diff --git a/doc/cross-compilation.xml b/doc/cross-compilation.xml
index 3b90596bcc2..c7187d86d1b 100644
--- a/doc/cross-compilation.xml
+++ b/doc/cross-compilation.xml
@@ -47,13 +47,9 @@
In Nixpkgs, these three platforms are defined as attribute sets under the
- names buildPlatform, hostPlatform,
- and targetPlatform. All three are always defined as
- attributes in the standard environment, and at the top level. That means
- one can get at them just like a dependency in a function that is imported
- with callPackage:
-{ stdenv, buildPlatform, hostPlatform, fooDep, barDep, .. }: ...buildPlatform...
- , or just off stdenv:
+ names buildPlatform, hostPlatform, and
+ targetPlatform. They are always defined as attributes in
+ the standard environment. That means one can access them like:
{ stdenv, fooDep, barDep, .. }: ...stdenv.buildPlatform...
.
diff --git a/doc/package-notes.xml b/doc/package-notes.xml
index c2aef8937b0..1f088e8aaa0 100644
--- a/doc/package-notes.xml
+++ b/doc/package-notes.xml
@@ -671,6 +671,8 @@ overrides = super: self: rec {
plugins = with availablePlugins; [ python perl ];
}
}
+ If the configure function returns an attrset without the plugins
+ attribute, availablePlugins will be used automatically.
@@ -704,6 +706,55 @@ overrides = super: self: rec {
}; }
+
+ WeeChat allows to set defaults on startup using the --run-command.
+ The configure method can be used to pass commands to the program:
+weechat.override {
+ configure = { availablePlugins, ... }: {
+ init = ''
+ /set foo bar
+ /server add freenode chat.freenode.org
+ '';
+ };
+}
+ Further values can be added to the list of commands when running
+ weechat --run-command "your-commands".
+
+
+ Additionally it's possible to specify scripts to be loaded when starting weechat.
+ These will be loaded before the commands from init:
+weechat.override {
+ configure = { availablePlugins, ... }: {
+ scripts = with pkgs.weechatScripts; [
+ weechat-xmpp weechat-matrix-bridge wee-slack
+ ];
+ init = ''
+ /set plugins.var.python.jabber.key "val"
+ '':
+ };
+}
+
+
+ In nixpkgs there's a subpackage which contains derivations for
+ WeeChat scripts. Such derivations expect a passthru.scripts attribute
+ which contains a list of all scripts inside the store path. Furthermore all scripts
+ have to live in $out/share. An exemplary derivation looks like this:
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation {
+ name = "exemplary-weechat-script";
+ src = fetchurl {
+ url = "https://scripts.tld/your-scripts.tar.gz";
+ sha256 = "...";
+ };
+ passthru.scripts = [ "foo.py" "bar.lua" ];
+ installPhase = ''
+ mkdir $out/share
+ cp foo.py $out/share
+ cp bar.lua $out/share
+ '';
+}
+
Citrix Receiver
diff --git a/lib/asserts.nix b/lib/asserts.nix
new file mode 100644
index 00000000000..8a5f1fb3feb
--- /dev/null
+++ b/lib/asserts.nix
@@ -0,0 +1,44 @@
+{ lib }:
+
+rec {
+
+ /* Print a trace message if pred is false.
+ Intended to be used to augment asserts with helpful error messages.
+
+ Example:
+ assertMsg false "nope"
+ => false
+ stderr> trace: nope
+
+ assert (assertMsg ("foo" == "bar") "foo is not bar, silly"); ""
+ stderr> trace: foo is not bar, silly
+ stderr> assert failed at …
+
+ Type:
+ assertMsg :: Bool -> String -> Bool
+ */
+ # TODO(Profpatsch): add tests that check stderr
+ assertMsg = pred: msg:
+ if pred
+ then true
+ else builtins.trace msg false;
+
+ /* Specialized `assertMsg` for checking if val is one of the elements
+ of a list. Useful for checking enums.
+
+ Example:
+ let sslLibrary = "libressl"
+ in assertOneOf "sslLibrary" sslLibrary [ "openssl" "bearssl" ]
+ => false
+ stderr> trace: sslLibrary must be one of "openssl", "bearssl", but is: "libressl"
+
+ Type:
+ assertOneOf :: String -> ComparableVal -> List ComparableVal -> Bool
+ */
+ assertOneOf = name: val: xs: assertMsg
+ (lib.elem val xs)
+ "${name} must be one of ${
+ lib.generators.toPretty {} xs}, but is: ${
+ lib.generators.toPretty {} val}";
+
+}
diff --git a/lib/default.nix b/lib/default.nix
index dd6fcec75e2..d7a05fec833 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -38,10 +38,11 @@ let
systems = callLibs ./systems;
# misc
+ asserts = callLibs ./asserts.nix;
debug = callLibs ./debug.nix;
-
generators = callLibs ./generators.nix;
misc = callLibs ./deprecated.nix;
+
# domain-specific
fetchers = callLibs ./fetchers.nix;
@@ -60,7 +61,6 @@ let
boolToString mergeAttrs flip mapNullable inNixShell min max
importJSON warn info nixpkgsVersion version mod compare
splitByAndCompare functionArgs setFunctionArgs isFunction;
-
inherit (fixedPoints) fix fix' extends composeExtensions
makeExtensible makeExtensibleWithCustomName;
inherit (attrsets) attrByPath hasAttrByPath setAttrByPath
@@ -117,6 +117,8 @@ let
unknownModule mkOption;
inherit (types) isType setType defaultTypeMerge defaultFunctor
isOptionType mkOptionType;
+ inherit (asserts)
+ assertMsg assertOneOf;
inherit (debug) addErrorContextToAttrs traceIf traceVal traceValFn
traceXMLVal traceXMLValMarked traceSeq traceSeqN traceValSeq
traceValSeqFn traceValSeqN traceValSeqNFn traceShowVal
diff --git a/lib/lists.nix b/lib/lists.nix
index 288882924ff..9ecd8f22003 100644
--- a/lib/lists.nix
+++ b/lib/lists.nix
@@ -509,7 +509,8 @@ rec {
=> 3
*/
last = list:
- assert list != []; elemAt list (length list - 1);
+ assert lib.assertMsg (list != []) "lists.last: list must not be empty!";
+ elemAt list (length list - 1);
/* Return all elements but the last
@@ -517,7 +518,9 @@ rec {
init [ 1 2 3 ]
=> [ 1 2 ]
*/
- init = list: assert list != []; take (length list - 1) list;
+ init = list:
+ assert lib.assertMsg (list != []) "lists.init: list must not be empty!";
+ take (length list - 1) list;
/* return the image of the cross product of some lists by a function
diff --git a/lib/strings.nix b/lib/strings.nix
index af932ce6ecf..0c4095bb55c 100644
--- a/lib/strings.nix
+++ b/lib/strings.nix
@@ -410,7 +410,7 @@ rec {
components = splitString "/" url;
filename = lib.last components;
name = builtins.head (splitString sep filename);
- in assert name != filename; name;
+ in assert name != filename; name;
/* Create an --{enable,disable}- string that can be passed to
standard GNU Autoconf scripts.
@@ -468,7 +468,10 @@ rec {
strw = lib.stringLength str;
reqWidth = width - (lib.stringLength filler);
in
- assert strw <= width;
+ assert lib.assertMsg (strw <= width)
+ "fixedWidthString: requested string length (${
+ toString width}) must not be shorter than actual length (${
+ toString strw})";
if strw == width then str else filler + fixedWidthString reqWidth filler str;
/* Format a number adding leading zeroes up to fixed width.
@@ -501,7 +504,7 @@ rec {
isStorePath = x:
isCoercibleToString x
&& builtins.substring 0 1 (toString x) == "/"
- && dirOf (builtins.toPath x) == builtins.storeDir;
+ && dirOf x == builtins.storeDir;
/* Convert string to int
Obviously, it is a bit hacky to use fromJSON that way.
@@ -537,11 +540,10 @@ rec {
*/
readPathsFromFile = rootPath: file:
let
- root = toString rootPath;
lines = lib.splitString "\n" (builtins.readFile file);
removeComments = lib.filter (line: line != "" && !(lib.hasPrefix "#" line));
relativePaths = removeComments lines;
- absolutePaths = builtins.map (path: builtins.toPath (root + "/" + path)) relativePaths;
+ absolutePaths = builtins.map (path: rootPath + "/${path}") relativePaths;
in
absolutePaths;
diff --git a/lib/tests/misc.nix b/lib/tests/misc.nix
index cf99aca58c0..d3bd7746d89 100644
--- a/lib/tests/misc.nix
+++ b/lib/tests/misc.nix
@@ -112,7 +112,7 @@ runTests {
storePathAppendix = isStorePath
"${goodPath}/bin/python";
nonAbsolute = isStorePath (concatStrings (tail (stringToCharacters goodPath)));
- asPath = isStorePath (builtins.toPath goodPath);
+ asPath = isStorePath goodPath;
otherPath = isStorePath "/something/else";
otherVals = {
attrset = isStorePath {};
@@ -357,7 +357,7 @@ runTests {
int = 42;
bool = true;
string = ''fno"rd'';
- path = /. + "/foo"; # toPath returns a string
+ path = /. + "/foo";
null_ = null;
function = x: x;
functionArgs = { arg ? 4, foo }: arg;
diff --git a/lib/trivial.nix b/lib/trivial.nix
index e702b8cdcc9..b1eea0bf124 100644
--- a/lib/trivial.nix
+++ b/lib/trivial.nix
@@ -171,7 +171,7 @@ rec {
builtins.fromJSON (builtins.readFile path);
- ## Warnings and asserts
+ ## Warnings
/* See https://github.com/NixOS/nix/issues/749. Eventually we'd like these
to expand to Nix builtins that carry metadata so that Nix can filter out
diff --git a/lib/types.nix b/lib/types.nix
index 4d6ac51c898..4e44e7521c4 100644
--- a/lib/types.nix
+++ b/lib/types.nix
@@ -119,7 +119,9 @@ rec {
let
betweenDesc = lowest: highest:
"${toString lowest} and ${toString highest} (both inclusive)";
- between = lowest: highest: assert lowest <= highest;
+ between = lowest: highest:
+ assert lib.assertMsg (lowest <= highest)
+ "ints.between: lowest must be smaller than highest";
addCheck int (x: x >= lowest && x <= highest) // {
name = "intBetween";
description = "integer between ${betweenDesc lowest highest}";
@@ -439,7 +441,9 @@ rec {
# Either value of type `finalType` or `coercedType`, the latter is
# converted to `finalType` using `coerceFunc`.
coercedTo = coercedType: coerceFunc: finalType:
- assert coercedType.getSubModules == null;
+ assert lib.assertMsg (coercedType.getSubModules == null)
+ "coercedTo: coercedType must not have submodules (it’s a ${
+ coercedType.description})";
mkOptionType rec {
name = "coercedTo";
description = "${finalType.description} or ${coercedType.description} convertible to it";
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 6356c0c7cef..ecec7bbaf7e 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -3396,6 +3396,11 @@
github = "relrod";
name = "Ricky Elrod";
};
+ renatoGarcia = {
+ email = "fgarcia.renato@gmail.com";
+ github = "renatoGarcia";
+ name = "Renato Garcia";
+ };
renzo = {
email = "renzocarbonara@gmail.com";
github = "k0001";
@@ -3888,6 +3893,11 @@
github = "StillerHarpo";
name = "Florian Engel";
};
+ stites = {
+ email = "sam@stites.io";
+ github = "stites";
+ name = "Sam Stites";
+ };
stumoss = {
email = "samoss@gmail.com";
github = "stumoss";
diff --git a/nixos/doc/manual/release-notes/rl-1809.xml b/nixos/doc/manual/release-notes/rl-1809.xml
index 53ffef31e3c..01421fc5dda 100644
--- a/nixos/doc/manual/release-notes/rl-1809.xml
+++ b/nixos/doc/manual/release-notes/rl-1809.xml
@@ -283,6 +283,14 @@ $ nix-instantiate -E '(import <nixpkgsunstable> {}).gitFull'
from your config without any issues.
+
+
+ stdenv.system and system in nixpkgs now refer to the host platform instead of the build platform.
+ For native builds this is not change, let alone a breaking one.
+ For cross builds, it is a breaking change, and stdenv.buildPlatform.system can be used instead for the old behavior.
+ They should be using that anyways for clarity.
+
+
@@ -536,6 +544,13 @@ inherit (pkgs.nixos {
a new paragraph.
+
+
+ Top-level buildPlatform, hostPlatform, and targetPlatform in Nixpkgs are deprecated.
+ Please use their equivalents in stdenv instead:
+ stdenv.buildPlatform, stdenv.hostPlatform, and stdenv.targetPlatform.
+
+
diff --git a/nixos/lib/eval-config.nix b/nixos/lib/eval-config.nix
index 97c79487df4..f71e264c347 100644
--- a/nixos/lib/eval-config.nix
+++ b/nixos/lib/eval-config.nix
@@ -28,7 +28,7 @@
let extraArgs_ = extraArgs; pkgs_ = pkgs;
extraModules = let e = builtins.getEnv "NIXOS_EXTRA_MODULE_PATH";
- in if e == "" then [] else [(import (builtins.toPath e))];
+ in if e == "" then [] else [(import e)];
in
let
@@ -36,7 +36,11 @@ let
_file = ./eval-config.nix;
key = _file;
config = {
- nixpkgs.localSystem = lib.mkDefault { inherit system; };
+ # Explicit `nixpkgs.system` or `nixpkgs.localSystem` should override
+ # this. Since the latter defaults to the former, the former should
+ # default to the argument. That way this new default could propagate all
+ # they way through, but has the last priority behind everything else.
+ nixpkgs.system = lib.mkDefault system;
_module.args.pkgs = lib.mkIf (pkgs_ != null) (lib.mkForce pkgs_);
};
};
diff --git a/nixos/modules/config/shells-environment.nix b/nixos/modules/config/shells-environment.nix
index 31adc9b8262..555db459f57 100644
--- a/nixos/modules/config/shells-environment.nix
+++ b/nixos/modules/config/shells-environment.nix
@@ -163,15 +163,24 @@ in
/bin/sh
'';
+ # For resetting environment with `. /etc/set-environment` when needed
+ # and discoverability (see motivation of #30418).
+ environment.etc."set-environment".source = config.system.build.setEnvironment;
+
system.build.setEnvironment = pkgs.writeText "set-environment"
- ''
- ${exportedEnvVars}
+ ''
+ # DO NOT EDIT -- this file has been generated automatically.
- ${cfg.extraInit}
+ # Prevent this file from being sourced by child shells.
+ export __NIXOS_SET_ENVIRONMENT_DONE=1
- # ~/bin if it exists overrides other bin directories.
- export PATH="$HOME/bin:$PATH"
- '';
+ ${exportedEnvVars}
+
+ ${cfg.extraInit}
+
+ # ~/bin if it exists overrides other bin directories.
+ export PATH="$HOME/bin:$PATH"
+ '';
system.activationScripts.binsh = stringAfter [ "stdio" ]
''
diff --git a/nixos/modules/config/xdg/mime.nix b/nixos/modules/config/xdg/mime.nix
index f1b672234a3..eb8ac2a54ac 100644
--- a/nixos/modules/config/xdg/mime.nix
+++ b/nixos/modules/config/xdg/mime.nix
@@ -23,7 +23,7 @@ with lib;
];
environment.extraSetup = ''
- if [ -w $out/share/mime ]; then
+ if [ -w $out/share/mime ] && [ -d $out/share/mime/packages ]; then
XDG_DATA_DIRS=$out/share ${pkgs.shared-mime-info}/bin/update-mime-database -V $out/share/mime > /dev/null
fi
diff --git a/nixos/modules/installer/tools/nix-fallback-paths.nix b/nixos/modules/installer/tools/nix-fallback-paths.nix
index 6611a6ca079..cb182a08a83 100644
--- a/nixos/modules/installer/tools/nix-fallback-paths.nix
+++ b/nixos/modules/installer/tools/nix-fallback-paths.nix
@@ -1,6 +1,6 @@
{
- x86_64-linux = "/nix/store/r9i30v8nasafg2851wflg71ln49fw03y-nix-2.1";
- i686-linux = "/nix/store/dsg3pr7wwrk51f7la9wgby173j18llqh-nix-2.1";
- aarch64-linux = "/nix/store/m3qgnch4xin21pmd1azas8kkcp9rhkr6-nix-2.1";
- x86_64-darwin = "/nix/store/n7fvy0k555gwkkdszdkhi3h0aahca8h3-nix-2.1";
+ x86_64-linux = "/nix/store/h180y3n5k1ypxgm1pcvj243qix5j45zz-nix-2.1.1";
+ i686-linux = "/nix/store/v2y4k4v9ml07jmfq739wyflapg3b7b5k-nix-2.1.1";
+ aarch64-linux = "/nix/store/v485craglq7xm5996ci8qy5dyc17dab0-nix-2.1.1";
+ x86_64-darwin = "/nix/store/lc3ymlix73kaad5srjdgaxp9ngr1sg6g-nix-2.1.1";
}
diff --git a/nixos/modules/misc/nixpkgs.nix b/nixos/modules/misc/nixpkgs.nix
index 8fbe218b232..7f9833e184a 100644
--- a/nixos/modules/misc/nixpkgs.nix
+++ b/nixos/modules/misc/nixpkgs.nix
@@ -62,12 +62,11 @@ in
pkgs = mkOption {
defaultText = literalExample
''import "''${nixos}/.." {
- inherit (config.nixpkgs) config overlays localSystem crossSystem;
+ inherit (cfg) config overlays localSystem crossSystem;
}
'';
default = import ../../.. {
- localSystem = { inherit (cfg) system; } // cfg.localSystem;
- inherit (cfg) config overlays crossSystem;
+ inherit (cfg) config overlays localSystem crossSystem;
};
type = pkgsType;
example = literalExample ''import {}'';
@@ -140,8 +139,11 @@ in
localSystem = mkOption {
type = types.attrs; # TODO utilize lib.systems.parsedPlatform
- default = { system = builtins.currentSystem; };
+ default = { inherit (cfg) system; };
example = { system = "aarch64-linux"; config = "aarch64-unknown-linux-gnu"; };
+ # Make sure that the final value has all fields for sake of other modules
+ # referring to this. TODO make `lib.systems` itself use the module system.
+ apply = lib.systems.elaborate;
defaultText = literalExample
''(import "''${nixos}/../lib").lib.systems.examples.aarch64-multiplatform'';
description = ''
@@ -180,6 +182,7 @@ in
system = mkOption {
type = types.str;
example = "i686-linux";
+ default = { system = builtins.currentSystem; };
description = ''
Specifies the Nix platform type on which NixOS should be built.
It is better to specify nixpkgs.localSystem instead.
@@ -196,6 +199,7 @@ in
See nixpkgs.localSystem for more information.
+ Ignored when nixpkgs.localSystem is set.
Ignored when nixpkgs.pkgs is set.
'';
};
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 4795922abcf..3f3123798f5 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -245,6 +245,7 @@
./services/desktops/gnome3/gnome-user-share.nix
./services/desktops/gnome3/gpaste.nix
./services/desktops/gnome3/gvfs.nix
+ ./services/desktops/gnome3/rygel.nix
./services/desktops/gnome3/seahorse.nix
./services/desktops/gnome3/sushi.nix
./services/desktops/gnome3/tracker.nix
@@ -406,6 +407,7 @@
./services/misc/taskserver
./services/misc/tzupdate.nix
./services/misc/uhub.nix
+ ./services/misc/weechat.nix
./services/misc/xmr-stak.nix
./services/misc/zookeeper.nix
./services/monitoring/apcupsd.nix
@@ -518,6 +520,7 @@
./services/networking/i2pd.nix
./services/networking/i2p.nix
./services/networking/iodine.nix
+ ./services/networking/iperf3.nix
./services/networking/ircd-hybrid/default.nix
./services/networking/iwd.nix
./services/networking/keepalived/default.nix
diff --git a/nixos/modules/programs/bash/bash.nix b/nixos/modules/programs/bash/bash.nix
index 69a1a482d07..424e1506b4c 100644
--- a/nixos/modules/programs/bash/bash.nix
+++ b/nixos/modules/programs/bash/bash.nix
@@ -126,7 +126,9 @@ in
programs.bash = {
shellInit = ''
- ${config.system.build.setEnvironment.text}
+ if [ -z "$__NIXOS_SET_ENVIRONMENT_DONE" ]; then
+ . ${config.system.build.setEnvironment}
+ fi
${cfge.shellInit}
'';
@@ -166,11 +168,11 @@ in
# Read system-wide modifications.
if test -f /etc/profile.local; then
- . /etc/profile.local
+ . /etc/profile.local
fi
if [ -n "''${BASH_VERSION:-}" ]; then
- . /etc/bashrc
+ . /etc/bashrc
fi
'';
@@ -191,12 +193,12 @@ in
# We are not always an interactive shell.
if [ -n "$PS1" ]; then
- ${cfg.interactiveShellInit}
+ ${cfg.interactiveShellInit}
fi
# Read system-wide modifications.
if test -f /etc/bashrc.local; then
- . /etc/bashrc.local
+ . /etc/bashrc.local
fi
'';
diff --git a/nixos/modules/programs/dconf.nix b/nixos/modules/programs/dconf.nix
index b7d8a345e65..9c9765b06b6 100644
--- a/nixos/modules/programs/dconf.nix
+++ b/nixos/modules/programs/dconf.nix
@@ -32,6 +32,8 @@ in
environment.etc = optionals (cfg.profiles != {})
(mapAttrsToList mkDconfProfile cfg.profiles);
+ services.dbus.packages = [ pkgs.gnome3.dconf ];
+
environment.variables.GIO_EXTRA_MODULES = optional cfg.enable
"${pkgs.gnome3.dconf.lib}/lib/gio/modules";
# https://github.com/NixOS/nixpkgs/pull/31891
diff --git a/nixos/modules/programs/fish.nix b/nixos/modules/programs/fish.nix
index c8d94a47be2..c3f742acde2 100644
--- a/nixos/modules/programs/fish.nix
+++ b/nixos/modules/programs/fish.nix
@@ -27,7 +27,7 @@ in
'';
type = types.bool;
};
-
+
vendor.config.enable = mkOption {
type = types.bool;
default = true;
@@ -43,7 +43,7 @@ in
Whether fish should use completion files provided by other packages.
'';
};
-
+
vendor.functions.enable = mkOption {
type = types.bool;
default = true;
@@ -107,9 +107,11 @@ in
# This happens before $__fish_datadir/config.fish sets fish_function_path, so it is currently
# unset. We set it and then completely erase it, leaving its configuration to $__fish_datadir/config.fish
set fish_function_path ${pkgs.fish-foreign-env}/share/fish-foreign-env/functions $__fish_datadir/functions
-
+
# source the NixOS environment config
- fenv source ${config.system.build.setEnvironment}
+ if [ -z "$__NIXOS_SET_ENVIRONMENT_DONE" ]
+ fenv source ${config.system.build.setEnvironment}
+ end
# clear fish_function_path so that it will be correctly set when we return to $__fish_datadir/config.fish
set -e fish_function_path
@@ -123,7 +125,7 @@ in
set fish_function_path ${pkgs.fish-foreign-env}/share/fish-foreign-env/functions $fish_function_path
fenv source /etc/fish/foreign-env/shellInit > /dev/null
set -e fish_function_path[1]
-
+
${cfg.shellInit}
# and leave a note so we don't source this config section again from
@@ -137,7 +139,7 @@ in
set fish_function_path ${pkgs.fish-foreign-env}/share/fish-foreign-env/functions $fish_function_path
fenv source /etc/fish/foreign-env/loginShellInit > /dev/null
set -e fish_function_path[1]
-
+
${cfg.loginShellInit}
# and leave a note so we don't source this config section again from
@@ -149,12 +151,11 @@ in
status --is-interactive; and not set -q __fish_nixos_interactive_config_sourced
and begin
${fishAliases}
-
set fish_function_path ${pkgs.fish-foreign-env}/share/fish-foreign-env/functions $fish_function_path
fenv source /etc/fish/foreign-env/interactiveShellInit > /dev/null
set -e fish_function_path[1]
-
+
${cfg.promptInit}
${cfg.interactiveShellInit}
@@ -170,7 +171,7 @@ in
++ optional cfg.vendor.config.enable "/share/fish/vendor_conf.d"
++ optional cfg.vendor.completions.enable "/share/fish/vendor_completions.d"
++ optional cfg.vendor.functions.enable "/share/fish/vendor_functions.d";
-
+
environment.systemPackages = [ pkgs.fish ];
environment.shells = [
diff --git a/nixos/modules/programs/zsh/zsh.nix b/nixos/modules/programs/zsh/zsh.nix
index d30b3415411..b4ca8730958 100644
--- a/nixos/modules/programs/zsh/zsh.nix
+++ b/nixos/modules/programs/zsh/zsh.nix
@@ -70,7 +70,7 @@ in
promptInit = mkOption {
default = ''
if [ "$TERM" != dumb ]; then
- autoload -U promptinit && promptinit && prompt walters
+ autoload -U promptinit && promptinit && prompt walters
fi
'';
description = ''
@@ -116,7 +116,9 @@ in
if [ -n "$__ETC_ZSHENV_SOURCED" ]; then return; fi
export __ETC_ZSHENV_SOURCED=1
- ${config.system.build.setEnvironment.text}
+ if [ -z "$__NIXOS_SET_ENVIRONMENT_DONE" ]; then
+ . ${config.system.build.setEnvironment}
+ fi
${cfge.shellInit}
@@ -124,7 +126,7 @@ in
# Read system-wide modifications.
if test -f /etc/zshenv.local; then
- . /etc/zshenv.local
+ . /etc/zshenv.local
fi
'';
@@ -143,7 +145,7 @@ in
# Read system-wide modifications.
if test -f /etc/zprofile.local; then
- . /etc/zprofile.local
+ . /etc/zprofile.local
fi
'';
@@ -169,7 +171,7 @@ in
# Tell zsh how to find installed completions
for p in ''${(z)NIX_PROFILES}; do
- fpath+=($p/share/zsh/site-functions $p/share/zsh/$ZSH_VERSION/functions $p/share/zsh/vendor-completions)
+ fpath+=($p/share/zsh/site-functions $p/share/zsh/$ZSH_VERSION/functions $p/share/zsh/vendor-completions)
done
${optionalString cfg.enableGlobalCompInit "autoload -U compinit && compinit"}
@@ -184,7 +186,7 @@ in
# Read system-wide modifications.
if test -f /etc/zshrc.local; then
- . /etc/zshrc.local
+ . /etc/zshrc.local
fi
'';
diff --git a/nixos/modules/services/desktops/gnome3/rygel.nix b/nixos/modules/services/desktops/gnome3/rygel.nix
new file mode 100644
index 00000000000..55d5e703aa1
--- /dev/null
+++ b/nixos/modules/services/desktops/gnome3/rygel.nix
@@ -0,0 +1,30 @@
+# rygel service.
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+{
+ ###### interface
+ options = {
+ services.gnome3.rygel = {
+ enable = mkOption {
+ default = false;
+ description = ''
+ Whether to enable Rygel UPnP Mediaserver.
+
+ You will need to also allow UPnP connections in firewall, see the following comment.
+ '';
+ type = types.bool;
+ };
+ };
+ };
+
+ ###### implementation
+ config = mkIf config.services.gnome3.rygel.enable {
+ environment.systemPackages = [ pkgs.gnome3.rygel ];
+
+ services.dbus.packages = [ pkgs.gnome3.rygel ];
+
+ systemd.packages = [ pkgs.gnome3.rygel ];
+ };
+}
diff --git a/nixos/modules/services/misc/weechat.nix b/nixos/modules/services/misc/weechat.nix
new file mode 100644
index 00000000000..1fcfb440485
--- /dev/null
+++ b/nixos/modules/services/misc/weechat.nix
@@ -0,0 +1,56 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+ cfg = config.services.weechat;
+in
+
+{
+ options.services.weechat = {
+ enable = mkEnableOption "weechat";
+ root = mkOption {
+ description = "Weechat state directory.";
+ type = types.str;
+ default = "/var/lib/weechat";
+ };
+ sessionName = mkOption {
+ description = "Name of the `screen' session for weechat.";
+ default = "weechat-screen";
+ type = types.str;
+ };
+ binary = mkOption {
+ description = "Binary to execute (by default \${weechat}/bin/weechat).";
+ example = literalExample ''
+ ''${pkgs.weechat}/bin/weechat-headless
+ '';
+ default = "${pkgs.weechat}/bin/weechat";
+ };
+ };
+
+ config = mkIf cfg.enable {
+ users = {
+ groups.weechat = {};
+ users.weechat = {
+ createHome = true;
+ group = "weechat";
+ home = cfg.root;
+ isSystemUser = true;
+ };
+ };
+
+ systemd.services.weechat = {
+ environment.WEECHAT_HOME = cfg.root;
+ serviceConfig = {
+ User = "weechat";
+ Group = "weechat";
+ RemainAfterExit = "yes";
+ };
+ script = "exec ${pkgs.screen}/bin/screen -Dm -S ${cfg.sessionName} ${cfg.binary}";
+ wantedBy = [ "multi-user.target" ];
+ wants = [ "network.target" ];
+ };
+ };
+
+ meta.doc = ./weechat.xml;
+}
diff --git a/nixos/modules/services/misc/weechat.xml b/nixos/modules/services/misc/weechat.xml
new file mode 100644
index 00000000000..de86dede2eb
--- /dev/null
+++ b/nixos/modules/services/misc/weechat.xml
@@ -0,0 +1,61 @@
+
+
+WeeChat
+WeeChat is a fast and extensible IRC client.
+
+Basic Usage
+
+By default, the module creates a
+systemd unit
+which runs the chat client in a detached
+screen session.
+
+
+
+
+This can be done by enabling the weechat service:
+
+
+{ ... }:
+
+{
+ services.weechat.enable = true;
+}
+
+
+
+The service is managed by a dedicated user
+named weechat in the state directory
+/var/lib/weechat.
+
+
+Re-attaching to WeeChat
+
+WeeChat runs in a screen session owned by a dedicated user. To explicitly
+allow your another user to attach to this session, the screenrc needs to be tweaked
+by adding multiuser support:
+
+
+{
+ programs.screen.screenrc = ''
+ multiuser on
+ acladd normal_user
+ '';
+}
+
+
+Now, the session can be re-attached like this:
+
+
+screen -r weechat-screen
+
+
+
+The session name can be changed using services.weechat.sessionName.
+
+
+
diff --git a/nixos/modules/services/monitoring/riemann.nix b/nixos/modules/services/monitoring/riemann.nix
index 237de53456f..13d2b1cc060 100644
--- a/nixos/modules/services/monitoring/riemann.nix
+++ b/nixos/modules/services/monitoring/riemann.nix
@@ -17,9 +17,9 @@ let
launcher = writeScriptBin "riemann" ''
#!/bin/sh
- exec ${jdk}/bin/java ${concatStringsSep "\n" cfg.extraJavaOpts} \
+ exec ${jdk}/bin/java ${concatStringsSep " " cfg.extraJavaOpts} \
-cp ${classpath} \
- riemann.bin ${writeText "riemann-config.clj" riemannConfig}
+ riemann.bin ${cfg.configFile}
'';
in {
@@ -37,7 +37,8 @@ in {
config = mkOption {
type = types.lines;
description = ''
- Contents of the Riemann configuration file.
+ Contents of the Riemann configuration file. For more complicated
+ config you should use configFile.
'';
};
configFiles = mkOption {
@@ -47,7 +48,15 @@ in {
Extra files containing Riemann configuration. These files will be
loaded at runtime by Riemann (with Clojure's
load-file function) at the end of the
- configuration.
+ configuration if you use the config option, this is ignored if you
+ use configFile.
+ '';
+ };
+ configFile = mkOption {
+ type = types.str;
+ description = ''
+ A Riemann config file. Any files in the same directory as this file
+ will be added to the classpath by Riemann.
'';
};
extraClasspathEntries = mkOption {
@@ -77,6 +86,10 @@ in {
group = "riemann";
};
+ services.riemann.configFile = mkDefault (
+ writeText "riemann-config.clj" riemannConfig
+ );
+
systemd.services.riemann = {
wantedBy = [ "multi-user.target" ];
path = [ inetutils ];
@@ -84,6 +97,7 @@ in {
User = "riemann";
ExecStart = "${launcher}/bin/riemann";
};
+ serviceConfig.LimitNOFILE = 65536;
};
};
diff --git a/nixos/modules/services/networking/iperf3.nix b/nixos/modules/services/networking/iperf3.nix
new file mode 100644
index 00000000000..742404a5692
--- /dev/null
+++ b/nixos/modules/services/networking/iperf3.nix
@@ -0,0 +1,87 @@
+{ config, lib, pkgs, ... }: with lib;
+let
+ cfg = config.services.iperf3;
+
+ api = {
+ enable = mkEnableOption "iperf3 network throughput testing server";
+ port = mkOption {
+ type = types.ints.u16;
+ default = 5201;
+ description = "Server port to listen on for iperf3 client requsts.";
+ };
+ affinity = mkOption {
+ type = types.nullOr types.ints.unsigned;
+ default = null;
+ description = "CPU affinity for the process.";
+ };
+ bind = mkOption {
+ type = types.nullOr types.str;
+ default = null;
+ description = "Bind to the specific interface associated with the given address.";
+ };
+ verbose = mkOption {
+ type = types.bool;
+ default = false;
+ description = "Give more detailed output.";
+ };
+ forceFlush = mkOption {
+ type = types.bool;
+ default = false;
+ description = "Force flushing output at every interval.";
+ };
+ debug = mkOption {
+ type = types.bool;
+ default = false;
+ description = "Emit debugging output.";
+ };
+ rsaPrivateKey = mkOption {
+ type = types.nullOr types.path;
+ default = null;
+ description = "Path to the RSA private key (not password-protected) used to decrypt authentication credentials from the client.";
+ };
+ authorizedUsersFile = mkOption {
+ type = types.nullOr types.path;
+ default = null;
+ description = "Path to the configuration file containing authorized users credentials to run iperf tests.";
+ };
+ extraFlags = mkOption {
+ type = types.listOf types.str;
+ default = [ ];
+ description = "Extra flags to pass to iperf3(1).";
+ };
+ };
+
+ imp = {
+ systemd.services.iperf3 = {
+ description = "iperf3 daemon";
+ unitConfig.Documentation = "man:iperf3(1) https://iperf.fr/iperf-doc.php";
+ wantedBy = [ "multi-user.target" ];
+ after = [ "network.target" ];
+
+ serviceConfig = {
+ Restart = "on-failure";
+ RestartSec = 2;
+ DynamicUser = true;
+ PrivateDevices = true;
+ CapabilityBoundingSet = "";
+ NoNewPrivileges = true;
+ ExecStart = ''
+ ${pkgs.iperf3}/bin/iperf \
+ --server \
+ --port ${toString cfg.port} \
+ ${optionalString (cfg.affinity != null) "--affinity ${toString cfg.affinity}"} \
+ ${optionalString (cfg.bind != null) "--bind ${cfg.bind}"} \
+ ${optionalString (cfg.rsaPrivateKey != null) "--rsa-private-key-path ${cfg.rsaPrivateKey}"} \
+ ${optionalString (cfg.authorizedUsersFile != null) "--authorized-users-path ${cfg.authorizedUsersFile}"} \
+ ${optionalString cfg.verbose "--verbose"} \
+ ${optionalString cfg.debug "--debug"} \
+ ${optionalString cfg.forceFlush "--forceflush"} \
+ ${escapeShellArgs cfg.extraFlags}
+ '';
+ };
+ };
+ };
+in {
+ options.services.iperf3 = api;
+ config = mkIf cfg.enable imp;
+}
diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix
index d5af4648e8f..2d76e0676b2 100644
--- a/nixos/modules/services/networking/networkmanager.nix
+++ b/nixos/modules/services/networking/networkmanager.nix
@@ -406,25 +406,25 @@ in {
{ source = configFile;
target = "NetworkManager/NetworkManager.conf";
}
- { source = "${networkmanager-openvpn}/etc/NetworkManager/VPN/nm-openvpn-service.name";
+ { source = "${networkmanager-openvpn}/lib/NetworkManager/VPN/nm-openvpn-service.name";
target = "NetworkManager/VPN/nm-openvpn-service.name";
}
- { source = "${networkmanager-vpnc}/etc/NetworkManager/VPN/nm-vpnc-service.name";
+ { source = "${networkmanager-vpnc}/lib/NetworkManager/VPN/nm-vpnc-service.name";
target = "NetworkManager/VPN/nm-vpnc-service.name";
}
- { source = "${networkmanager-openconnect}/etc/NetworkManager/VPN/nm-openconnect-service.name";
+ { source = "${networkmanager-openconnect}/lib/NetworkManager/VPN/nm-openconnect-service.name";
target = "NetworkManager/VPN/nm-openconnect-service.name";
}
- { source = "${networkmanager-fortisslvpn}/etc/NetworkManager/VPN/nm-fortisslvpn-service.name";
+ { source = "${networkmanager-fortisslvpn}/lib/NetworkManager/VPN/nm-fortisslvpn-service.name";
target = "NetworkManager/VPN/nm-fortisslvpn-service.name";
}
- { source = "${networkmanager-l2tp}/etc/NetworkManager/VPN/nm-l2tp-service.name";
+ { source = "${networkmanager-l2tp}/lib/NetworkManager/VPN/nm-l2tp-service.name";
target = "NetworkManager/VPN/nm-l2tp-service.name";
}
- { source = "${networkmanager_strongswan}/etc/NetworkManager/VPN/nm-strongswan-service.name";
+ { source = "${networkmanager_strongswan}/lib/NetworkManager/VPN/nm-strongswan-service.name";
target = "NetworkManager/VPN/nm-strongswan-service.name";
}
- { source = "${networkmanager-iodine}/etc/NetworkManager/VPN/nm-iodine-service.name";
+ { source = "${networkmanager-iodine}/lib/NetworkManager/VPN/nm-iodine-service.name";
target = "NetworkManager/VPN/nm-iodine-service.name";
}
] ++ optional (cfg.appendNameservers == [] || cfg.insertNameservers == [])
diff --git a/nixos/modules/services/security/sks.nix b/nixos/modules/services/security/sks.nix
index 62308428f32..9f0261038d5 100644
--- a/nixos/modules/services/security/sks.nix
+++ b/nixos/modules/services/security/sks.nix
@@ -3,78 +3,112 @@
with lib;
let
-
cfg = config.services.sks;
-
sksPkg = cfg.package;
-in
-
-{
+in {
+ meta.maintainers = with maintainers; [ primeos calbrecht jcumming ];
options = {
services.sks = {
- enable = mkEnableOption "sks";
+ enable = mkEnableOption ''
+ SKS (synchronizing key server for OpenPGP) and start the database
+ server. You need to create "''${dataDir}/dump/*.gpg" for the initial
+ import'';
package = mkOption {
default = pkgs.sks;
defaultText = "pkgs.sks";
type = types.package;
- description = "
- Which sks derivation to use.
- ";
+ description = "Which SKS derivation to use.";
+ };
+
+ dataDir = mkOption {
+ type = types.path;
+ default = "/var/db/sks";
+ example = "/var/lib/sks";
+ # TODO: The default might change to "/var/lib/sks" as this is more
+ # common. There's also https://github.com/NixOS/nixpkgs/issues/26256
+ # and "/var/db" is not FHS compliant (seems to come from BSD).
+ description = ''
+ Data directory (-basedir) for SKS, where the database and all
+ configuration files are located (e.g. KDB, PTree, membership and
+ sksconf).
+ '';
};
hkpAddress = mkOption {
default = [ "127.0.0.1" "::1" ];
type = types.listOf types.str;
- description = "
- Wich ip addresses the sks-keyserver is listening on.
- ";
+ description = ''
+ Domain names, IPv4 and/or IPv6 addresses to listen on for HKP
+ requests.
+ '';
};
hkpPort = mkOption {
default = 11371;
- type = types.int;
- description = "
- Which port the sks-keyserver is listening on.
- ";
+ type = types.ints.u16;
+ description = "HKP port to listen on.";
+ };
+
+ webroot = mkOption {
+ type = types.nullOr types.path;
+ default = "${sksPkg.webSamples}/OpenPKG";
+ defaultText = "\${pkgs.sks.webSamples}/OpenPKG";
+ description = ''
+ Source directory (will be symlinked, if not null) for the files the
+ built-in webserver should serve. SKS (''${pkgs.sks.webSamples})
+ provides the following examples: "HTML5", "OpenPKG", and "XHTML+ES".
+ The index file can be named index.html, index.htm, index.xhtm, or
+ index.xhtml. Files with the extensions .css, .es, .js, .jpg, .jpeg,
+ .png, or .gif are supported. Subdirectories and filenames with
+ anything other than alphanumeric characters and the '.' character
+ will be ignored.
+ '';
};
};
};
config = mkIf cfg.enable {
- environment.systemPackages = [ sksPkg ];
-
- users.users.sks = {
- createHome = true;
- home = "/var/db/sks";
- isSystemUser = true;
- shell = "${pkgs.coreutils}/bin/true";
+ users = {
+ users.sks = {
+ isSystemUser = true;
+ description = "SKS user";
+ home = cfg.dataDir;
+ createHome = true;
+ group = "sks";
+ useDefaultShell = true;
+ packages = [ sksPkg pkgs.db ];
+ };
+ groups.sks = { };
};
systemd.services = let
hkpAddress = "'" + (builtins.concatStringsSep " " cfg.hkpAddress) + "'" ;
hkpPort = builtins.toString cfg.hkpPort;
- home = config.users.users.sks.home;
- user = config.users.users.sks.name;
in {
- sks-keyserver = {
+ "sks-db" = {
+ description = "SKS database server";
+ after = [ "network.target" ];
wantedBy = [ "multi-user.target" ];
preStart = ''
- mkdir -p ${home}/dump
- ${pkgs.sks}/bin/sks build ${home}/dump/*.gpg -n 10 -cache 100 || true #*/
- ${pkgs.sks}/bin/sks cleandb || true
- ${pkgs.sks}/bin/sks pbuild -cache 20 -ptree_cache 70 || true
+ ${lib.optionalString (cfg.webroot != null)
+ "ln -sfT \"${cfg.webroot}\" web"}
+ mkdir -p dump
+ ${sksPkg}/bin/sks build dump/*.gpg -n 10 -cache 100 || true #*/
+ ${sksPkg}/bin/sks cleandb || true
+ ${sksPkg}/bin/sks pbuild -cache 20 -ptree_cache 70 || true
'';
serviceConfig = {
- WorkingDirectory = home;
- User = user;
+ WorkingDirectory = "~";
+ User = "sks";
+ Group = "sks";
Restart = "always";
- ExecStart = "${pkgs.sks}/bin/sks db -hkp_address ${hkpAddress} -hkp_port ${hkpPort}";
+ ExecStart = "${sksPkg}/bin/sks db -hkp_address ${hkpAddress} -hkp_port ${hkpPort}";
};
};
};
diff --git a/nixos/modules/services/system/kerberos.nix b/nixos/modules/services/system/kerberos.nix
index d151385d2f9..e2c45ed64ac 100644
--- a/nixos/modules/services/system/kerberos.nix
+++ b/nixos/modules/services/system/kerberos.nix
@@ -42,7 +42,7 @@ in
protocol = "tcp";
user = "root";
server = "${pkgs.tcp_wrappers}/bin/tcpd";
- serverArgs = "${pkgs.heimdalFull}/bin/kadmind";
+ serverArgs = "${pkgs.heimdalFull}/libexec/heimdal/kadmind";
};
systemd.services.kdc = {
@@ -51,13 +51,13 @@ in
preStart = ''
mkdir -m 0755 -p ${stateDir}
'';
- script = "${heimdalFull}/bin/kdc";
+ script = "${heimdalFull}/libexec/heimdal/kdc";
};
systemd.services.kpasswdd = {
description = "Kerberos Password Changing daemon";
wantedBy = [ "multi-user.target" ];
- script = "${heimdalFull}/bin/kpasswdd";
+ script = "${heimdalFull}/libexec/heimdal/kpasswdd";
};
};
diff --git a/nixos/modules/services/x11/desktop-managers/enlightenment.nix b/nixos/modules/services/x11/desktop-managers/enlightenment.nix
index 6fa3ec3b925..04e380b6153 100644
--- a/nixos/modules/services/x11/desktop-managers/enlightenment.nix
+++ b/nixos/modules/services/x11/desktop-managers/enlightenment.nix
@@ -66,7 +66,7 @@ in
'';
}];
- security.wrappers = (import (builtins.toPath "${e.enlightenment}/e-wrappers.nix")).security.wrappers;
+ security.wrappers = (import "${e.enlightenment}/e-wrappers.nix").security.wrappers;
environment.etc = singleton
{ source = xcfg.xkbDir;
diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix
index faf5214130d..eb86f7b53bb 100644
--- a/nixos/modules/services/x11/desktop-managers/gnome3.nix
+++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix
@@ -110,6 +110,7 @@ in {
services.gnome3.gnome-terminal-server.enable = mkDefault true;
services.gnome3.gnome-user-share.enable = mkDefault true;
services.gnome3.gvfs.enable = true;
+ services.gnome3.rygel.enable = mkDefault true;
services.gnome3.seahorse.enable = mkDefault true;
services.gnome3.sushi.enable = mkDefault true;
services.gnome3.tracker.enable = mkDefault true;
diff --git a/nixos/modules/system/activation/switch-to-configuration.pl b/nixos/modules/system/activation/switch-to-configuration.pl
index b3fe6caf62d..c3e469e4b8a 100644
--- a/nixos/modules/system/activation/switch-to-configuration.pl
+++ b/nixos/modules/system/activation/switch-to-configuration.pl
@@ -419,7 +419,7 @@ while (my $f = <$listActiveUsers>) {
my ($uid, $name) = ($+{uid}, $+{user});
print STDERR "reloading user units for $name...\n";
- system("su", "-l", $name, "-c", "XDG_RUNTIME_DIR=/run/user/$uid @systemd@/bin/systemctl --user daemon-reload");
+ system("su", "-s", "@shell@", "-l", $name, "-c", "XDG_RUNTIME_DIR=/run/user/$uid @systemd@/bin/systemctl --user daemon-reload");
}
close $listActiveUsers;
diff --git a/nixos/modules/system/activation/top-level.nix b/nixos/modules/system/activation/top-level.nix
index fff88e2c2bf..9797ef641e4 100644
--- a/nixos/modules/system/activation/top-level.nix
+++ b/nixos/modules/system/activation/top-level.nix
@@ -115,6 +115,7 @@ let
inherit (pkgs) utillinux coreutils;
systemd = config.systemd.package;
+ inherit (pkgs.stdenv) shell;
inherit children;
kernelParams = config.boot.kernelParams;
diff --git a/nixos/modules/system/boot/networkd.nix b/nixos/modules/system/boot/networkd.nix
index 4bacf0f126a..63a6f7fbe09 100644
--- a/nixos/modules/system/boot/networkd.nix
+++ b/nixos/modules/system/boot/networkd.nix
@@ -208,7 +208,6 @@ let
"InitialCongestionWindow" "InitialAdvertisedReceiveWindow" "QuickAck"
"MTUBytes"
])
- (assertHasField "Gateway")
];
checkDhcp = checkUnitConfig "DHCP" [
@@ -249,13 +248,14 @@ let
# .network files have a [Link] section with different options than in .netlink files
checkNetworkLink = checkUnitConfig "Link" [
(assertOnlyFields [
- "MACAddress" "MTUBytes" "ARP" "Unmanaged" "RequiredForOnline"
+ "MACAddress" "MTUBytes" "ARP" "Multicast" "Unmanaged" "RequiredForOnline"
])
(assertMacAddress "MACAddress")
(assertByteFormat "MTUBytes")
(assertValueOneOf "ARP" boolValues)
+ (assertValueOneOf "Multicast" boolValues)
(assertValueOneOf "Unmanaged" boolValues)
- (assertValueOneOf "RquiredForOnline" boolValues)
+ (assertValueOneOf "RequiredForOnline" boolValues)
];
diff --git a/nixos/release.nix b/nixos/release.nix
index 17f51d977c9..0fd8d694641 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -399,7 +399,7 @@ in rec {
tests.slurm = callTest tests/slurm.nix {};
tests.smokeping = callTest tests/smokeping.nix {};
tests.snapper = callTest tests/snapper.nix {};
- tests.statsd = callTest tests/statsd.nix {};
+ #tests.statsd = callTest tests/statsd.nix {}; # statsd is broken: #45946
tests.strongswan-swanctl = callTest tests/strongswan-swanctl.nix {};
tests.sudo = callTest tests/sudo.nix {};
tests.systemd = callTest tests/systemd.nix {};
diff --git a/nixos/tests/novacomd.nix b/nixos/tests/novacomd.nix
index 2b56aee0a2e..4eb60c0feb5 100644
--- a/nixos/tests/novacomd.nix
+++ b/nixos/tests/novacomd.nix
@@ -9,12 +9,16 @@ import ./make-test.nix ({ pkgs, ...} : {
};
testScript = ''
- startAll;
+ $machine->waitForUnit("multi-user.target");
+ # multi-user.target wants novacomd.service, but let's make sure
$machine->waitForUnit("novacomd.service");
# Check status and try connecting with novacom
$machine->succeed("systemctl status novacomd.service >&2");
+ # to prevent non-deterministic failure,
+ # make sure the daemon is really listening
+ $machine->waitForOpenPort(6968);
$machine->succeed("novacom -l");
# Stop the daemon, double-check novacom fails if daemon isn't working
@@ -23,6 +27,8 @@ import ./make-test.nix ({ pkgs, ...} : {
# And back again for good measure
$machine->startJob("novacomd");
+ # make sure the daemon is really listening
+ $machine->waitForOpenPort(6968);
$machine->succeed("novacom -l");
'';
})
diff --git a/nixos/tests/opensmtpd.nix b/nixos/tests/opensmtpd.nix
index 5079779f35b..4c0cbca2101 100644
--- a/nixos/tests/opensmtpd.nix
+++ b/nixos/tests/opensmtpd.nix
@@ -102,11 +102,17 @@ import ./make-test.nix {
testScript = ''
startAll;
- $client->waitForUnit("network.target");
+ $client->waitForUnit("network-online.target");
$smtp1->waitForUnit('opensmtpd');
$smtp2->waitForUnit('opensmtpd');
$smtp2->waitForUnit('dovecot2');
+ # To prevent sporadic failures during daemon startup, make sure
+ # services are listening on their ports before sending requests
+ $smtp1->waitForOpenPort(25);
+ $smtp2->waitForOpenPort(25);
+ $smtp2->waitForOpenPort(143);
+
$client->succeed('send-a-test-mail');
$smtp1->waitUntilFails('smtpctl show queue | egrep .');
$smtp2->waitUntilFails('smtpctl show queue | egrep .');
diff --git a/pkgs/applications/altcoins/monero-gui/default.nix b/pkgs/applications/altcoins/monero-gui/default.nix
index 2aff86ae1d3..49b8db51bcc 100644
--- a/pkgs/applications/altcoins/monero-gui/default.nix
+++ b/pkgs/applications/altcoins/monero-gui/default.nix
@@ -12,13 +12,13 @@ with stdenv.lib;
stdenv.mkDerivation rec {
name = "monero-gui-${version}";
- version = "0.12.0.0";
+ version = "0.12.3.0";
src = fetchFromGitHub {
owner = "monero-project";
repo = "monero-gui";
rev = "v${version}";
- sha256 = "1mg5ival8a2wdp14yib4wzqax4xyvd40zjy9anhszljds1439jhl";
+ sha256 = "1ry0455cgirkc6n46qnlv5p49axjllil78xmx6469nbp3a2r3z7i";
};
nativeBuildInputs = [ qmake pkgconfig ];
@@ -70,7 +70,8 @@ stdenv.mkDerivation rec {
cp ${desktopItem}/share/applications/* $out/share/applications
# install translations
- cp -r release/bin/translations $out/share/
+ mkdir -p $out/share/translations
+ cp translations/*.qm $out/share/translations/
# install icons
for n in 16 24 32 48 64 96 128 256; do
diff --git a/pkgs/applications/altcoins/monero-gui/move-log-file.patch b/pkgs/applications/altcoins/monero-gui/move-log-file.patch
index 08840c6a65e..74f817d8135 100644
--- a/pkgs/applications/altcoins/monero-gui/move-log-file.patch
+++ b/pkgs/applications/altcoins/monero-gui/move-log-file.patch
@@ -1,38 +1,27 @@
diff --git a/main.cpp b/main.cpp
-index c03b160..a8ea263 100644
+index 79223c0..e80b317 100644
--- a/main.cpp
+++ b/main.cpp
-@@ -80,14 +80,16 @@ int main(int argc, char *argv[])
- // qDebug() << "High DPI auto scaling - enabled";
- //#endif
-
-- // Log settings
-- Monero::Wallet::init(argv[0], "monero-wallet-gui");
--// qInstallMessageHandler(messageHandler);
--
- MainApp app(argc, argv);
-
- qDebug() << "app startd";
-
-+ // Log settings
-+ QString logfile =
-+ QStandardPaths::writableLocation(QStandardPaths::CacheLocation)
-+ + "/monero-wallet-gui.log";
-+ Monero::Wallet::init(argv[0], logfile.toUtf8().constData());
-+
- app.setApplicationName("monero-core");
- app.setOrganizationDomain("getmonero.org");
- app.setOrganizationName("monero-project");
-diff --git a/src/libwalletqt/Wallet.cpp b/src/libwalletqt/Wallet.cpp
-index 74649ce..fe1efc6 100644
---- a/src/libwalletqt/Wallet.cpp
-+++ b/src/libwalletqt/Wallet.cpp
-@@ -729,7 +729,7 @@ QString Wallet::getWalletLogPath() const
- #ifdef Q_OS_MACOS
- return QStandardPaths::standardLocations(QStandardPaths::HomeLocation).at(0) + "/Library/Logs/" + filename;
- #else
-- return QCoreApplication::applicationDirPath() + "/" + filename;
-+ return QStandardPaths::writableLocation(QStandardPaths::CacheLocation) + filename;
+@@ -115,6 +115,9 @@ int main(int argc, char *argv[])
+ QCommandLineOption logPathOption(QStringList() << "l" << "log-file",
+ QCoreApplication::translate("main", "Log to specified file"),
+ QCoreApplication::translate("main", "file"));
++ logPathOption.setDefaultValue(
++ QStandardPaths::writableLocation(QStandardPaths::CacheLocation)
++ + "/monero-wallet-gui.log");
+ parser.addOption(logPathOption);
+ parser.addHelpOption();
+ parser.process(app);
+diff --git a/Logger.cpp b/Logger.cpp
+index 660bafc..dae24d4 100644
+--- a/Logger.cpp
++++ b/Logger.cpp
+@@ -15,7 +15,7 @@ static const QString default_name = "monero-wallet-gui.log";
+ #elif defined(Q_OS_MAC)
+ static const QString osPath = QStandardPaths::standardLocations(QStandardPaths::HomeLocation).at(0) + "/Library/Logs";
+ #else // linux + bsd
+- static const QString osPath = QStandardPaths::standardLocations(QStandardPaths::HomeLocation).at(0);
++ static const QString osPath = QStandardPaths::standardLocations(QStandardPaths::CacheLocation).at(0);
#endif
- }
+
diff --git a/pkgs/applications/altcoins/monero-gui/move-translations-dir.patch b/pkgs/applications/altcoins/monero-gui/move-translations-dir.patch
index 29bb5630154..ff17ce5da1c 100644
--- a/pkgs/applications/altcoins/monero-gui/move-translations-dir.patch
+++ b/pkgs/applications/altcoins/monero-gui/move-translations-dir.patch
@@ -1,14 +1,13 @@
diff --git a/TranslationManager.cpp b/TranslationManager.cpp
-index fa39d35..5a410f7 100644
+index e7fc52a..83534cc 100644
--- a/TranslationManager.cpp
+++ b/TranslationManager.cpp
-@@ -29,7 +29,7 @@ bool TranslationManager::setLanguage(const QString &language)
- #ifdef Q_OS_MACX
- QString dir = qApp->applicationDirPath() + "/../Resources/translations";
- #else
+@@ -25,7 +25,7 @@ bool TranslationManager::setLanguage(const QString &language)
+ return true;
+ }
+
- QString dir = qApp->applicationDirPath() + "/translations";
+ QString dir = qApp->applicationDirPath() + "/../share/translations";
- #endif
-
QString filename = "monero-core_" + language;
-
+
+ qDebug("%s: loading translation file '%s' from '%s'",
diff --git a/pkgs/applications/altcoins/monero/default.nix b/pkgs/applications/altcoins/monero/default.nix
index cbba1ecba14..a4a884707a9 100644
--- a/pkgs/applications/altcoins/monero/default.nix
+++ b/pkgs/applications/altcoins/monero/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fetchpatch
+{ stdenv, fetchgit
, cmake, pkgconfig, git
, boost, miniupnpc, openssl, unbound, cppzmq
, zeromq, pcsclite, readline
@@ -11,25 +11,16 @@ with stdenv.lib;
stdenv.mkDerivation rec {
name = "monero-${version}";
- version = "0.12.0.0";
+ version = "0.12.3.0";
- src = fetchFromGitHub {
- owner = "monero-project";
- repo = "monero";
+ src = fetchgit {
+ url = "https://github.com/monero-project/monero.git";
rev = "v${version}";
- sha256 = "1lc9mkrl1m8mdbvj88y8y5rv44vinxf7dyv221ndmw5c5gs5zfgk";
+ sha256 = "1609k1qn9xx37a92ai36rajds9cmdjlkqyka95hks5xjr3l5ca8i";
};
nativeBuildInputs = [ cmake pkgconfig git ];
- patches = [
- # fix daemon crash, remove with 0.12.1.0 update
- (fetchpatch {
- url = "https://github.com/monero-project/monero/commit/08343ab.diff";
- sha256 = "0f1snrl2mk2czwk1ysympzr8ismjx39fcqgy13276vcmw0cfqi83";
- })
- ];
-
buildInputs = [
boost miniupnpc openssl unbound
cppzmq zeromq pcsclite readline
@@ -39,7 +30,7 @@ stdenv.mkDerivation rec {
"-DCMAKE_BUILD_TYPE=Release"
"-DBUILD_GUI_DEPS=ON"
"-DReadline_ROOT_DIR=${readline.dev}"
- ];
+ ] ++ optional stdenv.isDarwin "-DBoost_USE_MULTITHREADED=OFF";
hardeningDisable = [ "fortify" ];
diff --git a/pkgs/applications/audio/puredata/default.nix b/pkgs/applications/audio/puredata/default.nix
index 6aca7e9ce22..354b7c4b6c7 100644
--- a/pkgs/applications/audio/puredata/default.nix
+++ b/pkgs/applications/audio/puredata/default.nix
@@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
name = "puredata-${version}";
- version = "0.48-0";
+ version = "0.48-2";
src = fetchurl {
url = "http://msp.ucsd.edu/Software/pd-${version}.src.tar.gz";
- sha256 = "0wy9kl2v00fl27x4mfzhbca415hpaisp6ls8a6mkl01qbw20krny";
+ sha256 = "0p86hncgzkrl437v2wch2fg9iyn6mnrgbn811sh9pwmrjj2f06v8";
};
nativeBuildInputs = [ autoreconfHook gettext makeWrapper ];
diff --git a/pkgs/applications/audio/sound-juicer/default.nix b/pkgs/applications/audio/sound-juicer/default.nix
index e38f38dad78..f402721e180 100644
--- a/pkgs/applications/audio/sound-juicer/default.nix
+++ b/pkgs/applications/audio/sound-juicer/default.nix
@@ -22,6 +22,8 @@ in stdenv.mkDerivation rec{
gst_all_1.gst-libav
];
+ NIX_CFLAGS_COMPILE="-Wno-error=format-nonliteral";
+
passthru = {
updateScript = gnome3.updateScript {
packageName = pname;
diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix
index 1639ab34b6c..81cda4edaed 100644
--- a/pkgs/applications/audio/spotify/default.nix
+++ b/pkgs/applications/audio/spotify/default.nix
@@ -5,14 +5,14 @@
let
# TO UPDATE: just execute the ./update.sh script (won't do anything if there is no update)
# "rev" decides what is actually being downloaded
- version = "1.0.88.353.g15c26ea1-14";
+ version = "1.0.83.316.ge96b6e67-5";
# To get the latest stable revision:
# curl -H 'X-Ubuntu-Series: 16' 'https://api.snapcraft.io/api/v1/snaps/details/spotify?channel=stable' | jq '.download_url,.version,.last_updated'
# To get general information:
# curl -H 'Snap-Device-Series: 16' 'https://api.snapcraft.io/v2/snaps/info/spotify' | jq '.'
- # More exapmles of api usage:
+ # More examples of api usage:
# https://github.com/canonical-websites/snapcraft.io/blob/master/webapp/publisher/snaps/views.py
- rev = "19";
+ rev = "17";
deps = [
@@ -65,7 +65,7 @@ stdenv.mkDerivation {
# https://community.spotify.com/t5/Desktop-Linux/Redistribute-Spotify-on-Linux-Distributions/td-p/1695334
src = fetchurl {
url = "https://api.snapcraft.io/api/v1/snaps/download/pOBIoZ2LrCB3rDohMxoYGnbN14EHOgD7_${rev}.snap";
- sha512 = "3a068cbe3c1fca84ae67e28830216f993aa459947517956897c3b3f63063005c9db646960e85185b149747ffc302060c208a7f9968ea69d50a3496067089f3db";
+ sha512 = "19bbr4142shsl4qrikf48vq7kyrd4k4jbsada13qxicxps46a9bx51vjm2hkijqv739c1gdkgzwx7llyk95z26lhrz53shm2n5ij8xi";
};
buildInputs = [ squashfsTools makeWrapper ];
diff --git a/pkgs/applications/editors/kakoune/default.nix b/pkgs/applications/editors/kakoune/default.nix
index ad408081e1f..e50625fa0e8 100644
--- a/pkgs/applications/editors/kakoune/default.nix
+++ b/pkgs/applications/editors/kakoune/default.nix
@@ -4,12 +4,12 @@ with stdenv.lib;
stdenv.mkDerivation rec {
name = "kakoune-unstable-${version}";
- version = "2018-08-05";
+ version = "2018.09.04";
src = fetchFromGitHub {
repo = "kakoune";
owner = "mawww";
- rev = "ae75032936ed9ffa2bf14589fef115d3d684a7c6";
- sha256 = "1qm6i8vzr4wjxxdvhr54pan0ysxq1sn880bz8p2w9y6qa91yd3m3";
+ rev = "v${version}";
+ sha256 = "08v55hh7whm6hx6a047gszh0h5g35k3r8r52aggv7r2ybzrrw6w1";
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ ncurses asciidoc docbook_xsl libxslt ];
diff --git a/pkgs/applications/editors/nano/nanorc/default.nix b/pkgs/applications/editors/nano/nanorc/default.nix
new file mode 100644
index 00000000000..fb30036e146
--- /dev/null
+++ b/pkgs/applications/editors/nano/nanorc/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+ name = "nanorc-${version}";
+ version = "2018-09-05";
+
+ src = fetchFromGitHub {
+ owner = "scopatz";
+ repo = "nanorc";
+ rev = "1e589cb729d24fba470228d429e6dde07973d597";
+ sha256 = "136yxr38lzrfv8bar0c6c56rh54q9s94zpwa19f425crh44drppl";
+ };
+
+ dontBuild = true;
+
+ installPhase = ''
+ mkdir -p $out/share
+
+ install *.nanorc $out/share/
+ '';
+
+ meta = {
+ description = "Improved Nano Syntax Highlighting Files";
+ homepage = https://github.com/scopatz/nanorc;
+ license = stdenv.lib.licenses.gpl3;
+ maintainers = with stdenv.lib.maintainers; [ nequissimus ];
+ platforms = stdenv.lib.platforms.all;
+ };
+}
diff --git a/pkgs/applications/editors/neovim/wrapper.nix b/pkgs/applications/editors/neovim/wrapper.nix
index 17cf49521f1..568043f9668 100644
--- a/pkgs/applications/editors/neovim/wrapper.nix
+++ b/pkgs/applications/editors/neovim/wrapper.nix
@@ -30,7 +30,7 @@ let
/* for compatibility with passing extraPythonPackages as a list; added 2018-07-11 */
compatFun = funOrList: (if builtins.isList funOrList then
- (_: builtins.trace "passing a list as extraPythonPackages to the neovim wrapper is deprecated, pass a function as to python.withPackages instead" funOrList)
+ (_: lib.warn "passing a list as extraPythonPackages to the neovim wrapper is deprecated, pass a function as to python.withPackages instead" funOrList)
else funOrList);
extraPythonPackagesFun = compatFun extraPythonPackages;
extraPython3PackagesFun = compatFun extraPython3Packages;
diff --git a/pkgs/applications/editors/okteta/default.nix b/pkgs/applications/editors/okteta/default.nix
index efe728f6849..a2337483bf1 100644
--- a/pkgs/applications/editors/okteta/default.nix
+++ b/pkgs/applications/editors/okteta/default.nix
@@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
name = "okteta-${version}";
- version = "0.25.2";
+ version = "0.25.3";
src = fetchurl {
url = "mirror://kde/stable/okteta/${version}/src/${name}.tar.xz";
- sha256 = "00mw8gdqvn6vn6ir6kqnp7xi3lpn6iyp4f5aknxwq6mdcxgjmh1p";
+ sha256 = "0mm6pmk7k9c581b12a3wl0ayhadvyymfzmscy9x32b391qy9inai";
};
nativeBuildInputs = [ qtscript extra-cmake-modules kdoctools ];
diff --git a/pkgs/applications/editors/rednotebook/default.nix b/pkgs/applications/editors/rednotebook/default.nix
index 9456ea3150a..8b37f0b74d5 100644
--- a/pkgs/applications/editors/rednotebook/default.nix
+++ b/pkgs/applications/editors/rednotebook/default.nix
@@ -5,13 +5,13 @@
buildPythonApplication rec {
pname = "rednotebook";
- version = "2.3";
+ version = "2.6.1";
src = fetchFromGitHub {
owner = "jendrikseipp";
repo = "rednotebook";
rev = "v${version}";
- sha256 = "0zkfid104hcsf20r6829v11wxdghqkd3j1zbgyvd1s7q4nxjn5lj";
+ sha256 = "1x6acx0hagsawx84cv55qz17p8qjpq1v1zaf8rmm6ifsslsxw91h";
};
# We have not packaged tests.
diff --git a/pkgs/applications/graphics/kipi-plugins/default.nix b/pkgs/applications/graphics/kipi-plugins/default.nix
index 48a94a5253d..f7faba7c41a 100644
--- a/pkgs/applications/graphics/kipi-plugins/default.nix
+++ b/pkgs/applications/graphics/kipi-plugins/default.nix
@@ -7,11 +7,11 @@
stdenv.mkDerivation rec {
name = "kipi-plugins-${version}";
- version = "5.2.0";
+ version = "5.9.0";
src = fetchurl {
url = "http://download.kde.org/stable/digikam/digikam-${version}.tar.xz";
- sha256 = "0q4j7iv20cxgfsr14qwzx05wbp2zkgc7cg2pi7ibcnwba70ky96g";
+ sha256 = "06qdalf2mwx2f43p3bljy3vn5bk8n3x539kha6ky2vzxvkp343b6";
};
prePatch = ''
diff --git a/pkgs/applications/misc/josm/default.nix b/pkgs/applications/misc/josm/default.nix
index e753c5ded95..fc10bc852e5 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 = "14066";
+ version = "14178";
src = fetchurl {
url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar";
- sha256 = "06mhaz5vr19ydqc5irhgcbl0s8fifwvaq60iz2nsnlxb1pw89xia";
+ sha256 = "08an4s8vbcd8vyinnvd7cxmgnrsy47j78a94nk6vq244gp7v5n0r";
};
buildInputs = [ jre10 makeWrapper ];
diff --git a/pkgs/applications/misc/khal/default.nix b/pkgs/applications/misc/khal/default.nix
index ede85aeada5..f9c929c21bf 100644
--- a/pkgs/applications/misc/khal/default.nix
+++ b/pkgs/applications/misc/khal/default.nix
@@ -46,6 +46,10 @@ in with python.pkgs; buildPythonApplication rec {
nativeBuildInputs = [ setuptools_scm pkgs.glibcLocales ];
checkInputs = [ pytest ];
+ postInstall = ''
+ install -D misc/__khal $out/share/zsh/site-functions/__khal
+ '';
+
checkPhase = ''
py.test
'';
diff --git a/pkgs/applications/misc/kitty/default.nix b/pkgs/applications/misc/kitty/default.nix
index c34167b4ddb..70b580cd0f8 100644
--- a/pkgs/applications/misc/kitty/default.nix
+++ b/pkgs/applications/misc/kitty/default.nix
@@ -2,12 +2,12 @@
fontconfig, pkgconfig, ncurses, imagemagick, xsel,
libstartup_notification, libX11, libXrandr, libXinerama, libXcursor,
libxkbcommon, libXi, libXext, wayland-protocols, wayland,
- which
+ which, dbus
}:
with python3Packages;
buildPythonApplication rec {
- version = "0.11.3";
+ version = "0.12.0";
name = "kitty-${version}";
format = "other";
@@ -15,13 +15,13 @@ buildPythonApplication rec {
owner = "kovidgoyal";
repo = "kitty";
rev = "v${version}";
- sha256 = "1fql8ayxvip8hgq9gy0dhqfvngv13gh5bf71vnc3agd80kzq1n73";
+ sha256 = "1n2pi9pc903inls1fvz257q7wpif76rj394qkgq7pixpisijdyjm";
};
buildInputs = [
fontconfig glfw ncurses libunistring harfbuzz libX11
libXrandr libXinerama libXcursor libxkbcommon libXi libXext
- wayland-protocols wayland
+ wayland-protocols wayland dbus
];
nativeBuildInputs = [ pkgconfig which sphinx ];
diff --git a/pkgs/applications/misc/lilyterm/default.nix b/pkgs/applications/misc/lilyterm/default.nix
index 72cb1e85802..948ae7b14a1 100644
--- a/pkgs/applications/misc/lilyterm/default.nix
+++ b/pkgs/applications/misc/lilyterm/default.nix
@@ -1,13 +1,12 @@
-{ stdenv, fetchurl, fetchFromGitHub
+{ stdenv, lib, fetchurl, fetchFromGitHub
, pkgconfig
, autoconf, automake, intltool, gettext
, gtk, vte
-# "stable" or "git"
, flavour ? "stable"
}:
-assert flavour == "stable" || flavour == "git";
+assert lib.assertOneOf "flavour" flavour [ "stable" "git" ];
let
stuff =
diff --git a/pkgs/applications/misc/mediainfo-gui/default.nix b/pkgs/applications/misc/mediainfo-gui/default.nix
index b6ec3305cb3..3ff07ba2008 100644
--- a/pkgs/applications/misc/mediainfo-gui/default.nix
+++ b/pkgs/applications/misc/mediainfo-gui/default.nix
@@ -2,11 +2,11 @@
, desktop-file-utils, libSM, imagemagick }:
stdenv.mkDerivation rec {
- version = "18.05";
+ version = "18.08";
name = "mediainfo-gui-${version}";
src = fetchurl {
url = "https://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz";
- sha256 = "0rgsfplisf729n1j3fyg82wpw88aahisrddn5wq9yx8hz6m96h6r";
+ sha256 = "0l4bhrgwfn3da6cr0jz5vs17sk7k0bc26nk7hymv04xifns5999n";
};
nativeBuildInputs = [ autoreconfHook pkgconfig ];
diff --git a/pkgs/applications/misc/mediainfo/default.nix b/pkgs/applications/misc/mediainfo/default.nix
index 5b2f8125f72..d222ad1e53e 100644
--- a/pkgs/applications/misc/mediainfo/default.nix
+++ b/pkgs/applications/misc/mediainfo/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, autoreconfHook, pkgconfig, libzen, libmediainfo, zlib }:
stdenv.mkDerivation rec {
- version = "18.05";
+ version = "18.08";
name = "mediainfo-${version}";
src = fetchurl {
url = "https://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz";
- sha256 = "0rgsfplisf729n1j3fyg82wpw88aahisrddn5wq9yx8hz6m96h6r";
+ sha256 = "0l4bhrgwfn3da6cr0jz5vs17sk7k0bc26nk7hymv04xifns5999n";
};
nativeBuildInputs = [ autoreconfHook pkgconfig ];
diff --git a/pkgs/applications/misc/qmapshack/default.nix b/pkgs/applications/misc/qmapshack/default.nix
index 3b9e76aee4b..a2c8c75dc24 100644
--- a/pkgs/applications/misc/qmapshack/default.nix
+++ b/pkgs/applications/misc/qmapshack/default.nix
@@ -1,17 +1,17 @@
-{ stdenv, fetchurl, cmake, qtscript, qtwebkit, gdal, proj, routino, quazip }:
+{ stdenv, fetchurl, cmake, qtscript, qtwebengine, gdal, proj, routino, quazip }:
stdenv.mkDerivation rec {
name = "qmapshack-${version}";
- version = "1.11.1";
+ version = "1.12.0";
src = fetchurl {
url = "https://bitbucket.org/maproom/qmapshack/downloads/${name}.tar.gz";
- sha256 = "0yqilfldmfw8m18jbkffv4ar1px6kjs0zlgb216bnhahcr1y8r9y";
+ sha256 = "0d5p60kq9pa2hfql4nr8p42n88lr42jrsryrsllvaj45b8b6kvih";
};
nativeBuildInputs = [ cmake ];
- buildInputs = [ qtscript qtwebkit gdal proj routino quazip ];
+ buildInputs = [ qtscript qtwebengine gdal proj routino quazip ];
cmakeFlags = [
"-DROUTINO_XML_PATH=${routino}/share/routino"
diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix
index ebc700a7f37..6b9f7225c84 100644
--- a/pkgs/applications/networking/browsers/chromium/common.nix
+++ b/pkgs/applications/networking/browsers/chromium/common.nix
@@ -1,4 +1,4 @@
-{ stdenv, ninja, which, nodejs, fetchurl, fetchpatch, gnutar
+{ stdenv, gn, ninja, which, nodejs, fetchurl, fetchpatch, gnutar
# default dependencies
, bzip2, flac, speex, libopus
@@ -139,11 +139,6 @@ let
# (gentooPatch "" "0000000000000000000000000000000000000000000000000000000000000000")
./patches/fix-freetype.patch
./patches/nix_plugin_paths_68.patch
- ] ++ optionals (versionRange "68" "69") [
- ./patches/remove-webp-include-68.patch
- (githubPatch "4d10424f9e2a06978cdd6cdf5403fcaef18e49fc" "11la1jycmr5b5rw89mzcdwznmd2qh28sghvz9klr1qhmsmw1vzjc")
- (githubPatch "56cb5f7da1025f6db869e840ed34d3b98b9ab899" "04mp5r1yvdvdx6m12g3lw3z51bzh7m3gr73mhblkn4wxdbvi3dcs")
- ] ++ optionals (versionAtLeast version "69") [
./patches/remove-webp-include-69.patch
] ++ optional enableWideVine ./patches/widevine.patch;
@@ -243,15 +238,11 @@ let
configurePhase = ''
runHook preConfigure
- # Build gn
- python tools/gn/bootstrap/bootstrap.py -v -s --no-clean
- PATH="$PWD/out/Release:$PATH"
-
# This is to ensure expansion of $out.
libExecPath="${libExecPath}"
python build/linux/unbundle/replace_gn_files.py \
--system-libraries ${toString gnSystemLibraries}
- gn gen --args=${escapeShellArg gnFlags} out/Release | tee gn-gen-outputs.txt
+ ${gn}/bin/gn gen --args=${escapeShellArg gnFlags} out/Release | tee gn-gen-outputs.txt
# Fail if `gn gen` contains a WARNING.
grep -o WARNING gn-gen-outputs.txt && echo "Found gn WARNING, exiting nix build" && exit 1
diff --git a/pkgs/applications/networking/browsers/chromium/patches/remove-webp-include-68.patch b/pkgs/applications/networking/browsers/chromium/patches/remove-webp-include-68.patch
deleted file mode 100644
index 1995bf1fa8f..00000000000
--- a/pkgs/applications/networking/browsers/chromium/patches/remove-webp-include-68.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/third_party/blink/renderer/platform/image-encoders/image_encoder.h
-+++ b/third_party/blink/renderer/platform/image-encoders/image_encoder.h
-@@ -8,7 +8,7 @@
- #include "third_party/blink/renderer/platform/platform_export.h"
- #include "third_party/blink/renderer/platform/wtf/vector.h"
- #include "third_party/libjpeg/jpeglib.h" // for JPEG_MAX_DIMENSION
--#include "third_party/libwebp/src/webp/encode.h" // for WEBP_MAX_DIMENSION
-+#define WEBP_MAX_DIMENSION 16383
- #include "third_party/skia/include/core/SkStream.h"
- #include "third_party/skia/include/encode/SkJpegEncoder.h"
- #include "third_party/skia/include/encode/SkPngEncoder.h"
-
diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix
index 89b6a7ce312..ebf73012907 100644
--- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix
+++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix
@@ -1,18 +1,18 @@
# This file is autogenerated from update.sh in the same directory.
{
beta = {
- sha256 = "0w5k1446j45796vj8p6kv5cdrkrxyr7rh8d8vavplfldbvg36bdw";
- sha256bin64 = "0a7gmbcps3b85rhwgrvg41m9db2n3igwr4hncm7kcqnq5hr60v8s";
- version = "69.0.3497.32";
+ sha256 = "0i3iz6c05ykqxbq58sx954nky0gd0schl7ik2r56p3jqsk8cfnhn";
+ sha256bin64 = "03k5y1nyzx26mxwxmdijkl2kj49vm5vhbxhakfxxjg3r1v0rsqrs";
+ version = "69.0.3497.81";
};
dev = {
- sha256 = "15gk2jbjv3iy4hg4xm1f66x5jqfqh9f98wfzrcsd5ix3ki3f9g3c";
- sha256bin64 = "1lir6q31dnjsbrz99bfx74r5j6f0c1a443ky1k0idbx6ysvr8nnm";
- version = "70.0.3521.2";
+ sha256 = "1lx6dfd6w675b4kyrci8ikc8rfmjc1aqmm7bimxp3h4p97j5wml1";
+ sha256bin64 = "0fsxj9h25glp3akw0x2rc488w5zr5v5yvl6ry7fy8w70fqgynffj";
+ version = "70.0.3538.9";
};
stable = {
- sha256 = "1676y2axl5ihvv8jid2i9wp4i4awxzij5nwvd5zx98506l3088bh";
- sha256bin64 = "0d352maw1630g0hns3c0g0n95bp5iqh7nzs8bnv48kxz87snmpdj";
- version = "68.0.3440.106";
+ sha256 = "0i3iz6c05ykqxbq58sx954nky0gd0schl7ik2r56p3jqsk8cfnhn";
+ sha256bin64 = "1f3shb85jynxq37vjxxkkxrjayqgvpss1zws5i28x6i9nygfzay7";
+ version = "69.0.3497.81";
};
}
diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
index 13808fca99f..594cf175e9e 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
@@ -1,985 +1,995 @@
{
- version = "61.0.2";
+ version = "62.0";
sources = [
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/ach/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/ach/firefox-62.0.tar.bz2";
locale = "ach";
arch = "linux-x86_64";
- sha512 = "572696944414358a50dcf8e647f22f4d3172bf5ac846cd29bcb4baeb0ac5a351f361632ee87dacc1214633848f9970f93cbb25a6e9cfbd9ee796e30e06f34715";
+ sha512 = "68a0802cccd72ffd36bc9188fb96b819b6357b889630173294f92af4dcf719389d678232b986ff6aeb258d2cd149d670d70c2bc90309dc61fb359b1d3011cc6a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/af/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/af/firefox-62.0.tar.bz2";
locale = "af";
arch = "linux-x86_64";
- sha512 = "dc4b22a8df99c3519f3a8001d0bdbcfdf4fc5d4dd13d18bd15892fb29e928126d46e2ccb9b512dca0c5395852a3c918a5aacd2b9a7b7f2cdb982052e915d5413";
+ sha512 = "afdb463bc4bb5f0f3ba95a0af9430d5407a707b7cdd181c44ba0d343230d75e16a3078bc1f412dce8248991b8e752480be885355e394c1e4a4465c7c1929075e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/an/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/an/firefox-62.0.tar.bz2";
locale = "an";
arch = "linux-x86_64";
- sha512 = "2d57784a18278bac69c08e81fafbdc3530d17a112d3f1e7d407e2590935c87058641498c74300950d3f151bf5fd67065133d91c83e1e500c72b60ebc91a4572d";
+ sha512 = "c54b5365a97c44559aeac1c50a5d22250eabb94180987e3745bc875e7f2d7a843fd1282946cf5f27e53f4e0e6958a00376e6f761333e9bd5fd9ae7f6c081e1a0";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/ar/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/ar/firefox-62.0.tar.bz2";
locale = "ar";
arch = "linux-x86_64";
- sha512 = "e397f8d276c115105afcbab6fb71afd7bcc93778e79ec86a4274e10a6a039ad3107cbaabc9dd4bd197ce6be7add3cc0af954f029c179a6972ad2ba15ff2e3eb9";
+ sha512 = "08d5c5aefa22408c15a44646ef1b82ec3100a8bd69beb68a1d34029d2b0b554e110092ea5ee905bd866393cf506cd658591bba2e6f670943b21187015d99a836";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/as/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/as/firefox-62.0.tar.bz2";
locale = "as";
arch = "linux-x86_64";
- sha512 = "9869e76e004c1e77d976f01f9a4cafe29c253ad3c85b1119d67a65c784b5f65dd7a4927ccd535ee80fd63a6a47127e614478effbd0455a227e200ca31c846acb";
+ sha512 = "c403ca739506adc934e3453bff0e282ed514580895dcab70d41ac92499feabaa0d811a821b4441b988a3c12320735794d891620e06c8f081f13882f3bb6a56e8";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/ast/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/ast/firefox-62.0.tar.bz2";
locale = "ast";
arch = "linux-x86_64";
- sha512 = "5b298cce253df9c8a072fdc93df894fdb4218c720ded3260f282c711270086104eca08e2d5afe1be4960beb274017eb4e0ae7313ceb5d6e596d0591f026f78fc";
+ sha512 = "8d0e1c648c9eb8ddf8987360be83238eb6daf578f090687071ad5a63ff76028ebb4a988115a8ff9f7c40dc3522f06b4f79626f2ec8371040c76501457b93bcc6";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/az/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/az/firefox-62.0.tar.bz2";
locale = "az";
arch = "linux-x86_64";
- sha512 = "cd8df2a19e10d5445ac0970814ad245e25f6ea695ec9590344c1a4e261b6fd7d15534028f6a8abf1943fb97f0e127ed55774e2cc2bf7cf85be525503bbb69f1e";
+ sha512 = "2cc58aa3833572ae3a97e0d2b70caf19f5429d360da8d3587399a3ef71b48bd1565b0a6eb560c032c45984930e74ad072ca6806686a18cbd7a0ee24805524a64";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/be/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/be/firefox-62.0.tar.bz2";
locale = "be";
arch = "linux-x86_64";
- sha512 = "94947ee7b7477b467016cd21daa8134bf28ab289ea29c0905e04291b7560da895124be2ab7403d2b9874291b7e33f5a92d36f9c0ed9d58ccc3306ecd7723305c";
+ sha512 = "fa196010cf483c3f8a4bf63934cb54f543fd00bf8cee45d76aac29675a2b95757f687f8584e7f9122fa1e82b007aa13ef06f0c8fed7dcdea059223f3607db0ed";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/bg/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/bg/firefox-62.0.tar.bz2";
locale = "bg";
arch = "linux-x86_64";
- sha512 = "9b0bce62c85282c79708245fa792207dccd7bf939ebc23ddb2e6bb7bc3f6fdbfdeecf69d1ba599b2ec8d10fe2d79bab5dd229cf9fa7b79e076797267df39c54b";
+ sha512 = "e0f107ab8248ee3e1bdb30ed081e415f03dba9068599f9596706dc4fb907be7737a9f2378e347aeedd667f2526a5b5753c4f35b004da6db6dfc9ca1593e9c91e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/bn-BD/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/bn-BD/firefox-62.0.tar.bz2";
locale = "bn-BD";
arch = "linux-x86_64";
- sha512 = "4de95899462eafed03464fd054b7ee12cf53d004fbcb58ad18bd462e57f5c50c31d3b50f689a7d54f973228a2877e6c77c47740280daf7d6db4f7ba5988b9484";
+ sha512 = "794d93fa5bc61186b3cc1d7866a13d155420d6f829e9b20377c8bd8ed66418b92eac08e843170893a23249fefd7fb4c5a93df89fc9249b8de00ad803b9aad0ab";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/bn-IN/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/bn-IN/firefox-62.0.tar.bz2";
locale = "bn-IN";
arch = "linux-x86_64";
- sha512 = "2ecbf2ae7d1296dcfd6e2268dbc27060ce07bb4b3d9d62f6bf27fc8874f114dfcca73672adb4d411d2c1eca7ffac22f7832bc5cdad12a492c3bc4406e3a6746a";
+ sha512 = "1ba17cf852e267f1adf9192d0081e03b7d96f4a23cb83ff1a67f31d7340b234037a6def0c821fb4a872fd011999b14b464a3041d308cf5135382c2164f9832c8";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/br/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/br/firefox-62.0.tar.bz2";
locale = "br";
arch = "linux-x86_64";
- sha512 = "a92abcb1aaec11ae3b0eee75b5b5610157f8ca64627a20018925431ac09cc4295d14357e63ea0fa2b66bb415039c659f53292b8133558d591a16cbb5772f875f";
+ sha512 = "7ff933244cabb95fbdad1a64ae900f6fd694dacf1d76621865b4a2066624c31f0686c4dff53add7523749d6f5befe6ec7bbf0160e426e1a02457f8d3d5e15016";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/bs/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/bs/firefox-62.0.tar.bz2";
locale = "bs";
arch = "linux-x86_64";
- sha512 = "15dda8914e02198a9b6efdf0ba9dd4f37e41ec7c6674b8b32189ccc368ab6ee671e401cd668c5ed57157634220c176be543c277342e708baf7b0110cbbb4fe64";
+ sha512 = "dfd9a7b8f2f355f274dca7941349512339aeaa9da4412681a4e933cf0e1e9396d57d60887fca59c341e70496dd7073647794fbb4c8bcd1abd7b5062ee6809b53";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/ca/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/ca/firefox-62.0.tar.bz2";
locale = "ca";
arch = "linux-x86_64";
- sha512 = "230591cd45dd9d3644313b96ea304d33e9c87d6968c37b73ac3c701132bf13a3869672317b135f31d8082f39298c978c07d614f5055555ba9079afc6e17a489e";
+ sha512 = "3785649ca22ab7882f751d0c2223589b7c8b5fa04bb0786ba5f64be405ba89a665244e7f4882d77a85569c46da9f6bc1d3fc95f0ff77e57f02cb8a7dc22f5b67";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/cak/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/cak/firefox-62.0.tar.bz2";
locale = "cak";
arch = "linux-x86_64";
- sha512 = "c622e622cc199b8a9946276afdf03f006403bd302d2c62a5076403e6764dfdcd121c1e15fc56d45bdb1751131326babdc9be96e6425fcab9e55d6c689e5959ca";
+ sha512 = "e367d02bf8c743f7a5c42b6ca19521813ba31f6a6525f4fbd4ecf418c9927a083d218ded1ae8b11084d4cc5707f97312b327a40735d638e1d3ea07056dce7070";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/cs/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/cs/firefox-62.0.tar.bz2";
locale = "cs";
arch = "linux-x86_64";
- sha512 = "8e4d452a75befcb6c2a6e7ed0b4b1aaa8f18d4d61302ddf6b8143e024352a060621c375742748db5981efecb8075268f56811702586189a116698a669408dee2";
+ sha512 = "cfa21baf935d6e325b6ea13d19796ae7adb51bfa6923f7f13e5138628f8064154bbfc5a4a0131a147383b2bf723e1abc46a79b698b2682602faa9a8f80b5e6cc";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/cy/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/cy/firefox-62.0.tar.bz2";
locale = "cy";
arch = "linux-x86_64";
- sha512 = "349f73f43be8dad527549ff158b267c62be7c0d828c2adcfc635e419ac9840076549a7a51396b306bc042d1d7697c8d6caea3bf0b4e3f42e7c0efbd5b8d92e1e";
+ sha512 = "0a9ad3a8ba02b863194fe4ba347be568fdb92bd72352251220f673349b77ebdb2b2c6e828e98c1c757fe3d4484783528e5f0129ae994a2f0226a17040a2f8c7a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/da/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/da/firefox-62.0.tar.bz2";
locale = "da";
arch = "linux-x86_64";
- sha512 = "187bec61e1218fa6c2fe79b3e80066a617ee3c26f83aa16b61a21e3fc76a64c2c821120f9206240642dd10175b6976c352b13a5b2e5514126a3840524fdd1de6";
+ sha512 = "21ce01d959f36084dacdcd52cd26440a67e724c79361ed1897371fe4b33a853c72fc4feec6fee446ef47c1ce29c4a88392266bfca08189f1d99127ca637b8be1";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/de/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/de/firefox-62.0.tar.bz2";
locale = "de";
arch = "linux-x86_64";
- sha512 = "8aaa8aeecf1a2dff922b785ed3a4cbf248454cf010ea9c188a4ac70f0550813944a8e9265c2edb13bdbdfbe20ec5a0dda3168d2dcd529d082bafcfaef6271913";
+ sha512 = "cae69bd2193db9888ed3a415ed7147dc3002c05029a6cf3e7a010259919dfb0f209055b20e259459f008b99317a215cf6962ab173fac0f1e57c86341571d0eae";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/dsb/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/dsb/firefox-62.0.tar.bz2";
locale = "dsb";
arch = "linux-x86_64";
- sha512 = "c821eae950e48de43580c9dd4af7fc609927e3fd27ea876fca909bb3319574663120688e442ba83acf1d273e1fd22a87d0cd934e68151edd9a8561015e58a47c";
+ sha512 = "4583f05b675973a2818b06baf771474b7bff9ec741c2e606cce13f6e4b153f92fadfb0c15d91c4a25d492a38fc3c48180cb6c7ea5e433aa774a9fffe26f4e593";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/el/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/el/firefox-62.0.tar.bz2";
locale = "el";
arch = "linux-x86_64";
- sha512 = "afa286bd1ac48a6007b6e5072bce0a26482a0eefdb00aee824de8c4dd06688d16731252933cb71b9f3bf6d30f951c6df68c2ede85733edc81facbb628118c72c";
+ sha512 = "4419885f9b6510edbf2797a047a08c97008731ce4fad19cda1fde4ab70b8912c9aa96df533f9b138d843303e549baa30ff9338bd9531b3044bdcc521cff14678";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/en-GB/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/en-CA/firefox-62.0.tar.bz2";
+ locale = "en-CA";
+ arch = "linux-x86_64";
+ sha512 = "86cf4dda9c21faea5d5031f423c7badb1876b225ad618fa8c1dd49803d65aec1032bedfded3278dc19d84c1f88688cd4ba31a27ad6f706ad55e9b407e3151f9a";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/en-GB/firefox-62.0.tar.bz2";
locale = "en-GB";
arch = "linux-x86_64";
- sha512 = "c2ca0c9a72503ac5817ed9ff3736b812005037c51534ef9a159b7914b974a356f3f1bc89d0669d05bde8dde124f2fcc3ff3a91cb412ec0329c2e6def875219fc";
+ sha512 = "278d00ec48c2d88d3aa5bedbc9443e82f367a2c9f8261f624eef42fcbfb83d74a3f35d6ad450ef3974ca8a19f7e654c93c40c1941264a2372fafdbb803c08f40";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/en-US/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/en-US/firefox-62.0.tar.bz2";
locale = "en-US";
arch = "linux-x86_64";
- sha512 = "9f32b33727e5877bfdeb186420a02f185896a2a5803565a811203d86e84d51ede06f27d63a88a482028c36b65ed92ac4c17196aa2069370d6cae09b74bf482a5";
+ sha512 = "f4dfc51d6c8f9ccac869691ea4efb0f5fd8257d661698dba4eb7cc9fb7d28314e00a09ec595d424186cc928c8a6f9f93af0efcb3651eaa4fa40f81cfda73770d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/en-ZA/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/en-ZA/firefox-62.0.tar.bz2";
locale = "en-ZA";
arch = "linux-x86_64";
- sha512 = "e41b7ea34f193bbcd892030b5feb2f117bb5f3f9dfbe69560ea64b7936bcdc47a55e878c645786999a2e52c4333c033320eb1ed9aace3481a9f37d87c9ae9ccb";
+ sha512 = "f6036fe984da3057e76d324c76a2cfb17903d73f3e6bc7884338bb0ef0f9f68ef69e94ee93331f81e17a8eacc40827263c74e5aeb9a70420c7cf0670a205c61c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/eo/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/eo/firefox-62.0.tar.bz2";
locale = "eo";
arch = "linux-x86_64";
- sha512 = "e0850feb028cf0644340d2842b054e49608cdc1afbb9487ee744f6fe1ce0662874f0f96de2da52de2e0abbe39d7ea430efc70392d555e7cbff7a46f9029ba9fd";
+ sha512 = "011a742e57cdc2134115ea294782716bdc49ac4d2d7b06bfed048f75d18a5780cb93a16cd0ec6b8017e6b8299a5b260015adfcb3f093883703ed9403768555f0";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/es-AR/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/es-AR/firefox-62.0.tar.bz2";
locale = "es-AR";
arch = "linux-x86_64";
- sha512 = "72bde05493e4c140f6022e24cccf0ca580ed3c423840d2631cb28ce8a20be92837f78cfaa3b09a324bbc0fcb064ced351fc66a0edf2c56d972f629aed6662dcb";
+ sha512 = "f86be240d21d47eda8bb04ff6b502ccee3c94afd6763239c5a79e094532facb8e8beefdf024c089d35ecffbd687febde5a4f10f362fd3c4d71bdabdc3ef1ce04";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/es-CL/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/es-CL/firefox-62.0.tar.bz2";
locale = "es-CL";
arch = "linux-x86_64";
- sha512 = "4bb298e184263edff9100e1e7f58cbbd405dbc73a265a5dc1d78e8cd25e538d34ef0994b6b5e79082fc12f1c0b2035c944e17eccaa7e1bd92eee8d27d8f50400";
+ sha512 = "e6be4bff771e5c64d35fdce320fcd80283c964e16fa938824adfa6dff9c69c721ee9184a1f37de86ac42f730ebc7b4c8355d151306e761bc96308868d6d349a9";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/es-ES/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/es-ES/firefox-62.0.tar.bz2";
locale = "es-ES";
arch = "linux-x86_64";
- sha512 = "13d7f54f7899eda53add9dc4a1bc27fd30e0caaa9c5a95d716c1ef8382c2317733cc7a71aba9aa4f2a024717eeb09be7fdd55dbf6183d1679e61e3b57964e61e";
+ sha512 = "32473438f9d39f53249faef39e467546db58b3dce905cc1f4c0250b5fcf5ff2eb671baef0ab179b27ea47bd85bc5684f9bd4846c785f2454076035711642a7d7";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/es-MX/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/es-MX/firefox-62.0.tar.bz2";
locale = "es-MX";
arch = "linux-x86_64";
- sha512 = "66c24cd9a80da6137a94bf9cf2bad4ad3ef0141bc10c8d92435f9d89e11712afc08018d7e1b4f17fe03e4ac62b2f6ed1cec638dc7d0726bf27453e1741a1ba06";
+ sha512 = "e81563bd3cc51241b129f084d4d9f5e8b7f34c1f5517f041bbf6992b50e0ad4fdf33fb36f0d1cc22d2bf9eb0bcbd0515a1b21b5cbb8d084cadd0f5d9d80c7b3d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/et/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/et/firefox-62.0.tar.bz2";
locale = "et";
arch = "linux-x86_64";
- sha512 = "a7a686b1e16b616a3aff8901148a2818cbbe2459851660a23610ddfb4b8109aac159fe80986744bdc4124a10ab160d2703b2e8f65def0c86977bfa3fcb3ab020";
+ sha512 = "5827c7dac8e12610e731e92128ed66f8f107c19de99937a730e7439b26dc404cf518145467cb702fb395d9cb3a0f4ad45c92484ffb053d88dc7ac858781f4ed0";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/eu/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/eu/firefox-62.0.tar.bz2";
locale = "eu";
arch = "linux-x86_64";
- sha512 = "0760621f5d053fb802a46151f6283fb7a0b7de5c22ba0a55ae0f3056b0d43cf16c6da79af8a2217a665825a840b9c83134128f455dfe6e83f473290e425ad396";
+ sha512 = "c59ad7413f47ac19e9cd3a267150066099f561a455913714a18afd1b0e284202364f009cbe0361f5941b96d57b43c3d7d778235c9b9123133f864e75479556da";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/fa/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/fa/firefox-62.0.tar.bz2";
locale = "fa";
arch = "linux-x86_64";
- sha512 = "29e8466e754900b63704206b5b650ea60aea841aebfa58187013a495a95dd32d939308253b0f856ef5e04d3ddf320c289e74cb03830a16374e9fe2c03214a1b4";
+ sha512 = "fc3a1caac599a418ab0ce2208fa921dd40912e80ff075bf7d90ef64379057e83332483c1a7a44dece95a38be523d0ea2f92a57b45c300f032b174dde4812e5f8";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/ff/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/ff/firefox-62.0.tar.bz2";
locale = "ff";
arch = "linux-x86_64";
- sha512 = "240232a8dd4556c5c4df872b60b3352176490b7afd4388c26322008c7dca489f48f679c21d148016965ea81d850eaffe9fb7887b97cbbbac955f9cc29f28b4f6";
+ sha512 = "629c2b79571980bfdbf9bece6760d1553cc002f91f26fe46d58d4fa5040f437b6a8b9b6ff41cdcb3d615c479c66a17d87d878fca65025070a31073165098ed26";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/fi/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/fi/firefox-62.0.tar.bz2";
locale = "fi";
arch = "linux-x86_64";
- sha512 = "63c7d4ede5e02c9d4b2e59234b57d4f539c0cd3666a053b127cc18d080900bcf488f8d3d7f2dfb98399a1cec5ec6780d86d93ad9dd2ce7612e84604481562a64";
+ sha512 = "4393019f9dec44bc62985d84f95585de0a26736a923f873b92d87f7d46d11f8f3e8af53812696ed4d312fad51c3bdd34026cd7ef933fd047f771441245b30213";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/fr/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/fr/firefox-62.0.tar.bz2";
locale = "fr";
arch = "linux-x86_64";
- sha512 = "3a4263e78c62faaab850c743660e633269dd9e625f03f94459b34ede41989cbaf498755fb8c2f507e4f4b88b633c29a3eae837ffce0572ee03afdf67c53d4ed1";
+ sha512 = "9d9afd43288fe6719b8d4f76c4542a26dd4b36376abcc8a0d8111c701bf397345451ccec5bc5ed1f2c2927549c62a429d4d97470d850d0c83ef8362c40531f0b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/fy-NL/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/fy-NL/firefox-62.0.tar.bz2";
locale = "fy-NL";
arch = "linux-x86_64";
- sha512 = "e8c7760f3f64b4c525bd0521cb66ed11bdd9142deee986fd6a5f6a322685633aa3539f819e3ec886884906998d37dd6401b77e4790a246cd098c47cd49f929d3";
+ sha512 = "12050decaa38a27ead08d67130d43ba36666728d3920cf40ad2dc0eb18de6a204e81dfff72cc0a33022b0d96097ec83fb36c88b463707f04669e5c907b8cac15";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/ga-IE/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/ga-IE/firefox-62.0.tar.bz2";
locale = "ga-IE";
arch = "linux-x86_64";
- sha512 = "8f59620f30767cd58babc163b803b2c8b174562e5a6a686c5a586d24db0da4c4ecf180c13673a6a434faee02c2b7ef746c1f10e45055d42327044a945925e514";
+ sha512 = "fb028d4b55cb5758eddb89a506b68d322c758d2e8ce01151a30678dd01c4ce625c9a051650a2e115705dbe02967f0db5894a4476d6460ff08313d4767dad9b7a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/gd/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/gd/firefox-62.0.tar.bz2";
locale = "gd";
arch = "linux-x86_64";
- sha512 = "ba496ad0daec76e2c6e4f3c2dbb8219d1f3234893acb09602e51b7bfab4ef84d9f49104a021b206ff528bb323e2255c97e92a6949b3949098e5863f48e9fefa7";
+ sha512 = "a1173104e4be1fdb6cf3a0c8c997075d40e5eb950dc2482107b5795adb2590575c1c79f50daca87227de6426f4ad9d756233f95a0ddd3aa6e949ab773d319db2";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/gl/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/gl/firefox-62.0.tar.bz2";
locale = "gl";
arch = "linux-x86_64";
- sha512 = "3ef33eda5d7a88fb6f67f91983ab2db11404f58686ecbe30dcbc27dd1358660b4c88ab8e678184cdd3fd4102f93120e0d0a4d75435812b047ec2bcb74cb52a83";
+ sha512 = "b6b46ec64e4386c9196d1f5362674667e46b5006b756cdc164e6c1c42ebff417c57cacceee949d2e9a5f55c76b82471ed9cfa01cbddd8ab74d6669c6870864d9";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/gn/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/gn/firefox-62.0.tar.bz2";
locale = "gn";
arch = "linux-x86_64";
- sha512 = "5e86c34b627b66872a7f07e30ee6285e61d041e69b0e2355eec142b23ceac8ea5ef7e257adfd1ae877b442f7171381cb013fddd7593d1b6e42f3a22e2267a5df";
+ sha512 = "3c35f52d34d57dfbfe43d8df6be4f04bc10c79b3b9e08949525a503952ebecb90e59d99565c44adf25addff6f713088bce3034513eea3108a37c02b0921e2f01";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/gu-IN/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/gu-IN/firefox-62.0.tar.bz2";
locale = "gu-IN";
arch = "linux-x86_64";
- sha512 = "72e43c4dbc3db08473d96d0686fa2df56f82ebdbee064a152ebb2a49cb4fa7a9a80135fa9b7106ffdb64d3342b38400de5351a3b225360d5a730f0f4991418f3";
+ sha512 = "0bdaed369d5318c59b929193686960ea2ed2173027c2cdb0384936d724585a9f8db058cd00d5a9d4b5ff8182a59c65066a9daf70e1e0b0d6013b3753e6f36adf";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/he/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/he/firefox-62.0.tar.bz2";
locale = "he";
arch = "linux-x86_64";
- sha512 = "d3b5a43aff6e76264eec6d211a5a9dd0b7fb89e41bbb265f31091ce3261f4a160e1ddaf59432bc3771bc5afacf1a3e12e42e0d08107727b0e8b5941ff29174c6";
+ sha512 = "07074488f2b83055b66300b357e8fd4cd94dea52c359227cf33908a0abdfcf1bb969dbc8d00454c42e5b83f35651aadfd8492507deb5a229d3e70b329753a86d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/hi-IN/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/hi-IN/firefox-62.0.tar.bz2";
locale = "hi-IN";
arch = "linux-x86_64";
- sha512 = "7b568bad470b3fa069b44bc0d69fbae51408ab44751a99fc36a7c220548d0200ec57d8362dbe1dca7370e587d5aadb45b5c9dc91e6d267f2421fe5a2260d29fa";
+ sha512 = "8e6b126bbd13b6ca9ecdf088a049e28328942c5153937198b851ddfdf1705211a03c6dbe71e95b3afd8f7d3889705d2c6a1bb0b135e34ba389830cff519dfbf3";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/hr/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/hr/firefox-62.0.tar.bz2";
locale = "hr";
arch = "linux-x86_64";
- sha512 = "c69df1a2226a967dbc0cbd3813ced6ae36b696389187489ec62b78b3180800175d3c33b07bc84c45112947348e160cbcd6db2e68d5e4b6f07e0a2f6adfc8fd2a";
+ sha512 = "d1c36d8cff63d070a827d24d3e95a823a1e302cd42a48ec50edd34ca3f76678f65897f060ff5365a677525e938baca6df512f27b0fa039eac6b78fcfd347b440";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/hsb/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/hsb/firefox-62.0.tar.bz2";
locale = "hsb";
arch = "linux-x86_64";
- sha512 = "080ad8f1bf263f96294e3e6178dd64d30a7fda50d229081b14e54bfaa183c6efeb0ba3aa66cd23c8541a622382e415a12e3e063cb3aace5619d3c8c212ea3078";
+ sha512 = "384393359093655a50c6052cf25ba413fcc02000685fc6e97f15e3668cd93421dfd3fe95d266bd4ae5e687105ce7a4c364aef92faec9a5c01f6f5336c134fa21";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/hu/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/hu/firefox-62.0.tar.bz2";
locale = "hu";
arch = "linux-x86_64";
- sha512 = "44f07968bb89c3c0e2d365f9cfd45d89b138a269cdff48542124a34f9d9ba9df5103e4613934c504f90b494fe20bbc6f71a12c210799e689e8f69405ea22e4a1";
+ sha512 = "05c76472230f7ca011fd5f936568b50cfb646ce7efdde65d1640f0d4ccb31196873a8e5aa32ca6bc796e80400d52ea4c191e334270c04ed92354b6744ff4cb50";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/hy-AM/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/hy-AM/firefox-62.0.tar.bz2";
locale = "hy-AM";
arch = "linux-x86_64";
- sha512 = "8d3ee8a030ad60ae2de062b21437e8d512ff3feaf614b91da71ff6af9d3994be79aab1753e3d46a94237d7e0a49eb670781c2567f96662b6057ee7172a0363c7";
+ sha512 = "cd3f20095f0c31e20fb383089141f1aa22ba8f8e7734370fd377ba900cb71ba1f2e76e196bf30cf3e3a8139bd667575d139b03969ca3ceb3f2e1c231e70431bb";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/ia/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/ia/firefox-62.0.tar.bz2";
locale = "ia";
arch = "linux-x86_64";
- sha512 = "448e543b5f7075e2e1b984c808dded1ee67dcefb600058635c87d0c226eb02aa8dd7f59c624ebec60c9c0b334f98607eba88e111f2b03a1aa579b74b1398511e";
+ sha512 = "834d2f397c3eefa2da5b184dcb4537ff28d26ade5ba985f916c4921473774d79a63cc97f3c72e49e19f37b4285a6efbc0bfd8ca78159b4a9e643027fbc4fc830";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/id/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/id/firefox-62.0.tar.bz2";
locale = "id";
arch = "linux-x86_64";
- sha512 = "a1f8eceb53485ac41a685f98b1e9dcf57ac094c0911ed8f9a862d4b3a5fa8072c16fa6a4cef3e06d15b07b3866397fcf9ead7b4b43143e0f5dccf93acb2f7676";
+ sha512 = "25b18c83fa9899f54a6fea9c617582c06b6ace769deb95e2ee6d1f3f4d32ce1654041605072096fb434c483b2f47913a35b4cdf392989db108f48ac9376d62ae";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/is/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/is/firefox-62.0.tar.bz2";
locale = "is";
arch = "linux-x86_64";
- sha512 = "43d6ff785394bdfb6c376588531a9fe043b18fe44ae83f481b11d71a2422b5d5022356cf960d92f55fb3d0ee103e6534bc0299a3d84e9ca7e6b3a5544e11ad45";
+ sha512 = "596a5ae84a71ee3a5f1ba4896b794cd103d2bce08a505faa38ea6df9cdc5380d7b97b2c4b3c80cb525007bc2f08dfa2bccc2634a135e653c79b913c1624f56ea";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/it/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/it/firefox-62.0.tar.bz2";
locale = "it";
arch = "linux-x86_64";
- sha512 = "460385b5854565f4ca33431c573ac355baddd7a35a2fbf631b3748b02102a749e56fb1128ec3e9f6b721b1123578060641bc3b783ece271a1708656626b10a13";
+ sha512 = "46bb6c5d0e575acdd510b72375677fefc3feba3c7ca2d1ad4a84f82ebfb3e7d14a9b419964850f6b640adad0970b105b3ae45bdee4a8a47200c5ac7f290c204e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/ja/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/ja/firefox-62.0.tar.bz2";
locale = "ja";
arch = "linux-x86_64";
- sha512 = "682430030d87391692170bc81d759d806f4667b66b4e3df84e836e65678f274720038d0556f5338d8eb18e281b64249e758b5265b3ce30e6f272ca9d84ac1496";
+ sha512 = "031a4aebd4d676f724c95812dab0fa4ca289fe4144417ffb28c6c4579580666bfa690737f544a3b09f5e07c7661200c334c4a336ea45700b6e8fbf5bbe5cd81c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/ka/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/ka/firefox-62.0.tar.bz2";
locale = "ka";
arch = "linux-x86_64";
- sha512 = "e8c9e6a61867efdb9d021aaa8f059e3ac9896444448b08b7d90f70fb2847d46d1950a24e6fa2db0b947cf3ec628bba1c230ee7d8d53a959928122018a9e5c7da";
+ sha512 = "14979e42ecff3c9005fd229a5516d36a72958ef810766a64963c2a6028c31e0717ca9079abe6103ece951c5ade140adbd35227dcb73c6101a145f1bc9e241721";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/kab/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/kab/firefox-62.0.tar.bz2";
locale = "kab";
arch = "linux-x86_64";
- sha512 = "17636e7157d6cf3ab73b7e36eeb7ad5bcc35e756fe6d369b98305c58b88208b5b11f673f52425363425d18c2a7fe79274a6e5babeb926adc9cea22afe3e55e5a";
+ sha512 = "16189c288a8807afc94b1d781a3afad833a52c16ad8a805787b7ba5603ed6988bffe34d9c9a98ea3db0eda25341ff24430ab68b59a1cf9724bd16246a52c1847";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/kk/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/kk/firefox-62.0.tar.bz2";
locale = "kk";
arch = "linux-x86_64";
- sha512 = "4eeb48f250c617ea8eefd99fb44159170311becc229f77ca014e801594260ea23ce46ae11e0526ad620dd830b857b73de8a3a90c18764ab2a8f71cebfecfa143";
+ sha512 = "c4a35a83e41df1149c1ab38d8f243753865a50d6d896b89499bee42db45c8237b9b8d6599fb3c932717977c5e460ce7adc6c93d561fa69a4704e1931fc11d21f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/km/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/km/firefox-62.0.tar.bz2";
locale = "km";
arch = "linux-x86_64";
- sha512 = "57a0bb58ced30d8743c30d288250328568758674e55127d51e99485f5c85e8b0b300aeeec4d34526f53d1d538189b75925eb907e3b5fb2d455e0546e179dfe04";
+ sha512 = "dadea116c3bce18f18f2bfb3652ee1d26b3cd11442b8e941565772d202d2a8a2e7d6277a1737f39c63947b2972ed8a84680b4c7dc351563c5ff11abeebd6205f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/kn/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/kn/firefox-62.0.tar.bz2";
locale = "kn";
arch = "linux-x86_64";
- sha512 = "c40e9f5906cf3968bc92932f45d4d0b712322e6efd9a5d1f3b48a7b94a162c6390142081a8a4fd2f0fb8737869723432eeb5a4b44c3161aa38a4d506bff8a3d8";
+ sha512 = "dd6109e92bdc9a7b3c8e08d9e104691a1ee449f9f915b5a4090ca471089ea000da34dda44883f10f72f4a5ca21078263663444a413ab1f1e7599f85f01f3700a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/ko/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/ko/firefox-62.0.tar.bz2";
locale = "ko";
arch = "linux-x86_64";
- sha512 = "3f6104ed9b2fb9f1b0e3f49b06aaaf513ecf7e31b417af90c11403bca7a3ad51a87b448fa0a2ae6a01462b57dfd21f90376421ca8cd9ea62b0e3a1c7462aa9db";
+ sha512 = "1dc4383f48dc1aedb80c373398a5539649397f1660664181c97ecfaa17eac2c503a976ae15b1e7607a83ed90e3b4f6c3b15d1bd60e13e22b8f071d91d373fab6";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/lij/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/lij/firefox-62.0.tar.bz2";
locale = "lij";
arch = "linux-x86_64";
- sha512 = "46c8eb64b30455ed97618d67215510b22acb6cf5946ba492c5938d879e656d983accfcd7ff2e93cebe7ea5a52e9fca348ebb9ba02e70ffb4196a9d9edf5abc51";
+ sha512 = "a26d5e50807efe3d4e3e01d10b0131ecbde0ef141f13310db4b01adcbac63d003db073ee24620745ab551ecba92965a5055e553b31fcfbd2df9af0a8913c7823";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/lt/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/lt/firefox-62.0.tar.bz2";
locale = "lt";
arch = "linux-x86_64";
- sha512 = "54470adc31bdab9745f72598d402fc961d6b407b6f8fabc8e0c6b785a5a5f3e9922e06a922688c6bd1ba43be81ed37bbab216fe2182bdd0b32befabc55fa1a48";
+ sha512 = "dd99282b5eea3a1e4518644acdd9bebdcb1532cde148f8c60fc83177fd39757e98e7fe3cc54c681305c699a085788a14cd44e93e5f10e11a6812afae10b2db8c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/lv/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/lv/firefox-62.0.tar.bz2";
locale = "lv";
arch = "linux-x86_64";
- sha512 = "376ded474c9c8a898bab54b66a4a9e9cb598dee114d9a156b9e7fb925250511e610d2e17a5decf4c2db44f227065cb2840265d6955364a1405060ff022b04d07";
+ sha512 = "4be6a61d0ccf424ced36aad978f6419d00afb3db93751c1cd9f6d1ec0c2db8530e77099efbdd8883b333fc2dcb315143088423c359debdc7da5808853aa99268";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/mai/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/mai/firefox-62.0.tar.bz2";
locale = "mai";
arch = "linux-x86_64";
- sha512 = "21643b1b723a42d81bb4476b16282d2550100278a221b5538d5666c8fd7f3e96f242393c4b175cf6431e82458e199fa80a51ef0f5bd6a9b691d0150bf1d4c8c6";
+ sha512 = "71aa1872d28a5f741df79e4f1490b110fd9bc13e9f6c4f2aea8d5028b434d02f0bff859613dcac258e0af7e8840b5a5b37fe80eb6d94d4712e83b96d971a46bf";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/mk/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/mk/firefox-62.0.tar.bz2";
locale = "mk";
arch = "linux-x86_64";
- sha512 = "452571329b805586a1218dd5fcd5b48f7f20fc914ba006441ec3642ef8653537b764a98b7916c0e440888d60d41b290826114c3a37083ec098fcd6c86a6adc15";
+ sha512 = "5b9e7e8f865675c0488fb9f7e965dc37b35ff53f0ab84c3cc0d37f9baab0084bf5981e4a1dc65557a02f83de7a92302c5cc72c7c25c20baa484fc6abc552c279";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/ml/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/ml/firefox-62.0.tar.bz2";
locale = "ml";
arch = "linux-x86_64";
- sha512 = "8d2c850525f9ffab96c4d02908440a9a5f4b6fffc49e5505d5eb33d35d3690fd7a81ef73aac810d0c52e0deca5b69dff9eb3f0eaf508b7c866442943f7cf9547";
+ sha512 = "d3ea17e668e021f9f002d775df1117c51e7b5bd92780b014bbdd869f93e50400e290a35e4f056c4ce8a235fc2851b630d24ddb3b8e6ccce7c21b65a94fe9816b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/mr/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/mr/firefox-62.0.tar.bz2";
locale = "mr";
arch = "linux-x86_64";
- sha512 = "1eedeaa3a2b6362c460e468b28bf7efc9bb5c960c766ec9f0e423834aaa67248c5bea0fe9b4fc0a8e62b0a40d8dfd1e7ff31adfebf6d1d6405daa02879977015";
+ sha512 = "9022898d857eae94054ed357cc5d06bae72ea38fe2f1efb6d09baa6b18d55cb8a75a5c0f2b312458366e2146b36d12407373e8862278ef348e588a893c068a17";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/ms/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/ms/firefox-62.0.tar.bz2";
locale = "ms";
arch = "linux-x86_64";
- sha512 = "fe2d5ae09b8921d366616eaee49c240ff529050e1b3f97c915d91c23dd67b22d78a75e14e2f192963f0fcb05eb812da2c5f68313599111d85c1abc0ac9dbb676";
+ sha512 = "c81f40e528ec7f141de902432f1f367023a39889794a46de8b271e9c4bebcfbb4b6124dc8e0b86c560214c493d650389829a04c3f4a4d121b3243ae66092a100";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/my/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/my/firefox-62.0.tar.bz2";
locale = "my";
arch = "linux-x86_64";
- sha512 = "631a6059d38a64c24e1f7d2b9a27aa2e405fe413471ac1e1d7ab337f614df9a1470a091de35904c39664d679c06eaddcd239c4a392c1e2ee548ce0be7fd5e416";
+ sha512 = "ba942bcab35045de32a2d7914bf7f953dd1f683ff0d142246035df830d4528b47f195b8a6b96c95b62e2d03e89215c938072ae23b19af41bbbbc40bed3d0212e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/nb-NO/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/nb-NO/firefox-62.0.tar.bz2";
locale = "nb-NO";
arch = "linux-x86_64";
- sha512 = "90d0c3c696ada86b47e9a6ce8aa9a8d0939eedf5746ccef79ae170a935e6b97906b187d7839af158a6008a9022cc50467febaf0617f3a3b1e8e21fd648805d13";
+ sha512 = "dc86c87a0e51105bd89ee579711aea9e61904f17afae27236ad12bf754831dd592f9ef938ab35d037b2da884aa301044eb71462a6c4ad26af97e9911e6356bd7";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/ne-NP/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/ne-NP/firefox-62.0.tar.bz2";
locale = "ne-NP";
arch = "linux-x86_64";
- sha512 = "b5e13e214cbea0d541aa8c29d53afa4ae952970a64bb5695be62ce19c829df901dba4c66cfd03d5d3a31f69041c9c700553b2689dcc4ac4ef254d155700bf5fc";
+ sha512 = "9bb1e18c015696ee9b17853a942537bf462101e687107771d34c4f62d3cb3f7d9debbbba9efdcf7acafd8a9f8c4f8c197b2df15c80b9c5a562ca1ee765867b3a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/nl/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/nl/firefox-62.0.tar.bz2";
locale = "nl";
arch = "linux-x86_64";
- sha512 = "44470b1cc4e95a05b4198ac3458125651de9bf9548dcfbcab5850c519fea01a3e8c6161e4a66271af68d7f1a1b37456d2ae1e51ca890307e6185a531c8cbfe74";
+ sha512 = "2fa2082a1a9cd71f0ae7019507055e6109292bdacc9ad4c860aa5ca9ea6896c37609a083981df309d2c53811674261147053ee6247908ec1ce7a2e030d320443";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/nn-NO/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/nn-NO/firefox-62.0.tar.bz2";
locale = "nn-NO";
arch = "linux-x86_64";
- sha512 = "5e49d30ed8fb64e367ea3f5b472baf0caff6c4b880d811cba5db969d21f8e5dd0d8ae4c01a151fd495eab1eef817b35b6a6e14441a860059b8f20453dbe86116";
+ sha512 = "4665302f9850b93c4cf178c3e2397e299716ccf92e4fbec9762892b17960f275c1167396de4073b899d4bdbd73bf06f87f10c36be7eda22934faaaa78925e8dc";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/oc/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/oc/firefox-62.0.tar.bz2";
locale = "oc";
arch = "linux-x86_64";
- sha512 = "bd75cdbb1bcbe24347f35b748ec5d62da6bb20fb0f58f17a348f8bbe19e92ec3d08da3148d41f56e0b42a8e49e1c1b70b40770c737e626239b5b538bac6d42e0";
+ sha512 = "d0b9a462b7157a1452a54e2fd3d9d0c38ab478eb6c6391350c8c7c9c581e425262f42d33fdd0ac9e50eb8cf77f0d8b71372cf15b079254c2294f5bb613337bd2";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/or/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/or/firefox-62.0.tar.bz2";
locale = "or";
arch = "linux-x86_64";
- sha512 = "e88f706c60e93b205484411bde177fd9b1ea921372669b5665ecebd795d7abcef5d2caee16a8605bf7f3f23e8d0ebf8036c156097318e7f8d3a22517e1fdf017";
+ sha512 = "555135a96975771bc9bef17601f1e2a2e308e07ba3681164512f2939da1892ac592a8f69264a365dfad36a473306d6d33712fc6868bc809ad5d5a3ef16eaf5e2";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/pa-IN/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/pa-IN/firefox-62.0.tar.bz2";
locale = "pa-IN";
arch = "linux-x86_64";
- sha512 = "81af24b8ab70e373339ed4fd7116e1c4f2bc7a2ee14b46e2af29860add01ab492ec692ee2653de81856d04a465860e4cfda0af4928a237bc0c8469c4899136d5";
+ sha512 = "a1d01ebf734b6357ecdddb3601b9062216c040966d633e282d61a28ecb830b5edb5152dff4c46a3cc273034fdc7110cc56858cbf31c6e90ada6efeb4130c510a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/pl/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/pl/firefox-62.0.tar.bz2";
locale = "pl";
arch = "linux-x86_64";
- sha512 = "f7b6b21ab27b58ab1bdaaac012dc035e7cb1226f46da43fa3de37c7e4fac73f5303dac02332510eae7a8bcec0172769b620acfbaab8b383a64404bb294d6df66";
+ sha512 = "701b496e7d20e8eff7484db6bf5e15f1bac769fc97f69de028a0dcbfe0f681d0a9031242b30367833f8cf1f8fbb1acd6d469a225152bf5b220a38b369c740381";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/pt-BR/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/pt-BR/firefox-62.0.tar.bz2";
locale = "pt-BR";
arch = "linux-x86_64";
- sha512 = "c17c0e7990b4192f10f7269a5c5c6c74cd6e6353b8649a0417c537197c5f853085948e9d0c50f08afbb16e242f3d8e9eaa1e9657bfb6c40075e5f4e640771d2f";
+ sha512 = "c4b3be3a9483ed76f7b8334998d75b293db031329852ec59ce8ae13e1184a541f2f35b5d1bce413ecf525d482277d27d7470444e477f297e361751d07cf64920";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/pt-PT/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/pt-PT/firefox-62.0.tar.bz2";
locale = "pt-PT";
arch = "linux-x86_64";
- sha512 = "2a5db6053556c75d399bbad5ffbfe51505f6b25bcd73008d85f7dba66d89fdf56ee0ba2cfce6e2617b463cb8db087a1700507051322fdd2ea8f732be5bfadb9c";
+ sha512 = "389ffbbd4dfeb1c7149a02cdbcb70479be32ac8e91683570093f99e38b4c541f145ec27fc3cbe54f70ec3ebc21e5c0ded3b18124307976befd8f2ae1839c5dc2";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/rm/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/rm/firefox-62.0.tar.bz2";
locale = "rm";
arch = "linux-x86_64";
- sha512 = "94e95e037ea9f924363aa5b80298f67ecc678bb2e22d552c2207af1cdfdcd9ef5b85fa4a6b42ed08167a4b482859658ef6a946adb7462c2e2519c4685428bb90";
+ sha512 = "cf9b89f1828bec694147528a0db8a8ec4530fb60e8a1957b77c8202e95459217c95bea2f104ec303922074c3528321f775fd955080b5e012b8941bb7f6575bdb";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/ro/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/ro/firefox-62.0.tar.bz2";
locale = "ro";
arch = "linux-x86_64";
- sha512 = "dc901a8b6ea913f976c915807bc4ab5fd4a756c98a78498ef52fa8577cb9e3a047e2a38240bf675d72644d975ac70d720f693db056e764218151431de572a37b";
+ sha512 = "44e3ac3e35af41616c1dfab41edb172b4dd92bc622aa53b8626375d782235ce3e9540e72e14b1d25dc19f4e44db5717fede7429b1fb245b644c20f2e13c0d7e3";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/ru/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/ru/firefox-62.0.tar.bz2";
locale = "ru";
arch = "linux-x86_64";
- sha512 = "dcaddf1072b19f714e9f50eb1d5e8e15bce98bf96bbbc13e7a4a82581e76339818766e389279fb33d212afa6cea947185de130a3eb72c0f6079e159ff2f18e9d";
+ sha512 = "7b38581a552ae9df2222ef9bd8f2c272cd98458d4a11c55a8f942870411d08c72da0c1dc5c4354b8e2e17d0a97794e4f2d59446a394e3c95376f5e7ee296d57b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/si/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/si/firefox-62.0.tar.bz2";
locale = "si";
arch = "linux-x86_64";
- sha512 = "5544833432d6b41efdff96fcc8d2d322f5c158764320ae6345e9183b2d48817afd796685bb87998e5e6fd227b1753f503bedda5f6fdfa9dcad2083cc9b7df9fd";
+ sha512 = "dbb7cc9c9efd5c1305cb7c770db67ace1b10c2afa55d2dc9b8de896629e4e69e79bdc5d06cf3d7900635d03420c32e0dcb1b0b8ead25ab8fb3cd12a154eaf0c7";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/sk/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/sk/firefox-62.0.tar.bz2";
locale = "sk";
arch = "linux-x86_64";
- sha512 = "d4702ea94482a276ecafaeb7e991ab850a432158009c95489b2b87a82402c92a84c33ce43b27ebf58367e20d63bc444e656f32cb957ad0ad03b1d9f793157052";
+ sha512 = "04f9b7c1977aff8144ad53a2bb7bc5aaaa11054cb8bd00b1747ab7ec34e3664d1fb3adf65b49b5d5acbbde2e1ab45ee642033e3ab57e99d5973ec853a1a6194c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/sl/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/sl/firefox-62.0.tar.bz2";
locale = "sl";
arch = "linux-x86_64";
- sha512 = "6103a4d340e45af988d17b93c4e8951a656ace095c9e13f5b0d6bcfd55d51e27f9f26614223d40dc19733aee34606a80a221838be86a1f91417a1c6f00a7771f";
+ sha512 = "3202a009f73fab2326611c65ee97a8249f5ccf047365874db92da588c5cb8693ad1a7b7852511bbab10a9146d0beb7cefdc79d3269c3b7404205d616a7394dfa";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/son/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/son/firefox-62.0.tar.bz2";
locale = "son";
arch = "linux-x86_64";
- sha512 = "ea04aee1c01d4d545ab4a370e4be4bd23b9f1a698bc660877a754f42995334446bbc08412bc9f8ec92a2a69a6fb8bd0caee40f622813d9ac18b43773c3111029";
+ sha512 = "a4f718670b73af088e87910197a78dace22d9e04bf268e4653709eebfa499ffa4a97b4048e4ac80c6a847afa598b0e19bdff07c6a7d6e164dfbf3d09f1070593";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/sq/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/sq/firefox-62.0.tar.bz2";
locale = "sq";
arch = "linux-x86_64";
- sha512 = "6789f071e366dfb3300cf5057d690c89daafe969a8b8b4e5a3ddee6683caa1426e62901d2288da61b8e8c59ac19d9764521b82f2d0d4fbe375d4e4eecd5751fb";
+ sha512 = "8b67dfcd41328b677bb33a640c1045b3643368b8c0004cb55027d36ac2f3fb9cc99c272d132c355567ab0505a50d34fab80f6fdb8598cef09ea9806e19d6107e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/sr/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/sr/firefox-62.0.tar.bz2";
locale = "sr";
arch = "linux-x86_64";
- sha512 = "2d079c315d0c66d2e1530cf2d30a357d62f9bb6517abe7313911bcfb5c42ac95c47b3f12f654ea61d2fdb74d44ed0b090443f6ec66ec22cbd51c674084a8c4e1";
+ sha512 = "51834193c037ca0e23f2c73800a351debd8327908f7c6b378a89424ea86b01a272bed893df59b1102760303592604812794c7ac70effcd50c20fbd676f4b5640";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/sv-SE/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/sv-SE/firefox-62.0.tar.bz2";
locale = "sv-SE";
arch = "linux-x86_64";
- sha512 = "c78e06de0834a84bf0cdd22a46e80901db3dec7d5d9e0dcb6ad850a040e8df6d3ba2c6e68f8a3da118dd9306c7af7f352d9b56e839cf74afd3730b2d8ddbd38b";
+ sha512 = "8763a55b6a3f7ffb75afe854aaa54bd7bd5a5ee8dbd741f4348fd29ce015603f81cd98bed3547c628dafe98dfa800a97b64e281606223fbb400c03a0af332018";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/ta/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/ta/firefox-62.0.tar.bz2";
locale = "ta";
arch = "linux-x86_64";
- sha512 = "d996633ce2cfc9d5766840d5198900a341c8158f4bc00c32ef168ac57a1c1d89dc10e9ebfcb2a504273d1722ed319acb9d9aca8d30257a7a6a01361ae7acbc4a";
+ sha512 = "82d687d98f2e75b637e76416ed1b749d1af18c7ac140eab32f8fdf99238fec76f3f926caaf212fb42f054d51d8c807536da8cb0ac5354ad123a3030fdf46690d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/te/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/te/firefox-62.0.tar.bz2";
locale = "te";
arch = "linux-x86_64";
- sha512 = "81b745184db9c550a135efd9b085e074a0dbbce24d81a16a39fb51166233d84da6c61b556e39b2ec68365ded627b31065d367c224721bf9e99338456aec07698";
+ sha512 = "2a690bbaf6f8ba90f98c2761d6ac6030fe17d384478a3bf7c07875bc6e3e6285f154e3e21db4b639602f205cc03360fb36bcfe26473ec48cb1749a65b781875d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/th/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/th/firefox-62.0.tar.bz2";
locale = "th";
arch = "linux-x86_64";
- sha512 = "a6ba250aa390005ce6830f14a4f7518062b3a98444da87e36f515fe29d3408b7efe9947a9d865a220b9f60ce57dadc12099c5742012981ca9c4d3fcc0ff4c877";
+ sha512 = "ebc344d1439fc4fdb71d772b047466e5bc19a04a83de09e64e9c820d19bc057f3deeff5d0ec9bd9cb11ed2079f4bff459f3727b0ba92fb7426e2e186bd0cb4f6";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/tr/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/tr/firefox-62.0.tar.bz2";
locale = "tr";
arch = "linux-x86_64";
- sha512 = "55eef864538b70b8d6e7fc2e6af2c73853a48860dfdb1ac5e4471675ebd2d9f089793c1c6cee713654caaa253b059e9e01acb12aa0f6f4efedd09632d10315d6";
+ sha512 = "9096da5a647463a3643e3e5f21dc51ee9be87d857004285de7dab164255103bca4ceb9d8474fce587ae497397c753803b8157c40d05dd8d3310d59e97965ca0c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/uk/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/uk/firefox-62.0.tar.bz2";
locale = "uk";
arch = "linux-x86_64";
- sha512 = "2bf67d7523c9b07acbef099dee48902d19a5b542ffe9eb65283524ce2cbcf853b1e3e862fa2a7640160cf5dec8ad884a237f4bddf215304a458a4d9575af8137";
+ sha512 = "f9f609eb7f3050e95bff33de4b88d8e17949c4c167d3bbd7a9901cb0d19926a37f72e40a6bdde1f6c7610a3ffc67d7fbcfaf298659e519aca16592714c70bb4d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/ur/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/ur/firefox-62.0.tar.bz2";
locale = "ur";
arch = "linux-x86_64";
- sha512 = "4127578edad2690915aae81fac45cbc90694b68d593562f4c55a1545cd1b8cdcf3eda18fbfb2dc9fb3e0dd3119fad09db68d65e6fdc09d96aa65440750fcf380";
+ sha512 = "35a755f1c1d93d9d8e4bd813c83a332a1cee74989d993921f987e023da90a851863f83b56a41c58878f5aed07b4e08e0ca9d3f4d4ccc8610544516bf903855c0";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/uz/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/uz/firefox-62.0.tar.bz2";
locale = "uz";
arch = "linux-x86_64";
- sha512 = "7b0257e2bf2edf26afaf6bff2a06f9fc81bbf5397c8823a65ee63e54cd32bd2329ddd858a5e1374df64bd188d3d3392434d83e05d0fcb4a71d0a73bb6da224dc";
+ sha512 = "d957def873388aa5f5051ed3ab5cf51196f8b5fc83e2fc4b56476f63357ff26ef38e6f3d469cf4f117b094c3e31a0f561b1f5c0a90c85e827436ecfe0d61e98d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/vi/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/vi/firefox-62.0.tar.bz2";
locale = "vi";
arch = "linux-x86_64";
- sha512 = "071e162e6919168fa4858aa98d68a2c6ff8ceeb10e5968a2dff55040613ecd7e7290f3acc929f8f2faf3fa4b97cdfbe4fd8b464f7df0c3d1d530af5a9ca8fd71";
+ sha512 = "e7f10deacc80f55928f3f6ea4dff80142e790cf9dc814c38f173cd03ea59de45438fda5cce1073b0c9e1b528870c7d979d16254b038bd351834def51944193f8";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/xh/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/xh/firefox-62.0.tar.bz2";
locale = "xh";
arch = "linux-x86_64";
- sha512 = "7e12d3e453216ce6ef2dd56980a130c52e273b23543a3df0b5fb11c69d1366533eb4875814e5084682c54f86d2cb8a304b95b08a66c8595c8dada69d4e97af71";
+ sha512 = "0e64c9a9c1ebada345f02d6dd40d2ab1ae157ee238b8716b011aeddfb18775c1594ae0f7706c4ddda97ca01c44304391570f526524f4f19d3eb5580a1839c19a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/zh-CN/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/zh-CN/firefox-62.0.tar.bz2";
locale = "zh-CN";
arch = "linux-x86_64";
- sha512 = "1b98d214d15d0163aa91316fc6f507bda61169701a8accac3aa79dc8b6d7260d58813d87ce25d7083f6fc2d2a16519464267feaa3981e2e556298d3cc3f1abf0";
+ sha512 = "cf1381aeb00f19fa6f8665ffbda8a9c6c19939a29e16fb49a2cf9097dbb2674eaf4e32b658dfb126645540582c52ad86e87a9679c1dabe03757d57032e0d3d4a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/zh-TW/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/zh-TW/firefox-62.0.tar.bz2";
locale = "zh-TW";
arch = "linux-x86_64";
- sha512 = "f466df89dcc7a4b72ef7b41800961828012fe913b2eecdf68f442b492109467ee69a95738db2afc1ff39fac0b6376598e8ae5b050aeddd6fe3d40d0dc8d424b6";
+ sha512 = "9d28b0b773227d7efc611e300250d518b303b9e03396092420e8195872c6e8c78aed6f9985e491bb01f75c541299bb7f0cf78abdf25d3a8587b085e3f6489e0e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/ach/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/ach/firefox-62.0.tar.bz2";
locale = "ach";
arch = "linux-i686";
- sha512 = "6aafc9db497700c6c91087e2477b707a162447199f26c87a4921b278d81828e868214501e8b89deb387c097d5768faa18eab83076ed84aa59799b24f62a3663a";
+ sha512 = "6de54e5cde101eff5c1edd43b7f3286f10cd631398f646608e0d6f22c9dc6d8dc2a3346c8d5fa9caf6ab1a82af8708ba3ee17fcf605d0404e2beb5d10b623ca9";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/af/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/af/firefox-62.0.tar.bz2";
locale = "af";
arch = "linux-i686";
- sha512 = "5cfe6413a70265360661dce8555941703feaf9045604313361553769b4738e3febf21a79c8be66e24272fef72b41dbf0c3a2e8e76e5b992789250d4b04fda45e";
+ sha512 = "29c5898b88cda4a1f365b8792789c854b954b4d6533ed7a556f7d0e3dde3f7705adf5a6c3bf14444268648ad3b3002eef49dac200d5eb89cbda5ee33e1cb4d4d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/an/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/an/firefox-62.0.tar.bz2";
locale = "an";
arch = "linux-i686";
- sha512 = "cdd9509e49d563ed3d26f58fe957375357fcee36fca7526a20dbd09e9f4f2867c81508cb637cb8d35572bd730b13ed34fceb0af4aefcff631e632bb78a6713f3";
+ sha512 = "484a8277cca9e437d8372f750403c71c5e4923b28b776b5809f58debb8d0d3ceb5d523df05691f326d06efba5970e27bb06abffcefc500748b04e99ee41664bf";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/ar/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/ar/firefox-62.0.tar.bz2";
locale = "ar";
arch = "linux-i686";
- sha512 = "906d0020510eb911d7b2709c55cca0e4a69638c685bda7e7b406fb41f385b97ed95ee97515693d72f722a619d13583d227264d0819ef973f01e67427a269225f";
+ sha512 = "7e3deb89acab69012c5f1aa99219ec0ff0cb380ae5f1dd71eea078bee4434855c612c808a574bcf46512d2eb77b3e8f9c26ea524ece97b02699b2434d8cacf45";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/as/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/as/firefox-62.0.tar.bz2";
locale = "as";
arch = "linux-i686";
- sha512 = "2fce0d7c990c7e2039a601ec5b5feafa7da368e24f363489c1cdae831bf36a11e2bf967ec4f74512f6ca06095ee3a59982b0a5ea3bd003bba9c3f4c763b9771e";
+ sha512 = "0836d6d22d13096db35f5ee3da13cd4a8504a55de73ce24897a8e4903eca5b7d56f244321d2b6b623a357b1741d419957f67ee65e71d1c71606db24bbbd95631";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/ast/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/ast/firefox-62.0.tar.bz2";
locale = "ast";
arch = "linux-i686";
- sha512 = "872e0b0962b7d6f86663c0cdf5fed6f4927f4a24bfe1848debb605e7c19bc574d98bdcfb74a2e5a4362c27ed1b9372881fc1418c742e4cfa75d15d838cad6f87";
+ sha512 = "247817ddfd24b97b991ac916311e01871a831197c92025d3a2ea97937fe993869c7a12e118b32baa3aaca49ae469dfaa8e892150731b6dfdca1c4e0929c2ba08";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/az/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/az/firefox-62.0.tar.bz2";
locale = "az";
arch = "linux-i686";
- sha512 = "dd92dcd6f0c32d5487525cd88832fb567ef0e8fda5cf7f401399992243146bc2690881839d5752ebafb4e7e099c6594c71ef99d5509d94753256507216a2532a";
+ sha512 = "4f0977cc5ce9e01c311d256d239a3e89dcc1db5b78b4c08f08999d7c52731fd58fce08c9f77a80fde1176a0a5289b5c59f06eb790cedd3625d96928dbdec46da";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/be/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/be/firefox-62.0.tar.bz2";
locale = "be";
arch = "linux-i686";
- sha512 = "1eda2b0945a4d8e70c0e61b187abce6873b9a8a578c089cb66b2728bfc71b90aab71b57599417ce775b4d5fa1c0fd908fa4b9b3183a3aa570da95d4fd726ba84";
+ sha512 = "294adf3029076f9dceb32a54330d63b10ba9219d9f688e3c7246e04fdff2ff10bdc24b577f48b18935c35b8d9acb2437a7d6cc3533fd6441b9027ca67e7cacc8";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/bg/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/bg/firefox-62.0.tar.bz2";
locale = "bg";
arch = "linux-i686";
- sha512 = "597dc8972c670f67f34ac23ffb57506b896efc9436d36270dbcdab484dcacab174aba53671f5462ffc7b54b9718c0280a66734e789edeb7710cd7c2b9fd602a8";
+ sha512 = "41b78104367cd25e67a38b71d3db6054995caa28fd0c4dfa0ebb494d2293c92c20a347fd763f88b65d31a514987c607102206390b2dc41335d00aabd9d5d589d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/bn-BD/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/bn-BD/firefox-62.0.tar.bz2";
locale = "bn-BD";
arch = "linux-i686";
- sha512 = "79989196e4647c035d4af9f24dc9edfceebf9d90afb1efe894e0a54e940ffcf32e3746b9e07b486bd89a11ef8f35cfaf2e61992071352a561a535bb058c0396b";
+ sha512 = "79241d9dc44b5ad35ed76f7b33bc8be8bf7f5da09855df9e34354994554aff2ddd2dfe8a2a3410916887568fc92a70927b8cae4747f20d0dacb067206eec3d7a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/bn-IN/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/bn-IN/firefox-62.0.tar.bz2";
locale = "bn-IN";
arch = "linux-i686";
- sha512 = "25b3d138308e0667d62e41a8384619fea548dfe441cec761c82e238c1f0467300d6abc89d265f22f1d9699ffa2165bbb7dceab76169a78acaa4bb1c46396182e";
+ sha512 = "5194de3d21783d335a11c824cd46b0e01ea512f900a7e3fb45ed2567501acd27d5f5bf8dd68f146ff550f6ae4c70089d539f56823cf7280f02b67d5111715760";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/br/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/br/firefox-62.0.tar.bz2";
locale = "br";
arch = "linux-i686";
- sha512 = "8f18a08ed64cf071462b2eb65e0965f4b3825857e867da2898f959fbe84ea55cf19fbed289a4c4e739e5c4fc5392f1f496feb6b4f383e86a753f5041dfa333ee";
+ sha512 = "59dfe19ea10c4698067a8ca70143b160ed5a73c38e0f6ed3a14d9a60209378acfaa1f8b09647a1a96d519e6fd6a34cb7e2a8bc3cc276653842c2bb3a6ee3cbe3";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/bs/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/bs/firefox-62.0.tar.bz2";
locale = "bs";
arch = "linux-i686";
- sha512 = "2cd2a33ff71b4a471d694912f8c102b53327f1bdf005316e16d32ef17a510784cfeac972f9a854304b07d6c9d19459b19bf3f7e47caae2e58a635fa555115039";
+ sha512 = "7e6069ecc137c1b0b479159fc8eb323a8c417c81edd8c7d54498c47cea4f1a2fd4a1cc52bed17b899ca72df8b0fbaf88e1794b17f86086d249011ccb592ce5d1";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/ca/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/ca/firefox-62.0.tar.bz2";
locale = "ca";
arch = "linux-i686";
- sha512 = "78649a90b8e890adb271fc57328669afb49f70e9f323a2849a2071b83125f3f1f40e13beb353336a9c5aebd930979889c719075b49ce4099715951164d979926";
+ sha512 = "932ce6517bd55ddbd927eb28935bc99ff5576ee924d239dc490fa79b3d90dd77f579a7b16c0b4fe4ddf8fedb4e825664aee7fe246145ebbe19c8f8841d098464";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/cak/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/cak/firefox-62.0.tar.bz2";
locale = "cak";
arch = "linux-i686";
- sha512 = "8e66b6ed5b20efda281350535f2b08892763c2dcb62ba4fc764b598606a36b4a6f3d5960919a8f2967f736add11132252449efc4bef827653534b45566ff69ce";
+ sha512 = "38c4ed4be2e79145056bfbc5a476e3a03c4f1f6aed1ccb834a7ddb2576f99fc52305b93939145ee1e7ae9144b656e857bfcc6b084ea4b501c3a574e10d7438a8";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/cs/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/cs/firefox-62.0.tar.bz2";
locale = "cs";
arch = "linux-i686";
- sha512 = "5e81414b8411fda775b35704de90d006be40cffbb51b495171b9f69896b9d486e4438bcc2bd2f3775ab5f998b7b41599f44f92ee150ddbbb2a84f64058657938";
+ sha512 = "1d569ba50f84ada02f0962e0418ee7f26e79fe19cc09f50dee4350a59262ddc87440dabbf10129d73172e512eff5904062f60561f4bd2d4eda395bc67af90dd1";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/cy/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/cy/firefox-62.0.tar.bz2";
locale = "cy";
arch = "linux-i686";
- sha512 = "8f4c5db5c760e16ef258bf2da401e51c2cf3d75808d83eb4b7adfaea4c2b69bfca0cd92c9cf69d7e4de188a2c43574d37c49b3c641dd9c8edb7bb6aefd2e4755";
+ sha512 = "9294f39bf32de7eb2a1bc2480cf7f7e51dcdd124d3281f9e45c4729b6926002f8ac99c30403ea53a5c6857077633ec08e0c35f5160ea8e08a7f5f881e8a90748";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/da/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/da/firefox-62.0.tar.bz2";
locale = "da";
arch = "linux-i686";
- sha512 = "4aceadbf8cd2ced63f15aed369d98f4234faef18560e767aab1026c876fd3d6a069cbba49139eea60a78e0e42c063451918ce4090e850fc5528a93f527067335";
+ sha512 = "77bde4fc9cacdec311b513045f3f026c44d7c199cfe0520cde20ed711c1cdb40d6b64483944f4da47b8fb280764899ff5931a8e5639bd0a8a4e03425835d8f2e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/de/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/de/firefox-62.0.tar.bz2";
locale = "de";
arch = "linux-i686";
- sha512 = "327c8b22f3ff3c11061b5ee58d1ea2311743e53d804bcff6e66615eeae3aada694c8adbba58f3521b6bcd8f54513bcff1d50ac952ffe5f1ff3f22b52264bdb68";
+ sha512 = "b2bf1a5fc4536c3c0822d84c7f0138f04f6bf4597804eff101502d3d782f2b22fc54dff966c2f32821471622cb1602050de1c51aaf9f64c63314f8ba002ea201";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/dsb/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/dsb/firefox-62.0.tar.bz2";
locale = "dsb";
arch = "linux-i686";
- sha512 = "5a964d9c25326d2a97730723be2a999bcd8a1bc91b2d0d7ebb4aee9bd773fe93cdfdd94c70cb2f9c0ef10f84474c28726c21c23e19a1fb9b55e6db5c2a74b6b9";
+ sha512 = "812842664c8b0088f33acc42ae1581a33cb2527d3aaea0ed102fdc27a088c06008b96a3a052f95a900694d869591311dd986bea2e828a02238aaff854a77aaf6";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/el/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/el/firefox-62.0.tar.bz2";
locale = "el";
arch = "linux-i686";
- sha512 = "ed1eceba7d5bae11af3a916902a55c66ed97ca6da9f1a6421e4be76c65b25111e2ca7c979c55f920d5fa30146016980fde273c643a5ff4996ed32b82f0b9087e";
+ sha512 = "f1116c938bed2333309d32c13ef69f806418c14fb8a2fc10f63c932d8d8ae169aa76a8e3835eb6bb2d61cde7c8d8dfec56240b8280695f1c2273899bb7c8aa4e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/en-GB/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/en-CA/firefox-62.0.tar.bz2";
+ locale = "en-CA";
+ arch = "linux-i686";
+ sha512 = "ba07c206a4b4ee0bf27ff82e8ea14e3ddff262fec11e088a114253ef4a4a81951cd5c85cf6eb9f6e1ba06f97be0bf5787f5e26c65b7f2aadfedf27f968146efe";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/en-GB/firefox-62.0.tar.bz2";
locale = "en-GB";
arch = "linux-i686";
- sha512 = "019be53a2e1bafbc4ea77730545c40be314d7e4a370e5cadaffd735a2dcb3dbca14e4d23b88dd2e34aa4518a57aae1b37ca561e8e62d7acd3417227f0d18d344";
+ sha512 = "558c10ec35144d696e1458a4b70de954ed3c8d3f05d5d1ae492374ee3b90752a93d55e6e41de30a64a3ee3b9e68bab88aa479066b849971d78121961ce2aaab9";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/en-US/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/en-US/firefox-62.0.tar.bz2";
locale = "en-US";
arch = "linux-i686";
- sha512 = "ee88e6d55855a9e2fccf2a362f26177393447dd1210eb8f78992a7760bd0e8245267c4143eb5309a7ac5826b345b8c9637bcc504bb7214d1f7897db70e9c7697";
+ sha512 = "51d606c5d9fdc2d6b611b1fea06c54ee4a6ac7666b4dce0a26dbaec99d110a2e304f88108d307b011f27312f8b935fcbf473f87b52056a465b667f8ecff9a48f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/en-ZA/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/en-ZA/firefox-62.0.tar.bz2";
locale = "en-ZA";
arch = "linux-i686";
- sha512 = "877cb9d50e95a8b0789660d871f263497279ea229b11218bc9398facb23d78200db4ad19e0030ca44cf36ae3913f8a119abddc3278e85a4c89d298c59a3443fb";
+ sha512 = "b88ea68f4eabf086ff2f3fa6752cc42bd19391029d4c0565342bf24d90817717e5f07f774e164df234eeb735e426491adf35784dd9096475635365912e57ba62";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/eo/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/eo/firefox-62.0.tar.bz2";
locale = "eo";
arch = "linux-i686";
- sha512 = "5c78af15b977019cf7402e88b823ab2488b08ba9e8dd27a55caac7570392e78afd8aa972f0f95f21dfb1239936ba23272ed5b84cf24578cda5e7bb1048ce7d67";
+ sha512 = "b97c269786efad57ff954d27ec69a4983e18a7ee4e0ffdc6925268830104103a99a31247359eba915be0710455f0626379b801d5fbcf501f30e3cc0b9736eb32";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/es-AR/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/es-AR/firefox-62.0.tar.bz2";
locale = "es-AR";
arch = "linux-i686";
- sha512 = "8328fef71e94c07c37491a331ac362d142d44e93404c0a3ea883426c8f11ebf6f5bf6584237b7fa75439c7312bd1f33a2ddcfcb8882c3cf3c526abfae48a620e";
+ sha512 = "a5fd087a8852f39e1208b388a2507981af3d989a8b86b1b0e2e83adcc9f6a494116050ff811e8b2225fd113ef1e689bace73a617c0e569df627df7e9c655a14e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/es-CL/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/es-CL/firefox-62.0.tar.bz2";
locale = "es-CL";
arch = "linux-i686";
- sha512 = "ef4e96123acde3a3ed75d8d93868894f859349613b556d44056009d55a3794e78824928eb04afe8746e291fb3d443b7a1b6f63376ebeb65102f7e03067480b86";
+ sha512 = "bdf7aeb5fbb80711d7b8dd7ac30e544847e00f015f7bb8835315f5ee3023458bf781a368f0dcf11c57737fb1d0f077352c0eab28d32e801861bba36bce5e52cc";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/es-ES/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/es-ES/firefox-62.0.tar.bz2";
locale = "es-ES";
arch = "linux-i686";
- sha512 = "934e92d37b920ccb715a411509905c150501eb14d11aefd084f2639afb8ee1a4ce3e869d682ec9f9db4b70a795875f09ca3d7d997f0e621ef99cffeeb1675f04";
+ sha512 = "47bf0dbb55435016312a6f6650033f28710471e7aaf14e0dc83488f1ff87e559de552fd95d5a58864420032392f84de06d8a1916efb8128423826c7e4577ab44";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/es-MX/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/es-MX/firefox-62.0.tar.bz2";
locale = "es-MX";
arch = "linux-i686";
- sha512 = "57e7bacb006bd079554670fc216ab2c1912a252b7966b32cc25a7d6735f7b0928ae0911b666c2810c63031d57513a4ff800cf92906a95868aa32608eb927e2f6";
+ sha512 = "79e42f01744b05df6c1c7928743914ac28f3dd696a6918a08000a531b050fda95ca621ce0484c216f2eadf728db867707c1ec45188c70bb91ee611eaff7ac565";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/et/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/et/firefox-62.0.tar.bz2";
locale = "et";
arch = "linux-i686";
- sha512 = "b357f29c0f77e7ed4ac764f7feab6588cf322a1807210052359402e5d1092d3d8cf515e04beac86d32a6ddac43b4be8b92d88a1437f6899b4007d2c9faeb7fc2";
+ sha512 = "8489f6dcc733debebe1acbaa86cd093e5dcbdb4c8d60480414ec1e27710bf57590fef3a29fb208e9eeaa5d8858e5807d7cf0be5130d57bfe308b7653de431db4";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/eu/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/eu/firefox-62.0.tar.bz2";
locale = "eu";
arch = "linux-i686";
- sha512 = "61b4a7b767e62b1a1b4eee4cb024e869969b5623de658ca2a3762c271a6519fb4869c9398e7a3cbb987f01799961021fff6f8634b78dc62770ca1f345e56d061";
+ sha512 = "92f49ebaf7777962eb2d1b13043a10e82cebcad1a0f43a3527d7e7a5a31e720b812febda86051125e64d5f0355225dcb6cb496df5ace1ed10c2c6a4cfbe16cf8";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/fa/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/fa/firefox-62.0.tar.bz2";
locale = "fa";
arch = "linux-i686";
- sha512 = "4eec6e7231fa548c0a24b8904b55311058dfc89b2ffb87142859b994aa0a31a07c48107495cfa66bb4a65094328f6bbd7f33e0ca33632457f620ecd90678552d";
+ sha512 = "1bf258264b77fc9cece834363a12c34be719121afd55378e23fb2af9cf20da2a7ef4ffdb2d39c34c9970ea5d259a47c894b6f9d703ecf75834a2239844d783e1";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/ff/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/ff/firefox-62.0.tar.bz2";
locale = "ff";
arch = "linux-i686";
- sha512 = "0a17ac2aa0a855c97b613741d7933dffc4569da9fef9f753a4e404847e683cf10a4444ff4cee5b5d1f86ef069525d0f2635433e8249ef029bfa2c247ed605386";
+ sha512 = "0b60ade68d6f4b9f1fda4a3ce36fe54e69583efa5ecb41443f0f92d394257449c2d5ca7124d1e194fc7394ba0daeb67f828de4aaf13f78c89aff8dc273213ea5";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/fi/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/fi/firefox-62.0.tar.bz2";
locale = "fi";
arch = "linux-i686";
- sha512 = "32526703d86dcd74739f419518974ba7f43083a8b3f971d0dd7446caf787c5ed4be82710e3bd53f2d1e9e5dcb67f46735bb55f60ec7d9c49c62cfc2857866fc2";
+ sha512 = "f5cd4ed69914705a01765cce884e3f3fd66cea53e85d33da378087ac7ccbc9afcb1b2ebaa78bb4ffbdca2fc34b2ce4aebad6d55fdff44b8740a815265026d2dd";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/fr/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/fr/firefox-62.0.tar.bz2";
locale = "fr";
arch = "linux-i686";
- sha512 = "b7e00691c8a1a5f0c1a6312a79eb40ae17e455e156f66da2f4e43beaad5ec35d770b783aba83c500db1fa885b1038095effe69f936e17d69bd320f41b71d4b2f";
+ sha512 = "3dc1eda7eba9e0112b246a370a296c6f5e11f318e514d08fc800d198afa5fc692f13ba66fa7b2ec891929c53572ade6caed21f967b880262cb36718fd76e18c1";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/fy-NL/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/fy-NL/firefox-62.0.tar.bz2";
locale = "fy-NL";
arch = "linux-i686";
- sha512 = "d8d70ed1d04686cabc9862c5cad06dffa6fa8b975a2a61f0154a6c1c6b182a173abe4563b727de30f414a4d04311744917a82158665883697d26589b29a25263";
+ sha512 = "576b0645bb3c2367138e3f385282f77c72040b0a4c75ac5f39163a7f1e23a34e7702305857ae2250c96adcebd587c1cb83b1e7d129667307089b38842bc4e175";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/ga-IE/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/ga-IE/firefox-62.0.tar.bz2";
locale = "ga-IE";
arch = "linux-i686";
- sha512 = "352620fb58ed1fc024e8633e70ce3a705fa518cb8f600b3bbcf1c50c440812ab8f04608bb5a3582f96dfb2a19b0d52debe6c4947dff2f06f426710d8f927977c";
+ sha512 = "416cad5b5859bf1565f7e68fd3a53ca8b180609a488e2201f70d42eda3186fb1e22c647016c67fd3068d67b50af678bc6dcd96194001511844afff43e31611bb";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/gd/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/gd/firefox-62.0.tar.bz2";
locale = "gd";
arch = "linux-i686";
- sha512 = "90923e5ecaa85d21d7d6de57c79a3f35b329faa14a74e8b210cc2024f1d48f3aa5c4930c63e8e1688778bdbe998f06c72b5bdce8287ffd7ae05fe62845ba2bfd";
+ sha512 = "167ac1a9411d1cc3ab052d3b206de6a119e8b56854b7e9588ed68815e7c9b9e1722210951a8b731e944aeb8b2890095cdfa7d73b03b473a5ac99a90095de6917";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/gl/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/gl/firefox-62.0.tar.bz2";
locale = "gl";
arch = "linux-i686";
- sha512 = "339f8ebd6d714945e50be0d18be3af010e2f00924a84df2fe5641b06842278550bc76b01474ad2b2a0feda734f6f2ac9254c008c3a6f942714c684504bdd47b9";
+ sha512 = "efefb9e9d53be16fda773e8f40073c357c4b46cedecedcfd311e890a45810b7fbfb368ea3e93b07efd0f9111b9fa7a67808298c0ce98be2c8bc7eff354f7efb8";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/gn/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/gn/firefox-62.0.tar.bz2";
locale = "gn";
arch = "linux-i686";
- sha512 = "35de07bd227904bf0372555d81ead164d993410d963e0e733f536ec445112652c04d3bce8f910d0b3daa3d9ef2ff956d24ed680916a5e86c3e9a6f9366d0dda9";
+ sha512 = "044c8e610d639ac8830b00ba2e4e2ff8e1bf827c3f91101edd45a6d478b5b8b99c1100c9fb2273a6fd378826f0bcbaf8817cdf1e3303bdb1b9b0e0c01cf095ec";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/gu-IN/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/gu-IN/firefox-62.0.tar.bz2";
locale = "gu-IN";
arch = "linux-i686";
- sha512 = "20b1b40d84264f0e98ab91a4e5943da078b7c37816b24443f8936933d779453d640b26ae04eca1b24b3a68134a29e7853bbd544c4cd725b934660574c6381284";
+ sha512 = "433bc4b580bb3d164ad78a21ef8894e053b4c6d972d5e4aa46a9b8ac27cdf38e395164eb46e24815cc645d8048c237371a3abbd1bb639e69b65efbeff00a30b5";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/he/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/he/firefox-62.0.tar.bz2";
locale = "he";
arch = "linux-i686";
- sha512 = "f8652f2cdc19827a7f2a92e6ec251c5f0bd8448d3dfaa3bd930a4ba116dbdcdd7f2a9c083c5fa93ba2a24395147782146c5443221c6183622248e54d0687f287";
+ sha512 = "d6acd3b06216d4b0f0856cb6576c36381dd9f48bfbd3543e410eb0e0e5aa11977cf3d68b38b0be7b6700831c1561e2a8dc75eb5193637bbd2484673d83bd3a1b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/hi-IN/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/hi-IN/firefox-62.0.tar.bz2";
locale = "hi-IN";
arch = "linux-i686";
- sha512 = "7051302d9315dc30fc8f6ebebaa587b49d17823aae7a542133d2f82a1d5a18e3062ff02880f347518e5f88a0de913568d9f6b4ab72bf7dd20cff5812cea65ebe";
+ sha512 = "49856be15be3ab0ca687f8d6616c481d61bc0380133b043d394cdcd21d1f7cd8816b2bca5538f2e601a32ffa8c51745e89f537f62bfa853da42759db70186ee1";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/hr/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/hr/firefox-62.0.tar.bz2";
locale = "hr";
arch = "linux-i686";
- sha512 = "acc1297166057cdac0015758d6556bc870481d96951e7a14704792e39010938a6c0bafab2cb28e9a23bf24695813e8dc1a80512c1c5fc75bfb8a0d29f7091c93";
+ sha512 = "0040ba7333a13820e4c0a85fb24c30131d4b477da3da9e4e04296088d1c0e938fd495777aedbe3bec22533a6c4766be902adbd8b470a81380fe4dd23f831d0f2";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/hsb/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/hsb/firefox-62.0.tar.bz2";
locale = "hsb";
arch = "linux-i686";
- sha512 = "2ec761ce5eaa14cf5fa114524f70b93998d76971de7b8d001e656cd6331c32252ef3ae78f54906f5dd416896b2cf8b6f5afcb5e3a02d017d9c8a33835655718e";
+ sha512 = "715d14b52fb82f255300dbc828ab05fd578f61325cdf4d4cf86f1a47e22fc1856b57bb459941a4bfa8d325b7168fb0e39c075122b56de3455933fa89927f025f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/hu/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/hu/firefox-62.0.tar.bz2";
locale = "hu";
arch = "linux-i686";
- sha512 = "160d7307aeb834f9ac15ad77c0cced4cf7abb855264e10d8a62eea1b1ef85aa3b0a00fa9221052bf4a3df010e54fa198d7033d8450d59212ff36c936d99a1469";
+ sha512 = "deac0b43865960d665f13a2f0a77cd9413ba9b3172fd2660695464b5f72944f4013f6d9a47801e528db63c3e05496aa7df890624a39ddc6651ff5e8d0d02883e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/hy-AM/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/hy-AM/firefox-62.0.tar.bz2";
locale = "hy-AM";
arch = "linux-i686";
- sha512 = "09950c9536fa0bdbad207b84ccc83088b23a7f2f960d094ea0615de566ac1bd9cf55acbe01c0f574114dd9246bc74e582e67706ec0c34a2c9ed6dea3d30bae17";
+ sha512 = "22e134785777ea4e4fd72cdc7f17765d5bf8e943be33a0991baada71fb254f60f9ce9b68b4ba5640dc807a6db0e4ac3c81784a7a33e5096cda1833b22336f9de";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/ia/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/ia/firefox-62.0.tar.bz2";
locale = "ia";
arch = "linux-i686";
- sha512 = "e6c1b00971dce7387e183a8328234ba65722c69c7d48e328223eb7e490af3706298d43c11844505ba2ea5aaf21a1fcf7b3cc8ec8946862fe7aed8128e6c6d5cb";
+ sha512 = "91112a783ed4402cec7ce357e68806609b202bd1553c649271ccf4cb90a724ec612951b3acfe0eb64646957870726cb40f66b4a233cc0b73fdeed51083d6894a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/id/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/id/firefox-62.0.tar.bz2";
locale = "id";
arch = "linux-i686";
- sha512 = "85506ef07ecdd1d466fbb261d46bca8cc4ac8b3a707f27db9083dfe1996e5214cc0e78080f33c2b3198e27e044c6a6d13717d69b43c3ad98a1c43f50b12bb69b";
+ sha512 = "8b87e2f13550334a96bde04fb7d61ac963548e35de2717b8738fd14fafb015944403a1bf175e2c13ceb7d4f482f5a6d56b57b44cf015b6dabfac3fed77d86f81";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/is/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/is/firefox-62.0.tar.bz2";
locale = "is";
arch = "linux-i686";
- sha512 = "973b863ef94121836f472f5450f8a1a2d3329306f289b8ba09ff811b336196a157cfc966fdffecd54e78f4f48508ca1f8284f0c2d3804579ef82be4e1adda48d";
+ sha512 = "8ea8972b5dc06bd12844fbafff92f6f493f604ebe03139043435fb5f761098cee81c0ccd42b67bcf3c7d1b370f3382858c08d4c14eb24a75fb851e78c51c296c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/it/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/it/firefox-62.0.tar.bz2";
locale = "it";
arch = "linux-i686";
- sha512 = "fbb8e899b2aac3f4c64ccde0fffa11f8609ca3b7ea8bc05e062d207b46234b2414746822e0fad8d24fe8ae43e3bd8ebf2fc5d26a02365012a95a4070de002274";
+ sha512 = "b50a422dcd94d6ea69ab22426d6f79b3997313bf4e0e17f2af31d8b64ee85d603cde1768a730b279a10ff87639ba2af26185bdb81ea4bcb7b61947b1836ab700";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/ja/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/ja/firefox-62.0.tar.bz2";
locale = "ja";
arch = "linux-i686";
- sha512 = "c6585b28baaeffcdedeb1167aae4d20874755e970f53aafb351a31acd3933e6b805cde1e22ce0c2ade58984ad940a5d8b6857116f11ea6070bfa88c8232bbae8";
+ sha512 = "f52d31f997b291e2a0c9cedaafbcb5bc3ffd2148b52700eb5c140846f2809613c9061f339728b1810bc5f899fd208a3eedad06ace984dad41fac0a057c101ec1";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/ka/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/ka/firefox-62.0.tar.bz2";
locale = "ka";
arch = "linux-i686";
- sha512 = "136f49750c33d72e7aee3fd5733730f1b78d6656fd45b2aa2299d8e9d01adf13f9debe1d08d8fb9149107e96ce5f5fefce81b5d9a2d9a1e1896cb8df3c588829";
+ sha512 = "e155d5c70de47d6f96f3f0e34ee317e90ac1aaeee4be68ed265d4bec46d52e6d67d7a140f3fb135dd086d9d6cfb5e8f80063a85f07e8b2197b23233a122efbb6";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/kab/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/kab/firefox-62.0.tar.bz2";
locale = "kab";
arch = "linux-i686";
- sha512 = "2a0fd4952c493a4c22e76135efbf155962fb51444328726f29660cb97586ba76c1903d28c7baed9bb4815e57747b5a009649e179971b3c7aafd19fb96be23c75";
+ sha512 = "153ed4ce1692e6691222779860a066b27dc9a5e747d79f4e1bd3273541d849d4b093062b3ff8d702786542fe99caefcde13f63cada7d0f67f461531aa32603a1";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/kk/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/kk/firefox-62.0.tar.bz2";
locale = "kk";
arch = "linux-i686";
- sha512 = "0cad124b5e3d995124057fe0d818121be4f7f186c7cd4ada4d13b89ca5d505a8830525ffcda9a27a0f5f2241fb65b44b8433d95221220740ab8643f374c938ad";
+ sha512 = "dd88ca465251b9489e766c268755a66babdcaa5962d40ddb4ebdc3f100a31f34b9b962bcf5fb5a0e46b2871e7ebb8d4169982a3a7174bbdaf5e6716274321ae3";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/km/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/km/firefox-62.0.tar.bz2";
locale = "km";
arch = "linux-i686";
- sha512 = "06a58d8d54bf641e3ddc7fdb3417f8a5a2aaa16e8c11f961321c939e803249edb7dd3e08027a4b20ea840298b4a12da20c2771364d2b9caaba496d1eba863e15";
+ sha512 = "ccb473d36522f34c889ae3d211a1cd4ebf4e60da341c51c34cf05d9d8d75615b91eb4b00e327409c6fe406aaeaa07f8eec53c364bec50ae87c48c37ac1602e69";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/kn/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/kn/firefox-62.0.tar.bz2";
locale = "kn";
arch = "linux-i686";
- sha512 = "92a9d9e4fc65472200f408238ade4ed23321d4e25b0c7eff9096f23f76e480cea0031159b53e509cc6d3d6b2c0c0c8396742c81f2fc3e9825c1d5e45a35a12f3";
+ sha512 = "e1c718690141b6e89f4df017d5804efe07a1dfa838f1c23ca14b90438458278bfe90e178abb5ad6c52d43a993b6a65664c0e801a9f58ac57f9300a9bb6f9679a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/ko/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/ko/firefox-62.0.tar.bz2";
locale = "ko";
arch = "linux-i686";
- sha512 = "dd9d7674f6261a94cb00fb823a02cec12758476c1ca1cf6a973eae78dbc1c94ebfcc14155c035966781398e1d3262e000da4291e90ec434756c8c3ba0de7b7b4";
+ sha512 = "e916fddce4044fd924f7aded0b0c082f82bb50fe0f7587d7aed4782d545be8b0dad67ed4d2c41bc75360f6ed7c236bd7c40cb3503b472792f1b27c8f0742f597";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/lij/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/lij/firefox-62.0.tar.bz2";
locale = "lij";
arch = "linux-i686";
- sha512 = "1d01c34ab89ff1122147685b0551aa650f5b751deec35a5e7d64d6ba46272e929d7f1c49601fb2b1f5514b840ba6554af892c79c1a3f71af392216271d206cd5";
+ sha512 = "ab86bf8a92b05bc5defee073afa19ab00be704ce49a2d26f032edcbb60d9e5ef4e7a6196d31bec8d6e090c586a88d6e9b69f576ed5e587ca09dcfb60a0661b3d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/lt/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/lt/firefox-62.0.tar.bz2";
locale = "lt";
arch = "linux-i686";
- sha512 = "93d3dfaca37a668eb7c43bdc74ba521bee0344fff43ff9cefad5e4746b7c3ccdba445f97577338606951a15fc5e629bcd4b8cb979842fbe550d3e7e88169b3a4";
+ sha512 = "d716f7fc2c4015f97962d07ba7ffd6903675a6c36416765f2e81da43f9e4aba759b3ff31bd82bb7cf64c7d8b99f9d7454716f4ce6daa022f9fa31f4a49d9efee";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/lv/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/lv/firefox-62.0.tar.bz2";
locale = "lv";
arch = "linux-i686";
- sha512 = "0037d16778bccde9146965d7553513a21a443960cabca4a65b6f58ca2ea9f243b3405d3993e8ed078c1a2b7bd636deb86ed829f8f699400fd755f35cf048c463";
+ sha512 = "453e0bbf9eb2e9678ed029ecb797b701b4b39e030f9555bcca7eb6d56676bb44366e2d1ccc613b12a09f95d99ed08f9d3f34cfc9dd16cf38c9ab8e162dbae3e0";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/mai/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/mai/firefox-62.0.tar.bz2";
locale = "mai";
arch = "linux-i686";
- sha512 = "d8025e4c4ab5b7e9b2d8dd8afbc221e1765eddf878943c4daece0e27b7443e7e17de3e400d99a5ef5b62a5ba9e3f2a4c27112551c8c0ea1f81136d6d74b7e91e";
+ sha512 = "75e863c56d68cf2304f0c6c2f1861ce025d934d033341c23d3b95a70e73bfe66334c3beb77d9fd597f7b4091baf70729419ce452131009ccf03d2d33d16621c0";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/mk/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/mk/firefox-62.0.tar.bz2";
locale = "mk";
arch = "linux-i686";
- sha512 = "6ed44201501bd8336615b29078de4e52374712f857e2816732277cc37b6f8b305af0861894f3f70fa62fe2de6476d689bc5b79bd245b4dd750dcbab0b448c69e";
+ sha512 = "bb87f94a4de4984544477837cde4186a55309eec70b85f0cffaf0cfe747b7c761d9a6553adfa1ab1fba72d732be855e2bb46e4c7f22a0f25529207b42b6da396";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/ml/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/ml/firefox-62.0.tar.bz2";
locale = "ml";
arch = "linux-i686";
- sha512 = "5b7272acc37c4dffc2421824b86c5f0192b7a92535f193a0b567fff8e79129f41bdb336bfc1c742ea0f106739eca47339d9f550b785951364233e612b035f94b";
+ sha512 = "5754b4a0a3c6c67191f4ef3dda7bc208766ed8171de772d4250033039b2b39dddc3bee800a28fffe41c68cfca82a5c9c6005625fc6bb5bf232b256d7bd58de71";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/mr/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/mr/firefox-62.0.tar.bz2";
locale = "mr";
arch = "linux-i686";
- sha512 = "fff73ffc6f080aa064df90a2f19c85364a09c831a095bf3722a5bc0760e04e305be8683804883968a492589a652d705f1cfbbed617de2f00348a723babf60a86";
+ sha512 = "04e40c1d060b848cf957af34079f6d1cdd12589b0f31932f15b5ebf837e37d84d332fe3ee4a54c501ac47050233f891ec6617802d03472ae9d7e45baca809adc";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/ms/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/ms/firefox-62.0.tar.bz2";
locale = "ms";
arch = "linux-i686";
- sha512 = "a7574ce597a12b92aec0e88ca72d544cca1ec1a5def40b034a8cb25a24a3672c42e2fbe7ebcf0b5293f55fa12216856503af5514c3ab2b3cea551a8a43900b04";
+ sha512 = "1b84fd0960c4952ff42bc50595683da47545fec9ab10d7b3fee3e3541b2a47aee084526766fb2bbf17dad413f4dd2dc458cb0c3e8153b7ef897a9573292abe2a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/my/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/my/firefox-62.0.tar.bz2";
locale = "my";
arch = "linux-i686";
- sha512 = "0bb892e7ab8126f2f946b1d3c9b8b00119dde0a165832ed211265be4f698087ab83970b1c1d47171913db7e01f43036e90b4aea135accb91c33beea1031d545c";
+ sha512 = "95fd60b8c2e9b0add3163c67a5b46e794f0105621293017838fdce48cf90a0b0bd62bcefec2693fa16b0616260b39587bf3c619b506d56b072f0c715398307ae";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/nb-NO/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/nb-NO/firefox-62.0.tar.bz2";
locale = "nb-NO";
arch = "linux-i686";
- sha512 = "184130d826eda76da820974a4f729de6eb569bbc7f36ffe2d4599b7c142d75c5537546511770db38abaf28b9d3866937fc6d51c7fbcffb074432da3d98310b06";
+ sha512 = "05c83c17e5470f009ab369d0c8a1c64cb8ecc008161fe1ced3ca85e9065f36f7ee4e220f8ed7a0320305ac31b35a035b5c8f7525b3b04c6b96e95e4044418f33";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/ne-NP/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/ne-NP/firefox-62.0.tar.bz2";
locale = "ne-NP";
arch = "linux-i686";
- sha512 = "2428dc2175f0da8e4fa66ac11810467306a59b181c34165e4a54dfe5f3bebc182f0fbcb117f15707e72baf97f4d75131a3ec97d03d0fc1109229caf83519dd51";
+ sha512 = "2ad4756b8800554c54aa1f47effe512de332a61fcd7571e27ae83bd5e0100cd8b60fd5d8381764f9bc2b1d925ec4b53fc3c6c6a88840cb12f57e9acba892dc5d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/nl/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/nl/firefox-62.0.tar.bz2";
locale = "nl";
arch = "linux-i686";
- sha512 = "96bd92c9979e02a13db550f7f3a795585baa1017691371c5e5bc99825d730d535c63ddbf805ebf8a0e6406ae80ec644d0f715d04f913935f845ad89467c01832";
+ sha512 = "a3ba32bb48a6bc386d49e4ec703f51cda3bf917673e23965d7f5e7977dc8ae0696b375535aa04d1a416b6b5655cb3302cb9738a238d9cc8a6bcb78dda52afae6";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/nn-NO/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/nn-NO/firefox-62.0.tar.bz2";
locale = "nn-NO";
arch = "linux-i686";
- sha512 = "26f35cd02873ba061cd0f38cca18947e2c05589d3b399c55fb4d0f356c26d399848467a20fc542c7f51c67c912ab7c8fe5fae25c97d942260276faba40d24c89";
+ sha512 = "35bac6119415eaca5c8d9fd2d57e0a550abcd7d069454202a02ce6418f9e47ae59563224763008f23d49604cde09ad251dc8785d2205d4e9623c138a97b69533";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/oc/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/oc/firefox-62.0.tar.bz2";
locale = "oc";
arch = "linux-i686";
- sha512 = "711b260ac771280d795d6e3746df07bed4b9357b7261e83e8b17934ab027d77bfa1781d3d9d1923724f49f16136468c1fef40d1809d6a020d5b49b7767030f85";
+ sha512 = "40d3e74b204da461cdd79163cc838e538a5dbb8c4e693a59d801202363cfba4bf48e01bcc87d247dce6b1fdad0a24f2bdd15272399e407b26293156698f7bf7c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/or/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/or/firefox-62.0.tar.bz2";
locale = "or";
arch = "linux-i686";
- sha512 = "dcd1d7068c75428533d268b50d3d1e7324dba2709abe4049c9cfea4fd4413b09c3c7dd9f944f5f54f57454d8d2aa8471b8ba5871e73cbeae6fa357c8c68e90fc";
+ sha512 = "2220ecdcb26b459ebb0fb3380bb8b9430c1a09aa899418b18a765a4ba76c8d35480f59b71edaf6047e0eae04146ec6dd6bf25ccb619f559a260ff6f2828a0db0";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/pa-IN/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/pa-IN/firefox-62.0.tar.bz2";
locale = "pa-IN";
arch = "linux-i686";
- sha512 = "f34c32479a92cce9fc6564899b5477fdbdbdc868b17904f8d7ae338c2924fb7cb8335b038378a805a2119ff5ad13e349c7b80efe7a29add706bbaf1466d623a6";
+ sha512 = "91425dba14c27a3bbb744cf5added1545c071f466c6cfb77d7b2ff0b0b5ab289ffcb56821023e50d12deb4ff29cc5ae490c028420384da84811c661d277017f3";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/pl/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/pl/firefox-62.0.tar.bz2";
locale = "pl";
arch = "linux-i686";
- sha512 = "d62822aa991cd30cb6c5e47dc211bd4018de427b243543bd83bd166601e40e3bed35dfc073660573dc500ae19ead2dca858041a3b80bd616def3c2b3f72aee11";
+ sha512 = "a5581c2e2d7de1187967af10802c4a6577a5bbf9a0ab56448b0695ca3fdee845117fa364ea53149b81a5aeb3ddab22c58ff65863fc981445bd34858766fb438c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/pt-BR/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/pt-BR/firefox-62.0.tar.bz2";
locale = "pt-BR";
arch = "linux-i686";
- sha512 = "5a2ea1494423a5ce1afc60c2d1a4e53ef084a02050ca61a688ecf18ff9d99e43d6bd334683937c12965767e7e5b0bd1a32708f1f2c2a241db1f68271633ace66";
+ sha512 = "70a9cc592980afbaa3efa37b57e190f6bd6c76fe975ee16b3a3b2e3498c65e792a83870f569836fe79fabc289c201b7f6764d4d512f9d561058eb496d1bc1cf8";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/pt-PT/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/pt-PT/firefox-62.0.tar.bz2";
locale = "pt-PT";
arch = "linux-i686";
- sha512 = "83cff834812ad238b103fcee8b801e46ae542eba3475709e04848f18df0bee68075b2834ee871bfa5eb58ad1ec7fb34239d661a27d0dcba17e6c39de8428cef6";
+ sha512 = "8e1d94b4b3e01e684387b4e3c9439ee1df9712cef607f370d63ff0072876c2ad9e22a978fcaba14c03802c8fd5b559c6dc412fdadaa6a01425bb491852c4ce02";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/rm/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/rm/firefox-62.0.tar.bz2";
locale = "rm";
arch = "linux-i686";
- sha512 = "c4190e7e2007805b2c7507dd26b0695bc5d3c007eabd6a592c283a99cf0495ce1dfcd6dbb1e753a990f64466f24618d3b84df617f99fb266ceadf32fcd990af8";
+ sha512 = "77500b96558c055ea90750d99aeb096d789a920fac4fd368b95a032cfa565ea0ee1259503ef0d198c4802bbeeb847a3ca22f06ae79b6e554c54d336a99f61687";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/ro/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/ro/firefox-62.0.tar.bz2";
locale = "ro";
arch = "linux-i686";
- sha512 = "292112e0af6bad96b97bb0a1d58d0b7c9d4cb476cf531b1caaffcfd54c2f0ecd72a4311f98b614d7f834ffe2779261f77eb43d4d7ab724378dc6b7ad83bb1840";
+ sha512 = "e3cfec0059f0372d2b3764a4c3809b7a8c9ee6e795bb1d8eccf663feb1d054be58c15569b8dcad55b5ad37a1332d950f5286ad88ca5db55441c1cb3dd879bb8d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/ru/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/ru/firefox-62.0.tar.bz2";
locale = "ru";
arch = "linux-i686";
- sha512 = "3d6fa0994fba5ff988e281ac4feff8655a5353ebf0d99df5ac7412cff2d19d478a912851d27f2af5bd78fdbc68030878682bb7ffa912180d2c4aa9bafcd77cd5";
+ sha512 = "91077e66da0403828807fe1a3ee274ac162898efafd651b3c243c315c9f0f1cfb88925e738b9bf25fa7fc0c7b747f2a9f2a5a1c77b87cb83d3aa620475239822";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/si/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/si/firefox-62.0.tar.bz2";
locale = "si";
arch = "linux-i686";
- sha512 = "e6d3c4049f267e68216e9824743b123539e5445a5d53297eb8af33af95a418e492a655a456970d02049f8969c81c0ab8c5be1471a5ab8e01b4744995b799158a";
+ sha512 = "f770321771e965776b55d7681783e3782b7ce4df3c3d7cce581a3de1db0f8fc8c3ded3d606fc7f7f61e62b33986e8e05ff64e49427a8cb85b68b7b6fe43f6c3b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/sk/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/sk/firefox-62.0.tar.bz2";
locale = "sk";
arch = "linux-i686";
- sha512 = "66fc1f3f4fb7dec1c261db144243dc0647b4dbc4257de93c5fb017ae616d31d6825fdfafc30d3fc299a278d5fd51731f24e6033cb3807c69ccd1512527029063";
+ sha512 = "150792fbeebcd0969fdbef0827b617f83383bcaaf3eed9dac0790aa0ffb893d4498dae29eb480fda05a2feaca0428cf600bfb3398dfbcc921e92cf2ca01c7a1c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/sl/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/sl/firefox-62.0.tar.bz2";
locale = "sl";
arch = "linux-i686";
- sha512 = "e089b96b77a60c2c8e96f107cd26f37e681f8a8c702cf32ee3592344900c81daba274516c32ac856609917a30f8d60d853fd649fe575c3a2915072e45908126b";
+ sha512 = "d423c10683ba690a8d8eec50e4e966b7233d565e2c35b5fdd70aa917908daab5d01f847c32f7e24c604aa19ab941ca70c6e6613b39271d01f1370dbd974800fa";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/son/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/son/firefox-62.0.tar.bz2";
locale = "son";
arch = "linux-i686";
- sha512 = "00eecadab36816ae5e977dd50f335222e1fd8253b98daa1f14920e48678afb22b0e619ae4a86e6a45c8d2973f83f614f16a1f860e6ed1ed488851032075d6c72";
+ sha512 = "7f1d638cbd729b51d959b0b1ee0e4ec5473f5478bf315c890fd9df20e3065861a5c8447399e973cac78bd078d2a1f0e1bad829f6b462ec6ffc55e7748760677a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/sq/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/sq/firefox-62.0.tar.bz2";
locale = "sq";
arch = "linux-i686";
- sha512 = "ebd8ed00c12288a3ae4f6a113bbac8595ea9c0fbc35575115fd019c6158857ad083588100d4cae440822780bf25789501d0dd800bbe2baef5f037fb43aeabb74";
+ sha512 = "823b4b5043e3fd8fcf0bcb345d00dbfa38e6e03fdf172a30c272f51eee7f9057ec99423c7117ab8d21e9037bcc1e19a7082401a0b25514e2258542aef4c4af80";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/sr/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/sr/firefox-62.0.tar.bz2";
locale = "sr";
arch = "linux-i686";
- sha512 = "bfce8265755adbc3c30d56a1e4bbbbb14385ddd3d2434b6404b04e3fa3120d58b32cb9e598aeb1540f23d2757c23fe903fd5c9d5167db305a88077e98d9a39b2";
+ sha512 = "a08ef0de87e4f01c11b20301e45e98d3bf10bbd4d2699de56f66470d7f4298aec3744f44888ba46ec1293fb713487f6df20bb9f5682a57827993f0ddd28cdde3";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/sv-SE/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/sv-SE/firefox-62.0.tar.bz2";
locale = "sv-SE";
arch = "linux-i686";
- sha512 = "518b28e8f88a763aa09c5aed12eb0f2b582f84770401f3e11e5083fe69d176ce1483a81c2345a7fae2473551bf41db6a35f341495eb59c559a99398b93a7195a";
+ sha512 = "e3e65e32e5e11547e220bb34d0009257f3c4f18aec0fe961f310ef4b76311d8d885a01d6bc4420c2b97687b886c3d00c09d43af0c6c7eaca8e6a804d78d4bfe7";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/ta/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/ta/firefox-62.0.tar.bz2";
locale = "ta";
arch = "linux-i686";
- sha512 = "a4d5960e0b60cf03c0ecf7f0d2b697dbb68dbfb4e0f3c77548c020d574f60c0fe7cc032a81215f34108a11651800deb1b1533efad3e238fd32780f22bd5524fc";
+ sha512 = "47753ccbe4471ab3d3de3ea11992cd332251868ae3a7772e860531d013c657f5ff559d34592fedf7b52ecf3a54476dc2e0fc68119170afb9c482fccd04a36776";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/te/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/te/firefox-62.0.tar.bz2";
locale = "te";
arch = "linux-i686";
- sha512 = "8bf1510077ce86f50c668cb8d931d6d0899d1b7559736312c86acfdc3149da75f8c8f750393e02023a9b063c27c03adcc6bd5c29c950fc0a6055392a2e0eb2d4";
+ sha512 = "90327dd95f3a597692cf5ea54258c31ed813261f102a7f668f5bc5062499a6bfe64d2d241dc33ffdc5cd152802e7d462c7ffdbe4498825ad88be48d21031919b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/th/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/th/firefox-62.0.tar.bz2";
locale = "th";
arch = "linux-i686";
- sha512 = "af32b002380fee3b147b2cc44831c3d2ee29d784b8c935fe1be464b302992aebba73a39929ca23b35b9b6a8475e909a73622f70810e0a4a21bc7db74a8b4da46";
+ sha512 = "652a7bf7f2a7c6fa27edbd5e78cfecd2df661e1a7a01cc532b1caaed53bd40025aaee2126dd1116e77ef9e050777e78e96537ed2decfe493caa1d03c7bbb0646";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/tr/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/tr/firefox-62.0.tar.bz2";
locale = "tr";
arch = "linux-i686";
- sha512 = "4216a4e126a41f26b344804e4222535aee43c9f52fafbb6e1d019cc743fe18c0cdeed7fc04dd06fb921efc0431256ed2f09ed21fafff8a1132d097082b849388";
+ sha512 = "f98d45b831f51a0caa47fcaaaf1ed37f267035e1f1ab95ae0cfbafa06f03b89f99b7a7accb9812644f862b819c2bb294f5a3454ece80f775359ac77734a99d44";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/uk/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/uk/firefox-62.0.tar.bz2";
locale = "uk";
arch = "linux-i686";
- sha512 = "dfe75bb618097d0a96066dd65ba0da7e9d3ce91c14075023c48aedfb88c6d30b83c8ab503666c7581783baf347beac58e81d49e7f9b671bedcdb6827f0843b35";
+ sha512 = "6c67554c87c7941fec8193bfcdd9d5d0af906d13ab237e0ddd97733816d2df27fee5e11eb450e85f9143f71049219e8ef9c6cd4d327faf3e335247130cdd26f6";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/ur/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/ur/firefox-62.0.tar.bz2";
locale = "ur";
arch = "linux-i686";
- sha512 = "0a1a8cae5f364b5e0e2570ef6e06870efd136322082e2fb7690b381f05195eee48787ac679916cd7508f9f51458c038798c9e73f982992dd5b0de8d596e83ca4";
+ sha512 = "0c90e5575d057d9f32c18a102d2db7848f8821d71edb3cb9ae4f2565a1cc2851da7fb1bd493e81dca003a50a9f26454af8cf0ef7f947ea42aa22baf20abc06d8";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/uz/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/uz/firefox-62.0.tar.bz2";
locale = "uz";
arch = "linux-i686";
- sha512 = "153e781c6e4a530fad7631168afaaed74b0c8323317b1b4104cfffd8ee9250ae9af0ed9a0a0f157fc6745dfef7889402426c3d5e13d0c1b234fdaf952c9cb3aa";
+ sha512 = "fc35bb30011063bda8c256b6c405bffae55ae7d67ce5809367aaadaddb1094acfe0186f2cd84b2dceb55a76358ee46e29ec013058e035123a7797b5ac49b6e4d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/vi/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/vi/firefox-62.0.tar.bz2";
locale = "vi";
arch = "linux-i686";
- sha512 = "1cc2e611316137b1d569d3c2617d41bddc48a8618a8937eab643ebdf94727139743b8bc6e1d18a7487e9d30f867ae1b7f77bfd528e0b535d122a4e8f9fcd311c";
+ sha512 = "0c6a94f811ba509dc468b31f9448eba7f1004e6652a418db8ef84d03d79ff850237bd7555b8f73d515f8a0c546df371a18bc51ccd3dad069bc481f58f9a4c989";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/xh/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/xh/firefox-62.0.tar.bz2";
locale = "xh";
arch = "linux-i686";
- sha512 = "b0c4a093950fe90ad2249a5259843e7b3b4bdf2179b0c7ee61e1f965a4104636a53d7db0b91aaff3047cc7252855970f12e1b3bc4aa9e4f85d301652cb53c6c0";
+ sha512 = "b113f1f4a81a7cac63a8604a8152bf651ebee3ad48eaabef84d09d3576b37b529f56c04fc9fd1b3326364aeaefad77cc123a97b662c85665c7f239384f5c6d7c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/zh-CN/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/zh-CN/firefox-62.0.tar.bz2";
locale = "zh-CN";
arch = "linux-i686";
- sha512 = "b3d1ea1e74ce5c7779bd1c7299197d0143688cc6bd9c4ae0b391e3849fec40c3142a9b7db19d3805616fa885deb16a6fdbe2fd23ddf0eac0fb0094498917d356";
+ sha512 = "7c3da83ebdfbcaf8a67ac8cf953d648dd3eb54d1c9f6e74680b00ef94e01a0384a53d27c4a78312e25e284209f3e4c53661958347e3250eb820a20873e66c3fd";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/zh-TW/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/zh-TW/firefox-62.0.tar.bz2";
locale = "zh-TW";
arch = "linux-i686";
- sha512 = "cda9d835f282746cb711054f1ed2f137e0f7e89c27429af12f470ed8984ea0c9a4f28e5cd403aa2f37fe0c06271c7651f794009ec11ddc64a96c4c661ca9ecb6";
+ sha512 = "659ea2bbd51d99a0c3573043a55ee580839e5f0323c57bb7b086ebc41a19f493baadecf67b64443b5abcf5db69e7e82e0c965a40b151d141557cda04b3ce6d52";
}
];
}
diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix
index 984d80167c3..11222cc65ba 100644
--- a/pkgs/applications/networking/browsers/firefox/packages.nix
+++ b/pkgs/applications/networking/browsers/firefox/packages.nix
@@ -20,10 +20,10 @@ rec {
firefox = common rec {
pname = "firefox";
- version = "61.0.2";
+ version = "62.0";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
- sha512 = "3zzcxqjpsn2m5z4l66rxrq7yf58aii370jj8pcl50smcd55sfsyknnc20agbppsw4k4pnwycfn57im33swwkjzg0hk0h2ng4rvi42x2";
+ sha512 = "0byxslbgr37sm1ra3wywl5c2a39qbkjwc227yp4j2l930m5j86m5g7rmv8zm944vv5vnyzmwhym972si229fm2lwq74p4xam5rfv948";
};
patches = nixpkgsPatches ++ [
@@ -60,6 +60,7 @@ rec {
meta = firefox.meta // {
description = "A web browser built from Firefox Extended Support Release source tree";
+ knownVulnerabilities = [ "Support ended in August 2018." ];
};
updateScript = callPackage ./update.nix {
attrPath = "firefox-esr-52-unwrapped";
@@ -69,10 +70,10 @@ rec {
firefox-esr-60 = common rec {
pname = "firefox-esr";
- version = "60.1.0esr";
+ version = "60.2.0esr";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
- sha512 = "2bg7zvkpy1x2ryiazvk4nn5m94v0addbhrcrlcf9djnqjf14rp5q50lbiymhxxz0988vgpicsvizifb8gb3hi7b8g17rdw6438ddhh6";
+ sha512 = "1nf7nsycvzafvy4jjli5xh59d2mac17gfx91a1jh86f41w6qcsi3lvkfa8xhxsq8wfdsmqk1f4hmqzyx63h4m691qji7838g2nk49k7";
};
patches = nixpkgsPatches ++ [
diff --git a/pkgs/applications/networking/browsers/qtchan/default.nix b/pkgs/applications/networking/browsers/qtchan/default.nix
index f6bc05371f3..df956addf5c 100644
--- a/pkgs/applications/networking/browsers/qtchan/default.nix
+++ b/pkgs/applications/networking/browsers/qtchan/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, qt, makeWrapper }:
+{ stdenv, fetchFromGitHub, fetchpatch, qt, makeWrapper }:
stdenv.mkDerivation rec {
name = "qtchan-${version}";
@@ -11,6 +11,13 @@ stdenv.mkDerivation rec {
sha256 = "0n94jd6b1y8v6x5lkinr9rzm4bjg9xh9m7zj3j73pgq829gpmj3a";
};
+ patches = [
+ (fetchpatch {
+ url = https://github.com/siavash119/qtchan/commit/718abeee5cf4aca8c99b35b26f43909362a29ee6.patch;
+ sha256 = "11b72l5njvfsyapd479hp4yfvwwb1mhq3f077hwgg0waz5l7n00z";
+ })
+ ];
+
enableParallelBuilding = true;
nativeBuildInputs = [ qt.qmake makeWrapper ];
buildInputs = [ qt.qtbase ];
diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix
index 47a273e99f9..a3b6c036416 100644
--- a/pkgs/applications/networking/browsers/qutebrowser/default.nix
+++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix
@@ -28,12 +28,12 @@ let
in python3Packages.buildPythonApplication rec {
pname = "qutebrowser";
- version = "1.4.1";
+ version = "1.4.2";
# the release tarballs are different from the git checkout!
src = fetchurl {
url = "https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/${pname}-${version}.tar.gz";
- sha256 = "0n2z92vb91gpfchdm9wsm712r9grbvxwdp4npl5c1nbq247dxwm3";
+ sha256 = "1pnj47mllg1x34qakxs7s59x8mj262nfhdxgihsb2h2ywjq4fpgx";
};
# Needs tox
@@ -71,15 +71,26 @@ in python3Packages.buildPythonApplication rec {
install -Dm644 doc/qutebrowser.1 "$out/share/man/man1/qutebrowser.1"
install -Dm644 misc/qutebrowser.desktop \
"$out/share/applications/qutebrowser.desktop"
+
+ # Install icons
for i in 16 24 32 48 64 128 256 512; do
install -Dm644 "icons/qutebrowser-''${i}x''${i}.png" \
"$out/share/icons/hicolor/''${i}x''${i}/apps/qutebrowser.png"
done
install -Dm644 icons/qutebrowser.svg \
"$out/share/icons/hicolor/scalable/apps/qutebrowser.svg"
+
+ # Install scripts
+ sed -i "s,/usr/bin/qutebrowser,$out/bin/qutebrowser,g" scripts/open_url_in_instance.sh
+ install -Dm755 -t "$out/share/qutebrowser/scripts/" scripts/open_url_in_instance.sh
install -Dm755 -t "$out/share/qutebrowser/userscripts/" misc/userscripts/*
- install -Dm755 -t "$out/share/qutebrowser/scripts/" \
- scripts/{importer.py,dictcli.py,keytester.py,open_url_in_instance.sh,utils.py}
+
+ # Install and patch python scripts
+ buildPythonPath "$out $propagatedBuildInputs"
+ for i in importer dictcli keytester utils; do
+ install -Dm755 -t "$out/share/qutebrowser/scripts/" scripts/$i.py
+ patchPythonScript "$out/share/qutebrowser/scripts/$i.py"
+ done
'';
postFixup = lib.optionalString (! withWebEngineDefault) ''
diff --git a/pkgs/applications/networking/cluster/helm/default.nix b/pkgs/applications/networking/cluster/helm/default.nix
index d09e65a4caa..bd00404b536 100644
--- a/pkgs/applications/networking/cluster/helm/default.nix
+++ b/pkgs/applications/networking/cluster/helm/default.nix
@@ -5,10 +5,10 @@ let
then "linux-amd64"
else "darwin-amd64";
checksum = if isLinux
- then "1fk6w6sajdi6iphxrzi9r7xfyaf923nxcqnl01s6x3f611fjvbjn"
- else "1jzgy641hm3khj0bakfbr5wd5zl3s7w5jb622fjv2jxwmnv7dxiv";
+ then "1zig6ihmxcaw2wsbdd85yf1zswqcifw0hvbp1zws7r5ihd4yv8hg"
+ else "1l8y9i8vhibhwbn5kn5qp722q4dcx464kymlzy2bkmhiqbxnnkkw";
pname = "helm";
- version = "2.9.1";
+ version = "2.10.0";
in
stdenv.mkDerivation {
name = "${pname}-${version}";
diff --git a/pkgs/applications/networking/cluster/kops/default.nix b/pkgs/applications/networking/cluster/kops/default.nix
index 5f7a2e8e284..6ffe40d6a3d 100644
--- a/pkgs/applications/networking/cluster/kops/default.nix
+++ b/pkgs/applications/networking/cluster/kops/default.nix
@@ -3,7 +3,7 @@
buildGoPackage rec {
name = "kops-${version}";
- version = "1.9.0";
+ version = "1.10.0";
goPackagePath = "k8s.io/kops";
@@ -11,7 +11,7 @@ buildGoPackage rec {
rev = version;
owner = "kubernetes";
repo = "kops";
- sha256 = "03avkm7gk2dqyvd7245qsca1sbhwk41j9yhc208gcmjgjhkx2vn7";
+ sha256 = "1ga83sbhvhcazran6xfwgv95sg8ygg2w59vql0yjicj8r2q01vqp";
};
buildInputs = [go-bindata];
diff --git a/pkgs/applications/networking/instant-messengers/dino/default.nix b/pkgs/applications/networking/instant-messengers/dino/default.nix
index 3682097e302..777057b327b 100644
--- a/pkgs/applications/networking/instant-messengers/dino/default.nix
+++ b/pkgs/applications/networking/instant-messengers/dino/default.nix
@@ -13,13 +13,13 @@
}:
stdenv.mkDerivation rec {
- name = "dino-unstable-2018-07-08";
+ name = "dino-unstable-2018-09-05";
src = fetchFromGitHub {
owner = "dino";
repo = "dino";
- rev = "df8b5fcb722c4a33ed18cbbaafecb206f127b849";
- sha256 = "1r7h9pxix0sylnwab7a8lir9h5yssk98128x2bzva77id9id33vi";
+ rev = "79e0aee5fdb90830fad748fdfae717cb5fbf91f9";
+ sha256 = "1sfh729fg6c5ds3rcma13paqnvv58jln34s93j74jnca19wgn7k5";
fetchSubmodules = true;
};
diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
index 516abb4c9c0..99cd8371aa9 100644
--- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
@@ -55,11 +55,11 @@ let
in stdenv.mkDerivation rec {
name = "signal-desktop-${version}";
- version = "1.15.5";
+ version = "1.16.0";
src = fetchurl {
url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb";
- sha256 = "1a63kyxbhdaz6izprg8wryvscmvfjii50xi1v5pxlf74x2pkxs8k";
+ sha256 = "0hw5h1m8fijhqybx0xijrkifn5wl50qibaxkn2mxqf4mjwlvaw9a";
};
phases = [ "unpackPhase" "installPhase" ];
diff --git a/pkgs/applications/networking/instant-messengers/swift-im/default.nix b/pkgs/applications/networking/instant-messengers/swift-im/default.nix
index e3b3d719189..8316c560b06 100644
--- a/pkgs/applications/networking/instant-messengers/swift-im/default.nix
+++ b/pkgs/applications/networking/instant-messengers/swift-im/default.nix
@@ -14,7 +14,7 @@ in stdenv.mkDerivation rec {
sha256 = "0w0aiszjd58ynxpacwcgf052zpmbpcym4dhci64vbfgch6wryz0w";
};
- patches = [ ./scons.patch ];
+ patches = [ ./qt-5.11.patch ./scons.patch ];
nativeBuildInputs = [ pkgconfig qttools scons ];
@@ -28,6 +28,8 @@ in stdenv.mkDerivation rec {
NIX_CFLAGS_COMPILE = [
"-I${libxml2.dev}/include/libxml2"
"-I${miniupnpc}/include/miniupnpc"
+ "-I${qtwebkit.dev}/include/QtWebKit"
+ "-I${qtwebkit.dev}/include/QtWebKitWidgets"
];
buildPhase = ''
diff --git a/pkgs/applications/networking/instant-messengers/swift-im/qt-5.11.patch b/pkgs/applications/networking/instant-messengers/swift-im/qt-5.11.patch
new file mode 100644
index 00000000000..911e7570427
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/swift-im/qt-5.11.patch
@@ -0,0 +1,10 @@
+--- a/Swift/QtUI/UserSearch/QtUserSearchWindow.h
++++ b/Swift/QtUI/UserSearch/QtUserSearchWindow.h
+@@ -8,6 +8,7 @@
+
+ #include
+
++#include
+ #include
+
+ #include
diff --git a/pkgs/applications/networking/irc/weechat/aggregate-commands.patch b/pkgs/applications/networking/irc/weechat/aggregate-commands.patch
new file mode 100644
index 00000000000..41e3c54a2d5
--- /dev/null
+++ b/pkgs/applications/networking/irc/weechat/aggregate-commands.patch
@@ -0,0 +1,110 @@
+diff --git a/src/core/wee-command.c b/src/core/wee-command.c
+index 91c3c068d..8105e4171 100644
+--- a/src/core/wee-command.c
++++ b/src/core/wee-command.c
+@@ -8345,10 +8345,20 @@ command_exec_list (const char *command_list)
+ void
+ command_startup (int plugins_loaded)
+ {
++ int i;
++
+ if (plugins_loaded)
+ {
+ command_exec_list (CONFIG_STRING(config_startup_command_after_plugins));
+- command_exec_list (weechat_startup_commands);
++ if (weechat_startup_commands)
++ {
++ for (i = 0; i < weelist_size (weechat_startup_commands); i++)
++ {
++ command_exec_list (
++ weelist_string (
++ weelist_get (weechat_startup_commands, i)));
++ }
++ }
+ }
+ else
+ command_exec_list (CONFIG_STRING(config_startup_command_before_plugins));
+diff --git a/src/core/weechat.c b/src/core/weechat.c
+index f74598ad5..ff2e539d1 100644
+--- a/src/core/weechat.c
++++ b/src/core/weechat.c
+@@ -60,6 +60,7 @@
+ #include "wee-eval.h"
+ #include "wee-hdata.h"
+ #include "wee-hook.h"
++#include "wee-list.h"
+ #include "wee-log.h"
+ #include "wee-network.h"
+ #include "wee-proxy.h"
+@@ -102,7 +103,8 @@ int weechat_no_gnutls = 0; /* remove init/deinit of gnutls */
+ /* (useful with valgrind/electric-f.)*/
+ int weechat_no_gcrypt = 0; /* remove init/deinit of gcrypt */
+ /* (useful with valgrind) */
+-char *weechat_startup_commands = NULL; /* startup commands (-r flag) */
++struct t_weelist *weechat_startup_commands = NULL; /* startup commands */
++ /* (option -r) */
+
+
+ /*
+@@ -152,9 +154,13 @@ weechat_display_usage ()
+ " -h, --help display this help\n"
+ " -l, --license display WeeChat license\n"
+ " -p, --no-plugin don't load any plugin at startup\n"
+- " -r, --run-command run command(s) after startup\n"
+- " (many commands can be separated by "
+- "semicolons)\n"
++ " -P, --plugins load only these plugins at startup\n"
++ " (see /help weechat.plugin.autoload)\n"
++ " -r, --run-command run command(s) after startup;\n"
++ " many commands can be separated by "
++ "semicolons,\n"
++ " this option can be given multiple "
++ "times\n"
+ " -s, --no-script don't load any script at startup\n"
+ " --upgrade upgrade WeeChat using session files "
+ "(see /help upgrade in WeeChat)\n"
+@@ -276,9 +282,10 @@ weechat_parse_args (int argc, char *argv[])
+ {
+ if (i + 1 < argc)
+ {
+- if (weechat_startup_commands)
+- free (weechat_startup_commands);
+- weechat_startup_commands = strdup (argv[++i]);
++ if (!weechat_startup_commands)
++ weechat_startup_commands = weelist_new ();
++ weelist_add (weechat_startup_commands, argv[++i],
++ WEECHAT_LIST_POS_END, NULL);
+ }
+ else
+ {
+@@ -616,6 +623,8 @@ weechat_shutdown (int return_code, int crash)
+ free (weechat_home);
+ if (weechat_local_charset)
+ free (weechat_local_charset);
++ if (weechat_startup_commands)
++ weelist_free (weechat_startup_commands);
+
+ if (crash)
+ abort ();
+diff --git a/src/core/weechat.h b/src/core/weechat.h
+index 9420ff415..cbb565a03 100644
+--- a/src/core/weechat.h
++++ b/src/core/weechat.h
+@@ -96,6 +96,8 @@
+ /* name of environment variable with an extra lib dir */
+ #define WEECHAT_EXTRA_LIBDIR "WEECHAT_EXTRA_LIBDIR"
+
++struct t_weelist;
++
+ /* global variables and functions */
+ extern int weechat_headless;
+ extern int weechat_debug_core;
+@@ -112,7 +114,7 @@ extern char *weechat_local_charset;
+ extern int weechat_plugin_no_dlclose;
+ extern int weechat_no_gnutls;
+ extern int weechat_no_gcrypt;
+-extern char *weechat_startup_commands;
++extern struct t_weelist *weechat_startup_commands;
+
+ extern void weechat_term_check ();
+ extern void weechat_shutdown (int return_code, int crash);
diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix
index 16162435e09..a9de275559d 100644
--- a/pkgs/applications/networking/irc/weechat/default.nix
+++ b/pkgs/applications/networking/irc/weechat/default.nix
@@ -12,7 +12,8 @@
, tclSupport ? true, tcl
, extraBuildInputs ? []
, configure ? { availablePlugins, ... }: { plugins = builtins.attrValues availablePlugins; }
-, runCommand }:
+, runCommand, buildEnv
+}:
let
inherit (pythonPackages) python;
@@ -29,12 +30,12 @@ let
weechat =
assert lib.all (p: p.enabled -> ! (builtins.elem null p.buildInputs)) plugins;
stdenv.mkDerivation rec {
- version = "2.1";
+ version = "2.2";
name = "weechat-${version}";
src = fetchurl {
url = "http://weechat.org/files/src/weechat-${version}.tar.bz2";
- sha256 = "0fq68wgynv2c3319gmzi0lz4ln4yrrk755y5mbrlr7fc1sx7ffd8";
+ sha256 = "0p4nhh7f7w4q77g7jm9i6fynndqlgjkc9dk5g1xb4gf9imiisqlg";
};
outputs = [ "out" "man" ] ++ map (p: p.name) enabledPlugins;
@@ -69,6 +70,13 @@ let
done
'';
+ # remove when bumping to the latest version.
+ # This patch basically rebases `fcf7469d7664f37e94d5f6d0b3fe6fce6413f88c`
+ # from weechat upstream to weechat-2.2.
+ patches = [
+ ./aggregate-commands.patch
+ ];
+
meta = {
homepage = http://www.weechat.org/;
description = "A fast, light and extensible chat client";
@@ -78,38 +86,38 @@ let
on https://nixos.org/nixpkgs/manual/#sec-weechat .
'';
license = stdenv.lib.licenses.gpl3;
- maintainers = with stdenv.lib.maintainers; [ lovek323 garbas the-kenny lheckemann ];
+ maintainers = with stdenv.lib.maintainers; [ lovek323 garbas the-kenny lheckemann ma27 ];
platforms = stdenv.lib.platforms.unix;
};
};
in if configure == null then weechat else
let
perlInterpreter = perl;
- config = configure {
- availablePlugins = let
- simplePlugin = name: {pluginFile = "${weechat.${name}}/lib/weechat/plugins/${name}.so";};
- in rec {
- python = {
- pluginFile = "${weechat.python}/lib/weechat/plugins/python.so";
- withPackages = pkgsFun: (python // {
- extraEnv = ''
- export PYTHONHOME="${pythonPackages.python.withPackages pkgsFun}"
- '';
- });
- };
- perl = (simplePlugin "perl") // {
+ availablePlugins = let
+ simplePlugin = name: {pluginFile = "${weechat.${name}}/lib/weechat/plugins/${name}.so";};
+ in rec {
+ python = {
+ pluginFile = "${weechat.python}/lib/weechat/plugins/python.so";
+ withPackages = pkgsFun: (python // {
extraEnv = ''
- export PATH="${perlInterpreter}/bin:$PATH"
+ export PYTHONHOME="${pythonPackages.python.withPackages pkgsFun}"
'';
- };
- tcl = simplePlugin "tcl";
- ruby = simplePlugin "ruby";
- guile = simplePlugin "guile";
- lua = simplePlugin "lua";
+ });
};
+ perl = (simplePlugin "perl") // {
+ extraEnv = ''
+ export PATH="${perlInterpreter}/bin:$PATH"
+ '';
+ };
+ tcl = simplePlugin "tcl";
+ ruby = simplePlugin "ruby";
+ guile = simplePlugin "guile";
+ lua = simplePlugin "lua";
};
- inherit (config) plugins;
+ config = configure { inherit availablePlugins; };
+
+ plugins = config.plugins or (builtins.attrValues availablePlugins);
pluginsDir = runCommand "weechat-plugins" {} ''
mkdir -p $out/plugins
@@ -117,13 +125,29 @@ in if configure == null then weechat else
ln -s $plugin $out/plugins
done
'';
- in (writeScriptBin "weechat" ''
- #!${stdenv.shell}
- export WEECHAT_EXTRA_LIBDIR=${pluginsDir}
- ${lib.concatMapStringsSep "\n" (p: lib.optionalString (p ? extraEnv) p.extraEnv) plugins}
- exec ${weechat}/bin/weechat "$@"
- '') // {
- name = weechat.name;
- unwrapped = weechat;
- meta = weechat.meta;
+
+ init = let
+ init = builtins.replaceStrings [ "\n" ] [ ";" ] (config.init or "");
+
+ mkScript = drv: lib.flip map drv.scripts (script: "/script load ${drv}/share/${script}");
+
+ scripts = builtins.concatStringsSep ";" (lib.foldl (scripts: drv: scripts ++ mkScript drv)
+ [ ] (config.scripts or []));
+ in "${scripts};${init}";
+
+ mkWeechat = bin: (writeScriptBin bin ''
+ #!${stdenv.shell}
+ export WEECHAT_EXTRA_LIBDIR=${pluginsDir}
+ ${lib.concatMapStringsSep "\n" (p: lib.optionalString (p ? extraEnv) p.extraEnv) plugins}
+ exec ${weechat}/bin/${bin} "$@" --run-command ${lib.escapeShellArg init}
+ '') // {
+ inherit (weechat) name meta;
+ unwrapped = weechat;
+ };
+ in buildEnv {
+ name = "weechat-bin-env";
+ paths = [
+ (mkWeechat "weechat")
+ (mkWeechat "weechat-headless")
+ ];
}
diff --git a/pkgs/applications/networking/irc/weechat/scripts/default.nix b/pkgs/applications/networking/irc/weechat/scripts/default.nix
new file mode 100644
index 00000000000..21038a2fa96
--- /dev/null
+++ b/pkgs/applications/networking/irc/weechat/scripts/default.nix
@@ -0,0 +1,13 @@
+{ callPackage, luaPackages, pythonPackages }:
+
+{
+ weechat-xmpp = callPackage ./weechat-xmpp {
+ inherit (pythonPackages) pydns;
+ };
+
+ weechat-matrix-bridge = callPackage ./weechat-matrix-bridge {
+ inherit (luaPackages) cjson;
+ };
+
+ wee-slack = callPackage ./wee-slack { };
+}
diff --git a/pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix b/pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix
new file mode 100644
index 00000000000..1b6e5215744
--- /dev/null
+++ b/pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+ name = "wee-slack-${version}";
+ version = "2.1.1";
+
+ src = fetchFromGitHub {
+ repo = "wee-slack";
+ owner = "wee-slack";
+ rev = "v${version}";
+ sha256 = "05caackz645aw6kljmiihiy7xz9jld8b9blwpmh0cnaihavgj1wc";
+ };
+
+ passthru.scripts = [ "wee_slack.py" ];
+
+ installPhase = ''
+ mkdir -p $out/share
+ cp wee_slack.py $out/share/wee_slack.py
+ '';
+
+ meta = with stdenv.lib; {
+ homepage = https://github.com/wee-slack/wee-slack;
+ license = licenses.mit;
+ maintainers = with maintainers; [ ma27 ];
+ description = ''
+ A WeeChat plugin for Slack.com. Synchronizes read markers, provides typing notification, search, etc..
+ '';
+ };
+}
diff --git a/pkgs/applications/networking/instant-messengers/weechat-matrix-bridge/default.nix b/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix-bridge/default.nix
similarity index 96%
rename from pkgs/applications/networking/instant-messengers/weechat-matrix-bridge/default.nix
rename to pkgs/applications/networking/irc/weechat/scripts/weechat-matrix-bridge/default.nix
index 4a8ffaaa261..1018e46ec62 100644
--- a/pkgs/applications/networking/instant-messengers/weechat-matrix-bridge/default.nix
+++ b/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix-bridge/default.nix
@@ -25,6 +25,8 @@ stdenv.mkDerivation {
--replace "__NIX_LIB_PATH__" "$out/lib/?.so"
'';
+ passthru.scripts = [ "olm.lua" "matrix.lua" ];
+
installPhase = ''
mkdir -p $out/{share,lib}
diff --git a/pkgs/applications/networking/instant-messengers/weechat-matrix-bridge/library-path.patch b/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix-bridge/library-path.patch
similarity index 100%
rename from pkgs/applications/networking/instant-messengers/weechat-matrix-bridge/library-path.patch
rename to pkgs/applications/networking/irc/weechat/scripts/weechat-matrix-bridge/library-path.patch
diff --git a/pkgs/applications/networking/instant-messengers/weechat-xmpp/default.nix b/pkgs/applications/networking/irc/weechat/scripts/weechat-xmpp/default.nix
similarity index 95%
rename from pkgs/applications/networking/instant-messengers/weechat-xmpp/default.nix
rename to pkgs/applications/networking/irc/weechat/scripts/weechat-xmpp/default.nix
index 4b92d1212c5..dad5b9c5e02 100644
--- a/pkgs/applications/networking/instant-messengers/weechat-xmpp/default.nix
+++ b/pkgs/applications/networking/irc/weechat/scripts/weechat-xmpp/default.nix
@@ -25,6 +25,8 @@ stdenv.mkDerivation {
})
];
+ passthru.scripts = [ "jabber.py" ];
+
meta = with stdenv.lib; {
description = "A fork of the jabber plugin for weechat";
homepage = "https://github.com/sleduc/weechat-xmpp";
diff --git a/pkgs/applications/networking/instant-messengers/weechat-xmpp/libpath.patch b/pkgs/applications/networking/irc/weechat/scripts/weechat-xmpp/libpath.patch
similarity index 100%
rename from pkgs/applications/networking/instant-messengers/weechat-xmpp/libpath.patch
rename to pkgs/applications/networking/irc/weechat/scripts/weechat-xmpp/libpath.patch
diff --git a/pkgs/applications/office/gnumeric/default.nix b/pkgs/applications/office/gnumeric/default.nix
index e196b1bd0d7..c155d696d39 100644
--- a/pkgs/applications/office/gnumeric/default.nix
+++ b/pkgs/applications/office/gnumeric/default.nix
@@ -9,11 +9,11 @@ let
isonum = fetchurl { url = http://www.oasis-open.org/docbook/xml/4.5/ent/isonum.ent; sha256 = "04b62dw2g3cj9i4vn9xyrsrlz8fpmmijq98dm0nrkky31bwbbrs3"; };
isogrk1 = fetchurl { url = http://www.oasis-open.org/docbook/xml/4.5/ent/isogrk1.ent; sha256 = "04b23anhs5wr62n4rgsjirzvw7rpjcsf8smz4ffzaqh3b0vw90vm"; };
in stdenv.mkDerivation rec {
- name = "gnumeric-1.12.39";
+ name = "gnumeric-1.12.43";
src = fetchurl {
url = "mirror://gnome/sources/gnumeric/1.12/${name}.tar.xz";
- sha256 = "26cceb7fa97dc7eee7181a79a6251a85b1f1464dcaaaf7624829f7439c5f7d3f";
+ sha256 = "87c9abd6260cf29401fa1e0fcce374e8c7bcd1986608e4049f6037c9d32b5fd5";
};
configureFlags = [ "--disable-component" ];
diff --git a/pkgs/applications/office/libreoffice/default-primary-src.nix b/pkgs/applications/office/libreoffice/default-primary-src.nix
index 87fe343613e..446efe78d25 100644
--- a/pkgs/applications/office/libreoffice/default-primary-src.nix
+++ b/pkgs/applications/office/libreoffice/default-primary-src.nix
@@ -2,9 +2,9 @@
rec {
major = "6";
- minor = "0";
- patch = "5";
- tweak = "2";
+ minor = "1";
+ patch = "0";
+ tweak = "3";
subdir = "${major}.${minor}.${patch}";
@@ -12,6 +12,6 @@ rec {
src = fetchurl {
url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz";
- sha256 = "16h60j7h9z48vfhhj22m64myksnrrgrnh0qc6i4bxgshmm8kkzdn";
+ sha256 = "54eccd268f75d62fa6ab78d25685719c109257e1c0f4d628eae92ec09632ebd8";
};
}
diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix
index 22c044d199a..2de1ed92dea 100644
--- a/pkgs/applications/office/libreoffice/default.nix
+++ b/pkgs/applications/office/libreoffice/default.nix
@@ -6,7 +6,7 @@
, openssl, gperf, cppunit, GConf, ORBit2, poppler, utillinux
, librsvg, gnome_vfs, libGLU_combined, bsh, CoinMP, libwps, libabw
, autoconf, automake, openldap, bash, hunspell, librdf_redland, nss, nspr
-, libwpg, dbus-glib, glibc, qt4, clucene_core, libcdr, lcms, vigra
+, libwpg, dbus-glib, qt4, clucene_core, libcdr, lcms, vigra
, unixODBC, mdds, sane-backends, mythes, libexttextcat, libvisio
, fontsConf, pkgconfig, bluez5, libtool, carlito
, libatomic_ops, graphite2, harfbuzz, libodfgen, libzmf
@@ -34,22 +34,28 @@ let
};
srcs = {
- third_party = [ (let md5 = "185d60944ea767075d27247c3162b3bc"; in fetchurl rec {
- url = "https://dev-www.libreoffice.org/extern/${md5}-${name}";
- sha256 = "1infwvv1p6i21scywrldsxs22f62x85mns4iq8h6vr6vlx3fdzga";
- name = "unowinreg.dll";
- }) ] ++ (map (x : ((fetchurl {inherit (x) url sha256 name;}) // {inherit (x) md5name md5;})) (import ./libreoffice-srcs.nix));
+ third_party =
+ map (x : ((fetchurl {inherit (x) url sha256 name;}) // {inherit (x) md5name md5;}))
+ ((import ./libreoffice-srcs.nix) ++ [
+ (rec {
+ name = "unowinreg.dll";
+ url = "https://dev-www.libreoffice.org/extern/${md5name}";
+ sha256 = "1infwvv1p6i21scywrldsxs22f62x85mns4iq8h6vr6vlx3fdzga";
+ md5 = "185d60944ea767075d27247c3162b3bc";
+ md5name = "${md5}-${name}";
+ })
+ ]);
translations = fetchSrc {
name = "translations";
- sha256 = "1p8gb9jxv4n8ggksbfsqzdw5amxg575grxifsabhgjllpisjzrlr";
+ sha256 = "140i0q6nyi2l6nv2b3n7s7mggm2rb1ws3h9awa9y6m2iads54qm7";
};
# TODO: dictionaries
help = fetchSrc {
name = "help";
- sha256 = "1dkzm766zi4msk6w35bvfk5b5bx1xyqg2wx58wklr5375kjv6ba9";
+ sha256 = "0ayssl5ivhyzxi3gz3h4yhp8hq7ihig6n6iijbks5f1sm7dwridv";
};
};
@@ -58,26 +64,18 @@ in stdenv.mkDerivation rec {
inherit (primary-src) src;
- # Openoffice will open libcups dynamically, so we link it directly
- # to make its dlopen work.
- # It also seems not to mention libdl explicitly in some places.
- NIX_LDFLAGS = "-lcups -ldl";
-
# For some reason librdf_redland sometimes refers to rasqal.h instead
# of rasqal/rasqal.h
- # And LO refers to gpgme++ by no-path name
- NIX_CFLAGS_COMPILE="-I${librdf_rasqal}/include/rasqal -I${gpgme.dev}/include/gpgme++";
-
- # If we call 'configure', 'make' will then call configure again without parameters.
- # It's their system.
- configureScript = "./autogen.sh";
- dontUseCmakeConfigure = true;
+ NIX_CFLAGS_COMPILE = [ "-I${librdf_rasqal}/include/rasqal" ];
patches = [ ./xdg-open-brief.patch ];
postUnpack = ''
mkdir -v $sourceRoot/src
- '' + (stdenv.lib.concatMapStrings (f: "ln -sfv ${f} $sourceRoot/src/${f.md5 or f.outputHash}-${f.name}\nln -sfv ${f} $sourceRoot/src/${f.name}\n") srcs.third_party)
+ '' + (lib.flip lib.concatMapStrings srcs.third_party (f: ''
+ ln -sfv ${f} $sourceRoot/src/${f.md5name}
+ ln -sfv ${f} $sourceRoot/src/${f.name}
+ ''))
+ ''
ln -sv ${srcs.help} $sourceRoot/src/${srcs.help.name}
ln -svf ${srcs.translations} $sourceRoot/src/${srcs.translations.name}
@@ -85,14 +83,20 @@ in stdenv.mkDerivation rec {
postPatch = ''
sed -e 's@/usr/bin/xdg-open@xdg-open@g' -i shell/source/unix/exec/shellexec.cxx
+
+ # configure checks for header 'gpgme++/gpgmepp_version.h',
+ # and if it is found (no matter where) uses a hardcoded path
+ # in what presumably is an effort to make it possible to write
+ # '#include ' instead of '#include '.
+ #
+ # Fix this path to point to where the headers can actually be found instead.
+ substituteInPlace configure.ac --replace \
+ 'GPGMEPP_CFLAGS=-I/usr/include/gpgme++' \
+ 'GPGMEPP_CFLAGS=-I${gpgme.dev}/include/gpgme++'
'';
QT4DIR = qt4;
- # Fix boost 1.59 compat
- # Try removing in the next version
- CPPFLAGS = "-DBOOST_ERROR_CODE_HEADER_ONLY -DBOOST_SYSTEM_NO_DEPRECATED";
-
preConfigure = ''
configureFlagsArray=(
"--with-parallelism=$NIX_BUILD_CORES"
@@ -101,69 +105,72 @@ in stdenv.mkDerivation rec {
chmod a+x ./bin/unpack-sources
patchShebangs .
- # It is used only as an indicator of the proper current directory
- touch solenv/inc/target.mk
-
- # BLFS patch for Glibc 2.23 renaming isnan
- sed -ire "s@isnan@std::&@g" xmloff/source/draw/ximp3dscene.cxx
# This is required as some cppunittests require fontconfig configured
cp "${fontsConf}" fonts.conf
sed -e '/include/i${carlito}/etc/fonts/conf.d' -i fonts.conf
export FONTCONFIG_FILE="$PWD/fonts.conf"
+
+ NOCONFIGURE=1 ./autogen.sh
'';
- # fetch_Download_item tries to interpret the name as a variable name
- # Let it do so…
- postConfigure = ''
- sed -e '1ilibreoffice-translations-${version}.tar.xz=libreoffice-translations-${version}.tar.xz' -i Makefile
- sed -e '1ilibreoffice-help-${version}.tar.xz=libreoffice-help-${version}.tar.xz' -i Makefile
+ postConfigure =
+ # fetch_Download_item tries to interpret the name as a variable name, let it do so...
+ ''
+ sed -e '1ilibreoffice-translations-${version}.tar.xz=libreoffice-translations-${version}.tar.xz' -i Makefile
+ sed -e '1ilibreoffice-help-${version}.tar.xz=libreoffice-help-${version}.tar.xz' -i Makefile
+ ''
+ # Test fixups
+ # May need to be revisited/pruned, left alone for now.
+ + ''
+ # unit test sd_tiledrendering seems to be fragile
+ # https://nabble.documentfoundation.org/libreoffice-5-0-failure-in-CUT-libreofficekit-tiledrendering-td4150319.html
+ echo > ./sd/CppunitTest_sd_tiledrendering.mk
+ sed -e /CppunitTest_sd_tiledrendering/d -i sd/Module_sd.mk
+ # one more fragile test?
+ sed -e '/CPPUNIT_TEST(testTdf96536);/d' -i sw/qa/extras/uiwriter/uiwriter.cxx
+ # this I actually hate, this should be a data consistency test!
+ sed -e '/CPPUNIT_TEST(testTdf115013);/d' -i sw/qa/extras/uiwriter/uiwriter.cxx
+ # rendering-dependent test
+ sed -e '/CPPUNIT_ASSERT_EQUAL(11148L, pOleObj->GetLogicRect().getWidth());/d ' -i sc/qa/unit/subsequent_filters-test.cxx
+ # tilde expansion in path processing checks the existence of $HOME
+ sed -e 's@OString sSysPath("~/tmp");@& return ; @' -i sal/qa/osl/file/osl_File.cxx
+ # rendering-dependent: on my computer the test table actually doesn't fit…
+ # interesting fact: test disabled on macOS by upstream
+ sed -re '/DECLARE_WW8EXPORT_TEST[(]testTableKeep, "tdf91083.odt"[)]/,+5d' -i ./sw/qa/extras/ww8export/ww8export.cxx
+ # Segfault on DB access — maybe temporarily acceptable for a new version of Fresh?
+ sed -e 's/CppunitTest_dbaccess_empty_stdlib_save//' -i ./dbaccess/Module_dbaccess.mk
+ # one more fragile test?
+ sed -e '/CPPUNIT_TEST(testTdf77014);/d' -i sw/qa/extras/uiwriter/uiwriter.cxx
+ # rendering-dependent tests
+ sed -e '/CPPUNIT_TEST(testCustomColumnWidthExportXLSX)/d' -i sc/qa/unit/subsequent_export-test.cxx
+ sed -e '/CPPUNIT_TEST(testColumnWidthExportFromODStoXLSX)/d' -i sc/qa/unit/subsequent_export-test.cxx
+ sed -e '/CPPUNIT_TEST(testChartImportXLS)/d' -i sc/qa/unit/subsequent_filters-test.cxx
+ sed -zre 's/DesktopLOKTest::testGetFontSubset[^{]*[{]/& return; /' -i desktop/qa/desktop_lib/test_desktop_lib.cxx
+ sed -z -r -e 's/DECLARE_OOXMLEXPORT_TEST[(]testFlipAndRotateCustomShape,[^)]*[)].[{]/& return;/' -i sw/qa/extras/ooxmlexport/ooxmlexport7.cxx
+ sed -z -r -e 's/DECLARE_OOXMLEXPORT_TEST[(]tdf105490_negativeMargins,[^)]*[)].[{]/& return;/' -i sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
+ sed -z -r -e 's/DECLARE_OOXMLIMPORT_TEST[(]testTdf112443,[^)]*[)].[{]/& return;/' -i sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+ sed -z -r -e 's/DECLARE_RTFIMPORT_TEST[(]testTdf108947,[^)]*[)].[{]/& return;/' -i sw/qa/extras/rtfimport/rtfimport.cxx
+ # not sure about this fragile test
+ sed -z -r -e 's/DECLARE_OOXMLEXPORT_TEST[(]testTDF87348,[^)]*[)].[{]/& return;/' -i sw/qa/extras/ooxmlexport/ooxmlexport7.cxx
+ ''
+ # This to avoid using /lib:/usr/lib at linking
+ + ''
+ sed -i '/gb_LinkTarget_LDFLAGS/{ n; /rpath-link/d;}' solenv/gbuild/platform/unxgcc.mk
- # unit test sd_tiledrendering seems to be fragile
- # https://nabble.documentfoundation.org/libreoffice-5-0-failure-in-CUT-libreofficekit-tiledrendering-td4150319.html
- echo > ./sd/CppunitTest_sd_tiledrendering.mk
- sed -e /CppunitTest_sd_tiledrendering/d -i sd/Module_sd.mk
- # one more fragile test?
- sed -e '/CPPUNIT_TEST(testTdf96536);/d' -i sw/qa/extras/uiwriter/uiwriter.cxx
- # this I actually hate, this should be a data consistency test!
- sed -e '/CPPUNIT_TEST(testTdf115013);/d' -i sw/qa/extras/uiwriter/uiwriter.cxx
- # rendering-dependent test
- sed -e '/CPPUNIT_ASSERT_EQUAL(11148L, pOleObj->GetLogicRect().getWidth());/d ' -i sc/qa/unit/subsequent_filters-test.cxx
- # tilde expansion in path processing checks the existence of $HOME
- sed -e 's@OString sSysPath("~/tmp");@& return ; @' -i sal/qa/osl/file/osl_File.cxx
- # rendering-dependent: on my computer the test table actually doesn't fit…
- # interesting fact: test disabled on macOS by upstream
- sed -re '/DECLARE_WW8EXPORT_TEST[(]testTableKeep, "tdf91083.odt"[)]/,+5d' -i ./sw/qa/extras/ww8export/ww8export.cxx
- # Segfault on DB access — maybe temporarily acceptable for a new version of Fresh?
- sed -e 's/CppunitTest_dbaccess_empty_stdlib_save//' -i ./dbaccess/Module_dbaccess.mk
- # one more fragile test?
- sed -e '/CPPUNIT_TEST(testTdf77014);/d' -i sw/qa/extras/uiwriter/uiwriter.cxx
- # rendering-dependent tests
- sed -e '/CPPUNIT_TEST(testCustomColumnWidthExportXLSX)/d' -i sc/qa/unit/subsequent_export-test.cxx
- sed -e '/CPPUNIT_TEST(testColumnWidthExportFromODStoXLSX)/d' -i sc/qa/unit/subsequent_export-test.cxx
- sed -e '/CPPUNIT_TEST(testChartImportXLS)/d' -i sc/qa/unit/subsequent_filters-test.cxx
- sed -zre 's/DesktopLOKTest::testGetFontSubset[^{]*[{]/& return; /' -i desktop/qa/desktop_lib/test_desktop_lib.cxx
- sed -z -r -e 's/DECLARE_OOXMLEXPORT_TEST[(]testFlipAndRotateCustomShape,[^)]*[)].[{]/& return;/' -i sw/qa/extras/ooxmlexport/ooxmlexport7.cxx
- sed -z -r -e 's/DECLARE_OOXMLEXPORT_TEST[(]tdf105490_negativeMargins,[^)]*[)].[{]/& return;/' -i sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
- sed -z -r -e 's/DECLARE_OOXMLIMPORT_TEST[(]testTdf112443,[^)]*[)].[{]/& return;/' -i sw/qa/extras/ooxmlimport/ooxmlimport.cxx
- sed -z -r -e 's/DECLARE_RTFIMPORT_TEST[(]testTdf108947,[^)]*[)].[{]/& return;/' -i sw/qa/extras/rtfimport/rtfimport.cxx
- # not sure about this fragile test
- sed -z -r -e 's/DECLARE_OOXMLEXPORT_TEST[(]testTDF87348,[^)]*[)].[{]/& return;/' -i sw/qa/extras/ooxmlexport/ooxmlexport7.cxx
- '';
+ find -name "*.cmd" -exec sed -i s,/lib:/usr/lib,, {} \;
+ '';
makeFlags = "SHELL=${bash}/bin/bash";
enableParallelBuilding = true;
buildPhase = ''
- # This to avoid using /lib:/usr/lib at linking
- sed -i '/gb_LinkTarget_LDFLAGS/{ n; /rpath-link/d;}' solenv/gbuild/platform/unxgcc.mk
-
- find -name "*.cmd" -exec sed -i s,/lib:/usr/lib,, {} \;
-
- make
+ make build-nocheck
'';
+ doCheck = true;
+
# It installs only things to $out/lib/libreoffice
postInstall = ''
mkdir -p $out/bin $out/share/desktop
@@ -195,11 +202,11 @@ in stdenv.mkDerivation rec {
"--with-vendor=NixOS"
"--with-commons-logging-jar=${commonsLogging}/share/java/commons-logging-1.2.jar"
"--disable-report-builder"
+ "--disable-online-update"
"--enable-python=system"
"--enable-dbus"
"--enable-release-build"
(lib.enableFeature kdeIntegration "kde4")
- "--with-package-format=installed"
"--enable-epm"
"--with-jdk-home=${jdk.home}"
"--with-ant-home=${ant}/lib/ant"
@@ -213,9 +220,13 @@ in stdenv.mkDerivation rec {
"--with-system-openldap"
"--with-system-coinmp"
+ "--with-alloc=system"
+
# Without these, configure does not finish
"--without-junit"
+ "--disable-libnumbertext" # system-libnumbertext"
+
# I imagine this helps. Copied from go-oo.
# Modified on every upgrade, though
"--disable-odk"
@@ -260,7 +271,7 @@ in stdenv.mkDerivation rec {
gst_all_1.gst-plugins-base glib
neon nspr nss openldap openssl ORBit2 pam perl pkgconfig poppler
python3 sablotron sane-backends unzip vigra which zip zlib
- mdds bluez5 glibc libcmis libwps libabw libzmf libtool
+ mdds bluez5 libcmis libwps libabw libzmf libtool
libxshmfence libatomic_ops graphite2 harfbuzz gpgme utillinux
librevenge libe-book libmwaw glm glew ncurses epoxy
libodfgen CoinMP librdf_rasqal defaultIconTheme gettext
diff --git a/pkgs/applications/office/libreoffice/libreoffice-srcs-still.nix b/pkgs/applications/office/libreoffice/libreoffice-srcs-still.nix
index 36500166dcc..94e2564d113 100644
--- a/pkgs/applications/office/libreoffice/libreoffice-srcs-still.nix
+++ b/pkgs/applications/office/libreoffice/libreoffice-srcs-still.nix
@@ -1,10 +1,10 @@
[
{
- name = "libabw-0.1.1.tar.bz2";
- url = "http://dev-www.libreoffice.org/src/libabw-0.1.1.tar.bz2";
- sha256 = "7a3d3415cf82ab9894f601d1b3057c4615060304d5279efdec6275e01b96a199";
+ name = "libabw-0.1.2.tar.xz";
+ url = "http://dev-www.libreoffice.org/src/libabw-0.1.2.tar.xz";
+ sha256 = "0b72944d5af81dda0a5c5803ee84cbac4b81441a4d767aa57029adc6744c2485";
md5 = "";
- md5name = "7a3d3415cf82ab9894f601d1b3057c4615060304d5279efdec6275e01b96a199-libabw-0.1.1.tar.bz2";
+ md5name = "0b72944d5af81dda0a5c5803ee84cbac4b81441a4d767aa57029adc6744c2485-libabw-0.1.2.tar.xz";
}
{
name = "commons-logging-1.2-src.tar.gz";
@@ -28,11 +28,11 @@
md5name = "976a12a59bc286d634a21d7be0841cc74289ea9077aa1af46be19d1a6e844c19-apr-util-1.5.4.tar.gz";
}
{
- name = "boost_1_63_0.tar.bz2";
- url = "http://dev-www.libreoffice.org/src/boost_1_63_0.tar.bz2";
- sha256 = "beae2529f759f6b3bf3f4969a19c2e9d6f0c503edcb2de4a61d1428519fcb3b0";
+ name = "boost_1_65_1.tar.bz2";
+ url = "http://dev-www.libreoffice.org/src/boost_1_65_1.tar.bz2";
+ sha256 = "9807a5d16566c57fd74fb522764e0b134a8bbe6b6e8967b83afefd30dcd3be81";
md5 = "";
- md5name = "beae2529f759f6b3bf3f4969a19c2e9d6f0c503edcb2de4a61d1428519fcb3b0-boost_1_63_0.tar.bz2";
+ md5name = "9807a5d16566c57fd74fb522764e0b134a8bbe6b6e8967b83afefd30dcd3be81-boost_1_65_1.tar.bz2";
}
{
name = "breakpad.zip";
@@ -56,18 +56,18 @@
md5name = "00b516f4704d4a7cb50a1d97e6e8e15b-bzip2-1.0.6.tar.gz";
}
{
- name = "cairo-1.14.8.tar.xz";
- url = "http://dev-www.libreoffice.org/src/cairo-1.14.8.tar.xz";
- sha256 = "d1f2d98ae9a4111564f6de4e013d639cf77155baf2556582295a0f00a9bc5e20";
+ name = "cairo-1.14.10.tar.xz";
+ url = "http://dev-www.libreoffice.org/src/cairo-1.14.10.tar.xz";
+ sha256 = "7e87878658f2c9951a14fc64114d4958c0e65ac47530b8ac3078b2ce41b66a09";
md5 = "";
- md5name = "d1f2d98ae9a4111564f6de4e013d639cf77155baf2556582295a0f00a9bc5e20-cairo-1.14.8.tar.xz";
+ md5name = "7e87878658f2c9951a14fc64114d4958c0e65ac47530b8ac3078b2ce41b66a09-cairo-1.14.10.tar.xz";
}
{
- name = "libcdr-0.1.3.tar.bz2";
- url = "http://dev-www.libreoffice.org/src/libcdr-0.1.3.tar.bz2";
- sha256 = "5160bbbfefe52bd4880840fad2b07a512813e37bfaf8ccac062fca238f230f4d";
+ name = "libcdr-0.1.4.tar.xz";
+ url = "http://dev-www.libreoffice.org/src/libcdr-0.1.4.tar.xz";
+ sha256 = "e7a7e8b00a3df5798110024d7061fe9d1c3330277d2e4fa9213294f966a4a66d";
md5 = "";
- md5name = "5160bbbfefe52bd4880840fad2b07a512813e37bfaf8ccac062fca238f230f4d-libcdr-0.1.3.tar.bz2";
+ md5name = "e7a7e8b00a3df5798110024d7061fe9d1c3330277d2e4fa9213294f966a4a66d-libcdr-0.1.4.tar.xz";
}
{
name = "clucene-core-2.3.3.4.tar.gz";
@@ -90,13 +90,6 @@
md5 = "";
md5name = "86c798780b9e1f5921fe4efe651a93cb420623b45aa1fdff57af8c37f116113f-CoinMP-1.7.6.tgz";
}
- {
- name = "collada2gltf-master-cb1d97788a.tar.bz2";
- url = "http://dev-www.libreoffice.org/src/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2";
- sha256 = "b0adb8e71aef80751b999c9c055e419a625c4a05184e407aef2aee28752ad8cb";
- md5 = "4b87018f7fff1d054939d19920b751a0";
- md5name = "4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2";
- }
{
name = "cppunit-1.14.0.tar.gz";
url = "http://dev-www.libreoffice.org/src/cppunit-1.14.0.tar.gz";
@@ -112,18 +105,18 @@
md5name = "1f467e5bb703f12cbbb09d5cf67ecf4a-converttexttonumber-1-5-0.oxt";
}
{
- name = "curl-7.52.1.tar.gz";
- url = "http://dev-www.libreoffice.org/src/curl-7.52.1.tar.gz";
- sha256 = "a8984e8b20880b621f61a62d95ff3c0763a3152093a9f9ce4287cfd614add6ae";
+ name = "curl-7.60.0.tar.gz";
+ url = "http://dev-www.libreoffice.org/src/curl-7.60.0.tar.gz";
+ sha256 = "e9c37986337743f37fd14fe8737f246e97aec94b39d1b71e8a5973f72a9fc4f5";
md5 = "";
- md5name = "a8984e8b20880b621f61a62d95ff3c0763a3152093a9f9ce4287cfd614add6ae-curl-7.52.1.tar.gz";
+ md5name = "e9c37986337743f37fd14fe8737f246e97aec94b39d1b71e8a5973f72a9fc4f5-curl-7.60.0.tar.gz";
}
{
- name = "libe-book-0.1.2.tar.bz2";
- url = "http://dev-www.libreoffice.org/src/libe-book-0.1.2.tar.bz2";
- sha256 = "b710a57c633205b933015474d0ac0862253d1c52114d535dd09b20939a0d1850";
+ name = "libe-book-0.1.3.tar.xz";
+ url = "http://dev-www.libreoffice.org/src/libe-book-0.1.3.tar.xz";
+ sha256 = "7e8d8ff34f27831aca3bc6f9cc532c2f90d2057c778963b884ff3d1e34dfe1f9";
md5 = "";
- md5name = "b710a57c633205b933015474d0ac0862253d1c52114d535dd09b20939a0d1850-libe-book-0.1.2.tar.bz2";
+ md5name = "7e8d8ff34f27831aca3bc6f9cc532c2f90d2057c778963b884ff3d1e34dfe1f9-libe-book-0.1.3.tar.xz";
}
{
name = "libepoxy-1.3.1.tar.bz2";
@@ -140,18 +133,25 @@
md5name = "3ade8cfe7e59ca8e65052644fed9fca4-epm-3.7.tar.gz";
}
{
- name = "libetonyek-0.1.6.tar.bz2";
- url = "http://dev-www.libreoffice.org/src/libetonyek-0.1.6.tar.bz2";
- sha256 = "032f53e8d7691e48a73ddbe74fa84c906ff6ff32a33e6ee2a935b6fdb6aecb78";
+ name = "libepubgen-0.1.0.tar.bz2";
+ url = "http://dev-www.libreoffice.org/src/libepubgen-0.1.0.tar.bz2";
+ sha256 = "730bd1cbeee166334faadbc06c953a67b145c3c4754a3b503482066dae4cd633";
md5 = "";
- md5name = "032f53e8d7691e48a73ddbe74fa84c906ff6ff32a33e6ee2a935b6fdb6aecb78-libetonyek-0.1.6.tar.bz2";
+ md5name = "730bd1cbeee166334faadbc06c953a67b145c3c4754a3b503482066dae4cd633-libepubgen-0.1.0.tar.bz2";
}
{
- name = "expat-2.2.3.tar.bz2";
- url = "http://dev-www.libreoffice.org/src/expat-2.2.3.tar.bz2";
- sha256 = "b31890fb02f85c002a67491923f89bda5028a880fd6c374f707193ad81aace5f";
+ name = "libetonyek-0.1.7.tar.xz";
+ url = "http://dev-www.libreoffice.org/src/libetonyek-0.1.7.tar.xz";
+ sha256 = "69dbe10d4426d52f09060d489f8eb90dfa1df592e82eb0698d9dbaf38cc734ac";
md5 = "";
- md5name = "b31890fb02f85c002a67491923f89bda5028a880fd6c374f707193ad81aace5f-expat-2.2.3.tar.bz2";
+ md5name = "69dbe10d4426d52f09060d489f8eb90dfa1df592e82eb0698d9dbaf38cc734ac-libetonyek-0.1.7.tar.xz";
+ }
+ {
+ name = "expat-2.2.5.tar.bz2";
+ url = "http://dev-www.libreoffice.org/src/expat-2.2.5.tar.bz2";
+ sha256 = "d9dc32efba7e74f788fcc4f212a43216fc37cf5f23f4c2339664d473353aedf6";
+ md5 = "";
+ md5name = "d9dc32efba7e74f788fcc4f212a43216fc37cf5f23f4c2339664d473353aedf6-expat-2.2.5.tar.bz2";
}
{
name = "Firebird-3.0.0.32483-0.tar.bz2";
@@ -161,11 +161,11 @@
md5name = "6994be3555e23226630c587444be19d309b25b0fcf1f87df3b4e3f88943e5860-Firebird-3.0.0.32483-0.tar.bz2";
}
{
- name = "fontconfig-2.12.1.tar.bz2";
- url = "http://dev-www.libreoffice.org/src/fontconfig-2.12.1.tar.bz2";
- sha256 = "b449a3e10c47e1d1c7a6ec6e2016cca73d3bd68fbbd4f0ae5cc6b573f7d6c7f3";
+ name = "fontconfig-2.12.6.tar.bz2";
+ url = "http://dev-www.libreoffice.org/src/fontconfig-2.12.6.tar.bz2";
+ sha256 = "cf0c30807d08f6a28ab46c61b8dbd55c97d2f292cf88f3a07d3384687f31f017";
md5 = "";
- md5name = "b449a3e10c47e1d1c7a6ec6e2016cca73d3bd68fbbd4f0ae5cc6b573f7d6c7f3-fontconfig-2.12.1.tar.bz2";
+ md5name = "cf0c30807d08f6a28ab46c61b8dbd55c97d2f292cf88f3a07d3384687f31f017-fontconfig-2.12.6.tar.bz2";
}
{
name = "crosextrafonts-20130214.tar.gz";
@@ -216,20 +216,6 @@
md5 = "e7a384790b13c29113e22e596ade9687";
md5name = "e7a384790b13c29113e22e596ade9687-LinLibertineG-20120116.zip";
}
- {
- name = "open-sans-font-ttf-1.10.tar.gz";
- url = "http://dev-www.libreoffice.org/src/7a15edea7d415ac5150ea403e27401fd-open-sans-font-ttf-1.10.tar.gz";
- sha256 = "cc80fd415e57ecec067339beadd0eef9eaa45e65d3c51a922ba5f9172779bfb8";
- md5 = "7a15edea7d415ac5150ea403e27401fd";
- md5name = "7a15edea7d415ac5150ea403e27401fd-open-sans-font-ttf-1.10.tar.gz";
- }
- {
- name = "pt-serif-font-1.0000W.tar.gz";
- url = "http://dev-www.libreoffice.org/src/c3c1a8ba7452950636e871d25020ce0d-pt-serif-font-1.0000W.tar.gz";
- sha256 = "6757feb23f889a82df59679d02b8ee1f907df0a0ac1c49cdb48ed737b60e5dfa";
- md5 = "c3c1a8ba7452950636e871d25020ce0d";
- md5name = "c3c1a8ba7452950636e871d25020ce0d-pt-serif-font-1.0000W.tar.gz";
- }
{
name = "source-code-pro-2.030R-ro-1.050R-it.tar.gz";
url = "http://dev-www.libreoffice.org/src/907d6e99f241876695c19ff3db0b8923-source-code-pro-2.030R-ro-1.050R-it.tar.gz";
@@ -252,18 +238,74 @@
md5name = "d1a08f7c10589f22740231017694af0a7a270760c8dec33d8d1c038e2be0a0c7-EmojiOneColor-SVGinOT-1.3.tar.gz";
}
{
- name = "libfreehand-0.1.1.tar.bz2";
- url = "http://dev-www.libreoffice.org/src/libfreehand-0.1.1.tar.bz2";
- sha256 = "45dab0e5d632eb51eeb00847972ca03835d6791149e9e714f093a9df2b445877";
+ name = "noto-fonts-20171024.tar.gz";
+ url = "http://dev-www.libreoffice.org/src/noto-fonts-20171024.tar.gz";
+ sha256 = "29acc15a4c4d6b51201ba5d60f303dfbc2e5acbfdb70413c9ae1ed34fa259994";
md5 = "";
- md5name = "45dab0e5d632eb51eeb00847972ca03835d6791149e9e714f093a9df2b445877-libfreehand-0.1.1.tar.bz2";
+ md5name = "29acc15a4c4d6b51201ba5d60f303dfbc2e5acbfdb70413c9ae1ed34fa259994-noto-fonts-20171024.tar.gz";
}
{
- name = "freetype-2.7.1.tar.bz2";
- url = "http://dev-www.libreoffice.org/src/freetype-2.7.1.tar.bz2";
- sha256 = "3a3bb2c4e15ffb433f2032f50a5b5a92558206822e22bfe8cbe339af4aa82f88";
+ name = "culmus-0.131.tar.gz";
+ url = "http://dev-www.libreoffice.org/src/culmus-0.131.tar.gz";
+ sha256 = "dcf112cfcccb76328dcfc095f4d7c7f4d2f7e48d0eed5e78b100d1d77ce2ed1b";
md5 = "";
- md5name = "3a3bb2c4e15ffb433f2032f50a5b5a92558206822e22bfe8cbe339af4aa82f88-freetype-2.7.1.tar.bz2";
+ md5name = "dcf112cfcccb76328dcfc095f4d7c7f4d2f7e48d0eed5e78b100d1d77ce2ed1b-culmus-0.131.tar.gz";
+ }
+ {
+ name = "libre-hebrew-1.0.tar.gz";
+ url = "http://dev-www.libreoffice.org/src/libre-hebrew-1.0.tar.gz";
+ sha256 = "f596257c1db706ce35795b18d7f66a4db99d427725f20e9384914b534142579a";
+ md5 = "";
+ md5name = "f596257c1db706ce35795b18d7f66a4db99d427725f20e9384914b534142579a-libre-hebrew-1.0.tar.gz";
+ }
+ {
+ name = "alef-1.001.tar.gz";
+ url = "http://dev-www.libreoffice.org/src/alef-1.001.tar.gz";
+ sha256 = "b98b67602a2c8880a1770f0b9e37c190f29a7e2ade5616784f0b89fbdb75bf52";
+ md5 = "";
+ md5name = "b98b67602a2c8880a1770f0b9e37c190f29a7e2ade5616784f0b89fbdb75bf52-alef-1.001.tar.gz";
+ }
+ {
+ name = "amiri-0.109.zip";
+ url = "http://dev-www.libreoffice.org/src/amiri-0.109.zip";
+ sha256 = "97ee6e40d87f4b31de15d9a93bb30bf27bf308f0814f4ee9c47365b027402ad6";
+ md5 = "";
+ md5name = "97ee6e40d87f4b31de15d9a93bb30bf27bf308f0814f4ee9c47365b027402ad6-amiri-0.109.zip";
+ }
+ {
+ name = "ttf-kacst_2.01+mry.tar.gz";
+ url = "http://dev-www.libreoffice.org/src/ttf-kacst_2.01+mry.tar.gz";
+ sha256 = "dca00f5e655f2f217a766faa73a81f542c5c204aa3a47017c3c2be0b31d00a56";
+ md5 = "";
+ md5name = "dca00f5e655f2f217a766faa73a81f542c5c204aa3a47017c3c2be0b31d00a56-ttf-kacst_2.01+mry.tar.gz";
+ }
+ {
+ name = "ReemKufi-0.6.tar.gz";
+ url = "http://dev-www.libreoffice.org/src/ReemKufi-0.6.tar.gz";
+ sha256 = "4dfbd8b227ea062ca1742fb15d707f0b74398f9ddb231892554f0959048e809b";
+ md5 = "";
+ md5name = "4dfbd8b227ea062ca1742fb15d707f0b74398f9ddb231892554f0959048e809b-ReemKufi-0.6.tar.gz";
+ }
+ {
+ name = "Scheherazade-2.100.zip";
+ url = "http://dev-www.libreoffice.org/src/Scheherazade-2.100.zip";
+ sha256 = "251c8817ceb87d9b661ce1d5b49e732a0116add10abc046be4b8ba5196e149b5";
+ md5 = "";
+ md5name = "251c8817ceb87d9b661ce1d5b49e732a0116add10abc046be4b8ba5196e149b5-Scheherazade-2.100.zip";
+ }
+ {
+ name = "libfreehand-0.1.2.tar.xz";
+ url = "http://dev-www.libreoffice.org/src/libfreehand-0.1.2.tar.xz";
+ sha256 = "0e422d1564a6dbf22a9af598535425271e583514c0f7ba7d9091676420de34ac";
+ md5 = "";
+ md5name = "0e422d1564a6dbf22a9af598535425271e583514c0f7ba7d9091676420de34ac-libfreehand-0.1.2.tar.xz";
+ }
+ {
+ name = "freetype-2.8.1.tar.bz2";
+ url = "http://dev-www.libreoffice.org/src/freetype-2.8.1.tar.bz2";
+ sha256 = "e5435f02e02d2b87bb8e4efdcaa14b1f78c9cf3ab1ed80f94b6382fb6acc7d78";
+ md5 = "";
+ md5name = "e5435f02e02d2b87bb8e4efdcaa14b1f78c9cf3ab1ed80f94b6382fb6acc7d78-freetype-2.8.1.tar.bz2";
}
{
name = "glm-0.9.4.6-libreoffice.zip";
@@ -273,11 +315,11 @@
md5name = "bae83fa5dc7f081768daace6e199adc3-glm-0.9.4.6-libreoffice.zip";
}
{
- name = "gpgme-1.8.0.tar.bz2";
- url = "http://dev-www.libreoffice.org/src/gpgme-1.8.0.tar.bz2";
- sha256 = "596097257c2ce22e747741f8ff3d7e24f6e26231fa198a41b2a072e62d1e5d33";
+ name = "gpgme-1.9.0.tar.bz2";
+ url = "http://dev-www.libreoffice.org/src/gpgme-1.9.0.tar.bz2";
+ sha256 = "1b29fedb8bfad775e70eafac5b0590621683b2d9869db994568e6401f4034ceb";
md5 = "";
- md5name = "596097257c2ce22e747741f8ff3d7e24f6e26231fa198a41b2a072e62d1e5d33-gpgme-1.8.0.tar.bz2";
+ md5name = "1b29fedb8bfad775e70eafac5b0590621683b2d9869db994568e6401f4034ceb-gpgme-1.9.0.tar.bz2";
}
{
name = "graphite2-minimal-1.3.10.tgz";
@@ -287,11 +329,11 @@
md5name = "aa5e58356cd084000609ebbd93fef456a1bc0ab9e46fea20e81552fb286232a9-graphite2-minimal-1.3.10.tgz";
}
{
- name = "harfbuzz-1.4.8.tar.bz2";
- url = "http://dev-www.libreoffice.org/src/harfbuzz-1.4.8.tar.bz2";
- sha256 = "ccec4930ff0bb2d0c40aee203075447954b64a8c2695202413cc5e428c907131";
+ name = "harfbuzz-1.7.0.tar.bz2";
+ url = "http://dev-www.libreoffice.org/src/harfbuzz-1.7.0.tar.bz2";
+ sha256 = "042742d6ec67bc6719b69cf38a3fba24fbd120e207e3fdc18530dc730fb6a029";
md5 = "";
- md5name = "ccec4930ff0bb2d0c40aee203075447954b64a8c2695202413cc5e428c907131-harfbuzz-1.4.8.tar.bz2";
+ md5name = "042742d6ec67bc6719b69cf38a3fba24fbd120e207e3fdc18530dc730fb6a029-harfbuzz-1.7.0.tar.bz2";
}
{
name = "hsqldb_1_8_0.zip";
@@ -301,11 +343,11 @@
md5name = "17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip";
}
{
- name = "hunspell-1.6.0.tar.gz";
- url = "http://dev-www.libreoffice.org/src/047c3feb121261b76dc16cdb62f54483-hunspell-1.6.0.tar.gz";
- sha256 = "512e7d2ee69dad0b35ca011076405e56e0f10963a02d4859dbcc4faf53ca68e2";
- md5 = "047c3feb121261b76dc16cdb62f54483";
- md5name = "047c3feb121261b76dc16cdb62f54483-hunspell-1.6.0.tar.gz";
+ name = "hunspell-1.6.2.tar.gz";
+ url = "http://dev-www.libreoffice.org/src/hunspell-1.6.2.tar.gz";
+ sha256 = "3cd9ceb062fe5814f668e4f22b2fa6e3ba0b339b921739541ce180cac4d6f4c4";
+ md5 = "";
+ md5name = "3cd9ceb062fe5814f668e4f22b2fa6e3ba0b339b921739541ce180cac4d6f4c4-hunspell-1.6.2.tar.gz";
}
{
name = "hyphen-2.8.8.tar.gz";
@@ -315,11 +357,18 @@
md5name = "5ade6ae2a99bc1e9e57031ca88d36dad-hyphen-2.8.8.tar.gz";
}
{
- name = "icu4c-58_1-src.tgz";
- url = "http://dev-www.libreoffice.org/src/1901302aaff1c1633ef81862663d2917-icu4c-58_1-src.tgz";
- sha256 = "0eb46ba3746a9c2092c8ad347a29b1a1b4941144772d13a88667a7b11ea30309";
- md5 = "1901302aaff1c1633ef81862663d2917";
- md5name = "1901302aaff1c1633ef81862663d2917-icu4c-58_1-src.tgz";
+ name = "icu4c-60_2-src.tgz";
+ url = "http://dev-www.libreoffice.org/src/icu4c-60_2-src.tgz";
+ sha256 = "f073ea8f35b926d70bb33e6577508aa642a8b316a803f11be20af384811db418";
+ md5 = "";
+ md5name = "f073ea8f35b926d70bb33e6577508aa642a8b316a803f11be20af384811db418-icu4c-60_2-src.tgz";
+ }
+ {
+ name = "icu4c-60_2-data.zip";
+ url = "http://dev-www.libreoffice.org/src/icu4c-60_2-data.zip";
+ sha256 = "68f42ad0c9e0a5a5af8eba0577ba100833912288bad6e4d1f42ff480bbcfd4a9";
+ md5 = "";
+ md5name = "68f42ad0c9e0a5a5af8eba0577ba100833912288bad6e4d1f42ff480bbcfd4a9-icu4c-60_2-data.zip";
}
{
name = "flow-engine-0.9.4.zip";
@@ -399,18 +448,18 @@
md5name = "39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip";
}
{
- name = "libjpeg-turbo-1.5.1.tar.gz";
- url = "http://dev-www.libreoffice.org/src/libjpeg-turbo-1.5.1.tar.gz";
- sha256 = "41429d3d253017433f66e3d472b8c7d998491d2f41caa7306b8d9a6f2a2c666c";
+ name = "libjpeg-turbo-1.5.2.tar.gz";
+ url = "http://dev-www.libreoffice.org/src/libjpeg-turbo-1.5.2.tar.gz";
+ sha256 = "9098943b270388727ae61de82adec73cf9f0dbb240b3bc8b172595ebf405b528";
md5 = "";
- md5name = "41429d3d253017433f66e3d472b8c7d998491d2f41caa7306b8d9a6f2a2c666c-libjpeg-turbo-1.5.1.tar.gz";
+ md5name = "9098943b270388727ae61de82adec73cf9f0dbb240b3bc8b172595ebf405b528-libjpeg-turbo-1.5.2.tar.gz";
}
{
- name = "language-subtag-registry-2017-12-14.tar.bz2";
- url = "http://dev-www.libreoffice.org/src/language-subtag-registry-2017-12-14.tar.bz2";
- sha256 = "0f87b9428cbc2d96d8e4f54a07e3858b4a428e5fec9396bc3b52fb9f248be362";
+ name = "language-subtag-registry-2018-03-30.tar.bz2";
+ url = "http://dev-www.libreoffice.org/src/language-subtag-registry-2018-03-30.tar.bz2";
+ sha256 = "b7ad618b7db518155f00490a11b861496864f18b23b4b537eb80bfe84ca6f854";
md5 = "";
- md5name = "0f87b9428cbc2d96d8e4f54a07e3858b4a428e5fec9396bc3b52fb9f248be362-language-subtag-registry-2017-12-14.tar.bz2";
+ md5name = "b7ad618b7db518155f00490a11b861496864f18b23b4b537eb80bfe84ca6f854-language-subtag-registry-2018-03-30.tar.bz2";
}
{
name = "JLanguageTool-1.7.0.tar.bz2";
@@ -448,25 +497,18 @@
md5name = "cf5091fa8e7dcdbe667335eb90a2cfdd0a3fe8f8c7c8d1ece44d9d055736a06a-libeot-0.01.tar.bz2";
}
{
- name = "libexttextcat-3.4.4.tar.bz2";
- url = "http://dev-www.libreoffice.org/src/10d61fbaa6a06348823651b1bd7940fe-libexttextcat-3.4.4.tar.bz2";
- sha256 = "9595601c41051356d03d0a7d5dcad334fe1b420d221f6885d143c14bb8d62163";
- md5 = "10d61fbaa6a06348823651b1bd7940fe";
- md5name = "10d61fbaa6a06348823651b1bd7940fe-libexttextcat-3.4.4.tar.bz2";
+ name = "libexttextcat-3.4.5.tar.xz";
+ url = "http://dev-www.libreoffice.org/src/libexttextcat-3.4.5.tar.xz";
+ sha256 = "13fdbc9d4c489a4d0519e51933a1aa21fe3fb9eb7da191b87f7a63e82797dac8";
+ md5 = "";
+ md5name = "13fdbc9d4c489a4d0519e51933a1aa21fe3fb9eb7da191b87f7a63e82797dac8-libexttextcat-3.4.5.tar.xz";
}
{
- name = "libgltf-0.1.0.tar.gz";
- url = "http://dev-www.libreoffice.org/src/libgltf/libgltf-0.1.0.tar.gz";
- sha256 = "119e730fbf002dd0eaafa4930167267d7d910aa17f29979ca9ca8b66625fd2da";
+ name = "libgpg-error-1.27.tar.bz2";
+ url = "http://dev-www.libreoffice.org/src/libgpg-error-1.27.tar.bz2";
+ sha256 = "4f93aac6fecb7da2b92871bb9ee33032be6a87b174f54abf8ddf0911a22d29d2";
md5 = "";
- md5name = "119e730fbf002dd0eaafa4930167267d7d910aa17f29979ca9ca8b66625fd2da-libgltf-0.1.0.tar.gz";
- }
- {
- name = "libgpg-error-1.26.tar.bz2";
- url = "http://dev-www.libreoffice.org/src/libgpg-error-1.26.tar.bz2";
- sha256 = "4c4bcbc90116932e3acd37b37812d8653b1b189c1904985898e860af818aee69";
- md5 = "";
- md5name = "4c4bcbc90116932e3acd37b37812d8653b1b189c1904985898e860af818aee69-libgpg-error-1.26.tar.bz2";
+ md5name = "4f93aac6fecb7da2b92871bb9ee33032be6a87b174f54abf8ddf0911a22d29d2-libgpg-error-1.27.tar.bz2";
}
{
name = "liblangtag-0.6.2.tar.bz2";
@@ -483,25 +525,25 @@
md5name = "083daa92d8ee6f4af96a6143b12d7fc8fe1a547e14f862304f7281f8f7347483-ltm-1.0.zip";
}
{
- name = "xmlsec1-1.2.24.tar.gz";
- url = "http://dev-www.libreoffice.org/src/xmlsec1-1.2.24.tar.gz";
- sha256 = "99a8643f118bb1261a72162f83e2deba0f4f690893b4b90e1be4f708e8d481cc";
+ name = "xmlsec1-1.2.25.tar.gz";
+ url = "http://dev-www.libreoffice.org/src/xmlsec1-1.2.25.tar.gz";
+ sha256 = "967ca83edf25ccb5b48a3c4a09ad3405a63365576503bf34290a42de1b92fcd2";
md5 = "";
- md5name = "99a8643f118bb1261a72162f83e2deba0f4f690893b4b90e1be4f708e8d481cc-xmlsec1-1.2.24.tar.gz";
+ md5name = "967ca83edf25ccb5b48a3c4a09ad3405a63365576503bf34290a42de1b92fcd2-xmlsec1-1.2.25.tar.gz";
}
{
- name = "libxml2-2.9.4.tar.gz";
- url = "http://dev-www.libreoffice.org/src/ae249165c173b1ff386ee8ad676815f5-libxml2-2.9.4.tar.gz";
- sha256 = "ffb911191e509b966deb55de705387f14156e1a56b21824357cdf0053233633c";
- md5 = "ae249165c173b1ff386ee8ad676815f5";
- md5name = "ae249165c173b1ff386ee8ad676815f5-libxml2-2.9.4.tar.gz";
+ name = "libxml2-2.9.8.tar.gz";
+ url = "http://dev-www.libreoffice.org/src/libxml2-2.9.8.tar.gz";
+ sha256 = "0b74e51595654f958148759cfef0993114ddccccbb6f31aee018f3558e8e2732";
+ md5 = "";
+ md5name = "0b74e51595654f958148759cfef0993114ddccccbb6f31aee018f3558e8e2732-libxml2-2.9.8.tar.gz";
}
{
- name = "libxslt-1.1.29.tar.gz";
- url = "http://dev-www.libreoffice.org/src/a129d3c44c022de3b9dcf6d6f288d72e-libxslt-1.1.29.tar.gz";
- sha256 = "b5976e3857837e7617b29f2249ebb5eeac34e249208d31f1fbf7a6ba7a4090ce";
- md5 = "a129d3c44c022de3b9dcf6d6f288d72e";
- md5name = "a129d3c44c022de3b9dcf6d6f288d72e-libxslt-1.1.29.tar.gz";
+ name = "libxslt-1.1.32.tar.gz";
+ url = "http://dev-www.libreoffice.org/src/libxslt-1.1.32.tar.gz";
+ sha256 = "526ecd0abaf4a7789041622c3950c0e7f2c4c8835471515fd77eec684a355460";
+ md5 = "";
+ md5name = "526ecd0abaf4a7789041622c3950c0e7f2c4c8835471515fd77eec684a355460-libxslt-1.1.32.tar.gz";
}
{
name = "lp_solve_5.5.tar.gz";
@@ -518,11 +560,11 @@
md5name = "a233181e03d3c307668b4c722d881661-mariadb_client-2.0.0-src.tar.gz";
}
{
- name = "mdds-1.2.2.tar.bz2";
- url = "http://dev-www.libreoffice.org/src/mdds-1.2.2.tar.bz2";
- sha256 = "141e730b39110434b02cd844c5ad3442103f7c35f7e9a4d6a9f8af813594cc9d";
+ name = "mdds-1.3.1.tar.bz2";
+ url = "http://dev-www.libreoffice.org/src/mdds-1.3.1.tar.bz2";
+ sha256 = "dcb8cd2425567a5a5ec164afea475bce57784bca3e352ad4cbdd3d1a7e08e5a1";
md5 = "";
- md5name = "141e730b39110434b02cd844c5ad3442103f7c35f7e9a4d6a9f8af813594cc9d-mdds-1.2.2.tar.bz2";
+ md5name = "dcb8cd2425567a5a5ec164afea475bce57784bca3e352ad4cbdd3d1a7e08e5a1-mdds-1.3.1.tar.bz2";
}
{
name = "mDNSResponder-576.30.4.tar.gz";
@@ -532,18 +574,18 @@
md5name = "4737cb51378377e11d0edb7bcdd1bec79cbdaa7b27ea09c13e3006e58f8d92c0-mDNSResponder-576.30.4.tar.gz";
}
{
- name = "libmspub-0.1.2.tar.bz2";
- url = "http://dev-www.libreoffice.org/src/libmspub-0.1.2.tar.bz2";
- sha256 = "26d488527ffbb0b41686d4bab756e3e6aaeb99f88adeb169d0c16d2cde96859a";
+ name = "libmspub-0.1.3.tar.xz";
+ url = "http://dev-www.libreoffice.org/src/libmspub-0.1.3.tar.xz";
+ sha256 = "f0225f0ff03f6bec4847d7c2d8719a36cafc4b97a09e504b610372cc5b981c97";
md5 = "";
- md5name = "26d488527ffbb0b41686d4bab756e3e6aaeb99f88adeb169d0c16d2cde96859a-libmspub-0.1.2.tar.bz2";
+ md5name = "f0225f0ff03f6bec4847d7c2d8719a36cafc4b97a09e504b610372cc5b981c97-libmspub-0.1.3.tar.xz";
}
{
- name = "libmwaw-0.3.11.tar.xz";
- url = "http://dev-www.libreoffice.org/src/libmwaw-0.3.11.tar.xz";
- sha256 = "4b483a196bbe82bc0f7cb4cdf70ef1cedb91139bd2e037eabaed4a4d6ed2299a";
+ name = "libmwaw-0.3.13.tar.xz";
+ url = "http://dev-www.libreoffice.org/src/libmwaw-0.3.13.tar.xz";
+ sha256 = "db55c728448f9c795cd71a0bb6043f6d4744e3e001b955a018a2c634981d5aea";
md5 = "";
- md5name = "4b483a196bbe82bc0f7cb4cdf70ef1cedb91139bd2e037eabaed4a4d6ed2299a-libmwaw-0.3.11.tar.xz";
+ md5name = "db55c728448f9c795cd71a0bb6043f6d4744e3e001b955a018a2c634981d5aea-libmwaw-0.3.13.tar.xz";
}
{
name = "mysql-connector-c++-1.1.4.tar.gz";
@@ -560,18 +602,18 @@
md5name = "a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz";
}
{
- name = "neon-0.30.1.tar.gz";
- url = "http://dev-www.libreoffice.org/src/231adebe5c2f78fded3e3df6e958878e-neon-0.30.1.tar.gz";
- sha256 = "00c626c0dc18d094ab374dbd9a354915bfe4776433289386ed489c2ec0845cdd";
- md5 = "231adebe5c2f78fded3e3df6e958878e";
- md5name = "231adebe5c2f78fded3e3df6e958878e-neon-0.30.1.tar.gz";
+ name = "neon-0.30.2.tar.gz";
+ url = "http://dev-www.libreoffice.org/src/neon-0.30.2.tar.gz";
+ sha256 = "db0bd8cdec329b48f53a6f00199c92d5ba40b0f015b153718d1b15d3d967fbca";
+ md5 = "";
+ md5name = "db0bd8cdec329b48f53a6f00199c92d5ba40b0f015b153718d1b15d3d967fbca-neon-0.30.2.tar.gz";
}
{
- name = "nss-3.29.5-with-nspr-4.13.1.tar.gz";
- url = "http://dev-www.libreoffice.org/src/nss-3.29.5-with-nspr-4.13.1.tar.gz";
- sha256 = "8cb8624147737d1b4587c50bf058afbb6effc0f3c205d69b5ef4077b3bfed0e4";
+ name = "nss-3.33-with-nspr-4.17.tar.gz";
+ url = "http://dev-www.libreoffice.org/src/nss-3.33-with-nspr-4.17.tar.gz";
+ sha256 = "878d505ec0be577c45990c57eb5d2e5c8696bfa3412bd0fae193b275297bf5c4";
md5 = "";
- md5name = "8cb8624147737d1b4587c50bf058afbb6effc0f3c205d69b5ef4077b3bfed0e4-nss-3.29.5-with-nspr-4.13.1.tar.gz";
+ md5name = "878d505ec0be577c45990c57eb5d2e5c8696bfa3412bd0fae193b275297bf5c4-nss-3.33-with-nspr-4.17.tar.gz";
}
{
name = "libodfgen-0.1.6.tar.bz2";
@@ -595,32 +637,25 @@
md5name = "8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar";
}
{
- name = "OpenCOLLADA-master-6509aa13af.tar.bz2";
- url = "http://dev-www.libreoffice.org/src/OpenCOLLADA-master-6509aa13af.tar.bz2";
- sha256 = "8f25d429237cde289a448c82a0a830791354ccce5ee40d77535642e46367d6c4";
+ name = "openldap-2.4.45.tgz";
+ url = "http://dev-www.libreoffice.org/src/openldap-2.4.45.tgz";
+ sha256 = "cdd6cffdebcd95161a73305ec13fc7a78e9707b46ca9f84fb897cd5626df3824";
md5 = "";
- md5name = "8f25d429237cde289a448c82a0a830791354ccce5ee40d77535642e46367d6c4-OpenCOLLADA-master-6509aa13af.tar.bz2";
+ md5name = "cdd6cffdebcd95161a73305ec13fc7a78e9707b46ca9f84fb897cd5626df3824-openldap-2.4.45.tgz";
}
{
- name = "openldap-2.4.44.tgz";
- url = "http://dev-www.libreoffice.org/src/openldap-2.4.44.tgz";
- sha256 = "d7de6bf3c67009c95525dde3a0212cc110d0a70b92af2af8e3ee800e81b88400";
+ name = "openssl-1.0.2m.tar.gz";
+ url = "http://dev-www.libreoffice.org/src/openssl-1.0.2m.tar.gz";
+ sha256 = "8c6ff15ec6b319b50788f42c7abc2890c08ba5a1cdcd3810eb9092deada37b0f";
md5 = "";
- md5name = "d7de6bf3c67009c95525dde3a0212cc110d0a70b92af2af8e3ee800e81b88400-openldap-2.4.44.tgz";
+ md5name = "8c6ff15ec6b319b50788f42c7abc2890c08ba5a1cdcd3810eb9092deada37b0f-openssl-1.0.2m.tar.gz";
}
{
- name = "openssl-1.0.2k.tar.gz";
- url = "http://dev-www.libreoffice.org/src/openssl-1.0.2k.tar.gz";
- sha256 = "6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0";
+ name = "liborcus-0.13.3.tar.gz";
+ url = "http://dev-www.libreoffice.org/src/liborcus-0.13.3.tar.gz";
+ sha256 = "62e76de1fd3101e77118732b860354121b40a87bbb1ebfeb8203477fffac16e9";
md5 = "";
- md5name = "6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0-openssl-1.0.2k.tar.gz";
- }
- {
- name = "liborcus-0.12.1.tar.gz";
- url = "http://dev-www.libreoffice.org/src/liborcus-0.12.1.tar.gz";
- sha256 = "676b1fedd721f64489650f5e76d7f98b750439914d87cae505b8163d08447908";
- md5 = "";
- md5name = "676b1fedd721f64489650f5e76d7f98b750439914d87cae505b8163d08447908-liborcus-0.12.1.tar.gz";
+ md5name = "62e76de1fd3101e77118732b860354121b40a87bbb1ebfeb8203477fffac16e9-liborcus-0.13.3.tar.gz";
}
{
name = "owncloud-android-library-0.9.4-no-binary-deps.tar.gz";
@@ -630,18 +665,18 @@
md5name = "b18b3e3ef7fae6a79b62f2bb43cc47a5346b6330f6a383dc4be34439aca5e9fb-owncloud-android-library-0.9.4-no-binary-deps.tar.gz";
}
{
- name = "libpagemaker-0.0.3.tar.bz2";
- url = "http://dev-www.libreoffice.org/src/libpagemaker-0.0.3.tar.bz2";
- sha256 = "3b5de037692f8e156777a75e162f6b110fa24c01749e4a66d7eb83f364e52a33";
+ name = "libpagemaker-0.0.4.tar.xz";
+ url = "http://dev-www.libreoffice.org/src/libpagemaker-0.0.4.tar.xz";
+ sha256 = "66adacd705a7d19895e08eac46d1e851332adf2e736c566bef1164e7a442519d";
md5 = "";
- md5name = "3b5de037692f8e156777a75e162f6b110fa24c01749e4a66d7eb83f364e52a33-libpagemaker-0.0.3.tar.bz2";
+ md5name = "66adacd705a7d19895e08eac46d1e851332adf2e736c566bef1164e7a442519d-libpagemaker-0.0.4.tar.xz";
}
{
- name = "pdfium-3064.tar.bz2";
- url = "http://dev-www.libreoffice.org/src/pdfium-3064.tar.bz2";
- sha256 = "ded806dc9e2a4005d8c0a6b7fcb232ab36221d72d9ff5b815e8244987299d883";
+ name = "pdfium-3235.tar.bz2";
+ url = "http://dev-www.libreoffice.org/src/pdfium-3235.tar.bz2";
+ sha256 = "7dc0d33fc24b1612865f5e173d48800ba3f2db891c57e3f92b9d2ce56ffeb72f";
md5 = "";
- md5name = "ded806dc9e2a4005d8c0a6b7fcb232ab36221d72d9ff5b815e8244987299d883-pdfium-3064.tar.bz2";
+ md5name = "7dc0d33fc24b1612865f5e173d48800ba3f2db891c57e3f92b9d2ce56ffeb72f-pdfium-3235.tar.bz2";
}
{
name = "pixman-0.34.0.tar.gz";
@@ -651,18 +686,18 @@
md5name = "e80ebae4da01e77f68744319f01d52a3-pixman-0.34.0.tar.gz";
}
{
- name = "libpng-1.6.28.tar.gz";
- url = "http://dev-www.libreoffice.org/src/libpng-1.6.28.tar.gz";
- sha256 = "b6cec903e74e9fdd7b5bbcde0ab2415dd12f2f9e84d9e4d9ddd2ba26a41623b2";
+ name = "libpng-1.6.34.tar.xz";
+ url = "http://dev-www.libreoffice.org/src/libpng-1.6.34.tar.xz";
+ sha256 = "2f1e960d92ce3b3abd03d06dfec9637dfbd22febf107a536b44f7a47c60659f6";
md5 = "";
- md5name = "b6cec903e74e9fdd7b5bbcde0ab2415dd12f2f9e84d9e4d9ddd2ba26a41623b2-libpng-1.6.28.tar.gz";
+ md5name = "2f1e960d92ce3b3abd03d06dfec9637dfbd22febf107a536b44f7a47c60659f6-libpng-1.6.34.tar.xz";
}
{
- name = "poppler-0.56.0.tar.xz";
- url = "http://dev-www.libreoffice.org/src/poppler-0.56.0.tar.xz";
- sha256 = "869dbadf99ed882e776acbdbc06689d8a81872a2963440b1e8516cd7a2577173";
+ name = "poppler-0.66.0.tar.xz";
+ url = "http://dev-www.libreoffice.org/src/poppler-0.66.0.tar.xz";
+ sha256 = "2c096431adfb74bc2f53be466889b7646e1b599f28fa036094f3f7235cc9eae7";
md5 = "";
- md5name = "869dbadf99ed882e776acbdbc06689d8a81872a2963440b1e8516cd7a2577173-poppler-0.56.0.tar.xz";
+ md5name = "2c096431adfb74bc2f53be466889b7646e1b599f28fa036094f3f7235cc9eae7-poppler-0.66.0.tar.xz";
}
{
name = "postgresql-9.2.1.tar.bz2";
@@ -672,11 +707,18 @@
md5name = "c0b4799ea9850eae3ead14f0a60e9418-postgresql-9.2.1.tar.bz2";
}
{
- name = "Python-3.5.4.tgz";
- url = "http://dev-www.libreoffice.org/src/Python-3.5.4.tgz";
- sha256 = "6ed87a8b6c758cc3299a8b433e8a9a9122054ad5bc8aad43299cff3a53d8ca44";
+ name = "Python-3.5.5.tar.xz";
+ url = "http://dev-www.libreoffice.org/src/Python-3.5.5.tar.xz";
+ sha256 = "063d2c3b0402d6191b90731e0f735c64830e7522348aeb7ed382a83165d45009";
md5 = "";
- md5name = "6ed87a8b6c758cc3299a8b433e8a9a9122054ad5bc8aad43299cff3a53d8ca44-Python-3.5.4.tgz";
+ md5name = "063d2c3b0402d6191b90731e0f735c64830e7522348aeb7ed382a83165d45009-Python-3.5.5.tar.xz";
+ }
+ {
+ name = "libqxp-0.0.1.tar.xz";
+ url = "http://dev-www.libreoffice.org/src/libqxp-0.0.1.tar.xz";
+ sha256 = "8c257f6184ff94aefa7c9fa1cfae82083d55a49247266905c71c53e013f95c73";
+ md5 = "";
+ md5name = "8c257f6184ff94aefa7c9fa1cfae82083d55a49247266905c71c53e013f95c73-libqxp-0.0.1.tar.xz";
}
{
name = "raptor2-2.0.15.tar.gz";
@@ -721,11 +763,11 @@
md5name = "6988d394b62c3494635b6f0760bc3079f9a0cd380baf0f6b075af1eb9fa5e700-serf-1.2.1.tar.bz2";
}
{
- name = "libstaroffice-0.0.3.tar.xz";
- url = "http://dev-www.libreoffice.org/src/libstaroffice-0.0.3.tar.xz";
- sha256 = "bedeec104b4cc3896b3dfd1976dda5ce7392d1942bf8f5d2f7d796cc47e422c6";
+ name = "libstaroffice-0.0.5.tar.xz";
+ url = "http://dev-www.libreoffice.org/src/libstaroffice-0.0.5.tar.xz";
+ sha256 = "315507add58068aa6d5c437e7c2a6fd1abe684515915152c6cf338fc588da982";
md5 = "";
- md5name = "bedeec104b4cc3896b3dfd1976dda5ce7392d1942bf8f5d2f7d796cc47e422c6-libstaroffice-0.0.3.tar.xz";
+ md5name = "315507add58068aa6d5c437e7c2a6fd1abe684515915152c6cf338fc588da982-libstaroffice-0.0.5.tar.xz";
}
{
name = "swingExSrc.zip";
@@ -742,32 +784,32 @@
md5name = "0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz";
}
{
- name = "libvisio-0.1.5.tar.bz2";
- url = "http://dev-www.libreoffice.org/src/libvisio-0.1.5.tar.bz2";
- sha256 = "b83b7991a40b4e7f07d0cac7bb46ddfac84dece705fd18e21bfd119a09be458e";
+ name = "libvisio-0.1.6.tar.xz";
+ url = "http://dev-www.libreoffice.org/src/libvisio-0.1.6.tar.xz";
+ sha256 = "fe1002d3671d53c09bc65e47ec948ec7b67e6fb112ed1cd10966e211a8bb50f9";
md5 = "";
- md5name = "b83b7991a40b4e7f07d0cac7bb46ddfac84dece705fd18e21bfd119a09be458e-libvisio-0.1.5.tar.bz2";
+ md5name = "fe1002d3671d53c09bc65e47ec948ec7b67e6fb112ed1cd10966e211a8bb50f9-libvisio-0.1.6.tar.xz";
}
{
- name = "libwpd-0.10.1.tar.bz2";
- url = "http://dev-www.libreoffice.org/src/libwpd-0.10.1.tar.bz2";
- sha256 = "efc20361d6e43f9ff74de5f4d86c2ce9c677693f5da08b0a88d603b7475a508d";
+ name = "libwpd-0.10.2.tar.xz";
+ url = "http://dev-www.libreoffice.org/src/libwpd-0.10.2.tar.xz";
+ sha256 = "323f68beaf4f35e5a4d7daffb4703d0566698280109210fa4eaa90dea27d6610";
md5 = "";
- md5name = "efc20361d6e43f9ff74de5f4d86c2ce9c677693f5da08b0a88d603b7475a508d-libwpd-0.10.1.tar.bz2";
+ md5name = "323f68beaf4f35e5a4d7daffb4703d0566698280109210fa4eaa90dea27d6610-libwpd-0.10.2.tar.xz";
}
{
- name = "libwpg-0.3.1.tar.bz2";
- url = "http://dev-www.libreoffice.org/src/libwpg-0.3.1.tar.bz2";
- sha256 = "29049b95895914e680390717a243b291448e76e0f82fb4d2479adee5330fbb59";
+ name = "libwpg-0.3.2.tar.xz";
+ url = "http://dev-www.libreoffice.org/src/libwpg-0.3.2.tar.xz";
+ sha256 = "57faf1ab97d63d57383ac5d7875e992a3d190436732f4083310c0471e72f8c33";
md5 = "";
- md5name = "29049b95895914e680390717a243b291448e76e0f82fb4d2479adee5330fbb59-libwpg-0.3.1.tar.bz2";
+ md5name = "57faf1ab97d63d57383ac5d7875e992a3d190436732f4083310c0471e72f8c33-libwpg-0.3.2.tar.xz";
}
{
- name = "libwps-0.4.6.tar.xz";
- url = "http://dev-www.libreoffice.org/src/libwps-0.4.6.tar.xz";
- sha256 = "e48a7c2fd20048a0a8eaf69bad972575f8b9f06e7497c787463f127d332fccd0";
+ name = "libwps-0.4.8.tar.xz";
+ url = "http://dev-www.libreoffice.org/src/libwps-0.4.8.tar.xz";
+ sha256 = "e478e825ef33f6a434a19ff902c5469c9da7acc866ea0d8ab610a8b2aa94177e";
md5 = "";
- md5name = "e48a7c2fd20048a0a8eaf69bad972575f8b9f06e7497c787463f127d332fccd0-libwps-0.4.6.tar.xz";
+ md5name = "e478e825ef33f6a434a19ff902c5469c9da7acc866ea0d8ab610a8b2aa94177e-libwps-0.4.8.tar.xz";
}
{
name = "xsltml_2.1.2.zip";
@@ -784,10 +826,10 @@
md5name = "4ff941449631ace0d4d203e3483be9dbc9da454084111f97ea0a2114e19bf066-zlib-1.2.11.tar.xz";
}
{
- name = "libzmf-0.0.1.tar.bz2";
- url = "http://dev-www.libreoffice.org/src/libzmf-0.0.1.tar.bz2";
- sha256 = "b69f7f6e94cf695c4b672ca65def4825490a1e7dee34c2126309b96d21a19e6b";
+ name = "libzmf-0.0.2.tar.xz";
+ url = "http://dev-www.libreoffice.org/src/libzmf-0.0.2.tar.xz";
+ sha256 = "27051a30cb057fdb5d5de65a1f165c7153dc76e27fe62251cbb86639eb2caf22";
md5 = "";
- md5name = "b69f7f6e94cf695c4b672ca65def4825490a1e7dee34c2126309b96d21a19e6b-libzmf-0.0.1.tar.bz2";
+ md5name = "27051a30cb057fdb5d5de65a1f165c7153dc76e27fe62251cbb86639eb2caf22-libzmf-0.0.2.tar.xz";
}
]
diff --git a/pkgs/applications/office/libreoffice/libreoffice-srcs.nix b/pkgs/applications/office/libreoffice/libreoffice-srcs.nix
index 66d1baed2da..57495404eb9 100644
--- a/pkgs/applications/office/libreoffice/libreoffice-srcs.nix
+++ b/pkgs/applications/office/libreoffice/libreoffice-srcs.nix
@@ -28,11 +28,11 @@
md5name = "976a12a59bc286d634a21d7be0841cc74289ea9077aa1af46be19d1a6e844c19-apr-util-1.5.4.tar.gz";
}
{
- name = "boost_1_65_1.tar.bz2";
- url = "http://dev-www.libreoffice.org/src/boost_1_65_1.tar.bz2";
- sha256 = "9807a5d16566c57fd74fb522764e0b134a8bbe6b6e8967b83afefd30dcd3be81";
+ name = "boost_1_66_0.tar.bz2";
+ url = "http://dev-www.libreoffice.org/src/boost_1_66_0.tar.bz2";
+ sha256 = "5721818253e6a0989583192f96782c4a98eb6204965316df9f5ad75819225ca9";
md5 = "";
- md5name = "9807a5d16566c57fd74fb522764e0b134a8bbe6b6e8967b83afefd30dcd3be81-boost_1_65_1.tar.bz2";
+ md5name = "5721818253e6a0989583192f96782c4a98eb6204965316df9f5ad75819225ca9-boost_1_66_0.tar.bz2";
}
{
name = "breakpad.zip";
@@ -133,18 +133,18 @@
md5name = "3ade8cfe7e59ca8e65052644fed9fca4-epm-3.7.tar.gz";
}
{
- name = "libepubgen-0.1.0.tar.bz2";
- url = "http://dev-www.libreoffice.org/src/libepubgen-0.1.0.tar.bz2";
- sha256 = "730bd1cbeee166334faadbc06c953a67b145c3c4754a3b503482066dae4cd633";
+ name = "libepubgen-0.1.1.tar.xz";
+ url = "http://dev-www.libreoffice.org/src/libepubgen-0.1.1.tar.xz";
+ sha256 = "03e084b994cbeffc8c3dd13303b2cb805f44d8f2c3b79f7690d7e3fc7f6215ad";
md5 = "";
- md5name = "730bd1cbeee166334faadbc06c953a67b145c3c4754a3b503482066dae4cd633-libepubgen-0.1.0.tar.bz2";
+ md5name = "03e084b994cbeffc8c3dd13303b2cb805f44d8f2c3b79f7690d7e3fc7f6215ad-libepubgen-0.1.1.tar.xz";
}
{
- name = "libetonyek-0.1.7.tar.xz";
- url = "http://dev-www.libreoffice.org/src/libetonyek-0.1.7.tar.xz";
- sha256 = "69dbe10d4426d52f09060d489f8eb90dfa1df592e82eb0698d9dbaf38cc734ac";
+ name = "libetonyek-0.1.8.tar.xz";
+ url = "http://dev-www.libreoffice.org/src/libetonyek-0.1.8.tar.xz";
+ sha256 = "9dc92347aee0cc9ed57b175a3e21f9d96ebe55d30fecb10e841d1050794ed82d";
md5 = "";
- md5name = "69dbe10d4426d52f09060d489f8eb90dfa1df592e82eb0698d9dbaf38cc734ac-libetonyek-0.1.7.tar.xz";
+ md5name = "9dc92347aee0cc9ed57b175a3e21f9d96ebe55d30fecb10e841d1050794ed82d-libetonyek-0.1.8.tar.xz";
}
{
name = "expat-2.2.5.tar.bz2";
@@ -266,11 +266,11 @@
md5name = "b98b67602a2c8880a1770f0b9e37c190f29a7e2ade5616784f0b89fbdb75bf52-alef-1.001.tar.gz";
}
{
- name = "amiri-0.109.zip";
- url = "http://dev-www.libreoffice.org/src/amiri-0.109.zip";
- sha256 = "97ee6e40d87f4b31de15d9a93bb30bf27bf308f0814f4ee9c47365b027402ad6";
+ name = "Amiri-0.111.zip";
+ url = "http://dev-www.libreoffice.org/src/Amiri-0.111.zip";
+ sha256 = "1fbfccced6348b5db2c1c21d5b319cd488e14d055702fa817a0f6cb83d882166";
md5 = "";
- md5name = "97ee6e40d87f4b31de15d9a93bb30bf27bf308f0814f4ee9c47365b027402ad6-amiri-0.109.zip";
+ md5name = "1fbfccced6348b5db2c1c21d5b319cd488e14d055702fa817a0f6cb83d882166-Amiri-0.111.zip";
}
{
name = "ttf-kacst_2.01+mry.tar.gz";
@@ -280,11 +280,11 @@
md5name = "dca00f5e655f2f217a766faa73a81f542c5c204aa3a47017c3c2be0b31d00a56-ttf-kacst_2.01+mry.tar.gz";
}
{
- name = "ReemKufi-0.6.tar.gz";
- url = "http://dev-www.libreoffice.org/src/ReemKufi-0.6.tar.gz";
- sha256 = "4dfbd8b227ea062ca1742fb15d707f0b74398f9ddb231892554f0959048e809b";
+ name = "ReemKufi-0.7.zip";
+ url = "http://dev-www.libreoffice.org/src/ReemKufi-0.7.zip";
+ sha256 = "f60c6508d209ce4236d2d7324256c2ffddd480be7e3d6023770b93dc391a605f";
md5 = "";
- md5name = "4dfbd8b227ea062ca1742fb15d707f0b74398f9ddb231892554f0959048e809b-ReemKufi-0.6.tar.gz";
+ md5name = "f60c6508d209ce4236d2d7324256c2ffddd480be7e3d6023770b93dc391a605f-ReemKufi-0.7.zip";
}
{
name = "Scheherazade-2.100.zip";
@@ -329,11 +329,11 @@
md5name = "aa5e58356cd084000609ebbd93fef456a1bc0ab9e46fea20e81552fb286232a9-graphite2-minimal-1.3.10.tgz";
}
{
- name = "harfbuzz-1.7.0.tar.bz2";
- url = "http://dev-www.libreoffice.org/src/harfbuzz-1.7.0.tar.bz2";
- sha256 = "042742d6ec67bc6719b69cf38a3fba24fbd120e207e3fdc18530dc730fb6a029";
+ name = "harfbuzz-1.7.4.tar.bz2";
+ url = "http://dev-www.libreoffice.org/src/harfbuzz-1.7.4.tar.bz2";
+ sha256 = "b5d6ac8415f97f3540d73f3f91c41c5c10f8a4d76350f11a7184062aae88ac0b";
md5 = "";
- md5name = "042742d6ec67bc6719b69cf38a3fba24fbd120e207e3fdc18530dc730fb6a029-harfbuzz-1.7.0.tar.bz2";
+ md5name = "b5d6ac8415f97f3540d73f3f91c41c5c10f8a4d76350f11a7184062aae88ac0b-harfbuzz-1.7.4.tar.bz2";
}
{
name = "hsqldb_1_8_0.zip";
@@ -357,18 +357,18 @@
md5name = "5ade6ae2a99bc1e9e57031ca88d36dad-hyphen-2.8.8.tar.gz";
}
{
- name = "icu4c-60_2-src.tgz";
- url = "http://dev-www.libreoffice.org/src/icu4c-60_2-src.tgz";
- sha256 = "f073ea8f35b926d70bb33e6577508aa642a8b316a803f11be20af384811db418";
+ name = "icu4c-61_1-src.tgz";
+ url = "http://dev-www.libreoffice.org/src/icu4c-61_1-src.tgz";
+ sha256 = "d007f89ae8a2543a53525c74359b65b36412fa84b3349f1400be6dcf409fafef";
md5 = "";
- md5name = "f073ea8f35b926d70bb33e6577508aa642a8b316a803f11be20af384811db418-icu4c-60_2-src.tgz";
+ md5name = "d007f89ae8a2543a53525c74359b65b36412fa84b3349f1400be6dcf409fafef-icu4c-61_1-src.tgz";
}
{
- name = "icu4c-60_2-data.zip";
- url = "http://dev-www.libreoffice.org/src/icu4c-60_2-data.zip";
- sha256 = "68f42ad0c9e0a5a5af8eba0577ba100833912288bad6e4d1f42ff480bbcfd4a9";
+ name = "icu4c-61_1-data.zip";
+ url = "http://dev-www.libreoffice.org/src/icu4c-61_1-data.zip";
+ sha256 = "d149ed0985b5a6e16a9d8ed66f105dd58fd334c276779f74241cfa656ed2830a";
md5 = "";
- md5name = "68f42ad0c9e0a5a5af8eba0577ba100833912288bad6e4d1f42ff480bbcfd4a9-icu4c-60_2-data.zip";
+ md5name = "d149ed0985b5a6e16a9d8ed66f105dd58fd334c276779f74241cfa656ed2830a-icu4c-61_1-data.zip";
}
{
name = "flow-engine-0.9.4.zip";
@@ -455,11 +455,11 @@
md5name = "9098943b270388727ae61de82adec73cf9f0dbb240b3bc8b172595ebf405b528-libjpeg-turbo-1.5.2.tar.gz";
}
{
- name = "language-subtag-registry-2018-03-30.tar.bz2";
- url = "http://dev-www.libreoffice.org/src/language-subtag-registry-2018-03-30.tar.bz2";
- sha256 = "b7ad618b7db518155f00490a11b861496864f18b23b4b537eb80bfe84ca6f854";
+ name = "language-subtag-registry-2018-04-23.tar.bz2";
+ url = "http://dev-www.libreoffice.org/src/language-subtag-registry-2018-04-23.tar.bz2";
+ sha256 = "14c21f4533ca74e3af9e09184d6756a750d0cd46099015ba8c595e48499aa878";
md5 = "";
- md5name = "b7ad618b7db518155f00490a11b861496864f18b23b4b537eb80bfe84ca6f854-language-subtag-registry-2018-03-30.tar.bz2";
+ md5name = "14c21f4533ca74e3af9e09184d6756a750d0cd46099015ba8c595e48499aa878-language-subtag-registry-2018-04-23.tar.bz2";
}
{
name = "JLanguageTool-1.7.0.tar.bz2";
@@ -476,11 +476,11 @@
md5name = "66d02b229d2ea9474e62c2b6cd6720fde946155cd1d0d2bffdab829790a0fb22-lcms2-2.8.tar.gz";
}
{
- name = "libassuan-2.4.3.tar.bz2";
- url = "http://dev-www.libreoffice.org/src/libassuan-2.4.3.tar.bz2";
- sha256 = "22843a3bdb256f59be49842abf24da76700354293a066d82ade8134bb5aa2b71";
+ name = "libassuan-2.5.1.tar.bz2";
+ url = "http://dev-www.libreoffice.org/src/libassuan-2.5.1.tar.bz2";
+ sha256 = "47f96c37b4f2aac289f0bc1bacfa8bd8b4b209a488d3d15e2229cb6cc9b26449";
md5 = "";
- md5name = "22843a3bdb256f59be49842abf24da76700354293a066d82ade8134bb5aa2b71-libassuan-2.4.3.tar.bz2";
+ md5name = "47f96c37b4f2aac289f0bc1bacfa8bd8b4b209a488d3d15e2229cb6cc9b26449-libassuan-2.5.1.tar.bz2";
}
{
name = "libatomic_ops-7_2d.zip";
@@ -517,6 +517,13 @@
md5 = "";
md5name = "d6242790324f1432fb0a6fae71b6851f520b2c5a87675497cf8ea14c2924d52e-liblangtag-0.6.2.tar.bz2";
}
+ {
+ name = "libnumbertext-1.0.4.tar.xz";
+ url = "http://dev-www.libreoffice.org/src/libnumbertext-1.0.4.tar.xz";
+ sha256 = "349258f4c3a8b090893e847b978b22e8dc1343d4ada3bfba811b97144f1dd67b";
+ md5 = "";
+ md5name = "349258f4c3a8b090893e847b978b22e8dc1343d4ada3bfba811b97144f1dd67b-libnumbertext-1.0.4.tar.xz";
+ }
{
name = "ltm-1.0.zip";
url = "http://dev-www.libreoffice.org/src/ltm-1.0.zip";
@@ -552,6 +559,13 @@
md5 = "26b3e95ddf3d9c077c480ea45874b3b8";
md5name = "26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz";
}
+ {
+ name = "lxml-4.1.1.tgz";
+ url = "http://dev-www.libreoffice.org/src/lxml-4.1.1.tgz";
+ sha256 = "940caef1ec7c78e0c34b0f6b94fe42d0f2022915ffc78643d28538a5cfd0f40e";
+ md5 = "";
+ md5name = "940caef1ec7c78e0c34b0f6b94fe42d0f2022915ffc78643d28538a5cfd0f40e-lxml-4.1.1.tgz";
+ }
{
name = "mariadb_client-2.0.0-src.tar.gz";
url = "http://dev-www.libreoffice.org/src/a233181e03d3c307668b4c722d881661-mariadb_client-2.0.0-src.tar.gz";
@@ -574,18 +588,18 @@
md5name = "4737cb51378377e11d0edb7bcdd1bec79cbdaa7b27ea09c13e3006e58f8d92c0-mDNSResponder-576.30.4.tar.gz";
}
{
- name = "libmspub-0.1.3.tar.xz";
- url = "http://dev-www.libreoffice.org/src/libmspub-0.1.3.tar.xz";
- sha256 = "f0225f0ff03f6bec4847d7c2d8719a36cafc4b97a09e504b610372cc5b981c97";
+ name = "libmspub-0.1.4.tar.xz";
+ url = "http://dev-www.libreoffice.org/src/libmspub-0.1.4.tar.xz";
+ sha256 = "ef36c1a1aabb2ba3b0bedaaafe717bf4480be2ba8de6f3894be5fd3702b013ba";
md5 = "";
- md5name = "f0225f0ff03f6bec4847d7c2d8719a36cafc4b97a09e504b610372cc5b981c97-libmspub-0.1.3.tar.xz";
+ md5name = "ef36c1a1aabb2ba3b0bedaaafe717bf4480be2ba8de6f3894be5fd3702b013ba-libmspub-0.1.4.tar.xz";
}
{
- name = "libmwaw-0.3.13.tar.xz";
- url = "http://dev-www.libreoffice.org/src/libmwaw-0.3.13.tar.xz";
- sha256 = "db55c728448f9c795cd71a0bb6043f6d4744e3e001b955a018a2c634981d5aea";
+ name = "libmwaw-0.3.14.tar.xz";
+ url = "http://dev-www.libreoffice.org/src/libmwaw-0.3.14.tar.xz";
+ sha256 = "aca8bf1ce55ed83adbea82c70d4c8bebe8139f334b3481bf5a6e407f91f33ce9";
md5 = "";
- md5name = "db55c728448f9c795cd71a0bb6043f6d4744e3e001b955a018a2c634981d5aea-libmwaw-0.3.13.tar.xz";
+ md5name = "aca8bf1ce55ed83adbea82c70d4c8bebe8139f334b3481bf5a6e407f91f33ce9-libmwaw-0.3.14.tar.xz";
}
{
name = "mysql-connector-c++-1.1.4.tar.gz";
@@ -644,18 +658,18 @@
md5name = "cdd6cffdebcd95161a73305ec13fc7a78e9707b46ca9f84fb897cd5626df3824-openldap-2.4.45.tgz";
}
{
- name = "openssl-1.0.2m.tar.gz";
- url = "http://dev-www.libreoffice.org/src/openssl-1.0.2m.tar.gz";
- sha256 = "8c6ff15ec6b319b50788f42c7abc2890c08ba5a1cdcd3810eb9092deada37b0f";
+ name = "openssl-1.0.2o.tar.gz";
+ url = "http://dev-www.libreoffice.org/src/openssl-1.0.2o.tar.gz";
+ sha256 = "ec3f5c9714ba0fd45cb4e087301eb1336c317e0d20b575a125050470e8089e4d";
md5 = "";
- md5name = "8c6ff15ec6b319b50788f42c7abc2890c08ba5a1cdcd3810eb9092deada37b0f-openssl-1.0.2m.tar.gz";
+ md5name = "ec3f5c9714ba0fd45cb4e087301eb1336c317e0d20b575a125050470e8089e4d-openssl-1.0.2o.tar.gz";
}
{
- name = "liborcus-0.13.3.tar.gz";
- url = "http://dev-www.libreoffice.org/src/liborcus-0.13.3.tar.gz";
- sha256 = "62e76de1fd3101e77118732b860354121b40a87bbb1ebfeb8203477fffac16e9";
+ name = "liborcus-0.13.4.tar.gz";
+ url = "http://dev-www.libreoffice.org/src/liborcus-0.13.4.tar.gz";
+ sha256 = "bc01b1b3e9091416f498840d3c19a1aa2704b448100e7f6b80eefe88aab06d5b";
md5 = "";
- md5name = "62e76de1fd3101e77118732b860354121b40a87bbb1ebfeb8203477fffac16e9-liborcus-0.13.3.tar.gz";
+ md5name = "bc01b1b3e9091416f498840d3c19a1aa2704b448100e7f6b80eefe88aab06d5b-liborcus-0.13.4.tar.gz";
}
{
name = "owncloud-android-library-0.9.4-no-binary-deps.tar.gz";
@@ -672,11 +686,11 @@
md5name = "66adacd705a7d19895e08eac46d1e851332adf2e736c566bef1164e7a442519d-libpagemaker-0.0.4.tar.xz";
}
{
- name = "pdfium-3235.tar.bz2";
- url = "http://dev-www.libreoffice.org/src/pdfium-3235.tar.bz2";
- sha256 = "7dc0d33fc24b1612865f5e173d48800ba3f2db891c57e3f92b9d2ce56ffeb72f";
+ name = "pdfium-3426.tar.bz2";
+ url = "http://dev-www.libreoffice.org/src/pdfium-3426.tar.bz2";
+ sha256 = "80331b48166501a192d65476932f17044eeb5f10faa6ea50f4f175169475c957";
md5 = "";
- md5name = "7dc0d33fc24b1612865f5e173d48800ba3f2db891c57e3f92b9d2ce56ffeb72f-pdfium-3235.tar.bz2";
+ md5name = "80331b48166501a192d65476932f17044eeb5f10faa6ea50f4f175169475c957-pdfium-3426.tar.bz2";
}
{
name = "pixman-0.34.0.tar.gz";
@@ -693,11 +707,11 @@
md5name = "2f1e960d92ce3b3abd03d06dfec9637dfbd22febf107a536b44f7a47c60659f6-libpng-1.6.34.tar.xz";
}
{
- name = "poppler-0.59.0.tar.xz";
- url = "http://dev-www.libreoffice.org/src/poppler-0.59.0.tar.xz";
- sha256 = "a3d626b24cd14efa9864e12584b22c9c32f51c46417d7c10ca17651f297c9641";
+ name = "poppler-0.66.0.tar.xz";
+ url = "http://dev-www.libreoffice.org/src/poppler-0.66.0.tar.xz";
+ sha256 = "2c096431adfb74bc2f53be466889b7646e1b599f28fa036094f3f7235cc9eae7";
md5 = "";
- md5name = "a3d626b24cd14efa9864e12584b22c9c32f51c46417d7c10ca17651f297c9641-poppler-0.59.0.tar.xz";
+ md5name = "2c096431adfb74bc2f53be466889b7646e1b599f28fa036094f3f7235cc9eae7-poppler-0.66.0.tar.xz";
}
{
name = "postgresql-9.2.1.tar.bz2";
@@ -707,11 +721,11 @@
md5name = "c0b4799ea9850eae3ead14f0a60e9418-postgresql-9.2.1.tar.bz2";
}
{
- name = "Python-3.5.4.tgz";
- url = "http://dev-www.libreoffice.org/src/Python-3.5.4.tgz";
- sha256 = "6ed87a8b6c758cc3299a8b433e8a9a9122054ad5bc8aad43299cff3a53d8ca44";
+ name = "Python-3.5.5.tar.xz";
+ url = "http://dev-www.libreoffice.org/src/Python-3.5.5.tar.xz";
+ sha256 = "063d2c3b0402d6191b90731e0f735c64830e7522348aeb7ed382a83165d45009";
md5 = "";
- md5name = "6ed87a8b6c758cc3299a8b433e8a9a9122054ad5bc8aad43299cff3a53d8ca44-Python-3.5.4.tgz";
+ md5name = "063d2c3b0402d6191b90731e0f735c64830e7522348aeb7ed382a83165d45009-Python-3.5.5.tar.xz";
}
{
name = "libqxp-0.0.1.tar.xz";
@@ -763,11 +777,11 @@
md5name = "6988d394b62c3494635b6f0760bc3079f9a0cd380baf0f6b075af1eb9fa5e700-serf-1.2.1.tar.bz2";
}
{
- name = "libstaroffice-0.0.5.tar.xz";
- url = "http://dev-www.libreoffice.org/src/libstaroffice-0.0.5.tar.xz";
- sha256 = "315507add58068aa6d5c437e7c2a6fd1abe684515915152c6cf338fc588da982";
+ name = "libstaroffice-0.0.6.tar.xz";
+ url = "http://dev-www.libreoffice.org/src/libstaroffice-0.0.6.tar.xz";
+ sha256 = "6b00e1ed8194e6072be4441025d1b888e39365727ed5b23e0e8c92c4009d1ec4";
md5 = "";
- md5name = "315507add58068aa6d5c437e7c2a6fd1abe684515915152c6cf338fc588da982-libstaroffice-0.0.5.tar.xz";
+ md5name = "6b00e1ed8194e6072be4441025d1b888e39365727ed5b23e0e8c92c4009d1ec4-libstaroffice-0.0.6.tar.xz";
}
{
name = "swingExSrc.zip";
@@ -776,6 +790,13 @@
md5 = "35c94d2df8893241173de1d16b6034c0";
md5name = "35c94d2df8893241173de1d16b6034c0-swingExSrc.zip";
}
+ {
+ name = "twaindsm_2.4.1.orig.tar.gz";
+ url = "http://dev-www.libreoffice.org/src/twaindsm_2.4.1.orig.tar.gz";
+ sha256 = "82c818be771f242388457aa8c807e4b52aa84dc22b21c6c56184a6b4cbb085e6";
+ md5 = "";
+ md5name = "82c818be771f242388457aa8c807e4b52aa84dc22b21c6c56184a6b4cbb085e6-twaindsm_2.4.1.orig.tar.gz";
+ }
{
name = "ucpp-1.3.2.tar.gz";
url = "http://dev-www.libreoffice.org/src/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz";
@@ -805,11 +826,11 @@
md5name = "57faf1ab97d63d57383ac5d7875e992a3d190436732f4083310c0471e72f8c33-libwpg-0.3.2.tar.xz";
}
{
- name = "libwps-0.4.8.tar.xz";
- url = "http://dev-www.libreoffice.org/src/libwps-0.4.8.tar.xz";
- sha256 = "e478e825ef33f6a434a19ff902c5469c9da7acc866ea0d8ab610a8b2aa94177e";
+ name = "libwps-0.4.9.tar.xz";
+ url = "http://dev-www.libreoffice.org/src/libwps-0.4.9.tar.xz";
+ sha256 = "13beb0c733bb1544a542b6ab1d9d205f218e9a2202d1d4cac056f79f6db74922";
md5 = "";
- md5name = "e478e825ef33f6a434a19ff902c5469c9da7acc866ea0d8ab610a8b2aa94177e-libwps-0.4.8.tar.xz";
+ md5name = "13beb0c733bb1544a542b6ab1d9d205f218e9a2202d1d4cac056f79f6db74922-libwps-0.4.9.tar.xz";
}
{
name = "xsltml_2.1.2.zip";
diff --git a/pkgs/applications/office/libreoffice/still-primary-src.nix b/pkgs/applications/office/libreoffice/still-primary-src.nix
index 22216af3723..6719b953ad1 100644
--- a/pkgs/applications/office/libreoffice/still-primary-src.nix
+++ b/pkgs/applications/office/libreoffice/still-primary-src.nix
@@ -1,9 +1,9 @@
{ fetchurl }:
rec {
- major = "5";
- minor = "4";
- patch = "7";
+ major = "6";
+ minor = "0";
+ patch = "6";
tweak = "2";
subdir = "${major}.${minor}.${patch}";
@@ -12,6 +12,6 @@ rec {
src = fetchurl {
url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz";
- sha256 = "0s9s4nhp2whwxis54jbxrf1dwpnpl95b9781d1pdj4xk5z9v90fv";
+ sha256 = "f1666430abf616a3813e4c886b51f157366f592102ae0e874abc17f3d58c6a8e";
};
}
diff --git a/pkgs/applications/office/libreoffice/still.nix b/pkgs/applications/office/libreoffice/still.nix
index 1808eec8c2b..aff0817a865 100644
--- a/pkgs/applications/office/libreoffice/still.nix
+++ b/pkgs/applications/office/libreoffice/still.nix
@@ -1,14 +1,14 @@
-{ stdenv, fetchurl, pam, python3, libxslt, perl, ArchiveZip
+{ stdenv, fetchurl, pam, python3, libxslt, perl, ArchiveZip, gettext
, IOCompress, zlib, libjpeg, expat, freetype, libwpd
, libxml2, db, sablotron, curl, fontconfig, libsndfile, neon
, bison, flex, zip, unzip, gtk3, gtk2, libmspack, getopt, file, cairo, which
-, icu, boost, jdk, ant, cups, xorg, libcmis, carlito
-, openssl, gperf, cppunit, GConf, ORBit2, poppler
+, icu, boost, jdk, ant, cups, xorg, libcmis
+, openssl, gperf, cppunit, GConf, ORBit2, poppler, utillinux
, librsvg, gnome_vfs, libGLU_combined, bsh, CoinMP, libwps, libabw
, autoconf, automake, openldap, bash, hunspell, librdf_redland, nss, nspr
-, libwpg, dbus-glib, glibc, qt4, clucene_core, libcdr, lcms, vigra
+, libwpg, dbus-glib, qt4, clucene_core, libcdr, lcms, vigra
, unixODBC, mdds, sane-backends, mythes, libexttextcat, libvisio
-, fontsConf, pkgconfig, bluez5, libtool
+, fontsConf, pkgconfig, bluez5, libtool, carlito
, libatomic_ops, graphite2, harfbuzz, libodfgen, libzmf
, librevenge, libe-book, libmwaw, glm, glew, gst_all_1
, gdb, commonsLogging, librdf_rasqal, wrapGAppsHook
@@ -34,22 +34,28 @@ let
};
srcs = {
- third_party = [ (let md5 = "185d60944ea767075d27247c3162b3bc"; in fetchurl rec {
- url = "https://dev-www.libreoffice.org/extern/${md5}-${name}";
- sha256 = "1infwvv1p6i21scywrldsxs22f62x85mns4iq8h6vr6vlx3fdzga";
- name = "unowinreg.dll";
- }) ] ++ (map (x : ((fetchurl {inherit (x) url sha256 name;}) // {inherit (x) md5name md5;})) (import ./libreoffice-srcs-still.nix));
+ third_party =
+ map (x : ((fetchurl {inherit (x) url sha256 name;}) // {inherit (x) md5name md5;}))
+ ((import ./libreoffice-srcs-still.nix) ++ [
+ (rec {
+ name = "unowinreg.dll";
+ url = "https://dev-www.libreoffice.org/extern/${md5name}";
+ sha256 = "1infwvv1p6i21scywrldsxs22f62x85mns4iq8h6vr6vlx3fdzga";
+ md5 = "185d60944ea767075d27247c3162b3bc";
+ md5name = "${md5}-${name}";
+ })
+ ]);
translations = fetchSrc {
name = "translations";
- sha256 = "05ixmqbs3pkdpyqcwadz9i3wg797vimsm75rmfby7z71wc3frcyk";
+ sha256 = "0hi7m5y9gxwqn5i2nsyqyz1vdiz2bxn26sd3i0958ghhwv3zqmdb";
};
# TODO: dictionaries
help = fetchSrc {
name = "help";
- sha256 = "0ifyh4m8mwpkb16g6883ivk2s2qybr4s4s7pdjzp4cpx1nalzibl";
+ sha256 = "0pp8xs3mqna6fh1jd4h1xjyr4v0fsrik10rri5if5n3z1vfg0jby";
};
};
@@ -58,26 +64,18 @@ in stdenv.mkDerivation rec {
inherit (primary-src) src;
- # Openoffice will open libcups dynamically, so we link it directly
- # to make its dlopen work.
- # It also seems not to mention libdl explicitly in some places.
- NIX_LDFLAGS = "-lcups -ldl";
-
# For some reason librdf_redland sometimes refers to rasqal.h instead
# of rasqal/rasqal.h
- # And LO refers to gpgme++ by no-path name
- NIX_CFLAGS_COMPILE="-I${librdf_rasqal}/include/rasqal -I${gpgme.dev}/include/gpgme++";
-
- # If we call 'configure', 'make' will then call configure again without parameters.
- # It's their system.
- configureScript = "./autogen.sh";
- dontUseCmakeConfigure = true;
+ NIX_CFLAGS_COMPILE = [ "-I${librdf_rasqal}/include/rasqal" ];
patches = [ ./xdg-open-brief.patch ];
postUnpack = ''
mkdir -v $sourceRoot/src
- '' + (stdenv.lib.concatMapStrings (f: "ln -sfv ${f} $sourceRoot/src/${f.md5 or f.outputHash}-${f.name}\nln -sfv ${f} $sourceRoot/src/${f.name}\n") srcs.third_party)
+ '' + (lib.flip lib.concatMapStrings srcs.third_party (f: ''
+ ln -sfv ${f} $sourceRoot/src/${f.md5name}
+ ln -sfv ${f} $sourceRoot/src/${f.name}
+ ''))
+ ''
ln -sv ${srcs.help} $sourceRoot/src/${srcs.help.name}
ln -svf ${srcs.translations} $sourceRoot/src/${srcs.translations.name}
@@ -85,14 +83,20 @@ in stdenv.mkDerivation rec {
postPatch = ''
sed -e 's@/usr/bin/xdg-open@xdg-open@g' -i shell/source/unix/exec/shellexec.cxx
+
+ # configure checks for header 'gpgme++/gpgmepp_version.h',
+ # and if it is found (no matter where) uses a hardcoded path
+ # in what presumably is an effort to make it possible to write
+ # '#include ' instead of '#include '.
+ #
+ # Fix this path to point to where the headers can actually be found instead.
+ substituteInPlace configure.ac --replace \
+ 'GPGMEPP_CFLAGS=-I/usr/include/gpgme++' \
+ 'GPGMEPP_CFLAGS=-I${gpgme.dev}/include/gpgme++'
'';
QT4DIR = qt4;
- # Fix boost 1.59 compat
- # Try removing in the next version
- CPPFLAGS = "-DBOOST_ERROR_CODE_HEADER_ONLY -DBOOST_SYSTEM_NO_DEPRECATED";
-
preConfigure = ''
configureFlagsArray=(
"--with-parallelism=$NIX_BUILD_CORES"
@@ -101,68 +105,72 @@ in stdenv.mkDerivation rec {
chmod a+x ./bin/unpack-sources
patchShebangs .
- # It is used only as an indicator of the proper current directory
- touch solenv/inc/target.mk
-
- # BLFS patch for Glibc 2.23 renaming isnan
- sed -ire "s@isnan@std::&@g" xmloff/source/draw/ximp3dscene.cxx
# This is required as some cppunittests require fontconfig configured
cp "${fontsConf}" fonts.conf
sed -e '/include/i${carlito}/etc/fonts/conf.d' -i fonts.conf
export FONTCONFIG_FILE="$PWD/fonts.conf"
+
+ NOCONFIGURE=1 ./autogen.sh
'';
- # fetch_Download_item tries to interpret the name as a variable name
- # Let it do so…
- postConfigure = ''
- sed -e '1ilibreoffice-translations-${version}.tar.xz=libreoffice-translations-${version}.tar.xz' -i Makefile
- sed -e '1ilibreoffice-help-${version}.tar.xz=libreoffice-help-${version}.tar.xz' -i Makefile
+ postConfigure =
+ # fetch_Download_item tries to interpret the name as a variable name, let it do so...
+ ''
+ sed -e '1ilibreoffice-translations-${version}.tar.xz=libreoffice-translations-${version}.tar.xz' -i Makefile
+ sed -e '1ilibreoffice-help-${version}.tar.xz=libreoffice-help-${version}.tar.xz' -i Makefile
+ ''
+ # Test fixups
+ # May need to be revisited/pruned, left alone for now.
+ + ''
+ # unit test sd_tiledrendering seems to be fragile
+ # https://nabble.documentfoundation.org/libreoffice-5-0-failure-in-CUT-libreofficekit-tiledrendering-td4150319.html
+ echo > ./sd/CppunitTest_sd_tiledrendering.mk
+ sed -e /CppunitTest_sd_tiledrendering/d -i sd/Module_sd.mk
+ # one more fragile test?
+ sed -e '/CPPUNIT_TEST(testTdf96536);/d' -i sw/qa/extras/uiwriter/uiwriter.cxx
+ # this I actually hate, this should be a data consistency test!
+ sed -e '/CPPUNIT_TEST(testTdf115013);/d' -i sw/qa/extras/uiwriter/uiwriter.cxx
+ # rendering-dependent test
+ sed -e '/CPPUNIT_ASSERT_EQUAL(11148L, pOleObj->GetLogicRect().getWidth());/d ' -i sc/qa/unit/subsequent_filters-test.cxx
+ # tilde expansion in path processing checks the existence of $HOME
+ sed -e 's@OString sSysPath("~/tmp");@& return ; @' -i sal/qa/osl/file/osl_File.cxx
+ # rendering-dependent: on my computer the test table actually doesn't fit…
+ # interesting fact: test disabled on macOS by upstream
+ sed -re '/DECLARE_WW8EXPORT_TEST[(]testTableKeep, "tdf91083.odt"[)]/,+5d' -i ./sw/qa/extras/ww8export/ww8export.cxx
+ # Segfault on DB access — maybe temporarily acceptable for a new version of Fresh?
+ sed -e 's/CppunitTest_dbaccess_empty_stdlib_save//' -i ./dbaccess/Module_dbaccess.mk
+ # one more fragile test?
+ sed -e '/CPPUNIT_TEST(testTdf77014);/d' -i sw/qa/extras/uiwriter/uiwriter.cxx
+ # rendering-dependent tests
+ sed -e '/CPPUNIT_TEST(testCustomColumnWidthExportXLSX)/d' -i sc/qa/unit/subsequent_export-test.cxx
+ sed -e '/CPPUNIT_TEST(testColumnWidthExportFromODStoXLSX)/d' -i sc/qa/unit/subsequent_export-test.cxx
+ sed -e '/CPPUNIT_TEST(testChartImportXLS)/d' -i sc/qa/unit/subsequent_filters-test.cxx
+ sed -zre 's/DesktopLOKTest::testGetFontSubset[^{]*[{]/& return; /' -i desktop/qa/desktop_lib/test_desktop_lib.cxx
+ sed -z -r -e 's/DECLARE_OOXMLEXPORT_TEST[(]testFlipAndRotateCustomShape,[^)]*[)].[{]/& return;/' -i sw/qa/extras/ooxmlexport/ooxmlexport7.cxx
+ sed -z -r -e 's/DECLARE_OOXMLEXPORT_TEST[(]tdf105490_negativeMargins,[^)]*[)].[{]/& return;/' -i sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
+ sed -z -r -e 's/DECLARE_OOXMLIMPORT_TEST[(]testTdf112443,[^)]*[)].[{]/& return;/' -i sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+ sed -z -r -e 's/DECLARE_RTFIMPORT_TEST[(]testTdf108947,[^)]*[)].[{]/& return;/' -i sw/qa/extras/rtfimport/rtfimport.cxx
+ # not sure about this fragile test
+ sed -z -r -e 's/DECLARE_OOXMLEXPORT_TEST[(]testTDF87348,[^)]*[)].[{]/& return;/' -i sw/qa/extras/ooxmlexport/ooxmlexport7.cxx
+ ''
+ # This to avoid using /lib:/usr/lib at linking
+ + ''
+ sed -i '/gb_LinkTarget_LDFLAGS/{ n; /rpath-link/d;}' solenv/gbuild/platform/unxgcc.mk
- # unit test sd_tiledrendering seems to be fragile
- # https://nabble.documentfoundation.org/libreoffice-5-0-failure-in-CUT-libreofficekit-tiledrendering-td4150319.html
- echo > ./sd/CppunitTest_sd_tiledrendering.mk
- sed -e /CppunitTest_sd_tiledrendering/d -i sd/Module_sd.mk
- # one more fragile test?
- sed -e '/CPPUNIT_TEST(testTdf96536);/d' -i sw/qa/extras/uiwriter/uiwriter.cxx
- # rendering-dependent test
- sed -e '/CPPUNIT_ASSERT_EQUAL(11148L, pOleObj->GetLogicRect().getWidth());/d ' -i sc/qa/unit/subsequent_filters-test.cxx
- # tilde expansion in path processing checks the existence of $HOME
- sed -e 's@OString sSysPath("~/tmp");@& return ; @' -i sal/qa/osl/file/osl_File.cxx
- # rendering-dependent: on my computer the test table actually doesn't fit…
- # interesting fact: test disabled on macOS by upstream
- sed -re '/DECLARE_WW8EXPORT_TEST[(]testTableKeep, "tdf91083.odt"[)]/,+5d' -i ./sw/qa/extras/ww8export/ww8export.cxx
- # Segfault on DB access — maybe temporarily acceptable for a new version of Fresh?
- sed -e 's/CppunitTest_dbaccess_empty_stdlib_save//' -i ./dbaccess/Module_dbaccess.mk
- # one more fragile test?
- sed -e '/CPPUNIT_TEST(testTdf77014);/d' -i sw/qa/extras/uiwriter/uiwriter.cxx
- # rendering-dependent tests
- sed -e '/CPPUNIT_TEST(testCustomColumnWidthExportXLSX)/d' -i sc/qa/unit/subsequent_export-test.cxx
- sed -e '/CPPUNIT_TEST(testColumnWidthExportFromODStoXLSX)/d' -i sc/qa/unit/subsequent_export-test.cxx
- sed -e '/CPPUNIT_TEST(testChartImportXLS)/d' -i sc/qa/unit/subsequent_filters-test.cxx
- sed -zre 's/DesktopLOKTest::testGetFontSubset[^{]*[{]/& return; /' -i desktop/qa/desktop_lib/test_desktop_lib.cxx
- sed -z -r -e 's/DECLARE_OOXMLEXPORT_TEST[(]testFlipAndRotateCustomShape,[^)]*[)].[{]/& return;/' -i sw/qa/extras/ooxmlexport/ooxmlexport7.cxx
- sed -z -r -e 's/DECLARE_OOXMLEXPORT_TEST[(]tdf105490_negativeMargins,[^)]*[)].[{]/& return;/' -i sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
- # not sure about this fragile test
- sed -z -r -e 's/DECLARE_OOXMLEXPORT_TEST[(]testTDF87348,[^)]*[)].[{]/& return;/' -i sw/qa/extras/ooxmlexport/ooxmlexport7.cxx
- '';
+ find -name "*.cmd" -exec sed -i s,/lib:/usr/lib,, {} \;
+ '';
makeFlags = "SHELL=${bash}/bin/bash";
enableParallelBuilding = true;
buildPhase = ''
- # This is required as some cppunittests require fontconfig configured
- export FONTCONFIG_FILE=${fontsConf}
-
- # This to avoid using /lib:/usr/lib at linking
- sed -i '/gb_LinkTarget_LDFLAGS/{ n; /rpath-link/d;}' solenv/gbuild/platform/unxgcc.mk
-
- find -name "*.cmd" -exec sed -i s,/lib:/usr/lib,, {} \;
-
- make
+ make build-nocheck
'';
+ doCheck = true;
+
# It installs only things to $out/lib/libreoffice
postInstall = ''
mkdir -p $out/bin $out/share/desktop
@@ -194,11 +202,11 @@ in stdenv.mkDerivation rec {
"--with-vendor=NixOS"
"--with-commons-logging-jar=${commonsLogging}/share/java/commons-logging-1.2.jar"
"--disable-report-builder"
+ "--disable-online-update"
"--enable-python=system"
"--enable-dbus"
"--enable-release-build"
(lib.enableFeature kdeIntegration "kde4")
- "--with-package-format=installed"
"--enable-epm"
"--with-jdk-home=${jdk.home}"
"--with-ant-home=${ant}/lib/ant"
@@ -212,6 +220,8 @@ in stdenv.mkDerivation rec {
"--with-system-openldap"
"--with-system-coinmp"
+ "--with-alloc=system"
+
# Without these, configure does not finish
"--without-junit"
@@ -234,8 +244,10 @@ in stdenv.mkDerivation rec {
"--without-system-liblangtag"
"--without-system-libmspub"
"--without-system-libpagemaker"
- "--without-system-libgltf"
"--without-system-libstaroffice"
+ "--without-system-libepubgen"
+ "--without-system-libqxp"
+ "--without-system-mdds"
# https://github.com/NixOS/nixpkgs/commit/5c5362427a3fa9aefccfca9e531492a8735d4e6f
"--without-system-orcus"
"--without-system-xmlsec"
@@ -257,10 +269,10 @@ in stdenv.mkDerivation rec {
gst_all_1.gst-plugins-base glib
neon nspr nss openldap openssl ORBit2 pam perl pkgconfig poppler
python3 sablotron sane-backends unzip vigra which zip zlib
- mdds bluez5 glibc libcmis libwps libabw libzmf libtool
- libxshmfence libatomic_ops graphite2 harfbuzz gpgme
+ mdds bluez5 libcmis libwps libabw libzmf libtool
+ libxshmfence libatomic_ops graphite2 harfbuzz gpgme utillinux
librevenge libe-book libmwaw glm glew ncurses epoxy
- libodfgen CoinMP librdf_rasqal defaultIconTheme
+ libodfgen CoinMP librdf_rasqal defaultIconTheme gettext
]
++ lib.optional kdeIntegration kdelibs4;
nativeBuildInputs = [ wrapGAppsHook gdb ];
diff --git a/pkgs/applications/science/astronomy/gildas/default.nix b/pkgs/applications/science/astronomy/gildas/default.nix
index ee19077065e..82575d9c6ff 100644
--- a/pkgs/applications/science/astronomy/gildas/default.nix
+++ b/pkgs/applications/science/astronomy/gildas/default.nix
@@ -12,7 +12,10 @@ stdenv.mkDerivation rec {
name = "gildas-${version}";
src = fetchurl {
- url = "http://www.iram.fr/~gildas/dist/gildas-src-${srcVersion}.tar.gz";
+ # For each new release, the upstream developers of Gildas move the
+ # source code of the previous release to a different directory
+ urls = [ "http://www.iram.fr/~gildas/dist/gildas-src-${srcVersion}.tar.gz"
+ "http://www.iram.fr/~gildas/dist/archive/gildas/gildas-src-${srcVersion}.tar.gz" ];
sha256 = "0mg3wijrj8x1p912vkgrhxbypjx7aj9b1492yxvq2y3fxban6bj1";
};
@@ -22,7 +25,9 @@ stdenv.mkDerivation rec {
buildInputs = [ gtk2-x11 lesstif cfitsio python27Env ];
- patches = [ ./wrapper.patch ./return-error-code.patch ./clang.patch ./aarch64.patch ];
+ patches = [ ./wrapper.patch ./return-error-code.patch ./clang.patch ./aarch64.patch ./gag-font-bin-rule.patch ];
+
+ NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang "-Wno-unused-command-line-argument";
configurePhase=''
substituteInPlace admin/wrapper.sh --replace '%%OUT%%' $out
diff --git a/pkgs/applications/science/astronomy/gildas/gag-font-bin-rule.patch b/pkgs/applications/science/astronomy/gildas/gag-font-bin-rule.patch
new file mode 100644
index 00000000000..61ddc37c7fd
--- /dev/null
+++ b/pkgs/applications/science/astronomy/gildas/gag-font-bin-rule.patch
@@ -0,0 +1,13 @@
+diff -ruN gildas-src-aug18a/kernel/etc/Makefile gildas-src-aug18a.gag-font-bin-rule/kernel/etc/Makefile
+--- gildas-src-aug18a/kernel/etc/Makefile 2016-09-09 09:39:37.000000000 +0200
++++ gildas-src-aug18a.gag-font-bin-rule/kernel/etc/Makefile 2018-09-04 12:03:11.000000000 +0200
+@@ -29,7 +29,8 @@
+
+ SEDEXE=sed -e 's?source tree?executable tree?g'
+
+-$(datadir)/gag-font.bin: hershey-font.dat $(bindir)/hershey
++$(datadir)/gag-font.bin: hershey-font.dat $(bindir)/hershey \
++ $(gagintdir)/etc/gag.dico.gbl $(gagintdir)/etc/gag.dico.lcl
+ ifeq ($(GAG_ENV_KIND)-$(GAG_TARGET_KIND),cygwin-mingw)
+ $(bindir)/hershey `cygpath -w $(datadir)`/gag-font.bin
+ else
diff --git a/pkgs/applications/science/chemistry/jmol/default.nix b/pkgs/applications/science/chemistry/jmol/default.nix
index d5dae364cc3..80415189d45 100644
--- a/pkgs/applications/science/chemistry/jmol/default.nix
+++ b/pkgs/applications/science/chemistry/jmol/default.nix
@@ -17,7 +17,7 @@ let
};
in
stdenv.mkDerivation rec {
- version = "14.29.17";
+ version = "14.29.19";
pname = "jmol";
name = "${pname}-${version}";
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
baseVersion = "${lib.versions.major version}.${lib.versions.minor version}";
in fetchurl {
url = "mirror://sourceforge/jmol/Jmol/Version%20${baseVersion}/Jmol%20${version}/Jmol-${version}-binary.tar.gz";
- sha256 = "1dnxbvi8ha9z2ldymkjpxydd216afv6k7fdp3j70sql10zgy0isk";
+ sha256 = "0sfbbi6mgj9hqzvcz19cr5s96rna2f2b1nc1d4j28xvva7qaqjm5";
};
patchPhase = ''
diff --git a/pkgs/applications/science/geometry/drgeo/default.nix b/pkgs/applications/science/geometry/drgeo/default.nix
index 8db1beedebb..e233b91bbc9 100644
--- a/pkgs/applications/science/geometry/drgeo/default.nix
+++ b/pkgs/applications/science/geometry/drgeo/default.nix
@@ -20,8 +20,10 @@ stdenv.mkDerivation rec {
cp drgeo.desktop.in drgeo.desktop
'';
- meta = {
+ meta = with stdenv.lib; {
description = "Interactive geometry program";
- platforms = stdenv.lib.platforms.linux;
+ homepage = https://sourceforge.net/projects/ofset;
+ license = licenses.gpl2;
+ platforms = platforms.linux;
};
}
diff --git a/pkgs/applications/science/logic/prooftree/default.nix b/pkgs/applications/science/logic/prooftree/default.nix
index 01dfc35f6e0..2d5fcfd2d26 100644
--- a/pkgs/applications/science/logic/prooftree/default.nix
+++ b/pkgs/applications/science/logic/prooftree/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation (rec {
dontAddPrefix = true;
configureFlags = [ "--prefix" "$(out)" ];
- meta = {
+ meta = with stdenv.lib; {
description = "A program for proof-tree visualization";
longDescription = ''
Prooftree is a program for proof-tree visualization during interactive
@@ -35,7 +35,8 @@ stdenv.mkDerivation (rec {
shift-click).
'';
homepage = http://askra.de/software/prooftree;
- platforms = stdenv.lib.platforms.unix;
- maintainers = [ stdenv.lib.maintainers.jwiegley ];
+ platforms = platforms.unix;
+ maintainers = [ maintainers.jwiegley ];
+ license = licenses.gpl3;
};
})
diff --git a/pkgs/applications/science/math/mxnet/default.nix b/pkgs/applications/science/math/mxnet/default.nix
index ce9c214b3f0..990d3f1a5d5 100644
--- a/pkgs/applications/science/math/mxnet/default.nix
+++ b/pkgs/applications/science/math/mxnet/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, lib, fetchgit, cmake
-, opencv, gtest, openblas, liblapack
+{ stdenv, lib, fetchurl, bash, cmake
+, opencv, gtest, openblas, liblapack, perl
, cudaSupport ? false, cudatoolkit, nvidia_x11
, cudnnSupport ? false, cudnn
}:
@@ -8,16 +8,17 @@ assert cudnnSupport -> cudaSupport;
stdenv.mkDerivation rec {
name = "mxnet-${version}";
- version = "1.1.0";
+ version = "1.2.1";
- # Submodules needed
- src = fetchgit {
- url = "https://github.com/apache/incubator-mxnet";
- rev = "refs/tags/${version}";
- sha256 = "1qgns0c70a1gfyil96h17ms736nwdkp9kv496gvs9pkzqzvr6cpz";
+ # Fetching from git does not work at the time (1.2.1) due to an
+ # incorrect hash in one of the submodules. The provided tarballs
+ # contain all necessary sources.
+ src = fetchurl {
+ url = "https://github.com/apache/incubator-mxnet/releases/download/${version}/apache-mxnet-src-${version}-incubating.tar.gz";
+ sha256 = "053zbdgs4j8l79ipdz461zc7wyfbfcflmi5bw7lj2q08zm1glnb2";
};
- nativeBuildInputs = [ cmake ];
+ nativeBuildInputs = [ cmake perl ];
buildInputs = [ opencv gtest openblas liblapack ]
++ lib.optionals cudaSupport [ cudatoolkit nvidia_x11 ]
@@ -30,9 +31,17 @@ stdenv.mkDerivation rec {
] else [ "-DUSE_CUDA=OFF" ])
++ lib.optional (!cudnnSupport) "-DUSE_CUDNN=OFF";
- installPhase = ''
- install -Dm755 libmxnet.so $out/lib/libmxnet.so
- cp -r ../include $out
+ postPatch = ''
+ substituteInPlace 3rdparty/mkldnn/tests/CMakeLists.txt \
+ --replace "/bin/bash" "${bash}/bin/bash"
+
+ # Build against the system version of OpenMP.
+ # https://github.com/apache/incubator-mxnet/pull/12160
+ rm -rf 3rdparty/openmp
+ '';
+
+ postInstall = ''
+ rm "$out"/lib/*.a
'';
enableParallelBuilding = true;
diff --git a/pkgs/applications/science/math/pynac/default.nix b/pkgs/applications/science/math/pynac/default.nix
index 1a059aeb167..9bbb695a331 100644
--- a/pkgs/applications/science/math/pynac/default.nix
+++ b/pkgs/applications/science/math/pynac/default.nix
@@ -41,6 +41,7 @@ stdenv.mkDerivation rec {
of the full GiNaC, and it is *only* meant to be used as a Python library.
'';
homepage = http://pynac.org;
+ license = licenses.gpl3;
maintainers = with maintainers; [ timokau ];
platforms = platforms.linux;
};
diff --git a/pkgs/applications/science/math/ripser/default.nix b/pkgs/applications/science/math/ripser/default.nix
index 21948a279d0..5e0b7fc300b 100644
--- a/pkgs/applications/science/math/ripser/default.nix
+++ b/pkgs/applications/science/math/ripser/default.nix
@@ -8,7 +8,8 @@
with stdenv.lib;
-assert elem fileFormat ["lowerTriangularCsv" "upperTriangularCsv" "dipha"];
+assert assertOneOf "fileFormat" fileFormat
+ ["lowerTriangularCsv" "upperTriangularCsv" "dipha"];
assert useGoogleHashmap -> sparsehash != null;
let
diff --git a/pkgs/applications/science/math/sage/default.nix b/pkgs/applications/science/math/sage/default.nix
index 08e3a752b8b..7e62f0cf75e 100644
--- a/pkgs/applications/science/math/sage/default.nix
+++ b/pkgs/applications/science/math/sage/default.nix
@@ -21,7 +21,7 @@ let
sagelib = self.callPackage ./sagelib.nix {
inherit flint ecl arb;
- inherit sage-src pynac singular;
+ inherit sage-src openblas-blas-pc openblas-cblas-pc openblas-lapack-pc pynac singular;
linbox = nixpkgs.linbox.override { withSage = true; };
};
@@ -41,13 +41,13 @@ let
};
sage-env = self.callPackage ./sage-env.nix {
- inherit sage-src python rWrapper ecl singular palp flint pynac pythonEnv;
+ inherit sage-src python rWrapper openblas-cblas-pc ecl singular palp flint pynac pythonEnv;
pkg-config = nixpkgs.pkgconfig; # not to confuse with pythonPackages.pkgconfig
};
sage-with-env = self.callPackage ./sage-with-env.nix {
inherit pythonEnv;
- inherit sage-src pynac singular;
+ inherit sage-src openblas-blas-pc openblas-cblas-pc openblas-lapack-pc pynac singular;
pkg-config = nixpkgs.pkgconfig; # not to confuse with pythonPackages.pkgconfig
three = nodePackages_8_x.three;
};
@@ -60,6 +60,10 @@ let
};
};
+ openblas-blas-pc = callPackage ./openblas-pc.nix { name = "blas"; };
+ openblas-cblas-pc = callPackage ./openblas-pc.nix { name = "cblas"; };
+ openblas-lapack-pc = callPackage ./openblas-pc.nix { name = "lapack"; };
+
sage-src = callPackage ./sage-src.nix {};
pythonRuntimeDeps = with python.pkgs; [
diff --git a/pkgs/applications/science/math/sage/openblas-pc.nix b/pkgs/applications/science/math/sage/openblas-pc.nix
new file mode 100644
index 00000000000..f4669a6557e
--- /dev/null
+++ b/pkgs/applications/science/math/sage/openblas-pc.nix
@@ -0,0 +1,17 @@
+{ openblasCompat
+, writeTextFile
+, name
+}:
+
+writeTextFile {
+ name = "openblas-${name}-pc-${openblasCompat.version}";
+ destination = "/lib/pkgconfig/${name}.pc";
+ text = ''
+ Name: ${name}
+ Version: ${openblasCompat.version}
+
+ Description: ${name} for SageMath, provided by the OpenBLAS package.
+ Cflags: -I${openblasCompat}/include
+ Libs: -L${openblasCompat}/lib -lopenblas
+ '';
+}
diff --git a/pkgs/applications/science/math/sage/patches/numpy-1.14.3.patch b/pkgs/applications/science/math/sage/patches/numpy-1.15.1.patch
similarity index 78%
rename from pkgs/applications/science/math/sage/patches/numpy-1.14.3.patch
rename to pkgs/applications/science/math/sage/patches/numpy-1.15.1.patch
index 5927bc11609..9e855ba4ad9 100644
--- a/pkgs/applications/science/math/sage/patches/numpy-1.14.3.patch
+++ b/pkgs/applications/science/math/sage/patches/numpy-1.15.1.patch
@@ -1,5 +1,5 @@
diff --git a/src/doc/en/faq/faq-usage.rst b/src/doc/en/faq/faq-usage.rst
-index 79b4205fd3..9a89bd2136 100644
+index 2347a1190d..f5b0fe71a4 100644
--- a/src/doc/en/faq/faq-usage.rst
+++ b/src/doc/en/faq/faq-usage.rst
@@ -338,7 +338,7 @@ ints. For example::
@@ -174,7 +174,7 @@ index 5b89cd75ee..e50b2ea5d4 100644
This creates a random 5x5 matrix ``A``, and solves `Ax=b` where
``b=[0.0,1.0,2.0,3.0,4.0]``. There are many other routines in the :mod:`numpy.linalg`
diff --git a/src/sage/calculus/riemann.pyx b/src/sage/calculus/riemann.pyx
-index df85cce43d..34ea164be0 100644
+index 60f37f7557..4ac3dedf1d 100644
--- a/src/sage/calculus/riemann.pyx
+++ b/src/sage/calculus/riemann.pyx
@@ -1191,30 +1191,30 @@ cpdef complex_to_spiderweb(np.ndarray[COMPLEX_T, ndim = 2] z_values,
@@ -248,7 +248,7 @@ index df85cce43d..34ea164be0 100644
TESTS::
diff --git a/src/sage/combinat/fully_packed_loop.py b/src/sage/combinat/fully_packed_loop.py
-index 61b1003002..4baee9cbbd 100644
+index 0a9bd61267..d2193cc2d6 100644
--- a/src/sage/combinat/fully_packed_loop.py
+++ b/src/sage/combinat/fully_packed_loop.py
@@ -72,11 +72,11 @@ def _make_color_list(n, colors=None, color_map=None, randomize=False):
@@ -269,10 +269,10 @@ index 61b1003002..4baee9cbbd 100644
['blue', 'blue', 'red', 'blue', 'red', 'red', 'red', 'blue']
"""
diff --git a/src/sage/finance/time_series.pyx b/src/sage/finance/time_series.pyx
-index c37700d14e..49b7298d0b 100644
+index 28779365df..3ab0282861 100644
--- a/src/sage/finance/time_series.pyx
+++ b/src/sage/finance/time_series.pyx
-@@ -109,8 +109,8 @@ cdef class TimeSeries:
+@@ -111,8 +111,8 @@ cdef class TimeSeries:
sage: import numpy
sage: v = numpy.array([[1,2], [3,4]], dtype=float); v
@@ -283,7 +283,7 @@ index c37700d14e..49b7298d0b 100644
sage: finance.TimeSeries(v)
[1.0000, 2.0000, 3.0000, 4.0000]
sage: finance.TimeSeries(v[:,0])
-@@ -2098,14 +2098,14 @@ cdef class TimeSeries:
+@@ -2100,14 +2100,14 @@ cdef class TimeSeries:
sage: w[0] = 20
sage: w
@@ -301,7 +301,7 @@ index c37700d14e..49b7298d0b 100644
sage: v
[20.0000, -3.0000, 4.5000, -2.0000]
diff --git a/src/sage/functions/hyperbolic.py b/src/sage/functions/hyperbolic.py
-index 931a4b41e4..bf33fc483d 100644
+index aff552f450..7a6df931e7 100644
--- a/src/sage/functions/hyperbolic.py
+++ b/src/sage/functions/hyperbolic.py
@@ -214,7 +214,7 @@ class Function_coth(GinacFunction):
@@ -341,7 +341,7 @@ index 931a4b41e4..bf33fc483d 100644
return arctanh(1.0 / x)
diff --git a/src/sage/functions/orthogonal_polys.py b/src/sage/functions/orthogonal_polys.py
-index 017c85a96f..33fbb499c5 100644
+index ed6365bef4..99b8b04dad 100644
--- a/src/sage/functions/orthogonal_polys.py
+++ b/src/sage/functions/orthogonal_polys.py
@@ -810,12 +810,12 @@ class Func_chebyshev_T(ChebyshevFunction):
@@ -379,10 +379,10 @@ index 017c85a96f..33fbb499c5 100644
array([ 0.2 , -0.96])
"""
diff --git a/src/sage/functions/other.py b/src/sage/functions/other.py
-index 679384c907..d63b295a4c 100644
+index 1883daa3e6..9885222817 100644
--- a/src/sage/functions/other.py
+++ b/src/sage/functions/other.py
-@@ -390,7 +390,7 @@ class Function_ceil(BuiltinFunction):
+@@ -389,7 +389,7 @@ class Function_ceil(BuiltinFunction):
sage: import numpy
sage: a = numpy.linspace(0,2,6)
sage: ceil(a)
@@ -391,7 +391,7 @@ index 679384c907..d63b295a4c 100644
Test pickling::
-@@ -539,7 +539,7 @@ class Function_floor(BuiltinFunction):
+@@ -553,7 +553,7 @@ class Function_floor(BuiltinFunction):
sage: import numpy
sage: a = numpy.linspace(0,2,6)
sage: floor(a)
@@ -400,7 +400,7 @@ index 679384c907..d63b295a4c 100644
sage: floor(x)._sympy_()
floor(x)
-@@ -840,7 +840,7 @@ def sqrt(x, *args, **kwds):
+@@ -869,7 +869,7 @@ def sqrt(x, *args, **kwds):
sage: import numpy
sage: a = numpy.arange(2,5)
sage: sqrt(a)
@@ -409,11 +409,35 @@ index 679384c907..d63b295a4c 100644
"""
if isinstance(x, float):
return math.sqrt(x)
+diff --git a/src/sage/functions/spike_function.py b/src/sage/functions/spike_function.py
+index 1e021de3fe..56635ca98f 100644
+--- a/src/sage/functions/spike_function.py
++++ b/src/sage/functions/spike_function.py
+@@ -157,7 +157,7 @@ class SpikeFunction:
+ sage: S = spike_function([(-3,4),(-1,1),(2,3)]); S
+ A spike function with spikes at [-3.0, -1.0, 2.0]
+ sage: P = S.plot_fft_abs(8)
+- sage: p = P[0]; p.ydata
++ sage: p = P[0]; p.ydata # abs tol 1e-8
+ [5.0, 5.0, 3.367958691924177, 3.367958691924177, 4.123105625617661, 4.123105625617661, 4.759921664218055, 4.759921664218055]
+ """
+ w = self.vector(samples = samples, xmin=xmin, xmax=xmax)
+@@ -176,8 +176,8 @@ class SpikeFunction:
+ sage: S = spike_function([(-3,4),(-1,1),(2,3)]); S
+ A spike function with spikes at [-3.0, -1.0, 2.0]
+ sage: P = S.plot_fft_arg(8)
+- sage: p = P[0]; p.ydata
+- [0.0, 0.0, -0.211524990023434..., -0.211524990023434..., 0.244978663126864..., 0.244978663126864..., -0.149106180027477..., -0.149106180027477...]
++ sage: p = P[0]; p.ydata # abs tol 1e-8
++ [0.0, 0.0, -0.211524990023434, -0.211524990023434, 0.244978663126864, 0.244978663126864, -0.149106180027477, -0.149106180027477]
+ """
+ w = self.vector(samples = samples, xmin=xmin, xmax=xmax)
+ xmin, xmax = self._ranges(xmin, xmax)
diff --git a/src/sage/functions/trig.py b/src/sage/functions/trig.py
-index e7e7a311cd..e7ff78a9de 100644
+index 501e7ff6b6..5f760912f0 100644
--- a/src/sage/functions/trig.py
+++ b/src/sage/functions/trig.py
-@@ -731,7 +731,7 @@ class Function_arccot(GinacFunction):
+@@ -724,7 +724,7 @@ class Function_arccot(GinacFunction):
sage: import numpy
sage: a = numpy.arange(2, 5)
sage: arccot(a)
@@ -422,7 +446,7 @@ index e7e7a311cd..e7ff78a9de 100644
"""
return math.pi/2 - arctan(x)
-@@ -787,7 +787,7 @@ class Function_arccsc(GinacFunction):
+@@ -780,7 +780,7 @@ class Function_arccsc(GinacFunction):
sage: import numpy
sage: a = numpy.arange(2, 5)
sage: arccsc(a)
@@ -431,7 +455,7 @@ index e7e7a311cd..e7ff78a9de 100644
"""
return arcsin(1.0/x)
-@@ -845,7 +845,7 @@ class Function_arcsec(GinacFunction):
+@@ -838,7 +838,7 @@ class Function_arcsec(GinacFunction):
sage: import numpy
sage: a = numpy.arange(2, 5)
sage: arcsec(a)
@@ -440,7 +464,7 @@ index e7e7a311cd..e7ff78a9de 100644
"""
return arccos(1.0/x)
-@@ -920,13 +920,13 @@ class Function_arctan2(GinacFunction):
+@@ -913,13 +913,13 @@ class Function_arctan2(GinacFunction):
sage: a = numpy.linspace(1, 3, 3)
sage: b = numpy.linspace(3, 6, 3)
sage: atan2(a, b)
@@ -458,10 +482,10 @@ index e7e7a311cd..e7ff78a9de 100644
TESTS::
diff --git a/src/sage/matrix/constructor.pyx b/src/sage/matrix/constructor.pyx
-index 19a1d37df0..5780dfae1c 100644
+index 12136f1773..491bf22e62 100644
--- a/src/sage/matrix/constructor.pyx
+++ b/src/sage/matrix/constructor.pyx
-@@ -494,8 +494,8 @@ class MatrixFactory(object):
+@@ -503,8 +503,8 @@ def matrix(*args, **kwds):
[7 8 9]
Full MatrixSpace of 3 by 3 dense matrices over Integer Ring
sage: n = matrix(QQ, 2, 2, [1, 1/2, 1/3, 1/4]).numpy(); n
@@ -473,10 +497,31 @@ index 19a1d37df0..5780dfae1c 100644
[ 1 1/2]
[1/3 1/4]
diff --git a/src/sage/matrix/matrix_double_dense.pyx b/src/sage/matrix/matrix_double_dense.pyx
-index 48e0a8a97f..1be5d35b19 100644
+index 66e54a79a4..0498334f4b 100644
--- a/src/sage/matrix/matrix_double_dense.pyx
+++ b/src/sage/matrix/matrix_double_dense.pyx
-@@ -2546,7 +2546,7 @@ cdef class Matrix_double_dense(Matrix_dense):
+@@ -606,6 +606,9 @@ cdef class Matrix_double_dense(Matrix_dense):
+ [ 3.0 + 9.0*I 4.0 + 16.0*I 5.0 + 25.0*I]
+ [6.0 + 36.0*I 7.0 + 49.0*I 8.0 + 64.0*I]
+ sage: B.condition()
++ doctest:warning
++ ...
++ ComplexWarning: Casting complex values to real discards the imaginary part
+ 203.851798...
+ sage: B.condition(p='frob')
+ 203.851798...
+@@ -654,9 +657,7 @@ cdef class Matrix_double_dense(Matrix_dense):
+ True
+ sage: B = A.change_ring(CDF)
+ sage: B.condition()
+- Traceback (most recent call last):
+- ...
+- LinAlgError: Singular matrix
++ +Infinity
+
+ Improper values of ``p`` are caught. ::
+
+@@ -2519,7 +2520,7 @@ cdef class Matrix_double_dense(Matrix_dense):
sage: P.is_unitary(algorithm='orthonormal')
Traceback (most recent call last):
...
@@ -485,7 +530,7 @@ index 48e0a8a97f..1be5d35b19 100644
TESTS::
-@@ -3662,8 +3662,8 @@ cdef class Matrix_double_dense(Matrix_dense):
+@@ -3635,8 +3636,8 @@ cdef class Matrix_double_dense(Matrix_dense):
[0.0 1.0 2.0]
[3.0 4.0 5.0]
sage: m.numpy()
@@ -496,7 +541,7 @@ index 48e0a8a97f..1be5d35b19 100644
Alternatively, numpy automatically calls this function (via
the magic :meth:`__array__` method) to convert Sage matrices
-@@ -3674,16 +3674,16 @@ cdef class Matrix_double_dense(Matrix_dense):
+@@ -3647,16 +3648,16 @@ cdef class Matrix_double_dense(Matrix_dense):
[0.0 1.0 2.0]
[3.0 4.0 5.0]
sage: numpy.array(m)
@@ -518,10 +563,10 @@ index 48e0a8a97f..1be5d35b19 100644
dtype('complex128')
diff --git a/src/sage/matrix/special.py b/src/sage/matrix/special.py
-index c698ba5e97..b743bab354 100644
+index ccbd208810..c3f9a65093 100644
--- a/src/sage/matrix/special.py
+++ b/src/sage/matrix/special.py
-@@ -705,7 +705,7 @@ def diagonal_matrix(arg0=None, arg1=None, arg2=None, sparse=True):
+@@ -706,7 +706,7 @@ def diagonal_matrix(arg0=None, arg1=None, arg2=None, sparse=True):
sage: import numpy
sage: entries = numpy.array([1.2, 5.6]); entries
@@ -530,7 +575,7 @@ index c698ba5e97..b743bab354 100644
sage: A = diagonal_matrix(3, entries); A
[1.2 0.0 0.0]
[0.0 5.6 0.0]
-@@ -715,7 +715,7 @@ def diagonal_matrix(arg0=None, arg1=None, arg2=None, sparse=True):
+@@ -716,7 +716,7 @@ def diagonal_matrix(arg0=None, arg1=None, arg2=None, sparse=True):
sage: j = numpy.complex(0,1)
sage: entries = numpy.array([2.0+j, 8.1, 3.4+2.6*j]); entries
@@ -540,10 +585,10 @@ index c698ba5e97..b743bab354 100644
[2.0 + 1.0*I 0.0 0.0]
[ 0.0 8.1 0.0]
diff --git a/src/sage/modules/free_module_element.pyx b/src/sage/modules/free_module_element.pyx
-index 230f142117..2ab1c0ae68 100644
+index 37d92c1282..955d083b34 100644
--- a/src/sage/modules/free_module_element.pyx
+++ b/src/sage/modules/free_module_element.pyx
-@@ -982,7 +982,7 @@ cdef class FreeModuleElement(Vector): # abstract base class
+@@ -988,7 +988,7 @@ cdef class FreeModuleElement(Vector): # abstract base class
sage: v.numpy()
array([1, 2, 5/6], dtype=object)
sage: v.numpy(dtype=float)
@@ -552,7 +597,7 @@ index 230f142117..2ab1c0ae68 100644
sage: v.numpy(dtype=int)
array([1, 2, 0])
sage: import numpy
-@@ -993,7 +993,7 @@ cdef class FreeModuleElement(Vector): # abstract base class
+@@ -999,7 +999,7 @@ cdef class FreeModuleElement(Vector): # abstract base class
be more efficient but may have unintended consequences::
sage: v.numpy(dtype=None)
@@ -596,22 +641,6 @@ index 39fc2970de..2badf98284 100644
"""
if dtype is None or dtype is self._vector_numpy.dtype:
from copy import copy
-diff --git a/src/sage/numerical/optimize.py b/src/sage/numerical/optimize.py
-index 17b5ebb84b..92ce35c502 100644
---- a/src/sage/numerical/optimize.py
-+++ b/src/sage/numerical/optimize.py
-@@ -486,9 +486,9 @@ def minimize_constrained(func,cons,x0,gradient=None,algorithm='default', **args)
- else:
- min = optimize.fmin_tnc(f, x0, approx_grad=True, bounds=cons, messages=0, **args)[0]
- elif isinstance(cons[0], function_type) or isinstance(cons[0], Expression):
-- min = optimize.fmin_cobyla(f, x0, cons, iprint=0, **args)
-+ min = optimize.fmin_cobyla(f, x0, cons, disp=0, **args)
- elif isinstance(cons, function_type) or isinstance(cons, Expression):
-- min = optimize.fmin_cobyla(f, x0, cons, iprint=0, **args)
-+ min = optimize.fmin_cobyla(f, x0, cons, disp=0, **args)
- return vector(RDF, min)
-
-
diff --git a/src/sage/plot/complex_plot.pyx b/src/sage/plot/complex_plot.pyx
index ad9693da62..758fb709b7 100644
--- a/src/sage/plot/complex_plot.pyx
@@ -649,6 +678,76 @@ index ad9693da62..758fb709b7 100644
"""
import numpy
cdef unsigned int i, j, imax, jmax
+diff --git a/src/sage/plot/histogram.py b/src/sage/plot/histogram.py
+index 5d28473731..fc4b2046c0 100644
+--- a/src/sage/plot/histogram.py
++++ b/src/sage/plot/histogram.py
+@@ -53,10 +53,17 @@ class Histogram(GraphicPrimitive):
+ """
+ import numpy as np
+ self.datalist=np.asarray(datalist,dtype=float)
++ if 'normed' in options:
++ from sage.misc.superseded import deprecation
++ deprecation(25260, "the 'normed' option is deprecated. Use 'density' instead.")
+ if 'linestyle' in options:
+ from sage.plot.misc import get_matplotlib_linestyle
+ options['linestyle'] = get_matplotlib_linestyle(
+ options['linestyle'], return_type='long')
++ if options.get('range', None):
++ # numpy.histogram performs type checks on "range" so this must be
++ # actual floats
++ options['range'] = [float(x) for x in options['range']]
+ GraphicPrimitive.__init__(self, options)
+
+ def get_minmax_data(self):
+@@ -80,10 +87,14 @@ class Histogram(GraphicPrimitive):
+ {'xmax': 4.0, 'xmin': 0, 'ymax': 2, 'ymin': 0}
+
+ TESTS::
+-
+ sage: h = histogram([10,3,5], normed=True)[0]
+- sage: h.get_minmax_data() # rel tol 1e-15
+- {'xmax': 10.0, 'xmin': 3.0, 'ymax': 0.4761904761904765, 'ymin': 0}
++ doctest:warning...:
++ DeprecationWarning: the 'normed' option is deprecated. Use 'density' instead.
++ See https://trac.sagemath.org/25260 for details.
++ sage: h.get_minmax_data()
++ doctest:warning ...:
++ VisibleDeprecationWarning: Passing `normed=True` on non-uniform bins has always been broken, and computes neither the probability density function nor the probability mass function. The result is only correct if the bins are uniform, when density=True will produce the same result anyway. The argument will be removed in a future version of numpy.
++ {'xmax': 10.0, 'xmin': 3.0, 'ymax': 0.476190476190..., 'ymin': 0}
+ """
+ import numpy
+
+@@ -152,7 +163,7 @@ class Histogram(GraphicPrimitive):
+ 'rwidth': 'The relative width of the bars as a fraction of the bin width',
+ 'cumulative': '(True or False) If True, then a histogram is computed in which each bin gives the counts in that bin plus all bins for smaller values. Negative values give a reversed direction of accumulation.',
+ 'range': 'A list [min, max] which define the range of the histogram. Values outside of this range are treated as outliers and omitted from counts.',
+- 'normed': 'Deprecated alias for density',
++ 'normed': 'Deprecated. Use density instead.',
+ 'density': '(True or False) If True, the counts are normalized to form a probability density. (n/(len(x)*dbin)',
+ 'weights': 'A sequence of weights the same length as the data list. If supplied, then each value contributes its associated weight to the bin count.',
+ 'stacked': '(True or False) If True, multiple data are stacked on top of each other.',
+@@ -199,7 +210,7 @@ class Histogram(GraphicPrimitive):
+ subplot.hist(self.datalist.transpose(), **options)
+
+
+-@options(aspect_ratio='automatic',align='mid', weights=None, range=None, bins=10, edgecolor='black')
++@options(aspect_ratio='automatic', align='mid', weights=None, range=None, bins=10, edgecolor='black')
+ def histogram(datalist, **options):
+ """
+ Computes and draws the histogram for list(s) of numerical data.
+@@ -231,8 +242,9 @@ def histogram(datalist, **options):
+ - ``linewidth`` -- (float) width of the lines defining the bars
+ - ``linestyle`` -- (default: 'solid') Style of the line. One of 'solid'
+ or '-', 'dashed' or '--', 'dotted' or ':', 'dashdot' or '-.'
+- - ``density`` -- (boolean - default: False) If True, the counts are
+- normalized to form a probability density.
++ - ``density`` -- (boolean - default: False) If True, the result is the
++ value of the probability density function at the bin, normalized such
++ that the integral over the range is 1.
+ - ``range`` -- A list [min, max] which define the range of the
+ histogram. Values outside of this range are treated as outliers and
+ omitted from counts
diff --git a/src/sage/plot/line.py b/src/sage/plot/line.py
index 23f5e61446..3b1b51d7cf 100644
--- a/src/sage/plot/line.py
@@ -718,7 +817,7 @@ index f3da57c370..3806f4b32f 100644
TESTS:
diff --git a/src/sage/probability/probability_distribution.pyx b/src/sage/probability/probability_distribution.pyx
-index f66cd898b9..35995886d5 100644
+index 1b119e323f..3290b00695 100644
--- a/src/sage/probability/probability_distribution.pyx
+++ b/src/sage/probability/probability_distribution.pyx
@@ -130,7 +130,17 @@ cdef class ProbabilityDistribution:
@@ -741,10 +840,10 @@ index f66cd898b9..35995886d5 100644
import pylab
l = [float(self.get_random_element()) for _ in range(num_samples)]
diff --git a/src/sage/rings/rational.pyx b/src/sage/rings/rational.pyx
-index a0bfe080f5..7d95e7a1a8 100644
+index 12ca1b222b..9bad7dae0c 100644
--- a/src/sage/rings/rational.pyx
+++ b/src/sage/rings/rational.pyx
-@@ -1056,7 +1056,7 @@ cdef class Rational(sage.structure.element.FieldElement):
+@@ -1041,7 +1041,7 @@ cdef class Rational(sage.structure.element.FieldElement):
dtype('O')
sage: numpy.array([1, 1/2, 3/4])
@@ -754,10 +853,10 @@ index a0bfe080f5..7d95e7a1a8 100644
if mpz_cmp_ui(mpq_denref(self.value), 1) == 0:
if mpz_fits_slong_p(mpq_numref(self.value)):
diff --git a/src/sage/rings/real_mpfr.pyx b/src/sage/rings/real_mpfr.pyx
-index 4c630867a4..64e2187f5b 100644
+index 9b90c8833e..1ce05b937d 100644
--- a/src/sage/rings/real_mpfr.pyx
+++ b/src/sage/rings/real_mpfr.pyx
-@@ -1438,7 +1438,7 @@ cdef class RealNumber(sage.structure.element.RingElement):
+@@ -1439,7 +1439,7 @@ cdef class RealNumber(sage.structure.element.RingElement):
sage: import numpy
sage: numpy.arange(10.0)
@@ -767,10 +866,10 @@ index 4c630867a4..64e2187f5b 100644
dtype('float64')
sage: numpy.array([1.000000000000000000000000000000000000]).dtype
diff --git a/src/sage/schemes/elliptic_curves/height.py b/src/sage/schemes/elliptic_curves/height.py
-index 3d270ebf9d..1144f168e3 100644
+index de31fe9883..7a33ea6f5b 100644
--- a/src/sage/schemes/elliptic_curves/height.py
+++ b/src/sage/schemes/elliptic_curves/height.py
-@@ -1623,18 +1623,18 @@ class EllipticCurveCanonicalHeight:
+@@ -1627,18 +1627,18 @@ class EllipticCurveCanonicalHeight:
even::
sage: H.wp_on_grid(v,4)
@@ -798,10 +897,10 @@ index 3d270ebf9d..1144f168e3 100644
tau = self.tau(v)
fk, err = self.fk_intervals(v, 15, CDF)
diff --git a/src/sage/symbolic/ring.pyx b/src/sage/symbolic/ring.pyx
-index 2dcb0492b9..2b1a06385c 100644
+index 9da38002e8..d61e74bf82 100644
--- a/src/sage/symbolic/ring.pyx
+++ b/src/sage/symbolic/ring.pyx
-@@ -1135,7 +1135,7 @@ cdef class NumpyToSRMorphism(Morphism):
+@@ -1136,7 +1136,7 @@ cdef class NumpyToSRMorphism(Morphism):
sage: cos(numpy.int('2'))
cos(2)
sage: numpy.cos(numpy.int('2'))
diff --git a/pkgs/applications/science/math/sage/sage-env.nix b/pkgs/applications/science/math/sage/sage-env.nix
index 74c2e0aa036..317eb6e16c4 100644
--- a/pkgs/applications/science/math/sage/sage-env.nix
+++ b/pkgs/applications/science/math/sage/sage-env.nix
@@ -37,7 +37,7 @@
, lcalc
, rubiks
, flintqs
-, openblasCompat
+, openblas-cblas-pc
, flint
, gmp
, mpfr
@@ -98,9 +98,9 @@ writeTextFile rec {
export PKG_CONFIG_PATH='${lib.concatStringsSep ":" (map (pkg: "${pkg}/lib/pkgconfig") [
# This is only needed in the src/sage/misc/cython.py test and I'm not sure if there's really a use-case
# for it outside of the tests. However since singular and openblas are runtime dependencies anyways
- # it doesn't really hurt to include.
+ # and openblas-cblas-pc is tiny, it doesn't really hurt to include.
singular
- openblasCompat
+ openblas-cblas-pc
])
}'
export SAGE_ROOT='${sage-src}'
diff --git a/pkgs/applications/science/math/sage/sage-src.nix b/pkgs/applications/science/math/sage/sage-src.nix
index 7fd49fe205c..f74da33f402 100644
--- a/pkgs/applications/science/math/sage/sage-src.nix
+++ b/pkgs/applications/science/math/sage/sage-src.nix
@@ -94,9 +94,20 @@ stdenv.mkDerivation rec {
stripLen = 1;
})
- # Only formatting changes.
+ (fetchpatch {
+ name = "matplotlib-2.2.2";
+ url = "https://git.sagemath.org/sage.git/patch?id=0d6244ed53b71aba861ce3d683d33e542c0bf0b0";
+ sha256 = "15x4cadxxlsdfh2sblgagqjj6ir13fgdzixxnwnvzln60saahb34";
+ })
+
+ (fetchpatch {
+ name = "scipy-1.1.0";
+ url = "https://git.sagemath.org/sage.git/patch?id=e0db968a51678b34ebd8d34906c7042900272378";
+ sha256 = "0kq5zxqphhrmavrmg830wdr7hwp1bkzdqlf3jfqfr8r8xq12qwf7";
+ })
+
# https://trac.sagemath.org/ticket/25260
- ./patches/numpy-1.14.3.patch
+ ./patches/numpy-1.15.1.patch
# https://trac.sagemath.org/ticket/25862
./patches/eclib-20180710.patch
diff --git a/pkgs/applications/science/math/sage/sage-with-env.nix b/pkgs/applications/science/math/sage/sage-with-env.nix
index 8ccf8b5a493..63b9772b823 100644
--- a/pkgs/applications/science/math/sage/sage-with-env.nix
+++ b/pkgs/applications/science/math/sage/sage-with-env.nix
@@ -4,6 +4,9 @@
, sage-env
, sage-src
, openblasCompat
+, openblas-blas-pc
+, openblas-cblas-pc
+, openblas-lapack-pc
, pkg-config
, three
, singular
@@ -29,6 +32,9 @@ let
makeWrapper
pkg-config
openblasCompat # lots of segfaults with regular (64 bit) openblas
+ openblas-blas-pc
+ openblas-cblas-pc
+ openblas-lapack-pc
singular
three
pynac
diff --git a/pkgs/applications/science/math/sage/sagelib.nix b/pkgs/applications/science/math/sage/sagelib.nix
index c1dbcf38304..abcefba5e26 100644
--- a/pkgs/applications/science/math/sage/sagelib.nix
+++ b/pkgs/applications/science/math/sage/sagelib.nix
@@ -3,6 +3,9 @@
, buildPythonPackage
, arb
, openblasCompat
+, openblas-blas-pc
+, openblas-cblas-pc
+, openblas-lapack-pc
, brial
, cliquer
, cypari2
@@ -56,7 +59,9 @@ buildPythonPackage rec {
nativeBuildInputs = [
iml
perl
- openblasCompat
+ openblas-blas-pc
+ openblas-cblas-pc
+ openblas-lapack-pc
jupyter_core
];
diff --git a/pkgs/applications/science/misc/root/default.nix b/pkgs/applications/science/misc/root/default.nix
index e966e798ae6..2ec1ded68a2 100644
--- a/pkgs/applications/science/misc/root/default.nix
+++ b/pkgs/applications/science/misc/root/default.nix
@@ -67,10 +67,11 @@ stdenv.mkDerivation rec {
setupHook = ./setup-hook.sh;
- meta = {
+ meta = with stdenv.lib; {
homepage = https://root.cern.ch/;
description = "A data analysis framework";
- platforms = stdenv.lib.platforms.unix;
- maintainers = with stdenv.lib.maintainers; [ veprbl ];
+ platforms = platforms.unix;
+ maintainers = [ maintainers.veprbl ];
+ license = licenses.lgpl21;
};
}
diff --git a/pkgs/applications/science/misc/snakemake/default.nix b/pkgs/applications/science/misc/snakemake/default.nix
index 6b0570814f2..6f04d436877 100644
--- a/pkgs/applications/science/misc/snakemake/default.nix
+++ b/pkgs/applications/science/misc/snakemake/default.nix
@@ -37,5 +37,6 @@ python.buildPythonPackage rec {
workflows are essentially Python scripts extended by declarative code to define
rules. Rules describe how to create output files from input files.
'';
+ maintainers = with maintainers; [ helkafen renatoGarcia ];
};
}
diff --git a/pkgs/applications/version-management/bazaar/default.nix b/pkgs/applications/version-management/bazaar/default.nix
index fea6fb35830..097c1e86a89 100644
--- a/pkgs/applications/version-management/bazaar/default.nix
+++ b/pkgs/applications/version-management/bazaar/default.nix
@@ -27,9 +27,10 @@ python2Packages.buildPythonApplication rec {
--subst-var-by certPath /etc/ssl/certs/ca-certificates.crt
'';
- meta = {
+ meta = with stdenv.lib; {
homepage = http://bazaar-vcs.org/;
description = "A distributed version control system that Just Works";
- platforms = stdenv.lib.platforms.unix;
+ platforms = platforms.unix;
+ license = licenses.gpl2Plus;
};
}
diff --git a/pkgs/applications/version-management/bazaar/tools.nix b/pkgs/applications/version-management/bazaar/tools.nix
index 0ad3c6079ac..82c87f30b71 100644
--- a/pkgs/applications/version-management/bazaar/tools.nix
+++ b/pkgs/applications/version-management/bazaar/tools.nix
@@ -3,7 +3,7 @@
python2Packages.buildPythonApplication rec {
name = "bzr-tools-${version}";
version = "2.6.0";
-
+
src = fetchurl {
url = "http://launchpad.net/bzrtools/stable/${version}/+download/bzrtools-${version}.tar.gz";
sha256 = "0n3zzc6jf5866kfhmrnya1vdr2ja137a45qrzsz8vz6sc6xgn5wb";
@@ -11,9 +11,10 @@ python2Packages.buildPythonApplication rec {
doCheck = false;
- meta = {
+ meta = with stdenv.lib; {
description = "Bazaar plugins";
homepage = http://wiki.bazaar.canonical.com/BzrTools;
- platforms = stdenv.lib.platforms.unix;
+ platforms = platforms.unix;
+ license = licenses.gpl2;
};
}
diff --git a/pkgs/applications/version-management/cvs2svn/default.nix b/pkgs/applications/version-management/cvs2svn/default.nix
index 90a9f26045f..5dc0c48b0f7 100644
--- a/pkgs/applications/version-management/cvs2svn/default.nix
+++ b/pkgs/applications/version-management/cvs2svn/default.nix
@@ -23,10 +23,11 @@ stdenv.mkDerivation rec {
/* !!! maybe we should absolutise the program names in
$out/lib/python2.4/site-packages/cvs2svn_lib/config.py. */
- meta = {
+ meta = with stdenv.lib; {
description = "A tool to convert CVS repositories to Subversion repositories";
homepage = http://cvs2svn.tigris.org/;
- maintainers = [ lib.maintainers.makefu ];
- platforms = stdenv.lib.platforms.unix;
+ maintainers = [ maintainers.makefu ];
+ platforms = platforms.unix;
+ license = licenses.asl20;
};
}
diff --git a/pkgs/applications/version-management/guitone/default.nix b/pkgs/applications/version-management/guitone/default.nix
index 88074a0862c..33d2eb89ad0 100644
--- a/pkgs/applications/version-management/guitone/default.nix
+++ b/pkgs/applications/version-management/guitone/default.nix
@@ -25,8 +25,9 @@ stdenv.mkDerivation rec {
meta = {
description = "Qt4 based GUI for monotone";
- homepage = http://guitone.thomaskeller.biz;
+ homepage = https://guitone.thomaskeller.biz;
downloadPage = https://code.monotone.ca/p/guitone/;
+ license = stdenv.lib.licenses.gpl3;
inherit (qt4.meta) platforms;
};
}
diff --git a/pkgs/applications/version-management/monotone/default.nix b/pkgs/applications/version-management/monotone/default.nix
index 4282f48654e..0606c58c09d 100644
--- a/pkgs/applications/version-management/monotone/default.nix
+++ b/pkgs/applications/version-management/monotone/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
patches = [ ./monotone-1.1-Adapt-to-changes-in-pcre-8.42.patch ];
nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ boost zlib botan libidn lua pcre sqlite expect
+ buildInputs = [ boost zlib botan libidn lua pcre sqlite expect
openssl gmp bzip2 ];
postInstall = ''
@@ -33,9 +33,10 @@ stdenv.mkDerivation rec {
#doCheck = true; # some tests fail (and they take VERY long)
- meta = {
+ meta = with stdenv.lib; {
description = "A free distributed version control system";
- maintainers = [stdenv.lib.maintainers.raskin];
- platforms = stdenv.lib.platforms.unix;
+ maintainers = [ maintainers.raskin ];
+ platforms = platforms.unix;
+ license = licenses.gpl2;
};
}
diff --git a/pkgs/applications/version-management/vcprompt/default.nix b/pkgs/applications/version-management/vcprompt/default.nix
index 4afb1b20e32..c2bf0a4183c 100644
--- a/pkgs/applications/version-management/vcprompt/default.nix
+++ b/pkgs/applications/version-management/vcprompt/default.nix
@@ -25,5 +25,6 @@ stdenv.mkDerivation rec {
homepage = http://hg.gerg.ca/vcprompt;
maintainers = with maintainers; [ cstrahan ];
platforms = with platforms; linux ++ darwin;
+ license = licenses.gpl2Plus;
};
}
diff --git a/pkgs/applications/video/kodi/commons.nix b/pkgs/applications/video/kodi/commons.nix
deleted file mode 100644
index eff9b787106..00000000000
--- a/pkgs/applications/video/kodi/commons.nix
+++ /dev/null
@@ -1,83 +0,0 @@
-{ stdenv, fetchFromGitHub
-, cmake, kodiPlain, libcec_platform, tinyxml }:
-
-rec {
-
- pluginDir = "/share/kodi/addons";
-
- kodi-platform = stdenv.mkDerivation rec {
- project = "kodi-platform";
- version = "17.1";
- name = "${project}-${version}";
-
- src = fetchFromGitHub {
- owner = "xbmc";
- repo = project;
- rev = "c8188d82678fec6b784597db69a68e74ff4986b5";
- sha256 = "1r3gs3c6zczmm66qcxh9mr306clwb3p7ykzb70r3jv5jqggiz199";
- };
-
- buildInputs = [ cmake kodiPlain libcec_platform tinyxml ];
-
- };
-
- mkKodiAPIPlugin = { plugin, namespace, version, src, meta, sourceDir ? null, ... }:
- stdenv.lib.makeOverridable stdenv.mkDerivation rec {
-
- inherit src meta sourceDir;
-
- name = "kodi-plugin-${plugin}-${version}";
-
- passthru = {
- kodiPlugin = pluginDir;
- namespace = namespace;
- };
-
- dontStrip = true;
-
- installPhase = ''
- ${if isNull sourceDir then "" else "cd $src/$sourceDir"}
- d=$out${pluginDir}/${namespace}
- mkdir -p $d
- sauce="."
- [ -d ${namespace} ] && sauce=${namespace}
- cp -R "$sauce/"* $d
- '';
-
- };
-
- mkKodiPlugin = mkKodiAPIPlugin;
-
- mkKodiABIPlugin = { plugin, namespace, version, src, meta
- , extraBuildInputs ? [], sourceDir ? null, ... }:
- stdenv.lib.makeOverridable stdenv.mkDerivation rec {
-
- inherit src meta sourceDir;
-
- name = "kodi-plugin-${plugin}-${version}";
-
- passthru = {
- kodiPlugin = pluginDir;
- namespace = namespace;
- };
-
- dontStrip = true;
-
- buildInputs = [ cmake kodiPlain kodi-platform libcec_platform ]
- ++ extraBuildInputs;
-
- # disables check ensuring install prefix is that of kodi
- cmakeFlags = [
- "-DOVERRIDE_PATHS=1"
- ];
-
- # kodi checks for plugin .so libs existance in the addon folder (share/...)
- # and the non-wrapped kodi lib/... folder before even trying to dlopen
- # them. Symlinking .so, as setting LD_LIBRARY_PATH is of no use
- installPhase = let n = namespace; in ''
- make install
- ln -s $out/lib/addons/${n}/${n}.so.${version} $out/${pluginDir}/${n}/${n}.so.${version}
- '';
-
- };
-}
diff --git a/pkgs/applications/video/kodi/default.nix b/pkgs/applications/video/kodi/default.nix
index 454665455c5..9272d3c8e26 100644
--- a/pkgs/applications/video/kodi/default.nix
+++ b/pkgs/applications/video/kodi/default.nix
@@ -1,5 +1,5 @@
{ stdenv, lib, fetchFromGitHub, autoconf, automake, libtool, makeWrapper
-, pkgconfig, cmake, gnumake, yasm, python2
+, pkgconfig, cmake, gnumake, yasm, python2Packages
, libgcrypt, libgpgerror, libunistring
, boost, avahi, lame, autoreconfHook
, gettext, pcre-cpp, yajl, fribidi, which
@@ -119,7 +119,7 @@ in stdenv.mkDerivation rec {
buildInputs = [
gnutls libidn libtasn1 nasm p11-kit
- libxml2 yasm python2
+ libxml2 yasm python2Packages.python
boost libmicrohttpd
gettext pcre-cpp yajl fribidi libva libdrm
openssl gperf tinyxml2 taglib libssh swig jre
@@ -187,7 +187,7 @@ in stdenv.mkDerivation rec {
postInstall = ''
for p in $(ls $out/bin/) ; do
wrapProgram $out/bin/$p \
- --prefix PATH ":" "${lib.makeBinPath [ python2 glxinfo xdpyinfo ]}" \
+ --prefix PATH ":" "${lib.makeBinPath [ python2Packages.python glxinfo xdpyinfo ]}" \
--prefix LD_LIBRARY_PATH ":" "${lib.makeLibraryPath
([ curl systemd libmad libvdpau libcec libcec_platform rtmpdump libass ] ++ lib.optional nfsSupport libnfs)}"
done
@@ -200,6 +200,10 @@ in stdenv.mkDerivation rec {
installCheckPhase = "$out/bin/kodi --version";
+ passthru = {
+ pythonPackages = python2Packages;
+ };
+
meta = with stdenv.lib; {
description = "Media center";
homepage = https://kodi.tv/;
diff --git a/pkgs/applications/video/kodi/plugins.nix b/pkgs/applications/video/kodi/plugins.nix
index 5a0583202e6..f2ceacdd799 100644
--- a/pkgs/applications/video/kodi/plugins.nix
+++ b/pkgs/applications/video/kodi/plugins.nix
@@ -1,9 +1,90 @@
{ stdenv, callPackage, fetchurl, fetchFromGitHub, unzip
+, cmake, kodiPlain, libcec_platform, tinyxml
, steam, libusb, pcre-cpp, jsoncpp, libhdhomerun, zlib }:
-with (callPackage ./commons.nix {});
+with stdenv.lib;
-rec {
+let self = rec {
+
+ pluginDir = "/share/kodi/addons";
+
+ kodi = kodiPlain;
+
+ # Convert derivation to a kodi module. Stolen from ../../../top-level/python-packages.nix
+ toKodiPlugin = drv: drv.overrideAttrs(oldAttrs: {
+ # Use passthru in order to prevent rebuilds when possible.
+ passthru = (oldAttrs.passthru or {})// {
+ kodiPluginFor = kodi;
+ requiredKodiPlugins = requiredKodiPlugins drv.propagatedBuildInputs;
+ };
+ });
+
+ # Check whether a derivation provides a Kodi plugin.
+ hasKodiPlugin = drv: drv ? kodiPluginFor && drv.kodiPluginFor == kodi;
+
+ # Get list of required Kodi plugins given a list of derivations.
+ requiredKodiPlugins = drvs: let
+ modules = filter hasKodiPlugin drvs;
+ in unique (modules ++ concatLists (catAttrs "requiredKodiPlugins" modules));
+
+ kodiWithPlugins = func: callPackage ./wrapper.nix {
+ inherit kodi;
+ plugins = requiredKodiPlugins (func self);
+ };
+
+ kodi-platform = stdenv.mkDerivation rec {
+ project = "kodi-platform";
+ version = "17.1";
+ name = "${project}-${version}";
+
+ src = fetchFromGitHub {
+ owner = "xbmc";
+ repo = project;
+ rev = "c8188d82678fec6b784597db69a68e74ff4986b5";
+ sha256 = "1r3gs3c6zczmm66qcxh9mr306clwb3p7ykzb70r3jv5jqggiz199";
+ };
+
+ buildInputs = [ cmake kodiPlain libcec_platform tinyxml ];
+ };
+
+ mkKodiPlugin = { plugin, namespace, version, sourceDir ? null, ... }@args:
+ toKodiPlugin (stdenv.mkDerivation (rec {
+ name = "kodi-plugin-${plugin}-${version}";
+
+ dontStrip = true;
+
+ installPhase = ''
+ ${if isNull sourceDir then "" else "cd $src/$sourceDir"}
+ d=$out${pluginDir}/${namespace}
+ mkdir -p $d
+ sauce="."
+ [ -d ${namespace} ] && sauce=${namespace}
+ cp -R "$sauce/"* $d
+ '';
+ } // args));
+
+ mkKodiABIPlugin = { plugin, namespace, version, extraBuildInputs ? [], ... }@args:
+ toKodiPlugin (stdenv.mkDerivation (rec {
+ name = "kodi-plugin-${plugin}-${version}";
+
+ dontStrip = true;
+
+ buildInputs = [ cmake kodiPlain kodi-platform libcec_platform ]
+ ++ extraBuildInputs;
+
+ # disables check ensuring install prefix is that of kodi
+ cmakeFlags = [
+ "-DOVERRIDE_PATHS=1"
+ ];
+
+ # kodi checks for plugin .so libs existance in the addon folder (share/...)
+ # and the non-wrapped kodi lib/... folder before even trying to dlopen
+ # them. Symlinking .so, as setting LD_LIBRARY_PATH is of no use
+ installPhase = let n = namespace; in ''
+ make install
+ ln -s $out/lib/addons/${n}/${n}.so.${version} $out${pluginDir}/${n}/${n}.so.${version}
+ '';
+ } // args));
advanced-launcher = mkKodiPlugin rec {
@@ -18,7 +99,7 @@ rec {
sha256 = "142vvgs37asq5m54xqhjzqvgmb0xlirvm0kz6lxaqynp0vvgrkx2";
};
- meta = with stdenv.lib; {
+ meta = {
homepage = https://forum.kodi.tv/showthread.php?tid=85724;
description = "A program launcher for Kodi";
longDescription = ''
@@ -48,7 +129,7 @@ rec {
sha256 = "1sv9z77jj6bam6llcnd9b3dgkbvhwad2m1v541rv3acrackms2z2";
};
- meta = with stdenv.lib; {
+ meta = {
homepage = https://forum.kodi.tv/showthread.php?tid=287826;
description = "A program launcher for Kodi";
longDescription = ''
@@ -75,7 +156,7 @@ rec {
sha256 = "0sbc0w0fwbp7rbmbgb6a1kglhnn5g85hijcbbvf5x6jdq9v3f1qb";
};
- meta = with stdenv.lib; {
+ meta = {
description = "Add support for different gaming controllers.";
platforms = platforms.all;
maintainers = with maintainers; [ edwtjo ];
@@ -99,7 +180,7 @@ rec {
// (mkController "ps")
// (mkController "snes");
- exodus = (mkKodiPlugin rec {
+ exodus = mkKodiPlugin rec {
plugin = "exodus";
namespace = "plugin.video.exodus";
@@ -110,13 +191,14 @@ rec {
sha256 = "1zyay7cinljxmpzngzlrr4pnk2a7z9wwfdcsk6a4p416iglyggdj";
};
- meta = with stdenv.lib; {
+ buildInputs = [ unzip ];
+
+ meta = {
description = "A streaming plugin for Kodi";
platforms = platforms.all;
maintainers = with maintainers; [ edwtjo ];
};
-
- }).override { buildInputs = [ unzip ]; };
+ };
hyper-launcher = let
pname = "hyper-launcher";
@@ -128,7 +210,7 @@ rec {
rev = "f958ba93fe85b9c9025b1745d89c2db2e7dd9bf6";
sha256 = "1dvff24fbas25k5kvca4ssks9l1g5rfa3hl8lqxczkaqi3pp41j5";
};
- meta = with stdenv.lib; {
+ meta = {
homepage = https://forum.kodi.tv/showthread.php?tid=258159;
description = "A ROM launcher for Kodi that uses HyperSpin assets.";
maintainers = with maintainers; [ edwtjo ];
@@ -159,7 +241,7 @@ rec {
sha256 = "18m61v8z9fbh4imvzhh4g9629r9df49g2yk9ycaczirg131dhfbh";
};
- meta = with stdenv.lib; {
+ meta = {
description = "Binary addon for raw joystick input.";
platforms = platforms.all;
maintainers = with maintainers; [ edwtjo ];
@@ -183,7 +265,7 @@ rec {
sha256 = "0klk1jpjc243ak306k94mag4b4s17w68v69yb8lzzydszqkaqa7x";
};
- meta = with stdenv.lib; {
+ meta = {
homepage = https://forum.kodi.tv/showthread.php?tid=67110;
description = "Watch content from SVT Play";
longDescription = ''
@@ -212,7 +294,7 @@ rec {
extraBuildInputs = [ libusb ];
- meta = with stdenv.lib; {
+ meta = {
description = "Binary addon for steam controller.";
platforms = platforms.all;
maintainers = with maintainers; [ edwtjo ];
@@ -220,7 +302,7 @@ rec {
};
- steam-launcher = (mkKodiPlugin rec {
+ steam-launcher = mkKodiPlugin rec {
plugin = "steam-launcher";
namespace = "script.steam.launcher";
@@ -233,7 +315,9 @@ rec {
sha256 = "001a7zs3a4jfzj8ylxv2klc33mipmqsd5aqax7q81fbgwdlndvbm";
};
- meta = with stdenv.lib; {
+ propagatedBuildInputs = [ steam ];
+
+ meta = {
homepage = https://forum.kodi.tv/showthread.php?tid=157499;
description = "Launch Steam in Big Picture Mode from Kodi";
longDescription = ''
@@ -245,8 +329,6 @@ rec {
'';
maintainers = with maintainers; [ edwtjo ];
};
- }).override {
- propagatedBuildinputs = [ steam ];
};
pdfreader = mkKodiPlugin rec {
@@ -262,7 +344,7 @@ rec {
sha256 = "1iv7d030z3xvlflvp4p5v3riqnwg9g0yvzxszy63v1a6x5kpjkqa";
};
- meta = with stdenv.lib; {
+ meta = {
homepage = https://forum.kodi.tv/showthread.php?tid=187421;
description = "A comic book reader";
maintainers = with maintainers; [ edwtjo ];
@@ -282,7 +364,7 @@ rec {
sha256 = "0pmlgqr4kd0gvckz77mj6v42kcx6lb23anm8jnf2fbn877snnijx";
};
- meta = with stdenv.lib; {
+ meta = {
homepage = https://github.com/kodi-pvr/pvr.hts;
description = "Kodi's Tvheadend HTSP client addon";
platforms = platforms.all;
@@ -304,7 +386,7 @@ rec {
sha256 = "0dvdv0vk2q12nj0i5h51iaypy3i7jfsxjyxwwpxfy82y8260ragy";
};
- meta = with stdenv.lib; {
+ meta = {
homepage = https://github.com/kodi-pvr/pvr.hdhomerun;
description = "Kodi's HDHomeRun PVR client addon";
platforms = platforms.all;
@@ -328,7 +410,7 @@ rec {
sha256 = "1f1im2gachrxnr3z96h5cg2c13vapgkvkdwvrbl4hxlnyp1a6jyz";
};
- meta = with stdenv.lib; {
+ meta = {
homepage = https://github.com/kodi-pvr/pvr.iptvsimple;
description = "Kodi's IPTV Simple client addon";
platforms = platforms.all;
@@ -352,7 +434,7 @@ rec {
sha256 = "1b3fm02annsq58pcfc985glrmh21rmqksdj3q8wn6gyza06jdf3v";
};
- meta = with stdenv.lib; {
+ meta = {
homepage = https://github.com/osmc/skin.osmc;
description = "The default skin for OSMC";
platforms = platforms.all;
@@ -360,4 +442,5 @@ rec {
license = licenses.cc-by-nc-sa-30;
};
};
-}
+
+}; in self
diff --git a/pkgs/applications/video/kodi/wrapper.nix b/pkgs/applications/video/kodi/wrapper.nix
index e6d3fbb090f..d0dc9274a10 100644
--- a/pkgs/applications/video/kodi/wrapper.nix
+++ b/pkgs/applications/video/kodi/wrapper.nix
@@ -1,54 +1,25 @@
-{ stdenv, lib, makeWrapper, kodi, plugins }:
+{ stdenv, lib, makeWrapper, buildEnv, kodi, plugins }:
-let
+buildEnv {
+ name = "kodi-with-plugins-${(builtins.parseDrvName kodi.name).version}";
- p = builtins.parseDrvName kodi.name;
-
-in
-
-stdenv.mkDerivation {
-
- name = "kodi-" + p.version;
- version = p.version;
+ paths = [ kodi ] ++ plugins;
+ pathsToLink = [ "/share" ];
buildInputs = [ makeWrapper ];
- buildCommand = ''
- mkdir -p $out/share/kodi/addons
- ${stdenv.lib.concatMapStrings
- (plugin: "ln -s ${plugin.out
- + plugin.kodiPlugin
- + "/" + plugin.namespace
- } $out/share/kodi/addons/.;") plugins}
- $(for plugin in ${kodi}/share/kodi/addons/*
+ postBuild = ''
+ mkdir $out/bin
+ for exe in kodi{,-standalone}
do
- $(ln -s $plugin/ $out/share/kodi/addons/.)
- done)
- $(for share in ${kodi}/share/kodi/*
- do
- $(ln -s $share $out/share/kodi/.)
- done)
- $(for passthrough in icons xsessions applications
- do
- ln -s ${kodi}/share/$passthrough $out/share/
- done)
- $(for exe in kodi{,-standalone}
- do
- makeWrapper ${kodi}/bin/$exe $out/bin/$exe \
- --prefix KODI_HOME : $out/share/kodi;
- done)
+ makeWrapper ${kodi}/bin/$exe $out/bin/$exe \
+ --prefix PYTHONPATH : ${kodi.pythonPackages.makePythonPath plugins} \
+ --prefix KODI_HOME : $out/share/kodi
+ done
'';
- preferLocalBuild = true;
-
- meta = with kodi.meta; {
- inherit license homepage;
- description = description
- + " (with plugins: "
- + lib.concatStrings (lib.intersperse ", " (map (x: ""+x.name) plugins))
- + ")";
-
- platforms = stdenv.lib.platforms.linux;
+ meta = kodi.meta // {
+ description = kodi.meta.description
+ + " (with plugins: ${lib.concatMapStringsSep ", " (x: x.name) plugins})";
};
-
}
diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix
index c384455d672..9d843a3bfef 100644
--- a/pkgs/applications/video/mpv/default.nix
+++ b/pkgs/applications/video/mpv/default.nix
@@ -3,42 +3,46 @@
, freefont_ttf, freetype, libass, libpthreadstubs
, lua, luasocket, libuchardet, libiconv ? null, darwin
-, x11Support ? stdenv.isLinux,
- libGLU_combined ? null,
- libX11 ? null,
- libXext ? null,
- libXxf86vm ? null,
- libXrandr ? null
-
, waylandSupport ? false
, wayland ? null
, wayland-protocols ? null
, libxkbcommon ? null
-, rubberbandSupport ? true, rubberband ? null
-, xineramaSupport ? true, libXinerama ? null
-, xvSupport ? true, libXv ? null
-, sdl2Support ? true, SDL2 ? null
+, x11Support ? stdenv.isLinux
+ , libGLU_combined ? null
+ , libX11 ? null
+ , libXext ? null
+ , libXxf86vm ? null
+ , libXrandr ? null
+
+, cddaSupport ? false
+ , libcdio ? null
+ , libcdio-paranoia ? null
+
, alsaSupport ? true, alsaLib ? null
-, screenSaverSupport ? true, libXScrnSaver ? null
-, cmsSupport ? true, lcms2 ? null
-, vdpauSupport ? true, libvdpau ? null
-, dvdreadSupport ? true, libdvdread ? null
-, dvdnavSupport ? true, libdvdnav ? null
, bluraySupport ? true, libbluray ? null
-, speexSupport ? true, speex ? null
-, theoraSupport ? true, libtheora ? null
-, pulseSupport ? true, libpulseaudio ? null
, bs2bSupport ? true, libbs2b ? null
, cacaSupport ? true, libcaca ? null
-, libpngSupport ? true, libpng ? null
-, youtubeSupport ? true, youtube-dl ? null
-, vaapiSupport ? true, libva ? null
+, cmsSupport ? true, lcms2 ? null
, drmSupport ? true, libdrm ? null
-, openalSupport ? false, openalSoft ? null
-, vapoursynthSupport ? false, vapoursynth ? null
+, dvdnavSupport ? true, libdvdnav ? null
+, dvdreadSupport ? true, libdvdread ? null
+, libpngSupport ? true, libpng ? null
+, pulseSupport ? true, libpulseaudio ? null
+, rubberbandSupport ? true, rubberband ? null
+, screenSaverSupport ? true, libXScrnSaver ? null
+, sdl2Support ? true, SDL2 ? null
+, speexSupport ? true, speex ? null
+, theoraSupport ? true, libtheora ? null
+, vaapiSupport ? true, libva ? null
+, vdpauSupport ? true, libvdpau ? null
+, xineramaSupport ? true, libXinerama ? null
+, xvSupport ? true, libXv ? null
+, youtubeSupport ? true, youtube-dl ? null
, archiveSupport ? false, libarchive ? null
, jackaudioSupport ? false, libjack2 ? null
+, openalSupport ? false, openalSoft ? null
+, vapoursynthSupport ? false, vapoursynth ? null
}:
with stdenv.lib;
@@ -46,32 +50,33 @@ with stdenv.lib;
let
available = x: x != null;
in
-assert x11Support -> all available [libGLU_combined libX11 libXext libXxf86vm libXrandr];
-assert waylandSupport -> all available [wayland wayland-protocols libxkbcommon];
-assert rubberbandSupport -> available rubberband;
-assert xineramaSupport -> x11Support && available libXinerama;
-assert xvSupport -> x11Support && available libXv;
-assert sdl2Support -> available SDL2;
assert alsaSupport -> available alsaLib;
-assert screenSaverSupport -> available libXScrnSaver;
-assert cmsSupport -> available lcms2;
-assert vdpauSupport -> available libvdpau;
-assert dvdreadSupport -> available libdvdread;
-assert dvdnavSupport -> available libdvdnav;
+assert archiveSupport -> available libarchive;
assert bluraySupport -> available libbluray;
-assert speexSupport -> available speex;
-assert theoraSupport -> available libtheora;
-assert openalSupport -> available openalSoft;
-assert pulseSupport -> available libpulseaudio;
assert bs2bSupport -> available libbs2b;
assert cacaSupport -> available libcaca;
-assert libpngSupport -> available libpng;
-assert youtubeSupport -> available youtube-dl;
-assert vapoursynthSupport -> available vapoursynth;
-assert jackaudioSupport -> available libjack2;
-assert archiveSupport -> available libarchive;
-assert vaapiSupport -> available libva;
+assert cddaSupport -> all available [libcdio libcdio-paranoia];
+assert cmsSupport -> available lcms2;
assert drmSupport -> available libdrm;
+assert dvdnavSupport -> available libdvdnav;
+assert dvdreadSupport -> available libdvdread;
+assert jackaudioSupport -> available libjack2;
+assert libpngSupport -> available libpng;
+assert openalSupport -> available openalSoft;
+assert pulseSupport -> available libpulseaudio;
+assert rubberbandSupport -> available rubberband;
+assert screenSaverSupport -> available libXScrnSaver;
+assert sdl2Support -> available SDL2;
+assert speexSupport -> available speex;
+assert theoraSupport -> available libtheora;
+assert vaapiSupport -> available libva;
+assert vapoursynthSupport -> available vapoursynth;
+assert vdpauSupport -> available libvdpau;
+assert waylandSupport -> all available [ wayland wayland-protocols libxkbcommon ];
+assert x11Support -> all available [ libGLU_combined libX11 libXext libXxf86vm libXrandr ];
+assert xineramaSupport -> x11Support && available libXinerama;
+assert xvSupport -> x11Support && available libXv;
+assert youtubeSupport -> available youtube-dl;
let
# Purity: Waf is normally downloaded by bootstrap.py, but
@@ -115,13 +120,14 @@ in stdenv.mkDerivation rec {
"--disable-static-build"
"--disable-build-date" # Purity
"--disable-macos-cocoa-cb" # Disable whilst Swift isn't supported
- (enableFeature archiveSupport "libarchive")
- (enableFeature dvdreadSupport "dvdread")
- (enableFeature dvdnavSupport "dvdnav")
- (enableFeature openalSupport "openal")
- (enableFeature vaapiSupport "vaapi")
- (enableFeature waylandSupport "wayland")
- (enableFeature stdenv.isLinux "dvbin")
+ (enableFeature archiveSupport "libarchive")
+ (enableFeature cddaSupport "cdda")
+ (enableFeature dvdnavSupport "dvdnav")
+ (enableFeature dvdreadSupport "dvdread")
+ (enableFeature openalSupport "openal")
+ (enableFeature vaapiSupport "vaapi")
+ (enableFeature waylandSupport "wayland")
+ (enableFeature stdenv.isLinux "dvbin")
];
configurePhase = ''
@@ -137,32 +143,33 @@ in stdenv.mkDerivation rec {
ffmpeg_4 freetype libass libpthreadstubs
lua luasocket libuchardet
] ++ optional alsaSupport alsaLib
- ++ optional xvSupport libXv
- ++ optional theoraSupport libtheora
- ++ optional xineramaSupport libXinerama
- ++ optional dvdreadSupport libdvdread
+ ++ optional archiveSupport libarchive
++ optional bluraySupport libbluray
+ ++ optional bs2bSupport libbs2b
+ ++ optional cacaSupport libcaca
+ ++ optional cmsSupport lcms2
+ ++ optional drmSupport libdrm
+ ++ optional dvdreadSupport libdvdread
++ optional jackaudioSupport libjack2
+ ++ optional libpngSupport libpng
+ ++ optional openalSupport openalSoft
++ optional pulseSupport libpulseaudio
++ optional rubberbandSupport rubberband
++ optional screenSaverSupport libXScrnSaver
- ++ optional cmsSupport lcms2
- ++ optional vdpauSupport libvdpau
- ++ optional speexSupport speex
- ++ optional bs2bSupport libbs2b
- ++ optional openalSupport openalSoft
- ++ optional libpngSupport libpng
- ++ optional youtubeSupport youtube-dl
++ optional sdl2Support SDL2
- ++ optional cacaSupport libcaca
+ ++ optional speexSupport speex
+ ++ optional theoraSupport libtheora
++ optional vaapiSupport libva
- ++ optional drmSupport libdrm
++ optional vapoursynthSupport vapoursynth
- ++ optional archiveSupport libarchive
+ ++ optional vdpauSupport libvdpau
+ ++ optional xineramaSupport libXinerama
+ ++ optional xvSupport libXv
+ ++ optional youtubeSupport youtube-dl
++ optional stdenv.isDarwin libiconv
+ ++ optionals cddaSupport [ libcdio libcdio-paranoia ]
++ optionals dvdnavSupport [ libdvdnav libdvdnav.libdvdread ]
- ++ optionals x11Support [ libX11 libXext libGLU_combined libXxf86vm libXrandr ]
++ optionals waylandSupport [ wayland wayland-protocols libxkbcommon ]
+ ++ optionals x11Support [ libX11 libXext libGLU_combined libXxf86vm libXrandr ]
++ optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
CoreFoundation Cocoa CoreAudio
]);
diff --git a/pkgs/applications/video/tivodecode/default.nix b/pkgs/applications/video/tivodecode/default.nix
index b158bc92460..83ca41e201c 100644
--- a/pkgs/applications/video/tivodecode/default.nix
+++ b/pkgs/applications/video/tivodecode/default.nix
@@ -13,9 +13,10 @@ stdenv.mkDerivation {
sha256 = "1pww5r2iygscqn20a1cz9xbfh18p84a6a5ifg4h5nvyn9b63k23q";
};
- meta = {
+ meta = with stdenv.lib; {
description = "Converts a .TiVo file (produced by TiVoToGo) to a normal MPEG file";
homepage = http://tivodecode.sourceforge.net;
- platforms = stdenv.lib.platforms.unix;
+ platforms = platforms.unix;
+ license = licenses.bsd3;
};
}
diff --git a/pkgs/applications/video/xine-ui/default.nix b/pkgs/applications/video/xine-ui/default.nix
index 69fc68a69de..4dfc3fd052a 100644
--- a/pkgs/applications/video/xine-ui/default.nix
+++ b/pkgs/applications/video/xine-ui/default.nix
@@ -3,12 +3,12 @@
stdenv.mkDerivation rec {
name = "xine-ui-0.99.10";
-
+
src = fetchurl {
url = "mirror://sourceforge/xine/${name}.tar.xz";
sha256 = "0i3jzhiipfs5p1jbxviwh42zcfzag6iqc6yycaan0vrqm90an86a";
};
-
+
nativeBuildInputs = [ pkgconfig shared-mime-info ];
buildInputs =
@@ -20,14 +20,15 @@ stdenv.mkDerivation rec {
patchPhase = ''sed -e '/curl\/types\.h/d' -i src/xitk/download.c'';
configureFlags = [ "--with-readline=${readline.dev}" ];
-
+
LIRC_CFLAGS="-I${lirc}/include";
LIRC_LIBS="-L ${lirc}/lib -llirc_client";
#NIX_LDFLAGS = "-lXext -lgcc_s";
- meta = {
+ meta = with stdenv.lib; {
homepage = http://www.xine-project.org/;
description = "Xlib-based interface to Xine, a video player";
- platforms = stdenv.lib.platforms.linux;
+ platforms = platforms.linux;
+ license = licenses.gpl2;
};
}
diff --git a/pkgs/applications/window-managers/fbpanel/default.nix b/pkgs/applications/window-managers/fbpanel/default.nix
index b521240b48f..0c13691a36a 100644
--- a/pkgs/applications/window-managers/fbpanel/default.nix
+++ b/pkgs/applications/window-managers/fbpanel/default.nix
@@ -20,6 +20,7 @@ stdenv.mkDerivation rec {
description = "A stand-alone panel";
maintainers = with maintainers; [ raskin ];
platforms = platforms.linux;
+ license = licenses.mit;
};
passthru = {
diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix
index a981ffea708..301bc2694c4 100644
--- a/pkgs/build-support/cc-wrapper/default.nix
+++ b/pkgs/build-support/cc-wrapper/default.nix
@@ -75,7 +75,7 @@ stdenv.mkDerivation {
preferLocalBuild = true;
inherit cc libc_bin libc_dev libc_lib bintools coreutils_bin;
- shell = getBin shell + stdenv.lib.optionalString (stdenv ? shellPath) stdenv.shellPath;
+ shell = getBin shell + shell.shellPath or "";
gnugrep_bin = if nativeTools then "" else gnugrep;
inherit targetPrefix infixSalt;
diff --git a/pkgs/build-support/fetchdocker/default.nix b/pkgs/build-support/fetchdocker/default.nix
index 3556df32d92..bbd2bae46df 100644
--- a/pkgs/build-support/fetchdocker/default.nix
+++ b/pkgs/build-support/fetchdocker/default.nix
@@ -22,8 +22,8 @@ assert null == lib.findFirst (c: "/"==c) null (lib.stringToCharacters repository
assert null == lib.findFirst (c: "/"==c) null (lib.stringToCharacters imageName);
let
- # Abuse `builtins.toPath` to collapse possible double slashes
- repoTag0 = builtins.toString (builtins.toPath "/${stripScheme registry}/${repository}/${imageName}");
+ # Abuse paths to collapse possible double slashes
+ repoTag0 = builtins.toString (/. + "/${stripScheme registry}/${repository}/${imageName}");
repoTag1 = lib.removePrefix "/" repoTag0;
layers = builtins.map stripNixStore imageLayers;
diff --git a/pkgs/build-support/skaware/build-skaware-package.nix b/pkgs/build-support/skaware/build-skaware-package.nix
new file mode 100644
index 00000000000..51921fdfbdc
--- /dev/null
+++ b/pkgs/build-support/skaware/build-skaware-package.nix
@@ -0,0 +1,127 @@
+{ stdenv, fetchurl, writeScript, file }:
+let lib = stdenv.lib;
+in {
+ # : string
+ pname
+ # : string
+, version
+ # : string
+, sha256
+ # : string
+, description
+ # : list Platform
+, platforms ? lib.platforms.all
+ # : list string
+, outputs ? [ "bin" "lib" "dev" "doc" "out" ]
+ # TODO(Profpatsch): automatically infer most of these
+ # : list string
+, configureFlags
+ # mostly for moving and deleting files from the build directory
+ # : lines
+, postInstall
+ # : list Maintainer
+, maintainers ? []
+
+
+}:
+
+let
+
+ # File globs that can always be deleted
+ commonNoiseFiles = [
+ ".gitignore"
+ "Makefile"
+ "INSTALL"
+ "configure"
+ "patch-for-solaris"
+ "src/**/*"
+ "tools/**/*"
+ "package/**/*"
+ "config.mak"
+ ];
+
+ # File globs that should be moved to $doc
+ commonMetaFiles = [
+ "COPYING"
+ "AUTHORS"
+ "NEWS"
+ "CHANGELOG"
+ "README"
+ "README.*"
+ ];
+
+ globWith = stdenv.lib.concatMapStringsSep "\n";
+ rmNoise = globWith (f:
+ ''rm -rf ${f}'') commonNoiseFiles;
+ mvMeta = globWith
+ (f: ''mv ${f} "$DOCDIR" 2>/dev/null || true'')
+ commonMetaFiles;
+
+ # Move & remove actions, taking the package doc directory
+ commonFileActions = writeScript "common-file-actions.sh" ''
+ #!${stdenv.shell}
+ set -e
+ DOCDIR="$1"
+ shopt -s globstar extglob nullglob
+ ${rmNoise}
+ mkdir -p "$DOCDIR"
+ ${mvMeta}
+ '';
+
+
+in stdenv.mkDerivation {
+ name = "${pname}-${version}";
+
+ src = fetchurl {
+ url = "https://skarnet.org/software/${pname}/${pname}-${version}.tar.gz";
+ inherit sha256;
+ };
+
+ inherit outputs;
+
+ dontDisableStatic = true;
+ enableParallelBuilding = true;
+
+ configureFlags = configureFlags ++ [
+ "--enable-absolute-paths"
+ (if stdenv.isDarwin
+ then "--disable-shared"
+ else "--enable-shared")
+ ]
+ # On darwin, the target triplet from -dumpmachine includes version number,
+ # but skarnet.org software uses the triplet to test binary compatibility.
+ # Explicitly setting target ensures code can be compiled against a skalibs
+ # binary built on a different version of darwin.
+ # http://www.skarnet.org/cgi-bin/archive.cgi?1:mss:623:heiodchokfjdkonfhdph
+ ++ (lib.optional stdenv.isDarwin
+ "--build=${stdenv.hostPlatform.system}");
+
+ # TODO(Profpatsch): ensure that there is always a $doc output!
+ postInstall = ''
+ echo "Cleaning & moving common files"
+ mkdir -p $doc/share/doc/${pname}
+ ${commonFileActions} $doc/share/doc/${pname}
+
+ ${postInstall}
+ '';
+
+ postFixup = ''
+ echo "Checking for remaining source files"
+ rem=$(find -mindepth 1 -xtype f -print0 \
+ | tee $TMP/remaining-files)
+ if [[ "$rem" != "" ]]; then
+ echo "ERROR: These files should be either moved or deleted:"
+ cat $TMP/remaining-files | xargs -0 ${file}/bin/file
+ exit 1
+ fi
+ '';
+
+ meta = {
+ homepage = "https://skarnet.org/software/${pname}/";
+ inherit description platforms;
+ license = stdenv.lib.licenses.isc;
+ maintainers = with lib.maintainers;
+ [ pmahoney Profpatsch ] ++ maintainers;
+ };
+
+}
diff --git a/pkgs/data/fonts/pecita/default.nix b/pkgs/data/fonts/pecita/default.nix
index b57cf22569d..a90ff42a8e2 100644
--- a/pkgs/data/fonts/pecita/default.nix
+++ b/pkgs/data/fonts/pecita/default.nix
@@ -1,18 +1,24 @@
-{stdenv, fetchzip}:
+{ stdenv, fetchurl }:
let
+
version = "5.4";
-in fetchzip rec {
+
+in
+
+fetchurl rec {
name = "pecita-${version}";
- url = "http://archive.rycee.net/pecita/${name}.tar.xz";
+ url = "http://pecita.eu/b/Pecita.otf";
+
+ downloadToTemp = true;
postFetch = ''
- tar xJvf $downloadedFile --strip-components=1
mkdir -p $out/share/fonts/opentype
- cp -v Pecita.otf $out/share/fonts/opentype/Pecita.otf
+ cp -v $downloadedFile $out/share/fonts/opentype/Pecita.otf
'';
+ recursiveHash = true;
sha256 = "0pwm20f38lcbfkdqkpa2ydpc9kvmdg0ifc4h2dmipsnwbcb5rfwm";
meta = with stdenv.lib; {
diff --git a/pkgs/data/icons/numix-icon-theme-circle/default.nix b/pkgs/data/icons/numix-icon-theme-circle/default.nix
index 5ac0998fb29..68b967e715d 100644
--- a/pkgs/data/icons/numix-icon-theme-circle/default.nix
+++ b/pkgs/data/icons/numix-icon-theme-circle/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Numix icon theme (circle version)";
- homepage = https://numixproject.org;
+ homepage = https://numixproject.github.io;
license = licenses.gpl3;
# darwin cannot deal with file names differing only in case
platforms = platforms.linux;
diff --git a/pkgs/data/icons/numix-icon-theme-square/default.nix b/pkgs/data/icons/numix-icon-theme-square/default.nix
index 875e1025927..ec6972c4cac 100644
--- a/pkgs/data/icons/numix-icon-theme-square/default.nix
+++ b/pkgs/data/icons/numix-icon-theme-square/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Numix icon theme (square version)";
- homepage = https://numixproject.org;
+ homepage = https://numixproject.github.io;
license = licenses.gpl3;
# darwin cannot deal with file names differing only in case
platforms = platforms.linux;
diff --git a/pkgs/data/icons/numix-icon-theme/default.nix b/pkgs/data/icons/numix-icon-theme/default.nix
index 35f624a00f5..9aaed97dc27 100644
--- a/pkgs/data/icons/numix-icon-theme/default.nix
+++ b/pkgs/data/icons/numix-icon-theme/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Numix icon theme";
- homepage = https://numixproject.org;
+ homepage = https://numixproject.github.io;
license = licenses.gpl3;
# darwin cannot deal with file names differing only in case
platforms = platforms.linux;
diff --git a/pkgs/data/misc/hackage/default.nix b/pkgs/data/misc/hackage/default.nix
index fce8f44bd3f..a2d04640d59 100644
--- a/pkgs/data/misc/hackage/default.nix
+++ b/pkgs/data/misc/hackage/default.nix
@@ -1,6 +1,6 @@
{ fetchurl }:
fetchurl {
- url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/d5c89ad106556f7890c89c50a2b4d3fbdcea7616.tar.gz";
- sha256 = "0j8r88wwf0qvqxcnwmcs6xcn4vi0189c9f5chfl80941ggxfbpxk";
+ url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/22cb611adaf63739fc7e3956d83d450154ec766b.tar.gz";
+ sha256 = "0wxggabwz8qs2hmnr3k3iwy9rmvicx4a1n22l7f6krk1hym5bkpl";
}
diff --git a/pkgs/desktops/deepin/deepin-mutter/default.nix b/pkgs/desktops/deepin/deepin-mutter/default.nix
new file mode 100644
index 00000000000..e397ab53576
--- /dev/null
+++ b/pkgs/desktops/deepin/deepin-mutter/default.nix
@@ -0,0 +1,61 @@
+{ stdenv, fetchFromGitHub, pkgconfig, intltool, libtool, gnome3, xorg,
+ libcanberra-gtk3, upower, xkeyboard_config, libxkbcommon,
+ libstartup_notification, libinput, cogl, clutter, systemd
+}:
+
+stdenv.mkDerivation rec {
+ name = "${pname}-${version}";
+ pname = "deepin-mutter";
+ version = "3.20.34";
+
+ src = fetchFromGitHub {
+ owner = "linuxdeepin";
+ repo = pname;
+ rev = version;
+ sha256 = "0s427fmj806ljpdg6jdvpfislk5m1xvxpnnyrq3l8b7pkhjvp8wd";
+ };
+
+ nativeBuildInputs = [
+ pkgconfig
+ intltool
+ libtool
+ gnome3.gnome-common
+ ];
+
+ buildInputs = [
+ gnome3.gtk
+ gnome3.gnome-desktop
+ gnome3.gsettings-desktop-schemas
+ gnome3.libgudev
+ gnome3.zenity
+ upower
+ xorg.libxkbfile
+ libxkbcommon
+ libcanberra-gtk3
+ libstartup_notification
+ libinput
+ xkeyboard_config
+ cogl
+ clutter
+ systemd
+ ];
+
+ enableParallelBuilding = true;
+
+ configureFlags = [
+ "--enable-native-backend"
+ "--enable-compile-warnings=minimum"
+ ];
+
+ preConfigure = ''
+ NOCONFIGURE=1 ./autogen.sh
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Base window manager for deepin, fork of gnome mutter";
+ homepage = https://github.com/linuxdeepin/deepin-mutter;
+ license = licenses.gpl3;
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ romildo ];
+ };
+}
diff --git a/pkgs/desktops/deepin/deepin-shortcut-viewer/default.nix b/pkgs/desktops/deepin/deepin-shortcut-viewer/default.nix
new file mode 100644
index 00000000000..1bb112b76f6
--- /dev/null
+++ b/pkgs/desktops/deepin/deepin-shortcut-viewer/default.nix
@@ -0,0 +1,37 @@
+{ stdenv, fetchFromGitHub, pkgconfig, qmake, dtkcore, dtkwidget,
+ qt5integration
+}:
+
+stdenv.mkDerivation rec {
+ name = "${pname}-${version}";
+ pname = "deepin-shortcut-viewer";
+ version = "1.3.5";
+
+ src = fetchFromGitHub {
+ owner = "linuxdeepin";
+ repo = pname;
+ rev = version;
+ sha256 = "13vz8kjdqkrhgpvdgrvwn62vwzbyqp88hjm5m4rcqg3bh56709ma";
+ };
+
+ nativeBuildInputs = [
+ pkgconfig
+ qmake
+ ];
+
+ buildInputs = [
+ dtkcore
+ dtkwidget
+ qt5integration
+ ];
+
+ enableParallelBuilding = true;
+
+ meta = with stdenv.lib; {
+ description = "Pop-up shortcut viewer for Deepin applications";
+ homepage = https://github.com/linuxdeepin/deepin-shortcut-viewer;
+ license = licenses.gpl3;
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ romildo ];
+ };
+}
diff --git a/pkgs/desktops/deepin/deepin-terminal/default.nix b/pkgs/desktops/deepin/deepin-terminal/default.nix
index 2ce7885807a..26146b8ab47 100644
--- a/pkgs/desktops/deepin/deepin-terminal/default.nix
+++ b/pkgs/desktops/deepin/deepin-terminal/default.nix
@@ -1,6 +1,7 @@
{ stdenv, fetchurl, fetchFromGitHub, pkgconfig, gtk3, vala, cmake,
ninja, vte, libgee, wnck, zssh, gettext, librsvg, libsecret,
- json-glib, gobjectIntrospection, deepin-menu }:
+ json-glib, gobjectIntrospection, deepin-menu, deepin-shortcut-viewer
+}:
stdenv.mkDerivation rec {
name = "deepin-terminal-${version}";
@@ -27,12 +28,27 @@ stdenv.mkDerivation rec {
'';
nativeBuildInputs = [
- pkgconfig vala cmake ninja gettext
- # For setup hook
- gobjectIntrospection
+ pkgconfig
+ vala
+ cmake
+ ninja
+ gettext
+ gobjectIntrospection # For setup hook
];
- buildInputs = [ gtk3 vte libgee wnck librsvg libsecret json-glib deepin-menu ];
+ buildInputs = [
+ gtk3
+ vte
+ libgee
+ wnck
+ librsvg
+ libsecret
+ json-glib
+ deepin-menu
+ deepin-shortcut-viewer
+ ];
+
+ enableParallelBuilding = true;
meta = with stdenv.lib; {
description = "The default terminal emulation for Deepin";
diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix
index 15e108a651a..c1438012ef5 100644
--- a/pkgs/desktops/deepin/default.nix
+++ b/pkgs/desktops/deepin/default.nix
@@ -8,6 +8,8 @@ let
deepin-gtk-theme = callPackage ./deepin-gtk-theme { };
deepin-icon-theme = callPackage ./deepin-icon-theme { };
deepin-menu = callPackage ./deepin-menu { };
+ deepin-mutter = callPackage ./deepin-mutter { };
+ deepin-shortcut-viewer = callPackage ./deepin-shortcut-viewer { };
deepin-terminal = callPackage ./deepin-terminal {
inherit (pkgs.gnome3) libgee vte;
wnck = pkgs.libwnck3;
diff --git a/pkgs/desktops/gnome-3/core/rygel/default.nix b/pkgs/desktops/gnome-3/core/rygel/default.nix
new file mode 100644
index 00000000000..ef088632897
--- /dev/null
+++ b/pkgs/desktops/gnome-3/core/rygel/default.nix
@@ -0,0 +1,54 @@
+{ stdenv, fetchurl, pkgconfig, vala, gettext, libxml2, gobjectIntrospection, gtk-doc, wrapGAppsHook, glib, gssdp, gupnp, gupnp-av, gupnp-dlna, gst_all_1, libgee, libsoup, gtk3, libmediaart, sqlite, systemd, tracker, shared-mime-info, gnome3 }:
+
+let
+ pname = "rygel";
+ version = "0.36.2";
+in stdenv.mkDerivation rec {
+ name = "${pname}-${version}";
+
+ # TODO: split out lib
+ outputs = [ "out" "dev" "devdoc" ];
+
+ src = fetchurl {
+ url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+ sha256 = "0i12z6bzfzgcjidhxa2jsvpm4hqpab0s032z13jy2vbifrncfcnk";
+ };
+
+ nativeBuildInputs = [
+ pkgconfig vala gettext libxml2 gobjectIntrospection gtk-doc wrapGAppsHook
+ ];
+ buildInputs = [
+ glib gssdp gupnp gupnp-av gupnp-dlna libgee libsoup gtk3 libmediaart sqlite systemd tracker shared-mime-info
+ ] ++ (with gst_all_1; [
+ gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly
+ ]);
+
+ configureFlags = [
+ "--with-systemduserunitdir=$(out)/lib/systemd/user"
+ "--enable-apidocs"
+ "--sysconfdir=/etc"
+ ];
+
+ installFlags = [
+ "sysconfdir=$(out)/etc"
+ ];
+
+ doCheck = true;
+
+ enableParallelBuilding = true;
+
+ passthru = {
+ updateScript = gnome3.updateScript {
+ packageName = pname;
+ attrPath = "gnome3.${pname}";
+ };
+ };
+
+ meta = with stdenv.lib; {
+ description = "A home media solution (UPnP AV MediaServer) that allows you to easily share audio, video and pictures to other devices";
+ homepage = https://wiki.gnome.org/Projects/Rygel;
+ license = licenses.lgpl21Plus;
+ maintainers = gnome3.maintainers;
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/desktops/gnome-3/core/tracker/default.nix b/pkgs/desktops/gnome-3/core/tracker/default.nix
index ef6f31490a5..38e0d7cfa50 100644
--- a/pkgs/desktops/gnome-3/core/tracker/default.nix
+++ b/pkgs/desktops/gnome-3/core/tracker/default.nix
@@ -5,7 +5,7 @@
let
pname = "tracker";
- version = "2.1.3";
+ version = "2.1.4";
in stdenv.mkDerivation rec {
name = "${pname}-${version}";
@@ -13,7 +13,7 @@ in stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
- sha256 = "00gimpn2ydv3yka25cmw3i0n402d2nhx7992byvq4yvhr77rni22";
+ sha256 = "0xf58zld6pnfa8k7k70rv8ya8g7zqgahz6q4sapwxs6k97d2fgsx";
};
nativeBuildInputs = [
diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix
index d90440d5f55..5112f8b496f 100644
--- a/pkgs/desktops/gnome-3/default.nix
+++ b/pkgs/desktops/gnome-3/default.nix
@@ -216,6 +216,8 @@ lib.makeScope pkgs.newScope (self: with self; {
rest = callPackage ./core/rest { };
+ rygel = callPackage ./core/rygel { };
+
simple-scan = callPackage ./core/simple-scan { };
sushi = callPackage ./core/sushi { };
diff --git a/pkgs/desktops/plasma-5/fetch.sh b/pkgs/desktops/plasma-5/fetch.sh
index acf769f02e3..fc1850b3c2a 100644
--- a/pkgs/desktops/plasma-5/fetch.sh
+++ b/pkgs/desktops/plasma-5/fetch.sh
@@ -1 +1 @@
-WGET_ARGS=( https://download.kde.org/stable/plasma/5.13.4/ -A '*.tar.xz' )
+WGET_ARGS=( https://download.kde.org/stable/plasma/5.13.5/ -A '*.tar.xz' )
diff --git a/pkgs/desktops/plasma-5/srcs.nix b/pkgs/desktops/plasma-5/srcs.nix
index 752493b1a70..a6c3cb66f6a 100644
--- a/pkgs/desktops/plasma-5/srcs.nix
+++ b/pkgs/desktops/plasma-5/srcs.nix
@@ -3,363 +3,363 @@
{
bluedevil = {
- version = "5.13.4";
+ version = "5.13.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.13.4/bluedevil-5.13.4.tar.xz";
- sha256 = "1f7bjj3p5n8pvmqqgqz5xgjjhq1mjwknd36hrr5jn3klhbyahqkk";
- name = "bluedevil-5.13.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.13.5/bluedevil-5.13.5.tar.xz";
+ sha256 = "0am708cb6jfccx1jfbriwc2jgwd4ajqllirc9i0bg4jz5ydxbjxg";
+ name = "bluedevil-5.13.5.tar.xz";
};
};
breeze = {
- version = "5.13.4";
+ version = "5.13.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.13.4/breeze-5.13.4.tar.xz";
- sha256 = "1kxcd8zkk79mjh1j0lzw2nf0v0w2qc4zzb68nw61k1ca8v9mgq84";
- name = "breeze-5.13.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.13.5/breeze-5.13.5.tar.xz";
+ sha256 = "09jkkfdmngvbp8i2y6irlv6yvrzpc86mw6apmqvphiaqsilyxaw0";
+ name = "breeze-5.13.5.tar.xz";
};
};
breeze-grub = {
- version = "5.13.4";
+ version = "5.13.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.13.4/breeze-grub-5.13.4.tar.xz";
- sha256 = "1vxy24b2ndjkljw5ipwl8nl8nqckxr64sq6v4p690wib9j1nly09";
- name = "breeze-grub-5.13.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.13.5/breeze-grub-5.13.5.tar.xz";
+ sha256 = "03hsq77gi75chgyq9pzh3ry6k6bi78pfm33zn8gx784k9fx7gvqr";
+ name = "breeze-grub-5.13.5.tar.xz";
};
};
breeze-gtk = {
- version = "5.13.4";
+ version = "5.13.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.13.4/breeze-gtk-5.13.4.tar.xz";
- sha256 = "0sa0v9irimqhh17c1nykzkbhr6n3agam8y0idfr26xg7jblch3s0";
- name = "breeze-gtk-5.13.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.13.5/breeze-gtk-5.13.5.tar.xz";
+ sha256 = "1knh0b27b81rnd87s31s2mawqcl1yzwjcakk5npzfm3nj23xakv3";
+ name = "breeze-gtk-5.13.5.tar.xz";
};
};
breeze-plymouth = {
- version = "5.13.4";
+ version = "5.13.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.13.4/breeze-plymouth-5.13.4.tar.xz";
- sha256 = "1v02bh3xwcx5vixcp21a4wq04nn3wsgip5ycrgsb2bn013mspv20";
- name = "breeze-plymouth-5.13.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.13.5/breeze-plymouth-5.13.5.tar.xz";
+ sha256 = "0xsjl602wsb5ak1xg19w8y0fv9404cwbj1rcrm0hgjv735m32c57";
+ name = "breeze-plymouth-5.13.5.tar.xz";
};
};
discover = {
- version = "5.13.4";
+ version = "5.13.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.13.4/discover-5.13.4.tar.xz";
- sha256 = "1n7wd9w1r9a5ncgqc2s0aywivzqc3115wr93hrf1lqxpk0qskkyc";
- name = "discover-5.13.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.13.5/discover-5.13.5.tar.xz";
+ sha256 = "1q3nc5lih95vs5masd8z897hvfvpwidiisj8bg62iq0cblsgwz6d";
+ name = "discover-5.13.5.tar.xz";
};
};
drkonqi = {
- version = "5.13.4";
+ version = "5.13.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.13.4/drkonqi-5.13.4.tar.xz";
- sha256 = "1ddqisah98qd0hqg6pz5jk1pmisji2c6mj3i5w7df57zi7kpj4wz";
- name = "drkonqi-5.13.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.13.5/drkonqi-5.13.5.tar.xz";
+ sha256 = "02kbmymzzhsf9slaf64xlp8sfv59gl7qf1g2ahcq58sqry5bqjnk";
+ name = "drkonqi-5.13.5.tar.xz";
};
};
kactivitymanagerd = {
- version = "5.13.4";
+ version = "5.13.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.13.4/kactivitymanagerd-5.13.4.tar.xz";
- sha256 = "0iq5bxnszdndbvrqi8xm80d7i67xw0z45yq3qdsdlx80zzgb9g9d";
- name = "kactivitymanagerd-5.13.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.13.5/kactivitymanagerd-5.13.5.tar.xz";
+ sha256 = "0zfvypxh748vsl270l8wn6inmp8shi2m051yy699qdqbyb039wjq";
+ name = "kactivitymanagerd-5.13.5.tar.xz";
};
};
kde-cli-tools = {
- version = "5.13.4";
+ version = "5.13.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.13.4/kde-cli-tools-5.13.4.tar.xz";
- sha256 = "1dznj0jni4bm5z0hy644pcf7iavfd9yp8hfx87af3xhxxrifws37";
- name = "kde-cli-tools-5.13.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.13.5/kde-cli-tools-5.13.5.tar.xz";
+ sha256 = "0p1az420p4ldinmxnkdwl69542ddm0r4f3wmdysfird7d68yw2hp";
+ name = "kde-cli-tools-5.13.5.tar.xz";
};
};
kdecoration = {
- version = "5.13.4";
+ version = "5.13.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.13.4/kdecoration-5.13.4.tar.xz";
- sha256 = "1clf939g7qpnxxxw8iv3i4l9330dayzhg0cfrx6mffm2ywny67wd";
- name = "kdecoration-5.13.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.13.5/kdecoration-5.13.5.tar.xz";
+ sha256 = "04p77fs5c9b4mbpcl4a2c1wc0i09g51b7c1v7n9fd4nfkm7z8sqs";
+ name = "kdecoration-5.13.5.tar.xz";
};
};
kde-gtk-config = {
- version = "5.13.4";
+ version = "5.13.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.13.4/kde-gtk-config-5.13.4.tar.xz";
- sha256 = "03x5yvgk6kjy12qh3xblv90rsf8g5nsrc9573zd3rzz74pjql605";
- name = "kde-gtk-config-5.13.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.13.5/kde-gtk-config-5.13.5.tar.xz";
+ sha256 = "06j64y7p5kxnrc3407hma0drh3sb8jvjp3mx6na6b86z4xxf1kj6";
+ name = "kde-gtk-config-5.13.5.tar.xz";
};
};
kdeplasma-addons = {
- version = "5.13.4";
+ version = "5.13.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.13.4/kdeplasma-addons-5.13.4.tar.xz";
- sha256 = "1kgnmkykma14vinabal747hpvnrahccksgb68pxb4lxgylbcvy04";
- name = "kdeplasma-addons-5.13.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.13.5/kdeplasma-addons-5.13.5.tar.xz";
+ sha256 = "1a4f61bbwhc2y0lnrglbq3sas16bxff0ga3im9d15nq5a5q637i1";
+ name = "kdeplasma-addons-5.13.5.tar.xz";
};
};
kgamma5 = {
- version = "5.13.4";
+ version = "5.13.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.13.4/kgamma5-5.13.4.tar.xz";
- sha256 = "0hcnflk7zzpx00w6ifidrwxjmr99xrisfz2206fggal5j7y5w6yw";
- name = "kgamma5-5.13.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.13.5/kgamma5-5.13.5.tar.xz";
+ sha256 = "08brmdi5y69iwhj7506q2l0bfm92c9l9ds9w4d1ipcgnbydrhfyn";
+ name = "kgamma5-5.13.5.tar.xz";
};
};
khotkeys = {
- version = "5.13.4";
+ version = "5.13.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.13.4/khotkeys-5.13.4.tar.xz";
- sha256 = "1nq2afb06y3383gh3n5b1b4sbry5nicy3znid6p7b0jch1a0v73x";
- name = "khotkeys-5.13.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.13.5/khotkeys-5.13.5.tar.xz";
+ sha256 = "16kp5ck6zfpnmnvspdnqklix54np3sxvj5ixs9saqf3gd5rk49mp";
+ name = "khotkeys-5.13.5.tar.xz";
};
};
kinfocenter = {
- version = "5.13.4";
+ version = "5.13.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.13.4/kinfocenter-5.13.4.tar.xz";
- sha256 = "1vnch4ic1ppsrnp1w6rjcmn3c9ni91b3dgk0z91aw2x8c77cvji9";
- name = "kinfocenter-5.13.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.13.5/kinfocenter-5.13.5.tar.xz";
+ sha256 = "15r9j33z3l31gip9q3fw015s4mxakgy5wqfs04w5p0aq8x9xkpzl";
+ name = "kinfocenter-5.13.5.tar.xz";
};
};
kmenuedit = {
- version = "5.13.4";
+ version = "5.13.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.13.4/kmenuedit-5.13.4.tar.xz";
- sha256 = "0jyb4dc42dnpb6v4hkfb9m97yim767z0dc0i0hxqvznd87n5nk98";
- name = "kmenuedit-5.13.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.13.5/kmenuedit-5.13.5.tar.xz";
+ sha256 = "0zha39cd3p5nmrbkhkbcavxns2n2wnb6chc5kcsk5km9wn4laxz0";
+ name = "kmenuedit-5.13.5.tar.xz";
};
};
kscreen = {
- version = "5.13.4";
+ version = "5.13.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.13.4/kscreen-5.13.4.tar.xz";
- sha256 = "0labhlwdar6iibixal48bkk777hpyaibszv9mshlmhd7riaqrxs3";
- name = "kscreen-5.13.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.13.5/kscreen-5.13.5.tar.xz";
+ sha256 = "0kf1cf88n46b4js7x9r504605v68wp5hwpwid6phvfqdyqrvbb77";
+ name = "kscreen-5.13.5.tar.xz";
};
};
kscreenlocker = {
- version = "5.13.4";
+ version = "5.13.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.13.4/kscreenlocker-5.13.4.tar.xz";
- sha256 = "01b6y0wwclhni6ansg3avkml4qsq93rrg254ihy18bd1h05jxg4r";
- name = "kscreenlocker-5.13.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.13.5/kscreenlocker-5.13.5.tar.xz";
+ sha256 = "171zjk9r333kbkb9pashw0rdmiwq11nzfin4wnmqzwp7rrclxs18";
+ name = "kscreenlocker-5.13.5.tar.xz";
};
};
ksshaskpass = {
- version = "5.13.4";
+ version = "5.13.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.13.4/ksshaskpass-5.13.4.tar.xz";
- sha256 = "1f1567ac8qlgjgbqbksxqm969shydw3nizhn3ixvzr0n81lvab36";
- name = "ksshaskpass-5.13.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.13.5/ksshaskpass-5.13.5.tar.xz";
+ sha256 = "1znhj8x8kag1jrw0j1kfvqgprdayrcfbmawz2jap1ik2bjq7dp81";
+ name = "ksshaskpass-5.13.5.tar.xz";
};
};
ksysguard = {
- version = "5.13.4";
+ version = "5.13.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.13.4/ksysguard-5.13.4.tar.xz";
- sha256 = "1pg5687mlf5h4wb65my0v6scrj1zkxm5755wlq1jdasqr6zffdw0";
- name = "ksysguard-5.13.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.13.5/ksysguard-5.13.5.tar.xz";
+ sha256 = "1qjqhqc23rbimz3qj8gr3dhp0griwgbiajhvjngh1jl55fb3q29j";
+ name = "ksysguard-5.13.5.tar.xz";
};
};
kwallet-pam = {
- version = "5.13.4";
+ version = "5.13.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.13.4/kwallet-pam-5.13.4.tar.xz";
- sha256 = "0f9pg73710adr8p7m9qmync2lc86yl6hxmvr854lqzrp9mm2an0p";
- name = "kwallet-pam-5.13.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.13.5/kwallet-pam-5.13.5.tar.xz";
+ sha256 = "145daahh8qjpbfcvjk2zyd6k3sr22npgnv3n23j9aim75qiwz1ac";
+ name = "kwallet-pam-5.13.5.tar.xz";
};
};
kwayland-integration = {
- version = "5.13.4";
+ version = "5.13.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.13.4/kwayland-integration-5.13.4.tar.xz";
- sha256 = "0mhsidzpv5wg59d3v5z3a4n27fgfpdcr6y33zvib9k67isgx39h1";
- name = "kwayland-integration-5.13.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.13.5/kwayland-integration-5.13.5.tar.xz";
+ sha256 = "1qhkrs8md36z5gndkm88pyv6mspqsdsdavjz8klfwfv1hii6qyds";
+ name = "kwayland-integration-5.13.5.tar.xz";
};
};
kwin = {
- version = "5.13.4";
+ version = "5.13.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.13.4/kwin-5.13.4.tar.xz";
- sha256 = "1inh20xh80nv1vn0154jqsn6cn1xqfgjvvdvng6k2v330sd15dc6";
- name = "kwin-5.13.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.13.5/kwin-5.13.5.tar.xz";
+ sha256 = "0ld1pclni1axrh7jww3gxlfwkbjsfbqb9z7gygj2ff3nmc6khgfm";
+ name = "kwin-5.13.5.tar.xz";
};
};
kwrited = {
- version = "5.13.4";
+ version = "5.13.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.13.4/kwrited-5.13.4.tar.xz";
- sha256 = "1j9gl6d3j5mzydb4r9xmzxs313f2pj5phnh2n74nia672fn5kpqb";
- name = "kwrited-5.13.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.13.5/kwrited-5.13.5.tar.xz";
+ sha256 = "150nhjk4vcigs2r2bxqk309g81lxpnkkv8l44hiyivcbmwvc3aya";
+ name = "kwrited-5.13.5.tar.xz";
};
};
libkscreen = {
- version = "5.13.4";
+ version = "5.13.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.13.4/libkscreen-5.13.4.tar.xz";
- sha256 = "1azcpc3jm006s8zswv1w22gcajyvs800xc77l6das5jrl4ddk309";
- name = "libkscreen-5.13.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.13.5/libkscreen-5.13.5.tar.xz";
+ sha256 = "04719va15i66qn1xqx318v6risxhp8bfcnhxh9mqm5h9qx5c6c4k";
+ name = "libkscreen-5.13.5.tar.xz";
};
};
libksysguard = {
- version = "5.13.4";
+ version = "5.13.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.13.4/libksysguard-5.13.4.tar.xz";
- sha256 = "0k8q5bxk9zyv7c3nny1c399v8acqs618nw39q20pj2qdijl9ibvh";
- name = "libksysguard-5.13.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.13.5/libksysguard-5.13.5.tar.xz";
+ sha256 = "0pccjjjzk8dxgmkj5vrq20nwb3qpf9isjd1zmg5nc127jld924x6";
+ name = "libksysguard-5.13.5.tar.xz";
};
};
milou = {
- version = "5.13.4";
+ version = "5.13.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.13.4/milou-5.13.4.tar.xz";
- sha256 = "0rqwjb91a5x7piwdfh4xy8f2nhkfzdaja0ifpm7hrkysq6d9yzad";
- name = "milou-5.13.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.13.5/milou-5.13.5.tar.xz";
+ sha256 = "0rhgj10l2iik1mgnv2bixxqjyc3pl731bs1bqz9gsa3wiazspwrv";
+ name = "milou-5.13.5.tar.xz";
};
};
oxygen = {
- version = "5.13.4";
+ version = "5.13.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.13.4/oxygen-5.13.4.tar.xz";
- sha256 = "0035z94v4fbdl5jcaggv1vqjxk9z1marf4vs8zm7fkz6hhcn4vj2";
- name = "oxygen-5.13.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.13.5/oxygen-5.13.5.tar.xz";
+ sha256 = "0wm2mngh0gb0lqvx8g82ml2sdv0kbkx14mpb8c6aw3hslcwma7yd";
+ name = "oxygen-5.13.5.tar.xz";
};
};
plasma-browser-integration = {
- version = "5.13.4";
+ version = "5.13.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.13.4/plasma-browser-integration-5.13.4.tar.xz";
- sha256 = "19vqn3wbkfzsbf5rl61zaqgp10q83zxjmvvbn9325rp3dsv3i0jb";
- name = "plasma-browser-integration-5.13.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.13.5/plasma-browser-integration-5.13.5.tar.xz";
+ sha256 = "0bhpbq4n29x8m0nmxlli5ljmgpw9da7sfbmf3j5c3wnxqja16sgy";
+ name = "plasma-browser-integration-5.13.5.tar.xz";
};
};
plasma-desktop = {
- version = "5.13.4";
+ version = "5.13.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.13.4/plasma-desktop-5.13.4.tar.xz";
- sha256 = "1wmyms3bjka9kgjc6zp17j8w707lnmr2kxqzqznm78c16h34lfdx";
- name = "plasma-desktop-5.13.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.13.5/plasma-desktop-5.13.5.tar.xz";
+ sha256 = "14isrq3n9lm1nzmyv8zdgq6pwnv2zmg4dwxyp7fvqjxfls8851vp";
+ name = "plasma-desktop-5.13.5.tar.xz";
};
};
plasma-integration = {
- version = "5.13.4";
+ version = "5.13.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.13.4/plasma-integration-5.13.4.tar.xz";
- sha256 = "0p5wqj0jdvwq7blj7j1va00jlkqkwcxfkcj7gpnjmnsggp25mpsq";
- name = "plasma-integration-5.13.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.13.5/plasma-integration-5.13.5.tar.xz";
+ sha256 = "0j57ra79p5lkj81d05hhb87mrxgyj6qikkpzcb0p2dr2x8cmkng2";
+ name = "plasma-integration-5.13.5.tar.xz";
};
};
plasma-nm = {
- version = "5.13.4";
+ version = "5.13.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.13.4/plasma-nm-5.13.4.tar.xz";
- sha256 = "0qadmxzmw8a4r43ri2xxj4i884vraxlyxmwqkkn540x0aysyj4rq";
- name = "plasma-nm-5.13.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.13.5/plasma-nm-5.13.5.tar.xz";
+ sha256 = "1z8f5iybgra72vhpiayiwpysvv2z8x2r5xal8rhgf7y24xcjwxmi";
+ name = "plasma-nm-5.13.5.tar.xz";
};
};
plasma-pa = {
- version = "5.13.4";
+ version = "5.13.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.13.4/plasma-pa-5.13.4.tar.xz";
- sha256 = "1xqmp19dkggfzapns94jr0jz03aphdlz31iw888w2qj730zdx97k";
- name = "plasma-pa-5.13.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.13.5/plasma-pa-5.13.5.tar.xz";
+ sha256 = "0p54x4zr3w009nn7g00qmxh7xil35x7b48d0l0flz5d7hvkk6nd8";
+ name = "plasma-pa-5.13.5.tar.xz";
};
};
plasma-sdk = {
- version = "5.13.4";
+ version = "5.13.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.13.4/plasma-sdk-5.13.4.tar.xz";
- sha256 = "13ddin88ila3imkhn9bgaf1i0bbbmcb4xigk2cps74s8vl98jpfa";
- name = "plasma-sdk-5.13.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.13.5/plasma-sdk-5.13.5.tar.xz";
+ sha256 = "1x8hq343xzwlcsdvf0jy0qgn64xw8l11lawhknbjrf90qq58axga";
+ name = "plasma-sdk-5.13.5.tar.xz";
};
};
plasma-tests = {
- version = "5.13.4";
+ version = "5.13.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.13.4/plasma-tests-5.13.4.tar.xz";
- sha256 = "0fzqw3ix9sa3m492xjz46wsaqs7cgfpcprdx3z05ww4217k5d4sf";
- name = "plasma-tests-5.13.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.13.5/plasma-tests-5.13.5.tar.xz";
+ sha256 = "00nm0d0c4zccbwnhy8sc1qb4sf7bs5vfky3n7lihwyng3syqwz3d";
+ name = "plasma-tests-5.13.5.tar.xz";
};
};
plasma-vault = {
- version = "5.13.4";
+ version = "5.13.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.13.4/plasma-vault-5.13.4.tar.xz";
- sha256 = "1acpn49vb645a30xnxxf0rylihb7n838l0ky5169n6dq96swam4j";
- name = "plasma-vault-5.13.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.13.5/plasma-vault-5.13.5.tar.xz";
+ sha256 = "1045zb58pmcyn0cznb81bmcpd4hkhxm6509rznrjykkhcfcrbf8z";
+ name = "plasma-vault-5.13.5.tar.xz";
};
};
plasma-workspace = {
- version = "5.13.4";
+ version = "5.13.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.13.4/plasma-workspace-5.13.4.tar.xz";
- sha256 = "1kvl6pbhqw7llv8llq020qvbk7glynix8c4dsh3dfp170xpg3qnh";
- name = "plasma-workspace-5.13.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.13.5/plasma-workspace-5.13.5.tar.xz";
+ sha256 = "1qcmw60lyp966rhvw9raaqrvxdv09pr8zc7x3fx1vpm9kphh3lv3";
+ name = "plasma-workspace-5.13.5.tar.xz";
};
};
plasma-workspace-wallpapers = {
- version = "5.13.4";
+ version = "5.13.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.13.4/plasma-workspace-wallpapers-5.13.4.tar.xz";
- sha256 = "11z8isy01vbgzb5jkbslin30himy5072wwrb010jw9ls9j5dz1cm";
- name = "plasma-workspace-wallpapers-5.13.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.13.5/plasma-workspace-wallpapers-5.13.5.tar.xz";
+ sha256 = "1wbnm6bzvgx2ssig4dk3plhrsjiw3lq1yhr2dfga6vvlyi6wg9mg";
+ name = "plasma-workspace-wallpapers-5.13.5.tar.xz";
};
};
plymouth-kcm = {
- version = "5.13.4";
+ version = "5.13.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.13.4/plymouth-kcm-5.13.4.tar.xz";
- sha256 = "1f18ys2b80smd975a18qkhxb3ipr31wx8g0pmbfscqclc6kma506";
- name = "plymouth-kcm-5.13.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.13.5/plymouth-kcm-5.13.5.tar.xz";
+ sha256 = "0flgr68rms40acgl2f4539mvp53m36ifignxix27raqmibaf38s1";
+ name = "plymouth-kcm-5.13.5.tar.xz";
};
};
polkit-kde-agent = {
- version = "1-5.13.4";
+ version = "1-5.13.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.13.4/polkit-kde-agent-1-5.13.4.tar.xz";
- sha256 = "0wgj9pawwcgznqg7shp3zh65ag9cscnmamgr29x2lq9wwxqw2836";
- name = "polkit-kde-agent-1-5.13.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.13.5/polkit-kde-agent-1-5.13.5.tar.xz";
+ sha256 = "00f05ii3www8knn2ycgkc6izc8ydb3vjy4f657k38hkzl2sjnhl6";
+ name = "polkit-kde-agent-1-5.13.5.tar.xz";
};
};
powerdevil = {
- version = "5.13.4";
+ version = "5.13.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.13.4/powerdevil-5.13.4.tar.xz";
- sha256 = "10zhm5z0hwh75fmcp7cz5c35zcywm7an73x2dh4fyl42cczfb0zl";
- name = "powerdevil-5.13.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.13.5/powerdevil-5.13.5.tar.xz";
+ sha256 = "1k7ilcvm5nvx6sd43j0djar9ay6ag84g4m8f420yf7q4yryp76yn";
+ name = "powerdevil-5.13.5.tar.xz";
};
};
sddm-kcm = {
- version = "5.13.4";
+ version = "5.13.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.13.4/sddm-kcm-5.13.4.tar.xz";
- sha256 = "0g6alnlg8waxgf3cbzx838062qsdcfisxsw67zxykyp77spq00f0";
- name = "sddm-kcm-5.13.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.13.5/sddm-kcm-5.13.5.tar.xz";
+ sha256 = "122g83ajh0xqylvmicrhgw0fm8bmzpw26v7fjckfk9if5zqzk8ch";
+ name = "sddm-kcm-5.13.5.tar.xz";
};
};
systemsettings = {
- version = "5.13.4";
+ version = "5.13.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.13.4/systemsettings-5.13.4.tar.xz";
- sha256 = "1z6c6kaz0ib76qsiq5cj6ya4mrdgmv3xa71hnwd2fbmv45agk8q4";
- name = "systemsettings-5.13.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.13.5/systemsettings-5.13.5.tar.xz";
+ sha256 = "14029a3mf2d6cw87lyffnwy88yvj0n3jmi0glr69zwi8lmz0cbsv";
+ name = "systemsettings-5.13.5.tar.xz";
};
};
user-manager = {
- version = "5.13.4";
+ version = "5.13.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.13.4/user-manager-5.13.4.tar.xz";
- sha256 = "1s968hf7p9rrv3b0bq47s1387cbl6iq5313m34xfv5h7rqr2cw3m";
- name = "user-manager-5.13.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.13.5/user-manager-5.13.5.tar.xz";
+ sha256 = "12550xvl084rab0y331r8dm3qwpcvm83k3j02gxrwrigv1vckas8";
+ name = "user-manager-5.13.5.tar.xz";
};
};
xdg-desktop-portal-kde = {
- version = "5.13.4";
+ version = "5.13.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.13.4/xdg-desktop-portal-kde-5.13.4.tar.xz";
- sha256 = "02fv1v778rh512wcm2zqgn6q61459bjbcjj2xz63lp3iycl7avqi";
- name = "xdg-desktop-portal-kde-5.13.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.13.5/xdg-desktop-portal-kde-5.13.5.tar.xz";
+ sha256 = "0i9pcbdxfh2cbv9ybk9i11l7vcm2ifx0zm3gkj3ry3bjxxbphn4f";
+ name = "xdg-desktop-portal-kde-5.13.5.tar.xz";
};
};
}
diff --git a/pkgs/development/compilers/gnu-smalltalk/default.nix b/pkgs/development/compilers/gnu-smalltalk/default.nix
index 21c0a5ede91..39d1652fc70 100644
--- a/pkgs/development/compilers/gnu-smalltalk/default.nix
+++ b/pkgs/development/compilers/gnu-smalltalk/default.nix
@@ -34,6 +34,8 @@ in stdenv.mkDerivation rec {
configureFlags = stdenv.lib.optional (!emacsSupport) "--without-emacs";
+ hardeningDisable = [ "format" ];
+
installFlags = stdenv.lib.optional emacsSupport "lispdir=$(out)/share/emacs/site-lisp";
# For some reason the tests fail if executated with nix-build, but pass if
diff --git a/pkgs/development/compilers/go/1.11.nix b/pkgs/development/compilers/go/1.11.nix
index 55cc654b0aa..237f74e319f 100644
--- a/pkgs/development/compilers/go/1.11.nix
+++ b/pkgs/development/compilers/go/1.11.nix
@@ -139,7 +139,7 @@ stdenv.mkDerivation rec {
else if stdenv.targetPlatform.isAarch32 then "arm"
else if stdenv.targetPlatform.isAarch64 then "arm64"
else throw "Unsupported system";
- GOARM = stdenv.targetPlatform.parsed.cpu.version or "";
+ GOARM = toString (stdenv.lib.intersectLists [(stdenv.targetPlatform.parsed.cpu.version or "")] ["5" "6" "7"]);
GO386 = 387; # from Arch: don't assume sse2 on i686
CGO_ENABLED = 1;
GOROOT_BOOTSTRAP = "${goBootstrap}/share/go";
diff --git a/pkgs/development/compilers/julia/shared.nix b/pkgs/development/compilers/julia/shared.nix
index 41c9c57bd03..e07c2c04b92 100644
--- a/pkgs/development/compilers/julia/shared.nix
+++ b/pkgs/development/compilers/julia/shared.nix
@@ -211,7 +211,7 @@ stdenv.mkDerivation rec {
description = "High-level performance-oriented dynamical language for technical computing";
homepage = https://julialang.org/;
license = stdenv.lib.licenses.mit;
- maintainers = with stdenv.lib.maintainers; [ raskin rob ];
+ maintainers = with stdenv.lib.maintainers; [ raskin rob garrison ];
platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ];
broken = stdenv.isi686;
};
diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix
index a860aa7dc73..34855838fe8 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.4.7";
+ version = "1.4.10";
src = fetchurl {
url = "mirror://sourceforge/project/sbcl/sbcl/${version}/${name}-source.tar.bz2";
- sha256 = "1wmxly94pn8527092hyzg5mq58mg7qlc46nm31f268wb2dm67rvm";
+ sha256 = "1j9wb608pkihpwgzl4qvnr4jl6mb7ngfqy559pxnvmnn1zlyfklh";
};
patchPhase = ''
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 3aee4857f99..4a26fcbffc1 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -9054,12 +9054,6 @@ dont-distribute-packages:
temporary-resourcet: [ i686-linux, x86_64-linux, x86_64-darwin ]
tempus: [ i686-linux, x86_64-linux, x86_64-darwin ]
tensor: [ i686-linux, x86_64-linux, x86_64-darwin ]
- tensorflow-core-ops: [ i686-linux, x86_64-linux, x86_64-darwin ]
- tensorflow-logging: [ i686-linux, x86_64-linux, x86_64-darwin ]
- tensorflow-opgen: [ i686-linux, x86_64-linux, x86_64-darwin ]
- tensorflow-ops: [ i686-linux, x86_64-linux, x86_64-darwin ]
- tensorflow-proto: [ i686-linux, x86_64-linux, x86_64-darwin ]
- tensorflow: [ i686-linux, x86_64-linux, x86_64-darwin ]
term-rewriting: [ i686-linux, x86_64-linux, x86_64-darwin ]
termbox-bindings: [ i686-linux, x86_64-linux, x86_64-darwin ]
termcolor: [ i686-linux, x86_64-linux, x86_64-darwin ]
diff --git a/pkgs/development/haskell-modules/configuration-tensorflow.nix b/pkgs/development/haskell-modules/configuration-tensorflow.nix
index dfc93686405..43a3b82923b 100644
--- a/pkgs/development/haskell-modules/configuration-tensorflow.nix
+++ b/pkgs/development/haskell-modules/configuration-tensorflow.nix
@@ -55,13 +55,29 @@ in
tensorflow-logging = super.tensorflow-logging.override {
inherit proto-lens;
};
- tensorflow-mnist = super.tensorflow-mnist.override {
+ tensorflow-mnist = overrideCabal (super.tensorflow-mnist.override {
inherit proto-lens;
- };
+ # https://github.com/tensorflow/haskell/issues/215
+ tensorflow-mnist-input-data = self.tensorflow-mnist-input-data;
+ }) (_drv: { broken = false; });
tensorflow-mnist-input-data = setSourceRoot "tensorflow-mnist-input-data" (super.callPackage (
{ mkDerivation, base, bytestring, Cabal, cryptonite, directory
, filepath, HTTP, network-uri, stdenv
}:
+
+ let
+ fileInfos = {
+ "train-images-idx3-ubyte.gz" = "440fcabf73cc546fa21475e81ea370265605f56be210a4024d2ca8f203523609";
+ "train-labels-idx1-ubyte.gz" = "3552534a0a558bbed6aed32b30c495cca23d567ec52cac8be1a0730e8010255c";
+ "t10k-images-idx3-ubyte.gz" = "8d422c7b0a1c1c79245a5bcf07fe86e33eeafee792b84584aec276f5a2dbc4e6";
+ "t10k-labels-idx1-ubyte.gz" = "f7ae60f92e00ec6debd23a6088c31dbd2371eca3ffa0defaefb259924204aec6";
+ };
+ downloads = with pkgs.lib; flip mapAttrsToList fileInfos (name: sha256:
+ pkgs.fetchurl {
+ url = "http://yann.lecun.com/exdb/mnist/${name}";
+ inherit sha256;
+ });
+ in
mkDerivation {
pname = "tensorflow-mnist-input-data";
version = "0.1.0.0";
@@ -71,6 +87,9 @@ in
base bytestring Cabal cryptonite directory filepath HTTP
network-uri
];
+ preConfigure = pkgs.lib.strings.concatStringsSep "\n" (
+ map (x: "ln -s ${x} data/$(stripHash ${x})") downloads
+ );
libraryHaskellDepends = [ base ];
homepage = "https://github.com/tensorflow/haskell#readme";
description = "Downloader of input data for training MNIST";
diff --git a/pkgs/development/libraries/clutter/default.nix b/pkgs/development/libraries/clutter/default.nix
index 705aa7252d1..d8150fd1150 100644
--- a/pkgs/development/libraries/clutter/default.nix
+++ b/pkgs/development/libraries/clutter/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, pkgconfig, libGLU_combined, libX11, libXext, libXfixes
-, libXdamage, libXcomposite, libXi, libxcb, cogl, pango, atk, json-glib,
-gobjectIntrospection, gtk3, gnome3
+, libXdamage, libXcomposite, libXi, libxcb, cogl, pango, atk, json-glib
+, gobjectIntrospection, gtk3, gnome3, libinput, libgudev, libxkbcommon
}:
let
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ];
propagatedBuildInputs =
[ libX11 libGLU_combined libXext libXfixes libXdamage libXcomposite libXi cogl pango
- atk json-glib gobjectIntrospection libxcb
+ atk json-glib gobjectIntrospection libxcb libinput libgudev libxkbcommon
];
configureFlags = [ "--enable-introspection" ]; # needed by muffin AFAIK
diff --git a/pkgs/development/libraries/cogl/default.nix b/pkgs/development/libraries/cogl/default.nix
index e06c71c15db..c624f9537fb 100644
--- a/pkgs/development/libraries/cogl/default.nix
+++ b/pkgs/development/libraries/cogl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, libGL, glib, gdk_pixbuf, xorg, libintl
+{ stdenv, fetchurl, fetchpatch, pkgconfig, libGL, glib, gdk_pixbuf, xorg, libintl
, pangoSupport ? true, pango, cairo, gobjectIntrospection, wayland, gnome3
, mesa_noglu
, gstreamerSupport ? true, gst_all_1 }:
@@ -14,6 +14,23 @@ in stdenv.mkDerivation rec {
sha256 = "03f0ha3qk7ca0nnkkcr1garrm1n1vvfqhkz9lwjm592fnv6ii9rr";
};
+ patches = [
+ # Some deepin packages need the following patches. They have been
+ # submitted by Fedora on the GNOME Bugzilla
+ # (https://bugzilla.gnome.org/787443). Upstream thinks the patch
+ # could be merged, but dev can not make a new release.
+
+ (fetchpatch {
+ url = https://bug787443.bugzilla-attachments.gnome.org/attachment.cgi?id=359589;
+ sha256 = "0f0d9iddg8zwy853phh7swikg4yzhxxv71fcag36f8gis0j5p998";
+ })
+
+ (fetchpatch {
+ url = https://bug787443.bugzilla-attachments.gnome.org/attachment.cgi?id=361056;
+ sha256 = "09fyrdci4727fg6qm5aaapsbv71sf4wgfaqz8jqlyy61dibgg490";
+ })
+ ];
+
nativeBuildInputs = [ pkgconfig libintl ];
configureFlags = [
diff --git a/pkgs/development/libraries/dbus-sharp/default.nix b/pkgs/development/libraries/dbus-sharp/default.nix
index 40c633dda52..855dd9f3832 100644
--- a/pkgs/development/libraries/dbus-sharp/default.nix
+++ b/pkgs/development/libraries/dbus-sharp/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchFromGitHub, pkgconfig, mono, autoreconfHook }:
+{stdenv, fetchFromGitHub, pkgconfig, mono48, autoreconfHook }:
stdenv.mkDerivation rec {
name = "dbus-sharp-${version}";
@@ -13,7 +13,10 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ pkgconfig autoreconfHook ];
- buildInputs = [ mono ];
+
+ # Use msbuild when https://github.com/NixOS/nixpkgs/pull/43680 is merged
+ # See: https://github.com/NixOS/nixpkgs/pull/46060
+ buildInputs = [ mono48 ];
dontStrip = true;
diff --git a/pkgs/development/libraries/goffice/default.nix b/pkgs/development/libraries/goffice/default.nix
index 6155b8b18bd..4795f45812b 100644
--- a/pkgs/development/libraries/goffice/default.nix
+++ b/pkgs/development/libraries/goffice/default.nix
@@ -2,11 +2,11 @@
, libgsf, libxml2, libxslt, cairo, pango, librsvg }:
stdenv.mkDerivation rec {
- name = "goffice-0.10.39";
+ name = "goffice-0.10.43";
src = fetchurl {
url = "mirror://gnome/sources/goffice/0.10/${name}.tar.xz";
- sha256 = "73f23fbf05f3fa98343208b751db04b31a7ff743c2d828e1a0a130c566f1bc4f";
+ sha256 = "550fceefa74622b8fe57dd0b030003e31db50edf7f87068ff5e146365108b64e";
};
nativeBuildInputs = [ pkgconfig intltool ];
diff --git a/pkgs/development/libraries/gssdp/default.nix b/pkgs/development/libraries/gssdp/default.nix
index d48ba9082af..0d77018eee5 100644
--- a/pkgs/development/libraries/gssdp/default.nix
+++ b/pkgs/development/libraries/gssdp/default.nix
@@ -1,22 +1,30 @@
-{ stdenv, fetchurl, pkgconfig, libsoup, glib }:
+{ stdenv, fetchurl, pkgconfig, gobjectIntrospection, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_412, libsoup, gtk3, glib }:
stdenv.mkDerivation rec {
name = "gssdp-${version}";
version = "1.0.2";
+ outputs = [ "out" "bin" "dev" "devdoc" ];
+
src = fetchurl {
- url = "mirror://gnome/sources/gssdp/1.0/${name}.tar.xz";
+ url = "mirror://gnome/sources/gssdp/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "1p1m2m3ndzr2whipqw4vfb6s6ia0g7rnzzc4pnq8b8g1qw4prqd1";
};
- nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ libsoup ];
+ nativeBuildInputs = [ pkgconfig gobjectIntrospection vala gtk-doc docbook_xsl docbook_xml_dtd_412 ];
+ buildInputs = [ libsoup gtk3 ];
propagatedBuildInputs = [ glib ];
+ configureFlags = [
+ "--enable-gtk-doc"
+ ];
+
+ doCheck = true;
+
meta = with stdenv.lib; {
description = "GObject-based API for handling resource discovery and announcement over SSDP";
homepage = http://www.gupnp.org/;
- license = licenses.lgpl2;
+ license = licenses.lgpl2Plus;
platforms = platforms.all;
};
}
diff --git a/pkgs/development/libraries/gupnp-av/default.nix b/pkgs/development/libraries/gupnp-av/default.nix
index 9b61f4b648e..7491da7c3e2 100644
--- a/pkgs/development/libraries/gupnp-av/default.nix
+++ b/pkgs/development/libraries/gupnp-av/default.nix
@@ -1,22 +1,29 @@
-{ stdenv, fetchurl, pkgconfig, gupnp, glib, libxml2 }:
+{ stdenv, fetchurl, pkgconfig, gobjectIntrospection, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_412, gupnp, glib, libxml2 }:
stdenv.mkDerivation rec {
name = "gupnp-av-${version}";
- majorVersion = "0.12";
- version = "${majorVersion}.10";
+ version = "0.12.10";
+
+ outputs = [ "out" "dev" "devdoc" ];
src = fetchurl {
- url = "mirror://gnome/sources/gupnp-av/${majorVersion}/${name}.tar.xz";
+ url = "mirror://gnome/sources/gupnp-av/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "0nmq6wlbfsssanv3jgv2z0nhfkv8vzfr3gq5qa8svryvvn2fyf40";
};
-
- nativeBuildInputs = [ pkgconfig ];
+
+ nativeBuildInputs = [ pkgconfig gobjectIntrospection vala gtk-doc docbook_xsl docbook_xml_dtd_412 ];
buildInputs = [ gupnp glib libxml2 ];
- meta = {
+ configureFlags = [
+ "--enable-gtk-doc"
+ ];
+
+ doCheck = true;
+
+ meta = with stdenv.lib; {
homepage = http://gupnp.org/;
description = "A collection of helpers for building AV (audio/video) applications using GUPnP";
- license = stdenv.lib.licenses.gpl2;
- platforms = stdenv.lib.platforms.linux;
+ license = licenses.lgpl2Plus;
+ platforms = platforms.linux;
};
}
diff --git a/pkgs/development/libraries/gupnp-dlna/default.nix b/pkgs/development/libraries/gupnp-dlna/default.nix
index 75818f75692..aba95889b69 100644
--- a/pkgs/development/libraries/gupnp-dlna/default.nix
+++ b/pkgs/development/libraries/gupnp-dlna/default.nix
@@ -1,22 +1,34 @@
-{ stdenv, fetchurl, pkgconfig, gobjectIntrospection, gupnp, gst-plugins-base }:
+{ stdenv, fetchurl, pkgconfig, gobjectIntrospection, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_412, gupnp, gst_all_1 }:
stdenv.mkDerivation rec {
name = "gupnp-dlna-${version}";
- majorVersion = "0.10";
- version = "${majorVersion}.5";
+ version = "0.10.5";
+
+ outputs = [ "out" "dev" "devdoc" ];
src = fetchurl {
- url = "mirror://gnome/sources/gupnp-dlna/${majorVersion}/${name}.tar.xz";
+ url = "mirror://gnome/sources/gupnp-dlna/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "0spzd2saax7w776p5laixdam6d7smyynr9qszhbmq7f14y13cghj";
};
- nativeBuildInputs = [ pkgconfig gobjectIntrospection ];
- buildInputs = [ gupnp gst-plugins-base ];
+ nativeBuildInputs = [ pkgconfig gobjectIntrospection vala gtk-doc docbook_xsl docbook_xml_dtd_412 ];
+ buildInputs = [ gupnp gst_all_1.gst-plugins-base ];
- meta = {
+ configureFlags = [
+ "--enable-gtk-doc"
+ ];
+
+ doCheck = true;
+
+ postPatch = ''
+ chmod +x tests/test-discoverer.sh.in
+ patchShebangs tests/test-discoverer.sh.in
+ '';
+
+ meta = with stdenv.lib; {
homepage = https://wiki.gnome.org/Projects/GUPnP/;
description = "Library to ease DLNA-related bits for applications using GUPnP";
- license = stdenv.lib.licenses.gpl2;
- platforms = stdenv.lib.platforms.linux;
+ license = licenses.lgpl2Plus;
+ platforms = platforms.linux;
};
}
diff --git a/pkgs/development/libraries/gupnp-igd/default.nix b/pkgs/development/libraries/gupnp-igd/default.nix
index 182905e9546..50107959786 100644
--- a/pkgs/development/libraries/gupnp-igd/default.nix
+++ b/pkgs/development/libraries/gupnp-igd/default.nix
@@ -1,22 +1,29 @@
-{ stdenv, fetchurl, pkgconfig, glib, gupnp }:
-
+{ stdenv, fetchurl, pkgconfig, gettext, gobjectIntrospection, gtk-doc, docbook_xsl, docbook_xml_dtd_412, glib, gupnp }:
+
stdenv.mkDerivation rec {
name = "gupnp-igd-${version}";
- majorVersion = "0.2";
- version = "${majorVersion}.4";
+ version = "0.2.5";
+
+ outputs = [ "out" "dev" "devdoc" ];
src = fetchurl {
- url = "mirror://gnome/sources/gupnp-igd/${majorVersion}/${name}.tar.xz";
- sha256 = "38c4a6d7718d17eac17df95a3a8c337677eda77e58978129ad3182d769c38e44";
+ url = "mirror://gnome/sources/gupnp-igd/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+ sha256 = "081v1vhkbz3wayv49xfiskvrmvnpx93k25am2wnarg5cifiiljlb";
};
- nativeBuildInputs = [ pkgconfig ];
+ nativeBuildInputs = [ pkgconfig gettext gobjectIntrospection gtk-doc docbook_xsl docbook_xml_dtd_412 ];
propagatedBuildInputs = [ glib gupnp ];
- meta = {
+ configureFlags = [
+ "--enable-gtk-doc"
+ ];
+
+ doCheck = true;
+
+ meta = with stdenv.lib; {
+ description = "Library to handle UPnP IGD port mapping";
homepage = http://www.gupnp.org/;
- license = stdenv.lib.licenses.lgpl21;
- platforms = stdenv.lib.platforms.linux;
+ license = licenses.lgpl21;
+ platforms = platforms.linux;
};
}
-
diff --git a/pkgs/development/libraries/gupnp/default.nix b/pkgs/development/libraries/gupnp/default.nix
index 963b93ef691..45adf46ff36 100644
--- a/pkgs/development/libraries/gupnp/default.nix
+++ b/pkgs/development/libraries/gupnp/default.nix
@@ -1,28 +1,39 @@
-{ stdenv, fetchurl, pkgconfig, glib, gssdp, libsoup, libxml2, libuuid }:
-
+{ stdenv, fetchurl, pkgconfig, gobjectIntrospection, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_412, docbook_xml_dtd_44, glib, gssdp, libsoup, libxml2, libuuid }:
+
stdenv.mkDerivation rec {
name = "gupnp-${version}";
- majorVersion = "1.0";
- version = "${majorVersion}.2";
+ version = "1.0.3";
+
+ outputs = [ "out" "dev" "devdoc" ];
src = fetchurl {
- url = "mirror://gnome/sources/gupnp/${majorVersion}/gupnp-${version}.tar.xz";
- sha256 = "043nqxlj030a3wvd6x4c9z8fjarjjjsl2pjarl0nn70ig6kzswsi";
+ url = "mirror://gnome/sources/gupnp/${stdenv.lib.versions.majorMinor version}/gupnp-${version}.tar.xz";
+ sha256 = "1fyb6yn75vf2y1b8nbc1df572swzr74yiwy3v3g5xn36wlp1cjvr";
};
- nativeBuildInputs = [ pkgconfig ];
+ patches = [
+ # Nix’s pkg-config ignores Requires.private
+ # https://github.com/NixOS/nixpkgs/commit/1e6622f4d5d500d6e701bd81dd4a22977d10637d
+ # We are essentialy reverting the following patch for now
+ # https://bugzilla.gnome.org/show_bug.cgi?id=685477
+ # at least until Requires.internal or something is implemented
+ # https://gitlab.freedesktop.org/pkg-config/pkg-config/issues/7
+ ./fix-requires.patch
+ ];
+
+ nativeBuildInputs = [ pkgconfig gobjectIntrospection vala gtk-doc docbook_xsl docbook_xml_dtd_412 docbook_xml_dtd_44 ];
propagatedBuildInputs = [ glib gssdp libsoup libxml2 libuuid ];
- postInstall = ''
- ln -sv ${libsoup.dev}/include/libsoup-2*/libsoup $out/include
- ln -sv ${libxml2.dev}/include/*/libxml $out/include
- ln -sv ${gssdp}/include/*/libgssdp $out/include
- '';
+ configureFlags = [
+ "--enable-gtk-doc"
+ ];
- meta = {
+ doCheck = true;
+
+ meta = with stdenv.lib; {
homepage = http://www.gupnp.org/;
description = "An implementation of the UPnP specification";
- license = stdenv.lib.licenses.gpl2;
- platforms = stdenv.lib.platforms.linux;
+ license = licenses.lgpl2Plus;
+ platforms = platforms.linux;
};
}
diff --git a/pkgs/development/libraries/gupnp/fix-requires.patch b/pkgs/development/libraries/gupnp/fix-requires.patch
new file mode 100644
index 00000000000..4538fc55460
--- /dev/null
+++ b/pkgs/development/libraries/gupnp/fix-requires.patch
@@ -0,0 +1,9 @@
+--- a/gupnp-1.0.pc.in
++++ b/gupnp-1.0.pc.in
+@@ -8,4 +8,5 @@
+ Version: @VERSION@
+ Libs: -L${libdir} -lgupnp-1.0
+ Cflags: -I${includedir}/gupnp-1.0
+-Requires.private: gssdp-1.0 libxml-2.0 libsoup-2.4 @UUID_LIBS@
++Requires: glib-2.0 gobject-2.0 gssdp-1.0 libxml-2.0 libsoup-2.4
++Requires.private: @UUID_LIBS@
diff --git a/pkgs/development/libraries/kerberos/heimdal.nix b/pkgs/development/libraries/kerberos/heimdal.nix
index 24adb2a141e..5b92458d89e 100644
--- a/pkgs/development/libraries/kerberos/heimdal.nix
+++ b/pkgs/development/libraries/kerberos/heimdal.nix
@@ -2,16 +2,11 @@
, texinfo, perlPackages
, openldap, libcap_ng, sqlite, openssl, db, libedit, pam
, CoreFoundation, Security, SystemConfiguration
-# Extra Args
-, type ? ""
}:
-let
- libOnly = type == "lib";
-in
with stdenv.lib;
stdenv.mkDerivation rec {
- name = "${type}heimdal-${version}";
+ name = "heimdal-${version}";
version = "7.5.0";
src = fetchFromGitHub {
@@ -21,28 +16,31 @@ stdenv.mkDerivation rec {
sha256 = "1j38wjj4k0q8vx168k3d3k0fwa8j1q5q8f2688nnx1b9qgjd6w1d";
};
+ outputs = [ "out" "dev" "man" "info" ];
+
patches = [ ./heimdal-make-missing-headers.patch ];
- nativeBuildInputs = [ autoreconfHook pkgconfig python2 perl yacc flex ]
- ++ (with perlPackages; [ JSON ])
- ++ optional (!libOnly) texinfo;
+ nativeBuildInputs = [ autoreconfHook pkgconfig python2 perl yacc flex texinfo ]
+ ++ (with perlPackages; [ JSON ]);
buildInputs = optionals (stdenv.isLinux) [ libcap_ng ]
- ++ [ db sqlite openssl libedit ]
- ++ optionals (stdenv.isDarwin) [ CoreFoundation Security SystemConfiguration ]
- ++ optionals (!libOnly) [ openldap pam ];
+ ++ [ db sqlite openssl libedit openldap pam]
+ ++ optionals (stdenv.isDarwin) [ CoreFoundation Security SystemConfiguration ];
## ugly, X should be made an option
configureFlags = [
"--sysconfdir=/etc"
"--localstatedir=/var"
+ "--infodir=$info/share/info"
"--enable-hdb-openldap-module"
"--with-sqlite3=${sqlite.dev}"
- "--with-libedit=${libedit}"
+
+ # ugly, --with-libedit is not enought, it fall back to bundled libedit
+ "--with-libedit-include=${libedit.dev}/include"
+ "--with-libedit-lib=${libedit}/lib"
"--with-openssl=${openssl.dev}"
"--without-x"
"--with-berkeley-db"
"--with-berkeley-db-include=${db.dev}/include"
- ] ++ optionals (!libOnly) [
"--with-openldap=${openldap.dev}"
] ++ optionals (stdenv.isLinux) [
"--with-capng"
@@ -50,24 +48,17 @@ stdenv.mkDerivation rec {
postUnpack = ''
sed -i '/^DEFAULT_INCLUDES/ s,$, -I..,' source/cf/Makefile.am.common
+ sed -i -e 's/date/date --date="@$SOURCE_DATE_EPOCH"/' source/configure.ac
'';
- buildPhase = optionalString libOnly ''
- (cd include; make -j $NIX_BUILD_CORES)
- (cd lib; make -j $NIX_BUILD_CORES)
- (cd tools; make -j $NIX_BUILD_CORES)
- (cd include/hcrypto; make -j $NIX_BUILD_CORES)
- (cd lib/hcrypto; make -j $NIX_BUILD_CORES)
- '';
-
- installPhase = optionalString libOnly ''
- (cd include; make -j $NIX_BUILD_CORES install)
- (cd lib; make -j $NIX_BUILD_CORES install)
- (cd tools; make -j $NIX_BUILD_CORES install)
- (cd include/hcrypto; make -j $NIX_BUILD_CORES install)
- (cd lib/hcrypto; make -j $NIX_BUILD_CORES install)
- rm -rf $out/{libexec,sbin,share}
- find $out/bin -type f | grep -v 'krb5-config' | xargs rm
+ preConfigure = ''
+ configureFlagsArray+=(
+ "--bindir=$out/bin"
+ "--sbindir=$out/sbin"
+ "--libexecdir=$out/libexec/heimdal"
+ "--mandir=$man/share/man"
+ "--infodir=$man/share/info"
+ "--includedir=$dev/include")
'';
# We need to build hcrypt for applications like samba
@@ -81,9 +72,15 @@ stdenv.mkDerivation rec {
(cd include/hcrypto; make -j $NIX_BUILD_CORES install)
(cd lib/hcrypto; make -j $NIX_BUILD_CORES install)
- # Doesn't succeed with --libexec=$out/sbin, so
- mv "$out/libexec/"* $out/sbin/
- rmdir $out/libexec
+ # Do we need it?
+ rm $out/bin/su
+
+ mkdir -p $dev/bin
+ mv $out/bin/krb5-config $dev/bin/
+
+ # asn1 compilers, move them to $dev
+ mv $out/libexec/heimdal/heimdal/* $dev/bin
+ rmdir $out/libexec/heimdal/heimdal
'';
# Issues with hydra
diff --git a/pkgs/development/libraries/liblangtag/default.nix b/pkgs/development/libraries/liblangtag/default.nix
index 6d9085e1741..8ebfa53b7d1 100644
--- a/pkgs/development/libraries/liblangtag/default.nix
+++ b/pkgs/development/libraries/liblangtag/default.nix
@@ -16,8 +16,8 @@ stdenv.mkDerivation rec {
core_zip = fetchurl {
# please update if an update is available
- url = "http://www.unicode.org/Public/cldr/33/core.zip";
- sha256 = "1faq1p5dmxpkczz6cjfsry7piksgym19cq2kf4jj2v885h490d7s";
+ url = "http://www.unicode.org/Public/cldr/33.1/core.zip";
+ sha256 = "0f195aald02ng3ch2q1wf59b5lwp2bi1cd8ia7572pbyy2w8w8cp";
};
language_subtag_registry = fetchurl {
diff --git a/pkgs/development/libraries/libmediainfo/default.nix b/pkgs/development/libraries/libmediainfo/default.nix
index 3ba513f9078..c4f41663c84 100644
--- a/pkgs/development/libraries/libmediainfo/default.nix
+++ b/pkgs/development/libraries/libmediainfo/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, autoreconfHook, pkgconfig, libzen, zlib }:
stdenv.mkDerivation rec {
- version = "18.05";
+ version = "18.08";
name = "libmediainfo-${version}";
src = fetchurl {
url = "https://mediaarea.net/download/source/libmediainfo/${version}/libmediainfo_${version}.tar.xz";
- sha256 = "08ajrmbvqn2cvfq3jjdh64lma77kx4di5vg632c6bmbir89rcxbn";
+ sha256 = "0h9fkfkil9y5xjxa7q4gxxihkn9kv9hak6ral2isvks5x3sy0ca8";
};
nativeBuildInputs = [ autoreconfHook pkgconfig ];
diff --git a/pkgs/development/libraries/libtensorflow/default.nix b/pkgs/development/libraries/libtensorflow/default.nix
index b4e616409c4..e6cd140c4e4 100644
--- a/pkgs/development/libraries/libtensorflow/default.nix
+++ b/pkgs/development/libraries/libtensorflow/default.nix
@@ -31,19 +31,19 @@ let
in stdenv.mkDerivation rec {
pname = "libtensorflow";
- version = "1.10.0";
+ version = "1.9.0";
name = "${pname}-${version}";
src = fetchurl {
url = "https://storage.googleapis.com/tensorflow/${pname}/${pname}-${tfType}-${system}-${version}.tar.gz";
sha256 =
if system == "linux-x86_64" then
if cudaSupport
- then "0v66sscxpyixjrf9yjshl001nix233i6chc61akx0kx7ial4l1wn"
- else "11sbpcbgdzj8v17mdppfv7v1fn3nbzkdad60gc42y2j6knjbmwxb"
+ then "1q3mh06x344im25z7r3vgrfksfdsi8fh8ldn6y2mf86h4d11yxc3"
+ else "0l9ps115ng5ffzdwphlqmj3jhidps2v5afppdzrbpzmy41xz0z21"
else if system == "darwin-x86_64" then
if cudaSupport
then unavailable
- else "11p0f77m4wycpc024mh7jx0kbdhgm0wp6ir6dsa8lkcpdb59bn59"
+ else "1qj0v1706w6mczycdsh38h2glyv5d25v62kdn98wxd5rw8f9v657"
else unavailable;
};
diff --git a/pkgs/development/libraries/libvmi/default.nix b/pkgs/development/libraries/libvmi/default.nix
index 28cfe56d59b..44b2a81b2d3 100644
--- a/pkgs/development/libraries/libvmi/default.nix
+++ b/pkgs/development/libraries/libvmi/default.nix
@@ -15,6 +15,7 @@ with stdenv.lib;
stdenv.mkDerivation rec {
name = "libvmi-${version}";
version = "0.12.0";
+ libVersion = "0.0.12";
src = fetchFromGitHub {
owner = "libvmi";
@@ -28,6 +29,13 @@ stdenv.mkDerivation rec {
configureFlags = optional (!xenSupport) "--disable-xen";
+ # libvmi uses dlopen() for the xen libraries, however autoPatchelfHook doesn't work here
+ postFixup = optionalString xenSupport ''
+ libvmi="$out/lib/libvmi.so.${libVersion}"
+ oldrpath=$(patchelf --print-rpath "$libvmi")
+ patchelf --set-rpath "$oldrpath:${makeLibraryPath [ xen ]}" "$libvmi"
+ '';
+
meta = with stdenv.lib; {
homepage = "http://libvmi.com/";
description = "A C library for virtual machine introspection";
diff --git a/pkgs/development/libraries/mono-addins/default.nix b/pkgs/development/libraries/mono-addins/default.nix
index e68661b44ec..780f68e7d48 100644
--- a/pkgs/development/libraries/mono-addins/default.nix
+++ b/pkgs/development/libraries/mono-addins/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, mono, gtk-sharp-2_0 }:
+{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, mono48, gtk-sharp-2_0 }:
stdenv.mkDerivation rec {
name = "mono-addins-${version}";
@@ -13,7 +13,9 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ pkgconfig autoreconfHook ];
- buildInputs = [ mono gtk-sharp-2_0 ];
+
+ # Use msbuild when https://github.com/NixOS/nixpkgs/pull/43680 is merged
+ buildInputs = [ mono48 gtk-sharp-2_0 ];
dontStrip = true;
diff --git a/pkgs/development/libraries/nix-plugins/default.nix b/pkgs/development/libraries/nix-plugins/default.nix
index ff8a54f87f2..d3a4b21b4b6 100644
--- a/pkgs/development/libraries/nix-plugins/default.nix
+++ b/pkgs/development/libraries/nix-plugins/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, nix, cmake, pkgconfig, boost }:
-let version = "4.0.5"; in
+let version = "5.0.0"; in
stdenv.mkDerivation {
name = "nix-plugins-${version}";
@@ -7,7 +7,7 @@ stdenv.mkDerivation {
owner = "shlevy";
repo = "nix-plugins";
rev = version;
- sha256 = "170f365rnik62fp9wllbqlspr8lf1yb96pmn2z708i2wjlkdnrny";
+ sha256 = "0231j92504vx0f4wax9hwjdni1j4z0g8bx9wbakg6rbghl4svmdv";
};
nativeBuildInputs = [ cmake pkgconfig ];
diff --git a/pkgs/development/libraries/nsss/default.nix b/pkgs/development/libraries/nsss/default.nix
new file mode 100644
index 00000000000..6c4a23ccaf2
--- /dev/null
+++ b/pkgs/development/libraries/nsss/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, skawarePackages }:
+
+with skawarePackages;
+
+buildPackage {
+ pname = "nsss";
+ version = "0.0.1.0";
+ sha256 = "0f285bvpvhk40cqjpkc1jb36il0fkzzzjmc89gbbq3awl3w4r1i0";
+
+ description = "An implementation of a subset of the pwd.h, group.h and shadow.h family of functions.";
+
+ # TODO: nsss support
+ configureFlags = [
+ "--libdir=\${lib}/lib"
+ "--dynlibdir=\${lib}/lib"
+ "--bindir=\${bin}/bin"
+ "--includedir=\${dev}/include"
+ "--with-sysdeps=${skalibs.lib}/lib/skalibs/sysdeps"
+ "--with-include=${skalibs.dev}/include"
+ "--with-lib=${skalibs.lib}/lib"
+ "--with-dynlib=${skalibs.lib}/lib"
+ ];
+
+ postInstall = ''
+ # remove all nsss executables from build directory
+ rm $(find -name "nsssd-*" -type f -mindepth 1 -maxdepth 1 -executable)
+ rm libnsss.* libnsssd.*
+
+ mv doc $doc/share/doc/nsss/html
+ mv examples $doc/share/doc/nsss/examples
+ '';
+
+}
diff --git a/pkgs/development/libraries/oniguruma/default.nix b/pkgs/development/libraries/oniguruma/default.nix
index f9a75801e10..956c8b58ffc 100644
--- a/pkgs/development/libraries/oniguruma/default.nix
+++ b/pkgs/development/libraries/oniguruma/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "onig-${version}";
- version = "6.8.2";
+ version = "6.9.0";
src = fetchFromGitHub {
owner = "kkos";
repo = "oniguruma";
rev = "v${version}";
- sha256 = "00ly5i26n7wajhyhq3xadsc7dxrf7qllhwilk8dza2qj5dhld4nd";
+ sha256 = "064nk8nxygqrk5b6n7zvrksf5shrsapn12zdi6crbbfbw0s7pn8h";
};
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/development/libraries/physics/geant4/default.nix b/pkgs/development/libraries/physics/geant4/default.nix
index 87af069c18a..7123858b8ed 100644
--- a/pkgs/development/libraries/physics/geant4/default.nix
+++ b/pkgs/development/libraries/physics/geant4/default.nix
@@ -1,128 +1,101 @@
-{ enableMultiThreading ? false
+{ enableMultiThreading ? true
, enableG3toG4 ? false
, enableInventor ? false
, enableGDML ? false
, enableQT ? false
, enableXM ? false
-, enableOpenGLX11 ? false
+, enableOpenGLX11 ? true
, enableRaytracerX11 ? false
# Standard build environment with cmake.
, stdenv, fetchurl, cmake
# Optional system packages, otherwise internal GEANT4 packages are used.
-, clhep ? null
-, expat ? null
-, zlib ? null
+, clhep ? null # not packaged currently
+, expat
+, zlib
# For enableGDML.
-, xercesc ? null
+, xercesc
# For enableQT.
-, qt ? null # qt4SDK or qt5SDK
+, qtbase
# For enableXM.
-, motif ? null # motif or lesstif
+, motif
# For enableInventor
, coin3d
, soxt
-, libXpm ? null
+, libXpm
# For enableQT, enableXM, enableOpenGLX11, enableRaytracerX11.
-, libGLU_combined ? null
-, xlibsWrapper ? null
-, libXmu ? null
+, libGLU_combined
+, xlibsWrapper
+, libXmu
}:
-# G4persistency library with support for GDML
-assert enableGDML -> xercesc != null;
+stdenv.mkDerivation rec {
+ version = "10.4.1";
+ name = "geant4-${version}";
-# If enableQT, Qt4/5 User Interface and Visualization drivers.
-assert enableQT -> qt != null;
-
-# Motif User Interface and Visualisation drivers.
-assert enableXM -> motif != null;
-
-# OpenGL/X11 User Interface and Visualisation drivers.
-assert enableQT || enableXM || enableOpenGLX11 || enableRaytracerX11 -> libGLU_combined != null;
-assert enableQT || enableXM || enableOpenGLX11 || enableRaytracerX11 -> xlibsWrapper != null;
-assert enableQT || enableXM || enableOpenGLX11 || enableRaytracerX11 -> libXmu != null;
-assert enableInventor -> libXpm != null;
-
-let
- buildGeant4 =
- { version, src, multiThreadingCapable ? false }:
-
- stdenv.mkDerivation rec {
- inherit version src;
- name = "geant4-${version}";
-
- multiThreadingFlag = if multiThreadingCapable then "-DGEANT4_BUILD_MULTITHREADED=${if enableMultiThreading then "ON" else "OFF"}" else "";
-
- cmakeFlags = ''
- ${multiThreadingFlag}
- -DGEANT4_INSTALL_DATA=OFF
- -DGEANT4_USE_GDML=${if enableGDML then "ON" else "OFF"}
- -DGEANT4_USE_G3TOG4=${if enableG3toG4 then "ON" else "OFF"}
- -DGEANT4_USE_QT=${if enableQT then "ON" else "OFF"}
- -DGEANT4_USE_XM=${if enableXM then "ON" else "OFF"}
- -DGEANT4_USE_OPENGL_X11=${if enableOpenGLX11 then "ON" else "OFF"}
- -DGEANT4_USE_INVENTOR=${if enableInventor then "ON" else "OFF"}
- -DGEANT4_USE_RAYTRACER_X11=${if enableRaytracerX11 then "ON" else "OFF"}
- -DGEANT4_USE_SYSTEM_CLHEP=${if clhep != null then "ON" else "OFF"}
- -DGEANT4_USE_SYSTEM_EXPAT=${if expat != null then "ON" else "OFF"}
- -DGEANT4_USE_SYSTEM_ZLIB=${if zlib != null then "ON" else "OFF"}
- -DINVENTOR_INCLUDE_DIR=${coin3d}/include
- -DINVENTOR_LIBRARY_RELEASE=${coin3d}/lib/libCoin.so
- '';
-
- enableParallelBuilding = true;
- buildInputs = [ cmake clhep expat zlib xercesc qt motif libGLU_combined xlibsWrapper libXmu libXpm coin3d soxt ];
- propagatedBuildInputs = [ clhep expat zlib xercesc qt motif libGLU_combined xlibsWrapper libXmu libXpm coin3d soxt ];
-
- postFixup = ''
- # Don't try to export invalid environment variables.
- sed -i 's/export G4\([A-Z]*\)DATA/#export G4\1DATA/' "$out"/bin/geant4.sh
- '';
-
- setupHook = ./geant4-hook.sh;
-
- passthru = {
- data = import ./datasets.nix { inherit stdenv fetchurl; };
- };
-
- # Set the myriad of envars required by Geant4 if we use a nix-shell.
- shellHook = ''
- source $out/nix-support/setup-hook
- '';
-
- meta = with stdenv.lib; {
- description = "A toolkit for the simulation of the passage of particles through matter";
- longDescription = ''
- Geant4 is a toolkit for the simulation of the passage of particles through matter.
- Its areas of application include high energy, nuclear and accelerator physics, as well as studies in medical and space science.
- The two main reference papers for Geant4 are published in Nuclear Instruments and Methods in Physics Research A 506 (2003) 250-303, and IEEE Transactions on Nuclear Science 53 No. 1 (2006) 270-278.
- '';
- homepage = http://www.geant4.org;
- license = licenses.g4sl;
- maintainers = with maintainers; [ tmplt ];
- platforms = platforms.all;
- };
- };
-
- fetchGeant4 = import ./fetch.nix {
- inherit stdenv fetchurl;
+ src = fetchurl{
+ url = "http://cern.ch/geant4-data/releases/geant4.10.04.p01.tar.gz";
+ sha256 = "a3eb13e4f1217737b842d3869dc5b1fb978f761113e74bd4eaf6017307d234dd";
};
-in {
- v10_0_2 = buildGeant4 {
- inherit (fetchGeant4.v10_0_2) version src;
- multiThreadingCapable = true;
+ cmakeFlags = [
+ "-DGEANT4_INSTALL_DATA=OFF"
+ "-DGEANT4_USE_GDML=${if enableGDML then "ON" else "OFF"}"
+ "-DGEANT4_USE_G3TOG4=${if enableG3toG4 then "ON" else "OFF"}"
+ "-DGEANT4_USE_QT=${if enableQT then "ON" else "OFF"}"
+ "-DGEANT4_USE_XM=${if enableXM then "ON" else "OFF"}"
+ "-DGEANT4_USE_OPENGL_X11=${if enableOpenGLX11 then "ON" else "OFF"}"
+ "-DGEANT4_USE_INVENTOR=${if enableInventor then "ON" else "OFF"}"
+ "-DGEANT4_USE_RAYTRACER_X11=${if enableRaytracerX11 then "ON" else "OFF"}"
+ "-DGEANT4_USE_SYSTEM_CLHEP=${if clhep != null then "ON" else "OFF"}"
+ "-DGEANT4_USE_SYSTEM_EXPAT=${if expat != null then "ON" else "OFF"}"
+ "-DGEANT4_USE_SYSTEM_ZLIB=${if zlib != null then "ON" else "OFF"}"
+ "-DGEANT4_BUILD_MULTITHREADED=${if enableMultiThreading then "ON" else "OFF"}"
+ ] ++ stdenv.lib.optionals enableInventor [
+ "-DINVENTOR_INCLUDE_DIR=${coin3d}/include"
+ "-DINVENTOR_LIBRARY_RELEASE=${coin3d}/lib/libCoin.so"
+ ];
+
+ enableParallelBuilding = true;
+ nativeBuildInputs = [ cmake ];
+ buildInputs = [ clhep expat zlib libGLU_combined xlibsWrapper libXmu ]
+ ++ stdenv.lib.optionals enableGDML [ xercesc ]
+ ++ stdenv.lib.optionals enableXM [ motif ]
+ ++ stdenv.lib.optionals enableQT [ qtbase ]
+ ++ stdenv.lib.optionals enableInventor [ libXpm coin3d soxt ];
+
+ postFixup = ''
+ # Don't try to export invalid environment variables.
+ sed -i 's/export G4\([A-Z]*\)DATA/#export G4\1DATA/' "$out"/bin/geant4.sh
+ '';
+
+ setupHook = ./geant4-hook.sh;
+
+ passthru = {
+ data = import ./datasets.nix { inherit stdenv fetchurl; };
};
- v10_4_1 = buildGeant4 {
- inherit (fetchGeant4.v10_4_1) version src;
- multiThreadingCapable = true;
+ # Set the myriad of envars required by Geant4 if we use a nix-shell.
+ shellHook = ''
+ source $out/nix-support/setup-hook
+ '';
+
+ meta = with stdenv.lib; {
+ description = "A toolkit for the simulation of the passage of particles through matter";
+ longDescription = ''
+ Geant4 is a toolkit for the simulation of the passage of particles through matter.
+ Its areas of application include high energy, nuclear and accelerator physics, as well as studies in medical and space science.
+ The two main reference papers for Geant4 are published in Nuclear Instruments and Methods in Physics Research A 506 (2003) 250-303, and IEEE Transactions on Nuclear Science 53 No. 1 (2006) 270-278.
+ '';
+ homepage = http://www.geant4.org;
+ license = licenses.g4sl;
+ maintainers = with maintainers; [ tmplt ];
+ platforms = platforms.linux;
};
}
diff --git a/pkgs/development/libraries/physics/geant4/fetch.nix b/pkgs/development/libraries/physics/geant4/fetch.nix
deleted file mode 100644
index 5d539b480d7..00000000000
--- a/pkgs/development/libraries/physics/geant4/fetch.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ stdenv, fetchurl }:
-
-let
- fetch = { version, src ? builtins.getAttr stdenv.hostPlatform.system sources, sources ? null }:
- {
- inherit version src;
- };
-
-in {
- v10_0_2 = fetch {
- version = "10.0.2";
-
- src = fetchurl{
- url = "http://geant4.cern.ch/support/source/geant4.10.00.p02.tar.gz";
- sha256 = "9d615200901f1a5760970e8f5970625ea146253e4f7c5ad9df2a9cf84549e848";
- };
- };
-
- v10_4_1 = fetch {
- version = "10.4.1";
-
- src = fetchurl{
- url = "http://cern.ch/geant4-data/releases/geant4.10.04.p01.tar.gz";
- sha256 = "a3eb13e4f1217737b842d3869dc5b1fb978f761113e74bd4eaf6017307d234dd";
- };
- };
-
-}
-
diff --git a/pkgs/development/libraries/physics/geant4/g4py/configure.patch b/pkgs/development/libraries/physics/geant4/g4py/configure.patch
deleted file mode 100644
index 886618abd34..00000000000
--- a/pkgs/development/libraries/physics/geant4/g4py/configure.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- environments/g4py/configure 2014-03-17 22:47:05.000000000 +1100
-+++ environments/g4py/configure 2014-09-01 15:33:46.523637686 +1000
-@@ -4,9 +4,6 @@
- # ======================================================================
- export LANG=C
-
--PATH=/bin:/usr/bin
--export PATH
--
- # ======================================================================
- # testing the echo features
- # ======================================================================
diff --git a/pkgs/development/libraries/physics/geant4/g4py/default.nix b/pkgs/development/libraries/physics/geant4/g4py/default.nix
index ee332171158..551d61af3ad 100644
--- a/pkgs/development/libraries/physics/geant4/g4py/default.nix
+++ b/pkgs/development/libraries/physics/geant4/g4py/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl
+{ stdenv, fetchurl, cmake, xercesc
# The target version of Geant4
, geant4
@@ -9,66 +9,55 @@
}:
let
- buildG4py =
- { version, src, geant4}:
+ # g4py does not support MT and will fail to build against MT geant
+ geant4_nomt = geant4.override { enableMultiThreading = false; };
+ boost_python = boost.override { enablePython = true; inherit python; };
+in
- stdenv.mkDerivation rec {
- inherit version src geant4;
- name = "g4py-${version}";
+stdenv.mkDerivation rec {
+ inherit (geant4_nomt) version src;
+ name = "g4py-${version}";
- # ./configure overwrites $PATH, which clobbers everything.
- patches = [ ./configure.patch ];
- patchFlags = "-p0";
+ sourceRoot = "geant4.10.04.p01/environments/g4py";
- configurePhase = ''
- export PYTHONPATH=$PYTHONPATH:${geant4}/lib64:$prefix
+ nativeBuildInputs = [ cmake ];
+ buildInputs = [ geant4_nomt xercesc boost_python python ];
- source ${geant4}/share/Geant4-*/geant4make/geant4make.sh
- cd environments/g4py
+ GEANT4_INSTALL = geant4_nomt;
- ./configure linux64 --prefix=$prefix \
- --with-g4install-dir=${geant4} \
- --with-python-incdir=${python}/include/python${python.majorVersion} \
- --with-python-libdir=${python}/lib \
- --with-boost-incdir=${boost.dev}/include \
- --with-boost-libdir=${boost.out}/lib
- '';
+ preConfigure = ''
+ # Fix for boost 1.67+
+ substituteInPlace CMakeLists.txt \
+ --replace "find_package(Boost)" "find_package(Boost 1.40 REQUIRED COMPONENTS python${builtins.replaceStrings ["."] [""] python.majorVersion})"
+ for f in `find . -name CMakeLists.txt`; do
+ substituteInPlace "$f" \
+ --replace "boost_python" "\''${Boost_LIBRARIES}"
+ done
+ '';
- enableParallelBuilding = true;
- buildInputs = [ geant4 boost python ];
+ enableParallelBuilding = true;
- setupHook = ./setup-hook.sh;
+ setupHook = ./setup-hook.sh;
- # Make sure we set PYTHONPATH
- shellHook = ''
- source $out/nix-support/setup-hook
- '';
+ # Make sure we set PYTHONPATH
+ shellHook = ''
+ source $out/nix-support/setup-hook
+ '';
- meta = {
- description = "Python bindings and utilities for Geant4";
- longDescription = ''
- Geant4 is a toolkit for the simulation of the passage of particles
- through matter. Its areas of application include high energy,
- nuclear and accelerator physics, as well as studies in medical and
- space science. The two main reference papers for Geant4 are
- published in Nuclear Instruments and Methods in Physics Research A
- 506 (2003) 250-303, and IEEE Transactions on Nuclear Science 53 No. 1
- (2006) 270-278.
- '';
- homepage = http://www.geant4.org;
- license = stdenv.lib.licenses.g4sl;
- maintainers = [ ];
- platforms = stdenv.lib.platforms.all;
- };
- };
-
- fetchGeant4 = import ../fetch.nix {
- inherit stdenv fetchurl;
- };
-
-in {
- v10_0_2 = buildG4py {
- inherit (fetchGeant4.v10_0_2) version src;
- geant4 = geant4.v10_0_2;
+ meta = {
+ description = "Python bindings and utilities for Geant4";
+ longDescription = ''
+ Geant4 is a toolkit for the simulation of the passage of particles
+ through matter. Its areas of application include high energy,
+ nuclear and accelerator physics, as well as studies in medical and
+ space science. The two main reference papers for Geant4 are
+ published in Nuclear Instruments and Methods in Physics Research A
+ 506 (2003) 250-303, and IEEE Transactions on Nuclear Science 53 No. 1
+ (2006) 270-278.
+ '';
+ homepage = http://www.geant4.org;
+ license = stdenv.lib.licenses.g4sl;
+ maintainers = [ ];
+ platforms = stdenv.lib.platforms.all;
};
}
diff --git a/pkgs/development/libraries/qtkeychain/0001-Fixes-build-with-Qt4.patch b/pkgs/development/libraries/qtkeychain/0001-Fixes-build-with-Qt4.patch
new file mode 100644
index 00000000000..4cd7214e61e
--- /dev/null
+++ b/pkgs/development/libraries/qtkeychain/0001-Fixes-build-with-Qt4.patch
@@ -0,0 +1,25 @@
+From f72e5b67ee1137a0ccd57db5d077a197b01b3cdc Mon Sep 17 00:00:00 2001
+From: Samuel Dionne-Riel
+Date: Tue, 4 Sep 2018 23:19:29 -0400
+Subject: [PATCH] Fixes build with Qt4.
+
+---
+ keychain_unix.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/keychain_unix.cpp b/keychain_unix.cpp
+index 30b26c3..b27ebef 100644
+--- a/keychain_unix.cpp
++++ b/keychain_unix.cpp
+@@ -91,7 +91,7 @@ static bool isKwallet5Available()
+ // a wallet can be opened.
+
+ iface.setTimeout(500);
+- QDBusMessage reply = iface.call(QStringLiteral("networkWallet"));
++ QDBusMessage reply = iface.call("networkWallet");
+ return reply.type() == QDBusMessage::ReplyMessage;
+ }
+
+--
+2.16.4
+
diff --git a/pkgs/development/libraries/qtkeychain/default.nix b/pkgs/development/libraries/qtkeychain/default.nix
index 220c6241096..2b3c88d5886 100644
--- a/pkgs/development/libraries/qtkeychain/default.nix
+++ b/pkgs/development/libraries/qtkeychain/default.nix
@@ -18,6 +18,8 @@ stdenv.mkDerivation rec {
sha256 = "0h4wgngn2yl35hapbjs24amkjfbzsvnna4ixfhn87snjnq5lmjbc"; # v0.9.1
};
+ patches = if withQt5 then null else [ ./0001-Fixes-build-with-Qt4.patch ];
+
cmakeFlags = [ "-DQT_TRANSLATIONS_DIR=share/qt/translations" ]
++ stdenv.lib.optional stdenv.isDarwin [
# correctly detect the compiler
diff --git a/pkgs/development/libraries/skalibs/default.nix b/pkgs/development/libraries/skalibs/default.nix
index 9d5bd170e20..0667e1265b3 100644
--- a/pkgs/development/libraries/skalibs/default.nix
+++ b/pkgs/development/libraries/skalibs/default.nix
@@ -1,51 +1,30 @@
-{ stdenv, fetchgit }:
+{ stdenv, skawarePackages }:
-let
+with skawarePackages;
- version = "2.6.4.0";
+buildPackage {
+ pname = "skalibs";
+ version = "2.7.0.0";
+ sha256 = "0mnprdf4w4ami0db22rwd111m037cdmn2p8xa4i8cbwxcrv4sjcn";
-in stdenv.mkDerivation rec {
-
- name = "skalibs-${version}";
-
- src = fetchgit {
- url = "git://git.skarnet.org/skalibs";
- rev = "refs/tags/v${version}";
- sha256 = "13icrwxxb7k3cj37dl07h0apk6lwyrg1qrwjwh4l82i8f32bnjz2";
- };
+ description = "A set of general-purpose C programming libraries";
outputs = [ "lib" "dev" "doc" "out" ];
- dontDisableStatic = true;
-
- enableParallelBuilding = true;
-
configureFlags = [
- "--enable-force-devr" # assume /dev/random works
+ # assume /dev/random works
+ "--enable-force-devr"
"--libdir=\${lib}/lib"
"--dynlibdir=\${lib}/lib"
"--includedir=\${dev}/include"
"--sysdepdir=\${lib}/lib/skalibs/sysdeps"
- ]
- ++ (if stdenv.isDarwin then [ "--disable-shared" ] else [ "--enable-shared" ])
- # On darwin, the target triplet from -dumpmachine includes version number, but
- # skarnet.org software uses the triplet to test binary compatibility.
- # Explicitly setting target ensures code can be compiled against a skalibs
- # binary built on a different version of darwin.
- # http://www.skarnet.org/cgi-bin/archive.cgi?1:mss:623:heiodchokfjdkonfhdph
- ++ (stdenv.lib.optional stdenv.isDarwin "--build=${stdenv.hostPlatform.system}");
+ ];
postInstall = ''
- mkdir -p $doc/share/doc/skalibs
+ rm -rf sysdeps.cfg
+ rm libskarnet.*
+
mv doc $doc/share/doc/skalibs/html
'';
- meta = {
- homepage = http://skarnet.org/software/skalibs/;
- description = "A set of general-purpose C programming libraries";
- platforms = stdenv.lib.platforms.all;
- license = stdenv.lib.licenses.isc;
- maintainers = with stdenv.lib.maintainers; [ pmahoney Profpatsch ];
- };
-
}
diff --git a/pkgs/development/mobile/androidenv/androidndk.nix b/pkgs/development/mobile/androidenv/androidndk.nix
index 3ccdb237f89..dc693accbf4 100644
--- a/pkgs/development/mobile/androidenv/androidndk.nix
+++ b/pkgs/development/mobile/androidenv/androidndk.nix
@@ -1,96 +1,110 @@
{ stdenv, fetchurl, zlib, ncurses5, unzip, lib, makeWrapper
, coreutils, file, findutils, gawk, gnugrep, gnused, jdk, which
-, platformTools, python3, libcxx, version, sha256
+, platformTools, python3, libcxx, version, sha256, bash, runCommand
, fullNDK ? false # set to true if you want other parts of the NDK
# that is not used by Nixpkgs like sources,
# examples, docs, or LLVM toolchains
}:
-stdenv.mkDerivation rec {
- name = "android-ndk-r${version}";
- inherit version;
+let
+ makeStandaloneToolchain = api: arch: let
+ full_ndk = (ndk true);
+ in runCommand "makeStandaloneToolchain-${version}" {} ''
+ ${full_ndk}/libexec/${full_ndk.name}/build/tools/make_standalone_toolchain.py --api ${toString api} --arch ${arch} --install-dir $out
+ '';
+ ndk = fullNDK: stdenv.mkDerivation rec {
+ name = "android-ndk-r${version}";
+ inherit version;
- src = if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl {
+ src = if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl {
url = "https://dl.google.com/android/repository/${name}-linux-x86_64.zip";
inherit sha256;
} else throw "platform ${stdenv.hostPlatform.system} not supported!";
- phases = "buildPhase";
+ phases = "buildPhase";
- nativeBuildInputs = [ unzip makeWrapper file ];
+ nativeBuildInputs = [ unzip makeWrapper file ];
- buildCommand = let
- bin_path = "$out/bin";
- pkg_path = "$out/libexec/${name}";
- sed_script_1 =
- "'s|^PROGDIR=`dirname $0`" +
- "|PROGDIR=`dirname $(readlink -f $(which $0))`|'";
- runtime_paths = (lib.makeBinPath [
- coreutils file findutils
- gawk gnugrep gnused
- jdk python3 which
- ]) + ":${platformTools}/platform-tools";
- in ''
- mkdir -pv $out/libexec
- cd $out/libexec
- unzip -qq $src
+ buildCommand = let
+ bin_path = "$out/bin";
+ pkg_path = "$out/libexec/${name}";
+ sed_script_1 =
+ "'s|^PROGDIR=`dirname $0`" +
+ "|PROGDIR=`dirname $(readlink -f $(which $0))`|'";
+ runtime_paths = (lib.makeBinPath [
+ coreutils file findutils
+ gawk gnugrep gnused
+ jdk python3 which
+ ]) + ":${platformTools}/platform-tools";
+ in ''
+ mkdir -pv $out/libexec
+ cd $out/libexec
+ unzip -qq $src
- patchShebangs ${pkg_path}
+ # so that it doesn't fail because of read-only permissions set
+ cd -
+ ${if (version == "10e") then
+ ''
+ patch -p1 \
+ --no-backup-if-mismatch \
+ -d $out/libexec/${name} < ${ ./make-standalone-toolchain_r10e.patch }
+ ''
+ else
+ ''
+ patch -p1 \
+ --no-backup-if-mismatch \
+ -d $out/libexec/${name} < ${ ./. + "/make_standalone_toolchain.py_" + "${version}" + ".patch" }
- # so that it doesn't fail because of read-only permissions set
- cd -
- ${if (version == "10e") then
- ''
- patch -p1 \
- --no-backup-if-mismatch \
- -d $out/libexec/${name} < ${ ./make-standalone-toolchain_r10e.patch }
- ''
- else
- ''
- patch -p1 \
- --no-backup-if-mismatch \
- -d $out/libexec/${name} < ${ ./. + builtins.toPath ("/make_standalone_toolchain.py_" + "${version}" + ".patch") }
- wrapProgram ${pkg_path}/build/tools/make_standalone_toolchain.py --prefix PATH : "${runtime_paths}"
- ''
- }
- cd ${pkg_path}
+ sed -i 's,#!/usr/bin/env python,#!${python3}/bin/python,g' ${pkg_path}/build/tools/make_standalone_toolchain.py
+ sed -i 's,#!/bin/bash,#!${bash}/bin/bash,g' ${pkg_path}/build/tools/make_standalone_toolchain.py
+ wrapProgram ${pkg_path}/build/tools/make_standalone_toolchain.py --prefix PATH : "${runtime_paths}"
+ ''
+ }
- '' + lib.optionalString (!fullNDK) ''
- # Steps to reduce output size
- rm -rf docs sources tests
- # We only support cross compiling with gcc for now
- rm -rf toolchains/*-clang* toolchains/llvm*
- '' +
+ patchShebangs ${pkg_path}
- ''
- find ${pkg_path}/toolchains \( \
- \( -type f -a -name "*.so*" \) -o \
- \( -type f -a -perm -0100 \) \
- \) -exec patchelf --set-interpreter ${stdenv.cc.libc.out}/lib/ld-*so.? \
- --set-rpath ${stdenv.lib.makeLibraryPath [ libcxx zlib ncurses5 ]} {} \;
- # fix ineffective PROGDIR / MYNDKDIR determination
- for i in ndk-build ${lib.optionalString (version == "10e") "ndk-gdb ndk-gdb-py"}
- do
- sed -i -e ${sed_script_1} $i
- done
+ cd ${pkg_path}
- # wrap
- for i in ndk-build ${lib.optionalString (version == "10e") "ndk-gdb ndk-gdb-py ndk-which"}
- do
- wrapProgram "$(pwd)/$i" --prefix PATH : "${runtime_paths}"
- done
- # make some executables available in PATH
- mkdir -pv ${bin_path}
- for i in \
- ndk-build ${lib.optionalString (version == "10e") "ndk-depends ndk-gdb ndk-gdb-py ndk-gdb.py ndk-stack ndk-which"}
- do
- ln -sf ${pkg_path}/$i ${bin_path}/$i
- done
- '';
+ '' + lib.optionalString (!fullNDK) ''
+ # Steps to reduce output size
+ rm -rf docs sources tests
+ # We only support cross compiling with gcc for now
+ rm -rf toolchains/*-clang* toolchains/llvm*
+ '' +
- meta = {
- platforms = stdenv.lib.platforms.linux;
- hydraPlatforms = [];
- license = stdenv.lib.licenses.asl20;
+ ''
+ find ${pkg_path}/toolchains \( \
+ \( -type f -a -name "*.so*" \) -o \
+ \( -type f -a -perm -0100 \) \
+ \) -exec patchelf --set-interpreter ${stdenv.cc.libc.out}/lib/ld-*so.? \
+ --set-rpath ${stdenv.lib.makeLibraryPath [ libcxx zlib ncurses5 ]} {} \;
+ # fix ineffective PROGDIR / MYNDKDIR determination
+ for i in ndk-build ${lib.optionalString (version == "10e") "ndk-gdb ndk-gdb-py"}
+ do
+ sed -i -e ${sed_script_1} $i
+ done
+
+ # wrap
+ for i in ndk-build ${lib.optionalString (version == "10e") "ndk-gdb ndk-gdb-py ndk-which"}
+ do
+ wrapProgram "$(pwd)/$i" --prefix PATH : "${runtime_paths}"
+ done
+ # make some executables available in PATH
+ mkdir -pv ${bin_path}
+ for i in \
+ ndk-build ${lib.optionalString (version == "10e") "ndk-depends ndk-gdb ndk-gdb-py ndk-gdb.py ndk-stack ndk-which"}
+ do
+ ln -sf ${pkg_path}/$i ${bin_path}/$i
+ done
+ '';
+
+ meta = {
+ platforms = stdenv.lib.platforms.linux;
+ hydraPlatforms = [];
+ license = stdenv.lib.licenses.asl20;
+ };
};
-}
+ passthru = {
+ inherit makeStandaloneToolchain;
+ };
+in lib.extendDerivation true passthru (ndk fullNDK)
diff --git a/pkgs/development/node-packages/default-v8.nix b/pkgs/development/node-packages/default-v8.nix
index 3b7182e27b3..e67a91b90a1 100644
--- a/pkgs/development/node-packages/default-v8.nix
+++ b/pkgs/development/node-packages/default-v8.nix
@@ -77,6 +77,12 @@ nodePackages // {
'';
};
+ statsd = nodePackages.statsd.override {
+ # broken with node v8, dead upstream,
+ # see #45946 and https://github.com/etsy/statsd/issues/646
+ meta.broken = true;
+ };
+
webdrvr = nodePackages.webdrvr.override {
buildInputs = [ pkgs.phantomjs ];
diff --git a/pkgs/development/ocaml-modules/lwt/default.nix b/pkgs/development/ocaml-modules/lwt/default.nix
index 345ca037fec..739e6e1e43a 100644
--- a/pkgs/development/ocaml-modules/lwt/default.nix
+++ b/pkgs/development/ocaml-modules/lwt/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchzip, pkgconfig, ncurses, libev, jbuilder
, ocaml, findlib, cppo
, ocaml-migrate-parsetree, ppx_tools_versioned, result
-, withP4 ? !stdenv.lib.versionAtLeast ocaml.version "4.07"
+, withP4 ? true
, camlp4 ? null
}:
diff --git a/pkgs/development/ocaml-modules/re/default.nix b/pkgs/development/ocaml-modules/re/default.nix
index c6f1b6d1758..4994ceca7fb 100644
--- a/pkgs/development/ocaml-modules/re/default.nix
+++ b/pkgs/development/ocaml-modules/re/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchzip, ocaml, findlib, jbuilder, ounit }:
+{ stdenv, fetchzip, ocaml, findlib, jbuilder, ounit, seq }:
if !stdenv.lib.versionAtLeast ocaml.version "4.02"
then throw "re is not available for OCaml ${ocaml.version}"
@@ -6,14 +6,15 @@ else
stdenv.mkDerivation rec {
name = "ocaml${ocaml.version}-re-${version}";
- version = "1.7.3";
+ version = "1.8.0";
src = fetchzip {
url = "https://github.com/ocaml/ocaml-re/archive/${version}.tar.gz";
- sha256 = "1pb6w9wqg6gzcfaaw6ckv1bqjgjpmrzzqz7r0mp9w16qbf3i54zr";
+ sha256 = "0ch6hvmm4ym3w2vghjxf3ka5j1023a37980fqi4zcb7sx756z20i";
};
buildInputs = [ ocaml findlib jbuilder ounit ];
+ propagatedBuildInputs = [ seq ];
doCheck = true;
checkPhase = "jbuilder runtest";
diff --git a/pkgs/development/ocaml-modules/seq/default.nix b/pkgs/development/ocaml-modules/seq/default.nix
new file mode 100644
index 00000000000..f4918b420c4
--- /dev/null
+++ b/pkgs/development/ocaml-modules/seq/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild }:
+
+stdenv.mkDerivation rec {
+ version = "0.1";
+ name = "ocaml${ocaml.version}-seq-${version}";
+
+ src = fetchFromGitHub {
+ owner = "c-cube";
+ repo = "seq";
+ rev = version;
+ sha256 = "1cjpsc7q76yfgq9iyvswxgic4kfq2vcqdlmxjdjgd4lx87zvcwrv";
+ };
+
+ buildInputs = [ ocaml findlib ocamlbuild ];
+
+ createFindlibDestdir = true;
+
+ meta = {
+ description = "Compatibility package for OCaml’s standard iterator type starting from 4.07";
+ license = stdenv.lib.licenses.lgpl21;
+ maintainers = [ stdenv.lib.maintainers.vbgl ];
+ inherit (src.meta) homepage;
+ inherit (ocaml.meta) platforms;
+ };
+}
diff --git a/pkgs/development/ocaml-modules/tyxml/default.nix b/pkgs/development/ocaml-modules/tyxml/default.nix
index b34c9279c30..a38040e6e1f 100644
--- a/pkgs/development/ocaml-modules/tyxml/default.nix
+++ b/pkgs/development/ocaml-modules/tyxml/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, uutf, markup, ppx_tools_versioned, re
-, withP4 ? !stdenv.lib.versionAtLeast ocaml.version "4.07"
+, withP4 ? true
, camlp4 ? null
}:
diff --git a/pkgs/development/python-modules/alot/default.nix b/pkgs/development/python-modules/alot/default.nix
index dd06d4dde7a..7c4e15f8568 100644
--- a/pkgs/development/python-modules/alot/default.nix
+++ b/pkgs/development/python-modules/alot/default.nix
@@ -47,6 +47,8 @@ buildPythonPackage rec {
mkdir -p $out/share/{applications,alot}
cp -r extra/themes $out/share/alot
+ install -D extra/completion/alot-completion.zsh $out/share/zsh/site-functions/_alot
+
sed "s,/usr/bin,$out/bin,g" extra/alot.desktop > $out/share/applications/alot.desktop
'';
diff --git a/pkgs/development/python-modules/confluent-kafka/default.nix b/pkgs/development/python-modules/confluent-kafka/default.nix
index 0638ea3a36d..a0183e4595c 100644
--- a/pkgs/development/python-modules/confluent-kafka/default.nix
+++ b/pkgs/development/python-modules/confluent-kafka/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, isPy3k, rdkafka, requests, avro3k, avro}:
+{ stdenv, buildPythonPackage, fetchPypi, isPy3k, rdkafka, requests, avro3k, avro, futures}:
buildPythonPackage rec {
version = "0.11.5";
@@ -9,7 +9,7 @@ buildPythonPackage rec {
sha256 = "bfb5807bfb5effd74f2cfe65e4e3e8564a9e72b25e099f655d8ad0d362a63b9f";
};
- buildInputs = [ rdkafka requests ] ++ (if isPy3k then [ avro3k ] else [ avro ]) ;
+ buildInputs = [ rdkafka requests ] ++ (if isPy3k then [ avro3k ] else [ avro futures ]) ;
# Tests fail for python3 under this pypi release
doCheck = if isPy3k then false else true;
diff --git a/pkgs/development/python-modules/genanki/default.nix b/pkgs/development/python-modules/genanki/default.nix
new file mode 100644
index 00000000000..bcc462e7237
--- /dev/null
+++ b/pkgs/development/python-modules/genanki/default.nix
@@ -0,0 +1,38 @@
+{ stdenv, buildPythonPackage, fetchPypi, isPy3k
+, cached-property, frozendict, pystache, pyyaml, pytest, pytestrunner
+}:
+
+buildPythonPackage rec {
+ pname = "genanki";
+ version = "0.6.0";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "0xj8yd3acl8h457sh42balvcd0z4mg5idd4q63f7qlfzc5wgbb74";
+ };
+
+ propagatedBuildInputs = [
+ pytestrunner
+ cached-property
+ frozendict
+ pystache
+ pyyaml
+ ];
+
+ checkInputs = [ pytest ];
+
+ disabled = !isPy3k;
+
+ # relies on upstream anki
+ doCheck = false;
+ checkPhase = ''
+ py.test
+ '';
+
+ meta = with stdenv.lib; {
+ homepage = http://github.com/kerrickstaley/genanki;
+ description = "Generate Anki decks programmatically";
+ license = licenses.mit;
+ maintainers = with maintainers; [ teto ];
+ };
+}
diff --git a/pkgs/development/python-modules/geopandas/default.nix b/pkgs/development/python-modules/geopandas/default.nix
index cab25a60f3b..976df095261 100644
--- a/pkgs/development/python-modules/geopandas/default.nix
+++ b/pkgs/development/python-modules/geopandas/default.nix
@@ -1,23 +1,23 @@
{ stdenv, buildPythonPackage, fetchFromGitHub
, pandas, shapely, fiona, descartes, pyproj
-, pytest }:
+, pytest, Rtree }:
buildPythonPackage rec {
pname = "geopandas";
- version = "0.3.0";
+ version = "0.4.0";
name = pname + "-" + version;
src = fetchFromGitHub {
owner = "geopandas";
repo = "geopandas";
rev = "v${version}";
- sha256 = "0maafafr7sjjmlg2f19bizg06c8a5z5igmbcgq6kgmi7rklx8xxz";
+ sha256 = "025zpgck5pnmidvzk0805pr345rd7k6z66qb2m34gjh1814xjkhv";
};
- checkInputs = [ pytest ];
+ checkInputs = [ pytest Rtree ];
checkPhase = ''
- py.test geopandas
+ py.test geopandas -m "not web"
'';
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/gmpy/default.nix b/pkgs/development/python-modules/gmpy/default.nix
new file mode 100644
index 00000000000..81af4b5e550
--- /dev/null
+++ b/pkgs/development/python-modules/gmpy/default.nix
@@ -0,0 +1,24 @@
+{ buildPythonPackage, fetchurl, isPyPy, gmp } :
+
+let
+ pname = "gmpy";
+ version = "1.17";
+in
+
+buildPythonPackage {
+ inherit pname version;
+
+ disabled = isPyPy;
+
+ src = fetchurl {
+ url = "mirror://pypi/g/gmpy/${pname}-${version}.zip";
+ sha256 = "1a79118a5332b40aba6aa24b051ead3a31b9b3b9642288934da754515da8fa14";
+ };
+
+ buildInputs = [ gmp ];
+
+ meta = {
+ description = "GMP or MPIR interface to Python 2.4+ and 3.x";
+ homepage = http://code.google.com/p/gmpy/;
+ };
+}
diff --git a/pkgs/development/python-modules/gmpy2/default.nix b/pkgs/development/python-modules/gmpy2/default.nix
new file mode 100644
index 00000000000..5d1f82356a0
--- /dev/null
+++ b/pkgs/development/python-modules/gmpy2/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, buildPythonPackage, fetchurl, isPyPy, gmp, mpfr, libmpc } :
+
+let
+ pname = "gmpy2";
+ version = "2.0.8";
+in
+
+buildPythonPackage {
+ inherit pname version;
+
+ disabled = isPyPy;
+
+ src = fetchurl {
+ url = "mirror://pypi/g/gmpy2/${pname}-${version}.zip";
+ sha256 = "0grx6zmi99iaslm07w6c2aqpnmbkgrxcqjrqpfq223xri0r3w8yx";
+ };
+
+ buildInputs = [ gmp mpfr libmpc ];
+
+ meta = with stdenv.lib; {
+ description = "GMP/MPIR, MPFR, and MPC interface to Python 2.6+ and 3.x";
+ homepage = http://code.google.com/p/gmpy/;
+ license = licenses.gpl3Plus;
+ };
+}
diff --git a/pkgs/development/python-modules/jupyterlab_launcher/default.nix b/pkgs/development/python-modules/jupyterlab_launcher/default.nix
index 1831b47ee79..af29b9155a5 100644
--- a/pkgs/development/python-modules/jupyterlab_launcher/default.nix
+++ b/pkgs/development/python-modules/jupyterlab_launcher/default.nix
@@ -1,7 +1,8 @@
-{ lib, buildPythonPackage, fetchPypi, jsonschema, notebook }:
+{ lib, buildPythonPackage, fetchPypi, jsonschema, notebook, pythonOlder }:
buildPythonPackage rec {
pname = "jupyterlab_launcher";
version = "0.13.1";
+ disabled = pythonOlder "3.5";
src = fetchPypi {
inherit pname version;
diff --git a/pkgs/development/python-modules/kubernetes/default.nix b/pkgs/development/python-modules/kubernetes/default.nix
index 030766eb698..55d29729db8 100644
--- a/pkgs/development/python-modules/kubernetes/default.nix
+++ b/pkgs/development/python-modules/kubernetes/default.nix
@@ -1,5 +1,5 @@
{ stdenv, buildPythonPackage, fetchPypi, pythonAtLeast,
- ipaddress, websocket_client, urllib3, pyyaml, requests_oauthlib, python-dateutil, google_auth,
+ ipaddress, websocket_client, urllib3, pyyaml, requests_oauthlib, python-dateutil, google_auth, adal,
isort, pytest, coverage, mock, sphinx, autopep8, pep8, codecov, recommonmark, nose }:
buildPythonPackage rec {
@@ -27,7 +27,7 @@ buildPythonPackage rec {
};
checkInputs = [ isort coverage pytest mock sphinx autopep8 pep8 codecov recommonmark nose ];
- propagatedBuildInputs = [ ipaddress websocket_client urllib3 pyyaml requests_oauthlib python-dateutil google_auth ];
+ propagatedBuildInputs = [ ipaddress websocket_client urllib3 pyyaml requests_oauthlib python-dateutil google_auth adal ];
meta = with stdenv.lib; {
description = "Kubernetes python client";
diff --git a/pkgs/development/python-modules/locustio/default.nix b/pkgs/development/python-modules/locustio/default.nix
index c3e27c8b36a..18875f84064 100644
--- a/pkgs/development/python-modules/locustio/default.nix
+++ b/pkgs/development/python-modules/locustio/default.nix
@@ -1,8 +1,8 @@
{ buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
, mock
, unittest2
-, msgpack-python
+, msgpack
, requests
, flask
, gevent
@@ -11,18 +11,16 @@
buildPythonPackage rec {
pname = "locustio";
- version = "0.8.1";
+ version = "0.9.0";
- src = fetchPypi {
- inherit pname version;
- sha256 = "64583987ba1c330bb071aee3e29d2eedbfb7c8b342fa064bfb74fafcff660d61";
+ src = fetchFromGitHub {
+ owner = "locustio";
+ repo = "locust";
+ rev = "${version}";
+ sha256 = "1645d63ig4ymw716b6h53bhmjqqc13p9r95k1xfx66ck6vdqnisd";
};
- patchPhase = ''
- sed -i s/"pyzmq=="/"pyzmq>="/ setup.py
- '';
-
- propagatedBuildInputs = [ msgpack-python requests flask gevent pyzmq ];
+ propagatedBuildInputs = [ msgpack requests flask gevent pyzmq ];
buildInputs = [ mock unittest2 ];
meta = {
diff --git a/pkgs/development/python-modules/markerlib/default.nix b/pkgs/development/python-modules/markerlib/default.nix
new file mode 100644
index 00000000000..640b11a6f28
--- /dev/null
+++ b/pkgs/development/python-modules/markerlib/default.nix
@@ -0,0 +1,30 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, setuptools
+, nose
+}:
+
+buildPythonPackage rec {
+ version = "0.6.0";
+ pname = "markerlib";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "2fdb3939441f5bf4f090b1979a34f84a11d33eed6c0e3995de88ae5c06b6e3ae";
+ };
+
+ buildInputs = [ setuptools ];
+ checkInputs = [ nose ];
+
+ checkPhase = ''
+ nosetests
+ '';
+
+ meta = with stdenv.lib; {
+ homepage = https://bitbucket.org/dholth/markerlib/;
+ description = "A compiler for PEP 345 environment markers";
+ license = licenses.mit;
+ maintainers = [ maintainers.costrouc ];
+ };
+}
diff --git a/pkgs/development/python-modules/ncclient/default.nix b/pkgs/development/python-modules/ncclient/default.nix
index 9dc7710ff28..9933e849d0b 100644
--- a/pkgs/development/python-modules/ncclient/default.nix
+++ b/pkgs/development/python-modules/ncclient/default.nix
@@ -2,6 +2,7 @@
, buildPythonPackage
, fetchPypi
, paramiko
+, selectors2
, lxml
, libxml2
, libxslt
@@ -21,7 +22,7 @@ buildPythonPackage rec {
checkInputs = [ nose rednose ];
propagatedBuildInputs = [
- paramiko lxml libxml2 libxslt
+ paramiko lxml libxml2 libxslt selectors2
];
checkPhase = ''
diff --git a/pkgs/development/python-modules/nipype/default.nix b/pkgs/development/python-modules/nipype/default.nix
index 8b0ee06b349..a092123da82 100644
--- a/pkgs/development/python-modules/nipype/default.nix
+++ b/pkgs/development/python-modules/nipype/default.nix
@@ -18,6 +18,8 @@
, psutil
, pydot
, pytest
+, pytest_xdist
+, pytest-forked
, scipy
, simplejson
, traits
@@ -47,8 +49,6 @@ buildPythonPackage rec {
postPatch = ''
substituteInPlace nipype/interfaces/base/tests/test_core.py \
--replace "/usr/bin/env bash" "${bash}/bin/bash"
-
- rm pytest.ini
'';
propagatedBuildInputs = [
@@ -56,7 +56,6 @@ buildPythonPackage rec {
dateutil
funcsigs
future
- futures
networkx
nibabel
numpy
@@ -70,9 +69,10 @@ buildPythonPackage rec {
xvfbwrapper
] ++ stdenv.lib.optional (!isPy3k) [
configparser
+ futures
];
- checkInputs = [ pytest mock pytestcov codecov which glibcLocales ];
+ checkInputs = [ pytest mock pytestcov pytest_xdist pytest-forked codecov which glibcLocales ];
checkPhase = ''
LC_ALL="en_US.UTF-8" py.test -v --doctest-modules nipype
diff --git a/pkgs/development/python-modules/ordered-set/default.nix b/pkgs/development/python-modules/ordered-set/default.nix
index bf20f7827be..4044ad3f2fd 100644
--- a/pkgs/development/python-modules/ordered-set/default.nix
+++ b/pkgs/development/python-modules/ordered-set/default.nix
@@ -1,10 +1,10 @@
-{ buildPythonPackage, fetchPypi, lib, pytest }:
+{ buildPythonPackage, fetchPypi, lib, pytest, pytestrunner }:
buildPythonPackage rec {
pname = "ordered-set";
version = "3.0.1";
- buildInputs = [ pytest ];
+ buildInputs = [ pytest pytestrunner ];
src = fetchPypi {
inherit pname version;
@@ -21,6 +21,3 @@ buildPythonPackage rec {
maintainers = [ lib.maintainers.MostAwesomeDude ];
};
}
-
-
-
diff --git a/pkgs/development/python-modules/persistent/default.nix b/pkgs/development/python-modules/persistent/default.nix
index 542a68728af..721385f3ed6 100644
--- a/pkgs/development/python-modules/persistent/default.nix
+++ b/pkgs/development/python-modules/persistent/default.nix
@@ -1,12 +1,14 @@
{ buildPythonPackage
, fetchPypi
, zope_interface
+, sphinx, manuel
}:
buildPythonPackage rec {
pname = "persistent";
version = "4.4.2";
+ nativeBuildInputs = [ sphinx manuel ];
propagatedBuildInputs = [ zope_interface ];
src = fetchPypi {
diff --git a/pkgs/development/python-modules/phe/default.nix b/pkgs/development/python-modules/phe/default.nix
new file mode 100644
index 00000000000..b016a9bd92c
--- /dev/null
+++ b/pkgs/development/python-modules/phe/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, buildPythonPackage, fetchPypi, isPyPy, isPy3k, click, gmpy2, numpy } :
+
+let
+ pname = "phe";
+ version = "1.4.0";
+in
+
+buildPythonPackage {
+ inherit pname version;
+
+ # https://github.com/n1analytics/python-paillier/issues/51
+ disabled = isPyPy || ! isPy3k;
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "0wzlk7d24kp0f5kpm0kvvc88mm42144f5cg9pcpb1dsfha75qy5m";
+ };
+
+ buildInputs = [ click gmpy2 numpy ];
+
+ # 29/233 tests fail
+ doCheck = false;
+
+ meta = with stdenv.lib; {
+ description = "A library for Partially Homomorphic Encryption in Python";
+ homepage = https://github.com/n1analytics/python-paillier;
+ license = licenses.gpl3;
+ };
+}
diff --git a/pkgs/development/python-modules/phonopy/default.nix b/pkgs/development/python-modules/phonopy/default.nix
index cf15ccc18fc..903b2b90c30 100644
--- a/pkgs/development/python-modules/phonopy/default.nix
+++ b/pkgs/development/python-modules/phonopy/default.nix
@@ -10,9 +10,12 @@ buildPythonPackage rec {
};
propagatedBuildInputs = [ numpy pyyaml matplotlib h5py ];
-
+
checkPhase = ''
- cd test/phonopy
+ cd test
+ # dynamic structure factor test ocassionally fails do to roundoff
+ # see issue https://github.com/atztogo/phonopy/issues/79
+ rm spectrum/test_dynamic_structure_factor.py
${python.interpreter} -m unittest discover -b
cd ../..
'';
@@ -24,4 +27,3 @@ buildPythonPackage rec {
maintainers = with maintainers; [ psyanticy ];
};
}
-
diff --git a/pkgs/development/python-modules/py3status/default.nix b/pkgs/development/python-modules/py3status/default.nix
index 8a7dcc63f57..fd42faaad21 100644
--- a/pkgs/development/python-modules/py3status/default.nix
+++ b/pkgs/development/python-modules/py3status/default.nix
@@ -1,6 +1,7 @@
{ stdenv
, buildPythonPackage
, fetchPypi
+, fetchpatch
, requests
, pytz
, tzlocal
@@ -19,10 +20,18 @@
buildPythonPackage rec {
pname = "py3status";
version = "3.12";
+
src = fetchPypi {
inherit pname version;
sha256 = "c9ef49f72c2d83976d2841ab7e70faee3c77f4d7dbb2d3390ef0f0509473ea9a";
};
+
+ # ImportError: cannot import name '_to_ascii'
+ patches = fetchpatch {
+ url = "${meta.homepage}/commit/8a48e01cb68b514b532f56037e4f5a6c19662de5.patch";
+ sha256 = "0v1yja5lvdjk6vh13lvh07n7aw5hjcy7v9lrs2dfb0y0cjw4kx9n";
+ };
+
doCheck = false;
propagatedBuildInputs = [ pytz requests tzlocal ];
buildInputs = [ file ];
diff --git a/pkgs/development/python-modules/pycaption/default.nix b/pkgs/development/python-modules/pycaption/default.nix
index d4ed6088409..468011e2a80 100644
--- a/pkgs/development/python-modules/pycaption/default.nix
+++ b/pkgs/development/python-modules/pycaption/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
prePatch = ''
substituteInPlace setup.py \
--replace 'beautifulsoup4>=4.2.1,<4.5.0' \
- 'beautifulsoup4>=4.2.1,<=4.6.0'
+ 'beautifulsoup4>=4.2.1,<=4.6.3'
'';
# don't require enum34 on python >= 3.4
diff --git a/pkgs/development/python-modules/pymatgen/default.nix b/pkgs/development/python-modules/pymatgen/default.nix
index d810a5d6b4d..523e7f80806 100644
--- a/pkgs/development/python-modules/pymatgen/default.nix
+++ b/pkgs/development/python-modules/pymatgen/default.nix
@@ -1,17 +1,17 @@
-{ stdenv, buildPythonPackage, fetchPypi, glibcLocales, numpy, pydispatcher, sympy, requests, monty, ruamel_yaml, six, scipy, tabulate, enum34, matplotlib, palettable, spglib, pandas }:
+{ stdenv, buildPythonPackage, fetchPypi, glibcLocales, numpy, pydispatcher, sympy, requests, monty, ruamel_yaml, six, scipy, tabulate, enum34, matplotlib, palettable, spglib, pandas, networkx }:
buildPythonPackage rec {
pname = "pymatgen";
- version = "2018.8.10";
+ version = "2018.9.1";
src = fetchPypi {
inherit pname version;
- sha256 = "9bb3b170ca8654c956fa2efdd31107570c0610f7585d90e4a541eb99cee41603";
+ sha256 = "dee5dbd8008081de9f27759c20c550d09a07136eeebfe941e3d05fd88ccace18";
};
nativeBuildInputs = [ glibcLocales ];
- propagatedBuildInputs = [ numpy pydispatcher sympy requests monty ruamel_yaml six scipy tabulate enum34 matplotlib palettable spglib pandas ];
-
+ propagatedBuildInputs = [ numpy pydispatcher sympy requests monty ruamel_yaml six scipy tabulate enum34 matplotlib palettable spglib pandas networkx ];
+
# No tests in pypi tarball.
doCheck = false;
@@ -22,4 +22,3 @@ buildPythonPackage rec {
maintainers = with maintainers; [ psyanticy ];
};
}
-
diff --git a/pkgs/development/python-modules/pymetar/default.nix b/pkgs/development/python-modules/pymetar/default.nix
index a918528bdf8..339ddcbc791 100644
--- a/pkgs/development/python-modules/pymetar/default.nix
+++ b/pkgs/development/python-modules/pymetar/default.nix
@@ -1,20 +1,30 @@
-{ stdenv, buildPythonPackage, isPy3k, fetchPypi }:
+{ stdenv, python, buildPythonPackage, isPy3k, fetchPypi }:
buildPythonPackage rec {
pname = "pymetar";
- version = "0.21";
+ version = "1.0";
- disabled = isPy3k;
+ disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
- sha256 = "1sh3nm5ilnsgpnzbb2wv4xndnizjayw859qp72798jadqpcph69k";
+ sha256 = "1n4k5aic4sgp43ki6j3zdw9b21r3biqqws8ah57b77n44b8wzrap";
};
+ checkPhase = ''
+ cd testing/smoketest
+ tar xzf reports.tgz
+ mkdir logs
+ patchShebangs runtests.sh
+ substituteInPlace runtests.sh --replace "break" "exit 1" # fail properly
+ export PYTHONPATH="$PYTHONPATH:$out/${python.sitePackages}"
+ ./runtests.sh
+ '';
+
meta = with stdenv.lib; {
description = "A command-line tool to show the weather report by a given station ID";
homepage = http://www.schwarzvogel.de/software/pymetar.html;
- license = licenses.gpl2;
+ license = licenses.gpl2Plus;
maintainers = with maintainers; [ erosennin ];
};
}
diff --git a/pkgs/development/python-modules/pyslurm/default.nix b/pkgs/development/python-modules/pyslurm/default.nix
index 9057c3970e1..24704bd8f30 100644
--- a/pkgs/development/python-modules/pyslurm/default.nix
+++ b/pkgs/development/python-modules/pyslurm/default.nix
@@ -2,13 +2,13 @@
buildPythonPackage rec {
pname = "pyslurm";
- version = "20180604";
+ version = "20180811";
src = fetchFromGitHub {
repo = "pyslurm";
owner = "PySlurm";
- rev = "9dd4817e785fee138a9e29c3d71d2ea44898eedc";
- sha256 = "14ivwc27sjnk0z0jpfgyy9bd91m2bhcz11lzp1kk9xn4495i7wvj";
+ rev = "2d4f0553de971309b7e465d4d64528b8a5fafb05";
+ sha256 = "1cy57gyvvmzx0c8fx4h6p8dgan0ay6pdivdf24k1xiancjnw20xr";
};
buildInputs = [ cython slurm ];
diff --git a/pkgs/development/python-modules/pytest-fixture-config/default.nix b/pkgs/development/python-modules/pytest-fixture-config/default.nix
index df700526d1b..67ceebef305 100644
--- a/pkgs/development/python-modules/pytest-fixture-config/default.nix
+++ b/pkgs/development/python-modules/pytest-fixture-config/default.nix
@@ -1,5 +1,5 @@
{ stdenv, buildPythonPackage, fetchPypi
-, setuptools-git, pytest, six }:
+, setuptools-git, pytest }:
buildPythonPackage rec {
pname = "pytest-fixture-config";
@@ -14,11 +14,7 @@ buildPythonPackage rec {
buildInputs = [ pytest ];
- checkInputs = [ six ];
-
- checkPhase = ''
- py.test
- '';
+ doCheck = false;
meta = with stdenv.lib; {
description = "Simple configuration objects for Py.test fixtures. Allows you to skip tests when their required config variables aren’t set.";
diff --git a/pkgs/development/python-modules/selectors2/default.nix b/pkgs/development/python-modules/selectors2/default.nix
new file mode 100644
index 00000000000..030178fef83
--- /dev/null
+++ b/pkgs/development/python-modules/selectors2/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, buildPythonPackage, fetchPypi
+, nose, psutil, mock }:
+
+buildPythonPackage rec {
+ version = "2.0.1";
+ pname = "selectors2";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "81b77c4c6f607248b1d6bbdb5935403fef294b224b842a830bbfabb400c81884";
+ };
+
+ checkInputs = [ nose psutil mock ];
+
+ checkPhase = ''
+ # https://github.com/NixOS/nixpkgs/pull/46186#issuecomment-419450064
+ # Trick to disable certain tests that depend on timing which
+ # will always fail on hydra
+ export TRAVIS=""
+ nosetests tests/test_selectors2.py
+ '';
+
+ meta = with stdenv.lib; {
+ homepage = https://www.github.com/SethMichaelLarson/selectors2;
+ description = "Back-ported, durable, and portable selectors";
+ license = licenses.mit;
+ maintainers = [ maintainers.costrouc ];
+ };
+}
diff --git a/pkgs/development/python-modules/sniffio/default.nix b/pkgs/development/python-modules/sniffio/default.nix
new file mode 100644
index 00000000000..9893bc5828a
--- /dev/null
+++ b/pkgs/development/python-modules/sniffio/default.nix
@@ -0,0 +1,30 @@
+{ buildPythonPackage, lib, fetchPypi, glibcLocales, isPy3k, contextvars
+, pythonOlder
+}:
+
+buildPythonPackage rec {
+ pname = "sniffio";
+ version = "1.0.0";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "1dzb0nx3m1hpjgsv6s6w5ac2jcmywcz6gqnfkw8rwz1vkr1836rf";
+ };
+
+ # breaks with the following error:
+ # > TypeError: 'encoding' is an invalid keyword argument for this function
+ disabled = !isPy3k;
+
+ buildInputs = [ glibcLocales ];
+
+ propagatedBuildInputs = lib.optionals (pythonOlder "3.7") [ contextvars ];
+
+ # no tests distributed with PyPI
+ doCheck = false;
+
+ meta = with lib; {
+ homepage = https://github.com/python-trio/sniffio;
+ license = licenses.asl20;
+ description = "Sniff out which async library your code is running under";
+ };
+}
diff --git a/pkgs/development/python-modules/spacy/default.nix b/pkgs/development/python-modules/spacy/default.nix
index dc0509e226c..0667565c0de 100644
--- a/pkgs/development/python-modules/spacy/default.nix
+++ b/pkgs/development/python-modules/spacy/default.nix
@@ -37,7 +37,8 @@ buildPythonPackage rec {
--replace "ftfy==" "ftfy>=" \
--replace "msgpack-python==" "msgpack-python>=" \
--replace "msgpack-numpy==" "msgpack-numpy>=" \
- --replace "pathlib" "pathlib; python_version<\"3.4\""
+ --replace "thinc>=6.10.3,<6.11.0" "thinc>=6.10.3" \
+ --replace "plac<1.0.0,>=0.9.6" "plac>=0.9.6"
'';
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/spacy/models.json b/pkgs/development/python-modules/spacy/models.json
index e9c163c6525..34b8082872b 100644
--- a/pkgs/development/python-modules/spacy/models.json
+++ b/pkgs/development/python-modules/spacy/models.json
@@ -1,42 +1,78 @@
[{
- "pname": "es_core_web_md",
- "version": "1.0.0",
- "sha256": "0ikyakdhnj6rrfpr8k83695d1gd3z9n60a245hwwchv94jmr7r6s",
+ "pname": "de_core_news_sm",
+ "version": "2.0.0",
+ "sha256": "13fs4f46qg9mlxd9ynmh81gxizm11kfq3g52pk8d2m7wp89xfc6a",
"license": "cc-by-sa-40"
},
{
- "pname": "fr_depvec_web_lg",
- "version": "1.0.0",
- "sha256": "0nxmdszs1s5by2874cz37azrmwamh1ngdsiylffkfihzq6s8bhka",
- "license": "cc-by-nc-sa-40"
+ "pname": "en_core_web_lg",
+ "version": "2.0.0",
+ "sha256": "1r33l02jrkzjn78nd0bzzzd6rwjlz7qfgs3bg5yr2ki6q0m7qxvw",
+ "license": "cc-by-sa-40"
},
{
"pname": "en_core_web_md",
- "version": "1.2.1",
- "sha256": "12prr4hcbfdaky9rcna1y1ykr417jkhkks2r8l06g8fb7am3pvp3",
- "license": "cc-by-sa-40"
-},
-{
- "pname": "en_depent_web_md",
- "version": "1.2.1",
- "sha256": "0giyr35q5lpp5drpcamyvb5gsjnhj62mk3ndfr49nm1s6d5f6m52",
+ "version": "2.0.0",
+ "sha256": "1b5g5gma1gzm8ffj0pgli1pllccx5jpjvb7a19n7c8bfswpifxzc",
"license": "cc-by-sa-40"
},
{
"pname": "en_core_web_sm",
- "version": "1.2.0",
- "sha256": "0vc4l77dcwa9lmzyqdci8ikjc0m2rhasl2zvyba547vf76qb0528",
+ "version": "2.0.0",
+ "sha256": "161298pl6kzc0cgf2g7ji84xbqv8ayrgsrmmg0hxiflwghfj77cx",
"license": "cc-by-sa-40"
},
{
- "pname": "de_core_news_md",
- "version": "1.0.0",
- "sha256": "072jz2rdi1nckny7k16avp86vjg4didfdsw816kfl9zwr88iny6g",
+ "pname": "en_vectors_web_lg",
+ "version": "2.0.0",
+ "sha256": "15qfd8vzdv56x41fzghy7k5x1c8ql92ds70r37b6a8hkb87z9byw",
"license": "cc-by-sa-40"
},
{
- "pname": "en_vectors_glove_md",
- "version": "1.0.0",
- "sha256": "1jbr27xnh5fdww8yphpvk2brfnzb174wfnxkzdqwv3iyi02zsin6",
+ "pname": "es_core_news_md",
+ "version": "2.0.0",
+ "sha256": "03056qz866r641q4nagymw6pc78qnn5vdvcp7p1ph2cvxh7081kp",
+ "license": "cc-by-sa-40"
+},
+{
+ "pname": "es_core_news_sm",
+ "version": "2.0.0",
+ "sha256": "1b91lcmw2kyqmcrxlfq7m5vlj1a57i3bb9a5h4y31smjgzmsr81s",
+ "license": "cc-by-sa-40"
+},
+{
+ "pname": "fr_core_news_md",
+ "version": "2.0.0",
+ "sha256": "06kva46l1nw819bidzj2vks69ap1a9fa7rnvpd28l3z2haci38ls",
+ "license": "cc-by-sa-40"
+},
+{
+ "pname": "fr_core_news_sm",
+ "version": "2.0.0",
+ "sha256": "1zlhm9646g3cwcv4cs33160f3v8gxmzdr02x8hx7jpw1fbnmc5mx",
+ "license": "cc-by-sa-40"
+},
+{
+ "pname": "it_core_news_sm",
+ "version": "2.0.0",
+ "sha256": "0fs68rdq19migb3x3hb510b96aabibsi01adlk1fipll1x48msaz",
+ "license": "cc-by-sa-40"
+},
+{
+ "pname": "nl_core_news_sm",
+ "version": "2.0.0",
+ "sha256": "0n5x61jp8rdxa3ki250ipbd68rjpp9li6xwbx3fbzycpngffwy8z",
+ "license": "cc-by-sa-40"
+},
+{
+ "pname": "pt_core_news_sm",
+ "version": "2.0.0",
+ "sha256": "1sg500b3f3qnx1ga32hbq9p4qfynqhpdzhlmdjrxgqw8i58ys23g",
+ "license": "cc-by-sa-40"
+},
+{
+ "pname": "xx_ent_wiki_sm",
+ "version": "2.0.0",
+ "sha256": "0mc3mm6nfjp31wbjysdj2x72akyi52hgprm1g54djxfypm3pmn35",
"license": "cc-by-sa-40"
}]
diff --git a/pkgs/development/python-modules/tflearn/default.nix b/pkgs/development/python-modules/tflearn/default.nix
new file mode 100644
index 00000000000..341c1da5680
--- /dev/null
+++ b/pkgs/development/python-modules/tflearn/default.nix
@@ -0,0 +1,24 @@
+{ lib, fetchPypi, buildPythonPackage, fetchurl, pytest, scipy, h5py
+, pillow, tensorflow }:
+
+buildPythonPackage rec {
+ pname = "tflearn";
+ version = "0.3.2";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "034lvbslcivyj64r4w6xmr90ckmyxmrnkka9kal50x4175h02n1z";
+ };
+
+ buildInputs = [ pytest ];
+
+ propagatedBuildInputs = [ scipy h5py pillow tensorflow ];
+
+ doCheck = false;
+
+ meta = with lib; {
+ description = "Deep learning library featuring a higher-level API for TensorFlow";
+ homepage = "https://github.com/tflearn/tflearn";
+ license = licenses.mit;
+ };
+}
diff --git a/pkgs/development/python-modules/thinc/default.nix b/pkgs/development/python-modules/thinc/default.nix
index 88e6c8d1674..6217a420057 100644
--- a/pkgs/development/python-modules/thinc/default.nix
+++ b/pkgs/development/python-modules/thinc/default.nix
@@ -6,6 +6,7 @@
, pytest
, cython
, cymem
+, darwin
, msgpack-numpy
, msgpack-python
, preshed
@@ -35,9 +36,15 @@ buildPythonPackage rec {
postPatch = ''
substituteInPlace setup.py \
--replace "msgpack-python==" "msgpack-python>=" \
- --replace "msgpack-numpy==" "msgpack-numpy>="
+ --replace "msgpack-numpy==" "msgpack-numpy>=" \
+ --replace "plac>=0.9,<1.0" "plac>=0.9" \
+ --replace "hypothesis>=2,<3" "hypothesis>=2"
'';
+ buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
+ Accelerate CoreFoundation CoreGraphics CoreVideo
+ ]);
+
propagatedBuildInputs = [
cython
cymem
diff --git a/pkgs/development/python-modules/trio/default.nix b/pkgs/development/python-modules/trio/default.nix
index 4924fa527c6..89addb377dc 100644
--- a/pkgs/development/python-modules/trio/default.nix
+++ b/pkgs/development/python-modules/trio/default.nix
@@ -8,6 +8,7 @@
, pytest
, pyopenssl
, trustme
+, sniffio
}:
buildPythonPackage rec {
@@ -31,6 +32,7 @@ buildPythonPackage rec {
async_generator
idna
outcome
+ sniffio
] ++ lib.optionals (pythonOlder "3.7") [ contextvars ];
meta = {
diff --git a/pkgs/development/tools/analysis/pmd/default.nix b/pkgs/development/tools/analysis/pmd/default.nix
index 78dd5778962..187b2d7b03f 100644
--- a/pkgs/development/tools/analysis/pmd/default.nix
+++ b/pkgs/development/tools/analysis/pmd/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "pmd-${version}";
- version = "6.5.0";
+ version = "6.7.0";
buildInputs = [ unzip ];
src = fetchurl {
url = "mirror://sourceforge/pmd/pmd-bin-${version}.zip";
- sha256 = "10jdgps1ikx75ljp2gi76ff7payg28pmiy5y3vp17gg47mv991aw";
+ sha256 = "0bnbr8zq28dgvwka563g5lbya5jhmjrahnbwagcs4afpsrm7zj6c";
};
installPhase = ''
diff --git a/pkgs/development/tools/analysis/radare2/cutter.nix b/pkgs/development/tools/analysis/radare2/cutter.nix
index 4269661a4ff..659d6a94f5e 100644
--- a/pkgs/development/tools/analysis/radare2/cutter.nix
+++ b/pkgs/development/tools/analysis/radare2/cutter.nix
@@ -8,7 +8,7 @@
, python3 }:
let
- version = "1.7";
+ version = "1.7.1";
in
stdenv.mkDerivation rec {
name = "radare2-cutter-${version}";
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
owner = "radareorg";
repo = "cutter";
rev = "v${version}";
- sha256 = "0z9wzxd5hw0ivakrg3xiv4zx1rjj032hlmizq0pxj22xjrj1gg9n";
+ sha256 = "0dfi6f016jnh3swppvks5qkvmk0j2hvggh9sd1f40kg9pg5p08hy";
};
postUnpack = "export sourceRoot=$sourceRoot/src";
@@ -49,6 +49,6 @@ stdenv.mkDerivation rec {
description = "A Qt and C++ GUI for radare2 reverse engineering framework";
homepage = src.meta.homepage;
license = licenses.gpl3;
- maintainers = with maintainers; [ dtzWill ];
+ maintainers = with maintainers; [ mic92 dtzWill ];
};
}
diff --git a/pkgs/development/tools/analysis/radare2/default.nix b/pkgs/development/tools/analysis/radare2/default.nix
index 85559269f27..f10b820a73e 100644
--- a/pkgs/development/tools/analysis/radare2/default.nix
+++ b/pkgs/development/tools/analysis/radare2/default.nix
@@ -86,22 +86,22 @@ in {
#
# DO NOT EDIT! Automatically generated by ./update.py
radare2 = generic {
- version_commit = "19251";
- gittap = "2.8.0";
- gittip = "a76b965410aba07b4ef8b96d90b25b271c2003dd";
- rev = "2.8.0";
- version = "2.8.0";
- sha256 = "1d9rkzc3vychy2h1bnywwx4why83rr18r0lvvl1cqx87ad5awcjk";
+ version_commit = "19349";
+ gittap = "2.9.0";
+ gittip = "d5e9539ec8068ca2ab4759dc3b0697781ded4cc8";
+ rev = "2.9.0";
+ version = "2.9.0";
+ sha256 = "0zz6337p9095picfvjrcnqaxdi2a2b68h9my523ilnw8ynwfhdzw";
cs_tip = "782ea67e17a391ca0d3faafdc365b335a1a8930a";
cs_sha256 = "1maww4ir78a193pm3f8lr2kdkizi7rywn68ffa65ipyr7j4pl6i4";
};
r2-for-cutter = generic {
- version_commit = "19251";
- gittap = "2.8.0-118-gb0547831f";
- gittip = "b0547831f127b7357e3c93bc43933482a4d6213b";
- rev = "b0547831f127b7357e3c93bc43933482a4d6213b";
- version = "2018-08-07";
- sha256 = "1ix42kipd1aayb494ajbxawzc1cwikm9fxk343d1kchxx4a30a1m";
+ version_commit = "19349";
+ gittap = "2.8.0-189-gf82b28982";
+ gittip = "f82b289822825e4c7403734f3b95dfd7f5e4f725";
+ rev = "f82b289822825e4c7403734f3b95dfd7f5e4f725";
+ version = "2018-08-14";
+ sha256 = "0zc2a09xmwbxphxd1b0ia0zm8323wfcmxwwx6k239681jj9qwgr1";
cs_tip = "782ea67e17a391ca0d3faafdc365b335a1a8930a";
cs_sha256 = "1maww4ir78a193pm3f8lr2kdkizi7rywn68ffa65ipyr7j4pl6i4";
};
diff --git a/pkgs/development/tools/analysis/radare2/update.py b/pkgs/development/tools/analysis/radare2/update.py
index fae6a52a392..45920fd1e4b 100755
--- a/pkgs/development/tools/analysis/radare2/update.py
+++ b/pkgs/development/tools/analysis/radare2/update.py
@@ -13,6 +13,8 @@ from datetime import datetime
from pathlib import Path
from typing import Dict
+SCRIPT_DIR = Path(__file__).parent.resolve()
+
def sh(*args: str) -> str:
out = subprocess.check_output(list(args))
@@ -34,8 +36,17 @@ def get_radare2_rev() -> str:
return release["tag_name"]
+def get_cutter_version() -> str:
+ version_expr = """
+(with import {}; (builtins.parseDrvName (qt5.callPackage ./cutter.nix {}).name).version)
+"""
+ with SCRIPT_DIR:
+ return sh("nix", "eval", "--raw", version_expr.strip())
+
+
def get_r2_cutter_rev() -> str:
- url = "https://api.github.com/repos/radareorg/cutter/contents/"
+ version = get_cutter_version()
+ url = f"https://api.github.com/repos/radareorg/cutter/contents?ref=v{version}"
with urllib.request.urlopen(url) as response:
data = json.load(response) # type: ignore
for entry in data:
diff --git a/pkgs/development/tools/build-managers/bear/default.nix b/pkgs/development/tools/build-managers/bear/default.nix
index fb12b5a9c14..51e8d12d314 100644
--- a/pkgs/development/tools/build-managers/bear/default.nix
+++ b/pkgs/development/tools/build-managers/bear/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "bear-${version}";
- version = "2.3.12";
+ version = "2.3.13";
src = fetchFromGitHub {
owner = "rizsotto";
repo = "Bear";
rev = version;
- sha256 = "1zzz2yiiny9pm4h6ayb82xzxc2j5djcpf8va2wagcw92m7w6miqw";
+ sha256 = "0imvvs22gyr1v6ydgp5yn2nq8fb8llmz0ra1m733ikjaczl3jm7z";
};
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/development/tools/gocode/default.nix b/pkgs/development/tools/gocode/default.nix
index a20e1658988..64921ec6e10 100644
--- a/pkgs/development/tools/gocode/default.nix
+++ b/pkgs/development/tools/gocode/default.nix
@@ -1,20 +1,47 @@
-{ stdenv, buildGoPackage, fetchgit }:
+{ stdenv, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
name = "gocode-${version}";
- version = "20170903-${stdenv.lib.strings.substring 0 7 rev}";
- rev = "c7fddb39ecbc9ebd1ebe7d2a3af473ed0fffffa1";
+ version = "20180727-${stdenv.lib.strings.substring 0 7 rev}";
+ rev = "00e7f5ac290aeb20a3d8d31e737ae560a191a1d5";
- goPackagePath = "github.com/nsf/gocode";
+ goPackagePath = "github.com/mdempsky/gocode";
# we must allow references to the original `go` package,
# because `gocode` needs to dig into $GOROOT to provide completions for the
# standard packages.
allowGoReference = true;
- src = fetchgit {
+ src = fetchFromGitHub {
+ owner = "mdempsky";
+ repo = "gocode";
inherit rev;
- url = "https://github.com/nsf/gocode";
- sha256 = "0qx8pq38faig41xkl1a4hrgp3ziyjyn6g53vn5wj7cdgm5kk67nb";
+ sha256 = "0vrwjq4r90za47hm88yx5h2mvkv7y4yaj2xbx3skg62wq2drsq31";
+ };
+
+ preBuild = ''
+ # getting an error building the testdata because they contain invalid files
+ # on purpose as part of the testing.
+ rm -r go/src/$goPackagePath/internal/suggest/testdata
+ '';
+
+ meta = with stdenv.lib; {
+ description = "An autocompletion daemon for the Go programming language";
+ longDescription = ''
+ Gocode is a helper tool which is intended to be integrated with your
+ source code editor, like vim, neovim and emacs. It provides several
+ advanced capabilities, which currently includes:
+
+ - Context-sensitive autocompletion
+
+ It is called daemon, because it uses client/server architecture for
+ caching purposes. In particular, it makes autocompletions very fast.
+ Typical autocompletion time with warm cache is 30ms, which is barely
+ noticeable.
+ '';
+ homepage = https://github.com/mdempsky/gocode;
+ license = licenses.mit;
+ platforms = platforms.all;
+ maintainers = with maintainers; [ kalbasit ];
};
}
diff --git a/pkgs/development/tools/jbake/default.nix b/pkgs/development/tools/jbake/default.nix
index 152cddc101d..9c3094fb4fe 100644
--- a/pkgs/development/tools/jbake/default.nix
+++ b/pkgs/development/tools/jbake/default.nix
@@ -11,6 +11,8 @@ stdenv.mkDerivation rec {
buildInputs = [ makeWrapper jre ];
+ postPatch = "patchShebangs .";
+
installPhase = ''
mkdir -p $out
cp -vr * $out
diff --git a/pkgs/development/tools/misc/texinfo/common.nix b/pkgs/development/tools/misc/texinfo/common.nix
index 101298cd305..c6877ed4d1a 100644
--- a/pkgs/development/tools/misc/texinfo/common.nix
+++ b/pkgs/development/tools/misc/texinfo/common.nix
@@ -17,6 +17,9 @@ stdenv.mkDerivation rec {
inherit sha256;
};
+ # TODO: fix on mass rebuild
+ ${if interactive then "patches" else null} = optional (version == "6.5") ./perl.patch;
+
# We need a native compiler to build perl XS extensions
# when cross-compiling.
depsBuildBuild = [ buildPackages.stdenv.cc perl ];
diff --git a/pkgs/development/tools/misc/texinfo/perl.patch b/pkgs/development/tools/misc/texinfo/perl.patch
new file mode 100644
index 00000000000..e651b37371c
--- /dev/null
+++ b/pkgs/development/tools/misc/texinfo/perl.patch
@@ -0,0 +1,43 @@
+Adapted from http://svn.savannah.gnu.org/viewvc/texinfo/
+Author: gavin
+--- trunk/tp/Texinfo/Parser.pm 2018-06-04 19:51:36 UTC (rev 8006)
++++ trunk/tp/Texinfo/Parser.pm 2018-07-13 15:31:28 UTC (rev 8007)
+@@ -5531,11 +5531,11 @@
+ }
+ } elsif ($command eq 'clickstyle') {
+ # REMACRO
+- if ($line =~ /^\s+@([[:alnum:]][[:alnum:]\-]*)({})?\s*/) {
++ if ($line =~ /^\s+@([[:alnum:]][[:alnum:]\-]*)(\{\})?\s*/) {
+ $args = ['@'.$1];
+ $self->{'clickstyle'} = $1;
+ $remaining = $line;
+- $remaining =~ s/^\s+@([[:alnum:]][[:alnum:]\-]*)({})?\s*(\@(c|comment)((\@|\s+).*)?)?//;
++ $remaining =~ s/^\s+@([[:alnum:]][[:alnum:]\-]*)(\{\})?\s*(\@(c|comment)((\@|\s+).*)?)?//;
+ $has_comment = 1 if (defined($4));
+ } else {
+ $self->line_error (sprintf($self->__(
+--- trunk/tp/Texinfo/Convert/XSParagraph/xspara.c 2018-07-13 15:31:28 UTC (rev 8007)
++++ trunk/tp/Texinfo/Convert/XSParagraph/xspara.c 2018-07-13 15:39:29 UTC (rev 8008)
+@@ -248,6 +248,11 @@
+
+ dTHX;
+
++#if PERL_VERSION > 27 || (PERL_VERSION == 27 && PERL_SUBVERSION > 8)
++ /* needed due to thread-safe locale handling in newer perls */
++ switch_to_global_locale();
++#endif
++
+ if (setlocale (LC_CTYPE, "en_US.UTF-8")
+ || setlocale (LC_CTYPE, "en_US.utf8"))
+ goto success;
+@@ -320,6 +325,10 @@
+ {
+ success: ;
+ free (utf8_locale);
++#if PERL_VERSION > 27 || (PERL_VERSION == 27 && PERL_SUBVERSION > 8)
++ /* needed due to thread-safe locale handling in newer perls */
++ sync_locale();
++#endif
+ /*
+ fprintf (stderr, "tried to set LC_CTYPE to UTF-8.\n");
+ fprintf (stderr, "character encoding is: %s\n",
diff --git a/pkgs/development/tools/ocaml/opam/1.2.2.nix b/pkgs/development/tools/ocaml/opam/1.2.2.nix
new file mode 100644
index 00000000000..7e84719ae47
--- /dev/null
+++ b/pkgs/development/tools/ocaml/opam/1.2.2.nix
@@ -0,0 +1,92 @@
+{ stdenv, lib, fetchurl, makeWrapper,
+ ocaml, unzip, ncurses, curl, aspcud
+}:
+
+assert lib.versionAtLeast ocaml.version "3.12.1";
+
+let
+ srcs = {
+ cudf = fetchurl {
+ url = "https://gforge.inria.fr/frs/download.php/file/33593/cudf-0.7.tar.gz";
+ sha256 = "92c8a9ed730bbac73f3513abab41127d966c9b9202ab2aaffcd02358c030a701";
+ };
+ extlib = fetchurl {
+ url = "http://ocaml-extlib.googlecode.com/files/extlib-1.5.3.tar.gz";
+ sha256 = "c095eef4202a8614ff1474d4c08c50c32d6ca82d1015387785cf03d5913ec021";
+ };
+ ocaml_re = fetchurl {
+ url = "https://github.com/ocaml/ocaml-re/archive/ocaml-re-1.2.0.tar.gz";
+ sha256 = "a34dd9d6136731436a963bbab5c4bbb16e5d4e21b3b851d34887a3dec451999f";
+ };
+ ocamlgraph = fetchurl {
+ url = "http://ocamlgraph.lri.fr/download/ocamlgraph-1.8.5.tar.gz";
+ sha256 = "d167466435a155c779d5ec25b2db83ad851feb42ebc37dca8ffa345ddaefb82f";
+ };
+ dose3 = fetchurl {
+ url = "https://gforge.inria.fr/frs/download.php/file/34277/dose3-3.3.tar.gz";
+ sha256 = "8dc4dae9b1a81bb3a42abb283df785ba3eb00ade29b13875821c69f03e00680e";
+ };
+ cmdliner = fetchurl {
+ url = "http://erratique.ch/software/cmdliner/releases/cmdliner-0.9.7.tbz";
+ sha256 = "9c19893cffb5d3c3469ee0cce85e3eeeba17d309b33b9ace31aba06f68f0bf7a";
+ };
+ uutf = fetchurl {
+ url = "http://erratique.ch/software/uutf/releases/uutf-0.9.3.tbz";
+ sha256 = "1f364f89b1179e5182a4d3ad8975f57389d45548735d19054845e06a27107877";
+ };
+ jsonm = fetchurl {
+ url = "http://erratique.ch/software/jsonm/releases/jsonm-0.9.1.tbz";
+ sha256 = "3fd4dca045d82332da847e65e981d8b504883571d299a3f7e71447d46bc65f73";
+ };
+ opam = fetchurl {
+ url = "https://github.com/ocaml/opam/archive/1.2.2.zip";
+ sha256 = "c590ce55ae69ec74f46215cf16a156a02b23c5f3ecb22f23a3ad9ba3d91ddb6e";
+ };
+ };
+in stdenv.mkDerivation rec {
+ name = "opam-${version}";
+ version = "1.2.2";
+
+ buildInputs = [ unzip curl ncurses ocaml makeWrapper ];
+
+ src = srcs.opam;
+
+ postUnpack = ''
+ ln -sv ${srcs.cudf} $sourceRoot/src_ext/${srcs.cudf.name}
+ ln -sv ${srcs.extlib} $sourceRoot/src_ext/${srcs.extlib.name}
+ ln -sv ${srcs.ocaml_re} $sourceRoot/src_ext/${srcs.ocaml_re.name}
+ ln -sv ${srcs.ocamlgraph} $sourceRoot/src_ext/${srcs.ocamlgraph.name}
+ ln -sv ${srcs.dose3} $sourceRoot/src_ext/${srcs.dose3.name}
+ ln -sv ${srcs.cmdliner} $sourceRoot/src_ext/${srcs.cmdliner.name}
+ ln -sv ${srcs.uutf} $sourceRoot/src_ext/${srcs.uutf.name}
+ ln -sv ${srcs.jsonm} $sourceRoot/src_ext/${srcs.jsonm.name}
+ '';
+
+ preConfigure = ''
+ substituteInPlace ./src_ext/Makefile --replace "%.stamp: %.download" "%.stamp:"
+ '';
+
+ postConfigure = "make lib-ext";
+
+ # Dirty, but apparently ocp-build requires a TERM
+ makeFlags = ["TERM=screen"];
+
+ # change argv0 to "opam" as a workaround for
+ # https://github.com/ocaml/opam/issues/2142
+ postInstall = ''
+ mv $out/bin/opam $out/bin/.opam-wrapped
+ makeWrapper $out/bin/.opam-wrapped $out/bin/opam \
+ --argv0 "opam" \
+ --suffix PATH : ${aspcud}/bin:${unzip}/bin:${curl}/bin
+ '';
+
+ doCheck = false;
+
+ meta = with stdenv.lib; {
+ description = "A package manager for OCaml";
+ homepage = http://opam.ocamlpro.com/;
+ maintainers = [ maintainers.henrytill ];
+ platforms = platforms.all;
+ license = licenses.lgpl21Plus;
+ };
+}
diff --git a/pkgs/development/tools/ocaml/opam/default.nix b/pkgs/development/tools/ocaml/opam/default.nix
index 7e84719ae47..8e89dd3fadd 100644
--- a/pkgs/development/tools/ocaml/opam/default.nix
+++ b/pkgs/development/tools/ocaml/opam/default.nix
@@ -1,69 +1,87 @@
-{ stdenv, lib, fetchurl, makeWrapper,
- ocaml, unzip, ncurses, curl, aspcud
+{ stdenv, lib, fetchurl, makeWrapper, getconf,
+ ocaml, unzip, ncurses, curl, aspcud, bubblewrap
}:
-assert lib.versionAtLeast ocaml.version "3.12.1";
+assert lib.versionAtLeast ocaml.version "4.02.3";
let
srcs = {
+ cmdliner = fetchurl {
+ url = "http://erratique.ch/software/cmdliner/releases/cmdliner-1.0.2.tbz";
+ sha256 = "18jqphjiifljlh9jg8zpl6310p3iwyaqphdkmf89acyaix0s4kj1";
+ };
+ cppo = fetchurl {
+ url = "https://github.com/mjambon/cppo/archive/v1.6.4.tar.gz";
+ sha256 = "0jdb7d21lfa3ck4k59mrqs5pljzq5rb504jq57nnrc6klljm42j7";
+ };
cudf = fetchurl {
- url = "https://gforge.inria.fr/frs/download.php/file/33593/cudf-0.7.tar.gz";
- sha256 = "92c8a9ed730bbac73f3513abab41127d966c9b9202ab2aaffcd02358c030a701";
- };
- extlib = fetchurl {
- url = "http://ocaml-extlib.googlecode.com/files/extlib-1.5.3.tar.gz";
- sha256 = "c095eef4202a8614ff1474d4c08c50c32d6ca82d1015387785cf03d5913ec021";
- };
- ocaml_re = fetchurl {
- url = "https://github.com/ocaml/ocaml-re/archive/ocaml-re-1.2.0.tar.gz";
- sha256 = "a34dd9d6136731436a963bbab5c4bbb16e5d4e21b3b851d34887a3dec451999f";
- };
- ocamlgraph = fetchurl {
- url = "http://ocamlgraph.lri.fr/download/ocamlgraph-1.8.5.tar.gz";
- sha256 = "d167466435a155c779d5ec25b2db83ad851feb42ebc37dca8ffa345ddaefb82f";
+ url = "https://gforge.inria.fr/frs/download.php/36602/cudf-0.9.tar.gz";
+ sha256 = "0771lwljqwwn3cryl0plny5a5dyyrj4z6bw66ha5n8yfbpcy8clr";
};
dose3 = fetchurl {
- url = "https://gforge.inria.fr/frs/download.php/file/34277/dose3-3.3.tar.gz";
- sha256 = "8dc4dae9b1a81bb3a42abb283df785ba3eb00ade29b13875821c69f03e00680e";
+ url = "https://gforge.inria.fr/frs/download.php/file/36063/dose3-5.0.1.tar.gz";
+ sha256 = "00yvyfm4j423zqndvgc1ycnmiffaa2l9ab40cyg23pf51qmzk2jm";
};
- cmdliner = fetchurl {
- url = "http://erratique.ch/software/cmdliner/releases/cmdliner-0.9.7.tbz";
- sha256 = "9c19893cffb5d3c3469ee0cce85e3eeeba17d309b33b9ace31aba06f68f0bf7a";
+ extlib = fetchurl {
+ url = "http://ygrek.org.ua/p/release/ocaml-extlib/extlib-1.7.5.tar.gz";
+ sha256 = "19slqf5bdj0rrph2w41giwmn6df2qm07942jn058pjkjrnk30d4s";
};
- uutf = fetchurl {
- url = "http://erratique.ch/software/uutf/releases/uutf-0.9.3.tbz";
- sha256 = "1f364f89b1179e5182a4d3ad8975f57389d45548735d19054845e06a27107877";
+ jbuilder = fetchurl {
+ url = "https://github.com/ocaml/dune/releases/download/1.0+beta20/jbuilder-1.0.beta20.tbz";
+ sha256 = "07hl9as5llffgd6hbw41rs76i1ibgn3n9r0dba5h0mdlkapcwb10";
};
- jsonm = fetchurl {
- url = "http://erratique.ch/software/jsonm/releases/jsonm-0.9.1.tbz";
- sha256 = "3fd4dca045d82332da847e65e981d8b504883571d299a3f7e71447d46bc65f73";
+ mccs = fetchurl {
+ url = "https://github.com/AltGr/ocaml-mccs/archive/1.1+8.tar.gz";
+ sha256 = "0xavfvxfrcf3lmry8ymma1yzy0hw3ijbx94c9zq3pzlwnylrapa4";
+ };
+ ocamlgraph = fetchurl {
+ url = "http://ocamlgraph.lri.fr/download/ocamlgraph-1.8.8.tar.gz";
+ sha256 = "0m9g16wrrr86gw4fz2fazrh8nkqms0n863w7ndcvrmyafgxvxsnr";
+ };
+ opam-file-format = fetchurl {
+ url = "https://github.com/ocaml/opam-file-format/archive/2.0.0-rc2.tar.gz";
+ sha256 = "1mgk08msp7hxn0hs0m82vky3yv6hcq4pw5402b3vhx4c49431jsb";
+ };
+ re = fetchurl {
+ url = "https://github.com/ocaml/ocaml-re/releases/download/1.7.3/re-1.7.3.tbz";
+ sha256 = "0nv933qfl8y9i19cqvhsalwzif3dkm28vg478rpnr4hgfqjlfryr";
+ };
+ result = fetchurl {
+ url = "https://github.com/janestreet/result/releases/download/1.3/result-1.3.tbz";
+ sha256 = "1lrnbxdq80gbhnp85mqp1kfk0bkh6q1c93sfz2qgnq2qyz60w4sk";
};
opam = fetchurl {
- url = "https://github.com/ocaml/opam/archive/1.2.2.zip";
- sha256 = "c590ce55ae69ec74f46215cf16a156a02b23c5f3ecb22f23a3ad9ba3d91ddb6e";
+ url = "https://github.com/ocaml/opam/archive/2.0.0.zip";
+ sha256 = "0m4ilsldrfkkn0vlvl119bk76j2pwvqvdi8mpg957z4kqflfbfp8";
};
};
in stdenv.mkDerivation rec {
name = "opam-${version}";
- version = "1.2.2";
+ version = "2.0.0";
- buildInputs = [ unzip curl ncurses ocaml makeWrapper ];
+ buildInputs = [ unzip curl ncurses ocaml makeWrapper getconf ] ++ lib.optional stdenv.isLinux bubblewrap;
src = srcs.opam;
postUnpack = ''
- ln -sv ${srcs.cudf} $sourceRoot/src_ext/${srcs.cudf.name}
- ln -sv ${srcs.extlib} $sourceRoot/src_ext/${srcs.extlib.name}
- ln -sv ${srcs.ocaml_re} $sourceRoot/src_ext/${srcs.ocaml_re.name}
- ln -sv ${srcs.ocamlgraph} $sourceRoot/src_ext/${srcs.ocamlgraph.name}
- ln -sv ${srcs.dose3} $sourceRoot/src_ext/${srcs.dose3.name}
- ln -sv ${srcs.cmdliner} $sourceRoot/src_ext/${srcs.cmdliner.name}
- ln -sv ${srcs.uutf} $sourceRoot/src_ext/${srcs.uutf.name}
- ln -sv ${srcs.jsonm} $sourceRoot/src_ext/${srcs.jsonm.name}
+ ln -sv ${srcs.cmdliner} $sourceRoot/src_ext/cmdliner.tbz
+ ln -sv ${srcs.cppo} $sourceRoot/src_ext/cppo.tar.gz
+ ln -sv ${srcs.cudf} $sourceRoot/src_ext/cudf.tar.gz
+ ln -sv ${srcs.dose3} $sourceRoot/src_ext/dose3.tar.gz
+ ln -sv ${srcs.extlib} $sourceRoot/src_ext/extlib.tar.gz
+ ln -sv ${srcs.jbuilder} $sourceRoot/src_ext/jbuilder.tbz
+ ln -sv ${srcs.mccs} $sourceRoot/src_ext/mccs.tar.gz
+ ln -sv ${srcs.ocamlgraph} $sourceRoot/src_ext/ocamlgraph.tar.gz
+ ln -sv ${srcs.opam-file-format} $sourceRoot/src_ext/opam-file-format.tar.gz
+ ln -sv ${srcs.re} $sourceRoot/src_ext/re.tbz
+ ln -sv ${srcs.result} $sourceRoot/src_ext/result.tbz
'';
+ patches = [ ./opam-pull-3487.patch ./opam-shebangs.patch ./opam-mccs-darwin.patch ];
+
preConfigure = ''
substituteInPlace ./src_ext/Makefile --replace "%.stamp: %.download" "%.stamp:"
+ patchShebangs src/state/shellscripts
'';
postConfigure = "make lib-ext";
@@ -71,13 +89,17 @@ in stdenv.mkDerivation rec {
# Dirty, but apparently ocp-build requires a TERM
makeFlags = ["TERM=screen"];
+ outputs = [ "out" "installer" ];
+ setOutputFlags = false;
+
# change argv0 to "opam" as a workaround for
# https://github.com/ocaml/opam/issues/2142
postInstall = ''
mv $out/bin/opam $out/bin/.opam-wrapped
makeWrapper $out/bin/.opam-wrapped $out/bin/opam \
--argv0 "opam" \
- --suffix PATH : ${aspcud}/bin:${unzip}/bin:${curl}/bin
+ --suffix PATH : ${aspcud}/bin:${unzip}/bin:${curl}/bin:${lib.optionalString stdenv.isLinux "${bubblewrap}/bin:"}${getconf}/bin
+ $out/bin/opam-installer --prefix=$installer opam-installer.install
'';
doCheck = false;
@@ -87,6 +109,6 @@ in stdenv.mkDerivation rec {
homepage = http://opam.ocamlpro.com/;
maintainers = [ maintainers.henrytill ];
platforms = platforms.all;
- license = licenses.lgpl21Plus;
};
}
+# Generated by: ./opam.nix.pl -v 2.0.0 -p opam-pull-3487.patch,opam-shebangs.patch,opam-mccs-darwin.patch
diff --git a/pkgs/development/tools/ocaml/opam/opam-mccs-darwin.patch b/pkgs/development/tools/ocaml/opam/opam-mccs-darwin.patch
new file mode 100644
index 00000000000..501242c40a0
--- /dev/null
+++ b/pkgs/development/tools/ocaml/opam/opam-mccs-darwin.patch
@@ -0,0 +1,18 @@
+diff --git a/src_ext/patches/mccs/build-on-darwin.patch b/src_ext/patches/mccs/build-on-darwin.patch
+new file mode 100644
+index 00000000..157e2094
+--- /dev/null
++++ b/src_ext/patches/mccs/build-on-darwin.patch
+@@ -0,0 +1,12 @@
++diff --git a/src/context_flags.ml b/src/context_flags.ml
++index 7470030..6e07370 100644
++--- a/src/context_flags.ml
+++++ b/src/context_flags.ml
++@@ -24,6 +24,7 @@ let ifc c x = if c then x else []
++
++ let cxxflags =
++ let flags =
+++ (ifc (Config.system = "macosx") ["-x"; "c++"]) @
++ (ifc (Sys.win32 && Config.ccomp_type = "msvc") ["/EHsc"]) @
++ (ifc useGLPK ["-DUSEGLPK"]) @
++ (ifc useCOIN ["-DUSECOIN"]) @
diff --git a/pkgs/development/tools/ocaml/opam/opam-pull-3487.patch b/pkgs/development/tools/ocaml/opam/opam-pull-3487.patch
new file mode 100644
index 00000000000..e047c8298bc
--- /dev/null
+++ b/pkgs/development/tools/ocaml/opam/opam-pull-3487.patch
@@ -0,0 +1,23 @@
+diff --git a/src/state/shellscripts/bwrap.sh b/src/state/shellscripts/bwrap.sh
+index 6f5d7dbea..3e1a3e1b4 100755
+--- a/src/state/shellscripts/bwrap.sh
++++ b/src/state/shellscripts/bwrap.sh
+@@ -1,4 +1,6 @@
+-#!/bin/bash -ue
++#!/usr/bin/env bash
++
++set -ue
+
+ if ! command -v bwrap >/dev/null; then
+ echo "The 'bwrap' command was not found. Install 'bubblewrap' on your system, or" >&2
+@@ -11,7 +13,9 @@ fi
+
+ ARGS=(--unshare-net --new-session)
+ ARGS=("${ARGS[@]}" --proc /proc --dev /dev)
+-ARGS=("${ARGS[@]}" --bind /tmp /tmp --tmpfs /run --tmpfs /var)
++ARGS=("${ARGS[@]}" --bind "${TMPDIR:-/tmp}" /tmp)
++ARGS=("${ARGS[@]}" --setenv TMPDIR /tmp --setenv TMP /tmp --setenv TEMPDIR /tmp --setenv TEMP /tmp)
++ARGS=("${ARGS[@]}" --tmpfs /run --tmpfs /var)
+
+ add_mounts() {
+ case "$1" in
diff --git a/pkgs/development/tools/ocaml/opam/opam-shebangs.patch b/pkgs/development/tools/ocaml/opam/opam-shebangs.patch
new file mode 100644
index 00000000000..f74ac84ca6b
--- /dev/null
+++ b/pkgs/development/tools/ocaml/opam/opam-shebangs.patch
@@ -0,0 +1,128 @@
+diff --git a/src/client/opamInitDefaults.ml b/src/client/opamInitDefaults.ml
+index eca13a7c..1fd66f43 100644
+--- a/src/client/opamInitDefaults.ml
++++ b/src/client/opamInitDefaults.ml
+@@ -35,11 +35,15 @@ let eval_variables = [
+ let os_filter os =
+ FOp (FIdent ([], OpamVariable.of_string "os", None), `Eq, FString os)
+
++let os_distribution_filter distro =
++ FOp (FIdent ([], OpamVariable.of_string "os-distribution", None), `Eq, FString distro)
++
+ let linux_filter = os_filter "linux"
+ let macos_filter = os_filter "macos"
+ let openbsd_filter = os_filter "openbsd"
+ let freebsd_filter = os_filter "freebsd"
+ let sandbox_filter = FOr (linux_filter, macos_filter)
++let nixos_filter = os_distribution_filter "nixos"
+
+ let gpatch_filter = FOr (openbsd_filter, freebsd_filter)
+ let patch_filter = FNot gpatch_filter
+@@ -50,6 +54,11 @@ let wrappers ~sandboxing () =
+ CString t, None;
+ ] in
+ let w = OpamFile.Wrappers.empty in
++ let w = { w with
++ OpamFile.Wrappers.
++ pre_build = [[CString "%{hooks}%/shebangs.sh", None], Some nixos_filter];
++ }
++ in
+ if sandboxing then
+ { w with
+ OpamFile.Wrappers.
+@@ -113,6 +122,7 @@ let required_tools ~sandboxing () =
+ let init_scripts () = [
+ ("sandbox.sh", OpamScript.bwrap), Some bwrap_filter;
+ ("sandbox.sh", OpamScript.sandbox_exec), Some macos_filter;
++ ("shebangs.sh", OpamScript.patch_shebangs), Some nixos_filter;
+ ]
+
+ module I = OpamFile.InitConfig
+diff --git a/src/state/opamScript.mli b/src/state/opamScript.mli
+index 03449970..83de0b53 100644
+--- a/src/state/opamScript.mli
++++ b/src/state/opamScript.mli
+@@ -20,3 +20,4 @@ val env_hook : string
+ val env_hook_zsh : string
+ val env_hook_csh : string
+ val env_hook_fish : string
++val patch_shebangs : string
+diff --git a/src/state/shellscripts/patch_shebangs.sh b/src/state/shellscripts/patch_shebangs.sh
+new file mode 100755
+index 00000000..3ea84e2d
+--- /dev/null
++++ b/src/state/shellscripts/patch_shebangs.sh
+@@ -0,0 +1,73 @@
++#!/usr/bin/env bash
++# This setup hook causes the fixup phase to rewrite all script
++# interpreter file names (`#! /path') to paths found in $PATH. E.g.,
++# /bin/sh will be rewritten to /nix/store/-some-bash/bin/sh.
++# /usr/bin/env gets special treatment so that ".../bin/env python" is
++# rewritten to /nix/store//bin/python. Interpreters that are
++# already in the store are left untouched.
++
++header() { echo "$1"; }
++stopNest() { true; }
++
++fixupOutputHooks+=('if [ -z "$dontPatchShebangs" -a -e "$prefix" ]; then patchShebangs "$prefix"; fi')
++
++patchShebangs() {
++ local dir="$1"
++ header "patching script interpreter paths in $dir"
++ local f
++ local oldPath
++ local newPath
++ local arg0
++ local args
++ local oldInterpreterLine
++ local newInterpreterLine
++
++ find "$dir" -type f -perm -0100 | while read f; do
++ if [ "$(head -1 "$f" | head -c+2)" != '#!' ]; then
++ # missing shebang => not a script
++ continue
++ fi
++
++ oldInterpreterLine=$(head -1 "$f" | tail -c+3)
++ read -r oldPath arg0 args <<< "$oldInterpreterLine"
++
++ if $(echo "$oldPath" | grep -q "/bin/env$"); then
++ # Check for unsupported 'env' functionality:
++ # - options: something starting with a '-'
++ # - environment variables: foo=bar
++ if $(echo "$arg0" | grep -q -- "^-.*\|.*=.*"); then
++ echo "unsupported interpreter directive \"$oldInterpreterLine\" (set dontPatchShebangs=1 and handle shebang patching yourself)"
++ exit 1
++ fi
++ newPath="$(command -v "$arg0" || true)"
++ else
++ if [ "$oldPath" = "" ]; then
++ # If no interpreter is specified linux will use /bin/sh. Set
++ # oldpath="/bin/sh" so that we get /nix/store/.../sh.
++ oldPath="/bin/sh"
++ fi
++ newPath="$(command -v "$(basename "$oldPath")" || true)"
++ args="$arg0 $args"
++ fi
++
++ # Strip trailing whitespace introduced when no arguments are present
++ newInterpreterLine="$(echo "$newPath $args" | sed 's/[[:space:]]*$//')"
++
++ if [ -n "$oldPath" -a "${oldPath:0:${#NIX_STORE}}" != "$NIX_STORE" ]; then
++ if [ -n "$newPath" -a "$newPath" != "$oldPath" ]; then
++ echo "$f: interpreter directive changed from \"$oldInterpreterLine\" to \"$newInterpreterLine\""
++ # escape the escape chars so that sed doesn't interpret them
++ escapedInterpreterLine=$(echo "$newInterpreterLine" | sed 's|\\|\\\\|g')
++ # Preserve times, see: https://github.com/NixOS/nixpkgs/pull/33281
++ touch -r "$f" "$f.timestamp"
++ sed -i -e "1 s|.*|#\!$escapedInterpreterLine|" "$f"
++ touch -r "$f.timestamp" "$f"
++ rm "$f.timestamp"
++ fi
++ fi
++ done
++
++ stopNest
++}
++
++patchShebangs .
diff --git a/pkgs/development/tools/ocaml/opam/opam.nix.pl b/pkgs/development/tools/ocaml/opam/opam.nix.pl
new file mode 100755
index 00000000000..1862add452d
--- /dev/null
+++ b/pkgs/development/tools/ocaml/opam/opam.nix.pl
@@ -0,0 +1,130 @@
+#!/usr/bin/env perl
+
+use strict;
+use warnings qw;
+use Getopt::Std;
+
+my $gencmd = "# Generated by: " . join(" ", $0, @ARGV) . "\n";
+
+our $opt_v;
+our $opt_p;
+our $opt_r;
+our $opt_t;
+getopts "v:p:t:r:";
+
+my $OPAM_RELEASE = $opt_v // "2.0.0";
+my $OPAM_TAG = $opt_t // $OPAM_RELEASE;
+my $OPAM_GITHUB_REPO = $opt_r // "ocaml/opam";
+my $OPAM_RELEASE_URL = "https://github.com/$OPAM_GITHUB_REPO/archive/$OPAM_TAG.zip";
+my $OPAM_RELEASE_SHA256 = `nix-prefetch-url \Q$OPAM_RELEASE_URL\E`;
+chomp $OPAM_RELEASE_SHA256;
+
+my $OPAM_BASE_URL = "https://raw.githubusercontent.com/$OPAM_GITHUB_REPO/$OPAM_TAG";
+my $OPAM_OPAM = `curl -L --url \Q$OPAM_BASE_URL\E/opam-devel.opam`;
+my($OCAML_MIN_VERSION) = $OPAM_OPAM =~ /^available: ocaml-version >= "(.*)"$/m
+ or die "could not parse ocaml version bound\n";
+
+print <<"EOF";
+{ stdenv, lib, fetchurl, makeWrapper, getconf,
+ ocaml, unzip, ncurses, curl, aspcud, bubblewrap
+}:
+
+assert lib.versionAtLeast ocaml.version "$OCAML_MIN_VERSION";
+
+let
+ srcs = {
+EOF
+
+my %urls = ();
+my %md5s = ();
+
+open(SOURCES, "-|", "curl", "-L", "--url", "$OPAM_BASE_URL/src_ext/Makefile.sources");
+while () {
+ if (/^URL_(?!PKG_)([-\w]+)\s*=\s*(\S+)$/) {
+ $urls{$1} = $2;
+ } elsif (/^MD5_(?!PKG_)([-\w]+)\s*=\s*(\S+)$/) {
+ $md5s{$1} = $2;
+ }
+}
+for my $src (sort keys %urls) {
+ my ($sha256,$store_path) = split /\n/, `nix-prefetch-url --print-path \Q$urls{$src}\E`;
+ system "echo \Q$md5s{$src}\E' *'\Q$store_path\E | md5sum -c 1>&2";
+ die "md5 check failed for $urls{$src}\n" if $?;
+ print <<"EOF";
+ $src = fetchurl {
+ url = "$urls{$src}";
+ sha256 = "$sha256";
+ };
+EOF
+}
+
+print <<"EOF";
+ opam = fetchurl {
+ url = "$OPAM_RELEASE_URL";
+ sha256 = "$OPAM_RELEASE_SHA256";
+ };
+ };
+in stdenv.mkDerivation rec {
+ name = "opam-\${version}";
+ version = "$OPAM_RELEASE";
+
+ buildInputs = [ unzip curl ncurses ocaml makeWrapper getconf ] ++ lib.optional stdenv.isLinux bubblewrap;
+
+ src = srcs.opam;
+
+ postUnpack = ''
+EOF
+for my $src (sort keys %urls) {
+ my($ext) = $urls{$src} =~ /(\.(?:t(?:ar\.|)|)(?:gz|bz2?))$/
+ or die "could not find extension for $urls{$src}\n";
+ print <<"EOF";
+ ln -sv \${srcs.$src} \$sourceRoot/src_ext/$src$ext
+EOF
+}
+print <<'EOF';
+ '';
+
+EOF
+if (defined $opt_p) {
+ print " patches = [ ";
+ for my $patch (split /[, ]/, $opt_p) {
+ $patch =~ s/^(?=[^\/]*$)/.\//;
+ print "$patch ";
+ }
+ print "];\n\n";
+}
+print <<'EOF';
+ preConfigure = ''
+ substituteInPlace ./src_ext/Makefile --replace "%.stamp: %.download" "%.stamp:"
+ patchShebangs src/state/shellscripts
+ '';
+
+ postConfigure = "make lib-ext";
+
+ # Dirty, but apparently ocp-build requires a TERM
+ makeFlags = ["TERM=screen"];
+
+ outputs = [ "out" "installer" ];
+ setOutputFlags = false;
+
+ # change argv0 to "opam" as a workaround for
+ # https://github.com/ocaml/opam/issues/2142
+ postInstall = ''
+ mv $out/bin/opam $out/bin/.opam-wrapped
+ makeWrapper $out/bin/.opam-wrapped $out/bin/opam \
+ --argv0 "opam" \
+ --suffix PATH : ${aspcud}/bin:${unzip}/bin:${curl}/bin:${lib.optionalString stdenv.isLinux "${bubblewrap}/bin:"}${getconf}/bin
+ $out/bin/opam-installer --prefix=$installer opam-installer.install
+ '';
+
+ doCheck = false;
+
+ meta = with stdenv.lib; {
+ description = "A package manager for OCaml";
+ homepage = http://opam.ocamlpro.com/;
+ maintainers = [ maintainers.henrytill ];
+ platforms = platforms.all;
+ };
+}
+EOF
+print $gencmd;
diff --git a/pkgs/development/tools/solarus-quest-editor/default.nix b/pkgs/development/tools/solarus-quest-editor/default.nix
index 3df6d3de3e1..5a340d30949 100644
--- a/pkgs/development/tools/solarus-quest-editor/default.nix
+++ b/pkgs/development/tools/solarus-quest-editor/default.nix
@@ -1,17 +1,17 @@
-{ stdenv, fetchFromGitHub, cmake, luajit,
+{ stdenv, fetchFromGitLab, cmake, luajit,
SDL2, SDL2_image, SDL2_ttf, physfs,
openal, libmodplug, libvorbis, solarus,
- qtbase, qttools }:
+ qtbase, qttools, fetchpatch }:
stdenv.mkDerivation rec {
name = "solarus-quest-editor-${version}";
- version = "1.4.5";
+ version = "1.5.3";
- src = fetchFromGitHub {
- owner = "christopho";
+ src = fetchFromGitLab {
+ owner = "solarus-games";
repo = "solarus-quest-editor";
- rev = "61f0fa7a5048994fcd9c9f3a3d1255d0be2967df";
- sha256 = "1fpq55nvs5k2rxgzgf39c069rmm73vmv4gr5lvmqzgsz07rkh07f";
+ rev = "v1.5.3";
+ sha256 = "1b9mg04yy4pnrl745hbc82rz79k0f8ci3wv7gvsm3a998q8m98si";
};
buildInputs = [ cmake luajit SDL2
@@ -19,7 +19,18 @@ stdenv.mkDerivation rec {
openal libmodplug libvorbis
solarus qtbase qttools ];
- patches = [ ./patches/fix-install.patch ];
+ patches = [
+ ./patches/fix-install.patch
+
+ # Next two patches should be fine to remove for next release.
+ # This commit fixes issues AND adds features *sighs*
+ ./patches/partial-f285beab62594f73e57190c49848c848487214cf.patch
+
+ (fetchpatch {
+ url = https://gitlab.com/solarus-games/solarus-quest-editor/commit/8f308463030c18cd4f7c8a6052028fff3b7ca35a.patch;
+ sha256 = "1jq48ghhznrp47q9lq2rhh48a1z4aylyy4qaniaqyfyq3vihrchr";
+ })
+ ];
meta = with stdenv.lib; {
description = "The editor for the Zelda-like ARPG game engine, Solarus";
diff --git a/pkgs/development/tools/solarus-quest-editor/patches/partial-f285beab62594f73e57190c49848c848487214cf.patch b/pkgs/development/tools/solarus-quest-editor/patches/partial-f285beab62594f73e57190c49848c848487214cf.patch
new file mode 100644
index 00000000000..73e817fcfbe
--- /dev/null
+++ b/pkgs/development/tools/solarus-quest-editor/patches/partial-f285beab62594f73e57190c49848c848487214cf.patch
@@ -0,0 +1,33 @@
+From f285beab62594f73e57190c49848c848487214cf Mon Sep 17 00:00:00 2001
+From: stdgregwar
+Date: Sun, 1 Jul 2018 00:00:41 +0200
+Subject: [PATCH] Shader previewer base
+
+
+diff --git a/include/widgets/tileset_view.h b/include/widgets/tileset_view.h
+index 615f432..799a4c6 100644
+--- a/include/widgets/tileset_view.h
++++ b/include/widgets/tileset_view.h
+@@ -23,6 +23,7 @@
+ #include "pattern_separation.h"
+ #include
+ #include
++#include
+
+ class QAction;
+
+diff --git a/src/widgets/text_editor.cpp b/src/widgets/text_editor.cpp
+index 4f2ff68..90080a9 100644
+--- a/src/widgets/text_editor.cpp
++++ b/src/widgets/text_editor.cpp
+@@ -26,6 +26,7 @@
+ #include
+ #include
+ #include
++#include
+ #include
+ #include
+
+--
+2.18.0
+
diff --git a/pkgs/development/tools/wp-cli/default.nix b/pkgs/development/tools/wp-cli/default.nix
index 2f555294571..e2250297c8e 100644
--- a/pkgs/development/tools/wp-cli/default.nix
+++ b/pkgs/development/tools/wp-cli/default.nix
@@ -1,42 +1,46 @@
{ stdenv, lib, fetchurl, writeScript, writeText, php }:
let
- name = "wp-cli-${version}";
- version = "2.0.0";
-
- src = fetchurl {
- url = "https://github.com/wp-cli/wp-cli/releases/download/v${version}/${name}.phar";
- sha256 = "1s8pv8vdjwiwknpwsxc59l1zxc2np7nrp6bjd0s8jwsrv5fgjzsp";
- };
+ version = "2.0.1";
completion = fetchurl {
url = "https://raw.githubusercontent.com/wp-cli/wp-cli/v${version}/utils/wp-completion.bash";
sha256 = "15d330x6d3fizrm6ckzmdknqg6wjlx5fr87bmkbd5s6a1ihs0g24";
};
- bin = writeScript "wp" ''
- #! ${stdenv.shell}
-
- set -euo pipefail
-
- exec ${lib.getBin php}/bin/php \
- -c ${ini} \
- -f ${src} -- "$@"
- '';
-
- ini = writeText "wp-cli.ini" ''
- [PHP]
- memory_limit = -1 ; no limit as composer uses a lot of memory
-
- [Phar]
- phar.readonly = Off
- '';
-
in stdenv.mkDerivation rec {
- inherit name version;
+ name = "wp-cli-${version}";
+ inherit version;
+
+ src = fetchurl {
+ url = "https://github.com/wp-cli/wp-cli/releases/download/v${version}/${name}.phar";
+ sha256 = "05lbay4c0477465vv4h8d2j94pk3haz1a7f0ncb127fvxz3a2pcg";
+ };
buildCommand = ''
- install -Dm755 ${bin} $out/bin/wp
+ dir=$out/share/wp-cli
+ mkdir -p $out/bin $dir
+
+ cat <<_EOF > $out/bin/wp
+#!${stdenv.shell}
+
+set -euo pipefail
+
+exec ${lib.getBin php}/bin/php \\
+ -c $dir/php.ini \\
+ -f $dir/wp-cli -- "\$@"
+_EOF
+ chmod 0755 $out/bin/wp
+
+ cat <<_EOF > $dir/php.ini
+[PHP]
+memory_limit = -1 ; no limit as composer uses a lot of memory
+
+[Phar]
+phar.readonly = Off
+_EOF
+
+ install -Dm644 ${src} $dir/wp-cli
install -Dm644 ${completion} $out/share/bash-completion/completions/wp
# this is a very basic run test
diff --git a/pkgs/games/chessx/default.nix b/pkgs/games/chessx/default.nix
index c8d23fcc9de..e4ec4dffa1d 100644
--- a/pkgs/games/chessx/default.nix
+++ b/pkgs/games/chessx/default.nix
@@ -1,30 +1,41 @@
-{ stdenv, pkgconfig, zlib, qtbase, qtsvg, qttools, qtmultimedia, qmake, fetchurl }:
+{ stdenv, pkgconfig, zlib, qtbase, qtsvg, qttools, qtmultimedia, qmake, fetchurl, makeWrapper
+, lib
+}:
+
stdenv.mkDerivation rec {
name = "chessx-${version}";
version = "1.4.6";
+
src = fetchurl {
url = "mirror://sourceforge/chessx/chessx-${version}.tgz";
sha256 = "1vb838byzmnyglm9mq3khh3kddb9g4g111cybxjzalxxlc81k5dd";
};
+
buildInputs = [
- qtbase
- qtsvg
- qttools
- qtmultimedia
- zlib
+ qtbase
+ qtsvg
+ qttools
+ qtmultimedia
+ zlib
];
- nativeBuildInputs = [ pkgconfig qmake ];
+
+ nativeBuildInputs = [ pkgconfig qmake makeWrapper ];
# RCC: Error in 'resources.qrc': Cannot find file 'i18n/chessx_da.qm'
enableParallelBuilding = false;
installPhase = ''
- runHook preInstall
- mkdir -p "$out/bin"
- mkdir -p "$out/share/applications"
- cp -pr release/chessx "$out/bin"
- cp -pr unix/chessx.desktop "$out/share/applications"
- runHook postInstall
+ runHook preInstall
+
+ mkdir -p "$out/bin"
+ mkdir -p "$out/share/applications"
+ cp -pr release/chessx "$out/bin"
+ cp -pr unix/chessx.desktop "$out/share/applications"
+
+ wrapProgram $out/bin/chessx \
+ --prefix QT_PLUGIN_PATH : ${qtbase}/lib/qt-5.${lib.versions.minor qtbase.version}/plugins
+
+ runHook postInstall
'';
meta = with stdenv.lib; {
@@ -32,5 +43,6 @@ stdenv.mkDerivation rec {
description = "ChessX allows you to browse and analyse chess games";
license = licenses.gpl2;
maintainers = [maintainers.luispedro];
+ platforms = platforms.linux;
};
}
diff --git a/pkgs/games/openrct2/default.nix b/pkgs/games/openrct2/default.nix
index e5783ec5396..e41caa3db97 100644
--- a/pkgs/games/openrct2/default.nix
+++ b/pkgs/games/openrct2/default.nix
@@ -5,20 +5,20 @@
let
name = "openrct2-${version}";
- version = "0.2.0";
+ version = "0.2.1";
openrct2-src = fetchFromGitHub {
owner = "OpenRCT2";
repo = "OpenRCT2";
rev = "v${version}";
- sha256 = "1nmz8war8b49iicpc70gk7zlqizrvvwpidqm70lfpa0p68m7m3px";
+ sha256 = "0dl1f0gvq0ifaii66c7bwp8k822krcdn9l44prnyds6smrdmd3dq";
};
objects-src = fetchFromGitHub {
owner = "OpenRCT2";
repo = "objects";
- rev = "v1.0.2";
- sha256 = "1gl37fmhhrfgd6gilw0n7hfdq80a9b31bi5r0xhxg7d579jccb04";
+ rev = "v1.0.6";
+ sha256 = "1yhyafsk2lyasgj1r7h2n4k7vp5q792aj86ggpbmd6bcp4kk6hbm";
};
title-sequences-src = fetchFromGitHub {
diff --git a/pkgs/games/solarus/default.nix b/pkgs/games/solarus/default.nix
index 6f7876e4872..23abadf66ae 100644
--- a/pkgs/games/solarus/default.nix
+++ b/pkgs/games/solarus/default.nix
@@ -1,21 +1,23 @@
-{ stdenv, fetchFromGitHub, cmake, luajit,
+{ stdenv, fetchFromGitLab, cmake, luajit,
SDL2, SDL2_image, SDL2_ttf, physfs,
- openal, libmodplug, libvorbis}:
+ openal, libmodplug, libvorbis,
+ qtbase, qttools }:
stdenv.mkDerivation rec {
name = "solarus-${version}";
- version = "1.4.5";
+ version = "1.5.3";
- src = fetchFromGitHub {
- owner = "christopho";
+ src = fetchFromGitLab {
+ owner = "solarus-games";
repo = "solarus";
- rev = "d9fdb9fdb4e1b9fc384730a9279d134ae9f2c70e";
- sha256 = "0xjx789d6crm322wmkqyq9r288vddsha59yavhy78c4r01gs1p5v";
+ rev = "v1.5.3";
+ sha256 = "035hkdw3a1ryasj5wfa1xla1xmpnc3hjp4s20sl9ywip41675vaz";
};
buildInputs = [ cmake luajit SDL2
SDL2_image SDL2_ttf physfs
- openal libmodplug libvorbis ];
+ openal libmodplug libvorbis
+ qtbase qttools ];
enableParallelBuilding = true;
diff --git a/pkgs/misc/emulators/yabause/0001-Fixes-for-Qt-5.11-upgrade.patch b/pkgs/misc/emulators/yabause/0001-Fixes-for-Qt-5.11-upgrade.patch
new file mode 100644
index 00000000000..43539ef4ca5
--- /dev/null
+++ b/pkgs/misc/emulators/yabause/0001-Fixes-for-Qt-5.11-upgrade.patch
@@ -0,0 +1,67 @@
+From 3140afd6fb7dad7a25296526a71b005fb9eae048 Mon Sep 17 00:00:00 2001
+From: Samuel Dionne-Riel
+Date: Sat, 8 Sep 2018 00:44:08 -0400
+Subject: [PATCH] Fixes for Qt 5.11 upgrade
+
+---
+ src/qt/ui/UICheatRaw.cpp | 2 --
+ src/qt/ui/UICheatRaw.h | 2 +-
+ src/qt/ui/UICheats.cpp | 2 ++
+ src/qt/ui/UIHexInput.h | 2 ++
+ 4 files changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/src/qt/ui/UICheatRaw.cpp b/src/qt/ui/UICheatRaw.cpp
+index 4ad82d77..3f78486b 100755
+--- a/src/qt/ui/UICheatRaw.cpp
++++ b/src/qt/ui/UICheatRaw.cpp
+@@ -20,8 +20,6 @@
+ #include "UIHexInput.h"
+ #include "../QtYabause.h"
+
+-#include
+-
+ UICheatRaw::UICheatRaw( QWidget* p )
+ : QDialog( p )
+ {
+diff --git a/src/qt/ui/UICheatRaw.h b/src/qt/ui/UICheatRaw.h
+index d97b429d..20318c67 100755
+--- a/src/qt/ui/UICheatRaw.h
++++ b/src/qt/ui/UICheatRaw.h
+@@ -21,7 +21,7 @@
+
+ #include "ui_UICheatRaw.h"
+
+-class QButtonGroup;
++#include
+
+ class UICheatRaw : public QDialog, public Ui::UICheatRaw
+ {
+diff --git a/src/qt/ui/UICheats.cpp b/src/qt/ui/UICheats.cpp
+index c6027972..44d341c3 100755
+--- a/src/qt/ui/UICheats.cpp
++++ b/src/qt/ui/UICheats.cpp
+@@ -21,6 +21,8 @@
+ #include "UICheatRaw.h"
+ #include "../CommonDialogs.h"
+
++#include
++
+ UICheats::UICheats( QWidget* p )
+ : QDialog( p )
+ {
+diff --git a/src/qt/ui/UIHexInput.h b/src/qt/ui/UIHexInput.h
+index f333b016..4bd8aed4 100644
+--- a/src/qt/ui/UIHexInput.h
++++ b/src/qt/ui/UIHexInput.h
+@@ -22,6 +22,8 @@
+ #include "ui_UIHexInput.h"
+ #include "../QtYabause.h"
+
++#include
++
+ class HexValidator : public QValidator
+ {
+ Q_OBJECT
+--
+2.16.4
+
diff --git a/pkgs/misc/emulators/yabause/default.nix b/pkgs/misc/emulators/yabause/default.nix
index e7237fd4454..a2d462fd990 100644
--- a/pkgs/misc/emulators/yabause/default.nix
+++ b/pkgs/misc/emulators/yabause/default.nix
@@ -1,21 +1,24 @@
-{ stdenv, fetchurl, cmake, pkgconfig, qtbase, libGLU_combined
+{ stdenv, fetchurl, cmake, pkgconfig, qtbase, qt5, libGLU_combined
, freeglut ? null, openal ? null, SDL2 ? null }:
stdenv.mkDerivation rec {
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";
+ version = "0.9.15";
src = fetchurl {
url = "https://download.tuxfamily.org/yabause/releases/${version}/${name}.tar.gz";
- sha256 = "0nkpvnr599g0i2mf19sjvw5m0rrvixdgz2snav4qwvzgfc435rkm";
+ sha256 = "1cn2rjjb7d9pkr4g5bqz55vd4pzyb7hg94cfmixjkzzkw0zw8d23";
};
nativeBuildInputs = [ cmake pkgconfig ];
- buildInputs = [ qtbase libGLU_combined freeglut openal SDL2 ];
+ buildInputs = [ qtbase qt5.qtmultimedia libGLU_combined freeglut openal SDL2 ];
- patches = [ ./emu-compatibility.com.patch ./linkage-rwx-linux-elf.patch ];
+ patches = [
+ ./linkage-rwx-linux-elf.patch
+ # Fixes derived from
+ # https://github.com/Yabause/yabause/commit/06a816c032c6f7fd79ced6e594dd4b33571a0e73
+ ./0001-Fixes-for-Qt-5.11-upgrade.patch
+ ];
cmakeFlags = [
"-DYAB_NETWORK=ON"
diff --git a/pkgs/misc/emulators/yabause/emu-compatibility.com.patch b/pkgs/misc/emulators/yabause/emu-compatibility.com.patch
deleted file mode 100644
index 5f13d2ee183..00000000000
--- a/pkgs/misc/emulators/yabause/emu-compatibility.com.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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 @@
-
- &Help
-
--
-
-
-