diff options
562 files changed, 7050 insertions, 4202 deletions
diff --git a/doc/languages-frameworks/python.section.md b/doc/languages-frameworks/python.section.md index c4a5bb0612c9..298920ce166b 100644 --- a/doc/languages-frameworks/python.section.md +++ b/doc/languages-frameworks/python.section.md @@ -436,7 +436,7 @@ Let's split the package definition from the environment definition. We first create a function that builds `toolz` in `~/path/to/toolz/release.nix` ```nix -{ pkgs, buildPythonPackage }: +{ lib, pkgs, buildPythonPackage }: buildPythonPackage rec { pname = "toolz"; @@ -447,7 +447,7 @@ buildPythonPackage rec { sha256 = "43c2c9e5e7a16b6c88ba3088a9bfc82f7db8e13378be7c78d6c14a5f8ed05afd"; }; - meta = { + meta = with lib; { homepage = "http://github.com/pytoolz/toolz/"; description = "List processing tools and functional utilities"; license = licenses.bsd3; @@ -1029,7 +1029,7 @@ To alter a python package using overlays, you would use the following approach: ```nix self: super: -rec { +{ python = super.python.override { packageOverrides = python-self: python-super: { bepasty-server = python-super.bepasty-server.overrideAttrs ( oldAttrs: { @@ -1041,7 +1041,7 @@ rec { }); }; }; - pythonPackages = python.pkgs; + pythonPackages = self.python.pkgs; } ``` diff --git a/lib/attrsets.nix b/lib/attrsets.nix index 19218cfe8ecb..dca39cf79ffa 100644 --- a/lib/attrsets.nix +++ b/lib/attrsets.nix @@ -195,8 +195,9 @@ rec { { x = "foo"; y = "bar"; } => { x = "x-foo"; y = "y-bar"; } */ - mapAttrs = f: set: - listToAttrs (map (attr: { name = attr; value = f attr set.${attr}; }) (attrNames set)); + mapAttrs = builtins.mapAttrs or + (f: set: + listToAttrs (map (attr: { name = attr; value = f attr set.${attr}; }) (attrNames set))); /* Like `mapAttrs', but allows the name of each attribute to be diff --git a/lib/generators.nix b/lib/generators.nix index 073bb6982e14..aa6759087031 100644 --- a/lib/generators.nix +++ b/lib/generators.nix @@ -177,13 +177,15 @@ rec { # PLIST handling toPlist = {}: v: let - expr = ind: x: with builtins; - if isNull x then "" else - if isBool x then bool ind x else - if isInt x then int ind x else + isFloat = builtins.isFloat or (x: false); + expr = ind: x: with builtins; + if isNull x then "" else + if isBool x then bool ind x else + if isInt x then int ind x else if isString x then str ind x else - if isList x then list ind x else - if isAttrs x then attrs ind x else + if isList x then list ind x else + if isAttrs x then attrs ind x else + if isFloat x then float ind x else abort "generators.toPlist: should never happen (v = ${v})"; literal = ind: x: ind + x; @@ -192,6 +194,7 @@ rec { int = ind: x: literal ind "<integer>${toString x}</integer>"; str = ind: x: literal ind "<string>${x}</string>"; key = ind: x: literal ind "<key>${x}</key>"; + float = ind: x: literal ind "<real>${toString x}</real>"; indent = ind: expr "\t${ind}"; diff --git a/lib/lists.nix b/lib/lists.nix index 194e1c200ec9..231c2317c0c4 100644 --- a/lib/lists.nix +++ b/lib/lists.nix @@ -101,7 +101,7 @@ rec { concatMap (x: [x] ++ ["z"]) ["a" "b"] => [ "a" "z" "b" "z" ] */ - concatMap = f: list: concatLists (map f list); + concatMap = builtins.concatMap or (f: list: concatLists (map f list)); /* Flatten the argument into a single list; that is, nested lists are spliced into the top-level lists. diff --git a/lib/trivial.nix b/lib/trivial.nix index 0bcefcbc28de..fac0718a9e73 100644 --- a/lib/trivial.nix +++ b/lib/trivial.nix @@ -102,7 +102,7 @@ rec { # Pull in some builtins not included elsewhere. inherit (builtins) pathExists readFile isBool - isInt add sub lessThan + isInt isFloat add sub lessThan seq deepSeq genericClosure; inherit (lib.strings) fileContents; diff --git a/lib/types.nix b/lib/types.nix index 5aa09d33e9b3..cf6f2aa46e40 100644 --- a/lib/types.nix +++ b/lib/types.nix @@ -167,6 +167,13 @@ rec { # s32 = sign 32 4294967296; }; + float = mkOptionType rec { + name = "float"; + description = "floating point number"; + check = isFloat; + merge = mergeOneOption; + }; + str = mkOptionType { name = "str"; description = "string"; diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 16bd5795b245..c66fbadb6dd7 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2854,6 +2854,11 @@ github = "nthorne"; name = "Niklas Thörne"; }; + numinit = { + email = "me@numin.it"; + github = "numinit"; + name = "Morgan Jones"; + }; nyanloutre = { email = "paul@nyanlout.re"; github = "nyanloutre"; @@ -2938,6 +2943,11 @@ github = "oxij"; name = "Jan Malakhovski"; }; + oyren = { + email = "m.scheuren@oyra.eu"; + github = "oyren"; + name = "Moritz Scheuren"; + }; pSub = { email = "mail@pascal-wittmann.de"; github = "pSub"; diff --git a/maintainers/scripts/all-tarballs.nix b/maintainers/scripts/all-tarballs.nix index d981a1fa7dbc..6a4de8a4b951 100644 --- a/maintainers/scripts/all-tarballs.nix +++ b/maintainers/scripts/all-tarballs.nix @@ -6,13 +6,11 @@ $ copy-tarballs.pl --expr 'import <nixpkgs/maintainers/scripts/all-tarballs.nix>' */ -removeAttrs (import ../../pkgs/top-level/release.nix +import ../../pkgs/top-level/release.nix { # Don't apply ‘hydraJob’ to jobs, because then we can't get to the # dependency graph. scrubJobs = false; # No need to evaluate on i686. supportedSystems = [ "x86_64-linux" ]; - }) - [ # Remove jobs whose evaluation depends on a writable Nix store. - "tarball" "unstable" "darwin-tested" - ] + limitedSupportedSystems = []; + } diff --git a/nixos/modules/config/ldap.nix b/nixos/modules/config/ldap.nix index 710dfdd01af5..0693e896f715 100644 --- a/nixos/modules/config/ldap.nix +++ b/nixos/modules/config/ldap.nix @@ -215,11 +215,11 @@ in ); users = mkIf cfg.daemon.enable { - extraGroups.nslcd = { + groups.nslcd = { gid = config.ids.gids.nslcd; }; - extraUsers.nslcd = { + users.nslcd = { uid = config.ids.uids.nslcd; description = "nslcd user."; group = "nslcd"; diff --git a/nixos/modules/config/pulseaudio.nix b/nixos/modules/config/pulseaudio.nix index 90cea47b70ae..3fd882789af2 100644 --- a/nixos/modules/config/pulseaudio.nix +++ b/nixos/modules/config/pulseaudio.nix @@ -264,7 +264,7 @@ in { }) (mkIf systemWide { - users.extraUsers.pulse = { + users.users.pulse = { # For some reason, PulseAudio wants UID == GID. uid = assert uid == gid; uid; group = "pulse"; @@ -274,7 +274,7 @@ in { createHome = true; }; - users.extraGroups.pulse.gid = gid; + users.groups.pulse.gid = gid; systemd.services.pulseaudio = { description = "PulseAudio System-Wide Server"; diff --git a/nixos/modules/hardware/nitrokey.nix b/nixos/modules/hardware/nitrokey.nix index bd440de69722..60fc95a75828 100644 --- a/nixos/modules/hardware/nitrokey.nix +++ b/nixos/modules/hardware/nitrokey.nix @@ -36,6 +36,6 @@ in { inherit (cfg) group; } )) ]; - users.extraGroups."${cfg.group}" = {}; + users.groups."${cfg.group}" = {}; }; } diff --git a/nixos/modules/installer/cd-dvd/installation-cd-base.nix b/nixos/modules/installer/cd-dvd/installation-cd-base.nix index 1ed56386e6e7..298b8d88bb59 100644 --- a/nixos/modules/installer/cd-dvd/installation-cd-base.nix +++ b/nixos/modules/installer/cd-dvd/installation-cd-base.nix @@ -30,7 +30,7 @@ with lib; boot.loader.grub.memtest86.enable = true; # Allow the user to log in as root without a password. - users.extraUsers.root.initialHashedPassword = ""; + users.users.root.initialHashedPassword = ""; system.nixos.stateVersion = mkDefault "18.03"; } diff --git a/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix b/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix index ddf91a5656c7..4eb28434e192 100644 --- a/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix +++ b/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix @@ -34,7 +34,7 @@ in boot.kernelParams = ["cma=32M" "console=ttyS0,115200n8" "console=ttyAMA0,115200n8" "console=tty0"]; # FIXME: this probably should be in installation-device.nix - users.extraUsers.root.initialHashedPassword = ""; + users.users.root.initialHashedPassword = ""; sdImage = { populateBootCommands = let diff --git a/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix b/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix index 891923234dda..0d595503f193 100644 --- a/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix +++ b/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix @@ -35,7 +35,7 @@ in boot.kernelParams = ["console=ttyS0,115200n8" "console=ttymxc0,115200n8" "console=ttyAMA0,115200n8" "console=ttyO0,115200n8" "console=ttySAC2,115200n8" "console=tty0"]; # FIXME: this probably should be in installation-device.nix - users.extraUsers.root.initialHashedPassword = ""; + users.users.root.initialHashedPassword = ""; sdImage = { populateBootCommands = let diff --git a/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix b/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix index fe6cc4161630..aa52844288ca 100644 --- a/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix +++ b/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix @@ -28,7 +28,7 @@ in boot.kernelPackages = pkgs.linuxPackages_rpi; # FIXME: this probably should be in installation-device.nix - users.extraUsers.root.initialHashedPassword = ""; + users.users.root.initialHashedPassword = ""; sdImage = { populateBootCommands = let diff --git a/nixos/modules/installer/netboot/netboot-base.nix b/nixos/modules/installer/netboot/netboot-base.nix index b12eaccf8707..5e8f7f93d92a 100644 --- a/nixos/modules/installer/netboot/netboot-base.nix +++ b/nixos/modules/installer/netboot/netboot-base.nix @@ -16,5 +16,5 @@ with lib; ]; # Allow the user to log in as root without a password. - users.extraUsers.root.initialHashedPassword = ""; + users.users.root.initialHashedPassword = ""; } diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/nixos/modules/installer/tools/nixos-generate-config.pl index a198c2d49b53..165566912401 100644 --- a/nixos/modules/installer/tools/nixos-generate-config.pl +++ b/nixos/modules/installer/tools/nixos-generate-config.pl @@ -619,7 +619,7 @@ $bootLoaderConfig # services.xserver.desktopManager.plasma5.enable = true; # Define a user account. Don't forget to set a password with ‘passwd’. - # users.extraUsers.guest = { + # users.users.guest = { # isNormalUser = true; # uid = 1000; # }; diff --git a/nixos/modules/installer/virtualbox-demo.nix b/nixos/modules/installer/virtualbox-demo.nix index c40e30354206..f58c36587801 100644 --- a/nixos/modules/installer/virtualbox-demo.nix +++ b/nixos/modules/installer/virtualbox-demo.nix @@ -14,7 +14,7 @@ with lib; boot.loader.grub.fsIdentifier = "provided"; # Allow mounting of shared folders. - users.extraUsers.demo.extraGroups = [ "vboxsf" ]; + users.users.demo.extraGroups = [ "vboxsf" ]; # Add some more video drivers to give X11 a shot at working in # VMware and QEMU. diff --git a/nixos/modules/misc/locate.nix b/nixos/modules/misc/locate.nix index ce5765cf1978..dd6a2f67b30d 100644 --- a/nixos/modules/misc/locate.nix +++ b/nixos/modules/misc/locate.nix @@ -101,7 +101,7 @@ in { }; config = mkIf cfg.enable { - users.extraGroups = mkIf isMLocate { mlocate = {}; }; + users.groups = mkIf isMLocate { mlocate = {}; }; security.wrappers = mkIf isMLocate { locate = { diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index c70d52c94cdb..f6628b8e9c51 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -627,6 +627,7 @@ ./services/security/hologram-agent.nix ./services/security/munge.nix ./services/security/oauth2_proxy.nix + ./services/security/oauth2_proxy_nginx.nix ./services/security/physlock.nix ./services/security/shibboleth-sp.nix ./services/security/sks.nix diff --git a/nixos/modules/profiles/demo.nix b/nixos/modules/profiles/demo.nix index c3ee6e98371e..7477795a94e9 100644 --- a/nixos/modules/profiles/demo.nix +++ b/nixos/modules/profiles/demo.nix @@ -3,7 +3,7 @@ { imports = [ ./graphical.nix ]; - users.extraUsers.demo = + users.users.demo = { isNormalUser = true; description = "Demo user account"; extraGroups = [ "wheel" ]; diff --git a/nixos/modules/programs/adb.nix b/nixos/modules/programs/adb.nix index f648d70bd9fa..942572cef9d5 100644 --- a/nixos/modules/programs/adb.nix +++ b/nixos/modules/programs/adb.nix @@ -14,7 +14,7 @@ with lib; description = '' Whether to configure system to use Android Debug Bridge (adb). To grant access to a user, it must be part of adbusers group: - <code>users.extraUsers.alice.extraGroups = ["adbusers"];</code> + <code>users.users.alice.extraGroups = ["adbusers"];</code> ''; relatedPackages = [ ["androidenv" "platformTools"] ]; }; @@ -25,6 +25,6 @@ with lib; config = mkIf config.programs.adb.enable { services.udev.packages = [ pkgs.android-udev-rules ]; environment.systemPackages = [ pkgs.androidenv.platformTools ]; - users.extraGroups.adbusers = {}; + users.groups.adbusers = {}; }; } diff --git a/nixos/modules/programs/gphoto2.nix b/nixos/modules/programs/gphoto2.nix index ca7c6fb28f52..93923ff3133c 100644 --- a/nixos/modules/programs/gphoto2.nix +++ b/nixos/modules/programs/gphoto2.nix @@ -15,7 +15,7 @@ with lib; Whether to configure system to use gphoto2. To grant digital camera access to a user, the user must be part of the camera group: - <code>users.extraUsers.alice.extraGroups = ["camera"];</code> + <code>users.users.alice.extraGroups = ["camera"];</code> ''; }; }; @@ -25,6 +25,6 @@ with lib; config = mkIf config.programs.gphoto2.enable { services.udev.packages = [ pkgs.libgphoto2 ]; environment.systemPackages = [ pkgs.gphoto2 ]; - users.extraGroups.camera = {}; + users.groups.camera = {}; }; } diff --git a/nixos/modules/programs/sway.nix b/nixos/modules/programs/sway.nix index d9503d6004ff..0eaaf6b85b99 100644 --- a/nixos/modules/programs/sway.nix +++ b/nixos/modules/programs/sway.nix @@ -73,7 +73,7 @@ in { permissions = "u+rx,g+rx"; }; - users.extraGroups.sway = {}; + users.groups.sway = {}; security.pam.services.swaylock = {}; hardware.opengl.enable = mkDefault true; diff --git a/nixos/modules/programs/wireshark.nix b/nixos/modules/programs/wireshark.nix index 710d223b6f59..819f15b98a05 100644 --- a/nixos/modules/programs/wireshark.nix +++ b/nixos/modules/programs/wireshark.nix @@ -29,7 +29,7 @@ in { config = mkIf cfg.enable { environment.systemPackages = [ wireshark ]; - users.extraGroups.wireshark = {}; + users.groups.wireshark = {}; security.wrappers.dumpcap = { source = "${wireshark}/bin/dumpcap"; diff --git a/nixos/modules/security/pam_mount.nix b/nixos/modules/security/pam_mount.nix index a5299728348d..8b131c54a2a5 100644 --- a/nixos/modules/security/pam_mount.nix +++ b/nixos/modules/security/pam_mount.nix @@ -40,7 +40,7 @@ in target = "security/pam_mount.conf.xml"; source = let - extraUserVolumes = filterAttrs (n: u: u.cryptHomeLuks != null) config.users.extraUsers; + extraUserVolumes = filterAttrs (n: u: u.cryptHomeLuks != null) config.users.users; userVolumeEntry = user: "<volume user=\"${user.name}\" path=\"${user.cryptHomeLuks}\" mountpoint=\"${user.home}\" />\n"; in pkgs.writeText "pam_mount.conf.xml" '' diff --git a/nixos/modules/security/polkit.nix b/nixos/modules/security/polkit.nix index 7e59408a5b0b..04685f2c9ea1 100644 --- a/nixos/modules/security/polkit.nix +++ b/nixos/modules/security/polkit.nix @@ -94,7 +94,7 @@ in rm -rf /var/lib/{polkit-1,PolicyKit} ''; - users.extraUsers.polkituser = { + users.users.polkituser = { description = "PolKit daemon"; uid = config.ids.uids.polkituser; }; diff --git a/nixos/modules/security/rtkit.nix b/nixos/modules/security/rtkit.nix index afe93f24273d..f6dda21c6006 100644 --- a/nixos/modules/security/rtkit.nix +++ b/nixos/modules/security/rtkit.nix @@ -34,7 +34,7 @@ with lib; services.dbus.packages = [ pkgs.rtkit ]; - users.extraUsers = singleton + users.users = singleton { name = "rtkit"; uid = config.ids.uids.rtkit; description = "RealtimeKit daemon"; diff --git a/nixos/modules/security/sudo.nix b/nixos/modules/security/sudo.nix index 24283e1d6165..361a7e869602 100644 --- a/nixos/modules/security/sudo.nix +++ b/nixos/modules/security/sudo.nix @@ -66,6 +66,9 @@ in security.sudo.extraRules = mkOption { description = '' Define specific rules to be in the <filename>sudoers</filename> file. + More specific rules should come after more general ones in order to + yield the expected behavior. You can use mkBefore/mkAfter to ensure + this is the case when configuration options are merged. ''; default = []; example = [ diff --git a/nixos/modules/services/admin/oxidized.nix b/nixos/modules/services/admin/oxidized.nix index 891ca6323c3c..70f7dd9e3647 100644 --- a/nixos/modules/services/admin/oxidized.nix +++ b/nixos/modules/services/admin/oxidized.nix @@ -83,8 +83,8 @@ in }; config = mkIf cfg.enable { - users.extraGroups.${cfg.group} = { }; - users.extraUsers.${cfg.user} = { + users.groups.${cfg.group} = { }; + users.users.${cfg.user} = { description = "Oxidized service user"; group = cfg.group; home = cfg.dataDir; diff --git a/nixos/modules/services/amqp/activemq/default.nix b/nixos/modules/services/amqp/activemq/default.nix index 261f97617664..27bfd91cd2d5 100644 --- a/nixos/modules/services/amqp/activemq/default.nix +++ b/nixos/modules/services/amqp/activemq/default.nix @@ -93,13 +93,13 @@ in { }; config = mkIf cfg.enable { - users.extraUsers.activemq = { + users.users.activemq = { description = "ActiveMQ server user"; group = "activemq"; uid = config.ids.uids.activemq; }; - users.extraGroups.activemq.gid = config.ids.gids.activemq; + users.groups.activemq.gid = config.ids.gids.activemq; systemd.services.activemq_init = { wantedBy = [ "activemq.service" ]; diff --git a/nixos/modules/services/amqp/rabbitmq.nix b/nixos/modules/services/amqp/rabbitmq.nix index f536d56d7c63..bb6fc0a104df 100644 --- a/nixos/modules/services/amqp/rabbitmq.nix +++ b/nixos/modules/services/amqp/rabbitmq.nix @@ -83,7 +83,7 @@ in { environment.systemPackages = [ pkgs.rabbitmq_server ]; - users.extraUsers.rabbitmq = { + users.users.rabbitmq = { description = "RabbitMQ server user"; home = "${cfg.dataDir}"; createHome = true; @@ -91,7 +91,7 @@ in { uid = config.ids.uids.rabbitmq; }; - users.extraGroups.rabbitmq.gid = config.ids.gids.rabbitmq; + users.groups.rabbitmq.gid = config.ids.gids.rabbitmq; systemd.services.rabbitmq = { description = "RabbitMQ Server"; diff --git a/nixos/modules/services/audio/liquidsoap.nix b/nixos/modules/services/audio/liquidsoap.nix index 1c19ed36bdc7..66f84ef20762 100644 --- a/nixos/modules/services/audio/liquidsoap.nix +++ b/nixos/modules/services/audio/liquidsoap.nix @@ -57,7 +57,7 @@ in config = mkIf (builtins.length streams != 0) { - users.extraUsers.liquidsoap = { + users.users.liquidsoap = { uid = config.ids.uids.liquidsoap; group = "liquidsoap"; extraGroups = [ "audio" ]; @@ -66,7 +66,7 @@ in createHome = true; }; - users.extraGroups.liquidsoap.gid = config.ids.gids.liquidsoap; + users.groups.liquidsoap.gid = config.ids.gids.liquidsoap; systemd.services = builtins.listToAttrs ( map streamService streams ); }; diff --git a/nixos/modules/services/audio/mopidy.nix b/nixos/modules/services/audio/mopidy.nix index 52613d450b51..e2f4ec39f94c 100644 --- a/nixos/modules/services/audio/mopidy.nix +++ b/nixos/modules/services/audio/mopidy.nix @@ -93,7 +93,7 @@ in { }; }; - users.extraUsers.mopidy = { + users.users.mopidy = { inherit uid; group = "mopidy"; extraGroups = [ "audio" ]; @@ -101,7 +101,7 @@ in { home = "${cfg.dataDir}"; }; - users.extraGroups.mopidy.gid = gid; + users.groups.mopidy.gid = gid; }; diff --git a/nixos/modules/services/audio/mpd.nix b/nixos/modules/services/audio/mpd.nix index 94020ed05d67..3add6556d0df 100644 --- a/nixos/modules/services/audio/mpd.nix +++ b/nixos/modules/services/audio/mpd.nix @@ -184,7 +184,7 @@ in { }; }; - users.extraUsers = optionalAttrs (cfg.user == name) (singleton { + users.users = optionalAttrs (cfg.user == name) (singleton { inherit uid; inherit name; group = cfg.group; @@ -193,7 +193,7 @@ in { home = "${cfg.dataDir}"; }); - users.extraGroups = optionalAttrs (cfg.group == name) (singleton { + users.groups = optionalAttrs (cfg.group == name) (singleton { inherit name; gid = gid; }); diff --git a/nixos/modules/services/audio/squeezelite.nix b/nixos/modules/services/audio/squeezelite.nix index f1a60be992d8..57ae38559939 100644 --- a/nixos/modules/services/audio/squeezelite.nix +++ b/nixos/modules/services/audio/squeezelite.nix @@ -54,7 +54,7 @@ in { }; }; - users.extraUsers.squeezelite= { + users.users.squeezelite= { inherit uid; group = "nogroup"; extraGroups = [ "audio" ]; diff --git a/nixos/modules/services/backup/bacula.nix b/nixos/modules/services/backup/bacula.nix index 340b0cf07234..e2806a695398 100644 --- a/nixos/modules/services/backup/bacula.nix +++ b/nixos/modules/services/backup/bacula.nix @@ -397,7 +397,7 @@ in { environment.systemPackages = [ pkgs.bacula ]; - users.extraUsers.bacula = { + users.users.bacula = { group = "bacula"; uid = config.ids.uids.bacula; home = "${libDir}"; @@ -406,6 +406,6 @@ in { shell = "${pkgs.bash}/bin/bash"; }; - users.extraGroups.bacula.gid = config.ids.gids.bacula; + users.groups.bacula.gid = config.ids.gids.bacula; }; } diff --git a/nixos/modules/services/backup/duplicati.nix b/nixos/modules/services/backup/duplicati.nix index 379fde1fe038..80287f30b813 100644 --- a/nixos/modules/services/backup/duplicati.nix +++ b/nixos/modules/services/backup/duplicati.nix @@ -44,13 +44,13 @@ in }; }; - users.extraUsers.duplicati = { + users.users.duplicati = { uid = config.ids.uids.duplicati; home = "/var/lib/duplicati"; createHome = true; group = "duplicati"; }; - users.extraGroups.duplicati.gid = config.ids.gids.duplicati; + users.groups.duplicati.gid = config.ids.gids.duplicati; }; } diff --git a/nixos/modules/services/backup/mysql-backup.nix b/nixos/modules/services/backup/mysql-backup.nix index 3f533fa457dc..f0c273ffebf1 100644 --- a/nixos/modules/services/backup/mysql-backup.nix +++ b/nixos/modules/services/backup/mysql-backup.nix @@ -84,7 +84,7 @@ in }; config = mkIf cfg.enable { - users.extraUsers = optionalAttrs (cfg.user == defaultUser) (singleton + users.users = optionalAttrs (cfg.user == defaultUser) (singleton { name = defaultUser; isSystemUser = true; createHome = false; diff --git a/nixos/modules/services/backup/restic-rest-server.nix b/nixos/modules/services/backup/restic-rest-server.nix index d4b47a099410..d1b775f150dc 100644 --- a/nixos/modules/services/backup/restic-rest-server.nix +++ b/nixos/modules/services/backup/restic-rest-server.nix @@ -95,13 +95,13 @@ in }; }; - users.extraUsers.restic = { + users.users.restic = { group = "restic"; home = cfg.dataDir; createHome = true; uid = config.ids.uids.restic; }; - users.extraGroups.restic.gid = config.ids.uids.restic; + users.groups.restic.gid = config.ids.uids.restic; }; } diff --git a/nixos/modules/services/cluster/hadoop/default.nix b/nixos/modules/services/cluster/hadoop/default.nix index 53c13fd0603d..240938f0d621 100644 --- a/nixos/modules/services/cluster/hadoop/default.nix +++ b/nixos/modules/services/cluster/hadoop/default.nix @@ -52,9 +52,9 @@ with lib; config = mkMerge [ - (mkIf (builtins.hasAttr "yarn" config.users.extraUsers || - builtins.hasAttr "hdfs" config.users.extraUsers ) { - users.extraGroups.hadoop = { + (mkIf (builtins.hasAttr "yarn" config.users.users || + builtins.hasAttr "hdfs" config.users.users) { + users.groups.hadoop = { gid = config.ids.gids.hadoop; }; }) diff --git a/nixos/modules/services/cluster/hadoop/hdfs.nix b/nixos/modules/services/cluster/hadoop/hdfs.nix index 48020e6139cb..a38b6a78d3a5 100644 --- a/nixos/modules/services/cluster/hadoop/hdfs.nix +++ b/nixos/modules/services/cluster/hadoop/hdfs.nix @@ -62,7 +62,7 @@ with lib; (mkIf ( cfg.hdfs.namenode.enabled || cfg.hdfs.datanode.enabled ) { - users.extraUsers.hdfs = { + users.users.hdfs = { description = "Hadoop HDFS user"; group = "hadoop"; uid = config.ids.uids.hdfs; diff --git a/nixos/modules/services/cluster/hadoop/yarn.nix b/nixos/modules/services/cluster/hadoop/yarn.nix index ce5b04a331c5..5345a2732d7e 100644 --- a/nixos/modules/services/cluster/hadoop/yarn.nix +++ b/nixos/modules/services/cluster/hadoop/yarn.nix @@ -27,7 +27,7 @@ with lib; cfg.yarn.resourcemanager.enabled || cfg.yarn.nodemanager.enabled ) { - users.extraUsers.yarn = { + users.users.yarn = { description = "Hadoop YARN user"; group = "hadoop"; uid = config.ids.uids.yarn; diff --git a/nixos/modules/services/cluster/kubernetes/default.nix b/nixos/modules/services/cluster/kubernetes/default.nix index 5e87ae88f5a8..2707c176efd8 100644 --- a/nixos/modules/services/cluster/kubernetes/default.nix +++ b/nixos/modules/services/cluster/kubernetes/default.nix @@ -1145,7 +1145,7 @@ in { ]; environment.systemPackages = [ cfg.package ]; - users.extraUsers = singleton { + users.users = singleton { name = "kubernetes"; uid = config.ids.uids.kubernetes; description = "Kubernetes user"; @@ -1154,7 +1154,7 @@ in { home = cfg.dataDir; createHome = true; }; - users.extraGroups.kubernetes.gid = config.ids.gids.kubernetes; + users.groups.kubernetes.gid = config.ids.gids.kubernetes; # dns addon is enabled by default services.kubernetes.addons.dns.enable = mkDefault true; diff --git a/nixos/modules/services/continuous-integration/buildbot/master.nix b/nixos/modules/services/continuous-integration/buildbot/master.nix index 846efc8b5b9a..8d767de37f00 100644 --- a/nixos/modules/services/continuous-integration/buildbot/master.nix +++ b/nixos/modules/services/continuous-integration/buildbot/master.nix @@ -191,11 +191,11 @@ in { }; config = mkIf cfg.enable { - users.extraGroups = optional (cfg.group == "buildbot") { + users.groups = optional (cfg.group == "buildbot") { name = "buildbot"; }; - users.extraUsers = optional (cfg.user == "buildbot") { + users.users = optional (cfg.user == "buildbot") { name = "buildbot"; description = "Buildbot User."; isNormalUser = true; diff --git a/nixos/modules/services/continuous-integration/buildbot/worker.nix b/nixos/modules/services/continuous-integration/buildbot/worker.nix index a97f571e89df..67c541570b97 100644 --- a/nixos/modules/services/continuous-integration/buildbot/worker.nix +++ b/nixos/modules/services/continuous-integration/buildbot/worker.nix @@ -84,11 +84,11 @@ in { }; config = mkIf cfg.enable { - users.extraGroups = optional (cfg.group == "bbworker") { + users.groups = optional (cfg.group == "bbworker") { name = "bbworker"; }; - users.extraUsers = optional (cfg.user == "bbworker") { + users.users = optional (cfg.user == "bbworker") { name = "bbworker"; description = "Buildbot Worker User."; isNormalUser = true; diff --git a/nixos/modules/services/continuous-integration/buildkite-agent.nix b/nixos/modules/services/continuous-integration/buildkite-agent.nix index d647b7b9fa49..9daf391c73c4 100644 --- a/nixos/modules/services/continuous-integration/buildkite-agent.nix +++ b/nixos/modules/services/continuous-integration/buildkite-agent.nix @@ -185,7 +185,7 @@ in }; config = mkIf config.services.buildkite-agent.enable { - users.extraUsers.buildkite-agent = + users.users.buildkite-agent = { name = "buildkite-agent"; home = cfg.dataDir; createHome = true; diff --git a/nixos/modules/services/continuous-integration/gitlab-runner.nix b/nixos/modules/services/continuous-integration/gitlab-runner.nix index 6d5cea4f77a5..a0aff1b8b5b9 100644 --- a/nixos/modules/services/continuous-integration/gitlab-runner.nix +++ b/nixos/modules/services/continuous-integration/gitlab-runner.nix @@ -134,7 +134,7 @@ in # Make the gitlab-runner command availabe so users can query the runner environment.systemPackages = [ cfg.package ]; - users.extraUsers.gitlab-runner = { + users.users.gitlab-runner = { group = "gitlab-runner"; extraGroups = optional hasDocker "docker"; uid = config.ids.uids.gitlab-runner; @@ -142,6 +142,6 @@ in createHome = true; }; - users.extraGroups.gitlab-runner.gid = config.ids.gids.gitlab-runner; + users.groups.gitlab-runner.gid = config.ids.gids.gitlab-runner; }; } diff --git a/nixos/modules/services/continuous-integration/gocd-agent/default.nix b/nixos/modules/services/continuous-integration/gocd-agent/default.nix index 05adb18fbe91..8126f27c2b0c 100644 --- a/nixos/modules/services/continuous-integration/gocd-agent/default.nix +++ b/nixos/modules/services/continuous-integration/gocd-agent/default.nix @@ -135,12 +135,12 @@ in { }; config = mkIf cfg.enable { - users.extraGroups = optional (cfg.group == "gocd-agent") { + users.groups = optional (cfg.group == "gocd-agent") { name = "gocd-agent"; gid = config.ids.gids.gocd-agent; }; - users.extraUsers = optional (cfg.user == "gocd-agent") { + users.users = optional (cfg.user == "gocd-agent") { name = "gocd-agent"; description = "gocd-agent user"; createHome = true; diff --git a/nixos/modules/services/continuous-integration/gocd-server/default.nix b/nixos/modules/services/continuous-integration/gocd-server/default.nix index 07e00f17f1e8..8f177da129e5 100644 --- a/nixos/modules/services/continuous-integration/gocd-server/default.nix +++ b/nixos/modules/services/continuous-integration/gocd-server/default.nix @@ -113,8 +113,8 @@ in { extraOptions = mkOption { default = [ ]; - example = [ - "-X debug" + example = [ + "-X debug" "-Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5005" "-verbose:gc" "-Xloggc:go-server-gc.log" @@ -143,12 +143,12 @@ in { }; config = mkIf cfg.enable { - users.extraGroups = optional (cfg.group == "gocd-server") { + users.groups = optional (cfg.group == "gocd-server") { name = "gocd-server"; gid = config.ids.gids.gocd-server; }; - users.extraUsers = optional (cfg.user == "gocd-server") { + users.users = optional (cfg.user == "gocd-server") { name = "gocd-server"; description = "gocd-server user"; createHome = true; diff --git a/nixos/modules/services/continuous-integration/hydra/default.nix b/nixos/modules/services/continuous-integration/hydra/default.nix index 2fa7c59a965d..c7fe4eeeab99 100644 --- a/nixos/modules/services/continuous-integration/hydra/default.nix +++ b/nixos/modules/services/continuous-integration/hydra/default.nix @@ -194,11 +194,11 @@ in config = mkIf cfg.enable { - users.extraGroups.hydra = { + users.groups.hydra = { gid = config.ids.gids.hydra; }; - users.extraUsers.hydra = + users.users.hydra = { description = "Hydra"; group = "hydra"; createHome = true; @@ -207,7 +207,7 @@ in uid = config.ids.uids.hydra; }; - users.extraUsers.hydra-queue-runner = + users.users.hydra-queue-runner = { description = "Hydra queue runner"; group = "hydra"; useDefaultShell = true; @@ -215,7 +215,7 @@ in uid = config.ids.uids.hydra-queue-runner; }; - users.extraUsers.hydra-www = + users.users.hydra-www = { description = "Hydra web server"; group = "hydra"; useDefaultShell = true; diff --git a/nixos/modules/services/continuous-integration/jenkins/default.nix b/nixos/modules/services/continuous-integration/jenkins/default.nix index c2f4e9c0c5a7..1eca45fbd570 100644 --- a/nixos/modules/services/continuous-integration/jenkins/default.nix +++ b/nixos/modules/services/continuous-integration/jenkins/default.nix @@ -150,12 +150,12 @@ in { pkgs.dejavu_fonts ]; - users.extraGroups = optional (cfg.group == "jenkins") { + users.groups = optional (cfg.group == "jenkins") { name = "jenkins"; gid = config.ids.gids.jenkins; }; - users.extraUsers = optional (cfg.user == "jenkins") { + users.users = optional (cfg.user == "jenkins") { name = "jenkins"; description = "jenkins user"; createHome = true; diff --git a/nixos/modules/services/continuous-integration/jenkins/slave.nix b/nixos/modules/services/continuous-integration/jenkins/slave.nix index a0216caf2b5c..d8f55fb826f2 100644 --- a/nixos/modules/services/continuous-integration/jenkins/slave.nix +++ b/nixos/modules/services/continuous-integration/jenkins/slave.nix @@ -50,12 +50,12 @@ in { }; config = mkIf (cfg.enable && !masterCfg.enable) { - users.extraGroups = optional (cfg.group == "jenkins") { + users.groups = optional (cfg.group == "jenkins") { name = "jenkins"; gid = config.ids.gids.jenkins; }; - users.extraUsers = optional (cfg.user == "jenkins") { + users.users = optional (cfg.user == "jenkins") { name = "jenkins"; description = "jenkins user"; createHome = true; diff --git a/nixos/modules/services/databases/4store-endpoint.nix b/nixos/modules/services/databases/4store-endpoint.nix index d528355671f6..59ed0e5f0afd 100644 --- a/nixos/modules/services/databases/4store-endpoint.nix +++ b/nixos/modules/services/databases/4store-endpoint.nix @@ -52,7 +52,7 @@ with lib; message = "Must specify 4Store database name"; }; - users.extraUsers = singleton + users.users = singleton { name = endpointUser; uid = config.ids.uids.fourstorehttp; description = "4Store SPARQL endpoint user"; diff --git a/nixos/modules/services/databases/4store.nix b/nixos/modules/services/databases/4store.nix index abb62e1f2637..be4351c1c38f 100644 --- a/nixos/modules/services/databases/4store.nix +++ b/nixos/modules/services/databases/4store.nix @@ -43,7 +43,7 @@ with lib; message = "Must specify 4Store database name."; }; - users.extraUsers = singleton + users.users = singleton { name = fourStoreUser; uid = config.ids.uids.fourstore; description = "4Store database user"; diff --git a/nixos/modules/services/databases/cassandra.nix b/nixos/modules/services/databases/cassandra.nix index 1e5cd8f54130..09b3fbd8a62a 100644 --- a/nixos/modules/services/databases/cassandra.nix +++ b/nixos/modules/services/databases/cassandra.nix @@ -420,7 +420,7 @@ in { 9160 ]; - users.extraUsers.cassandra = + users.users.cassandra = if config.ids.uids ? "cassandra" then { uid = config.ids.uids.cassandra; } // cassandraUser else cassandraUser ; diff --git a/nixos/modules/services/databases/clickhouse.nix b/nixos/modules/services/databases/clickhouse.nix index 631d7f8cba79..1b8771cec391 100644 --- a/nixos/modules/services/databases/clickhouse.nix +++ b/nixos/modules/services/databases/clickhouse.nix @@ -27,14 +27,14 @@ with lib; config = mkIf cfg.enable { - users.extraUsers.clickhouse = { + users.users.clickhouse = { name = "clickhouse"; uid = config.ids.uids.clickhouse; group = "clickhouse"; description = "ClickHouse server user"; }; - users.extraGroups.clickhouse.gid = config.ids.gids.clickhouse; + users.groups.clickhouse.gid = config.ids.gids.clickhouse; systemd.services.clickhouse = { description = "ClickHouse server"; diff --git a/nixos/modules/services/databases/couchdb.nix b/nixos/modules/services/databases/couchdb.nix index 52247bfb983e..ca89b1198205 100644 --- a/nixos/modules/services/databases/couchdb.nix +++ b/nixos/modules/services/databases/couchdb.nix @@ -198,13 +198,13 @@ in { }; }; - users.extraUsers.couchdb = { + users.users.couchdb = { description = "CouchDB Server user"; group = "couchdb"; uid = config.ids.uids.couchdb; }; - users.extraGroups.couchdb.gid = config.ids.gids.couchdb; + users.groups.couchdb.gid = config.ids.gids.couchdb; }; } diff --git a/nixos/modules/services/databases/firebird.nix b/nixos/modules/services/databases/firebird.nix index b9f66612d4eb..cc81b440450b 100644 --- a/nixos/modules/services/databases/firebird.nix +++ b/nixos/modules/services/databases/firebird.nix @@ -154,13 +154,13 @@ in # there are some additional settings which should be reviewed ''; - users.extraUsers.firebird = { + users.users.firebird = { description = "Firebird server user"; group = "firebird"; uid = config.ids.uids.firebird; }; - users.extraGroups.firebird.gid = config.ids.gids.firebird; + users.groups.firebird.gid = config.ids.gids.firebird; }; } diff --git a/nixos/modules/services/databases/foundationdb.nix b/nixos/modules/services/databases/foundationdb.nix index 693d2fde9916..91337cf791dc 100644 --- a/nixos/modules/services/databases/foundationdb.nix +++ b/nixos/modules/services/databases/foundationdb.nix @@ -325,14 +325,14 @@ in environment.systemPackages = [ pkg ]; - users.extraUsers = optionalAttrs (cfg.user == "foundationdb") (singleton + users.users = optionalAttrs (cfg.user == "foundationdb") (singleton { name = "foundationdb"; description = "FoundationDB User"; uid = config.ids.uids.foundationdb; group = cfg.group; }); - users.extraGroups = optionalAttrs (cfg.group == "foundationdb") (singleton + users.groups = optionalAttrs (cfg.group == "foundationdb") (singleton { name = "foundationdb"; gid = config.ids.gids.foundationdb; }); diff --git a/nixos/modules/services/databases/hbase.nix b/nixos/modules/services/databases/hbase.nix index 629d02209a9c..4772e897efe2 100644 --- a/nixos/modules/services/databases/hbase.nix +++ b/nixos/modules/services/databases/hbase.nix @@ -122,13 +122,13 @@ in { }; }; - users.extraUsers.hbase = { + users.users.hbase = { description = "HBase Server user"; group = "hbase"; uid = config.ids.uids.hbase; }; - users.extraGroups.hbase.gid = config.ids.gids.hbase; + users.groups.hbase.gid = config.ids.gids.hbase; }; } diff --git a/nixos/modules/services/databases/influxdb.nix b/nixos/modules/services/databases/influxdb.nix index 15b711f57b13..d7a028b25d8d 100644 --- a/nixos/modules/services/databases/influxdb.nix +++ b/nixos/modules/services/databases/influxdb.nix @@ -182,13 +182,13 @@ in ''; }; - users.extraUsers = optional (cfg.user == "influxdb") { + users.users = optional (cfg.user == "influxdb") { name = "influxdb"; uid = config.ids.uids.influxdb; description = "Influxdb daemon user"; }; - users.extraGroups = optional (cfg.group == "influxdb") { + users.groups = optional (cfg.group == "influxdb") { name = "influxdb"; gid = config.ids.gids.influxdb; }; diff --git a/nixos/modules/services/databases/memcached.nix b/nixos/modules/services/databases/memcached.nix index 46bc6fc5c132..7af452e4dced 100644 --- a/nixos/modules/services/databases/memcached.nix +++ b/nixos/modules/services/databases/memcached.nix @@ -64,7 +64,7 @@ in config = mkIf config.services.memcached.enable { - users.extraUsers = optional (cfg.user == "memcached") { + users.users = optional (cfg.user == "memcached") { name = "memcached"; description = "Memcached server user"; }; diff --git a/nixos/modules/services/databases/mongodb.nix b/nixos/modules/services/databases/mongodb.nix index 78dbf0d784cf..4c46d9228e5f 100644 --- a/nixos/modules/services/databases/mongodb.nix +++ b/nixos/modules/services/databases/mongodb.nix @@ -93,7 +93,7 @@ in config = mkIf config.services.mongodb.enable { - users.extraUsers.mongodb = mkIf (cfg.user == "mongodb") + users.users.mongodb = mkIf (cfg.user == "mongodb") { name = "mongodb"; uid = config.ids.uids.mongodb; description = "MongoDB server user"; diff --git a/nixos/modules/services/databases/mysql.nix b/nixos/modules/services/databases/mysql.nix index 15b9c788e872..3eb7879e2d9f 100644 --- a/nixos/modules/services/databases/mysql.nix +++ b/nixos/modules/services/databases/mysql.nix @@ -221,13 +221,13 @@ in mkDefault (if versionAtLeast config.system.nixos.stateVersion "17.09" then "/var/lib/mysql" else "/var/mysql"); - users.extraUsers.mysql = { + users.users.mysql = { description = "MySQL server user"; group = "mysql"; uid = config.ids.uids.mysql; }; - users.extraGroups.mysql.gid = config.ids.gids.mysql; + users.groups.mysql.gid = config.ids.gids.mysql; environment.systemPackages = [mysql]; diff --git a/nixos/modules/services/databases/neo4j.nix b/nixos/modules/services/databases/neo4j.nix index 424e08a6ee34..5015618c4247 100644 --- a/nixos/modules/services/databases/neo4j.nix +++ b/nixos/modules/services/databases/neo4j.nix @@ -139,7 +139,7 @@ in { environment.systemPackages = [ cfg.package ]; - users.extraUsers = singleton { + users.users = singleton { name = "neo4j"; uid = config.ids.uids.neo4j; description = "Neo4j daemon user"; diff --git a/nixos/modules/services/databases/openldap.nix b/nixos/modules/services/databases/openldap.nix index a67c61eb9949..9f2bf5ef8a9c 100644 --- a/nixos/modules/services/databases/openldap.nix +++ b/nixos/modules/services/databases/openldap.nix @@ -145,13 +145,13 @@ in "${configOpts}"; }; - users.extraUsers.openldap = + users.users.openldap = { name = cfg.user; group = cfg.group; uid = config.ids.uids.openldap; }; - users.extraGroups.openldap = + users.groups.openldap = { name = cfg.group; gid = config.ids.gids.openldap; }; diff --git a/nixos/modules/services/databases/opentsdb.nix b/nixos/modules/services/databases/opentsdb.nix index 489cdcffe658..b26fa9093ef4 100644 --- a/nixos/modules/services/databases/opentsdb.nix +++ b/nixos/modules/services/databases/opentsdb.nix @@ -97,13 +97,13 @@ in { }; }; - users.extraUsers.opentsdb = { + users.users.opentsdb = { description = "OpenTSDB Server user"; group = "opentsdb"; uid = config.ids.uids.opentsdb; }; - users.extraGroups.opentsdb.gid = config.ids.gids.opentsdb; + users.groups.opentsdb.gid = config.ids.gids.opentsdb; }; } diff --git a/nixos/modules/services/databases/postgresql.nix b/nixos/modules/services/databases/postgresql.nix index 42d61fa1b368..e33bee9db6e9 100644 --- a/nixos/modules/services/databases/postgresql.nix +++ b/nixos/modules/services/databases/postgresql.nix @@ -183,14 +183,14 @@ in host all all ::1/128 md5 ''; - users.extraUsers.postgres = + users.users.postgres = { name = "postgres"; uid = config.ids.uids.postgres; group = "postgres"; description = "PostgreSQL server user"; }; - users.extraGroups.postgres.gid = config.ids.gids.postgres; + users.groups.postgres.gid = config.ids.gids.postgres; environment.systemPackages = [ postgresql ]; diff --git a/nixos/modules/services/databases/redis.nix b/nixos/modules/services/databases/redis.nix index e4e38a4364a0..cc7b51982d1d 100644 --- a/nixos/modules/services/databases/redis.nix +++ b/nixos/modules/services/databases/redis.nix @@ -217,7 +217,7 @@ in allowedTCPPorts = [ cfg.port ]; }; - users.extraUsers.redis = + users.users.redis = { name = cfg.user; description = "Redis database user"; }; diff --git a/nixos/modules/services/databases/rethinkdb.nix b/nixos/modules/services/databases/rethinkdb.nix index cd8c386b08db..789d9c851d64 100644 --- a/nixos/modules/services/databases/rethinkdb.nix +++ b/nixos/modules/services/databases/rethinkdb.nix @@ -96,12 +96,12 @@ in ''; }; - users.extraUsers.rethinkdb = mkIf (cfg.user == "rethinkdb") + users.users.rethinkdb = mkIf (cfg.user == "rethinkdb") { name = "rethinkdb"; description = "RethinkDB server user"; }; - users.extraGroups = optionalAttrs (cfg.group == "rethinkdb") (singleton + users.groups = optionalAttrs (cfg.group == "rethinkdb") (singleton { name = "rethinkdb"; }); diff --git a/nixos/modules/services/databases/riak-cs.nix b/nixos/modules/services/databases/riak-cs.nix index 198efc29222a..2cb204f729a7 100644 --- a/nixos/modules/services/databases/riak-cs.nix +++ b/nixos/modules/services/databases/riak-cs.nix @@ -145,7 +145,7 @@ in ${cfg.extraAdvancedConfig} ''; - users.extraUsers.riak-cs = { + users.users.riak-cs = { name = "riak-cs"; uid = config.ids.uids.riak-cs; group = "riak"; diff --git a/nixos/modules/services/databases/riak.nix b/nixos/modules/services/databases/riak.nix index e0ebf164aef0..ac086cf55996 100644 --- a/nixos/modules/services/databases/riak.nix +++ b/nixos/modules/services/databases/riak.nix @@ -102,14 +102,14 @@ in ${cfg.extraAdvancedConfig} ''; - users.extraUsers.riak = { + users.users.riak = { name = "riak"; uid = config.ids.uids.riak; group = "riak"; description = "Riak server user"; }; - users.extraGroups.riak.gid = config.ids.gids.riak; + users.groups.riak.gid = config.ids.gids.riak; systemd.services.riak = { description = "Riak Server"; diff --git a/nixos/modules/services/databases/stanchion.nix b/nixos/modules/services/databases/stanchion.nix index a4597cac3cd6..9fe49f51edd2 100644 --- a/nixos/modules/services/databases/stanchion.nix +++ b/nixos/modules/services/databases/stanchion.nix @@ -143,14 +143,14 @@ in ${cfg.extraConfig} ''; - users.extraUsers.stanchion = { + users.users.stanchion = { name = "stanchion"; uid = config.ids.uids.stanchion; group = "stanchion"; description = "Stanchion server user"; }; - users.extraGroups.stanchion.gid = config.ids.gids.stanchion; + users.groups.stanchion.gid = config.ids.gids.stanchion; systemd.services.stanchion = { description = "Stanchion Server"; diff --git a/nixos/modules/services/databases/virtuoso.nix b/nixos/modules/services/databases/virtuoso.nix index 3231fede08fa..6ffc44a5274e 100644 --- a/nixos/modules/services/databases/virtuoso.nix +++ b/nixos/modules/services/databases/virtuoso.nix @@ -54,7 +54,7 @@ with lib; config = mkIf cfg.enable { - users.extraUsers = singleton + users.users = singleton { name = virtuosoUser; uid = config.ids.uids.virtuoso; description = "virtuoso user"; diff --git a/nixos/modules/services/editors/infinoted.nix b/nixos/modules/services/editors/infinoted.nix index 9074a4345eae..bba21caca85d 100644 --- a/nixos/modules/services/editors/infinoted.nix +++ b/nixos/modules/services/editors/infinoted.nix @@ -111,12 +111,12 @@ in { }; config = mkIf (cfg.enable) { - users.extraUsers = optional (cfg.user == "infinoted") + users.users = optional (cfg.user == "infinoted") { name = "infinoted"; description = "Infinoted user"; group = cfg.group; }; - users.extraGroups = optional (cfg.group == "infinoted") + users.groups = optional (cfg.group == "infinoted") { name = "infinoted"; }; diff --git a/nixos/modules/services/games/minecraft-server.nix b/nixos/modules/services/games/minecraft-server.nix index d2c8af6de0c5..f50d2897843a 100644 --- a/nixos/modules/services/games/minecraft-server.nix +++ b/nixos/modules/services/games/minecraft-server.nix @@ -45,7 +45,7 @@ in }; config = mkIf cfg.enable { - users.extraUsers.minecraft = { + users.users.minecraft = { description = "Minecraft Server Service user"; home = cfg.dataDir; createHome = true; diff --git a/nixos/modules/services/games/minetest-server.nix b/nixos/modules/services/games/minetest-server.nix index 58b73ac4f6bf..2de42f20f6cc 100644 --- a/nixos/modules/services/games/minetest-server.nix +++ b/nixos/modules/services/games/minetest-server.nix @@ -79,7 +79,7 @@ in }; config = mkIf cfg.enable { - users.extraUsers.minetest = { + users.users.minetest = { description = "Minetest Server Service user"; home = "/var/lib/minetest"; createHome = true; diff --git a/nixos/modules/services/games/terraria.nix b/nixos/modules/services/games/terraria.nix index 21aff780b672..ddf17599296a 100644 --- a/nixos/modules/services/games/terraria.nix +++ b/nixos/modules/services/games/terraria.nix @@ -105,14 +105,14 @@ in }; config = mkIf cfg.enable { - users.extraUsers.terraria = { + users.users.terraria = { description = "Terraria server service user"; home = "/var/lib/terraria"; createHome = true; uid = config.ids.uids.terraria; }; - users.extraGroups.terraria = { + users.groups.terraria = { gid = config.ids.gids.terraria; members = [ "terraria" ]; }; diff --git a/nixos/modules/services/hardware/sane.nix b/nixos/modules/services/hardware/sane.nix index d651ccaa5776..fe05c5a5c06f 100644 --- a/nixos/modules/services/hardware/sane.nix +++ b/nixos/modules/services/hardware/sane.nix @@ -124,7 +124,7 @@ in environment.sessionVariables = env; services.udev.packages = backends; - users.extraGroups."scanner".gid = config.ids.gids.scanner; + users.groups."scanner".gid = config.ids.gids.scanner; }) (mkIf config.services.saned.enable { @@ -152,7 +152,7 @@ in }; }; - users.extraUsers."scanner" = { + users.users."scanner" = { uid = config.ids.uids.scanner; group = "scanner"; }; diff --git a/nixos/modules/services/hardware/tcsd.nix b/nixos/modules/services/hardware/tcsd.nix index d957b5063d38..d4b0a9495d75 100644 --- a/nixos/modules/services/hardware/tcsd.nix +++ b/nixos/modules/services/hardware/tcsd.nix @@ -137,13 +137,13 @@ in serviceConfig.ExecStart = "${pkgs.trousers}/sbin/tcsd -f -c ${tcsdConf}"; }; - users.extraUsers = optionalAttrs (cfg.user == "tss") (singleton + users.users = optionalAttrs (cfg.user == "tss") (singleton { name = "tss"; group = "tss"; uid = config.ids.uids.tss; }); - users.extraGroups = optionalAttrs (cfg.group == "tss") (singleton + users.groups = optionalAttrs (cfg.group == "tss") (singleton { name = "tss"; gid = config.ids.gids.tss; }); diff --git a/nixos/modules/services/hardware/usbmuxd.nix b/nixos/modules/services/hardware/usbmuxd.nix index 7ebd49fa01c2..6a3f7cfd210d 100644 --- a/nixos/modules/services/hardware/usbmuxd.nix +++ b/nixos/modules/services/hardware/usbmuxd.nix @@ -43,13 +43,13 @@ in config = mkIf cfg.enable { - users.extraUsers = optional (cfg.user == defaultUserGroup) { + users.users = optional (cfg.user == defaultUserGroup) { name = cfg.user; description = "usbmuxd user"; group = cfg.group; }; - users.extraGroups = optional (cfg.group == defaultUserGroup) { + users.groups = optional (cfg.group == defaultUserGroup) { name = cfg.group; }; diff --git a/nixos/modules/services/logging/graylog.nix b/nixos/modules/services/logging/graylog.nix index 95f31829882f..74a7b3c9b470 100644 --- a/nixos/modules/services/logging/graylog.nix +++ b/nixos/modules/services/logging/graylog.nix @@ -127,7 +127,7 @@ in config = mkIf cfg.enable { - users.extraUsers = mkIf (cfg.user == "graylog") { + users.users = mkIf (cfg.user == "graylog") { graylog = { uid = config.ids.uids.graylog; description = "Graylog server daemon user"; diff --git a/nixos/modules/services/logging/journalwatch.nix b/nixos/modules/services/logging/journalwatch.nix index d49795fe2b77..adabc6459148 100644 --- a/nixos/modules/services/logging/journalwatch.nix +++ b/nixos/modules/services/logging/journalwatch.nix @@ -197,7 +197,7 @@ in { config = mkIf cfg.enable { - users.extraUsers.${user} = { + users.users.${user} = { isSystemUser = true; createHome = true; home = dataDir; diff --git a/nixos/modules/services/logging/logcheck.nix b/nixos/modules/services/logging/logcheck.nix index a4cab0c94cdc..1477d273d5ee 100644 --- a/nixos/modules/services/logging/logcheck.nix +++ b/nixos/modules/services/logging/logcheck.nix @@ -213,7 +213,7 @@ in mapAttrsToList writeIgnoreRule cfg.ignore ++ mapAttrsToList writeIgnoreCronRule cfg.ignoreCron; - users.extraUsers = optionalAttrs (cfg.user == "logcheck") (singleton + users.users = optionalAttrs (cfg.user == "logcheck") (singleton { name = "logcheck"; uid = config.ids.uids.logcheck; shell = "/bin/sh"; diff --git a/nixos/modules/services/mail/dovecot.nix b/nixos/modules/services/mail/dovecot.nix index 50477fdd25ba..a3eb1653df5b 100644 --- a/nixos/modules/services/mail/dovecot.nix +++ b/nixos/modules/services/mail/dovecot.nix @@ -309,7 +309,7 @@ in ++ optional cfg.enablePop3 "pop3" ++ optional cfg.enableLmtp "lmtp"; - users.extraUsers = [ + users.users = [ { name = "dovenull"; uid = config.ids.uids.dovenull2; description = "Dovecot user for untrusted logins"; @@ -328,7 +328,7 @@ in group = cfg.mailGroup; }); - users.extraGroups = optional (cfg.group == "dovecot2") + users.groups = optional (cfg.group == "dovecot2") { name = "dovecot2"; gid = config.ids.gids.dovecot2; } diff --git a/nixos/modules/services/mail/dspam.nix b/nixos/modules/services/mail/dspam.nix index 89076ff05462..167b5aeccc84 100644 --- a/nixos/modules/services/mail/dspam.nix +++ b/nixos/modules/services/mail/dspam.nix @@ -86,13 +86,13 @@ in { config = mkIf cfg.enable (mkMerge [ { - users.extraUsers = optionalAttrs (cfg.user == "dspam") (singleton + users.users = optionalAttrs (cfg.user == "dspam") (singleton { name = "dspam"; group = cfg.group; uid = config.ids.uids.dspam; }); - users.extraGroups = optionalAttrs (cfg.group == "dspam") (singleton + users.groups = optionalAttrs (cfg.group == "dspam") (singleton { name = "dspam"; gid = config.ids.gids.dspam; }); diff --git a/nixos/modules/services/mail/exim.nix b/nixos/modules/services/mail/exim.nix index f9ee3f909660..06c4b2811b3f 100644 --- a/nixos/modules/services/mail/exim.nix +++ b/nixos/modules/services/mail/exim.nix @@ -77,14 +77,14 @@ in systemPackages = [ exim ]; }; - users.extraUsers = singleton { + users.users = singleton { name = cfg.user; description = "Exim mail transfer agent user"; uid = config.ids.uids.exim; group = cfg.group; }; - users.extraGroups = singleton { + users.groups = singleton { name = cfg.group; gid = config.ids.gids.exim; }; diff --git a/nixos/modules/services/mail/mailhog.nix b/nixos/modules/services/mail/mailhog.nix index 206fb50d31a2..b78f4c8e0e66 100644 --- a/nixos/modules/services/mail/mailhog.nix +++ b/nixos/modules/services/mail/mailhog.nix @@ -24,7 +24,7 @@ in { config = mkIf cfg.enable { - users.extraUsers.mailhog = { + users.users.mailhog = { name = cfg.user; description = "MailHog service user"; }; diff --git a/nixos/modules/services/mail/mlmmj.nix b/nixos/modules/services/mail/mlmmj.nix index b6439b44fb5f..11565bc02f89 100644 --- a/nixos/modules/services/mail/mlmmj.nix +++ b/nixos/modules/services/mail/mlmmj.nix @@ -94,7 +94,7 @@ in config = mkIf cfg.enable { - users.extraUsers = singleton { + users.users = singleton { name = cfg.user; description = "mlmmj user"; home = stateDir; @@ -104,7 +104,7 @@ in useDefaultShell = true; }; - users.extraGroups = singleton { + users.groups = singleton { name = cfg.group; gid = config.ids.gids.mlmmj; }; diff --git a/nixos/modules/services/mail/nullmailer.nix b/nixos/modules/services/mail/nullmailer.nix index 59cb512c115b..418c02af4b7f 100644 --- a/nixos/modules/services/mail/nullmailer.nix +++ b/nixos/modules/services/mail/nullmailer.nix @@ -201,13 +201,13 @@ with lib; }; users = { - extraUsers = singleton { + users = singleton { name = cfg.user; description = "Nullmailer relay-only mta user"; group = cfg.group; }; - extraGroups = singleton { + groups = singleton { name = cfg.group; }; }; diff --git a/nixos/modules/services/mail/opendkim.nix b/nixos/modules/services/mail/opendkim.nix index 59a8373843a1..7855efb46c73 100644 --- a/nixos/modules/services/mail/opendkim.nix +++ b/nixos/modules/services/mail/opendkim.nix @@ -88,13 +88,13 @@ in { config = mkIf cfg.enable { - users.extraUsers = optionalAttrs (cfg.user == "opendkim") (singleton + users.users = optionalAttrs (cfg.user == "opendkim") (singleton { name = "opendkim"; group = cfg.group; uid = config.ids.uids.opendkim; }); - users.extraGroups = optionalAttrs (cfg.group == "opendkim") (singleton + users.groups = optionalAttrs (cfg.group == "opendkim") (singleton { name = "opendkim"; gid = config.ids.gids.opendkim; }); diff --git a/nixos/modules/services/mail/opensmtpd.nix b/nixos/modules/services/mail/opensmtpd.nix index f9b890532ceb..4276552d4f03 100644 --- a/nixos/modules/services/mail/opensmtpd.nix +++ b/nixos/modules/services/mail/opensmtpd.nix @@ -83,12 +83,12 @@ in { ###### implementation config = mkIf cfg.enable { - users.extraGroups = { + users.groups = { smtpd.gid = config.ids.gids.smtpd; smtpq.gid = config.ids.gids.smtpq; }; - users.extraUsers = { + users.users = { smtpd = { description = "OpenSMTPD process user"; uid = config.ids.uids.smtpd; diff --git a/nixos/modules/services/mail/postfix.nix b/nixos/modules/services/mail/postfix.nix index 5ab331ac067f..33249aa3e554 100644 --- a/nixos/modules/services/mail/postfix.nix +++ b/nixos/modules/services/mail/postfix.nix @@ -616,14 +616,14 @@ in setgid = true; }; - users.extraUsers = optional (user == "postfix") + users.users = optional (user == "postfix") { name = "postfix"; description = "Postfix mail server user"; uid = config.ids.uids.postfix; group = group; }; - users.extraGroups = + users.groups = optional (group == "postfix") { name = group; gid = config.ids.gids.postfix; diff --git a/nixos/modules/services/mail/postgrey.nix b/nixos/modules/services/mail/postgrey.nix index d4ae25c066ac..241f75eae279 100644 --- a/nixos/modules/services/mail/postgrey.nix +++ b/nixos/modules/services/mail/postgrey.nix @@ -136,14 +136,14 @@ in { environment.systemPackages = [ pkgs.postgrey ]; users = { - extraUsers = { + users = { postgrey = { description = "Postgrey Daemon"; uid = config.ids.uids.postgrey; group = "postgrey"; }; }; - extraGroups = { + groups = { postgrey = { gid = config.ids.gids.postgrey; }; diff --git a/nixos/modules/services/mail/postsrsd.nix b/nixos/modules/services/mail/postsrsd.nix index a1af16ec9ac1..8f12a16906c5 100644 --- a/nixos/modules/services/mail/postsrsd.nix +++ b/nixos/modules/services/mail/postsrsd.nix @@ -90,13 +90,13 @@ in { services.postsrsd.domain = mkDefault config.networking.hostName; - users.extraUsers = optionalAttrs (cfg.user == "postsrsd") (singleton + users.users = optionalAttrs (cfg.user == "postsrsd") (singleton { name = "postsrsd"; group = cfg.group; uid = config.ids.uids.postsrsd; }); - users.extraGroups = optionalAttrs (cfg.group == "postsrsd") (singleton + users.groups = optionalAttrs (cfg.group == "postsrsd") (singleton { name = "postsrsd"; gid = config.ids.gids.postsrsd; }); diff --git a/nixos/modules/services/mail/rmilter.nix b/nixos/modules/services/mail/rmilter.nix index e17b7516bfff..7f38d7570132 100644 --- a/nixos/modules/services/mail/rmilter.nix +++ b/nixos/modules/services/mail/rmilter.nix @@ -194,14 +194,14 @@ in (mkIf cfg.enable { - users.extraUsers = singleton { + users.users = singleton { name = cfg.user; description = "rmilter daemon"; uid = config.ids.uids.rmilter; group = cfg.group; }; - users.extraGroups = singleton { + users.groups = singleton { name = cfg.group; gid = config.ids.gids.rmilter; }; @@ -238,12 +238,12 @@ in }) (mkIf (cfg.enable && cfg.rspamd.enable && rspamdCfg.enable) { - users.extraUsers.${cfg.user}.extraGroups = [ rspamdCfg.group ]; + users.users.${cfg.user}.extraGroups = [ rspamdCfg.group ]; }) (mkIf (cfg.enable && cfg.postfix.enable) { services.postfix.extraConfig = cfg.postfix.configFragment; - users.extraUsers.${postfixCfg.user}.extraGroups = [ cfg.group ]; + users.users.${postfixCfg.user}.extraGroups = [ cfg.group ]; }) ]; } diff --git a/nixos/modules/services/mail/rspamd.nix b/nixos/modules/services/mail/rspamd.nix index 09fb587e74b5..b3dae60c2c7e 100644 --- a/nixos/modules/services/mail/rspamd.nix +++ b/nixos/modules/services/mail/rspamd.nix @@ -282,14 +282,14 @@ in # Allow users to run 'rspamc' and 'rspamadm'. environment.systemPackages = [ pkgs.rspamd ]; - users.extraUsers = singleton { + users.users = singleton { name = cfg.user; description = "rspamd daemon"; uid = config.ids.uids.rspamd; group = cfg.group; }; - users.extraGroups = singleton { + users.groups = singleton { name = cfg.group; gid = config.ids.gids.rspamd; }; diff --git a/nixos/modules/services/mail/spamassassin.nix b/nixos/modules/services/mail/spamassassin.nix index d483a8c3d67d..0c11ea431368 100644 --- a/nixos/modules/services/mail/spamassassin.nix +++ b/nixos/modules/services/mail/spamassassin.nix @@ -128,14 +128,14 @@ in systemPackages = [ pkgs.spamassassin ]; }; - users.extraUsers = singleton { + users.users = singleton { name = "spamd"; description = "Spam Assassin Daemon"; uid = config.ids.uids.spamd; group = "spamd"; }; - users.extraGroups = singleton { + users.groups = singleton { name = "spamd"; gid = config.ids.gids.spamd; }; diff --git a/nixos/modules/services/misc/airsonic.nix b/nixos/modules/services/misc/airsonic.nix index b92104787a56..083587b8ebb1 100644 --- a/nixos/modules/services/misc/airsonic.nix +++ b/nixos/modules/services/misc/airsonic.nix @@ -107,7 +107,7 @@ in { }; }; - users.extraUsers.airsonic = { + users.users.airsonic = { description = "Airsonic service user"; name = cfg.user; home = cfg.home; diff --git a/nixos/modules/services/misc/apache-kafka.nix b/nixos/modules/services/misc/apache-kafka.nix index 82fa1cc2e7e5..363ac4411e11 100644 --- a/nixos/modules/services/misc/apache-kafka.nix +++ b/nixos/modules/services/misc/apache-kafka.nix @@ -124,7 +124,7 @@ in { environment.systemPackages = [cfg.package]; - users.extraUsers = singleton { + users.users = singleton { name = "apache-kafka"; uid = config.ids.uids.apache-kafka; description = "Apache Kafka daemon user"; diff --git a/nixos/modules/services/misc/autorandr.nix b/nixos/modules/services/misc/autorandr.nix index 3020130ad1f6..4708e16e2a6c 100644 --- a/nixos/modules/services/misc/autorandr.nix +++ b/nixos/modules/services/misc/autorandr.nix @@ -12,6 +12,16 @@ in { services.autorandr = { enable = mkEnableOption "handling of hotplug and sleep events by autorandr"; + + defaultTarget = mkOption { + default = "default"; + type = types.str; + description = '' + Fallback if no monitor layout can be detected. See the docs + (https://github.com/phillipberndt/autorandr/blob/v1.0/README.md#how-to-use) + for further reference. + ''; + }; }; }; @@ -22,13 +32,21 @@ in { environment.systemPackages = [ pkgs.autorandr ]; - systemd.packages = [ pkgs.autorandr ]; - systemd.services.autorandr = { wantedBy = [ "sleep.target" ]; + description = "Autorandr execution hook"; + after = [ "sleep.target" ]; + + serviceConfig = { + StartLimitInterval = 5; + StartLimitBurst = 1; + ExecStart = "${pkgs.autorandr}/bin/autorandr --batch --change --default ${cfg.defaultTarget}"; + Type = "oneshot"; + RemainAfterExit = false; + }; }; }; - meta.maintainers = with maintainers; [ gnidorah ]; + meta.maintainers = with maintainers; [ gnidorah ma27 ]; } diff --git a/nixos/modules/services/misc/bepasty.nix b/nixos/modules/services/misc/bepasty.nix index c499e428af35..62835c194e42 100644 --- a/nixos/modules/services/misc/bepasty.nix +++ b/nixos/modules/services/misc/bepasty.nix @@ -168,14 +168,14 @@ in }) ) cfg.servers; - users.extraUsers = [{ + users.users = [{ uid = config.ids.uids.bepasty; name = user; group = group; home = default_home; }]; - users.extraGroups = [{ + users.groups = [{ name = group; gid = config.ids.gids.bepasty; }]; diff --git a/nixos/modules/services/misc/calibre-server.nix b/nixos/modules/services/misc/calibre-server.nix index 6b19f780ec0c..84c04f403d3a 100644 --- a/nixos/modules/services/misc/calibre-server.nix +++ b/nixos/modules/services/misc/calibre-server.nix @@ -49,12 +49,12 @@ in environment.systemPackages = [ pkgs.calibre ]; - users.extraUsers.calibre-server = { + users.users.calibre-server = { uid = config.ids.uids.calibre-server; group = "calibre-server"; }; - users.extraGroups.calibre-server = { + users.groups.calibre-server = { gid = config.ids.gids.calibre-server; }; diff --git a/nixos/modules/services/misc/cfdyndns.nix b/nixos/modules/services/misc/cfdyndns.nix index 69a33d0b8c1b..dcf416022734 100644 --- a/nixos/modules/services/misc/cfdyndns.nix +++ b/nixos/modules/services/misc/cfdyndns.nix @@ -54,14 +54,14 @@ in }; }; - users.extraUsers = { + users.users = { cfdyndns = { group = "cfdyndns"; uid = config.ids.uids.cfdyndns; }; }; - users.extraGroups = { + users.groups = { cfdyndns = { gid = config.ids.gids.cfdyndns; }; diff --git a/nixos/modules/services/misc/cgminer.nix b/nixos/modules/services/misc/cgminer.nix index d5071d8ff767..b1cf5a7d1104 100644 --- a/nixos/modules/services/misc/cgminer.nix +++ b/nixos/modules/services/misc/cgminer.nix @@ -110,7 +110,7 @@ in config = mkIf config.services.cgminer.enable { - users.extraUsers = optionalAttrs (cfg.user == "cgminer") (singleton + users.users = optionalAttrs (cfg.user == "cgminer") (singleton { name = "cgminer"; uid = config.ids.uids.cgminer; description = "Cgminer user"; diff --git a/nixos/modules/services/misc/couchpotato.nix b/nixos/modules/services/misc/couchpotato.nix index 496487622351..70aa895f76d8 100644 --- a/nixos/modules/services/misc/couchpotato.nix +++ b/nixos/modules/services/misc/couchpotato.nix @@ -34,7 +34,7 @@ in }; }; - users.extraUsers = singleton + users.users = singleton { name = "couchpotato"; group = "couchpotato"; home = "/var/lib/couchpotato/"; @@ -42,7 +42,7 @@ in uid = config.ids.uids.couchpotato; }; - users.extraGroups = singleton + users.groups = singleton { name = "couchpotato"; gid = config.ids.gids.couchpotato; }; diff --git a/nixos/modules/services/misc/dictd.nix b/nixos/modules/services/misc/dictd.nix index 7e3b6431a133..8d3e294622d1 100644 --- a/nixos/modules/services/misc/dictd.nix +++ b/nixos/modules/services/misc/dictd.nix @@ -45,7 +45,7 @@ in # get the command line client on system path to make some use of the service environment.systemPackages = [ pkgs.dict ]; - users.extraUsers = singleton + users.users = singleton { name = "dictd"; group = "dictd"; description = "DICT.org dictd server"; @@ -53,7 +53,7 @@ in uid = config.ids.uids.dictd; }; - users.extraGroups = singleton + users.groups = singleton { name = "dictd"; gid = config.ids.gids.dictd; }; diff --git a/nixos/modules/services/misc/disnix.nix b/nixos/modules/services/misc/disnix.nix index e4517c636e88..b28995a09115 100644 --- a/nixos/modules/services/misc/disnix.nix +++ b/nixos/modules/services/misc/disnix.nix @@ -71,7 +71,7 @@ in ++ optional cfg.useWebServiceInterface "${pkgs.dbus_java}/share/java/dbus.jar"; services.tomcat.webapps = optional cfg.useWebServiceInterface pkgs.DisnixWebService; - users.extraGroups = singleton + users.groups = singleton { name = "disnix"; gid = config.ids.gids.disnix; }; diff --git a/nixos/modules/services/misc/docker-registry.nix b/nixos/modules/services/misc/docker-registry.nix index f628da4ac4c0..9a3966ab30aa 100644 --- a/nixos/modules/services/misc/docker-registry.nix +++ b/nixos/modules/services/misc/docker-registry.nix @@ -140,7 +140,7 @@ in { startAt = optional cfg.enableGarbageCollect cfg.garbageCollectDates; }; - users.extraUsers.docker-registry = { + users.users.docker-registry = { createHome = true; home = cfg.storagePath; }; diff --git a/nixos/modules/services/misc/emby.nix b/nixos/modules/services/misc/emby.nix index e295f0f930e1..b1968784af0f 100644 --- a/nixos/modules/services/misc/emby.nix +++ b/nixos/modules/services/misc/emby.nix @@ -54,14 +54,14 @@ in }; }; - users.extraUsers = mkIf (cfg.user == "emby") { + users.users = mkIf (cfg.user == "emby") { emby = { group = cfg.group; uid = config.ids.uids.emby; }; }; - users.extraGroups = mkIf (cfg.group == "emby") { + users.groups = mkIf (cfg.group == "emby") { emby = { gid = config.ids.gids.emby; }; diff --git a/nixos/modules/services/misc/errbot.nix b/nixos/modules/services/misc/errbot.nix index cb2fa6776240..ac6ba2181de2 100644 --- a/nixos/modules/services/misc/errbot.nix +++ b/nixos/modules/services/misc/errbot.nix @@ -76,8 +76,8 @@ in { }; config = mkIf (cfg.instances != {}) { - users.extraUsers.errbot.group = "errbot"; - users.extraGroups.errbot = {}; + users.users.errbot.group = "errbot"; + users.groups.errbot = {}; systemd.services = mapAttrs' (name: instanceCfg: nameValuePair "errbot-${name}" ( let diff --git a/nixos/modules/services/misc/etcd.nix b/nixos/modules/services/misc/etcd.nix index 7c91462883f1..2d1893dae64b 100644 --- a/nixos/modules/services/misc/etcd.nix +++ b/nixos/modules/services/misc/etcd.nix @@ -188,7 +188,7 @@ in { environment.systemPackages = [ pkgs.etcdctl ]; - users.extraUsers = singleton { + users.users = singleton { name = "etcd"; uid = config.ids.uids.etcd; description = "Etcd daemon user"; diff --git a/nixos/modules/services/misc/exhibitor.nix b/nixos/modules/services/misc/exhibitor.nix index 600bd780e7b0..685e652c0ba0 100644 --- a/nixos/modules/services/misc/exhibitor.nix +++ b/nixos/modules/services/misc/exhibitor.nix @@ -408,7 +408,7 @@ in chmod -R u+w ${cfg.baseDir}/zookeeper/conf ''; }; - users.extraUsers = singleton { + users.users = singleton { name = "zookeeper"; uid = config.ids.uids.zookeeper; description = "Zookeeper daemon user"; diff --git a/nixos/modules/services/misc/felix.nix b/nixos/modules/services/misc/felix.nix index d6ad9dcaebc2..1c5ece868258 100644 --- a/nixos/modules/services/misc/felix.nix +++ b/nixos/modules/services/misc/felix.nix @@ -47,12 +47,12 @@ in ###### implementation config = mkIf cfg.enable { - users.extraGroups = singleton + users.groups = singleton { name = "osgi"; gid = config.ids.gids.osgi; }; - users.extraUsers = singleton + users.users = singleton { name = "osgi"; uid = config.ids.uids.osgi; description = "OSGi user"; diff --git a/nixos/modules/services/misc/folding-at-home.nix b/nixos/modules/services/misc/folding-at-home.nix index 164221cbab7f..122c89ce0680 100644 --- a/nixos/modules/services/misc/folding-at-home.nix +++ b/nixos/modules/services/misc/folding-at-home.nix @@ -42,7 +42,7 @@ in { config = mkIf cfg.enable { - users.extraUsers = singleton + users.users = singleton { name = fahUser; uid = config.ids.uids.foldingathome; description = "Folding@Home user"; diff --git a/nixos/modules/services/misc/gammu-smsd.nix b/nixos/modules/services/misc/gammu-smsd.nix index 2d406b634437..3057d7fd1a09 100644 --- a/nixos/modules/services/misc/gammu-smsd.nix +++ b/nixos/modules/services/misc/gammu-smsd.nix @@ -200,7 +200,7 @@ in { }; config = mkIf cfg.enable { - users.extraUsers.${cfg.user} = { + users.users.${cfg.user} = { description = "gammu-smsd user"; uid = config.ids.uids.gammu-smsd; extraGroups = [ "${cfg.device.group}" ]; diff --git a/nixos/modules/services/misc/geoip-updater.nix b/nixos/modules/services/misc/geoip-updater.nix index e0b9df96f8e8..baf0a8d73d19 100644 --- a/nixos/modules/services/misc/geoip-updater.nix +++ b/nixos/modules/services/misc/geoip-updater.nix @@ -251,7 +251,7 @@ in } ]; - users.extraUsers.geoip = { + users.users.geoip = { group = "root"; description = "GeoIP database updater"; uid = config.ids.uids.geoip; diff --git a/nixos/modules/services/misc/gitea.nix b/nixos/modules/services/misc/gitea.nix index 46efc1df12eb..5d664728e0b5 100644 --- a/nixos/modules/services/misc/gitea.nix +++ b/nixos/modules/services/misc/gitea.nix @@ -337,7 +337,7 @@ in }; users = mkIf (cfg.user == "gitea") { - extraUsers.gitea = { + users.gitea = { description = "Gitea Service"; home = cfg.stateDir; createHome = true; diff --git a/nixos/modules/services/misc/gitit.nix b/nixos/modules/services/misc/gitit.nix index 94a98e0335df..0025d96bd37b 100644 --- a/nixos/modules/services/misc/gitit.nix +++ b/nixos/modules/services/misc/gitit.nix @@ -645,15 +645,15 @@ in config = mkIf cfg.enable { - users.extraUsers.gitit = { - group = config.users.extraGroups.gitit.name; + users.users.gitit = { + group = config.users.groups.gitit.name; description = "Gitit user"; home = homeDir; createHome = true; uid = config.ids.uids.gitit; }; - users.extraGroups.gitit.gid = config.ids.gids.gitit; + users.groups.gitit.gid = config.ids.gids.gitit; systemd.services.gitit = let uid = toString config.ids.uids.gitit; @@ -715,8 +715,8 @@ NAMED ''; serviceConfig = { - User = config.users.extraUsers.gitit.name; - Group = config.users.extraGroups.gitit.name; + User = config.users.users.gitit.name; + Group = config.users.groups.gitit.name; ExecStart = with cfg; gititSh haskellPackages extraPackages; }; }; diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix index e80abf96da48..b09f0408e102 100644 --- a/nixos/modules/services/misc/gitlab.nix +++ b/nixos/modules/services/misc/gitlab.nix @@ -444,7 +444,7 @@ in { # Use postfix to send out mails. services.postfix.enable = mkDefault true; - users.extraUsers = [ + users.users = [ { name = cfg.user; group = cfg.group; home = "${cfg.statePath}/home"; @@ -453,7 +453,7 @@ in { } ]; - users.extraGroups = [ + users.groups = [ { name = cfg.group; gid = config.ids.gids.gitlab; } diff --git a/nixos/modules/services/misc/gitolite.nix b/nixos/modules/services/misc/gitolite.nix index 6e60316d000c..b9c2a966e6f5 100644 --- a/nixos/modules/services/misc/gitolite.nix +++ b/nixos/modules/services/misc/gitolite.nix @@ -140,7 +140,7 @@ in push( @{$RC{ENABLE}}, 'git-annex-shell ua'); ''; - users.extraUsers.${cfg.user} = { + users.users.${cfg.user} = { description = "Gitolite user"; home = cfg.dataDir; createHome = true; @@ -148,7 +148,7 @@ in group = cfg.group; useDefaultShell = true; }; - users.extraGroups."${cfg.group}".gid = config.ids.gids.gitolite; + users.groups."${cfg.group}".gid = config.ids.gids.gitolite; systemd.services."gitolite-init" = { description = "Gitolite initialization"; diff --git a/nixos/modules/services/misc/gogs.nix b/nixos/modules/services/misc/gogs.nix index ba744d37e71c..ee99967c261b 100644 --- a/nixos/modules/services/misc/gogs.nix +++ b/nixos/modules/services/misc/gogs.nix @@ -254,7 +254,7 @@ in }; users = mkIf (cfg.user == "gogs") { - extraUsers.gogs = { + users.gogs = { description = "Go Git Service"; uid = config.ids.uids.gogs; group = "gogs"; @@ -262,7 +262,7 @@ in createHome = true; shell = pkgs.bash; }; - extraGroups.gogs.gid = config.ids.gids.gogs; + groups.gogs.gid = config.ids.gids.gogs; }; warnings = optional (cfg.database.password != "") diff --git a/nixos/modules/services/misc/gollum.nix b/nixos/modules/services/misc/gollum.nix index 0888221ab62f..d1823bc6d4df 100644 --- a/nixos/modules/services/misc/gollum.nix +++ b/nixos/modules/services/misc/gollum.nix @@ -93,8 +93,8 @@ in ''; serviceConfig = { - User = config.users.extraUsers.gollum.name; - Group = config.users.extraGroups.gollum.name; + User = config.users.users.gollum.name; + Group = config.users.groups.gollum.name; PermissionsStartOnly = true; ExecStart = '' ${pkgs.gollum}/bin/gollum \ diff --git a/nixos/modules/services/misc/gpsd.nix b/nixos/modules/services/misc/gpsd.nix index a4a4c7b5d937..3bfcb636a3c6 100644 --- a/nixos/modules/services/misc/gpsd.nix +++ b/nixos/modules/services/misc/gpsd.nix @@ -53,6 +53,14 @@ in ''; }; + nowait = mkOption { + type = types.bool; + default = false; + description = '' + don't wait for client connects to poll GPS + ''; + }; + port = mkOption { type = types.int; default = 2947; @@ -78,14 +86,14 @@ in config = mkIf cfg.enable { - users.extraUsers = singleton + users.users = singleton { name = "gpsd"; inherit uid; description = "gpsd daemon user"; home = "/var/empty"; }; - users.extraGroups = singleton + users.groups = singleton { name = "gpsd"; inherit gid; }; @@ -99,7 +107,8 @@ in ExecStart = '' ${pkgs.gpsd}/sbin/gpsd -D "${toString cfg.debugLevel}" \ -S "${toString cfg.port}" \ - ${if cfg.readonly then "-b" else ""} \ + ${optionalString cfg.readonly "-b"} \ + ${optionalString cfg.nowait "-n"} \ "${cfg.device}" ''; }; diff --git a/nixos/modules/services/misc/home-assistant.nix b/nixos/modules/services/misc/home-assistant.nix index 05555353f207..fdcfe6bc2b8e 100644 --- a/nixos/modules/services/misc/home-assistant.nix +++ b/nixos/modules/services/misc/home-assistant.nix @@ -170,13 +170,13 @@ in { after = wants; }; - users.extraUsers.hass = { + users.users.hass = { home = cfg.configDir; createHome = true; group = "hass"; uid = config.ids.uids.hass; }; - users.extraGroups.hass.gid = config.ids.gids.hass; + users.groups.hass.gid = config.ids.gids.hass; }; } diff --git a/nixos/modules/services/misc/ihaskell.nix b/nixos/modules/services/misc/ihaskell.nix index 6da9cc8c47e6..11597706d0d1 100644 --- a/nixos/modules/services/misc/ihaskell.nix +++ b/nixos/modules/services/misc/ihaskell.nix @@ -38,23 +38,23 @@ in config = mkIf cfg.enable { - users.extraUsers.ihaskell = { - group = config.users.extraGroups.ihaskell.name; + users.users.ihaskell = { + group = config.users.groups.ihaskell.name; description = "IHaskell user"; home = "/var/lib/ihaskell"; createHome = true; uid = config.ids.uids.ihaskell; }; - users.extraGroups.ihaskell.gid = config.ids.gids.ihaskell; + users.groups.ihaskell.gid = config.ids.gids.ihaskell; systemd.services.ihaskell = { description = "IHaskell notebook instance"; wantedBy = [ "multi-user.target" ]; after = [ "network.target" ]; serviceConfig = { - User = config.users.extraUsers.ihaskell.name; - Group = config.users.extraGroups.ihaskell.name; + User = config.users.users.ihaskell.name; + Group = config.users.groups.ihaskell.name; ExecStart = "${pkgs.runtimeShell} -c \"cd $HOME;${ihaskell}/bin/ihaskell-notebook\""; }; }; diff --git a/nixos/modules/services/misc/jackett.nix b/nixos/modules/services/misc/jackett.nix index 87a41ee70b54..db72d36f2ac7 100644 --- a/nixos/modules/services/misc/jackett.nix +++ b/nixos/modules/services/misc/jackett.nix @@ -36,12 +36,12 @@ in }; }; - users.extraUsers.jackett = { + users.users.jackett = { uid = config.ids.uids.jackett; home = "/var/lib/jackett"; group = "jackett"; }; - users.extraGroups.jackett.gid = config.ids.gids.jackett; + users.groups.jackett.gid = config.ids.gids.jackett; }; } diff --git a/nixos/modules/services/misc/mathics.nix b/nixos/modules/services/misc/mathics.nix index 50715858881a..c588a30d76cd 100644 --- a/nixos/modules/services/misc/mathics.nix +++ b/nixos/modules/services/misc/mathics.nix @@ -26,23 +26,23 @@ in { config = mkIf cfg.enable { - users.extraUsers.mathics = { - group = config.users.extraGroups.mathics.name; + users.users.mathics = { + group = config.users.groups.mathics.name; description = "Mathics user"; home = "/var/lib/mathics"; createHome = true; uid = config.ids.uids.mathics; }; - users.extraGroups.mathics.gid = config.ids.gids.mathics; + users.groups.mathics.gid = config.ids.gids.mathics; systemd.services.mathics = { description = "Mathics notebook server"; wantedBy = [ "multi-user.target" ]; after = [ "network.target" ]; serviceConfig = { - User = config.users.extraUsers.mathics.name; - Group = config.users.extraGroups.mathics.name; + User = config.users.users.mathics.name; + Group = config.users.groups.mathics.name; ExecStart = concatStringsSep " " [ "${pkgs.mathics}/bin/mathicsserver" "--port" (toString cfg.port) diff --git a/nixos/modules/services/misc/matrix-synapse.nix b/nixos/modules/services/misc/matrix-synapse.nix index f7441988b272..3e3de9114708 100644 --- a/nixos/modules/services/misc/matrix-synapse.nix +++ b/nixos/modules/services/misc/matrix-synapse.nix @@ -635,7 +635,7 @@ in { }; config = mkIf cfg.enable { - users.extraUsers = [ + users.users = [ { name = "matrix-synapse"; group = "matrix-synapse"; home = cfg.dataDir; @@ -644,7 +644,7 @@ in { uid = config.ids.uids.matrix-synapse; } ]; - users.extraGroups = [ + users.groups = [ { name = "matrix-synapse"; gid = config.ids.gids.matrix-synapse; } ]; diff --git a/nixos/modules/services/misc/mediatomb.nix b/nixos/modules/services/misc/mediatomb.nix index 40ec2831ff09..5c1977d28deb 100644 --- a/nixos/modules/services/misc/mediatomb.nix +++ b/nixos/modules/services/misc/mediatomb.nix @@ -267,12 +267,12 @@ in { serviceConfig.User = "${cfg.user}"; }; - users.extraGroups = optionalAttrs (cfg.group == "mediatomb") (singleton { + users.groups = optionalAttrs (cfg.group == "mediatomb") (singleton { name = "mediatomb"; gid = gid; }); - users.extraUsers = optionalAttrs (cfg.user == "mediatomb") (singleton { + users.users = optionalAttrs (cfg.user == "mediatomb") (singleton { name = "mediatomb"; isSystemUser = true; group = cfg.group; diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix index 0ee105e4c6f1..e64df8dc7d2d 100644 --- a/nixos/modules/services/misc/nix-daemon.nix +++ b/nixos/modules/services/misc/nix-daemon.nix @@ -131,10 +131,10 @@ in description = " If set, Nix will perform builds in a sandboxed environment that it will set up automatically for each build. This prevents impurities - in builds by disallowing access to dependencies outside of the Nix - store by using network and mount namespaces in a chroot environment. - This isn't enabled by default for possible performance impacts due to - the initial setup time of a sandbox for each build. It doesn't affect + in builds by disallowing access to dependencies outside of the Nix + store by using network and mount namespaces in a chroot environment. + This isn't enabled by default for possible performance impacts due to + the initial setup time of a sandbox for each build. It doesn't affect derivation hashes, so changing this option will not trigger a rebuild of packages. "; @@ -450,7 +450,7 @@ in nix.nrBuildUsers = mkDefault (lib.max 32 cfg.maxJobs); - users.extraUsers = nixbldUsers; + users.users = nixbldUsers; services.xserver.displayManager.hiddenUsers = map ({ name, ... }: name) nixbldUsers; diff --git a/nixos/modules/services/misc/nix-ssh-serve.nix b/nixos/modules/services/misc/nix-ssh-serve.nix index 5bd9cf9086f1..87ed7f0a61b9 100644 --- a/nixos/modules/services/misc/nix-ssh-serve.nix +++ b/nixos/modules/services/misc/nix-ssh-serve.nix @@ -36,7 +36,7 @@ in { config = mkIf cfg.enable { - users.extraUsers.nix-ssh = { + users.users.nix-ssh = { description = "Nix SSH store user"; uid = config.ids.uids.nix-ssh; useDefaultShell = true; @@ -55,7 +55,7 @@ in { Match All ''; - users.extraUsers.nix-ssh.openssh.authorizedKeys.keys = cfg.keys; + users.users.nix-ssh.openssh.authorizedKeys.keys = cfg.keys; }; } diff --git a/nixos/modules/services/misc/nzbget.nix b/nixos/modules/services/misc/nzbget.nix index a186d57ceba2..f79a04a1d748 100644 --- a/nixos/modules/services/misc/nzbget.nix +++ b/nixos/modules/services/misc/nzbget.nix @@ -86,14 +86,14 @@ let }; }; - users.extraUsers = mkIf (cfg.user == "nzbget") { + users.users = mkIf (cfg.user == "nzbget") { nzbget = { group = cfg.group; uid = config.ids.uids.nzbget; }; }; - users.extraGroups = mkIf (cfg.group == "nzbget") { + users.groups = mkIf (cfg.group == "nzbget") { nzbget = { gid = config.ids.gids.nzbget; }; diff --git a/nixos/modules/services/misc/octoprint.nix b/nixos/modules/services/misc/octoprint.nix index 6883993a893b..baa7c3ade52e 100644 --- a/nixos/modules/services/misc/octoprint.nix +++ b/nixos/modules/services/misc/octoprint.nix @@ -86,13 +86,13 @@ in config = mkIf cfg.enable { - users.extraUsers = optionalAttrs (cfg.user == "octoprint") (singleton + users.users = optionalAttrs (cfg.user == "octoprint") (singleton { name = "octoprint"; group = cfg.group; uid = config.ids.uids.octoprint; }); - users.extraGroups = optionalAttrs (cfg.group == "octoprint") (singleton + users.groups = optionalAttrs (cfg.group == "octoprint") (singleton { name = "octoprint"; gid = config.ids.gids.octoprint; }); diff --git a/nixos/modules/services/misc/osrm.nix b/nixos/modules/services/misc/osrm.nix index 7ec8b15906fc..f89f37ccd9df 100644 --- a/nixos/modules/services/misc/osrm.nix +++ b/nixos/modules/services/misc/osrm.nix @@ -69,7 +69,7 @@ in wantedBy = [ "multi-user.target" ]; serviceConfig = { - User = config.users.extraUsers.osrm.name; + User = config.users.users.osrm.name; ExecStart = '' ${pkgs.osrm-backend}/bin/osrm-routed \ --ip ${cfg.address} \ diff --git a/nixos/modules/services/misc/plex.nix b/nixos/modules/services/misc/plex.nix index 46221ace3084..85f1d4a85562 100644 --- a/nixos/modules/services/misc/plex.nix +++ b/nixos/modules/services/misc/plex.nix @@ -157,14 +157,14 @@ in allowedUDPPorts = [ 1900 5353 32410 32412 32413 32414 ]; }; - users.extraUsers = mkIf (cfg.user == "plex") { + users.users = mkIf (cfg.user == "plex") { plex = { group = cfg.group; uid = config.ids.uids.plex; }; }; - users.extraGroups = mkIf (cfg.group == "plex") { + users.groups = mkIf (cfg.group == "plex") { plex = { gid = config.ids.gids.plex; }; diff --git a/nixos/modules/services/misc/plexpy.nix b/nixos/modules/services/misc/plexpy.nix index df9f12581247..2a589fdfb27f 100644 --- a/nixos/modules/services/misc/plexpy.nix +++ b/nixos/modules/services/misc/plexpy.nix @@ -74,7 +74,7 @@ in }; }; - users.extraUsers = mkIf (cfg.user == "plexpy") { + users.users = mkIf (cfg.user == "plexpy") { plexpy = { group = cfg.group; uid = config.ids.uids.plexpy; }; }; }; diff --git a/nixos/modules/services/misc/pykms.nix b/nixos/modules/services/misc/pykms.nix index 897e856e2a2d..a11296e1bd02 100644 --- a/nixos/modules/services/misc/pykms.nix +++ b/nixos/modules/services/misc/pykms.nix @@ -73,7 +73,7 @@ in { }; users = { - extraUsers.pykms = { + users.pykms = { name = "pykms"; group = "pykms"; home = home; @@ -82,7 +82,7 @@ in { description = "PyKMS daemon user"; }; - extraGroups.pykms = { + groups.pykms = { gid = config.ids.gids.pykms; }; }; diff --git a/nixos/modules/services/misc/radarr.nix b/nixos/modules/services/misc/radarr.nix index 245ad9f9a6df..7738eacc6ae9 100644 --- a/nixos/modules/services/misc/radarr.nix +++ b/nixos/modules/services/misc/radarr.nix @@ -36,12 +36,12 @@ in }; }; - users.extraUsers.radarr = { + users.users.radarr = { uid = config.ids.uids.radarr; home = "/var/lib/radarr"; group = "radarr"; }; - users.extraGroups.radarr.gid = config.ids.gids.radarr; + users.groups.radarr.gid = config.ids.gids.radarr; }; } diff --git a/nixos/modules/services/misc/redmine.nix b/nixos/modules/services/misc/redmine.nix index 3997b3f0dca0..9a9424449f80 100644 --- a/nixos/modules/services/misc/redmine.nix +++ b/nixos/modules/services/misc/redmine.nix @@ -128,13 +128,13 @@ in { } ]; - users.extraUsers = [ + users.users = [ { name = "redmine"; group = "redmine"; uid = config.ids.uids.redmine; } ]; - users.extraGroups = [ + users.groups = [ { name = "redmine"; gid = config.ids.gids.redmine; } ]; diff --git a/nixos/modules/services/misc/ripple-data-api.nix b/nixos/modules/services/misc/ripple-data-api.nix index dbca56b13335..042b496d35ee 100644 --- a/nixos/modules/services/misc/ripple-data-api.nix +++ b/nixos/modules/services/misc/ripple-data-api.nix @@ -185,7 +185,7 @@ in { ]; }; - users.extraUsers = singleton + users.users = singleton { name = "ripple-data-api"; description = "Ripple data api user"; uid = config.ids.uids.ripple-data-api; diff --git a/nixos/modules/services/misc/rippled.nix b/nixos/modules/services/misc/rippled.nix index 8bcf35a8ad38..9d9a0ba44da5 100644 --- a/nixos/modules/services/misc/rippled.nix +++ b/nixos/modules/services/misc/rippled.nix @@ -406,7 +406,7 @@ in config = mkIf cfg.enable { - users.extraUsers = singleton + users.users = singleton { name = "rippled"; description = "Ripple server user"; uid = config.ids.uids.rippled; diff --git a/nixos/modules/services/misc/serviio.nix b/nixos/modules/services/misc/serviio.nix index a6612e9c6adb..8808f2d21931 100644 --- a/nixos/modules/services/misc/serviio.nix +++ b/nixos/modules/services/misc/serviio.nix @@ -63,7 +63,7 @@ in { }; }; - users.extraUsers = [ + users.users = [ { name = "serviio"; group = "serviio"; @@ -74,7 +74,7 @@ in { } ]; - users.extraGroups = [ + users.groups = [ { name = "serviio";} ]; diff --git a/nixos/modules/services/misc/siproxd.nix b/nixos/modules/services/misc/siproxd.nix index 9e8fb6c228f2..dcaf73aca448 100644 --- a/nixos/modules/services/misc/siproxd.nix +++ b/nixos/modules/services/misc/siproxd.nix @@ -161,7 +161,7 @@ in config = mkIf cfg.enable { - users.extraUsers = singleton { + users.users = singleton { name = "siproxyd"; uid = config.ids.uids.siproxd; }; diff --git a/nixos/modules/services/misc/sonarr.nix b/nixos/modules/services/misc/sonarr.nix index ecde2c33bfa9..edba4e6c23eb 100644 --- a/nixos/modules/services/misc/sonarr.nix +++ b/nixos/modules/services/misc/sonarr.nix @@ -36,12 +36,12 @@ in }; }; - users.extraUsers.sonarr = { + users.users.sonarr = { uid = config.ids.uids.sonarr; home = "/var/lib/sonarr"; group = "sonarr"; }; - users.extraGroups.sonarr.gid = config.ids.gids.sonarr; + users.groups.sonarr.gid = config.ids.gids.sonarr; }; } diff --git a/nixos/modules/services/misc/subsonic.nix b/nixos/modules/services/misc/subsonic.nix index c2efd53d413a..1612b197f35f 100644 --- a/nixos/modules/services/misc/subsonic.nix +++ b/nixos/modules/services/misc/subsonic.nix @@ -130,7 +130,7 @@ let cfg = config.services.subsonic; in { ! [ -e "${cfg.home}" ] && [ -d "$oldHome" ] && [ $(${pkgs.coreutils}/bin/stat -c %u "$oldHome") -eq \ - ${toString config.users.extraUsers.subsonic.uid} ]; then + ${toString config.users.users.subsonic.uid} ]; then logger Moving "$oldHome" to "${cfg.home}" ${pkgs.coreutils}/bin/mv -T "$oldHome" "${cfg.home}" fi @@ -152,7 +152,7 @@ let cfg = config.services.subsonic; in { }; }; - users.extraUsers.subsonic = { + users.users.subsonic = { description = "Subsonic daemon user"; home = cfg.home; createHome = true; @@ -160,6 +160,6 @@ let cfg = config.services.subsonic; in { uid = config.ids.uids.subsonic; }; - users.extraGroups.subsonic.gid = config.ids.gids.subsonic; + users.groups.subsonic.gid = config.ids.gids.subsonic; }; } diff --git a/nixos/modules/services/misc/uhub.nix b/nixos/modules/services/misc/uhub.nix index 15071202b9c2..005951b9231e 100644 --- a/nixos/modules/services/misc/uhub.nix +++ b/nixos/modules/services/misc/uhub.nix @@ -161,11 +161,11 @@ in config = mkIf cfg.enable { users = { - extraUsers = singleton { + users = singleton { name = "uhub"; uid = config.ids.uids.uhub; }; - extraGroups = singleton { + groups = singleton { name = "uhub"; gid = config.ids.gids.uhub; }; diff --git a/nixos/modules/services/misc/zookeeper.nix b/nixos/modules/services/misc/zookeeper.nix index 91539592511c..cb7cc97d5a5c 100644 --- a/nixos/modules/services/misc/zookeeper.nix +++ b/nixos/modules/services/misc/zookeeper.nix @@ -144,7 +144,7 @@ in { ''; }; - users.extraUsers = singleton { + users.users = singleton { name = "zookeeper"; uid = config.ids.uids.zookeeper; description = "Zookeeper daemon user"; diff --git a/nixos/modules/services/monitoring/bosun.nix b/nixos/modules/services/monitoring/bosun.nix index 496838a131ba..8bf741adb6e3 100644 --- a/nixos/modules/services/monitoring/bosun.nix +++ b/nixos/modules/services/monitoring/bosun.nix @@ -153,13 +153,13 @@ in { }; }; - users.extraUsers.bosun = { + users.users.bosun = { description = "bosun user"; group = "bosun"; uid = config.ids.uids.bosun; }; - users.extraGroups.bosun.gid = config.ids.gids.bosun; + users.groups.bosun.gid = config.ids.gids.bosun; }; diff --git a/nixos/modules/services/monitoring/collectd.nix b/nixos/modules/services/monitoring/collectd.nix index dfbac3446e03..6606980cdad8 100644 --- a/nixos/modules/services/monitoring/collectd.nix +++ b/nixos/modules/services/monitoring/collectd.nix @@ -97,7 +97,7 @@ in { ''; }; - users.extraUsers = optional (cfg.user == "collectd") { + users.users = optional (cfg.user == "collectd") { name = "collectd"; }; }; diff --git a/nixos/modules/services/monitoring/dd-agent/dd-agent.nix b/nixos/modules/services/monitoring/dd-agent/dd-agent.nix index 6367c8245f71..cf65b6c28cf2 100644 --- a/nixos/modules/services/monitoring/dd-agent/dd-agent.nix +++ b/nixos/modules/services/monitoring/dd-agent/dd-agent.nix @@ -178,7 +178,7 @@ in { config = mkIf cfg.enable { environment.systemPackages = [ pkgs."dd-agent" pkgs.sysstat pkgs.procps ]; - users.extraUsers.datadog = { + users.users.datadog = { description = "Datadog Agent User"; uid = config.ids.uids.datadog; group = "datadog"; @@ -186,7 +186,7 @@ in { createHome = true; }; - users.extraGroups.datadog.gid = config.ids.gids.datadog; + users.groups.datadog.gid = config.ids.gids.datadog; systemd.services.dd-agent = { description = "Datadog agent monitor"; diff --git a/nixos/modules/services/monitoring/fusion-inventory.nix b/nixos/modules/services/monitoring/fusion-inventory.nix index c3b869e00880..9c976c65ea49 100644 --- a/nixos/modules/services/monitoring/fusion-inventory.nix +++ b/nixos/modules/services/monitoring/fusion-inventory.nix @@ -46,7 +46,7 @@ in { config = mkIf cfg.enable { - users.extraUsers = singleton { + users.users = singleton { name = "fusion-inventory"; description = "FusionInventory user"; }; diff --git a/nixos/modules/services/monitoring/grafana.nix b/nixos/modules/services/monitoring/grafana.nix index eceb91525db4..3e801f9b838d 100644 --- a/nixos/modules/services/monitoring/grafana.nix +++ b/nixos/modules/services/monitoring/grafana.nix @@ -265,7 +265,7 @@ in { ''; }; - users.extraUsers.grafana = { + users.users.grafana = { uid = config.ids.uids.grafana; description = "Grafana user"; home = cfg.dataDir; diff --git a/nixos/modules/services/monitoring/graphite.nix b/nixos/modules/services/monitoring/graphite.nix index 4b1ad34b3a4e..7ad26c137e51 100644 --- a/nixos/modules/services/monitoring/graphite.nix +++ b/nixos/modules/services/monitoring/graphite.nix @@ -638,13 +638,13 @@ in { cfg.web.enable || cfg.api.enable || cfg.seyren.enable || cfg.pager.enable || cfg.beacon.enable ) { - users.extraUsers = singleton { + users.users = singleton { name = "graphite"; uid = config.ids.uids.graphite; description = "Graphite daemon user"; home = dataDir; }; - users.extraGroups.graphite.gid = config.ids.gids.graphite; + users.groups.graphite.gid = config.ids.gids.graphite; }) ]; } diff --git a/nixos/modules/services/monitoring/heapster.nix b/nixos/modules/services/monitoring/heapster.nix index deee64aa41ea..fbdff2eb5dbe 100644 --- a/nixos/modules/services/monitoring/heapster.nix +++ b/nixos/modules/services/monitoring/heapster.nix @@ -49,7 +49,7 @@ in { }; }; - users.extraUsers = singleton { + users.users = singleton { name = "heapster"; uid = config.ids.uids.heapster; description = "Heapster user"; diff --git a/nixos/modules/services/monitoring/munin.nix b/nixos/modules/services/monitoring/munin.nix index 358ffd431dd4..ff9604c7dbcd 100644 --- a/nixos/modules/services/monitoring/munin.nix +++ b/nixos/modules/services/monitoring/munin.nix @@ -150,14 +150,14 @@ in environment.systemPackages = [ pkgs.munin ]; - users.extraUsers = [{ + users.users = [{ name = "munin"; description = "Munin monitoring user"; group = "munin"; uid = config.ids.uids.munin; }]; - users.extraGroups = [{ + users.groups = [{ name = "munin"; gid = config.ids.gids.munin; }]; diff --git a/nixos/modules/services/monitoring/nagios.nix b/nixos/modules/services/monitoring/nagios.nix index 4914c5db97d2..3e1d727b416e 100644 --- a/nixos/modules/services/monitoring/nagios.nix +++ b/nixos/modules/services/monitoring/nagios.nix @@ -143,7 +143,7 @@ in config = mkIf cfg.enable { - users.extraUsers.nagios = { + users.users.nagios = { description = "Nagios user "; uid = config.ids.uids.nagios; home = nagiosState; diff --git a/nixos/modules/services/monitoring/netdata.nix b/nixos/modules/services/monitoring/netdata.nix index d23b329eeb25..eefddf5a206b 100644 --- a/nixos/modules/services/monitoring/netdata.nix +++ b/nixos/modules/services/monitoring/netdata.nix @@ -100,11 +100,11 @@ in { }; - users.extraUsers = optional (cfg.user == defaultUser) { + users.users = optional (cfg.user == defaultUser) { name = defaultUser; }; - users.extraGroups = optional (cfg.group == defaultUser) { + users.groups = optional (cfg.group == defaultUser) { name = defaultUser; }; diff --git a/nixos/modules/services/monitoring/prometheus/default.nix b/nixos/modules/services/monitoring/prometheus/default.nix index 80122e69d167..5dda763bd56b 100644 --- a/nixos/modules/services/monitoring/prometheus/default.nix +++ b/nixos/modules/services/monitoring/prometheus/default.nix @@ -471,8 +471,8 @@ in { }; config = mkIf cfg.enable { - users.extraGroups.${promGroup}.gid = config.ids.gids.prometheus; - users.extraUsers.${promUser} = { + users.groups.${promGroup}.gid = config.ids.gids.prometheus; + users.users.${promUser} = { description = "Prometheus daemon user"; uid = config.ids.uids.prometheus; group = promGroup; diff --git a/nixos/modules/services/monitoring/riemann-dash.nix b/nixos/modules/services/monitoring/riemann-dash.nix index 523f74cb72b9..7eb4d888b0cc 100644 --- a/nixos/modules/services/monitoring/riemann-dash.nix +++ b/nixos/modules/services/monitoring/riemann-dash.nix @@ -51,9 +51,9 @@ in { config = mkIf cfg.enable { - users.extraGroups.riemanndash.gid = config.ids.gids.riemanndash; + users.groups.riemanndash.gid = config.ids.gids.riemanndash; - users.extraUsers.riemanndash = { + users.users.riemanndash = { description = "riemann-dash daemon user"; uid = config.ids.uids.riemanndash; group = "riemanndash"; diff --git a/nixos/modules/services/monitoring/riemann-tools.nix b/nixos/modules/services/monitoring/riemann-tools.nix index de858813a762..4e8832dadc5e 100644 --- a/nixos/modules/services/monitoring/riemann-tools.nix +++ b/nixos/modules/services/monitoring/riemann-tools.nix @@ -40,9 +40,9 @@ in { config = mkIf cfg.enableHealth { - users.extraGroups.riemanntools.gid = config.ids.gids.riemanntools; + users.groups.riemanntools.gid = config.ids.gids.riemanntools; - users.extraUsers.riemanntools = { + users.users.riemanntools = { description = "riemann-tools daemon user"; uid = config.ids.uids.riemanntools; group = "riemanntools"; diff --git a/nixos/modules/services/monitoring/riemann.nix b/nixos/modules/services/monitoring/riemann.nix index ac5d0134a80d..237de53456f9 100644 --- a/nixos/modules/services/monitoring/riemann.nix +++ b/nixos/modules/services/monitoring/riemann.nix @@ -69,9 +69,9 @@ in { config = mkIf cfg.enable { - users.extraGroups.riemann.gid = config.ids.gids.riemann; + users.groups.riemann.gid = config.ids.gids.riemann; - users.extraUsers.riemann = { + users.users.riemann = { description = "riemann daemon user"; uid = config.ids.uids.riemann; group = "riemann"; diff --git a/nixos/modules/services/monitoring/scollector.nix b/nixos/modules/services/monitoring/scollector.nix index 2684482c6184..6ecb21d628de 100644 --- a/nixos/modules/services/monitoring/scollector.nix +++ b/nixos/modules/services/monitoring/scollector.nix @@ -123,13 +123,13 @@ in { }; }; - users.extraUsers.scollector = { + users.users.scollector = { description = "scollector user"; group = "scollector"; uid = config.ids.uids.scollector; }; - users.extraGroups.scollector.gid = config.ids.gids.scollector; + users.groups.scollector.gid = config.ids.gids.scollector; }; diff --git a/nixos/modules/services/monitoring/statsd.nix b/nixos/modules/services/monitoring/statsd.nix index 7b0e9981cbb1..ea155821ecc9 100644 --- a/nixos/modules/services/monitoring/statsd.nix +++ b/nixos/modules/services/monitoring/statsd.nix @@ -125,7 +125,7 @@ in message = "Only builtin backends (graphite, console, repeater) or backends enumerated in `pkgs.nodePackages` are allowed!"; }) cfg.backends; - users.extraUsers = singleton { + users.users = singleton { name = "statsd"; uid = config.ids.uids.statsd; description = "Statsd daemon user"; diff --git a/nixos/modules/services/monitoring/telegraf.nix b/nixos/modules/services/monitoring/telegraf.nix index 49dc9d8143e6..6bfcd7143e1c 100644 --- a/nixos/modules/services/monitoring/telegraf.nix +++ b/nixos/modules/services/monitoring/telegraf.nix @@ -62,7 +62,7 @@ in { }; }; - users.extraUsers = [{ + users.users = [{ name = "telegraf"; uid = config.ids.uids.telegraf; description = "telegraf daemon user"; diff --git a/nixos/modules/services/monitoring/ups.nix b/nixos/modules/services/monitoring/ups.nix index 29dc68f90cc9..bc755612fd9b 100644 --- a/nixos/modules/services/monitoring/ups.nix +++ b/nixos/modules/services/monitoring/ups.nix @@ -259,7 +259,7 @@ in /* - users.extraUsers = [ + users.users = [ { name = "nut"; uid = 84; home = "/var/lib/nut"; @@ -269,7 +269,7 @@ in } ]; - users.extraGroups = [ + users.groups = [ { name = "nut"; gid = 84; } diff --git a/nixos/modules/services/monitoring/vnstat.nix b/nixos/modules/services/monitoring/vnstat.nix index ca56e4a7b958..cb2f8c07edb9 100644 --- a/nixos/modules/services/monitoring/vnstat.nix +++ b/nixos/modules/services/monitoring/vnstat.nix @@ -16,7 +16,7 @@ in { }; config = mkIf cfg.enable { - users.extraUsers.vnstatd = { + users.users.vnstatd = { isSystemUser = true; description = "vnstat daemon user"; home = "/var/lib/vnstat"; diff --git a/nixos/modules/services/monitoring/zabbix-agent.nix b/nixos/modules/services/monitoring/zabbix-agent.nix index 88a63b4bf161..87857225e7d7 100644 --- a/nixos/modules/services/monitoring/zabbix-agent.nix +++ b/nixos/modules/services/monitoring/zabbix-agent.nix @@ -68,7 +68,7 @@ in config = mkIf cfg.enable { - users.extraUsers = mkIf (!config.services.zabbixServer.enable) (singleton + users.users = mkIf (!config.services.zabbixServer.enable) (singleton { name = "zabbix"; uid = config.ids.uids.zabbix; description = "Zabbix daemon user"; diff --git a/nixos/modules/services/monitoring/zabbix-server.nix b/nixos/modules/services/monitoring/zabbix-server.nix index acd1279ddf47..f62d55457ed4 100644 --- a/nixos/modules/services/monitoring/zabbix-server.nix +++ b/nixos/modules/services/monitoring/zabbix-server.nix @@ -85,7 +85,7 @@ in services.postgresql.enable = useLocalPostgres; - users.extraUsers = singleton + users.users = singleton { name = "zabbix"; uid = config.ids.uids.zabbix; description = "Zabbix daemon user"; diff --git a/nixos/modules/services/network-filesystems/ceph.nix b/nixos/modules/services/network-filesystems/ceph.nix index 5de8ae79a246..4e3bc839d400 100644 --- a/nixos/modules/services/network-filesystems/ceph.nix +++ b/nixos/modules/services/network-filesystems/ceph.nix @@ -332,13 +332,13 @@ in in generators.toINI {} totalConfig; - users.extraUsers = singleton { + users.users = singleton { name = "ceph"; uid = config.ids.uids.ceph; description = "Ceph daemon user"; }; - users.extraGroups = singleton { + users.groups = singleton { name = "ceph"; gid = config.ids.gids.ceph; }; diff --git a/nixos/modules/services/network-filesystems/davfs2.nix b/nixos/modules/services/network-filesystems/davfs2.nix index 6b2a770100c5..c16e12378d75 100644 --- a/nixos/modules/services/network-filesystems/davfs2.nix +++ b/nixos/modules/services/network-filesystems/davfs2.nix @@ -57,12 +57,12 @@ in environment.systemPackages = [ pkgs.davfs2 ]; environment.etc."davfs2/davfs2.conf".source = cfgFile; - users.extraGroups = optionalAttrs (cfg.davGroup == "davfs2") (singleton { + users.groups = optionalAttrs (cfg.davGroup == "davfs2") (singleton { name = "davfs2"; gid = config.ids.gids.davfs2; }); - users.extraUsers = optionalAttrs (cfg.davUser == "davfs2") (singleton { + users.users = optionalAttrs (cfg.davUser == "davfs2") (singleton { name = "davfs2"; createHome = false; group = cfg.davGroup; diff --git a/nixos/modules/services/network-filesystems/ipfs.nix b/nixos/modules/services/network-filesystems/ipfs.nix index ab6d3a3d2fa4..21b664e5b2f9 100644 --- a/nixos/modules/services/network-filesystems/ipfs.nix +++ b/nixos/modules/services/network-filesystems/ipfs.nix @@ -212,7 +212,7 @@ in { user_allow_other ''; }; - users.extraUsers = mkIf (cfg.user == "ipfs") { + users.users = mkIf (cfg.user == "ipfs") { ipfs = { group = cfg.group; home = cfg.dataDir; @@ -222,7 +222,7 @@ in { }; }; - users.extraGroups = mkIf (cfg.group == "ipfs") { + users.groups = mkIf (cfg.group == "ipfs") { ipfs.gid = config.ids.gids.ipfs; }; diff --git a/nixos/modules/services/network-filesystems/tahoe.nix b/nixos/modules/services/network-filesystems/tahoe.nix index 80b34c48f1d2..534862a3c9e4 100644 --- a/nixos/modules/services/network-filesystems/tahoe.nix +++ b/nixos/modules/services/network-filesystems/tahoe.nix @@ -255,7 +255,7 @@ in cp /etc/tahoe-lafs/introducer-"${node}".cfg ${lib.escapeShellArg nodedir}/tahoe.cfg ''; }); - users.extraUsers = flip mapAttrs' cfg.introducers (node: _: + users.users = flip mapAttrs' cfg.introducers (node: _: nameValuePair "tahoe.introducer-${node}" { description = "Tahoe node user for introducer ${node}"; isSystemUser = true; @@ -355,7 +355,7 @@ in cp /etc/tahoe-lafs/${lib.escapeShellArg node}.cfg ${lib.escapeShellArg nodedir}/tahoe.cfg ''; }); - users.extraUsers = flip mapAttrs' cfg.nodes (node: _: + users.users = flip mapAttrs' cfg.nodes (node: _: nameValuePair "tahoe.${node}" { description = "Tahoe node user for node ${node}"; isSystemUser = true; diff --git a/nixos/modules/services/network-filesystems/xtreemfs.nix b/nixos/modules/services/network-filesystems/xtreemfs.nix index 95d7641e8b53..c93e201da56c 100644 --- a/nixos/modules/services/network-filesystems/xtreemfs.nix +++ b/nixos/modules/services/network-filesystems/xtreemfs.nix @@ -432,14 +432,14 @@ in environment.systemPackages = [ xtreemfs ]; - users.extraUsers.xtreemfs = + users.users.xtreemfs = { uid = config.ids.uids.xtreemfs; description = "XtreemFS user"; createHome = true; home = home; }; - users.extraGroups.xtreemfs = + users.groups.xtreemfs = { gid = config.ids.gids.xtreemfs; }; diff --git a/nixos/modules/services/network-filesystems/yandex-disk.nix b/nixos/modules/services/network-filesystems/yandex-disk.nix index 44b0edf62018..e93f45b49867 100644 --- a/nixos/modules/services/network-filesystems/yandex-disk.nix +++ b/nixos/modules/services/network-filesystems/yandex-disk.nix @@ -73,7 +73,7 @@ in config = mkIf cfg.enable { - users.extraUsers = mkIf (cfg.user == null) [ { + users.users = mkIf (cfg.user == null) [ { name = u; uid = config.ids.uids.yandexdisk; group = "nogroup"; diff --git a/nixos/modules/services/networking/amuled.nix b/nixos/modules/services/networking/amuled.nix index 9898f164c5cf..57f02542eafd 100644 --- a/nixos/modules/services/networking/amuled.nix +++ b/nixos/modules/services/networking/amuled.nix @@ -45,14 +45,14 @@ in config = mkIf cfg.enable { - users.extraUsers = mkIf (cfg.user == null) [ + users.users = mkIf (cfg.user == null) [ { name = "amule"; description = "AMule daemon"; group = "amule"; uid = config.ids.uids.amule; } ]; - users.extraGroups = mkIf (cfg.user == null) [ + users.groups = mkIf (cfg.user == null) [ { name = "amule"; gid = config.ids.gids.amule; } ]; diff --git a/nixos/modules/services/networking/aria2.nix b/nixos/modules/services/networking/aria2.nix index df9c92db2e54..98eb00861016 100644 --- a/nixos/modules/services/networking/aria2.nix +++ b/nixos/modules/services/networking/aria2.nix @@ -92,7 +92,7 @@ in allowedTCPPorts = [ config.services.aria2.rpcListenPort ]; }; - users.extraUsers.aria2 = { + users.users.aria2 = { group = "aria2"; uid = config.ids.uids.aria2; description = "aria2 user"; @@ -100,7 +100,7 @@ in createHome = false; }; - users.extraGroups.aria2.gid = config.ids.gids.aria2; + users.groups.aria2.gid = config.ids.gids.aria2; systemd.services.aria2 = { description = "aria2 Service"; diff --git a/nixos/modules/services/networking/asterisk.nix b/nixos/modules/services/networking/asterisk.nix index 514204db33fa..b8ec2b25a227 100644 --- a/nixos/modules/services/networking/asterisk.nix +++ b/nixos/modules/services/networking/asterisk.nix @@ -211,7 +211,7 @@ in environment.etc.asterisk.source = asteriskEtc; - users.extraUsers.asterisk = + users.users.asterisk = { name = asteriskUser; group = asteriskGroup; uid = config.ids.uids.asterisk; @@ -219,7 +219,7 @@ in home = varlibdir; }; - users.extraGroups.asterisk = + users.groups.asterisk = { name = asteriskGroup; gid = config.ids.gids.asterisk; }; diff --git a/nixos/modules/services/networking/avahi-daemon.nix b/nixos/modules/services/networking/avahi-daemon.nix index 9ccdacb20e91..81e11db10409 100644 --- a/nixos/modules/services/networking/avahi-daemon.nix +++ b/nixos/modules/services/networking/avahi-daemon.nix @@ -187,14 +187,14 @@ in services.avahi.hostName = mkDefault config.networking.hostName; - users.extraUsers = singleton + users.users = singleton { name = "avahi"; uid = config.ids.uids.avahi; description = "`avahi-daemon' privilege separation user"; home = "/var/empty"; }; - users.extraGroups = singleton + users.groups = singleton { name = "avahi"; gid = config.ids.gids.avahi; }; diff --git a/nixos/modules/services/networking/bind.nix b/nixos/modules/services/networking/bind.nix index 7775a4bd87fe..abcd1ef6ff5d 100644 --- a/nixos/modules/services/networking/bind.nix +++ b/nixos/modules/services/networking/bind.nix @@ -170,7 +170,7 @@ in config = mkIf config.services.bind.enable { - users.extraUsers = singleton + users.users = singleton { name = bindUser; uid = config.ids.uids.bind; description = "BIND daemon user"; diff --git a/nixos/modules/services/networking/bird.nix b/nixos/modules/services/networking/bird.nix index c25bd0fdc541..9f08cc0a79ed 100644 --- a/nixos/modules/services/networking/bird.nix +++ b/nixos/modules/services/networking/bird.nix @@ -60,11 +60,11 @@ let }; }; users = { - extraUsers.${variant} = { + users.${variant} = { description = "BIRD Internet Routing Daemon user"; group = variant; }; - extraGroups.${variant} = {}; + groups.${variant} = {}; }; }; }; diff --git a/nixos/modules/services/networking/bitlbee.nix b/nixos/modules/services/networking/bitlbee.nix index bd26804788f3..392a8d5c2e7c 100644 --- a/nixos/modules/services/networking/bitlbee.nix +++ b/nixos/modules/services/networking/bitlbee.nix @@ -149,7 +149,7 @@ in config = mkIf config.services.bitlbee.enable { - users.extraUsers = singleton + users.users = singleton { name = "bitlbee"; uid = bitlbeeUid; description = "BitlBee user"; @@ -157,7 +157,7 @@ in createHome = true; }; - users.extraGroups = singleton + users.groups = singleton { name = "bitlbee"; gid = config.ids.gids.bitlbee; }; diff --git a/nixos/modules/services/networking/btsync.nix b/nixos/modules/services/networking/btsync.nix index 6e479a5860ac..33e85ef58e6e 100644 --- a/nixos/modules/services/networking/btsync.nix +++ b/nixos/modules/services/networking/btsync.nix @@ -284,7 +284,7 @@ in services.btsync.package = mkOptionDefault pkgs.bittorrentSync14; - users.extraUsers.btsync = { + users.users.btsync = { description = "Bittorrent Sync Service user"; home = cfg.storagePath; createHome = true; @@ -292,7 +292,7 @@ in group = "btsync"; }; - users.extraGroups = [ + users.groups = [ { name = "btsync"; }]; diff --git a/nixos/modules/services/networking/charybdis.nix b/nixos/modules/services/networking/charybdis.nix index c354ec61fe23..6d57faa9ac2b 100644 --- a/nixos/modules/services/networking/charybdis.nix +++ b/nixos/modules/services/networking/charybdis.nix @@ -71,14 +71,14 @@ in config = mkIf cfg.enable (lib.mkMerge [ { - users.extraUsers = singleton { + users.users = singleton { name = cfg.user; description = "Charybdis IRC daemon user"; uid = config.ids.uids.ircd; group = cfg.group; }; - users.extraGroups = singleton { + users.groups = singleton { name = cfg.group; gid = config.ids.gids.ircd; }; diff --git a/nixos/modules/services/networking/chrony.nix b/nixos/modules/services/networking/chrony.nix index c287ca01feb5..6a89002b42de 100644 --- a/nixos/modules/services/networking/chrony.nix +++ b/nixos/modules/services/networking/chrony.nix @@ -96,12 +96,12 @@ in # Make chronyc available in the system path environment.systemPackages = [ pkgs.chrony ]; - users.extraGroups = singleton + users.groups = singleton { name = "chrony"; gid = config.ids.gids.chrony; }; - users.extraUsers = singleton + users.users = singleton { name = "chrony"; uid = config.ids.uids.chrony; group = "chrony"; diff --git a/nixos/modules/services/networking/cntlm.nix b/nixos/modules/services/networking/cntlm.nix index 3978a1969ce9..4e4e3104c3a8 100644 --- a/nixos/modules/services/networking/cntlm.nix +++ b/nixos/modules/services/networking/cntlm.nix @@ -117,7 +117,7 @@ in }; }; - users.extraUsers.cntlm = { + users.users.cntlm = { name = "cntlm"; description = "cntlm system-wide daemon"; isSystemUser = true; diff --git a/nixos/modules/services/networking/consul.nix b/nixos/modules/services/networking/consul.nix index 6333970cb338..ab3f81037681 100644 --- a/nixos/modules/services/networking/consul.nix +++ b/nixos/modules/services/networking/consul.nix @@ -155,7 +155,7 @@ in config = mkIf cfg.enable ( mkMerge [{ - users.extraUsers."consul" = { + users.users."consul" = { description = "Consul agent daemon user"; uid = config.ids.uids.consul; # The shell is needed for health checks diff --git a/nixos/modules/services/networking/coturn.nix b/nixos/modules/services/networking/coturn.nix index b3c64490d97e..c430ce5af92a 100644 --- a/nixos/modules/services/networking/coturn.nix +++ b/nixos/modules/services/networking/coturn.nix @@ -294,12 +294,12 @@ in { }; config = mkIf cfg.enable { - users.extraUsers = [ + users.users = [ { name = "turnserver"; uid = config.ids.uids.turnserver; description = "coturn TURN server user"; } ]; - users.extraGroups = [ + users.groups = [ { name = "turnserver"; gid = config.ids.gids.turnserver; members = [ "turnserver" ]; diff --git a/nixos/modules/services/networking/dhcpd.nix b/nixos/modules/services/networking/dhcpd.nix index fd7e317eee95..0b2063bc4246 100644 --- a/nixos/modules/services/networking/dhcpd.nix +++ b/nixos/modules/services/networking/dhcpd.nix @@ -197,7 +197,7 @@ in config = mkIf (cfg4.enable || cfg6.enable) { users = { - extraUsers.dhcpd = { + users.dhcpd = { uid = config.ids.uids.dhcpd; description = "DHCP daemon user"; }; diff --git a/nixos/modules/services/networking/dnscache.nix b/nixos/modules/services/networking/dnscache.nix index ba5c8e2d5e53..fc30f50317fe 100644 --- a/nixos/modules/services/networking/dnscache.nix +++ b/nixos/modules/services/networking/dnscache.nix @@ -84,7 +84,7 @@ in { config = mkIf config.services.dnscache.enable { environment.systemPackages = [ pkgs.djbdns ]; - users.extraUsers.dnscache = {}; + users.users.dnscache = {}; systemd.services.dnscache = { description = "djbdns dnscache server"; diff --git a/nixos/modules/services/networking/dnschain.nix b/nixos/modules/services/networking/dnschain.nix index ee1cd3600039..0c2add424bac 100644 --- a/nixos/modules/services/networking/dnschain.nix +++ b/nixos/modules/services/networking/dnschain.nix @@ -141,7 +141,7 @@ in dns = "127.0.0.1:${toString cfg.dns.port}"; }; - users.extraUsers = singleton { + users.users = singleton { name = username; description = "DNSChain daemon user"; home = dataDir; diff --git a/nixos/modules/services/networking/dnsmasq.nix b/nixos/modules/services/networking/dnsmasq.nix index 91a3e54474ac..24d16046c63e 100644 --- a/nixos/modules/services/networking/dnsmasq.nix +++ b/nixos/modules/services/networking/dnsmasq.nix @@ -86,7 +86,7 @@ in services.dbus.packages = [ dnsmasq ]; - users.extraUsers = singleton { + users.users = singleton { name = "dnsmasq"; uid = config.ids.uids.dnsmasq; description = "Dnsmasq daemon user"; diff --git a/nixos/modules/services/networking/ejabberd.nix b/nixos/modules/services/networking/ejabberd.nix index 82ed7fc4a837..ef5e2cee6f20 100644 --- a/nixos/modules/services/networking/ejabberd.nix +++ b/nixos/modules/services/networking/ejabberd.nix @@ -94,7 +94,7 @@ in { config = mkIf cfg.enable { environment.systemPackages = [ cfg.package ]; - users.extraUsers = optionalAttrs (cfg.user == "ejabberd") (singleton + users.users = optionalAttrs (cfg.user == "ejabberd") (singleton { name = "ejabberd"; group = cfg.group; home = cfg.spoolDir; @@ -102,7 +102,7 @@ in { uid = config.ids.uids.ejabberd; }); - users.extraGroups = optionalAttrs (cfg.group == "ejabberd") (singleton + users.groups = optionalAttrs (cfg.group == "ejabberd") (singleton { name = "ejabberd"; gid = config.ids.gids.ejabberd; }); diff --git a/nixos/modules/services/networking/firewall.nix b/nixos/modules/services/networking/firewall.nix index c4bd0e7f9eef..36f1dd8d2479 100644 --- a/nixos/modules/services/networking/firewall.nix +++ b/nixos/modules/services/networking/firewall.nix @@ -148,38 +148,42 @@ let ip46tables -A nixos-fw -m conntrack --ctstate ESTABLISHED,RELATED -j nixos-fw-accept # Accept connections to the allowed TCP ports. - ${concatMapStrings (port: + ${concatStrings (mapAttrsToList (iface: cfg: + concatMapStrings (port: '' - ip46tables -A nixos-fw -p tcp --dport ${toString port} -j nixos-fw-accept + ip46tables -A nixos-fw -p tcp --dport ${toString port} -j nixos-fw-accept ${optionalString (iface != "default") "-i ${iface}"} '' ) cfg.allowedTCPPorts - } + ) cfg.interfaces)} # Accept connections to the allowed TCP port ranges. - ${concatMapStrings (rangeAttr: + ${concatStrings (mapAttrsToList (iface: cfg: + concatMapStrings (rangeAttr: let range = toString rangeAttr.from + ":" + toString rangeAttr.to; in '' - ip46tables -A nixos-fw -p tcp --dport ${range} -j nixos-fw-accept + ip46tables -A nixos-fw -p tcp --dport ${range} -j nixos-fw-accept ${optionalString (iface != "default") "-i ${iface}"} '' ) cfg.allowedTCPPortRanges - } + ) cfg.interfaces)} # Accept packets on the allowed UDP ports. - ${concatMapStrings (port: + ${concatStrings (mapAttrsToList (iface: cfg: + concatMapStrings (port: '' - ip46tables -A nixos-fw -p udp --dport ${toString port} -j nixos-fw-accept + ip46tables -A nixos-fw -p udp --dport ${toString port} -j nixos-fw-accept ${optionalString (iface != "default") "-i ${iface}"} '' ) cfg.allowedUDPPorts - } + ) cfg.interfaces)} # Accept packets on the allowed UDP port ranges. - ${concatMapStrings (rangeAttr: + ${concatStrings (mapAttrsToList (iface: cfg: + concatMapStrings (rangeAttr: let range = toString rangeAttr.from + ":" + toString rangeAttr.to; in '' - ip46tables -A nixos-fw -p udp --dport ${range} -j nixos-fw-accept + ip46tables -A nixos-fw -p udp --dport ${range} -j nixos-fw-accept ${optionalString (iface != "default") "-i ${iface}"} '' ) cfg.allowedUDPPortRanges - } + ) cfg.interfaces)} # Accept IPv4 multicast. Not a big security risk since # probably nobody is listening anyway. @@ -254,106 +258,30 @@ let fi ''; -in - -{ - - ###### interface - - options = { - - networking.firewall.enable = mkOption { - type = types.bool; - default = true; - description = - '' - Whether to enable the firewall. This is a simple stateful - firewall that blocks connection attempts to unauthorised TCP - or UDP ports on this machine. It does not affect packet - forwarding. - ''; - }; - - networking.firewall.logRefusedConnections = mkOption { - type = types.bool; - default = true; - description = - '' - Whether to log rejected or dropped incoming connections. - ''; - }; - - networking.firewall.logRefusedPackets = mkOption { - type = types.bool; - default = false; - description = - '' - Whether to log all rejected or dropped incoming packets. - This tends to give a lot of log messages, so it's mostly - useful for debugging. - ''; - }; - - networking.firewall.logRefusedUnicastsOnly = mkOption { - type = types.bool; - default = true; - description = - '' - If <option>networking.firewall.logRefusedPackets</option> - and this option are enabled, then only log packets - specifically directed at this machine, i.e., not broadcasts - or multicasts. - ''; - }; - - networking.firewall.rejectPackets = mkOption { - type = types.bool; - default = false; - description = - '' - If set, refused packets are rejected rather than dropped - (ignored). This means that an ICMP "port unreachable" error - message is sent back to the client (or a TCP RST packet in - case of an existing connection). Rejecting packets makes - port scanning somewhat easier. - ''; - }; - - networking.firewall.trustedInterfaces = mkOption { - type = types.listOf types.str; - default = [ ]; - example = [ "enp0s2" ]; - description = - '' - Traffic coming in from these interfaces will be accepted - unconditionally. Traffic from the loopback (lo) interface - will always be accepted. - ''; - }; - - networking.firewall.allowedTCPPorts = mkOption { + commonOptions = { + allowedTCPPorts = mkOption { type = types.listOf types.int; default = [ ]; example = [ 22 80 ]; description = - '' + '' List of TCP ports on which incoming connections are accepted. ''; }; - networking.firewall.allowedTCPPortRanges = mkOption { + allowedTCPPortRanges = mkOption { type = types.listOf (types.attrsOf types.int); default = [ ]; example = [ { from = 8999; to = 9003; } ]; description = - '' + '' A range of TCP ports on which incoming connections are accepted. ''; }; - networking.firewall.allowedUDPPorts = mkOption { + allowedUDPPorts = mkOption { type = types.listOf types.int; default = [ ]; example = [ 53 ]; @@ -363,7 +291,7 @@ in ''; }; - networking.firewall.allowedUDPPortRanges = mkOption { + allowedUDPPortRanges = mkOption { type = types.listOf (types.attrsOf types.int); default = [ ]; example = [ { from = 60000; to = 61000; } ]; @@ -372,133 +300,226 @@ in Range of open UDP ports. ''; }; + }; - networking.firewall.allowPing = mkOption { - type = types.bool; - default = true; - description = - '' - Whether to respond to incoming ICMPv4 echo requests - ("pings"). ICMPv6 pings are always allowed because the - larger address space of IPv6 makes network scanning much - less effective. - ''; - }; +in - networking.firewall.pingLimit = mkOption { - type = types.nullOr (types.separatedString " "); - default = null; - example = "--limit 1/minute --limit-burst 5"; - description = - '' - If pings are allowed, this allows setting rate limits - on them. If non-null, this option should be in the form of - flags like "--limit 1/minute --limit-burst 5" - ''; - }; +{ - networking.firewall.checkReversePath = mkOption { - type = types.either types.bool (types.enum ["strict" "loose"]); - default = kernelHasRPFilter; - example = "loose"; - description = - '' - Performs a reverse path filter test on a packet. If a reply - to the packet would not be sent via the same interface that - the packet arrived on, it is refused. + ###### interface - If using asymmetric routing or other complicated routing, set - this option to loose mode or disable it and setup your own - counter-measures. + options = { - This option can be either true (or "strict"), "loose" (only - drop the packet if the source address is not reachable via any - interface) or false. Defaults to the value of - kernelHasRPFilter. + networking.firewall = { + enable = mkOption { + type = types.bool; + default = true; + description = + '' + Whether to enable the firewall. This is a simple stateful + firewall that blocks connection attempts to unauthorised TCP + or UDP ports on this machine. It does not affect packet + forwarding. + ''; + }; - (needs kernel 3.3+) - ''; - }; + logRefusedConnections = mkOption { + type = types.bool; + default = true; + description = + '' + Whether to log rejected or dropped incoming connections. + ''; + }; - networking.firewall.logReversePathDrops = mkOption { - type = types.bool; - default = false; - description = - '' - Logs dropped packets failing the reverse path filter test if - the option networking.firewall.checkReversePath is enabled. - ''; - }; + logRefusedPackets = mkOption { + type = types.bool; + default = false; + description = + '' + Whether to log all rejected or dropped incoming packets. + This tends to give a lot of log messages, so it's mostly + useful for debugging. + ''; + }; - networking.firewall.connectionTrackingModules = mkOption { - type = types.listOf types.str; - default = [ ]; - example = [ "ftp" "irc" "sane" "sip" "tftp" "amanda" "h323" "netbios_sn" "pptp" "snmp" ]; - description = - '' - List of connection-tracking helpers that are auto-loaded. - The complete list of possible values is given in the example. - - As helpers can pose as a security risk, it is advised to - set this to an empty list and disable the setting - networking.firewall.autoLoadConntrackHelpers unless you - know what you are doing. Connection tracking is disabled - by default. - - Loading of helpers is recommended to be done through the - CT target. More info: - https://home.regit.org/netfilter-en/secure-use-of-helpers/ - ''; - }; + logRefusedUnicastsOnly = mkOption { + type = types.bool; + default = true; + description = + '' + If <option>networking.firewall.logRefusedPackets</option> + and this option are enabled, then only log packets + specifically directed at this machine, i.e., not broadcasts + or multicasts. + ''; + }; - networking.firewall.autoLoadConntrackHelpers = mkOption { - type = types.bool; - default = false; - description = - '' - Whether to auto-load connection-tracking helpers. - See the description at networking.firewall.connectionTrackingModules + rejectPackets = mkOption { + type = types.bool; + default = false; + description = + '' + If set, refused packets are rejected rather than dropped + (ignored). This means that an ICMP "port unreachable" error + message is sent back to the client (or a TCP RST packet in + case of an existing connection). Rejecting packets makes + port scanning somewhat easier. + ''; + }; - (needs kernel 3.5+) - ''; - }; + trustedInterfaces = mkOption { + type = types.listOf types.str; + default = [ ]; + example = [ "enp0s2" ]; + description = + '' + Traffic coming in from these interfaces will be accepted + unconditionally. Traffic from the loopback (lo) interface + will always be accepted. + ''; + }; - networking.firewall.extraCommands = mkOption { - type = types.lines; - default = ""; - example = "iptables -A INPUT -p icmp -j ACCEPT"; - description = - '' - Additional shell commands executed as part of the firewall - initialisation script. These are executed just before the - final "reject" firewall rule is added, so they can be used - to allow packets that would otherwise be refused. - ''; - }; + allowPing = mkOption { + type = types.bool; + default = true; + description = + '' + Whether to respond to incoming ICMPv4 echo requests + ("pings"). ICMPv6 pings are always allowed because the + larger address space of IPv6 makes network scanning much + less effective. + ''; + }; - networking.firewall.extraPackages = mkOption { - type = types.listOf types.package; - default = [ ]; - example = literalExample "[ pkgs.ipset ]"; - description = - '' - Additional packages to be included in the environment of the system - as well as the path of networking.firewall.extraCommands. - ''; - }; + pingLimit = mkOption { + type = types.nullOr (types.separatedString " "); + default = null; + example = "--limit 1/minute --limit-burst 5"; + description = + '' + If pings are allowed, this allows setting rate limits + on them. If non-null, this option should be in the form of + flags like "--limit 1/minute --limit-burst 5" + ''; + }; - networking.firewall.extraStopCommands = mkOption { - type = types.lines; - default = ""; - example = "iptables -P INPUT ACCEPT"; - description = - '' - Additional shell commands executed as part of the firewall - shutdown script. These are executed just after the removal - of the NixOS input rule, or if the service enters a failed - state. - ''; - }; + checkReversePath = mkOption { + type = types.either types.bool (types.enum ["strict" "loose"]); + default = kernelHasRPFilter; + example = "loose"; + description = + '' + Performs a reverse path filter test on a packet. If a reply + to the packet would not be sent via the same interface that + the packet arrived on, it is refused. + + If using asymmetric routing or other complicated routing, set + this option to loose mode or disable it and setup your own + counter-measures. + + This option can be either true (or "strict"), "loose" (only + drop the packet if the source address is not reachable via any + interface) or false. Defaults to the value of + kernelHasRPFilter. + + (needs kernel 3.3+) + ''; + }; + + logReversePathDrops = mkOption { + type = types.bool; + default = false; + description = + '' + Logs dropped packets failing the reverse path filter test if + the option networking.firewall.checkReversePath is enabled. + ''; + }; + + connectionTrackingModules = mkOption { + type = types.listOf types.str; + default = [ ]; + example = [ "ftp" "irc" "sane" "sip" "tftp" "amanda" "h323" "netbios_sn" "pptp" "snmp" ]; + description = + '' + List of connection-tracking helpers that are auto-loaded. + The complete list of possible values is given in the example. + + As helpers can pose as a security risk, it is advised to + set this to an empty list and disable the setting + networking.firewall.autoLoadConntrackHelpers unless you + know what you are doing. Connection tracking is disabled + by default. + + Loading of helpers is recommended to be done through the + CT target. More info: + https://home.regit.org/netfilter-en/secure-use-of-helpers/ + ''; + }; + + autoLoadConntrackHelpers = mkOption { + type = types.bool; + default = false; + description = + '' + Whether to auto-load connection-tracking helpers. + See the description at networking.firewall.connectionTrackingModules + + (needs kernel 3.5+) + ''; + }; + + extraCommands = mkOption { + type = types.lines; + default = ""; + example = "iptables -A INPUT -p icmp -j ACCEPT"; + description = + '' + Additional shell commands executed as part of the firewall + initialisation script. These are executed just before the + final "reject" firewall rule is added, so they can be used + to allow packets that would otherwise be refused. + ''; + }; + + extraPackages = mkOption { + type = types.listOf types.package; + default = [ ]; + example = literalExample "[ pkgs.ipset ]"; + description = + '' + Additional packages to be included in the environment of the system + as well as the path of networking.firewall.extraCommands. + ''; + }; + + extraStopCommands = mkOption { + type = types.lines; + default = ""; + example = "iptables -P INPUT ACCEPT"; + description = + '' + Additional shell commands executed as part of the firewall + shutdown script. These are executed just after the removal + of the NixOS input rule, or if the service enters a failed + state. + ''; + }; + + interfaces = mkOption { + default = { + default = mapAttrs (name: value: cfg."${name}") commonOptions; + }; + type = with types; attrsOf (submodule [ { options = commonOptions; } ]); + description = + '' + Interface-specific open ports. Setting this value will override + all values of the <literal>networking.firewall.allowed*</literal> + options. + ''; + }; + } // commonOptions; }; diff --git a/nixos/modules/services/networking/freenet.nix b/nixos/modules/services/networking/freenet.nix index 3903a2c708cb..3da3ab0c7df4 100644 --- a/nixos/modules/services/networking/freenet.nix +++ b/nixos/modules/services/networking/freenet.nix @@ -50,7 +50,7 @@ in serviceConfig.Nice = cfg.nice; }; - users.extraUsers.freenet = { + users.users.freenet = { group = "freenet"; description = "Freenet daemon user"; home = varDir; @@ -58,7 +58,7 @@ in uid = config.ids.uids.freenet; }; - users.extraGroups.freenet.gid = config.ids.gids.freenet; + users.groups.freenet.gid = config.ids.gids.freenet; }; } diff --git a/nixos/modules/services/networking/freeradius.nix b/nixos/modules/services/networking/freeradius.nix index 45cba1ce2770..e192b70c129c 100644 --- a/nixos/modules/services/networking/freeradius.nix +++ b/nixos/modules/services/networking/freeradius.nix @@ -59,7 +59,7 @@ in config = mkIf (cfg.enable) { users = { - extraUsers.radius = { + users.radius = { /*uid = config.ids.uids.radius;*/ description = "Radius daemon user"; }; diff --git a/nixos/modules/services/networking/gale.nix b/nixos/modules/services/networking/gale.nix index fd83f9e3c1b7..7083d87c4073 100644 --- a/nixos/modules/services/networking/gale.nix +++ b/nixos/modules/services/networking/gale.nix @@ -104,7 +104,7 @@ in systemPackages = [ pkgs.gale ]; }; - users.extraUsers = [{ + users.users = [{ name = cfg.user; description = "Gale daemon"; uid = config.ids.uids.gale; @@ -113,7 +113,7 @@ in createHome = true; }]; - users.extraGroups = [{ + users.groups = [{ name = cfg.group; gid = config.ids.gids.gale; }]; diff --git a/nixos/modules/services/networking/gateone.nix b/nixos/modules/services/networking/gateone.nix index 78ff0b76198c..4456a95402ed 100644 --- a/nixos/modules/services/networking/gateone.nix +++ b/nixos/modules/services/networking/gateone.nix @@ -23,12 +23,12 @@ config = mkIf cfg.enable { environment.systemPackages = with pkgs.pythonPackages; [ gateone pkgs.openssh pkgs.procps pkgs.coreutils pkgs.cacert]; - users.extraUsers.gateone = { + users.users.gateone = { description = "GateOne privilege separation user"; uid = config.ids.uids.gateone; home = cfg.settingsDir; }; - users.extraGroups.gateone.gid = config.ids.gids.gateone; + users.groups.gateone.gid = config.ids.gids.gateone; systemd.services.gateone = with pkgs; { description = "GateOne web-based terminal"; diff --git a/nixos/modules/services/networking/git-daemon.nix b/nixos/modules/services/networking/git-daemon.nix index cd3fcd0f8f66..c0020349ec74 100644 --- a/nixos/modules/services/networking/git-daemon.nix +++ b/nixos/modules/services/networking/git-daemon.nix @@ -104,13 +104,13 @@ in config = mkIf cfg.enable { - users.extraUsers = if cfg.user != "git" then {} else singleton + users.users = if cfg.user != "git" then {} else singleton { name = "git"; uid = config.ids.uids.git; description = "Git daemon user"; }; - users.extraGroups = if cfg.group != "git" then {} else singleton + users.groups = if cfg.group != "git" then {} else singleton { name = "git"; gid = config.ids.gids.git; }; diff --git a/nixos/modules/services/networking/gnunet.nix b/nixos/modules/services/networking/gnunet.nix index 008b09e81a57..6a1db81413c5 100644 --- a/nixos/modules/services/networking/gnunet.nix +++ b/nixos/modules/services/networking/gnunet.nix @@ -126,7 +126,7 @@ in config = mkIf config.services.gnunet.enable { - users.extraUsers.gnunet = { + users.users.gnunet = { group = "gnunet"; description = "GNUnet User"; home = homeDir; @@ -134,7 +134,7 @@ in uid = config.ids.uids.gnunet; }; - users.extraGroups.gnunet.gid = config.ids.gids.gnunet; + users.groups.gnunet.gid = config.ids.gids.gnunet; # The user tools that talk to `gnunetd' should come from the same source, # so install them globally. diff --git a/nixos/modules/services/networking/hans.nix b/nixos/modules/services/networking/hans.nix index dd34ef8d4ca1..20e57e4626ef 100644 --- a/nixos/modules/services/networking/hans.nix +++ b/nixos/modules/services/networking/hans.nix @@ -135,7 +135,7 @@ in }; }; - users.extraUsers = singleton { + users.users = singleton { name = hansUser; description = "Hans daemon user"; }; diff --git a/nixos/modules/services/networking/haproxy.nix b/nixos/modules/services/networking/haproxy.nix index 09e48ec4bff0..0438d0bf8d86 100644 --- a/nixos/modules/services/networking/haproxy.nix +++ b/nixos/modules/services/networking/haproxy.nix @@ -52,11 +52,11 @@ with lib; environment.systemPackages = [ pkgs.haproxy ]; - users.extraUsers.haproxy = { + users.users.haproxy = { group = "haproxy"; uid = config.ids.uids.haproxy; }; - users.extraGroups.haproxy.gid = config.ids.uids.haproxy; + users.groups.haproxy.gid = config.ids.uids.haproxy; }; } diff --git a/nixos/modules/services/networking/i2p.nix b/nixos/modules/services/networking/i2p.nix index e6ee5fd1f957..3b6010531f13 100644 --- a/nixos/modules/services/networking/i2p.nix +++ b/nixos/modules/services/networking/i2p.nix @@ -11,14 +11,14 @@ in { ###### implementation config = mkIf cfg.enable { - users.extraUsers.i2p = { + users.users.i2p = { group = "i2p"; description = "i2p User"; home = homeDir; createHome = true; uid = config.ids.uids.i2p; }; - users.extraGroups.i2p.gid = config.ids.gids.i2p; + users.groups.i2p.gid = config.ids.gids.i2p; systemd.services.i2p = { description = "I2P router with administration interface for hidden services"; after = [ "network.target" ]; diff --git a/nixos/modules/services/networking/i2pd.nix b/nixos/modules/services/networking/i2pd.nix index 8f5aeee4a16b..8875309143fd 100644 --- a/nixos/modules/services/networking/i2pd.nix +++ b/nixos/modules/services/networking/i2pd.nix @@ -456,7 +456,7 @@ in config = mkIf cfg.enable { - users.extraUsers.i2pd = { + users.users.i2pd = { group = "i2pd"; description = "I2Pd User"; home = homeDir; @@ -464,7 +464,7 @@ in uid = config.ids.uids.i2pd; }; - users.extraGroups.i2pd.gid = config.ids.gids.i2pd; + users.groups.i2pd.gid = config.ids.gids.i2pd; systemd.services.i2pd = { description = "Minimal I2P router"; diff --git a/nixos/modules/services/networking/iodine.nix b/nixos/modules/services/networking/iodine.nix index 3f41421d27f7..58ad0df4ff20 100644 --- a/nixos/modules/services/networking/iodine.nix +++ b/nixos/modules/services/networking/iodine.nix @@ -140,11 +140,11 @@ in }; }; - users.extraUsers = singleton { + users.users = singleton { name = iodinedUser; uid = config.ids.uids.iodined; description = "Iodine daemon user"; }; - users.extraGroups.iodined.gid = config.ids.gids.iodined; + users.groups.iodined.gid = config.ids.gids.iodined; }; } diff --git a/nixos/modules/services/networking/ircd-hybrid/default.nix b/nixos/modules/services/networking/ircd-hybrid/default.nix index bd583fb020ec..2bd898edf897 100644 --- a/nixos/modules/services/networking/ircd-hybrid/default.nix +++ b/nixos/modules/services/networking/ircd-hybrid/default.nix @@ -112,14 +112,14 @@ in config = mkIf config.services.ircdHybrid.enable { - users.extraUsers = singleton + users.users = singleton { name = "ircd"; description = "IRCD owner"; group = "ircd"; uid = config.ids.uids.ircd; }; - users.extraGroups.ircd.gid = config.ids.gids.ircd; + users.groups.ircd.gid = config.ids.gids.ircd; systemd.services."ircd-hybrid" = { description = "IRCD Hybrid server"; diff --git a/nixos/modules/services/networking/kippo.nix b/nixos/modules/services/networking/kippo.nix index 834de4fdc09f..40c38254a57c 100644 --- a/nixos/modules/services/networking/kippo.nix +++ b/nixos/modules/services/networking/kippo.nix @@ -73,12 +73,12 @@ rec { ${cfg.extraConfig} ''; - users.extraUsers = singleton { + users.users = singleton { name = "kippo"; description = "kippo web server privilege separation user"; uid = 108; # why does config.ids.uids.kippo give an error? }; - users.extraGroups = singleton { name = "kippo";gid=108; }; + users.groups = singleton { name = "kippo";gid=108; }; systemd.services.kippo = with pkgs; { description = "Kippo Web Server"; diff --git a/nixos/modules/services/networking/kresd.nix b/nixos/modules/services/networking/kresd.nix index aac02b811d71..ca34ff9df4ef 100644 --- a/nixos/modules/services/networking/kresd.nix +++ b/nixos/modules/services/networking/kresd.nix @@ -62,13 +62,13 @@ in config = mkIf cfg.enable { environment.etc."kresd.conf".source = configFile; # not required - users.extraUsers = singleton + users.users = singleton { name = "kresd"; uid = config.ids.uids.kresd; group = "kresd"; description = "Knot-resolver daemon user"; }; - users.extraGroups = singleton + users.groups = singleton { name = "kresd"; gid = config.ids.gids.kresd; }; diff --git a/nixos/modules/services/networking/lambdabot.nix b/nixos/modules/services/networking/lambdabot.nix index 5a61a9f96782..b7c8bd008fe1 100644 --- a/nixos/modules/services/networking/lambdabot.nix +++ b/nixos/modules/services/networking/lambdabot.nix @@ -67,7 +67,7 @@ in }; }; - users.extraUsers.lambdabot = { + users.users.lambdabot = { group = "lambdabot"; description = "Lambdabot daemon user"; home = "/var/lib/lambdabot"; @@ -75,7 +75,7 @@ in uid = config.ids.uids.lambdabot; }; - users.extraGroups.lambdabot.gid = config.ids.gids.lambdabot; + users.groups.lambdabot.gid = config.ids.gids.lambdabot; }; diff --git a/nixos/modules/services/networking/lldpd.nix b/nixos/modules/services/networking/lldpd.nix index db1534edfd7c..dec30cc92f6a 100644 --- a/nixos/modules/services/networking/lldpd.nix +++ b/nixos/modules/services/networking/lldpd.nix @@ -20,13 +20,13 @@ in }; config = mkIf cfg.enable { - users.extraUsers._lldpd = { + users.users._lldpd = { description = "lldpd user"; group = "_lldpd"; home = "/var/run/lldpd"; isSystemUser = true; }; - users.extraGroups._lldpd = {}; + users.groups._lldpd = {}; environment.systemPackages = [ pkgs.lldpd ]; systemd.packages = [ pkgs.lldpd ]; diff --git a/nixos/modules/services/networking/mailpile.nix b/nixos/modules/services/networking/mailpile.nix index e164d41483c7..c42d3d5a44cb 100644 --- a/nixos/modules/services/networking/mailpile.nix +++ b/nixos/modules/services/networking/mailpile.nix @@ -41,14 +41,14 @@ in config = mkIf config.services.mailpile.enable { - users.extraUsers.mailpile = + users.users.mailpile = { uid = config.ids.uids.mailpile; description = "Mailpile user"; createHome = true; home = "/var/lib/mailpile"; }; - users.extraGroups.mailpile = + users.groups.mailpile = { gid = config.ids.gids.mailpile; }; diff --git a/nixos/modules/services/networking/matterbridge.nix b/nixos/modules/services/networking/matterbridge.nix index e2f478405953..1fd63348c16c 100644 --- a/nixos/modules/services/networking/matterbridge.nix +++ b/nixos/modules/services/networking/matterbridge.nix @@ -92,12 +92,12 @@ in warnings = optional options.services.matterbridge.configFile.isDefined "The option services.matterbridge.configFile is insecure and should be replaced with services.matterbridge.configPath"; - users.extraUsers = optional (cfg.user == "matterbridge") + users.users = optional (cfg.user == "matterbridge") { name = "matterbridge"; group = "matterbridge"; }; - users.extraGroups = optional (cfg.group == "matterbridge") + users.groups = optional (cfg.group == "matterbridge") { name = "matterbridge"; }; diff --git a/nixos/modules/services/networking/minidlna.nix b/nixos/modules/services/networking/minidlna.nix index 6401631bf620..1858f03cac1f 100644 --- a/nixos/modules/services/networking/minidlna.nix +++ b/nixos/modules/services/networking/minidlna.nix @@ -84,13 +84,13 @@ in '') cfg.mediaDirs} ''; - users.extraUsers.minidlna = { + users.users.minidlna = { description = "MiniDLNA daemon user"; group = "minidlna"; uid = config.ids.uids.minidlna; }; - users.extraGroups.minidlna.gid = config.ids.gids.minidlna; + users.groups.minidlna.gid = config.ids.gids.minidlna; systemd.services.minidlna = { description = "MiniDLNA Server"; diff --git a/nixos/modules/services/networking/mjpg-streamer.nix b/nixos/modules/services/networking/mjpg-streamer.nix index 1286b0c7ef6c..e0a6c112e3cb 100644 --- a/nixos/modules/services/networking/mjpg-streamer.nix +++ b/nixos/modules/services/networking/mjpg-streamer.nix @@ -49,7 +49,7 @@ in { config = mkIf cfg.enable { - users.extraUsers = optional (cfg.user == "mjpg-streamer") { + users.users = optional (cfg.user == "mjpg-streamer") { name = "mjpg-streamer"; uid = config.ids.uids.mjpg-streamer; group = cfg.group; diff --git a/nixos/modules/services/networking/monero.nix b/nixos/modules/services/networking/monero.nix index 31379189f5de..8241c32bad07 100644 --- a/nixos/modules/services/networking/monero.nix +++ b/nixos/modules/services/networking/monero.nix @@ -197,7 +197,7 @@ in config = mkIf cfg.enable { - users.extraUsers = singleton { + users.users = singleton { name = "monero"; uid = config.ids.uids.monero; description = "Monero daemon user"; @@ -205,7 +205,7 @@ in createHome = true; }; - users.extraGroups = singleton { + users.groups = singleton { name = "monero"; gid = config.ids.gids.monero; }; diff --git a/nixos/modules/services/networking/morty.nix b/nixos/modules/services/networking/morty.nix index b31bec9a8627..f24562f11817 100644 --- a/nixos/modules/services/networking/morty.nix +++ b/nixos/modules/services/networking/morty.nix @@ -72,7 +72,7 @@ in config = mkIf config.services.morty.enable { - users.extraUsers.morty = + users.users.morty = { description = "Morty user"; createHome = true; home = "/var/lib/morty"; diff --git a/nixos/modules/services/networking/mosquitto.nix b/nixos/modules/services/networking/mosquitto.nix index d8135f4d0ffa..332dc541345e 100644 --- a/nixos/modules/services/networking/mosquitto.nix +++ b/nixos/modules/services/networking/mosquitto.nix @@ -218,7 +218,7 @@ in ) cfg.users); }; - users.extraUsers.mosquitto = { + users.users.mosquitto = { description = "Mosquitto MQTT Broker Daemon owner"; group = "mosquitto"; uid = config.ids.uids.mosquitto; @@ -226,7 +226,7 @@ in createHome = true; }; - users.extraGroups.mosquitto.gid = config.ids.gids.mosquitto; + users.groups.mosquitto.gid = config.ids.gids.mosquitto; }; } diff --git a/nixos/modules/services/networking/murmur.nix b/nixos/modules/services/networking/murmur.nix index 873d62dbf341..fcc813e6898f 100644 --- a/nixos/modules/services/networking/murmur.nix +++ b/nixos/modules/services/networking/murmur.nix @@ -238,7 +238,7 @@ in }; config = mkIf cfg.enable { - users.extraUsers.murmur = { + users.users.murmur = { description = "Murmur Service user"; home = "/var/lib/murmur"; createHome = true; @@ -248,7 +248,7 @@ in systemd.services.murmur = { description = "Murmur Chat Service"; wantedBy = [ "multi-user.target" ]; - after = [ "network.target "]; + after = [ "network-online.target "]; serviceConfig = { Type = "forking"; diff --git a/nixos/modules/services/networking/namecoind.nix b/nixos/modules/services/networking/namecoind.nix index 11f7d7e5caef..8de23b442f93 100644 --- a/nixos/modules/services/networking/namecoind.nix +++ b/nixos/modules/services/networking/namecoind.nix @@ -153,7 +153,7 @@ in config = ${configFile} ''; - users.extraUsers = singleton { + users.users = singleton { name = "namecoin"; uid = config.ids.uids.namecoin; description = "Namecoin daemon user"; @@ -161,7 +161,7 @@ in createHome = true; }; - users.extraGroups = singleton { + users.groups = singleton { name = "namecoin"; gid = config.ids.gids.namecoin; }; diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix index 4e51725b19de..cdc3a3525904 100644 --- a/nixos/modules/services/networking/networkmanager.nix +++ b/nixos/modules/services/networking/networkmanager.nix @@ -366,7 +366,7 @@ in { environment.systemPackages = cfg.packages; - users.extraGroups = [{ + users.groups = [{ name = "networkmanager"; gid = config.ids.gids.networkmanager; } @@ -374,7 +374,7 @@ in { name = "nm-openvpn"; gid = config.ids.gids.nm-openvpn; }]; - users.extraUsers = [{ + users.users = [{ name = "nm-openvpn"; uid = config.ids.uids.nm-openvpn; extraGroups = [ "networkmanager" ]; diff --git a/nixos/modules/services/networking/ngircd.nix b/nixos/modules/services/networking/ngircd.nix index 6a5290ffdee2..4b2fa7795922 100644 --- a/nixos/modules/services/networking/ngircd.nix +++ b/nixos/modules/services/networking/ngircd.nix @@ -51,7 +51,7 @@ in { serviceConfig.User = "ngircd"; }; - users.extraUsers.ngircd = { + users.users.ngircd = { uid = config.ids.uids.ngircd; description = "ngircd user."; }; diff --git a/nixos/modules/services/networking/nix-serve.nix b/nixos/modules/services/networking/nix-serve.nix index 8499e7c0f7c4..e83cad949ae8 100644 --- a/nixos/modules/services/networking/nix-serve.nix +++ b/nixos/modules/services/networking/nix-serve.nix @@ -64,7 +64,7 @@ in }; }; - users.extraUsers.nix-serve = { + users.users.nix-serve = { description = "Nix-serve user"; uid = config.ids.uids.nix-serve; }; diff --git a/nixos/modules/services/networking/nntp-proxy.nix b/nixos/modules/services/networking/nntp-proxy.nix index 7eebecb23b00..d24d6f77a491 100644 --- a/nixos/modules/services/networking/nntp-proxy.nix +++ b/nixos/modules/services/networking/nntp-proxy.nix @@ -210,7 +210,7 @@ in config = mkIf cfg.enable { - users.extraUsers = singleton + users.users = singleton { name = proxyUser; uid = config.ids.uids.nntp-proxy; description = "NNTP-Proxy daemon user"; diff --git a/nixos/modules/services/networking/nsd.nix b/nixos/modules/services/networking/nsd.nix index fc910e59c323..cde47bf23eae 100644 --- a/nixos/modules/services/networking/nsd.nix +++ b/nixos/modules/services/networking/nsd.nix @@ -897,12 +897,12 @@ in environment.systemPackages = [ nsdPkg ]; - users.extraGroups = singleton { + users.groups = singleton { name = username; gid = config.ids.gids.nsd; }; - users.extraUsers = singleton { + users.users = singleton { name = username; description = "NSD service user"; home = stateDir; diff --git a/nixos/modules/services/networking/ntpd.nix b/nixos/modules/services/networking/ntpd.nix index 88e6dbf22b9e..342350d49ab3 100644 --- a/nixos/modules/services/networking/ntpd.nix +++ b/nixos/modules/services/networking/ntpd.nix @@ -67,7 +67,7 @@ in environment.systemPackages = [ pkgs.ntp ]; services.timesyncd.enable = mkForce false; - users.extraUsers = singleton + users.users = singleton { name = ntpUser; uid = config.ids.uids.ntp; description = "NTP daemon user"; diff --git a/nixos/modules/services/networking/nylon.nix b/nixos/modules/services/networking/nylon.nix index 4864ecf3f92f..b7b59d95bf02 100644 --- a/nixos/modules/services/networking/nylon.nix +++ b/nixos/modules/services/networking/nylon.nix @@ -151,7 +151,7 @@ in config = mkIf (length(enabledNylons) > 0) { - users.extraUsers.nylon = { + users.users.nylon = { group = "nylon"; description = "Nylon SOCKS Proxy"; home = homeDir; @@ -159,7 +159,7 @@ in uid = config.ids.uids.nylon; }; - users.extraGroups.nylon.gid = config.ids.gids.nylon; + users.groups.nylon.gid = config.ids.gids.nylon; systemd.services = fold (a: b: a // b) {} nylonUnits; diff --git a/nixos/modules/services/networking/oidentd.nix b/nixos/modules/services/networking/oidentd.nix index ba7acd879546..8cf34623ab5e 100644 --- a/nixos/modules/services/networking/oidentd.nix +++ b/nixos/modules/services/networking/oidentd.nix @@ -32,13 +32,13 @@ with lib; optionalString config.networking.enableIPv6 " -a ::"; }; - users.extraUsers.oidentd = { + users.users.oidentd = { description = "Ident Protocol daemon user"; group = "oidentd"; uid = config.ids.uids.oidentd; }; - users.extraGroups.oidentd.gid = config.ids.gids.oidentd; + users.groups.oidentd.gid = config.ids.gids.oidentd; }; diff --git a/nixos/modules/services/networking/openntpd.nix b/nixos/modules/services/networking/openntpd.nix index 241038ca12ed..57638ebc9c01 100644 --- a/nixos/modules/services/networking/openntpd.nix +++ b/nixos/modules/services/networking/openntpd.nix @@ -59,7 +59,7 @@ in environment.etc."ntpd.conf".text = configFile; - users.extraUsers = singleton { + users.users = singleton { name = "ntp"; uid = config.ids.uids.ntp; description = "OpenNTP daemon user"; diff --git a/nixos/modules/services/networking/owamp.nix b/nixos/modules/services/networking/owamp.nix index a0d3e70d8e57..821a0258f4be 100644 --- a/nixos/modules/services/networking/owamp.nix +++ b/nixos/modules/services/networking/owamp.nix @@ -17,13 +17,13 @@ in ###### implementation config = mkIf cfg.enable { - users.extraUsers = singleton { + users.users = singleton { name = "owamp"; group = "owamp"; description = "Owamp daemon"; }; - users.extraGroups = singleton { + users.groups = singleton { name = "owamp"; }; diff --git a/nixos/modules/services/networking/pdns-recursor.nix b/nixos/modules/services/networking/pdns-recursor.nix index 26be72d2a61e..d07deb9dcc67 100644 --- a/nixos/modules/services/networking/pdns-recursor.nix +++ b/nixos/modules/services/networking/pdns-recursor.nix @@ -128,7 +128,7 @@ in { config = mkIf cfg.enable { - users.extraUsers."${username}" = { + users.users."${username}" = { home = dataDir; createHome = true; uid = config.ids.uids.pdns-recursor; diff --git a/nixos/modules/services/networking/pdnsd.nix b/nixos/modules/services/networking/pdnsd.nix index f4467b818958..f5b174dd7b7b 100644 --- a/nixos/modules/services/networking/pdnsd.nix +++ b/nixos/modules/services/networking/pdnsd.nix @@ -62,14 +62,14 @@ in }; config = mkIf cfg.enable { - users.extraUsers = singleton { + users.users = singleton { name = pdnsdUser; uid = config.ids.uids.pdnsd; group = pdnsdGroup; description = "pdnsd user"; }; - users.extraGroups = singleton { + users.groups = singleton { name = pdnsdGroup; gid = config.ids.gids.pdnsd; }; diff --git a/nixos/modules/services/networking/polipo.nix b/nixos/modules/services/networking/polipo.nix index 847fc88ead4c..529115a1c6e1 100644 --- a/nixos/modules/services/networking/polipo.nix +++ b/nixos/modules/services/networking/polipo.nix @@ -85,7 +85,7 @@ in config = mkIf cfg.enable { - users.extraUsers = singleton + users.users = singleton { name = "polipo"; uid = config.ids.uids.polipo; description = "Polipo caching proxy user"; @@ -93,7 +93,7 @@ in createHome = true; }; - users.extraGroups = singleton + users.groups = singleton { name = "polipo"; gid = config.ids.gids.polipo; members = [ "polipo" ]; diff --git a/nixos/modules/services/networking/prayer.nix b/nixos/modules/services/networking/prayer.nix index 8cd4a0823534..f63f86496bee 100644 --- a/nixos/modules/services/networking/prayer.nix +++ b/nixos/modules/services/networking/prayer.nix @@ -72,14 +72,14 @@ in config = mkIf config.services.prayer.enable { environment.systemPackages = [ prayer ]; - users.extraUsers = singleton + users.users = singleton { name = prayerUser; uid = config.ids.uids.prayer; description = "Prayer daemon user"; home = stateDir; }; - users.extraGroups = singleton + users.groups = singleton { name = prayerGroup; gid = config.ids.gids.prayer; }; diff --git a/nixos/modules/services/networking/prosody.nix b/nixos/modules/services/networking/prosody.nix index 1b4f81f6b56e..a37ef98caec6 100644 --- a/nixos/modules/services/networking/prosody.nix +++ b/nixos/modules/services/networking/prosody.nix @@ -487,7 +487,7 @@ in '') cfg.virtualHosts) } ''; - users.extraUsers.prosody = mkIf (cfg.user == "prosody") { + users.users.prosody = mkIf (cfg.user == "prosody") { uid = config.ids.uids.prosody; description = "Prosody user"; createHome = true; @@ -495,7 +495,7 @@ in home = "${cfg.dataDir}"; }; - users.extraGroups.prosody = mkIf (cfg.group == "prosody") { + users.groups.prosody = mkIf (cfg.group == "prosody") { gid = config.ids.gids.prosody; }; diff --git a/nixos/modules/services/networking/quassel.nix b/nixos/modules/services/networking/quassel.nix index bc7d6912b5ce..d850bb8b1305 100644 --- a/nixos/modules/services/networking/quassel.nix +++ b/nixos/modules/services/networking/quassel.nix @@ -72,14 +72,14 @@ in config = mkIf cfg.enable { - users.extraUsers = mkIf (cfg.user == null) [ + users.users = mkIf (cfg.user == null) [ { name = "quassel"; description = "Quassel IRC client daemon"; group = "quassel"; uid = config.ids.uids.quassel; }]; - users.extraGroups = mkIf (cfg.user == null) [ + users.groups = mkIf (cfg.user == null) [ { name = "quassel"; gid = config.ids.gids.quassel; }]; diff --git a/nixos/modules/services/networking/radicale.nix b/nixos/modules/services/networking/radicale.nix index 97ee05046ff0..2afab5ee3b3e 100644 --- a/nixos/modules/services/networking/radicale.nix +++ b/nixos/modules/services/networking/radicale.nix @@ -59,7 +59,7 @@ in config = mkIf cfg.enable { environment.systemPackages = [ cfg.package ]; - users.extraUsers = singleton + users.users = singleton { name = "radicale"; uid = config.ids.uids.radicale; description = "radicale user"; @@ -67,7 +67,7 @@ in createHome = true; }; - users.extraGroups = singleton + users.groups = singleton { name = "radicale"; gid = config.ids.gids.radicale; }; diff --git a/nixos/modules/services/networking/radvd.nix b/nixos/modules/services/networking/radvd.nix index 85d7f9e4a41b..020faa34922a 100644 --- a/nixos/modules/services/networking/radvd.nix +++ b/nixos/modules/services/networking/radvd.nix @@ -52,7 +52,7 @@ in config = mkIf cfg.enable { - users.extraUsers.radvd = + users.users.radvd = { uid = config.ids.uids.radvd; description = "Router Advertisement Daemon User"; }; diff --git a/nixos/modules/services/networking/rdnssd.nix b/nixos/modules/services/networking/rdnssd.nix index a102242eae71..887772f6e5f0 100644 --- a/nixos/modules/services/networking/rdnssd.nix +++ b/nixos/modules/services/networking/rdnssd.nix @@ -64,7 +64,7 @@ in }; }; - users.extraUsers.rdnssd = { + users.users.rdnssd = { description = "RDNSSD Daemon User"; uid = config.ids.uids.rdnssd; }; diff --git a/nixos/modules/services/networking/resilio.nix b/nixos/modules/services/networking/resilio.nix index 2956a5ecbc04..ee7f82ac7bee 100644 --- a/nixos/modules/services/networking/resilio.nix +++ b/nixos/modules/services/networking/resilio.nix @@ -236,7 +236,7 @@ in } ]; - users.extraUsers.rslsync = { + users.users.rslsync = { description = "Resilio Sync Service user"; home = cfg.storagePath; createHome = true; @@ -244,7 +244,7 @@ in group = "rslsync"; }; - users.extraGroups = [ { name = "rslsync"; } ]; + users.groups = [ { name = "rslsync"; } ]; systemd.services.resilio = with pkgs; { description = "Resilio Sync Service"; diff --git a/nixos/modules/services/networking/rpcbind.nix b/nixos/modules/services/networking/rpcbind.nix index cddcb09054e0..0a5df6987092 100644 --- a/nixos/modules/services/networking/rpcbind.nix +++ b/nixos/modules/services/networking/rpcbind.nix @@ -37,7 +37,7 @@ with lib; wantedBy = [ "multi-user.target" ]; }; - users.extraUsers.rpc = { + users.users.rpc = { group = "nogroup"; uid = config.ids.uids.rpc; }; diff --git a/nixos/modules/services/networking/sabnzbd.nix b/nixos/modules/services/networking/sabnzbd.nix index cacf753fdcd7..62b24d4377f8 100644 --- a/nixos/modules/services/networking/sabnzbd.nix +++ b/nixos/modules/services/networking/sabnzbd.nix @@ -41,7 +41,7 @@ in config = mkIf cfg.enable { - users.extraUsers.sabnzbd = { + users.users.sabnzbd = { uid = config.ids.uids.sabnzbd; group = "sabnzbd"; description = "sabnzbd user"; @@ -49,7 +49,7 @@ in createHome = true; }; - users.extraGroups.sabnzbd = { + users.groups.sabnzbd = { gid = config.ids.gids.sabnzbd; }; diff --git a/nixos/modules/services/networking/searx.nix b/nixos/modules/services/networking/searx.nix index c7a128ae212d..9412d0ef8a62 100644 --- a/nixos/modules/services/networking/searx.nix +++ b/nixos/modules/services/networking/searx.nix @@ -47,14 +47,14 @@ in config = mkIf config.services.searx.enable { - users.extraUsers.searx = + users.users.searx = { uid = config.ids.uids.searx; description = "Searx user"; createHome = true; home = "/var/lib/searx"; }; - users.extraGroups.searx = + users.groups.searx = { gid = config.ids.gids.searx; }; diff --git a/nixos/modules/services/networking/seeks.nix b/nixos/modules/services/networking/seeks.nix index f5bc60be3457..40729225b6d0 100644 --- a/nixos/modules/services/networking/seeks.nix +++ b/nixos/modules/services/networking/seeks.nix @@ -46,14 +46,14 @@ in config = mkIf config.services.seeks.enable { - users.extraUsers.seeks = + users.users.seeks = { uid = config.ids.uids.seeks; description = "Seeks user"; createHome = true; home = "/var/lib/seeks"; }; - users.extraGroups.seeks = + users.groups.seeks = { gid = config.ids.gids.seeks; }; diff --git a/nixos/modules/services/networking/shairport-sync.nix b/nixos/modules/services/networking/shairport-sync.nix index 908de9efd6fb..0b87140b0d8d 100644 --- a/nixos/modules/services/networking/shairport-sync.nix +++ b/nixos/modules/services/networking/shairport-sync.nix @@ -55,7 +55,7 @@ in services.avahi.publish.enable = true; services.avahi.publish.userServices = true; - users.extraUsers = singleton + users.users = singleton { name = cfg.user; description = "Shairport user"; isSystemUser = true; diff --git a/nixos/modules/services/networking/shout.nix b/nixos/modules/services/networking/shout.nix index 3664c2857739..9784f1d160f3 100644 --- a/nixos/modules/services/networking/shout.nix +++ b/nixos/modules/services/networking/shout.nix @@ -82,7 +82,7 @@ in { }; config = mkIf cfg.enable { - users.extraUsers = singleton { + users.users = singleton { name = "shout"; uid = config.ids.uids.shout; description = "Shout daemon user"; diff --git a/nixos/modules/services/networking/smokeping.nix b/nixos/modules/services/networking/smokeping.nix index c5c131cb4c50..9ba6e48f417c 100644 --- a/nixos/modules/services/networking/smokeping.nix +++ b/nixos/modules/services/networking/smokeping.nix @@ -278,7 +278,7 @@ in "fping6".source = "${pkgs.fping}/bin/fping6"; }; environment.systemPackages = [ pkgs.fping ]; - users.extraUsers = singleton { + users.users = singleton { name = cfg.user; isNormalUser = false; isSystemUser = true; diff --git a/nixos/modules/services/networking/sniproxy.nix b/nixos/modules/services/networking/sniproxy.nix index 4d0f36923293..0345c12d3afe 100644 --- a/nixos/modules/services/networking/sniproxy.nix +++ b/nixos/modules/services/networking/sniproxy.nix @@ -82,14 +82,14 @@ in }; }; - users.extraUsers = mkIf (cfg.user == "sniproxy") { + users.users = mkIf (cfg.user == "sniproxy") { sniproxy = { group = cfg.group; uid = config.ids.uids.sniproxy; }; }; - users.extraGroups = mkIf (cfg.group == "sniproxy") { + users.groups = mkIf (cfg.group == "sniproxy") { sniproxy = { gid = config.ids.gids.sniproxy; }; diff --git a/nixos/modules/services/networking/spiped.nix b/nixos/modules/services/networking/spiped.nix index 005d7182351a..e60d9abf42a6 100644 --- a/nixos/modules/services/networking/spiped.nix +++ b/nixos/modules/services/networking/spiped.nix @@ -171,8 +171,8 @@ in message = "A pipe must either encrypt or decrypt"; }) cfg.config; - users.extraGroups.spiped.gid = config.ids.gids.spiped; - users.extraUsers.spiped = { + users.groups.spiped.gid = config.ids.gids.spiped; + users.users.spiped = { description = "Secure Pipe Service user"; group = "spiped"; uid = config.ids.uids.spiped; diff --git a/nixos/modules/services/networking/ssh/sshd.nix b/nixos/modules/services/networking/ssh/sshd.nix index 961e72b2b810..8b04fac089ef 100644 --- a/nixos/modules/services/networking/ssh/sshd.nix +++ b/nixos/modules/services/networking/ssh/sshd.nix @@ -49,7 +49,7 @@ let ${concatMapStrings (f: readFile f + "\n") u.openssh.authorizedKeys.keyFiles} ''; }; - usersWithKeys = attrValues (flip filterAttrs config.users.extraUsers (n: u: + usersWithKeys = attrValues (flip filterAttrs config.users.users (n: u: length u.openssh.authorizedKeys.keys != 0 || length u.openssh.authorizedKeys.keyFiles != 0 )); in listToAttrs (map mkAuthKeyFile usersWithKeys); @@ -326,7 +326,7 @@ in config = mkIf cfg.enable { - users.extraUsers.sshd = + users.users.sshd = { isSystemUser = true; description = "SSH privilege separation user"; }; diff --git a/nixos/modules/services/networking/supplicant.nix b/nixos/modules/services/networking/supplicant.nix index dc90a4bcc620..3c4321ab9e9d 100644 --- a/nixos/modules/services/networking/supplicant.nix +++ b/nixos/modules/services/networking/supplicant.nix @@ -183,7 +183,7 @@ in example = literalExample '' { "wlan0 wlan1" = { - configFile = "/etc/wpa_supplicant"; + configFile.path = "/etc/wpa_supplicant.conf"; userControlled.group = "network"; extraConf = ''' ap_scan=1 diff --git a/nixos/modules/services/networking/supybot.nix b/nixos/modules/services/networking/supybot.nix index 2cfb9fc9b923..64eb11068329 100644 --- a/nixos/modules/services/networking/supybot.nix +++ b/nixos/modules/services/networking/supybot.nix @@ -45,7 +45,7 @@ in environment.systemPackages = [ pkgs.pythonPackages.limnoria ]; - users.extraUsers = singleton { + users.users = singleton { name = "supybot"; uid = config.ids.uids.supybot; group = "supybot"; @@ -54,7 +54,7 @@ in createHome = true; }; - users.extraGroups.supybot = { + users.groups.supybot = { name = "supybot"; gid = config.ids.gids.supybot; }; diff --git a/nixos/modules/services/networking/syncthing.nix b/nixos/modules/services/networking/syncthing.nix index e485c073cbdd..c610b3b66606 100644 --- a/nixos/modules/services/networking/syncthing.nix +++ b/nixos/modules/services/networking/syncthing.nix @@ -103,7 +103,7 @@ in { systemd.packages = [ pkgs.syncthing ]; users = mkIf (cfg.user == defaultUser) { - extraUsers."${defaultUser}" = + users."${defaultUser}" = { group = cfg.group; home = cfg.dataDir; createHome = true; @@ -111,7 +111,7 @@ in { description = "Syncthing daemon user"; }; - extraGroups."${defaultUser}".gid = + groups."${defaultUser}".gid = config.ids.gids.syncthing; }; diff --git a/nixos/modules/services/networking/tcpcrypt.nix b/nixos/modules/services/networking/tcpcrypt.nix index ee005e11aa32..a0ccb9950094 100644 --- a/nixos/modules/services/networking/tcpcrypt.nix +++ b/nixos/modules/services/networking/tcpcrypt.nix @@ -29,7 +29,7 @@ in config = mkIf cfg.enable { - users.extraUsers = singleton { + users.users = singleton { name = "tcpcryptd"; uid = config.ids.uids.tcpcryptd; description = "tcpcrypt daemon user"; diff --git a/nixos/modules/services/networking/tinc.nix b/nixos/modules/services/networking/tinc.nix index 77bcdae80191..35cdddc590b8 100644 --- a/nixos/modules/services/networking/tinc.nix +++ b/nixos/modules/services/networking/tinc.nix @@ -209,7 +209,7 @@ in }; in [ cli-wrappers ]; - users.extraUsers = flip mapAttrs' cfg.networks (network: _: + users.users = flip mapAttrs' cfg.networks (network: _: nameValuePair ("tinc.${network}") ({ description = "Tinc daemon user for ${network}"; isSystemUser = true; diff --git a/nixos/modules/services/networking/tinydns.nix b/nixos/modules/services/networking/tinydns.nix index 184888ef05da..7d5db71601ef 100644 --- a/nixos/modules/services/networking/tinydns.nix +++ b/nixos/modules/services/networking/tinydns.nix @@ -32,7 +32,7 @@ with lib; config = mkIf config.services.tinydns.enable { environment.systemPackages = [ pkgs.djbdns ]; - users.extraUsers.tinydns = {}; + users.users.tinydns = {}; systemd.services.tinydns = { description = "djbdns tinydns server"; diff --git a/nixos/modules/services/networking/tox-bootstrapd.nix b/nixos/modules/services/networking/tox-bootstrapd.nix index cb0e6b158651..1d3492151690 100644 --- a/nixos/modules/services/networking/tox-bootstrapd.nix +++ b/nixos/modules/services/networking/tox-bootstrapd.nix @@ -56,7 +56,7 @@ in config = mkIf config.services.toxBootstrapd.enable { - users.extraUsers = singleton + users.users = singleton { name = "tox-bootstrapd"; uid = config.ids.uids.tox-bootstrapd; description = "Tox bootstrap daemon user"; diff --git a/nixos/modules/services/networking/toxvpn.nix b/nixos/modules/services/networking/toxvpn.nix index 5e13402d7645..f5baea9222be 100644 --- a/nixos/modules/services/networking/toxvpn.nix +++ b/nixos/modules/services/networking/toxvpn.nix @@ -57,7 +57,7 @@ with lib; environment.systemPackages = [ pkgs.toxvpn ]; - users.extraUsers = { + users.users = { toxvpn = { uid = config.ids.uids.toxvpn; home = "/var/lib/toxvpn"; diff --git a/nixos/modules/services/networking/tvheadend.nix b/nixos/modules/services/networking/tvheadend.nix index cdd8747ba898..f495c39967e8 100644 --- a/nixos/modules/services/networking/tvheadend.nix +++ b/nixos/modules/services/networking/tvheadend.nix @@ -3,7 +3,7 @@ with lib; let cfg = config.services.tvheadend; - pidFile = "${config.users.extraUsers.tvheadend.home}/tvheadend.pid"; + pidFile = "${config.users.users.tvheadend.home}/tvheadend.pid"; in { @@ -25,7 +25,7 @@ in }; config = mkIf cfg.enable { - users.extraUsers.tvheadend = { + users.users.tvheadend = { description = "Tvheadend Service user"; home = "/var/lib/tvheadend"; createHome = true; diff --git a/nixos/modules/services/networking/unifi.nix b/nixos/modules/services/networking/unifi.nix index 94958bfdd83e..ac10e77ba306 100644 --- a/nixos/modules/services/networking/unifi.nix +++ b/nixos/modules/services/networking/unifi.nix @@ -114,7 +114,7 @@ in config = mkIf cfg.enable { - users.extraUsers.unifi = { + users.users.unifi = { uid = config.ids.uids.unifi; description = "UniFi controller daemon user"; home = "${stateDir}"; diff --git a/nixos/modules/services/networking/vsftpd.nix b/nixos/modules/services/networking/vsftpd.nix index 6b3d658bd852..1f9107c3ce9c 100644 --- a/nixos/modules/services/networking/vsftpd.nix +++ b/nixos/modules/services/networking/vsftpd.nix @@ -193,7 +193,7 @@ in message = "vsftpd: If forceLocalLoginsSSL or forceLocalDataSSL is true then a rsaCertFile must be provided!"; }; - users.extraUsers = + users.users = [ { name = "vsftpd"; uid = config.ids.uids.vsftpd; description = "VSFTPD user"; @@ -207,7 +207,7 @@ in home = cfg.anonymousUserHome; }; - users.extraGroups.ftp.gid = config.ids.gids.ftp; + users.groups.ftp.gid = config.ids.gids.ftp; # If you really have to access root via FTP use mkOverride or userlistDeny # = false and whitelist root diff --git a/nixos/modules/services/networking/znc.nix b/nixos/modules/services/networking/znc.nix index 72313ab2ee14..76e4899c85ee 100644 --- a/nixos/modules/services/networking/znc.nix +++ b/nixos/modules/services/networking/znc.nix @@ -402,7 +402,7 @@ in script = "${pkgs.znc}/bin/znc --foreground --datadir ${cfg.dataDir} ${toString cfg.extraFlags}"; }; - users.extraUsers = optional (cfg.user == defaultUser) + users.users = optional (cfg.user == defaultUser) { name = defaultUser; description = "ZNC server daemon owner"; group = defaultUser; @@ -411,7 +411,7 @@ in createHome = true; }; - users.extraGroups = optional (cfg.user == defaultUser) + users.groups = optional (cfg.user == defaultUser) { name = defaultUser; gid = config.ids.gids.znc; members = [ defaultUser ]; diff --git a/nixos/modules/services/printing/cupsd.nix b/nixos/modules/services/printing/cupsd.nix index c4147986439c..b074d15cbec1 100644 --- a/nixos/modules/services/printing/cupsd.nix +++ b/nixos/modules/services/printing/cupsd.nix @@ -268,7 +268,7 @@ in config = mkIf config.services.printing.enable { - users.extraUsers = singleton + users.users = singleton { name = "cups"; uid = config.ids.uids.cups; group = "lp"; diff --git a/nixos/modules/services/scheduling/atd.nix b/nixos/modules/services/scheduling/atd.nix index 77a3f6b51e80..a32907647a0d 100644 --- a/nixos/modules/services/scheduling/atd.nix +++ b/nixos/modules/services/scheduling/atd.nix @@ -57,14 +57,14 @@ in security.pam.services.atd = {}; - users.extraUsers = singleton + users.users = singleton { name = "atd"; uid = config.ids.uids.atd; description = "atd user"; home = "/var/empty"; }; - users.extraGroups = singleton + users.groups = singleton { name = "atd"; gid = config.ids.gids.atd; }; diff --git a/nixos/modules/services/scheduling/chronos.nix b/nixos/modules/services/scheduling/chronos.nix index 6c39997fec88..9a8ed4c09ac1 100644 --- a/nixos/modules/services/scheduling/chronos.nix +++ b/nixos/modules/services/scheduling/chronos.nix @@ -49,6 +49,6 @@ in { }; }; - users.extraUsers.chronos.uid = config.ids.uids.chronos; + users.users.chronos.uid = config.ids.uids.chronos; }; } diff --git a/nixos/modules/services/scheduling/fcron.nix b/nixos/modules/services/scheduling/fcron.nix index 0ea41f3c3985..ae3828977753 100644 --- a/nixos/modules/services/scheduling/fcron.nix +++ b/nixos/modules/services/scheduling/fcron.nix @@ -115,7 +115,7 @@ in ]; environment.systemPackages = [ pkgs.fcron ]; - users.extraUsers.fcron = { + users.users.fcron = { uid = config.ids.uids.fcron; home = "/var/spool/fcron"; group = "fcron"; diff --git a/nixos/modules/services/scheduling/marathon.nix b/nixos/modules/services/scheduling/marathon.nix index 19c9a708f21f..0961a67770e1 100644 --- a/nixos/modules/services/scheduling/marathon.nix +++ b/nixos/modules/services/scheduling/marathon.nix @@ -93,6 +93,6 @@ in { }; }; - users.extraUsers.${cfg.user} = { }; + users.users.${cfg.user} = { }; }; } diff --git a/nixos/modules/services/search/hound.nix b/nixos/modules/services/search/hound.nix index a94a851e80ec..6740928db9a7 100644 --- a/nixos/modules/services/search/hound.nix +++ b/nixos/modules/services/search/hound.nix @@ -88,12 +88,12 @@ in { }; config = mkIf cfg.enable { - users.extraGroups = optional (cfg.group == "hound") { + users.groups = optional (cfg.group == "hound") { name = "hound"; gid = config.ids.gids.hound; }; - users.extraUsers = optional (cfg.user == "hound") { + users.users = optional (cfg.user == "hound") { name = "hound"; description = "hound code search"; createHome = true; diff --git a/nixos/modules/services/search/kibana.nix b/nixos/modules/services/search/kibana.nix index 9d7d2d799189..5885a72c6628 100644 --- a/nixos/modules/services/search/kibana.nix +++ b/nixos/modules/services/search/kibana.nix @@ -193,7 +193,7 @@ in { environment.systemPackages = [ cfg.package ]; - users.extraUsers = singleton { + users.users = singleton { name = "kibana"; uid = config.ids.uids.kibana; description = "Kibana service user"; diff --git a/nixos/modules/services/security/clamav.nix b/nixos/modules/services/security/clamav.nix index 4161c61ed375..9ad0095252de 100644 --- a/nixos/modules/services/security/clamav.nix +++ b/nixos/modules/services/security/clamav.nix @@ -79,7 +79,7 @@ in config = mkIf (cfg.updater.enable || cfg.daemon.enable) { environment.systemPackages = [ pkg ]; - users.extraUsers = singleton { + users.users = singleton { name = clamavUser; uid = config.ids.uids.clamav; group = clamavGroup; @@ -87,7 +87,7 @@ in home = stateDir; }; - users.extraGroups = singleton { + users.groups = singleton { name = clamavGroup; gid = config.ids.gids.clamav; }; diff --git a/nixos/modules/services/security/fprot.nix b/nixos/modules/services/security/fprot.nix index a12aa01503e3..b1ca4ab23452 100644 --- a/nixos/modules/services/security/fprot.nix +++ b/nixos/modules/services/security/fprot.nix @@ -53,14 +53,14 @@ in { target = "f-prot.conf"; }; - users.extraUsers = singleton + users.users = singleton { name = fprotUser; uid = config.ids.uids.fprot; description = "F-Prot daemon user"; home = stateDir; }; - users.extraGroups = singleton + users.groups = singleton { name = fprotGroup; gid = config.ids.gids.fprot; }; diff --git a/nixos/modules/services/security/oauth2_proxy.nix b/nixos/modules/services/security/oauth2_proxy.nix index 96d78630e6d1..0c5fe8c0ef5f 100644 --- a/nixos/modules/services/security/oauth2_proxy.nix +++ b/nixos/modules/services/security/oauth2_proxy.nix @@ -544,7 +544,7 @@ in cookie.secret = mkDefault null; }; - users.extraUsers.oauth2_proxy = { + users.users.oauth2_proxy = { description = "OAuth2 Proxy"; }; diff --git a/nixos/modules/services/security/oauth2_proxy_nginx.nix b/nixos/modules/services/security/oauth2_proxy_nginx.nix new file mode 100644 index 000000000000..2aa2c57fd22c --- /dev/null +++ b/nixos/modules/services/security/oauth2_proxy_nginx.nix @@ -0,0 +1,64 @@ +{ pkgs, config, lib, ... }: +with lib; +let + cfg = config.services.oauth2_proxy.nginx; +in +{ + options.services.oauth2_proxy.nginx = { + proxy = mkOption { + type = types.string; + default = config.services.oauth2_proxy.httpAddress; + description = '' + The address of the reverse proxy endpoint for oauth2_proxy + ''; + }; + virtualHosts = mkOption { + type = types.listOf types.string; + default = []; + description = '' + A list of nginx virtual hosts to put behind the oauth2 proxy + ''; + }; + }; + config.services.oauth2_proxy = mkIf (cfg.virtualHosts != [] && (hasPrefix "127.0.0.1:" cfg.proxy)) { + enable = true; + }; + config.services.nginx = mkMerge ((optional (cfg.virtualHosts != []) { + recommendedProxySettings = true; # needed because duplicate headers + }) ++ (map (vhost: { + virtualHosts.${vhost} = { + locations."/oauth2/" = { + proxyPass = cfg.proxy; + extraConfig = '' + proxy_set_header X-Scheme $scheme; + proxy_set_header X-Auth-Request-Redirect $request_uri; + ''; + }; + locations."/oauth2/auth" = { + proxyPass = cfg.proxy; + extraConfig = '' + proxy_set_header X-Scheme $scheme; + # nginx auth_request includes headers but not body + proxy_set_header Content-Length ""; + proxy_pass_request_body off; + ''; + }; + locations."/".extraConfig = '' + auth_request /oauth2/auth; + error_page 401 = /oauth2/sign_in; + + # pass information via X-User and X-Email headers to backend, + # requires running with --set-xauthrequest flag + auth_request_set $user $upstream_http_x_auth_request_user; + auth_request_set $email $upstream_http_x_auth_request_email; + proxy_set_header X-User $user; + proxy_set_header X-Email $email; + + # if you enabled --cookie-refresh, this is needed for it to work with auth_request + auth_request_set $auth_cookie $upstream_http_set_cookie; + add_header Set-Cookie $auth_cookie; + ''; + + }; + }) cfg.virtualHosts)); +} diff --git a/nixos/modules/services/security/tor.nix b/nixos/modules/services/security/tor.nix index 15200c49d70a..dcb41d187c2b 100644 --- a/nixos/modules/services/security/tor.nix +++ b/nixos/modules/services/security/tor.nix @@ -686,8 +686,8 @@ in always create a container/VM with a separate Tor daemon instance. ''; - users.extraGroups.tor.gid = config.ids.gids.tor; - users.extraUsers.tor = + users.groups.tor.gid = config.ids.gids.tor; + users.users.tor = { description = "Tor Daemon User"; createHome = true; home = torDirectory; diff --git a/nixos/modules/services/security/vault.nix b/nixos/modules/services/security/vault.nix index 146afec344ab..47c70cf0687b 100644 --- a/nixos/modules/services/security/vault.nix +++ b/nixos/modules/services/security/vault.nix @@ -97,13 +97,13 @@ in } ]; - users.extraUsers.vault = { + users.users.vault = { name = "vault"; group = "vault"; uid = config.ids.uids.vault; description = "Vault daemon user"; }; - users.extraGroups.vault.gid = config.ids.gids.vault; + users.groups.vault.gid = config.ids.gids.vault; systemd.services.vault = { description = "Vault server daemon"; diff --git a/nixos/modules/services/system/dbus.nix b/nixos/modules/services/system/dbus.nix index 248df7351a8c..e04580218442 100644 --- a/nixos/modules/services/system/dbus.nix +++ b/nixos/modules/services/system/dbus.nix @@ -71,14 +71,14 @@ in target = "dbus-1"; }; - users.extraUsers.messagebus = { + users.users.messagebus = { uid = config.ids.uids.messagebus; description = "D-Bus system message bus daemon user"; home = homeDir; group = "messagebus"; }; - users.extraGroups.messagebus.gid = config.ids.gids.messagebus; + users.groups.messagebus.gid = config.ids.gids.messagebus; systemd.packages = [ pkgs.dbus.daemon ]; diff --git a/nixos/modules/services/system/kerberos.nix b/nixos/modules/services/system/kerberos.nix index 4f2e2fdf662b..d85dee089827 100644 --- a/nixos/modules/services/system/kerberos.nix +++ b/nixos/modules/services/system/kerberos.nix @@ -41,8 +41,8 @@ in flags = "REUSE NAMEINARGS"; protocol = "tcp"; user = "root"; - server = "${pkgs.tcp_wrappers}/sbin/tcpd"; - serverArgs = "${pkgs.heimdalFull}/sbin/kadmind"; + server = "${pkgs.tcp_wrappers}/bin/tcpd"; + serverArgs = "${pkgs.heimdalFull}/bin/kadmind"; }; systemd.services.kdc = { @@ -51,13 +51,13 @@ in preStart = '' mkdir -m 0755 -p ${stateDir} ''; - script = "${heimdalFull}/sbin/kdc"; + script = "${heimdalFull}/bin/kdc"; }; systemd.services.kpasswdd = { description = "Kerberos Password Changing daemon"; wantedBy = [ "multi-user.target" ]; - script = "${heimdalFull}/sbin/kpasswdd"; + script = "${heimdalFull}/bin/kpasswdd"; }; }; diff --git a/nixos/modules/services/system/nscd.nix b/nixos/modules/services/system/nscd.nix index eb4b5281c7c6..11a30ea81ba9 100644 --- a/nixos/modules/services/system/nscd.nix +++ b/nixos/modules/services/system/nscd.nix @@ -41,7 +41,7 @@ in config = mkIf cfg.enable { environment.etc."nscd.conf".text = cfg.config; - users.extraUsers.nscd = + users.users.nscd = { isSystemUser = true; description = "Name service cache daemon user"; }; diff --git a/nixos/modules/services/system/uptimed.nix b/nixos/modules/services/system/uptimed.nix index b20d60968032..3c9978ab2269 100644 --- a/nixos/modules/services/system/uptimed.nix +++ b/nixos/modules/services/system/uptimed.nix @@ -20,7 +20,7 @@ in }; config = mkIf cfg.enable { - users.extraUsers.uptimed = { + users.users.uptimed = { description = "Uptimed daemon user"; home = stateDir; createHome = true; diff --git a/nixos/modules/services/torrent/deluge.nix b/nixos/modules/services/torrent/deluge.nix index bff22cd13594..84f0437b9411 100644 --- a/nixos/modules/services/torrent/deluge.nix +++ b/nixos/modules/services/torrent/deluge.nix @@ -55,7 +55,7 @@ in { environment.systemPackages = [ pkgs.deluge ]; - users.extraUsers.deluge = { + users.users.deluge = { group = "deluge"; uid = config.ids.uids.deluge; home = "/var/lib/deluge/"; @@ -63,6 +63,6 @@ in { description = "Deluge Daemon user"; }; - users.extraGroups.deluge.gid = config.ids.gids.deluge; + users.groups.deluge.gid = config.ids.gids.deluge; }; } diff --git a/nixos/modules/services/torrent/peerflix.nix b/nixos/modules/services/torrent/peerflix.nix index 2e3dd9902d72..bed6661f84d6 100644 --- a/nixos/modules/services/torrent/peerflix.nix +++ b/nixos/modules/services/torrent/peerflix.nix @@ -58,6 +58,6 @@ in { }; }; - users.extraUsers.peerflix.uid = config.ids.uids.peerflix; + users.users.peerflix.uid = config.ids.uids.peerflix; }; } diff --git a/nixos/modules/services/torrent/transmission.nix b/nixos/modules/services/torrent/transmission.nix index 3564afd77f41..bf4fb76d0c0c 100644 --- a/nixos/modules/services/torrent/transmission.nix +++ b/nixos/modules/services/torrent/transmission.nix @@ -113,8 +113,8 @@ in # It's useful to have transmission in path, e.g. for remote control environment.systemPackages = [ pkgs.transmission ]; - users.extraGroups.transmission.gid = config.ids.gids.transmission; - users.extraUsers.transmission = { + users.groups.transmission.gid = config.ids.gids.transmission; + users.users.transmission = { group = "transmission"; uid = config.ids.uids.transmission; description = "Transmission BitTorrent user"; diff --git a/nixos/modules/services/web-apps/atlassian/confluence.nix b/nixos/modules/services/web-apps/atlassian/confluence.nix index 84c41b6e53c2..f896d92fd6fc 100644 --- a/nixos/modules/services/web-apps/atlassian/confluence.nix +++ b/nixos/modules/services/web-apps/atlassian/confluence.nix @@ -137,12 +137,12 @@ in }; config = mkIf cfg.enable { - users.extraUsers."${cfg.user}" = { + users.users."${cfg.user}" = { isSystemUser = true; group = cfg.group; }; - users.extraGroups."${cfg.group}" = {}; + users.groups."${cfg.group}" = {}; systemd.services.confluence = { description = "Atlassian Confluence"; diff --git a/nixos/modules/services/web-apps/atlassian/crowd.nix b/nixos/modules/services/web-apps/atlassian/crowd.nix index 778e4afa1e0b..b6cb9f3b7c41 100644 --- a/nixos/modules/services/web-apps/atlassian/crowd.nix +++ b/nixos/modules/services/web-apps/atlassian/crowd.nix @@ -103,12 +103,12 @@ in }; config = mkIf cfg.enable { - users.extraUsers."${cfg.user}" = { + users.users."${cfg.user}" = { isSystemUser = true; group = cfg.group; }; - users.extraGroups."${cfg.group}" = {}; + users.groups."${cfg.group}" = {}; systemd.services.atlassian-crowd = { description = "Atlassian Crowd"; diff --git a/nixos/modules/services/web-apps/atlassian/jira.nix b/nixos/modules/services/web-apps/atlassian/jira.nix index 13c5951524d9..f5ec0a5f31b8 100644 --- a/nixos/modules/services/web-apps/atlassian/jira.nix +++ b/nixos/modules/services/web-apps/atlassian/jira.nix @@ -141,12 +141,12 @@ in }; config = mkIf cfg.enable { - users.extraUsers."${cfg.user}" = { + users.users."${cfg.user}" = { isSystemUser = true; group = cfg.group; }; - users.extraGroups."${cfg.group}" = {}; + users.groups."${cfg.group}" = {}; systemd.services.atlassian-jira = { description = "Atlassian JIRA"; diff --git a/nixos/modules/services/web-apps/frab.nix b/nixos/modules/services/web-apps/frab.nix index d5329ef03c89..d411727a1a54 100644 --- a/nixos/modules/services/web-apps/frab.nix +++ b/nixos/modules/services/web-apps/frab.nix @@ -174,14 +174,14 @@ in config = mkIf cfg.enable { environment.systemPackages = [ frab-rake ]; - users.extraUsers = [ + users.users = [ { name = cfg.user; group = cfg.group; home = "${cfg.statePath}"; } ]; - users.extraGroups = [ { name = cfg.group; } ]; + users.groups = [ { name = cfg.group; } ]; systemd.services.frab = { after = [ "network.target" "gitlab.service" ]; diff --git a/nixos/modules/services/web-apps/matomo.nix b/nixos/modules/services/web-apps/matomo.nix index ef6ac9698e21..ed38eb9ce1e9 100644 --- a/nixos/modules/services/web-apps/matomo.nix +++ b/nixos/modules/services/web-apps/matomo.nix @@ -109,13 +109,13 @@ in { message = "Either services.matomo.nginx or services.matomo.nginx.webServerUser is mandatory"; }]; - users.extraUsers.${user} = { + users.users.${user} = { isSystemUser = true; createHome = true; home = dataDir; group = user; }; - users.extraGroups.${user} = {}; + users.groups.${user} = {}; systemd.services.matomo_setup_update = { # everything needs to set up and up to date before matomo php files are executed diff --git a/nixos/modules/services/web-apps/mattermost.nix b/nixos/modules/services/web-apps/mattermost.nix index 96792c47cd24..8c7fc4056adc 100644 --- a/nixos/modules/services/web-apps/mattermost.nix +++ b/nixos/modules/services/web-apps/mattermost.nix @@ -146,14 +146,14 @@ in config = mkMerge [ (mkIf cfg.enable { - users.extraUsers = optionalAttrs (cfg.user == "mattermost") (singleton { + users.users = optionalAttrs (cfg.user == "mattermost") (singleton { name = "mattermost"; group = cfg.group; uid = config.ids.uids.mattermost; home = cfg.statePath; }); - users.extraGroups = optionalAttrs (cfg.group == "mattermost") (singleton { + users.groups = optionalAttrs (cfg.group == "mattermost") (singleton { name = "mattermost"; gid = config.ids.gids.mattermost; }); diff --git a/nixos/modules/services/web-apps/nexus.nix b/nixos/modules/services/web-apps/nexus.nix index b0eaee6040e3..30876889cf25 100644 --- a/nixos/modules/services/web-apps/nexus.nix +++ b/nixos/modules/services/web-apps/nexus.nix @@ -80,12 +80,12 @@ in }; config = mkIf cfg.enable { - users.extraUsers."${cfg.user}" = { + users.users."${cfg.user}" = { isSystemUser = true; group = cfg.group; }; - users.extraGroups."${cfg.group}" = {}; + users.groups."${cfg.group}" = {}; systemd.services.nexus = { description = "Sonatype Nexus3"; diff --git a/nixos/modules/services/web-apps/restya-board.nix b/nixos/modules/services/web-apps/restya-board.nix index cee725e8fe5f..bc6689bdb271 100644 --- a/nixos/modules/services/web-apps/restya-board.nix +++ b/nixos/modules/services/web-apps/restya-board.nix @@ -358,13 +358,13 @@ in ''; }; - users.extraUsers.restya-board = { + users.users.restya-board = { isSystemUser = true; createHome = false; home = runDir; group = "restya-board"; }; - users.extraGroups.restya-board = {}; + users.groups.restya-board = {}; services.postgresql.enable = mkIf (isNull cfg.database.host) true; diff --git a/nixos/modules/services/web-apps/tt-rss.nix b/nixos/modules/services/web-apps/tt-rss.nix index 1646ee5964fb..2b171aa1b2b2 100644 --- a/nixos/modules/services/web-apps/tt-rss.nix +++ b/nixos/modules/services/web-apps/tt-rss.nix @@ -624,8 +624,8 @@ let }; users = optionalAttrs (cfg.user == "tt_rss") { - extraUsers.tt_rss.group = "tt_rss"; - extraGroups.tt_rss = {}; + users.tt_rss.group = "tt_rss"; + groups.tt_rss = {}; }; }; } diff --git a/nixos/modules/services/web-apps/virtlyst.nix b/nixos/modules/services/web-apps/virtlyst.nix index 2fc67435ce82..e5c0bff2168a 100644 --- a/nixos/modules/services/web-apps/virtlyst.nix +++ b/nixos/modules/services/web-apps/virtlyst.nix @@ -50,7 +50,7 @@ in }; config = mkIf cfg.enable { - users.extraUsers.virtlyst = { + users.users.virtlyst = { home = stateDir; createHome = true; group = mkIf config.virtualisation.libvirtd.enable "libvirtd"; diff --git a/nixos/modules/services/web-servers/apache-httpd/default.nix b/nixos/modules/services/web-servers/apache-httpd/default.nix index f9f2511f45dc..b71ff0531cc8 100644 --- a/nixos/modules/services/web-servers/apache-httpd/default.nix +++ b/nixos/modules/services/web-servers/apache-httpd/default.nix @@ -658,14 +658,14 @@ in warnings = map (cfg: ''apache-httpd's port option is deprecated. Use listen = [{/*ip = "*"; */ port = ${toString cfg.port}";}]; instead'' ) (lib.filter (cfg: cfg.port != 0) allHosts); - users.extraUsers = optionalAttrs (mainCfg.user == "wwwrun") (singleton + users.users = optionalAttrs (mainCfg.user == "wwwrun") (singleton { name = "wwwrun"; group = mainCfg.group; description = "Apache httpd user"; uid = config.ids.uids.wwwrun; }); - users.extraGroups = optionalAttrs (mainCfg.group == "wwwrun") (singleton + users.groups = optionalAttrs (mainCfg.group == "wwwrun") (singleton { name = "wwwrun"; gid = config.ids.gids.wwwrun; }); diff --git a/nixos/modules/services/web-servers/caddy.nix b/nixos/modules/services/web-servers/caddy.nix index fe65fba42a46..4237cfdd9198 100644 --- a/nixos/modules/services/web-servers/caddy.nix +++ b/nixos/modules/services/web-servers/caddy.nix @@ -93,13 +93,13 @@ in { }; }; - users.extraUsers.caddy = { + users.users.caddy = { group = "caddy"; uid = config.ids.uids.caddy; home = cfg.dataDir; createHome = true; }; - users.extraGroups.caddy.gid = config.ids.uids.caddy; + users.groups.caddy.gid = config.ids.uids.caddy; }; } diff --git a/nixos/modules/services/web-servers/hitch/default.nix b/nixos/modules/services/web-servers/hitch/default.nix index 895d02827f71..a6c4cbea1225 100644 --- a/nixos/modules/services/web-servers/hitch/default.nix +++ b/nixos/modules/services/web-servers/hitch/default.nix @@ -102,7 +102,7 @@ with lib; environment.systemPackages = [ pkgs.hitch ]; - users.extraUsers.hitch.group = "hitch"; - users.extraGroups.hitch = {}; + users.users.hitch.group = "hitch"; + users.groups.hitch = {}; }; } diff --git a/nixos/modules/services/web-servers/lighttpd/default.nix b/nixos/modules/services/web-servers/lighttpd/default.nix index d23e810dcc62..7a3df26e47a6 100644 --- a/nixos/modules/services/web-servers/lighttpd/default.nix +++ b/nixos/modules/services/web-servers/lighttpd/default.nix @@ -245,12 +245,12 @@ in serviceConfig.KillSignal = "SIGINT"; }; - users.extraUsers.lighttpd = { + users.users.lighttpd = { group = "lighttpd"; description = "lighttpd web server privilege separation user"; uid = config.ids.uids.lighttpd; }; - users.extraGroups.lighttpd.gid = config.ids.gids.lighttpd; + users.groups.lighttpd.gid = config.ids.gids.lighttpd; }; } diff --git a/nixos/modules/services/web-servers/lighttpd/inginious.nix b/nixos/modules/services/web-servers/lighttpd/inginious.nix index 8c813d116a52..5ff1796e92a1 100644 --- a/nixos/modules/services/web-servers/lighttpd/inginious.nix +++ b/nixos/modules/services/web-servers/lighttpd/inginious.nix @@ -194,7 +194,7 @@ in storageDriver = mkDefault "overlay"; }; - users.extraUsers."lighttpd".extraGroups = [ "docker" ]; + users.users."lighttpd".extraGroups = [ "docker" ]; # Ensure that docker has pulled the required images. systemd.services.inginious-prefetch = { diff --git a/nixos/modules/services/web-servers/meguca.nix b/nixos/modules/services/web-servers/meguca.nix index 8ae86c67a29f..ed7325ff0790 100644 --- a/nixos/modules/services/web-servers/meguca.nix +++ b/nixos/modules/services/web-servers/meguca.nix @@ -104,15 +104,16 @@ in preStart = '' # Ensure folder exists and links are correct or create them mkdir -p ${cfg.baseDir} + chmod 750 ${cfg.baseDir} ln -sf ${pkgs.meguca}/share/meguca/www ${cfg.baseDir} # Ensure the database is correct or create it ${pkgs.sudo}/bin/sudo -u ${postgres.superUser} ${postgres.package}/bin/createuser \ -SDR meguca || true - ${pkgs.sudo}/bin/sudo -u ${postgres.superUser} ${postgres.package}/bin/psql \ - -c "ALTER ROLE meguca WITH PASSWORD '$(cat ${cfg.passwordFile})';" || true ${pkgs.sudo}/bin/sudo -u ${postgres.superUser} ${postgres.package}/bin/createdb \ -T template0 -E UTF8 -O meguca meguca || true + ${pkgs.sudo}/bin/sudo -u meguca ${postgres.package}/bin/psql \ + -c "ALTER ROLE meguca WITH PASSWORD '$(cat ${cfg.passwordFile})';" || true ''; script = '' @@ -139,7 +140,7 @@ in }; users = { - extraUsers.meguca = { + users.meguca = { description = "meguca server service user"; home = cfg.baseDir; createHome = true; @@ -147,7 +148,7 @@ in uid = config.ids.uids.meguca; }; - extraGroups.meguca = { + groups.meguca = { gid = config.ids.gids.meguca; members = [ "meguca" ]; }; diff --git a/nixos/modules/services/web-servers/mighttpd2.nix b/nixos/modules/services/web-servers/mighttpd2.nix index a888f623616e..4e7082c67690 100644 --- a/nixos/modules/services/web-servers/mighttpd2.nix +++ b/nixos/modules/services/web-servers/mighttpd2.nix @@ -119,13 +119,13 @@ in { }; }; - users.extraUsers.mighttpd2 = { + users.users.mighttpd2 = { group = "mighttpd2"; uid = config.ids.uids.mighttpd2; isSystemUser = true; }; - users.extraGroups.mighttpd2.gid = config.ids.gids.mighttpd2; + users.groups.mighttpd2.gid = config.ids.gids.mighttpd2; }; meta.maintainers = with lib.maintainers; [ fgaz ]; diff --git a/nixos/modules/services/web-servers/minio.nix b/nixos/modules/services/web-servers/minio.nix index 7ead33483ea4..f78a966989b6 100644 --- a/nixos/modules/services/web-servers/minio.nix +++ b/nixos/modules/services/web-servers/minio.nix @@ -101,11 +101,11 @@ in }; }; - users.extraUsers.minio = { + users.users.minio = { group = "minio"; uid = config.ids.uids.minio; }; - users.extraGroups.minio.gid = config.ids.uids.minio; + users.groups.minio.gid = config.ids.uids.minio; }; } diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix index 0aa780bf6da1..355976c4b7cb 100644 --- a/nixos/modules/services/web-servers/nginx/default.nix +++ b/nixos/modules/services/web-servers/nginx/default.nix @@ -613,13 +613,13 @@ in listToAttrs acmePairs ); - users.extraUsers = optionalAttrs (cfg.user == "nginx") (singleton + users.users = optionalAttrs (cfg.user == "nginx") (singleton { name = "nginx"; group = cfg.group; uid = config.ids.uids.nginx; }); - users.extraGroups = optionalAttrs (cfg.group == "nginx") (singleton + users.groups = optionalAttrs (cfg.group == "nginx") (singleton { name = "nginx"; gid = config.ids.gids.nginx; }); diff --git a/nixos/modules/services/web-servers/tomcat.nix b/nixos/modules/services/web-servers/tomcat.nix index bc713a08f18f..d8ccb7ca65d6 100644 --- a/nixos/modules/services/web-servers/tomcat.nix +++ b/nixos/modules/services/web-servers/tomcat.nix @@ -166,12 +166,12 @@ in config = mkIf config.services.tomcat.enable { - users.extraGroups = singleton + users.groups = singleton { name = "tomcat"; gid = config.ids.gids.tomcat; }; - users.extraUsers = singleton + users.users = singleton { name = "tomcat"; uid = config.ids.uids.tomcat; description = "Tomcat user"; diff --git a/nixos/modules/services/web-servers/traefik.nix b/nixos/modules/services/web-servers/traefik.nix index b6c7fef21fb2..700202b1d28f 100644 --- a/nixos/modules/services/web-servers/traefik.nix +++ b/nixos/modules/services/web-servers/traefik.nix @@ -114,12 +114,12 @@ in { }; }; - users.extraUsers.traefik = { + users.users.traefik = { group = "traefik"; home = cfg.dataDir; createHome = true; }; - users.extraGroups.traefik = {}; + users.groups.traefik = {}; }; } diff --git a/nixos/modules/services/web-servers/uwsgi.nix b/nixos/modules/services/web-servers/uwsgi.nix index 356b896a6dc9..3ef78ea77cb2 100644 --- a/nixos/modules/services/web-servers/uwsgi.nix +++ b/nixos/modules/services/web-servers/uwsgi.nix @@ -150,13 +150,13 @@ in { }; }; - users.extraUsers = optionalAttrs (cfg.user == "uwsgi") (singleton + users.users = optionalAttrs (cfg.user == "uwsgi") (singleton { name = "uwsgi"; group = cfg.group; uid = config.ids.uids.uwsgi; }); - users.extraGroups = optionalAttrs (cfg.group == "uwsgi") (singleton + users.groups = optionalAttrs (cfg.group == "uwsgi") (singleton { name = "uwsgi"; gid = config.ids.gids.uwsgi; }); diff --git a/nixos/modules/services/web-servers/varnish/default.nix b/nixos/modules/services/web-servers/varnish/default.nix index bc74d62b116a..63f967185c2d 100644 --- a/nixos/modules/services/web-servers/varnish/default.nix +++ b/nixos/modules/services/web-servers/varnish/default.nix @@ -103,11 +103,11 @@ in }) ]; - users.extraUsers.varnish = { + users.users.varnish = { group = "varnish"; uid = config.ids.uids.varnish; }; - users.extraGroups.varnish.gid = config.ids.uids.varnish; + users.groups.varnish.gid = config.ids.uids.varnish; }; } diff --git a/nixos/modules/services/web-servers/zope2.nix b/nixos/modules/services/web-servers/zope2.nix index 496e34db4a96..1dcc3ac9d8d4 100644 --- a/nixos/modules/services/web-servers/zope2.nix +++ b/nixos/modules/services/web-servers/zope2.nix @@ -103,7 +103,7 @@ in config = mkIf (cfg.instances != {}) { - users.extraUsers.zope2.uid = config.ids.uids.zope2; + users.users.zope2.uid = config.ids.uids.zope2; systemd.services = let diff --git a/nixos/modules/services/x11/display-managers/gdm.nix b/nixos/modules/services/x11/display-managers/gdm.nix index a6a38a21b617..8b08c01ea0db 100644 --- a/nixos/modules/services/x11/display-managers/gdm.nix +++ b/nixos/modules/services/x11/display-managers/gdm.nix @@ -89,7 +89,7 @@ in services.xserver.displayManager.slim.enable = false; - users.extraUsers.gdm = + users.users.gdm = { name = "gdm"; uid = config.ids.uids.gdm; group = "gdm"; @@ -97,7 +97,7 @@ in description = "GDM user"; }; - users.extraGroups.gdm.gid = config.ids.gids.gdm; + users.groups.gdm.gid = config.ids.gids.gdm; # GDM needs different xserverArgs, presumable because using wayland by default. services.xserver.tty = null; diff --git a/nixos/modules/services/x11/display-managers/lightdm.nix b/nixos/modules/services/x11/display-managers/lightdm.nix index 5beadacdfa93..206ede227efa 100644 --- a/nixos/modules/services/x11/display-managers/lightdm.nix +++ b/nixos/modules/services/x11/display-managers/lightdm.nix @@ -42,7 +42,7 @@ let '' [LightDM] ${optionalString cfg.greeter.enable '' - greeter-user = ${config.users.extraUsers.lightdm.name} + greeter-user = ${config.users.users.lightdm.name} greeters-directory = ${cfg.greeter.package} ''} sessions-directory = ${dmcfg.session.desktops} @@ -252,14 +252,14 @@ in session include lightdm ''; - users.extraUsers.lightdm = { + users.users.lightdm = { createHome = true; home = "/var/lib/lightdm-data"; group = "lightdm"; uid = config.ids.uids.lightdm; }; - users.extraGroups.lightdm.gid = config.ids.gids.lightdm; + users.groups.lightdm.gid = config.ids.gids.lightdm; services.xserver.tty = null; # We might start multiple X servers so let the tty increment themselves.. services.xserver.display = null; # We specify our own display (and logfile) in xserver-wrapper up there }; diff --git a/nixos/modules/services/x11/display-managers/sddm.nix b/nixos/modules/services/x11/display-managers/sddm.nix index df782e82ed15..8db7414e811f 100644 --- a/nixos/modules/services/x11/display-managers/sddm.nix +++ b/nixos/modules/services/x11/display-managers/sddm.nix @@ -268,7 +268,7 @@ in ''; }; - users.extraUsers.sddm = { + users.users.sddm = { createHome = true; home = "/var/lib/sddm"; group = "sddm"; @@ -277,7 +277,7 @@ in environment.etc."sddm.conf".source = cfgFile; - users.extraGroups.sddm.gid = config.ids.gids.sddm; + users.groups.sddm.gid = config.ids.gids.sddm; environment.systemPackages = [ sddm ]; services.dbus.packages = [ sddm ]; diff --git a/nixos/modules/system/boot/initrd-ssh.nix b/nixos/modules/system/boot/initrd-ssh.nix index 8b3dc2d90eb3..53e993603e27 100644 --- a/nixos/modules/system/boot/initrd-ssh.nix +++ b/nixos/modules/system/boot/initrd-ssh.nix @@ -79,7 +79,7 @@ in boot.initrd.network.ssh.authorizedKeys = mkOption { type = types.listOf types.str; - default = config.users.extraUsers.root.openssh.authorizedKeys.keys; + default = config.users.users.root.openssh.authorizedKeys.keys; description = '' Authorized keys for the root user on initrd. ''; diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix index d2fe33488a7a..6593b1a02430 100644 --- a/nixos/modules/system/boot/systemd.nix +++ b/nixos/modules/system/boot/systemd.nix @@ -798,13 +798,13 @@ in mkdir -m 0700 -p /var/log/journal ''; - users.extraUsers.systemd-network.uid = config.ids.uids.systemd-network; - users.extraGroups.systemd-network.gid = config.ids.gids.systemd-network; - users.extraUsers.systemd-resolve.uid = config.ids.uids.systemd-resolve; - users.extraGroups.systemd-resolve.gid = config.ids.gids.systemd-resolve; + users.users.systemd-network.uid = config.ids.uids.systemd-network; + users.groups.systemd-network.gid = config.ids.gids.systemd-network; + users.users.systemd-resolve.uid = config.ids.uids.systemd-resolve; + users.groups.systemd-resolve.gid = config.ids.gids.systemd-resolve; # Target for ‘charon send-keys’ to hook into. - users.extraGroups.keys.gid = config.ids.gids.keys; + users.groups.keys.gid = config.ids.gids.keys; systemd.targets.keys = { description = "Security Keys"; @@ -840,9 +840,9 @@ in "TMPFS_XATTR" "SECCOMP" ]; - users.extraGroups.systemd-journal.gid = config.ids.gids.systemd-journal; - users.extraUsers.systemd-journal-gateway.uid = config.ids.uids.systemd-journal-gateway; - users.extraGroups.systemd-journal-gateway.gid = config.ids.gids.systemd-journal-gateway; + users.groups.systemd-journal.gid = config.ids.gids.systemd-journal; + users.users.systemd-journal-gateway.uid = config.ids.uids.systemd-journal-gateway; + users.groups.systemd-journal-gateway.gid = config.ids.gids.systemd-journal-gateway; # Generate timer units for all services that have a ‘startAt’ value. systemd.timers = diff --git a/nixos/modules/system/boot/timesyncd.nix b/nixos/modules/system/boot/timesyncd.nix index 57853c5698d0..18aad58b36cc 100644 --- a/nixos/modules/system/boot/timesyncd.nix +++ b/nixos/modules/system/boot/timesyncd.nix @@ -37,8 +37,8 @@ with lib; NTP=${concatStringsSep " " config.services.timesyncd.servers} ''; - users.extraUsers.systemd-timesync.uid = config.ids.uids.systemd-timesync; - users.extraGroups.systemd-timesync.gid = config.ids.gids.systemd-timesync; + users.users.systemd-timesync.uid = config.ids.uids.systemd-timesync; + users.groups.systemd-timesync.gid = config.ids.gids.systemd-timesync; }; diff --git a/nixos/modules/tasks/filesystems/zfs.nix b/nixos/modules/tasks/filesystems/zfs.nix index bfcd81d62159..39f51c363673 100644 --- a/nixos/modules/tasks/filesystems/zfs.nix +++ b/nixos/modules/tasks/filesystems/zfs.nix @@ -58,6 +58,45 @@ let snapshotNames = [ "frequent" "hourly" "daily" "weekly" "monthly" ]; + # When importing ZFS pools, there's one difficulty: These scripts may run + # before the backing devices (physical HDDs, etc.) of the pool have been + # scanned and initialized. + # + # An attempted import with all devices missing will just fail, and can be + # retried, but an import where e.g. two out of three disks in a three-way + # mirror are missing, will succeed. This is a problem: When the missing disks + # are later discovered, they won't be automatically set online, rendering the + # pool redundancy-less (and far slower) until such time as the system reboots. + # + # The solution is the below. poolReady checks the status of an un-imported + # pool, to see if *every* device is available -- in which case the pool will be + # in state ONLINE, as opposed to DEGRADED, FAULTED or MISSING. + # + # The import scripts then loop over this, waiting until the pool is ready or a + # sufficient amount of time has passed that we can assume it won't be. In the + # latter case it makes one last attempt at importing, allowing the system to + # (eventually) boot even with a degraded pool. + importLib = {zpoolCmd, awkCmd, cfgZfs}: '' + poolReady() { + pool="$1" + state="$("${zpoolCmd}" import | "${awkCmd}" "/pool: $pool/ { found = 1 }; /state:/ { if (found == 1) { print \$2; exit } }; END { if (found == 0) { print \"MISSING\" } }")" + if [[ "$state" = "ONLINE" ]]; then + return 0 + else + echo "Pool $pool in state $state, waiting" + return 1 + fi + } + poolImported() { + pool="$1" + "${zpoolCmd}" list "$pool" >/dev/null 2>/dev/null + } + poolImport() { + pool="$1" + "${zpoolCmd}" import -d "${cfgZfs.devNodes}" -N $ZFS_FORCE "$pool" + } + ''; + in { @@ -339,19 +378,26 @@ in ;; esac done - ''] ++ (map (pool: '' + ''] ++ [(importLib { + # See comments at importLib definition. + zpoolCmd = "zpool"; + awkCmd = "awk"; + inherit cfgZfs; + })] ++ (map (pool: '' echo -n "importing root ZFS pool \"${pool}\"..." - trial=0 - until msg="$(zpool import -d ${cfgZfs.devNodes} -N $ZFS_FORCE '${pool}' 2>&1)"; do - sleep 0.25 - echo -n . - trial=$(($trial + 1)) - if [[ $trial -eq 60 ]]; then - break + # Loop across the import until it succeeds, because the devices needed may not be discovered yet. + if ! poolImported "${pool}"; then + for trial in `seq 1 60`; do + poolReady "${pool}" > /dev/null && msg="$(poolImport "${pool}" 2>&1)" && break + sleep 1 + echo -n . + done + echo + if [[ -n "$msg" ]]; then + echo "$msg"; fi - done - echo - if [[ -n "$msg" ]]; then echo "$msg"; fi + poolImported "${pool}" || poolImport "${pool}" # Try one last time, e.g. to import a degraded pool. + fi ${lib.optionalString cfgZfs.requestEncryptionCredentials '' zfs load-key -a ''} @@ -395,10 +441,26 @@ in Type = "oneshot"; RemainAfterExit = true; }; - script = '' - zpool_cmd="${packages.zfsUser}/sbin/zpool" - ("$zpool_cmd" list "${pool}" >/dev/null) || "$zpool_cmd" import -d ${cfgZfs.devNodes} -N ${optionalString cfgZfs.forceImportAll "-f"} "${pool}" - ${optionalString cfgZfs.requestEncryptionCredentials "\"${packages.zfsUser}/sbin/zfs\" load-key -r \"${pool}\""} + script = (importLib { + # See comments at importLib definition. + zpoolCmd="${packages.zfsUser}/sbin/zpool"; + awkCmd="${pkgs.gawk}/bin/awk"; + inherit cfgZfs; + }) + '' + poolImported "${pool}" && exit + echo -n "importing ZFS pool \"${pool}\"..." + # Loop across the import until it succeeds, because the devices needed may not be discovered yet. + for trial in `seq 1 60`; do + poolReady "${pool}" && poolImport "${pool}" && break + sleep 1 + done + poolImported "${pool}" || poolImport "${pool}" # Try one last time, e.g. to import a degraded pool. + if poolImported "${pool}"; then + ${optionalString cfgZfs.requestEncryptionCredentials "\"${packages.zfsUser}/sbin/zfs\" load-key -r \"${pool}\""} + echo "Successfully imported ${pool}" + else + exit 1 + fi ''; }; diff --git a/nixos/modules/testing/test-instrumentation.nix b/nixos/modules/testing/test-instrumentation.nix index 3d46ba72493c..7a7fcbecd64f 100644 --- a/nixos/modules/testing/test-instrumentation.nix +++ b/nixos/modules/testing/test-instrumentation.nix @@ -126,7 +126,7 @@ in networking.usePredictableInterfaceNames = false; # Make it easy to log in as root when running the test interactively. - users.extraUsers.root.initialHashedPassword = mkOverride 150 ""; + users.users.root.initialHashedPassword = mkOverride 150 ""; services.xserver.displayManager.job.logToJournal = true; diff --git a/nixos/modules/virtualisation/docker.nix b/nixos/modules/virtualisation/docker.nix index a9a2095499a7..a1a32c1c59a1 100644 --- a/nixos/modules/virtualisation/docker.nix +++ b/nixos/modules/virtualisation/docker.nix @@ -141,7 +141,7 @@ in config = mkIf cfg.enable (mkMerge [{ environment.systemPackages = [ cfg.package ]; - users.extraGroups.docker.gid = config.ids.gids.docker; + users.groups.docker.gid = config.ids.gids.docker; systemd.packages = [ cfg.package ]; systemd.services.docker = { diff --git a/nixos/modules/virtualisation/libvirtd.nix b/nixos/modules/virtualisation/libvirtd.nix index 024db7f87c2e..87409db4320c 100644 --- a/nixos/modules/virtualisation/libvirtd.nix +++ b/nixos/modules/virtualisation/libvirtd.nix @@ -108,7 +108,7 @@ in { boot.kernelModules = [ "tun" ]; - users.extraGroups.libvirtd.gid = config.ids.gids.libvirtd; + users.groups.libvirtd.gid = config.ids.gids.libvirtd; systemd.packages = [ pkgs.libvirt ]; diff --git a/nixos/modules/virtualisation/lxc-container.nix b/nixos/modules/virtualisation/lxc-container.nix index 0208787e7795..dbb7b881955a 100644 --- a/nixos/modules/virtualisation/lxc-container.nix +++ b/nixos/modules/virtualisation/lxc-container.nix @@ -8,7 +8,7 @@ with lib; ]; # Allow the user to login as root without password. - users.extraUsers.root.initialHashedPassword = mkOverride 150 ""; + users.users.root.initialHashedPassword = mkOverride 150 ""; # Some more help text. services.mingetty.helpLine = diff --git a/nixos/modules/virtualisation/lxd.nix b/nixos/modules/virtualisation/lxd.nix index 3e76cdacfc4b..505c11abd208 100644 --- a/nixos/modules/virtualisation/lxd.nix +++ b/nixos/modules/virtualisation/lxd.nix @@ -73,9 +73,9 @@ in }; - users.extraGroups.lxd.gid = config.ids.gids.lxd; + users.groups.lxd.gid = config.ids.gids.lxd; - users.extraUsers.root = { + users.users.root = { subUidRanges = [ { startUid = 1000000; count = 65536; } ]; subGidRanges = [ { startGid = 1000000; count = 65536; } ]; }; diff --git a/nixos/modules/virtualisation/rkt.nix b/nixos/modules/virtualisation/rkt.nix index 98be4f680c3a..fd662b52df52 100644 --- a/nixos/modules/virtualisation/rkt.nix +++ b/nixos/modules/virtualisation/rkt.nix @@ -59,6 +59,6 @@ in }; }; - users.extraGroups.rkt = {}; + users.groups.rkt = {}; }; } diff --git a/nixos/modules/virtualisation/virtualbox-guest.nix b/nixos/modules/virtualisation/virtualbox-guest.nix index 5da4b7e3bafd..78c6f740788e 100644 --- a/nixos/modules/virtualisation/virtualbox-guest.nix +++ b/nixos/modules/virtualisation/virtualbox-guest.nix @@ -44,7 +44,7 @@ in boot.supportedFilesystems = [ "vboxsf" ]; boot.initrd.supportedFilesystems = [ "vboxsf" ]; - users.extraGroups.vboxsf.gid = config.ids.gids.vboxsf; + users.groups.vboxsf.gid = config.ids.gids.vboxsf; systemd.services.virtualbox = { description = "VirtualBox Guest Services"; diff --git a/nixos/modules/virtualisation/virtualbox-host.nix b/nixos/modules/virtualisation/virtualbox-host.nix index 885d752577d5..8adf3aa919d8 100644 --- a/nixos/modules/virtualisation/virtualbox-host.nix +++ b/nixos/modules/virtualisation/virtualbox-host.nix @@ -86,7 +86,7 @@ in "VirtualBox" ])); - users.extraGroups.vboxusers.gid = config.ids.gids.vboxusers; + users.groups.vboxusers.gid = config.ids.gids.vboxusers; services.udev.extraRules = '' diff --git a/nixos/release.nix b/nixos/release.nix index 67820149437d..f11f372335a0 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -341,6 +341,7 @@ in rec { tests.mesos = callTest tests/mesos.nix {}; tests.misc = callTest tests/misc.nix {}; tests.mongodb = callTest tests/mongodb.nix {}; + tests.mpd = callTest tests/mpd.nix {}; tests.mumble = callTest tests/mumble.nix {}; tests.munin = callTest tests/munin.nix {}; tests.mutableUsers = callTest tests/mutable-users.nix {}; diff --git a/nixos/tests/atd.nix b/nixos/tests/atd.nix index 5260c8ddfb82..ef848c2a374f 100644 --- a/nixos/tests/atd.nix +++ b/nixos/tests/atd.nix @@ -9,7 +9,7 @@ import ./make-test.nix ({ pkgs, lib, ... }: machine = { config, pkgs, ... }: { services.atd.enable = true; - users.extraUsers.alice = { isNormalUser = true; }; + users.users.alice = { isNormalUser = true; }; }; # "at" has a resolution of 1 minute diff --git a/nixos/tests/common/user-account.nix b/nixos/tests/common/user-account.nix index 93aeb60e456a..dc50e14750b0 100644 --- a/nixos/tests/common/user-account.nix +++ b/nixos/tests/common/user-account.nix @@ -1,12 +1,12 @@ { lib, ... }: -{ users.extraUsers.alice = +{ users.users.alice = { isNormalUser = true; description = "Alice Foobar"; password = "foobar"; }; - users.extraUsers.bob = + users.users.bob = { isNormalUser = true; description = "Bob Foobar"; password = "foobar"; diff --git a/nixos/tests/gitolite.nix b/nixos/tests/gitolite.nix index 4b4e081acc5f..d4028efad1d8 100644 --- a/nixos/tests/gitolite.nix +++ b/nixos/tests/gitolite.nix @@ -78,8 +78,8 @@ in # there's nobody around that can input password PreferredAuthentications publickey ''; - users.extraUsers.alice = { isNormalUser = true; }; - users.extraUsers.bob = { isNormalUser = true; }; + users.users.alice = { isNormalUser = true; }; + users.users.bob = { isNormalUser = true; }; }; }; diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix index 92f400937b97..8ce9bc21ff77 100644 --- a/nixos/tests/installer.nix +++ b/nixos/tests/installer.nix @@ -43,7 +43,7 @@ let boot.loader.systemd-boot.enable = true; ''} - users.extraUsers.alice = { + users.users.alice = { isNormalUser = true; home = "/home/alice"; description = "Alice Foobar"; diff --git a/nixos/tests/jenkins.nix b/nixos/tests/jenkins.nix index ed55b2ff5871..25629efbfa49 100644 --- a/nixos/tests/jenkins.nix +++ b/nixos/tests/jenkins.nix @@ -18,7 +18,7 @@ import ./make-test.nix ({ pkgs, ...} : { # should have no effect services.jenkinsSlave.enable = true; - users.extraUsers.jenkins.extraGroups = [ "users" ]; + users.users.jenkins.extraGroups = [ "users" ]; systemd.services.jenkins.serviceConfig.TimeoutStartSec = "6min"; }; @@ -27,7 +27,7 @@ import ./make-test.nix ({ pkgs, ...} : { { config, pkgs, ... }: { services.jenkinsSlave.enable = true; - users.extraUsers.jenkins.extraGroups = [ "users" ]; + users.users.jenkins.extraGroups = [ "users" ]; }; }; diff --git a/nixos/tests/lightdm.nix b/nixos/tests/lightdm.nix index 97ec79406b88..d2b561fa67b4 100644 --- a/nixos/tests/lightdm.nix +++ b/nixos/tests/lightdm.nix @@ -16,7 +16,7 @@ import ./make-test.nix ({ pkgs, ...} : { enableOCR = true; testScript = { nodes, ... }: let - user = nodes.machine.config.users.extraUsers.alice; + user = nodes.machine.config.users.users.alice; in '' startAll; $machine->waitForText(qr/${user.description}/); diff --git a/nixos/tests/mpd.nix b/nixos/tests/mpd.nix new file mode 100644 index 000000000000..2950a8d809d6 --- /dev/null +++ b/nixos/tests/mpd.nix @@ -0,0 +1,119 @@ +import ./make-test.nix ({ pkgs, ... }: + let + track = pkgs.fetchurl { + # Sourced from http://freemusicarchive.org/music/Blue_Wave_Theory/Surf_Music_Month_Challenge/Skyhawk_Beach_fade_in + # License: http://creativecommons.org/licenses/by-sa/4.0/ + + name = "Blue_Wave_Theory-Skyhawk_Beach.mp3"; + url = https://freemusicarchive.org/file/music/ccCommunity/Blue_Wave_Theory/Surf_Music_Month_Challenge/Blue_Wave_Theory_-_04_-_Skyhawk_Beach.mp3; + sha256 = "0xw417bxkx4gqqy139bb21yldi37xx8xjfxrwaqa0gyw19dl6mgp"; + }; + + defaultCfg = rec { + user = "mpd"; + group = "mpd"; + dataDir = "/var/lib/mpd"; + musicDirectory = "${dataDir}/music"; + }; + + defaultMpdCfg = with defaultCfg; { + inherit dataDir musicDirectory user group; + enable = true; + }; + + musicService = { user, group, musicDirectory }: { + description = "Sets up the music file(s) for MPD to use."; + requires = [ "mpd.service" ]; + after = [ "mpd.service" ]; + wantedBy = [ "default.target" ]; + script = '' + mkdir -p ${musicDirectory} && chown -R ${user}:${group} ${musicDirectory} + cp ${track} ${musicDirectory} + chown ${user}:${group} ${musicDirectory}/$(basename ${track}) + ''; + }; + + mkServer = { mpd, musicService, }: + { boot.kernelModules = [ "snd-dummy" ]; + sound.enable = true; + services.mpd = mpd; + systemd.services.musicService = musicService; + }; + in { + name = "mpd"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ emmanuelrosa ]; + }; + + nodes = + { client = + { config, pkgs, ... }: { }; + + serverALSA = + { config, pkgs, ... }: (mkServer { + mpd = defaultMpdCfg // { + network.listenAddress = "any"; + extraConfig = '' + audio_output { + type "alsa" + name "ALSA" + mixer_type "null" + } + ''; + }; + + musicService = with defaultMpdCfg; musicService { inherit user group musicDirectory; }; + }) // { networking.firewall.allowedTCPPorts = [ 6600 ]; }; + + serverPulseAudio = + { config, pkgs, ... }: (mkServer { + mpd = defaultMpdCfg // { + extraConfig = '' + audio_output { + type "pulse" + name "The Pulse" + } + ''; + }; + + musicService = with defaultCfg; musicService { inherit user group musicDirectory; }; + }) // { hardware.pulseaudio.enable = true; }; + }; + + testScript = '' + my $mpc = "${pkgs.mpc_cli}/bin/mpc --wait"; + + # Connects to the given server and attempts to play a tune. + sub play_some_music { + my $server = $_[0]; + + $server->waitForUnit("mpd.service"); + $server->succeed("$mpc update"); + my @tracks = $server->execute("$mpc ls"); + + for my $track (split(/\n/, $tracks[1])) { + $server->succeed("$mpc add $track"); + }; + + my @added_tracks = $server->execute("$mpc listall"); + (length $added_tracks[1]) > 0 or die "Failed to add audio tracks to the playlist."; + + $server->succeed("$mpc play"); + + my @status = $server->execute("$mpc status"); + my @output = split(/\n/, $status[1]); + $output[1] =~ /.*playing.*/ or die "Audio track is not playing, as expected."; + + $server->succeed("$mpc stop"); + }; + + play_some_music($serverALSA); + play_some_music($serverPulseAudio); + + $client->succeed("$mpc -h serverALSA status"); + + # The PulseAudio-based server is configured not to accept external client connections + # to perform the following test: + $client->fail("$mpc -h serverPulseAudio status"); + ''; +}) diff --git a/nixos/tests/openssh.nix b/nixos/tests/openssh.nix index b2d254e9d9d9..230b45206847 100644 --- a/nixos/tests/openssh.nix +++ b/nixos/tests/openssh.nix @@ -17,7 +17,7 @@ in { services.openssh.enable = true; security.pam.services.sshd.limits = [ { domain = "*"; item = "memlock"; type = "-"; value = 1024; } ]; - users.extraUsers.root.openssh.authorizedKeys.keys = [ + users.users.root.openssh.authorizedKeys.keys = [ snakeOilPublicKey ]; }; @@ -29,7 +29,7 @@ in { services.openssh = { enable = true; startWhenNeeded = true; }; security.pam.services.sshd.limits = [ { domain = "*"; item = "memlock"; type = "-"; value = 1024; } ]; - users.extraUsers.root.openssh.authorizedKeys.keys = [ + users.users.root.openssh.authorizedKeys.keys = [ snakeOilPublicKey ]; }; diff --git a/nixos/tests/pam-oath-login.nix b/nixos/tests/pam-oath-login.nix index 4364d6e354a6..eb5966d92139 100644 --- a/nixos/tests/pam-oath-login.nix +++ b/nixos/tests/pam-oath-login.nix @@ -30,7 +30,7 @@ in enable = true; }; - users.extraUsers.alice = { + users.users.alice = { isNormalUser = true; name = "alice"; uid = 1000; diff --git a/nixos/tests/plasma5.nix b/nixos/tests/plasma5.nix index 14ab2e30cabf..e479d3f1cb8f 100644 --- a/nixos/tests/plasma5.nix +++ b/nixos/tests/plasma5.nix @@ -41,7 +41,7 @@ import ./make-test.nix ({ pkgs, ...} : enableOCR = true; testScript = { nodes, ... }: let - user = nodes.machine.config.users.extraUsers.alice; + user = nodes.machine.config.users.users.alice; xdo = "${pkgs.xdotool}/bin/xdotool"; in '' startAll; diff --git a/nixos/tests/sddm.nix b/nixos/tests/sddm.nix index 1ce2b8157842..ac91a89f6695 100644 --- a/nixos/tests/sddm.nix +++ b/nixos/tests/sddm.nix @@ -21,7 +21,7 @@ let enableOCR = true; testScript = { nodes, ... }: let - user = nodes.machine.config.users.extraUsers.alice; + user = nodes.machine.config.users.users.alice; in '' startAll; $machine->waitForText(qr/select your user/i); diff --git a/nixos/tests/slim.nix b/nixos/tests/slim.nix index 7b939d836381..5c76c58cf3f3 100644 --- a/nixos/tests/slim.nix +++ b/nixos/tests/slim.nix @@ -48,7 +48,7 @@ import ./make-test.nix ({ pkgs, ...} : { enableOCR = true; testScript = { nodes, ... }: let - user = nodes.machine.config.users.extraUsers.alice; + user = nodes.machine.config.users.users.alice; in '' startAll; $machine->waitForText(qr/Username:/); diff --git a/nixos/tests/sudo.nix b/nixos/tests/sudo.nix index 35addb0ee805..5d6c8691230a 100644 --- a/nixos/tests/sudo.nix +++ b/nixos/tests/sudo.nix @@ -14,7 +14,7 @@ in { config, lib, pkgs, ... }: with lib; { - users.extraGroups = { foobar = {}; barfoo = {}; baz = { gid = 1337; }; }; + users.groups = { foobar = {}; barfoo = {}; baz = { gid = 1337; }; }; users.users = { test0 = { isNormalUser = true; extraGroups = [ "wheel" ]; }; test1 = { isNormalUser = true; password = password; }; diff --git a/nixos/tests/virtualbox.nix b/nixos/tests/virtualbox.nix index 249571fcedec..008dab8459c8 100644 --- a/nixos/tests/virtualbox.nix +++ b/nixos/tests/virtualbox.nix @@ -334,7 +334,7 @@ let virtualisation.memorySize = 2048; virtualisation.virtualbox.host.enable = true; services.xserver.displayManager.auto.user = "alice"; - users.extraUsers.alice.extraGroups = let + users.users.alice.extraGroups = let inherit (config.virtualisation.virtualbox.host) enableHardening; in lib.mkIf enableHardening (lib.singleton "vboxusers"); }; diff --git a/pkgs/applications/audio/snd/default.nix b/pkgs/applications/audio/snd/default.nix index 9b386ea7ac7e..272d4b6592ac 100644 --- a/pkgs/applications/audio/snd/default.nix +++ b/pkgs/applications/audio/snd/default.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { - name = "snd-18.4"; + name = "snd-18.5"; src = fetchurl { url = "mirror://sourceforge/snd/${name}.tar.gz"; - sha256 = "1asc513d0cmbq0ldzpzmfbydvlj5hwpp480qnicgkn96wplp9c7s"; + sha256 = "1m2rw1p9xr9428p9drd3w5irsi12lz23m605lzgk9gjamq9paywy"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index 2e82216b7e5d..ed18d34e4a9c 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -13,9 +13,9 @@ let sha256Hash = "196yaswbxh2nd83gimjxr8ggr5xkdxq7n3xlh6ax73v59pj4hryq"; }; latestVersion = { - version = "3.3.0.0"; # "Android Studio 3.3 Canary 1" - build = "181.4861037"; - sha256Hash = "1abilixr386x65qzgp6pwdn41y1xi9h8yihgxhc1c97n90f5gab8"; + version = "3.3.0.1"; # "Android Studio 3.3 Canary 2" + build = "181.4869471"; + sha256Hash = "1v2v09gd5vxh4nzbnrjfh0blpzz71i3i7lq5bkjsfl0g82r8j512"; }; in rec { # Old alias diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix index a77792254725..142e9b789948 100644 --- a/pkgs/applications/editors/atom/default.nix +++ b/pkgs/applications/editors/atom/default.nix @@ -21,6 +21,7 @@ let mv $out/usr/* $out/ rm -r $out/share/lintian rm -r $out/usr/ + sed -i "s/${pname})/.${pname}-wrapped)/" $out/bin/${pname} # sed -i "s/'${pname}'/'.${pname}-wrapped'/" $out/bin/${pname} wrapProgram $out/bin/${pname} \ --prefix "PATH" : "${gvfs}/bin" @@ -60,12 +61,12 @@ let }; in stdenv.lib.mapAttrs common { atom = { - version = "1.28.0"; - sha256 = "0k09316897qb9ypkqm6w78nz7sj5385xfdm9bm97m8pka7v61g7h"; + version = "1.28.1"; + sha256 = "03phnbsc45i0r799ni9br7s4qjy05fczbca64jd0sr4jhzi7qmlx"; }; atom-beta = { - version = "1.29.0-beta0"; - sha256 = "05xk63wsjfssf8ckph2bgrxaf99fhz3gs8n8pira8cc9yjk7diz7"; + version = "1.29.0-beta1"; + sha256 = "121y716pnq4vpjrymr505prskvi5a2lnn8hw79q8b4hf7yz0j6rb"; }; } diff --git a/pkgs/applications/editors/atom/env.nix b/pkgs/applications/editors/atom/env.nix index c7e1dfe27364..f93d4042a622 100644 --- a/pkgs/applications/editors/atom/env.nix +++ b/pkgs/applications/editors/atom/env.nix @@ -1,11 +1,11 @@ -{ stdenv, lib, zlib, glib, alsaLib, dbus, gtk2, atk, pango, freetype, fontconfig +{ stdenv, lib, zlib, glib, alsaLib, dbus, gtk3, atk, pango, freetype, fontconfig , libgnome-keyring3, gdk_pixbuf, gvfs, cairo, cups, expat, libgpgerror, nspr , gconf, nss, xorg, libcap, systemd, libnotify, libsecret }: let packages = [ - stdenv.cc.cc zlib glib dbus gtk2 atk pango freetype libgnome-keyring3 + stdenv.cc.cc zlib glib dbus gtk3 atk pango freetype libgnome-keyring3 fontconfig gdk_pixbuf cairo cups expat libgpgerror alsaLib nspr gconf nss xorg.libXrender xorg.libX11 xorg.libXext xorg.libXdamage xorg.libXtst xorg.libXcomposite xorg.libXi xorg.libXfixes xorg.libXrandr diff --git a/pkgs/applications/editors/eclipse/plugins.nix b/pkgs/applications/editors/eclipse/plugins.nix index 28fe3e294b5c..8b03d93d1838 100644 --- a/pkgs/applications/editors/eclipse/plugins.nix +++ b/pkgs/applications/editors/eclipse/plugins.nix @@ -487,6 +487,29 @@ rec { }; }; + jdt-codemining = buildEclipsePlugin rec { + name = "jdt-codemining-${version}"; + version = "1.0.0.201806221018"; + + srcFeature = fetchurl { + url = "http://oss.opensagres.fr/jdt-codemining/snapshot/features/jdt-codemining-feature_${version}.jar"; + sha256 = "1vy30rsb9xifn4r1r2n84d48g6riadzli1xvhfs1mf5pkm5ljwl6"; + }; + + srcPlugin = fetchurl { + url = "http://oss.opensagres.fr/jdt-codemining/snapshot/plugins/org.eclipse.jdt.codemining_${version}.jar"; + sha256 = "0qdzlqcjcm2i4mwhmcdml0am83z1dayrcmf37ji7vmw6iwdk1xmp"; + }; + + meta = with stdenv.lib; { + homepage = https://github.com/angelozerr/jdt-codemining; + description = "Provides JDT Java CodeMining"; + license = licenses.epl10; + platforms = platforms.all; + maintainers = [ maintainers.rycee ]; + }; + }; + rustdt = buildEclipseUpdateSite rec { name = "rustdt-${version}"; version = "0.6.2"; diff --git a/pkgs/applications/editors/emacs-modes/icicles/default.nix b/pkgs/applications/editors/emacs-modes/icicles/default.nix index 2277ebef4ff0..884d1724ef8d 100644 --- a/pkgs/applications/editors/emacs-modes/icicles/default.nix +++ b/pkgs/applications/editors/emacs-modes/icicles/default.nix @@ -3,14 +3,14 @@ let modules = [ { name = "icicles.el"; sha256 = "0wxak7wh0rrb3h77ay2vypbb53skcfbrv71xkajhax0w12q6zpaj"; } - { name = "icicles-chg.el"; sha256 = "1kqlhisg5g9ycylzqiwxrmmgfw2jw599wisz26wvi48lac2icgg7"; } - { name = "icicles-cmd1.el"; sha256 = "17cpw798bl6p77cmjl7lwdnxa1qpw4z1wacjq2mdc8fh81cyw3am"; } + { name = "icicles-chg.el"; sha256 = "0qavq9vy566l3qi9n8akrqjcgy8n6k0j8d7vsc7p1jhqvvq812gh"; } + { name = "icicles-cmd1.el"; sha256 = "0lgk6ngl9090iqvvw1c227q7p37mr73cc6ap3ky6b0nv3ql8rkyi"; } { name = "icicles-cmd2.el"; sha256 = "15swxk7fr7wsqpf26xzbvyk12ikkvfcyh9w8wmnpc38dmpyq79rb"; } { name = "icicles-doc1.el"; sha256 = "04j5qvj7pqnjh8h2y2sdgi7x55czdp9xn7yysr3bzcmr1rq5p4bz"; } { name = "icicles-doc2.el"; sha256 = "1k8vfhi3fa4bzsxr074bw5q6srvq6z6hi61rzlxdw7pah6qf7hcz"; } { name = "icicles-face.el"; sha256 = "1pvygqzmh6ag0zhfjn1vhdvlhxybwxzj22ah2pc0ls80dlywhi4l"; } - { name = "icicles-fn.el"; sha256 = "1sn56z5rjsvqsy3vs7af7yai0c0qdjvcxvwwc59rhswrbi6zlxz5"; } - { name = "icicles-mac.el"; sha256 = "1wyvqzlpq5n70mggqijb8f5r5q9y1hxxngp64sixy0xszy5d12dk"; } + { name = "icicles-fn.el"; sha256 = "05v7sc2k2mjm1mbnlkpi01aaxnxnb40540y7g70dg534scjd7w36"; } + { name = "icicles-mac.el"; sha256 = "0nhbwswz6xz7q4g8flszgx12q4gi4nx1d3n4jgz6svr2kk2vmlb4"; } { name = "icicles-mcmd.el"; sha256 = "05dniz6337v9r15w8r2zad0n2h6jlygzjp7vw75vvq8mds0acmia"; } { name = "icicles-mode.el"; sha256 = "1xfv8nryf5y2gygg02naawzm5qhrkba3h84g43518r1xc6rgbpp6"; } { name = "icicles-opt.el"; sha256 = "10n4p999ylkapirs75y5fh33lpiyx42i3ajzl2zjfwyr1zksg1iz"; } @@ -20,7 +20,7 @@ let forAll = f: map f modules; in stdenv.mkDerivation rec { - version = "2018-04-16"; + version = "2018-07-02"; name = "icicles-${version}"; srcs = forAll ({name, sha256}: fetchurl { url = "http://www.emacswiki.org/emacs/download/${name}"; inherit sha256; }); diff --git a/pkgs/applications/editors/rednotebook/default.nix b/pkgs/applications/editors/rednotebook/default.nix index 34f6e4409a6d..9456ea3150a4 100644 --- a/pkgs/applications/editors/rednotebook/default.nix +++ b/pkgs/applications/editors/rednotebook/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonApplication, fetchFromGitHub -, gdk_pixbuf, glib, gtk3, pango, webkitgtk +, gdk_pixbuf, glib, gobjectIntrospection, gtk3, pango, webkitgtk , pygobject3, pyyaml }: @@ -17,6 +17,8 @@ buildPythonApplication rec { # We have not packaged tests. doCheck = false; + nativeBuildInputs = [ gobjectIntrospection ]; + propagatedBuildInputs = [ gdk_pixbuf glib gtk3 pango webkitgtk pygobject3 pyyaml diff --git a/pkgs/applications/editors/vim/common.nix b/pkgs/applications/editors/vim/common.nix index a93054a9aeb8..2ce6563be0bd 100644 --- a/pkgs/applications/editors/vim/common.nix +++ b/pkgs/applications/editors/vim/common.nix @@ -1,12 +1,12 @@ { lib, fetchFromGitHub }: rec { - version = "8.1.0001"; + version = "8.1.0146"; src = fetchFromGitHub { owner = "vim"; repo = "vim"; rev = "v${version}"; - sha256 = "056h9cyysyh6hqsr1s9xg94la554f56lwnpk87g013xmqf37bna6"; + sha256 = "1v33h08j15zii0ipw5py18ghsaxlbar0nyx365z1acjhk4vhn9nb"; }; enableParallelBuilding = true; diff --git a/pkgs/applications/editors/vscode/default.nix b/pkgs/applications/editors/vscode/default.nix index 4b1d26742d69..818657f25341 100644 --- a/pkgs/applications/editors/vscode/default.nix +++ b/pkgs/applications/editors/vscode/default.nix @@ -2,7 +2,7 @@ makeWrapper, libXScrnSaver, libxkbfile, libsecret }: let - version = "1.24.0"; + version = "1.24.1"; channel = "stable"; plat = { @@ -12,9 +12,9 @@ let }.${stdenv.system}; sha256 = { - "i686-linux" = "17dvyp31kf12mfs6z3cm8rxfrvrmbrk9gbsk3z7v284z64dry9vz"; - "x86_64-linux" = "11m50lb0hvnmvb3qdixgpvdzcljzm94qxl41240g4qh4a36qvr1j"; - "x86_64-darwin" = "1wm6h3f8b33rky5nlrvwx4qx0k9h72aabiz6sm27x1wrs486p3lf"; + "i686-linux" = "189chqdimijjzydb8sp3yyi19fijsivyxrdddy8raaj7qkwq0maa"; + "x86_64-linux" = "1944v54pfpfkq5jjnfrhndcwndsnvavd9qih1i2pq16mgaizmib2"; + "x86_64-darwin" = "09sn22j40hax9v6ai99pfj67ymzkk82yqf8j33bg8byk4fgrz9jg"; }.${stdenv.system}; archive_fmt = if stdenv.system == "x86_64-darwin" then "zip" else "tar.gz"; diff --git a/pkgs/applications/graphics/ImageMagick/7.0.nix b/pkgs/applications/graphics/ImageMagick/7.0.nix index fb390c0995e0..d8c11f33439a 100644 --- a/pkgs/applications/graphics/ImageMagick/7.0.nix +++ b/pkgs/applications/graphics/ImageMagick/7.0.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, fetchpatch, pkgconfig, libtool , bzip2, zlib, libX11, libXext, libXt, fontconfig, freetype, ghostscript, libjpeg -, lcms2, openexr, libpng, librsvg, libtiff, libxml2, openjpeg, libwebp +, lcms2, openexr, libpng, librsvg, libtiff, libxml2, openjpeg, libwebp, libheif , ApplicationServices , buildPlatform, hostPlatform }: @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { buildInputs = [ zlib fontconfig freetype ghostscript - libpng libtiff libxml2 + libpng libtiff libxml2 libheif ] ++ lib.optionals (!hostPlatform.isMinGW) [ openexr librsvg openjpeg ] diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index 3af6e19b7011..b767f11da00b 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, fetchpatch, pkgconfig, libtool , bzip2, zlib, libX11, libXext, libXt, fontconfig, freetype, ghostscript, libjpeg -, lcms2, openexr, libpng, librsvg, libtiff, libxml2, openjpeg, libwebp, fftw +, lcms2, openexr, libpng, librsvg, libtiff, libxml2, openjpeg, libwebp, fftw, libheif, libde265 , ApplicationServices , buildPlatform, hostPlatform }: @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { buildInputs = [ zlib fontconfig freetype ghostscript - libpng libtiff libxml2 + libpng libtiff libxml2 libheif libde265 ] ++ lib.optionals (!hostPlatform.isMinGW) [ openexr librsvg openjpeg ] diff --git a/pkgs/applications/graphics/fbida/default.nix b/pkgs/applications/graphics/fbida/default.nix index 2e91f7873501..33d65a860764 100644 --- a/pkgs/applications/graphics/fbida/default.nix +++ b/pkgs/applications/graphics/fbida/default.nix @@ -3,11 +3,11 @@ , epoxy, poppler, mesa_noglu, lirc }: stdenv.mkDerivation rec { - name = "fbida-2.13"; + name = "fbida-2.14"; src = fetchurl { url = "http://dl.bytesex.org/releases/fbida/${name}.tar.gz"; - sha256 = "01yv4qqqfbz9v281y2jlxhxdym3ricyb0zkqkgp5b40qrmfik1x8"; + sha256 = "0f242mix20rgsqz1llibhsz4r2pbvx6k32rmky0zjvnbaqaw1dwm"; }; nativeBuildInputs = [ pkgconfig which ]; @@ -17,12 +17,12 @@ stdenv.mkDerivation rec { mesa_noglu ]; - makeFlags = [ "prefix=$(out)" "verbose=yes" "STRIP=" ]; + makeFlags = [ "prefix=$(out)" "verbose=yes" "STRIP=" "JPEG_VER=62" ]; - patchPhase = - '' + patchPhase = '' sed -e 's@ cpp\>@ gcc -E -@' -i GNUmakefile - ''; + sed -e 's@$(HAVE_LINUX_FB_H)@yes@' -i GNUmakefile + ''; meta = with stdenv.lib; { description = "Image viewing and manipulation programs"; diff --git a/pkgs/applications/graphics/feh/default.nix b/pkgs/applications/graphics/feh/default.nix index dad378affbea..4ec4b76ac047 100644 --- a/pkgs/applications/graphics/feh/default.nix +++ b/pkgs/applications/graphics/feh/default.nix @@ -6,11 +6,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "feh-${version}"; - version = "2.26.4"; + version = "2.27"; src = fetchurl { url = "https://feh.finalrewind.org/${name}.tar.bz2"; - sha256 = "15a7hjg7xwj1hsw3c5k18psvvmbqgn4g79qq03bsvibzl4kqakq7"; + sha256 = "0kn6cka9m76697i495npd60ad64jnfnzv5z6znzyr0vlxx2nhcmg"; }; outputs = [ "out" "man" "doc" ]; diff --git a/pkgs/applications/graphics/gimp/default.nix b/pkgs/applications/graphics/gimp/default.nix index f92594f08e16..8e18d531605c 100644 --- a/pkgs/applications/graphics/gimp/default.nix +++ b/pkgs/applications/graphics/gimp/default.nix @@ -2,18 +2,18 @@ , pango, cairo, freetype, fontconfig, lcms, libpng, libjpeg, poppler, poppler_data, libtiff , libmng, librsvg, libwmf, zlib, libzip, ghostscript, aalib, shared-mime-info , python2Packages, libexif, gettext, xorg, glib-networking, libmypaint, gexiv2 -, harfbuzz, mypaint-brushes, libwebp, libgudev, openexr +, harfbuzz, mypaint-brushes, libwebp, libheif, libgudev, openexr , AppKit, Cocoa, gtk-mac-integration }: let inherit (python2Packages) pygtk wrapPython python; in stdenv.mkDerivation rec { name = "gimp-${version}"; - version = "2.10.2"; + version = "2.10.4"; src = fetchurl { url = "http://download.gimp.org/pub/gimp/v${stdenv.lib.versions.majorMinor version}/${name}.tar.bz2"; - sha256 = "1srkqd9cx1xmny7cyk3b6f14dknb3fd77whm38vlvr7grnpbmc0w"; + sha256 = "14pi0q3wwkapy0inqxk1hjsa2h8lff1z4wgdsyrk29jaw66pdc7z"; }; nativeBuildInputs = [ autoreconfHook pkgconfig intltool gettext wrapPython ]; @@ -21,7 +21,7 @@ in stdenv.mkDerivation rec { buildInputs = [ babl gegl gtk2 glib gdk_pixbuf pango cairo gexiv2 harfbuzz isocodes freetype fontconfig lcms libpng libjpeg poppler poppler_data libtiff openexr - libmng librsvg libwmf zlib libzip ghostscript aalib shared-mime-info libwebp + libmng librsvg libwmf zlib libzip ghostscript aalib shared-mime-info libwebp libheif python pygtk libexif xorg.libXpm glib-networking libmypaint mypaint-brushes ] ++ stdenv.lib.optionals stdenv.isDarwin [ AppKit Cocoa gtk-mac-integration ] ++ stdenv.lib.optionals stdenv.isLinux [ libgudev ]; diff --git a/pkgs/applications/graphics/graphicsmagick/default.nix b/pkgs/applications/graphics/graphicsmagick/default.nix index 872afb39ec6f..2c322128c386 100644 --- a/pkgs/applications/graphics/graphicsmagick/default.nix +++ b/pkgs/applications/graphics/graphicsmagick/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "graphicsmagick-${version}"; - version = "1.3.29"; + version = "1.3.30"; src = fetchurl { url = "mirror://sourceforge/graphicsmagick/GraphicsMagick-${version}.tar.xz"; - sha256 = "1m0cc6kpky06lpcipj7rfwc2jbw2igr0jk97zqmw3j1ld5mg93g1"; + sha256 = "1warar0731xf94r4bn5x1km85rjabl4iq8r0dk3ywmczap3farfr"; }; patches = [ diff --git a/pkgs/applications/graphics/krita/default.nix b/pkgs/applications/graphics/krita/default.nix index 690253947a18..1fd19162a4f7 100644 --- a/pkgs/applications/graphics/krita/default.nix +++ b/pkgs/applications/graphics/krita/default.nix @@ -2,18 +2,19 @@ , karchive, kconfig, kwidgetsaddons, kcompletion, kcoreaddons , kguiaddons, ki18n, kitemmodels, kitemviews, kwindowsystem , kio, kcrash -, boost, libraw, fftw, eigen, exiv2, lcms2, gsl, openexr +, boost, libraw, fftw, eigen, exiv2, libheif, lcms2, gsl, openexr, giflib , openjpeg, opencolorio, vc, poppler_qt5, curl, ilmbase , qtmultimedia, qtx11extras +, python3 }: mkDerivation rec { name = "krita-${version}"; - version = "4.0.3"; + version = "4.1.0"; src = fetchurl { url = "https://download.kde.org/stable/krita/${version}/${name}.tar.gz"; - sha256 = "0zmn29dzqncc80pvy9ymgyzqw8x1ryq8b4x5mr4sz15iyj7xgspr"; + sha256 = "1mbyybc7h3sblbaklvz0cci3ys4zcyi616fgdn06p62v2vw2sybq"; }; nativeBuildInputs = [ cmake extra-cmake-modules ]; @@ -21,9 +22,10 @@ mkDerivation rec { buildInputs = [ karchive kconfig kwidgetsaddons kcompletion kcoreaddons kguiaddons ki18n kitemmodels kitemviews kwindowsystem kio kcrash - boost libraw fftw eigen exiv2 lcms2 gsl openexr + boost libraw fftw eigen exiv2 lcms2 gsl openexr libheif giflib openjpeg opencolorio vc poppler_qt5 curl ilmbase qtmultimedia qtx11extras + python3 ]; NIX_CFLAGS_COMPILE = [ "-I${ilmbase.dev}/include/OpenEXR" ]; diff --git a/pkgs/applications/graphics/write_stylus/default.nix b/pkgs/applications/graphics/write_stylus/default.nix new file mode 100644 index 000000000000..a1c39fadb59d --- /dev/null +++ b/pkgs/applications/graphics/write_stylus/default.nix @@ -0,0 +1,52 @@ +{ stdenv, lib, qtbase, qtsvg, makeWrapper, fetchurl, makeDesktopItem }: +stdenv.mkDerivation rec { + name = "write_stylus-${version}"; + version = "209"; + + desktopItem = makeDesktopItem { + name = "Write"; + exec = "Write"; + comment = "a word processor for hadwriting"; + desktopName = "Write"; + genericName = "Write"; + categories = "Office;Graphics"; + }; + + src = fetchurl { + url = "http://www.styluslabs.com/write/write${version}.tar.gz"; + sha256 = "1p6glp4vdpwl8hmhypayc4cvs3j9jfmjfhhrgqm2xkgl5bfbv2qd"; + }; + sourceRoot = "."; + + dontBuild = true; + + installPhase = '' + mkdir -p $out/bin + cp -R Write $out/ + # symlink the binary to bin/ + ln -s $out/Write/Write $out/bin/Write + + mkdir -p $out/share/applications + ln -s ${desktopItem}/share/applications/* $out/share/applications/ + ''; + preFixup = let + libPath = lib.makeLibraryPath [ + qtbase # libQt5PrintSupport.so.5 + qtsvg # libQt5Svg.so.5 + stdenv.cc.cc.lib # libstdc++.so.6 + ]; + in '' + patchelf \ + --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath "${libPath}" \ + $out/Write/Write + ''; + + meta = with stdenv.lib; { + homepage = http://www.styluslabs.com/; + description = "Write is a word processor for handwriting."; + platforms = platforms.linux; + license = stdenv.lib.licenses.unfree; + maintainers = with maintainers; [ oyren ]; + }; +} diff --git a/pkgs/applications/misc/barrier/default.nix b/pkgs/applications/misc/barrier/default.nix index 0bc12e269c0e..6151b3d55ab7 100644 --- a/pkgs/applications/misc/barrier/default.nix +++ b/pkgs/applications/misc/barrier/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, curl, xorg, avahi, qt5, +{ stdenv, fetchpatch, fetchurl, cmake, curl, xorg, avahi, qt5, avahiWithLibdnssdCompat ? avahi.override { withLibdnssdCompat = true; } }: @@ -13,9 +13,18 @@ stdenv.mkDerivation rec { buildInputs = [ cmake curl xorg.libX11 xorg.libXext xorg.libXtst avahiWithLibdnssdCompat ]; propagatedBuildInputs = with qt5; [ qtbase ]; + patches = [ + # Fix compilation on Qt 5.11 + # Patch should be removed on next version bump from 2.1.1! + (fetchpatch { + url = "https://github.com/debauchee/barrier/commit/a956cad0da23f544b874888c6c3540dc7f8f22cf.patch"; + sha256 = "0x5045bdks1f9casp0v7svx9ml1gxhkhw5sqc7xk36h184m24a21"; + }) + ]; + postFixup = '' - substituteInPlace "$out/share/applications/barrier.desktop" --replace "Exec=barrier" "Exec=$out/bin/barrier" - ''; + substituteInPlace "$out/share/applications/barrier.desktop" --replace "Exec=barrier" "Exec=$out/bin/barrier" + ''; meta = { description = "Open-source KVM software"; diff --git a/pkgs/applications/misc/dbeaver/default.nix b/pkgs/applications/misc/dbeaver/default.nix index 36aca5e17295..ed08356fdc5a 100644 --- a/pkgs/applications/misc/dbeaver/default.nix +++ b/pkgs/applications/misc/dbeaver/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { name = "dbeaver-ce-${version}"; - version = "5.1.1"; + version = "5.1.2"; desktopItem = makeDesktopItem { name = "dbeaver"; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://dbeaver.io/files/${version}/dbeaver-ce-${version}-linux.gtk.x86_64.tar.gz"; - sha256 = "1ll1q585b7yca9jrgg7iw7i6xhyy1wc9q8hjqj1g3gzdagbrf396"; + sha256 = "1p1klrasasc440qzxsn96lcgfib5qwhl508gvwrbslvmija6m6b2"; }; installPhase = '' diff --git a/pkgs/applications/misc/digitalbitbox/default.nix b/pkgs/applications/misc/digitalbitbox/default.nix index fbd9d47633a1..09b6db3abf9a 100644 --- a/pkgs/applications/misc/digitalbitbox/default.nix +++ b/pkgs/applications/misc/digitalbitbox/default.nix @@ -3,6 +3,7 @@ , curl , fetchFromGitHub , git +, libcap , libevent , libtool , libqrencode @@ -67,6 +68,8 @@ in stdenv.mkDerivation rec { ]; buildInputs = with stdenv.lib; [ + # TODO: remove libcap when pruneLibtoolFiles applies to pulseaudio. + libcap libevent libtool libudev @@ -112,6 +115,8 @@ in stdenv.mkDerivation rec { ${copyUdevRuleToOutput "52-hid-digitalbox.rules" udevRule52} ''; + enableParallelBuilding = true; + meta = with stdenv.lib; { description = "A QT based application for the Digital Bitbox hardware wallet"; longDescription = '' diff --git a/pkgs/applications/misc/ipmicfg/default.nix b/pkgs/applications/misc/ipmicfg/default.nix index af7d257eed6e..e150ab457e07 100644 --- a/pkgs/applications/misc/ipmicfg/default.nix +++ b/pkgs/applications/misc/ipmicfg/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "ipmicfg-${version}"; - version = "1.27.1"; - buildVersion = "170901"; + version = "1.28.0"; + buildVersion = "180302"; src = fetchzip { url = "ftp://ftp.supermicro.com/utility/IPMICFG/IPMICFG_${version}_build.${buildVersion}.zip"; - sha256 = "11xhzw36pg4has8857pypf44cni8m2mg8qsqi1s4bfjbxlfgxgwk"; + sha256 = "0hw853cwaaxmxy1sa3m7l9gqalwpbbvp4ghk8inr7dzwxjljmr02"; extraPostFetch = "chmod u+rwX,go-rwx+X $out/"; }; diff --git a/pkgs/applications/misc/josm/default.nix b/pkgs/applications/misc/josm/default.nix index d79e2620c343..97b60080365f 100644 --- a/pkgs/applications/misc/josm/default.nix +++ b/pkgs/applications/misc/josm/default.nix @@ -1,15 +1,15 @@ -{ fetchurl, stdenv, makeDesktopItem, makeWrapper, unzip, bash, jre8 }: +{ fetchurl, stdenv, makeDesktopItem, makeWrapper, unzip, bash, jre10 }: stdenv.mkDerivation rec { name = "josm-${version}"; - version = "13878"; + version = "13996"; src = fetchurl { url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar"; - sha256 = "0f8cbzlrlyq8awhzgbjvsljih19s8dzxhhwb4h2dfiakv1rl6vvx"; + sha256 = "1j98wxw84f5rf3finr38bkr1sh9ckah8pmhmxyhmcw2rxf1mv9bf"; }; - buildInputs = [ jre8 makeWrapper ]; + buildInputs = [ jre10 makeWrapper ]; desktopItem = makeDesktopItem { name = "josm"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { mkdir -p $out/bin $out/share/java cp -v $src $out/share/java/josm.jar - makeWrapper ${jre8}/bin/java $out/bin/josm \ + makeWrapper ${jre10}/bin/java $out/bin/josm \ --add-flags "-jar $out/share/java/josm.jar" mkdir -p $out/share/applications diff --git a/pkgs/applications/misc/khard/default.nix b/pkgs/applications/misc/khard/default.nix index c626aaca66bd..075640f702cb 100644 --- a/pkgs/applications/misc/khard/default.nix +++ b/pkgs/applications/misc/khard/default.nix @@ -1,6 +1,22 @@ -{ stdenv, fetchurl, fetchFromGitHub, glibcLocales, python3Packages }: +{ stdenv, fetchurl, fetchFromGitHub, glibcLocales, python3 }: -python3Packages.buildPythonApplication rec { +let + python = python3.override { + packageOverrides = self: super: { + + # https://github.com/pimutils/khal/issues/780 + python-dateutil = super.python-dateutil.overridePythonAttrs (oldAttrs: rec { + version = "2.6.1"; + src = oldAttrs.src.override { + inherit version; + sha256 = "891c38b2a02f5bb1be3e4793866c8df49c7d19baabf9c1bad62547e0b4866aca"; + }; + }); + + }; + }; + +in with python.pkgs; buildPythonApplication rec { version = "0.12.2"; name = "khard-${version}"; namePrefix = ""; @@ -14,7 +30,7 @@ python3Packages.buildPythonApplication rec { LC_ALL = "en_US.UTF-8"; buildInputs = [ glibcLocales ]; - propagatedBuildInputs = with python3Packages; [ + propagatedBuildInputs = [ atomicwrites configobj vobject diff --git a/pkgs/applications/misc/krename/default.nix b/pkgs/applications/misc/krename/default.nix index e686ec94a4a3..a0a2776ae360 100644 --- a/pkgs/applications/misc/krename/default.nix +++ b/pkgs/applications/misc/krename/default.nix @@ -1,5 +1,5 @@ { - mkDerivation, fetchFromGitHub, lib, + mkDerivation, fetchurl, lib, extra-cmake-modules, kdoctools, wrapGAppsHook, kconfig, kinit, kjsembed, taglib, exiv2, podofo, kcrash @@ -7,15 +7,14 @@ let pname = "krename"; - version = "20170610"; + version = "5.0.0"; + in mkDerivation rec { name = "${pname}-${version}"; - src = fetchFromGitHub { - owner = "KDE"; - repo = "krename"; - rev = "18000edfec52de0b417d575e14eb078b4bd7b2f3"; - sha256 = "0hsrlfrbi42jqqnkcz682c6yrfi3xpl299672knj22074wr6sv0j"; + src = fetchurl { + url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz"; + sha256 = "136j1dkqrhv458rjh5v3vzjhvq6dhz7k79zk6mmx8zvqacc7cq8a"; }; meta = with lib; { diff --git a/pkgs/applications/misc/rtv/default.nix b/pkgs/applications/misc/rtv/default.nix index ed54e523c8f8..d20276968244 100644 --- a/pkgs/applications/misc/rtv/default.nix +++ b/pkgs/applications/misc/rtv/default.nix @@ -2,14 +2,14 @@ with pythonPackages; buildPythonApplication rec { - version = "1.22.1"; + version = "1.23.0"; name = "rtv-${version}"; src = fetchFromGitHub { owner = "michael-lazar"; repo = "rtv"; rev = "v${version}"; - sha256 = "1jil8cwhnpf2mclgah7s79j4c38hzm0j6di2mffrqhlsnn2vxbf4"; + sha256 = "0i6iqj3ly1bgsfa9403m5190mfl9yk1x4ific3v31wqfja985nsr"; }; # Tests try to access network diff --git a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix index 9be83bc3678f..f1e03215d13c 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix @@ -1,995 +1,995 @@ { - version = "62.0b3"; + version = "62.0b5"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/ach/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-x86_64/ach/firefox-62.0b5.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "30ede248dbc0a8d9375d372dd1c0260dbf7fbbb398d1528400933953da56ef018cf7bac604bef1138a5454fde8cbb96906f65b0afe3605dc9ff5edee91245c41"; + sha512 = "4fac318de5d68bd78583b83e4c87d14fd1e968ee76e9f83c17c32750cccaa660ca0ce59584ed320f7d1e3c1985ba686c23acf5a39e17e535fc297e4e12ebcd7f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/af/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-x86_64/af/firefox-62.0b5.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "52227774b4c0f4817c208ca46f68d09fcdd9865867a438ec2eda8dcb66564e7cc7f88d3102dcaa1de6edf428b16167a2460b181facd2b12a2dd0c287deac75e8"; + sha512 = "1c9fa48bc56581eef1980b9fa95ed91785392e67c49926239f46e8de567bd62b88df8f169cb2069306a6bd77d26224a257e2bebdccc1f8c97753101b25a4cb05"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/an/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-x86_64/an/firefox-62.0b5.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "e932625df7fcdfbd8c30898008ac07aa91c446a3785eb3c7cc0998ed5e52659268bc8b86086968534e8108312dacd53de4d0e5d9cd0bdc2f76edd46c29599bd3"; + sha512 = "485c0028520d1c4b835c6be6850c33720985273e6f53d349c00df587647686c0d4ffbdcd825696ac84bdf6662d416946169feba5749bee7c8482ef1c4346a992"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/ar/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-x86_64/ar/firefox-62.0b5.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "1873b5a75b3b51e69143f8b85442a995d05a2b753e5ddc06b15224b34d694f8f3ccfba3d15e522e12a265813255023258b791e0a95c680af1d07771aac196ef1"; + sha512 = "33037d82656fbaf10291094833f9e84e2312b9ca78124c2f450e9d1ae8bad6e13df2b9f087c515e151379a5c75cfc44a1fe85e870ad459f2406400eb175d49be"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/as/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-x86_64/as/firefox-62.0b5.tar.bz2"; locale = "as"; arch = "linux-x86_64"; - sha512 = "31b0241902ece8d7364e85a5072f8e4f9ee18fb0b45f3f0d11dff4c25499e6488fa47fbe4eaed6ab16fb63d72fa153e8459ef0e455973d0142e3240ebee35503"; + sha512 = "30d8cce77817df81fa315a9d49cf5d82df7626d4208b246210d9b7f34e5ba5d7d5d8f9258d7c65487156efa6f2c6bd8036d8f1953bc39dcbf523c0c1bf793c18"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/ast/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-x86_64/ast/firefox-62.0b5.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "d4b3033952e71c3aa9c4a0b6e3835c35795deddee65c0f39f50f24d4b5557407d7bbfb6f7e69969856c1ae4e8d7654e943656377c94dd33d8e45a5ce44054eda"; + sha512 = "6e28a170ce3850714440f196c09ec868c5d5fe249409aa5b794aeac9d87522eaea341813b64d92d37df922899b4b3176079e7a519bff61c9694a1267ba0a0ada"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/az/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-x86_64/az/firefox-62.0b5.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "8bb472d6f3a81db37b5d3e06f19b1c7a3c44f7055ccbc922a600b10870f45e2380ea427cd7e0a3b4567798a21274f9619482e077650a22f2bcd7d52c8d83a06f"; + sha512 = "b8a258e0c17f6a72fbdc6fd5463c8355424016bbdd55df3a5aa724c8b3be56ceba671aca4ea6a2d65f60a37d035d8a21315473b6790d8238c127fc12485a20d5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/be/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-x86_64/be/firefox-62.0b5.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "4c5e859878a9463d9c55b08b1a1ef41d09265bfb4b217cfb3c70ee98f6df50910493a5425fcbff0473ca9c29a8ff753097530d7747506747b4ac05f2b9e87f39"; + sha512 = "a0136dfd3898da46fcea3417ca9851f9aa667c70e10fcd7f8af795f949dd6dfe13994588412c10d81b95f5a366eb31eaff399823343bd9b7cfe10b89e6ae58d8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/bg/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-x86_64/bg/firefox-62.0b5.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "95eb87c22eeb1302cd86c4a92ffdd367d3586eb9ad6a6472a4b7cb8133554f09f322572d576c46a23d0b0a6fd9f84fd2b7217ada82eeedaeb31484c8d85e6807"; + sha512 = "adcfef0da5a5718b64bc083971f4868813a2c7cdc4b543f0283b538447777fd4ed3a1290faf5ecc1b03a9b54c74a29a9121b8e76dc125fe712b0e4874696696d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/bn-BD/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-x86_64/bn-BD/firefox-62.0b5.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; - sha512 = "629ecff0efa7aad6f6ce407f1d44ac5c52f781828909a953ad6efe92c43c1cb94fb555bf96e2474b664bdeefaf40b1f6ed7e0acbc43ab9e48ee37b5d0164908c"; + sha512 = "172d8d2a5be99afac8731febfcab2f0330907be72396266afab12707f91919abc8968cb5e8fc609b6909a2db9f8e89763dd5fed42261f49a03a697b0f12e8019"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/bn-IN/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-x86_64/bn-IN/firefox-62.0b5.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; - sha512 = "ae7a67643bcaaaa199560785169c41f43854ef0ca110e1fffcd7f118433e6213bb4549fb6c85b52a3c1b00a7700609f489eb7e649225f4f3f1aeab0097af82e1"; + sha512 = "63765ffbdce49cb75b2fad7ec13741c5c4d1f7f84fcb4f1f2d00e19f478bdc65956fba461e213ed010898eb2ec7fa2e12bfe5494070c33db29b935229b7f9cc5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/br/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-x86_64/br/firefox-62.0b5.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "eaffdb43d8870a26989be3f3ac44649a593c40679f2d7ff230fd710f3edd2fd9d011503e9a7e4659a4db5acc9eddb979c9bc9c6953d3f089c278e145e2a89eb0"; + sha512 = "25777e6547c116ff6dfe4e0b579d5934190697b25ce1cb06838100feca88e0ba22640d6d0ebf6ed41d23639290982d5edfbd8e82e5e2fb2b6ba5881e3d413062"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/bs/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-x86_64/bs/firefox-62.0b5.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "b431d7b07bad19fb209ce8563cbac95f2385b921f13bbc931deaa37528850d7234734a223775796c7d919e67931ac4d931345badebdf158f3d9de20b7267dac6"; + sha512 = "25538c4afff44b9467809b7f515134ca9f555b32ef40decf0983e23b1e9c592d0426d20412c9f6ed1bf9952008962578edefeca87c774630ac255dabaf8ea5a0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/ca/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-x86_64/ca/firefox-62.0b5.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "04b5aaf8c9e29f85cb5c8a71a1bd6c43e0247f3c92bfb56bd3c0b862ec813c5d94dd40ae901609516a12649beeaac7d7e512b585d1e9b5e87167329942b614e9"; + sha512 = "c03fa0fcbde474fa12b08680c68e87fe6ffa65d7420f35af8f16c52e6ca2f4a5820954c775d7933fd3c3bc381b10ded56f3fea8d68fffdff7f5a49d6f9a29e00"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/cak/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-x86_64/cak/firefox-62.0b5.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "80680ed074f4f532bf5138174bc7f79b1f0dac4617e717e52dea3ceb6592919776ba7afcfc8b63d9dae8816d0dfde8af7badecf6f84610404f94c5a92486abf3"; + sha512 = "48bef5fe12693b25e6b4e8f0cd98e2782aef2f4612df5788f585fde7be205dbac259b93e9e27a8fdd161f5ba0061bf89048f7b95e9b2a056e9c0fad04cd6b0dc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/cs/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-x86_64/cs/firefox-62.0b5.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "d93cd8788dffaa1f58ea70454d2b5693d0b22bbd8f8d65456add235c6ce812faa04e63ee375b07154f8a0d6364df39637b43bb7e7619eae2df394c9e8724eeb4"; + sha512 = "3038404304662d9833a430d2f50b08a9ef35c46c54c85b0c10f752d818561c62fddf268af49e2f16c2f6fad8f5f8bc3a10832f21e62c67a08c86ab1cce38bc41"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/cy/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-x86_64/cy/firefox-62.0b5.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "2a3a4f1d31dc97655b2a0dab87d21c71b974545be1d35c427f459cc079b32d91da65ede482c9915d333d865266a1a2ed6dfa0ab770943972a91064f08bfca67b"; + sha512 = "0166f0ae13dd5c476a2d45273926deb9550509efd48cbf3ebe0cc39940a0ef43f61aaa5ef22e3a0e1c7bcc1f6479b7ae050adee59c93e1949248cc68532fd89f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/da/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-x86_64/da/firefox-62.0b5.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "529aa1487c7cd7e488fdf8e011acb0284b2d9d2c89cbcf4799f530fc9301f4894eaea555939896d289a63cbe737e0dbc5b1312dab6a2684213cf33ee988799d9"; + sha512 = "59d2532b06354cc0dd9363f82e5138101a01125f7630fdd4d4c0c382a5f65a3efbb0e8edaaa43fe252f3dc639fd71216c54b7230df8b3cfd2deb5a555d8a2d22"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/de/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-x86_64/de/firefox-62.0b5.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "160a7ef01b28c72b66ba07c9d3cb7bf8acd8935ed2a3e17d14bf62385e46f19b6e8d24cf4f3b98e321183a17bd7f6d6ee75bc144244f66f93d1b3945cfe9ad1d"; + sha512 = "1d9b0976e61928ca996e6deb2cbaafc759e783fb3cb4c154bcb6ccfe0f2d74201058cd184d431753548671863ce0f2913fc0a303e53fa4394725e2010b0fc1e7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/dsb/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-x86_64/dsb/firefox-62.0b5.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "c0f3095ad12bc6f9131f676d17dca3385b586c593f0de8568c3b7dbb1c6ca43729720b962f35d5993be0fdef096da5085ab64d4868f29727d49a136955abe086"; + sha512 = "a54ea854f5e80bd617a7ab27a15067ae10261b1db3ba57b804b06c4b267ff0d0e9d10537052ceaec3201a88efc1553a1aa2f75565e8120d72e582e1be7c083a9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/el/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-x86_64/el/firefox-62.0b5.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "e899b6aeafab429521cf25de489d98fad392a901c5533185b7b2e7516b6705f13a57c6bb68b5904a0887c54a026959df2b0fb1375df3a926b3065d516bdc0f4b"; + sha512 = "b72705638cd123eea0a4992ad6b1c5fec01a78d28ad1773cbc113a516909a62e59cf98d0de2339a7e4c12cc5e1ac84dc2f1d0d4c00f391455b223912db985267"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/en-CA/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-x86_64/en-CA/firefox-62.0b5.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha512 = "ccdb6270c83ca3475a4a77d3bc9304c1407977d0c60a4cee9680122b8e16a481f656914174cd6e4ea9b9a738424c74eecc34c864f897bfb2b59736d9cbe7a8ab"; + sha512 = "09e2289d098326df008e724cfe555004d60fb94714b7488b6d614866282bd6d7bf4dc2d4bada8f25bd52004ff164dbbc777ac91dbfb27e5889a82f5521708b7a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/en-GB/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-x86_64/en-GB/firefox-62.0b5.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "674854163f9ede8b6e4eab70b748635e0111420c127a9b94ead1294330255f4f00c89160608b98dc6231114bf4be87aa470631645069ac5a587f84a282ca6656"; + sha512 = "47e76735ed4bbf67225b3ac9043f68ec2c2b392113c488692e7f23187f6741d8652bcdeb778b64f42025afa972b8f9503d76f5f3fb1d902df25145b24f2d3077"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/en-US/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-x86_64/en-US/firefox-62.0b5.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "b09b00a8a5228fc2afb0d890ec63a19a078cdfbf82c64b7255aa26ed5ec26591b2dbc4e313bff40fab0accd6ecdaa4fbbce363bb78fed5d29d4fb7b7e46713ca"; + sha512 = "7f16492fb7f8258c6776e24c86030c55389f91d8e62f0847c9ea3fc032a53c4401b231c3677eb38cbc49a882332911c6e10119231cdde124c6d52ebb4fb67730"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/en-ZA/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-x86_64/en-ZA/firefox-62.0b5.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; - sha512 = "72be1014c8be0030cd0c512c31c64a73957d24eb756bf4cc9959a5656f460ecbae5c984d0708cb9d5d29c434468f7b68bb215d04bc261057921bfcc75bb420c3"; + sha512 = "022ff33cff54482871e515fc5c5895a5c3226db4ebb6c61f33c46b0d71bc8db1efb962db7c44b31fd5a6818e96703716ec18ccdedfde4c905762e9c0e484ea20"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/eo/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-x86_64/eo/firefox-62.0b5.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "65fd6961a1f694711336bbab7f1cf1ca5804f838295a9e3d4ead6c7fee7779c7c881820bf35eb8de218e08b8435329514a43e9018253f5519856fc0a75382d82"; + sha512 = "35414a4b02aed31563fd309b7fc1d2b6cfc0b37ef7603e73e3a6183c682ee25cf825c145a319421a279ca2d7c6c21e3ce39e316c19d8f82050c60d8ccdb8a9bc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/es-AR/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-x86_64/es-AR/firefox-62.0b5.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "a1b23e9591635e0f4bf8520e63cbc7e7ee8c9b016983b4e71185f067deaf2f1edeca80798ac833fd0aa2f337fcce71ebb36fec7afb30f9a36bdf0b59162ffef8"; + sha512 = "7fe67bd3fd36343c4babafb5ee71d3ba4749ae6d9ccdd5b6b0d4f5d14a6f9e952742c848bcc6cfb290b8e9c23323c46fcaae8732984f0e2432c084444bf74fe7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/es-CL/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-x86_64/es-CL/firefox-62.0b5.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "ed19154cc73ba0115a5f3b5606661324992d09347fc4debea0174d49ce01ed6aa4d7a1db51a064d4190053ef20f3d1263f8c48125075178a41da80ab4870e7f1"; + sha512 = "cb0f8b9803b8e07c8a771d6d7b003cf3e80c2f11272c8fe10150f0d40c52929b6ed9864f62c0b0c4cb1425b98cdcee93349046f6769b473115c8e4a7833ba360"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/es-ES/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-x86_64/es-ES/firefox-62.0b5.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "b6ce87d1adde83a33bddf2c26051facfee52197fdc8e1f9d3e457b05dee15ff76c36e0987d4802a68717ffbbdb3cb22d7737fe76d0b4b19be9b818c2d319ea8a"; + sha512 = "1de577a154328d88d6676513717c0734414542132f9265365835a6558ae8ad4718cfd018e7fe914ffc27acb49e27058c383e5e6620e60f61daf3b7a0ad06f821"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/es-MX/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-x86_64/es-MX/firefox-62.0b5.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "286c1b3cee8b93496b2ea1c158af19a5dc8f8094c5656ca3062463783834590199a2ce20e31141be2de9772b2e5d2a16ec52ad46fd19fadd25ae5c828f0b3b5a"; + sha512 = "63dc948280655a673caa1f459b285ce617b1ca2c59859951bdd7824b2409176beb1fd2bfdddee4801add5d7abff09723ef9f4a92932a800f49b564c0504fa60b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/et/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-x86_64/et/firefox-62.0b5.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "d99ffaf22ad6040382d4501572591f5a5f507baa812ff51911d7d7df876a22c961eedd2570eca9efa2a9109ab48e8b17b54838e90ef1b8bd619a0b3f57cef239"; + sha512 = "a471e69a3c90a6126319c94860a62c4ee1cc74f5260bf14eec9941b2756603d512ac052ea09f0c1a4b0a14fead86e2419aec5481a354e6d7e1f2fad1c1049da0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/eu/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-x86_64/eu/firefox-62.0b5.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "0ccfe1605789438672104bf54325676c1fdf2cafb3a3698eacfc9844843d8d33e1dee11fa38934c625301a5ce1f3ee271c2587d39aa64abc9efa509549d897df"; + sha512 = "5d998c7cd5069186f1a79aa0fe15cd70aebb10e60a61fc1ec4f70358ed67e44f7cbeefe359fe3dac98b2707aeae70e120cf9ea8827788a37932d492b24eec83c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/fa/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-x86_64/fa/firefox-62.0b5.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "7114be05fc7418f4426e6b61e2dc6b3629b905117af1517004a68eda17f6bdd0818c656efc5c298e2a2b357c740d2410e96022aa0c1d964ef83bda48b2c55d2b"; + sha512 = "2bd92cc14afd14bdb7e744127bc6ce19fa8e6dfd04fe2bb883a867dc9574104cf4a0b4a401a6c8f64c94d349f23a43e56be25053ae91397a221ca8243a062e55"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/ff/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-x86_64/ff/firefox-62.0b5.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "74eeccf7d25e71482d1a0b96096559aa90d969aff0e5085f7c0f51fbb6cd6b7bb9689e648f89ca5773efcd9ec51ed493baa49d007a10163a8995c3738573d880"; + sha512 = "21dfd28b2967b17322210927e2fb970c373d35fba0fb75e4f9bad460ca03132c304f7beb2cdbf0b9322a2705b3981c58cc05f46b1390064b07b20f05d613dbcb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/fi/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-x86_64/fi/firefox-62.0b5.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "30df120ccd5fbd0970851694edd0f09058a02bcf7e22928869f779b2ab4f31886b5893379bb742f67cba3427a368c5413354ac49d89cbcd6ed0e7a5d15941792"; + sha512 = "ab1547256fcd376fcb640c1cd37aae47b9a076f3bb6b6b220eb8922694af57d259e443f3791f1dcfa43bf0c445e508f8bcf5e36f51b9266aca9ba1b3d7177d00"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/fr/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-x86_64/fr/firefox-62.0b5.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "7ccb92068898d13494047de74e4663b87e2567a8ba252d53d5ca7b395053d5488524aeb035db2c01b25eb4320c79f5628da7faccf57d9c9e076921bfdf4bf84f"; + sha512 = "dab5e35a91c052ecd026e25bff3245ad05167ae820e301a62bfeeb0ef6354fbcb35f81dd94591f8af73b725da1d03fa5dbe35d3d63d4542386ee34efd403c0e8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/fy-NL/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-x86_64/fy-NL/firefox-62.0b5.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "d2c468239240c860324733dfda2aa3b94864e31d83079ff3026c7abbb2949c891da4a72fe7ae4509d9f3e88d3805201f200c1dd6ac0169c4206bf651977b5ad9"; + sha512 = "958d4cf35a96d08d95cb60f309291ab4509668792369a266c8f5e4d0729d7c1d9fb7070ae82c912b072bf50c9fcb0d7de51cb72fcec8b06b766b393f71bd247a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/ga-IE/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-x86_64/ga-IE/firefox-62.0b5.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "a4646dfa1761ec80139ab38106bb823b90170dacd851a5406a675d4b388391da01faf2211ae5913ccbf0b0207c2af6c166f12bdc51185a2c97de1d7fbac1e262"; + sha512 = "d44c28a82295bba78b1779a8aa2bff91dee66c515bb295fafe9758eb965e88f3e7b937196f2b6a30d7db972d4d1fb40e654a578770e37b8afe492e01ee3943a5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/gd/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-x86_64/gd/firefox-62.0b5.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "6caf34ec1b45abe91ccb48d09d4462c5b3dd6bb1f42a727805b7348b5d027f5b7128661979e9f711ef93c55f36abb082d7ae38961d1333bbc0422047e0ec05a7"; + sha512 = "c1edcd680b7bab30b6f9a566981fe41392881caf0c2e16357debaf379475b1f67bcb74b266a766814f2321527b23736a228aa70528ae774552bb329940379b1c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/gl/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-x86_64/gl/firefox-62.0b5.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "b8193b7b4123635a7df3c7fc89afbafbca04f29789bb8165f32f91afbac91255d9f157e320ef34775ba8aef9de6c05c556de8ba0f8a108601cd75b1d2d8ff7b2"; + sha512 = "5ef61e87e73d7837eb0d6e37df2b72b5d37c5e75873eafb99eb531c3234c139d7e16743580ac75d495996d02f8699e68f4adbeaf148be2995f37c383cab2635b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/gn/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-x86_64/gn/firefox-62.0b5.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "a8d3614e837c3c62c7eda24dfcb8347240b3e8d23282c9dc02a62ffc2bf84ec97602288f9459e05fbb364e4ab196099e7a4e881f8c39211b027c64a8baf1ecd4"; + sha512 = "06cf259a174a435c41e7cb75538c4605ab6bc7fa684293cb8bd6fcd79b40eae4132ac2332816fb9644061154e9baa11f05f63af55b92285bd1bbc14ef41efb66"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/gu-IN/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-x86_64/gu-IN/firefox-62.0b5.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "953acf6c1f65c7e5ad67dc3c8f0f2e8cf764aa230b8a1391221ab1966dbdc45c0199cd4d8e11b2409ec1a964a14c468a2bc4a517ec1597578f02301b60965768"; + sha512 = "032c98bdb08ad588c12f427f2e388e0a7491068ba474d009170054b85a9308d3dbfe79f3e28e26d47f4cfea20d68dbfb441da391ba0fe0873c3dfe84df9cea22"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/he/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-x86_64/he/firefox-62.0b5.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "0a4364e10a169fa755cd04ad205fa9fea01c8197a299c0c8a6857861343b6cf154bbe9b615c7592823cdf5a05043d97974d61867db63b4d4971fd28ddafe6c85"; + sha512 = "66b3dbf252e87f38ec02cd45aaf22231d0102f6d245876f036b9df6f45ebb30fd4d5b14eefd651118a1842bc54c6b7a89ffae2547b3fd6544d1fdc46a35a996a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/hi-IN/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-x86_64/hi-IN/firefox-62.0b5.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "7ca2d592ff66147387cbdd651addc07f05fa8f7def67200f7b6e8b5d7b71874eeb2f289ae5e8a91f321c90e2216a7ed2accba1f45bdb40bbf5f115509ae0a660"; + sha512 = "5f245a667b1ac4dac612f1e0017fd4ccedb43c5784692423e258bfab8db2884719649f49380d062c6934a4b9b8efc65f3061e5f816e5a7f8fa8a389011a7f32b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/hr/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-x86_64/hr/firefox-62.0b5.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "a3f9f110b344e6c5e204b2d5439594ea2a38db591693be6a357ae145864e4f2f989e876fcf947ae4ddb897c32d3f376931075a0b56e0034b4f558eed8d6293f3"; + sha512 = "507782b7291ebf9601197b7a05c0f4e03b8cc2f449f42b71d67c3a800ed35b5c2525fd2ded6c1b946e78e7bc895fd488f172a14ed8d9ad77b786c1d781dc40d5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/hsb/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-x86_64/hsb/firefox-62.0b5.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "816e5aaa60e9041f127a5792e44357245a551feef2415d6c1d1e3e5045629382be7cad0cb9947c666cde0010ff93e4c114a0b04e0e060ed508b5c280456e118e"; + sha512 = "566f1cffe3f079139597938871d41ba7fd2225e97f36b297e289dfae6c8dff9df98938de3287650516e6bbc5c80e2e36eefa256f7c22e93fe95ae90472847816"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/hu/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-x86_64/hu/firefox-62.0b5.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "5cb7979744039864ec9451db0d4f8771792df35be22171a2d1934533f751aa3269fde7dcd6bb263284a2e66c83823f6b36c821e92aed7804c2b091c23c6abd72"; + sha512 = "6e9151b51621e06f817c3d96b9df3621cf264e01e054fa1e4aef2b9e2d4775c7d5da3fb459560fa2c5cca5c6420f56e89ae122f3c645891461d720fbaee9d5a9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/hy-AM/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-x86_64/hy-AM/firefox-62.0b5.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "971051896b26735f0e94ec60bc046900c62cad571b1d6daf4c41c65d825056ae72c5fc4428c696cc148ad107050685471cd99887251c52223a46f3cff9347c4d"; + sha512 = "ff3031532dc6f7cf9ed5aaf5562ce65230b9092a70208684c5a48789a867af4aaac27958bbfe823ddd60ac0af7c60217ca4d820ad2373a3040a633d9b889b3f6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/ia/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-x86_64/ia/firefox-62.0b5.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha512 = "086733f47febb78bdcf1dff692a3ba03c3de57a03d84245cf8add743f7006f75f9fd1813d6bedab9c71bfe5b2d8d7e2f79950e19cca9a1082664e08f8f3ecd4f"; + sha512 = "ca9bc1d76cb71ddb65eaacc8c20003f2d9880c50aa519f0d7c0666610ddf478b0d6d857e45c1253b53891ee76484b62c8a05bf461127bfe8bbfd8d4f398dffe6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/id/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-x86_64/id/firefox-62.0b5.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "fce9a1a60caef1f77572fee5934d072e9321ff0d6146745da4c48f5461a3e7e74e756ac4e6ebaf1bad804b6e6062eed2d8511377693b459ea8d47a80a99940e2"; + sha512 = "310bb8ff55446f591eacf28a861003685ebf75ffb98c5d23f90f4f127282f8b1498b56fd8c7198c52256d5ec68a072bcc5f93b3352ace02a89652c970609512d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/is/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-x86_64/is/firefox-62.0b5.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "82480e44a7402deba55cd1bf3112a9c90ef937da3f5c41a4340b8097035e0b7583d8927b73b28433768f7f40e2010704b51e895a703ba40b6ebe1ce106b56946"; + sha512 = "730e91eed23eab372be68ceced592781490caef86b806ce0cb532f28c72c3396c1cdf3125baf56034f71d2cd1834b7c9a73cebb5ef48fd5bfb3390bafba8ca6b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/it/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-x86_64/it/firefox-62.0b5.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "ecb4cb08e7638478281522346181af2ad939567e777f9b49bbac54985f0d01a98260a3a36ee9053d0cb8e549a3aee481d2639d87eced7fdfd31693c88675bfd8"; + sha512 = "ce82d2960efcfff2e924dfc8e0363c577eda0c599b5b274b37455ac4b443489b5d65e58f5a3e20ce563dca6803e530ebcd16a8bc85c092e7c4d37bfcd52be9db"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/ja/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-x86_64/ja/firefox-62.0b5.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "0cc094cde71d8729a93d3ffeaa8f1ce0e878835133dd32de8a807caea71e06fbc6f41ee748135eebad3fe9241628d6d17628e8a2e68f5e8e4a18e88b31f0fd6c"; + sha512 = "bf93bfaa131ea46cb4c6515b35edb52972e861c26a34b812e6168b707d47522f9c8b895702d199c15d218ca6ff7553285161eeb13fb9e3447509139e1e154bce"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/ka/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-x86_64/ka/firefox-62.0b5.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "ba98c0d5270f7d16bb865212a4602bc0baaf0d956e5ffd4cb6f83e67391df450e187a7b927d99e6b4668e5465be0b9839099ea9eb7c67765ab0db2d3d72c6f91"; + sha512 = "3cf7ea1a5dc1f77c136a43d643712af6e6baf87c8f100f5a3f27aff9bc5b997b5b6dca455fc56ca92e665340066b225eb2a68a4cf921b2d3be7296d507e2214e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/kab/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-x86_64/kab/firefox-62.0b5.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "3553d3dd634693226bfc0db1aaf94c3c9b43461ab2c4466a8419e4429dc2f8cc87f25d15fe23a588ed1f415944a7019a9686b7bfd3057e6687ce56b63f674236"; + sha512 = "a5efb5aeeec6c355b42f90d54f196b7c7f340cfeb45e0911fabe2b32841fb0d409ab955098f737d00b8c07cf0836d6362261fdc5e482c17cd90cebea73878863"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/kk/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-x86_64/kk/firefox-62.0b5.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "79d9097b7b000d95bf967aeca33d043227155e2acf10aa2812af1ada20547e37ca33975ba922b267ae9ed35c107eb466edf6a188d2c87d847828db66df4ad012"; + sha512 = "b1230262c87e06f4c667522468207071ca1e23ea3571163d84d86b5f1c92d9db58a8f45d08e16053cb676abb79a717267af491f7eab09a87fe7a4a2cfabe9182"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/km/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-x86_64/km/firefox-62.0b5.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "ebf3264bf56422e8bff7170eca01909ffc197704d386d0fd08847b7dda0b832a4e9e42ef200a7e516b037e6ef02364a5fbfb844faf1dc65c2e99e55cf5d89c8c"; + sha512 = "a9d68f9c1a05b3e9d147be671b41dd1f42a6ad93fd97b6827fa84e46ac23b84106c754bd1ec666a2dadb5c88e10510de64c3a01ee5fc997e87512344e09836f8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/kn/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-x86_64/kn/firefox-62.0b5.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "37859cc2086c393f0026d5b164ce1a8ae7f43f231f92a94bca3c5d33781a502b1c108b9773745689bc6c7ea17311ccc9b692ef7cbedeb09abf8c8914a4bfdadb"; + sha512 = "f22963b2ebe2e12b65ece0c12fbe335ffd69d5ffb3dab8d23d9b3ec09431e69a9a2d9fc2ffd25e6d18e267d0a273f51d3e6901605dd751b9076e1ab5d30805b9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/ko/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-x86_64/ko/firefox-62.0b5.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "f2032095748d301b1c1a7503d80f92f96bb07dbc7373a2b07e879850a706615eb82a838bb2a0617ba3ea779165256bdb2be24f5186073009d52123609310f9da"; + sha512 = "74ce342f76d2a0a805f871b18e87c5e4c4a4c8fca3043f9a31c2a72ba7761c59adc8d2fd54d6c3fb1baad1d711cef9af2b97dbc314b4c82a65c183e68eb3af3c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/lij/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-x86_64/lij/firefox-62.0b5.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "50e742da88e94d29ef02d172ee9de5ccf78e51997bf9bae048a1c63f703f1af4948cd1b70740a5d8d944fff58bea03c6b66edbb75732fe0817bac89d238203b4"; + sha512 = "d087ea1451dcd4e31257058d354b47efc20cc1c2f0606cd29f2b156bdbd292ca082a710809d263a98b946a04e31afe178c135dc60c2311164d4433be32962838"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/lt/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-x86_64/lt/firefox-62.0b5.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "bd34739a3f1c7722d8532d3c960af7d1abc1150b75d97188551ad4d811b60fd585143e2c2828786a84138753443bb29d480ab342a5bdc843be1d8772641d2243"; + sha512 = "089aea7b4e9e3bc2086b90214675b270b05cdff7a0a2c616b4990837b6c2817df0d6b95ab807bdc3eefc7b541ba645de92328cff8910ca025b8e890879acae03"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/lv/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-x86_64/lv/firefox-62.0b5.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "3accceec24b52c19bab59f0b99e1bbd5ac51553056cbd3a304d0e38fba0c94aa927d3f4ddcf709996a819be64f0eeb30127c59c0f8b7a2a142e8e37b6d386675"; + sha512 = "891d1617c7f0b484ad325b24eecc76aee8395cd7ee47d011a14d4ff26d5741e35da228f2268df2eaabc1bd33136b8ca80e6c377ea9dc359296efa593db0b1fdd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/mai/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-x86_64/mai/firefox-62.0b5.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; - sha512 = "614cd2818a1868667d17576b793c471dbccf1afe450a1dbda969aa4c84fe67dc44108fcaa2146ca64a0f5109201e4efcbb65dbf49ae68b900f57138a2a562ece"; + sha512 = "dc20c342006912399702ce0b1fdedd65a479e52db00cc1a382053281454cc070015bbd4844f1157e19760f97b312aed42d54b4f92ede02a98a58bffb0f06c375"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/mk/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-x86_64/mk/firefox-62.0b5.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "85068377c4a31e96c85efeab9019830bd4703bd3a26ba8a9d5c52e3c8c3fda4c23efef0a9c5a97c17fa0cc7a4f982024bd7fa0eeb0a80eb05ec90d22f610859f"; + sha512 = "047a52c0f50894744ca8ec7b6a2000bafb6bc253a3b0cf89c36a5da054809c314f89a1249ea8930bb1268361d06b07e6076ab7af771a3c144c6f51f2170997cd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/ml/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-x86_64/ml/firefox-62.0b5.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; - sha512 = "88f09504637268604a77b59b61f0fbd38fe3f4a04d557c7e2abb36d5c2bdff88d1c6fc07ca1cc18e00a4a032de4e93fb674552d9ab77d3ad2256dba45438cce4"; + sha512 = "e7e98d4529b2eec49b611a7dfd48b7dc4b783b820a3c001d1c4951600ca9dc4ffba0f40b219a5899c351175f458618533922541175db428659b9c8ecc719bc03"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/mr/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-x86_64/mr/firefox-62.0b5.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "97f39a0b777d7bfc90b744e9487cfd7552802978247b0285577bc10f27383d5033f7a3555c399939182dae046e716b35f542b50f7d1e39f7cb78bfa9afd184ed"; + sha512 = "b1e8e334a9c1f1f5d38e005166fa310bad324a39b1273072bec09cc2bf5b6ceb113377b0a35c4b040737b5f4705a31ba516bfbb8a86a666e80a6fc7c085706aa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/ms/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-x86_64/ms/firefox-62.0b5.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "ce9cbecf5ec72ba7843426fab4c62e0ace1d0870816e00b104e60f7ee7300111d2f6759d3f52c128e0c06a912fb22ee0e7db74e185d1ca33451739c703520a9c"; + sha512 = "2ba871c517bd357bb9d0bfcba65cde914ae318909b570a94b4914629626cb1e0e163e782b8aab7a023979226afee92eb82fa2179eb703bdb30f70210636b51dd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/my/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-x86_64/my/firefox-62.0b5.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "8b52d27861a1a48fb5dce225f88cd7b7104443de0fca537c060225ee0bc5205be40677a8743900eaab892996e2f1fd829865962ad22f72a1dcaa157bfc8b0499"; + sha512 = "5b4ff681ad0c569fd11dc5c57859131caf15a831352eda1cee2eca92efb962fd0bdc2b262a8161d8ed532d7cae0a4b3e5b94de9ac417b4a4a5dc347c637d4afd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/nb-NO/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-x86_64/nb-NO/firefox-62.0b5.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "d8da0175bf389c1d85534b1f8b2fa3acaba0d7f42c4b31c19c1099dda1ad505af1921c9c0009b219a78e6f929978be77eb73ad399dd67e9ccf143339862f4923"; + sha512 = "0589064cf5af173a50a993cc586a0737360707908febb1f8aaaf24e1003778b4a9af4e18e78a619f1ef05c951e251b5d769e91c796a77051b5b7c89f00df56ab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/ne-NP/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-x86_64/ne-NP/firefox-62.0b5.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha512 = "9a7c68be248103fa7f817d63169f362c0a74de4e3214cd20dd51e0d2b9f0997dad9e71fe4f4cfa908486013c010ccf018e68b26f45f4725cf7c6c6d0f6f51707"; + sha512 = "3c593ae1b9d6098f6c528af2397c1ec7a91536afe49f44ee467fcad363fa0c39888c45ed1db61189d24eeddc19b3b2e17896d6cf233b12d90e84eebea2dc4974"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/nl/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-x86_64/nl/firefox-62.0b5.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "a39ba40d3d17bfe4c8ec26e1a727255b3c6d1e4dd1d18f0af473fed1d5955849d035ee1b51969e21e9b20d04a1341f6cc3f0cec02cbe3358cf7f5225ea773ea7"; + sha512 = "52316252c099892037106aee8ca01ae2d5b6e8fabd9d4778a248bef9a8be18f321d99595ca848fe40939af7f9e1a72b2777ad4835690420928b988d5c4816fca"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/nn-NO/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-x86_64/nn-NO/firefox-62.0b5.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "2bf0dc2ae462d160fbaa3cc0351dac577537649adeabd321b44aedda65c4525382dd8627b925ccfc4701966c593dad81b30391819affc15f62481eb93fc46e9e"; + sha512 = "f9e4a0fd69561374c5a458b22642f09845c5e4f6d58fc6d610a78b9dd69c432cf9f5709b6c8db64c8ce6d79fc3b5dddd2168ab415333d818051d628814ccd46a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/oc/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-x86_64/oc/firefox-62.0b5.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha512 = "e63393b51019891b1662f6b5950efd62e7880b9f1921abf35fbcb851cce68d544069a0bf06ffc297c198d216ba7a407165bbd7c127578f6da8a1a173cd5d06a9"; + sha512 = "1dd2961d515e165bd1dd10619940c227ac44ae51933b9eaa729aea7f1a23961276386294efdad89debadc08c4c7d51347ede59106a68438a2403d33a321ce007"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/or/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-x86_64/or/firefox-62.0b5.tar.bz2"; locale = "or"; arch = "linux-x86_64"; - sha512 = "7acc56b02539257d5f08605dd9fa64c01ad4ddbfcae34d81e805f7e46dc311105a43ad102cf588fe332d70d79558119c17d69e653b5bf11eca2d63863725b936"; + sha512 = "b91f30523dbbc7f0cc9513248960321fde85a96c5adaa699cda4e4553f14ed9f617ca434714ac8da52bc7be7691feb99c39a1e6f0a0532d0f977873145241646"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/pa-IN/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-x86_64/pa-IN/firefox-62.0b5.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "f4dbf55b3861e2018412ef3d27d06d531ebd59b1dc0d4b60161f006e920ddcb4cb0ff3bbca7ad2559f3052003044b5bf4370af1d0cf9f2375869f68673dbd102"; + sha512 = "facf98f036b0a018cceb869afd751ebb5b94d4cf12df523de6b3956e6b81f184f7f26b92a5d2afa25829f5695c5d28f0a53bf69bf9bc5bfc5d789a12fa43bb61"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/pl/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-x86_64/pl/firefox-62.0b5.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "2c4cb6f9c190a0b286ca9657c29e9bc7065809b5a532c5da906d66095430b01c5b401551eaf3f29fdd5beb44dcdde9de26c9df5fd7acc78474db1509c25f063a"; + sha512 = "e38c9921a50e7574467caacfcdd6f6b84570c58f240ed8d2d14e2d0ee6ab3a6cbf89ed7fd334082d9aed599fad71b54555ca7090bd492df5b0a36935adfaad94"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/pt-BR/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-x86_64/pt-BR/firefox-62.0b5.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "5dff06cbf8da6a5006ec927adc192f6afdbebd816ff49e2b68036f52fdbe26542da66370a1a574cfb33949a9aa5e18f0f9f4ef5358fbbd65608ea68f9507cc62"; + sha512 = "dfb79b222a4ee448f4b0430378e57fe24176162b41a1018e9c0108c1f9e162e9a03feaff35f76545273b20cd777bc22471bd3f680bf222ecb968cf89dd27482e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/pt-PT/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-x86_64/pt-PT/firefox-62.0b5.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "e3ab34d448e7a5408461a6663c621da74145381fc25e1db98ac3989b383e093ee2fa1b12429d5d1ece58bc27a3b2a94cefe0fce22e79b8d74116cff637de125a"; + sha512 = "2be6413d0f7c795907a69e796a54057725bd97cabcac84db00281a398089be843bb6ab86de9d09aec5f4270569e0875e85be380333817bf8cb601433e99e634a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/rm/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-x86_64/rm/firefox-62.0b5.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "f8355c83a7af21259a2be8d720cf2cb00bfddd06d699d888da41cdd7a8fc5834833992787f75319193b0cdf7f0b5c87f7b8705bf88de3a5ea357a719cfd58886"; + sha512 = "95991740445ac826e1b1800d07e75a6fcab4a3c8531396ef0eb93a72716896cfb59c291fa88eb41321a014a4a46a061a45cb38e387700cfab9e3d1a8eef78bee"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/ro/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-x86_64/ro/firefox-62.0b5.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "daca4090ea994c8111098d874b77e1ed8c8874a993c2c81328081fc42111c476e3a5eda2e383bec557b4bf2e9ac6cb8a78bb75c930cae69d760f231f7bbbda35"; + sha512 = "7f770b59fd9b9ce96cbedaab0f5c4af0f806e0accb7680bbad55d39aaeffb29700981f4dfc1bfe9eef63ed42a88414a6aefd373fd1b77cfd151a19b09a30ae79"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/ru/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-x86_64/ru/firefox-62.0b5.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "c1f6c877b1119b2d16960cd5724ac9044912524791dc25658a86b34f1b1ee800dea524e954e60048fe8211285f227a864359902562a0a721ec6b948fa722da02"; + sha512 = "a0781328d9961c545071be97055313bd4d5fa27d95986b9400a91423b24edee361bde7853e3ae63d64e043a6f44d29557dfd075e7650f2574d5d9b938334f664"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/si/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-x86_64/si/firefox-62.0b5.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "0784b64e92df8b00d48695e627a00c3d4bd4ca56f717f0582c4f2fe025f3da9984d6b509fa4ecd06b9367ec6a9931938e69f6edd83397f0ff416e74167d85d15"; + sha512 = "828c6ddc28e23c5c91442947b781fbc2331d6eff6b2a855dd569d1999dd1120fa8b5ba9a6c588c9e04ee4a8eadab33b8fa2ebfa699dfe28fffea0bf410d26d09"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/sk/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-x86_64/sk/firefox-62.0b5.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "76b6412df2dad10607b201d7be480e436e44988d401a055669e2ae308c0d687ead9e3f1bd06d30ccfab55fcff2f605fe96f98e3df8e321bd4ab11a3d211a5ce8"; + sha512 = "3862306b1f60fbf58df8cd101e0b0fb21fb0bbf07a391b28560b79554067e1a39de5b3f2ed6aa8de9123ee97b8542312e5ba3ff803af50ba943ca7a6618c2041"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/sl/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-x86_64/sl/firefox-62.0b5.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "056b78321432303d6dd09f4833b6420f0134a47b90d62820f7bf12b430f608be3cb3d3960bc6e7b4d247c599efbd7305989ca44b55bdaba37c49ef57ce19cf0c"; + sha512 = "0c3ab1ea59f015cb6b02d7f851efba277b56670ab4151393770b6d7312b42d490039fc174878a17a058d1d6a9b24c9fdf7c3f935858927599e92d18976f83f06"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/son/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-x86_64/son/firefox-62.0b5.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "f7b5b82969e199a12887f381f39def4d2ab8cf6fb9a722b3b9c312c841dc5fa8b4568e98940d0b683a9165edbdabfcf17092497c80b732108d0883a1ec58bfda"; + sha512 = "e459a2c61d68f7b387efd32c16f90e5fab4809945a232f3451cfa5409cecdc97859fb08763eb5583b8cd25dfce2f35c91b21bcdc9c859903d6f1bd5712b676e4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/sq/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-x86_64/sq/firefox-62.0b5.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "2a8f683b0529596c35cd0f76b7d8fc1f1503f1298ff05a7596972d3ece439d88587b250615f5994dc75fd1ceb370ef2473f91028015b2464ef259838cd9d78be"; + sha512 = "33871f9075078aac29cd7a86b36d02c5c6713e8a3645bfcfa6207f78e3441de756620ccac4af5da8059dcd4ce14f7935a0166ef56ef1d4396059fa2696f4b379"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/sr/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-x86_64/sr/firefox-62.0b5.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "b33187d6b6b20023fa810a0b3c70792f1c665833213460dbb081c5b2848217a025688b456e66e50d8750e42cb7e71f6445e5680e5d8d7b77c3999463ffbcfbbc"; + sha512 = "94cf855e55d1ee094e49be4e914728aed5aece1cae79cf70b0e4ead416550fe437a6f2c9feabcac3fbd18a3409c2f7a2d9a557afb555bab2b812f654f2b2d459"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/sv-SE/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-x86_64/sv-SE/firefox-62.0b5.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "ea2b99d16d891e742697a68749cb8499c0457e15e42d61bfe0f2356f3f42ba272df6fe88088a594c9423d59177f4bbbf11dd929d6f33459a280948ecff55a2c0"; + sha512 = "546409339a6d8481ffa111304739b60e858892e51919ef9a36833e585403a09b9e83c58a223553174f8c443efba2cc5514587f4b87c9ffc7b620add785b77764"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/ta/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-x86_64/ta/firefox-62.0b5.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "fdcfdaba2ef1cda3f7434aea3d7931a9f88b4406ae8a05d5fd1b84722b2170079385f99bb071febfb6416e147f0b06bd0dd710766222edaa5e68331d92edf106"; + sha512 = "8b1badc2ab892f07c8d2f129bfc08e163e87ceaad330d728d8e7079d2ec934fd4c936a73338dc374a55f1a5e2a104b73d2b5c9f05674ee948af464f50be1abd8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/te/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-x86_64/te/firefox-62.0b5.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "b4e55cd67c66362d28867f9ddef1f6a44d3081e183fb19d4a73895817a37e2eec0a87e394c0fa70305f7752c40ed355ed16fc3111d72e70f6e667b959bf22c56"; + sha512 = "d04777f7dbc11e92658e5affe36114b1c56ffa3b9e548a479e011dfc2da779f6da4e06b93982abdaffdd52933abb239369d4c2dbe82200312d3539bc93d957a2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/th/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-x86_64/th/firefox-62.0b5.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "20780e1eafed9667b1124a3e99636fe3b401f8da0785c9f44bf5b797b2d7b0ee17cefa916c5a30813bf66fd6bfaa1313d74b8b59e65c05d6488d30aa9939d3cb"; + sha512 = "9b9957f311e774c72915aa6de90ad998ebf42f6fa48ae58c12abcffbda99d07bf3a0922851d3121727203225975fd709edfafb58b2bbb5ae6de07acfadb398bc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/tr/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-x86_64/tr/firefox-62.0b5.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "bc3cd8e37a59f599b486c966097f152836e1486925fc99f7b65df33535d99347659dea5c0696c061d36a5fe85a8ac307fc43c3b88152daef40389395ca3a43d5"; + sha512 = "a48f995638205f572c449ecd4c2628ee698104e131a75a427f2e81bf338e605f6bc0cdb5f9193b2f0f0ad5f2bea9bc2fba20d5e4a93420ce098351fbd823c6dd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/uk/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-x86_64/uk/firefox-62.0b5.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "4a0b66639dfe743bc585d35887f1c32bc93df6345b943e4e21909bd5613bb298273640bd97a50a38f1577a985368b169cfd6528da6b7816282411483f1a83782"; + sha512 = "e18aac470f8dd454b5b71f11c437b953644b3bda93cc924c9866c27e0f273cc2eaa43b0115556fea64bf13d735d7d3a70f34af31966e50090ef38426775cced1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/ur/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-x86_64/ur/firefox-62.0b5.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "69d6451c07778120ec20003f7106ebe77b04569a81e0a9b8643e8436b7a05d8a6fb97f9d8d9e91c6bfec1031d0518e720520ccbcb9461350f4ae2b7efe421d8a"; + sha512 = "6ea9a9a64547079b369058365595becf9f2c8766396aa557d92bb40b3848bf44bcba029d8203c1a61f8bef1b0d1f37f8b882f35d82a821d678d1f103dccd5091"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/uz/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-x86_64/uz/firefox-62.0b5.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "6cbc42bc4f147c6f6a30e41a42b019938d8984dbe21f6f01be689b212f3308bc409f02c5dd1337edacd29d80ab5af2b67e14fe2666d349d3368030b551965e2b"; + sha512 = "6fe5b3287d569faa349b9cf67c77f26e3a92738bc03a10f84751e0067723c943507b1ad838080d7afe09956fb03e823eeffbb1ace143b220f58e1772717cf352"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/vi/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-x86_64/vi/firefox-62.0b5.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "07877f515cc5c04bc03173108321ca019432dc4440bd66b3de0c8bcefcad22a2671a84b82ea4120a630b5bf732067d59e0be9abf003566ce4e00da8ae64e3d66"; + sha512 = "ed50c5c645576ddecac3a818f23df66e70b9c0814a32aadb1250d3fe20fa818245d671481a4bdbe95417e45433bde451f5ffdb9fe061fc9df7b60065f0d4710c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/xh/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-x86_64/xh/firefox-62.0b5.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "db8c70eb94f26d07f6f80d842b632353e353ef4577fd341f3c66e81b48421b948999104570a545cd3366dea286a5640547c999f3c9ef69cb443b770c37c73083"; + sha512 = "9eecec4f1704e76f96ca2e6a9ba416d9cdd24783ba31daf46148944671b1af4f752b12570aa3148f5bd893ed0487bef0c6c3934eb11c703aab88eaa871f08432"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/zh-CN/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-x86_64/zh-CN/firefox-62.0b5.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "a4b7a5bcde4951b94cb688b0c9760dab85c879ddaba0627113f53b80dc80958fb85d8edea61e6a923f0aa8d78af1ee751cf40c34683aa077481cca4a6688c65f"; + sha512 = "f58a7767a5a6b1d4fa0a6a0196863c02917575816d1146a833124c5b4b3f2f9c8e3c69394df3a106f69ed6696abdd6e2a382007a7acc550291ad81f94f362b7f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/zh-TW/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-x86_64/zh-TW/firefox-62.0b5.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "37c477b745d2ed5c0fb0dcffdd2727e3c95cb73e5d5d88a5f707bec8be3deeea4e05cf35562059a8274734524a85987943d7a7085e3194fdd83eb4517c2c8870"; + sha512 = "b452a0c98e193ce6a7370801446ddf076687602f58256e99851d38deb85c4ef6790ce78b90106acc145007c2bcd3a3c4d7f70125939e339e9fa3e5c00c1cfff0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/ach/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-i686/ach/firefox-62.0b5.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "a037c7a7e98174c7ea9b2a87ba0fdc0dd1059fbbf087cd6f6831e3eb0a06d223dd1a2f99a52898d324f40d08337525c4604f35bd154b216d369e9da70db744f0"; + sha512 = "7e6d289d6e9e824370f5c90e45a38836ccbf97a014ffdee0380c0c1173a9c0973a448337a91e05839ab1a8f7b6dab707e49dedd47e5e7ba4cdf56da94ded7bfc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/af/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-i686/af/firefox-62.0b5.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "558a10aaa328676b5540990cca5be794e5dc7202a74cc97948db71642ef4d045d16ed5a72e816d8f0ce63741fd78b815ecdc1aa4a2fd4e4241d1ebddf5d25022"; + sha512 = "547afca0ebc8cd9b8082160a3f8fbcf680f8ed8f96c13926ad8be26960c0c3d353756ee285d68af96060eb47a56709878ab974a5f2f00b0c55978f6768a15ec3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/an/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-i686/an/firefox-62.0b5.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "810b5e449cdc78806b9aee08a5a43fe0e5f771e49a8f2185f950609d397b9cbb80ba16c35c8efb24fb8d9d6d7b1e41a5a3da1374c84a919f47c3db70b31090a4"; + sha512 = "82e00c8d07a0e2492dbcce0f14941e13cb4ba205d74bcf188eaf91293fc980a21752c328179e08f797eb2b971c94e4bf94672e597d2fda483cb0b3607e063074"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/ar/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-i686/ar/firefox-62.0b5.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "39762c036ce21ce118dd5529b35be17fe9a8f03753e59deffe8903d20f73355ff20466a2a4d3e400826575fb08a5882002019421240490987d7e9b9215499654"; + sha512 = "3bc28634e891b79f30d07dfd6a554a8818c9e3a181713d618588cc811fc6af7debe0d730ae986ae57bf564df6be2979c018269d522c5a3cd465ea48d1677b883"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/as/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-i686/as/firefox-62.0b5.tar.bz2"; locale = "as"; arch = "linux-i686"; - sha512 = "12d9b7000d8a2a3b0c0930b778a0e262793381dc57ae53532043c2dcddc520ab931baa67eed24c3bc2dae8d9ea198a34250d41cf61b80b0af18aca24b754387b"; + sha512 = "b249ec9cf4e08d9db67293ede0a24cb8eb61c27a5c86133aae8d05dc905f54ba981327b3824ad4e90ffd3f2a808a118e7e3b0571b4f7dd981f9abf54d294d299"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/ast/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-i686/ast/firefox-62.0b5.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "3c84c453e4d583b2df67649badf90f0dfc0d25780d1d7cb5fb38c9b9b749a25842d986554b4cc8a66aa4193f93688a570bd7ccbdcfc901203b8e240bde2235e4"; + sha512 = "fd3c41fea14d8fe1ee4137a2696e2a80f29b162bbfc01e676f3a98cd2ca44be6b85bb603d794f497306f4c83bee1b9a7398e166ef85c35764eb3a01f8c20f8c6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/az/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-i686/az/firefox-62.0b5.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "dfca240828b9c4e4e7b555f6c7e33c29e6b095ef73b91e87c548bfbccc80d78a25f58a790f02de3d53303ff6a554dcd0b538a0bd5a34e95469bf0fdb319ee4ff"; + sha512 = "e57ec95f22719b83b1ceccc6248b92b05d8acef1edbb5585312f6230c273d5590b29b2c9a58b73825f9603e0c80493e886febca86abb708f9b4e2c36ac37f248"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/be/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-i686/be/firefox-62.0b5.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "4080e78d935385a39bdaa1a1433642e89b2026e4803bf76e45e92da9a741ec5bcbcff5fbcd6dca6cca072334610189614382df9d6d1cbb116a0e95758c2f5930"; + sha512 = "84fd42730bcccfdd765cc760eb374b74d4b228e1adc70a39a262aafc2178ff10b2db948ac3cd9953aefb3e180f833b75b40e216a2d66093a67e57a692c499f78"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/bg/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-i686/bg/firefox-62.0b5.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "fbfe7107d0f3c70c283a643426c530e62a45962973818311dd3787563c54ae8fda3826bc8bc807ed5b9fb281ac0ab163162705cccdedb84d3f8cc2eb2a68a712"; + sha512 = "be982a82b8d5ea42009e847d408a33f1b554cc9b90c73d02941540b3da5a326437780d6d901a9681f3c094b03ea8b4e3fb1f9023c8a953ab96d779c4cc2373de"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/bn-BD/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-i686/bn-BD/firefox-62.0b5.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; - sha512 = "5fc9c22452bf775577ffacfa0a6a328265e5143c0c7804b40fa33f887eda33cccb95aedba9426f65ff60d7d3fda28fa4e82bd7fb740341f4dc4d5991526eb3d8"; + sha512 = "6651b19765c8b179a489917bddae5faa30dc0b0fc36b9e26ec94f0301bbe4b71dcf5eb12f3a46621e37acde9c63864d0ba7af27d5982c22c7a7b46a79fccff0c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/bn-IN/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-i686/bn-IN/firefox-62.0b5.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; - sha512 = "ffb74d1aecadb920208bf282e5805dce203d854f79f733d34dc5834b065e2bdd5f9feaf2646c13247be9b9a3fc47f1277a917c89f86f14285d7c6c41b9399cf0"; + sha512 = "dbb9c44e0c9e40cd38fae5a6c97cfede59297824d09adaf57c14b5a141df5e7b9140f55231fe00378f77f5d6802d2f76fbaef4748d7282562495b1137e27fedc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/br/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-i686/br/firefox-62.0b5.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "7a127b5901965324d47d2fe2a263ee7e088df95cb7a53014a06bc4dbfdef0eac7026272af2616c90e2dd7aef82be12dfc5fc7010b306376d97db9588f30a1133"; + sha512 = "586a95d196177a3fceb76d2a02525faed0e75d23dbe0805f5eb84130774e45d0e633dbb1ad0583d52456481712974443abdaa2bc470a69acd8010e3c73c89cf5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/bs/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-i686/bs/firefox-62.0b5.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "704022cfbc5ec0d9bd74c6782354c507cf6c1945fb6101bfa5bdafa982c69c38e66527db09a00f5fafa4b7263e9b5e53f95b68d6e4be24f9c4f48d90d63db38e"; + sha512 = "672778dcdfa93a190db34d116e363a39eafdbd5f1bcd52dd755e65fb64a6b5f7c1c468b3c14c857d7dadee6d93938fa01b7f252d76f2f24828d7cf3debbf29bd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/ca/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-i686/ca/firefox-62.0b5.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "a2efb994515d3c85e501c32f77a9bfdbb80a27e0e30f6cfc0dd877041906866665d7663266acc50d1acb73f2d56349a80e47ea51ac4891a588f40a2861e89007"; + sha512 = "cff7a5c4b7b4f06e2334425ba82e8c7e3f2c6b1b65436625c370b3fe3223713a6bb1137a38915db9ad20a485ec21c89006df5ddf6de0ee92554f687bcb528923"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/cak/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-i686/cak/firefox-62.0b5.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "bdcda65e9f15ceecf75294af72fa9dfebd64253521545b24d543b3adbe2f98418700ebf0191ad5d894cec4cdf7457a2a8a2f60734b9a437f35e870f27efe5d04"; + sha512 = "35f7019284a1ef0e9bc3510a02df24070e22fb4433d5987d6b78a15708942667ea8e9d7df4c5337d39e9995f03a06f675f29bb85248f098da6fcac980716bf6e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/cs/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-i686/cs/firefox-62.0b5.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "a2d6b96afc9f2f3ea5707504329233c536f4fd387f0125da39bd68d94efc40f46080f5184e45362dbbb4f44896a662d7855ac4c57be44c4b2caf9dac23f899d8"; + sha512 = "f370295fd5d80b6d6979d4269fe306c2c8bb463b509e599a0c2c88f904cbf46e9cbee1c4c6e33e393bde705a1451a16b590f939394210500f134b7da2c4549ad"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/cy/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-i686/cy/firefox-62.0b5.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "82f87813b206d623680b20ef3f687f59fb83decc4479e25f6bbb7f46d986ec805ed054c643f2b5955c43925d930a04ead99ebfad2862652f4fd4e71043f137b6"; + sha512 = "2bed6c02bef30676e67b0d4281cb0ffde1538fbe4b15893050c5cca42ade0ffc8e8839bde58e3519b355ca7cf7343e12e089abaa86016f5ef73902476dc64591"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/da/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-i686/da/firefox-62.0b5.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "7b023117930f5266c75819fad5d207aa9a177776864a798cfdbec24ad25507af139a184b593b267f045ef381cac8baa28240d5788667dfae37967e4364fa07da"; + sha512 = "b86a5147dde2eed7d753d604a6dc5f9255c51331b12ee667896a3d24e3ab6a7691c0210d610b2c0057404c5737c3a11a15bda9929113b56cb304248ded6dabc9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/de/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-i686/de/firefox-62.0b5.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "cbf905036051c20ab3afc1899ccf5ca2db3a137023764f039830d996f515967b78a02349a118d0bc0be022be353b0ba57e8f27b8baddd21ff4d8eb240577b208"; + sha512 = "640f8a3b23e70db791d908db8317cfc5020b405aa86ae170a6633cf5b81d0a839fd43558fa6919e33f97b79488b3507ee77e677ddf9a131b50e414a09fae79fd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/dsb/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-i686/dsb/firefox-62.0b5.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "f7a109193d3fccd09718763d44f9c30313b2062b25c962e4fe4273e62f630655cc7c162d2b6648bbcff89469d5ba26fc894c330f074dab3924d705e3406dc9e6"; + sha512 = "66ff4bb4794b4459f9b4855ee4a36ab3135c9e0002b47accff60bf49c7cd8177d822c8bb2687f4c4f4ceebfec15a26973f018e15755df413965fa20e29a967b9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/el/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-i686/el/firefox-62.0b5.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "80a90637d8678a1817e653f50ad7a67b7bcb395e3f6df3e39f90b575b9d554e86554e0732675210ac2979e030827135a6ddc752640b7d6e55d6a6c0098c9e34a"; + sha512 = "eb358df27fa85dba956e9e2df2c00402734eba84647968a046d7ec80e00ac35ba6a5ded9dc347093e00696767f436125ba776a2f0db57c343b55f00b0bbb2bc7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/en-CA/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-i686/en-CA/firefox-62.0b5.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha512 = "2dae6b1eaf95e735adb0d4299a7ad5abb3dcf15ee8fd117f200600e3b668d1d4a0e5e23a3b1db2d3ca00498b1abcbeef1494dea834b18e43bed067a60000feda"; + sha512 = "25d394796a794416941e649754351db443778c2d509a0c44b3b8a5a5b6ef47187418b410b858c684deef12f203ecf1853ca0b104d1f03808ad6aa2cc27790cc4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/en-GB/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-i686/en-GB/firefox-62.0b5.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "63e280fc13f34b19b07fd2dca94f38d1d2d6a0d2d300b430dedc23ef60d248bab8171dfd8836d0d9476ffdeab9951083307b36fa2324cd39feafddd71599093c"; + sha512 = "57f943b2c74c43aa9e2f8d0b83ff37bace83f72c3612ef7d195fdd5ee4a5989c42ad5eef350b2e3265d62f4ef17bfd8cc20d84cecc40ad87e14ab7ebe6c81ba8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/en-US/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-i686/en-US/firefox-62.0b5.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "03d8cbc65efa158d1b7fe303db38df37648aa0f56b6afb7a3e6349f4a658946e8b78fc892391866175966387b90bfcad3e1543b615521c4c8aa15053a34b60b5"; + sha512 = "c7b4adf7ae4731b960925447a44ed5d02ddf8244014757487550c512b83c69cafe3193107f5d29a445f98fa79c5426b85af5061a2b2d270cbe365cca2c96e345"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/en-ZA/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-i686/en-ZA/firefox-62.0b5.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; - sha512 = "a5510a63055c47b313eefe5d4aa21b1e9411c9a155ee4e89fc3438ad6a0b9909bc197ad5462bcf29df4e7bcd8a86ca0eba33ed222e15d4061cc4ce7bd67f757d"; + sha512 = "d34fbe7cd3399ad7212022dc92ff4e7fc0eaf1916292d270841de7216c41517ddfefb8ed04fba37797bd9b7c2f8d43586e0e30da39224d5c3203e8576d09fcca"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/eo/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-i686/eo/firefox-62.0b5.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "29908c15095edc7701609dc8d2ac0ab3a8ec2f18bfaa74e5b410e80fbc2f1476f3f98db67dece9e8caa37cbf3e0f8034cf791958220a906e2b53205487c9e8a5"; + sha512 = "a319848c69997b63cba9beb316720a58688780e6d99e48cc8bcae85094345c4effebdaddb5e5fd9a899d8fc78ddbbdcd3bb39a9c1d3cc81ca210ca10907f11a7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/es-AR/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-i686/es-AR/firefox-62.0b5.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "1b2cb7e7fa15219988b87c465c74516d04c8642033504888de896b8c29555073864a5f5ca9a39baf3f273dc981dba139322e6f65c242dbb69ab5d335e4952540"; + sha512 = "1b29ca22ab76ddfcefa2e8598f371c1285a17445f264e880bf198da9cbebef550e979891d2cf37697ee028c484ea0914bf71811db3db033725484dc9826e62f9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/es-CL/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-i686/es-CL/firefox-62.0b5.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "232a910b28f3e415bfbf2ba56167941f5076bef3f58c24d3647fbc2c034ac71a1bc4d4903c4e7e26f56f73c72a4759baab9e8a9edbcd848b6235337e095100c2"; + sha512 = "09113c80ea5f2921ec8f64aae460d03fb4e784e3e860d274b5e85d7822f69a352b2ed10efcc7564a9b47627ee8f1f7c9922a2a05d758d5d644413a68819069ef"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/es-ES/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-i686/es-ES/firefox-62.0b5.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "3ab5192cc1bd24a565cee5a24e4f11719fb6f052c6503770bab5436b308b2ea1aa935b40ee4fe9a1168ddbf206c9a8361585880cab0380cc6794b15a172b2089"; + sha512 = "e0e8899ad3c536a717d7adb0b9ecced2d8923a7ef51fa62908f7d88f32944ee1c02b415d5fc1c6c8fb122f1485602fed4d3d59adaec2bcea48edf4c750622d1b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/es-MX/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-i686/es-MX/firefox-62.0b5.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "d5ec7c8b509370002108a741c46b1846d03af3805e22724a26d8195cfaee3a5bdf09b1140df2755d43593bdb7ac0eacd68df59348e818cb0ebd102343a30ec4b"; + sha512 = "f0935deb2781f651b01968146d4e4300471678ad0a4db31746ce8537e29565b3275f4f6ec1912306f35b28826d9adc00439ef4adfb27bf2ea7dfd8c4a1915bf0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/et/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-i686/et/firefox-62.0b5.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "aa3bfe0fffe0ef16ac9ca5ba50374eacd82435a2b2625999e1663f4335dd7f0ff56559ef43247d858e85f7c6bdf8c2dc971ee7cfdf457de99ea0434002c40571"; + sha512 = "8d155202308450ee705c61c1fb03da169fe19fd27cd7609b232af8584a0a600379cb5c17fd69697a8f4a07e30cd6a0616048127cb842d58050926884520bbfce"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/eu/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-i686/eu/firefox-62.0b5.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "d41a08fdb3188c6e9c8c97e3b4883442c9ec8e2c4915c179bdef70af8da8d31c2750b8128298de9fa9a7aaad1ed2374ee91285057eb5e80bf22845572df6292f"; + sha512 = "8425c0d54f2546e1b372826e90b4b32fae426fecfa3bc6cdbcaf27bf4e286a3fb445cac8b0145b5b3ccf33864933f590292d971186e79258b8616e0fb9f58f68"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/fa/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-i686/fa/firefox-62.0b5.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "7fce80e993a00210aff7afe4f75b19e55e39e2ccdaf6346186be1fc508df298dcab101da349c7c243e736a2e3d4b5ce59a7ed88c5f5602e2263d0bde3406472e"; + sha512 = "ca62c1f15af8e60190ef213f46a4599119111a0aba51eaef9c7a075ef6ec80bfda70283545ae70268ce440ee1895482bde7aa8455be51f23552998049291401a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/ff/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-i686/ff/firefox-62.0b5.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "87387872c03dc64afa6f92f36614898de6d22f946a8f65ee8647a1b80705e180dc36688f23285a6db8fb57056ce7d6562251cea9bb44bf9dc60a2c63c6d74399"; + sha512 = "560dc960f80c64fa8c42968ee8a65222ddb042fd3b60c6761d6229eee4fabefd323c5787f0019d054e2e98ed2f68054bfe84843e00330ba38a0cd791ea28ddd4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/fi/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-i686/fi/firefox-62.0b5.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "d09dcb33a339c274c9559a3835ce376e0dffe4bdba6c80dd0de877ea3324a3ed752f5bb7e1f28eba3c5ff48cf0fa85f0807756edf8bbeeef22bbb163b13bd433"; + sha512 = "e034bb7f68e18ec2551c9d481aa4cbb9129f0a90a63782463e1fae9f5fd4cf697c01324c8a2e9e08a1275bc060898903e28606fd070bbfdddad022c5176aba0a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/fr/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-i686/fr/firefox-62.0b5.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "5180d006c4fca181bf96b5cc2a36f6668398ea1670b3bae4ca3802d30e3e7f6a0c9f0bf26ee4e8596bfaef451dd3724dc0e16e95eef5d5117bd67d39a0967ff6"; + sha512 = "4eb639927735239894cab21ab213fd8fb7b96a2e94a8e46d5ce813c4f09032882357f2086a71aaacc44f787ac496cec074e552f14b14cb165917d9c47317fb83"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/fy-NL/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-i686/fy-NL/firefox-62.0b5.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "7f95c5d348ec4b9881a1c0f2a6d6b0b71f98f007ee9237ac11a5aea0c05266ecf9f2b2a1df6cae7926ce338e04e2930fa41ca394ad6d6434c2eae225e3d08276"; + sha512 = "ebe9413fc31d8563177a0ac0d895e1515b65a6256f5c1862689388a92f6bdf6f8427fd97a70be9f29b0ab3cbe69218d5a6974f537f4d1c0408f56781cd6706c2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/ga-IE/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-i686/ga-IE/firefox-62.0b5.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "fd264de05253312e94660883857194c80049435398e39cdaa45d7c06f2f39e356903f14d27c70899f71d79aed22286476ef65fe18737810b767875d8557bc67c"; + sha512 = "a3a4dba70564a8872cbfbe95aec779e2f44f244936a9701e7b96681444793c6ae29de0d22ffa3a4e1880706987c2bcd8e2ba6065578a3f67dd0802231cfba638"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/gd/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-i686/gd/firefox-62.0b5.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "a82e59321fc99f0b853e8febaf74ca709572473a0e1ba80c450b83bd213a27c0d3a42e13958d239ed78078abc22b518c19f15a9f6ed95b2799c0b3644aad724f"; + sha512 = "71db4bef0c9f77fb24515de4be1e256141bcfdb7cdce98ab01d77405de4c3dd7e65e4c6b5e4dc4326d4f1afd8467f77aea0d3a3c0a751eecb502c0ec64340de9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/gl/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-i686/gl/firefox-62.0b5.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "f2ecdfded32e7a99d225d6e535a24d0e7e73270020d0a16abffaa05a5553a309ec412ccd7d2fc45a0ea3dadd7a46f78279c1a6a79f884f00e06d9502e26b05a4"; + sha512 = "70758ebd52993ba62931a2b64b928c167d92da8c8a77e71cba44ef6701643666ca1f874c4c4ec1658c82a2023b94ae5b1538e88ba4f96bb8ba3a47cea59eacc2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/gn/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-i686/gn/firefox-62.0b5.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "3e807ffd78b3bd9ecb46f1c0f26b69be6108adbce27eb6235fd8d44c46ab8555dd84fb626a40c361ff7a93a233b03ab58754430fbdaa9d059da338decc45906e"; + sha512 = "0abe30c7ce9845a27d19ce7de8053d3f330fd675701d348930fcf28c921bfa7ea7705e712c195f5e064400a1eedebe86c985830c0e714d9eccee1bec3af4a947"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/gu-IN/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-i686/gu-IN/firefox-62.0b5.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "50edcc06670da6e41903cc476efb66412cdb025e7dab4bc6777743f0ca59c9f8aba1ecfa445b25185bef69a950b24febf79dd6becb43b8a5e96cc23441285d32"; + sha512 = "51327c16545a2cdf7ddc79020f6d14cc38ca9b1437e35a4e2cb1f481f0d126f2fcc2786dc89c8196f4cfe450b22dc9725e3a77ec9075e0dba754c989fb5494f0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/he/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-i686/he/firefox-62.0b5.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "dcf02abacc28fa133db89513ed696d9063c263edf46e35e920804e1ec059c673aa9174181f96809c844fc42738a38d3c1abd7b0e1588b8b501ceef874382b103"; + sha512 = "4c1a7052ab3fe9941c64fced88cc756662dcc32d05e5cce5fffa45f02aa5d04f45470c7002978bec1c9919dec255983886b5ed25dcdd4728740a498180b2c530"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/hi-IN/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-i686/hi-IN/firefox-62.0b5.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "06d36c3e16e66c5d5a46c1fff49d7e42316a9cf0de734582759b01489a73b51a0e338db104635ae941a206ae18749be124ee7ce578517306f898b2a24e7e9d62"; + sha512 = "b3cdb1dfa34ade46a5b30f78cf9c4e6a820fbc05a15d22e560f29e0a5c0689647d7d7a72200984a05423f06dfb5186dd9ef3df84f82a0966bf105d7c110dabe9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/hr/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-i686/hr/firefox-62.0b5.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "77d49817ee73c36cf4297a0e0d97fb54f4551051a444c61ff15ea8f4de3b10f842307ca5ea58d588f571e967b3abc1a2a8a5f2cfcc4f08e3f3e745c0a2f8b2b4"; + sha512 = "db6d9c1d975187d43638df8b5a3029a58cd2b672e6ac630e774db251c27dd6d3132ecea42a635183ffbc5bcbe1cbe1f22f42f206592e92d4ec53708e384231d3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/hsb/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-i686/hsb/firefox-62.0b5.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "07578453be912cda63cb87240aa8254b87a64d119339d9f1a89fa64d397391f03e99d3177e2a0853f06f78e1008706735c4c8eb835b627cd2322c404c6cc0cb7"; + sha512 = "722e9845b177de9596c2e8e54eab1a5171702c340acc56f11b1d14647ef4de83dc2ce3159ba89a93af4acf686b88b32ad0741df65845fb0dfc5a12d486a488d5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/hu/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-i686/hu/firefox-62.0b5.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "db3646504427cdca82196a6fcd56b133e06a8630dd3b55200a9627dba91adb2ba5f2d4747742cd89f1b4eda70eb95d06a229a5b783ccb68aa52aa40c6e69086c"; + sha512 = "101f57371397ffbdd181d371d9ea410c08d46545c6da69df7a9728ba16ded9c009b1d789d7f36805cd7c1ee85410c1c9c4705a623ff102667d2bf2b8942547ec"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/hy-AM/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-i686/hy-AM/firefox-62.0b5.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "359d64594bc2009a4aa71e0d49406e87a071c312b78b51b82a5bf1501b3e75fa693029e7999846f2d0e204d43525a18d3bec5370d04c4fa6d27de0754950affb"; + sha512 = "f315d308aa5ac1d9fcf9b86fb587dee016566113a93de1c2049b74f6dcef6f157dccbd03260e0df30b5e6810ad827d7ed49d195381f0e5567d12390a1a4fb82c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/ia/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-i686/ia/firefox-62.0b5.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha512 = "dde35f60387a9ffe930f77638660e7765e3bcad00116e5c36b9256f06af61966758679cdc27b254d43ef12a1a3ae0b3d5cbde7e338cb3e4245ab60bf29792d9f"; + sha512 = "5d76ffabbd26b243d96e105788e178ef2ef08124d0733e3c922f1fd71bfe790385c9c8cd4d32f159f24cb6f89fd08281758b0260334d79f960cf6191de699886"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/id/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-i686/id/firefox-62.0b5.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "7d480fb09f3171cb3b7fcebac9a548c16622bbd19822de288def3e6d3cfb56eb68aeb0c23de4c1c74e303a5491a0a818dbc420dee6d117f6734ed8a3018f4f8c"; + sha512 = "8a408487bfff277d77faa07f5d04b8000f756b2b2f8297b536decd79b992e329e55fec186739d41d848ea5be7daa3879e7b3fd0cd46255a587e9d77d43652b9a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/is/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-i686/is/firefox-62.0b5.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "fdeef94f70504762ae64060590cbe59804aa1023d6b9095a96c87fa06c42919e36004917228219a012a3036fe64b6550d0f6851c56e09d66472385ba8a9764b2"; + sha512 = "51f8e881756488fc777efc3002c24c581bd16cce7ff9f39f7ed1c4fa8d6b898929153edf2b44d9d1db0d3f7fd35e6c38edac257d04273b8cc559f41f30d6c0e4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/it/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-i686/it/firefox-62.0b5.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "446f92129d027d4cde2d34d3b5fda8890a5461db89a95e1f456f0beb8b59f77bad0306565062307d2b02c69504376e31e933955803ea0a08e8c9de10077c9807"; + sha512 = "fde7669fe9ad5f7b802f640c24e550e6e4985b21855130df8ee79ec4e1ae66eb5c9aade67543fd1939a35d04eb8f3e25916dab17e2a2233a642a371769eb11b4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/ja/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-i686/ja/firefox-62.0b5.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "0bf6139ddc700056295969d193b1663edc11c22832a789edf1010dc979f8da2d08f2c58ef67b37119dbf80fcb6b0564db54d1f15b6bbb94ee43d01ee113a11f5"; + sha512 = "333149196397423b9e351346abdf2140cad35e35d31d1867097cbb0465d3151cc182285f1caaa7dc9b2b911a3e5bfff49d5a87b8bb9b0863470251a6e9127564"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/ka/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-i686/ka/firefox-62.0b5.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "e1d94e02cfa454564a8d57f7297337189157bb4632f603f41678b204fd52c25b46c3bc2bb445fc947baa50a9a23aea287b747998ed2126a1de77f425637bf2b6"; + sha512 = "3306019ff92099807cd86b03f3762745a21abeb8f352a11235a6c2b51c420a5e8e86d7cf0068a530b83d2567fea476e8dd7b9ec1af6ae5c0f82473362811b18a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/kab/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-i686/kab/firefox-62.0b5.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "3de3ab72850763d06ea987fe92841024121f245ecc2c3e5ba44904bbbbc926063ee104ccf287a85cd88f189f11dd4fef12e3917c2f481659a03d99ad90ab06ab"; + sha512 = "876cda22dc4dd14486ef43679ac5d7327d36aa5d0561b3475b3dd2c9fa24150b983028a1be396ca841d5ec140ed845f99bdd645e54eea6ffa7b4083431062ce4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/kk/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-i686/kk/firefox-62.0b5.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "7ae95f7a83ab91def7b2d9c83777f85b88ed5d4507a0b4c2b1258b46f38c08e6db9506adde4d8343cf92eafb595506b8c9ae6eb4c4b7c0735c367fc583d2f933"; + sha512 = "2db81b19f867cd6e6052756c130d7a5bebfb709f8f00c8daa8187ab1f5c2cadae0989f981b03098f66139977b666ee116cc696ca91f59719703a70f550218e75"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/km/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-i686/km/firefox-62.0b5.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "adc3ae9055915eeadd5f1c7b3c76a562ec4043a3e73d6f0885a8577d9bb86b46ae4df2d537c920d9077b9cdafe14c78296e22ff76e18bab2123ca91c37df2479"; + sha512 = "c91a22c4b96080de372371e3636f289d7942e1b4a06318fb406712cc27f1f20d0a7c244785c2c6633dc77249fdd06c10b03db68d86779536ec98670b7da83142"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/kn/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-i686/kn/firefox-62.0b5.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "b005a955cc8d47d9e00605fb02b508ec7153dffb5c4d0e5a49cb89dad8f7e4cafc4ce0c3208076e80611f35bd4ab8f8bca07e5112219a6a62aa87a2966342fe9"; + sha512 = "b3cb649b4a9d1fdf6ee57de1a778e8658bec2f103f6ebacdac6992d764306356c0cef52617ebead5fa89b8fef8f8f1a34a8d0fd2e96e2011f3980111497f3ea3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/ko/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-i686/ko/firefox-62.0b5.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "96c1191ea09841dd73c7e0c0f25f0cb0a31cfce8d5231a18df7c54190e4dc4c6bda9fdc23b49d3c7de54ed179b0c6c876f4932f01f6dc0fbd79b5a97104629b1"; + sha512 = "42a8dc9e50f532fefe1d04b6a473117f526c9919e82c2a167dfd1d0be87a75244d55413945879543be5d3fe281f532773d3b859c653cb851e2232da470d42bf8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/lij/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-i686/lij/firefox-62.0b5.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "a457973ea05899d64bd691509fa1a0e915747015111e1c146b366cb3cd41d20563bfaf0d034b8935876dc53b80a02fd4b0e9c0a693a31a930fe6c70bc675b98f"; + sha512 = "2a8f08c2f06df308386edc879765c0aeaf5ece194a3cf1de0f5e4f0d2da2260397e5d68756ba116e5e75d3989b2c82186864b94efac1c2c7f92b2a050881097b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/lt/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-i686/lt/firefox-62.0b5.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "ea78673f152de3a08964db5bd9ce91a77c1725a947f6af2b074ef73987297f3f48fc37b11ee8e7b4a8a9f5369a99f56906ab233a3615b462dca9eeb4c71626ce"; + sha512 = "6a8a65a435e0a9bcc69206f5f76996354c9ce7cd9977f8cbe1b514c670a5bea2ebaf2e555c02ab71ad557a9e5f1d925e651804d64328bdc77db07eb6b1647160"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/lv/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-i686/lv/firefox-62.0b5.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "6cbcadd3ac50a21409e83d1c60a533559602824a1deab1b3b66d89479f43dda4b44abbcdf4795fbe5291e3e718a5574d88388d66e8a79a842ad1bb29febe8e8c"; + sha512 = "4b87ccb7c461d15141a329b88db8f1d6ef47c96a58c2702c7702aedaccd0fb02999619f014a5df4cd1235adac58324eb48381e238df5d7b93a557c138ddeaa24"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/mai/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-i686/mai/firefox-62.0b5.tar.bz2"; locale = "mai"; arch = "linux-i686"; - sha512 = "8159ff18abf68b9d3dd4744913fef67695cd98ff3e6eb2b7ff727c53a34949be9b49986e6a2c7b88cc1163075dfa688e263b7340ed378dbee285c03ab4cb9af5"; + sha512 = "ee8dac2b40dd12457ba784fc55ba1502cd20584b75368ab9abb3275edd038314ef8d6ff7cbd5c7905ecba115ad23a71c795c3d4baf5b3205ed063f21da0fca94"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/mk/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-i686/mk/firefox-62.0b5.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "e5f1e26acdef22b51aad608950dd1a0d459c8fbb0f0b11a73bef67bfdf645366a56bab865a198e48fb8ad5a082cdd03a5b2682469c383044a6a6863fb5ebe295"; + sha512 = "1e8dc8062f756cd41b7589fbe1300de8b5de4832b3296d5b48794a96bcc905100dbefc2c3d7284ccf13aa3c9e0c6b8e3fbe1e2b9edc28eb445bd01264c6f28a5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/ml/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-i686/ml/firefox-62.0b5.tar.bz2"; locale = "ml"; arch = "linux-i686"; - sha512 = "779d447f6457441c3723862a2487d5c807f709d234b07cc5f4308a4da39945ec872793b0868f7f8fca684b63623f05f03bd51f9ba7bf37818a7505b11e9e4c39"; + sha512 = "17c4530601b960b73f61fd47ae3841303665d7c2a67d268b4e5244de8a53f3fb65bb8179c0fa0590f5f54cc07399c503a6f3909fb76725b82c516c102fff8cf4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/mr/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-i686/mr/firefox-62.0b5.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "e42cd6f92c9c5e3bced29c7310c571dfc2a13fbd0295200695ec1243fa94a4ef57d8b0bc213da1acc5c0004ad5c608eb84e3b8d8d3a7d4c0b9f46c055d22b80d"; + sha512 = "7e8d144aa3c57e9c8cdb495c0c964db003e40f80446de5cf1fb8888df16220c2cd12c9c89beb49b62a196fca18c59555cd8328e739b5e36d50033a2c4995cf8a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/ms/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-i686/ms/firefox-62.0b5.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "b30f42f4d4824b8bfa0a31bc08a24094fec0c12dbe91449c263295c1e349a59bba04f13c0d0fa02884c673b3627cf356d567ee075bea401139640a814cebb7a3"; + sha512 = "4860a2fc8218faf0e95d04a1bb2697875f685ee81012473dcab3dfeb759bc85c0e5bfb0297186f8286974c9fbe9251038ded7f5de505abbabf4dbb1b2ce6e9ff"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/my/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-i686/my/firefox-62.0b5.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "c3b3307bd8668e5918857860a639dda21969e2ebdc35905faf4f5788644ffe4973b99585a3966e4e127715ed3654f9d5151f1d3d7fbfbf6380f74f228cc711d5"; + sha512 = "f81aa2d5b3f7fedd90a68586bf83ef8fe20358c9d631ebf788e661f01d3302e45679f50f3e09c6c5778926c2d82d76ce7483bbe3de9bdf511698f4cc5aa0fcbf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/nb-NO/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-i686/nb-NO/firefox-62.0b5.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "41776a30a2345be5845348dbfe5146dc1ccca4ace6fe5cc152fa7a08ee346b2e15be3a3b35f27df49ed1e199d43b6f70748a8e0322877386374b4678648cd912"; + sha512 = "e27487b00c9fda778dc85e7f7ea5c24e3d4bde3f0c2f6819501520a1c799b75a07375438478b864ea7f71b788f227493d819215d6d3feee81c9dc043fe76db0d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/ne-NP/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-i686/ne-NP/firefox-62.0b5.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha512 = "4130075d9546cddc151e2cfb3deb45747173009fd56ff01ad7b6c84f4de48cded9627bbe8e7cf9b3993fd4438904d78259ac1d75013afa6d48c7f81ddbe2a42a"; + sha512 = "2e45128af7980e9c802239a37e1680783cbf1dc25783550b5e92200959540b38387ef8217bd895d1077d79c5c61a29dcc0bb861ad3446b31f1dc10a6ff1fad75"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/nl/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-i686/nl/firefox-62.0b5.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "0ea7b52e6e065ce99ccdc7a2a126af8a2c5695ba5cce5504b308881450bed0d0744f445e0193300353b9a6497b29c1f20fb7bfaddb78582b478c6fd7225dd506"; + sha512 = "48d477aeb7af0390c13bb4eaefd16dd0fb8f3d00770bebc888c75d9cdbf3b51ccc591daa3566d60c1d9d07a03ac10474fdb1c8651e2c3b450158a0ab6147c9f7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/nn-NO/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-i686/nn-NO/firefox-62.0b5.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "3cc74dce8034e05d8839a7302cb755200e1bd13768fabc33281bc6d698a4311b4af4540fb407fbf2df71353e746edeab6ef33d9490e4851d615dcbabc5129d6f"; + sha512 = "7cb8bd26c9fa9b1313282cb6cabeddeddd506167161e2d3a25de8e102cbc85e6aafde327517b4d72b3863888af940e03c2abb891dda00809632c74ecd26419d9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/oc/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-i686/oc/firefox-62.0b5.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha512 = "eada735c781efbf19f68c3fc92dd0502a6be3eaa1be3363499ded16d7ecf2ff55c8b3922c18bda74f516fde4f827946989eedaefe0f89b4f1378c08c8e4a60d1"; + sha512 = "b90e9ab956f66716ede86435112cf2bf95a9a64ac2f77b109cd272180c86236366a5e7164732bbafd65c939032c1e3159166ba72ff17527bae8e141e59aac2c4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/or/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-i686/or/firefox-62.0b5.tar.bz2"; locale = "or"; arch = "linux-i686"; - sha512 = "85ca6b655f77ea788d0a7f35cd0af4c498189dd9b0b69a02f7efbd57dbdbe7de48d20f1b74487ab03a136a6c64f9606a1ed3472c7510107f4dc4a82473873152"; + sha512 = "4f8726062d320d260c65a2acc1901199da056125f559f261f13e4c8b03bf5e95da2cbb592ef8cb75405302f14f204e3b10ebecfc4645606c97390f233c9be394"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/pa-IN/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-i686/pa-IN/firefox-62.0b5.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "1a953691cacb7aaced202ee466e217feb66a87eba5789b77beb98cf4b8636d6f4880f2a3608af9392e0363e596588f2cd6362553ce301dd26d16f5cdc62c9266"; + sha512 = "cf8d2c84b67ec654c4d5d7869b07714dd108e0f600c35f47e802b58da92fcb7a424c1ecf652774186bbd4d5eb1ab6514041ad4424e44ece386fb7c4fd0b5d840"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/pl/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-i686/pl/firefox-62.0b5.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "298dafd3d49890c295ed24e525424cd8eede31bbe295509e5eb24e815c51adc79848d391af61c35cc79be30feed2990acee9bdd3f8029b11be2dcd8090f43ac2"; + sha512 = "9636daa36c953f7666537de642de10b91d3bdba8f37a021ef1e01168cff182483ae06c06e0eaede8a3bacf2d10e5d712c4e5ea8ac3acc0e9cfb2cebb26d55854"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/pt-BR/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-i686/pt-BR/firefox-62.0b5.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "fe779f5e6cbce2be6c12a934a2b83681ba77bb570a75c2b9d7d68e27c34823dbd88c14e75543900c38b1edad440a124036027dc8756527b9db0c7bdf26829b30"; + sha512 = "3b01678be0e39a506fc4741ab8c4c175cde2d9ec43b83b294c8ed60d9b7d2b396bbb3a94c1df8e5a40204d67a4f1f4c830af695162eda6d182a0f63e3a7a26c3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/pt-PT/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-i686/pt-PT/firefox-62.0b5.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "9423cd6a91564aae4af0dc53db5cee24a93f97bdee5c6311c0bd798395312a583d4a1e45ce49516a37cda3864e38b0f243b5502cd380dc9fee08512d37573bee"; + sha512 = "b7d9e33d5e27375697b36756734ad9155131133a3900632a957bd0d14319f80d912b922f829227bdc18ab5270e95e14dc90bff97597a94bc266276ba51f47f1e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/rm/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-i686/rm/firefox-62.0b5.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "49cd84478b01cae06135706e04f43768d989ec29cb418595476bedb97c1af9ff5e99cfc1e2e13a0a447ca4a6450ee873043c612da76a9acf4e1cc834db40976d"; + sha512 = "35d824c106a4e75af1e796a6372630874cda977e312e05a4b309d6cffc727a55cee8ec989f8f990ee8a4996349a9737a489a5aa9e4c8e2c9d2b76e5a6f64cb9d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/ro/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-i686/ro/firefox-62.0b5.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "0f84b684db2d68be8d344424f8ad5bd3bb7d4b9e48304bb305d6cb5c7622cf2243a301a51fb3544c6fc3526bb4c17088771d1cea86c142fad6d8aea4323dee3d"; + sha512 = "b701ee96d8cb5a7679f9c9af9662f631cb93d04fce2aa5c4d4b82b4976a0ca85bc6fa400ed18a65cf4338f9d33c3aafc689ea64e814a6b55f03b15bd6dea972f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/ru/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-i686/ru/firefox-62.0b5.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "5620a6765d5c911c825477129a7fed51921ad0c7623d81ef8554c86015ace816a38ed2a99ea2bdc9d04144aa301eee8a22d4a773a80fff642777268c2885ea12"; + sha512 = "7aea3ef25f0ca4389b9bfd20a5547999979ca53502ee09444c9e0c17ec7b03bb548ea97dd70e216fd3f64cf36bf8d2b22ab65b093e38f380663e08e6d4788b49"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/si/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-i686/si/firefox-62.0b5.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "fab980c5319bf1e09d9433fabeb48657929430d79154817e414b3abec731271a5444485da7b4a4639564f2cc1e0ac1c862c6e048a7f955f0e8282f3fbcd6a897"; + sha512 = "e023f07309daad3fbc760eedd0266cc77164ba498f54d08331748c2033e52e7d341b600c45004926592c6e4ed3db8d0b99662735c2dae45793a7f6233b5fcdaa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/sk/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-i686/sk/firefox-62.0b5.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "d83016d0992f3f2a707623e422ad98b1fcf7ba2e0f48524ce188ac68c1e9e1174a3de95745f3a1f804cddebc790f4e46f1d6184b5ba30e5b839e208fa83d0946"; + sha512 = "63d1a419e5be5697e55b1b955e13d3347445d27cb49ad5c02a97e465202ed666092f7f015ea11c37717e02a74a9e1f4c7ed1ca6715ac56f8743db18011fb9262"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/sl/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-i686/sl/firefox-62.0b5.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "e659376911924a58ad5a8298ae98787307d133dcde179c8b1f358e929e7321dc87eec8d2a601f4dc3aeb4cdbe1105309fdbb9efdfd3d22828d5ae6e9f627819a"; + sha512 = "d98e8238bfe0c301871562a139ebaba4ef3ed7266322746bd540ae123d439968346c056716420ae61f50c19ce8698cca0d9d76352f7aacdfa6cecdfe3b4500f7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/son/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-i686/son/firefox-62.0b5.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "8ee3e51d3549635793ada4af651c063e3440e0a5bd4d88af15d33c783b03c97c553cad06872b60cdde416031a81816b546c3452e07e93535bd97c38d3f278833"; + sha512 = "0e12d2a18dfcf9c58d86696c458e4d9d63631180706b31342bdf8124e225f380a0d2a42ceca3c2dce11ce7b4cd251119b774a79f4d5d4a5e30280d4592796b76"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/sq/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-i686/sq/firefox-62.0b5.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "ac8d9f7ee122c4362a1efed25137ea34fa2125c563d150c3660a079b9c9af35eb3a90f0fd96cf5fa3747df71e040f99953847b065ce6a3b568e3d5cce3884cc0"; + sha512 = "e662c8040b114a994e9c819da58a4ff6c3be644ca5dbf4065f215a2aeae8f891d16a9bc86bc2b88f2a9c1d63f30f2966ee8ce5c4153e503ee31ce4dffe1d279e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/sr/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-i686/sr/firefox-62.0b5.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "d044cfa14abb017c042fe41bcd8ce8acada46c461afc308bbf3e8475c7869ea228aa7cdcb5c18d97f49fb4feccb691ab5c13232c944b900ad478bce08c070232"; + sha512 = "9fde9f71228c7015ddbd7c2d0898c424be06a9276a8e1fcdb0e26284e8dc623a4701595bfb5ce414eeeceddb08a2f17f05bb43c9eac8d7b728b212ffa891d0c4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/sv-SE/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-i686/sv-SE/firefox-62.0b5.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "ac3e16d233061a774dcca9ae76f6c2f4ba42b885c771d3da1186e1329735efb1fb34e7672a050058cacd2d3db7f4bf4d60bcfef77529777a7ff10ac7f93f30d6"; + sha512 = "dce3f16c568018ef78e48db1a411af5826ec187acd70a718a2f38f4603a20a073cfee6cf30b539bb5b962b604e655088ebf9c5c8c4121fcb1ca94641c73dcaf1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/ta/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-i686/ta/firefox-62.0b5.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "89dee1fe6edaa32cd5f5eda39ed175a3debc23de44b116f8de32e38e1827a7ac30613614ab3fc6401165db0d0486db3c94045750e37294a43211ab9718b26911"; + sha512 = "b651180e1ee438764e42b7a7e5fa3d9c8f7acf4feb1de8f59fb7e46a5ce730842d99e8468e7fc9146c01f68aa978396870f2aee4ab9ca970cb9ac92f9adda459"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/te/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-i686/te/firefox-62.0b5.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "3c292980d3ff21d59c98d68eec743d397cd76516561a610d912866bc25f0dbaa2db70d76b7bfcd94dab21cf86857e134f9ddd5bb85b5b38be86d7987c3cce1c7"; + sha512 = "21cd596bcef50ee1a97e686807f09e0207848bda274143dbee1a02b50c49a7eb65bb96c5c24ea73c23f950a78df1f214470ee29f1d4928733e3db8bbe26885ca"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/th/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-i686/th/firefox-62.0b5.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "867b8860acb1764cefe3b5b691beb9a2c521f0738b927b41c896517ef7712d6e082eb15272b8aac3efdaaa103fcdcd57279ae71096b7a94a851121f7e7103ff9"; + sha512 = "4c56c163732cc6798aada56071b11b5ee81fdca803ea7da3375619e6146eec33c987a80f2fa1ca0785bf9c0a9e0fc9b8e2c5d504d85012444920dc14b14cc016"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/tr/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-i686/tr/firefox-62.0b5.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "56416e1fd7ba25d1a6d0b65e5a6f0035addc2d8c28145c6ee91a2dfe8893f6fbdbaaf82a05304b687512e4f6f1b8798e9c83bbdf6a1d72bfd32a85710b5df91c"; + sha512 = "52e444732b7c1d8e4c10f1b6ed5d440c21d4d4f58913905daa0c72d01628667cc4bdf48bca3759af251d4155cfc5e3bacb81ef8263b2aaefa748b41760c29c6f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/uk/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-i686/uk/firefox-62.0b5.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "c228886955089f11567361056d6ddb043617e4d48613592be7d2ffae5cf8528a7109eb10760fcf7d731aaf26d1c6ce92cbadca32013864c2a29117017aa3552c"; + sha512 = "15c6a26bdde2fa868bd1ec8b3602f4c1941d497fd4245c8cfc86f4d7546fdbef209e95c9fdf8efaa9057c21199d14a25119d1f29a22fe66f9bdfd70feb9fc617"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/ur/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-i686/ur/firefox-62.0b5.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "e10d8c5e1723148909ba855c111ee077942a8d5a3d8154b10349a718a8fbfc44b3eb366a95cbf30aa01e71f9123dabad27b29513bcd2dd31dd7665aa5c01f060"; + sha512 = "755f7343563129bb5c11a1c0cf031eccbb3e387d08bcce758b7371b6e4efadc5600305e051dfd00f6500fb3846f8edf27386cc100060d1d4c6646d90561fc7a3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/uz/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-i686/uz/firefox-62.0b5.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "d2ffc996a3bc7eb852e4627a4968d6e48ea3b5d7fb19c756f90d42b0da4ad6325ae5bfb23c8feab969a3fac96e5712fd1fc8978949d59f677a9bc36f3d440d90"; + sha512 = "29096e8e682096cd109ce41d4e68f08ef2c1a5e3c7c74d98d1b3c9eb4a1cc86266c336c3dd2bb1c170868fbc2bc1b659d663eba320e8ee26f997711f97074a91"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/vi/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-i686/vi/firefox-62.0b5.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "d6c045e3fb066170da74b347fe75542c34a9c7eb758bb6d85a26313b7a2d1183aa3d1a65088bcfd1dc675c44fc0532c9d6779f8b1f11236cf2eb8c287fe17af6"; + sha512 = "c7967f030bea630b65080b4b863ad474559ccb4c26a38e9caeb6c1c31d4d8170a5a86febc6e37565409261650deb67b3e518a8f4e4c041fc5f90379471e4a284"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/xh/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-i686/xh/firefox-62.0b5.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "169196a370bc41bfc6f03c43e70d966ec2dcb10f2727ed3750afec73df7a33875af20dffe3bd1f2a97671af23b028f9de85281245f92243db1bca44361be77c0"; + sha512 = "f13833ce3c59d141ef646d226d80a8576726d0da2cb4e22817778aea222b5c902778364352fa30e6aa98233f1878b91dd2847d11b5966aa2c3ffc8edf29b62ec"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/zh-CN/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-i686/zh-CN/firefox-62.0b5.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "3f1615c4ae6cc297c749c01f0eef3620f0a789220a1f4bd052a42e3e92a3a32ef141ada45c204ef5bb3646e0a1964f1e580e149280b04e1189b8e6c6e1fdc733"; + sha512 = "95feb9664efbcc236eefac60ad2bd2ee71e5e9820ca92f545b6d42210114315187247d74c977410c1b666d1c51a6a8832c59c85d410691b8fa4a3a76049c1367"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/zh-TW/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b5/linux-i686/zh-TW/firefox-62.0b5.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "5f82822c82b0efeae25ca083b27a3054136a5b881139bec624764171bc1e91c352e688655006e00aac039b743273dac1155ed6312ac5f016af6ca18bb969a56a"; + sha512 = "9dca672ad0b6cb979d6fe3c31cb0dff2cacad534958b9b5f511e47a6da7a7889bf7e49a232780387b3ef24a2e7524b26af6078a69499c36e872c24b94a58d6cd"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix index 8626b9ef6649..377056db64ff 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix @@ -1,995 +1,995 @@ { - version = "62.0b3"; + version = "62.0b5"; sources = [ - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/ach/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-x86_64/ach/firefox-62.0b5.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "fb662a573025fc9f8e4de57d81f0a237b507040a040844150d55d37210296873112de5cca3a57b3f849ca9d4ba4a11786d8118446b0d190c2895e7144945ab28"; + sha512 = "a923d4b6deeaefcef17cef1b86b6ab9c5876da49db39502bab24f8cb3aae48870021d325c15b6e8cb36ac3681a84cd66289bdb3b526d20ddc608529aa497c848"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/af/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-x86_64/af/firefox-62.0b5.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "000ce0eadeec614c9ec6388932fc0835fe844966be86516b71c9baf33126ab8e7245231da12046ed38c5b0f9ebe79ac1af61ce7d0c39263a8e890032bd36f24a"; + sha512 = "6cfdf445dc68e455294e89b56008d320bd92494693e63b2b2c0a4d9a6558714e8107a946074151917a018acc4bda55f14feec6640e19b211923878a689c9c1d3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/an/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-x86_64/an/firefox-62.0b5.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "b081b77430f9a0f9d4459c680f6b544acb290522308bbae6c2635791d325c3283afa3db97e9bdafb446a9f2265f3f20836eade5a687fb9f38811cb12e7af2330"; + sha512 = "82f1264f3c8dc0138d08dea887d49410e78a925886a3c4bfd17dcc8f2b559782dd8aeed745eab6b8ec337a8cc841fe215c512c0bfc111dd2c620a4bb56674a3f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/ar/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-x86_64/ar/firefox-62.0b5.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "6e9fa89945b9ef32cffd2fb936151a642e0b5a1ac1b333e22406fd409087c456e64095edb371eb244af2100cfc0d36d4b106d7fee6d67d9ff5627d3efefe0434"; + sha512 = "643b69ea453e9a09087880e89e60fd9f338b8d82fe83b979acbb782105e5f456412355806e24f2db077de58dd7b8b484e3c267a79fea0f78930c20b590909dad"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/as/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-x86_64/as/firefox-62.0b5.tar.bz2"; locale = "as"; arch = "linux-x86_64"; - sha512 = "53750c2fb6abb624c5fd645bd08406bb4d0dfbc7094e128a773d1222f211d25fa4ad042879e0aab53a092fed0e6d4a1997f941662afda2bbd5740a6946768241"; + sha512 = "e3bcfd43be957d83bbb675147248a68341c5c6498b2298b7f8a78f6f2d9c06538dffb78ae1d406226c347ea6ae9eda9871cd3b2a7916133f153f54bc22475617"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/ast/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-x86_64/ast/firefox-62.0b5.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "26105f6c7568727608f70351d3111f2997eab7a3670bec9733415b8612c38f5c780568ffd0da4ca840ffd12a7fa27b4e7e34cf8749817762f9d805e0fe4e3bc9"; + sha512 = "1a8f0307c2590f3138033301dba9f02d81ecd9a566f9a385ad076d0b7aa715d6504dedef56781f5fffb85b7760c156ce7347aa85ab89c279f256428792f1df12"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/az/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-x86_64/az/firefox-62.0b5.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "d4d0507bbf25810e39fb348705ef950d1d0b85d9570b72d6a24aab5d95a5860632229392863aff6f719cf41975299e76b57f337681d233be9f32fab2a3a6ec57"; + sha512 = "37c41d856a11facdac3abc9bd1c32c544424ac905f8c645bce33093d4f813396df80b108c6eda693993f20d2a0a2a230feaabd643abdabbc75365fc7dd577728"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/be/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-x86_64/be/firefox-62.0b5.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "d6426e87f85d76da37e58a3f2f59d965bb96fd8d10c066130fc8445dc753c04fa9103987e29d9dd2cde38d1123d63f3741997d823f14ccf51d57746fa3508070"; + sha512 = "5ca73e36ab1ecc19df2ad6eddc018a3b49ac34f5bfd9648b018421e9f982fc986274003e3654b9a8a9726e406ebb4e7e431aac02371fdac0527fecc668c8c868"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/bg/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-x86_64/bg/firefox-62.0b5.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "e99f471aaf2aadc26e6484dec1a0969da2459aaa7fbc4c16bae76abf5bd325d43642853aa6b5b1d8b7375c82f69a5a012743a2a458c6fb365f8429a4d4e7c9df"; + sha512 = "a77bcdd39b5d9d1d305d9e1ec733c6c0f032d6c4f95a334b29afde06114b5b25017912102e3286a8c5c634db66bc5da94fa015ac62df03282b3cefeb03ca746b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/bn-BD/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-x86_64/bn-BD/firefox-62.0b5.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; - sha512 = "55e3d8ecc06fb8d12310ec6ed6a7458c7f0f357ba286ad7a4967880e0da591704133525e989349f57696a64b168a532da3d167897fb91aad7ae0fd153bf96f09"; + sha512 = "abc33d0a235f8ed17c0cc098bb3f50562f492deb268e7ee5e9dfb0eb1f8cfda83f664b08bf1ccf55dab858a434f27cc5f394210c18cba75219fef975bca9e44a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/bn-IN/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-x86_64/bn-IN/firefox-62.0b5.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; - sha512 = "ca0940bb07232cbcd9143547a3870593b938979f4aeb6711e9320468f1b55bd8da02c363be6450f9cd6ca4320e0b41b401b21c8b16b7fa8238f4ececb1cc82bb"; + sha512 = "3a970292d83f8471f014a65af11d67b016086e9041ee752daa8f4f84df24f4d171d004dca499501400b6a11cdc7e2b33a55c534e1af7c64030b2c2bb3ccddfe2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/br/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-x86_64/br/firefox-62.0b5.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "bc060aa4d847eb5e3694f2c88f536de9dee2f0e83967f3ed3559894fc91f483b8cfc9a160d57d0c97008f145bcaec2eea5b7a9a442439d71cadce35820765c6c"; + sha512 = "a57a39bf9d46f7e9dd7d1fd0229e67960b2e9f095a7c19c6b38ff5a3b9b006818a17944e7c6b7de0ce5df5c7257ba1cccaceb02baaf66cba4e7be195ab63dd6f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/bs/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-x86_64/bs/firefox-62.0b5.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "b6ad77b36fb6613234aff3e120e8e0954dfa430287c6a48662c8affde272f4449a452104a215a25e075b6afc4e4b3d7ceb6f7e9439e10ba4de411e7c6396be39"; + sha512 = "2c4b0784da43c05c3e2594452aae8064d8a575a06da9b6f931435c7cf9b8dce42f8a0b89a484ede651ee09c7d6e29a22ee2c9928885b361e5b1174e25d8eef28"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/ca/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-x86_64/ca/firefox-62.0b5.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "261fa5ad64ad6f3d58d87ed71843105b12ad689372f215be4572e23937cac0dd648d8bf722c614c08211c864045dfe8a7f65eef45a297666a762f80a62cf56b4"; + sha512 = "d3c34c57e53d2cb09fc16ace9f88a0244633ebedc7ccb761a983b11e41de8ecb4249a983dce8c3c00afa7ba87e9a5c2e31f8e852efbae96819b1ed8a503dbd9c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/cak/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-x86_64/cak/firefox-62.0b5.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "27feba8268ddfe5d12876520f6dec73799802ef179464c54c44fc134fa18c15faeca9d946b6d3f67a8b7210cc68130c7373167aaf1732f5ed9df1febd6077860"; + sha512 = "cdb034c083439e38990a185f7995f9eb07eeb2301d21b9007ad8a3af4f07ce4b5326637b48377d2f3a31706039a29e72242911e3f77bec7ef57ad1054532d698"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/cs/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-x86_64/cs/firefox-62.0b5.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "4f922f1a443c630571c0389b816db1880f0cd386326778560461eaed7ede66700be9f69294e90c9339295009c3ce2a1a2b3e545a73f3b61854f899ae5cfda75c"; + sha512 = "b26e36d7fc37cdc5703a44bc8e27795bc0eceefc6cf177ee9ffe37545ca9442ec60ba0e0074a6e2cf7a82423e99476a09b2147d7462c3819ade6ab572c2cd6c7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/cy/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-x86_64/cy/firefox-62.0b5.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "2a36df61f32b2da0a3d0e6d37c4f7e9fce3e596a23feede17539baaeb74f24abdc9fa562ee6ab6cad57650b25a1e117a20d308cbdb30a07c59b11907efdc631a"; + sha512 = "a3176a2121d4fca5f1a921f28b59b360d368610313e174da1169c9777ba61bd104af6157c1f55b0392910a53e0dd374f998216a3e4b1e3538d571b3c8dccef91"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/da/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-x86_64/da/firefox-62.0b5.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "4840577c308c51eecc349fd3780311a9dda632c0ffeb3df10bf028c3e6ad27d0fe5fb7c572bf706a69fcd49ab9de83680023ac4373abd46860b8afe8e6d2bd2f"; + sha512 = "fdf4c2d82bc0468df2bffca55cf97c84caf39788011394fe021007ffaa6406c7561a7ac5a0763468b875fe37e1281985d8b80bedd2bdffcf1e8c28963d888aa8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/de/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-x86_64/de/firefox-62.0b5.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "4767e6bb638664c9abbf4c93547e6f9498e84181b5924f8f96a35b8e7e3cc11ab04b18cfbca38efa075274cc9bd2a036e25f53eb84d462f2afd7abda4f4e32c0"; + sha512 = "51e3cef68c51960f1c509bd6ae7c397913a2a07bd9ef53741804ea7430080ee1a7136547d2d9d36e5b12b7b1d59f335ac930f4855cb7c6b3482e75d39cb65349"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/dsb/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-x86_64/dsb/firefox-62.0b5.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "4620c84dea2fffaa684554ec8517a5a6dabbdbbf4f60b999a490e70fe0da5a1fa21ef2183e089414b979f0529d867bd98ec892df146507502eb81ba6c2c04856"; + sha512 = "dc5f7f916231becc4a02bf3d12be91bde05f0299d3ac78992b7a6d0164422254c4617515c549fa9edcac7ac731b33c658e7d28705cd1a5de1f15a4fa2704972a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/el/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-x86_64/el/firefox-62.0b5.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "12ad8e39c55f975f82351e1499ce1ba78565326eff521f36c87d31b7500f3da004c1e8c72c98cc603949c8456cbd709f8810491c6914f5c42e6cf8b05eac4684"; + sha512 = "73bfc9bfc349ec1dff820231cd70f7ea4c8eca7103519a581045994127b4438e0abb2c23e8e95838a1fff34e0132b0df2d630221693bd6eb92e870c6f2f648c8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/en-CA/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-x86_64/en-CA/firefox-62.0b5.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha512 = "0f7c43bd7f5586a1ec78ccbb2bf424933be3964c16c2424adde1e901c0fdd5d523adcd974b02e09999bad66bb719a9976e7749b8673d303613447861e07c65a7"; + sha512 = "733fd992172a4858a0921221463c014a173e145b70a4b7080644eb6e7e09e4e61741c9666b9e8813990b094aff1f355d68724ea436d21b83459ac81760df4c44"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/en-GB/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-x86_64/en-GB/firefox-62.0b5.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "5c234d1017b65319b129e8430469850e9c5d25990df2949e16dbd610cef45bcb5061d044cbfd0ef95cc0328f9c27eb239c251b7d41388677741e638349bce26e"; + sha512 = "512e0f156dbf3f0f046ee56483be1c694e67fd4e3539dbc2dba21c15af9ee46a001d055107efe3bde60a01b3931eff135a998a5bef9fc03b9b29615f603587f8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/en-US/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-x86_64/en-US/firefox-62.0b5.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "638b97dd86c548b666220b0b4e785d49c40f8dc46ea006416b7f66cadd2fa511040604743c921bf5c156b06fa26007859d26923ab39cbca0a5def80c9e171ffc"; + sha512 = "d7ff6af9c57c88e2da116b7951529c8d50d233cc29b934afc991213a3bcf788539cd05617d8bfb5d61fcad3610fffa470b2e91c62ed6ba99d98f998d8802074d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/en-ZA/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-x86_64/en-ZA/firefox-62.0b5.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; - sha512 = "3a64761e9083c5b6eedf25c6641534211d6325d9b97b22a19a413305ecdc697d75bd06322f04c7b84c08ee077685fd23da3363306a31ec3439794333a2e264cb"; + sha512 = "a2a304dd3551d104e01503831821dd9db632241aa26d1ed1fff90a5973877d391101ddda451e46a532a3eeed88b8c85794003747e8addccb14583bfdc3d4c44d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/eo/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-x86_64/eo/firefox-62.0b5.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "d244bf5d4a4f385116228b6b3f306d15b8710a969ea50580e91da861b97ece4473aa2851ea02bccfc73dc183abd523089c09da320cb6d34e1db492ce0bf58cb9"; + sha512 = "373a67049df900e6c3908a251ee85d8b9b0d5716ee05dfa374b44fa652046c3e1949edf7282f352029f5218fe87d0ecf42f4ebc755afe4143b7498f5a6de7331"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/es-AR/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-x86_64/es-AR/firefox-62.0b5.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "5e53d61b916f9774c2471d941b26b72e5d1caef0c1997a1b435b1f57b70cb96ffd8b4061ee4a3bd90c2d480fb94314d2f71d6be336ced511b27b447b6dc2e6b2"; + sha512 = "4da9dfdb0a82da4bd60f40073b251cce91fcbb6c268b0c747677a8ec36cff89fdb17c76c493444c88c81222e2a3052bb5fb7054d52d2766e3dd85c07a452ed91"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/es-CL/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-x86_64/es-CL/firefox-62.0b5.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "23f44b92bee6543ef4919554533a2ba35e1597d4ff46246047b4f2f0e45751c5739f00167f535f39c8f06415bc63e204a5b38152da33a26cd8dc2f713b3ebb4b"; + sha512 = "1626c9b20caaaabd69492e12160a86e6360e7e8d82d18cf0d30e1436cdcadebed6c3f6828e9f511bb196b70dd68e325fcbe56f3b6011565c1a01834a225ae238"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/es-ES/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-x86_64/es-ES/firefox-62.0b5.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "47b30177bdf420887782067817ffb7618b0aa73a4777568de97e9b09fd86ca3d575c1b00f8ecaf24455ebb654238dc873ad3544818353d48d18f1202fd96c9f6"; + sha512 = "18a53c4a753d9929963fdc8f1ec0d06975c962c8e3104ec4315a294741f59b6cd70c74bc6a1b1b8791c991358c07bc31323f983cb756890f903b1f62a590c51b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/es-MX/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-x86_64/es-MX/firefox-62.0b5.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "34749402c8fbee479097d411981b271c4c5f3fe17faa7a22684ba4755035d1316b01b94e085a0d7107f3e14caed296c37e96007af32ff447672cf3732bdf6fa5"; + sha512 = "e2a6c12b1c2d36385055bff1cd590417a5173a31e75a4cc9a23b43cab36d5a25ca8b09d35dc2be90cf4f66cc60efe443da7e8ddb1a01b254189085d41335427b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/et/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-x86_64/et/firefox-62.0b5.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "093f375d961b48a70457f31c007547341f72eb86f4b91ad84fcc8dd2bbbc4b23a2b20d2422904f9959b6906c3075166f82669b30938525dd72287e864ea98ab1"; + sha512 = "bf8552544664d03a94765c5d832764d956bcf2a6372854cb77bef7a2976b598c0de7186cd434f6d0374b4d1cb3af419a11f36e22436e472d28aa4935e95b8af9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/eu/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-x86_64/eu/firefox-62.0b5.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "a9dfab6c92cb6a78cab0a9e2f1f273bed2d54d18a918367cd8e1fdd9f96dfa9e065bf4205211e8c95c6e085c947aa48e22a82c8ef4e5b87f94829bf6de4d1547"; + sha512 = "899d59ecd80d8b11eb956ba0b4532a2156595920f2716c5bd8af5d81b0b2c4fc1abb9c6089ba8764f6aaefb372f2afe9c06aba9ee96ad6f9619801cd3939a6e7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/fa/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-x86_64/fa/firefox-62.0b5.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "5e20caf1360465aed8711f914d2d6d727aecf3e94b6b19cd3264c4b0fd567950bac73eb602b2a7813f6d7bae6717aa598f04daafa49960c19852ba8dbb06f849"; + sha512 = "976a93e9750aafff819d44d28cab8c59c106f2ab017f56ffe48b8d9254d6465166549454381e33160ba50832fb2407012be45f38912124ced81864bc8eccb689"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/ff/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-x86_64/ff/firefox-62.0b5.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "4d2a56f24d2be12653e3b3a3d5466702c2a83a3e2d6a3628897b63e0de8653dd7412878a6fc855ee37f588a3aa3ff3d587ef544b4f81dd8f73042fa9a2918243"; + sha512 = "4c1968d07eb8de5b6385e315de46d1bb51388ad43a1d8b650ccd03fab56ab2e3fe530305a1c91d8e78e3410d832fb177ff3672483b0bbd28b3358c52a191c0d3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/fi/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-x86_64/fi/firefox-62.0b5.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "ba75525f36e0fdd30f030b3490aed77ea5ba53a21da526871d1813882bdb11aef2576448dc066d0aa995a0ccaa7c3740b4e19c88c4c9a6490b23432800637b33"; + sha512 = "fa9dd54963c1a8fc0b186885ab347b43591a7810ed49a1722ec29b2db7c7678d5798062d673257d4745cc385cc22337628699074a2284cd70d29e8e8876d0e84"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/fr/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-x86_64/fr/firefox-62.0b5.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "bd8ec59817759393c6a248769873673e05591241e172404b8277709dcfa8496061fb411641145bc51bc7c34b26427c88088199ac1b7314c1780e312038e48643"; + sha512 = "9460e6b63bf9b1dcc3a8ff337d57b2df1479e04c82b5672c417af2316e0d6e0ae6e72ab2eeea590ae8fabfcbf5de0e55c21eeb1eda1b500b7636a3fad96d3e11"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/fy-NL/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-x86_64/fy-NL/firefox-62.0b5.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "af9180e4773207eed96741f8aaf0448e3f0b0ea061a6d9d6059f01cfe6f9a599a0a68c54868e1ce2428b5b6c3c5262a8a5de545dad96799c144da49e591184bd"; + sha512 = "216454d044c51336c381ffb944b0634c43b0286f9c4b572b47d5a69c35f76fce08f5f8b5e4e1f2ad5a865b7f615a131d60fd506e3d62d1d0afd3b7ff2cd44b18"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/ga-IE/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-x86_64/ga-IE/firefox-62.0b5.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "2cfe60bc05ab09bd86dfbd77d5b9cfd0b768cd8c9cdcee7772a712056cb0aff70ddba515e10fd5f2be29ca4f82e1dd8632cc131a30d70dcb183b3dcd1e9e5f46"; + sha512 = "98b02294576ed9873313f9ed2765e65a69d8e5c9fd34cb43434673d3c2a071d5c062975f235ba33b348ddee7444c827b597518d7e5ae7ba1ad1be5e23c0b9f25"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/gd/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-x86_64/gd/firefox-62.0b5.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "2a918ffae1c37d06aedb5e33cb3771c0879edd31722fc4afcb50b58be984122a573b59130dbd978521c7473fc24584bd5dfb05e46877bd885c9468d20050a997"; + sha512 = "5eeea8d602b4dcfffb7a9e468b2444a4d84dca07dfd732a217d6900e3db4d6ade788215ef81b1efe2f73f91d4a795cc4d0b5378d222c222b1e5b28a519d6f8e9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/gl/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-x86_64/gl/firefox-62.0b5.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "0cf0fe3099b4c1967c152a95228eccc8043c65324b42f87c2dea5d33a3bac93672eeb93dc85c7d12f8768489ee071d6437aa6efbcbe6d5b81a7129ce20da1312"; + sha512 = "24a06375fba63f6fe20bf0595b67da9365f0c93c31f651418b395f05557dae8934bf3da78e175a10073b4655ad5b46a719adafc2157ff0823e0d6bd0ab531e59"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/gn/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-x86_64/gn/firefox-62.0b5.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "0156f9882dd2ab3a02aa2916eae8eeeddad584038bcbd79a877ccee67bf24d2095a95817fc4add01dda9680db6d713f13629d83e0470faf84187b9a836e0a489"; + sha512 = "c84b6c0467d668a77e0d85d6929a31e6736ea77ae0e47d96d5dd72ec9de7bf2749a8f43e13bb752a0e282ae9b38d0706eaf51bce60784db02f0fc78489ffaa18"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/gu-IN/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-x86_64/gu-IN/firefox-62.0b5.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "78421ec8446122895822893559d5d1d8180a38158a41e04529eb165e7e68f50d0419ed60dd6a94076dcea270f3cf492376ed1ca8b53bc67cd70e19a18fad5c77"; + sha512 = "081c8b722ad2caf4139fb462b4007229b7bffc2ec3e8637093840848655c0fcea625fc610f91c480c1938476d82fe5ccb4ac179a050d4fa3dd96318e238479b4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/he/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-x86_64/he/firefox-62.0b5.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "77fcfd12786a328f27dc59b1fa6bccf3427090d557d4f2be945f575d3d2b46049d293a400c74496ceabc24b3c17e6dfe6fd038c1dc9ab9460c5ff807f30a8993"; + sha512 = "06852e17c1f891edbe3d2e5d4b598d784105a5e25b21ca6e6055c0ca86dc07a2a607acdb99282c15a6867d174c83554b4d42a3674c24665eb19c770c1ee362a2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/hi-IN/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-x86_64/hi-IN/firefox-62.0b5.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "4437886e4647b086556b19f3530c1974dd429b6ddb1f678ae3fb3448bf75ea27a4ad153692328d22d8e15ad21233ada1769e6ed7222560d26ab2f1c4cfba5f56"; + sha512 = "bafd954618b1d6ddf0ce4fba42f8faac5e2c368248a4027d2319edbe4ca1940667c2f5830ffadaba4c378d8253e447df39819c7fe6356b6e20cf38ab85872914"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/hr/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-x86_64/hr/firefox-62.0b5.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "f0226760fb545f730a218d24129e95a2f0739044421cc91d921377afd0c0118811cf3f7f26a3be63ebcaf2f0b259f5279a2b4da17399e9ba076eea6980f9816b"; + sha512 = "95ea732ddd56fffb174a5cdeee68a7d4161691124af0f849fe5c0ae987707a7e99726aafe1f759a2fa90da2f7230bf86c3d6a9621a9e5c26a624d4edb85a899a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/hsb/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-x86_64/hsb/firefox-62.0b5.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "be593a431d81bba03f5cb9d4e15a2e31a2be4561c5b89c585b23edc08b618383d8658d4898320dfd34483de95f483176e5fbd9c6493f72a416f040a3485f4eee"; + sha512 = "086f408443bd1804d9aaa04aee7c8a5b96edc8ec2e066bf9eb65540eea363852ad6cae5d206d81b01dcaf3392ab73df62fe8654f65f71dedbe83163d9b441701"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/hu/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-x86_64/hu/firefox-62.0b5.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "2d3e066b7eb24c948759cf62ee2ceddafd86b51b73a67e306c78ade75661b3a6a47c1dee51b1b43057ddfc555a64c523befce8e17afa9008d7e2ee382c2e3c28"; + sha512 = "d89dcbc08338878a66c58b814bf472bff25b94150f9b93efe8a272342c1188e77800d1b851ad4b6927e8a1adcb8196064061b48847336339341ef884713edee9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/hy-AM/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-x86_64/hy-AM/firefox-62.0b5.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "a23afdceaf33a3ce0bb323812cd6a1e0239b2f2c4ba688c601f8a158e64a2635e1cab1313edcccd337bbbba63173e9d171254e00ca3bafc6ebaab4297ed6584f"; + sha512 = "29b1c39eaf846b161dd6d0b2b5fd6b63807157606d0c93347c7fdd817fb6fd4623232c80784bbb352d2981a13f899ae594235b972aa53090fc6958194fb2008f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/ia/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-x86_64/ia/firefox-62.0b5.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha512 = "b36bfea78825a783d4813f9454d9fca02c6ac9ae685c7ab81efebf3fdada08e76b2e02cba0b19fc6a1809bab46dee01dfbcec2fd57fa83186de092e5b2744227"; + sha512 = "af69e300eda285537f452c64d12e24e77702e6161bf26d9667b4beac4db85dd38c27d9bd8160776506611431ff1adb023321cffed81c3aeb226412757cd5224e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/id/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-x86_64/id/firefox-62.0b5.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "013c40d4a0775101cbd66078c62a4bd28be2335b9bf38350474fc2593b7fcc43c5caed4cef4ad906245ad0192df8de38e8fc537ecd6a48afdc97d5141738a2db"; + sha512 = "d6952649d1c56288090f3fc46eb8bf233f73837e5854cc99ae0bb1f736cd75346b67450646ef3bd8bb1d469ccae38f11f4484536b4113b11788b8860f57a26d7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/is/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-x86_64/is/firefox-62.0b5.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "f9c95cde0a4927c5b7e3d2920a90ee3229319fa8989b6c7e2deb2cc864e12822b156e6b44fdc8b4ed6d8e8bc706e323cd0e38bf1e2393eaffd32040eda2faa78"; + sha512 = "01fd7bb2d04dbb123c213cd937935df76b5472a0c0d16888d4fdab6982a9d258b70af24a09e23c6a8123ce8d9bd3db14991c5888a6d047f78309684bec0120b1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/it/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-x86_64/it/firefox-62.0b5.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "3a1f50aba975761e41626b3e5f3f6619dcc09d31a27899e4b0348c45af5079883de2b67135197e7a57e448172e55cb9bed4864ad6fb9e0e0c0624152c180632b"; + sha512 = "b5f0a0cc64ddf0ce2af7c908094dc60c5a1524fcfaae156a0a8fcf8a6029cda12ab811d2b778cbed83f14ccab2071f3f463bd649f2832d88fc0cb48531d66c0b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/ja/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-x86_64/ja/firefox-62.0b5.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "b513ec2ed69e0e8c16a53404fc3b891181a581101972e54ec509f4f2b842d2a18fda2b6dcc573bf3a426bd06dae4de8295b12d016b81242d93bcb1e25e11557c"; + sha512 = "ba291e1ff0e44a56fb30242cbddf338859020f5cc4545158479d1eca9e7ec566cd95e1e7d26abb7a8e041323b8024d95efd1ff1042cb9c50f29a0ab62bbaf929"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/ka/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-x86_64/ka/firefox-62.0b5.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "520f4d76371051d4f97a3ecf295031b208561b5ec1bd81317d63fe445fd80d75f5ed8fa866e2e742073a8fe6f92cbe018edba93d4ccef50d1f78c90f598950e9"; + sha512 = "8a23b823e24053d429551926fa384911a882bc135588d1985ac3722dc02df400458e5c1f8898561c0a57e96d3412d2d15540e865af1878c6a984b1cc5553b7a8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/kab/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-x86_64/kab/firefox-62.0b5.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "c0744662c499216249ccd2c8a926933c00f2bca52fb3c8f865c5f7a0e0a4699938dd146ec94ca16517bf9f6502c30dc5695c1505c033ff6bde3c08af5bd2966e"; + sha512 = "f948c764ba2f19c0a384262fa9f97c1cdc2864f5fffc356317a6eb001bc000d359e36a6d65839639939f80a0a8149d30e9869e5244c8a9f0d6da2f57ee3a7907"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/kk/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-x86_64/kk/firefox-62.0b5.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "aa939d0305fcb03f62bc704fcd1aebffc2389e69674a05033d268dfa87eba3c31828ef70a658c072766afdcdb2435ab451cf47f9a4776d6bb5b15bf871b393fe"; + sha512 = "97e68648841adac6fad807ec82f9cfedaaf4fea0a12462d8689109e028d4f8641ee450c63a21afd5e2afa87c39505ba125b66a54db1acde1c4eed02a80a336b8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/km/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-x86_64/km/firefox-62.0b5.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "cc0bf0b7332423df05ffb8f3b22d02765f5a8a78922ee0b6bb832cf7d9117bc8a79e4abdb4b06008736db8eb519fa22eb929aac37df443e788305098cc694418"; + sha512 = "bf5962d4a2c806ef57d0fef1054e6d04ef2c021833a9ad84fb251594aa48dd9eee3ee5dbcd52d6581b514986a4643908c40affb765b14a12dbe338b923eff2f6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/kn/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-x86_64/kn/firefox-62.0b5.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "4e90b10dfae4126cd4a5f4855118ed011a7cd2f54af02148b46a8001326aa167b508e053a259105513f4341982b163835ac58d5459052f847584aeb2584e97c9"; + sha512 = "f46df3c8ee94d6382b35d58e0d2d25a41da0b571bcd62e747e9e620094f29a46f3a33568ad4269ef025ee7782f143e6e6812f8151f765dc4743a5ed9c4d1449b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/ko/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-x86_64/ko/firefox-62.0b5.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "2e3645774a2746be83e18169b0b0dddfed5e89f0c7d804f76b1e672f3606ab448359e3086085762a8cbe1ea3431ba73f4ebad94f3819624d8bb3b4e5edff9cfa"; + sha512 = "d7639d2efdb895b14c06a4cb904be43590efea7f55d5b59c17a3b1b2253039844c8852a99f2618f19a4284ba8f9c37d141d5f56ecc801a4578ba7ca5b7bfac26"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/lij/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-x86_64/lij/firefox-62.0b5.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "9ca670bf8828933e587c3d1ed2f4bdd730b12afcb757f88f50e55cf79afcd51a9edf67f0d15eb44d8166bf8afde2d54bce1a9a3f7d10596a31f7f73d2b1d4c71"; + sha512 = "64ac944127a34a8ef680b0be641c373f6116a10de0dd3cb205ff54e40a085026817b2344e34ec28f3742519f22a8d75df6bd20a7633b6bf3c45d53af030dbfee"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/lt/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-x86_64/lt/firefox-62.0b5.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "be2de3a6c0b9510fcb6e1fb09d366019e7a27517bf00c85a33ab35719c091ac821c560828ba6bd4252456dad2cd5d52ffa16131d3c4024c9b66d02584187f6e1"; + sha512 = "978c488d9df2fc5dc943a7a700cfd5db658d07a1fa55d99b5204899c68e8c75334d01c9e7282609dc677439f41a3af626de6415b81b0085c868a4e9271bc5e53"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/lv/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-x86_64/lv/firefox-62.0b5.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "e99ab69dadfec0765ef4c616c12f919fe6fdbc048e96e2b2a67580e5d36123cf3e0dbdb2c45066cb535ca5c1b7b1f151a779ff6b93994026ca88ca558ad6fd71"; + sha512 = "f0a5fa3fea5c042d8aab27ddb8013bb2387857e61322f153316156a6c88941745677254262b543d732fd5b2a22d1b59c884409ec94cfd695cbf3cf876bb4d589"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/mai/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-x86_64/mai/firefox-62.0b5.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; - sha512 = "6d57ef217c9f51725586087c366d52421181f4fd90744f6481d923fc4fdc094dfff5452a39a307d8302eb3cad84293feb1dd5319cf3007dbcf895d0a11219982"; + sha512 = "c625f7e67de86bf7820166e37180e99ea96fb9465e1a35d5b91be7e62646b05baaa3f1eb550eba717f6f5e2f7861f693b2a7b454525aa932b59a793858aeaa0e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/mk/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-x86_64/mk/firefox-62.0b5.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "64d24756a2c0ed9b237d2241150ee0b45618c2f66b13f29d0c28f0a77fd3893c5845ae29d93590f461a9ae67bd18e6e6bc07597a8e55fa1fa98b8ea2551a9048"; + sha512 = "5477b9f669a5a7ef2e9836284066555f0e75a7dd2bf7806021991c597b63246b71b2c171bd9c9b7758af4e91f47f354978526e885f0f84a25e83347c85a5edee"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/ml/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-x86_64/ml/firefox-62.0b5.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; - sha512 = "88d21818c5f251676f67ae42ee498a55124104bcf9c96b4dc92d490b0d3ad33846edb7fb9011ad53b6b85c7d5a7fc7540124aea3b89d37ffd6e8ab60da638626"; + sha512 = "5c6109434a2c385139ae7fc184dfdbaeeca5889f1357b5af5373a01bfba49ab24a5a2445a79b08a728d6ab6b077961f4eb5b93b3572e806ef4bffcc74eef1953"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/mr/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-x86_64/mr/firefox-62.0b5.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "7b1fc11292246ad1bc87421081c4a2c45e34ea262b3ca2eb77acc619b6290c8ba25db3465f15205496d662a6ed6eb9ce69a46f941eeea4b0009458bb008482ea"; + sha512 = "47ae92e71683c83b567013eaaf3d0a91ba4a1569cdc290b6c85cce2354675042373f71194d1648650037a8da52a983e628d7b772fdcd82d05f3264f369bab137"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/ms/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-x86_64/ms/firefox-62.0b5.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "c790907f60b92d67e2a100607e5b1a8de8047385eb777313d0b349bcaa9ead166c2a51295c25269fc9a9928e228b76fc981c58842097c3294fcaa3f3ada870b6"; + sha512 = "8260be3dbaa41bd1ed39bf0dbbf265533bf60c7350cd396ca9a9965c932d7bab7a244972225478d753a611212f218d55c216611ec16fed9e0953bea68a3a6045"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/my/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-x86_64/my/firefox-62.0b5.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "481f21afd3dcd418749bdf8eee509d35c915003e92c5db39fc41f3fe84ed9f83f3a343eb83c195e5c72f6c48f69fe878798a6b8df80c80f3d6f23811f288bc42"; + sha512 = "87d08241d8b6b52e1881ac9be3901ce74e7a827a60b3783e72e4c2109d62bc6a8f3d339b8cc063e44804591637e6dfa0a93ecec51d5b8603709be4125f11fc9b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/nb-NO/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-x86_64/nb-NO/firefox-62.0b5.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "51f8ea1ec330464d69b805ebc0da9130a0a08063b0c535d6da4b0ad396f6073947d0bb28bfe19fd07d0054a32afb96d43e9a3a83cc65356d921295cc51186c73"; + sha512 = "3fda6e66f2bd082c2fe370a54772f0e0d6b8179c803bb909f5158e80314afbf1ef573ccfee34ca0e9c68c3ae8ccf9e798cf08a17c3702a21944e181a5f9e7b3d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/ne-NP/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-x86_64/ne-NP/firefox-62.0b5.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha512 = "57e69cb671901ca78dac898c4c304bbcd19f1c54d63be2dcaeaf921ea26d6b4adfc6ffe415547fa5b2b871c6356e65ca21b23c5e7160fbd81885d17e9ffca682"; + sha512 = "f31947b089ea34499efb9ec28948199f4b711fb19b558dd23ba36d24738eab2658fca1162b7dfd207cc7fbbf616f935dd880fdef3f756003a515dfb3d2677e2f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/nl/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-x86_64/nl/firefox-62.0b5.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "8dde66286a7fbc6eab4b7ad6573aa4602172ae7b96cbd732cf4886512f1cc085a9659a3943704eaeaf99b8a3005400e3d3cbcdf9452768575910cfec16756f9d"; + sha512 = "22b653af6770214b68d2b9a3dd0acce77c15f08c7b8a2c116f884b63e1b6e316f2d1c31980e59cc0352b83124e776c79a336bad24f3d32edd5a744c891d3f3c3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/nn-NO/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-x86_64/nn-NO/firefox-62.0b5.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "97f460ce8d17b03f24f13bdfe6119f08c727523900eec0549095dc6c97cfacf4e9081447cc8984d33050196453a22d47dbb7bf205efe595eeae794b5c78088cf"; + sha512 = "688c07d873ed2f0806093b00e365fbe5c04316147e8b735f87508df51be709e0e5286cafd4c75d3598db68060745bd1c4ecc2255ffb99d841c7c1f42a22c7444"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/oc/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-x86_64/oc/firefox-62.0b5.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha512 = "09e0e00dc7c06445efe7d12c46b77ccfd749726a9b7e9f291dd79025b14f07540b741c949b64d9eea27fd6549a3ed0a3a4da6034b25e455bc124c44e5238a6bb"; + sha512 = "0462e3cec7feab773b9408df3c535c48eef13e35a3892d5ee850d9b4f4d943ca61203268f0e59f04e534e142132dae116aa6ab718fbd8c78e98e30a1eb3418e1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/or/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-x86_64/or/firefox-62.0b5.tar.bz2"; locale = "or"; arch = "linux-x86_64"; - sha512 = "ca47ca122004c43b9ad3e46a6743b3b16595786894fdf9e90ec82196b1aa2a4befe6e75599faf2e12754d301f74fefe318afc9ff994d27e696ef94ef2af0abc9"; + sha512 = "3c4ab12cd550d9aafc1435433f0b8da33c66a1c9e7dc9c434f617996b11a7405095e573d9277d0753598edcee366b3223d9e2f538d301f2978b507df79bf769e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/pa-IN/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-x86_64/pa-IN/firefox-62.0b5.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "a173b1561fa796e914200b8ac027a8fe9e57de7806ce72ca7c6126c1fc3cee2cad5694ba34c2e2dfa8748378192b15721f14c01b10344eaf073fc1efe51d0005"; + sha512 = "890530be97b55ed33fc20062393f6d4eab15030d21a988cc72bfeea745faeec7cee14c30c1288bfb59d67e78a83a57db7429b7dc1718f98fb21f0a47646c065d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/pl/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-x86_64/pl/firefox-62.0b5.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "935dbcf9df73b7f2a689e81a7726c4009f3284ece8ba4f9a5c19326842f8dbe262ce1d68d025c79d09a2317a0260344ce110f2a8470dbd41a87aa2deb20285b8"; + sha512 = "4f69fbc8da3e9b06c3da157ce1941945e41c88b2d549fbdb6255d7a239284ae305ee6240882fc07933e3d85abb140d651507322af0ccd12edc0773f1147d5366"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/pt-BR/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-x86_64/pt-BR/firefox-62.0b5.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "8b783f8b348b021afd50447b96d931ea3e59b607ca0e6127e680af13959c2396b952f9d9395a21515b27d9bf0718a756c6276e54fea169a58783f706316848e0"; + sha512 = "d544d809b08d891a61df4193f2b18186794658c5bfbf528c78ef5bd2256cdc66c43f5b975a204fd4b1f6d12fbdd7b6599e475616d70e922b55d2216cd7a2b433"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/pt-PT/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-x86_64/pt-PT/firefox-62.0b5.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "2f0b3fcba8ed0b14b6270d4fe3dfcb1a4ad273e3723191bf2b041fca7776e362601a2e06beb6a544957fc66208072e4106d33bf8b52a2be0610f4db21c651c93"; + sha512 = "85963a08f82e62629a8d318a8a78ecb92ccc5e1c72b934ca5a1f6733e9f887877b1ddbe40c086cfb0dd29d3dc3c098324c669e72f2519347120ad8fce97c27e5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/rm/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-x86_64/rm/firefox-62.0b5.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "cb1b633c75cb08d1a84edfd315e02f3d3056f70a3eb382d1ab31dc317cd37522c7719a23eb1ab5f89c11711e4ce901e23b65f7f9182c88008ac964571c844a27"; + sha512 = "82c7add6d46b628801aae8ad11e24763c7f3b287091ddf7744359996563bfcc8abd7361fb37688ef300825663be893dea610222a1a0785d2db20a5218d963ef1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/ro/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-x86_64/ro/firefox-62.0b5.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "2d56b60d2843bf0a526fe1ab6edae613fe78ecec4acc4a603ce107d2a67b286d8e6098dfd1fadccb77335977a0401ca73527ff8414a6537edcd001ff288bad77"; + sha512 = "eab110fd61ed3c3e68cf304fe29c000a2679a01dc02e089b9ab292c960f07901a721eec4543d4cee5627e0574fa480940ddbc6cebf8a8935354bee2a0ffb324b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/ru/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-x86_64/ru/firefox-62.0b5.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "32cbeb54cd3b9c6edd56d05988d1fee6617b2aa8f0166f4acb07cd701aa1cdb03718edbb6fca776ba13103a377a31cc65e5800a49d1466500afc6cd8a92baf8b"; + sha512 = "28816591d47c9a93de282b01ecacf07d111890700fdecf8fad4eda4914c0ab6847ba252ce604a3d5ceb6af415b3d4f37b55d8a3f246ea8eef66ac85be6351bc2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/si/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-x86_64/si/firefox-62.0b5.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "06243a2358db5b9fa50a56e6302878a1cefc4fff42bfda6bcee57a8996314b101a61e544413c1cfc3e72555e88b0e946c5691956c33c04e44fdb199bbd30844f"; + sha512 = "9e2934dbbf307b783f0606d2fd92eb7a771fd4af2669efcf4fad6854ce3103b0e67eccf2971086a738573755d944ff000248f97f642c79501d4276e684596d47"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/sk/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-x86_64/sk/firefox-62.0b5.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "642c96e2dfb5f809504c27754dacc7dc604d724e8d783373b5c3d37c8fb5d2c159f4f7536353859d3263ce8648c53740eaf7ec7448c165718bf9f0d53870df06"; + sha512 = "2e59b2e5529f4277241af37cdf2f1cdfa6fb83a7aed6e57928e639d9c579626b6016162c455b8d3e5a57bc1bfa7ae84654e15db83b294dbd9974d790fba6c803"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/sl/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-x86_64/sl/firefox-62.0b5.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "4a803d3a1ad2720e4af3aaf1540ea56683a4d22c76beedb0b6928d7c5a89fa5bd36233a675fb85ad2d7d6f5c1c4cd7ab5e5ce77c3f49ca71a195cb93fbe37d1f"; + sha512 = "c8ad3d04a77b3cdf15cc730b6a65ab033b93a3bc0d24bfd54e76c3aa8ee68ca2f2adda81607a9f90b026235652af3627586b2c2e53fdc17aae09eef6780501c3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/son/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-x86_64/son/firefox-62.0b5.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "16f89877424340062914fcdb4be8e4d88bb0b6e04104069fc74b50a54c8610b4f766cc4623b5e39c794d2974144cad610900516054af51cd963529fa4d6d37d5"; + sha512 = "4cfa90e893f6e4fe7cf007afbcd018008fd1f26d89a9eb45356c4db2ab02934e4e657fb198a1321a6f2832b3f9609809a596e21afe3c8e49320929bfc90d022f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/sq/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-x86_64/sq/firefox-62.0b5.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "10c97decc9c113535042386b005687f32c16a6bfaa8930f23dd3787e7753d2c41d94e6dd5caef6183f0d3f72156bc5bbbf72389186b50a8a7376e5abda333132"; + sha512 = "03189db986317616876b3bde774c03d55de2811904b5aabb14d433e92ce0b8f8b27f7152b30eafb2dc3aed1f5ea3b8de3d2018da0fc8a215b8792dc8d4527919"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/sr/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-x86_64/sr/firefox-62.0b5.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "8d34baaf402bfdb3bb0c3c5104a9080da4d5eededb6d55b490a5a7c62a095f68e2e0534691bea826281abb91e7f28f3fd4a22076aec0e1600abd31c94c937f10"; + sha512 = "caa7c8e84ce496eae9f8e9b4dae0bf81a6eed25eb5376346a997ceb0d2949b386ad606b86da39933decda72ea93cbbd2af5ae0845c927a8756c7682badf5d3ba"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/sv-SE/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-x86_64/sv-SE/firefox-62.0b5.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "d4317109b5309eb355f5bdab8edb0259840b0ff940f57295851491d2dc0d8ef5488626bb952fda4055e2459ef502c57a836cce688a99aa88a570a388658b1ff3"; + sha512 = "760796e5524baa8c71cd3233f329e2252d2ef7fd267622b6aa48ef276808e7aecc0ca2bf9dbf1491625d07364edcb158823615e36a1c3a89e941800d50654e91"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/ta/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-x86_64/ta/firefox-62.0b5.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "6433f05c761095a3efc838eee6d46f8ef2337d6fd655c79dcd8dc95572875bc13d393ce98757c70c895161becbac3d3e08458ff24a604fc8c389405cee7fffa1"; + sha512 = "ea359a933a6412557afde2d4c52f91450eaaf8ece095162cb5e76d7f32a3e8b6dcf1c27f571ca53625ef17702570be42a9e69712214265617bfbe00fff56dcb3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/te/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-x86_64/te/firefox-62.0b5.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "07c2413be438177e6557b275a308ba5198b3332a128822a0ddf5c51dd13b2c2b50249990b2d541b58180d6bce4c4b7c42b984cef6f8ef9e4f62f5f0307261484"; + sha512 = "82904e06964fc05a53369861b192ad2d19f20dfa510efb40bad6224198560e6143e45d9d38362709d3293c0a1fffc1a3eb7bfb96fd3068bed32b80c544eb9ab8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/th/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-x86_64/th/firefox-62.0b5.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "fd82735960e4ea6db66928a022796606bfeb9ca00e889c6140d224d7a6382f1f0ba55f3cf171203a110d5429fc38cd84353296fee950857dfa0e3ea5fec2f22a"; + sha512 = "dae68213fe9edba3977f61d50afdf8f7fcb77ee93b41776a98b3b3ecbe8ab8eefc02580f39728c2a5c34de21e40d20dfe74c4aee2624853922ad4b80c4b86c07"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/tr/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-x86_64/tr/firefox-62.0b5.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "16b41ff0ac170a58f2dd8eb7adf0a7e1ed68fe88bce71ca594daa26e1881358697984a46dc74b75d5d4d554be28591ef570e9da672390eab57c97a9eecd36506"; + sha512 = "cf3594499fa271d05e4b4e1de09d089169d16919bbdaaa00910456ad0c73827bd2a1a4711cec70d9d825c5d732d10a032d53d28014182700fbba256f878c5e47"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/uk/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-x86_64/uk/firefox-62.0b5.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "fd8c5c8aee503dae022dd76a6e4af91c15796219c05a8350458ece2f6ea0bcbf15a461a5be035df6880e1d3aa287e447911023ecdf36a59451e44bc2cc819063"; + sha512 = "172f4227250713bb444bb891d76c67af8488a7036e08ee5ee4ae1f43b9fadf4892d18b0594cd057c093ef6386797317f864505ab9f23af698688b7fc831f9866"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/ur/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-x86_64/ur/firefox-62.0b5.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "12db58871502288ffdad76881f4d4b7c7922f22f4317c1286984035b6ddbe9155e3f0bac2f4645c3bb5878b491d326af68234ff69d046435a8ed1b5f2bcc2618"; + sha512 = "0259b8257b7ccb92b35b7e1e0b5f1f07868841a738f3495a76983bd311bd73ff86c6076abe6d74116e36fa5f8adbc59e3f12373944a293ae14a41914b962d924"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/uz/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-x86_64/uz/firefox-62.0b5.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "e3d5c3df93ecb48e685162a751f9eb225c063fd2b5a8676f7956cc1e3a651529dae38693304320187ef8f0eeb92c2fbe0c3dd7541443800d235ae0059562c0aa"; + sha512 = "de0f9101fd73adaffa8e5361ad93ef54b3255e5d985a289fec9977e1c46813596106775f63411a1bd7b188be0a86f11ce09534b206ba973e1b43e0cbbe9ae6d3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/vi/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-x86_64/vi/firefox-62.0b5.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "6e4eb1cb75f36c600bb9211a5560578441c0bb4ff5c58e75d07025ec98843e74e01299ea1686f45b461aae664dca68fe9c2f6352b389cb8229ac4c1578a4e494"; + sha512 = "335b39aecfe562cee544f9ba589133911d44ecf9b0812f9db3b8b9ca5787c2c4bf5e6d2534ec6f73919616c3c1b37b5dcc1058b7eb0de2df944baa65bd5a1734"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/xh/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-x86_64/xh/firefox-62.0b5.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "695ec0a3141c102270b09ffe55045b539981d68d35b13cb948570669edb86ee7dcb34e3d246800fc155d0126acadec73d97bab0eb5f7e63bca82270cdd3659cc"; + sha512 = "3c5debbf3b5b98a65a370ef3a71172028e6704880754d7f7ce9698f75f6e8b642ad9d13b2f16ce344e9dd202db964b5ca11064be73552eca3256d61df8fc74ed"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/zh-CN/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-x86_64/zh-CN/firefox-62.0b5.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "a94b0b7e67ffe5e3c961df0b6ed802ea9c20a6054236b5c17b638a1526bbe6f65392ec9eed2de6fc64dc9d8904e72da98f7262812273ad977694eaf53609295c"; + sha512 = "0c9cfcd3276f8d7bdcdf3abf34a70cece0be427854dfe8850325777e149a0fd54ef84dd89351c417c5f32e6322c957506aefc06d6d250c69509f061ddf2e3eb6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/zh-TW/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-x86_64/zh-TW/firefox-62.0b5.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "ec12bbb68350a10ab67da8160be765a5893a497a373267efc992bdb0429eb17bed9526247a313ff72aac4b491f42fdf618d4b03229d5f7b8aec7e680b60acd03"; + sha512 = "7d8a80facf8c3244beaab0769069fbc0cc791fcd4c27fdcf3ecb4c9acf4a97b29b18c202f36673894f123760ddeae821299b8c332a52e0dc043f9bc05f5bc55b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/ach/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-i686/ach/firefox-62.0b5.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "377a6ec42ee65a5002d6abe5f2c6f949f64914ef28f86c6ab4ce7218fbc689018f2e20c17660b340a34e047227a48cb0f9ee566ba5f390febfae4eb0f7675d6c"; + sha512 = "e8d5f233404c91010599c9116839e71c1460794ead7ffd352fd99eabb11469edb238300b983b093089c0f1a00cd30005a86bc06e20413219e3a6a30988316b33"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/af/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-i686/af/firefox-62.0b5.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "fd4558780ab15eac16d81e35b8ce8919c5968296d3c407f5d937dfecf72d1b63d53548f1775999a01792cabbc0118ad8c118c03f9b82e51abf1a6fa0ecc3220c"; + sha512 = "2e5a59a5217d24998f7c584e1b2913161140ee764d0f81556974d998568e1fca807e2c838776c2414ee98a08db4c874201e914349b4e0970e282556f469f3c3f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/an/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-i686/an/firefox-62.0b5.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "3dca1d995e534f9f037e13809d65fa3a59f3d97ceae7e3820685886130350ce3e1da9f6cf8b75dd213f8c1021cde55c5f215886f2e045ab7f60d1910c60ad4de"; + sha512 = "c92614d32d8a3533fa9edbd205950a76cf7bda8f94dec46ba54f51cb93ce804a30231b718dab05f43463fc7ae3601ab8d987c9e89b0919b04c715b728d7afc1f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/ar/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-i686/ar/firefox-62.0b5.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "5e3cba2868e67303d6cd340fa6540aa0a892ac0d0a81fef8d2c17586565a68974cc88c92cf98e2dbe79882c5897ba9229d0bcf49a883f64b7c0697cc2fdfba7e"; + sha512 = "906c5b772b9c747754d3253ac7c7d3ab0f756624d49b0fd23cd4065e0422467ffd76b4bb65ce7d537b76e8d068d7bc50874ea4052bf37b7fdd4bfa75bd826206"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/as/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-i686/as/firefox-62.0b5.tar.bz2"; locale = "as"; arch = "linux-i686"; - sha512 = "dfb1e492f247efbc86a326e4ec3d5524a0b9f16991f80b9d10d7da2929b252532b96a29ee32ad38bd151c2260eb8f3afe924c4c897b3171606db42046fc70641"; + sha512 = "6a04c05eb45b8803b0a1a0a0c4213d1a485cf86e07d48b57d67640d6791b0e885779f4719de0c21a0ca0a50da3b0bb82644bd3370402447d220d954c1b5ccbff"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/ast/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-i686/ast/firefox-62.0b5.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "bd3e42054d2e52eaa683eebd163656d69d59df1b479341a5236dcf46ca9195582ef5e980d5bb44df2503010a7f406b1fd3678733754aa4cf2405995a62c93ae8"; + sha512 = "b00f5a8de9a23afaa18e7a64c248f6a73e7730aec098394353eeda6abffb0cb68ae21291b789fb9b732bf65ba0b950530ca7e83a94911d3af5ed3074c7fd8891"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/az/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-i686/az/firefox-62.0b5.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "4d159eb67bf68275f000af3027dfd6059c532254ed2be98297b0cf8bc4c622b902d8bd17c00498600892f431d87dccaa6177cb8991ac37623422e197c5b3130a"; + sha512 = "2a001d39905a5c5c9bee486499d26ce466a83d118ee8ec75a5f0a2364cfe9fdf9d2bacc534d03e910b13778e9553da5a30230f10b65581238f833a1b0c68dc74"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/be/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-i686/be/firefox-62.0b5.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "bff2e6c483a3bba92d591e57d4f3c7c144ef1d43ef8d86d64beb9e0970ac585b04175135228aa43eeca1d518bc396c0ebbb7632e1d91909e92239269d1484393"; + sha512 = "a6ccd8ceff47f6ad6f123c19e4180590fa77399570df357adfd7d172cf2f01534300e0befb3e27adac0732a3e90b0a3eef5ccc1f9b8809cfcbe804bc18a16e65"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/bg/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-i686/bg/firefox-62.0b5.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "a07453ebbb39d427df3fcfe83280dd53519eb4a3b9aefc975098741d803bad430d84de733ef67b7f50738ed056c8db9c0867f9efa245a15c28955ac88fadc180"; + sha512 = "d3a5e6df5cd90ed05651d14fb86d1dc37da26fae9e9a102fe5fcc4de99fc8181e422542328be6da6ecc71ee7d640e13b1720be557cac050e7071b55d13954815"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/bn-BD/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-i686/bn-BD/firefox-62.0b5.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; - sha512 = "4c5c0d9bc4d9169d0d87a809bfb7740fec274c0f05cc1927e7c93058b948dccf66b0d3e35d111d1bab9c03496f6c78a8619a2edced3999c13f06e9522feddf02"; + sha512 = "92277c88b0e7a444626e5aed34dac4f6221868f85aa7c9d477513697728e590fea0552672954fe14e7f757ceedb4e3d8b97360cb51cc53ba99490685beec3d42"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/bn-IN/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-i686/bn-IN/firefox-62.0b5.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; - sha512 = "e6e2aa7643901ecd94149d2ac90f6d190edddae8f6692deecad4c5b619e75538765840c968f78ebefad73ccb85e05d429e6c20d040bbaaaff07513f49ba7fa37"; + sha512 = "f6744c1b4b177ba78579646e0cdfff4582554b27b8e65bc4c19efc5098f0c8feda5008ef526733d6f2cb4ab0fa62e7505bdffbd6a090522a79b93ae9508c4772"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/br/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-i686/br/firefox-62.0b5.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "6802ba52185ff5145f0d4dd6f33606c3a66796b24b4a43d8c3ce1967ddc916bdea935eee11453eb0e84d4a557784cdb2511c52ad9ee52fca5e9df7f6e70d144e"; + sha512 = "1824c8b0a5dd0a130970890849b875462903974f91417a248675633f81072f6a64cd7c9a620f2cb94719b5d58f1dcc278e3fe52ee16b9664baa9e76adb4f8601"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/bs/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-i686/bs/firefox-62.0b5.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "16af58f6127df1b72bd672d1942e66adf6e5fdcae8a43e18cd3fdaee592468f492668bf3272e15d440a123b97d15e913a668af3f069615a295e9de24b2b1ba8c"; + sha512 = "802b568f6f8cf289e4f7fc774b3d4363c75474c58bbc9479595ab89e12a5aaba82653da1da9353ef192b1b013c09f0c9eef4a0570455e0cdc0404cf46cade144"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/ca/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-i686/ca/firefox-62.0b5.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "9bfbe17e3bdf5bdc72a346c909c1e8c97a3158407b1bf937fa1b6b86fba831607401b1cee55dcd5a0b3553849f2f1cef8a5adcc563c44e1a88dd1101dc7f8700"; + sha512 = "c8602b74a4f97489b10e8291a93c0ef463229037ffdc4a7a103f271cc3cb00e2d138035e92f98e6214e99639719d50faa510bc5b4b2ea61b62afd09c301994ab"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/cak/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-i686/cak/firefox-62.0b5.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "55f887c4dd9d8c9251982a1274ff0986b3634fea2b974cc0edfa42a1777d75645314e22d5c1583990c5dc3448cc6ebb6b6ada590a9fb8673cfa4949b19c970a6"; + sha512 = "9f5a07dbe114371cc71d55fa70173e7cc67048520ec4dedbcd6211ada624b1e89b381da9a48032bf85b4ad5f9e5283b0462404a2c044e138909431e4043f6d1b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/cs/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-i686/cs/firefox-62.0b5.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "0d242c4d5ceb72d21884589ba6562617000206faafc4a55fa984ab083e35f4bec820e5d75ff7a152b0ffbd486798de18f7a17cc6cde9e5fdc52f3b2d1ad0e076"; + sha512 = "1ff697a50a824eed01bb1f9fe1a9f05e0bd5663fdb3668a823c391896405392ae8c58b6589c08c81e630b3731670a63e7fbea4aaa99b5a6fc0c776a6d720ef6e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/cy/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-i686/cy/firefox-62.0b5.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "0c8202cd52179cb76e7037a6d3e19bc362ddc66742bee71b1df8ae01a016437ac10e7723ce43decf28d5b31020c625021c62bcd9786754296303ec11960ebe18"; + sha512 = "bea88e9496fcea7db8ff87623e848e1cb728c944f0c13d9a1ffabd8ba0634fba4778a07e0d946cebfe630e2b0149c666ce782c7dbfe8e489c86ad66ccfccc8ce"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/da/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-i686/da/firefox-62.0b5.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "92017b5cc8fc9c7d2973cc40c870f3022aa6f0a643b41425f436c458e19639c1e46f068028eac9956ecd33db5f73ffcccd208a9d694b3d749ce69b2decf7ba32"; + sha512 = "c22462e4c2999a35ac0c624a90fb8c77cb47cd74e021d88316b69b5c60c6e56501d2f03287faed4dd6b02432ff7285315c073c224aee14c7e33df7e97993f864"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/de/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-i686/de/firefox-62.0b5.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "c454fdc29eb41afda1b9ff074d41b471fdf31cf9f75e4dc45a8e5f94d4d526f928d88918dfe9617f95ed755cd22de8dd4c7fb5b64f7566e3df70beca6795c897"; + sha512 = "e59741422d5f05cb3be9244a80bd23237aeab397829172b582738bd7ca75e067d155dbc51162bea1ef68bdd56aa5f52b341101fb6140852e69036b17441160c6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/dsb/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-i686/dsb/firefox-62.0b5.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "e80c89860ad364d66913d1c67d05057bf4fac56b17339833bacdeebf0e55ee20dda723ae404364fb6d4bb58728cb4cd13e7660f11fd5cb4c29284e5d67d27a50"; + sha512 = "865d88f598cbd0f413c39fb9e86b8a8138ef7ab580a6f9caf2f7f5cb147bccb8f887cc6238bf4a9d7a300648b4ce60cc3d5d1d4b2607ee1e0dbc6291289a5fd1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/el/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-i686/el/firefox-62.0b5.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "faff2b3992f2ec2c312a68e1d6562a3d5d72b9cb29bdb4a0503ad1b08a9abcfa5f934b2ffc5cb85a9dc5dbd74d772b5e1d239216510c5825706be406380369b7"; + sha512 = "c26e66c25547bc895db6c6f19df4f8e700d0794ea8bd95ca5e7f920252a4991c4f623913b652aae899e2593cc1013cdd19c5bf60f3ccbd4ad2c57922834e02c4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/en-CA/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-i686/en-CA/firefox-62.0b5.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha512 = "24643937312c2500dd9f7cae8dce49564e5e891b85b97be408793d7d0df9797fb43a0e03e685b8e3d84011d87da46b5036887d66d69ed4b9301b89454b6cfa47"; + sha512 = "ac096bfe63c912fe9df9129f18c71e3b3770fe6aeab73d5858be11db627c1e6188a8f87ede79349d31650c842c67a777864307b697a8fa6ddbf30e653c1c1706"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/en-GB/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-i686/en-GB/firefox-62.0b5.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "66f84337f0bd9f25069cd086d5f963b56bf372e3fec1d09e4bc6f39a94b6b177dffbd95c829eb0e78914cc915b55bfe7b5e25f14cd594339c7ce270ac77a2667"; + sha512 = "05ecf77b0a529856cb08b2038cddc12f2d0ebbea62447f2ebc9963ddb7c6ad59a35eb7812a38742d83f3f73a7a79c6dbc0af8f423d28d86c2664b38c1666b28e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/en-US/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-i686/en-US/firefox-62.0b5.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "a5ddbe8f111ba737ab0f123b888d0638bd299a715b231ccb40c2f92b1abdf859d8e077fc80184becfe675e4e35c88dcdd720b85f57c4d4ccd814b355349e1a51"; + sha512 = "c179c7ecbcb5039ba9eafc5ee4cd4a80a534099101ccd3e88d1e820383cf64a96afb0611d4e5433dceb3a1ee91baa8b093224f8ea6fccca85b1cad5acf0861f9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/en-ZA/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-i686/en-ZA/firefox-62.0b5.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; - sha512 = "d6f01366d3fbc8650576f9ffef64c23672b638003e5da7dbf66a2c19ee2b3486f0e4dcf724cb95daf2749dd4b2875f2037d8211ecbe3a617ce4afceeeaecaf1f"; + sha512 = "0424a1f96222cb678b75f8bd8a0b197f5e492075be56a48b09f5faef42774df98340417e7b73dda4025970d606343b525c8354b1eb462da57580f0e3c1074e77"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/eo/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-i686/eo/firefox-62.0b5.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "aa1e0d8b9f25893ecf6397fb017e32aa44bf06d57b13366528c5a59ad6f5b88dae0dd06784a133fc67cb9acdfeda57f56147a3970911a870b6773f8c1773fcf0"; + sha512 = "da1681859cf1bab3b7b01766a485231a77fd0a752b2806d52faec8d6ebf8144af27a1e5be2f1fb166a5cec6a51df92f260d753b0d5b357eeaa547103c96f9baf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/es-AR/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-i686/es-AR/firefox-62.0b5.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "59517a73c001c4d72b33f191cac521c7f4982b44c942185758ecc2a451fb41811198c771661966c550ea27d747ef60bc7589209f9680016f9f2296696b52a649"; + sha512 = "12e680b5f29c179472c2670eae11a8a0f6b5db444e0e6c008aa24c9b4650662e95266f6d3dfbdae5b9fbcdd3de81c37029be0e9734f4ab04b86815df425063b0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/es-CL/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-i686/es-CL/firefox-62.0b5.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "03b89336a014fb2b8f10227f210b33a4250eaa86604e65cd4ded3407d8b960ac1d2f67732fbd5ea7d8b0fcb25eb17f431ca69fb1820cec234deb9e68fc2664c8"; + sha512 = "f2268d16b8ee56408eb5ddeaa012fb26c9f5e624290253ea7e53f99b3c20025321408dd3a47e1697d020f0e63e0b0b785d106b5c83caed04ee38bad3056a3802"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/es-ES/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-i686/es-ES/firefox-62.0b5.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "0e023192c1b88270a6a1f6d7bad506233b47461f669949912b84d502fb404db6d797b51eb35ee898f10ddcee6d7e2ec98c46fc1c65d7a79b6cee1b47056a5b3a"; + sha512 = "1b814df98f4808704d21b520c3407f197d7581d24ba195e0b80dc136809dcfa337edbd3dac59cc741bef87a83a3aa90407286cb6434faaec154a90e2728e78a9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/es-MX/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-i686/es-MX/firefox-62.0b5.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "4ccc60cdacd9b5144c56cdbbc8d51c41822c5a6ca43713080a62c46924627ef98dbb259c22842aaa6255b45bc95b9a72c169352e505a353be95886036b122bde"; + sha512 = "04c59ad6b62965195abfcb2b99f821a0188850435f415053f26115e2bba6128a1af9062f4da0cf505ec68bace22f76ed3784cea4304cac5d43c554affaaa22ae"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/et/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-i686/et/firefox-62.0b5.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "3472a528bcdaa138dd68a44e872da9f17b3e3dd0cf99e1bd9cf99057fa0a71332dad99df2eedae82f015e3306531ed7575d579e94391b0d1262604f9294c6f78"; + sha512 = "f3e18e0974bf2c38967068b83751b6694695ca19574a49226b4b632c199fde2b2804281f6707e3d598681c8a9420e4dbe26708bdce93113f7354c64fa98367eb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/eu/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-i686/eu/firefox-62.0b5.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "2cc55b33e020985729d144357329429ba803d3380383051728e42824bbcca2da27458f42a6d4cd19015e7b14bb175ef104c02a7416fff69cdf425699246370b7"; + sha512 = "e158c5d5fa65ad6484a9f4c6bd3fb2ab920219258e5004a52a81c40e56d658c07bb1a45f3bb6edcc53ee8a4dc5bd1f65c67518f0c64f731a39e63cc41bf98437"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/fa/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-i686/fa/firefox-62.0b5.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "8874887a56222ba65fc675cc6c98b99ca5934121b3ab358fa1bd9bf284f8e34dae3d705010dab891d7f4896be0526f5c050cba688c06b55e90ee8ae30ff5813c"; + sha512 = "15661608ec7bd32e14916d137d5db92ec09d3ce61d39546ac6353d632ce13ac4060e21e65c6f48dd4e83e5ce2883c2153338bb5bbb9a0244ad67daa755d7638f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/ff/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-i686/ff/firefox-62.0b5.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "1c58c56d95834bcb6dd008dba4454ca4f21f63698bfc538d4e4f1565a09cb12735fb44067173637baab3ef530b8eddf28a0aa69065a2b2049b0dbee8f49483a8"; + sha512 = "8ce5c2d3f71055ec5ff8b27aa03c268fe952519d167a2898035c1203ade3504b9c0d9c0315df45b811285aa38fd35944958d739e8df8e367ac4dc9c6aec213b1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/fi/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-i686/fi/firefox-62.0b5.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "3b64e794db0017d38f15d348181ef8a93d94f88d8ef69b5ed2171af7f1ebf529835783924286d55acae1eeec944bb5f45dfa2c59639ac258f1dfd56eb7120710"; + sha512 = "cb8d5d9bee1db0b631b0b9f8bce7c98e1328126efe84a16692623542399cdecc6bda5aa28cd7507eaccad5d94e3cf147cca5ff43d0807c8f7115144903ef66ac"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/fr/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-i686/fr/firefox-62.0b5.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "d4022a1d25798844582c39f71311ea8c416dab9c2554a510a1ee2171acdf26c30bc85bfcddde07b29aec5ba0a30f1c3f957e2cb97f9c4dbdd9e539685703ca49"; + sha512 = "0f7437e6aac57a97ddeb25778946386801439a133084bb1d04f38856afba084ecd81b2c1768280a00499607e5b169170c8e853f98be7a4351edc34f841525d8c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/fy-NL/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-i686/fy-NL/firefox-62.0b5.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "d684855eb69e1574311493d9b86be37486e4391b48b377019b53fbc119cc10ff5364a0b004f9fa64575b84404b0a49c75780bdfe29d5a06c37d217558e025ccb"; + sha512 = "a44c2313d37f76ab8c58952b361f0110c25f8873e3e0502f8721bcb53341a209e2c01d296b8ea8c957d173d81944d13bd3f2730ee42e9d34f6e96d15c4a1cbb3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/ga-IE/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-i686/ga-IE/firefox-62.0b5.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "7874e6b777a01b696310ea96bb6ce28355f9aab492d05a0529ac9cf33c7ed76d896aa441a457ec304ed8bbcd6346a95553c91399f62938c19efeeeb5c3c08c27"; + sha512 = "84652a37ae3983d0bd94a3b58c1cec7707ded92a50630baf6f53416dd25a3bf51fb427e1ca61a7aaf2247d1bdfd7c6aefcd39243f793174e032c4f586ab28dc3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/gd/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-i686/gd/firefox-62.0b5.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "a570db98e06387e46ec29f14ee2048c9b7c8e4406f8f216748635ec471d2073a843039e2d6de8aad1773ec82e97a817b005b9b4f2200922d934aaad4ed950a65"; + sha512 = "b3ca12bfde2ab82d3c081f957fba2f6d989daad14cbb502bf5c689564fb0d159d9292c51b8a0a3fc42ee3f0e9bb8224e440dd0ff756ecc476365f690926c3444"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/gl/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-i686/gl/firefox-62.0b5.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "959e9863455c7802bd6720dcc8203b426e00bc17038785c22a00ed7f8f6c6942fd30548fe607bab66c7e234ffa4b94408a4bc0591b78674e097f9be26d465967"; + sha512 = "5d35cd62d50fa35ceafbf40ad8d5f951bc49f18fb9d1cd0812d3bdd5f5297264c43a211c9adf91ee8bed469e3b16ad6f9b8d73201bc8ad3a151119be979e1349"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/gn/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-i686/gn/firefox-62.0b5.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "cc8f2acbd0830430192c14a994eb0a47a6f0366e2bedab3fc43e2590e208440afecdda67e0571779b7003d2f800f1705d3a2851fe1f5c9d0b08eb855b09d5154"; + sha512 = "a31daaed68fdd58918c11771e82d564964cf39392c4cfc7980d6d56ec00a9870a7366ac59efde3dd6995527751427ff9744e7679a146439f31f0db91c14dbf09"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/gu-IN/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-i686/gu-IN/firefox-62.0b5.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "eff0f28add6f701db024d6319c11a95d6d82437cd42a2b1fb608325d6198301af361cd02c77b807f894adca8e3c418ab2bd6473b2a9be7a6a038d147655f3d00"; + sha512 = "a8463e59ae4d5714ef69519c5f79a4ee482c03b4a6687dacbe0e04b835905ed97d270b8409bd95839742d24c2e7355d4378fc2ec76aa42684f1f4b2d48f64341"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/he/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-i686/he/firefox-62.0b5.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "6191a8070cf7327e2cecc4433744f43a173daaa882a0fc2b440d9239af8e2e0a579b9c3b6da608fa0951000f527adf408e43e529a09fea4f232adf44f1fd1afb"; + sha512 = "a39296ba516795d6a2d1c422279da9cc6b92dd53fbffd843a6eaf2e759005992bc1e11b67642245c77be5993316d8958a90bcc1f9bcbc5c0e2b33f3fa29aabdf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/hi-IN/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-i686/hi-IN/firefox-62.0b5.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "3ef5346c74bcb81345aebb4be162f046392d84792a5024ce438a460d8fd147082a46e38e97b24c99567d880ebe4f4e8b84c9a83186bcc9f36333aa2ee26b1192"; + sha512 = "371ceefe2572551f20c7f6f5c06efeeef31f46c794910d368de82b7a676af0bc7971ea8b1fd6bca74f2dc72ef494b08e245efbebf5673d6cfc26b32ef55329fc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/hr/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-i686/hr/firefox-62.0b5.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "3550f03d1bcf399664d6a53fb932c5d1eb7e6de9345055071f14e65c7672f767d58983bcb0b95c77ba02a45d734f3d6bf65b720edfa6f441146765ebdebc6201"; + sha512 = "a98e8a7bfbad650fe434c448dc224bc128e70479e5c180558204b7353a5ea21ccb4b81c640d33a98c62904ec2394c26102b273482b24223d6140805113e30294"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/hsb/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-i686/hsb/firefox-62.0b5.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "2048278924a2d413c1807a15e937933cd76a02b8daf56ed44b89ec789cfab5d0ac4d666b06ba282350b17f96ff72755b4e52f49bc4fdb50ece4ff78ddc6c8833"; + sha512 = "1a161b5ca65ebad6a930595ec69076a8dc5038781d3fdc1094ac3e0a3ccc2ecc7bd070539a123128cadb68baedcbedfde36a4adbb2b9fcb1b6f2e2e7ef9bc82d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/hu/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-i686/hu/firefox-62.0b5.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "5ed4bf6277af178fb7c92c6b1c915896c02b35581506da5ef5048289199b501e690f44b5f82f857d8ab4a9ce737d36fcf761437f80f1a6933a934fa746c5a5ef"; + sha512 = "c9077b9bbb6fd5564ee3bf72855dbe0ec9bd3494c8c6b442cd1dc19c6b7e3ee1c3a4eac8d7e4305a189b1052b8609425717199e46b350fc327de18776aacd6d2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/hy-AM/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-i686/hy-AM/firefox-62.0b5.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "97170265155cd43aecae59534d8876748a64ee4ac336037f60202925dc8ed84c3b1d0dd49bb278d4f3f20e1e1b87158270d710346ed16d2839a9d32fd6f0b064"; + sha512 = "6ab89ee2608ab713dee4b8ceeddd990d3a0c91e8e816368ee0eddc501828b9ad19b61c0444a740c77c2792c764a5006489459f85aaeae6ab21b9f5f02a02b15e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/ia/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-i686/ia/firefox-62.0b5.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha512 = "e0b22f7c2687368f8255c050750c017edfea66cfdef8ef0f37d0d17a4f700498ddb6d567cee655292cff74be204023927f85c5a709ae0f32bb919d751d258538"; + sha512 = "f95a0d496cdb7db18531330c1e41d9c4cd00aea8fc40eac5542ea6b8619e8db753ab5cf87cce0b9d91b757e0034ca1c9f344bc2b1de8b74148a5835e60eeaba2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/id/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-i686/id/firefox-62.0b5.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "b430ee23b6a5b26b218e8d23622778b0bcc70d562188018900bdd14cb66f25114448ea263772c9a38d6db2c1a97b89ba69b1d9d855c1fd9d737d6626e19e46cb"; + sha512 = "1e1abcbeb523fc22f7b6afcb8d6802da5d6d8dc02161fea1006718120ed9dd8887fec59a93fc19208fa577c99c2465f9b817d721f00961c181842ca70fd6f26f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/is/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-i686/is/firefox-62.0b5.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "88670e161184ea78f1438bf56f66181956a18e31eb16735cdef1c2024d59fff3d0fc257c691249a1d93e96321ef80601af17733b347bdfa485945b4d4f41992b"; + sha512 = "ee32590bef3c6fd34e63f520c40c365d243cfb66ff6e240a25b4b7dbf4c8a407ce3b01c922057c4b1120d324fb79a5430bafc7d6b3005c009a59d3dae7aaaf22"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/it/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-i686/it/firefox-62.0b5.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "4bcc1492d278b3d7184ca2ddd494e31ae0689f7edf198d75e54d3c78fdd3f9a3f2a1839efaae2838ecb6f10bfd63348a4ef4a742f9f256a22f10d1049d50e244"; + sha512 = "df15056b7b96748634e529f5f5ac29f12f7d1bca511d0d5639b3c23591b1937e46ea25419e358624380874496c3142c107cd4a270ae53f352eb797627fbbae9f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/ja/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-i686/ja/firefox-62.0b5.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "a3e1bc8b5d1939956639b5ee52b154b1a26bc7209db675b4d29bab67ca7f0dac925014ed10ca176bf6bb52b1749207a4dc2d504170c97b24a542cc95ba78c61f"; + sha512 = "4d9008e31aaf78bf2d29e2353907ba16f340fcb0747d6a646eac4bbe00a0dc8379a67e5c19d9a22bebc39fed0562e4e06150a555c2b22396d780e986ab06f4b7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/ka/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-i686/ka/firefox-62.0b5.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "13816a6488fb90c56f951d44db171c8b3142f366c4047edbe31c10e3f2834abf329c45b9b737f86107f0dc6f852e825e1978e7369fb5f10a51c578b520678148"; + sha512 = "e62dc5523199fbd363dfaa8321ec2d17ca1136eee1bc179d312d043069351c0afa6a46074e20a96d1ee561879b8a2525b4a779eba7a153e68172a2b3758aeabd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/kab/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-i686/kab/firefox-62.0b5.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "a5bf1a8f85876bdc2b289e1e9688c7b3dec6783167cb14d5049b04e11f4a3efa1ba885468ca84ec6f8109e5363dfc1f3688020459532290416595d4d92713b95"; + sha512 = "b58f94002b6cc11c1633cd3950224e1bd1c2f73469f7d7e93d3b6aee743b3f4ae31781fa53d43c75806d3e3709e775af026d4fad6c4b08a32347b885d79641d2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/kk/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-i686/kk/firefox-62.0b5.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "68401c28fa4389a98614a40963978bcab94b15d2d9ea4818b28b488d905e9b223c82e1f3aae9bcbe2dd7da6ffd9d3d20e10dbc3bb4ac7ba182e0b7833c074093"; + sha512 = "cb6a8350c1cad1c32d37118b339f49104f1bf5c6806896750fe9374d7a23df9bafe1b21a664b0c5c4807b96fc5416a4bb7cd38bc15e1745a923841b057a167af"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/km/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-i686/km/firefox-62.0b5.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "71a8d5c71839c48e3117bb93735eaf8d56fa6d762ed46cd9514e91a13bf968db9c88d8c8b225d9842a9e7726ab2658568df7392cb4c45f0d736f60d2ed9e6f8b"; + sha512 = "154966e45ca55715cf2d7658a9d7d8c1cb9eafcc5de7813c8f0e9dc1c996a2494ef8854477989ae44ff39591c775c3e553d77a0ed06556656fd51fba4454b811"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/kn/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-i686/kn/firefox-62.0b5.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "d7b4644db963ef737eec03981cf795dd279f49cf87893a0647c229ad55dad45c85a42462b6ea94fc44b40d145853a86b0dfd92094ea17c441f0f997800d8b5a9"; + sha512 = "94143ad1d867aefeb156daae687d35e4b680568cca872d74fe2e7e02c0a88e936aa7ec0168b8127cfd268842a2fedadd2fb8171dfda00b340396148332c5d1e6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/ko/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-i686/ko/firefox-62.0b5.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "9c63a2d88f1c6073a0322d4464ac801e70b16fc82eb9ff544e1593a9d1b3478b123724d323062661b548dc6351f42e5885e659bcae94b022e4a7a79edf93bec5"; + sha512 = "f5cd979ee6adceeb6b8883630005c1e59beecc7b98baaada13505b9a6002c84e20265e9468d2f635eb9516f79eab85f69010aeb3d220760823b14e74e43c4f3c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/lij/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-i686/lij/firefox-62.0b5.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "a47014e854a7902098354556c389dac98b8b58ad928f65d864e70f74f6da47b4c4a10d2383eb18cfc3970d2cedc958861a912982b3d648d60c0f24f3662b1cf6"; + sha512 = "b908f1ece00bcb4b7f79e10e51567d4b37d13473c9a3b8017d65da28d50cc76f0524408236bd0e611319958a8b24bbc8cfe98177bd67370f03d6453315313c56"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/lt/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-i686/lt/firefox-62.0b5.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "41d66d0786e84ec6b39016d96536d41a011d202d741d1322d025f43e50a7d47df9216afe859700c3d79e6a2d4e11297b4d0b11ba6ab9de7f303f07186a58b0b8"; + sha512 = "5e557357c56ff1f3e596f68367d5a65d7ffba91288153c1702f694c2817526de2e47dc31392206e9b0abfc2172de9fa8ed54379d4a6bc6a13f1312dc057c22ce"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/lv/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-i686/lv/firefox-62.0b5.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "e46264a45fc3b68a161558fd3f1ce16d0d2a50179109626b133ca398605f71fa09b51de54d5b4f063645b8b79d220a9b52dfa5cacf05f0eb4ab43677a17d5359"; + sha512 = "68b7004e70954da668bb203a4275c881195b06e649ff4d656cd4471d114fccd72ebc616305496917347d0377747ce8a7aaa1dbc17de7dd6a7431b652d1616ac0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/mai/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-i686/mai/firefox-62.0b5.tar.bz2"; locale = "mai"; arch = "linux-i686"; - sha512 = "fc43421d4976d4a5f9c9c86aa0ba3eae5adeb8244f49edcbf2b6e94acae2006b58931e26d2f627e02b9119e99a4e45216d48f3d687cdfff1f67b837115a14439"; + sha512 = "4d1144a7a847597b7af85716484679cc330f175543813da826eab2e402be84fe2e131762788dcf46d00ce39fd5a20158c92d5d23de86a91481cc136e1347282b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/mk/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-i686/mk/firefox-62.0b5.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "7dc4e4697e085af373f144efd50e9710ed83e9bb7d6415f7a1c2f5323555aa441bd1062893727aebb0002cea5a8856703e1f21d181349babe72c6b01b3e7b2c8"; + sha512 = "e3a4d7db9e2f597c03bea45e7df423b29028dc51468c3b65b5ebe1f24049557d5cad55b65013f3bf2c7444a4748a349002dbc4d578a296fab3fa81cee1ee03ce"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/ml/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-i686/ml/firefox-62.0b5.tar.bz2"; locale = "ml"; arch = "linux-i686"; - sha512 = "c0a584e609a230cc65203b4064e6cf88ebbd83884f6a6c4b6e09c677076e99256088c99a9d9ef2dc0ab918bcda10f679298edba3d4b713e8cff066a3bae86502"; + sha512 = "abc854907fac114b5aa65ce9764dd5bdcaef3911d262d9eae5c832d838ab19d23f1ab828f1b882ed6b40b67da784977d285e610b3bbf989814a8c94fa927771a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/mr/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-i686/mr/firefox-62.0b5.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "4c49e33fbb66025ab682196440277b78e4241c05573a383ca925f789ef5c049b58a366b7af121cefc8a6f10181273d3ce86c2a80a33955e5200822ae363dba40"; + sha512 = "a073ec7569255b1918f3f9693f3dd1165cf5766485b21a6d74124b73ab950435f2bf742ebffa85ce38dca124d7d1b4da70931003635dceeddd37f8c5630fe2b3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/ms/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-i686/ms/firefox-62.0b5.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "1b649a0ef49cdf869ce3836c4ef037882f9b66889af787aae28032b879b0e38ec86ac823276397903ba91c3b640d15644225b0418fe748d94bb1499b0c9409b7"; + sha512 = "54a9ba0f62b2c6ff35afd450850b0d94daaa9ffeba665ea1640a6d8fb91533dac73fa13c56408c055eec441f447e9a46080377eb2b5636356260ff4fa7b590d1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/my/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-i686/my/firefox-62.0b5.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "266b5e3e6c6c26bd9c82839716cd2d3eac168ff96960a406f24ffe4d3a9b8e7da72f68ec01df9d13577ac8c9a38354d30babbb3067c4ad6477cb0d63038c669a"; + sha512 = "6d3dcea8e8895b65e241ab618efb11c314c79e8f0eb762181ac5b0d634479e2bc4e2b6f4792386787bc8c20bcdb73ddc9d011a997ed656cd10d87313d8971fca"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/nb-NO/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-i686/nb-NO/firefox-62.0b5.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "9ed5567c8bd5e8bdc274ce55c03cf609911276b2c33bc58aaafe4f3828dd4d8c32c669337c747b1283ea0fcc7fa6813d9fc06c3b6384c2c1d6911d69456604d4"; + sha512 = "3a67052e39f64007316ee9e40eec75b8bfcee4b7edcf19e4822c3f72bf35d01e20785ae302b51e005d7ed765ee2c126fe0b04a2da39a12b57d19d94ef5aa911e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/ne-NP/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-i686/ne-NP/firefox-62.0b5.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha512 = "f98bb5236d175ee3b40e8cbcf2a92899fde9c35fd1528e6160876f9f541b9de8395af4043be8afbfc4070cd2ae9b1d85a3ef40883051615a6591564f47533776"; + sha512 = "7dc6de0899e346282a49be99b989bb721ff92b284f2317e31cb71670a6d3cd1bd7dbe9d25c3a304c18f2daee7aee0afb821be3871077cf45cbebd9bf7c66e402"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/nl/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-i686/nl/firefox-62.0b5.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "9af76a903df95d99d20cd9acc28badb1d39c2112844668993bc4ae9158221700ebc115dea198f8fb4afb7db59f6f855c7e1b8fe7ef15888072a4ee1bd6eb61d7"; + sha512 = "a4316319b85b748788e5035eb68aaa74768a7fd59ccea40b955645bbb5645bffe6576ec293493dd352db4ce6c93f698fded8812f70c491476064b721604f9ac4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/nn-NO/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-i686/nn-NO/firefox-62.0b5.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "d23038b982bda5a7f636e5ef012d8618072eb188d379d026488695c21698e6ac452340d1719dca89cd0c7487a14271339f36a716ffd08f23b4bf5dbbafc121aa"; + sha512 = "3849cfe2da2c922d32cff7b7af64f52ecb96368ffbb507b9a9d048220c5b91cb0d3f24a5a6b6ba67ef9b9884680145e9fd0211cbab41267b95a6df96907c2206"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/oc/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-i686/oc/firefox-62.0b5.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha512 = "cf5e95c8024d827ef3ab242f09d99789b1e074f4982d77ad13ff4f03ca060a4a1c597d9359a01afd20d465fa23605e77fd1ec9dda71159fa34c468cfec4462f4"; + sha512 = "2093346162ee3f5fb634167ace6f3112651e361f10f061c4c68fa7d75d0e8e8f891828e90219e3b67919ec156e268947a6008ae6ccf44a427ec0fc2de342adc9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/or/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-i686/or/firefox-62.0b5.tar.bz2"; locale = "or"; arch = "linux-i686"; - sha512 = "ae80ab15d337a5b0f4e7b56f0dafe32689ae5a6bef1a2a3b0dfbb022e12452c5ebf54d39395e67a10daa3d29db7f74e199080a39978960c4b4e5ebcfd2ac762d"; + sha512 = "878e51de65ab0d6aa20ecc46da96c7dddae1df6c44f6412664fa1e407b0f9d2319f12fd0112ad9e8ba2c8aaa0d87fa125387e580036de1639ccc306031c9fee8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/pa-IN/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-i686/pa-IN/firefox-62.0b5.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "071a1bcf9ae7da98577c561264820b8f31fb81b2778f96a7e5707b175314b0d124b3ab484d057b90eb39897314e80c8ecaf95605f984a355e5c0b73fad9714a1"; + sha512 = "e9f706432819eec95eb2a81dbad5903c8b8e56fbeb35bf50a74834ef4b2fad804103a23a7b2f5cb14bbf765275e6a1278a236912d6538f5810d72b30aac5c4cd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/pl/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-i686/pl/firefox-62.0b5.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "2b9c7af72db100e0acd9023855e1ef14aa13972e6a46eac0829831bcdbd6e059c5bf8f75c70f3e4687b243bd60bd9b8617c80cc036021926459092495c294728"; + sha512 = "54ca6d8403402e30b188a12db667a866d24e45928a8f986860f20a16e524a177c960887f38d24f2ebd4be03bfb73964ea16e4027455b7afff3c9d30a7ee31a63"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/pt-BR/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-i686/pt-BR/firefox-62.0b5.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "6b2efbf5c74352f903035105db81bdf17a3ea2680711d7efd780801215d1f772b3e031162ec296c411dcea63b0b899ac8be51001049b6c4acf607a27a94823b6"; + sha512 = "f17e40eac8f2066f4c35f9c32c3a792cd9c7cda77327938fb85be12b3e69f3ee2229da68c28f799d7a6db3b765c23822b0039d9efb50ec6bc23e09808ce34490"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/pt-PT/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-i686/pt-PT/firefox-62.0b5.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "3e666c69a66c5e341140cdf00dbf5e2b13d90af067e79fb242b2e34b2bba3849131cbd408c4822945a516965e4c09c55f2283bf2cd83722d4307f0445e2588d6"; + sha512 = "b3fc9be0f29e71403cf16261a223472757c31163bebaa8f3099b66b9f87c5de9f57a7d6f405ab168f539eec3424e3baaa57b723e6a54d849b1b23c63a00dd193"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/rm/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-i686/rm/firefox-62.0b5.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "d46528605791a92de03bd6db6e7cc00b9d6966affc5523266f9baa0750ff052b892e4dcea852cb4c5e6546a5d8cb6a3bc4b01102ee81e12df7030dbdd7d2b9ff"; + sha512 = "95c1cee477cd756fe09fdc30e598a0b12f814a92f8f1b367ab7aebfa2148110927dff2f9394ea4b7e67edb78743954ba5966528bdc84fb20ec3049b6c77cdef7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/ro/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-i686/ro/firefox-62.0b5.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "8584be2c838c721046fccee9580ff1fd251fa7b0bb0284e8e2f0d65ff1349312de6ebf6072e4782b57d80173f6c526df773c68d0a5f9472baa88394e9cf84c4e"; + sha512 = "67e16913f5336294dde9272e2530ba23b38aa619bc19863461a02668f269f8854178c3b9be3dce5a2afbc4b2f114bf1dd0b8498e418c693142efac66e7f76b27"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/ru/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-i686/ru/firefox-62.0b5.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "150c7ecd29983f9ebde9d85d7ea0cb3dbb552945bb7dc4a90d103207ee868c3809c8ce2a77f5cbb093b9cda913abd70afce78c9547a57bc6321ae8694b1c5874"; + sha512 = "43a255e83eb08351b944a68e8d0eda806240e8fd01f675700c4666767a90cf0b43c78c993271e11e2676c032f3f64f33c78653fbf5cf0e7e926cc3a3e9dc4131"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/si/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-i686/si/firefox-62.0b5.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "fe49558596b3ed3b8e922145f3d55de6d47854137fb2992769d7a4f1b718e4b6c7c4ccc0f9b99f53d6474111e055947f8f9f52aea248217e207f7ac022746da4"; + sha512 = "3039342319a2f2602cc7db3641dd50efee9a154016fa4b3ef026e1eeb618b4cca99dffc91d1b9834a766f4ef932418e9e3a9d08eb98c2bf0f1e963211466ea8a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/sk/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-i686/sk/firefox-62.0b5.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "48021f8552165f9ade8779e967469f5d8db761c90aa3535f6f073f9d00de378a991d8705a46e8a8e5071ddfe1ca64915530f131e80028e29b706f6d41c0b7889"; + sha512 = "e99a7e05ede401f353e58d2a47035f03f6b83de4a137a345ddce5f10f5e54d142a12cd89c3325033368609ce1083146a0963b1902c72f8e43a3d647b910c640e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/sl/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-i686/sl/firefox-62.0b5.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "74c14db1244825e0914c0719e9d8617e760da562600df1eec65ec8853a3a6a2c0516f8286d81933946abb1803f3807fbe21a295442edabf49c174611e440562b"; + sha512 = "460324d4726c0c13e64f6863cc89ec308d895d22abea6573af054eae7992fd3b39410e294fd85d1e2dcb6eaae197b8692f10c0a2d4f1cce394b9efa072c3d9bf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/son/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-i686/son/firefox-62.0b5.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "486d10059b08aed3473b0d13bdf2490ac8299fd47295169ac631990d6ea4947859ede13aa86ed201343be9e40ef4e63a40b0a96947ae0f5fc0ab23b666f4b16d"; + sha512 = "6bb38d0ed02ceeb3e568bb04fda813ebe10c0ca263470c434ebed5164db8c17bf6f2ebb25f21f6b4a2f561a49e1bfe63d050f17d2914d99d763e7cc709df5e27"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/sq/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-i686/sq/firefox-62.0b5.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "75d6265c3eed948d4b5ea8168a1ba992655be83550f0fd4f3ed1d35e25aeaf09cc168dd2dbc1158e08b99bbdcc3f032e75f1675c35cdd37a683e9fb24248b5df"; + sha512 = "5d174b70f9eabbe9d4178e19fae50a4e226f88d2e60e32a1b67d7613d2e38030ad9e65a87721d45a28740cea1cedbe86f3a08f6ae42ba84227c562ea6d5bf83a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/sr/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-i686/sr/firefox-62.0b5.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "755e742490df25bd5c69a40bcaccb58637684b549092bab195cc524d89747b62d424ee693579cfdb2ab8a125070c3f26cafe3d919290fa9a8e4cc2bb71fd9297"; + sha512 = "76755d0d9ac08c29d466015d96783cadecfb341c858b7a69f72f247c0fa72ed21f43f69a91088a1c1e3c9733d30d0defb85a45cfd97d1cd01c33e81290922f78"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/sv-SE/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-i686/sv-SE/firefox-62.0b5.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "aa6a119f69e4c4e6ce3d7eb45c3d21019fd3e29fd8d4f3a9fc12e939f230646cccbb1dee54a0528cbecb48db4bed42a1996a0e1757a1d18ff647b5de1b203379"; + sha512 = "8484cb13ba1c927037bd30fcaa87fa70807e2abb5e0d81761a333bc9e677a11dd29dfa4ae41e5f9011d5a86f601d65ddede9355da153131c8acb1edf3311b375"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/ta/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-i686/ta/firefox-62.0b5.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "1b034a6959630fc7f5fd32d4288d43d374338c38371e2357702cf0e1055ea513aadb0dfab819edcb751c98e9bff993d59a571eb86cf493584451ec4e8e66aa03"; + sha512 = "5340920a1f96b0c8b7bc4f6986f280da92791c3294ffb9afaa4c16332a94e6a420b69d66b8be7c85ff9dce704c187a6a343eead24721b01aa4552c00888f440a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/te/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-i686/te/firefox-62.0b5.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "294f92edf25d2e89661f25b1fd2b750649c0b6f965ad1fcfeee2cdf61d3781e1ae2a11b6731a77e7fb2ccb399cef5a045d5a707f4a84713cf4b5cf23faa747bc"; + sha512 = "d8683c84a59448dc8b5cf40048463a71ab976df27083e662a8f7e1f783abf58f632561f2550ec45802c0fba0d4b5722b51a4f4bde6b614d9fea34a49e7bd4cc1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/th/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-i686/th/firefox-62.0b5.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "1d5b15208d4b3d59241d244334328cdda547772aca5de8652bf4710222c9ecbedd590280d2632dacfb6e28e7803556d652da6539688d41d7c8299daa480ae81e"; + sha512 = "2e2e3a0cd7f4533f600533f9fa890ae6f0db0530993da73e518694db7fd1e03e1641cc85a2bf78c070d79c879be750290fa787741824f5bd6670389c21d75e2a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/tr/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-i686/tr/firefox-62.0b5.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "c155c13c7a8964dc163214bc6ade3f0966b349766d072d4846f2228b761ac221dca0d79961e8ea5c8afe0a4ebb73e5ec65bc350a3b1a1905ae289ab7f378d88e"; + sha512 = "1fd8ae3ea74ed7f2364b6da1cc4a8ef47ee70370c225cb74d362567d9317caecad2ff1d0ea6f9c14bb5399e5680cafc974b48d36e8e27171ace9366b3749f9d8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/uk/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-i686/uk/firefox-62.0b5.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "bd6084b296f308f04708b301dbc46ec7cdf3e95249b3ec8f4f64b129df1e979721f3796cfabaacc56e124312b86dfdbe19161928b8783a731e59f6b29079c12e"; + sha512 = "061a947d3f6bc2c827d245c073585cd681c1f9836d502ea357a4bf14c28e911166bfb08d113ff502f0953aa8361aa6b47c73a5d13c818831e5f1aa16236288de"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/ur/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-i686/ur/firefox-62.0b5.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "0b3d5447fcfbb3cfab741848fc64f1dcc013bc1a13dbabc880c59721803e62f0dc6605db15b1cd6f9c150085934674d364974f947d37c4c1208e98919a0c4044"; + sha512 = "c121465ab43fa2c2ce2bef6fc2f1f34264c359bc253147a051cd8ea19f0c8a8ec1249fdbaef87ba7f28d8646250eca8f58e00485416a5cb8d0a19a616b2cc649"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/uz/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-i686/uz/firefox-62.0b5.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "b5d91159caa13ed34e51206c3127a29d1b7b7f1e07090eeeb25d21dbce4fbc86cae16dfed9f5f1e8b59ee75e9b15460ed89669501d466b5992a9b731e28ae04e"; + sha512 = "00523b23af78b586b3c3175042278dc09bd406a072b190e476e4deb8b53900aa7b6119996bca6c66a47cb95b9cef7466c6597e1953658b7838ead893c2d37d67"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/vi/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-i686/vi/firefox-62.0b5.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "9ec16c42df70d29b879d0bf38a0e3173a4c5e5b45231d5a04ea111ab347c91cfebdb68c4fa960710cb37e4ea439d48b843e5823171e3bb094ffcfcc53cd50aca"; + sha512 = "54f562a1cb09c31b882523d900f6ce0a77d3f59280a681a104c854f3b70de7a27632ad10aabb22faa4bec5d53d0e40d69ca97753ac8b353989e91ee5215bea8b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/xh/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-i686/xh/firefox-62.0b5.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "b2c5fa48411cd13dcbccdc747ca0d73458e1b067aedb57aba7a2bed66a46cf8e6466d6b7e5e49f919cb30190daef1d82dd60efa9ffa6d80ca63d7d0998c390f0"; + sha512 = "ae5ed63599aaf525d3ecf925b297496c280ef8c1fa931270460a021a63d0689f3d323863c22e6b7de271b2f813a985e48344c379985ec5e9309add3abe1e37df"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/zh-CN/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-i686/zh-CN/firefox-62.0b5.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "90b830a074e653bab78fcfd4863090af1225a99fce271f8427421d2a70ab04d3c58a0ca367530f2e34b52034d662ccc219b53f0c4793b906be4049d23fb91b9d"; + sha512 = "1977ad5c9b873ade6f5cfffea072db4a16fe6829d1266dd2b444e9c51d8caf48e1868cd317f3add8c095ea04457561cdcf693cf200c6dcd96da256a2272647ce"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/zh-TW/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b5/linux-i686/zh-TW/firefox-62.0b5.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "454fbf27e514638892061d78ce85290e66569e411f5f38f49260b7e14704ceb9cf1d8ddbe3bed524b92dab07c06b1a8527e373ad6e2233c6761f672cd3c57a38"; + sha512 = "0bdff2d39f380daa3b318c0a2eac7cc7da09e50e1787bdd1767d5162bfe076fec32434cf10ca349fa57edccaa765cd55ad8cb98673b1effe846118886eb08097"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index f49bfa963189..2c11fb27232f 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -145,16 +145,16 @@ in rec { tor-browser-7-5 = common (rec { pname = "tor-browser"; - version = "7.5.5"; + version = "7.5.6"; isTorBrowserLike = true; # FIXME: fetchFromGitHub is not ideal, unpacked source is >900Mb src = fetchFromGitHub { owner = "SLNOS"; repo = "tor-browser"; - # branch "tor-browser-52.8.1esr-7.5-1-slnos" - rev = "08e246847f0ccbee42f61d9449344d461c886cf1"; - sha256 = "023k7427g2hqkpdsw1h384djlyy6jyidpssrrwzbs3qv4s13slah"; + # branch "tor-browser-52.9.0esr-7.5-2-slnos" + rev = "95bb92d552876a1f4260edf68fda5faa3eb36ad8"; + sha256 = "1ykn3yg4s36g2cpzxbz7s995c33ij8kgyvghx38z4i8siaqxdddy"; }; patches = nixpkgsPatches; diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix index c2f27a0f7fc3..4e0f362360df 100644 --- a/pkgs/applications/networking/browsers/qutebrowser/default.nix +++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix @@ -12,11 +12,11 @@ assert withMediaPlayback -> gst_all_1 != null; let pdfjs = stdenv.mkDerivation rec { name = "pdfjs-${version}"; - version = "1.7.225"; + version = "1.10.100"; src = fetchzip { - url = "https://github.com/mozilla/pdf.js/releases/download/v${version}/${name}-dist.zip"; - sha256 = "0bsmbz7bbh0zpd70dlhss4fjdw7zq356091wld9s7kxnb2rixqd8"; + url = "https://github.com/mozilla/pdf.js/releases/download/${version}/${name}-dist.zip"; + sha256 = "04df4cf6i6chnggfjn6m1z9vb89f01a0l9fj5rk21yr9iirq9rkq"; stripRoot = false; }; @@ -27,15 +27,13 @@ let }; in python3Packages.buildPythonApplication rec { - name = "qutebrowser-${version}${versionPostfix}"; - namePrefix = ""; - version = "1.3.3"; - versionPostfix = ""; + pname = "qutebrowser"; + version = "1.4.0"; # the release tarballs are different from the git checkout! src = fetchurl { - url = "https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/${name}.tar.gz"; - sha256 = "01lrbkddm4wagx4hq6cz5qwvb8q8nlz0xa35k317gvr3pmnvgjk8"; + url = "https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/${pname}-${version}.tar.gz"; + sha256 = "169xgwizw9kpdg0xll5jrxkb1k107cl4j1zx3jhmpsfbgykcnxpz"; }; # Needs tox diff --git a/pkgs/applications/networking/cluster/minikube/default.nix b/pkgs/applications/networking/cluster/minikube/default.nix index 217998bbf82a..7301e45a41f8 100644 --- a/pkgs/applications/networking/cluster/minikube/default.nix +++ b/pkgs/applications/networking/cluster/minikube/default.nix @@ -14,7 +14,7 @@ let in buildGoPackage rec { pname = "minikube"; name = "${pname}-${version}"; - version = "0.27.0"; + version = "0.28.0"; goPackagePath = "k8s.io/minikube"; @@ -22,7 +22,7 @@ in buildGoPackage rec { owner = "kubernetes"; repo = "minikube"; rev = "v${version}"; - sha256 = "00gj8x5p0vxwy0y0g5nnddmq049h7zxvhb73lb4gii5mghr9mkws"; + sha256 = "1gm61w0f33mdax6im42wckfmjgdr5pziiaw2n7yj6jfjrxjnmzmf"; }; buildInputs = [ go-bindata makeWrapper gpgme ] ++ stdenv.lib.optional hostPlatform.isDarwin vmnet; diff --git a/pkgs/applications/networking/instant-messengers/hipchat/default.nix b/pkgs/applications/networking/instant-messengers/hipchat/default.nix index dd1ce2264d5f..ac00fb7bbd35 100644 --- a/pkgs/applications/networking/instant-messengers/hipchat/default.nix +++ b/pkgs/applications/networking/instant-messengers/hipchat/default.nix @@ -3,8 +3,7 @@ , libGL, xcbutilkeysyms, xdg_utils, libtool }: let - - version = "4.30.4.1672"; + version = "4.30.5.1676"; rpath = stdenv.lib.makeLibraryPath [ xdg_utils @@ -39,22 +38,13 @@ let systemd libGL ] + ":${stdenv.cc.cc.lib}/lib64"; - - src = - if stdenv.system == "x86_64-linux" then - fetchurl { - url = "https://atlassian.artifactoryonline.com/atlassian/hipchat-apt-client/pool/HipChat4-${version}-Linux.deb"; - sha256 = "1xrwndhbyhcmjcg8h1ib8lp1g51f7jxdhc6p7776zmhlfw94n3rx"; - } - else - throw "HipChat is not supported on ${stdenv.system}"; - -in - -stdenv.mkDerivation { +in stdenv.mkDerivation { name = "hipchat-${version}"; - inherit src; + src = fetchurl { + url = "https://atlassian.artifactoryonline.com/atlassian/hipchat-apt-client/pool/HipChat4-${version}-Linux.deb"; + sha256 = "1fmvarq7zf1cnah2d1l7rxhbiw3dmjcxsldys5is63y204hdh04y"; + }; buildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix index 87dddff4bd05..4e26d7683e69 100644 --- a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix @@ -39,7 +39,7 @@ let xorg.libxcb ]; - version = "3.0.2816"; + version = "3.2.2840"; plat = { "i686-linux" = "i386"; @@ -47,8 +47,8 @@ let }.${stdenv.system}; sha256 = { - "i686-linux" = "1ds807j1b8dk9hrnzbg4g9mvn44abw24pxrqns9ai62mh3hvi65p"; - "x86_64-linux" = "13pyyp2c8q0v0ni2hzh2jnbd3i96q68314glbmy4kyh7vm9427lc"; + "i686-linux" = "071ddh2d8wmiybwafwyb97962zj358l0fq7g2r44231653sgybvq"; + "x86_64-linux" = "0qp9ms94smnm7k47b0n0jdzvnm1b7gj25hyinsfc6lghrb6jqw3r"; }.${stdenv.system}; in diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix index 2f08e8af6c90..98beced062a4 100644 --- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix +++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix @@ -1,16 +1,22 @@ { stdenv, fetchurl, system, makeWrapper, makeDesktopItem, autoPatchelfHook -, dbus, glib, libGL, libX11, libXfixes, libuuid, libxcb, procps -, qtbase, qtdeclarative, qtlocation, qtquickcontrols2, qtscript -, qtwebchannel, qtwebengine +# Dynamic libraries +, dbus, glib, libGL, libX11, libXfixes, libuuid, libxcb, qtbase, qtdeclarative +, qtlocation, qtquickcontrols2, qtscript, qtwebchannel, qtwebengine +# Runtime +, libjpeg_turbo, pciutils, procps +, pulseaudioSupport ? true, libpulseaudio ? null }: +assert pulseaudioSupport -> libpulseaudio != null; + let + inherit (stdenv.lib) concatStringsSep makeBinPath optional optionalString; - version = "2.2.128100.0627"; + version = "2.2.128200.0702"; srcs = { x86_64-linux = fetchurl { url = "https://zoom.us/client/${version}/zoom_x86_64.tar.xz"; - sha256 = "1x98zhs75c22x58zj4vzk8gb9yr7a9hfkbiqhjp5jrvccgz6ncin"; + sha256 = "0n9kyj94bj35gbpwiz4kq7hc8pwfqwnfqf003g4c8gx5pda3g56w"; }; }; @@ -24,11 +30,17 @@ in stdenv.mkDerivation { buildInputs = [ dbus glib libGL libX11 libXfixes libuuid libxcb qtbase qtdeclarative qtlocation qtquickcontrols2 qtscript qtwebchannel qtwebengine + libjpeg_turbo pciutils procps ]; + runtimeDependencies = optional pulseaudioSupport libpulseaudio; + + # Don't remove runtimeDependencies from RPATH via patchelf --shrink-rpath + dontPatchELF = true; + installPhase = let - files = stdenv.lib.concatStringsSep " " [ + files = concatStringsSep " " [ "*.pcm" "*.png" "ZXMPPROOT.cer" @@ -52,8 +64,13 @@ in stdenv.mkDerivation { cp -ar ${files} $packagePath + # TODO Patch this somehow; tries to dlopen './libturbojpeg.so' from cwd + ln -s $(readlink -e "${libjpeg_turbo.out}/lib/libturbojpeg.so") $packagePath/libturbojpeg.so + makeWrapper $packagePath/zoom $out/bin/zoom-us \ - --prefix PATH : "${procps}/bin" + --prefix PATH : "${makeBinPath [ pciutils procps ]}" \ + --set QSG_INFO 1 \ + --run "cd $packagePath" runHook postInstall ''; diff --git a/pkgs/applications/networking/newsreaders/quiterss/0001-Revert-change-WebKit-602.1-c2f.patch b/pkgs/applications/networking/newsreaders/quiterss/0001-Revert-change-WebKit-602.1-c2f.patch deleted file mode 100644 index d9b994d9b37c..000000000000 --- a/pkgs/applications/networking/newsreaders/quiterss/0001-Revert-change-WebKit-602.1-c2f.patch +++ /dev/null @@ -1,157 +0,0 @@ -Date: Wed, 6 Jun 2018 20:46:38 +0200 - -This reverts commit eceda92a16f1f4e5c5b584acd745398571df2bd6. ---- - src/application/mainapplication.cpp | 3 --- - src/application/mainwindow.cpp | 11 ----------- - src/application/mainwindow.h | 2 -- - src/newstabwidget.cpp | 6 +----- - src/newstabwidget.h | 2 +- - src/optionsdialog.cpp | 2 -- - src/webview/webpage.cpp | 13 +------------ - src/webview/webpage.h | 3 --- - 8 files changed, 3 insertions(+), 39 deletions(-) - -diff --git a/src/application/mainapplication.cpp b/src/application/mainapplication.cpp -index e93ec9c1..a5913bdf 100644 ---- a/src/application/mainapplication.cpp -+++ b/src/application/mainapplication.cpp -@@ -566,9 +566,6 @@ void MainApplication::c2fLoadSettings() - settings.beginGroup("ClickToFlash"); - c2fWhitelist_ = settings.value("whitelist", QStringList()).toStringList(); - c2fEnabled_ = settings.value("enabled", true).toBool(); --#if QT_VERSION >= 0x050900 -- c2fEnabled_ = false; --#endif - settings.endGroup(); - } - -diff --git a/src/application/mainwindow.cpp b/src/application/mainwindow.cpp -index 337a7c4e..42255d2c 100644 ---- a/src/application/mainwindow.cpp -+++ b/src/application/mainwindow.cpp -@@ -8140,14 +8140,3 @@ void MainWindow::createBackup() - QFile::copy(settings.fileName(), backupFileName); - } - } -- --void MainWindow::webViewFullScreen(bool on) --{ -- setFullScreen(); -- feedsWidget_->setVisible(!on); -- pushButtonNull_->setVisible(!on); -- tabBarWidget_->setVisible(!on); -- currentNewsTab->newsWidget_->setVisible(!on); -- pushButtonNull_->setVisible(!on); -- statusBar()->setVisible(!on); --} -diff --git a/src/application/mainwindow.h b/src/application/mainwindow.h -index 995f96dc..93b75c11 100644 ---- a/src/application/mainwindow.h -+++ b/src/application/mainwindow.h -@@ -271,8 +271,6 @@ public: - - AdBlockIcon *adBlockIcon() { return adblockIcon_; } - -- void webViewFullScreen(bool on); -- - public slots: - void restoreFeedsOnStartUp(); - void addFeed(); -diff --git a/src/newstabwidget.cpp b/src/newstabwidget.cpp -index 77d74d3b..c6c130f7 100644 ---- a/src/newstabwidget.cpp -+++ b/src/newstabwidget.cpp -@@ -1842,12 +1842,8 @@ void NewsTabWidget::loadNewspaper(int refresh) - *----------------------------------------------------------------------------*/ - void NewsTabWidget::slotSetHtmlWebView(const QString &html, const QUrl &baseUrl) - { -- QUrl url = baseUrl; --#if QT_VERSION >= 0x050900 -- url.setScheme(""); --#endif - webView_->history()->setMaximumItemCount(0); -- webView_->setHtml(html, url); -+ webView_->setHtml(html, baseUrl); - webView_->history()->setMaximumItemCount(100); - } - -diff --git a/src/newstabwidget.h b/src/newstabwidget.h -index 7f5c3957..8d1266ac 100644 ---- a/src/newstabwidget.h -+++ b/src/newstabwidget.h -@@ -127,7 +127,6 @@ public: - QToolBar *newsToolBar_; - QSplitter *newsTabWidgetSplitter_; - -- QWidget *newsWidget_; - WebView *webView_; - QToolBar *webToolBar_; - LocationBar *locationBar_; -@@ -199,6 +198,7 @@ private: - - MainWindow *mainWindow_; - QSqlDatabase db_; -+ QWidget *newsWidget_; - - FeedsModel *feedsModel_; - FeedsProxyModel *feedsProxyModel_; -diff --git a/src/optionsdialog.cpp b/src/optionsdialog.cpp -index 73136dec..c082bc30 100644 ---- a/src/optionsdialog.cpp -+++ b/src/optionsdialog.cpp -@@ -741,9 +741,7 @@ void OptionsDialog::createBrowserWidget() - browserWidget_ = new QTabWidget(); - browserWidget_->addTab(generalBrowserWidget, tr("General")); - browserWidget_->addTab(historyBrowserWidget_, tr("History")); --#if QT_VERSION < 0x050900 - browserWidget_->addTab(click2FlashWidget_, tr("Click to Flash")); --#endif - browserWidget_->addTab(downloadsWidget, tr("Downloads")); - } - -diff --git a/src/webview/webpage.cpp b/src/webview/webpage.cpp -index 6401ec87..0254a167 100644 ---- a/src/webview/webpage.cpp -+++ b/src/webview/webpage.cpp -@@ -51,10 +51,7 @@ WebPage::WebPage(QObject *parent) - this, SLOT(downloadRequested(QNetworkRequest))); - connect(this, SIGNAL(printRequested(QWebFrame*)), - mainApp->mainWindow(), SLOT(slotPrint(QWebFrame*))); --#if QT_VERSION >= 0x050900 -- connect(this, SIGNAL(fullScreenRequested(QWebFullScreenRequest)), -- this, SLOT(slotFullScreenRequested(QWebFullScreenRequest))); --#endif -+ - livingPages_.append(this); - } - -@@ -286,11 +283,3 @@ void WebPage::cleanBlockedObjects() - mainFrame()->scrollToAnchor(mainFrame()->url().fragment()); - } - } -- --#if QT_VERSION >= 0x050900 --void WebPage::slotFullScreenRequested(QWebFullScreenRequest fullScreenRequest) --{ -- fullScreenRequest.accept(); -- mainApp->mainWindow()->webViewFullScreen(fullScreenRequest.toggleOn()); --} --#endif -diff --git a/src/webview/webpage.h b/src/webview/webpage.h -index 5c376c50..91e72758 100644 ---- a/src/webview/webpage.h -+++ b/src/webview/webpage.h -@@ -68,9 +68,6 @@ private slots: - void downloadRequested(const QNetworkRequest &request); - void cleanBlockedObjects(); - void urlChanged(const QUrl &url); --#if QT_VERSION >= 0x050900 -- void slotFullScreenRequested(QWebFullScreenRequest fullScreenRequest); --#endif - - private: - NetworkManagerProxy *networkManagerProxy_; --- -2.16.2 - diff --git a/pkgs/applications/networking/newsreaders/quiterss/default.nix b/pkgs/applications/networking/newsreaders/quiterss/default.nix index 6bd42183d038..6df0817070c2 100644 --- a/pkgs/applications/networking/newsreaders/quiterss/default.nix +++ b/pkgs/applications/networking/newsreaders/quiterss/default.nix @@ -4,20 +4,15 @@ stdenv.mkDerivation rec { name = "quiterss-${version}"; - version = "0.18.11"; + version = "0.18.12"; src = fetchFromGitHub { owner = "QuiteRSS"; repo = "quiterss"; rev = "${version}"; - sha256 = "0n9byhibi2qpgrb7x08knvqnmyn5c7vm24cl6y3zcvz52pz8y2yc"; + sha256 = "0xav9qr8n6310636nfbgx4iix65fs3ya5rz2isxsf38bkjm7r3pa"; }; - # Revert this commit until qt5.qtwebkit (currently an older version) from - # nixpkgs supports it (the commit states WebKit 602.1 while the current - # version in nixos-unstable is 538.1) - patches = [ ./0001-Revert-change-WebKit-602.1-c2f.patch ]; - nativeBuildInputs = [ qmake pkgconfig ]; buildInputs = [ qtbase qttools qtwebkit sqlite.dev ]; diff --git a/pkgs/applications/networking/remote/xrdp/default.nix b/pkgs/applications/networking/remote/xrdp/default.nix index ed1abfcba99d..3061467c82bd 100644 --- a/pkgs/applications/networking/remote/xrdp/default.nix +++ b/pkgs/applications/networking/remote/xrdp/default.nix @@ -3,13 +3,13 @@ let xorgxrdp = stdenv.mkDerivation rec { name = "xorgxrdp-${version}"; - version = "0.2.5"; + version = "0.2.7"; src = fetchFromGitHub { owner = "neutrinolabs"; repo = "xorgxrdp"; rev = "v${version}"; - sha256 = "05ix0bvbgpg0l0f6pyxp64a4785yv16dxf522y7k84b0rag4bxr7"; + sha256 = "15idwgcjgwa9in8y1bblpj67y7w0bfngc2sa0hd9hn0dinrlifrk"; }; nativeBuildInputs = [ pkgconfig autoconf automake which libtool nasm ]; @@ -34,7 +34,7 @@ let }; xrdp = stdenv.mkDerivation rec { - version = "0.9.5"; + version = "0.9.7"; name = "xrdp-${version}"; src = fetchFromGitHub { @@ -42,7 +42,7 @@ let repo = "xrdp"; rev = "refs/heads/runtime-cfg-path-${version}"; # Fixes https://github.com/neutrinolabs/xrdp/issues/609; not a patch on top of the official repo because "xorgxrdp.configureFlags" above includes "xrdp.src" which must be patched already fetchSubmodules = true; - sha256 = "1sm994dic72zvxgwxw9z6an6050976nlnnn2my42pnzj9l5842d8"; + sha256 = "1dw2zl9zh6win1q0kxj08n9fawpcrs1krjh5978wp0jmq8sdbn7k"; }; nativeBuildInputs = [ pkgconfig autoconf automake which libtool nasm ]; diff --git a/pkgs/applications/networking/ssb/patchwork-classic/default.nix b/pkgs/applications/networking/ssb/patchwork-classic/default.nix index 361aac4f122c..1f8d0cba6d05 100644 --- a/pkgs/applications/networking/ssb/patchwork-classic/default.nix +++ b/pkgs/applications/networking/ssb/patchwork-classic/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { version = "2.12.0"; - name = "patchwork-clasic-${version}"; + name = "patchwork-classic-${version}"; src = fetchurl { url = "https://github.com/ssbc/patchwork-classic-electron/releases/download/v2.12.0/ssb-patchwork-electron_2.12.0_linux-amd64.deb"; diff --git a/pkgs/applications/office/zotero/default.nix b/pkgs/applications/office/zotero/default.nix index 2f9999ab856c..b070958b756b 100644 --- a/pkgs/applications/office/zotero/default.nix +++ b/pkgs/applications/office/zotero/default.nix @@ -34,6 +34,7 @@ fhsEnv = buildFHSUserEnv { targetPkgs = pkgs: with pkgs; with xorg; [ gtk3 dbus-glib libXt nss + libX11 ]; }; diff --git a/pkgs/applications/science/astronomy/stellarium/default.nix b/pkgs/applications/science/astronomy/stellarium/default.nix index 945294c556f4..111608126718 100644 --- a/pkgs/applications/science/astronomy/stellarium/default.nix +++ b/pkgs/applications/science/astronomy/stellarium/default.nix @@ -6,13 +6,13 @@ mkDerivation rec { name = "stellarium-${version}"; - version = "0.18.0"; + version = "0.18.1"; src = fetchFromGitHub { owner = "Stellarium"; repo = "stellarium"; rev = "v${version}"; - sha256 = "11rh4gan8bhqb2n6a94g773drbq4ffii7aqjwxv97r036579azb2"; + sha256 = "0srwi08azzzayf50dr4dr1zcdcc8hwribzv7xvb7hbp6xp51c813"; }; nativeBuildInputs = [ cmake perl ]; diff --git a/pkgs/applications/science/electronics/verilator/default.nix b/pkgs/applications/science/electronics/verilator/default.nix index 9ecc9f20ac16..6ee3f3266f8d 100644 --- a/pkgs/applications/science/electronics/verilator/default.nix +++ b/pkgs/applications/science/electronics/verilator/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { description = "Fast and robust (System)Verilog simulator/compiler"; homepage = "https://www.veripool.org/wiki/verilator"; license = stdenv.lib.licenses.lgpl3; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; maintainers = with stdenv.lib.maintainers; [ thoughtpolice ]; }; } diff --git a/pkgs/applications/science/logic/cvc4/default.nix b/pkgs/applications/science/logic/cvc4/default.nix index 91ea7e500144..222021bb1c9f 100644 --- a/pkgs/applications/science/logic/cvc4/default.nix +++ b/pkgs/applications/science/logic/cvc4/default.nix @@ -1,19 +1,19 @@ { stdenv, fetchurl, cln, gmp, swig, pkgconfig , readline, libantlr3c, boost, jdk, autoreconfHook -, python2, antlr3_4 +, python3, antlr3_4 }: stdenv.mkDerivation rec { name = "cvc4-${version}"; - version = "1.5"; + version = "1.6"; src = fetchurl { url = "https://cvc4.cs.stanford.edu/downloads/builds/src/cvc4-${version}.tar.gz"; - sha256 = "0yxxawgc9vd2cz883swjlm76rbdkj48n7a8dfppsami530y2rvhi"; + sha256 = "1iw793zsi48q91lxpf8xl8lnvv0jsj4whdad79rakywkm1gbs62w"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; - buildInputs = [ gmp cln readline swig libantlr3c antlr3_4 boost jdk python2 ]; + buildInputs = [ gmp cln readline swig libantlr3c antlr3_4 boost jdk python3 ]; configureFlags = [ "--enable-language-bindings=c,c++,java" "--enable-gpl" @@ -38,6 +38,6 @@ stdenv.mkDerivation rec { homepage = http://cvc4.cs.nyu.edu/web/; license = licenses.gpl3; platforms = platforms.unix; - maintainers = with maintainers; [ vbgl thoughtpolice ]; + maintainers = with maintainers; [ vbgl thoughtpolice gebner ]; }; } diff --git a/pkgs/applications/science/logic/eprover/default.nix b/pkgs/applications/science/logic/eprover/default.nix index 9b0ba0799c78..95f5385fac3d 100644 --- a/pkgs/applications/science/logic/eprover/default.nix +++ b/pkgs/applications/science/logic/eprover/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "eprover-${version}"; - version = "2.0"; + version = "2.1"; src = fetchurl { url = "https://wwwlehre.dhbw-stuttgart.de/~sschulz/WORK/E_DOWNLOAD/V_${version}/E.tgz"; - sha256 = "1xmwr32pd8lv3f6yh720mdqhi3na505y3zbgcsgh2hwb7b5i3ngb"; + sha256 = "1gh99ajmza33f54idhqkdqxp5zh2k06jsf45drihnrzydlqv1n7l"; }; buildInputs = [ which ]; @@ -16,10 +16,6 @@ stdenv.mkDerivation rec { ''; configureFlags = "--exec-prefix=$(out) --man-prefix=$(out)/share/man"; - postInstall = '' - sed -e s,EXECPATH=.\*,EXECPATH=$out/bin, -i $out/bin/eproof{,_ram} - ''; - meta = with stdenv.lib; { description = "Automated theorem prover for full first-order logic with equality"; homepage = http://www.eprover.org/; diff --git a/pkgs/applications/science/logic/potassco/clingo.nix b/pkgs/applications/science/logic/potassco/clingo.nix index 6bf19a2a2f4d..4abfdf9162c0 100644 --- a/pkgs/applications/science/logic/potassco/clingo.nix +++ b/pkgs/applications/science/logic/potassco/clingo.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "clingo"; - version = "5.2.2"; + version = "5.3.0"; src = fetchzip { url = "https://github.com/potassco/clingo/archive/v${version}.tar.gz"; - sha256 = "04rjwpna37gzm8vxr09z3z6ay8y8cxbjd8lga7xvqfpn2l178zjm"; + sha256 = "01czx26p8gv81ahrh650x208hjhd8bx1kb688fmk1m4pw4yg5bfv"; }; buildInputs = []; diff --git a/pkgs/applications/science/logic/vampire/default.nix b/pkgs/applications/science/logic/vampire/default.nix new file mode 100644 index 000000000000..e05839b2a143 --- /dev/null +++ b/pkgs/applications/science/logic/vampire/default.nix @@ -0,0 +1,59 @@ +{ stdenv, fetchFromGitHub, fetchpatch, z3, zlib, git }: + +stdenv.mkDerivation rec { + version = "4.2.2"; + name = "vampire-${version}"; + + src = fetchFromGitHub { + owner = "vprover"; + repo = "vampire"; + rev = version; + sha256 = "080zwgmyhn0b2c6hqlhcgaw7n3frz02sh894v5kk68kzxbqr29w2"; + fetchSubmodules = true; + leaveDotGit = true; + }; + + nativeBuildInputs = [ git ]; + buildInputs = [ z3 zlib ]; + + makeFlags = [ "vampire_z3_rel" "CC:=$(CC)" "CXX:=$(CXX)" ]; + + patches = [ + # https://github.com/vprover/vampire/pull/54 + (fetchpatch { + name = "fix-apple-cygwin-defines.patch"; + url = https://github.com/vprover/vampire/pull/54.patch; + sha256 = "0i6nrc50wlg1dqxq38lkpx4rmfb3lf7s8f95l4jkvqp0nxa20cza"; + }) + # https://github.com/vprover/vampire/pull/55 + (fetchpatch { + name = "fix-wait-any.patch"; + url = https://github.com/vprover/vampire/pull/55.patch; + sha256 = "1pwfpwpl23bqsgkmmvw6bnniyvp5j9v8l3z9s9pllfabnfcrcz9l"; + }) + # https://github.com/vprover/vampire/pull/56 + (fetchpatch { + name = "fenv.patch"; + url = https://github.com/vprover/vampire/pull/56.patch; + sha256 = "0xl3jcyqmk146mg3qj5hdd0pbja6wbq3250zmfhbxqrjh40mm40g"; + }) + ]; + + enableParallelBuilding = true; + + fixupPhase = '' + rm -rf z3 + ''; + + installPhase = '' + install -m0755 -D vampire_z3_rel* $out/bin/vampire + ''; + + meta = with stdenv.lib; { + homepage = "https://vprover.github.io/"; + description = "The Vampire Theorem Prover"; + platforms = platforms.unix; + license = licenses.unfree; + maintainers = with maintainers; [ gebner ]; + }; +} diff --git a/pkgs/applications/science/math/R/default.nix b/pkgs/applications/science/math/R/default.nix index f20b75605d5a..25ebee96a103 100644 --- a/pkgs/applications/science/math/R/default.nix +++ b/pkgs/applications/science/math/R/default.nix @@ -7,11 +7,11 @@ }: stdenv.mkDerivation rec { - name = "R-3.5.0"; + name = "R-3.5.1"; src = fetchurl { url = "https://cran.r-project.org/src/base/R-3/${name}.tar.gz"; - sha256 = "0w38865laqg28cdhikxdxhx4rfp0kgcn72gakwypsy91br9ja5zx"; + sha256 = "0463bff5eea0f3d93fa071f79c18d0993878fd4f2e18ae6cf22c1639d11457ed"; }; buildInputs = [ @@ -65,8 +65,7 @@ stdenv.mkDerivation rec { installTargets = [ "install" "install-info" "install-pdf" ]; - doCheck = withRecommendedPackages; # R 3.5.0 fails the test suite if the - # recommended packages are not built + doCheck = true; preCheck = "export TZ=CET; bin/Rscript -e 'sessionInfo()'"; enableParallelBuilding = true; diff --git a/pkgs/applications/science/math/bliss/default.nix b/pkgs/applications/science/math/bliss/default.nix new file mode 100644 index 000000000000..b96aa60da686 --- /dev/null +++ b/pkgs/applications/science/math/bliss/default.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchurl, unzip, doxygen }: + +stdenv.mkDerivation rec { + name = "bliss-${version}"; + version = "0.73"; + + src = fetchurl { + url = "http://www.tcs.hut.fi/Software/bliss/${name}.zip"; + sha256 = "f57bf32804140cad58b1240b804e0dbd68f7e6bf67eba8e0c0fa3a62fd7f0f84"; + }; + + patches = fetchurl { + url = "http://scip.zib.de/download/bugfixes/scip-5.0.1/bliss-0.73.patch"; + sha256 = "815868d6586bcd49ff3c28e14ccb536d38b2661151088fe08187c13909c5dab0"; + }; + + nativeBuildInputs = [ unzip doxygen ]; + + preBuild = '' + doxygen Doxyfile + ''; + + installPhase = '' + mkdir -p $out/bin $out/share/doc/bliss $out/lib $out/include + mv bliss $out/bin + mv html/* COPYING* $out/share/doc/bliss + mv *.a $out/lib + mv *.h *.hh $out/include + ''; + + meta = with stdenv.lib; { + description = "bliss is an open source tool for computing automorphism groups and canonical forms of graphs. It has both a command line user interface as well as C++ and C programming language APIs."; + homepage = http://www.tcs.hut.fi/Software/bliss/; + license = licenses.lgpl3; + platforms = [ "i686-linux" "x86_64-linux" ]; + }; +} diff --git a/pkgs/applications/science/math/hmetis/default.nix b/pkgs/applications/science/math/hmetis/default.nix new file mode 100644 index 000000000000..9eab9ca39992 --- /dev/null +++ b/pkgs/applications/science/math/hmetis/default.nix @@ -0,0 +1,42 @@ +{ stdenv, fetchurl, ghostscript }: + +stdenv.mkDerivation rec { + name = "hmetis-${version}"; + version = "1.5"; + + src = fetchurl { + url = "http://glaros.dtc.umn.edu/gkhome/fetch/sw/hmetis/hmetis-${version}-linux.tar.gz"; + sha256 = "e835a098c046e9c26cecb8addfea4d18ff25214e49585ffd87038e72819be7e1"; + }; + + nativeBuildInputs = [ ghostscript ]; + + binaryFiles = "hmetis khmetis shmetis"; + + patchPhase = '' + for binaryfile in $binaryFiles; do + patchelf \ + --set-interpreter ${stdenv.glibc}/lib/ld-linux.so.2 \ + --set-rpath ${stdenv.glibc}/lib \ + $binaryfile + done + ''; + + buildPhase = '' + gs -sOutputFile=manual.pdf -sDEVICE=pdfwrite -SNOPAUSE -dBATCH manual.ps + ''; + + installPhase = '' + mkdir -p $out/bin $out/share/doc/hmetis $out/lib + mv $binaryFiles $out/bin + mv manual.pdf $out/share/doc/hmetis + mv libhmetis.a $out/lib + ''; + + meta = with stdenv.lib; { + description = "hMETIS is a set of programs for partitioning hypergraphs"; + homepage = http://glaros.dtc.umn.edu/gkhome/metis/hmetis/overview; + license = licenses.unfree; + platforms = [ "i686-linux" "x86_64-linux" ]; + }; +} diff --git a/pkgs/applications/science/math/qalculate-gtk/default.nix b/pkgs/applications/science/math/qalculate-gtk/default.nix index 11ae3852f067..28bd31506874 100644 --- a/pkgs/applications/science/math/qalculate-gtk/default.nix +++ b/pkgs/applications/science/math/qalculate-gtk/default.nix @@ -1,12 +1,14 @@ -{ stdenv, fetchurl, intltool, autoreconfHook, pkgconfig, libqalculate, gtk3, wrapGAppsHook }: +{ stdenv, fetchFromGitHub, intltool, autoreconfHook, pkgconfig, libqalculate, gtk3, wrapGAppsHook }: stdenv.mkDerivation rec { name = "qalculate-gtk-${version}"; - version = "2.5.0"; + version = "2.6.0"; - src = fetchurl { - url = "https://github.com/Qalculate/qalculate-gtk/archive/v${version}.tar.gz"; - sha256 = "1hwwsdk3mlzvg9fsnv0hpj0s1lfkhycwv3sx2yrjwffzphhmxs7a"; + src = fetchFromGitHub { + owner = "qalculate"; + repo = "qalculate-gtk"; + rev = "v${version}"; + sha256 = "0b2g9ziypcplczsm14b4i2k7vpiw9ll28qskv1fdhyqb0fij3qcx"; }; patchPhase = '' diff --git a/pkgs/applications/science/math/sage/sage-src.nix b/pkgs/applications/science/math/sage/sage-src.nix index 244a6ea72673..2eb7f8100597 100644 --- a/pkgs/applications/science/math/sage/sage-src.nix +++ b/pkgs/applications/science/math/sage/sage-src.nix @@ -104,13 +104,6 @@ stdenv.mkDerivation rec { # https://trac.sagemath.org/ticket/24935 ./patches/sphinx-1.7.patch - # https://trac.sagemath.org/ticket/25320 - (fetchpatch { - name = "zero_division_error_formatting.patch"; - url = "https://git.sagemath.org/sage.git/patch/?h=f79070ddd09fa0ad6b340b097bd8d690a7aa35f0"; - sha256 = "02wsc3wbp8g8dk5jcjyv18d9v537h3zp5v8lwir46j4na4kj0dlb"; - }) - # Adapt hashes to new boost version # https://trac.sagemath.org/ticket/22243 # (this ticket doesn't only upgrade boost but also avoids this problem in the future) diff --git a/pkgs/applications/science/programming/scyther/default.nix b/pkgs/applications/science/programming/scyther/default.nix index beef26c6032a..e0993a580193 100644 --- a/pkgs/applications/science/programming/scyther/default.nix +++ b/pkgs/applications/science/programming/scyther/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildEnv, callPackage_i686, fetchFromGitHub, python27Packages, graphviz +{ stdenv, lib, buildEnv, pkgsi686Linux, fetchFromGitHub, python27Packages, graphviz , includeGUI ? true , includeProtocols ? true }: @@ -20,7 +20,7 @@ let platforms = platforms.linux; }; - cli = callPackage_i686 ./cli.nix { + cli = pkgsi686Linux.callPackage ./cli.nix { inherit version src meta; }; @@ -47,7 +47,7 @@ let python27Packages.wxPython graphviz ]; - + installPhase = '' mkdir -p "$out"/gui "$out"/bin cp -r gui/* "$out"/gui diff --git a/pkgs/applications/search/recoll/default.nix b/pkgs/applications/search/recoll/default.nix index 8c442f31cd14..01a4f4023023 100644 --- a/pkgs/applications/search/recoll/default.nix +++ b/pkgs/applications/search/recoll/default.nix @@ -2,7 +2,8 @@ , qt4, xapian, file, python, perl , djvulibre, groff, libxslt, unzip, poppler_utils, antiword, catdoc, lyx , libwpd, unrtf, untex -, ghostscript, gawk, gnugrep, gnused, gnutar, gzip, libiconv }: +, ghostscript, gawk, gnugrep, gnused, gnutar, gzip, libiconv, zlib +, withGui ? true }: assert stdenv.system != "powerpc-linux"; @@ -15,10 +16,13 @@ stdenv.mkDerivation rec { sha256 = "186bj8zx2xw9hwrzvzxdgdin9nj7msiqh5j57w5g7j4abdlsisjn"; }; - configureFlags = [ "--enable-recollq" ] ++ - (if stdenv.isLinux then [ "--with-inotify" ] else [ "--without-inotify" ]); + configureFlags = [ "--enable-recollq" ] + ++ lib.optionals (!withGui) [ "--disable-qtgui" "--disable-x11mon" ] + ++ (if stdenv.isLinux then [ "--with-inotify" ] else [ "--without-inotify" ]); - buildInputs = [ qt4 xapian file python bison ]; + buildInputs = [ xapian file python bison zlib ] + ++ lib.optional withGui qt4 + ++ lib.optional stdenv.isDarwin libiconv; patchPhase = stdenv.lib.optionalString stdenv.isDarwin '' sed -i 's/-Wl,--no-undefined -Wl,--warn-unresolved-symbols//' Makefile.am diff --git a/pkgs/applications/version-management/p4v/default.nix b/pkgs/applications/version-management/p4v/default.nix index 27e029d39d1e..f82b80067bf2 100644 --- a/pkgs/applications/version-management/p4v/default.nix +++ b/pkgs/applications/version-management/p4v/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://cdist2.perforce.com/perforce/r17.3/bin.linux26x86_64/p4v.tgz"; - sha256 = "f317607f1bc8877db01ff020b8b0857c2d0f8600474d152749264aea0be66b21"; + sha256 = "9ded42683141e1808535ec3e87d3149f890315c192d6e97212794fd54862b9a4"; }; dontBuild = true; diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index 58628aa1f8e8..7880c3150872 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -7,11 +7,13 @@ libGLU_combined ? null, libX11 ? null, libXext ? null, - libXxf86vm ? null + libXxf86vm ? null, + libXrandr ? null -, waylandSupport ? false, - wayland ? null, - libxkbcommon ? null +, waylandSupport ? false + , wayland ? null + , wayland-protocols ? null + , libxkbcommon ? null , rubberbandSupport ? true, rubberband ? null , xineramaSupport ? true, libXinerama ? null @@ -46,8 +48,8 @@ with stdenv.lib; let available = x: x != null; in -assert x11Support -> all available [libGLU_combined libX11 libXext libXxf86vm]; -assert waylandSupport -> all available [wayland libxkbcommon]; +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; @@ -150,8 +152,8 @@ in stdenv.mkDerivation rec { ++ optional vapoursynthSupport vapoursynth ++ optional archiveSupport libarchive ++ optionals dvdnavSupport [ libdvdnav libdvdnav.libdvdread ] - ++ optionals x11Support [ libX11 libXext libGLU_combined libXxf86vm ] - ++ optionals waylandSupport [ wayland libxkbcommon ] + ++ optionals x11Support [ libX11 libXext libGLU_combined libXxf86vm libXrandr ] + ++ optionals waylandSupport [ wayland wayland-protocols libxkbcommon ] ++ optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ libiconv Cocoa CoreAudio ]); diff --git a/pkgs/build-support/rust/build-rust-crate.nix b/pkgs/build-support/rust/build-rust-crate.nix index 5c738dd7f0b3..be76c283babc 100644 --- a/pkgs/build-support/rust/build-rust-crate.nix +++ b/pkgs/build-support/rust/build-rust-crate.nix @@ -15,6 +15,12 @@ let makeDeps = dependencies: " --extern ${extern}=${dep.out}/lib/lib${extern}-${dep.metadata}${buildPlatform.extensions.sharedLibrary}") ) dependencies); + # This doesn't appear to be officially documented anywhere yet. + # See https://github.com/rust-lang-nursery/rust-forge/issues/101. + target_os = if buildPlatform.isDarwin + then "macos" + else buildPlatform.parsed.kernel.name; + echo_build_heading = colors: '' echo_build_heading() { start="" @@ -101,7 +107,7 @@ let makeDeps = dependencies: export CARGO_PKG_AUTHORS="${authors}" export CARGO_CFG_TARGET_ARCH=${buildPlatform.parsed.cpu.name} - export CARGO_CFG_TARGET_OS=${buildPlatform.parsed.kernel.name} + export CARGO_CFG_TARGET_OS=${target_os} export CARGO_CFG_TARGET_FAMILY="unix" export CARGO_CFG_UNIX=1 export CARGO_CFG_TARGET_ENV="gnu" diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index 9cdcc2a752d0..6a6deaa875a7 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -965,22 +965,22 @@ rec { }; debian8i386 = { - name = "debian-8.10-jessie-i386"; - fullName = "Debian 8.10 Jessie (i386)"; + name = "debian-8.11-jessie-i386"; + fullName = "Debian 8.11 Jessie (i386)"; packagesList = fetchurl { url = mirror://debian/dists/jessie/main/binary-i386/Packages.xz; - sha256 = "1w1gm195dcrndy5486kcv0h9l3br9dqnqyyhmavp4vr5w2zk7amk"; + sha256 = "0adblarhx50yga900il6m25ng0csa81i3wid1dxxmydbdmri7v7d"; }; urlPrefix = mirror://debian; packages = commonDebianPackages; }; debian8x86_64 = { - name = "debian-8.10-jessie-amd64"; - fullName = "Debian 8.10 Jessie (amd64)"; + name = "debian-8.11-jessie-amd64"; + fullName = "Debian 8.11 Jessie (amd64)"; packagesList = fetchurl { url = mirror://debian/dists/jessie/main/binary-amd64/Packages.xz; - sha256 = "045700qsrmd3lng2rw8nfs5ci7pf660lwl6alpzkyjikyp6pg7k8"; + sha256 = "09y1mv4kqllhxpk1ibjsyl5jig5bp0qxw6pp4sn56rglrpygmn5x"; }; urlPrefix = mirror://debian; packages = commonDebianPackages; diff --git a/pkgs/data/fonts/babelstone-han/default.nix b/pkgs/data/fonts/babelstone-han/default.nix index fbf62e3ba386..67080e73c46d 100644 --- a/pkgs/data/fonts/babelstone-han/default.nix +++ b/pkgs/data/fonts/babelstone-han/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchzip}: let - version = "11.0.2"; + version = "11.0.3"; in fetchzip { name = "babelstone-han-${version}"; @@ -10,7 +10,7 @@ in fetchzip { mkdir -p $out/share/fonts/truetype unzip $downloadedFile '*.ttf' -d $out/share/fonts/truetype ''; - sha256 = "003cz520riskjp729y3piqhmnzfw3jyrmb94im7jyvlc7hp14cdh"; + sha256 = "0c8s21kllyilwivrb8gywq818y67w3zpann34hz36vy0wyiswn1c"; meta = with stdenv.lib; { description = "Unicode CJK font with over 36000 Han characters"; diff --git a/pkgs/data/fonts/source-han-code-jp/default.nix b/pkgs/data/fonts/source-han-code-jp/default.nix new file mode 100644 index 000000000000..fc016a457c22 --- /dev/null +++ b/pkgs/data/fonts/source-han-code-jp/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchzip }: + +let + pname = "source-han-code-jp"; + version = "2.011R"; +in fetchzip { + name = "${pname}-${version}"; + + url = "https://github.com/adobe-fonts/${pname}/archive/${version}.zip"; + + postFetch = '' + mkdir -p $out/share/fonts + unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype + ''; + + sha256 = "184vrjkymcm29k1cx00cdvjchzqr1w17925lmh85f0frx7vwljcd"; + + meta = { + description = "A monospaced Latin font suitable for coding"; + maintainers = with stdenv.lib.maintainers; [ mt-caret ]; + platforms = with stdenv.lib.platforms; all; + homepage = https://blogs.adobe.com/CCJKType/2015/06/source-han-code-jp.html; + license = stdenv.lib.licenses.ofl; + }; +} diff --git a/pkgs/data/icons/arc-icon-theme/default.nix b/pkgs/data/icons/arc-icon-theme/default.nix index 84bf45a52bbe..6529e5c571c2 100644 --- a/pkgs/data/icons/arc-icon-theme/default.nix +++ b/pkgs/data/icons/arc-icon-theme/default.nix @@ -20,7 +20,8 @@ stdenv.mkDerivation rec { description = "Arc icon theme"; homepage = https://github.com/horst3180/arc-icon-theme; license = licenses.gpl3; - platforms = platforms.all; + # moka-icon-theme dependency is restricted to linux + platforms = platforms.linux; maintainers = with maintainers; [ romildo ]; }; } diff --git a/pkgs/data/icons/faba-icon-theme/default.nix b/pkgs/data/icons/faba-icon-theme/default.nix index fdad4f0f46da..e9d9efcfcb02 100644 --- a/pkgs/data/icons/faba-icon-theme/default.nix +++ b/pkgs/data/icons/faba-icon-theme/default.nix @@ -1,25 +1,23 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, elementary-icon-theme, gtk3 }: +{ stdenv, fetchFromGitHub, meson, ninja, gtk3, elementary-icon-theme }: stdenv.mkDerivation rec { name = "${package-name}-${version}"; package-name = "faba-icon-theme"; - version = "2016-09-13"; + version = "4.3"; src = fetchFromGitHub { owner = "moka-project"; repo = package-name; - rev = "00431894bce5fb1b8caccaee064788996be228a7"; - sha256 = "0hif030pd4w3s851k0s65w0mf2pik10ha25ycpsv91gpbgarqcns"; + rev = "v${version}"; + sha256 = "0xh6ppr73p76z60ym49b4d0liwdc96w41cc5p07d48hxjsa6qd6n"; }; - nativeBuildInputs = [ autoreconfHook elementary-icon-theme gtk3 ]; + nativeBuildInputs = [ meson ninja gtk3 elementary-icon-theme ]; postPatch = '' - substituteInPlace Makefile.am --replace '$(DESTDIR)'/usr $out + patchShebangs meson/post_install.py ''; - postFixup = "gtk-update-icon-cache $out/share/icons/Faba"; - meta = with stdenv.lib; { description = "A sexy and modern icon theme with Tango influences"; homepage = https://snwh.org/moka; diff --git a/pkgs/data/icons/faba-mono-icons/default.nix b/pkgs/data/icons/faba-mono-icons/default.nix index bdb6f651e6a5..a4ffefe1f26d 100644 --- a/pkgs/data/icons/faba-mono-icons/default.nix +++ b/pkgs/data/icons/faba-mono-icons/default.nix @@ -24,7 +24,8 @@ stdenv.mkDerivation rec { description = "The full set of Faba monochrome panel icons"; homepage = https://snwh.org/moka; license = licenses.gpl3; - platforms = platforms.all; + # moka-icon-theme dependency is restricted to linux + platforms = platforms.linux; maintainers = with maintainers; [ romildo ]; }; } diff --git a/pkgs/data/icons/moka-icon-theme/default.nix b/pkgs/data/icons/moka-icon-theme/default.nix index f3180db54dcf..2b4bb5d67c3b 100644 --- a/pkgs/data/icons/moka-icon-theme/default.nix +++ b/pkgs/data/icons/moka-icon-theme/default.nix @@ -1,30 +1,29 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, faba-icon-theme, gtk3 }: +{ stdenv, fetchFromGitHub, meson, ninja, gtk3, faba-icon-theme }: stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "moka-icon-theme"; - version = "5.3.6"; + version = "5.4.0"; src = fetchFromGitHub { owner = "snwh"; repo = pname; rev = "v${version}"; - sha256 = "17f8k8z8xvib4hkxq0cw9j7bhdpqpv5frrkyc4sbyildcbavzzbr"; + sha256 = "015l02im4mha5z91dbchxf6xkp66d346bg3xskwg0rh3lglhjsrd"; }; - nativeBuildInputs = [ autoreconfHook faba-icon-theme gtk3 ]; + nativeBuildInputs = [ meson ninja gtk3 faba-icon-theme ]; postPatch = '' - substituteInPlace Makefile.am --replace '$(DESTDIR)'/usr $out + patchShebangs meson/post_install.py ''; - postFixup = "gtk-update-icon-cache $out/share/icons/Moka"; - meta = with stdenv.lib; { description = "An icon theme designed with a minimal flat style using simple geometry and bright colours"; homepage = https://snwh.org/moka; license = with licenses; [ cc-by-sa-40 gpl3 ]; - platforms = platforms.all; + # darwin cannot deal with file names differing only in case + platforms = platforms.linux; maintainers = with maintainers; [ romildo ]; }; } diff --git a/pkgs/data/misc/hackage/default.nix b/pkgs/data/misc/hackage/default.nix index d25a165e40c4..2e603e22dfa7 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/dc7b5d4f0ee056ec87a4a5069b3c68bdd316abd6.tar.gz"; - sha256 = "0llycqa2y6ng5bhzb19ya6p83k0chfycpivg9287gzsmj363j934"; + url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/532d9c821a36f220c928be40465a6ace52bc3818.tar.gz"; + sha256 = "1yqn87r75cdf45wkbfa5vqxvsaxqsmypwjl4pw5w1g8qfrdilr18"; } diff --git a/pkgs/desktops/mate/mate-utils/default.nix b/pkgs/desktops/mate/mate-utils/default.nix index f96eecb0a4e6..8ea8ab33700c 100644 --- a/pkgs/desktops/mate/mate-utils/default.nix +++ b/pkgs/desktops/mate/mate-utils/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "mate-utils-${version}"; - version = "1.20.0"; + version = "1.20.1"; src = fetchurl { url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz"; - sha256 = "10a6k8gi7cajlkbj1jbvk3s633hw58lan3rc85v8jlrkwm7wmhpl"; + sha256 = "1kr0612h6r2gj3yg4ccyzr844lh640cd4wdj3gl8qzqikjx0n7ka"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/mate/mozo/default.nix b/pkgs/desktops/mate/mozo/default.nix index e98d16d774e2..387df5d45b3d 100644 --- a/pkgs/desktops/mate/mozo/default.nix +++ b/pkgs/desktops/mate/mozo/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "mozo-${version}"; - version = "1.20.0"; + version = "1.20.1"; src = fetchurl { url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz"; - sha256 = "1108avdappfjadd46ld7clhh5m9f4b5khl5y33l377m8ky9dy87g"; + sha256 = "16rkwbq385i2acll0kcsnp4ghdyljylhp06bjdsvbwv6bjspyyrp"; }; pythonPath = [ mate.mate-menus pythonPackages.pygobject3 ]; diff --git a/pkgs/development/compilers/graalvm/default.nix b/pkgs/development/compilers/graalvm/default.nix index ff269afd1a64..794467443715 100644 --- a/pkgs/development/compilers/graalvm/default.nix +++ b/pkgs/development/compilers/graalvm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, fetchhg, fetchurl, mercurial, python27, zlib, makeWrapper, oraclejdk8 }: +{ stdenv, lib, fetchFromGitHub, fetchhg, fetchurl, fetchzip, mercurial, python27, zlib, makeWrapper, oraclejdk8 }: let # pre-download some cache entries ('mx' will not be able to download under nixbld1) @@ -8,69 +8,84 @@ let buildCommand = '' mkdir $out ${lib.concatMapStrings ({url, name, sha1}: '' - ln -s ${fetchurl { inherit url sha1; }} $out/${name} + install -D ${fetchurl { inherit url sha1; }} $out/${name} echo -n ${sha1} > $out/${name}.sha1 '') list} ''; }; jvmci8-mxcache = [ - rec { sha1 = "66215826a684eb6866d4c14a5a4f9c344f1d1eef"; name = "JACOCOCORE_${sha1}.jar"; url = mirror://maven/org/jacoco/org.jacoco.core/0.7.9/org.jacoco.core-0.7.9.jar; } - rec { sha1 = "a365ee459836b2aa18028929923923d15f0c3af9"; name = "JACOCOCORE.sources_${sha1}.jar"; url = mirror://maven/org/jacoco/org.jacoco.core/0.7.9/org.jacoco.core-0.7.9-sources.jar; } - rec { sha1 = "8a7f78fdf2a4e58762890d8e896a9298c2980c10"; name = "JACOCOREPORT_${sha1}.jar"; url = mirror://maven/org/jacoco/org.jacoco.report/0.7.9/org.jacoco.report-0.7.9.jar; } - rec { sha1 = "e6703ef288523a8e63fa756d8adeaa70858d41b0"; name = "JACOCOREPORT.sources_${sha1}.jar"; url = mirror://maven/org/jacoco/org.jacoco.report/0.7.9/org.jacoco.report-0.7.9-sources.jar; } - rec { sha1 = "306816fb57cf94f108a43c95731b08934dcae15c"; name = "JOPTSIMPLE_4_6_${sha1}.jar"; url = mirror://maven/net/sf/jopt-simple/jopt-simple/4.6/jopt-simple-4.6.jar; } - rec { sha1 = "9cd14a61d7aa7d554f251ef285a6f2c65caf7b65"; name = "JOPTSIMPLE_4_6.sources_${sha1}.jar"; url = mirror://maven/net/sf/jopt-simple/jopt-simple/4.6/jopt-simple-4.6-sources.jar; } - rec { sha1 = "b852fb028de645ad2852bbe998e084d253f450a5"; name = "JMH_GENERATOR_ANNPROCESS_1_18_${sha1}.jar"; url = mirror://maven/org/openjdk/jmh/jmh-generator-annprocess/1.18/jmh-generator-annprocess-1.18.jar; } - rec { sha1 = "d455b0dc6108b5e6f1fb4f6cf1c7b4cbedbecc97"; name = "JMH_GENERATOR_ANNPROCESS_1_18.sources_${sha1}.jar"; url = mirror://maven/org/openjdk/jmh/jmh-generator-annprocess/1.18/jmh-generator-annprocess-1.18-sources.jar; } - rec { sha1 = "7aac374614a8a76cad16b91f1a4419d31a7dcda3"; name = "JMH_GENERATOR_ANNPROCESS_1_21_${sha1}.jar"; url = mirror://maven/org/openjdk/jmh/jmh-generator-annprocess/1.21/jmh-generator-annprocess-1.21.jar; } - rec { sha1 = "fb48e2a97df95f8b9dced54a1a37749d2a64d2ae"; name = "JMH_GENERATOR_ANNPROCESS_1_21.sources_${sha1}.jar"; url = mirror://maven/org/openjdk/jmh/jmh-generator-annprocess/1.21/jmh-generator-annprocess-1.21-sources.jar; } - rec { sha1 = "702b8525fcf81454235e5e2fa2a35f15ffc0ec7e"; name = "ASM_DEBUG_ALL_${sha1}.jar"; url = mirror://maven/org/ow2/asm/asm-debug-all/5.0.4/asm-debug-all-5.0.4.jar; } - rec { sha1 = "ec2544ab27e110d2d431bdad7d538ed509b21e62"; name = "COMMONS_MATH3_3_2_${sha1}.jar"; url = mirror://maven/org/apache/commons/commons-math3/3.2/commons-math3-3.2.jar; } - rec { sha1 = "cd098e055bf192a60c81d81893893e6e31a6482f"; name = "COMMONS_MATH3_3_2.sources_${sha1}.jar"; url = mirror://maven/org/apache/commons/commons-math3/3.2/commons-math3-3.2-sources.jar; } - rec { sha1 = "0174aa0077e9db596e53d7f9ec37556d9392d5a6"; name = "JMH_1_18_${sha1}.jar"; url = mirror://maven/org/openjdk/jmh/jmh-core/1.18/jmh-core-1.18.jar; } - rec { sha1 = "7ff1e1aafea436b6aa8b29a8b8f1c2d66be26f5b"; name = "JMH_1_18.sources_${sha1}.jar"; url = mirror://maven/org/openjdk/jmh/jmh-core/1.18/jmh-core-1.18-sources.jar; } - rec { sha1 = "442447101f63074c61063858033fbfde8a076873"; name = "JMH_1_21_${sha1}.jar"; url = mirror://maven/org/openjdk/jmh/jmh-core/1.21/jmh-core-1.21.jar; } - rec { sha1 = "a6fe84788bf8cf762b0e561bf48774c2ea74e370"; name = "JMH_1_21.sources_${sha1}.jar"; url = mirror://maven/org/openjdk/jmh/jmh-core/1.21/jmh-core-1.21-sources.jar; } - rec { sha1 = "2973d150c0dc1fefe998f834810d68f278ea58ec"; name = "JUNIT_${sha1}.jar"; url = https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/junit-4.12.jar; } - rec { sha1 = "a6c32b40bf3d76eca54e3c601e5d1470c86fcdfa"; name = "JUNIT.sources_${sha1}.jar"; url = https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/junit-4.12-sources.jar; } - rec { sha1 = "42a25dc3219429f0e5d060061f71acb49bf010a0"; name = "HAMCREST_${sha1}.jar"; url = https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/hamcrest-core-1.3.jar; } - rec { sha1 = "1dc37250fbc78e23a65a67fbbaf71d2e9cbc3c0b"; name = "HAMCREST.sources_${sha1}.jar"; url = https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/hamcrest-core-1.3-sources.jar; } - rec { sha1 = "0d031013db9a80d6c88330c42c983fbfa7053193"; name = "hsdis_${sha1}.so"; url = https://lafo.ssw.uni-linz.ac.at/pub/hsdis/intel/hsdis-amd64-linux-0d031013db9a80d6c88330c42c983fbfa7053193.so; } + rec { sha1 = "66215826a684eb6866d4c14a5a4f9c344f1d1eef"; name = "JACOCOCORE_${sha1}/jacococore.jar"; url = mirror://maven/org/jacoco/org.jacoco.core/0.7.9/org.jacoco.core-0.7.9.jar; } + rec { sha1 = "a365ee459836b2aa18028929923923d15f0c3af9"; name = "JACOCOCORE_${sha1}/jacococore.sources.jar"; url = mirror://maven/org/jacoco/org.jacoco.core/0.7.9/org.jacoco.core-0.7.9-sources.jar; } + rec { sha1 = "8a7f78fdf2a4e58762890d8e896a9298c2980c10"; name = "JACOCOREPORT_${sha1}/jacocoreport.jar"; url = mirror://maven/org/jacoco/org.jacoco.report/0.7.9/org.jacoco.report-0.7.9.jar; } + rec { sha1 = "e6703ef288523a8e63fa756d8adeaa70858d41b0"; name = "JACOCOREPORT_${sha1}/jacocoreport.sources.jar"; url = mirror://maven/org/jacoco/org.jacoco.report/0.7.9/org.jacoco.report-0.7.9-sources.jar; } + rec { sha1 = "306816fb57cf94f108a43c95731b08934dcae15c"; name = "JOPTSIMPLE_4_6_${sha1}/joptsimple-4-6.jar"; url = mirror://maven/net/sf/jopt-simple/jopt-simple/4.6/jopt-simple-4.6.jar; } + rec { sha1 = "9cd14a61d7aa7d554f251ef285a6f2c65caf7b65"; name = "JOPTSIMPLE_4_6_${sha1}/joptsimple-4-6.sources.jar"; url = mirror://maven/net/sf/jopt-simple/jopt-simple/4.6/jopt-simple-4.6-sources.jar; } + rec { sha1 = "b852fb028de645ad2852bbe998e084d253f450a5"; name = "JMH_GENERATOR_ANNPROCESS_1_18_${sha1}/jmh-generator-annprocess-1-18.jar"; url = mirror://maven/org/openjdk/jmh/jmh-generator-annprocess/1.18/jmh-generator-annprocess-1.18.jar; } + rec { sha1 = "d455b0dc6108b5e6f1fb4f6cf1c7b4cbedbecc97"; name = "JMH_GENERATOR_ANNPROCESS_1_18_${sha1}/jmh-generator-annprocess-1-18.sources.jar"; url = mirror://maven/org/openjdk/jmh/jmh-generator-annprocess/1.18/jmh-generator-annprocess-1.18-sources.jar; } + rec { sha1 = "7aac374614a8a76cad16b91f1a4419d31a7dcda3"; name = "JMH_GENERATOR_ANNPROCESS_1_21_${sha1}/jmh-generator-annprocess-1-21.jar"; url = mirror://maven/org/openjdk/jmh/jmh-generator-annprocess/1.21/jmh-generator-annprocess-1.21.jar; } + rec { sha1 = "fb48e2a97df95f8b9dced54a1a37749d2a64d2ae"; name = "JMH_GENERATOR_ANNPROCESS_1_21_${sha1}/jmh-generator-annprocess-1-21.sources.jar"; url = mirror://maven/org/openjdk/jmh/jmh-generator-annprocess/1.21/jmh-generator-annprocess-1.21-sources.jar; } + rec { sha1 = "702b8525fcf81454235e5e2fa2a35f15ffc0ec7e"; name = "ASM_DEBUG_ALL_${sha1}/asm-debug-all.jar"; url = mirror://maven/org/ow2/asm/asm-debug-all/5.0.4/asm-debug-all-5.0.4.jar; } + rec { sha1 = "ec2544ab27e110d2d431bdad7d538ed509b21e62"; name = "COMMONS_MATH3_3_2_${sha1}/commons-math3-3-2.jar"; url = mirror://maven/org/apache/commons/commons-math3/3.2/commons-math3-3.2.jar; } + rec { sha1 = "cd098e055bf192a60c81d81893893e6e31a6482f"; name = "COMMONS_MATH3_3_2_${sha1}/commons-math3-3-2.sources.jar"; url = mirror://maven/org/apache/commons/commons-math3/3.2/commons-math3-3.2-sources.jar; } + rec { sha1 = "0174aa0077e9db596e53d7f9ec37556d9392d5a6"; name = "JMH_1_18_${sha1}/jmh-1-18.jar"; url = mirror://maven/org/openjdk/jmh/jmh-core/1.18/jmh-core-1.18.jar; } + rec { sha1 = "7ff1e1aafea436b6aa8b29a8b8f1c2d66be26f5b"; name = "JMH_1_18_${sha1}/jmh-1-18.sources.jar"; url = mirror://maven/org/openjdk/jmh/jmh-core/1.18/jmh-core-1.18-sources.jar; } + rec { sha1 = "442447101f63074c61063858033fbfde8a076873"; name = "JMH_1_21_${sha1}/jmh-1-21.jar"; url = mirror://maven/org/openjdk/jmh/jmh-core/1.21/jmh-core-1.21.jar; } + rec { sha1 = "a6fe84788bf8cf762b0e561bf48774c2ea74e370"; name = "JMH_1_21_${sha1}/jmh-1-21.sources.jar"; url = mirror://maven/org/openjdk/jmh/jmh-core/1.21/jmh-core-1.21-sources.jar; } + rec { sha1 = "2973d150c0dc1fefe998f834810d68f278ea58ec"; name = "JUNIT_${sha1}/junit.jar"; url = mirror://maven/junit/junit/4.12/junit-4.12.jar; } + rec { sha1 = "a6c32b40bf3d76eca54e3c601e5d1470c86fcdfa"; name = "JUNIT_${sha1}/junit.sources.jar"; url = mirror://maven/junit/junit/4.12/junit-4.12-sources.jar; } + rec { sha1 = "42a25dc3219429f0e5d060061f71acb49bf010a0"; name = "HAMCREST_${sha1}/hamcrest.jar"; url = mirror://maven/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar; } + rec { sha1 = "1dc37250fbc78e23a65a67fbbaf71d2e9cbc3c0b"; name = "HAMCREST_${sha1}/hamcrest.sources.jar"; url = mirror://maven/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3-sources.jar; } + rec { sha1 = "0d031013db9a80d6c88330c42c983fbfa7053193"; name = "jvmci/intel-hsdis-amd64-linux-${sha1}.so"; url = "https://lafo.ssw.uni-linz.ac.at/pub/hsdis/intel/hsdis-amd64-linux-${sha1}.so"; } ]; graal-mxcache = jvmci8-mxcache ++ [ - rec { sha1 = "f2cfb09cee12469ff64f0d698b13de19903bb4f7"; name = "NanoHTTPD-WebSocket_${sha1}.jar"; url = mirror://maven/org/nanohttpd/nanohttpd-websocket/2.3.1/nanohttpd-websocket-2.3.1.jar; } - rec { sha1 = "a8d54d1ca554a77f377eff6bf9e16ca8383c8f6c"; name = "NanoHTTPD_${sha1}.jar"; url = mirror://maven/org/nanohttpd/nanohttpd/2.3.1/nanohttpd-2.3.1.jar; } - rec { sha1 = "aca5eb39e2a12fddd6c472b240afe9ebea3a6733"; name = "org.json_${sha1}.jar"; url = mirror://maven/org/json/json/20160810/json-20160810.jar; } - rec { sha1 = "fdedd5f2522122102f0b3db85fe7aa563a009926"; name = "JLINE_${sha1}.jar"; url = mirror://maven/jline/jline/2.14.5/jline-2.14.5.jar; } - rec { sha1 = "476d9a44cd19d6b55f81571077dfa972a4f8a083"; name = "JAVA_ALLOCATION_INSTRUMENTER_${sha1}.jar"; url = https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/java-allocation-instrumenter/java-allocation-instrumenter-8f0db117e64e.jar; } - rec { sha1 = "0da08b8cce7bbf903602a25a3a163ae252435795"; name = "ASM5_${sha1}.jar"; url = https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/asm-5.0.4.jar; } - rec { sha1 = "396ce0c07ba2b481f25a70195c7c94922f0d1b0b"; name = "ASM_TREE5_${sha1}.jar"; url = https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/asm-tree-5.0.4.jar; } - rec { sha1 = "280c265b789e041c02e5c97815793dfc283fb1e6"; name = "LIBFFI_${sha1}.tar.gz"; url = https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/libffi-3.2.1.tar.gz; } - rec { sha1 = "616a4fca49c5d610a3354e78cd97e7627024bb66"; name = "GSON_SHADOWED_${sha1}.jar"; url = https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/gson-shadowed-2.2.4.jar; } - rec { sha1 = "b13337a4ffd095c2e27ea401dc6edfca0d23a6e4"; name = "GSON_SHADOWED.sources_${sha1}.jar"; url = https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/gson-shadowed-2.2.4-sources.jar; } + rec { sha1 = "f2cfb09cee12469ff64f0d698b13de19903bb4f7"; name = "NanoHTTPD-WebSocket_${sha1}/nanohttpd-websocket.jar"; url = mirror://maven/org/nanohttpd/nanohttpd-websocket/2.3.1/nanohttpd-websocket-2.3.1.jar; } + rec { sha1 = "a8d54d1ca554a77f377eff6bf9e16ca8383c8f6c"; name = "NanoHTTPD_${sha1}/nanohttpd.jar"; url = mirror://maven/org/nanohttpd/nanohttpd/2.3.1/nanohttpd-2.3.1.jar; } + rec { sha1 = "30b13b7efc55b7feea667691509cf59902375001"; name = "ANTLR4_${sha1}/antlr4.jar"; url = mirror://maven/org/antlr/antlr4-runtime/4.7/antlr4-runtime-4.7.jar; } + rec { sha1 = "fdedd5f2522122102f0b3db85fe7aa563a009926"; name = "JLINE_${sha1}/jline.jar"; url = mirror://maven/jline/jline/2.14.5/jline-2.14.5.jar; } + rec { sha1 = "d0bdc21c5e6404726b102998e44c66a738897905"; name = "JAVA_ALLOCATION_INSTRUMENTER_${sha1}/java-allocation-instrumenter.jar"; url = mirror://maven/com/google/code/java-allocation-instrumenter/java-allocation-instrumenter/3.1.0/java-allocation-instrumenter-3.1.0.jar; } + rec { sha1 = "0da08b8cce7bbf903602a25a3a163ae252435795"; name = "ASM5_${sha1}/asm5.jar"; url = mirror://maven/org/ow2/asm/asm/5.0.4/asm-5.0.4.jar; } + rec { sha1 = "396ce0c07ba2b481f25a70195c7c94922f0d1b0b"; name = "ASM_TREE5_${sha1}/asm-tree5.jar"; url = mirror://maven/org/ow2/asm/asm-tree/5.0.4/asm-tree-5.0.4.jar; } + rec { sha1 = "280c265b789e041c02e5c97815793dfc283fb1e6"; name = "LIBFFI_${sha1}/libffi.tar.gz"; url = https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/libffi-3.2.1.tar.gz; } + rec { sha1 = "8819cea8bfe22c9c63f55465e296b3855ea41786"; name = "TruffleJSON_${sha1}/trufflejson.jar"; url = https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/trufflejson-20180130.jar; } + rec { sha1 = "9712a8124c40298015f04a74f61b3d81a51513af"; name = "CHECKSTYLE_8.8_${sha1}/checkstyle-8.8.jar"; url = https://github.com/graalvm/mx/releases/download/checkstyle-8.8/checkstyle-8.8-all.jar; } ]; + findbugs = fetchzip { + name = "findbugs-3.0.0"; + url = https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/findbugs-3.0.0.zip; + sha256 = "0sf5f9h1s6fmhfigjy81i109j1ani5kzdr4njlpq0mnkkh9fpr7m"; + }; + in rec { mx = stdenv.mkDerivation rec { - version = "5.171.0"; + version = "5.176.4"; name = "mx"; src = fetchFromGitHub { owner = "graalvm"; repo = "mx"; rev = version; - sha256 = "0ag3g49fnjrnlmjb55dbn9l2cwyvanx36f5hyf21ad8px05fh6jv"; + sha256 = "0xmx4hpnd6m9hk49lgwnvwd0q11s2m4d8axwq7zzc8wm10d692xw"; }; nativeBuildInputs = [ makeWrapper ]; buildPhase = '' substituteInPlace mx --replace /bin/pwd pwd + + # forbid network access while simulate success for passing obligatory "VerifyLibraryURL" + substituteInPlace mx.py --replace \ + 'def download(path, urls, verbose=False, abortOnError=True, verifyOnly=False):' \ + 'def download(path, urls, verbose=False, abortOnError=True, verifyOnly=False): + print("FAKE download(path={} urls={} verbose={} abortOnError={} verifyOnly={})".format(path, urls, verbose, abortOnError, verifyOnly)) + return True' ''; installPhase = '' mkdir -p $out/bin cp -dpR * $out/bin - wrapProgram $out/bin/mx --prefix PATH : ${lib.makeBinPath [ python27 mercurial ]} + wrapProgram $out/bin/mx \ + --prefix PATH : ${lib.makeBinPath [ python27 mercurial ]} \ + --set FINDBUGS_HOME ${findbugs} ''; meta = with stdenv.lib; { homepage = https://github.com/graalvm/mx; @@ -82,7 +97,7 @@ in rec { # copy of pkgs.oraclejvm8 with JVMCI interface (TODO: it should work with pkgs.openjdk8 too) jvmci8 = stdenv.mkDerivation rec { - version = "0.43"; + version = "0.45"; name = let n = "jvmci8u171-${version}"; in if (lib.stringLength n) == (lib.stringLength oraclejdk8.name) then @@ -93,7 +108,7 @@ in rec { owner = "graalvm"; repo = "graal-jvmci-8"; rev = "jvmci-${version}"; - sha256 = "0jkp67m7s252kngxnj0yp397pgx5z95v1lbi68v9g4dw050l28rk"; + sha256 = "1nppk9dpamisiadss1iy82i3rf6igndbf1vax85w9lz310kh0d12"; }; buildInputs = [ mx mercurial ]; postUnpack = '' @@ -122,6 +137,8 @@ in rec { installPhase = '' mv jdk1.8.0_*/linux-amd64/product $out find $out -type f -exec sed -i "s#${oraclejdk8}#$out#g" {} \; + + install -v -m0555 -D $MX_CACHE_DIR/jvmci/*hsdis*.so $out/jre/lib/amd64/hsdis-amd64.so ''; dontFixup = true; # do not nuke path of ffmpeg etc dontStrip = true; # why? see in oraclejdk derivation @@ -129,7 +146,7 @@ in rec { }; graalvm8 = stdenv.mkDerivation rec { - version = "1.0.0-rc1"; + version = "1.0.0-rc3"; name = let n = "graal-${version}"; in if (lib.stringLength n) == (lib.stringLength jvmci8.name) then @@ -140,7 +157,7 @@ in rec { owner = "oracle"; repo = "graal"; rev = "vm-${version}"; - sha256 = "1j1m53d8x0mkvqr9lwlkjddfha5jrsq9hxlblbjv1bqcivfmmfn7"; + sha256 = "1hcs4m6ailapgi3bikav1i517vqn5pn595cyqqjfvlnkjwihbnc3"; }; buildInputs = [ mx zlib mercurial jvmci8 ]; postUnpack = '' @@ -161,20 +178,42 @@ in rec { export MX_ALT_OUTPUT_ROOT=$NIX_BUILD_TOP/mxbuild export MX_CACHE_DIR=${makeMxCache graal-mxcache} - ( cd substratevm; mx --java-home $out build --no-daemon ) + ( cd substratevm + + mkdir -p clibraries + mx --java-home $out build + + # bootstrap native-image (that was removed from mx build in https://github.com/oracle/graal/commit/140d7a7edf54ec5872a8ff45869cd1ae499efde4) + mx --java-home $out native-image -cp $MX_ALT_OUTPUT_ROOT/substratevm/dists/svm-driver.jar com.oracle.svm.driver.NativeImage + ) + ( cd tools + mx --java-home $out build + ) ''; installPhase = '' - # add graal files - mkdir -p $out/jre/tools/{profiler,chromeinspector} - cp -pR substratevm/svmbuild/native-image-root/linux-amd64/bin/* $out/jre/bin/ - cp -pLR substratevm/svmbuild/native-image-root/lib/* $out/jre/lib/ || true # ignore "same file" error when dereferencing symlinks - cp -pLR substratevm/svmbuild/native-image-root/tools/* $out/jre/tools/ - cp -pR $MX_ALT_OUTPUT_ROOT/truffle/dists/* $out/jre/lib/truffle/ - cp -pR $MX_ALT_OUTPUT_ROOT/tools/dists/truffle-profiler* $out/jre/tools/profiler/ - cp -pR $MX_ALT_OUTPUT_ROOT/tools/dists/chromeinspector* $out/jre/tools/chromeinspector/ - echo "name=GraalVM ${version}" > $out/jre/lib/amd64/server/vm.properties - ln -s --relative $out/jre/bin/native-image $out/bin/native-image - cp -dpR $out/jre/lib/svm/clibraries $out/jre/lib/svm/builder/ + # add graal files modelling after directory structure of "graalvm-ce" binary distribution + mkdir -p $out/jre/tools/{profiler,chromeinspector,truffle/builder} $out/jre/lib/{graal,include,truffle/include} + cp -vpLR substratevm/svmbuild/native-image-root/lib/* $out/jre/lib/ || true # ignore "same file" error when dereferencing symlinks + cp -vp $MX_ALT_OUTPUT_ROOT/truffle/linux-amd64/truffle-nfi-native/bin/* $out/jre/lib/amd64/ + cp -vp $MX_ALT_OUTPUT_ROOT/compiler/dists/graal-*processor*.jar $out/jre/lib/graal/ + cp -vp $MX_ALT_OUTPUT_ROOT/truffle/linux-amd64/truffle-nfi-native/include/* $out/jre/lib/include/ + cp -vp $MX_ALT_OUTPUT_ROOT/compiler/dists/graal-management.jar $out/jre/lib/jvmci/ + cp -vdpR $out/jre/lib/svm/clibraries $out/jre/lib/svm/builder/ + cp -vpR $MX_ALT_OUTPUT_ROOT/truffle/dists/* $out/jre/lib/truffle/ + cp -vp $MX_ALT_OUTPUT_ROOT/truffle/linux-amd64/truffle-nfi-native/include/* $out/jre/lib/truffle/include/ + cp -vpLR substratevm/svmbuild/native-image-root/tools/* $out/jre/tools/ + cp -vpR $MX_ALT_OUTPUT_ROOT/tools/dists/chromeinspector* $out/jre/tools/chromeinspector/ + cp -vpR $MX_ALT_OUTPUT_ROOT/tools/dists/truffle-profiler* $out/jre/tools/profiler/ + cp -vpR $MX_ALT_OUTPUT_ROOT/truffle/linux-amd64/truffle-nfi-native/* $out/jre/tools/truffle/ + cp -vp $MX_ALT_OUTPUT_ROOT/truffle/dists/truffle-nfi.jar $out/jre/tools/truffle/builder/ + + echo "name=GraalVM ${version}" > $out/jre/lib/amd64/server/vm.properties + echo -n "graal" > $out/jre/lib/jvmci/compiler-name + echo -n "../truffle/truffle-api.jar:../truffle/truffle-nfi.jar" > $out/jre/lib/jvmci/parentClassLoader.classpath + + install -v -m0555 -D substratevm/com.oracle.svm.driver.nativeimage $out/jre/lib/svm/bin/native-image + ln -s ../lib/svm/bin/native-image $out/jre/bin/native-image + ln -s ../jre/bin/native-image $out/bin/native-image # BUG workaround http://mail.openjdk.java.net/pipermail/graal-dev/2017-December/005141.html substituteInPlace $out/jre/lib/security/java.security \ diff --git a/pkgs/development/compilers/kotlin/default.nix b/pkgs/development/compilers/kotlin/default.nix index 342051230030..89c6151a186b 100644 --- a/pkgs/development/compilers/kotlin/default.nix +++ b/pkgs/development/compilers/kotlin/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, makeWrapper, jre, unzip }: let - version = "1.2.50"; + version = "1.2.51"; in stdenv.mkDerivation rec { inherit version; name = "kotlin-${version}"; src = fetchurl { url = "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-compiler-${version}.zip"; - sha256 = "1abis73ij334vfwn9k4s9rsa1va7h31a9g97g84i2rrp7cq2q1mw"; + sha256 = "0b7rlv4w3bqfxwp0sici8lraskavmx08qgf1jddjcgaxh0f72x4a"; }; propagatedBuildInputs = [ jre ] ; diff --git a/pkgs/development/compilers/openjdk/10.nix b/pkgs/development/compilers/openjdk/10.nix index 7882fa49b07e..2c76d59512b6 100644 --- a/pkgs/development/compilers/openjdk/10.nix +++ b/pkgs/development/compilers/openjdk/10.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchurl, bash, cpio, pkgconfig, file, which, unzip, zip, cups, freetype , alsaLib, bootjdk, cacert, perl, liberation_ttf, fontconfig, zlib, lndir -, libX11, libICE, libXrender, libXext, libXt, libXtst, libXi, libXinerama, libXcursor +, libX11, libICE, libXrender, libXext, libXt, libXtst, libXi, libXinerama, libXcursor, libXrandr , libjpeg, giflib , setJavaClassPath , minimal ? false @@ -36,7 +36,7 @@ let buildInputs = [ cpio file which unzip zip perl bootjdk zlib cups freetype alsaLib libjpeg giflib libX11 libICE libXext libXrender libXtst libXt libXtst - libXi libXinerama libXcursor lndir fontconfig + libXi libXinerama libXcursor libXrandr lndir fontconfig ] ++ lib.optionals (!minimal && enableGnome2) [ gtk3 gnome_vfs GConf glib ]; diff --git a/pkgs/development/compilers/openjdk/8.nix b/pkgs/development/compilers/openjdk/8.nix index 9db5e8ba23c9..57771e383279 100644 --- a/pkgs/development/compilers/openjdk/8.nix +++ b/pkgs/development/compilers/openjdk/8.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchurl, bash, cpio, pkgconfig, file, which, unzip, zip, cups, freetype , alsaLib, bootjdk, cacert, perl, liberation_ttf, fontconfig, zlib, lndir -, libX11, libICE, libXrender, libXext, libXt, libXtst, libXi, libXinerama, libXcursor +, libX11, libICE, libXrender, libXext, libXt, libXtst, libXi, libXinerama, libXcursor, libXrandr , libjpeg, giflib , setJavaClassPath , minimal ? false @@ -70,7 +70,7 @@ let buildInputs = [ cpio file which unzip zip perl bootjdk zlib cups freetype alsaLib libjpeg giflib libX11 libICE libXext libXrender libXtst libXt libXtst - libXi libXinerama libXcursor lndir fontconfig + libXi libXinerama libXcursor libXrandr lndir fontconfig ] ++ lib.optionals (!minimal && enableGnome2) [ gtk2 gnome_vfs GConf glib ]; diff --git a/pkgs/development/compilers/wcc/default.nix b/pkgs/development/compilers/wcc/default.nix new file mode 100644 index 000000000000..8cb1e8e5f2cd --- /dev/null +++ b/pkgs/development/compilers/wcc/default.nix @@ -0,0 +1,49 @@ +{ stdenv, fetchFromGitHub, capstone, libbfd, libelf, libiberty, readline }: + +stdenv.mkDerivation rec { + name = "wcc-unstable-${version}"; + version = "2018-04-05"; + + src = fetchFromGitHub { + owner = "endrazine"; + repo = "wcc"; + rev = "f141963ff193d7e1931d41acde36d20d7221e74f"; + sha256 = "1f0w869x0176n5nsq7m70r344gv5qvfmk7b58syc0jls8ghmjvb4"; + fetchSubmodules = true; + }; + + buildInputs = [ capstone libbfd libelf libiberty readline ]; + + postPatch = '' + sed -i src/wsh/include/libwitch/wsh.h src/wsh/scripts/INDEX \ + -e "s#/usr/share/wcc#$out/share/wcc#" + ''; + + installFlags = [ "DESTDIR=$(out)" ]; + + preInstall = '' + mkdir -p $out/usr/bin + ''; + + postInstall = '' + mv $out/usr/* $out + rmdir $out/usr + mkdir -p $out/share/man/man1 + cp doc/manpages/*.1 $out/share/man/man1/ + ''; + + preFixup = '' + # Let patchShebangs rewrite shebangs with wsh. + PATH+=:$out/bin + ''; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + homepage = https://github.com/endrazine/wcc; + description = "Witchcraft compiler collection: tools to convert and script ELF files"; + license = licenses.mit; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ orivej ]; + }; +} diff --git a/pkgs/development/coq-modules/equations/default.nix b/pkgs/development/coq-modules/equations/default.nix index 1867d9605661..ec5491622bb4 100644 --- a/pkgs/development/coq-modules/equations/default.nix +++ b/pkgs/development/coq-modules/equations/default.nix @@ -14,6 +14,12 @@ let param = sha256 = "1bavg4zl1xn0jqrdq8iw7xqzdvdf39ligj9saz5m9c507zri952h"; }; + "8.8" = { + version = "1.0"; + rev = "v1.0-8.8"; + sha256 = "129rxsdsf88vjcw0xhm74yax1hmnk6f8n9ksg0hcyyjq1ijddiwa"; + }; + }."${coq.coq-version}" ; in diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 966334f1e45c..c3b04c22c2aa 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -665,7 +665,7 @@ self: super: { # Need newer versions of their dependencies than the ones we have in LTS-11.x. cabal2nix = super.cabal2nix.overrideScope (self: super: { hpack = self.hpack_0_28_2; hackage-db = self.hackage-db_2_0_1; }); dbus-hslogger = super.dbus-hslogger.overrideScope (self: super: { dbus = self.dbus_1_0_1; }); - graphviz = (addBuildTool super.graphviz pkgs.graphviz).overrideScope (self: super: { wl-pprint-text = self.wl-pprint-text_1_2_0_0; base-compat = self.base-compat_0_10_1; }); + graphviz = (addBuildTool super.graphviz pkgs.graphviz).overrideScope (self: super: { wl-pprint-text = self.wl-pprint-text_1_2_0_0; base-compat = self.base-compat_0_10_4; }); status-notifier-item = super.status-notifier-item.overrideScope (self: super: { dbus = self.dbus_1_0_1; }); # https://github.com/bos/configurator/issues/22 @@ -989,7 +989,7 @@ self: super: { cp -v embeddedfiles/*.info* $out/share/info/ ''; }); - hledger-ui = overrideCabal super.hledger-ui (drv: { + hledger-ui = (overrideCabal super.hledger-ui (drv: { postInstall = '' for i in $(seq 1 9); do for j in *.$i; do @@ -999,8 +999,8 @@ self: super: { done mkdir -p $out/share/info cp -v *.info* $out/share/info/ - ''; - }); + ''; # hledger-ui 1.10 needs newer fsnotify than lts-11 provides. + })).overrideScope (self: super: { fsnotify = self.fsnotify_0_3_0_1; }); hledger-web = overrideCabal super.hledger-web (drv: { postInstall = '' for i in $(seq 1 9); do @@ -1063,14 +1063,17 @@ self: super: { }); # dhall-json requires a very particular dhall version - dhall-json_1_2_1 = super.dhall-json_1_2_1.override { dhall = self.dhall_1_14_0; }; + dhall-json_1_2_1 = super.dhall-json_1_2_1.override { dhall = self.dhall_1_15_0; }; + + # dhall-nix requires a very particular dhall version + dhall-nix = super.dhall-nix.override { dhall = self.dhall_1_15_0; }; # https://github.com/fpco/streaming-commons/issues/49 streaming-commons = dontCheck super.streaming-commons; # cabal2nix generates a dependency on base-compat, which is the wrong version base-compat-batteries = super.base-compat-batteries.override { - base-compat = super.base-compat_0_10_1; + base-compat = super.base-compat_0_10_4; }; } diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix index ce24d9a27f48..6ea2db37d21d 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix @@ -94,4 +94,16 @@ self: super: { haddock-library = dontHaddock (dontCheck self.haddock-library_1_5_0_1); })); + # Hledger depends indirectly on different versions of base-compat. The + # override can probably be removed once we update to LTS 12.x. + hledger-lib = super.hledger-lib.overrideScope (self: super: { base-compat = self.base-compat_0_10_4; }); + hledger = super.hledger.overrideScope (self: super: { + base-compat = self.base-compat_0_10_4; + aeson = self.aeson_1_4_0_0; + }); + hledger-web = super.hledger-web.overrideScope (self: super: { + base-compat = self.base-compat_0_10_4; + aeson = self.aeson_1_4_0_0; + }); + } diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix index 736be056e0e7..b9e8a2bb4725 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix @@ -23,7 +23,6 @@ self: super: { ghc-prim = null; ghci = null; haskeline = null; - hoopl = self.hoopl_3_10_2_2; # no longer a core library in GHC 8.4.x hpc = null; integer-gmp = null; mtl = null; @@ -40,6 +39,9 @@ self: super: { unix = null; xhtml = null; + # Use to be a core-library, but no longer is since GHC 8.4.x. + hoopl = self.hoopl_3_10_2_2; + doctest = dontCheck super.doctest_0_16_0; # tests depend on very recent QuickCheck hackage-db = super.hackage-db_2_0_1; @@ -121,9 +123,6 @@ self: super: { }; }); - ## Bounds related: it wants base-compat 0.9. - criterion = super.criterion_1_4_1_0; - ## Unmerged ## Unmerged. PR: https://github.com/wrengr/bytestring-trie/pull/3 @@ -391,15 +390,17 @@ self: super: { enclosed-exceptions = dontCheck super.enclosed-exceptions; # Older versions don't compile. - base-compat = self.base-compat_0_10_1; + base-compat = self.base-compat_0_10_4; brick = self.brick_0_37_1; - dhall = self.dhall_1_14_0; - dhall_1_13_0 = doJailbreak super.dhall_1_14_0; # support ansi-terminal 0.8.x + criterion = super.criterion_1_5_0_0; + dhall = self.dhall_1_15_0; + # This is probably obsolete: + # dhall_1_15_0 = doJailbreak super.dhall_1_15_0; # support ansi-terminal 0.8.x HaTeX = self.HaTeX_3_19_0_0; hpack = self.hpack_0_28_2; - hspec = dontCheck super.hspec_2_5_3; - hspec-core = dontCheck super.hspec-core_2_5_3; - hspec-discover = self.hspec-discover_2_5_3; + hspec = dontCheck super.hspec_2_5_4; + hspec-core = dontCheck super.hspec-core_2_5_4; + hspec-discover = self.hspec-discover_2_5_4; hspec-smallcheck = self.hspec-smallcheck_0_5_2; matrix = self.matrix_0_3_6_1; pandoc = self.pandoc_2_2_1; @@ -415,24 +416,4 @@ self: super: { # https://github.com/xmonad/xmonad-contrib/issues/235 xmonad-contrib = doJailbreak (appendPatch super.xmonad-contrib ./patches/xmonad-contrib-ghc-8.4.1-fix.patch); - # Contributed by Bertram Felgenhauer <int-e@gmx.de>. - arrows = appendPatch super.arrows (pkgs.fetchpatch { - url = https://raw.githubusercontent.com/lambdabot/lambdabot/ghc-8.4.1/patches/arrows-0.4.4.1.patch; - sha256 = "0j859vclcfnz8n2mw466mv00kjsa9gdbrppjc1m3b68jbypdmfvr"; - }); - - # Contributed by Bertram Felgenhauer <int-e@gmx.de>. - flexible-defaults = appendPatch super.flexible-defaults (pkgs.fetchpatch { - url = https://raw.githubusercontent.com/lambdabot/lambdabot/ghc-8.4.1/patches/flexible-defaults-0.0.1.2.patch; - sha256 = "1bpsqq80h6nxm04wddgcgyzn0fjfsmhccmqb211jqswv5209znx8"; - }); - - lambdabot-core = appendPatch super.lambdabot-core ./patches/lambdabot-core-ghc-8.4.x-fix.patch; - - # Version 1.9.1 excludes base-compat 0.10.x for the benefit of older - # compilers, but ghc 8.4.x works fine with the new version. - hledger-lib = doJailbreak super.hledger-lib; - hledger = doJailbreak super.hledger; - hledger-ui = doJailbreak super.hledger-ui; - } diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix new file mode 100644 index 000000000000..bc540cbe36d6 --- /dev/null +++ b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix @@ -0,0 +1,47 @@ +{ pkgs, haskellLib }: + +with haskellLib; + +self: super: { + + # Use the latest LLVM. + inherit (pkgs) llvmPackages; + + # Disable GHC 8.6.x core libraries. + array = null; + base = null; + binary = null; + bytestring = null; + Cabal = null; + containers = null; + deepseq = null; + directory = null; + filepath = null; + ghc-boot = null; + ghc-boot-th = null; + ghc-compact = null; + ghc-heap = null; + ghc-prim = null; + ghci = null; + haskeline = null; + hpc = null; + integer-gmp = null; + libiserv = null; + mtl = null; + parsec = null; + pretty = null; + process = null; + rts = null; + stm = null; + template-haskell = null; + terminfo = null; + text = null; + time = null; + transformers = null; + unix = null; + xhtml = null; + + # Use to be a core-library, but no longer is since GHC 8.4.x. + hoopl = self.hoopl_3_10_2_2; + +} diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index bc2412aca11a..6957614c95cc 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -38,7 +38,9 @@ core-packages: - ghcjs-base-0 default-package-overrides: - # LTS Haskell 11.15 + # Newer versions require contravariant-1.5.*, which many builds refuse at the moment. + - base-compat-batteries ==0.10.1 + # LTS Haskell 11.16 - abstract-deque ==0.3 - abstract-deque-tests ==0.3 - abstract-par ==0.3.3 @@ -246,9 +248,9 @@ default-package-overrides: - basic-prelude ==0.7.0 - bbdb ==0.8 - bcrypt ==0.0.11 - - beam-core ==0.7.2.1 - - beam-migrate ==0.3.2.0 - - beam-sqlite ==0.3.2.1 + - beam-core ==0.7.2.2 + - beam-migrate ==0.3.2.1 + - beam-sqlite ==0.3.2.2 - bench ==1.0.9 - benchpress ==0.2.2.10 - bencode ==0.6.0.0 @@ -612,7 +614,7 @@ default-package-overrides: - doctemplates ==0.2.2.1 - doctest ==0.13.0 - doctest-discover ==0.1.0.7 - - doctest-driver-gen ==0.2.0.2 + - doctest-driver-gen ==0.2.0.3 - do-list ==1.0.1 - dom-parser ==3.0.0 - dotenv ==0.5.2.5 @@ -736,7 +738,7 @@ default-package-overrides: - flac ==0.1.2 - flac-picture ==0.1.1 - flat-mcmc ==1.5.0 - - flexible-defaults ==0.0.1.2 + - flexible-defaults ==0.0.2 - FloatingHex ==0.4 - floatshow ==0.2.4 - flow ==1.0.12 @@ -776,7 +778,7 @@ default-package-overrides: - functor-classes-compat ==1 - fuzzcheck ==0.1.1 - fuzzyset ==0.1.0.6 - - gauge ==0.2.1 + - gauge ==0.2.2 - gc ==0.0.2 - gd ==3000.7.3 - gdax ==0.6.0.0 @@ -784,7 +786,7 @@ default-package-overrides: - general-games ==1.1.1 - generic-aeson ==0.2.0.9 - generic-arbitrary ==0.1.0 - - generic-deriving ==1.12.1 + - generic-deriving ==1.12.2 - generic-lens ==0.5.1.0 - GenericPretty ==1.2.2 - generic-random ==1.1.0.2 @@ -817,7 +819,7 @@ default-package-overrides: - ghc-exactprint ==0.5.6.1 - ghcid ==0.6.10 - ghcjs-base-stub ==0.1.0.4 - - ghcjs-codemirror ==0.0.0.1 + - ghcjs-codemirror ==0.0.0.2 - ghcjs-perch ==0.3.3.2 - ghc-parser ==0.2.0.2 - ghc-paths ==0.1.0.9 @@ -896,8 +898,8 @@ default-package-overrides: - HandsomeSoup ==0.4.2 - handwriting ==0.1.0.3 - hapistrano ==0.3.5.7 - - happstack-jmacro ==7.0.12 - - happstack-server ==7.5.1 + - happstack-jmacro ==7.0.12.1 + - happstack-server ==7.5.1.1 - happstack-server-tls ==7.1.6.5 - happy ==1.19.9 - hasbolt ==0.1.3.0 @@ -906,7 +908,7 @@ default-package-overrides: - hashids ==1.0.2.4 - hashmap ==1.3.3 - hashtables ==1.2.3.1 - - haskeline ==0.7.4.2 + - haskeline ==0.7.4.3 - haskell-gi ==0.21.3 - haskell-gi-base ==0.21.1 - haskell-gi-overloading ==0.0 @@ -965,7 +967,7 @@ default-package-overrides: - hexml-lens ==0.2.1 - hexpat ==0.20.13 - hexstring ==0.11.1 - - hformat ==0.3.2.0 + - hformat ==0.3.3.0 - hfsevents ==0.1.6 - hid ==0.2.2 - hidapi ==0.1.4 @@ -1065,7 +1067,7 @@ default-package-overrides: - htaglib ==1.1.1 - HTF ==0.13.2.4 - html ==1.0.1.2 - - html-conduit ==1.3.0 + - html-conduit ==1.3.1 - html-email-validate ==0.2.0.0 - html-entity-map ==0.1.0.0 - htoml ==1.0.0.3 @@ -1147,7 +1149,7 @@ default-package-overrides: - inline-c ==0.6.0.6 - inline-c-cpp ==0.2.1.0 - inline-java ==0.8.2 - - inline-r ==0.9.1 + - inline-r ==0.9.2 - insert-ordered-containers ==0.2.1.0 - inspection-testing ==0.2.0.1 - instance-control ==0.1.2.0 @@ -1227,8 +1229,6 @@ default-package-overrides: - l10n ==0.1.0.1 - labels ==0.3.3 - lackey ==1.0.2 - - lambdabot-core ==5.1.0.1 - - lambdabot-irc-plugins ==5.1.0.1 - lame ==0.1.1 - language-c ==0.7.2 - language-c-quote ==0.12.1 @@ -1357,7 +1357,7 @@ default-package-overrides: - messagepack-rpc ==0.5.1 - metrics ==0.4.1.1 - MFlow ==0.4.6.0 - - microformats2-parser ==1.0.1.7 + - microformats2-parser ==1.0.1.8 - microlens ==0.4.8.3 - microlens-aeson ==2.3.0 - microlens-contra ==0.1.0.1 @@ -1372,7 +1372,7 @@ default-package-overrides: - milena ==0.5.2.2 - mime-mail ==0.4.14 - mime-mail-ses ==0.4.1 - - mime-types ==0.1.0.7 + - mime-types ==0.1.0.8 - minimorph ==0.1.6.1 - minio-hs ==1.0.1 - miniutter ==0.4.7.0 @@ -1447,7 +1447,7 @@ default-package-overrides: - murmur-hash ==0.1.0.9 - mustache ==2.3.0 - mutable-containers ==0.3.4 - - mwc-probability ==2.0.3 + - mwc-probability ==2.0.4 - mwc-random ==0.13.6.0 - mwc-random-accelerate ==0.1.0.0 - mysql ==0.1.5 @@ -1477,7 +1477,7 @@ default-package-overrides: - network-anonymous-tor ==0.11.0 - network-attoparsec ==0.12.2 - network-carbon ==1.0.12 - - network-conduit-tls ==1.3.0 + - network-conduit-tls ==1.3.2 - network-house ==0.1.0.2 - network-info ==0.2.0.10 - network-ip ==0.3.0.2 @@ -1626,7 +1626,7 @@ default-package-overrides: - pipes-extras ==1.0.14 - pipes-fastx ==0.3.0.0 - pipes-fluid ==0.6.0.0 - - pipes-group ==1.0.10 + - pipes-group ==1.0.11 - pipes-misc ==0.4.0.1 - pipes-mongodb ==0.1.0.0 - pipes-network ==0.6.5 @@ -1647,7 +1647,7 @@ default-package-overrides: - poly-arity ==0.1.0 - polynomials-bernstein ==1.1.2 - polyparse ==1.12 - - pomaps ==0.0.0.4 + - pomaps ==0.0.1.0 - pooled-io ==0.0.2.1 - PortMidi ==0.1.6.1 - posix-paths ==0.2.1.5 @@ -1699,8 +1699,8 @@ default-package-overrides: - prompt ==0.1.1.2 - protobuf ==0.2.1.2 - protobuf-simple ==0.1.0.5 - - protocol-buffers ==2.4.10 - - protocol-buffers-descriptor ==2.4.10 + - protocol-buffers ==2.4.11 + - protocol-buffers-descriptor ==2.4.11 - protocol-radius ==0.0.1.0 - protocol-radius-test ==0.0.1.0 - proto-lens ==0.2.2.0 @@ -1843,8 +1843,8 @@ default-package-overrides: - say ==0.1.0.0 - sbp ==2.3.16 - sbv ==7.5 - - SCalendar ==1.1.0 - scalendar ==1.2.0 + - SCalendar ==1.1.0 - scalpel ==0.5.1 - scalpel-core ==0.5.1 - scanner ==0.2 @@ -1887,7 +1887,7 @@ default-package-overrides: - servant-generic ==0.1.0.2 - servant-github-webhook ==0.4.1.0 - servant-js ==0.9.3.2 - - servant-JuicyPixels ==0.3.0.3 + - servant-JuicyPixels ==0.3.0.4 - servant-kotlin ==0.1.1.1 - servant-lucid ==0.8 - servant-mock ==0.8.4 @@ -1895,7 +1895,7 @@ default-package-overrides: - servant-purescript ==0.9.0.2 - servant-ruby ==0.7.0.0 - servant-server ==0.13.0.1 - - servant-static-th ==0.2.0.1 + - servant-static-th ==0.2.2.0 - servant-subscriber ==0.6.0.1 - servant-swagger ==1.1.5 - servant-swagger-ui ==0.2.5.3.9.1 @@ -1938,7 +1938,7 @@ default-package-overrides: - skein ==1.0.9.4 - skeletons ==0.4.0 - skylighting ==0.6 - - slack-web ==0.2.0.5 + - slack-web ==0.2.0.6 - slave-thread ==1.0.2 - slug ==0.1.7 - smallcheck ==1.1.4 @@ -2073,7 +2073,7 @@ default-package-overrides: - tasty-expected-failure ==0.11.1.1 - tasty-golden ==2.3.2 - tasty-hedgehog ==0.1.0.2 - - tasty-hspec ==1.1.4 + - tasty-hspec ==1.1.5 - tasty-html ==0.4.1.1 - tasty-hunit ==0.10.0.1 - tasty-kat ==0.0.3 @@ -2125,7 +2125,7 @@ default-package-overrides: - text-zipper ==0.10.1 - tfp ==1.0.0.2 - tf-random ==0.5 - - th-abstraction ==0.2.7.0 + - th-abstraction ==0.2.8.0 - th-data-compat ==0.0.2.6 - th-desugar ==1.7 - these ==0.7.4 @@ -2133,7 +2133,7 @@ default-package-overrides: - th-extras ==0.0.0.4 - th-lift ==0.7.10 - th-lift-instances ==0.1.11 - - th-orphans ==0.13.5 + - th-orphans ==0.13.6 - thread-hierarchy ==0.3.0.0 - thread-local-storage ==0.1.2 - threads ==0.5.1.6 @@ -2424,7 +2424,7 @@ default-package-overrides: - xturtle ==0.2.0.0 - xxhash ==0.0.2 - xxhash-ffi ==0.2.0.0 - - yaml ==0.8.30 + - yaml ==0.8.31.1 - Yampa ==0.10.7 - YampaSynth ==0.2 - yeshql ==3.0.1.3 @@ -2472,7 +2472,7 @@ default-package-overrides: - zeromq4-haskell ==0.7.0 - zim-parser ==0.2.1.0 - zip ==1.0.0 - - zip-archive ==0.3.2.5 + - zip-archive ==0.3.3 - zippers ==0.2.5 - zlib ==0.6.2 - zlib-bindings ==0.1.1.5 @@ -2811,6 +2811,7 @@ dont-distribute-packages: affine-invariant-ensemble-mcmc: [ i686-linux, x86_64-linux, x86_64-darwin ] affine: [ i686-linux, x86_64-linux, x86_64-darwin ] afv: [ i686-linux, x86_64-linux, x86_64-darwin ] + ag-pictgen: [ i686-linux, x86_64-linux, x86_64-darwin ] Agata: [ i686-linux, x86_64-linux, x86_64-darwin ] Agda-executable: [ i686-linux, x86_64-linux, x86_64-darwin ] agda-server: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2824,7 +2825,17 @@ dont-distribute-packages: airbrake: [ i686-linux, x86_64-linux, x86_64-darwin ] airship: [ i686-linux, x86_64-linux, x86_64-darwin ] airtable-api: [ i686-linux, x86_64-linux, x86_64-darwin ] + aivika-branches: [ i686-linux, x86_64-linux, x86_64-darwin ] + aivika-distributed: [ i686-linux, x86_64-linux, x86_64-darwin ] + aivika-experiment-cairo: [ i686-linux, x86_64-linux, x86_64-darwin ] + aivika-experiment-chart: [ i686-linux, x86_64-linux, x86_64-darwin ] aivika-experiment-diagrams: [ i686-linux, x86_64-linux, x86_64-darwin ] + aivika-experiment: [ i686-linux, x86_64-linux, x86_64-darwin ] + aivika-gpss: [ i686-linux, x86_64-linux, x86_64-darwin ] + aivika-lattice: [ i686-linux, x86_64-linux, x86_64-darwin ] + aivika-realtime: [ i686-linux, x86_64-linux, x86_64-darwin ] + aivika-transformers: [ i686-linux, x86_64-linux, x86_64-darwin ] + aivika: [ i686-linux, x86_64-linux, x86_64-darwin ] ajhc: [ i686-linux, x86_64-linux, x86_64-darwin ] al: [ i686-linux, x86_64-linux, x86_64-darwin ] AlanDeniseEricLauren: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2837,6 +2848,7 @@ dont-distribute-packages: algebraic-prelude: [ i686-linux, x86_64-linux, x86_64-darwin ] algebraic: [ i686-linux, x86_64-linux, x86_64-darwin ] algo-s: [ i686-linux, x86_64-linux, x86_64-darwin ] + algolia: [ i686-linux, x86_64-linux, x86_64-darwin ] AlgoRhythm: [ i686-linux, x86_64-linux, x86_64-darwin ] AlgorithmW: [ i686-linux, x86_64-linux, x86_64-darwin ] align-text: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3072,6 +3084,7 @@ dont-distribute-packages: asn1-codec: [ i686-linux, x86_64-linux, x86_64-darwin ] AspectAG: [ i686-linux, x86_64-linux, x86_64-darwin ] assert: [ i686-linux, x86_64-linux, x86_64-darwin ] + asset-map: [ i686-linux, x86_64-linux, x86_64-darwin ] assimp: [ i686-linux, x86_64-linux, x86_64-darwin ] astrds: [ i686-linux, x86_64-linux, x86_64-darwin ] astview: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3191,6 +3204,7 @@ dont-distribute-packages: base-noprelude: [ i686-linux, x86_64-linux, x86_64-darwin ] base64-bytestring-type: [ i686-linux, x86_64-linux, x86_64-darwin ] base64-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] + baserock-schema: [ i686-linux, x86_64-linux, x86_64-darwin ] basic-sop: [ i686-linux, x86_64-linux, x86_64-darwin ] BASIC: [ i686-linux, x86_64-linux, x86_64-darwin ] basic: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3203,6 +3217,7 @@ dont-distribute-packages: battleships: [ i686-linux, x86_64-linux, x86_64-darwin ] bayes-stack: [ i686-linux, x86_64-linux, x86_64-darwin ] BCMtools: [ i686-linux, x86_64-linux, x86_64-darwin ] + bdcs-api: [ i686-linux, x86_64-linux, x86_64-darwin ] bdcs: [ i686-linux, x86_64-linux, x86_64-darwin ] beam-core: [ i686-linux, x86_64-linux, x86_64-darwin ] beam-migrate: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3300,6 +3315,7 @@ dont-distribute-packages: BiobaseTypes: [ i686-linux, x86_64-linux, x86_64-darwin ] BiobaseVienna: [ i686-linux, x86_64-linux, x86_64-darwin ] BiobaseXNA: [ i686-linux, x86_64-linux, x86_64-darwin ] + biohazard: [ i686-linux, x86_64-linux, x86_64-darwin ] BioHMM: [ i686-linux, x86_64-linux, x86_64-darwin ] bioinformatics-toolkit: [ i686-linux, x86_64-linux, x86_64-darwin ] biophd: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3431,6 +3447,7 @@ dont-distribute-packages: bytestringreadp: [ i686-linux, x86_64-linux, x86_64-darwin ] c-dsl: [ i686-linux, x86_64-linux, x86_64-darwin ] c-io: [ i686-linux, x86_64-linux, x86_64-darwin ] + c-mosquitto: [ i686-linux, x86_64-linux, x86_64-darwin ] c2hsc: [ i686-linux, x86_64-linux, x86_64-darwin ] ca: [ i686-linux, x86_64-linux, x86_64-darwin ] cabal-audit: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3472,6 +3489,8 @@ dont-distribute-packages: CabalSearch: [ i686-linux, x86_64-linux, x86_64-darwin ] cabalvchk: [ i686-linux, x86_64-linux, x86_64-darwin ] cabocha: [ i686-linux, x86_64-linux, x86_64-darwin ] + cachix-api: [ i686-linux, x86_64-linux, x86_64-darwin ] + cachix: [ i686-linux, x86_64-linux, x86_64-darwin ] cacophony: [ i686-linux, x86_64-linux, x86_64-darwin ] caffegraph: [ i686-linux, x86_64-linux, x86_64-darwin ] cake3: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3578,6 +3597,7 @@ dont-distribute-packages: chalkboard: [ i686-linux, x86_64-linux, x86_64-darwin ] charade: [ i686-linux, x86_64-linux, x86_64-darwin ] Chart-diagrams: [ i686-linux, x86_64-linux, x86_64-darwin ] + Chart-gtk: [ i686-linux, x86_64-linux, x86_64-darwin ] chart-histogram: [ i686-linux, x86_64-linux, x86_64-darwin ] Chart-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] chart-unit: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3656,6 +3676,7 @@ dont-distribute-packages: click-clack: [ i686-linux, x86_64-linux, x86_64-darwin ] clif: [ i686-linux, x86_64-linux, x86_64-darwin ] clifford: [ i686-linux, x86_64-linux, x86_64-darwin ] + clifm: [ i686-linux, x86_64-linux, x86_64-darwin ] clingo: [ i686-linux, x86_64-linux, x86_64-darwin ] clippard: [ i686-linux, x86_64-linux, x86_64-darwin ] clipper: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4056,6 +4077,7 @@ dont-distribute-packages: dead-code-detection: [ i686-linux, x86_64-linux, x86_64-darwin ] dead-simple-json: [ i686-linux, x86_64-linux, x86_64-darwin ] debug-me: [ i686-linux, x86_64-linux, x86_64-darwin ] + debug-trace-var: [ i686-linux, x86_64-linux, x86_64-darwin ] debug: [ i686-linux, x86_64-linux, x86_64-darwin ] decepticons: [ i686-linux, x86_64-linux, x86_64-darwin ] decimal-arithmetic: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4098,6 +4120,7 @@ dont-distribute-packages: derp-lib: [ i686-linux, x86_64-linux, x86_64-darwin ] descript-lang: [ i686-linux, x86_64-linux, x86_64-darwin ] deterministic-game-engine: [ i686-linux, x86_64-linux, x86_64-darwin ] + detour-via-uom: [ i686-linux, x86_64-linux, x86_64-darwin ] deunicode: [ i686-linux, x86_64-linux, x86_64-darwin ] dewdrop: [ i686-linux, x86_64-linux, x86_64-darwin ] Dflow: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4147,6 +4170,7 @@ dont-distribute-packages: DifferenceLogic: [ i686-linux, x86_64-linux, x86_64-darwin ] DifferentialEvolution: [ i686-linux, x86_64-linux, x86_64-darwin ] difftodo: [ i686-linux, x86_64-linux, x86_64-darwin ] + digestive-bootstrap: [ i686-linux, x86_64-linux, x86_64-darwin ] digestive-foundation-lucid: [ i686-linux, x86_64-linux, x86_64-darwin ] digestive-functors-heist: [ i686-linux, x86_64-linux, x86_64-darwin ] digestive-functors-hsp: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4491,6 +4515,7 @@ dont-distribute-packages: fastcgi: [ i686-linux, x86_64-linux, x86_64-darwin ] fastedit: [ i686-linux, x86_64-linux, x86_64-darwin ] fastirc: [ i686-linux, x86_64-linux, x86_64-darwin ] + fastly: [ i686-linux, x86_64-linux, x86_64-darwin ] FastPush: [ i686-linux, x86_64-linux, x86_64-darwin ] FastxPipe: [ i686-linux, x86_64-linux, x86_64-darwin ] fathead-util: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4531,6 +4556,7 @@ dont-distribute-packages: FermatsLastMargin: [ i686-linux, x86_64-linux, x86_64-darwin ] fernet: [ i686-linux, x86_64-linux, x86_64-darwin ] FerryCore: [ i686-linux, x86_64-linux, x86_64-darwin ] + festung: [ i686-linux, x86_64-linux, x86_64-darwin ] Feval: [ i686-linux, x86_64-linux, x86_64-darwin ] ffeed: [ i686-linux, x86_64-linux, x86_64-darwin ] fficxx: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4594,6 +4620,7 @@ dont-distribute-packages: flexiwrap: [ i686-linux, x86_64-linux, x86_64-darwin ] flickr: [ i686-linux, x86_64-linux, x86_64-darwin ] flight-igc: [ i686-linux, x86_64-linux, x86_64-darwin ] + flight-kml: [ i686-linux, x86_64-linux, x86_64-darwin ] Flippi: [ i686-linux, x86_64-linux, x86_64-darwin ] flite: [ i686-linux, x86_64-linux, x86_64-darwin ] floating-bits: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4681,6 +4708,7 @@ dont-distribute-packages: fresh: [ i686-linux, x86_64-linux, x86_64-darwin ] friday-devil: [ i686-linux, x86_64-linux, x86_64-darwin ] friday-scale-dct: [ i686-linux, x86_64-linux, x86_64-darwin ] + fromhtml: [ i686-linux, x86_64-linux, x86_64-darwin ] frown: [ i686-linux, x86_64-linux, x86_64-darwin ] frp-arduino: [ i686-linux, x86_64-linux, x86_64-darwin ] frpnow-gtk3: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4703,6 +4731,7 @@ dont-distribute-packages: funbot-client: [ i686-linux, x86_64-linux, x86_64-darwin ] funbot-git-hook: [ i686-linux, x86_64-linux, x86_64-darwin ] funbot: [ i686-linux, x86_64-linux, x86_64-darwin ] + funcons-lambda-cbv-mp: [ i686-linux, x86_64-linux, x86_64-darwin ] funcons-tools: [ i686-linux, x86_64-linux, x86_64-darwin ] function-combine: [ i686-linux, x86_64-linux, x86_64-darwin ] function-instances-algebra: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4910,6 +4939,7 @@ dont-distribute-packages: githud: [ i686-linux, x86_64-linux, x86_64-darwin ] gitignore: [ i686-linux, x86_64-linux, x86_64-darwin ] gitit: [ i686-linux, x86_64-linux, x86_64-darwin ] + gitlab-api: [ i686-linux, x86_64-linux, x86_64-darwin ] gitlib-cmdline: [ i686-linux, x86_64-linux, x86_64-darwin ] gitlib-cross: [ i686-linux, x86_64-linux, x86_64-darwin ] gitlib-libgit2: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5132,6 +5162,7 @@ dont-distribute-packages: graph-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] graph-visit: [ i686-linux, x86_64-linux, x86_64-darwin ] Graph500: [ i686-linux, x86_64-linux, x86_64-darwin ] + graph: [ i686-linux, x86_64-linux, x86_64-darwin ] Graphalyze: [ i686-linux, x86_64-linux, x86_64-darwin ] graphbuilder: [ i686-linux, x86_64-linux, x86_64-darwin ] graphene: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5144,6 +5175,7 @@ dont-distribute-packages: graphtype: [ i686-linux, x86_64-linux, x86_64-darwin ] graql: [ i686-linux, x86_64-linux, x86_64-darwin ] grasp: [ i686-linux, x86_64-linux, x86_64-darwin ] + gray-code: [ i686-linux, x86_64-linux, x86_64-darwin ] gray-extended: [ i686-linux, x86_64-linux, x86_64-darwin ] graylog: [ i686-linux, x86_64-linux, x86_64-darwin ] greencard-lib: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5282,6 +5314,7 @@ dont-distribute-packages: halfs: [ i686-linux, x86_64-linux, x86_64-darwin ] halipeto: [ i686-linux, x86_64-linux, x86_64-darwin ] halive: [ i686-linux, x86_64-linux, x86_64-darwin ] + hall-symbols: [ i686-linux, x86_64-linux, x86_64-darwin ] halma-gui: [ i686-linux, x86_64-linux, x86_64-darwin ] halma-telegram-bot: [ i686-linux, x86_64-linux, x86_64-darwin ] halma: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5404,6 +5437,7 @@ dont-distribute-packages: haskell-names: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-neo4j-client: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-openflow: [ i686-linux, x86_64-linux, x86_64-darwin ] + haskell-overridez: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-packages: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-pdf-presenter: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-platform-test: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5536,6 +5570,7 @@ dont-distribute-packages: hBDD-CMUBDD: [ i686-linux, x86_64-linux, x86_64-darwin ] hBDD-CUDD: [ i686-linux, x86_64-linux, x86_64-darwin ] hbeat: [ i686-linux, x86_64-linux, x86_64-darwin ] + hbf: [ i686-linux, x86_64-linux, x86_64-darwin ] hblas: [ i686-linux, x86_64-linux, x86_64-darwin ] hblock: [ i686-linux, x86_64-linux, x86_64-darwin ] HCard: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5743,6 +5778,7 @@ dont-distribute-packages: HLearn-classification: [ i686-linux, x86_64-linux, x86_64-darwin ] HLearn-datastructures: [ i686-linux, x86_64-linux, x86_64-darwin ] HLearn-distributions: [ i686-linux, x86_64-linux, x86_64-darwin ] + hledger-api: [ i686-linux, x86_64-linux, x86_64-darwin ] hledger-chart: [ i686-linux, x86_64-linux, x86_64-darwin ] hledger-diff: [ i686-linux, x86_64-linux, x86_64-darwin ] hledger-irr: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6060,6 +6096,7 @@ dont-distribute-packages: HTicTacToe: [ i686-linux, x86_64-linux, x86_64-darwin ] htlset: [ i686-linux, x86_64-linux, x86_64-darwin ] html-entities: [ i686-linux, x86_64-linux, x86_64-darwin ] + html-entity: [ i686-linux, x86_64-linux, x86_64-darwin ] html-rules: [ i686-linux, x86_64-linux, x86_64-darwin ] html-tokenizer: [ i686-linux, x86_64-linux, x86_64-darwin ] hts: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6082,6 +6119,7 @@ dont-distribute-packages: http-reverse-proxy: [ i686-linux, x86_64-linux, x86_64-darwin ] http-shed: [ i686-linux, x86_64-linux, x86_64-darwin ] http-wget: [ i686-linux, x86_64-linux, x86_64-darwin ] + http2-client-grpc: [ i686-linux, x86_64-linux, x86_64-darwin ] http2-client: [ i686-linux, x86_64-linux, x86_64-darwin ] https-everywhere-rules-raw: [ i686-linux, x86_64-linux, x86_64-darwin ] https-everywhere-rules: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6224,6 +6262,7 @@ dont-distribute-packages: improve: [ i686-linux, x86_64-linux, x86_64-darwin ] INblobs: [ i686-linux, x86_64-linux, x86_64-darwin ] inch: [ i686-linux, x86_64-linux, x86_64-darwin ] + include-file: [ i686-linux, x86_64-linux, x86_64-darwin ] incremental-computing: [ i686-linux, x86_64-linux, x86_64-darwin ] incremental-maps: [ i686-linux, x86_64-linux, x86_64-darwin ] incremental-parser: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6336,6 +6375,7 @@ dont-distribute-packages: jason: [ i686-linux, x86_64-linux, x86_64-darwin ] java-bridge-extras: [ i686-linux, x86_64-linux, x86_64-darwin ] java-bridge: [ i686-linux, x86_64-linux, x86_64-darwin ] + java-character: [ i686-linux, x86_64-linux, x86_64-darwin ] java-reflect: [ i686-linux, x86_64-linux, x86_64-darwin ] javaclass: [ i686-linux, x86_64-linux, x86_64-darwin ] Javasf: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6424,6 +6464,8 @@ dont-distribute-packages: karakuri: [ i686-linux, x86_64-linux, x86_64-darwin ] karps: [ i686-linux, x86_64-linux, x86_64-darwin ] katip-elasticsearch: [ i686-linux, x86_64-linux, x86_64-darwin ] + katip-rollbar: [ i686-linux, x86_64-linux, x86_64-darwin ] + katip-scalyr-scribe: [ i686-linux, x86_64-linux, x86_64-darwin ] katip-syslog: [ i686-linux, x86_64-linux, x86_64-darwin ] katt: [ i686-linux, x86_64-linux, x86_64-darwin ] kawaii: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6570,6 +6612,7 @@ dont-distribute-packages: layers-game: [ i686-linux, x86_64-linux, x86_64-darwin ] layers: [ i686-linux, x86_64-linux, x86_64-darwin ] layout-bootstrap: [ i686-linux, x86_64-linux, x86_64-darwin ] + layout-rules: [ i686-linux, x86_64-linux, x86_64-darwin ] layouting: [ i686-linux, x86_64-linux, x86_64-darwin ] lazy-hash-cache: [ i686-linux, x86_64-linux, x86_64-darwin ] lazy-hash: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6641,6 +6684,7 @@ dont-distribute-packages: libxml-enumerator: [ i686-linux, x86_64-linux, x86_64-darwin ] libxslt: [ i686-linux, x86_64-linux, x86_64-darwin ] LibZip: [ i686-linux, x86_64-linux, x86_64-darwin ] + life-sync: [ i686-linux, x86_64-linux, x86_64-darwin ] lifted-protolude: [ i686-linux, x86_64-linux, x86_64-darwin ] lifted-stm: [ i686-linux, x86_64-linux, x86_64-darwin ] lifter: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6864,6 +6908,7 @@ dont-distribute-packages: mathblog: [ i686-linux, x86_64-linux, x86_64-darwin ] mathlink: [ i686-linux, x86_64-linux, x86_64-darwin ] matplotlib: [ i686-linux, x86_64-linux, x86_64-darwin ] + matrix-as-xyz: [ i686-linux, x86_64-linux, x86_64-darwin ] matsuri: [ i686-linux, x86_64-linux, x86_64-darwin ] matterhorn: [ i686-linux, x86_64-linux, x86_64-darwin ] mattermost-api-qc: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6916,6 +6961,7 @@ dont-distribute-packages: memo-sqlite: [ i686-linux, x86_64-linux, x86_64-darwin ] memoization-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] memorable-bits: [ i686-linux, x86_64-linux, x86_64-darwin ] + menoh: [ i686-linux, x86_64-linux, x86_64-darwin ] mercury-api: [ i686-linux, x86_64-linux, x86_64-darwin ] merge-bash-history: [ i686-linux, x86_64-linux, x86_64-darwin ] mergeless: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6971,6 +7017,7 @@ dont-distribute-packages: mkbndl: [ i686-linux, x86_64-linux, x86_64-darwin ] ml-w: [ i686-linux, x86_64-linux, x86_64-darwin ] mlist: [ i686-linux, x86_64-linux, x86_64-darwin ] + mltool: [ i686-linux, x86_64-linux, x86_64-darwin ] mmark-cli: [ i686-linux, x86_64-linux, x86_64-darwin ] mmtf: [ i686-linux, x86_64-linux, x86_64-darwin ] mmtl-base: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7014,6 +7061,7 @@ dont-distribute-packages: monad-ste: [ i686-linux, x86_64-linux, x86_64-darwin ] monad-stlike-io: [ i686-linux, x86_64-linux, x86_64-darwin ] monad-stlike-stm: [ i686-linux, x86_64-linux, x86_64-darwin ] + monad-timing: [ i686-linux, x86_64-linux, x86_64-darwin ] monad-tx: [ i686-linux, x86_64-linux, x86_64-darwin ] monad-unify: [ i686-linux, x86_64-linux, x86_64-darwin ] monad-wrap: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7276,6 +7324,7 @@ dont-distribute-packages: Nomyx-Rules: [ i686-linux, x86_64-linux, x86_64-darwin ] Nomyx-Web: [ i686-linux, x86_64-linux, x86_64-darwin ] Nomyx: [ i686-linux, x86_64-linux, x86_64-darwin ] + non-empty-containers: [ i686-linux, x86_64-linux, x86_64-darwin ] non-empty-zipper: [ i686-linux, x86_64-linux, x86_64-darwin ] NonEmptyList: [ i686-linux, x86_64-linux, x86_64-darwin ] nonlinear-optimization-ad: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7307,6 +7356,7 @@ dont-distribute-packages: numhask-histogram: [ i686-linux, x86_64-linux, x86_64-darwin ] numhask-prelude: [ i686-linux, x86_64-linux, x86_64-darwin ] numhask-range: [ i686-linux, x86_64-linux, x86_64-darwin ] + numhask-test: [ i686-linux, x86_64-linux, x86_64-darwin ] numhask: [ i686-linux, x86_64-linux, x86_64-darwin ] Nussinov78: [ i686-linux, x86_64-linux, x86_64-darwin ] Nutri: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7546,6 +7596,7 @@ dont-distribute-packages: persistent-equivalence: [ i686-linux, x86_64-linux, x86_64-darwin ] persistent-hssqlppp: [ i686-linux, x86_64-linux, x86_64-darwin ] persistent-map: [ i686-linux, x86_64-linux, x86_64-darwin ] + persistent-migration: [ i686-linux, x86_64-linux, x86_64-darwin ] persistent-mysql-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] persistent-odbc: [ i686-linux, x86_64-linux, x86_64-darwin ] persistent-protobuf: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7725,6 +7776,7 @@ dont-distribute-packages: potoki-cereal: [ i686-linux, x86_64-linux, x86_64-darwin ] potoki-core: [ i686-linux, x86_64-linux, x86_64-darwin ] potoki-hasql: [ i686-linux, x86_64-linux, x86_64-darwin ] + potoki-zlib: [ i686-linux, x86_64-linux, x86_64-darwin ] potoki: [ i686-linux, x86_64-linux, x86_64-darwin ] potrace-diagrams: [ i686-linux, x86_64-linux, x86_64-darwin ] powerpc: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7750,7 +7802,10 @@ dont-distribute-packages: presto-hdbc: [ i686-linux, x86_64-linux, x86_64-darwin ] pretty-relative-time: [ i686-linux, x86_64-linux, x86_64-darwin ] prettyprinter-vty: [ i686-linux, x86_64-linux, x86_64-darwin ] + prim-array: [ i686-linux, x86_64-linux, x86_64-darwin ] primesieve: [ i686-linux, x86_64-linux, x86_64-darwin ] + primitive-containers: [ i686-linux, x86_64-linux, x86_64-darwin ] + primitive-indexed: [ i686-linux, x86_64-linux, x86_64-darwin ] primitive-simd: [ i686-linux, x86_64-linux, x86_64-darwin ] primitive-sort: [ i686-linux, x86_64-linux, x86_64-darwin ] PrimitiveArray-Pretty: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8057,6 +8112,7 @@ dont-distribute-packages: rei: [ i686-linux, x86_64-linux, x86_64-darwin ] reified-records: [ i686-linux, x86_64-linux, x86_64-darwin ] reify: [ i686-linux, x86_64-linux, x86_64-darwin ] + relapse: [ i686-linux, x86_64-linux, x86_64-darwin ] relation: [ i686-linux, x86_64-linux, x86_64-darwin ] relational-postgresql8: [ i686-linux, x86_64-linux, x86_64-darwin ] relative-date: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8292,6 +8348,7 @@ dont-distribute-packages: scrabble-bot: [ i686-linux, x86_64-linux, x86_64-darwin ] scrape-changes: [ i686-linux, x86_64-linux, x86_64-darwin ] ScratchFs: [ i686-linux, x86_64-linux, x86_64-darwin ] + script-monad: [ i686-linux, x86_64-linux, x86_64-darwin ] scrobble: [ i686-linux, x86_64-linux, x86_64-darwin ] scroll: [ i686-linux, x86_64-linux, x86_64-darwin ] scrz: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8316,6 +8373,7 @@ dont-distribute-packages: SelectSequencesFromMSA: [ i686-linux, x86_64-linux, x86_64-darwin ] selenium-server: [ i686-linux, x86_64-linux, x86_64-darwin ] selenium: [ i686-linux, x86_64-linux, x86_64-darwin ] + self-extract: [ i686-linux, x86_64-linux, x86_64-darwin ] selinux: [ i686-linux, x86_64-linux, x86_64-darwin ] Semantique: [ i686-linux, x86_64-linux, x86_64-darwin ] semdoc: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8357,6 +8415,7 @@ dont-distribute-packages: servant-csharp: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-db-postgresql: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-db: [ i686-linux, x86_64-linux, x86_64-darwin ] + servant-dhall: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-ede: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-ekg: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-elm: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8418,6 +8477,7 @@ dont-distribute-packages: shady-graphics: [ i686-linux, x86_64-linux, x86_64-darwin ] shake-ats: [ i686-linux, x86_64-linux, x86_64-darwin ] shake-cabal-build: [ i686-linux, x86_64-linux, x86_64-darwin ] + shake-cabal: [ i686-linux, x86_64-linux, x86_64-darwin ] shake-ext: [ i686-linux, x86_64-linux, x86_64-darwin ] shake-extras: [ i686-linux, x86_64-linux, x86_64-darwin ] shake-minify: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8646,6 +8706,7 @@ dont-distribute-packages: sparsecheck: [ i686-linux, x86_64-linux, x86_64-darwin ] spata: [ i686-linux, x86_64-linux, x86_64-darwin ] spatial-math: [ i686-linux, x86_64-linux, x86_64-darwin ] + spatial-rotations: [ i686-linux, x86_64-linux, x86_64-darwin ] spdx: [ i686-linux, x86_64-linux, x86_64-darwin ] special-functors: [ i686-linux, x86_64-linux, x86_64-darwin ] specialize-th: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8838,6 +8899,7 @@ dont-distribute-packages: svgutils: [ i686-linux, x86_64-linux, x86_64-darwin ] svm-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] svndump: [ i686-linux, x86_64-linux, x86_64-darwin ] + swagger-petstore: [ i686-linux, x86_64-linux, x86_64-darwin ] swapper: [ i686-linux, x86_64-linux, x86_64-darwin ] swearjure: [ i686-linux, x86_64-linux, x86_64-darwin ] swf: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8925,6 +8987,7 @@ dont-distribute-packages: tasty-auto: [ i686-linux, x86_64-linux, x86_64-darwin ] tasty-fail-fast: [ i686-linux, x86_64-linux, x86_64-darwin ] tasty-groundhog-converters: [ i686-linux, x86_64-linux, x86_64-darwin ] + tasty-hedgehog-coverage: [ i686-linux, x86_64-linux, x86_64-darwin ] tasty-integrate: [ i686-linux, x86_64-linux, x86_64-darwin ] tasty-jenkins-xml: [ i686-linux, x86_64-linux, x86_64-darwin ] tasty-laws: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8986,6 +9049,7 @@ dont-distribute-packages: test-framework-quickcheck: [ i686-linux, x86_64-linux, x86_64-darwin ] test-framework-sandbox: [ i686-linux, x86_64-linux, x86_64-darwin ] test-framework-skip: [ i686-linux, x86_64-linux, x86_64-darwin ] + test-karya: [ i686-linux, x86_64-linux, x86_64-darwin ] test-pkg: [ i686-linux, x86_64-linux, x86_64-darwin ] test-sandbox-compose: [ i686-linux, x86_64-linux, x86_64-darwin ] test-sandbox-hunit: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -9344,6 +9408,7 @@ dont-distribute-packages: utf8-prelude: [ i686-linux, x86_64-linux, x86_64-darwin ] UTFTConverter: [ i686-linux, x86_64-linux, x86_64-darwin ] util: [ i686-linux, x86_64-linux, x86_64-darwin ] + uu-cco-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] uu-options: [ i686-linux, x86_64-linux, x86_64-darwin ] uuagc-diagrams: [ i686-linux, x86_64-linux, x86_64-darwin ] uuid-aeson: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -9477,6 +9542,7 @@ dont-distribute-packages: warp-static: [ i686-linux, x86_64-linux, x86_64-darwin ] warp-tls-uid: [ i686-linux, x86_64-linux, x86_64-darwin ] WashNGo: [ i686-linux, x86_64-linux, x86_64-darwin ] + wasm: [ i686-linux, x86_64-linux, x86_64-darwin ] watcher: [ i686-linux, x86_64-linux, x86_64-darwin ] watchit: [ i686-linux, x86_64-linux, x86_64-darwin ] wavefront-obj: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -9506,6 +9572,7 @@ dont-distribute-packages: webcrank-wai: [ i686-linux, x86_64-linux, x86_64-darwin ] webcrank: [ i686-linux, x86_64-linux, x86_64-darwin ] webdriver-snoy: [ i686-linux, x86_64-linux, x86_64-darwin ] + webdriver-w3c: [ i686-linux, x86_64-linux, x86_64-darwin ] WeberLogic: [ i686-linux, x86_64-linux, x86_64-darwin ] webfinger-client: [ i686-linux, x86_64-linux, x86_64-darwin ] webkit-javascriptcore: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -9827,6 +9894,7 @@ dont-distribute-packages: zsh-battery: [ i686-linux, x86_64-linux, x86_64-darwin ] zstd: [ i686-linux, x86_64-linux, x86_64-darwin ] ztail: [ i686-linux, x86_64-linux, x86_64-darwin ] + ztar: [ i686-linux, x86_64-linux, x86_64-darwin ] zuramaru: [ i686-linux, x86_64-linux, x86_64-darwin ] Zwaluw: [ i686-linux, x86_64-linux, x86_64-darwin ] zxcvbn-c: [ i686-linux, x86_64-linux, x86_64-darwin ] diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 2a60e3b71e0e..ed76024770cf 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -921,8 +921,8 @@ self: { }: mkDerivation { pname = "Allure"; - version = "0.8.1.2"; - sha256 = "0zm2sipfhg3fc5v33z7agj3sx4xzqlsd41apnqn403ld0ffvzy58"; + version = "0.8.3.0"; + sha256 = "1yzqiidc8qbjlpgs2d3jkikzggyd7ajq7i7l1dgwqv6sh4r030vb"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -2780,6 +2780,7 @@ self: { ]; description = "Utility functions for using the chart library with GTK"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Chart-simple" = callPackage @@ -5042,10 +5043,10 @@ self: { }: mkDerivation { pname = "Euterpea"; - version = "2.0.4"; - sha256 = "1n0b4ksdrr1457abvij76z8r4ski4cic80picddilpg83mxaasw6"; - revision = "3"; - editedCabalFile = "19llqvhhc1dl8khggvag47xs2ly0kf7wyba4d092r1c9rz4visy9"; + version = "2.0.5"; + sha256 = "186r8a2829sqx4l6n80vifc7g8b5ap66jl3hnqdwzg7s2c0r9saq"; + revision = "1"; + editedCabalFile = "1fy3f610i8nwfipfm1dxgb8807k1vix9d65rgn59k579390xfvw8"; libraryHaskellDepends = [ array arrows base bytestring containers deepseq ghc-prim HCodecs heap PortMidi random stm @@ -7052,6 +7053,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "HABQT" = callPackage + ({ mkDerivation, base, hmatrix, hmatrix-gsl, mtl, mwc-random + , newtype-generics, optparse-applicative, QuickCheck, streaming + , utility-ht, validation, vector + }: + mkDerivation { + pname = "HABQT"; + version = "0.1.0.0"; + sha256 = "02lni851v2997im77izycl3x2yw84sm8lsa1alpb0yp6y2f1ghay"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base hmatrix hmatrix-gsl mtl mwc-random newtype-generics streaming + utility-ht validation vector + ]; + executableHaskellDepends = [ base optparse-applicative streaming ]; + testHaskellDepends = [ + base hmatrix mwc-random newtype-generics QuickCheck streaming + utility-ht vector + ]; + description = "Hierarchical adaptive Bayesian quantum tomography for quantum bits"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "HARM" = callPackage ({ mkDerivation, array, base }: mkDerivation { @@ -9990,15 +10015,15 @@ self: { }: mkDerivation { pname = "HsYAML"; - version = "0.1.1.1"; - sha256 = "1qxblx2s67n4jmnzai00hqp92iz3kvmzl1pqyx6l9zgllmh94zrh"; + version = "0.1.1.2"; + sha256 = "1100yzyxbvin48q3dgmzpnhz1gbqaxnkpnwy7ywzj2wrvwrr8hjx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring containers dlist mtl parsec text ]; description = "Pure Haskell YAML 1.2 parser"; - license = stdenv.lib.licenses.gpl3; + license = stdenv.lib.licenses.gpl2; }) {}; "Hsed" = callPackage @@ -10336,8 +10361,8 @@ self: { ({ mkDerivation, base, containers }: mkDerivation { pname = "IntGraph"; - version = "0.1.0.0"; - sha256 = "0b7hycjl4mrs47377h4yisy1kcypz7im9x0rs6w0jblczf7gmk46"; + version = "0.1.1.0"; + sha256 = "08cvlvqvjzcxsnqs9lh493y9yjxv5wcfaqc4pq9rl3wlhixjlrp6"; libraryHaskellDepends = [ base containers ]; testHaskellDepends = [ base containers ]; description = "Dynamically sized graph library"; @@ -21369,8 +21394,8 @@ self: { pname = "ad"; version = "4.3.5"; sha256 = "0q4dvi02k21jq8xf0ywgmcs5mph4hpx5s3y3pj839y0g3x5paplw"; - revision = "4"; - editedCabalFile = "0n1r7ylnabfcd3x88j93r3fjbz8hdlp3hda0zaw7h5cawc7zy01j"; + revision = "5"; + editedCabalFile = "0yzyfqhsafzaqzj8wmjrj5ghm6jwbxya3wxc9sjl59j9q20jc4nq"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ array base comonad containers data-reify erf free nats reflection @@ -21504,6 +21529,8 @@ self: { pname = "adjunctions"; version = "4.4"; sha256 = "1sbal7cbhm12crfnfhkk322jnzgx7lhw3jzq0p463bipagsjwz2h"; + revision = "1"; + editedCabalFile = "0582nnn3fab63nd7ng8smk2c8j7pciiyzfj1na34wqid2hs675as"; libraryHaskellDepends = [ array base comonad containers contravariant distributive free mtl profunctors semigroupoids semigroups tagged transformers @@ -22570,6 +22597,7 @@ self: { executableHaskellDepends = [ base containers uuagc uulib ]; description = "Attribute Grammar picture generation"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "agda-server" = callPackage @@ -22841,14 +22869,15 @@ self: { }: mkDerivation { pname = "aivika"; - version = "5.7"; - sha256 = "1zhzb9pchpj9vk0zc3wb9bpxbw7zfn63m7ng37z46lwyv5s55d5m"; + version = "5.8"; + sha256 = "0yj022qf7afxs8md45qxz42n9i5g60572lz330szbm9ziwdwb1wp"; libraryHaskellDepends = [ array base binary containers deepseq exceptions mtl mwc-random random semigroups vector ]; description = "A multi-method simulation library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "aivika-branches" = callPackage @@ -22864,6 +22893,7 @@ self: { ]; description = "Nested discrete event simulation module for the Aivika library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "aivika-distributed" = callPackage @@ -22881,6 +22911,7 @@ self: { ]; description = "Parallel distributed discrete event simulation module for the Aivika library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "aivika-experiment" = callPackage @@ -22897,6 +22928,7 @@ self: { ]; description = "Simulation experiments for the Aivika library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "aivika-experiment-cairo" = callPackage @@ -22913,6 +22945,7 @@ self: { ]; description = "Cairo-based charting backend for the Aivika simulation library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "aivika-experiment-chart" = callPackage @@ -22930,6 +22963,7 @@ self: { ]; description = "Simulation experiments with charting for the Aivika library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "aivika-experiment-diagrams" = callPackage @@ -22963,6 +22997,7 @@ self: { ]; description = "GPSS-like DSL for Aivika"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "aivika-lattice" = callPackage @@ -22979,6 +23014,7 @@ self: { ]; description = "Nested discrete event simulation module for the Aivika library using lattice"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "aivika-realtime" = callPackage @@ -22995,6 +23031,7 @@ self: { ]; description = "Soft real-time simulation module for the Aivika library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "aivika-transformers" = callPackage @@ -23003,14 +23040,15 @@ self: { }: mkDerivation { pname = "aivika-transformers"; - version = "5.7"; - sha256 = "1nwffb0x7lzl52xqki415dgmag9dg66jv45qirdnmkjs33x0by3r"; + version = "5.8"; + sha256 = "0mndlxvi98k74q2qvzc7wry8ndcgmyi9ph1sas42cbc7a2djnlf0"; libraryHaskellDepends = [ aivika array base containers exceptions mtl mwc-random random semigroups vector ]; description = "Transformers for the Aivika simulation library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ajhc" = callPackage @@ -23419,6 +23457,7 @@ self: { ]; description = "A client implementing the Algolia search API"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "align" = callPackage @@ -23800,6 +23839,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "alternators_1_0_0_0" = callPackage + ({ mkDerivation, base, lens, mmorph, mtl, newtype-generics, stm + , transformers + }: + mkDerivation { + pname = "alternators"; + version = "1.0.0.0"; + sha256 = "0ffk7xhx7n7h5mhb43ss6kprm9mzc0jzdnagz5wdsgqr8a5mnfa4"; + libraryHaskellDepends = [ + base lens mmorph mtl newtype-generics stm transformers + ]; + description = "Handy functions when using transformers"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "altfloat" = callPackage ({ mkDerivation, base, ghc-prim, integer-gmp }: mkDerivation { @@ -26553,17 +26608,18 @@ self: { "amqp-utils" = callPackage ({ mkDerivation, amqp, base, bytestring, connection, containers - , data-default-class, process, text, time, tls, x509-system + , data-default-class, hinotify, magic, process, text, time, tls + , unix, x509-system }: mkDerivation { pname = "amqp-utils"; - version = "0.3.0.0"; - sha256 = "05yz8pgj1g8m2y35psvkkpf0xr9dr0qz0andqv452w0ak7vy54bk"; + version = "0.3.2.1"; + sha256 = "0l7rvxlxqykx0mpg2jk8vx0jib0ibn6ghhl1n28asmqkvx7y6989"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ amqp base bytestring connection containers data-default-class - process text time tls x509-system + hinotify magic process text time tls unix x509-system ]; description = "Generic Haskell AMQP Consumer"; license = stdenv.lib.licenses.gpl3; @@ -27075,8 +27131,8 @@ self: { pname = "ansi-pretty"; version = "0.1.2.1"; sha256 = "1ill2dlzbxn97smkzdqcjfx9z3fw7pgwvz6w36d92n8p7zwik23h"; - revision = "4"; - editedCabalFile = "0yp5wihvl22vfcr0x22xdbvrk79hcahx1kyfpwpvv0jkahc5c03q"; + revision = "5"; + editedCabalFile = "18vg7p8ymwk3kfhvg8cn8vq574x52n8a2c7ihrg4jg1gdsdrn0vi"; libraryHaskellDepends = [ aeson ansi-wl-pprint array base bytestring containers generics-sop nats scientific semigroups tagged text time unordered-containers @@ -29457,6 +29513,7 @@ self: { testHaskellDepends = [ base hspec ]; description = "Asset map support for the JavaScript broccoli-asset-rev library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "assimp" = callPackage @@ -30130,6 +30187,8 @@ self: { pname = "atomic-primops"; version = "0.8.2"; sha256 = "0cyr2x6xqz6s233znrz9rnrfj56m9bmnawwnka0lsqqy1hp8gy37"; + revision = "1"; + editedCabalFile = "0gdcd84x2s4jiry0was74rzv9l53an1q6ad8jiaj37fr4fim0wcc"; libraryHaskellDepends = [ base ghc-prim primitive ]; description = "A safe approach to CAS and other atomic ops in Haskell"; license = stdenv.lib.licenses.bsd3; @@ -30271,8 +30330,8 @@ self: { }: mkDerivation { pname = "ats-pkg"; - version = "2.11.0.8"; - sha256 = "1nk802nm3s5dygk1ldhn4djxwz9priqsm3hpd9wkb6pd80w945m5"; + version = "2.11.0.10"; + sha256 = "0090max9idmqkfppzpwhmnibkmzin9gr6x1r94i0dziaa7x4iwd8"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal cli-setup ]; @@ -31280,8 +31339,8 @@ self: { }: mkDerivation { pname = "avro"; - version = "0.3.0.5"; - sha256 = "04hzx9k3m6k5vlrj9yv02z5x3zq5b5878aa66fj8x2y8306zry39"; + version = "0.3.1.1"; + sha256 = "0hw8r3xv0823qz8w0vs0chyz21bv5hn8013c9684zss5jqygs2yx"; libraryHaskellDepends = [ aeson array base base16-bytestring binary bytestring containers data-binary-ieee754 entropy fail hashable mtl pure-zlib scientific @@ -32625,8 +32684,8 @@ self: { }: mkDerivation { pname = "barbies"; - version = "0.1.2.0"; - sha256 = "1n8m6qi30fz5xx67v0l7dsirrpd8h0smb7qd8d1q3w83yi606kvl"; + version = "0.1.3.1"; + sha256 = "0jddnjygqmcczhg2s1ifqgmbd1liqrkhnza4bmcplwmqkg4bkbr5"; libraryHaskellDepends = [ base bifunctors ]; testHaskellDepends = [ base QuickCheck tasty tasty-quickcheck ]; description = "Classes for working with types that can change clothes"; @@ -32769,12 +32828,12 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "base-compat_0_10_1" = callPackage + "base-compat_0_10_4" = callPackage ({ mkDerivation, base, unix }: mkDerivation { pname = "base-compat"; - version = "0.10.1"; - sha256 = "0vdv28qylnpqhq6jnhiqvnc0rmbrb0dvnsfdvp094sm7sj9j3v5j"; + version = "0.10.4"; + sha256 = "0ksp990gxs731mq19rzbxrbs43nazfljjc8krlx5bjqblw3kfs8d"; libraryHaskellDepends = [ base unix ]; description = "A compatibility layer for base"; license = stdenv.lib.licenses.mit; @@ -32797,6 +32856,22 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "base-compat-batteries_0_10_4" = callPackage + ({ mkDerivation, base, base-compat, contravariant, hspec + , hspec-discover, QuickCheck + }: + mkDerivation { + pname = "base-compat-batteries"; + version = "0.10.4"; + sha256 = "11k4k2n88kyaa41431cmjwmnlnhjbqx95r67mgrdxfyqxxwnxwp8"; + libraryHaskellDepends = [ base base-compat contravariant ]; + testHaskellDepends = [ base hspec QuickCheck ]; + testToolDepends = [ hspec-discover ]; + description = "base-compat with extra batteries"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "base-compat-migrate" = callPackage ({ mkDerivation, base, base-compat }: mkDerivation { @@ -32890,6 +32965,21 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "base-orphans_0_8" = callPackage + ({ mkDerivation, base, ghc-prim, hspec, hspec-discover, QuickCheck + }: + mkDerivation { + pname = "base-orphans"; + version = "0.8"; + sha256 = "05s8s9zbnvcwnnd8z23jbdcjpd1h07c8fgaw0g9jl8mlpxbcdvmc"; + libraryHaskellDepends = [ base ghc-prim ]; + testHaskellDepends = [ base hspec QuickCheck ]; + testToolDepends = [ hspec-discover ]; + description = "Backwards-compatible orphan instances for base"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "base-prelude" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -33134,8 +33224,8 @@ self: { }: mkDerivation { pname = "baserock-schema"; - version = "0.0.3.4"; - sha256 = "19r072s5032wcs4j647naixmk3j7h4ppniar78f6hxlkcz1hsc10"; + version = "0.0.3.5"; + sha256 = "0f12xazhmcw82ck3byjwcv7z15mzz0ihkzbdb2d6vph7719yxbg3"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -33152,6 +33242,7 @@ self: { ]; description = "Baserock Definitions Schema"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "basex-client" = callPackage @@ -33583,6 +33674,7 @@ self: { ]; description = "BDCS API Server"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs.gnome3) libgit2-glib;}; "bdd" = callPackage @@ -33655,8 +33747,8 @@ self: { }: mkDerivation { pname = "beam-core"; - version = "0.7.2.1"; - sha256 = "0v9mspr3r7g5n73pgdwipgx2z23cd5g537g8afd1hj22p7d993jw"; + version = "0.7.2.2"; + sha256 = "160ga0w0i1l4nbag6jg8wn3a3csid93x6fdd4j4pah2zk7dswc8j"; libraryHaskellDepends = [ aeson base bytestring containers dlist free ghc-prim hashable microlens mtl network-uri tagged text time vector-sized @@ -33677,8 +33769,8 @@ self: { }: mkDerivation { pname = "beam-migrate"; - version = "0.3.2.0"; - sha256 = "1a6m27cpa2xlwmwfi1374p3a23i2hm8fjfsl6bdn0zpnawgi5rhf"; + version = "0.3.2.1"; + sha256 = "0wwkyg87wf3qcj8c5j3ammdkmjacgzw35pgxbq75bvfkx8k5j69d"; libraryHaskellDepends = [ aeson base beam-core bytestring containers deepseq dependent-map dependent-sum free ghc-prim hashable haskell-src-exts mtl parallel @@ -33699,8 +33791,8 @@ self: { }: mkDerivation { pname = "beam-postgres"; - version = "0.3.2.0"; - sha256 = "09iv1ji1kpavi42z0p4nng057h0q5f16cdsx0yiq53c3ji3yvbnf"; + version = "0.3.2.2"; + sha256 = "1wa2ajwrgha5wbbynh68jbqbivfvmr7habnn89yhhfh6gmxqj5yk"; libraryHaskellDepends = [ aeson base beam-core beam-migrate bytestring case-insensitive conduit free hashable haskell-src-exts lifted-base monad-control @@ -33719,8 +33811,8 @@ self: { }: mkDerivation { pname = "beam-sqlite"; - version = "0.3.2.1"; - sha256 = "1ijgqlywb7gvig32zrhgryq0nkfabyxvxy81c36x9zfpyj36x04k"; + version = "0.3.2.2"; + sha256 = "1k33bbh6zhhm7h88q9rwigrj5fisfgbwza6mfrhbygdpzck473hp"; libraryHaskellDepends = [ aeson attoparsec base beam-core beam-migrate bytestring dlist free hashable mtl network-uri scientific sqlite-simple text time unix @@ -33917,14 +34009,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "bench_1_0_10" = callPackage + "bench_1_0_11" = callPackage ({ mkDerivation, base, criterion, optparse-applicative, process , silently, text, turtle }: mkDerivation { pname = "bench"; - version = "1.0.10"; - sha256 = "0h5lqxzx170a742rjqlngikar58krzyr772hd8f92zg85p1qgqzx"; + version = "1.0.11"; + sha256 = "15rv999kajlmhvd1cajcn8vir3r950c1v2njyywpqaz6anm6ykm8"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -34349,8 +34441,8 @@ self: { pname = "bifunctors"; version = "5.5.2"; sha256 = "04fbsysm6zl8kmvqgffmrqa9bxl9dl2gibrd51asqzg737mb4ark"; - revision = "2"; - editedCabalFile = "0glrvir6md8a1ncr6ah95a5mnn7n9v8yl85afvdx24i9z1nr1319"; + revision = "3"; + editedCabalFile = "102wb8w6b3g6chk4pr9jgz73vm11n10wbn2xg3d90c71rn8x9p0f"; libraryHaskellDepends = [ base base-orphans comonad containers semigroups tagged template-haskell th-abstraction transformers transformers-compat @@ -36083,6 +36175,7 @@ self: { ]; description = "bioinformatics support library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bioinformatics-toolkit" = callPackage @@ -37119,8 +37212,8 @@ self: { pname = "blank-canvas"; version = "0.6.3"; sha256 = "1d10ngvsgi2hz6xick59rkq1wzfbsgckply2jmg6gz9mf3zj97bk"; - revision = "1"; - editedCabalFile = "0z3ya0rj3s7h6flqj9k5qib7pvvfimaab62z6yyc68zpfwkdzb36"; + revision = "2"; + editedCabalFile = "0sybv2swx9gwpkjh704xfmilm9jhdb66jqc296agpzp85s2s75zz"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base base-compat-batteries base64-bytestring bytestring @@ -38339,8 +38432,8 @@ self: { ({ mkDerivation, base, boolector, c2hs, containers, mtl }: mkDerivation { pname = "boolector"; - version = "0.0.0.1"; - sha256 = "00ngv3asmn58bli7hb3033yn98zj0680m2skid2021p3kv4km3c4"; + version = "0.0.0.2"; + sha256 = "1w7ii42vxm4yyh32avx0x53h1fc1fjfihs15xn9igz5j46qc707j"; libraryHaskellDepends = [ base containers mtl ]; librarySystemDepends = [ boolector ]; libraryToolDepends = [ c2hs ]; @@ -38612,8 +38705,8 @@ self: { pname = "bound"; version = "2.0.1"; sha256 = "0xmvkwambzmji1czxipl9cms5l3v98765b9spmb3wn5n6dpj0ji9"; - revision = "5"; - editedCabalFile = "02xvpawr73xq11lwkj1rp96h3pgpgcp693gawc3wn5zksrr0986i"; + revision = "6"; + editedCabalFile = "18fqzxy3f8r09jwcsfzjlrpvnlz711jq5gcjp4dal1pvsbbw6i09"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base bifunctors binary bytes cereal comonad deepseq hashable mmorph @@ -39789,17 +39882,17 @@ self: { }) {}; "burnt-explorer" = callPackage - ({ mkDerivation, aeson, base, bitcoin-script, bytestring, process - , scientific + ({ mkDerivation, aeson, base, bitcoin-script, bytestring, cassava + , process, scientific }: mkDerivation { pname = "burnt-explorer"; - version = "1.0.0"; - sha256 = "1lddgjbm62k7avxvq8mlw7z4swbjavffk05nx5nla5fll7v4q219"; + version = "2.0.0"; + sha256 = "08r0hzpzyc8frx1k6rxv6b37hbz9yr5gfjsd9ikybx9m78cbgg3n"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - aeson base bitcoin-script bytestring process scientific + aeson base bitcoin-script bytestring cassava process scientific ]; description = "List OP_RETURN cryptocurrency transaction outputs"; license = stdenv.lib.licenses.asl20; @@ -40155,6 +40248,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "bytes_0_15_5" = callPackage + ({ mkDerivation, base, binary, bytestring, Cabal, cabal-doctest + , cereal, containers, directory, doctest, filepath, hashable, mtl + , scientific, text, time, transformers, transformers-compat + , unordered-containers, void + }: + mkDerivation { + pname = "bytes"; + version = "0.15.5"; + sha256 = "063il2vrn0p88r9gzndh4ijs0mxj37khkc9ym9bqdsv7ngk3b683"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + base binary bytestring cereal containers hashable mtl scientific + text time transformers transformers-compat unordered-containers + void + ]; + testHaskellDepends = [ base directory doctest filepath ]; + description = "Sharing code for serialization between binary and cereal"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "byteset" = callPackage ({ mkDerivation, base, binary }: mkDerivation { @@ -40560,6 +40675,30 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "bytestring-tree-builder_0_2_7_2" = callPackage + ({ mkDerivation, base, base-prelude, bytestring, criterion, deepseq + , QuickCheck, quickcheck-instances, semigroups, tasty, tasty-hunit + , tasty-quickcheck, text + }: + mkDerivation { + pname = "bytestring-tree-builder"; + version = "0.2.7.2"; + sha256 = "03h2nmhyrr63gw4xmflsrmwf80gvayhs32wnpg3k9aqfjzpz4bd1"; + libraryHaskellDepends = [ + base base-prelude bytestring semigroups text + ]; + testHaskellDepends = [ + base-prelude bytestring QuickCheck quickcheck-instances tasty + tasty-hunit tasty-quickcheck + ]; + benchmarkHaskellDepends = [ + base-prelude bytestring criterion deepseq + ]; + description = "A very efficient ByteString builder implementation based on the binary tree"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "bytestring-trie" = callPackage ({ mkDerivation, base, binary, bytestring }: mkDerivation { @@ -40719,6 +40858,7 @@ self: { testHaskellDepends = [ base ]; description = "Simpe mosquito MQTT binding able to work with the Amazons IoT"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) mosquitto;}; "c-storable" = callPackage @@ -41024,8 +41164,8 @@ self: { }: mkDerivation { pname = "cabal-debian"; - version = "4.38"; - sha256 = "0c5c3xd3lipnwdyvnvlxk4wk8gi2akbjwmhnc1bsdyr6g6ihai81"; + version = "4.38.1"; + sha256 = "1sniyy2pappjjhvw1bma593gxdcjlg3j2afx8jgb70h6cbl3769n"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -41995,6 +42135,100 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "cachix" = callPackage + ({ mkDerivation, async, base, base16-bytestring, base64-bytestring + , bifunctors, bytestring, cachix-api, conduit, conduit-combinators + , conduit-extra, cookie, cryptonite, dhall, directory, ed25519 + , fsnotify, here, hspec, http-client, http-client-tls, http-conduit + , http-types, lzma-conduit, megaparsec, memory, mmorph + , optparse-applicative, process, protolude, resourcet, servant + , servant-auth, servant-auth-client, servant-client + , servant-generic, servant-streaming-client, streaming, text, unix + , uri-bytestring, versions + }: + mkDerivation { + pname = "cachix"; + version = "0.1.0.0"; + sha256 = "1q2yglmsg5mgky7hmv8na3qpm9ywdn0b0apb7pcn9sib11nbwg5z"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + async base base16-bytestring base64-bytestring bifunctors + bytestring cachix-api conduit conduit-combinators conduit-extra + cookie cryptonite dhall directory ed25519 fsnotify here http-client + http-client-tls http-conduit http-types lzma-conduit megaparsec + memory mmorph optparse-applicative process protolude resourcet + servant servant-auth servant-auth-client servant-client + servant-generic servant-streaming-client streaming text unix + uri-bytestring versions + ]; + executableHaskellDepends = [ + async base base16-bytestring base64-bytestring bifunctors + bytestring cachix-api conduit conduit-combinators conduit-extra + cookie cryptonite dhall directory ed25519 fsnotify here http-client + http-client-tls http-conduit http-types lzma-conduit megaparsec + memory mmorph optparse-applicative process protolude resourcet + servant servant-auth servant-auth-client servant-client + servant-generic servant-streaming-client streaming text unix + uri-bytestring versions + ]; + testHaskellDepends = [ + async base base16-bytestring base64-bytestring bifunctors + bytestring cachix-api conduit conduit-combinators conduit-extra + cookie cryptonite dhall directory ed25519 fsnotify here hspec + http-client http-client-tls http-conduit http-types lzma-conduit + megaparsec memory mmorph optparse-applicative process protolude + resourcet servant servant-auth servant-auth-client servant-client + servant-generic servant-streaming-client streaming text unix + uri-bytestring versions + ]; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "cachix-api" = callPackage + ({ mkDerivation, aeson, amazonka, base, base16-bytestring + , bytestring, conduit, conduit-combinators, cookie, cryptonite + , hspec, http-api-data, http-media, lens, memory, protolude + , servant, servant-auth, servant-auth-server, servant-auth-swagger + , servant-generic, servant-streaming, servant-swagger + , servant-swagger-ui-core, string-conv, swagger2, text + , transformers + }: + mkDerivation { + pname = "cachix-api"; + version = "0.1.0.0"; + sha256 = "13nqy96m5f0kz969ix64d8il5bakhsr9wv550zab9mks3qlz6s6x"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson amazonka base base16-bytestring bytestring conduit + conduit-combinators cookie cryptonite http-api-data http-media lens + memory servant servant-auth servant-auth-server + servant-auth-swagger servant-generic servant-streaming + servant-swagger servant-swagger-ui-core string-conv swagger2 text + transformers + ]; + executableHaskellDepends = [ + aeson amazonka base base16-bytestring bytestring conduit + conduit-combinators cookie cryptonite http-api-data http-media lens + memory servant servant-auth servant-auth-server + servant-auth-swagger servant-generic servant-streaming + servant-swagger servant-swagger-ui-core string-conv swagger2 text + transformers + ]; + testHaskellDepends = [ + aeson amazonka base base16-bytestring bytestring conduit + conduit-combinators cookie cryptonite hspec http-api-data + http-media lens memory protolude servant servant-auth + servant-auth-server servant-auth-swagger servant-generic + servant-streaming servant-swagger servant-swagger-ui-core + string-conv swagger2 text transformers + ]; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "cacophony" = callPackage ({ mkDerivation, aeson, async, attoparsec, base, base16-bytestring , bytestring, criterion, cryptonite, deepseq, directory, exceptions @@ -42853,19 +43087,23 @@ self: { }) {}; "casa-abbreviations-and-acronyms" = callPackage - ({ mkDerivation, base, directory, doctest, filepath, QuickCheck - , template-haskell + ({ mkDerivation, base, bytestring, containers, fuzzy, lens + , monoid-subclasses, optparse-applicative, these, wreq }: mkDerivation { pname = "casa-abbreviations-and-acronyms"; - version = "0.0.1"; - sha256 = "12pcw19jf31kvccqfvsxk49ff7zldq0r3kf6zabvzyr9qbas9gjy"; - libraryHaskellDepends = [ base ]; - testHaskellDepends = [ - base directory doctest filepath QuickCheck template-haskell + version = "0.0.5"; + sha256 = "1r8p084kfwyg9ivqk1g2c0vhi0dfka3qbpwqj2sh0xh1gfnxhcsv"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring containers fuzzy lens monoid-subclasses these wreq + ]; + executableHaskellDepends = [ + base fuzzy lens optparse-applicative ]; description = "CASA Abbreviations and Acronyms"; - license = "unknown"; + license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -43910,8 +44148,8 @@ self: { }: mkDerivation { pname = "cdeps"; - version = "0.1.1.4"; - sha256 = "0gqaa8a3q84k5shar58kc5kfdq4f3zp2pz9pg8h78d3fibyz5cmw"; + version = "0.1.1.5"; + sha256 = "0vsljgsgrgb072xk53f02xqrlyp3zv94skmj0q5446ca7i3grppk"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -46080,21 +46318,23 @@ self: { }) {}; "clang-pure" = callPackage - ({ mkDerivation, base, bytestring, clang, containers, contravariant - , inline-c, microlens, microlens-contra, singletons, stm - , template-haskell, vector + ({ mkDerivation, base, bytestring, Cabal, clang, containers + , contravariant, inline-c, lens, microlens, microlens-contra + , process, singletons, stm, template-haskell, vector }: mkDerivation { pname = "clang-pure"; - version = "0.2.0.2"; - sha256 = "0k30w0hdvhvdbv03jjs0284639njlcs60fljfffskmpslcxqzm7s"; + version = "0.2.0.3"; + sha256 = "1x7mw4qw5mfkv6nhqaxp9pgry7xdsb3x24fvkpb7c2iigv1yyk8n"; isLibrary = true; isExecutable = true; + setupHaskellDepends = [ base Cabal inline-c process ]; libraryHaskellDepends = [ base bytestring containers contravariant inline-c microlens microlens-contra singletons stm template-haskell vector ]; librarySystemDepends = [ clang ]; + testHaskellDepends = [ base bytestring lens ]; description = "Pure C++ code analysis with libclang"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; @@ -46165,10 +46405,8 @@ self: { }: mkDerivation { pname = "clash-ghc"; - version = "0.99.1"; - sha256 = "0ybkjqza4wl6v4wghrbm87j7ns3qgsg4lb8g6i8rj9nb8yn43jsm"; - revision = "1"; - editedCabalFile = "1j11iplvng6m882c013fr0jzni1sqmvcw28k5p9icl3dgad990kf"; + version = "0.99.2"; + sha256 = "1f57rxw4v17c8hxxkr41zz9rvwmqm88szvyz44jihkr9m2y79v24"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -46195,8 +46433,8 @@ self: { }: mkDerivation { pname = "clash-lib"; - version = "0.99.1"; - sha256 = "1jrfvi3jxwmzc32nnf2kjyciws649ldixc38g7acsbapkpjhcfy5"; + version = "0.99.2"; + sha256 = "0spkxkh06dqdyv6wjj9511lb0ahj5qjb5q9pyd1nc9kczbv3spvf"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson ansi-wl-pprint attoparsec base bytestring clash-prelude @@ -46234,8 +46472,8 @@ self: { }: mkDerivation { pname = "clash-prelude"; - version = "0.99.1"; - sha256 = "03yys72aq9zhl6g9lw1mvx7ds90ch6jx90n7pv9995lg1nhc83fd"; + version = "0.99.2"; + sha256 = "1gs4f3kg2yq2a9y2xypm4k8mdp141889r7kh9495w3qwljhhpb7i"; libraryHaskellDepends = [ array base bifunctors constraints data-binary-ieee754 data-default deepseq ghc-prim ghc-typelits-extra ghc-typelits-knownnat @@ -46974,6 +47212,7 @@ self: { ]; description = "Command Line Interface File Manager"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "clingo" = callPackage @@ -47585,6 +47824,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "cmark-gfm_0_1_4" = callPackage + ({ mkDerivation, base, blaze-html, bytestring, cheapskate + , criterion, discount, HUnit, markdown, sundown, text + }: + mkDerivation { + pname = "cmark-gfm"; + version = "0.1.4"; + sha256 = "0jjcl7pfack8aksx34m1f80ll0y62ba1fyzdn77xbs2rvlvjzw0m"; + libraryHaskellDepends = [ base bytestring text ]; + testHaskellDepends = [ base HUnit text ]; + benchmarkHaskellDepends = [ + base blaze-html cheapskate criterion discount markdown sundown text + ]; + description = "Fast, accurate GitHub Flavored Markdown parser and renderer"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "cmark-highlight" = callPackage ({ mkDerivation, base, blaze-html, cmark, highlighting-kate, text }: @@ -48465,14 +48722,14 @@ self: { "colonnade" = callPackage ({ mkDerivation, base, bytestring, contravariant, doctest - , profunctors, semigroups, text, vector + , profunctors, text, vector }: mkDerivation { pname = "colonnade"; - version = "1.2.0"; - sha256 = "0a9xh1vg64wyby370djsdcvrhg0vx2bdrwdh7csqri9nbxpzj8jn"; + version = "1.2.0.1"; + sha256 = "12ryrg42qgg1hnflz757fik1lrg51l9bg4145bb678y9c1ixisrj"; libraryHaskellDepends = [ - base bytestring contravariant profunctors semigroups text vector + base bytestring contravariant profunctors text vector ]; testHaskellDepends = [ base doctest ]; description = "Generic types and functions for columnar encoding and decoding"; @@ -48658,6 +48915,8 @@ self: { pname = "colour-space"; version = "0.1.4.0"; sha256 = "0sr341chqhngm7ihyy3ym3w345sk101gznw80iksjwxjg3iiqxmq"; + revision = "1"; + editedCabalFile = "1n9n76g9zjp1i02f964dlfy65m978m8whbcivd063pf1acp9njax"; libraryHaskellDepends = [ base colour constrained-categories JuicyPixels linear linearmap-category manifolds semigroups vector-space @@ -49128,6 +49387,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "comonad_5_0_4" = callPackage + ({ mkDerivation, base, Cabal, cabal-doctest, containers + , contravariant, distributive, doctest, semigroups, tagged + , transformers, transformers-compat + }: + mkDerivation { + pname = "comonad"; + version = "5.0.4"; + sha256 = "09g870c4flp4k3fgbibsd0mmfjani1qcpbcl685v8x89kxzrva3q"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + base containers contravariant distributive semigroups tagged + transformers transformers-compat + ]; + testHaskellDepends = [ base doctest ]; + description = "Comonads"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "comonad-extras" = callPackage ({ mkDerivation, array, base, comonad, containers, distributive , semigroupoids, transformers @@ -49746,12 +50025,12 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "composition-prelude_1_5_0_5" = callPackage + "composition-prelude_1_5_0_6" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "composition-prelude"; - version = "1.5.0.5"; - sha256 = "0nap1qfvp7zjw2z0fz1z700wx27wlgihavp2x4h5jz9jc80ssmra"; + version = "1.5.0.6"; + sha256 = "13rjy6i48nsy3nqk79b4cqgiapjg11knzkzajmxy6ps6iq308vjn"; libraryHaskellDepends = [ base ]; description = "Higher-order function combinators"; license = stdenv.lib.licenses.bsd3; @@ -50162,14 +50441,14 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "concurrency_1_5_0_0" = callPackage + "concurrency_1_6_0_0" = callPackage ({ mkDerivation, array, atomic-primops, base, exceptions , monad-control, mtl, stm, transformers }: mkDerivation { pname = "concurrency"; - version = "1.5.0.0"; - sha256 = "0c07jkhsi9fy3ssjs19511dxsqq62yqbh9qd90r666wdhs0v86qh"; + version = "1.6.0.0"; + sha256 = "14zbwbp5mgnp3nv40qirnw1b8pv2kp1nqlhg36dnhw7l0mq5dwlk"; libraryHaskellDepends = [ array atomic-primops base exceptions monad-control mtl stm transformers @@ -50289,6 +50568,23 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; + "concurrent-output_1_10_6" = callPackage + ({ mkDerivation, ansi-terminal, async, base, directory, exceptions + , process, stm, terminal-size, text, transformers, unix + }: + mkDerivation { + pname = "concurrent-output"; + version = "1.10.6"; + sha256 = "1qlp1vij4qgcrkw8ym5xdc0pgfwklbhsfh56sgayy3cvpvcac093"; + libraryHaskellDepends = [ + ansi-terminal async base directory exceptions process stm + terminal-size text transformers unix + ]; + description = "Ungarble output from several threads or commands"; + license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "concurrent-rpc" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -51579,6 +51875,26 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; + "constraints_0_10_1" = callPackage + ({ mkDerivation, base, binary, deepseq, ghc-prim, hashable, hspec + , hspec-discover, mtl, semigroups, transformers + , transformers-compat + }: + mkDerivation { + pname = "constraints"; + version = "0.10.1"; + sha256 = "1xy3vv78jxc17hm0z7qqspxjwv7l2jbcbj670yrl2f053qkfr02q"; + libraryHaskellDepends = [ + base binary deepseq ghc-prim hashable mtl semigroups transformers + transformers-compat + ]; + testHaskellDepends = [ base hspec ]; + testToolDepends = [ hspec-discover ]; + description = "Constraint manipulation"; + license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "constraints-emerge" = callPackage ({ mkDerivation, base, constraints, containers, ghc, hashable , hspec, transformers @@ -51686,8 +52002,8 @@ self: { ({ mkDerivation, base, containers, convert, lens, text }: mkDerivation { pname = "container"; - version = "1.1.0"; - sha256 = "19x7jvzc499y4349gallwwy4wpw4pf4azbsp4gr8ly4j0flfgk6g"; + version = "1.1.1"; + sha256 = "1kmi57bx9bahr2vc0b89rgy68r26vn0y531m53fs4avdcadnjl9q"; libraryHaskellDepends = [ base containers convert lens text ]; description = "Containers abstraction and utilities"; license = stdenv.lib.licenses.asl20; @@ -51978,6 +52294,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "contravariant_1_5" = callPackage + ({ mkDerivation, base, StateVar, transformers }: + mkDerivation { + pname = "contravariant"; + version = "1.5"; + sha256 = "1hn31wl0jai2jrwc6cz19aflbv9xbyl3m5ab57zzysddjav6gw3f"; + libraryHaskellDepends = [ base StateVar transformers ]; + description = "Contravariant functors"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "contravariant-extras" = callPackage ({ mkDerivation, base, base-prelude, contravariant, semigroups , template-haskell, tuple-th @@ -52926,6 +53254,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "country_0_1_6" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bytestring, deepseq + , ghc-prim, hashable, primitive, scientific, text + , unordered-containers + }: + mkDerivation { + pname = "country"; + version = "0.1.6"; + sha256 = "0a4r2jnp15xy18s6xpd4p10cgq3hd8qqzhy5lakmzymivwq6xcq9"; + libraryHaskellDepends = [ + aeson attoparsec base bytestring deepseq ghc-prim hashable + primitive scientific text unordered-containers + ]; + testHaskellDepends = [ base ]; + description = "Country data type and functions"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "country-codes" = callPackage ({ mkDerivation, aeson, base, HTF, HUnit, shakespeare, text }: mkDerivation { @@ -53959,28 +54306,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "criterion_1_4_1_0" = callPackage + "criterion_1_5_0_0" = callPackage ({ mkDerivation, aeson, ansi-wl-pprint, base, base-compat , base-compat-batteries, binary, bytestring, cassava, code-page - , containers, deepseq, directory, exceptions, filepath, Glob, HUnit - , js-flot, js-jquery, microstache, mtl, mwc-random - , optparse-applicative, parsec, QuickCheck, semigroups, statistics - , tasty, tasty-hunit, tasty-quickcheck, text, time, transformers - , transformers-compat, vector, vector-algorithms + , containers, criterion-measurement, deepseq, directory, exceptions + , filepath, Glob, HUnit, js-flot, js-jquery, microstache, mtl + , mwc-random, optparse-applicative, parsec, QuickCheck, semigroups + , statistics, tasty, tasty-hunit, tasty-quickcheck, text, time + , transformers, transformers-compat, vector, vector-algorithms }: mkDerivation { pname = "criterion"; - version = "1.4.1.0"; - sha256 = "0v429araqkcw3wwwi6fsp0g7g1hy3l47p061lcy7r4m7d9khd4y4"; + version = "1.5.0.0"; + sha256 = "0j9qaahlnjnwp8glzxn83924mdpnb38inyq696bs2fbdjzh8nq0x"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson ansi-wl-pprint base base-compat-batteries binary bytestring - cassava code-page containers deepseq directory exceptions filepath - Glob js-flot js-jquery microstache mtl mwc-random - optparse-applicative parsec semigroups statistics text time - transformers transformers-compat vector vector-algorithms + cassava code-page containers criterion-measurement deepseq + directory exceptions filepath Glob js-flot js-jquery microstache + mtl mwc-random optparse-applicative parsec semigroups statistics + text time transformers transformers-compat vector vector-algorithms ]; executableHaskellDepends = [ base base-compat-batteries optparse-applicative semigroups @@ -53995,6 +54342,21 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "criterion-measurement" = callPackage + ({ mkDerivation, aeson, base, base-compat, binary, containers + , deepseq, vector + }: + mkDerivation { + pname = "criterion-measurement"; + version = "0.1.0.0"; + sha256 = "1kn6xcnmjab0rqxjjgrdpbm5z919jwmsraqnpxqkazswgbbj6r7y"; + libraryHaskellDepends = [ + aeson base base-compat binary containers deepseq vector + ]; + description = "Criterion measurement functionality and associated types"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "criterion-plus" = callPackage ({ mkDerivation, base, criterion, deepseq, HTF, HUnit, loch-th , monad-control, mtl, optparse-applicative, placeholders @@ -54981,8 +55343,8 @@ self: { }: mkDerivation { pname = "csg"; - version = "0.1.0.2"; - sha256 = "19lqlc8li2cx2kc2y3p4n6s2jz94h490zqnm0fywj7vgp4f11rcm"; + version = "0.1.0.3"; + sha256 = "17ysbi3585ag7a098lv7wjr4xsjm8mm3zz5hfvz2ahis2g151ipx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -56169,17 +56531,17 @@ self: { }) {}; "damnpacket" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, fail, hspec - , html-entities, HUnit, QuickCheck, template-haskell, text - , th-lift-instances + ({ mkDerivation, attoparsec, base, base-compat-batteries + , bytestring, fail, hspec, html-entity, HUnit, QuickCheck + , semigroups, template-haskell, text, th-lift-instances }: mkDerivation { pname = "damnpacket"; - version = "1.1.0"; - sha256 = "07xxlfl4n336k9r8jm12bdx4j8hx02wbq0l2gxlwam6dqpclwa38"; + version = "1.3.0"; + sha256 = "06lkdmbsxqws33ndv7rljpcgqh5iqx33fb227652nh60zw19j0y2"; libraryHaskellDepends = [ - attoparsec base bytestring fail html-entities template-haskell text - th-lift-instances + attoparsec base base-compat-batteries bytestring fail html-entity + semigroups template-haskell text th-lift-instances ]; testHaskellDepends = [ base bytestring hspec HUnit QuickCheck ]; description = "Parsing dAmn messages"; @@ -57168,14 +57530,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "data-diverse_4_5_0_0" = callPackage + "data-diverse_4_6_0_0" = callPackage ({ mkDerivation, base, containers, criterion, deepseq, ghc-prim , hspec, tagged }: mkDerivation { pname = "data-diverse"; - version = "4.5.0.0"; - sha256 = "1wcyv9nh1zaixyaw4527nslmhian6g6z16y69s345wd6zmx8idmr"; + version = "4.6.0.0"; + sha256 = "1m6bxi37c7qkn96296lxfc0x3ab33w7yyjkvf3avla94dd248k89"; libraryHaskellDepends = [ base containers deepseq ghc-prim tagged ]; @@ -57204,14 +57566,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "data-diverse-lens_4_2_0_1" = callPackage + "data-diverse-lens_4_3_0_0" = callPackage ({ mkDerivation, base, data-diverse, data-has, hspec, lens , profunctors, tagged }: mkDerivation { pname = "data-diverse-lens"; - version = "4.2.0.1"; - sha256 = "07nwbvjhwx3qyh2ksk027qgci91nsckgd4yskkbafndpiri1fxds"; + version = "4.3.0.0"; + sha256 = "11nrisgx7yb7qp03s3hxkbygc170fggbi3mcid196dhakxv4kl4p"; libraryHaskellDepends = [ base data-diverse data-has lens profunctors tagged ]; @@ -59559,6 +59921,7 @@ self: { libraryHaskellDepends = [ base template-haskell unicode-show ]; description = "You do not have to write variable names twice in Debug.Trace"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "debug-tracy" = callPackage @@ -60023,14 +60386,14 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "dejafu_1_10_1_0" = callPackage + "dejafu_1_11_0_1" = callPackage ({ mkDerivation, base, concurrency, containers, contravariant , deepseq, exceptions, leancheck, profunctors, random, transformers }: mkDerivation { pname = "dejafu"; - version = "1.10.1.0"; - sha256 = "17ib90sy40ynlpjagq7f2r2kw040qjgrhwnbncyicaravips3vva"; + version = "1.11.0.1"; + sha256 = "04a4nnipb7qlw0kz4gy7flzndas3zppjxjbp8vvpcc7n5mqcj89x"; libraryHaskellDepends = [ base concurrency containers contravariant deepseq exceptions leancheck profunctors random transformers @@ -60590,6 +60953,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "deriving-compat_0_5" = callPackage + ({ mkDerivation, base, base-compat, base-orphans, containers + , ghc-boot-th, ghc-prim, hspec, hspec-discover, QuickCheck, tagged + , template-haskell, th-abstraction, transformers + , transformers-compat + }: + mkDerivation { + pname = "deriving-compat"; + version = "0.5"; + sha256 = "1777569bgb7p1xn9ch90jbg2mk4gph04mzmw3r8c6kq84db1484m"; + libraryHaskellDepends = [ + base containers ghc-boot-th ghc-prim template-haskell + th-abstraction transformers transformers-compat + ]; + testHaskellDepends = [ + base base-compat base-orphans hspec QuickCheck tagged + template-haskell transformers transformers-compat + ]; + testToolDepends = [ hspec-discover ]; + description = "Backports of GHC deriving extensions"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "derp" = callPackage ({ mkDerivation, base, containers }: mkDerivation { @@ -60778,6 +61165,7 @@ self: { ]; description = "JSON and CSV encoding for quantities"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "detrospector" = callPackage @@ -60872,8 +61260,8 @@ self: { }: mkDerivation { pname = "dfinity-radix-tree"; - version = "0.0.0"; - sha256 = "1ksxg3qf7g5hnsrcl3bfcdq81v05xk787g4ry4qj3vlkwss5pcnc"; + version = "0.1.0"; + sha256 = "14q9ick40mz5a0bdz1s7ga4fhw27hkidrsf543nmgm14q5w8q2nf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -60884,9 +61272,10 @@ self: { ]; executableHaskellDepends = [ aeson base base16-bytestring bytestring cmdargs cryptohash-sha256 - data-default-class resourcet text unordered-containers + data-default-class leveldb-haskell resourcet text + unordered-containers ]; - description = "A Merkleized key–value data store"; + description = "A generic data integrity layer"; license = stdenv.lib.licenses.gpl3; }) {}; @@ -62236,6 +62625,7 @@ self: { ]; description = "Speed up form designing using digestive functors and bootstrap"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "digestive-foundation-lucid" = callPackage @@ -63170,6 +63560,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "disposable_1_0_0_0" = callPackage + ({ mkDerivation, base, ghcjs-base-stub, stm }: + mkDerivation { + pname = "disposable"; + version = "1.0.0.0"; + sha256 = "0kzyzbhhjm005fi2n59j4in58kps4rciaza9pzi0qd2xnn9j5iqv"; + libraryHaskellDepends = [ base ghcjs-base-stub stm ]; + description = "Allows storing different resource-releasing actions together"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "dist-upload" = callPackage ({ mkDerivation, base, Cabal, directory, filepath, process }: mkDerivation { @@ -63861,6 +64263,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "distributive_0_6" = callPackage + ({ mkDerivation, base, base-orphans, Cabal, cabal-doctest, doctest + , generic-deriving, hspec, hspec-discover, tagged, transformers + }: + mkDerivation { + pname = "distributive"; + version = "0.6"; + sha256 = "1m61ppv851nifid98fimvpml0z0j3ximj7nxd72hshrslr0i7bx4"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ base base-orphans tagged transformers ]; + testHaskellDepends = [ base doctest generic-deriving hspec ]; + testToolDepends = [ hspec-discover ]; + description = "Distributive functors -- Dual to Traversable"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "diversity" = callPackage ({ mkDerivation, base, containers, data-ordlist, fasta , math-functions, MonadRandom, optparse-applicative, parsec, pipes @@ -64628,22 +65047,6 @@ self: { ({ mkDerivation, base, doctest }: mkDerivation { pname = "doctest-driver-gen"; - version = "0.2.0.2"; - sha256 = "0yil9va8l4q1wp6zz6w699103ym54fw03vsigzj12iql6y06cxxl"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base doctest ]; - executableHaskellDepends = [ base ]; - testHaskellDepends = [ base doctest ]; - description = "Generate driver file for doctest's cabal integration"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "doctest-driver-gen_0_2_0_3" = callPackage - ({ mkDerivation, base, doctest }: - mkDerivation { - pname = "doctest-driver-gen"; version = "0.2.0.3"; sha256 = "1vm9rwym2fdl76kwgkh21z2ixfcvza1df4gba2hm7hkk0n4ndcq6"; isLibrary = true; @@ -66297,6 +66700,8 @@ self: { pname = "dynamic-plot"; version = "0.3.0.0"; sha256 = "0a674aqs9jnkga3a9sp24qyr3fssbizh4p1zwfvzwafnjrbmrc5c"; + revision = "1"; + editedCabalFile = "0f0n6pkgvhgvqh33dlzid3mb35r87w9kirdilky6zk8bcr2li4da"; libraryHaskellDepends = [ base colour colour-space constrained-categories containers data-default deepseq diagrams-cairo diagrams-core diagrams-gtk @@ -67384,6 +67789,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "either_5_0_1" = callPackage + ({ mkDerivation, base, bifunctors, mtl, profunctors, QuickCheck + , semigroupoids, semigroups, test-framework + , test-framework-quickcheck2 + }: + mkDerivation { + pname = "either"; + version = "5.0.1"; + sha256 = "064hjfld7dkzs78sy30k5qkiva3hx24rax6dvzz5ygr2c0zypdkc"; + libraryHaskellDepends = [ + base bifunctors mtl profunctors semigroupoids semigroups + ]; + testHaskellDepends = [ + base QuickCheck test-framework test-framework-quickcheck2 + ]; + description = "Combinators for working with sums"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "either-both" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -68322,6 +68747,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "email-validate_2_3_2_6" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, doctest, hspec + , QuickCheck, template-haskell + }: + mkDerivation { + pname = "email-validate"; + version = "2.3.2.6"; + sha256 = "0chgylvc8xmhp933rdbmpg5sv4y7yg2h6kbf0ip1dzmbd5p55pa5"; + libraryHaskellDepends = [ + attoparsec base bytestring template-haskell + ]; + testHaskellDepends = [ base bytestring doctest hspec QuickCheck ]; + description = "Email address validation"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "email-validate-json" = callPackage ({ mkDerivation, aeson, base, email-validate, text }: mkDerivation { @@ -69618,6 +70060,33 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "ersatz_0_4_3" = callPackage + ({ mkDerivation, array, attoparsec, base, bytestring, Cabal + , cabal-doctest, containers, data-default, directory, doctest + , filepath, lens, mtl, parsec, process, semigroups, temporary + , transformers, unordered-containers + }: + mkDerivation { + pname = "ersatz"; + version = "0.4.3"; + sha256 = "0c0yrh342682k47phy5xwc0gya4h9d07j53dakkwhnx0r4p6gjfn"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + array attoparsec base bytestring containers data-default lens mtl + process semigroups temporary transformers unordered-containers + ]; + executableHaskellDepends = [ + array base containers lens mtl parsec semigroups + ]; + testHaskellDepends = [ array base directory doctest filepath mtl ]; + description = "A monad for expressing SAT or QSAT problems using observable sharing"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ersatz-toysat" = callPackage ({ mkDerivation, array, base, containers, ersatz, toysolver , transformers @@ -70958,6 +71427,8 @@ self: { pname = "exceptions"; version = "0.10.0"; sha256 = "1ms9zansv0pwzwdjncvx4kf18lnkjy2p61hvjhvxmjx5bqp93p8y"; + revision = "1"; + editedCabalFile = "1ydvmhi9bj7b1md3wd4l2z2lccgyjgv3ha8milmy2l4lad9xh6xy"; libraryHaskellDepends = [ base mtl stm template-haskell transformers transformers-compat ]; @@ -71689,6 +72160,31 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "extensible_0_4_10" = callPackage + ({ mkDerivation, aeson, base, bytestring, cassava, comonad + , constraints, deepseq, exceptions, ghc-prim, hashable, lens + , monad-skeleton, mtl, prettyprinter, primitive, profunctors + , QuickCheck, resourcet, semigroups, StateVar, tagged + , template-haskell, text, th-lift, transformers + , unordered-containers, vector + }: + mkDerivation { + pname = "extensible"; + version = "0.4.10"; + sha256 = "012xryq2jz7k6dmrzjh8j3yn9ggyna63vppi6xwdqjxks9xms2zq"; + libraryHaskellDepends = [ + aeson base bytestring cassava comonad constraints deepseq + exceptions ghc-prim hashable monad-skeleton mtl prettyprinter + primitive profunctors QuickCheck resourcet semigroups StateVar + tagged template-haskell text th-lift transformers + unordered-containers vector + ]; + testHaskellDepends = [ base lens QuickCheck template-haskell ]; + description = "Extensible, efficient, optics-friendly data types and effects"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "extensible-data" = callPackage ({ mkDerivation, base, data-lens, hashable, template-haskell , unordered-containers @@ -71752,23 +72248,23 @@ self: { }) {}; "extensible-effects-concurrent" = callPackage - ({ mkDerivation, base, containers, directory, extensible-effects - , filepath, HUnit, lens, logging-effect, monad-control, mtl - , parallel, process, QuickCheck, random, stm, tagged, tasty - , tasty-discover, tasty-hunit, time, transformers + ({ mkDerivation, base, containers, deepseq, directory + , extensible-effects, filepath, HUnit, lens, logging-effect + , monad-control, mtl, parallel, process, QuickCheck, random, stm + , tagged, tasty, tasty-discover, tasty-hunit, time, transformers }: mkDerivation { pname = "extensible-effects-concurrent"; - version = "0.3.0.2"; - sha256 = "1w44dyyi3qgqsmbvnid67cn8mqy85si75wpryhl76b456pgp0ynl"; + version = "0.4.0.0"; + sha256 = "0asqibn8hf4i627k9ms8sak90wmyis919ggb41lra4rlv03r61rc"; libraryHaskellDepends = [ - base containers directory extensible-effects filepath lens + base containers deepseq directory extensible-effects filepath lens logging-effect monad-control mtl parallel process QuickCheck random stm tagged time transformers ]; testHaskellDepends = [ - base containers extensible-effects HUnit lens QuickCheck stm tasty - tasty-discover tasty-hunit + base containers deepseq extensible-effects HUnit lens QuickCheck + stm tasty tasty-discover tasty-hunit ]; description = "Message passing concurrency as extensible-effect"; license = stdenv.lib.licenses.bsd3; @@ -72537,6 +73033,7 @@ self: { testHaskellDepends = [ base hspec text ]; description = "A highly experimental Fastly API client"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fastparser" = callPackage @@ -73502,6 +73999,7 @@ self: { ]; description = "Remote multi-db SQLCipher server"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fez-conf" = callPackage @@ -73538,8 +74036,8 @@ self: { }: mkDerivation { pname = "fficxx"; - version = "0.4"; - sha256 = "0c3893jfxxihkjz9m7m25rfa8x4yfim70p8z4jsbdw6j5adgvh8b"; + version = "0.4.1"; + sha256 = "1s1yzvs1j4as4875509hzny1399zimpzyh9zh5g0ddg8dqg5lfi4"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring Cabal containers data-default directory either @@ -75220,21 +75718,6 @@ self: { }: mkDerivation { pname = "flexible-defaults"; - version = "0.0.1.2"; - sha256 = "1hkdnylmv1inmxgw2rx5wvy06z5spbxq82rs7xkpv4syrz734w42"; - libraryHaskellDepends = [ - base containers template-haskell th-extras transformers - ]; - description = "Generate default function implementations for complex type classes"; - license = stdenv.lib.licenses.publicDomain; - }) {}; - - "flexible-defaults_0_0_2" = callPackage - ({ mkDerivation, base, containers, template-haskell, th-extras - , transformers - }: - mkDerivation { - pname = "flexible-defaults"; version = "0.0.2"; sha256 = "0r4aq6n5h9xnal535hds111vq8whzsvyc3yibmcbp7fndldd9mgk"; libraryHaskellDepends = [ @@ -75242,7 +75725,6 @@ self: { ]; description = "Generate default function implementations for complex type classes"; license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "flexible-time" = callPackage @@ -75360,6 +75842,7 @@ self: { ]; description = "Parsing of pilot tracklogs dumped as KML"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "flip-cmd" = callPackage @@ -76081,20 +76564,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "foldl_1_4_1" = callPackage + "foldl_1_4_2" = callPackage ({ mkDerivation, base, bytestring, comonad, containers , contravariant, criterion, hashable, mwc-random, primitive - , profunctors, semigroups, text, transformers, unordered-containers - , vector, vector-builder + , profunctors, semigroupoids, semigroups, text, transformers + , unordered-containers, vector, vector-builder }: mkDerivation { pname = "foldl"; - version = "1.4.1"; - sha256 = "0xfwqhn4nzl1fi1v1h7i9haxjy32118lf08rgfiqpw33zzrkyz6d"; + version = "1.4.2"; + sha256 = "14ccc2spv63v7vipfrmk8jbbw2x1dkkxsyzqzcpnkzjw0yg4ghc9"; libraryHaskellDepends = [ base bytestring comonad containers contravariant hashable - mwc-random primitive profunctors semigroups text transformers - unordered-containers vector vector-builder + mwc-random primitive profunctors semigroupoids semigroups text + transformers unordered-containers vector vector-builder ]; benchmarkHaskellDepends = [ base criterion ]; description = "Composable, streaming, and efficient left folds"; @@ -76690,6 +77173,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "formatting_6_3_5" = callPackage + ({ mkDerivation, array, base, bytestring, clock, ghc-prim, hspec + , integer-gmp, old-locale, scientific, semigroups, text, time + , transformers + }: + mkDerivation { + pname = "formatting"; + version = "6.3.5"; + sha256 = "190dlahm0rr5122i09dm81wdawcacskj0mjmniz9ghzqq79wg2iy"; + libraryHaskellDepends = [ + array base bytestring clock ghc-prim integer-gmp old-locale + scientific semigroups text time transformers + ]; + testHaskellDepends = [ base hspec semigroups ]; + description = "Combinator-based type-safe formatting (like printf() or FORMAT)"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "forml" = callPackage ({ mkDerivation, ansi-terminal, base, bytestring, cereal , containers, directory, file-embed, ghc-prim, GraphSCC, hslogger @@ -77240,6 +77742,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "free_5_1" = callPackage + ({ mkDerivation, base, comonad, containers, distributive + , exceptions, mtl, profunctors, semigroupoids, template-haskell + , transformers, transformers-base + }: + mkDerivation { + pname = "free"; + version = "5.1"; + sha256 = "117axvibwyz429ixdws6mm3sk5vm0jygdxf45456m8yyh9f4shkh"; + libraryHaskellDepends = [ + base comonad containers distributive exceptions mtl profunctors + semigroupoids template-haskell transformers transformers-base + ]; + description = "Monads for free"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "free-concurrent" = callPackage ({ mkDerivation, base, type-aligned }: mkDerivation { @@ -77869,6 +78389,7 @@ self: { testHaskellDepends = [ base bytestring pandoc process text ]; description = "Simple library for transformation of HTML to other formats"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "frontmatter" = callPackage @@ -78490,6 +79011,7 @@ self: { ]; description = "Basic call-by-value lambda-calculus with operational semantics based on Funcons"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "funcons-tools" = callPackage @@ -78719,8 +79241,8 @@ self: { }: mkDerivation { pname = "funflow"; - version = "1.0.1"; - sha256 = "114fi0z54cl93ympb1vir1fc55q8ijbg09ax4v8k05nmb916p2s0"; + version = "1.1.0"; + sha256 = "1fly82yffcdldjvqkk920rj7aq4ncy71g5zix1cnn1hks6n8xp8b"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -79251,25 +79773,6 @@ self: { "gauge" = callPackage ({ mkDerivation, base, basement, bytestring, deepseq, directory - , HUnit, process, tasty, tasty-hunit, vector - }: - mkDerivation { - pname = "gauge"; - version = "0.2.1"; - sha256 = "0401b5jzfib4wxwicqynhkn79q98hnxrpiqk1b353a6wix55hy1d"; - libraryHaskellDepends = [ - base basement deepseq directory process vector - ]; - testHaskellDepends = [ - base bytestring deepseq directory HUnit tasty tasty-hunit - ]; - benchmarkHaskellDepends = [ base ]; - description = "small framework for performance measurement and analysis"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "gauge_0_2_2" = callPackage - ({ mkDerivation, base, basement, bytestring, deepseq, directory , foundation, process, vector }: mkDerivation { @@ -79285,7 +79788,6 @@ self: { benchmarkHaskellDepends = [ base ]; description = "small framework for performance measurement and analysis"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gbu" = callPackage @@ -80000,31 +80502,14 @@ self: { "generic-deriving" = callPackage ({ mkDerivation, base, containers, ghc-prim, hspec, hspec-discover - , template-haskell - }: - mkDerivation { - pname = "generic-deriving"; - version = "1.12.1"; - sha256 = "0wwl29f5mlxmrigh0kp35q7aj10ymknnjabmdrdfxpi079rkzzgm"; - revision = "1"; - editedCabalFile = "1vr9lyvcrdiar6ndqnspwvhvrbnc1fvsjyx458ivpcr6j75j0l5j"; - libraryHaskellDepends = [ - base containers ghc-prim template-haskell - ]; - testHaskellDepends = [ base hspec template-haskell ]; - testToolDepends = [ hspec-discover ]; - description = "Generic programming library for generalised deriving"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "generic-deriving_1_12_2" = callPackage - ({ mkDerivation, base, containers, ghc-prim, hspec, hspec-discover , template-haskell, th-abstraction }: mkDerivation { pname = "generic-deriving"; version = "1.12.2"; sha256 = "1i7d6cpj9yhaqb79zays3nqchhaacacjz9bkc0zlwj73y5gvi22n"; + revision = "1"; + editedCabalFile = "0gr20ypr6s0183wmrhmia0zvpbn4dmfyr3wksrkrqj4i8nhj42fz"; libraryHaskellDepends = [ base containers ghc-prim template-haskell th-abstraction ]; @@ -80032,7 +80517,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Generic programming library for generalised deriving"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "generic-enum" = callPackage @@ -80584,12 +81068,12 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "genvalidity_0_5_0_3" = callPackage + "genvalidity_0_5_1_0" = callPackage ({ mkDerivation, base, hspec, QuickCheck, validity }: mkDerivation { pname = "genvalidity"; - version = "0.5.0.3"; - sha256 = "0xf1sd5g87gvdg1n3g7in7x8x4cf1jnsbaxmq64qmjlns4qr0fnk"; + version = "0.5.1.0"; + sha256 = "17ykq38j9a2lzir6dqz5jgy6ndaafrpkhqhcg96c5ppg7wcxaaj0"; libraryHaskellDepends = [ base QuickCheck validity ]; testHaskellDepends = [ base hspec QuickCheck ]; description = "Testing utilities for the validity library"; @@ -80620,7 +81104,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "genvalidity-aeson_0_2_0_1" = callPackage + "genvalidity-aeson_0_2_0_2" = callPackage ({ mkDerivation, aeson, base, genvalidity, genvalidity-hspec , genvalidity-scientific, genvalidity-text , genvalidity-unordered-containers, genvalidity-vector, hspec @@ -80628,8 +81112,8 @@ self: { }: mkDerivation { pname = "genvalidity-aeson"; - version = "0.2.0.1"; - sha256 = "0cfp5smj5ap5ppsk95yf0qmpbysqypsiccbcdckqkiky73nnvax8"; + version = "0.2.0.2"; + sha256 = "1c77lbw4y6fmrsdzxwm38la161n6k3zvjwisg17ssz0a1bm4y96i"; libraryHaskellDepends = [ aeson base genvalidity genvalidity-scientific genvalidity-text genvalidity-unordered-containers genvalidity-vector QuickCheck @@ -80662,14 +81146,14 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "genvalidity-bytestring_0_2_0_1" = callPackage + "genvalidity-bytestring_0_2_0_2" = callPackage ({ mkDerivation, base, bytestring, genvalidity, genvalidity-hspec , hspec, QuickCheck, validity, validity-bytestring }: mkDerivation { pname = "genvalidity-bytestring"; - version = "0.2.0.1"; - sha256 = "0lyxaisy2wjsqh0igx74wkjginnza3mmjasi8gdvkzk8kd85jvcl"; + version = "0.2.0.2"; + sha256 = "1qy19j0cyza2a6z59br4wma68081xqsq9m4ndmv195ym04a0bfa3"; libraryHaskellDepends = [ base bytestring genvalidity QuickCheck validity validity-bytestring ]; @@ -80700,14 +81184,14 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "genvalidity-containers_0_4_0_1" = callPackage + "genvalidity-containers_0_5_0_0" = callPackage ({ mkDerivation, base, containers, genvalidity, genvalidity-hspec , hspec, QuickCheck, validity, validity-containers }: mkDerivation { pname = "genvalidity-containers"; - version = "0.4.0.1"; - sha256 = "1b8q17s22wimh4dgm2igaw6icdc2bqfr7ih28ba6chmnhsjiw9wf"; + version = "0.5.0.0"; + sha256 = "1qjqwsmdcwww4fwd3m40cckwq3xgmm37kc6s25z75w768grr51br"; libraryHaskellDepends = [ base containers genvalidity QuickCheck validity validity-containers ]; @@ -80739,14 +81223,14 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "genvalidity-hspec_0_6_0_3" = callPackage + "genvalidity-hspec_0_6_1_0" = callPackage ({ mkDerivation, base, doctest, genvalidity, genvalidity-property , hspec, hspec-core, QuickCheck, validity }: mkDerivation { pname = "genvalidity-hspec"; - version = "0.6.0.3"; - sha256 = "195r2yw1ivss2w7criarmw5bpwjfpa19myvxfpkwk769wz9vih63"; + version = "0.6.1.0"; + sha256 = "1m8vlbjnpn5g3gx59z7zspk1bjq6fy56g7i1wxxb1lgmgibydm1m"; libraryHaskellDepends = [ base genvalidity genvalidity-property hspec hspec-core QuickCheck validity @@ -80781,15 +81265,15 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "genvalidity-hspec-aeson_0_2_0_1" = callPackage + "genvalidity-hspec-aeson_0_3_0_0" = callPackage ({ mkDerivation, aeson, base, bytestring, deepseq, doctest , genvalidity, genvalidity-aeson, genvalidity-hspec , genvalidity-text, hspec, QuickCheck, text }: mkDerivation { pname = "genvalidity-hspec-aeson"; - version = "0.2.0.1"; - sha256 = "0q681wj05vpxrplklvdxcr8l67gm71hvs7b991m7rfslpkx24smh"; + version = "0.3.0.0"; + sha256 = "0bqjfl86gj2201w5yingzizwq8hn63zdhir9wp3p0jiah2zp5rxh"; libraryHaskellDepends = [ aeson base bytestring deepseq genvalidity genvalidity-hspec hspec QuickCheck @@ -80820,14 +81304,14 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "genvalidity-hspec-binary_0_2_0_1" = callPackage + "genvalidity-hspec-binary_0_2_0_2" = callPackage ({ mkDerivation, base, binary, deepseq, doctest, genvalidity , genvalidity-hspec, hspec, QuickCheck }: mkDerivation { pname = "genvalidity-hspec-binary"; - version = "0.2.0.1"; - sha256 = "1ch48h0z7njxkv8ig8hk3d2s5a1w0ssxy2br05qn43snbdh33vx0"; + version = "0.2.0.2"; + sha256 = "1h14b0m5kq3md5rys07rrn5jjcpk0c09fln40v221z2rrssnh211"; libraryHaskellDepends = [ base binary deepseq genvalidity genvalidity-hspec hspec QuickCheck ]; @@ -80854,14 +81338,14 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "genvalidity-hspec-cereal_0_2_0_1" = callPackage + "genvalidity-hspec-cereal_0_2_0_2" = callPackage ({ mkDerivation, base, cereal, deepseq, doctest, genvalidity , genvalidity-hspec, hspec, QuickCheck }: mkDerivation { pname = "genvalidity-hspec-cereal"; - version = "0.2.0.1"; - sha256 = "18md81dfwgf6cq6aq4yz0qm0j5myfq8md9zpbb87yrdmrqsvyapn"; + version = "0.2.0.2"; + sha256 = "16r4g9k9rjifvbmy5nwkan6lnwhjvp85nlfihr1in5lwxf3gcl71"; libraryHaskellDepends = [ base cereal deepseq genvalidity genvalidity-hspec hspec QuickCheck ]; @@ -80893,15 +81377,15 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "genvalidity-hspec-hashable_0_2_0_1" = callPackage + "genvalidity-hspec-hashable_0_2_0_2" = callPackage ({ mkDerivation, base, doctest, genvalidity, genvalidity-hspec , genvalidity-property, hashable, hspec, hspec-core, QuickCheck , validity }: mkDerivation { pname = "genvalidity-hspec-hashable"; - version = "0.2.0.1"; - sha256 = "1llgq9181n24cjd7blan1fc2lgv9039nfwl3sj95z2z9wvy63cgm"; + version = "0.2.0.2"; + sha256 = "0s4z5k4myx4c6sky11l7s2lsvkxgyri11ikq75nfinff8b44h7iw"; libraryHaskellDepends = [ base genvalidity genvalidity-hspec genvalidity-property hashable hspec QuickCheck validity @@ -80954,14 +81438,14 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "genvalidity-path_0_3_0_1" = callPackage + "genvalidity-path_0_3_0_2" = callPackage ({ mkDerivation, base, criterion, genvalidity, genvalidity-hspec , hspec, path, QuickCheck, validity-path }: mkDerivation { pname = "genvalidity-path"; - version = "0.3.0.1"; - sha256 = "13avz2nlksvp6yam0mjny4fcj77i40vp8an5585n1mzrikadhr8x"; + version = "0.3.0.2"; + sha256 = "1fj0lc1il2yjlj6wmczvnk505c1dlvz4xw2aml0agkal9lpnvz00"; libraryHaskellDepends = [ base genvalidity path QuickCheck validity-path ]; @@ -80990,14 +81474,14 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "genvalidity-property_0_2_0_2" = callPackage + "genvalidity-property_0_2_1_0" = callPackage ({ mkDerivation, base, directory, doctest, filepath, genvalidity , hspec, QuickCheck, validity }: mkDerivation { pname = "genvalidity-property"; - version = "0.2.0.2"; - sha256 = "1rsxi6d5a4bz2dcxcrsa3xpav2nkxss8hindyncfqgn2af0vk5rp"; + version = "0.2.1.0"; + sha256 = "0xwq2wnrxlxcllina9faxxs8svslpxr73z9cw8asgc4b3hf41drm"; libraryHaskellDepends = [ base genvalidity hspec QuickCheck validity ]; @@ -81064,14 +81548,14 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "genvalidity-text_0_5_0_1" = callPackage + "genvalidity-text_0_5_0_2" = callPackage ({ mkDerivation, array, base, genvalidity, genvalidity-hspec, hspec , QuickCheck, text, validity, validity-text }: mkDerivation { pname = "genvalidity-text"; - version = "0.5.0.1"; - sha256 = "05dgf67zm9gbk985mz89jm4vdwd1s9rnazmjzwxn9gqkd6niqxyw"; + version = "0.5.0.2"; + sha256 = "1d955278y5522a5aji1i662iynkjn7g88af9myvg6q5b4nig5cqx"; libraryHaskellDepends = [ array base genvalidity QuickCheck text validity validity-text ]; @@ -81100,14 +81584,14 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "genvalidity-time_0_2_0_2" = callPackage + "genvalidity-time_0_2_1_0" = callPackage ({ mkDerivation, base, genvalidity, genvalidity-hspec, hspec , QuickCheck, time, validity-time }: mkDerivation { pname = "genvalidity-time"; - version = "0.2.0.2"; - sha256 = "0b0cyssqirpafla3dxkg6klq0nv6xnbaj10szb714lwiyvcx8dj1"; + version = "0.2.1.0"; + sha256 = "1r28jg9awlx1hzcfdhi0a9a6xlr0f33imqgqyxz4pm9zs4faag7s"; libraryHaskellDepends = [ base genvalidity QuickCheck time validity-time ]; @@ -81178,14 +81662,14 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "genvalidity-uuid_0_1_0_1" = callPackage + "genvalidity-uuid_0_1_0_2" = callPackage ({ mkDerivation, base, genvalidity, genvalidity-hspec, hspec , QuickCheck, uuid, validity, validity-uuid }: mkDerivation { pname = "genvalidity-uuid"; - version = "0.1.0.1"; - sha256 = "1ssihh980iz9kx2apygbw0r5qdb40hnvjkpsn2qw55r8d5hc4sa6"; + version = "0.1.0.2"; + sha256 = "04pladdynmjdcd553cp44nli7k5hxp82rlpyihi1ynm7q3glndfi"; libraryHaskellDepends = [ base genvalidity QuickCheck uuid validity validity-uuid ]; @@ -81216,14 +81700,14 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "genvalidity-vector_0_2_0_1" = callPackage + "genvalidity-vector_0_2_0_2" = callPackage ({ mkDerivation, base, genvalidity, genvalidity-hspec, hspec , QuickCheck, validity, validity-vector, vector }: mkDerivation { pname = "genvalidity-vector"; - version = "0.2.0.1"; - sha256 = "1xinffnzcaws7i6k0l3x89g6kzkg1vhiwkngh5ag69wvpzq3if7n"; + version = "0.2.0.2"; + sha256 = "0f1ycxpvi6jmwakfs26ydzwd8gw8qzlybr2v1ppyvvjn6a7rilhi"; libraryHaskellDepends = [ base genvalidity QuickCheck validity validity-vector vector ]; @@ -82829,6 +83313,8 @@ self: { pname = "ghcjs-base-stub"; version = "0.2.0.0"; sha256 = "05k59a6jg1a5s8zvqfah5rvm5kg34sqpv2zx4chczihx3n9prfv7"; + revision = "1"; + editedCabalFile = "0hvmgwyhv28d39was8bm52anwqh6x4mbd1mzzqxazlm0d0l8bpwp"; libraryHaskellDepends = [ aeson attoparsec base containers deepseq ghc-prim primitive scientific text transformers unordered-containers vector @@ -82842,8 +83328,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "ghcjs-codemirror"; - version = "0.0.0.1"; - sha256 = "04x5h0i4fgyc2c5ihrnk0w3l1f3avvcl115zlnich93nillgbnfw"; + version = "0.0.0.2"; + sha256 = "15r09fdx6q3l8jk8k0hziw9hzvdj7p9jssj8nx78fjkdkxj2rfvc"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base ]; description = "Installs CodeMirror JavaScript files"; @@ -83850,6 +84336,28 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {webkitgtk-web-extension = null;}; + "gi-wnck" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk + , gi-gdk, gi-gdkpixbuf, gi-gobject, gi-gtk, haskell-gi + , haskell-gi-base, haskell-gi-overloading, libwnck, text + , transformers + }: + mkDerivation { + pname = "gi-wnck"; + version = "3.0.1"; + sha256 = "06l1gqnznpa7rgimk1l49i3yfzdaawb26vqz3baswrksmi9mhrhh"; + setupHaskellDepends = [ base Cabal haskell-gi ]; + libraryHaskellDepends = [ + base bytestring containers gi-atk gi-gdk gi-gdkpixbuf gi-gobject + gi-gtk haskell-gi haskell-gi-base haskell-gi-overloading text + transformers + ]; + libraryPkgconfigDepends = [ libwnck ]; + doHaddock = false; + description = "Wnck bindings"; + license = stdenv.lib.licenses.lgpl21; + }) {inherit (pkgs.gnome2) libwnck;}; + "gi-xlib" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, haskell-gi , haskell-gi-base, haskell-gi-overloading, text, transformers, x11 @@ -84505,6 +85013,25 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "githash" = callPackage + ({ mkDerivation, base, bytestring, directory, filepath, hspec + , process, template-haskell, temporary + }: + mkDerivation { + pname = "githash"; + version = "0.1.0.0"; + sha256 = "183f1kbyvcikvm2damm7radhimhlhgnblcvw5j2s794x2h4akcci"; + libraryHaskellDepends = [ + base bytestring directory filepath process template-haskell + ]; + testHaskellDepends = [ + base bytestring directory filepath hspec process template-haskell + temporary + ]; + description = "Compile git revision info into Haskell projects"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "github" = callPackage ({ mkDerivation, aeson, aeson-compat, base, base-compat , base16-bytestring, binary, binary-orphans, byteable, bytestring @@ -84863,6 +85390,7 @@ self: { testHaskellDepends = [ base hspec rio ]; description = "Gitlab Web API"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gitlib" = callPackage @@ -85313,6 +85841,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "glazier_1_0_0_0" = callPackage + ({ mkDerivation, alternators, base, data-diverse, data-diverse-lens + , dlist, lens, mtl, stm, tagged, transformers, unliftio + , unliftio-core + }: + mkDerivation { + pname = "glazier"; + version = "1.0.0.0"; + sha256 = "193igffdh2sdb8sharv7ycxj0daxii2x2n0c53kbz6cbwi865ig9"; + libraryHaskellDepends = [ + alternators base data-diverse data-diverse-lens dlist lens mtl + transformers unliftio unliftio-core + ]; + testHaskellDepends = [ + alternators base data-diverse data-diverse-lens dlist lens mtl stm + tagged transformers unliftio unliftio-core + ]; + description = "Extensible effects using ContT, State and variants"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "glazier-pipes" = callPackage ({ mkDerivation, base, glazier, mmorph, pipes, stm, stm-extras , transformers @@ -85329,22 +85879,21 @@ self: { }) {}; "glazier-react" = callPackage - ({ mkDerivation, base, containers, deepseq, disposable, dlist, free - , ghcjs-base-stub, glazier, javascript-extras, lens, mmorph, mtl - , pipes-concurrency, profunctors, semigroupoids, stm, text - , transformers, unordered-containers + ({ mkDerivation, alternators, base, containers, data-diverse + , data-diverse-lens, deepseq, dlist, ghcjs-base-stub, glazier + , javascript-extras, lens, lens-misc, mtl, newtype-generics, stm + , tagged, transformers, unliftio, unliftio-core }: mkDerivation { pname = "glazier-react"; - version = "0.6.0.0"; - sha256 = "06myq4g4g4n61l601848irqjribrlq3f4wa9cqkzl19wbfsxbdsp"; + version = "1.0.0.0"; + sha256 = "07srw64bmjhyhc8vvp4qc21smi7h7dmxkcj0ks650clbvh6g5887"; libraryHaskellDepends = [ - base containers deepseq disposable dlist free ghcjs-base-stub - glazier javascript-extras lens mmorph mtl pipes-concurrency - profunctors semigroupoids stm text transformers - unordered-containers + alternators base containers data-diverse data-diverse-lens deepseq + dlist ghcjs-base-stub glazier javascript-extras lens lens-misc mtl + newtype-generics stm tagged transformers unliftio unliftio-core ]; - description = "ReactJS binding using Glazier and Pipes.Fluid"; + description = "ReactJS binding using Glazier.Command."; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -85359,6 +85908,8 @@ self: { pname = "glazier-react-examples"; version = "0.6.0.0"; sha256 = "1a1abb24kfnfqvgrxs8hfpxgfyhiqwc13pgdpsq6rk0c1ys9vhzm"; + revision = "1"; + editedCabalFile = "141zbnixssldmfq12sh0i8i2mwr1kv9m5n2l63p50qlmzrqx4nqx"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -85373,18 +85924,19 @@ self: { }) {}; "glazier-react-widget" = callPackage - ({ mkDerivation, base, containers, disposable, dlist, free - , ghcjs-base-stub, glazier, glazier-react, javascript-extras, lens - , mmorph, mtl, pipes-concurrency, stm, transformers + ({ mkDerivation, base, containers, data-diverse, data-diverse-lens + , deepseq, Diff, dlist, ghcjs-base-stub, glazier, glazier-react + , javascript-extras, lens, lens-misc, monadlist, mtl, tagged + , transformers }: mkDerivation { pname = "glazier-react-widget"; - version = "0.6.0.0"; - sha256 = "1b7ywbyv2maqk8fdxx7g847gh5i25rsxyjy458ysy9gydswngrla"; + version = "1.0.0.0"; + sha256 = "1ac7ybkdi4zafdrhs7sv0db3x5lfalj3ny13rlix8r12bf24mxs0"; libraryHaskellDepends = [ - base containers disposable dlist free ghcjs-base-stub glazier - glazier-react javascript-extras lens mmorph mtl pipes-concurrency - stm transformers + base containers data-diverse data-diverse-lens deepseq Diff dlist + ghcjs-base-stub glazier glazier-react javascript-extras lens + lens-misc monadlist mtl tagged transformers ]; description = "Generic widget library using glazier-react"; license = stdenv.lib.licenses.bsd3; @@ -86064,12 +86616,12 @@ self: { }) {}; "gmpint" = callPackage - ({ mkDerivation, base, gmp }: + ({ mkDerivation, base, gmp, micro-recursion-schemes }: mkDerivation { pname = "gmpint"; - version = "0.1.0.14"; - sha256 = "08a3ksaq1xx8w153v0xd5k7g2b65wgkr1jshj7533pkg59s8zdxs"; - libraryHaskellDepends = [ base ]; + version = "0.1.1.1"; + sha256 = "02zr0acsf7zpyl369c9063qp6dgpblcb73q2m9fwz63ya58ixbk4"; + libraryHaskellDepends = [ base micro-recursion-schemes ]; librarySystemDepends = [ gmp ]; description = "GMP integer conversions"; license = stdenv.lib.licenses.bsd3; @@ -88640,6 +89192,7 @@ self: { testHaskellDepends = [ base smallcheck tasty tasty-smallcheck ]; description = "Class of graphs"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "graph-core" = callPackage @@ -89109,6 +89662,8 @@ self: { pname = "graphs"; version = "0.7.1"; sha256 = "02g21jpz8jm8j1kpszk8vglw1733z2jp32dc650z40nxlmxpmlxc"; + revision = "1"; + editedCabalFile = "1cjyxswlkachki6l4mcaffwpjajyx86jzipzlqjg7c080vwvb19g"; libraryHaskellDepends = [ array base containers transformers transformers-compat void ]; @@ -89238,6 +89793,7 @@ self: { testHaskellDepends = [ base QuickCheck ]; description = "Gray code encoder/decoder"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gray-extended" = callPackage @@ -92540,8 +93096,8 @@ self: { }: mkDerivation { pname = "hadolint"; - version = "1.8.0"; - sha256 = "1nkms3iqp24xs3v04q3vvc8m8iviq8l38jbw4jksaxbqpwin08bm"; + version = "1.9.0"; + sha256 = "1wsk7h1rd3r7rqmnchj56i3cgac6gf3kchhrpdp22s81lhnw5jkz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -93430,6 +93986,7 @@ self: { ]; description = "Symmetry operations generater of Hall Symbols"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "halma" = callPackage @@ -94463,23 +95020,6 @@ self: { }: mkDerivation { pname = "happstack-jmacro"; - version = "7.0.12"; - sha256 = "1bmffidqi784y1qwgqxncwcw6knklnkliznbdx66gjvkfccv9d5s"; - libraryHaskellDepends = [ - base base64-bytestring bytestring cereal digest happstack-server - jmacro text utf8-string wl-pprint-text - ]; - description = "Support for using JMacro with Happstack"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "happstack-jmacro_7_0_12_1" = callPackage - ({ mkDerivation, base, base64-bytestring, bytestring, cereal - , digest, happstack-server, jmacro, text, utf8-string - , wl-pprint-text - }: - mkDerivation { - pname = "happstack-jmacro"; version = "7.0.12.1"; sha256 = "0bx2wa0pdj73f11xhkk0qq3k8zwh6ccc3kqli9q59617s05wq6zz"; libraryHaskellDepends = [ @@ -94488,7 +95028,6 @@ self: { ]; description = "Support for using JMacro with Happstack"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "happstack-lite" = callPackage @@ -94548,34 +95087,6 @@ self: { }: mkDerivation { pname = "happstack-server"; - version = "7.5.1"; - sha256 = "18cfkwffwfz410x9wjbciynbqs9srpzg60rappzx778lb33px1rj"; - libraryHaskellDepends = [ - base base64-bytestring blaze-html bytestring containers directory - exceptions extensible-exceptions filepath hslogger html - monad-control mtl network network-uri old-locale parsec process - semigroups sendfile syb system-filepath template-haskell text - threads time time-compat transformers transformers-base - transformers-compat unix utf8-string xhtml zlib - ]; - testHaskellDepends = [ - base bytestring containers HUnit parsec zlib - ]; - description = "Web related tools and services"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "happstack-server_7_5_1_1" = callPackage - ({ mkDerivation, base, base64-bytestring, blaze-html, bytestring - , containers, directory, exceptions, extensible-exceptions - , filepath, hslogger, html, HUnit, monad-control, mtl, network - , network-uri, old-locale, parsec, process, semigroups, sendfile - , syb, system-filepath, template-haskell, text, threads, time - , time-compat, transformers, transformers-base, transformers-compat - , unix, utf8-string, xhtml, zlib - }: - mkDerivation { - pname = "happstack-server"; version = "7.5.1.1"; sha256 = "0qgx142xbig19j5j31b4vcgznzaw9c6fg4009vzp9yhvfbfnajk1"; libraryHaskellDepends = [ @@ -94591,7 +95102,6 @@ self: { ]; description = "Web related tools and services"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "happstack-server-tls" = callPackage @@ -96029,8 +96539,8 @@ self: { }: mkDerivation { pname = "haskell-dap"; - version = "0.0.5.0"; - sha256 = "1sb6jqq1nfzaycr1cx4an5yaaad3k8ijig7ss0xa6wvjkyc37xqa"; + version = "0.0.6.0"; + sha256 = "1w14vz2fgj90lx6w7w93zk9blmafpyv32gxzz7pm5fwnbrr07ds2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ]; @@ -96668,6 +97178,7 @@ self: { ]; description = "Manage nix overrides for haskell packages"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haskell-packages" = callPackage @@ -97114,14 +97625,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "haskell-tools-ast_1_1_0_0" = callPackage + "haskell-tools-ast_1_1_0_1" = callPackage ({ mkDerivation, base, classyplate, ghc, mtl, pretty, references , template-haskell, uniplate }: mkDerivation { pname = "haskell-tools-ast"; - version = "1.1.0.0"; - sha256 = "1s5iify3n8bixhrv5gllxbmihddym5vwa46dph36lvv44xxs7gfh"; + version = "1.1.0.1"; + sha256 = "1g450ikg2wi7whw46ibm9pc7jdnk5lng8l7lqryi0nigmrmgz355"; libraryHaskellDepends = [ base classyplate ghc mtl pretty references template-haskell uniplate @@ -97199,15 +97710,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "haskell-tools-backend-ghc_1_1_0_0" = callPackage + "haskell-tools-backend-ghc_1_1_0_1" = callPackage ({ mkDerivation, base, bytestring, containers, ghc, ghc-boot-th , haskell-tools-ast, mtl, references, safe, split, template-haskell , transformers, uniplate }: mkDerivation { pname = "haskell-tools-backend-ghc"; - version = "1.1.0.0"; - sha256 = "08a2h70sbzga9c202q0f7j1nqyvqjpx8npfzrkdid45fp04v3aks"; + version = "1.1.0.1"; + sha256 = "030ylilmgn4drp00d3683kwfyq9rky5i8ihpvmqjkphyq7bbwva4"; libraryHaskellDepends = [ base bytestring containers ghc ghc-boot-th haskell-tools-ast mtl references safe split template-haskell transformers uniplate @@ -97228,8 +97739,8 @@ self: { }: mkDerivation { pname = "haskell-tools-builtin-refactorings"; - version = "1.1.0.0"; - sha256 = "0v448flr5n6ppm4zd4cfd467rxan28vpjavw7yk8gj16ff9xv974"; + version = "1.1.0.1"; + sha256 = "0xlcwyydspn73nv7yi1djncqhswszqn9skrm6hm96scfyqvvxbwa"; libraryHaskellDepends = [ aeson base Cabal classyplate containers deepseq directory filepath ghc ghc-paths haskell-tools-ast haskell-tools-backend-ghc @@ -97258,8 +97769,8 @@ self: { }: mkDerivation { pname = "haskell-tools-cli"; - version = "1.1.0.0"; - sha256 = "1yi85v7h9zsnj90kpx681qxyzxdi54s0ah3k95jrwlhiddmf69hx"; + version = "1.1.0.1"; + sha256 = "1gc20ajz1xzp3343j013w0knqdvhwa5hxwvxr6ydpxgrigjxk18p"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -97295,8 +97806,8 @@ self: { }: mkDerivation { pname = "haskell-tools-daemon"; - version = "1.1.0.0"; - sha256 = "07m1zprhqvs7gr9vlhms9gypcp8w0f8a0d1xkx3wp0bbl942zcf6"; + version = "1.1.0.1"; + sha256 = "0vq8d7n8k978d2jv4f3sbvccjj9vqydci33xl1axamslani0k8x2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -97328,8 +97839,8 @@ self: { }: mkDerivation { pname = "haskell-tools-debug"; - version = "1.1.0.0"; - sha256 = "1cr352nw160gwfnhibc9vfnx1sgryjbq2psiz257ci55zpk4zihb"; + version = "1.1.0.1"; + sha256 = "1l84y0pqwcq1y6509gg68flfa1ai5zl2psn57lp1nm17i7cddsjw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -97354,8 +97865,8 @@ self: { }: mkDerivation { pname = "haskell-tools-demo"; - version = "1.1.0.0"; - sha256 = "1sjb6imfx9zraxdcwzn4a0a0alswlxazzqzfzsicyqp8778ifc0l"; + version = "1.1.0.1"; + sha256 = "1rzpwy7fvc51vs9sqpxvja84bqjgrpj6943cc2p06d1ynl7vzmk5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -97385,8 +97896,8 @@ self: { }: mkDerivation { pname = "haskell-tools-experimental-refactorings"; - version = "1.1.0.0"; - sha256 = "0pw13pr7lwlmbi6lqkxfbhlcvjmphsyy7qxkv6hmvwqfdkv805lr"; + version = "1.1.0.1"; + sha256 = "16qdvs68zlzjx5gj8034w5qwc79i640kfdnwc81wi84hch7xwy4p"; libraryHaskellDepends = [ base Cabal containers directory filepath ghc ghc-paths haskell-tools-ast haskell-tools-backend-ghc @@ -97422,14 +97933,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "haskell-tools-prettyprint_1_1_0_0" = callPackage + "haskell-tools-prettyprint_1_1_0_1" = callPackage ({ mkDerivation, base, containers, ghc, haskell-tools-ast, mtl , references, split, text, uniplate }: mkDerivation { pname = "haskell-tools-prettyprint"; - version = "1.1.0.0"; - sha256 = "12py365fg7rmprxpy4qj6q3znq8ah0bzi2gy3lx8s1s8kzq0wyv0"; + version = "1.1.0.1"; + sha256 = "1x8zz8i66cfnvif991bj9nkidp2bwlhs9zfkxwlyhvhrlda45q8f"; libraryHaskellDepends = [ base containers ghc haskell-tools-ast mtl references split text uniplate @@ -97469,7 +97980,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "haskell-tools-refactor_1_1_0_0" = callPackage + "haskell-tools-refactor_1_1_0_1" = callPackage ({ mkDerivation, aeson, base, Cabal, containers, directory, either , filepath, ghc, ghc-paths, haskell-tools-ast , haskell-tools-backend-ghc, haskell-tools-prettyprint @@ -97479,8 +97990,8 @@ self: { }: mkDerivation { pname = "haskell-tools-refactor"; - version = "1.1.0.0"; - sha256 = "1r3wh3jg8dmmx8fi7qpzl85gnxypmhp90h451dpb3ykcwfav775s"; + version = "1.1.0.1"; + sha256 = "0kfw41f4js9s6mf533q7vm7ym63hb289j77r2ypm08490bqjhi9g"; libraryHaskellDepends = [ aeson base Cabal containers directory filepath ghc ghc-paths haskell-tools-ast haskell-tools-backend-ghc @@ -97520,15 +98031,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "haskell-tools-rewrite_1_1_0_0" = callPackage + "haskell-tools-rewrite_1_1_0_1" = callPackage ({ mkDerivation, base, containers, directory, filepath, ghc , haskell-tools-ast, haskell-tools-prettyprint, mtl, references , tasty, tasty-hunit }: mkDerivation { pname = "haskell-tools-rewrite"; - version = "1.1.0.0"; - sha256 = "1000vm2ihfj8phajnqifhj6q4ghy5jq2xvn7s7l1hh2brd37zah8"; + version = "1.1.0.1"; + sha256 = "0j1925x0qkkm8n0klqbawgd419ra9jrfl4y4hn75j3w4zxzh3v5j"; libraryHaskellDepends = [ base containers ghc haskell-tools-ast haskell-tools-prettyprint mtl references @@ -100006,8 +100517,8 @@ self: { }: mkDerivation { pname = "hbf"; - version = "0.1.0.2"; - sha256 = "07r3m42y3g3ikg0mabqcd309jq2280kg0rn74n2ybmr1vs815fpj"; + version = "0.2.0.0"; + sha256 = "1w0q30vxfw8pz9sjnkiw40sq5m9xdigvnw9ppixzj1kd4d9b29z9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -100030,6 +100541,7 @@ self: { ]; description = "An optimizing Brainfuck compiler and evaluator"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hblas" = callPackage @@ -102671,8 +103183,8 @@ self: { }: mkDerivation { pname = "hformat"; - version = "0.3.2.0"; - sha256 = "1761gw0g7ar4ls4pzm8vq3k48nckd4lliq7f9s7br961215sjgx9"; + version = "0.3.3.0"; + sha256 = "0g9kjfssaksjj3cp0qiwk7v85yy3sb2ryhjnlrdznhm3mnkvp35j"; libraryHaskellDepends = [ ansi-terminal base base-unicode-symbols text ]; @@ -102929,8 +103441,8 @@ self: { }: mkDerivation { pname = "hgis"; - version = "1.0.0.0"; - sha256 = "1j70p3bgy8v1nzpqiv20lpxq7vxi54f9j3mwl8046hanra99wdr5"; + version = "1.0.0.1"; + sha256 = "0plx7k1lba4rdx1c7bnvhaqgnrjzh1br5h69msq4wkn4c9f54lha"; libraryHaskellDepends = [ ansi-wl-pprint base binary bytestring Chart Chart-cairo Chart-diagrams colour composition-prelude data-binary-ieee754 @@ -104687,51 +105199,54 @@ self: { }) {}; "hledger" = callPackage - ({ mkDerivation, ansi-terminal, base, base-compat, bytestring - , cmdargs, containers, criterion, csv, data-default, Decimal, Diff - , directory, file-embed, filepath, hashable, haskeline, here - , hledger-lib, html, HUnit, lucid, megaparsec, mtl, mtl-compat - , old-time, parsec, pretty-show, process, regex-tdfa, safe - , shakespeare, split, tabular, temporary, terminfo, test-framework - , test-framework-hunit, text, time, timeit, transformers - , unordered-containers, utf8-string, utility-ht, wizards + ({ mkDerivation, ansi-terminal, base, base-compat-batteries + , bytestring, cmdargs, containers, criterion, csv, data-default + , Decimal, Diff, directory, file-embed, filepath, hashable + , haskeline, here, hledger-lib, html, HUnit, lucid, megaparsec, mtl + , mtl-compat, old-time, parsec, pretty-show, process, regex-tdfa + , safe, shakespeare, split, tabular, temporary, terminfo + , test-framework, test-framework-hunit, text, time, timeit + , transformers, unordered-containers, utf8-string, utility-ht + , wizards }: mkDerivation { pname = "hledger"; - version = "1.9.1"; - sha256 = "13arzk1l2hxmi8baa68kvl2sha0na34h0dl6isbfpvgnp7w1c0b3"; - revision = "1"; - editedCabalFile = "0qmvkw2zbcpjmkf71janpdpdha45yi29f9kv54rxqbckkh1ziych"; + version = "1.10"; + sha256 = "1ly4sp0lhb3w5nrd77xd84bcyvm000fwwjipm7gq8bjhabw20i7n"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - ansi-terminal base base-compat bytestring cmdargs containers csv - data-default Decimal Diff directory file-embed filepath hashable - haskeline here hledger-lib HUnit lucid megaparsec mtl mtl-compat - old-time pretty-show process regex-tdfa safe shakespeare split - tabular temporary terminfo text time transformers + ansi-terminal base base-compat-batteries bytestring cmdargs + containers csv data-default Decimal Diff directory file-embed + filepath hashable haskeline here hledger-lib HUnit lucid megaparsec + mtl mtl-compat old-time parsec pretty-show process regex-tdfa safe + shakespeare split tabular temporary terminfo text time transformers unordered-containers utf8-string utility-ht wizards ]; executableHaskellDepends = [ - ansi-terminal base base-compat bytestring cmdargs containers csv - data-default Decimal directory file-embed filepath haskeline here - hledger-lib HUnit mtl mtl-compat old-time parsec pretty-show - process regex-tdfa safe shakespeare split tabular temporary - terminfo text time unordered-containers utf8-string utility-ht - wizards + ansi-terminal base base-compat-batteries bytestring cmdargs + containers csv data-default Decimal directory file-embed filepath + haskeline here hledger-lib HUnit megaparsec mtl mtl-compat old-time + parsec pretty-show process regex-tdfa safe shakespeare split + tabular temporary terminfo text time transformers + unordered-containers utf8-string utility-ht wizards ]; testHaskellDepends = [ - ansi-terminal base base-compat bytestring cmdargs containers csv - data-default Decimal directory file-embed filepath haskeline here - hledger-lib HUnit mtl mtl-compat old-time parsec pretty-show - process regex-tdfa safe shakespeare split tabular temporary - terminfo test-framework test-framework-hunit text time - unordered-containers utf8-string utility-ht wizards + ansi-terminal base base-compat-batteries bytestring cmdargs + containers csv data-default Decimal directory file-embed filepath + haskeline here hledger-lib HUnit megaparsec mtl mtl-compat old-time + parsec pretty-show process regex-tdfa safe shakespeare split + tabular temporary terminfo test-framework test-framework-hunit text + time transformers unordered-containers utf8-string utility-ht + wizards ]; benchmarkHaskellDepends = [ - ansi-terminal base base-compat criterion directory file-embed - filepath here hledger-lib html pretty-show process shakespeare - tabular temporary terminfo time timeit utility-ht + ansi-terminal base base-compat-batteries bytestring cmdargs + containers criterion csv data-default Decimal directory file-embed + filepath haskeline here hledger-lib html HUnit megaparsec mtl + mtl-compat old-time parsec pretty-show process regex-tdfa safe + shakespeare split tabular temporary terminfo text time timeit + transformers unordered-containers utf8-string utility-ht wizards ]; description = "Command-line interface for the hledger accounting tool"; license = stdenv.lib.licenses.gpl3; @@ -104746,8 +105261,8 @@ self: { }: mkDerivation { pname = "hledger-api"; - version = "1.9.1"; - sha256 = "1krg8pxqcndrs6z196lb7z5nanyp9vxk5ziqpapj0f11ifxcijj8"; + version = "1.10"; + sha256 = "1axcpipq6m4r9bh2633j7l88pc4ax8ycb2q0wivhfq2dp1pbylbf"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -104758,6 +105273,7 @@ self: { ]; description = "Web API server for the hledger accounting tool"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hledger-chart" = callPackage @@ -104848,8 +105364,8 @@ self: { }: mkDerivation { pname = "hledger-irr"; - version = "0.1.1.14"; - sha256 = "06y1y6qgq9arhqwdna1kfafhjwin8qmlczl5rxazms3g45dl72rr"; + version = "0.1.1.15"; + sha256 = "06fbahn3pp73an5xxn0qnh8h7hkjvvl5z4z52vgcpxh13frd65hx"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -104861,59 +105377,56 @@ self: { }) {}; "hledger-lib" = callPackage - ({ mkDerivation, ansi-terminal, array, base, base-compat + ({ mkDerivation, ansi-terminal, array, base, base-compat-batteries , blaze-markup, bytestring, cmdargs, containers, csv, data-default , Decimal, deepseq, directory, doctest, easytest, extra, filepath , Glob, hashtables, HUnit, megaparsec, mtl, mtl-compat, old-time - , parsec, pretty-show, regex-tdfa, safe, split, tabular - , test-framework, test-framework-hunit, text, time, transformers - , uglymemo, utf8-string + , parsec, parser-combinators, pretty-show, regex-tdfa, safe, split + , tabular, test-framework, test-framework-hunit, text, time + , transformers, uglymemo, utf8-string }: mkDerivation { pname = "hledger-lib"; - version = "1.9.1"; - sha256 = "0yxgx4bpqn8vchrfp07d1fqmsscj8w5g63nqd2n49r29d6i5q5az"; - revision = "1"; - editedCabalFile = "1j7yhnjkiw2vm63d6va18kknjxkywb2j0h525ys4z3y6840i8b8k"; + version = "1.10"; + sha256 = "1kj3376gaaq39rwfyhfg7npdsy7z561184wia4rc8ijzf0isz2p1"; libraryHaskellDepends = [ - ansi-terminal array base base-compat blaze-markup bytestring - cmdargs containers csv data-default Decimal deepseq directory extra - filepath hashtables HUnit megaparsec mtl mtl-compat old-time parsec - pretty-show regex-tdfa safe split tabular text time transformers - uglymemo utf8-string + ansi-terminal array base base-compat-batteries blaze-markup + bytestring cmdargs containers csv data-default Decimal deepseq + directory extra filepath hashtables HUnit megaparsec mtl mtl-compat + old-time parsec parser-combinators pretty-show regex-tdfa safe + split tabular text time transformers uglymemo utf8-string ]; testHaskellDepends = [ - ansi-terminal array base base-compat blaze-markup bytestring - cmdargs containers csv data-default Decimal deepseq directory - doctest easytest extra filepath Glob hashtables HUnit megaparsec - mtl mtl-compat old-time parsec pretty-show regex-tdfa safe split - tabular test-framework test-framework-hunit text time transformers - uglymemo utf8-string + ansi-terminal array base base-compat-batteries blaze-markup + bytestring cmdargs containers csv data-default Decimal deepseq + directory doctest easytest extra filepath Glob hashtables HUnit + megaparsec mtl mtl-compat old-time parsec parser-combinators + pretty-show regex-tdfa safe split tabular test-framework + test-framework-hunit text time transformers uglymemo utf8-string ]; description = "Core data types, parsers and functionality for the hledger accounting tools"; license = stdenv.lib.licenses.gpl3; }) {}; "hledger-ui" = callPackage - ({ mkDerivation, ansi-terminal, async, base, base-compat, brick - , cmdargs, containers, data-default, directory, filepath, fsnotify - , hledger, hledger-lib, HUnit, megaparsec, microlens + ({ mkDerivation, ansi-terminal, async, base, base-compat-batteries + , brick, cmdargs, containers, data-default, directory, filepath + , fsnotify, hledger, hledger-lib, HUnit, megaparsec, microlens , microlens-platform, pretty-show, process, safe, split, text , text-zipper, time, transformers, vector, vty }: mkDerivation { pname = "hledger-ui"; - version = "1.9.1"; - sha256 = "18ar9lja583rg06q9dbnrpify6hj99444fjw2z54lr54587151v0"; - revision = "1"; - editedCabalFile = "0dy5vrm969cqp4mz31524z8w1m3lznrr17kgn204rgq91j7zzwx2"; + version = "1.10.1"; + sha256 = "1h4hhsyajpiydvs1p6f4z1s3kblyfn4lvnwwbar6lj4z5jfizm67"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - ansi-terminal async base base-compat brick cmdargs containers - data-default directory filepath fsnotify hledger hledger-lib HUnit - megaparsec microlens microlens-platform pretty-show process safe - split text text-zipper time transformers vector vty + ansi-terminal async base base-compat-batteries brick cmdargs + containers data-default directory filepath fsnotify hledger + hledger-lib HUnit megaparsec microlens microlens-platform + pretty-show process safe split text text-zipper time transformers + vector vty ]; description = "Curses-style user interface for the hledger accounting tool"; license = stdenv.lib.licenses.gpl3; @@ -104939,46 +105452,29 @@ self: { }) {}; "hledger-web" = callPackage - ({ mkDerivation, base, base-compat, blaze-html, blaze-markup - , bytestring, clientsession, cmdargs, conduit-extra, data-default - , directory, filepath, hjsmin, hledger, hledger-lib, hspec - , http-client, http-conduit, HUnit, json, megaparsec, mtl, parsec - , safe, shakespeare, template-haskell, text, time, transformers - , wai, wai-extra, wai-handler-launch, warp, yaml, yesod, yesod-core - , yesod-form, yesod-static, yesod-test + ({ mkDerivation, base, blaze-html, blaze-markup, bytestring + , case-insensitive, clientsession, cmdargs, conduit, conduit-extra + , data-default, directory, filepath, hjsmin, hledger, hledger-lib + , http-client, http-conduit, HUnit, json, megaparsec, mtl + , semigroups, shakespeare, template-haskell, text, time + , transformers, wai, wai-extra, wai-handler-launch, warp, yaml + , yesod, yesod-core, yesod-form, yesod-static }: mkDerivation { pname = "hledger-web"; - version = "1.9.2"; - sha256 = "0b533vs5vrk4wpwgf23l7rvijq4qpi6w5nql2hsjwl3xk2ihfpv3"; - revision = "1"; - editedCabalFile = "1njgbfl71iif3f7z3kkyqgab98md93a56mpl6laq0kw4azgdsajy"; + version = "1.10"; + sha256 = "1hfl9kr3h9lcmy512s3yiv3rp31md7kw5n1145khj2j3l8qd3py9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base base-compat blaze-html blaze-markup bytestring clientsession - cmdargs conduit-extra data-default directory filepath hjsmin - hledger hledger-lib http-client http-conduit HUnit json megaparsec - mtl parsec safe shakespeare template-haskell text time transformers - wai wai-extra wai-handler-launch warp yaml yesod yesod-core - yesod-form yesod-static - ]; - executableHaskellDepends = [ - base base-compat blaze-html blaze-markup bytestring clientsession - cmdargs conduit-extra data-default directory filepath hjsmin - hledger hledger-lib http-client http-conduit HUnit json megaparsec - mtl parsec safe shakespeare template-haskell text time transformers - wai wai-extra wai-handler-launch warp yaml yesod yesod-core - yesod-form yesod-static - ]; - testHaskellDepends = [ - base base-compat blaze-html blaze-markup bytestring clientsession - cmdargs conduit-extra data-default directory filepath hjsmin - hledger hledger-lib hspec http-client http-conduit HUnit json - megaparsec mtl parsec safe shakespeare template-haskell text time - transformers wai wai-extra wai-handler-launch warp yaml yesod - yesod-core yesod-form yesod-static yesod-test + base blaze-html blaze-markup bytestring case-insensitive + clientsession cmdargs conduit conduit-extra data-default directory + filepath hjsmin hledger hledger-lib http-client http-conduit HUnit + json megaparsec mtl semigroups shakespeare template-haskell text + time transformers wai wai-extra wai-handler-launch warp yaml yesod + yesod-core yesod-form yesod-static ]; + executableHaskellDepends = [ base ]; description = "Web interface for the hledger accounting tool"; license = stdenv.lib.licenses.gpl3; maintainers = with stdenv.lib.maintainers; [ peti ]; @@ -105080,8 +105576,8 @@ self: { }: mkDerivation { pname = "hlint"; - version = "2.1.6"; - sha256 = "1sxdbb9zqhydx304v2as4y3r1yaqbgy9vcbygsaz3dy6rkifn23v"; + version = "2.1.7"; + sha256 = "1k693vmk4c7536534v2fd1l5km07xq53py6xnifv110h71g326zf"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -108515,12 +109011,12 @@ self: { license = "GPL"; }) {}; - "hs-bibutils_6_5_0_0" = callPackage + "hs-bibutils_6_6_0_0" = callPackage ({ mkDerivation, base, syb }: mkDerivation { pname = "hs-bibutils"; - version = "6.5.0.0"; - sha256 = "10myn4dg9d7ia40cgnsm3biyzd59w3kkaa4w0f6wc1wchmvmr37q"; + version = "6.6.0.0"; + sha256 = "0n2sz2zl4naspryd49ii858qkjp2lapns5a2gr8zm6vvn5sh1f0l"; libraryHaskellDepends = [ base syb ]; description = "Haskell bindings to bibutils, the bibliography conversion utilities"; license = "GPL"; @@ -110076,28 +110572,30 @@ self: { , attoparsec, base, bytestring, Cabal, containers, cpphs , data-default, deepseq, direct-sqlite, directory, exceptions , filepath, fsnotify, ghc, ghc-boot, ghc-paths, ghc-syb-utils - , haddock-api, haskell-names, haskell-src-exts, hdocs, hformat - , hlint, hspec, HTTP, lens, lifted-base, mmorph, monad-control - , monad-loops, mtl, network, optparse-applicative, process - , regex-pcre-builtin, scientific, simple-log, sqlite-simple, stm - , syb, template-haskell, text, text-region, time, transformers - , transformers-base, uniplate, unix, unordered-containers, vector + , haddock-api, haddock-library, haskell-names, haskell-src-exts + , hdocs, hformat, hlint, hspec, HTTP, lens, lifted-base, mmorph + , monad-control, monad-loops, mtl, network, optparse-applicative + , process, regex-pcre-builtin, scientific, simple-log + , sqlite-simple, stm, syb, template-haskell, text, text-region + , time, transformers, transformers-base, traverse-with-class + , uniplate, unix, unordered-containers, vector }: mkDerivation { pname = "hsdev"; - version = "0.3.1.3"; - sha256 = "1xrggdkaq3b1vsnkrcsm2ji6wcrmxv53lf8x3ki7py9blgjj3vrj"; + version = "0.3.1.4"; + sha256 = "12mz6ahfs693yxi02765v4215dbs2pzqp17w49z38zz3y6kcwmb9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson aeson-pretty array async attoparsec base bytestring Cabal containers cpphs data-default deepseq direct-sqlite directory exceptions filepath fsnotify ghc ghc-boot ghc-paths ghc-syb-utils - haddock-api haskell-names haskell-src-exts hdocs hformat hlint HTTP - lens lifted-base mmorph monad-control monad-loops mtl network - optparse-applicative process regex-pcre-builtin scientific - simple-log sqlite-simple stm syb template-haskell text text-region - time transformers transformers-base uniplate unix + haddock-api haddock-library haskell-names haskell-src-exts hdocs + hformat hlint HTTP lens lifted-base mmorph monad-control + monad-loops mtl network optparse-applicative process + regex-pcre-builtin scientific simple-log sqlite-simple stm syb + template-haskell text text-region time transformers + transformers-base traverse-with-class uniplate unix unordered-containers vector ]; executableHaskellDepends = [ @@ -111054,15 +111552,15 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "hspec_2_5_3" = callPackage + "hspec_2_5_4" = callPackage ({ mkDerivation, base, call-stack, directory, hspec-core , hspec-discover, hspec-expectations, hspec-meta, HUnit, QuickCheck , stringbuilder, transformers }: mkDerivation { pname = "hspec"; - version = "2.5.3"; - sha256 = "1rpiaw5m18zdsap7m7ih01awgmnaanq6rshhx9krway1v1y635ab"; + version = "2.5.4"; + sha256 = "19shs06srgq4j3mm0lz09yxqn7hzq4pnyl32wmi9nf2a7s3xwlm8"; libraryHaskellDepends = [ base call-stack hspec-core hspec-discover hspec-expectations HUnit QuickCheck transformers @@ -111160,7 +111658,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "hspec-core_2_5_3" = callPackage + "hspec-core_2_5_4" = callPackage ({ mkDerivation, ansi-terminal, array, base, call-stack, clock , deepseq, directory, filepath, hspec-expectations, hspec-meta , HUnit, process, QuickCheck, quickcheck-io, random, setenv @@ -111168,8 +111666,8 @@ self: { }: mkDerivation { pname = "hspec-core"; - version = "2.5.3"; - sha256 = "0gm9ydc89xhv56v6zqpmphl6pr4cik98rny3jy4x5vdwixv1yyyi"; + version = "2.5.4"; + sha256 = "1r9h59nqdl3bx4ka1f7fwp9b6724vs1260aa0a9xn18xkabkm72q"; libraryHaskellDepends = [ ansi-terminal array base call-stack clock deepseq directory filepath hspec-expectations HUnit QuickCheck quickcheck-io random @@ -111223,13 +111721,13 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "hspec-discover_2_5_3" = callPackage + "hspec-discover_2_5_4" = callPackage ({ mkDerivation, base, directory, filepath, hspec-meta, QuickCheck }: mkDerivation { pname = "hspec-discover"; - version = "2.5.3"; - sha256 = "0ja4360cphbhiaqfjsgm9qzzckvf0yc4f3c6wkr4iydx1km7v0r0"; + version = "2.5.4"; + sha256 = "1wzf6gf7qfq0n045gq4rpr5vs5g6rnwd3i6c4fmaza0k7pxd9znl"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base directory filepath ]; @@ -112809,26 +113307,6 @@ self: { }) {}; "html-conduit" = callPackage - ({ mkDerivation, base, bytestring, conduit, containers, hspec - , HUnit, resourcet, tagstream-conduit, text, transformers - , xml-conduit, xml-types - }: - mkDerivation { - pname = "html-conduit"; - version = "1.3.0"; - sha256 = "15pf15w55g39h2fwl4wlq1f0jbfknajb6qyk1l7xv6q7fphhkgvq"; - libraryHaskellDepends = [ - base bytestring conduit containers resourcet tagstream-conduit text - transformers xml-conduit xml-types - ]; - testHaskellDepends = [ - base bytestring containers hspec HUnit xml-conduit - ]; - description = "Parse HTML documents using xml-conduit datatypes"; - license = stdenv.lib.licenses.mit; - }) {}; - - "html-conduit_1_3_1" = callPackage ({ mkDerivation, attoparsec, base, bytestring, conduit , conduit-extra, containers, deepseq, hspec, HUnit, resourcet, text , transformers, xml-conduit, xml-types @@ -112846,7 +113324,6 @@ self: { ]; description = "Parse HTML documents using xml-conduit datatypes"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "html-email-validate" = callPackage @@ -112882,6 +113359,27 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "html-entity" = callPackage + ({ mkDerivation, attoparsec, base, base-compat, Cabal + , cabal-doctest, doctest, text, unordered-containers + }: + mkDerivation { + pname = "html-entity"; + version = "0.1.1.0"; + sha256 = "0phqz59acf3qjgfpqj8nymgnziz3j66kza6zinbjkzz4qnhbdh0j"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + attoparsec base base-compat text unordered-containers + ]; + testHaskellDepends = [ base doctest ]; + description = "HTML entity decoding and encoding for Text"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "html-entity-map" = callPackage ({ mkDerivation, base, criterion, text, unordered-containers }: mkDerivation { @@ -113274,6 +113772,8 @@ self: { pname = "http-client"; version = "0.5.13"; sha256 = "12q0w3avdkddrp7cgvwkmmfxdi4cz1ajic8jlrgp2plhn8ggnag2"; + revision = "1"; + editedCabalFile = "1ivwpyz9j7p1qp6sc256nb3p7bdprz92kfjgxynn0m6fldbbbvpp"; libraryHaskellDepends = [ array base blaze-builder bytestring case-insensitive containers cookie deepseq exceptions filepath ghc-prim http-types memory @@ -113290,6 +113790,34 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "http-client_0_5_13_1" = callPackage + ({ mkDerivation, array, async, base, blaze-builder, bytestring + , case-insensitive, containers, cookie, deepseq, directory + , exceptions, filepath, ghc-prim, hspec, http-types, memory + , mime-types, monad-control, network, network-uri, random, stm + , streaming-commons, text, time, transformers, zlib + }: + mkDerivation { + pname = "http-client"; + version = "0.5.13.1"; + sha256 = "0szwbgvkkdz56lgi91armkagmb7nnfwbpp4j7cm9zhmffv3ba8g1"; + libraryHaskellDepends = [ + array base blaze-builder bytestring case-insensitive containers + cookie deepseq exceptions filepath ghc-prim http-types memory + mime-types network network-uri random stm streaming-commons text + time transformers + ]; + testHaskellDepends = [ + async base blaze-builder bytestring case-insensitive containers + deepseq directory hspec http-types monad-control network + network-uri streaming-commons text time transformers zlib + ]; + doCheck = false; + description = "An HTTP client engine"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "http-client-auth" = callPackage ({ mkDerivation, base, base64-string, blaze-builder, bytestring , case-insensitive, conduit, crypto-conduit, http-client @@ -113550,6 +114078,37 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "http-conduit_2_3_2" = callPackage + ({ mkDerivation, aeson, base, blaze-builder, bytestring + , case-insensitive, conduit, conduit-extra, connection, cookie + , data-default-class, hspec, http-client, http-client-tls + , http-types, HUnit, mtl, network, resourcet, streaming-commons + , temporary, text, time, transformers, unliftio, unliftio-core + , utf8-string, wai, wai-conduit, warp, warp-tls + }: + mkDerivation { + pname = "http-conduit"; + version = "2.3.2"; + sha256 = "1iay4hr0mj8brkxvgkv1liqa8irl9axfc3qhn8qsvcyq4n1l95km"; + revision = "1"; + editedCabalFile = "0g6rg8r33q5rmrx5287vjfcqwjacchgzyfc8aqqrhrfz3fq5ll0g"; + libraryHaskellDepends = [ + aeson base bytestring conduit conduit-extra http-client + http-client-tls http-types mtl resourcet transformers unliftio-core + ]; + testHaskellDepends = [ + aeson base blaze-builder bytestring case-insensitive conduit + conduit-extra connection cookie data-default-class hspec + http-client http-types HUnit network resourcet streaming-commons + temporary text time transformers unliftio utf8-string wai + wai-conduit warp warp-tls + ]; + doCheck = false; + description = "HTTP client package with conduit interface and HTTPS support"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "http-conduit-browser" = callPackage ({ mkDerivation, base, base64-bytestring, blaze-builder, bytestring , case-insensitive, conduit, containers, cookie, data-default @@ -114196,6 +114755,7 @@ self: { testHaskellDepends = [ base ]; description = "Implement gRPC-over-HTTP2 clients"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "httpd-shed" = callPackage @@ -114556,12 +115116,12 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "hunit-dejafu_1_2_0_5" = callPackage + "hunit-dejafu_1_2_0_6" = callPackage ({ mkDerivation, base, dejafu, exceptions, HUnit }: mkDerivation { pname = "hunit-dejafu"; - version = "1.2.0.5"; - sha256 = "17k7sg2ifvmikzjlzhawc65afq32lva5p79szva6xplghh689xv6"; + version = "1.2.0.6"; + sha256 = "10zndwkgpliyycyynfd34nhzplfhs9cychpznzzcwbpckx3w5ajl"; libraryHaskellDepends = [ base dejafu exceptions HUnit ]; description = "Deja Fu support for the HUnit test framework"; license = stdenv.lib.licenses.mit; @@ -116668,8 +117228,8 @@ self: { pname = "hyphenation"; version = "0.7.1"; sha256 = "1h5i07v2zlka29dj4zysc47p747j88x6z4zm3zwcr5i8yirm0p52"; - revision = "3"; - editedCabalFile = "0pphkzschnqs2xj6kdg52gg2fjsg51lv0djxin8pqqjrdnyq4igy"; + revision = "4"; + editedCabalFile = "0pp7qm40alsfd9z5dvp6l2c7dp9zp0skl9g0iib3jahxs3n8qcrr"; enableSeparateDataOutput = true; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ @@ -118371,8 +118931,8 @@ self: { ({ mkDerivation, base, lens }: mkDerivation { pname = "impossible"; - version = "1.1.2"; - sha256 = "13iwy9pn3w3whg8hqy83mgbzcb156pz88nfcx4axkw9hpkh4810s"; + version = "1.1.3"; + sha256 = "01p9s6nzzlmgg1gr42ys6wkxnzp1jqs3ay8jz5lbm1nkbjlabs4n"; libraryHaskellDepends = [ base lens ]; description = "Set of data and type definitions of impossible types. Impossible types are useful when declaring type classes / type families instances that should not be expanded by GHC until a specific type is provided in order to keep the types nice and readable."; license = stdenv.lib.licenses.asl20; @@ -118530,6 +119090,7 @@ self: { benchmarkHaskellDepends = [ base bytestring criterion ]; description = "Inclusion of files in executables at compile-time"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "incremental" = callPackage @@ -119347,43 +119908,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "inline-r" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, criterion - , data-default-class, deepseq, directory, exceptions, filepath - , ieee754, inline-c, mtl, pretty, primitive, process - , quickcheck-assertions, R, reflection, setenv, silently - , singletons, strict, tasty, tasty-expected-failure, tasty-golden - , tasty-hunit, tasty-quickcheck, template-haskell, temporary, text - , th-lift, th-orphans, transformers, unix, vector + "inline-java_0_8_3" = callPackage + ({ mkDerivation, base, bytestring, Cabal, directory, filepath, ghc + , hspec, jni, jvm, language-java, mtl, process, template-haskell + , temporary, text }: mkDerivation { - pname = "inline-r"; - version = "0.9.1"; - sha256 = "1wpvyagc56yjkxvaw7a64gl2i4qfn4cgb47nx53pc6wcph7cyras"; - revision = "1"; - editedCabalFile = "0gid75ls60mfl0017716mqkypsbsv92lm1lsx2mf8vvd30znhcv0"; + pname = "inline-java"; + version = "0.8.3"; + sha256 = "01xg2ml1khdns5w30n83ibl3k0lc2ym7n0dgvkxgy17b5m8r6kbb"; libraryHaskellDepends = [ - aeson base bytestring containers data-default-class deepseq - exceptions inline-c mtl pretty primitive process reflection setenv - singletons template-haskell text th-lift th-orphans transformers - unix vector - ]; - libraryPkgconfigDepends = [ R ]; - testHaskellDepends = [ - base bytestring directory filepath ieee754 mtl process - quickcheck-assertions silently singletons strict tasty - tasty-expected-failure tasty-golden tasty-hunit tasty-quickcheck - template-haskell temporary text unix vector - ]; - benchmarkHaskellDepends = [ - base criterion filepath primitive process singletons - template-haskell vector + base bytestring Cabal directory filepath ghc jni jvm language-java + mtl process template-haskell temporary text ]; - description = "Seamlessly call R from Haskell and vice versa. No FFI required."; + testHaskellDepends = [ base hspec jni jvm text ]; + description = "Java interop via inline Java code in Haskell modules"; license = stdenv.lib.licenses.bsd3; - }) {inherit (pkgs) R;}; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; - "inline-r_0_9_2" = callPackage + "inline-r" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, criterion , data-default-class, deepseq, directory, exceptions, filepath , ieee754, inline-c, mtl, pretty, primitive, process @@ -119415,7 +119959,6 @@ self: { ]; description = "Seamlessly call R from Haskell and vice versa. No FFI required."; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) R;}; "inliterate" = callPackage @@ -120290,8 +120833,8 @@ self: { pname = "invariant"; version = "0.5"; sha256 = "1zz9a5irmpma5qchvvp7qin1s7cfnhvpg3b452xxysgbxvmcmfw0"; - revision = "1"; - editedCabalFile = "04sxa2jfv613ff3fxpnk0cn31f6fr80gzr7va47nrc0abp34vd7y"; + revision = "2"; + editedCabalFile = "01n0v2qmbyd44z3wvha6vmbf1nr3bar205nk1r8hsq9jsmrfzaj1"; libraryHaskellDepends = [ array base bifunctors comonad containers contravariant ghc-prim profunctors semigroups StateVar stm tagged template-haskell @@ -122434,6 +122977,7 @@ self: { libraryHaskellDepends = [ base diet ]; description = "Functions to simulate Java's Character class"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "java-poker" = callPackage @@ -122499,16 +123043,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "javascript-extras_0_4_0_0" = callPackage - ({ mkDerivation, base, deepseq, ghcjs-base-stub, parallel, text }: + "javascript-extras_0_5_0_0" = callPackage + ({ mkDerivation, base, deepseq, ghcjs-base-stub, newtype-generics + , parallel, text + }: mkDerivation { pname = "javascript-extras"; - version = "0.4.0.0"; - sha256 = "0qpz8q5pr939y35y3r8x83irb2nl9vmh50wzjii824kr25z5wipd"; + version = "0.5.0.0"; + sha256 = "1p87nkjmc5gjbj95wdchvj7ha7v5zfbricibakqkcbsahmgddk4c"; + revision = "1"; + editedCabalFile = "0y29kvmhpngv5qm0hi8kixmpxzgzih0dlpg77658ikw3mn5x30p1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base deepseq ghcjs-base-stub parallel text + base deepseq ghcjs-base-stub newtype-generics parallel text ]; executableHaskellDepends = [ base ghcjs-base-stub ]; description = "Extra javascript functions when using GHCJS"; @@ -123069,19 +123617,20 @@ self: { "jsaddle" = callPackage ({ mkDerivation, aeson, attoparsec, base, base64-bytestring - , bytestring, containers, deepseq, filepath, ghc-prim, http-types - , lens, primitive, process, random, ref-tf, scientific, stm, text - , time, transformers, unordered-containers, vector + , bytestring, containers, deepseq, exceptions, filepath, ghc-prim + , http-types, lens, primitive, process, random, ref-tf, scientific + , stm, text, time, transformers, unliftio-core + , unordered-containers, vector }: mkDerivation { pname = "jsaddle"; - version = "0.9.4.0"; - sha256 = "0lk4cbvl2n3zcc709hjcnxw3wm1vd49dqlm12cwy9im4aif1zbq1"; + version = "0.9.5.0"; + sha256 = "1b1d8dvj5lqpn0k6ay90jdgm0a05vbchxy4l3r9s4fn4mx56jp9z"; libraryHaskellDepends = [ aeson attoparsec base base64-bytestring bytestring containers - deepseq filepath ghc-prim http-types lens primitive process random - ref-tf scientific stm text time transformers unordered-containers - vector + deepseq exceptions filepath ghc-prim http-types lens primitive + process random ref-tf scientific stm text time transformers + unliftio-core unordered-containers vector ]; description = "Interface for JavaScript that works with GHCJS and GHC"; license = stdenv.lib.licenses.mit; @@ -123352,10 +123901,8 @@ self: { }: mkDerivation { pname = "json-autotype"; - version = "1.1.2"; - sha256 = "1gf7g5y46wpkkhdnmvi85h518a59yb5j8ffgrnb82cs5zjwjpa9j"; - revision = "1"; - editedCabalFile = "0qc69s8wcsfy8h8mbz2iyxi02gwissb93wn5gapwisinhm44ldpd"; + version = "2.0.0"; + sha256 = "0mip3k489321sqzzwbv0sbcscv2q9n4lbc63sx8lslsy95da9x68"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -124697,6 +125244,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "kan-extensions_5_2" = callPackage + ({ mkDerivation, adjunctions, array, base, comonad, containers + , contravariant, distributive, free, invariant, mtl, profunctors + , semigroupoids, tagged, transformers, transformers-compat + }: + mkDerivation { + pname = "kan-extensions"; + version = "5.2"; + sha256 = "1lyvyiwwh962j2nnnsqzlvp5zq6z8p3spvhmji99cjvldxc7wwkb"; + libraryHaskellDepends = [ + adjunctions array base comonad containers contravariant + distributive free invariant mtl profunctors semigroupoids tagged + transformers transformers-compat + ]; + description = "Kan extensions, Kan lifts, the Yoneda lemma, and (co)density (co)monads"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "kangaroo" = callPackage ({ mkDerivation, array, base }: mkDerivation { @@ -124773,8 +125339,8 @@ self: { pname = "kansas-comet"; version = "0.4"; sha256 = "1q9rffh6589a5am8mvfzxzwws34vg08rdjxggfabhmg9y9jla6hz"; - revision = "14"; - editedCabalFile = "0iz92v375bvfp1yib7xmvwwci2ndh68fy20597dvc0b6wpjx76lq"; + revision = "16"; + editedCabalFile = "1fnncjd9wjwrnl0247gizlvwklihjbfk21pad6a4mqnaa3li5672"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base containers data-default-class scotty stm text time @@ -125015,6 +125581,7 @@ self: { ]; description = "Katip scribe that logs to Rollbar"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "katip-scalyr-scribe" = callPackage @@ -125033,6 +125600,7 @@ self: { ]; description = "A katip scribe for logging to json"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "katip-syslog" = callPackage @@ -125790,8 +126358,8 @@ self: { pname = "keys"; version = "3.12"; sha256 = "0may9nrlfji2mmypl9q47lcpg4r793hmm4i22x7j4l6zz67sggyl"; - revision = "2"; - editedCabalFile = "0cy2fdxxqg0bgkb8xhnw6zws00d78bpk48xv7zzmvnj549l819ib"; + revision = "3"; + editedCabalFile = "164z97ck2svam9c5gc05jklw8ai5nna7dknwwsp9nvw7wcw1dmln"; libraryHaskellDepends = [ array base comonad containers free hashable semigroupoids semigroups tagged transformers transformers-compat @@ -125801,6 +126369,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "keys_3_12_1" = callPackage + ({ mkDerivation, array, base, comonad, containers, free, hashable + , semigroupoids, semigroups, tagged, transformers + , transformers-compat, unordered-containers + }: + mkDerivation { + pname = "keys"; + version = "3.12.1"; + sha256 = "1yqm4gpshsgswx6w78z64c83gpydh6jhgslx2lnc10nzhy0s9kkz"; + libraryHaskellDepends = [ + array base comonad containers free hashable semigroupoids + semigroups tagged transformers transformers-compat + unordered-containers + ]; + description = "Keyed functors and containers"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "keysafe" = callPackage ({ mkDerivation, aeson, argon2, async, base, bloomfilter , bytestring, containers, deepseq, directory, disk-free-space @@ -126858,8 +127445,8 @@ self: { }: mkDerivation { pname = "lambdabot"; - version = "5.1.0.1"; - sha256 = "195xm7ncqfpj51vipmv7di1yqba9iy6c38a0rqrkji0w13aprp14"; + version = "5.1.0.2"; + sha256 = "1nzjlxyzrri8zw67flqn1arz10mgbmyglhvf6pg4r8w78iwg5nk3"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -126883,8 +127470,8 @@ self: { }: mkDerivation { pname = "lambdabot-core"; - version = "5.1.0.1"; - sha256 = "0w49s8n0bj0fbdjikgy6p2mlbrcq5069m7yqwdwiqmffi7hl5dgb"; + version = "5.1.0.2"; + sha256 = "1n0cqkbiadc169vq7pj5zwvi3yay6db60q8pdk4kci0s9clz4161"; libraryHaskellDepends = [ base binary bytestring containers dependent-map dependent-sum dependent-sum-template directory edit-distance filepath haskeline @@ -126909,8 +127496,8 @@ self: { }: mkDerivation { pname = "lambdabot-haskell-plugins"; - version = "5.1.0.2"; - sha256 = "1vr4f92zsjdr2j1zxb2v1hmyrb4lvq32c08jgind7apkmvqjgm19"; + version = "5.1.0.3"; + sha256 = "1hka7kb2j5nqzv9jljjyylfyrf5z3hsfp2sfgv95y5qsr2b6g96a"; libraryHaskellDepends = [ array arrows base bytestring containers data-memocombinators directory filepath haskell-src-exts-simple hoogle HTTP IOSpec @@ -128990,6 +129577,7 @@ self: { libraryHaskellDepends = [ alex-tools base text ]; description = "A collection of different layout implementations"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "layouting" = callPackage @@ -129668,8 +130256,8 @@ self: { pname = "lens"; version = "4.16.1"; sha256 = "1im4drhbydbawd6i0jsrzpqihnmx4ywpkg7yg94ddwsw3mxwkgpm"; - revision = "1"; - editedCabalFile = "12ycfzkc87fp787a5iq3k20mrfjd6b0r2d0dr7zscfd81sgw4shx"; + revision = "2"; + editedCabalFile = "11h83lj5mba4grhz1qx3irz10ysm9c3k7k6i6xv2cr60q8xin3ri"; setupHaskellDepends = [ base Cabal cabal-doctest filepath ]; libraryHaskellDepends = [ array base base-orphans bifunctors bytestring call-stack comonad @@ -129694,6 +130282,47 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; + "lens_4_17" = callPackage + ({ mkDerivation, array, base, base-orphans, bifunctors, bytestring + , Cabal, cabal-doctest, call-stack, comonad, containers + , contravariant, criterion, deepseq, directory, distributive + , doctest, exceptions, filepath, free, generic-deriving, ghc-prim + , hashable, HUnit, kan-extensions, mtl, nats, parallel, profunctors + , QuickCheck, reflection, semigroupoids, semigroups, simple-reflect + , tagged, template-haskell, test-framework, test-framework-hunit + , test-framework-quickcheck2, test-framework-th, text + , th-abstraction, transformers, transformers-compat + , unordered-containers, vector, void + }: + mkDerivation { + pname = "lens"; + version = "4.17"; + sha256 = "1k087zfy10rijr3cikalj8p58d8ypfmhb4d29bsbw8qhakg68dj7"; + setupHaskellDepends = [ base Cabal cabal-doctest filepath ]; + libraryHaskellDepends = [ + array base base-orphans bifunctors bytestring call-stack comonad + containers contravariant distributive exceptions filepath free + ghc-prim hashable kan-extensions mtl parallel profunctors + reflection semigroupoids semigroups tagged template-haskell text + th-abstraction transformers transformers-compat + unordered-containers vector void + ]; + testHaskellDepends = [ + base bytestring containers deepseq directory doctest filepath + generic-deriving HUnit mtl nats parallel QuickCheck semigroups + simple-reflect test-framework test-framework-hunit + test-framework-quickcheck2 test-framework-th text transformers + unordered-containers vector + ]; + benchmarkHaskellDepends = [ + base bytestring comonad containers criterion deepseq + generic-deriving transformers unordered-containers vector + ]; + description = "Lenses, Folds and Traversals"; + license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "lens-accelerate" = callPackage ({ mkDerivation, accelerate, base, lens }: mkDerivation { @@ -129812,6 +130441,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "lens-family-th_0_5_0_2" = callPackage + ({ mkDerivation, base, hspec, template-haskell, transformers }: + mkDerivation { + pname = "lens-family-th"; + version = "0.5.0.2"; + sha256 = "1rmhcnnlnll4mq7pqld5qg6crxh74gp0fqiwl6wn8l3ssgx5l9ww"; + libraryHaskellDepends = [ base template-haskell ]; + testHaskellDepends = [ base hspec template-haskell transformers ]; + description = "Generate lens-family style lenses"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "lens-labels" = callPackage ({ mkDerivation, base, ghc-prim }: mkDerivation { @@ -129835,6 +130477,17 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "lens-misc" = callPackage + ({ mkDerivation, base, lens, tagged, template-haskell }: + mkDerivation { + pname = "lens-misc"; + version = "0.0.2.0"; + sha256 = "1jyqxi83imkyd318m17p2z84zqaxyb08mk5gy7q7saay2blmz4jr"; + libraryHaskellDepends = [ base lens tagged template-haskell ]; + description = "Miscellaneous lens utilities"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "lens-named" = callPackage ({ mkDerivation, base, lens, template-haskell }: mkDerivation { @@ -131143,6 +131796,7 @@ self: { ]; testToolDepends = [ tasty-discover ]; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lift-generics" = callPackage @@ -131153,8 +131807,8 @@ self: { pname = "lift-generics"; version = "0.1.2"; sha256 = "0kk05dp6n93jgxq4x1lrckjrca6lrwa7qklr3vpzc6iyrlbvv7qf"; - revision = "1"; - editedCabalFile = "02hg33ikmwl81zsw8fgppix740rdc3h8fv6nr9b9h37vizhs50zw"; + revision = "2"; + editedCabalFile = "171f8cpn0kw9psikx3n7cdwyqfwg8rr8gf1hja6g7pnm0683l5l8"; libraryHaskellDepends = [ base generic-deriving ghc-prim template-haskell ]; @@ -131594,8 +132248,8 @@ self: { pname = "linear"; version = "1.20.7"; sha256 = "1dna0zf4qwqwvslz0nkkfclvbflfvf10qydnjsi20wijilkbd22b"; - revision = "5"; - editedCabalFile = "0m67chpgxwakx62n22555nr2ii1hvspqcypjdwib9c1jrpg3ss95"; + revision = "6"; + editedCabalFile = "12ksfxwi0dc6laadswfp9ri9z7lnqf9qxh8vawmj2xnz8n1n73vx"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ adjunctions base base-orphans binary bytes cereal containers @@ -131611,6 +132265,35 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "linear_1_20_8" = callPackage + ({ mkDerivation, adjunctions, base, base-orphans, binary, bytes + , bytestring, Cabal, cabal-doctest, cereal, containers, deepseq + , distributive, doctest, ghc-prim, hashable, HUnit, lens + , reflection, semigroupoids, semigroups, simple-reflect, tagged + , template-haskell, test-framework, test-framework-hunit + , transformers, transformers-compat, unordered-containers, vector + , void + }: + mkDerivation { + pname = "linear"; + version = "1.20.8"; + sha256 = "046vkvxlb0s286qr55s0c6db0rlwbm1cmlmwhrrkqbkzhfcipgay"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + adjunctions base base-orphans binary bytes cereal containers + deepseq distributive ghc-prim hashable lens reflection + semigroupoids semigroups tagged template-haskell transformers + transformers-compat unordered-containers vector void + ]; + testHaskellDepends = [ + base binary bytestring deepseq doctest HUnit lens reflection + simple-reflect test-framework test-framework-hunit vector + ]; + description = "Linear Algebra"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "linear-accelerate" = callPackage ({ mkDerivation, accelerate, base, Cabal, cabal-doctest , distributive, doctest, lens, linear @@ -131776,20 +132459,19 @@ self: { }) {}; "linearmap-category" = callPackage - ({ mkDerivation, base, constrained-categories, containers - , free-vector-spaces, ieee754, lens, linear, manifolds-core - , semigroups, tagged, transformers, vector, vector-space + ({ mkDerivation, base, call-stack, constrained-categories + , containers, free-vector-spaces, ieee754, lens, linear + , manifolds-core, semigroups, tagged, transformers, vector + , vector-space }: mkDerivation { pname = "linearmap-category"; - version = "0.3.4.0"; - sha256 = "0idmaw25cz7lk3kr9n0jri776j0qajrlc9j1aki0brvx6p6yh2dp"; - revision = "1"; - editedCabalFile = "0vrx3ws23qg1ygh1ksvgrpz92nhnr1nmrwy8a3ax08n8jcx2nrrw"; + version = "0.3.5.0"; + sha256 = "0qmd0nz343j3j3kprbhwfkglcswfcawfy0y6g4ai6nzdga42nfrf"; libraryHaskellDepends = [ - base constrained-categories containers free-vector-spaces ieee754 - lens linear manifolds-core semigroups tagged transformers vector - vector-space + base call-stack constrained-categories containers + free-vector-spaces ieee754 lens linear manifolds-core semigroups + tagged transformers vector vector-space ]; description = "Native, complete, matrix-free linear algebra"; license = stdenv.lib.licenses.gpl3; @@ -135713,8 +136395,8 @@ self: { pname = "machines"; version = "0.6.3"; sha256 = "1kxypm26xxd30979yrg94pnaaj3yfn180ri3y4z2xsm2m5iyiliz"; - revision = "7"; - editedCabalFile = "00wq0lnz081bcjrnsg2pvn3i08b4ssgqm92n5j0lpqlym2vm0ar8"; + revision = "9"; + editedCabalFile = "1z8khbpx7yjlpm06q7immwk3jm1h2q8kf52aksy11lkmns9ladvl"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ adjunctions base comonad containers distributive mtl pointed @@ -135729,6 +136411,31 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "machines_0_6_4" = callPackage + ({ mkDerivation, adjunctions, base, Cabal, cabal-doctest, comonad + , conduit, containers, criterion, distributive, doctest, mtl, pipes + , pointed, profunctors, semigroupoids, semigroups, streaming + , transformers, transformers-compat, void + }: + mkDerivation { + pname = "machines"; + version = "0.6.4"; + sha256 = "0s3pvdklanw6a41pyyqrplm3vid63dpy6vd6qhp86dnb4wp2ppkj"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + adjunctions base comonad containers distributive mtl pointed + profunctors semigroupoids semigroups transformers + transformers-compat void + ]; + testHaskellDepends = [ base doctest ]; + benchmarkHaskellDepends = [ + base conduit criterion mtl pipes streaming + ]; + description = "Networked stream transducers"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "machines-amazonka" = callPackage ({ mkDerivation, amazonka, amazonka-autoscaling, amazonka-core , amazonka-ec2, amazonka-s3, amazonka-sts, base @@ -136867,8 +137574,8 @@ self: { }: mkDerivation { pname = "manifold-random"; - version = "0.4.5.0"; - sha256 = "0z21jcrzky80fq172b2s0hwna4g1kzfzval40cdl6glf0l2zfimv"; + version = "0.5.0.0"; + sha256 = "19p2yh8yrav6dljmw8mz3xnghxf2h9a5z5wqxnb6zsrl11mds95g"; libraryHaskellDepends = [ base constrained-categories linearmap-category manifolds random-fu semigroups vector-space @@ -136879,27 +137586,29 @@ self: { }) {}; "manifolds" = callPackage - ({ mkDerivation, base, call-stack, comonad, constrained-categories - , containers, deepseq, free, free-vector-spaces, lens, linear - , linearmap-category, manifolds-core, MemoTrie, number-show - , placeholders, pragmatic-show, QuickCheck, semigroups, tagged + ({ mkDerivation, array, base, call-stack, comonad + , constrained-categories, containers, deepseq, free + , free-vector-spaces, ieee754, lens, linear, linearmap-category + , manifolds-core, MemoTrie, number-show, placeholders + , pragmatic-show, QuickCheck, semigroups, spatial-rotations, tagged , tasty, tasty-hunit, tasty-quickcheck, transformers, vector , vector-space, void }: mkDerivation { pname = "manifolds"; - version = "0.4.5.0"; - sha256 = "0paq7x9nhna74q4y7gvwlvwfpzxil9dx9ysg3r6k5as4i9687442"; + version = "0.5.0.0"; + sha256 = "1261vap8raffngdxmzv042carjdlcssqbpa9vs3qi0x3jbbwiywc"; libraryHaskellDepends = [ - base call-stack comonad constrained-categories containers deepseq - free free-vector-spaces lens linear linearmap-category - manifolds-core MemoTrie number-show placeholders pragmatic-show - QuickCheck semigroups tagged transformers vector vector-space void + array base call-stack comonad constrained-categories containers + deepseq free free-vector-spaces ieee754 lens linear + linearmap-category manifolds-core MemoTrie number-show placeholders + pragmatic-show QuickCheck semigroups spatial-rotations tagged + transformers vector vector-space void ]; testHaskellDepends = [ base constrained-categories containers lens linear - linearmap-category pragmatic-show tasty tasty-hunit - tasty-quickcheck vector-space + linearmap-category pragmatic-show spatial-rotations tasty + tasty-hunit tasty-quickcheck vector-space ]; description = "Coordinate-free hypersurfaces"; license = stdenv.lib.licenses.gpl3; @@ -136910,8 +137619,8 @@ self: { ({ mkDerivation, base, call-stack, tagged, vector-space }: mkDerivation { pname = "manifolds-core"; - version = "0.4.5.0"; - sha256 = "1g2lb8f2l9gwpflifm8idvf2w6if497gc6pgpr7j6s9c7byh8p3p"; + version = "0.5.0.0"; + sha256 = "0b8ac9l2asqlhazl0wlgb0qiyj1adk89m5fvhqqx1nw829dly6gw"; libraryHaskellDepends = [ base call-stack tagged vector-space ]; description = "The basic classes for the manifolds hierarchy"; license = stdenv.lib.licenses.gpl3; @@ -137797,6 +138506,7 @@ self: { ]; description = "Read and Display representation of matrix like \"x,y,z\""; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "matrix-market" = callPackage @@ -139140,6 +139850,7 @@ self: { ]; description = "Haskell binding for Menoh DNN inference library"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {menoh = null;}; "mercury-api" = callPackage @@ -139630,42 +140341,6 @@ self: { }: mkDerivation { pname = "microformats2-parser"; - version = "1.0.1.7"; - sha256 = "1waqcw63ygn6yjs7720l94kssfsrjdxfsp70kri498zsziia9w6y"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson aeson-qq attoparsec base base-compat blaze-markup bytestring - containers data-default either errors html-conduit lens-aeson - network-uri pcre-heavy safe tagsoup text time transformers - unordered-containers vector xml-lens xss-sanitize - ]; - executableHaskellDepends = [ - aeson aeson-pretty base base-compat blaze-html blaze-markup - data-default network network-uri options scotty text wai-cli - wai-extra - ]; - testHaskellDepends = [ - aeson-qq base base-compat bytestring data-default hspec - hspec-expectations-pretty-diff html-conduit mtl network-uri - raw-strings-qq template-haskell text time xml-lens - ]; - description = "A Microformats 2 parser"; - license = stdenv.lib.licenses.publicDomain; - }) {}; - - "microformats2-parser_1_0_1_8" = callPackage - ({ mkDerivation, aeson, aeson-pretty, aeson-qq, attoparsec, base - , base-compat, blaze-html, blaze-markup, bytestring, containers - , data-default, either, errors, hspec - , hspec-expectations-pretty-diff, html-conduit, lens-aeson, mtl - , network, network-uri, options, pcre-heavy, raw-strings-qq, safe - , scotty, tagsoup, template-haskell, text, time, transformers - , unordered-containers, vector, wai-cli, wai-extra, xml-lens - , xss-sanitize - }: - mkDerivation { - pname = "microformats2-parser"; version = "1.0.1.8"; sha256 = "0hb5i60w369lngfw5a3bai5zvlgchcf1vvxshp9md77lyl7h49ar"; isLibrary = true; @@ -139688,7 +140363,6 @@ self: { ]; description = "A Microformats 2 parser"; license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "microformats2-types" = callPackage @@ -140399,23 +141073,11 @@ self: { ({ mkDerivation, base, bytestring, containers, text }: mkDerivation { pname = "mime-types"; - version = "0.1.0.7"; - sha256 = "1fg9cqpp5lswk8ajlq4f41n12c2v2naz179l8dsz6zisjqj4l5l3"; - libraryHaskellDepends = [ base bytestring containers text ]; - description = "Basic mime-type handling types and functions"; - license = stdenv.lib.licenses.mit; - }) {}; - - "mime-types_0_1_0_8" = callPackage - ({ mkDerivation, base, bytestring, containers, text }: - mkDerivation { - pname = "mime-types"; version = "0.1.0.8"; sha256 = "14ccl2842ya17zyj0bpc7vzklbyqvvydpbypn69h2fmhgji192x8"; libraryHaskellDepends = [ base bytestring containers text ]; description = "Basic mime-type handling types and functions"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "minecraft-data" = callPackage @@ -140595,6 +141257,38 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "minio-hs_1_1_0" = callPackage + ({ mkDerivation, aeson, base, base64-bytestring, bytestring + , case-insensitive, conduit, conduit-extra, containers, cryptonite + , cryptonite-conduit, directory, filepath, http-client + , http-conduit, http-types, ini, memory, protolude, QuickCheck + , resourcet, tasty, tasty-hunit, tasty-quickcheck, tasty-smallcheck + , temporary, text, time, transformers, unliftio, unliftio-core + , xml-conduit + }: + mkDerivation { + pname = "minio-hs"; + version = "1.1.0"; + sha256 = "0nmjv4khbw5pi01sin6vksh8r7xy6v5y1fadiy9ww2fh9y5ix56b"; + libraryHaskellDepends = [ + aeson base base64-bytestring bytestring case-insensitive conduit + conduit-extra containers cryptonite cryptonite-conduit directory + filepath http-client http-conduit http-types ini memory protolude + resourcet text time transformers unliftio unliftio-core xml-conduit + ]; + testHaskellDepends = [ + aeson base base64-bytestring bytestring case-insensitive conduit + conduit-extra containers cryptonite cryptonite-conduit directory + filepath http-client http-conduit http-types ini memory protolude + QuickCheck resourcet tasty tasty-hunit tasty-quickcheck + tasty-smallcheck temporary text time transformers unliftio + unliftio-core xml-conduit + ]; + description = "A Minio Haskell Library for Amazon S3 compatible cloud storage"; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "minions" = callPackage ({ mkDerivation, ansi-terminal, base, MissingH, process, time }: mkDerivation { @@ -141013,6 +141707,7 @@ self: { ]; description = "Machine Learning Toolbox"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mltool_0_2_0_1" = callPackage @@ -142157,6 +142852,24 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "monad-metrics_0_2_1_2" = callPackage + ({ mkDerivation, base, clock, ekg-core, exceptions, hashable + , microlens, mtl, text, transformers, unordered-containers + }: + mkDerivation { + pname = "monad-metrics"; + version = "0.2.1.2"; + sha256 = "0zxvdx75psdninvh7f7wqj498wav2cjmn94n5a3f5g8nvrs0n4rq"; + libraryHaskellDepends = [ + base clock ekg-core exceptions hashable microlens mtl text + transformers unordered-containers + ]; + testHaskellDepends = [ base ]; + description = "A convenient wrapper around EKG metrics"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "monad-mock" = callPackage ({ mkDerivation, base, constraints, exceptions, haskell-src-exts , haskell-src-meta, hspec, monad-control, mtl, template-haskell @@ -142551,6 +143264,7 @@ self: { testHaskellDepends = [ base containers hlint hspec transformers ]; description = "Monad transformer for recording timing events"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "monad-tx" = callPackage @@ -143593,6 +144307,40 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "morte_1_6_20" = callPackage + ({ mkDerivation, alex, array, base, binary, code-page, containers + , criterion, deepseq, Earley, formatting, http-client + , http-client-tls, microlens, microlens-mtl, mtl + , optparse-applicative, pipes, QuickCheck, system-fileio + , system-filepath, tasty, tasty-hunit, tasty-quickcheck, text + , transformers + }: + mkDerivation { + pname = "morte"; + version = "1.6.20"; + sha256 = "01m382137sa9if332y9aag8fl77f4sd3i8kxz5cp8g1p10iyjjbl"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + array base binary containers deepseq Earley formatting http-client + http-client-tls microlens microlens-mtl pipes system-fileio + system-filepath text transformers + ]; + libraryToolDepends = [ alex ]; + executableHaskellDepends = [ + base code-page formatting optparse-applicative text + ]; + testHaskellDepends = [ + base mtl QuickCheck system-filepath tasty tasty-hunit + tasty-quickcheck text transformers + ]; + benchmarkHaskellDepends = [ base criterion system-filepath text ]; + description = "A bare-bones calculus of constructions"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "mosaico-lib" = callPackage ({ mkDerivation, base, base-unicode-symbols, colour, diagrams-cairo , diagrams-core, diagrams-gtk, diagrams-lib, glib, gtk, JuicyPixels @@ -145602,8 +146350,8 @@ self: { ({ mkDerivation, base, mwc-random, primitive, transformers }: mkDerivation { pname = "mwc-probability"; - version = "2.0.3"; - sha256 = "18gnr5bjmz2bl717dhvg6hwj6z06y5sw2nmsw7d3vl37qd9rp6by"; + version = "2.0.4"; + sha256 = "0msi72qp5aps3n4ji565r4rzyjg7svwilsh8lch59y2b4q7fvscz"; libraryHaskellDepends = [ base mwc-random primitive transformers ]; description = "Sampling function-based probability distributions"; license = stdenv.lib.licenses.mit; @@ -146691,6 +147439,8 @@ self: { pname = "nats"; version = "1.1.2"; sha256 = "1v40drmhixck3pz3mdfghamh73l4rp71mzcviipv1y8jhrfxilmr"; + revision = "1"; + editedCabalFile = "1jzyysf758lfindlclqpzqcd0lrgrdv0rnz2lg8g1rvv07x2n7zh"; doHaddock = false; description = "Natural numbers"; license = stdenv.lib.licenses.bsd3; @@ -146800,8 +147550,8 @@ self: { pname = "natural-transformation"; version = "0.4"; sha256 = "1by8xwjc23l6pa9l4iv7zp82dykpll3vc3hgxk0pgva724n8xhma"; - revision = "5"; - editedCabalFile = "1wlmkq9k9aym4wig9rn5w6sygq2fg9kd02d18pfzgxw70icqjlq3"; + revision = "6"; + editedCabalFile = "0qdjf1756gmq6vjd1p7i4b398s7j1gqfiaz3yf894h5p6x1ym0zl"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base containers quickcheck-instances tasty tasty-quickcheck @@ -148008,26 +148758,6 @@ self: { }: mkDerivation { pname = "network-conduit-tls"; - version = "1.3.0"; - sha256 = "11a9s8spqccnv2x41846pqgkwvb554lrq7qdas78p7biw1d28vbl"; - libraryHaskellDepends = [ - base bytestring conduit conduit-extra connection data-default-class - network streaming-commons tls transformers unliftio-core - ]; - testHaskellDepends = [ - base bytestring conduit conduit-extra connection HUnit mtl - ]; - description = "Create TLS-aware network code with conduits"; - license = stdenv.lib.licenses.mit; - }) {}; - - "network-conduit-tls_1_3_2" = callPackage - ({ mkDerivation, base, bytestring, conduit, conduit-extra - , connection, data-default-class, HUnit, mtl, network - , streaming-commons, tls, transformers, unliftio-core - }: - mkDerivation { - pname = "network-conduit-tls"; version = "1.3.2"; sha256 = "0zxdsf7isv3l2g58vsvi8iwlrgf85v7ksa8636kr6ffycbhn1zgc"; libraryHaskellDepends = [ @@ -148039,7 +148769,6 @@ self: { ]; description = "Create TLS-aware network code with conduits"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "network-connection" = callPackage @@ -149778,6 +150507,7 @@ self: { sha256 = "1m4js4z27x43bkccbaqnlrmknfdiwqgdvvkfad7r4kgwdmil3mnc"; libraryHaskellDepends = [ base containers ]; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "non-empty-sequence" = callPackage @@ -150755,6 +151485,7 @@ self: { testHaskellDepends = [ base numhask-prelude QuickCheck tasty ]; description = "Laws and tests for numhask"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "nums" = callPackage @@ -151423,25 +152154,26 @@ self: { "odbc" = callPackage ({ mkDerivation, async, base, bytestring, containers, deepseq - , formatting, hspec, optparse-applicative, QuickCheck, semigroups - , text, time, transformers, unixODBC, unliftio-core, weigh + , formatting, hspec, optparse-applicative, parsec, QuickCheck + , semigroups, template-haskell, text, time, transformers, unixODBC + , unliftio-core, weigh }: mkDerivation { pname = "odbc"; - version = "0.0.5"; - sha256 = "06b52hd9bxidp62y2h856ac90pypcv72q533i7lywf4gjj1q0grn"; + version = "0.2.0"; + sha256 = "1dv7h2c6y59dsyhz99k1lzydms618i65jra7gzacf88zb4idnvi7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - async base bytestring containers deepseq formatting semigroups text - time transformers unliftio-core + async base bytestring containers deepseq formatting parsec + semigroups template-haskell text time transformers unliftio-core ]; librarySystemDepends = [ unixODBC ]; executableHaskellDepends = [ base bytestring optparse-applicative text ]; testHaskellDepends = [ - base bytestring hspec QuickCheck text time + base bytestring hspec parsec QuickCheck text time ]; benchmarkHaskellDepends = [ async base text weigh ]; description = "Haskell binding to the ODBC API, aimed at SQL Server driver"; @@ -153968,8 +154700,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "packcheck"; - version = "0.3.0"; - sha256 = "02ixa91wp0jxdc046gi5qxyyw332znkgknfz5chf4j3ydn7qjlha"; + version = "0.3.1"; + sha256 = "1s171bgqpqh61vaf8s91bbpgn816380bma4wb8in4pnnaf2s0xhv"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base ]; benchmarkHaskellDepends = [ base ]; @@ -158256,6 +158988,7 @@ self: { ]; description = "Manual migrations for the persistent library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "persistent-mongoDB" = callPackage @@ -159075,8 +159808,8 @@ self: { }: mkDerivation { pname = "phoityne-vscode"; - version = "0.0.24.0"; - sha256 = "1kk8bfvai1196960cqq6zg5xhs15jzwllw57n247csiifijs0b0v"; + version = "0.0.25.0"; + sha256 = "16l1w92i0nr6a9z4l9cq3372mqgis17nqhdky8a157cqa2if150b"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -160048,6 +160781,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "pipes-concurrency_2_0_11" = callPackage + ({ mkDerivation, async, base, contravariant, pipes, semigroups, stm + , void + }: + mkDerivation { + pname = "pipes-concurrency"; + version = "2.0.11"; + sha256 = "03h87b11c64yvj28lxgbvjvqrsx0zfqb92v0apd8ypb9xxabqd4m"; + libraryHaskellDepends = [ + async base contravariant pipes semigroups stm void + ]; + testHaskellDepends = [ async base pipes stm ]; + description = "Concurrency for the pipes ecosystem"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "pipes-conduit" = callPackage ({ mkDerivation, base, conduit, mtl, pipes-core }: mkDerivation { @@ -160166,6 +160916,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "pipes-extras_1_0_15" = callPackage + ({ mkDerivation, base, foldl, HUnit, lens, pipes, test-framework + , test-framework-hunit, transformers + }: + mkDerivation { + pname = "pipes-extras"; + version = "1.0.15"; + sha256 = "1cyb05bv5xkarab3090ikpjiqm79lr46n3nalplliz8jr4x67a82"; + libraryHaskellDepends = [ base foldl lens pipes transformers ]; + testHaskellDepends = [ + base HUnit pipes test-framework test-framework-hunit transformers + ]; + description = "Extra utilities for pipes"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "pipes-fastx" = callPackage ({ mkDerivation, attoparsec, base, bytestring, pipes , pipes-attoparsec, pipes-bytestring @@ -160262,8 +161029,8 @@ self: { }: mkDerivation { pname = "pipes-group"; - version = "1.0.10"; - sha256 = "1j37sj0i7lkmk228lchp5kkvf86fiwrkikwwrfibpb6xwixjmlr8"; + version = "1.0.11"; + sha256 = "1570chhj3i587wgsgz70d1p94j524wz86xaal7imwvgmw40gdacc"; libraryHaskellDepends = [ base free pipes pipes-parse transformers ]; @@ -160273,14 +161040,14 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "pipes-group_1_0_11" = callPackage + "pipes-group_1_0_12" = callPackage ({ mkDerivation, base, doctest, free, lens-family-core, pipes , pipes-parse, transformers }: mkDerivation { pname = "pipes-group"; - version = "1.0.11"; - sha256 = "1570chhj3i587wgsgz70d1p94j524wz86xaal7imwvgmw40gdacc"; + version = "1.0.12"; + sha256 = "1issfj3syi6lfbcdn3bhlbnlh86s92ldsb04c4ac69xipsgyhwqk"; libraryHaskellDepends = [ base free pipes pipes-parse transformers ]; @@ -161761,6 +162528,8 @@ self: { pname = "pointed"; version = "5.0.1"; sha256 = "1p91a762xglckscnhpflxzav8byf49a02mli3983i4kpr2jkaimr"; + revision = "1"; + editedCabalFile = "1ccjmzz3jf5ybrzv7qdwm3qb8rz0yskvi4ackrixyhdk8bg5f3nc"; libraryHaskellDepends = [ base comonad containers data-default-class hashable kan-extensions semigroupoids semigroups stm tagged transformers @@ -162276,29 +163045,6 @@ self: { }: mkDerivation { pname = "pomaps"; - version = "0.0.0.4"; - sha256 = "0mjfzj2j8b6337ivvnry7ylrw5g1ajxpqqzar1wmscm73ybr0xbn"; - libraryHaskellDepends = [ - base containers deepseq ghc-prim lattices - ]; - testHaskellDepends = [ - base ChasingBottoms containers doctest Glob lattices tasty - tasty-hspec tasty-quickcheck - ]; - benchmarkHaskellDepends = [ - base criterion deepseq lattices random vector - ]; - description = "Maps and sets of partial orders"; - license = stdenv.lib.licenses.mit; - }) {}; - - "pomaps_0_0_1_0" = callPackage - ({ mkDerivation, base, ChasingBottoms, containers, criterion - , deepseq, doctest, ghc-prim, Glob, lattices, random, tasty - , tasty-hspec, tasty-quickcheck, vector - }: - mkDerivation { - pname = "pomaps"; version = "0.0.1.0"; sha256 = "1vvvpqr3gnps425mv00scmab0hc8h93ylsiw07vm8cpafwkfxii8"; libraryHaskellDepends = [ @@ -162313,7 +163059,6 @@ self: { ]; description = "Maps and sets of partial orders"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pomodoro" = callPackage @@ -163638,8 +164383,8 @@ self: { }: mkDerivation { pname = "potoki-core"; - version = "2.1"; - sha256 = "04i94rk7skcvaqyapl88iw1npz84jhd1gr17darjvwxyvdvrm1h0"; + version = "2.2"; + sha256 = "19isadkd9dw4wz1230yri345mdn71hx8qcj0mbsih14yv5ignlsv"; libraryHaskellDepends = [ acquire attoparsec base bytestring directory foldl hashable profunctors ptr stm text transformers unagi-chan @@ -163681,6 +164426,7 @@ self: { ]; description = "Streaming ZLib decompression"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "potrace" = callPackage @@ -164860,6 +165606,7 @@ self: { libraryHaskellDepends = [ base ghc-prim primitive semigroups ]; description = "Primitive byte array with type variable"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "prim-ref" = callPackage @@ -164959,6 +165706,8 @@ self: { pname = "primitive"; version = "0.6.4.0"; sha256 = "0r0cda7acvplgwaxy69kviv4jp7kkfi038by68gj4yfx4iwszgjc"; + revision = "1"; + editedCabalFile = "18a14k1yiam1m4l29rin9a0y53yp3nxvkz358nysld8aqwy2qsjv"; libraryHaskellDepends = [ base ghc-prim transformers ]; description = "Primitive memory-related operations"; license = stdenv.lib.licenses.bsd3; @@ -164995,6 +165744,7 @@ self: { base containers gauge ghc-prim primitive random ]; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "primitive-indexed" = callPackage @@ -165006,6 +165756,7 @@ self: { libraryHaskellDepends = [ base primitive ]; testHaskellDepends = [ base doctest QuickCheck ]; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "primitive-simd" = callPackage @@ -165774,14 +166525,31 @@ self: { pname = "profunctors"; version = "5.2.2"; sha256 = "0s1pwjidbn761xk43pmzyvn99hm3psdifjd78ylki7f97aiyd0g9"; - revision = "1"; - editedCabalFile = "1g6fvxq2npnyi8wv9mvwy35an68lrm5bf7xmx9x61mbwdxb6d0cg"; + revision = "2"; + editedCabalFile = "1ywlg9z8nlhd2avgb8c6gbkv8zyk7hvc25926bafyg0m0k8y1amq"; + libraryHaskellDepends = [ + base base-orphans bifunctors comonad contravariant distributive + semigroups tagged transformers + ]; + description = "Profunctors"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "profunctors_5_3" = callPackage + ({ mkDerivation, base, base-orphans, bifunctors, comonad + , contravariant, distributive, semigroups, tagged, transformers + }: + mkDerivation { + pname = "profunctors"; + version = "5.3"; + sha256 = "1dx3nkc27yxsrbrhh3iwhq7dl1xn6bj7n62yx6nh8vmpbg62lqvl"; libraryHaskellDepends = [ base base-orphans bifunctors comonad contravariant distributive semigroups tagged transformers ]; description = "Profunctors"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "progress" = callPackage @@ -166602,24 +167370,6 @@ self: { }: mkDerivation { pname = "protocol-buffers"; - version = "2.4.10"; - sha256 = "0rr7yla1gl199hk2zn7jr1p0nq166mi4dm43ild27y6bvrdc2kvk"; - revision = "1"; - editedCabalFile = "04cv52k497nmh04pflmjrl26vlbczvm3mk4qld0zrwqxkk6v0ris"; - libraryHaskellDepends = [ - array base binary bytestring containers directory filepath mtl - parsec syb utf8-string - ]; - description = "Parse Google Protocol Buffer specifications"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "protocol-buffers_2_4_11" = callPackage - ({ mkDerivation, array, base, binary, bytestring, containers - , directory, filepath, mtl, parsec, syb, utf8-string - }: - mkDerivation { - pname = "protocol-buffers"; version = "2.4.11"; sha256 = "1s41iprw4w6g56phrgali2b59isn2s67nzfwr38yfgib3lm4kjs7"; libraryHaskellDepends = [ @@ -166628,29 +167378,12 @@ self: { ]; description = "Parse Google Protocol Buffer specifications"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "protocol-buffers-descriptor" = callPackage ({ mkDerivation, base, bytestring, containers, protocol-buffers }: mkDerivation { pname = "protocol-buffers-descriptor"; - version = "2.4.10"; - sha256 = "1w4n0yqf5xhbs5yi0xj8ak268chngklc7sif2s3bjr0dwk7fi5d0"; - revision = "1"; - editedCabalFile = "03b3w0yawnjv5hpprkhj49s1fkj9ib03avyxgv3i9vj0n0ngbiz1"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - base bytestring containers protocol-buffers - ]; - description = "Text.DescriptorProto.Options and code generated from the Google Protocol Buffer specification"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "protocol-buffers-descriptor_2_4_11" = callPackage - ({ mkDerivation, base, bytestring, containers, protocol-buffers }: - mkDerivation { - pname = "protocol-buffers-descriptor"; version = "2.4.11"; sha256 = "06k8sz0i021mizdgh01rx7v08wc767njwppimgmm2hyg6k4bv450"; enableSeparateDataOutput = true; @@ -166659,7 +167392,6 @@ self: { ]; description = "Text.DescriptorProto.Options and code generated from the Google Protocol Buffer specification"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "protocol-buffers-descriptor-fork" = callPackage @@ -167456,8 +168188,8 @@ self: { }: mkDerivation { pname = "pure-zlib"; - version = "0.6.3"; - sha256 = "1bsbpzywbh33kp2l7p80g8pnh66fd76sii4900f80x1yjig03gb8"; + version = "0.6.4"; + sha256 = "05rhvhvdn8ly5jldxg3q7ip6zflzqa1wyj8mlcl0scgsngn9lrzb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -170564,14 +171296,14 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "rank2classes_1_1" = callPackage + "rank2classes_1_1_0_1" = callPackage ({ mkDerivation, base, distributive, doctest, tasty, tasty-hunit , template-haskell, transformers }: mkDerivation { pname = "rank2classes"; - version = "1.1"; - sha256 = "0m7zxgjql399xm97v9jczg13mclnwnwbls8d788iyfqbhlk3slkf"; + version = "1.1.0.1"; + sha256 = "1iw2xanyv7rw995sy3c0dvkjl3js4bd7n2hz0x509pkz8hzsa93w"; libraryHaskellDepends = [ base distributive template-haskell transformers ]; @@ -171196,8 +171928,8 @@ self: { pname = "rcu"; version = "0.2.2"; sha256 = "0lj88xif38zh1qkpfzyarm36khzavqsl8chjma062b1pvhhlc9lk"; - revision = "3"; - editedCabalFile = "1qyc8jb97mfcmijn825s6mr244mx2kqvam5mm519dm6dyk8kchpa"; + revision = "4"; + editedCabalFile = "18gaaz7pj7x9yv2na1zbqavirrj93c7q6z28r4502if0w1w8wk8f"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal cabal-doctest ]; @@ -172164,6 +172896,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "recursion-schemes_5_0_3" = callPackage + ({ mkDerivation, base, base-orphans, comonad, free, HUnit + , template-haskell, th-abstraction, transformers + }: + mkDerivation { + pname = "recursion-schemes"; + version = "5.0.3"; + sha256 = "17x0kjl3yqanx234mb838yy21gw4if6qgzpi5l0b17m8llvp086v"; + revision = "1"; + editedCabalFile = "0r0qwxa0yg6814w8zfdla3k25x971a7pdr06sqws7fz5zri8rrn8"; + libraryHaskellDepends = [ + base base-orphans comonad free template-haskell th-abstraction + transformers + ]; + testHaskellDepends = [ base HUnit template-haskell transformers ]; + description = "Generalized bananas, lenses and barbed wire"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "recursion-schemes-ext" = callPackage ({ mkDerivation, base, composition-prelude, criterion, deepseq , hspec, lens, recursion-schemes @@ -172434,6 +173186,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "reducers_3_12_3" = callPackage + ({ mkDerivation, array, base, bytestring, containers, fingertree + , hashable, semigroupoids, semigroups, text, transformers + , unordered-containers + }: + mkDerivation { + pname = "reducers"; + version = "3.12.3"; + sha256 = "09wf8pl9ycglcv6qj5ba26gkg2s5iy81hsx9xp0q8na0cwvp71ki"; + libraryHaskellDepends = [ + array base bytestring containers fingertree hashable semigroupoids + semigroups text transformers unordered-containers + ]; + description = "Semigroups, specialized containers and a general map/reduce framework"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "reedsolomon" = callPackage ({ mkDerivation, base, bytestring, criterion, exceptions, gitrev , loop, mtl, primitive, profunctors, QuickCheck, random, tasty @@ -172655,6 +173425,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "reflection_2_1_4" = callPackage + ({ mkDerivation, base, template-haskell }: + mkDerivation { + pname = "reflection"; + version = "2.1.4"; + sha256 = "0kf4a5ijw6jfnfibjcrpdy9vzh1n6v2pxia8dhyyqdissiwc8bzj"; + libraryHaskellDepends = [ base template-haskell ]; + description = "Reifies arbitrary terms into types that can be reflected back into terms"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "reflection-extras" = callPackage ({ mkDerivation, aeson, base, constraints, lens, reflection, tagged }: @@ -173885,6 +174667,7 @@ self: { ]; description = "Sensible RLP encoding"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "relation" = callPackage @@ -173939,7 +174722,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "relational-query_0_12_0_0" = callPackage + "relational-query_0_12_0_1" = callPackage ({ mkDerivation, array, base, bytestring, containers, dlist , names-th, persistable-record, product-isomorphic , quickcheck-simple, sql-words, template-haskell, text @@ -173947,8 +174730,8 @@ self: { }: mkDerivation { pname = "relational-query"; - version = "0.12.0.0"; - sha256 = "0rp6fi93wyr0w2rhng8ymn9bdh4pdrn488l0lnm4f5ris50dz2y1"; + version = "0.12.0.1"; + sha256 = "0njmp3209499qvm30dy4k9gc3fpnf00bkkd42f8cif9gi5fhbwhz"; libraryHaskellDepends = [ array base bytestring containers dlist names-th persistable-record product-isomorphic sql-words template-haskell text th-reify-compat @@ -174035,8 +174818,8 @@ self: { }: mkDerivation { pname = "relational-record-examples"; - version = "0.5.1.0"; - sha256 = "0xsd1syrs1fsxkkbc7zb0dwl9wqjyf31n44h4b3la93pcjv4dl7q"; + version = "0.5.1.1"; + sha256 = "0ll6yjp0scbv2fl18b8qplj488a4wp985dr2km0hf4zjb1mri0i0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -176017,6 +176800,103 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "rfc-env" = callPackage + ({ mkDerivation, base, envy, network, rfc-prelude, time }: + mkDerivation { + pname = "rfc-env"; + version = "0.0.0.1"; + sha256 = "1s3r5wpap3rj7fxx1wvxjk5671jcnllvplz631vagwbyl9p755zh"; + libraryHaskellDepends = [ base envy network rfc-prelude time ]; + description = "Environment variable support from the Robert Fischer Commons"; + license = stdenv.lib.licenses.mit; + }) {}; + + "rfc-http-client" = callPackage + ({ mkDerivation, aeson, base, http-client, http-client-tls + , http-types, lens, network-uri, rfc-prelude, scientific + , servant-server, vector, wreq + }: + mkDerivation { + pname = "rfc-http-client"; + version = "0.0.0.1"; + sha256 = "0ksmv0vhprc8d2ck003jim03js5ifqw1vg7319afmwzzmqp8lwn1"; + libraryHaskellDepends = [ + aeson base http-client http-client-tls http-types lens network-uri + rfc-prelude scientific servant-server vector wreq + ]; + description = "The HTTP client extensions from the Robert Fischer Commons"; + license = stdenv.lib.licenses.mit; + }) {}; + + "rfc-prelude" = callPackage + ({ mkDerivation, aeson, base, bifunctors, bytestring + , classy-prelude, containers, data-default, http-api-data + , integer-logarithms, lens, monad-control, network-uri, text + , text-conversions, time, time-units, transformers, tuple, unliftio + , unliftio-core, uuid-types + }: + mkDerivation { + pname = "rfc-prelude"; + version = "0.0.0.2"; + sha256 = "1d2kvmidbglc60p3zy6wd9af6w27b303znqh09rjms5ifri0k6kf"; + libraryHaskellDepends = [ + aeson base bifunctors bytestring classy-prelude containers + data-default http-api-data integer-logarithms lens monad-control + network-uri text text-conversions time time-units transformers + tuple unliftio unliftio-core uuid-types + ]; + description = "The Prelude from the Robert Fischer Commons"; + license = stdenv.lib.licenses.mit; + }) {}; + + "rfc-psql" = callPackage + ({ mkDerivation, base, bytestring, network, postgresql-typed + , resource-pool, rfc-env, rfc-prelude, transformers + }: + mkDerivation { + pname = "rfc-psql"; + version = "0.0.0.1"; + sha256 = "1vaahacbk0c1zv7md6sb5lymncbzr7xxfn31cmd4dd8gjwdfk4zb"; + libraryHaskellDepends = [ + base bytestring network postgresql-typed resource-pool rfc-env + rfc-prelude transformers + ]; + description = "The PostgreSQL extensions from the Robert Fischer Commons"; + license = stdenv.lib.licenses.mit; + }) {}; + + "rfc-redis" = callPackage + ({ mkDerivation, base, hedis, rfc-env, rfc-prelude, time }: + mkDerivation { + pname = "rfc-redis"; + version = "0.0.0.1"; + sha256 = "00r8mghkgqgf6mh4v5jspahdcpb3bj5i82rmiyasv01a7gp6gzsg"; + libraryHaskellDepends = [ base hedis rfc-env rfc-prelude time ]; + description = "The Redis extensions from the Robert Fischer Commons"; + license = stdenv.lib.licenses.mit; + }) {}; + + "rfc-servant" = callPackage + ({ mkDerivation, aeson, amazonka, base, binary, blaze-html + , data-default, http-types, lens, markdown, natural-transformation + , rfc-http-client, rfc-prelude, rfc-psql, rfc-redis, servant + , servant-blaze, servant-docs, servant-server, servant-swagger + , servant-swagger-ui, swagger2, wai, wreq + }: + mkDerivation { + pname = "rfc-servant"; + version = "0.0.0.1"; + sha256 = "1p4j2lv4hj6bxqbanj4w0j00d1qm7np94gp7ap1kmjkdznsl4vhz"; + libraryHaskellDepends = [ + aeson amazonka base binary blaze-html data-default http-types lens + markdown natural-transformation rfc-http-client rfc-prelude + rfc-psql rfc-redis servant servant-blaze servant-docs + servant-server servant-swagger servant-swagger-ui swagger2 wai wreq + ]; + description = "The Servant extensions from the Robert Fischer Commons"; + license = stdenv.lib.licenses.mit; + }) {}; + "rfc1413-server" = callPackage ({ mkDerivation, base, network-simple, rfc1413-types }: mkDerivation { @@ -177418,8 +178298,8 @@ self: { }: mkDerivation { pname = "row-types"; - version = "0.2.2.0"; - sha256 = "1xv42yzv0xrb1bwqlmpmk7wwmq2mcf6d73g91aycq99hjq18bmcq"; + version = "0.2.3.0"; + sha256 = "1dihp1bd6aw2hn2jbrg9kgq0rvbspbfwvcx6vv9zrq2j0jbbq250"; libraryHaskellDepends = [ base constraints deepseq hashable text unordered-containers ]; @@ -180006,6 +180886,34 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "scotty_0_11_2" = callPackage + ({ mkDerivation, aeson, async, base, blaze-builder, bytestring + , case-insensitive, data-default-class, directory, exceptions, fail + , hpc-coveralls, hspec, hspec-discover, hspec-wai, http-types + , lifted-base, monad-control, mtl, nats, network, regex-compat + , text, transformers, transformers-base, transformers-compat, wai + , wai-extra, warp + }: + mkDerivation { + pname = "scotty"; + version = "0.11.2"; + sha256 = "18lxgnj05p4hk7pp4a84biz2dn387a5vxwzyh1kslns1bra6zn0x"; + libraryHaskellDepends = [ + aeson base blaze-builder bytestring case-insensitive + data-default-class exceptions fail http-types monad-control mtl + nats network regex-compat text transformers transformers-base + transformers-compat wai wai-extra warp + ]; + testHaskellDepends = [ + async base bytestring data-default-class directory hpc-coveralls + hspec hspec-wai http-types lifted-base network text wai + ]; + testToolDepends = [ hspec-discover ]; + description = "Haskell web framework inspired by Ruby's Sinatra, using WAI and Warp"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "scotty-binding-play" = callPackage ({ mkDerivation, base, bytestring, hspec, http-client, HUnit, mtl , scotty, template-haskell, text, transformers @@ -180312,6 +181220,7 @@ self: { ]; description = "Transformer stack of error, reader, writer, state, and prompt monads"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "scrobble" = callPackage @@ -181219,6 +182128,7 @@ self: { executableHaskellDepends = [ base ]; description = "A Haskell library to make self-extracting executables"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "selfrestart" = callPackage @@ -181339,6 +182249,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "semigroupoids_5_3_1" = callPackage + ({ mkDerivation, base, base-orphans, bifunctors, Cabal + , cabal-doctest, comonad, containers, contravariant, distributive + , doctest, hashable, semigroups, tagged, template-haskell + , transformers, transformers-compat, unordered-containers + }: + mkDerivation { + pname = "semigroupoids"; + version = "5.3.1"; + sha256 = "13iqjckq3jzp6rxldrf3bcvk3061ssvsr6y0g5y9jq32z1hyr2fd"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + base base-orphans bifunctors comonad containers contravariant + distributive hashable semigroups tagged template-haskell + transformers transformers-compat unordered-containers + ]; + testHaskellDepends = [ base doctest ]; + description = "Semigroupoids: Category sans id"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "semigroupoids-syntax" = callPackage ({ mkDerivation, base, comonad, containers, contravariant , directory, distributive, doctest, filepath, QuickCheck @@ -181371,6 +182303,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "semigroups_0_18_5" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "semigroups"; + version = "0.18.5"; + sha256 = "17g29h62g1k51ghhvzkw72zksjgi6vs6bfipkj81pqw1dsprcamb"; + libraryHaskellDepends = [ base ]; + description = "Anything that associates"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "semigroups-actions" = callPackage ({ mkDerivation, base, containers, semigroups }: mkDerivation { @@ -182182,26 +183126,6 @@ self: { }: mkDerivation { pname = "servant-JuicyPixels"; - version = "0.3.0.3"; - sha256 = "0kb53kla03clkv0686awjm6nc57r5yw0zmfs02036iplq6cc1yb0"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base bytestring http-media JuicyPixels servant - ]; - executableHaskellDepends = [ - base JuicyPixels servant servant-server wai warp - ]; - description = "Servant support for JuicyPixels"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "servant-JuicyPixels_0_3_0_4" = callPackage - ({ mkDerivation, base, bytestring, http-media, JuicyPixels, servant - , servant-server, wai, warp - }: - mkDerivation { - pname = "servant-JuicyPixels"; version = "0.3.0.4"; sha256 = "10crrcrxap7751wifbc28kr1kv0rjvrx3wlnkajgv3xpr05g00kv"; isLibrary = true; @@ -182214,7 +183138,6 @@ self: { ]; description = "Servant support for JuicyPixels"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-aeson-specs" = callPackage @@ -182813,6 +183736,7 @@ self: { ]; description = "Servant Dhall content-type"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-docs" = callPackage @@ -183798,32 +184722,6 @@ self: { }: mkDerivation { pname = "servant-static-th"; - version = "0.2.0.1"; - sha256 = "1np3sh8jcil63kd56smlkcxqg25zsn01s4dx0d1i4cmc610nb33l"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base blaze-html bytestring containers directory filepath http-media - semigroups servant servant-blaze servant-server template-haskell - text - ]; - testHaskellDepends = [ - base blaze-html bytestring directory doctest filepath Glob - hspec-wai servant servant-blaze servant-server tasty tasty-hspec - tasty-hunit wai - ]; - description = "Embed a directory of static files in your Servant server"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "servant-static-th_0_2_2_0" = callPackage - ({ mkDerivation, base, blaze-html, bytestring, containers - , directory, doctest, filepath, Glob, hspec-wai, http-media - , semigroups, servant, servant-blaze, servant-server, tasty - , tasty-hspec, tasty-hunit, template-haskell, text, wai - }: - mkDerivation { - pname = "servant-static-th"; version = "0.2.2.0"; sha256 = "06vl8a9h5gzmfazj390fmxp6p4bwfdszqjdwnpivv03m80lh3v2v"; isLibrary = true; @@ -183840,15 +184738,14 @@ self: { ]; description = "Embed a directory of static files in your Servant server"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-streaming" = callPackage ({ mkDerivation, base, hspec, http-types, QuickCheck, servant }: mkDerivation { pname = "servant-streaming"; - version = "0.2.0.0"; - sha256 = "10cs6yrzy75w8zvjddqw0gcnqmwmk28112vbj9dwpg2qgh1s1194"; + version = "0.3.0.0"; + sha256 = "0k2sgh7qhp54050k6xlz4zi5jf29xnar2iv02f4rg1k5fxjlh3cq"; libraryHaskellDepends = [ base http-types servant ]; testHaskellDepends = [ base hspec http-types QuickCheck servant ]; description = "Servant combinators for the 'streaming' package"; @@ -183863,8 +184760,8 @@ self: { }: mkDerivation { pname = "servant-streaming-client"; - version = "0.2.0.0"; - sha256 = "056k8ysani675ab9x7ls6fns55frw26krcdrsznwc2808bi71p3x"; + version = "0.3.0.0"; + sha256 = "1h3haws61m064zziyzn03n0450swffmr46gsv9k88lrpz8lv5qj2"; libraryHaskellDepends = [ base bytestring http-media http-types resourcet servant servant-client-core servant-streaming streaming @@ -183885,8 +184782,8 @@ self: { }: mkDerivation { pname = "servant-streaming-docs"; - version = "0.2.0.0"; - sha256 = "0a5f5bz4qgk9a7bfgym950mcqxx83629j3x35rmp7faxd50jx055"; + version = "0.3.0.0"; + sha256 = "0jy0na8cavym2vsy1a059n0yjzfb5a0xylyzxpz0i5apafv1xvlz"; libraryHaskellDepends = [ base lens servant servant-docs servant-streaming ]; @@ -183902,8 +184799,8 @@ self: { }: mkDerivation { pname = "servant-streaming-server"; - version = "0.2.0.0"; - sha256 = "1a95hzvcki51109hd563kk23zgv909pwdvpdxah3asbv78b9i7id"; + version = "0.3.0.0"; + sha256 = "0lsh3x6hkbk7p095pkp7ld0m54xlkw0101x6nrxhjvhmw13aiq66"; libraryHaskellDepends = [ base bytestring http-media http-types resourcet servant servant-server servant-streaming streaming streaming-wai wai @@ -184267,8 +185164,8 @@ self: { }: mkDerivation { pname = "serverless-haskell"; - version = "0.6.0"; - sha256 = "0vwvgncayp0wknycg1d3w2dx5nhr4dik9vkcc4mcxw9p479llx5r"; + version = "0.6.1"; + sha256 = "1amv4plafwjnw2nd4hc429zpybvd70c4c76hvnmkwc4d13z3rh3b"; libraryHaskellDepends = [ aeson aeson-casing aeson-extra amazonka-core amazonka-kinesis amazonka-s3 base bytestring case-insensitive http-types iproute @@ -185182,6 +186079,7 @@ self: { ]; description = "Shake library for use with cabal"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "shake-cabal-build" = callPackage @@ -185988,18 +186886,20 @@ self: { "shift" = callPackage ({ mkDerivation, ansi-terminal, base, binary, bytestring - , composition, data-default, lens, optparse-applicative - , system-fileio, system-filepath, text, turtle + , composition-prelude, data-default, microlens + , optparse-applicative, system-fileio, system-filepath, text + , turtle }: mkDerivation { pname = "shift"; - version = "0.2.0.1"; - sha256 = "162b862m73dwdw3ci1k8ihwb2kng7nrn679zk01v5cq3s3qkbqgx"; + version = "0.2.0.2"; + sha256 = "0n9iik288h93dfxrzv5wfalv5c8g0kz3wzg731yqcpad4csw9cq5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - ansi-terminal base binary bytestring composition data-default lens - optparse-applicative system-fileio system-filepath text turtle + ansi-terminal base binary bytestring composition-prelude + data-default microlens optparse-applicative system-fileio + system-filepath text turtle ]; executableHaskellDepends = [ base ]; description = "A tool to quickly switch between directories"; @@ -187334,8 +188234,8 @@ self: { }: mkDerivation { pname = "simple-vec3"; - version = "0.4.0.6"; - sha256 = "1ijwh5xsqiaykm8y39jz4vnzvcbdq2za77ahkb6l7nqfc5ryv5z1"; + version = "0.4.0.7"; + sha256 = "1snhvy9nlwi6ka6lj6qhc3p9wz9q88mj9yr80lir7z0i1qy0yvar"; libraryHaskellDepends = [ base QuickCheck vector ]; testHaskellDepends = [ base doctest doctest-driver-gen tasty tasty-quickcheck @@ -188351,30 +189251,6 @@ self: { }: mkDerivation { pname = "slack-web"; - version = "0.2.0.5"; - sha256 = "1bplhq3qd4hssp6s6710fgxdbmwm0gknsgs0p4n3hz3w30rp6b56"; - libraryHaskellDepends = [ - aeson base containers errors http-api-data http-client - http-client-tls megaparsec mtl servant servant-client - servant-client-core text time transformers - ]; - testHaskellDepends = [ - aeson base containers errors hspec http-api-data megaparsec text - time - ]; - description = "Bindings for the Slack web API"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "slack-web_0_2_0_6" = callPackage - ({ mkDerivation, aeson, base, containers, errors, hspec - , http-api-data, http-client, http-client-tls, megaparsec, mtl - , servant, servant-client, servant-client-core, text, time - , transformers - }: - mkDerivation { - pname = "slack-web"; version = "0.2.0.6"; sha256 = "1rydw71na7qninys7nqyn36mld5a5csvlsf01yzansnn2gvpdh2a"; libraryHaskellDepends = [ @@ -191711,6 +192587,29 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "spatial-rotations" = callPackage + ({ mkDerivation, base, containers, linear, manifolds + , manifolds-core, pragmatic-show, tasty, tasty-hunit + , tasty-quickcheck, vector-space + }: + mkDerivation { + pname = "spatial-rotations"; + version = "0.1.0.0"; + sha256 = "1315zk74kznhizi7wvd48n0j06d1ja3z16240hv16cbsh14lsxhm"; + revision = "1"; + editedCabalFile = "1qsnkxg0r68c675fsvg2wsqkkimlzx9zw92zwmpv69ww42qxrrhy"; + libraryHaskellDepends = [ + base linear manifolds-core vector-space + ]; + testHaskellDepends = [ + base containers manifolds pragmatic-show tasty tasty-hunit + tasty-quickcheck vector-space + ]; + description = "Rotate about any suitable axis"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "spawn" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -194548,26 +195447,27 @@ self: { "staversion" = callPackage ({ mkDerivation, aeson, ansi-wl-pprint, base, bytestring, Cabal - , containers, directory, filepath, hspec, http-client + , containers, directory, filepath, heredoc, hspec, http-client , http-client-tls, http-types, megaparsec, optparse-applicative - , pretty, QuickCheck, semigroups, text, transformers + , pretty, process, QuickCheck, semigroups, text, transformers , transformers-compat, unordered-containers, yaml }: mkDerivation { pname = "staversion"; - version = "0.2.1.4"; - sha256 = "1lhj8cbn8x1dxd9pv0sr298i304vaj4zdpasz1r9avpyxwcq6shc"; + version = "0.2.2.0"; + sha256 = "1pqb2sqhcjpzkxm45gjw4ih4nzky2l4kin80mwzcgd6q3y0n775x"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson ansi-wl-pprint base bytestring Cabal containers directory filepath http-client http-client-tls http-types megaparsec - optparse-applicative pretty semigroups text transformers + optparse-applicative pretty process semigroups text transformers transformers-compat unordered-containers yaml ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ - base bytestring Cabal filepath hspec QuickCheck semigroups text + base bytestring Cabal filepath heredoc hspec QuickCheck semigroups + text ]; description = "What version is the package X in stackage lts-Y.ZZ?"; license = stdenv.lib.licenses.bsd3; @@ -196905,8 +197805,8 @@ self: { pname = "structs"; version = "0.1.1"; sha256 = "0hdajhvd6i81dchdyd42fa17pm53jd7g3irqjfardbbmjx0sqq6z"; - revision = "1"; - editedCabalFile = "16ws2j3bhwawf6z1ipraiz73yvg65dg5l7hvj1lgbrqvn5lqizj3"; + revision = "2"; + editedCabalFile = "1v9gmnj17cm4p491rizvw9xdj255lk1y24gz6s8bqcz56sdb4d4s"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base deepseq ghc-prim primitive template-haskell @@ -198160,6 +199060,7 @@ self: { ]; description = "Auto-generated openapi-petstore API Client"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "swagger-test" = callPackage @@ -199911,6 +200812,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "tagged_0_8_6" = callPackage + ({ mkDerivation, base, deepseq, template-haskell, transformers }: + mkDerivation { + pname = "tagged"; + version = "0.8.6"; + sha256 = "1pciqzxf9ncv954v4r527xkxkn7r5hcr13mfw5dg1xjci3qdw5md"; + libraryHaskellDepends = [ + base deepseq template-haskell transformers + ]; + description = "Haskell 98 phantom types to avoid unsafely passing dummy arguments"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "tagged-binary" = callPackage ({ mkDerivation, base, base-compat, binary, bytestring, pureMD5 }: mkDerivation { @@ -200787,12 +201702,12 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "tasty-dejafu_1_2_0_6" = callPackage + "tasty-dejafu_1_2_0_7" = callPackage ({ mkDerivation, base, dejafu, random, tagged, tasty }: mkDerivation { pname = "tasty-dejafu"; - version = "1.2.0.6"; - sha256 = "193bf26vccbs0wpdhcqi0pi8mw806acrk1hpr2a7jl70jfwxhp98"; + version = "1.2.0.7"; + sha256 = "1wg6baw9rll5wajbr10av664i0dswy72flfha320137s6s3by2wc"; libraryHaskellDepends = [ base dejafu random tagged tasty ]; description = "Deja Fu support for the Tasty test framework"; license = stdenv.lib.licenses.mit; @@ -200947,6 +201862,7 @@ self: { ]; description = "Coverage tracking for Hedgehog Property-Based Testing via Tasty"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tasty-hspec" = callPackage @@ -200955,24 +201871,6 @@ self: { }: mkDerivation { pname = "tasty-hspec"; - version = "1.1.4"; - sha256 = "17f4rcga0qnynf1h047chwm5nicmik79lw04kiwpw48ahwc0zkp3"; - revision = "2"; - editedCabalFile = "1ijz75l5jhyxjk6hjrhbsw4470dxfdnwdwn9q3akxbmk095hpzjl"; - libraryHaskellDepends = [ - base hspec hspec-core QuickCheck tasty tasty-quickcheck - tasty-smallcheck - ]; - description = "Hspec support for the Tasty test framework"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "tasty-hspec_1_1_5" = callPackage - ({ mkDerivation, base, hspec, hspec-core, QuickCheck, tasty - , tasty-quickcheck, tasty-smallcheck - }: - mkDerivation { - pname = "tasty-hspec"; version = "1.1.5"; sha256 = "0m0ip2l4rg4pnrvk3mjxkbq2l683psv1x3v9l4rglk2k3pvxq36v"; revision = "1"; @@ -200983,7 +201881,6 @@ self: { ]; description = "Hspec support for the Tasty test framework"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tasty-html" = callPackage @@ -202891,6 +203788,7 @@ self: { ]; description = "Testing framework"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "test-pkg" = callPackage @@ -203935,7 +204833,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "text-show_3_7_3" = callPackage + "text-show_3_7_4" = callPackage ({ mkDerivation, array, base, base-compat-batteries, base-orphans , bifunctors, bytestring, bytestring-builder, containers , contravariant, criterion, deepseq, deriving-compat @@ -203946,8 +204844,8 @@ self: { }: mkDerivation { pname = "text-show"; - version = "3.7.3"; - sha256 = "1d8wmdndl8qsz90fb67xxbrprlmmp47p4f3ik6psp5m6r0cdvpzg"; + version = "3.7.4"; + sha256 = "068yp74k4ybhvycivnr7x238dl1qdnkjdzf25pcz127294rn9yry"; libraryHaskellDepends = [ array base base-compat-batteries bifunctors bytestring bytestring-builder containers contravariant generic-deriving @@ -203956,20 +204854,13 @@ self: { transformers-compat void ]; testHaskellDepends = [ - array base base-compat-batteries base-orphans bifunctors bytestring - bytestring-builder containers contravariant deriving-compat - generic-deriving ghc-boot-th ghc-prim hspec integer-gmp nats - QuickCheck quickcheck-instances semigroups tagged template-haskell - text th-lift transformers transformers-compat void + array base base-compat-batteries base-orphans bytestring + bytestring-builder deriving-compat generic-deriving ghc-prim hspec + nats QuickCheck quickcheck-instances semigroups tagged + template-haskell text transformers transformers-compat ]; testToolDepends = [ hspec-discover ]; - benchmarkHaskellDepends = [ - array base base-compat-batteries bifunctors bytestring - bytestring-builder containers contravariant criterion deepseq - generic-deriving ghc-boot-th ghc-prim integer-gmp nats semigroups - tagged template-haskell text th-lift transformers - transformers-compat void - ]; + benchmarkHaskellDepends = [ base criterion deepseq ghc-prim text ]; description = "Efficient conversion of values into Text"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -204008,36 +204899,33 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "text-show-instances_3_6_4" = callPackage + "text-show-instances_3_6_5" = callPackage ({ mkDerivation, base, base-compat-batteries, bifunctors, binary - , bytestring, containers, directory, generic-deriving, ghc-boot-th - , ghc-prim, haskeline, hoopl, hpc, hspec, hspec-discover - , old-locale, old-time, pretty, process, QuickCheck - , quickcheck-instances, random, semigroups, tagged - , template-haskell, terminfo, text, text-show, th-orphans, time - , transformers, transformers-compat, unix, unordered-containers - , vector, xhtml + , containers, directory, generic-deriving, ghc-boot-th, ghc-prim + , haskeline, hoopl, hpc, hspec, hspec-discover, old-locale + , old-time, pretty, QuickCheck, quickcheck-instances, random + , semigroups, tagged, template-haskell, terminfo, text, text-show + , th-orphans, time, transformers, transformers-compat, unix + , unordered-containers, vector, xhtml }: mkDerivation { pname = "text-show-instances"; - version = "3.6.4"; - sha256 = "1a2aacy6l58b49868hhvqws4900rq9dpb8zwkb5cz45gsb7zpgjf"; - revision = "1"; - editedCabalFile = "0fb704bm4n99vv7cblzsg9l8i6gy2ybppp2xagh4mcrwn5g776l8"; + version = "3.6.5"; + sha256 = "0hljqh31m3199w8ppcihggcya8cj4zmrav5z6fvcn6xn2hzz1cql"; libraryHaskellDepends = [ - base base-compat-batteries bifunctors binary bytestring containers - directory ghc-boot-th haskeline hoopl hpc old-locale old-time - pretty process random semigroups tagged template-haskell terminfo - text text-show time transformers transformers-compat unix - unordered-containers vector xhtml + base base-compat-batteries bifunctors binary containers directory + ghc-boot-th haskeline hoopl hpc old-locale old-time pretty random + semigroups tagged template-haskell terminfo text text-show time + transformers transformers-compat unix unordered-containers vector + xhtml ]; testHaskellDepends = [ - base base-compat-batteries bifunctors binary bytestring containers - directory generic-deriving ghc-boot-th ghc-prim haskeline hoopl hpc - hspec old-locale old-time pretty process QuickCheck - quickcheck-instances random semigroups tagged template-haskell - terminfo text text-show th-orphans time transformers - transformers-compat unix unordered-containers vector xhtml + base base-compat-batteries bifunctors binary containers directory + generic-deriving ghc-boot-th ghc-prim haskeline hoopl hpc hspec + old-locale old-time pretty QuickCheck quickcheck-instances random + tagged template-haskell terminfo text-show th-orphans time + transformers transformers-compat unix unordered-containers vector + xhtml ]; testToolDepends = [ hspec-discover ]; description = "Additional instances for text-show"; @@ -204361,31 +205249,16 @@ self: { ({ mkDerivation, base, containers, ghc-prim, template-haskell }: mkDerivation { pname = "th-abstraction"; - version = "0.2.7.0"; - sha256 = "1233x853gcc18xm0d8ysf7rlkg9aphy2j6hn78yxchalglfwjixf"; - revision = "1"; - editedCabalFile = "1fafzr80vbnamqq72rwnhk1ih3iyxzb8j2xfdgn691irv4fv6839"; - libraryHaskellDepends = [ - base containers ghc-prim template-haskell - ]; - testHaskellDepends = [ base containers template-haskell ]; - description = "Nicer interface for reified information about data types"; - license = stdenv.lib.licenses.isc; - }) {}; - - "th-abstraction_0_2_8_0" = callPackage - ({ mkDerivation, base, containers, ghc-prim, template-haskell }: - mkDerivation { - pname = "th-abstraction"; version = "0.2.8.0"; sha256 = "0n17w4q2ykd0nica4sck2wng6md56rfad8x0icl0l8vnzb9nn4ya"; + revision = "1"; + editedCabalFile = "0yr4bj9ypbls0ysmwrgn2nsjb1xpsb12bjaiwbkzp6nf3kljwnnv"; libraryHaskellDepends = [ base containers ghc-prim template-haskell ]; testHaskellDepends = [ base containers template-haskell ]; description = "Nicer interface for reified information about data types"; license = stdenv.lib.licenses.isc; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "th-alpha" = callPackage @@ -204724,10 +205597,8 @@ self: { }: mkDerivation { pname = "th-orphans"; - version = "0.13.5"; - sha256 = "1b9599vyn0wjwbq7b7n0w25s3wbihdxr958hscfpwc8lg55lsr4m"; - revision = "1"; - editedCabalFile = "1rgsrnh0qvlriz0c2c3q8wbb3ykby8d3lli0j553ml3n1sn9k4zv"; + version = "0.13.6"; + sha256 = "0sfl3pn9kq9da3ji3lsgzgzy82vz6yvsg80dmakc1jvk7awycibp"; libraryHaskellDepends = [ base mtl template-haskell th-lift th-lift-instances th-reify-many ]; @@ -205167,6 +206038,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "thread-local-storage_0_2" = callPackage + ({ mkDerivation, atomic-primops, base, containers, criterion }: + mkDerivation { + pname = "thread-local-storage"; + version = "0.2"; + sha256 = "152j8r7rfixkjrh1ynv2s0586bl65cpy47frhsikd40q64bf0j6n"; + libraryHaskellDepends = [ base containers ]; + testHaskellDepends = [ atomic-primops base ]; + benchmarkHaskellDepends = [ atomic-primops base criterion ]; + description = "Several options for thread-local-storage (TLS) in Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "threadPool" = callPackage ({ mkDerivation, base, process }: mkDerivation { @@ -206053,8 +206938,8 @@ self: { ({ mkDerivation, base, intervals, time }: mkDerivation { pname = "time-patterns"; - version = "0.1.4.2"; - sha256 = "1xh50plr6dk21cpc3mqcq00xakhm7zvnsgwbi0hyk1prgr408asl"; + version = "0.1.4.3"; + sha256 = "0qyg2y41c0bn296zyxfhjjjm0bxn4vmns242vl90j0b0siz69qr0"; libraryHaskellDepends = [ base intervals time ]; description = "Patterns for recurring events"; license = stdenv.lib.licenses.bsd3; @@ -208958,6 +209843,31 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "trifecta_2" = callPackage + ({ mkDerivation, ansi-terminal, ansi-wl-pprint, array, base + , blaze-builder, blaze-html, blaze-markup, bytestring, Cabal + , cabal-doctest, charset, comonad, containers, deepseq, doctest + , fingertree, ghc-prim, hashable, lens, mtl, parsers, profunctors + , QuickCheck, reducers, semigroups, transformers + , unordered-containers, utf8-string + }: + mkDerivation { + pname = "trifecta"; + version = "2"; + sha256 = "0hznd8i65s81xy13i2qc7cvipw3lfb2yhkv53apbdsh6sbljz5sk"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + ansi-terminal ansi-wl-pprint array base blaze-builder blaze-html + blaze-markup bytestring charset comonad containers deepseq + fingertree ghc-prim hashable lens mtl parsers profunctors reducers + semigroups transformers unordered-containers utf8-string + ]; + testHaskellDepends = [ base doctest parsers QuickCheck ]; + description = "A modern parser combinator library with convenient diagnostics"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "trigger" = callPackage ({ mkDerivation, aeson, ansi-terminal, base, clock, directory , exceptions, filepath, formatting, fsnotify, Glob, hspec, process @@ -209706,6 +210616,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "turtle_1_5_10" = callPackage + ({ mkDerivation, ansi-wl-pprint, async, base, bytestring, clock + , containers, criterion, directory, doctest, exceptions, foldl + , hostname, managed, optional-args, optparse-applicative, process + , semigroups, stm, system-fileio, system-filepath, temporary, text + , time, transformers, unix, unix-compat + }: + mkDerivation { + pname = "turtle"; + version = "1.5.10"; + sha256 = "0c2bfwfj1pf3s4kjr4k9g36166pj9wfpp2rrs5blzh77hjmak4rs"; + libraryHaskellDepends = [ + ansi-wl-pprint async base bytestring clock containers directory + exceptions foldl hostname managed optional-args + optparse-applicative process semigroups stm system-fileio + system-filepath temporary text time transformers unix unix-compat + ]; + testHaskellDepends = [ base doctest system-filepath temporary ]; + benchmarkHaskellDepends = [ base criterion text ]; + description = "Shell programming, Haskell-style"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "turtle-options" = callPackage ({ mkDerivation, base, HUnit, optional-args, parsec, text, turtle }: @@ -209782,20 +210716,20 @@ self: { ({ mkDerivation, aeson, ansi-wl-pprint, authenticate-oauth, base , bytestring, composition-prelude, containers, criterion , data-default, directory, extra, hspec, htoml-megaparsec - , http-client, http-client-tls, http-types, lens, megaparsec + , http-client, http-client-tls, http-types, megaparsec, microlens , optparse-applicative, split, text, unordered-containers }: mkDerivation { pname = "tweet-hs"; - version = "1.0.1.40"; - sha256 = "0zbhnx2hl6cgfdzgd3iwmlzkf4kgdz87m0ghmq2irdblfiz5kspr"; + version = "1.0.1.41"; + sha256 = "1ybrsnppy7lnj5z2f8m38cd6ix89j6dlvgc2icl7lj3w14g6cfxm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson ansi-wl-pprint authenticate-oauth base bytestring composition-prelude containers data-default extra htoml-megaparsec - http-client http-client-tls http-types lens megaparsec split text - unordered-containers + http-client http-client-tls http-types megaparsec microlens split + text unordered-containers ]; executableHaskellDepends = [ base bytestring directory optparse-applicative @@ -213285,8 +214219,8 @@ self: { }: mkDerivation { pname = "unordered-intmap"; - version = "0.1.0.0"; - sha256 = "0b4azafy32jwq3s9dy52l9lqkpy7hj4jqin3mj1hnh1qrlnm9jwr"; + version = "0.1.1"; + sha256 = "1vvn510v4gy70lk2bkx45bh7hk0kfdn62j3rp913j57d4c6azynq"; libraryHaskellDepends = [ base deepseq primitive ]; testHaskellDepends = [ base containers deepseq primitive QuickCheck tasty tasty-quickcheck @@ -214427,6 +215361,7 @@ self: { executableHaskellDepends = [ base uu-cco uuagc uuagc-cabal ]; description = "Utilities for compiler construction: example programs"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "uu-cco-hut-parsing" = callPackage @@ -215021,12 +215956,12 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "validity_0_6_0_0" = callPackage + "validity_0_7_0_0" = callPackage ({ mkDerivation, base, hspec }: mkDerivation { pname = "validity"; - version = "0.6.0.0"; - sha256 = "1ba7dvxz2x3ng4k221xawp0bz4gk4lz5gklklgypavp1fdrhf27q"; + version = "0.7.0.0"; + sha256 = "0xribw98amafihw87ddajk6vlirp7w9b26lrnjgq7jfm4710j95f"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec ]; description = "Validity typeclass"; @@ -215050,14 +215985,14 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "validity-aeson_0_2_0_1" = callPackage + "validity-aeson_0_2_0_2" = callPackage ({ mkDerivation, aeson, base, validity, validity-scientific , validity-text, validity-unordered-containers, validity-vector }: mkDerivation { pname = "validity-aeson"; - version = "0.2.0.1"; - sha256 = "001smpck69y4bmrzrykjvjnrwjllny83kh1l1c2fyy4zzjw14lpy"; + version = "0.2.0.2"; + sha256 = "010x1sprssj282gv85n63955fmn6ngz6h6qii3174vrxrwlkvh7s"; libraryHaskellDepends = [ aeson base validity validity-scientific validity-text validity-unordered-containers validity-vector @@ -215078,12 +216013,12 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "validity-bytestring_0_3_0_1" = callPackage + "validity-bytestring_0_3_0_2" = callPackage ({ mkDerivation, base, bytestring, validity }: mkDerivation { pname = "validity-bytestring"; - version = "0.3.0.1"; - sha256 = "1jp1d72qr9axngzgq18k0kvvmc2x8yndpnh9g52zcmm66nkhn2d9"; + version = "0.3.0.2"; + sha256 = "0bwixp9fcblqy6b8kxvzg9l2i9lksn9g71243m2zcan1kh7a1qb2"; libraryHaskellDepends = [ base bytestring validity ]; description = "Validity instances for bytestring"; license = stdenv.lib.licenses.mit; @@ -215101,12 +216036,12 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "validity-containers_0_3_0_1" = callPackage + "validity-containers_0_3_1_0" = callPackage ({ mkDerivation, base, containers, validity }: mkDerivation { pname = "validity-containers"; - version = "0.3.0.1"; - sha256 = "0ksqyr335f0d686j0slpzyph7663xiyv86rblgiaqjjwbj9y1jqf"; + version = "0.3.1.0"; + sha256 = "1ci07x5k9hjpn23pbp4bc0zvml5xbpppsmcxr1qfcg0g4036q29r"; libraryHaskellDepends = [ base containers validity ]; description = "Validity instances for containers"; license = stdenv.lib.licenses.mit; @@ -218485,6 +219420,8 @@ self: { pname = "wai-middleware-static"; version = "0.8.2"; sha256 = "1z5yapcf8j9w71f2na30snmalsajlyi8an2f9qrjdmajabyykr0b"; + revision = "1"; + editedCabalFile = "0n7i81jrjsrav8bpg31avrd18vh95l5z6bfj4fqkrdj4h1v6armi"; libraryHaskellDepends = [ base bytestring containers cryptonite directory expiring-cache-map filepath http-types memory mime-types mtl old-locale semigroups @@ -218700,8 +219637,8 @@ self: { }: mkDerivation { pname = "wai-routes"; - version = "0.10.2"; - sha256 = "0nhimzkws5v7qpfv305lp41qm61q0xxny5vvs0d26jarnmar9crq"; + version = "0.10.3"; + sha256 = "0q7928i2y0j0z68qz1ixgzh3cx2rmyp44vpzc5jxqrrbfsb0z56k"; libraryHaskellDepends = [ aeson base blaze-builder bytestring case-insensitive containers cookie data-default-class filepath http-types mime-types @@ -219314,6 +220251,7 @@ self: { testToolDepends = [ alex happy ]; description = "WebAssembly Language Toolkit and Interpreter"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "watchdog" = callPackage @@ -220096,6 +221034,7 @@ self: { ]; description = "Bindings to the WebDriver API"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "webex-teams-api" = callPackage @@ -221806,9 +222745,12 @@ self: { ({ mkDerivation, base, containers, megaparsec, text }: mkDerivation { pname = "work-time"; - version = "0.1.1.0"; - sha256 = "02rrag1zi266spp6szlxsh23x55r669xz6h4rv7qymp5ww1dj0bf"; + version = "0.1.2.0"; + sha256 = "0vss3ik2q33nqiqy4d4gzyjfgr8grzgjx68lgi7wbwzgqmkk86bz"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base containers megaparsec text ]; + executableHaskellDepends = [ base text ]; description = "A library for parsing a chat-based work hour reporting scheme"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -224765,6 +225707,27 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; + "xss-sanitize_0_3_6" = callPackage + ({ mkDerivation, attoparsec, base, containers, css-text, hspec + , HUnit, network-uri, tagsoup, text, utf8-string + }: + mkDerivation { + pname = "xss-sanitize"; + version = "0.3.6"; + sha256 = "1d72s3a6520iwwc1wbn9v2znqgbw6a5wwzb23iq8ny9ccnjyx1dk"; + libraryHaskellDepends = [ + attoparsec base containers css-text network-uri tagsoup text + utf8-string + ]; + testHaskellDepends = [ + attoparsec base containers css-text hspec HUnit network-uri tagsoup + text utf8-string + ]; + description = "sanitize untrusted HTML to prevent XSS attacks"; + license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "xtc" = callPackage ({ mkDerivation, base, wx, wxcore }: mkDerivation { @@ -225187,36 +226150,8 @@ self: { }: mkDerivation { pname = "yaml"; - version = "0.8.30"; - sha256 = "11dyjqs1rzhpidzfqdw3lg8rsm32jhjph54kc68k4dwib6fnwnyi"; - configureFlags = [ "-fsystem-libyaml" ]; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson attoparsec base bytestring conduit containers directory - filepath resourcet scientific semigroups template-haskell text - transformers unordered-containers vector - ]; - libraryPkgconfigDepends = [ libyaml ]; - testHaskellDepends = [ - aeson base base-compat bytestring conduit directory hspec HUnit - mockery resourcet temporary text transformers unordered-containers - vector - ]; - description = "Support for parsing and rendering YAML documents"; - license = stdenv.lib.licenses.bsd3; - }) {inherit (pkgs) libyaml;}; - - "yaml_0_8_31" = callPackage - ({ mkDerivation, aeson, attoparsec, base, base-compat, bytestring - , conduit, containers, directory, filepath, hspec, HUnit, libyaml - , mockery, resourcet, scientific, semigroups, template-haskell - , temporary, text, transformers, unordered-containers, vector - }: - mkDerivation { - pname = "yaml"; - version = "0.8.31"; - sha256 = "1a9b24czyrls3d7lgamm0cmrwkndr8ip3h6d338q79alhdz8ziqm"; + version = "0.8.31.1"; + sha256 = "0lwbdlz2r54nvdr5snmjp5lnkv6wwk118bhy13v1vjz62wclb88v"; configureFlags = [ "-fsystem-libyaml" ]; isLibrary = true; isExecutable = true; @@ -225233,7 +226168,6 @@ self: { ]; description = "Support for parsing and rendering YAML documents"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) libyaml;}; "yaml-combinators" = callPackage @@ -225292,8 +226226,8 @@ self: { }: mkDerivation { pname = "yaml-light-lens"; - version = "0.3.3.4"; - sha256 = "1vvwgb302w2nz05c97gzxkjx7m2lp25bpp3l16bzh92mjvqddpbd"; + version = "0.3.3.5"; + sha256 = "11q6g00qycpr29n1yxpsgpailzk216pr3cfjy7pyrlvfpl4wx24f"; libraryHaskellDepends = [ base bytestring bytestring-lexing containers lens yaml-light ]; @@ -225437,8 +226371,8 @@ self: { pname = "yampa-canvas"; version = "0.2.2"; sha256 = "0g1yvb6snnsbvy2f74lrlqff5zgnvfh2f6r8xdwxi61dk71qsz0n"; - revision = "4"; - editedCabalFile = "1bqjfmssgg0jd6j5x727clk6wawbbh0hq8v0qpj4d5bfv4931pkb"; + revision = "5"; + editedCabalFile = "18my271nsvb26sh5l45ng2zvwnm6fzw589cr9cipbpdaaqhyppfg"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base blank-canvas stm time Yampa ]; @@ -226347,15 +227281,16 @@ self: { }) {}; "yesod-colonnade" = callPackage - ({ mkDerivation, base, blaze-html, blaze-markup, colonnade, text - , yesod-core + ({ mkDerivation, base, blaze-html, blaze-markup, colonnade, conduit + , conduit-extra, text, yesod-core, yesod-elements }: mkDerivation { pname = "yesod-colonnade"; - version = "1.2.0"; - sha256 = "1xbcwaklbly80fimmbi04j9wpl06knjdf1zy0m8i8cb1xmd8nh0k"; + version = "1.3.0.1"; + sha256 = "1x5m3xv4jq2x49fnvxw3v8bvbsx4hdccykcn32fz3cwavp4p1q1p"; libraryHaskellDepends = [ - base blaze-html blaze-markup colonnade text yesod-core + base blaze-html blaze-markup colonnade conduit conduit-extra text + yesod-core yesod-elements ]; description = "Helper functions for using yesod with colonnade"; license = stdenv.lib.licenses.bsd3; @@ -226630,12 +227565,16 @@ self: { }) {}; "yesod-elements" = callPackage - ({ mkDerivation, base, blaze-html, yesod-core }: + ({ mkDerivation, base, blaze-html, blaze-markup, bytestring, text + , yesod-core + }: mkDerivation { pname = "yesod-elements"; - version = "1.0"; - sha256 = "0d0ihp0yk0b07v2ym6vvzj70pwh16ms6xyp7yan4dcavcy8cz86l"; - libraryHaskellDepends = [ base blaze-html yesod-core ]; + version = "1.1"; + sha256 = "0rxx3lxl55q0mxdzfixwy2d0cnzmfxx2zg24k6kdgghg0k77g3d3"; + libraryHaskellDepends = [ + base blaze-html blaze-markup bytestring text yesod-core + ]; description = "Non template haskell markup building function in the spirit of lucid"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -229360,31 +230299,6 @@ self: { "zip-archive" = callPackage ({ mkDerivation, array, base, binary, bytestring, Cabal, containers - , digest, directory, filepath, HUnit, mtl, old-time, pretty - , process, temporary, text, time, unix, unzip, zlib - }: - mkDerivation { - pname = "zip-archive"; - version = "0.3.2.5"; - sha256 = "14xkaj456zpxxbwd1h5prcxiiid42snli4mqm1052jp32c7xhf89"; - isLibrary = true; - isExecutable = true; - setupHaskellDepends = [ base Cabal ]; - libraryHaskellDepends = [ - array base binary bytestring containers digest directory filepath - mtl old-time pretty text time unix zlib - ]; - testHaskellDepends = [ - base bytestring directory filepath HUnit old-time process temporary - time unix - ]; - testToolDepends = [ unzip ]; - description = "Library for creating and modifying zip archives"; - license = stdenv.lib.licenses.bsd3; - }) {inherit (pkgs) unzip;}; - - "zip-archive_0_3_3" = callPackage - ({ mkDerivation, array, base, binary, bytestring, Cabal, containers , digest, directory, filepath, HUnit, mtl, pretty, process , temporary, text, time, unix, unzip, zlib }: @@ -229406,7 +230320,6 @@ self: { testToolDepends = [ unzip ]; description = "Library for creating and modifying zip archives"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) unzip;}; "zip-conduit" = callPackage @@ -229958,6 +230871,7 @@ self: { ]; description = "Creating and extracting arbitrary archives"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "zuramaru" = callPackage diff --git a/pkgs/development/idris-modules/default.nix b/pkgs/development/idris-modules/default.nix index 1dfa4e48899a..25f8dba00b02 100644 --- a/pkgs/development/idris-modules/default.nix +++ b/pkgs/development/idris-modules/default.nix @@ -31,10 +31,9 @@ # Idris wrapper with specified compiler and library paths, used to build packages - idris = - (pkgs.callPackage ./idris-wrapper.nix {}) - idris-no-deps - { path = [ pkgs.gcc ]; lib = [pkgs.gmp]; }; + idris = pkgs.callPackage ./idris-wrapper.nix { + inherit idris-no-deps; + }; # Utilities for building packages diff --git a/pkgs/development/idris-modules/idris-wrapper.nix b/pkgs/development/idris-modules/idris-wrapper.nix index fcd02c4da246..f395bcd95d7c 100644 --- a/pkgs/development/idris-modules/idris-wrapper.nix +++ b/pkgs/development/idris-modules/idris-wrapper.nix @@ -1,14 +1,12 @@ -{ symlinkJoin, makeWrapper, stdenv }: idris: { path, lib }: +{ lib, symlinkJoin, makeWrapper, idris-no-deps, gcc, gmp }: symlinkJoin { - name = idris.name; - src = idris.src; - paths = [ idris ]; + inherit (idris-no-deps) name src meta; + paths = [ idris-no-deps ]; buildInputs = [ makeWrapper ]; - meta.platforms = idris.meta.platforms; postBuild = '' wrapProgram $out/bin/idris \ - --suffix PATH : ${ stdenv.lib.makeBinPath path } \ - --suffix LIBRARY_PATH : ${stdenv.lib.makeLibraryPath lib} - ''; - } + --run 'export IDRIS_CC=''${IDRIS_CC:-${lib.getBin gcc}/bin/gcc}' \ + --suffix LIBRARY_PATH : ${lib.makeLibraryPath [ gmp ]} + ''; +} diff --git a/pkgs/development/interpreters/gauche/default.nix b/pkgs/development/interpreters/gauche/default.nix index c13a26204e26..2478493d41d7 100644 --- a/pkgs/development/interpreters/gauche/default.nix +++ b/pkgs/development/interpreters/gauche/default.nix @@ -1,23 +1,29 @@ -{ stdenv, fetchurl, pkgconfig, texinfo, libiconv, gdbm, openssl, zlib }: +{ stdenv, fetchurl, pkgconfig, texinfo, libiconv, gdbm, openssl, zlib +, mbedtls, cacert +}: stdenv.mkDerivation rec { name = "gauche-${version}"; - version = "0.9.5"; + version = "0.9.6"; src = fetchurl { url = "mirror://sourceforge/gauche/Gauche-${version}.tgz"; - sha256 = "0g77nik15whm5frxb7l0pwzd95qlq949dym5pn5p04p17lhm72jc"; + sha256 = "1bwwwvyxsrp2a4cfib6hn0hcgwzmp2znylm088w09f331miji2fd"; }; nativeBuildInputs = [ pkgconfig texinfo ]; - buildInputs = [ libiconv gdbm openssl zlib ]; + buildInputs = [ libiconv gdbm openssl zlib mbedtls cacert ]; + + postPatch = '' + patchShebangs . + ''; configureFlags = [ - "--enable-multibyte=utf-8" "--with-iconv=${libiconv}" "--with-dbm=gdbm" "--with-zlib=${zlib}" + "--with-ca-bundle=$SSL_CERT_FILE" # TODO: Enable slib # Current slib in nixpkgs is specialized to Guile # "--with-slib=${slibGuile}/lib/slib" diff --git a/pkgs/development/libraries/SDL2/default.nix b/pkgs/development/libraries/SDL2/default.nix index 5e01a83b7c0c..7d8f5b2caee6 100644 --- a/pkgs/development/libraries/SDL2/default.nix +++ b/pkgs/development/libraries/SDL2/default.nix @@ -1,14 +1,14 @@ -{ stdenv, lib, fetchurl, pkgconfig, audiofile +{ stdenv, lib, fetchurl, pkgconfig, pruneLibtoolFiles , openglSupport ? false, libGL , alsaSupport ? true, alsaLib -, x11Support ? true, libICE, libXi, libXScrnSaver, libXcursor, libXinerama, libXext, libXxf86vm, libXrandr +, x11Support ? true, libX11, xproto, libICE, libXi, libXScrnSaver, libXcursor, libXinerama, libXext, libXxf86vm, libXrandr , waylandSupport ? true, wayland, wayland-protocols, libxkbcommon , dbusSupport ? false, dbus , udevSupport ? false, udev , ibusSupport ? false, ibus , pulseaudioSupport ? true, libpulseaudio , AudioUnit, Cocoa, CoreAudio, CoreServices, ForceFeedback, OpenGL -, libiconv +, audiofile, libiconv }: # NOTE: When editing this expression see if the same change applies to @@ -33,18 +33,26 @@ stdenv.mkDerivation rec { patches = [ ./find-headers.patch ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig pruneLibtoolFiles ]; - propagatedBuildInputs = [ libiconv ] + propagatedBuildInputs = dlopenPropagatedBuildInputs; + + dlopenPropagatedBuildInputs = [ ] + # Propagated for #include <GLES/gl.h> in SDL_opengles.h. + ++ optional openglSupport libGL + # Propagated for #include <X11/Xlib.h> and <X11/Xatom.h> in SDL_syswm.h. + ++ optionals x11Support [ libX11 xproto ]; + + dlopenBuildInputs = [ ] + ++ optional alsaSupport alsaLib ++ optional dbusSupport dbus + ++ optional pulseaudioSupport libpulseaudio ++ optional udevSupport udev - ++ optionals x11Support [ libICE libXi libXScrnSaver libXcursor libXinerama libXext libXrandr libXxf86vm ] ++ optionals waylandSupport [ wayland wayland-protocols libxkbcommon ] - ++ optional alsaSupport alsaLib - ++ optional pulseaudioSupport libpulseaudio; + ++ optionals x11Support [ libICE libXi libXScrnSaver libXcursor libXinerama libXext libXrandr libXxf86vm ]; - buildInputs = [ audiofile ] - ++ optional openglSupport libGL + buildInputs = [ audiofile libiconv ] + ++ dlopenBuildInputs ++ optional ibusSupport ibus ++ optionals stdenv.isDarwin [ AudioUnit Cocoa CoreAudio CoreServices ForceFeedback OpenGL ]; @@ -76,12 +84,13 @@ stdenv.mkDerivation rec { # SDL API that requires said libraries will fail to start. # # You can grep SDL sources with `grep -rE 'SDL_(NAME|.*_SYM)'` to - # confirm that they actually use most of the `propagatedBuildInputs` - # from above in this way. This is pretty weird. - postFixup = '' + # list the symbols used in this way. + postFixup = let + rpath = makeLibraryPath (dlopenPropagatedBuildInputs ++ dlopenBuildInputs); + in optionalString (stdenv.hostPlatform.extensions.sharedLibrary == ".so") '' for lib in $out/lib/*.so* ; do - if [[ -L "$lib" ]]; then - patchelf --set-rpath "$(patchelf --print-rpath $lib):${lib.makeLibraryPath propagatedBuildInputs}" "$lib" + if ! [[ -L "$lib" ]]; then + patchelf --set-rpath "$(patchelf --print-rpath $lib):${rpath}" "$lib" fi done ''; diff --git a/pkgs/development/libraries/babl/default.nix b/pkgs/development/libraries/babl/default.nix index a82f4e7dfdae..844028008b02 100644 --- a/pkgs/development/libraries/babl/default.nix +++ b/pkgs/development/libraries/babl/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "babl-0.1.50"; + name = "babl-0.1.52"; src = fetchurl { url = "https://ftp.gtk.org/pub/babl/0.1/${name}.tar.bz2"; - sha256 = "0bavr2y4v88pip7vlca4kwmnksk2qxcvkkdp9jyfi6pzh701sb5m"; + sha256 = "0v7pkr3qd5jnn0pra88d90ixkl5h9ngg6w660nn1cgh4zjh19xs0"; }; doCheck = true; diff --git a/pkgs/development/libraries/boehm-gc/default.nix b/pkgs/development/libraries/boehm-gc/default.nix index 14479a560913..f33ee8623580 100644 --- a/pkgs/development/libraries/boehm-gc/default.nix +++ b/pkgs/development/libraries/boehm-gc/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ''; patches = [ (fetchpatch { - url = "https://raw.githubusercontent.com/gentoo/musl/85b6a600996bdd71162b357e9ba93d8559342432/dev-libs/boehm-gc/files/boehm-gc-7.6.0-sys_select.patch"; + url = "https://gitweb.gentoo.org/proj/musl.git/plain/dev-libs/boehm-gc/files/boehm-gc-7.6.0-sys_select.patch"; sha256 = "1gydwlklvci30f5dpp5ccw2p2qpph5y41r55wx9idamjlq66fbb3"; }) ] ++ # https://github.com/ivmai/bdwgc/pull/208 diff --git a/pkgs/development/libraries/boost/darwin-no-system-python.patch b/pkgs/development/libraries/boost/darwin-no-system-python.patch new file mode 100644 index 000000000000..73e0910336a1 --- /dev/null +++ b/pkgs/development/libraries/boost/darwin-no-system-python.patch @@ -0,0 +1,45 @@ +diff --git a/tools/build/src/tools/python.jam b/tools/build/src/tools/python.jam +index 273b28a..2d2031e 100644 +--- a/tools/build/src/tools/python.jam ++++ b/tools/build/src/tools/python.jam +@@ -428,13 +428,7 @@ local rule windows-installed-pythons ( version ? ) + + local rule darwin-installed-pythons ( version ? ) + { +- version ?= $(.version-countdown) ; +- +- local prefix +- = [ GLOB /System/Library/Frameworks /Library/Frameworks +- : Python.framework ] ; +- +- return $(prefix)/Versions/$(version)/bin/python ; ++ return ; + } + + +@@ -890,25 +884,6 @@ local rule configure ( version ? : cmd-or-prefix ? : includes * : libraries ? : + + # See if we can find a framework directory on darwin. + local framework-directory ; +- if $(target-os) = darwin +- { +- # Search upward for the framework directory. +- local framework-directory = $(libraries[-1]) ; +- while $(framework-directory:D=) && $(framework-directory:D=) != Python.framework +- { +- framework-directory = $(framework-directory:D) ; +- } +- +- if $(framework-directory:D=) = Python.framework +- { +- debug-message framework directory is \"$(framework-directory)\" ; +- } +- else +- { +- debug-message "no framework directory found; using library path" ; +- framework-directory = ; +- } +- } + + local dll-path = $(libraries) ; + diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix index 34e837f7cd2b..dab6fac6f0cc 100644 --- a/pkgs/development/libraries/boost/generic.nix +++ b/pkgs/development/libraries/boost/generic.nix @@ -87,11 +87,13 @@ stdenv.mkDerivation { inherit src; patchFlags = optionalString (hostPlatform.libc == "msvcrt") "-p0"; - patches = patches ++ optional (hostPlatform.libc == "msvcrt") (fetchurl { - url = "https://svn.boost.org/trac/boost/raw-attachment/tickaet/7262/" - + "boost-mingw.patch"; - sha256 = "0s32kwll66k50w6r5np1y5g907b7lcpsjhfgr7rsw7q5syhzddyj"; - }); + patches = patches + ++ optional stdenv.isDarwin ./darwin-no-system-python.patch + ++ optional (hostPlatform.libc == "msvcrt") (fetchurl { + url = "https://svn.boost.org/trac/boost/raw-attachment/tickaet/7262/" + + "boost-mingw.patch"; + sha256 = "0s32kwll66k50w6r5np1y5g907b7lcpsjhfgr7rsw7q5syhzddyj"; + }); meta = { homepage = http://boost.org/; diff --git a/pkgs/development/libraries/eccodes/default.nix b/pkgs/development/libraries/eccodes/default.nix index a453a70dcad7..5f70a7571bae 100644 --- a/pkgs/development/libraries/eccodes/default.nix +++ b/pkgs/development/libraries/eccodes/default.nix @@ -6,11 +6,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "eccodes-${version}"; - version = "2.7.3"; + version = "2.8.0"; src = fetchurl { url = "https://software.ecmwf.int/wiki/download/attachments/45757960/eccodes-${version}-Source.tar.gz"; - sha256 = "1nvip0cmbhzmgzyi65qw8406p460alw1842dw2r4nq1lpcyi9avg"; + sha256 = "06rf6yzrszfqm74sq3485c7h6m0xjnz35sm31xkk70fxgk129fp0"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/eventlog/default.nix b/pkgs/development/libraries/eventlog/default.nix index b784088dc652..838693ba12d0 100644 --- a/pkgs/development/libraries/eventlog/default.nix +++ b/pkgs/development/libraries/eventlog/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { Where you had a simple non-structrured string in syslog() you have a combination of description and tag/value pairs. ''; - homepage = http://www.balabit.com/support/community/products/; + homepage = https://www.balabit.com/support/community/products/; license = stdenv.lib.licenses.bsd3; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/development/libraries/flatpak/default.nix b/pkgs/development/libraries/flatpak/default.nix index 9f704dc6a089..9a7acc287cc4 100644 --- a/pkgs/development/libraries/flatpak/default.nix +++ b/pkgs/development/libraries/flatpak/default.nix @@ -4,7 +4,7 @@ , libsoup, lzma, ostree, polkit, python3, systemd, xlibs, valgrind, glib_networking, makeWrapper, gnome3 }: let - version = "0.99.1"; + version = "0.99.2"; desktop_schemas = gnome3.gsettings_desktop_schemas; in stdenv.mkDerivation rec { name = "flatpak-${version}"; @@ -13,7 +13,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/flatpak/flatpak/releases/download/${version}/${name}.tar.xz"; - sha256 = "0f0mfmnc531pifrpkp1qv20wvbvi4la41rwyb3m8lnh1q5bmrch0"; + sha256 = "1cc82nxd290m4ljkd1phllwb3hkhz41h4ncfdrmhbg3gk47zgpyw"; }; patches = [ diff --git a/pkgs/development/libraries/folly/default.nix b/pkgs/development/libraries/folly/default.nix index 97ad0c08ad96..75335f08545e 100644 --- a/pkgs/development/libraries/folly/default.nix +++ b/pkgs/development/libraries/folly/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "folly-${version}"; - version = "2018.06.18.00"; + version = "2018.06.25.00"; src = fetchFromGitHub { owner = "facebook"; repo = "folly"; rev = "v${version}"; - sha256 = "0698wazz99wzfbz29jgkl4rlakypg3v2cnsjg9a0yq83a4y038p7"; + sha256 = "0i0c2130xjrpzf5k29j09ckl1nc9ab2hapf5l6004axq6v1kw9sa"; }; nativeBuildInputs = [ autoreconfHook python pkgconfig ]; diff --git a/pkgs/development/libraries/gegl/4.0.nix b/pkgs/development/libraries/gegl/4.0.nix index 623ee5b3375c..f32bc120170c 100644 --- a/pkgs/development/libraries/gegl/4.0.nix +++ b/pkgs/development/libraries/gegl/4.0.nix @@ -3,13 +3,13 @@ , libwebp, gnome3, libintl }: let - version = "0.4.2"; + version = "0.4.4"; in stdenv.mkDerivation rec { name = "gegl-${version}"; src = fetchurl { url = "https://download.gimp.org/pub/gegl/${stdenv.lib.versions.majorMinor version}/${name}.tar.bz2"; - sha256 = "13bzl0k5l12pk8bkcq4ar7wscbnw7jswhp34mwfsrf10kp0qndba"; + sha256 = "143qwn92xc5wm09p9iwrpw9y0ahha5lcyx1bb0lzwcb1fgd4bjzq"; }; # needs fonts otherwise, don't know how to pass them diff --git a/pkgs/development/libraries/harfbuzz/default.nix b/pkgs/development/libraries/harfbuzz/default.nix index 7c67ab48ad4c..88caf7476d02 100644 --- a/pkgs/development/libraries/harfbuzz/default.nix +++ b/pkgs/development/libraries/harfbuzz/default.nix @@ -5,7 +5,7 @@ }: let - version = "1.8.0"; + version = "1.8.1"; inherit (stdenv.lib) optional optionals optionalString; in @@ -14,7 +14,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://www.freedesktop.org/software/harfbuzz/release/harfbuzz-${version}.tar.bz2"; - sha256 = "18wnbq919k5h8pfm1pfy38gs1qzj1hnfr1wq989bix1n2jiii1d1"; + sha256 = "0ifzhqbg4p6ka7ps5c7lapix09i9yy4z7achc1gf91dhvn967vgv"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/iksemel/default.nix b/pkgs/development/libraries/iksemel/default.nix new file mode 100644 index 000000000000..b97f62dcf25c --- /dev/null +++ b/pkgs/development/libraries/iksemel/default.nix @@ -0,0 +1,25 @@ +{ stdenv, autoreconfHook, libtool, pkgconfig, gnutls, fetchFromGitHub, texinfo }: + +stdenv.mkDerivation rec { + name = "iksemel-${version}"; + version = "1.4.2"; + + src = fetchFromGitHub { + owner = "timothytylee"; + repo = "iksemel-1.4"; + rev = "v${version}"; + sha256 = "1xv302p344hnpxqcgs3z6wwxhrik39ckgfw5cjyrw0dkf316z9yh"; + }; + + nativeBuildInputs = [ pkgconfig autoreconfHook libtool texinfo ]; + buildInputs = [ gnutls ]; + + meta = with stdenv.lib; { + description = "XML parser for jabber"; + + homepage = https://github.com/timothytylee/iksemel-1.4; + license = licenses.gpl2; + maintainers = with maintainers; [ disassembler ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/libde265/default.nix b/pkgs/development/libraries/libde265/default.nix new file mode 100644 index 000000000000..07823072bad4 --- /dev/null +++ b/pkgs/development/libraries/libde265/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig }: + +stdenv.mkDerivation rec { + version = "1.0.3"; + name = "libde265-${version}"; + + src = fetchFromGitHub { + owner = "strukturag"; + repo = "libde265"; + rev = "v${version}"; + sha256 = "049g77f6c5sbk1h534zi9akj3y5h8zwnca5c9kqqjkn7f17irk10"; + }; + + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + + meta = { + homepage = "https://github.com/strukturag/libde265"; + description = "Open h.265 video codec implementation"; + license = stdenv.lib.licenses.lgpl3; + platforms = stdenv.lib.platforms.unix; + maintainers = with stdenv.lib.maintainers; [ gebner ]; + }; + +} diff --git a/pkgs/development/libraries/libfive/default.nix b/pkgs/development/libraries/libfive/default.nix new file mode 100644 index 000000000000..2c3085fc384f --- /dev/null +++ b/pkgs/development/libraries/libfive/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchFromGitHub, cmake, ninja, pkgconfig, eigen3_3, +zlib, libpng, boost, qt5, guile +}: + +stdenv.mkDerivation rec { + name = "libfive-${version}"; + version = "2018-07-01"; + + src = fetchFromGitHub { + owner = "libfive"; + repo = "libfive"; + rev = "0f517dde9521d751310a22f85ee69b2c84690267"; + sha256 = "0bfxysf5f4ripgcv546il8wnw5p0d4s75kdjlwvj32549537hlz0"; + }; + nativeBuildInputs = [ cmake ninja pkgconfig ]; + buildInputs = [ eigen3_3 zlib libpng boost qt5.qtimageformats guile ]; + + # Link "Studio" binary to "libfive-studio" to be more obvious: + postFixup = '' + ln -s "$out/bin/Studio" "$out/bin/libfive-studio" + ''; + + meta = with stdenv.lib; { + description = "Infrastructure for solid modeling with F-Reps in C, C++, and Guile"; + homepage = https://libfive.com/; + maintainers = with maintainers; [ hodapp ]; + license = licenses.lgpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/libheif/default.nix b/pkgs/development/libraries/libheif/default.nix new file mode 100644 index 000000000000..cdc03c01a022 --- /dev/null +++ b/pkgs/development/libraries/libheif/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, pruneLibtoolFiles, libde265, x265, libpng, libjpeg }: + +stdenv.mkDerivation rec { + version = "1.3.2"; + name = "libheif-${version}"; + + src = fetchFromGitHub { + owner = "strukturag"; + repo = "libheif"; + rev = "v${version}"; + sha256 = "0hk8mzig2kp5f94j4jwqxzjrm7ffk16ffvxl92rf0afsh6vgnz7w"; + }; + + nativeBuildInputs = [ autoreconfHook pkgconfig pruneLibtoolFiles ]; + buildInputs = [ libde265 x265 libpng libjpeg ]; + + enableParallelBuilding = true; + + meta = { + homepage = "http://www.libheif.org/"; + description = "ISO/IEC 23008-12:2017 HEIF image file format decoder and encoder"; + license = stdenv.lib.licenses.lgpl3; + platforms = stdenv.lib.platforms.unix; + maintainers = with stdenv.lib.maintainers; [ gebner ]; + }; + +} diff --git a/pkgs/development/libraries/libndctl/default.nix b/pkgs/development/libraries/libndctl/default.nix index fa48fc390aa0..0c7c02f80d47 100644 --- a/pkgs/development/libraries/libndctl/default.nix +++ b/pkgs/development/libraries/libndctl/default.nix @@ -2,7 +2,7 @@ }: let - version = "60.3"; + version = "61.1"; in stdenv.mkDerivation rec { name = "libndctl-${version}"; @@ -10,7 +10,7 @@ in stdenv.mkDerivation rec { owner = "pmem"; repo = "ndctl"; rev = "v${version}"; - sha256 = "0w19yh6f9skf5zy4bhdjlrn3wdx5xx9cq8j6h04cmw4nla6zj9ar"; + sha256 = "1k996p757nwvkg86firx0yh39dsa9jx5w14rlfl4hlg2h9kkivnx"; }; outputs = [ "out" "man" "dev" ]; diff --git a/pkgs/development/libraries/libqalculate/default.nix b/pkgs/development/libraries/libqalculate/default.nix index a74095bce297..5c7868983708 100644 --- a/pkgs/development/libraries/libqalculate/default.nix +++ b/pkgs/development/libraries/libqalculate/default.nix @@ -1,13 +1,15 @@ -{ stdenv, fetchurl, mpfr, libxml2, intltool, pkgconfig, doxygen, +{ stdenv, fetchFromGitHub, mpfr, libxml2, intltool, pkgconfig, doxygen, autoreconfHook, readline, libiconv, icu, curl, gnuplot, gettext }: stdenv.mkDerivation rec { name = "libqalculate-${version}"; - version = "2.5.0"; + version = "2.6.0b"; - src = fetchurl { - url = "https://github.com/Qalculate/libqalculate/archive/v${version}.tar.gz"; - sha256 = "0xs2qjr93k43p6j126xj20fgb1n2jv56rhgc211yv1l46crbqxfv"; + src = fetchFromGitHub { + owner = "qalculate"; + repo = "libqalculate"; + rev = "v${version}"; + sha256 = "1g0pmf33vrjabxmx6lyysgkxa6hg8qmwk0n5ncl4pr8sdkimswxw"; }; outputs = [ "out" "dev" "doc" ]; diff --git a/pkgs/development/libraries/librealsense/default.nix b/pkgs/development/libraries/librealsense/default.nix index b6328a7354cf..464e702acabb 100644 --- a/pkgs/development/libraries/librealsense/default.nix +++ b/pkgs/development/libraries/librealsense/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "librealsense-${version}"; - version = "2.12.0"; + version = "2.13.0"; src = fetchFromGitHub { owner = "IntelRealSense"; repo = "librealsense"; rev = "v${version}"; - sha256 = "1hmrp39x6c8i1l5d0hla0c8k6mf70sdyfjrlnwiqyi2p4s6phyd2"; + sha256 = "0rs7ic95kix173kl1ijb1riigjxnp7yqvps35hfxbhjqbjc2wfgn"; }; buildInputs = [ diff --git a/pkgs/development/libraries/libvmi/default.nix b/pkgs/development/libraries/libvmi/default.nix new file mode 100644 index 000000000000..28cfe56d59b8 --- /dev/null +++ b/pkgs/development/libraries/libvmi/default.nix @@ -0,0 +1,43 @@ +{ stdenv, + fetchFromGitHub, + autoreconfHook, + bison, + flex, + glib, + pkgconfig, + json_c, + xen, + libvirt, + xenSupport ? true }: + +with stdenv.lib; + +stdenv.mkDerivation rec { + name = "libvmi-${version}"; + version = "0.12.0"; + + src = fetchFromGitHub { + owner = "libvmi"; + repo = "libvmi"; + rev = "v${version}"; + sha256 = "0wbi2nasb1gbci6cq23g6kq7i10rwi1y7r44rl03icr5prqjpdyv"; + }; + + buildInputs = [ glib libvirt json_c ] ++ (optional xenSupport xen); + nativeBuildInputs = [ autoreconfHook bison flex pkgconfig ]; + + configureFlags = optional (!xenSupport) "--disable-xen"; + + meta = with stdenv.lib; { + homepage = "http://libvmi.com/"; + description = "A C library for virtual machine introspection"; + longDescription = '' + LibVMI is a C library with Python bindings that makes it easy to monitor the low-level + details of a running virtual machine by viewing its memory, trapping on hardware events, + and accessing the vCPU registers. + ''; + license = with licenses; [ gpl3 lgpl3 ]; + platforms = platforms.linux; + maintainers = with maintainers; [ lschuermann ]; + }; +} diff --git a/pkgs/development/libraries/libyaml/default.nix b/pkgs/development/libraries/libyaml/default.nix index 150da3d45997..7178e64b6b6a 100644 --- a/pkgs/development/libraries/libyaml/default.nix +++ b/pkgs/development/libraries/libyaml/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { }; meta = with stdenv.lib; { - homepage = http://pyyaml.org/; + homepage = https://pyyaml.org/; description = "A YAML 1.1 parser and emitter written in C"; license = licenses.mit; platforms = platforms.all; diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix index f8a17c9f5c3f..9b0593ceb6f8 100644 --- a/pkgs/development/libraries/poppler/default.nix +++ b/pkgs/development/libraries/poppler/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, cmake, ninja, pkgconfig, libiconv, libintl +{ stdenv, lib, fetchurl, cmake, ninja, pkgconfig, libiconv, libintl, fetchpatch , zlib, curl, cairo, freetype, fontconfig, lcms, libjpeg, openjpeg , withData ? true, poppler_data , qt5Support ? false, qtbase ? null @@ -33,6 +33,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ninja pkgconfig ]; + patches = lib.optional stdenv.isDarwin (fetchpatch { + url = "https://cgit.freedesktop.org/poppler/poppler/patch/?id=267228bb071016621c80fc8514927905164aaeea"; + sha256 = "0i2sbxz1mrsnj75qgqaadayjgs48ay2mhrbkij95djy6am44m54k"; + }); + # Not sure when and how to pass it. It seems an upstream bug anyway. CXXFLAGS = stdenv.lib.optionalString stdenv.cc.isClang "-std=c++11"; diff --git a/pkgs/development/libraries/qpdf/default.nix b/pkgs/development/libraries/qpdf/default.nix index 7622254afd97..0aa39532325d 100644 --- a/pkgs/development/libraries/qpdf/default.nix +++ b/pkgs/development/libraries/qpdf/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, fetchpatch, libjpeg, zlib, perl }: -let version = "8.0.2"; +let version = "8.1.0"; in stdenv.mkDerivation rec { name = "qpdf-${version}"; src = fetchurl { url = "mirror://sourceforge/qpdf/qpdf/${version}/${name}.tar.gz"; - sha256 = "1hf8jfjar8p7v288d7ccmr8w171mv9kb86b6hq1nk58mnlq1g7mh"; + sha256 = "1m3hcgip6bzjx4gd7wq1328p8zi3pq5savzncdyln6l0lcklh7vx"; }; nativeBuildInputs = [ perl ]; diff --git a/pkgs/development/libraries/qt-5/5.11/fetch.sh b/pkgs/development/libraries/qt-5/5.11/fetch.sh index aaf42c5c5b21..ce82e243af77 100644 --- a/pkgs/development/libraries/qt-5/5.11/fetch.sh +++ b/pkgs/development/libraries/qt-5/5.11/fetch.sh @@ -1,2 +1,2 @@ -WGET_ARGS=( http://download.qt.io/official_releases/qt/5.11/5.11.0/submodules/ \ +WGET_ARGS=( http://download.qt.io/official_releases/qt/5.11/5.11.1/submodules/ \ -A '*.tar.xz' ) diff --git a/pkgs/development/libraries/qt-5/5.11/qtbase-darwin.patch b/pkgs/development/libraries/qt-5/5.11/qtbase-darwin.patch index 86c55f083989..f66351752054 100644 --- a/pkgs/development/libraries/qt-5/5.11/qtbase-darwin.patch +++ b/pkgs/development/libraries/qt-5/5.11/qtbase-darwin.patch @@ -20,9 +20,8 @@ index 341d3bccf2..3368234c26 100644 for (NSString *ifName in wifiInterfaces) { scanThread->interfaceName = QString::fromNSString(ifName); scanThread->start(); -diff --git a/src/plugins/platforms/cocoa/qcocoascreen.mm b/src/plugins/platforms/cocoa/qcoco -ascreen.mm -index a17a02b6..d76c42fa 100644 +diff --git a/src/plugins/platforms/cocoa/qcocoascreen.mm b/src/plugins/platforms/cocoa/qcocoascreen.mm +index a17a02b629..d76c42fa03 100644 --- a/src/plugins/platforms/cocoa/qcocoascreen.mm +++ b/src/plugins/platforms/cocoa/qcocoascreen.mm @@ -114,7 +114,7 @@ void QCocoaScreen::updateGeometry() @@ -35,10 +34,10 @@ index a17a02b6..d76c42fa 100644 m_availableGeometry = qt_mac_flip(QRectF::fromCGRect(nsScreen.visibleFrame), primaryScreenGeometry).toRect(); diff --git a/src/plugins/platforms/cocoa/qcocoawindow.mm b/src/plugins/platforms/cocoa/qcocoawindow.mm -index 54254455e4..e10f62909a 100644 +index 72f3bc0075..a9c058a850 100644 --- a/src/plugins/platforms/cocoa/qcocoawindow.mm +++ b/src/plugins/platforms/cocoa/qcocoawindow.mm -@@ -1674,7 +1674,7 @@ void QCocoaWindow::applyContentBorderThickness(NSWindow *window) +@@ -1676,7 +1676,7 @@ void QCocoaWindow::applyContentBorderThickness(NSWindow *window) if (!m_drawContentBorderGradient) { window.styleMask = window.styleMask & ~NSTexturedBackgroundWindowMask; diff --git a/pkgs/development/libraries/qt-5/5.11/qtbase-revert-no-macos10.10.patch b/pkgs/development/libraries/qt-5/5.11/qtbase-revert-no-macos10.10.patch index e39934802cdf..29776518379d 100644 --- a/pkgs/development/libraries/qt-5/5.11/qtbase-revert-no-macos10.10.patch +++ b/pkgs/development/libraries/qt-5/5.11/qtbase-revert-no-macos10.10.patch @@ -21,7 +21,7 @@ Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com> 3 files changed, 4 insertions(+), 34 deletions(-) diff --git a/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm b/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm -index 98b753ef..489d9cd0 100644 +index 98b753eff9..489d9cd031 100644 --- a/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm +++ b/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm @@ -47,18 +47,28 @@ @@ -57,7 +57,7 @@ index 98b753ef..489d9cd0 100644 #define kCTFontWeightThin NSFontWeightThin #define kCTFontWeightLight NSFontWeightLight diff --git a/src/plugins/platforms/cocoa/qcocoafiledialoghelper.mm b/src/plugins/platforms/cocoa/qcocoafiledialoghelper.mm -index 94f2125b..272cd9f3 100644 +index 94f2125bad..272cd9f3dc 100644 --- a/src/plugins/platforms/cocoa/qcocoafiledialoghelper.mm +++ b/src/plugins/platforms/cocoa/qcocoafiledialoghelper.mm @@ -162,7 +162,11 @@ QT_NAMESPACE_ALIAS_OBJC_CLASS(QNSOpenSavePanelDelegate); @@ -74,11 +74,11 @@ index 94f2125b..272cd9f3 100644 if (mOptions->isLabelExplicitlySet(QFileDialogOptions::Accept)) [mSavePanel setPrompt:[self strip:options->labelText(QFileDialogOptions::Accept)]]; diff --git a/src/plugins/platforms/cocoa/qnswindowdelegate.mm b/src/plugins/platforms/cocoa/qnswindowdelegate.mm -index 6e5623d6..cdecd86d 100644 +index 057a4c2943..eb55e50622 100644 --- a/src/plugins/platforms/cocoa/qnswindowdelegate.mm +++ b/src/plugins/platforms/cocoa/qnswindowdelegate.mm -@@ -80,6 +80,22 @@ static QRegExp whitespaceRegex = QRegExp(QStringLiteral("\\s*")); - return NSRectFromCGRect(m_cocoaWindow->screen()->availableGeometry().toCGRect()); +@@ -103,6 +103,22 @@ static QRegExp whitespaceRegex = QRegExp(QStringLiteral("\\s*")); + return QCocoaScreen::mapToNative(maximizedFrame); } +#if QT_MACOS_DEPLOYMENT_TARGET_BELOW(__MAC_10_11) diff --git a/pkgs/development/libraries/qt-5/5.11/qtbase.patch b/pkgs/development/libraries/qt-5/5.11/qtbase.patch index ec8d27ebb6c2..fa0b2c51c46e 100644 --- a/pkgs/development/libraries/qt-5/5.11/qtbase.patch +++ b/pkgs/development/libraries/qt-5/5.11/qtbase.patch @@ -12,7 +12,7 @@ index 5208379f9a..92fe29a0ac 100644 QMAKE_LFLAGS_REL_RPATH = diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf -index 66acedef55..fe01bf8de4 100644 +index 2ed708e085..05e60ff45f 100644 --- a/mkspecs/features/create_cmake.prf +++ b/mkspecs/features/create_cmake.prf @@ -21,7 +21,7 @@ load(cmake_functions) @@ -24,7 +24,7 @@ index 66acedef55..fe01bf8de4 100644 contains(CMAKE_INSTALL_LIBS_DIR, ^(/usr)?/lib(64)?.*): CMAKE_USR_MOVE_WORKAROUND = $$CMAKE_INSTALL_LIBS_DIR CMAKE_OUT_DIR = $$MODULE_BASE_OUTDIR/lib/cmake -@@ -47,49 +47,20 @@ split_incpath { +@@ -51,45 +51,20 @@ split_incpath { $$cmake_extra_source_includes.output } @@ -33,11 +33,9 @@ index 66acedef55..fe01bf8de4 100644 - CMAKE_INCLUDE_DIR = $$[QT_INSTALL_HEADERS]/ - CMAKE_INCLUDE_DIR_IS_ABSOLUTE = True -} -- --isEmpty(QT.$${MODULE}_private.includes)| \ -- !exists($$first(QT.$${MODULE}_private.includes)): \ -- CMAKE_NO_PRIVATE_INCLUDES = true -- ++CMAKE_INCLUDE_DIR = $$NIX_OUTPUT_DEV/include/ ++CMAKE_INCLUDE_DIR_IS_ABSOLUTE = True + -CMAKE_LIB_DIR = $$cmakeRelativePath($$[QT_INSTALL_LIBS], $$[QT_INSTALL_PREFIX]) -contains(CMAKE_LIB_DIR,"^\\.\\./.*") { - CMAKE_LIB_DIR = $$[QT_INSTALL_LIBS]/ @@ -48,25 +46,23 @@ index 66acedef55..fe01bf8de4 100644 - # installed in $${CMAKE_LIB_DIR}/cmake/Qt5$${CMAKE_MODULE_NAME} - CMAKE_RELATIVE_INSTALL_DIR = "$${CMAKE_RELATIVE_INSTALL_LIBS_DIR}../../" -} -+CMAKE_INCLUDE_DIR = $$NIX_OUTPUT_DEV/include/ -+CMAKE_INCLUDE_DIR_IS_ABSOLUTE = True ++CMAKE_BIN_DIR = $$NIX_OUTPUT_BIN/bin/ ++CMAKE_BIN_DIR_IS_ABSOLUTE = True -CMAKE_BIN_DIR = $$cmakeRelativePath($$[QT_HOST_BINS], $$[QT_INSTALL_PREFIX]) -contains(CMAKE_BIN_DIR, "^\\.\\./.*") { - CMAKE_BIN_DIR = $$[QT_HOST_BINS]/ - CMAKE_BIN_DIR_IS_ABSOLUTE = True -} -+CMAKE_BIN_DIR = $$NIX_OUTPUT_BIN/bin/ -+CMAKE_BIN_DIR_IS_ABSOLUTE = True ++CMAKE_LIB_DIR = $$NIX_OUTPUT_OUT/lib/ ++CMAKE_LIB_DIR_IS_ABSOLUTE = True -CMAKE_PLUGIN_DIR = $$cmakeRelativePath($$[QT_INSTALL_PLUGINS], $$[QT_INSTALL_PREFIX]) -contains(CMAKE_PLUGIN_DIR, "^\\.\\./.*") { - CMAKE_PLUGIN_DIR = $$[QT_INSTALL_PLUGINS]/ - CMAKE_PLUGIN_DIR_IS_ABSOLUTE = True -} -+CMAKE_LIB_DIR = $$NIX_OUTPUT_OUT/lib/ -+CMAKE_LIB_DIR_IS_ABSOLUTE = True - +- -win32:!static:!staticlib { - CMAKE_DLL_DIR = $$cmakeRelativePath($$[QT_INSTALL_BINS], $$[QT_INSTALL_PREFIX]) - contains(CMAKE_DLL_DIR, "^\\.\\./.*") { @@ -85,7 +81,7 @@ index 66acedef55..fe01bf8de4 100644 static|staticlib:CMAKE_STATIC_TYPE = true -@@ -169,7 +140,7 @@ contains(CONFIG, plugin) { +@@ -169,7 +144,7 @@ contains(CONFIG, plugin) { cmake_target_file cmake_qt5_plugin_file.files = $$cmake_target_file.output @@ -94,7 +90,7 @@ index 66acedef55..fe01bf8de4 100644 INSTALLS += cmake_qt5_plugin_file return() -@@ -316,7 +287,7 @@ exists($$cmake_macros_file.input) { +@@ -316,7 +291,7 @@ exists($$cmake_macros_file.input) { cmake_qt5_module_files.files += $$cmake_macros_file.output } @@ -264,13 +260,14 @@ index 27f4c277d6..18b4813e25 100644 set_target_properties(Qt5::${Plugin} PROPERTIES \"IMPORTED_LOCATION_${Configuration}\" ${imported_location} diff --git a/mkspecs/features/mac/default_post.prf b/mkspecs/features/mac/default_post.prf -index 50a1ec6764..d6368b769e 100644 +index 21d487f1f9..a0e5c68b7e 100644 --- a/mkspecs/features/mac/default_post.prf +++ b/mkspecs/features/mac/default_post.prf -@@ -25,188 +25,3 @@ qt { +@@ -24,196 +24,3 @@ qt { + } } } - +- -# Add the same default rpaths as Xcode does for new projects. -# This is especially important for iOS/tvOS/watchOS where no other option is possible. -!no_default_rpath { @@ -456,14 +453,21 @@ index 50a1ec6764..d6368b769e 100644 - cache(QMAKE_XCODE_VERSION, stash) - -QMAKE_XCODE_LIBRARY_SUFFIX = $$qtPlatformTargetSuffix() +- +-xcode_product_bundle_identifier_setting.name = PRODUCT_BUNDLE_IDENTIFIER +-xcode_product_bundle_identifier_setting.value = $$QMAKE_TARGET_BUNDLE_PREFIX +-isEmpty(xcode_product_bundle_identifier_setting.value): \ +- xcode_product_bundle_identifier_setting.value = "com.yourcompany" +-xcode_product_bundle_identifier_setting.value = "$${xcode_product_bundle_identifier_setting.value}.${PRODUCT_NAME:rfc1034identifier}" +-QMAKE_MAC_XCODE_SETTINGS += xcode_product_bundle_identifier_setting diff --git a/mkspecs/features/mac/default_pre.prf b/mkspecs/features/mac/default_pre.prf -index f1a4ca77b2..61ed486a76 100644 +index e3534561a5..3b01424e67 100644 --- a/mkspecs/features/mac/default_pre.prf +++ b/mkspecs/features/mac/default_pre.prf -@@ -1,67 +1,3 @@ +@@ -1,60 +1,2 @@ CONFIG = asset_catalogs rez $$CONFIG load(default_pre) - +- -isEmpty(QMAKE_XCODE_DEVELOPER_PATH) { - # Get path of Xcode's Developer directory - QMAKE_XCODE_DEVELOPER_PATH = $$system("/usr/bin/xcode-select --print-path 2>/dev/null") @@ -521,13 +525,6 @@ index f1a4ca77b2..61ed486a76 100644 -xcode_copy_phase_strip_setting.name = COPY_PHASE_STRIP -xcode_copy_phase_strip_setting.value = NO -QMAKE_MAC_XCODE_SETTINGS += xcode_copy_phase_strip_setting -- --xcode_product_bundle_identifier_setting.name = PRODUCT_BUNDLE_IDENTIFIER --xcode_product_bundle_identifier_setting.value = $$QMAKE_TARGET_BUNDLE_PREFIX --isEmpty(xcode_product_bundle_identifier_setting.value): \ -- xcode_product_bundle_identifier_setting.value = "com.yourcompany" --xcode_product_bundle_identifier_setting.value = "$${xcode_product_bundle_identifier_setting.value}.${PRODUCT_NAME:rfc1034identifier}" --QMAKE_MAC_XCODE_SETTINGS += xcode_product_bundle_identifier_setting diff --git a/mkspecs/features/mac/sdk.prf b/mkspecs/features/mac/sdk.prf index 8360dd8b38..8b13789179 100644 --- a/mkspecs/features/mac/sdk.prf @@ -658,7 +655,7 @@ index 1848f00e90..2af93675c5 100644 + MODULE_QMAKE_OUTDIR = $$NIX_OUTPUT_OUT } diff --git a/mkspecs/features/qt_common.prf b/mkspecs/features/qt_common.prf -index f4ae5bde80..6d4c6d223f 100644 +index 415044bb64..7163ef56cd 100644 --- a/mkspecs/features/qt_common.prf +++ b/mkspecs/features/qt_common.prf @@ -32,8 +32,8 @@ contains(TEMPLATE, .*lib) { @@ -1044,10 +1041,10 @@ index cc982b3379..0c5005d3d7 100644 #endif } diff --git a/src/plugins/platforms/xcb/qxcbcursor.cpp b/src/plugins/platforms/xcb/qxcbcursor.cpp -index 8d151b760b..a8b39d282a 100644 +index b401100dd4..b45a290065 100644 --- a/src/plugins/platforms/xcb/qxcbcursor.cpp +++ b/src/plugins/platforms/xcb/qxcbcursor.cpp -@@ -314,10 +314,10 @@ QXcbCursor::QXcbCursor(QXcbConnection *conn, QXcbScreen *screen) +@@ -316,10 +316,10 @@ QXcbCursor::QXcbCursor(QXcbConnection *conn, QXcbScreen *screen) #if QT_CONFIG(xcb_xlib) && QT_CONFIG(library) static bool function_ptrs_not_initialized = true; if (function_ptrs_not_initialized) { diff --git a/pkgs/development/libraries/qt-5/5.11/qtdeclarative.patch b/pkgs/development/libraries/qt-5/5.11/qtdeclarative.patch index 01a975c14ec7..8f5b5d4790fb 100644 --- a/pkgs/development/libraries/qt-5/5.11/qtdeclarative.patch +++ b/pkgs/development/libraries/qt-5/5.11/qtdeclarative.patch @@ -1,8 +1,8 @@ diff --git a/src/qml/qml/qqmlimport.cpp b/src/qml/qml/qqmlimport.cpp -index a7cafa1a9..e17ffd35b 100644 +index 005db4248..685c5b1b2 100644 --- a/src/qml/qml/qqmlimport.cpp +++ b/src/qml/qml/qqmlimport.cpp -@@ -1737,6 +1737,15 @@ QQmlImportDatabase::QQmlImportDatabase(QQmlEngine *e) +@@ -1760,6 +1760,15 @@ QQmlImportDatabase::QQmlImportDatabase(QQmlEngine *e) QString installImportsPath = QLibraryInfo::location(QLibraryInfo::Qml2ImportsPath); addImportPath(installImportsPath); @@ -19,10 +19,10 @@ index a7cafa1a9..e17ffd35b 100644 if (Q_UNLIKELY(!qEnvironmentVariableIsEmpty("QML2_IMPORT_PATH"))) { const QString envImportPath = qEnvironmentVariable("QML2_IMPORT_PATH"); diff --git a/tools/qmlcachegen/qmlcache.prf b/tools/qmlcachegen/qmlcache.prf -index 330da358b..cdf570205 100644 +index 537eaf62e..e21de58f6 100644 --- a/tools/qmlcachegen/qmlcache.prf +++ b/tools/qmlcachegen/qmlcache.prf -@@ -44,7 +44,7 @@ defineReplace(qmlCacheOutputFileName) { +@@ -26,7 +26,7 @@ defineReplace(qmlCacheOutputFileName) { } qmlcacheinst.base = $$QMLCACHE_DESTDIR diff --git a/pkgs/development/libraries/qt-5/5.11/srcs.nix b/pkgs/development/libraries/qt-5/5.11/srcs.nix index f570b793a241..b6668a91606c 100644 --- a/pkgs/development/libraries/qt-5/5.11/srcs.nix +++ b/pkgs/development/libraries/qt-5/5.11/srcs.nix @@ -3,323 +3,323 @@ { qt3d = { - version = "5.11.0"; + version = "5.11.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.0/submodules/qt3d-everywhere-src-5.11.0.tar.xz"; - sha256 = "1h3hb395vpbblwin5bx3zazwcz5gwf2fjawdcqd866mkmcb1am2d"; - name = "qt3d-everywhere-src-5.11.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qt3d-everywhere-src-5.11.1.tar.xz"; + sha256 = "03fkbrghj40rp8pf5r5979pcvq7qjsj7db446r6fl6slwphmk1nb"; + name = "qt3d-everywhere-src-5.11.1.tar.xz"; }; }; qtactiveqt = { - version = "5.11.0"; + version = "5.11.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.0/submodules/qtactiveqt-everywhere-src-5.11.0.tar.xz"; - sha256 = "019ppkqi8kzd3sjxilig9sqqfw331d3nbq8c3d4xanwqsl6vxak9"; - name = "qtactiveqt-everywhere-src-5.11.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qtactiveqt-everywhere-src-5.11.1.tar.xz"; + sha256 = "1f9w3dc2wvhz7pqhrsb2p908kc2c6xrqsp82ny8akil4xx6nrvn6"; + name = "qtactiveqt-everywhere-src-5.11.1.tar.xz"; }; }; qtandroidextras = { - version = "5.11.0"; + version = "5.11.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.0/submodules/qtandroidextras-everywhere-src-5.11.0.tar.xz"; - sha256 = "1yw1fsjbs4ibxi01nxk1431v7ky22ll9npxc5x7fpd4w3h6y73gw"; - name = "qtandroidextras-everywhere-src-5.11.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qtandroidextras-everywhere-src-5.11.1.tar.xz"; + sha256 = "1qiggrz2hdb7vrkvsh71hqdipj3klak0jpn2nq8qpilqxgb9dx76"; + name = "qtandroidextras-everywhere-src-5.11.1.tar.xz"; }; }; qtbase = { - version = "5.11.0"; + version = "5.11.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.0/submodules/qtbase-everywhere-src-5.11.0.tar.xz"; - sha256 = "0rny87ypnkkvyp9p76nim77v6np0cdf1dbjfmcilklzphkdlcvpd"; - name = "qtbase-everywhere-src-5.11.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qtbase-everywhere-src-5.11.1.tar.xz"; + sha256 = "0ipv18ypbgpxhh49rfplqmflskmnhhwj1bjr5hrwi0jpvar4gl50"; + name = "qtbase-everywhere-src-5.11.1.tar.xz"; }; }; qtcanvas3d = { - version = "5.11.0"; + version = "5.11.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.0/submodules/qtcanvas3d-everywhere-src-5.11.0.tar.xz"; - sha256 = "1kqcaks6lkz8cp9s3pwrvgrr8381rjzf5fbf2bzshdw7psphxiiz"; - name = "qtcanvas3d-everywhere-src-5.11.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qtcanvas3d-everywhere-src-5.11.1.tar.xz"; + sha256 = "1pif3m1f44jrly2nh0hzid6dmdxqiy5qgx645hz6g5fmpl113d8g"; + name = "qtcanvas3d-everywhere-src-5.11.1.tar.xz"; }; }; qtcharts = { - version = "5.11.0"; + version = "5.11.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.0/submodules/qtcharts-everywhere-src-5.11.0.tar.xz"; - sha256 = "0lg39vd6i0l76spjz6bhb1kkpbk2mgc0hxccj7733xxbxaz14vn4"; - name = "qtcharts-everywhere-src-5.11.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qtcharts-everywhere-src-5.11.1.tar.xz"; + sha256 = "0avscsni84zrzydilkkp456sbaypyzhkn42qygjdq7wcn045zxk2"; + name = "qtcharts-everywhere-src-5.11.1.tar.xz"; }; }; qtconnectivity = { - version = "5.11.0"; + version = "5.11.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.0/submodules/qtconnectivity-everywhere-src-5.11.0.tar.xz"; - sha256 = "0wqq5q5saf007aphvpn5pvj6l0qp0z7wxvfba6v9iq5ylyqm6bnd"; - name = "qtconnectivity-everywhere-src-5.11.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qtconnectivity-everywhere-src-5.11.1.tar.xz"; + sha256 = "0mz6mbf069yqdvi6mcvp6izskcn9wzig4s3dzmygwd430pmx93kk"; + name = "qtconnectivity-everywhere-src-5.11.1.tar.xz"; }; }; qtdatavis3d = { - version = "5.11.0"; + version = "5.11.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.0/submodules/qtdatavis3d-everywhere-src-5.11.0.tar.xz"; - sha256 = "1s7gmgh6g3aia74yiqahffrc6n8f4491vb7g3i4i10ilandipg34"; - name = "qtdatavis3d-everywhere-src-5.11.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qtdatavis3d-everywhere-src-5.11.1.tar.xz"; + sha256 = "0gay0dsz05xfrlx190y95hp9wipzb988h02fqbqvyn00ds3s178w"; + name = "qtdatavis3d-everywhere-src-5.11.1.tar.xz"; }; }; qtdeclarative = { - version = "5.11.0"; + version = "5.11.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.0/submodules/qtdeclarative-everywhere-src-5.11.0.tar.xz"; - sha256 = "1h2pbyr7dnak4q96373xpa6gk6rl528rnqima8xnvhdi2y5kgagf"; - name = "qtdeclarative-everywhere-src-5.11.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qtdeclarative-everywhere-src-5.11.1.tar.xz"; + sha256 = "0fjg9ii64mhx2ww70rj44cy65rwwkwyjxcm435kwp3v1pzv5xkwy"; + name = "qtdeclarative-everywhere-src-5.11.1.tar.xz"; }; }; qtdoc = { - version = "5.11.0"; + version = "5.11.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.0/submodules/qtdoc-everywhere-src-5.11.0.tar.xz"; - sha256 = "1y4cr3a9pi83mbabd8g6gz072dqgj26bla2qw2dgcv1v7ifhcpky"; - name = "qtdoc-everywhere-src-5.11.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qtdoc-everywhere-src-5.11.1.tar.xz"; + sha256 = "1z0sqmn0pw5g4ycdi8igsi89151cw6p3kv9g97pxl2qx3my1ppmc"; + name = "qtdoc-everywhere-src-5.11.1.tar.xz"; }; }; qtgamepad = { - version = "5.11.0"; + version = "5.11.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.0/submodules/qtgamepad-everywhere-src-5.11.0.tar.xz"; - sha256 = "0g52c03gdgz57h7szdxvc5hdy45l7q7m29yfzhwqc57hwdfl98bi"; - name = "qtgamepad-everywhere-src-5.11.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qtgamepad-everywhere-src-5.11.1.tar.xz"; + sha256 = "1n97w9rcbg8mzkvjgn3i8jbfmplp7w0p80ykdchpml47gxk1kwma"; + name = "qtgamepad-everywhere-src-5.11.1.tar.xz"; }; }; qtgraphicaleffects = { - version = "5.11.0"; + version = "5.11.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.0/submodules/qtgraphicaleffects-everywhere-src-5.11.0.tar.xz"; - sha256 = "0xzr4421w7idlgndxnd68wwc2asabycjiskkyl1f8nwqv34lcy3j"; - name = "qtgraphicaleffects-everywhere-src-5.11.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qtgraphicaleffects-everywhere-src-5.11.1.tar.xz"; + sha256 = "1ws8aj7bq3rxpzjs370dcyqk8a5v1y6fwvrdhf70j8b2d4v75lnr"; + name = "qtgraphicaleffects-everywhere-src-5.11.1.tar.xz"; }; }; qtimageformats = { - version = "5.11.0"; + version = "5.11.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.0/submodules/qtimageformats-everywhere-src-5.11.0.tar.xz"; - sha256 = "0w0yy7zzln3v7dm7ksjxkzhq8r0a9nwk823wv4f1x7vsa3pnyh2q"; - name = "qtimageformats-everywhere-src-5.11.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qtimageformats-everywhere-src-5.11.1.tar.xz"; + sha256 = "05jnyrq7klr3mdiz0r9c151vl829yc8y9cxfbw5dwbp1rkndwl7b"; + name = "qtimageformats-everywhere-src-5.11.1.tar.xz"; }; }; qtlocation = { - version = "5.11.0"; + version = "5.11.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.0/submodules/qtlocation-everywhere-src-5.11.0.tar.xz"; - sha256 = "074cjqhr14mqlsqj9rzagzdcqnayyichp31lq02k05q07wg93xi8"; - name = "qtlocation-everywhere-src-5.11.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qtlocation-everywhere-src-5.11.1.tar.xz"; + sha256 = "03vrbymwbn4nqsypcmr4ccqv20nvwdfs9gb01pi3jxr6x0wrlb0p"; + name = "qtlocation-everywhere-src-5.11.1.tar.xz"; }; }; qtmacextras = { - version = "5.11.0"; + version = "5.11.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.0/submodules/qtmacextras-everywhere-src-5.11.0.tar.xz"; - sha256 = "1dwlfngp0bs8v1c64p677dbdprv5fpcwva2xq7ir6zca5pma88yz"; - name = "qtmacextras-everywhere-src-5.11.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qtmacextras-everywhere-src-5.11.1.tar.xz"; + sha256 = "1wf3n5n4gg8gmjnjq88lmymkssg8q5s3qkrpsxd1hb6pd3n32gpn"; + name = "qtmacextras-everywhere-src-5.11.1.tar.xz"; }; }; qtmultimedia = { - version = "5.11.0"; + version = "5.11.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.0/submodules/qtmultimedia-everywhere-src-5.11.0.tar.xz"; - sha256 = "0g4x1w251imq58zp1px6yschwj6icsxzwl3fy7pjfbgd27qjhlzg"; - name = "qtmultimedia-everywhere-src-5.11.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qtmultimedia-everywhere-src-5.11.1.tar.xz"; + sha256 = "0369b0mh7sr718l119b07grb1v8xqlq6l4damyd6lrmlj1wbb2zj"; + name = "qtmultimedia-everywhere-src-5.11.1.tar.xz"; }; }; qtnetworkauth = { - version = "5.11.0"; + version = "5.11.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.0/submodules/qtnetworkauth-everywhere-src-5.11.0.tar.xz"; - sha256 = "1kr8hwjsb8a5cypvqj48vrnkcvm2rcni102dh6i909i70a7hcsym"; - name = "qtnetworkauth-everywhere-src-5.11.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qtnetworkauth-everywhere-src-5.11.1.tar.xz"; + sha256 = "05p4pvfp3k5612d54anvpj39bgc7v572x6kgk3fy69xgn7lhbd02"; + name = "qtnetworkauth-everywhere-src-5.11.1.tar.xz"; }; }; qtpurchasing = { - version = "5.11.0"; + version = "5.11.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.0/submodules/qtpurchasing-everywhere-src-5.11.0.tar.xz"; - sha256 = "1c92yv2yi38sic06nyr9r6zpq3y4sxnasmj14d3jmg50gc1ncqfs"; - name = "qtpurchasing-everywhere-src-5.11.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qtpurchasing-everywhere-src-5.11.1.tar.xz"; + sha256 = "0crm39fy9aqns10mjlbxvkkna9xklic49zfp3f7v7cwl66wap6dc"; + name = "qtpurchasing-everywhere-src-5.11.1.tar.xz"; }; }; qtquickcontrols = { - version = "5.11.0"; + version = "5.11.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.0/submodules/qtquickcontrols-everywhere-src-5.11.0.tar.xz"; - sha256 = "01ziibf4afdhb5b3gfci8maprmviqwhdvma2z1jlq2ck45cpsqi6"; - name = "qtquickcontrols-everywhere-src-5.11.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qtquickcontrols-everywhere-src-5.11.1.tar.xz"; + sha256 = "0mn662j0gkpama7zlrsn4h27sjrk49kpbha1h0zxxyiza5cpzsms"; + name = "qtquickcontrols-everywhere-src-5.11.1.tar.xz"; }; }; qtquickcontrols2 = { - version = "5.11.0"; + version = "5.11.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.0/submodules/qtquickcontrols2-everywhere-src-5.11.0.tar.xz"; - sha256 = "1hsa8n4dlqpyz9xq2kq1hsxrxsjc7ywzzfhqijylgzzclvlqgb7y"; - name = "qtquickcontrols2-everywhere-src-5.11.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qtquickcontrols2-everywhere-src-5.11.1.tar.xz"; + sha256 = "0hn4kvrkz5ivwrp9p6yzwlw7cn4j72kcpm2nqyi3dbai1px6dc5x"; + name = "qtquickcontrols2-everywhere-src-5.11.1.tar.xz"; }; }; qtremoteobjects = { - version = "5.11.0"; + version = "5.11.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.0/submodules/qtremoteobjects-everywhere-src-5.11.0.tar.xz"; - sha256 = "1chn1xxhapfwvhrlv4chwfgf2dw8x8kn1lssdmpmg5s420z3pbq9"; - name = "qtremoteobjects-everywhere-src-5.11.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qtremoteobjects-everywhere-src-5.11.1.tar.xz"; + sha256 = "1yv9f2329nv4viiyqmq7ciz51574wd11grj8s88qm0ndcb36jbgb"; + name = "qtremoteobjects-everywhere-src-5.11.1.tar.xz"; }; }; qtscript = { - version = "5.11.0"; + version = "5.11.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.0/submodules/qtscript-everywhere-src-5.11.0.tar.xz"; - sha256 = "1ib8a5gsxarbm2j94j5d097ly3ap4snqkx2imz3sl6xk6gknm4i5"; - name = "qtscript-everywhere-src-5.11.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qtscript-everywhere-src-5.11.1.tar.xz"; + sha256 = "0z6sb4b9ds5lwkr0sxrnx6nim3aq2qx4a8illjy5vclfdv80yhqw"; + name = "qtscript-everywhere-src-5.11.1.tar.xz"; }; }; qtscxml = { - version = "5.11.0"; + version = "5.11.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.0/submodules/qtscxml-everywhere-src-5.11.0.tar.xz"; - sha256 = "00wb89ris8fyivhz9qpqn72mzpkh6mqdjss82j3q10g3c142072k"; - name = "qtscxml-everywhere-src-5.11.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qtscxml-everywhere-src-5.11.1.tar.xz"; + sha256 = "0f1k4fnk2aydagxqvkb636pcsi17sbq2zj2fn0ad50dvq013yiph"; + name = "qtscxml-everywhere-src-5.11.1.tar.xz"; }; }; qtsensors = { - version = "5.11.0"; + version = "5.11.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.0/submodules/qtsensors-everywhere-src-5.11.0.tar.xz"; - sha256 = "1az22rdkpc1m44qb3dyh7cpiprplkvynzjr629ai05i8ngbfdi0g"; - name = "qtsensors-everywhere-src-5.11.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qtsensors-everywhere-src-5.11.1.tar.xz"; + sha256 = "1yn065l6kzs3fn74950pkxxglqi55lzk7alf15klsd1wnxc0zsfb"; + name = "qtsensors-everywhere-src-5.11.1.tar.xz"; }; }; qtserialbus = { - version = "5.11.0"; + version = "5.11.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.0/submodules/qtserialbus-everywhere-src-5.11.0.tar.xz"; - sha256 = "0r3crk7gw0xs6wk1gvw2k8r9s9vam3sfwrji1njhswavii9fbp85"; - name = "qtserialbus-everywhere-src-5.11.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qtserialbus-everywhere-src-5.11.1.tar.xz"; + sha256 = "0jjmdd6vkvs5izqazp1rsrad0b1fzk6knrbdjl37lvcsawyfxfyk"; + name = "qtserialbus-everywhere-src-5.11.1.tar.xz"; }; }; qtserialport = { - version = "5.11.0"; + version = "5.11.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.0/submodules/qtserialport-everywhere-src-5.11.0.tar.xz"; - sha256 = "1cbf1jsginp5p3y17cyb6dfhsafxal0bn9pya6aybz0q799zgvl5"; - name = "qtserialport-everywhere-src-5.11.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qtserialport-everywhere-src-5.11.1.tar.xz"; + sha256 = "18v4pbq7bnmrl81m8s11ksbjlvzbb4kw5py6ji2dhmnm44w9k9sn"; + name = "qtserialport-everywhere-src-5.11.1.tar.xz"; }; }; qtspeech = { - version = "5.11.0"; + version = "5.11.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.0/submodules/qtspeech-everywhere-src-5.11.0.tar.xz"; - sha256 = "1bgfg0akqf1nfzm28n8dhvhj0p1niwxrfs763gj7m0g6vpwjbhd1"; - name = "qtspeech-everywhere-src-5.11.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qtspeech-everywhere-src-5.11.1.tar.xz"; + sha256 = "1nwvbaijg35i98yaiqgnyn5vv0cn4v3wrxhwi1s0hfv9sv3q5iyw"; + name = "qtspeech-everywhere-src-5.11.1.tar.xz"; }; }; qtsvg = { - version = "5.11.0"; + version = "5.11.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.0/submodules/qtsvg-everywhere-src-5.11.0.tar.xz"; - sha256 = "0m0zglp0m5gv75ivma6l3hm8brb0cf44dhbc6lqwfdwacxhgx3jb"; - name = "qtsvg-everywhere-src-5.11.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qtsvg-everywhere-src-5.11.1.tar.xz"; + sha256 = "0drhig0jcss3cf01aqfmafajf8gzf6bh468g1ikyrkh46czgyshx"; + name = "qtsvg-everywhere-src-5.11.1.tar.xz"; }; }; qttools = { - version = "5.11.0"; + version = "5.11.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.0/submodules/qttools-everywhere-src-5.11.0.tar.xz"; - sha256 = "1nb77bfs63nyy0wkhsci9qbqmahncy3sdcrwj4qr1prc4y2cm4wx"; - name = "qttools-everywhere-src-5.11.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qttools-everywhere-src-5.11.1.tar.xz"; + sha256 = "1zhl8p29mbabf07rhaks13qcm45zdckzymvz9qn95nxfj9piiyxp"; + name = "qttools-everywhere-src-5.11.1.tar.xz"; }; }; qttranslations = { - version = "5.11.0"; + version = "5.11.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.0/submodules/qttranslations-everywhere-src-5.11.0.tar.xz"; - sha256 = "0778y8vxa26wr4vgqi79si1dpflfyxdn926hpzjc1k1mx7y94gpi"; - name = "qttranslations-everywhere-src-5.11.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qttranslations-everywhere-src-5.11.1.tar.xz"; + sha256 = "01kid5dc20jnzjmd4ycjmacrsmrw4hsh2s4y5k9y9p34z8m9pn0j"; + name = "qttranslations-everywhere-src-5.11.1.tar.xz"; }; }; qtvirtualkeyboard = { - version = "5.11.0"; + version = "5.11.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.0/submodules/qtvirtualkeyboard-everywhere-src-5.11.0.tar.xz"; - sha256 = "1g9wj4j29lysqp6wxnck6s7h36qj87g3lbapvkfsqchvm00yckci"; - name = "qtvirtualkeyboard-everywhere-src-5.11.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qtvirtualkeyboard-everywhere-src-5.11.1.tar.xz"; + sha256 = "16xzpdqn07z8j6f8iywy3967djap5bbi2myqp37s4xh9fz60scsv"; + name = "qtvirtualkeyboard-everywhere-src-5.11.1.tar.xz"; }; }; qtwayland = { - version = "5.11.0"; + version = "5.11.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.0/submodules/qtwayland-everywhere-src-5.11.0.tar.xz"; - sha256 = "09s1ckqj0cgjmmi7jylsf039vgzlq7i9rr4swb590fkz427lx0b8"; - name = "qtwayland-everywhere-src-5.11.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qtwayland-everywhere-src-5.11.1.tar.xz"; + sha256 = "1sj4lsza48xji1qhmi1wqpx07jgm1mpa95gmd2w1kxw240hbr6p0"; + name = "qtwayland-everywhere-src-5.11.1.tar.xz"; }; }; qtwebchannel = { - version = "5.11.0"; + version = "5.11.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.0/submodules/qtwebchannel-everywhere-src-5.11.0.tar.xz"; - sha256 = "05fa5pwvk24cjp8m6pbw3ma95vnls762crpjdgvygfk0h8xilxmh"; - name = "qtwebchannel-everywhere-src-5.11.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qtwebchannel-everywhere-src-5.11.1.tar.xz"; + sha256 = "11rfjkb4h8dzxfmk889x7kkc73cbk26smc7h62lnh35f2nppd95r"; + name = "qtwebchannel-everywhere-src-5.11.1.tar.xz"; }; }; qtwebengine = { - version = "5.11.0"; + version = "5.11.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.0/submodules/qtwebengine-everywhere-src-5.11.0.tar.xz"; - sha256 = "0iabqkan99msp0jab0hndap6jqkf9b1ggd4n7glkcvf60gb59msx"; - name = "qtwebengine-everywhere-src-5.11.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qtwebengine-everywhere-src-5.11.1.tar.xz"; + sha256 = "136lc2kw4af4bilgn7vn9hdckpk62xvyjb4kr0gc2firr919z79q"; + name = "qtwebengine-everywhere-src-5.11.1.tar.xz"; }; }; qtwebglplugin = { - version = "5.11.0"; + version = "5.11.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.0/submodules/qtwebglplugin-everywhere-src-5.11.0.tar.xz"; - sha256 = "1al7dv7i9rg4z4p8vnipbjbbgc6113lbfjggxxap3sn6hqs986fm"; - name = "qtwebglplugin-everywhere-src-5.11.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qtwebglplugin-everywhere-src-5.11.1.tar.xz"; + sha256 = "108yhi3sj6d1ysmlpka69ivb20mx9h6jpra6yq099i3jw4gc753x"; + name = "qtwebglplugin-everywhere-src-5.11.1.tar.xz"; }; }; qtwebsockets = { - version = "5.11.0"; + version = "5.11.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.0/submodules/qtwebsockets-everywhere-src-5.11.0.tar.xz"; - sha256 = "1drr6nxxbkwpmz39bhyfmmsqjhy11bj3w1nc3q9dwhpcbf04an3x"; - name = "qtwebsockets-everywhere-src-5.11.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qtwebsockets-everywhere-src-5.11.1.tar.xz"; + sha256 = "1bj82y3f1nd2adnj3ljfr4vlx4bkgdlm3zvhlsas2lz837vi5aks"; + name = "qtwebsockets-everywhere-src-5.11.1.tar.xz"; }; }; qtwebview = { - version = "5.11.0"; + version = "5.11.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.0/submodules/qtwebview-everywhere-src-5.11.0.tar.xz"; - sha256 = "0a89v8mj5pb7a7whyhasf4ms0n34ghfmv2qp0pyxnq56f2bsjbl4"; - name = "qtwebview-everywhere-src-5.11.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qtwebview-everywhere-src-5.11.1.tar.xz"; + sha256 = "18da6a13wpb23vb6mbg9v75gphdf5mjmch7q3v1qjrv2sdwbpjbp"; + name = "qtwebview-everywhere-src-5.11.1.tar.xz"; }; }; qtwinextras = { - version = "5.11.0"; + version = "5.11.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.0/submodules/qtwinextras-everywhere-src-5.11.0.tar.xz"; - sha256 = "0qrf6vf9i1cvfcyg22d4f611bl3xi5qb3vcbb2idk24jg9q48cqw"; - name = "qtwinextras-everywhere-src-5.11.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qtwinextras-everywhere-src-5.11.1.tar.xz"; + sha256 = "0qxwfhg962a456lb9b6y7xhi6fvvvb42z0li6v7695vfbckifbzz"; + name = "qtwinextras-everywhere-src-5.11.1.tar.xz"; }; }; qtx11extras = { - version = "5.11.0"; + version = "5.11.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.0/submodules/qtx11extras-everywhere-src-5.11.0.tar.xz"; - sha256 = "13vbx61wcd8pnpgk3j5r665pm03s7jp2s98apvc6fhp1njlr0rhi"; - name = "qtx11extras-everywhere-src-5.11.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qtx11extras-everywhere-src-5.11.1.tar.xz"; + sha256 = "0rccpmhz48kq4xs441lj9mnwpbi6kxwl8y7dj7w7g5zvpv41kwmw"; + name = "qtx11extras-everywhere-src-5.11.1.tar.xz"; }; }; qtxmlpatterns = { - version = "5.11.0"; + version = "5.11.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.0/submodules/qtxmlpatterns-everywhere-src-5.11.0.tar.xz"; - sha256 = "13nj2pa706sy874bqbv7y94ypicr4k09x6n2jyxkw93flb5pi8qr"; - name = "qtxmlpatterns-everywhere-src-5.11.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qtxmlpatterns-everywhere-src-5.11.1.tar.xz"; + sha256 = "0n5gacpni019i2872m4b1p5qaqibhszsdl3xhw3xsckvr0hf25v1"; + name = "qtxmlpatterns-everywhere-src-5.11.1.tar.xz"; }; }; } diff --git a/pkgs/development/libraries/vapoursynth/default.nix b/pkgs/development/libraries/vapoursynth/default.nix index e45337c8cf5d..7344f3a7e2bb 100644 --- a/pkgs/development/libraries/vapoursynth/default.nix +++ b/pkgs/development/libraries/vapoursynth/default.nix @@ -35,6 +35,8 @@ stdenv.mkDerivation rec { (optionalString (!imwriSupport) "--disable-imwri") ]; + enableParallelBuilding = true; + meta = with stdenv.lib; { description = "A video processing framework with the future in mind"; homepage = http://www.vapoursynth.com/; diff --git a/pkgs/development/node-packages/default-v10.nix b/pkgs/development/node-packages/default-v10.nix index 9bdba59b5357..d7df19066bb3 100644 --- a/pkgs/development/node-packages/default-v10.nix +++ b/pkgs/development/node-packages/default-v10.nix @@ -5,4 +5,20 @@ let inherit pkgs system nodejs; }; in -nodePackages +nodePackages // { + + pnpm = nodePackages.pnpm.override { + nativeBuildInputs = [ pkgs.makeWrapper ]; + postInstall = let + pnpmLibPath = stdenv.lib.makeBinPath [ + nodejs.passthru.python + nodejs + ]; + in '' + for prog in $out/bin/*; do + wrapProgram "$prog" --prefix PATH : ${pnpmLibPath} + done + ''; + }; + +} diff --git a/pkgs/development/node-packages/node-packages-v10.json b/pkgs/development/node-packages/node-packages-v10.json index a298a6b95225..50cc105e7fff 100644 --- a/pkgs/development/node-packages/node-packages-v10.json +++ b/pkgs/development/node-packages/node-packages-v10.json @@ -2,4 +2,5 @@ "bower" , "coffee-script" , "grunt-cli" +, "pnpm" ] diff --git a/pkgs/development/node-packages/node-packages-v10.nix b/pkgs/development/node-packages/node-packages-v10.nix index 45b698320431..30b63e5ca4da 100644 --- a/pkgs/development/node-packages/node-packages-v10.nix +++ b/pkgs/development/node-packages/node-packages-v10.nix @@ -210,4 +210,21 @@ in production = true; bypassCache = true; }; + pnpm = nodeEnv.buildNodePackage { + name = "pnpm"; + packageName = "pnpm"; + version = "2.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pnpm/-/pnpm-2.9.0.tgz"; + sha1 = "1c2f5ade46b87cc3b1f3b7c66eeb7b0f4df4d968"; + }; + buildInputs = globalBuildInputs; + meta = { + description = "Fast, disk space efficient package manager"; + homepage = https://pnpm.js.org/; + license = "MIT"; + }; + production = true; + bypassCache = true; + }; } \ No newline at end of file diff --git a/pkgs/development/node-packages/node-packages-v6.nix b/pkgs/development/node-packages/node-packages-v6.nix index bcbeeca306af..e183feb99720 100644 --- a/pkgs/development/node-packages/node-packages-v6.nix +++ b/pkgs/development/node-packages/node-packages-v6.nix @@ -112,13 +112,13 @@ let sha512 = "lyJ8sW1PbY3uwuvpOBZ9zMYKshMnQpXmeDHh8dj9j2nJm/xrW0FgB5gLSYOArj5X0IfaXnmhFoJnhS4KbqIMug=="; }; }; - "@types/node-10.5.0" = { + "@types/node-10.5.1" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "10.5.0"; + version = "10.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-10.5.0.tgz"; - sha512 = "baXPuqA7EVcBUpA5so2K26DTzk7NCWBc9xrPMu9PbUMwgusJRm9zJBPhiDmJVEcnTQ3aOxUZeuFHpd9qMYDNRg=="; + url = "https://registry.npmjs.org/@types/node/-/node-10.5.1.tgz"; + sha512 = "AFLl1IALIuyt6oK4AYZsgWVJ/5rnyzQWud7IebaZWWV3YmgtPZkQmYio9R5Ze/2pdd7XfqF5bP+hWS11mAKoOQ=="; }; }; "@types/node-8.10.20" = { @@ -778,6 +778,15 @@ let sha512 = "pgZos1vgOHDiC7gKNbZW8eKvCnNXARv2oqrGQT7Hzbq5Azp7aZG6DJzADnkuSq7RH6qkXp4J/m68yPX/2uBHyQ=="; }; }; + "ajv-6.5.2" = { + name = "ajv"; + packageName = "ajv"; + version = "6.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/ajv/-/ajv-6.5.2.tgz"; + sha512 = "hOs7GfvI6tUI1LfZddH82ky6mOMyTuY0mk7kE2pWpmhhUSkumzaTO5vbVwij39MdwPQWCV4Zv57Eo06NtL/GVA=="; + }; + }; "ajv-keywords-1.5.1" = { name = "ajv-keywords"; packageName = "ajv-keywords"; @@ -1867,13 +1876,13 @@ let sha1 = "00f35b2d27ac91b1f0d3ef2084c98cf1d1f0adc3"; }; }; - "aws-sdk-2.265.1" = { + "aws-sdk-2.266.1" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.265.1"; + version = "2.266.1"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.265.1.tgz"; - sha512 = "0xL9Lontx71wxwa+adZQGAWGmsXyrJbJmBzcCd6w+/zRAkd/mGX7T0V4mivPZK3QIiaKR8U/TZDmxAwnOryX3Q=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.266.1.tgz"; + sha512 = "b8lisloCETh0Fx0il540i+Hbgf3hyegQ6ezoJFggfc1HIbqzvIjVJYJhOsYl1fL1o+iMUaVU4ZH8cSyoMFR2Tw=="; }; }; "aws-sign-0.2.0" = { @@ -2686,13 +2695,13 @@ let sha1 = "c60917f26dc235661566c681061c303c2b28842b"; }; }; - "bcrypt-pbkdf-1.0.1" = { + "bcrypt-pbkdf-1.0.2" = { name = "bcrypt-pbkdf"; packageName = "bcrypt-pbkdf"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz"; - sha1 = "63bc5dcb61331b92bc05fd528953c33462a06f8d"; + url = "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz"; + sha1 = "a4301d389b6a43f9b67ff3ca11a3f6637e360e9e"; }; }; "bcryptjs-2.4.3" = { @@ -4396,15 +4405,6 @@ let sha512 = "9ZTaoBaePSCFvNlNGrsyI8ZVACP2svUtq0DkM7t4K2ClAa96sqOIRjAzDTc8zXzFt1cZR46rRzLTiHFSJ+Qw0g=="; }; }; - "charenc-0.0.2" = { - name = "charenc"; - packageName = "charenc"; - version = "0.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/charenc/-/charenc-0.0.2.tgz"; - sha1 = "c0a1d2f3a7092e03774bfa83f14c0fc5790a8667"; - }; - }; "check-error-1.0.2" = { name = "check-error"; packageName = "check-error"; @@ -5368,6 +5368,15 @@ let sha512 = "VlfT9F3V0v+jr4yxPc5gg9s62/fIVWsd2Bk2iD435um1NlGMYdVCq+MjcXnhYq2icNOizHr1kK+5TI6H0Hy0ag=="; }; }; + "commander-2.16.0" = { + name = "commander"; + packageName = "commander"; + version = "2.16.0"; + src = fetchurl { + url = "https://registry.npmjs.org/commander/-/commander-2.16.0.tgz"; + sha512 = "sVXqklSaotK9at437sFlFpyOcJonxe0yST/AG9DkQKUdIE6IqGIMv4SfAQSKaJbSdVEJYItASCrBiVQHq1HQew=="; + }; + }; "commander-2.6.0" = { name = "commander"; packageName = "commander"; @@ -6494,15 +6503,6 @@ let sha1 = "7eeeed9eddc95e22c189382e34624044a89a5a6d"; }; }; - "crypt-0.0.2" = { - name = "crypt"; - packageName = "crypt"; - version = "0.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/crypt/-/crypt-0.0.2.tgz"; - sha1 = "88d7ff7ec0dfb86f713dc87bbb42d044d3e6c41b"; - }; - }; "crypt3-0.2.0" = { name = "crypt3"; packageName = "crypt3"; @@ -8997,6 +8997,15 @@ let sha512 = "bT3/1x1EbZB7phzYu7vCr1v3ONuzDtX8WjuM9c0iYxe+cq+pwcKEoQjl7zd3RpC6YOLgnSy3cTN58M2jcoPDIQ=="; }; }; + "eslint-5.0.1" = { + name = "eslint"; + packageName = "eslint"; + version = "5.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/eslint/-/eslint-5.0.1.tgz"; + sha512 = "D5nG2rErquLUstgUaxJlWB5+gu+U/3VDY0fk/Iuq8y9CUFy/7Y6oF4N2cR1tV8knzQvciIbfqfohd359xTLIKQ=="; + }; + }; "eslint-plugin-no-unsafe-innerhtml-1.0.16" = { name = "eslint-plugin-no-unsafe-innerhtml"; packageName = "eslint-plugin-no-unsafe-innerhtml"; @@ -16811,15 +16820,6 @@ let sha1 = "8b3aac588b8a66e4975e3cdea67f7bb329601fac"; }; }; - "md5-2.2.1" = { - name = "md5"; - packageName = "md5"; - version = "2.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/md5/-/md5-2.2.1.tgz"; - sha1 = "53ab38d5fe3c8891ba465329ea23fac0540126f9"; - }; - }; "md5.js-1.3.4" = { name = "md5.js"; packageName = "md5.js"; @@ -22191,13 +22191,13 @@ let sha1 = "01ba954276052b783900e63d6118d8fcf3875d7f"; }; }; - "raven-2.6.3" = { - name = "raven"; - packageName = "raven"; - version = "2.6.3"; + "raven-js-3.26.3" = { + name = "raven-js"; + packageName = "raven-js"; + version = "3.26.3"; src = fetchurl { - url = "https://registry.npmjs.org/raven/-/raven-2.6.3.tgz"; - sha512 = "bKre7qlDW+y1+G2bUtCuntdDYc8o5v1T233t0vmJfbj8ttGOgLrGRlYB8saelVMW9KUAJNLrhFkAKOwFWFJonw=="; + url = "https://registry.npmjs.org/raven-js/-/raven-js-3.26.3.tgz"; + sha512 = "VPAsPfK73A9VPcJx5X/kt0GxOqUGpGDM8vdzsYNQXMhYemyZGiW1JX1AI+f4jxm37Apijj6VVtCyJcYFz3ocSQ=="; }; }; "raw-body-0.0.3" = { @@ -24558,13 +24558,13 @@ let sha512 = "FL1b58BDrqS3A11lJ0zEdnJ3UOKqVxawAkF3k7F0CVN7VQ34aZrV+G8BZ1WC9ZL7NyrwsW0oviwsWDgRuVYtJg=="; }; }; - "snyk-1.87.0" = { + "snyk-1.88.0" = { name = "snyk"; packageName = "snyk"; - version = "1.87.0"; + version = "1.88.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.87.0.tgz"; - sha1 = "8d35801eddaca1ffc3ecc2da1c7ae2dab9bf97d3"; + url = "https://registry.npmjs.org/snyk/-/snyk-1.88.0.tgz"; + sha1 = "10d171427de94f6474d64fdc524d6f87c0ab069e"; }; }; "snyk-config-2.1.0" = { @@ -24576,13 +24576,13 @@ let sha512 = "D1Xz1pZa9lwA9AHogmAigyJGo/iuEGH+rcPB77mFsneVfnuiK9c6IjnsHbEBUf1cePtZvWdGBjs6e75Cvc2AMg=="; }; }; - "snyk-docker-plugin-1.10.2" = { + "snyk-docker-plugin-1.10.3" = { name = "snyk-docker-plugin"; packageName = "snyk-docker-plugin"; - version = "1.10.2"; + version = "1.10.3"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-docker-plugin/-/snyk-docker-plugin-1.10.2.tgz"; - sha512 = "/pHIhyYhEOUYogn8aXPSt/VMHIxobmNcuU04Jze+NWW/B93emc7i8zxvTgjl4JIsx22sVfnLBSbjDMntk4+X4A=="; + url = "https://registry.npmjs.org/snyk-docker-plugin/-/snyk-docker-plugin-1.10.3.tgz"; + sha512 = "nIw6zS705SiQLEhBwoO2qsJ3lVN1DZ48tyMgqhlr5f5GuOrwUJ0ivUK5HQUI79xA6pF7tU18495OlbsKuEHUOw=="; }; }; "snyk-go-plugin-1.5.1" = { @@ -28393,15 +28393,6 @@ let sha1 = "67e2e863797215530dff318e5bf9dcebfd47b21a"; }; }; - "uuid-3.0.0" = { - name = "uuid"; - packageName = "uuid"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/uuid/-/uuid-3.0.0.tgz"; - sha1 = "6728fc0459c450d796a99c31837569bdf672d728"; - }; - }; "uuid-3.0.1" = { name = "uuid"; packageName = "uuid"; @@ -28420,13 +28411,13 @@ let sha512 = "DIWtzUkw04M4k3bf1IcpS2tngXEL26YUD2M0tMDUpnUrz2hgzUBlD55a4FjdLGPvfHxS6uluGWvaVEqgBcVa+g=="; }; }; - "uuid-3.3.0" = { + "uuid-3.3.2" = { name = "uuid"; packageName = "uuid"; - version = "3.3.0"; + version = "3.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/uuid/-/uuid-3.3.0.tgz"; - sha512 = "ijO9N2xY/YaOqQ5yz5c4sy2ZjWmA6AR6zASb/gdpeKZ8+948CxwfMW9RrKVk5may6ev8c0/Xguu32e2Llelpqw=="; + url = "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz"; + sha512 = "yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA=="; }; }; "uws-9.14.0" = { @@ -28654,13 +28645,13 @@ let sha1 = "2fb1decd4c466aa88b0f9341af33dc1aff2478d5"; }; }; - "videostream-2.4.2" = { + "videostream-2.4.3" = { name = "videostream"; packageName = "videostream"; - version = "2.4.2"; + version = "2.4.3"; src = fetchurl { - url = "https://registry.npmjs.org/videostream/-/videostream-2.4.2.tgz"; - sha1 = "9560254d00fabdc40955c1a3c282057d8db1d115"; + url = "https://registry.npmjs.org/videostream/-/videostream-2.4.3.tgz"; + sha512 = "8AkDc1SBg3kw8+hHImYKtSamjKfJxMHuCXIcXvCFOAWGU7IcW41hxx7K7bU/tC6zWEck/tgB1rXLxf6o5Pn79Q=="; }; }; "vinyl-0.4.6" = { @@ -29915,13 +29906,13 @@ let sha512 = "Rjp+lMYQOWtgqojx1dEWorjCofi1YN7AoFvYV7b1gx/7dAAeuI4kN5SZiEvr0ZmsZTOpDRcCqrpI10L31tFkBw=="; }; }; - "yargs-12.0.0" = { + "yargs-12.0.1" = { name = "yargs"; packageName = "yargs"; - version = "12.0.0"; + version = "12.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/yargs/-/yargs-12.0.0.tgz"; - sha512 = "wxkoyGB8193wsR6UhjzVQ76VgXx5wLJvGsBd70tuLabLFIDx/Pq9+GFGY3aoWZ8zDMK6KrmdjlUf/h/SMv+eOA=="; + url = "https://registry.npmjs.org/yargs/-/yargs-12.0.1.tgz"; + sha512 = "B0vRAp1hRX4jgIOWFtjfNjd9OA9RWYZ6tqGA9/I/IrTMsxmKvtWy+ersM+jzpQqbC3YfLzeABPdeTgcJ9eu1qQ=="; }; }; "yargs-3.10.0" = { @@ -29978,13 +29969,13 @@ let sha1 = "52acc23feecac34042078ee78c0c007f5085db4c"; }; }; - "yargs-parser-10.0.0" = { + "yargs-parser-10.1.0" = { name = "yargs-parser"; packageName = "yargs-parser"; - version = "10.0.0"; + version = "10.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-10.0.0.tgz"; - sha512 = "+DHejWujTVYeMHLff8U96rLc4uE4Emncoftvn5AjhB1Jw1pWxLzgBUT/WYbPrHmy6YPEBTZQx5myHhVcuuu64g=="; + url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-10.1.0.tgz"; + sha512 = "VCIyR1wJoEBZUqk5PA+oOBF6ypbwh5aNB3I50guxAL/quggdfs4TtNHQrSazFA3fYZ+tEqfs0zIGlv0c/rgjbQ=="; }; }; "yargs-parser-4.2.1" = { @@ -30208,7 +30199,7 @@ in sources."chalk-1.1.3" sources."chmodr-1.0.2" sources."colors-1.3.0" - sources."commander-2.15.1" + sources."commander-2.16.0" sources."concat-map-0.0.1" sources."convert-source-map-1.5.1" sources."core-js-2.5.7" @@ -30320,7 +30311,7 @@ in sources."aws-sign2-0.7.0" sources."aws4-1.7.0" sources."balanced-match-1.0.0" - sources."bcrypt-pbkdf-1.0.1" + sources."bcrypt-pbkdf-1.0.2" sources."binary-0.3.0" sources."brace-expansion-1.1.11" sources."buffers-0.1.1" @@ -30329,7 +30320,7 @@ in sources."chromium-pickle-js-0.2.0" sources."co-4.6.0" sources."combined-stream-1.0.6" - sources."commander-2.15.1" + sources."commander-2.16.0" sources."concat-map-0.0.1" sources."core-util-is-1.0.2" sources."cuint-0.2.2" @@ -30400,7 +30391,7 @@ in sources."traverse-0.3.9" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" - sources."uuid-3.3.0" + sources."uuid-3.3.2" sources."verror-1.10.0" sources."wrappy-1.0.2" ]; @@ -30558,7 +30549,7 @@ in ]; }) sources."balanced-match-1.0.0" - sources."bcrypt-pbkdf-1.0.1" + sources."bcrypt-pbkdf-1.0.2" (sources."bl-1.1.2" // { dependencies = [ sources."readable-stream-2.0.6" @@ -30634,7 +30625,7 @@ in sources."har-schema-2.0.0" (sources."har-validator-2.0.6" // { dependencies = [ - sources."commander-2.15.1" + sources."commander-2.16.0" ]; }) sources."has-ansi-2.0.0" @@ -30801,7 +30792,7 @@ in sources."async-0.2.10" ]; }) - sources."uuid-3.3.0" + sources."uuid-3.3.2" sources."validator-5.2.0" (sources."verror-1.10.0" // { dependencies = [ @@ -31219,7 +31210,7 @@ in sources."codepage-1.4.0" sources."colour-0.7.1" sources."combined-stream-0.0.7" - sources."commander-2.15.1" + sources."commander-2.16.0" sources."compact2string-1.4.0" sources."concat-map-0.0.1" (sources."concat-stream-1.6.2" // { @@ -31586,7 +31577,7 @@ in sources."color-convert-1.9.2" sources."color-name-1.1.1" sources."colors-1.3.0" - sources."commander-2.15.1" + sources."commander-2.16.0" sources."debug-3.1.0" sources."escape-string-regexp-1.0.5" sources."follow-redirects-1.5.0" @@ -31689,7 +31680,7 @@ in sources."aws4-1.7.0" sources."balanced-match-1.0.0" sources."base64-js-1.3.0" - sources."bcrypt-pbkdf-1.0.1" + sources."bcrypt-pbkdf-1.0.2" sources."big-integer-1.6.32" sources."block-stream-0.0.9" sources."bn.js-4.11.8" @@ -31733,7 +31724,7 @@ in sources."code-point-at-1.1.0" sources."combine-source-map-0.8.0" sources."combined-stream-1.0.6" - sources."commander-2.15.1" + sources."commander-2.16.0" (sources."compressible-2.0.14" // { dependencies = [ sources."mime-db-1.34.0" @@ -31912,7 +31903,7 @@ in sources."uuid-2.0.3" ]; }) - sources."uuid-3.3.0" + sources."uuid-3.3.2" ]; }) sources."interpret-1.1.0" @@ -32066,7 +32057,7 @@ in (sources."request-2.79.0" // { dependencies = [ sources."qs-6.3.2" - sources."uuid-3.3.0" + sources."uuid-3.3.2" ]; }) sources."resolve-1.8.1" @@ -32212,7 +32203,7 @@ in sources."buffer-from-0.1.2" sources."builtins-1.0.3" sources."chalk-1.1.3" - sources."commander-2.15.1" + sources."commander-2.16.0" sources."concat-map-0.0.1" sources."core-util-is-1.0.2" sources."cross-spawn-4.0.2" @@ -32394,7 +32385,7 @@ in sources."aws-sign2-0.7.0" sources."aws4-1.7.0" sources."balanced-match-1.0.0" - sources."bcrypt-pbkdf-1.0.1" + sources."bcrypt-pbkdf-1.0.2" sources."bencode-1.0.0" (sources."bitfield-rle-2.1.0" // { dependencies = [ @@ -32745,7 +32736,7 @@ in sources."util-deprecate-1.0.2" sources."utile-0.3.0" sources."utp-native-1.7.1" - sources."uuid-3.3.0" + sources."uuid-3.3.2" sources."varint-3.0.1" sources."verror-1.10.0" (sources."winston-2.1.1" // { @@ -33114,11 +33105,11 @@ in sources."assert-plus-1.0.0" sources."async-2.6.1" sources."asynckit-0.4.0" - sources."aws-sdk-2.265.1" + sources."aws-sdk-2.266.1" sources."aws-sign2-0.7.0" sources."aws4-1.7.0" sources."base64-js-1.3.0" - sources."bcrypt-pbkdf-1.0.1" + sources."bcrypt-pbkdf-1.0.2" sources."buffer-4.9.1" sources."caseless-0.12.0" sources."co-4.6.0" @@ -33230,7 +33221,7 @@ in sources."aws-sign2-0.6.0" sources."aws4-1.7.0" sources."balanced-match-1.0.0" - sources."bcrypt-pbkdf-1.0.1" + sources."bcrypt-pbkdf-1.0.2" sources."binary-extensions-1.11.0" sources."binstall-1.2.0" sources."block-stream-0.0.9" @@ -33247,7 +33238,7 @@ in sources."color-convert-1.9.2" sources."color-name-1.1.1" sources."combined-stream-1.0.6" - sources."commander-2.15.1" + sources."commander-2.16.0" sources."concat-map-0.0.1" sources."core-util-is-1.0.2" sources."cross-spawn-4.0.0" @@ -33410,7 +33401,7 @@ in sources."tunnel-agent-0.4.3" sources."tweetnacl-0.14.5" sources."util-deprecate-1.0.2" - sources."uuid-3.3.0" + sources."uuid-3.3.2" (sources."verror-1.10.0" // { dependencies = [ sources."assert-plus-1.0.0" @@ -33678,7 +33669,7 @@ in dependencies = [ sources."acorn-5.7.1" sources."acorn-jsx-4.1.1" - sources."ajv-6.5.1" + sources."ajv-6.5.2" sources."ajv-keywords-3.2.0" sources."ansi-escapes-3.1.0" sources."ansi-regex-2.1.1" @@ -33841,20 +33832,16 @@ in eslint_d = nodeEnv.buildNodePackage { name = "eslint_d"; packageName = "eslint_d"; - version = "5.3.1"; + version = "6.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint_d/-/eslint_d-5.3.1.tgz"; - sha512 = "nD7fk0BxVUHDP+15SuRwDE9JtAJ3BGfqCtiCvCRsZtNRLJ8W+HaOaot06Zk9N4lgUoZTTDFDwlloy4iQt2fMOg=="; + url = "https://registry.npmjs.org/eslint_d/-/eslint_d-6.0.0.tgz"; + sha512 = "NRn6C7G0HzA2hEFlLzD+M/m1eIeTtmxxO45n7Pp+Nk/gBp8mfIXlE8wSLdePt/g0Sl7BhuU/hY/E+kD/8P5LeQ=="; }; dependencies = [ sources."acorn-5.7.1" - (sources."acorn-jsx-3.0.1" // { - dependencies = [ - sources."acorn-3.3.0" - ]; - }) - sources."ajv-5.5.2" - sources."ajv-keywords-2.1.1" + sources."acorn-jsx-4.1.1" + sources."ajv-6.5.2" + sources."ajv-keywords-3.2.0" sources."ansi-escapes-3.1.0" sources."ansi-regex-2.1.1" sources."ansi-styles-2.2.1" @@ -33865,7 +33852,6 @@ in sources."babel-code-frame-6.26.0" sources."balanced-match-1.0.0" sources."brace-expansion-1.1.11" - sources."buffer-from-1.1.0" sources."caller-path-0.1.0" sources."callsites-0.2.0" (sources."chalk-1.1.3" // { @@ -33877,19 +33863,19 @@ in sources."circular-json-0.3.3" sources."cli-cursor-2.1.0" sources."cli-width-2.2.0" - sources."co-4.6.0" sources."color-convert-1.9.2" sources."color-name-1.1.1" sources."concat-map-0.0.1" - sources."concat-stream-1.6.2" - sources."core-util-is-1.0.2" - sources."cross-spawn-5.1.0" + sources."cross-spawn-6.0.5" sources."debug-3.1.0" sources."deep-is-0.1.3" + sources."define-properties-1.1.2" sources."del-2.2.2" sources."doctrine-2.1.0" + sources."es-abstract-1.12.0" + sources."es-to-primitive-1.1.1" sources."escape-string-regexp-1.0.5" - (sources."eslint-4.19.1" // { + (sources."eslint-5.0.1" // { dependencies = [ sources."ansi-regex-3.0.0" sources."ansi-styles-3.2.1" @@ -33898,35 +33884,39 @@ in sources."supports-color-5.4.0" ]; }) - sources."eslint-scope-3.7.1" + sources."eslint-scope-4.0.0" sources."eslint-visitor-keys-1.0.0" - sources."espree-3.5.4" + sources."espree-4.0.0" sources."esprima-4.0.0" sources."esquery-1.0.1" sources."esrecurse-4.2.1" sources."estraverse-4.2.0" sources."esutils-2.0.2" sources."external-editor-2.2.0" - sources."fast-deep-equal-1.1.0" + sources."fast-deep-equal-2.0.1" sources."fast-json-stable-stringify-2.0.0" sources."fast-levenshtein-2.0.6" sources."figures-2.0.0" sources."file-entry-cache-2.0.0" sources."flat-cache-1.3.0" + sources."foreach-2.0.5" sources."fs.realpath-1.0.0" + sources."function-bind-1.1.1" sources."functional-red-black-tree-1.0.1" sources."glob-7.1.2" sources."globals-11.7.0" sources."globby-5.0.0" sources."graceful-fs-4.1.11" + sources."has-1.0.3" sources."has-ansi-2.0.0" sources."has-flag-3.0.0" + sources."has-symbols-1.0.0" sources."iconv-lite-0.4.23" sources."ignore-3.3.10" sources."imurmurhash-0.1.4" sources."inflight-1.0.6" sources."inherits-2.0.3" - (sources."inquirer-3.3.0" // { + (sources."inquirer-5.2.0" // { dependencies = [ sources."ansi-regex-3.0.0" sources."ansi-styles-3.2.1" @@ -33935,21 +33925,23 @@ in sources."supports-color-5.4.0" ]; }) + sources."is-callable-1.1.3" + sources."is-date-object-1.0.1" sources."is-fullwidth-code-point-2.0.0" sources."is-path-cwd-1.0.0" sources."is-path-in-cwd-1.0.1" sources."is-path-inside-1.0.1" sources."is-promise-2.1.0" + sources."is-regex-1.0.4" sources."is-resolvable-1.1.0" - sources."isarray-1.0.0" + sources."is-symbol-1.0.1" sources."isexe-2.0.0" sources."js-tokens-3.0.2" sources."js-yaml-3.12.0" - sources."json-schema-traverse-0.3.1" + sources."json-schema-traverse-0.4.1" sources."json-stable-stringify-without-jsonify-1.0.1" sources."levn-0.3.0" sources."lodash-4.17.10" - sources."lru-cache-4.1.3" sources."mimic-fn-1.2.0" sources."minimatch-3.0.4" sources."minimist-0.0.8" @@ -33958,23 +33950,25 @@ in sources."mute-stream-0.0.7" sources."nanolru-1.0.0" sources."natural-compare-1.4.0" + sources."nice-try-1.0.4" sources."object-assign-4.1.1" + sources."object-keys-1.0.12" sources."once-1.4.0" sources."onetime-2.0.1" sources."optionator-0.8.2" sources."os-tmpdir-1.0.2" sources."path-is-absolute-1.0.1" sources."path-is-inside-1.0.2" + sources."path-key-2.0.1" sources."path-parse-1.0.5" sources."pify-2.3.0" sources."pinkie-2.0.4" sources."pinkie-promise-2.0.1" sources."pluralize-7.0.0" sources."prelude-ls-1.1.2" - sources."process-nextick-args-2.0.0" sources."progress-2.0.0" - sources."pseudomap-1.0.2" - sources."readable-stream-2.3.6" + sources."punycode-2.1.1" + sources."regexp.prototype.flags-1.2.0" sources."regexpp-1.1.0" sources."require-uncached-1.0.3" sources."resolve-1.8.1" @@ -33982,9 +33976,7 @@ in sources."restore-cursor-2.0.0" sources."rimraf-2.6.2" sources."run-async-2.3.0" - sources."rx-lite-4.0.8" - sources."rx-lite-aggregates-4.0.8" - sources."safe-buffer-5.1.2" + sources."rxjs-5.5.11" sources."safer-buffer-2.1.2" sources."semver-5.5.0" sources."shebang-command-1.2.0" @@ -33998,7 +33990,7 @@ in sources."strip-ansi-4.0.0" ]; }) - sources."string_decoder-1.1.1" + sources."string.prototype.matchall-2.0.0" sources."strip-ansi-3.0.1" sources."strip-json-comments-2.0.1" (sources."supports-color-3.2.3" // { @@ -34006,7 +33998,8 @@ in sources."has-flag-1.0.0" ]; }) - (sources."table-4.0.2" // { + sources."symbol-observable-1.0.1" + (sources."table-4.0.3" // { dependencies = [ sources."ansi-styles-3.2.1" sources."chalk-2.4.1" @@ -34017,13 +34010,11 @@ in sources."through-2.3.8" sources."tmp-0.0.33" sources."type-check-0.3.2" - sources."typedarray-0.0.6" - sources."util-deprecate-1.0.2" + sources."uri-js-4.2.2" sources."which-1.3.1" sources."wordwrap-1.0.0" sources."wrappy-1.0.2" sources."write-0.2.1" - sources."yallist-2.1.2" ]; buildInputs = globalBuildInputs; meta = { @@ -34069,7 +34060,7 @@ in sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" sources."aws4-1.7.0" - sources."bcrypt-pbkdf-1.0.1" + sources."bcrypt-pbkdf-1.0.2" sources."buffer-from-1.1.0" sources."builtin-modules-1.1.1" sources."camelcase-2.1.1" @@ -34217,7 +34208,7 @@ in sources."tweetnacl-0.14.5" sources."typedarray-0.0.6" sources."util-deprecate-1.0.2" - sources."uuid-3.3.0" + sources."uuid-3.3.2" sources."validate-npm-package-license-3.0.3" sources."verror-1.10.0" sources."which-1.3.1" @@ -35413,7 +35404,7 @@ in sources."untildify-3.0.3" sources."util-deprecate-1.0.2" sources."utils-merge-1.0.1" - sources."uuid-3.3.0" + sources."uuid-3.3.2" sources."vary-1.1.2" sources."websocket-driver-0.7.0" sources."websocket-extensions-0.1.3" @@ -35632,7 +35623,7 @@ in sources."check-error-1.0.2" sources."color-convert-1.9.2" sources."color-name-1.1.1" - sources."commander-2.15.1" + sources."commander-2.16.0" sources."concat-map-0.0.1" sources."deep-eql-3.0.1" sources."deep-equal-1.0.1" @@ -35833,7 +35824,7 @@ in dependencies = [ sources."abbrev-1.1.1" sources."bluebird-3.5.1" - sources."commander-2.15.1" + sources."commander-2.16.0" sources."config-chain-1.1.11" sources."editorconfig-0.13.3" sources."ini-1.3.5" @@ -35996,7 +35987,7 @@ in sources."aws-sign2-0.7.0" sources."aws4-1.7.0" sources."basic-auth-2.0.0" - sources."bcrypt-pbkdf-1.0.1" + sources."bcrypt-pbkdf-1.0.2" sources."body-parser-1.18.3" sources."boxen-1.3.0" sources."bytes-3.0.0" @@ -36213,7 +36204,7 @@ in sources."update-notifier-2.5.0" sources."url-parse-lax-1.0.0" sources."utils-merge-1.0.1" - sources."uuid-3.3.0" + sources."uuid-3.3.2" sources."vary-1.1.2" sources."verror-1.10.0" sources."which-1.3.1" @@ -36320,7 +36311,7 @@ in }) sources."base64-arraybuffer-0.1.5" sources."base64id-1.0.0" - sources."bcrypt-pbkdf-1.0.1" + sources."bcrypt-pbkdf-1.0.2" sources."better-assert-1.0.2" sources."binary-extensions-1.11.0" sources."bitsyntax-0.0.4" @@ -36373,7 +36364,7 @@ in sources."colors-1.3.0" sources."combine-lists-1.0.1" sources."combined-stream-1.0.6" - sources."commander-2.15.1" + sources."commander-2.16.0" sources."component-bind-1.0.0" sources."component-emitter-1.2.1" sources."component-inherit-0.0.3" @@ -36856,7 +36847,7 @@ in }) sources."util-deprecate-1.0.2" sources."utils-merge-1.0.1" - sources."uuid-3.3.0" + sources."uuid-3.3.2" sources."uws-9.14.0" sources."verror-1.10.0" sources."void-elements-2.0.1" @@ -37159,7 +37150,7 @@ in sources."aws-sign2-0.7.0" sources."aws4-1.7.0" sources."balanced-match-1.0.0" - sources."bcrypt-pbkdf-1.0.1" + sources."bcrypt-pbkdf-1.0.2" sources."boolbase-1.0.0" sources."boom-4.3.1" sources."brace-expansion-1.1.11" @@ -37352,7 +37343,7 @@ in sources."async-0.9.2" ]; }) - sources."uuid-3.3.0" + sources."uuid-3.3.2" sources."verror-1.10.0" sources."webidl-conversions-2.0.1" sources."whatwg-url-compat-0.6.5" @@ -37723,7 +37714,7 @@ in (sources."temp-write-3.4.0" // { dependencies = [ sources."pify-3.0.0" - sources."uuid-3.3.0" + sources."uuid-3.3.2" ]; }) sources."tempfile-1.1.1" @@ -37818,7 +37809,7 @@ in sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" sources."aws4-1.7.0" - sources."bcrypt-pbkdf-1.0.1" + sources."bcrypt-pbkdf-1.0.2" sources."caseless-0.12.0" sources."co-4.6.0" sources."combined-stream-1.0.6" @@ -37865,7 +37856,7 @@ in sources."tough-cookie-2.3.4" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" - sources."uuid-3.3.0" + sources."uuid-3.3.2" sources."verror-1.10.0" ]; buildInputs = globalBuildInputs; @@ -38047,7 +38038,7 @@ in sources."unpipe-1.0.0" sources."util-deprecate-1.0.2" sources."utils-merge-1.0.0" - sources."uuid-3.3.0" + sources."uuid-3.3.2" sources."vary-1.1.2" sources."websocket-driver-0.7.0" sources."websocket-extensions-0.1.3" @@ -38091,7 +38082,7 @@ in sources."balanced-match-1.0.0" sources."base64-arraybuffer-0.1.5" sources."base64id-1.0.0" - sources."bcrypt-pbkdf-1.0.1" + sources."bcrypt-pbkdf-1.0.2" sources."better-assert-1.0.2" sources."binary-extensions-1.11.0" sources."blob-0.0.4" @@ -38308,7 +38299,7 @@ in sources."unpipe-1.0.0" sources."util-deprecate-1.0.2" sources."utils-merge-1.0.1" - sources."uuid-3.3.0" + sources."uuid-3.3.2" sources."vary-1.1.2" sources."verror-1.10.0" sources."ws-3.3.3" @@ -38432,7 +38423,7 @@ in sources."define-property-1.0.0" ]; }) - sources."bcrypt-pbkdf-1.0.1" + sources."bcrypt-pbkdf-1.0.2" sources."beeper-1.1.1" sources."boom-2.10.1" sources."brace-expansion-1.1.11" @@ -39050,7 +39041,7 @@ in sources."use-3.1.0" sources."user-home-1.1.1" sources."util-deprecate-1.0.2" - sources."uuid-3.3.0" + sources."uuid-3.3.2" sources."v8flags-2.1.1" sources."value-or-function-3.0.0" (sources."verror-1.10.0" // { @@ -39145,7 +39136,7 @@ in sources."argparse-1.0.10" sources."asynckit-0.4.0" sources."combined-stream-1.0.6" - sources."commander-2.15.1" + sources."commander-2.16.0" sources."component-emitter-1.2.1" sources."cookiejar-2.1.2" sources."core-util-is-1.0.2" @@ -39229,7 +39220,7 @@ in sources."aws-sign2-0.7.0" sources."aws4-1.7.0" sources."base64-js-1.2.3" - sources."bcrypt-pbkdf-1.0.1" + sources."bcrypt-pbkdf-1.0.2" sources."buffer-from-1.1.0" sources."builtin-modules-1.1.1" sources."builtins-1.0.3" @@ -39344,7 +39335,7 @@ in sources."typedarray-0.0.6" sources."uid-number-0.0.5" sources."util-deprecate-1.0.2" - sources."uuid-3.3.0" + sources."uuid-3.3.2" sources."validate-npm-package-license-3.0.3" sources."validate-npm-package-name-3.0.0" sources."verror-1.10.0" @@ -39382,7 +39373,7 @@ in sources."aws-sign2-0.6.0" sources."aws4-1.7.0" sources."balanced-match-1.0.0" - sources."bcrypt-pbkdf-1.0.1" + sources."bcrypt-pbkdf-1.0.2" sources."block-stream-0.0.9" sources."boom-2.10.1" sources."brace-expansion-1.1.11" @@ -39481,7 +39472,7 @@ in sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."util-deprecate-1.0.2" - sources."uuid-3.3.0" + sources."uuid-3.3.2" (sources."verror-1.10.0" // { dependencies = [ sources."assert-plus-1.0.0" @@ -39543,7 +39534,7 @@ in sources."aws4-1.7.0" sources."balanced-match-1.0.0" sources."base64-js-0.0.8" - sources."bcrypt-pbkdf-1.0.1" + sources."bcrypt-pbkdf-1.0.2" sources."biased-opener-0.2.8" sources."big-integer-1.6.32" sources."block-stream-0.0.9" @@ -39775,7 +39766,7 @@ in sources."untildify-2.1.0" sources."util-deprecate-1.0.2" sources."utils-merge-1.0.1" - sources."uuid-3.3.0" + sources."uuid-3.3.2" sources."v8-debug-1.0.1" sources."v8-profiler-5.7.0" sources."validate-npm-package-license-3.0.3" @@ -40289,7 +40280,7 @@ in sources."balanced-match-1.0.0" sources."basic-auth-2.0.0" sources."bcrypt-1.0.3" - sources."bcrypt-pbkdf-1.0.1" + sources."bcrypt-pbkdf-1.0.2" sources."bcryptjs-2.4.3" sources."bl-1.2.2" sources."block-stream-0.0.9" @@ -40644,7 +40635,7 @@ in sources."util-deprecate-1.0.2" sources."utils-merge-1.0.1" sources."uue-3.1.2" - sources."uuid-3.3.0" + sources."uuid-3.3.2" sources."vary-1.1.2" sources."verror-1.10.0" (sources."websocket-stream-5.1.2" // { @@ -40843,7 +40834,7 @@ in sources."aws-sign2-0.7.0" sources."aws4-1.7.0" sources."balanced-match-1.0.0" - sources."bcrypt-pbkdf-1.0.1" + sources."bcrypt-pbkdf-1.0.2" sources."block-stream-0.0.9" sources."brace-expansion-1.1.11" sources."caseless-0.12.0" @@ -40970,7 +40961,7 @@ in sources."underscore-1.4.4" sources."underscore.string-2.3.3" sources."util-deprecate-1.0.2" - sources."uuid-3.3.0" + sources."uuid-3.3.2" sources."verror-1.10.0" sources."walk-2.3.13" sources."wide-align-1.1.3" @@ -41015,7 +41006,7 @@ in sources."color-convert-1.9.2" sources."color-name-1.1.1" sources."colors-1.0.3" - sources."commander-2.15.1" + sources."commander-2.16.0" sources."configstore-3.1.2" sources."create-error-class-3.0.2" sources."cross-spawn-5.1.0" @@ -41337,7 +41328,7 @@ in sources."aws4-1.7.0" sources."babybird-0.0.1" sources."balanced-match-1.0.0" - sources."bcrypt-pbkdf-1.0.1" + sources."bcrypt-pbkdf-1.0.2" (sources."bl-1.2.2" // { dependencies = [ sources."isarray-1.0.0" @@ -41624,7 +41615,7 @@ in sources."unpipe-1.0.0" sources."util-deprecate-1.0.2" sources."utils-merge-1.0.1" - sources."uuid-3.3.0" + sources."uuid-3.3.2" sources."validate-npm-package-license-3.0.3" sources."vary-1.1.2" sources."verror-1.10.0" @@ -42345,14 +42336,14 @@ in sources."async-2.6.1" sources."aws-sign2-0.6.0" sources."balanced-match-1.0.0" - sources."bcrypt-pbkdf-1.0.1" + sources."bcrypt-pbkdf-1.0.2" sources."bl-1.0.3" sources."boom-2.10.1" sources."brace-expansion-1.1.11" sources."caseless-0.11.0" sources."chalk-1.1.3" sources."combined-stream-1.0.6" - sources."commander-2.15.1" + sources."commander-2.16.0" sources."concat-map-0.0.1" sources."concat-stream-1.5.0" sources."core-util-is-1.0.2" @@ -42981,7 +42972,7 @@ in sources."babel-types-6.26.0" sources."babylon-6.18.0" sources."basic-auth-2.0.0" - sources."bcrypt-pbkdf-1.0.1" + sources."bcrypt-pbkdf-1.0.2" sources."bindings-1.2.1" sources."bl-1.2.2" sources."body-parser-1.18.3" @@ -43001,7 +42992,7 @@ in sources."co-4.6.0" sources."code-point-at-1.1.0" sources."combined-stream-1.0.6" - sources."commander-2.15.1" + sources."commander-2.16.0" sources."console-control-strings-1.1.0" sources."constantinople-3.1.2" sources."content-disposition-0.5.2" @@ -43238,7 +43229,7 @@ in sources."unzip-response-1.0.2" sources."util-deprecate-1.0.2" sources."utils-merge-1.0.1" - sources."uuid-3.3.0" + sources."uuid-3.3.2" sources."vary-1.1.2" (sources."verror-1.10.0" // { dependencies = [ @@ -43283,7 +43274,7 @@ in sources."balanced-match-1.0.0" sources."base62-0.1.1" sources."brace-expansion-1.1.11" - sources."commander-2.15.1" + sources."commander-2.16.0" sources."commoner-0.10.8" sources."concat-map-0.0.1" sources."defined-1.0.0" @@ -43402,7 +43393,7 @@ in sources."aws-sdk-1.18.0" sources."aws-sign2-0.7.0" sources."aws4-1.7.0" - sources."bcrypt-pbkdf-1.0.1" + sources."bcrypt-pbkdf-1.0.2" sources."buffer-crc32-0.2.1" sources."bytes-0.2.1" sources."caseless-0.12.0" @@ -43505,7 +43496,7 @@ in sources."tweetnacl-0.14.5" sources."uid2-0.0.3" sources."util-0.4.9" - sources."uuid-3.3.0" + sources."uuid-3.3.2" sources."verror-1.10.0" sources."xml2js-0.2.4" sources."xmlbuilder-0.4.2" @@ -43654,7 +43645,7 @@ in sources."base64-arraybuffer-0.1.2" sources."base64id-0.1.0" sources."bcrypt-nodejs-0.0.3" - sources."bcrypt-pbkdf-1.0.1" + sources."bcrypt-pbkdf-1.0.2" sources."better-assert-1.0.2" sources."blob-0.0.2" sources."body-parser-1.18.2" @@ -43664,7 +43655,7 @@ in sources."cheerio-0.17.0" sources."co-4.6.0" sources."combined-stream-1.0.6" - sources."commander-2.15.1" + sources."commander-2.16.0" sources."component-bind-1.0.0" sources."component-emitter-1.1.2" sources."component-inherit-0.0.3" @@ -43834,7 +43825,7 @@ in sources."unpipe-1.0.0" sources."utf8-2.0.0" sources."utils-merge-1.0.1" - sources."uuid-3.3.0" + sources."uuid-3.3.2" sources."vary-1.1.2" sources."verror-1.10.0" (sources."ws-0.4.31" // { @@ -43877,7 +43868,7 @@ in sources."aws-sign2-0.7.0" sources."aws4-1.7.0" sources."balanced-match-1.0.0" - sources."bcrypt-pbkdf-1.0.1" + sources."bcrypt-pbkdf-1.0.2" (sources."body-parser-1.18.3" // { dependencies = [ sources."bytes-3.0.0" @@ -43895,7 +43886,7 @@ in sources."color-convert-1.9.2" sources."color-name-1.1.1" sources."combined-stream-1.0.6" - sources."commander-2.15.1" + sources."commander-2.16.0" (sources."compressible-2.0.14" // { dependencies = [ sources."mime-db-1.34.0" @@ -44084,7 +44075,7 @@ in sources."unpipe-1.0.0" sources."util-deprecate-1.0.2" sources."utils-merge-1.0.0" - sources."uuid-3.3.0" + sources."uuid-3.3.2" sources."vary-1.1.2" sources."verror-1.10.0" sources."wordwrap-0.0.3" @@ -44596,7 +44587,7 @@ in sources."asynckit-0.4.0" sources."aws-sign2-0.6.0" sources."aws4-1.7.0" - sources."bcrypt-pbkdf-1.0.1" + sources."bcrypt-pbkdf-1.0.2" sources."boom-2.10.1" sources."camelcase-1.2.1" sources."caseless-0.12.0" @@ -44610,7 +44601,7 @@ in sources."co-4.6.0" sources."colors-1.1.2" sources."combined-stream-1.0.6" - sources."commander-2.15.1" + sources."commander-2.16.0" sources."core-util-is-1.0.2" sources."cryptiles-2.0.5" sources."cycle-1.0.3" @@ -45016,10 +45007,10 @@ in ungit = nodeEnv.buildNodePackage { name = "ungit"; packageName = "ungit"; - version = "1.4.26"; + version = "1.4.28"; src = fetchurl { - url = "https://registry.npmjs.org/ungit/-/ungit-1.4.26.tgz"; - sha512 = "hA1Sr7zi6v+RhcJVC4cOySorCh21+Xdw627ewEkLlRXIWVjUnwdj8cEr0gj6apL7E+lqso3NwhZS/GliMyeL2g=="; + url = "https://registry.npmjs.org/ungit/-/ungit-1.4.28.tgz"; + sha512 = "rXb0l9jqiIWeKvrlUnK0/SYOmOKHe3nw1AV/VWqJERMkaoI5XJ1Pfu4pDnqWEtbSLVLE9dvffeleqISO6qK4BQ=="; }; dependencies = [ sources."abbrev-1.1.1" @@ -45048,7 +45039,7 @@ in sources."balanced-match-1.0.0" sources."base64-arraybuffer-0.1.5" sources."base64id-1.0.0" - sources."bcrypt-pbkdf-1.0.1" + sources."bcrypt-pbkdf-1.0.2" sources."better-assert-1.0.2" sources."blob-0.0.4" sources."bluebird-3.5.1" @@ -45062,7 +45053,6 @@ in sources."callsite-1.0.0" sources."camelcase-4.1.0" sources."caseless-0.12.0" - sources."charenc-0.0.2" (sources."cliui-4.1.0" // { dependencies = [ sources."ansi-regex-3.0.0" @@ -45102,11 +45092,10 @@ in sources."crc-3.4.4" sources."cross-spawn-5.1.0" sources."crossroads-0.12.2" - sources."crypt-0.0.2" sources."cycle-1.0.3" sources."dashdash-1.14.1" sources."debug-2.6.9" - sources."decamelize-1.2.0" + sources."decamelize-2.0.0" sources."deep-extend-0.6.0" sources."delayed-stream-0.0.5" sources."delegates-1.0.0" @@ -45163,7 +45152,7 @@ in sources."statuses-1.4.0" ]; }) - sources."find-up-2.1.0" + sources."find-up-3.0.0" sources."forever-agent-0.6.1" (sources."form-data-0.1.3" // { dependencies = [ @@ -45208,11 +45197,11 @@ in sources."invert-kv-1.0.0" sources."ipaddr.js-1.6.0" sources."is-arrayish-0.3.2" - sources."is-buffer-1.1.6" sources."is-builtin-module-1.0.0" sources."is-fullwidth-code-point-1.0.0" sources."is-stream-1.1.0" sources."is-typedarray-1.0.0" + sources."is-wsl-1.1.0" sources."isarray-0.0.1" sources."isexe-2.0.0" sources."isstream-0.1.2" @@ -45234,11 +45223,10 @@ in }) sources."knockout-3.5.0-rc" sources."lcid-1.0.0" - sources."locate-path-2.0.0" + sources."locate-path-3.0.0" sources."locks-0.2.2" sources."lodash-4.17.10" sources."lru-cache-4.1.3" - sources."md5-2.2.1" sources."media-typer-0.3.0" sources."mem-1.1.0" (sources."memorystore-1.6.0" // { @@ -45275,15 +45263,15 @@ in sources."on-finished-2.3.0" sources."on-headers-1.0.1" sources."once-1.4.0" - sources."open-0.0.5" + sources."opn-5.3.0" sources."os-homedir-1.0.2" sources."os-locale-2.1.0" sources."os-tmpdir-1.0.2" sources."osenv-0.1.5" sources."p-finally-1.0.0" - sources."p-limit-1.3.0" - sources."p-locate-2.0.0" - sources."p-try-1.0.0" + sources."p-limit-2.0.0" + sources."p-locate-3.0.0" + sources."p-try-2.0.0" sources."parseqs-0.0.5" sources."parseuri-0.0.5" sources."parseurl-1.3.2" @@ -45303,11 +45291,7 @@ in sources."qs-6.5.2" sources."random-bytes-1.0.0" sources."range-parser-1.2.0" - (sources."raven-2.6.3" // { - dependencies = [ - sources."uuid-3.0.0" - ]; - }) + sources."raven-js-3.26.3" sources."raw-body-2.3.3" (sources."rc-1.2.8" // { dependencies = [ @@ -45398,7 +45382,6 @@ in sources."rimraf-2.2.8" ]; }) - sources."timed-out-4.0.1" sources."to-array-0.1.4" sources."tough-cookie-2.3.4" sources."tunnel-agent-0.6.0" @@ -45412,7 +45395,7 @@ in sources."unpipe-1.0.0" sources."util-deprecate-1.0.2" sources."utils-merge-1.0.1" - sources."uuid-3.3.0" + sources."uuid-3.3.2" sources."validate-npm-package-license-3.0.3" sources."validate-npm-package-name-3.0.0" sources."vary-1.1.2" @@ -45430,9 +45413,10 @@ in sources."wrappy-1.0.2" sources."ws-3.3.3" sources."xmlhttprequest-ssl-1.5.5" + sources."xregexp-4.0.0" sources."y18n-4.0.0" sources."yallist-2.1.2" - (sources."yargs-12.0.0" // { + (sources."yargs-12.0.1" // { dependencies = [ sources."ansi-regex-3.0.0" sources."is-fullwidth-code-point-2.0.0" @@ -45440,7 +45424,7 @@ in sources."strip-ansi-4.0.0" ]; }) - sources."yargs-parser-10.0.0" + sources."yargs-parser-10.1.0" sources."yeast-0.1.2" ]; buildInputs = globalBuildInputs; @@ -45487,7 +45471,7 @@ in sources."aws4-1.7.0" sources."balanced-match-1.0.0" sources."base64-js-0.0.8" - sources."bcrypt-pbkdf-1.0.1" + sources."bcrypt-pbkdf-1.0.2" sources."bl-1.2.2" sources."bluebird-3.5.1" sources."brace-expansion-1.1.11" @@ -45521,7 +45505,7 @@ in sources."color-convert-1.9.2" sources."color-name-1.1.1" sources."combined-stream-1.0.6" - sources."commander-2.15.1" + sources."commander-2.16.0" sources."concat-map-0.0.1" sources."config-chain-1.1.11" sources."consolidate-0.14.5" @@ -45732,7 +45716,7 @@ in sources."url-to-options-1.0.1" sources."user-home-2.0.0" sources."util-deprecate-1.0.2" - sources."uuid-3.3.0" + sources."uuid-3.3.2" sources."validate-npm-package-name-3.0.0" sources."verror-1.10.0" sources."ware-1.3.0" @@ -45773,14 +45757,14 @@ in sources."async-2.6.1" sources."aws-sign2-0.6.0" sources."balanced-match-1.0.0" - sources."bcrypt-pbkdf-1.0.1" + sources."bcrypt-pbkdf-1.0.2" sources."bl-1.0.3" sources."boom-2.10.1" sources."brace-expansion-1.1.11" sources."caseless-0.11.0" sources."chalk-1.1.3" sources."combined-stream-1.0.6" - sources."commander-2.15.1" + sources."commander-2.16.0" sources."concat-map-0.0.1" sources."concat-stream-1.5.0" (sources."config-chain-1.1.11" // { @@ -45922,10 +45906,10 @@ in webpack = nodeEnv.buildNodePackage { name = "webpack"; packageName = "webpack"; - version = "4.13.0"; + version = "4.14.0"; src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-4.13.0.tgz"; - sha512 = "3KMX0uPjJ4cXjl9V/AY+goRQPs7jtKRQn3hhNOG6s8Sx3mmGCQUjQJvjVoGNABVo5svgujIcSLBN8g62EzqIMA=="; + url = "https://registry.npmjs.org/webpack/-/webpack-4.14.0.tgz"; + sha512 = "CgZPUwobJbQlZqpylDNtEazZLfNnGuyFmpk1dHIP2kFchtyMWB+W2wBKPImSnSQ2rbX/WZMKiQax+SZmlUXuQQ=="; }; dependencies = [ sources."@webassemblyjs/ast-1.5.12" @@ -45948,7 +45932,7 @@ in sources."@webassemblyjs/wast-printer-1.5.12" sources."acorn-5.7.1" sources."acorn-dynamic-import-3.0.0" - sources."ajv-6.5.1" + sources."ajv-6.5.2" sources."ajv-keywords-3.2.0" sources."anymatch-2.0.0" sources."aproba-1.2.0" @@ -46658,7 +46642,7 @@ in }) sources."ut_pex-1.2.1" sources."util-deprecate-1.0.2" - (sources."videostream-2.4.2" // { + (sources."videostream-2.4.3" // { dependencies = [ sources."pump-1.0.3" ]; @@ -46701,7 +46685,7 @@ in dependencies = [ sources."@cliqz-oss/firefox-client-0.3.1" sources."@cliqz-oss/node-firefox-connect-1.2.1" - sources."@types/node-10.5.0" + sources."@types/node-10.5.1" sources."JSONSelect-0.2.1" sources."abbrev-1.1.1" sources."acorn-5.7.1" @@ -46796,7 +46780,7 @@ in ]; }) sources."base64-js-0.0.2" - sources."bcrypt-pbkdf-1.0.1" + sources."bcrypt-pbkdf-1.0.2" sources."binary-extensions-1.11.0" sources."bl-1.2.2" sources."bluebird-2.9.34" @@ -46878,7 +46862,7 @@ in sources."colors-0.5.1" sources."columnify-1.5.4" sources."combined-stream-1.0.6" - sources."commander-2.15.1" + sources."commander-2.16.0" sources."common-tags-1.7.2" sources."component-emitter-1.2.1" sources."compress-commons-1.2.2" @@ -47603,7 +47587,7 @@ in }) sources."snapdragon-util-3.0.1" sources."sntp-2.1.0" - (sources."snyk-1.87.0" // { + (sources."snyk-1.88.0" // { dependencies = [ sources."ansi-styles-3.2.1" sources."chalk-2.4.1" @@ -47616,7 +47600,7 @@ in sources."debug-3.1.0" ]; }) - (sources."snyk-docker-plugin-1.10.2" // { + (sources."snyk-docker-plugin-1.10.3" // { dependencies = [ sources."debug-3.1.0" sources."request-2.87.0" @@ -47811,7 +47795,7 @@ in sources."user-home-2.0.0" sources."util-0.10.4" sources."util-deprecate-1.0.2" - sources."uuid-3.3.0" + sources."uuid-3.3.2" sources."validate-npm-package-license-3.0.3" sources."verror-1.10.0" sources."vfile-1.4.0" @@ -47951,7 +47935,7 @@ in sources."define-property-1.0.0" ]; }) - sources."bcrypt-pbkdf-1.0.1" + sources."bcrypt-pbkdf-1.0.2" (sources."bin-version-2.0.0" // { dependencies = [ sources."execa-0.1.1" @@ -48581,7 +48565,7 @@ in sources."use-3.1.0" sources."user-home-2.0.0" sources."util-deprecate-1.0.2" - sources."uuid-3.3.0" + sources."uuid-3.3.2" sources."validate-npm-package-license-3.0.3" sources."verror-1.10.0" sources."vinyl-1.2.0" diff --git a/pkgs/development/node-packages/node-packages-v8.nix b/pkgs/development/node-packages/node-packages-v8.nix index 9bea5ebfe962..bcd5d2fa86e7 100644 --- a/pkgs/development/node-packages/node-packages-v8.nix +++ b/pkgs/development/node-packages/node-packages-v8.nix @@ -49,13 +49,13 @@ let sha1 = "cbc4b9a68981bf0b501ccd06a9058acd65309bf7"; }; }; - "@types/node-10.5.0" = { + "@types/node-10.5.1" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "10.5.0"; + version = "10.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-10.5.0.tgz"; - sha512 = "baXPuqA7EVcBUpA5so2K26DTzk7NCWBc9xrPMu9PbUMwgusJRm9zJBPhiDmJVEcnTQ3aOxUZeuFHpd9qMYDNRg=="; + url = "https://registry.npmjs.org/@types/node/-/node-10.5.1.tgz"; + sha512 = "AFLl1IALIuyt6oK4AYZsgWVJ/5rnyzQWud7IebaZWWV3YmgtPZkQmYio9R5Ze/2pdd7XfqF5bP+hWS11mAKoOQ=="; }; }; "@types/superagent-3.5.6" = { @@ -571,13 +571,13 @@ let sha1 = "1101e9544f4a76b1bc3b26d452ca96d7a35e7978"; }; }; - "bcrypt-pbkdf-1.0.1" = { + "bcrypt-pbkdf-1.0.2" = { name = "bcrypt-pbkdf"; packageName = "bcrypt-pbkdf"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz"; - sha1 = "63bc5dcb61331b92bc05fd528953c33462a06f8d"; + url = "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz"; + sha1 = "a4301d389b6a43f9b67ff3ca11a3f6637e360e9e"; }; }; "bencode-1.0.0" = { @@ -1291,6 +1291,15 @@ let sha512 = "VlfT9F3V0v+jr4yxPc5gg9s62/fIVWsd2Bk2iD435um1NlGMYdVCq+MjcXnhYq2icNOizHr1kK+5TI6H0Hy0ag=="; }; }; + "commander-2.16.0" = { + name = "commander"; + packageName = "commander"; + version = "2.16.0"; + src = fetchurl { + url = "https://registry.npmjs.org/commander/-/commander-2.16.0.tgz"; + sha512 = "sVXqklSaotK9at437sFlFpyOcJonxe0yST/AG9DkQKUdIE6IqGIMv4SfAQSKaJbSdVEJYItASCrBiVQHq1HQew=="; + }; + }; "commander-2.3.0" = { name = "commander"; packageName = "commander"; @@ -7420,13 +7429,13 @@ let sha512 = "FSs76hQZsSsdI4YeePxb5SQoWmHxDRznImGiAN905O1svyHvcoQ3hYptu3Y9hPxRHeB3lHzJR5KRZy0Byj7qqg=="; }; }; - "uuid-3.3.0" = { + "uuid-3.3.2" = { name = "uuid"; packageName = "uuid"; - version = "3.3.0"; + version = "3.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/uuid/-/uuid-3.3.0.tgz"; - sha512 = "ijO9N2xY/YaOqQ5yz5c4sy2ZjWmA6AR6zASb/gdpeKZ8+948CxwfMW9RrKVk5may6ev8c0/Xguu32e2Llelpqw=="; + url = "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz"; + sha512 = "yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA=="; }; }; "valid-url-1.0.9" = { @@ -7768,7 +7777,7 @@ in sources."@cycle/isolate-3.3.0" sources."@cycle/run-3.4.0" sources."@cycle/time-0.10.1" - sources."@types/node-10.5.0" + sources."@types/node-10.5.1" sources."@types/superagent-3.5.6" sources."ansi-escapes-3.1.0" sources."ansi-regex-2.1.1" @@ -7933,7 +7942,7 @@ in sources."aws-sign2-0.7.0" sources."aws4-1.7.0" sources."balanced-match-1.0.0" - sources."bcrypt-pbkdf-1.0.1" + sources."bcrypt-pbkdf-1.0.2" sources."bencode-1.0.0" (sources."bitfield-rle-2.1.0" // { dependencies = [ @@ -8284,7 +8293,7 @@ in sources."util-deprecate-1.0.2" sources."utile-0.3.0" sources."utp-native-1.7.1" - sources."uuid-3.3.0" + sources."uuid-3.3.2" sources."varint-3.0.1" sources."verror-1.10.0" (sources."winston-2.1.1" // { @@ -8426,7 +8435,7 @@ in sources."aws-sign2-0.6.0" sources."aws4-1.7.0" sources."balanced-match-1.0.0" - sources."bcrypt-pbkdf-1.0.1" + sources."bcrypt-pbkdf-1.0.2" sources."block-stream-0.0.9" sources."boom-2.10.1" sources."brace-expansion-1.1.11" @@ -8525,7 +8534,7 @@ in sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."util-deprecate-1.0.2" - sources."uuid-3.3.0" + sources."uuid-3.3.2" (sources."verror-1.10.0" // { dependencies = [ sources."assert-plus-1.0.0" @@ -8651,10 +8660,10 @@ in pnpm = nodeEnv.buildNodePackage { name = "pnpm"; packageName = "pnpm"; - version = "2.7.0"; + version = "2.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/pnpm/-/pnpm-2.7.0.tgz"; - sha1 = "cfaf3889c04125abfa20117358d7bcec72902faf"; + url = "https://registry.npmjs.org/pnpm/-/pnpm-2.9.0.tgz"; + sha1 = "1c2f5ade46b87cc3b1f3b7c66eeb7b0f4df4d968"; }; buildInputs = globalBuildInputs; meta = { @@ -8757,7 +8766,7 @@ in sources."aws4-1.7.0" sources."balanced-match-1.0.0" sources."base64-js-0.0.8" - sources."bcrypt-pbkdf-1.0.1" + sources."bcrypt-pbkdf-1.0.2" sources."bl-1.2.2" sources."bluebird-3.5.1" sources."brace-expansion-1.1.11" @@ -8791,7 +8800,7 @@ in sources."color-convert-1.9.2" sources."color-name-1.1.1" sources."combined-stream-1.0.6" - sources."commander-2.15.1" + sources."commander-2.16.0" sources."concat-map-0.0.1" sources."config-chain-1.1.11" sources."consolidate-0.14.5" @@ -9002,7 +9011,7 @@ in sources."url-to-options-1.0.1" sources."user-home-2.0.0" sources."util-deprecate-1.0.2" - sources."uuid-3.3.0" + sources."uuid-3.3.2" sources."validate-npm-package-name-3.0.0" sources."verror-1.10.0" sources."ware-1.3.0" @@ -9137,7 +9146,7 @@ in sources."color-convert-1.9.2" sources."color-name-1.1.1" sources."combined-stream-1.0.6" - sources."commander-2.15.1" + sources."commander-2.16.0" sources."component-emitter-1.2.1" sources."concat-map-0.0.1" sources."concat-stream-1.6.2" diff --git a/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/default.nix b/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/default.nix index b88000eeb32a..9a2af140e312 100644 --- a/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/default.nix +++ b/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/default.nix @@ -6,24 +6,19 @@ else stdenv.mkDerivation rec { name = "ocaml${ocaml.version}-ocaml-migrate-parsetree-${version}"; - version = "1.0.7"; + version = "1.0.11"; src = fetchFromGitHub { - owner = "let-def"; + owner = "ocaml-ppx"; repo = "ocaml-migrate-parsetree"; rev = "v${version}"; - sha256 = "0v1h943xv5bd8qy5mr8pvyjbgamhs59nkgr94j3vznabrcfqzkh7"; + sha256 = "05kbgs9n1x64fk6g3wbjnwjd17w10k3k8dzglnc45xg4hr7z651n"; }; buildInputs = [ ocaml findlib ocamlbuild jbuilder ]; propagatedBuildInputs = [ result ]; - installPhase = '' - for p in *.install - do - ${jbuilder.installPhase} $p - done - ''; + inherit (jbuilder) installPhase; meta = { description = "Convert OCaml parsetrees between different major versions"; diff --git a/pkgs/development/ocaml-modules/zarith/default.nix b/pkgs/development/ocaml-modules/zarith/default.nix index 5dc6a9056ada..e5d954970589 100644 --- a/pkgs/development/ocaml-modules/zarith/default.nix +++ b/pkgs/development/ocaml-modules/zarith/default.nix @@ -5,9 +5,9 @@ assert stdenv.lib.versionAtLeast ocaml.version "3.12.1"; let param = if stdenv.lib.versionAtLeast ocaml.version "4.02" then { - version = "1.4.1"; - url = http://forge.ocamlcore.org/frs/download.php/1574/zarith-1.4.1.tgz; - sha256 = "0l36hzmfbvdai2kcgynh13vfdim5x2grnaw61fxqalyjm90c3di3"; + version = "1.7"; + url = https://github.com/ocaml/Zarith/archive/release-1.7.tar.gz; + sha256 = "0fmblap5nsbqq0dab63d6b7lsxpc3snkgz7jfldi2qa4s1kbnhfn"; } else { version = "1.3"; url = http://forge.ocamlcore.org/frs/download.php/1471/zarith-1.3.tgz; diff --git a/pkgs/development/pharo/vm/default.nix b/pkgs/development/pharo/vm/default.nix index e6269503a4c4..b995e0e2540a 100644 --- a/pkgs/development/pharo/vm/default.nix +++ b/pkgs/development/pharo/vm/default.nix @@ -1,7 +1,7 @@ -{ stdenv, callPackage, callPackage_i686, makeWrapper, ...} @pkgs: +{ stdenv, callPackage, pkgsi686Linux, makeWrapper, ...} @pkgs: let - i686 = callPackage_i686 ./vms.nix {}; + i686 = pkgsi686Linux.callPackage ./vms.nix {}; native = callPackage ./vms.nix {}; in @@ -11,5 +11,3 @@ rec { spur64 = if stdenv.is64bit then native.spur else "none"; multi-vm-wrapper = callPackage ../wrapper { inherit cog32 spur32 spur64; }; } - - diff --git a/pkgs/development/python-modules/asyncssh/default.nix b/pkgs/development/python-modules/asyncssh/default.nix index ef21cb001b49..6308b1a170fb 100644 --- a/pkgs/development/python-modules/asyncssh/default.nix +++ b/pkgs/development/python-modules/asyncssh/default.nix @@ -4,12 +4,12 @@ buildPythonPackage rec { pname = "asyncssh"; - version = "1.13.1"; + version = "1.13.2"; disabled = pythonOlder "3.4"; src = fetchPypi { inherit pname version; - sha256 = "a44736830741e2bb9c4e3992819288b77ac4af217a46d12f415bb57c18ed9c22"; + sha256 = "e4c07577d021c68d4c8e6d1897987424cc25b58e0726f31ff72476a34ddb6deb"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/backports_shutil_get_terminal_size/default.nix b/pkgs/development/python-modules/backports_shutil_get_terminal_size/default.nix index 7f4faa8a8b47..3cd37617a393 100644 --- a/pkgs/development/python-modules/backports_shutil_get_terminal_size/default.nix +++ b/pkgs/development/python-modules/backports_shutil_get_terminal_size/default.nix @@ -1,26 +1,35 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub , pytest , pythonOlder }: if !(pythonOlder "3.3") then null else buildPythonPackage rec { pname = "backports.shutil_get_terminal_size"; - version = "1.0.0"; + version = "unstable-2016-02-21"; - src = fetchPypi { - inherit pname version; - sha256 = "713e7a8228ae80341c70586d1cc0a8caa5207346927e23d09dcbcaf18eadec80"; + # there have been numerous fixes commited since the initial release. + # Most notably fixing a problem where the backport would always return + # terminal size 0. See https://trac.sagemath.org/ticket/25320#comment:5. + # Unfortunately the maintainer seems inactive and has not responded to + # a request for a new release since 2016: + # https://github.com/chrippa/backports.shutil_get_terminal_size/issues/7 + src = fetchFromGitHub { + owner = "chrippa"; + repo = "backports.shutil_get_terminal_size"; + rev = "159e269450dbf37c3a837f6ea7e628d59acbb96a"; + sha256 = "17sgv8vg0xxfdnca45l1mmwwvj29gich5c8kqznnj51kfccch7sg"; }; checkInputs = [ pytest ]; - meta = { + meta = with lib; { description = "A backport of the get_terminal_size function from Python 3.3’s shutil."; homepage = https://github.com/chrippa/backports.shutil_get_terminal_size; - license = with lib.licenses; [ mit ]; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ timokau ]; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/boto3/default.nix b/pkgs/development/python-modules/boto3/default.nix index 042ad9cf7932..b3a15ba08682 100644 --- a/pkgs/development/python-modules/boto3/default.nix +++ b/pkgs/development/python-modules/boto3/default.nix @@ -13,13 +13,13 @@ buildPythonPackage rec { pname = "boto3"; - version = "1.7.9"; + version = "1.7.48"; src = fetchFromGitHub { owner = "boto"; repo = "boto3"; rev = version; - sha256 = "0yqym19nlayjm1qlh6vvinmk5xw0zskil971n2v9s65ray7sn5lv"; + sha256 = "0pag37yy6693k8xvlyx4f06asab52i89xljy2ip121i60ih3jfw4"; }; propagatedBuildInputs = [ botocore jmespath s3transfer ] ++ lib.optionals (!isPy3k) [ futures ]; diff --git a/pkgs/development/python-modules/botocore/default.nix b/pkgs/development/python-modules/botocore/default.nix index 68b5abd906d9..fada751968b3 100644 --- a/pkgs/development/python-modules/botocore/default.nix +++ b/pkgs/development/python-modules/botocore/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "botocore"; - version = "1.10.9"; + version = "1.10.48"; src = fetchPypi { inherit pname version; - sha256 = "19vlf2w05h9818hrhx8al4r9ngfhvhf2pxcwka9s7bc51qnhx4xh"; + sha256 = "1432drc7482nwrppwkk1i6ars3wz9w2g9rsxkz5nlxmyf9qm260j"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/flask-restful/default.nix b/pkgs/development/python-modules/flask-restful/default.nix index a57823a09872..41735c4d1c6e 100644 --- a/pkgs/development/python-modules/flask-restful/default.nix +++ b/pkgs/development/python-modules/flask-restful/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, isPy3k +{ lib, buildPythonPackage, fetchPypi, fetchpatch, isPy3k , nose, mock, blinker , flask, six, pytz, aniso8601, pycrypto }: @@ -12,19 +12,27 @@ buildPythonPackage rec { sha256 = "01rlvl2iq074ciyn4schmjip7cyplkwkysbb8f610zil06am35ap"; }; -# TypeError: Only byte strings can be passed to C code - patchPhase = if isPy3k then '' + patches = [ + (fetchpatch { + url = https://github.com/flask-restful/flask-restful/commit/54979f0a49b2217babc53c5b65b5df10b6de8e05.patch; + sha256 = "11s6ag6l42g61ccg5jw9j1f26hwgjfa3sp890cbl5r4hy5ycpyr5"; + }) + (fetchpatch { + url = https://github.com/flask-restful/flask-restful/commit/f45e81a45ed03922fd225afe27006315811077e6.patch; + sha256 = "16avd369j5r08d1l23mwbba26zjwnmfqvfvnfz02am3gr5l6p3gl"; + }) + ]; + + postPatch = lib.optionalString isPy3k '' + # TypeError: Only byte strings can be passed to C code rm tests/test_crypto.py tests/test_paging.py - '' else null; -# Disable test broken with aniso > 3.0.0, can be removed when updating to a flask-restful version with commit 54979f0 - preCheck = '' - substituteInPlace "./tests/test_inputs.py" --replace "test_bad_isointervals" "disabled_bad_isointervals" ''; - buildInputs = [ nose mock blinker ]; + + checkInputs = [ nose mock blinker ]; + propagatedBuildInputs = [ flask six pytz aniso8601 pycrypto ]; - PYTHON_EGG_CACHE = "`pwd`/.egg-cache"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://flask-restful.readthedocs.io/"; description = "REST API building blocks for Flask"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/google_cloud_speech/default.nix b/pkgs/development/python-modules/google_cloud_speech/default.nix index 56882c5269ad..8cf3fe5753ee 100644 --- a/pkgs/development/python-modules/google_cloud_speech/default.nix +++ b/pkgs/development/python-modules/google_cloud_speech/default.nix @@ -1,5 +1,5 @@ { stdenv, buildPythonPackage, fetchPypi -, setuptools, google_api_core, google_gax, google_cloud_core, pytest, mock }: +, google_api_core, pytest, mock }: buildPythonPackage rec { pname = "google-cloud-speech"; @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "8396646aa9de210bacb144fabd82ab5fe577b3b11708725c879b72c96009d631"; }; - propagatedBuildInputs = [ setuptools google_api_core google_gax google_cloud_core ]; + propagatedBuildInputs = [ google_api_core ]; checkInputs = [ pytest mock ]; # needs credentials diff --git a/pkgs/development/python-modules/google_gax/default.nix b/pkgs/development/python-modules/google_gax/default.nix deleted file mode 100644 index daabba6c390a..000000000000 --- a/pkgs/development/python-modules/google_gax/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ stdenv, buildPythonPackage, fetchPypi -, google_auth, ply, protobuf, grpcio, requests -, googleapis_common_protos, dill, future, pytest, mock, unittest2 }: - -buildPythonPackage rec { - pname = "google-gax"; - version = "0.16.0"; - - src = fetchPypi { - inherit pname version; - sha256 = "1d844c56f942d98f12a1b0ecabe8a17d69bef41ff513edd97253bcde02ffd929"; - }; - - propagatedBuildInputs = [ google_auth ply protobuf grpcio requests googleapis_common_protos dill future ]; - checkInputs = [ pytest mock unittest2 ]; - - # Importing test__grpc_google_auth fails with "ModuleNotFoundError: No module named 'google_auth_httplib2'", where - # that file would be is unclear to me so I just remove the test. - postPatch = ''rm tests/test__grpc_google_auth.py''; - - checkPhase = '' - py.test - ''; - - meta = with stdenv.lib; { - description = "Google API Extensions for Python (gax-python) tools based on gRPC and Google API conventions."; - homepage = "http://gax-python.readthedocs.io/en/latest/"; - license = licenses.bsd3; - maintainers = with maintainers; [ vanschelven ]; - }; -} diff --git a/pkgs/development/python-modules/grpcio-tools/default.nix b/pkgs/development/python-modules/grpcio-tools/default.nix new file mode 100644 index 000000000000..8d4c925acf87 --- /dev/null +++ b/pkgs/development/python-modules/grpcio-tools/default.nix @@ -0,0 +1,25 @@ +{ stdenv, buildPythonPackage, fetchPypi, lib, grpc, grpcio}: + +buildPythonPackage rec { + pname = "grpcio-tools"; + version = "1.13.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1ck6818kb4nb6skm9lqg492brqs7kfk65f4hh2c7h7c8pkbrpcw1"; + }; + + enableParallelBuilding = true; + + propagatedBuildInputs = [ grpc grpcio ]; + + # no tests in the package + doCheck = false; + + meta = with stdenv.lib; { + description = "Protobuf code generator for gRPC"; + license = lib.licenses.asl20; + homepage = "https://grpc.io/grpc/python/"; + maintainers = with maintainers; [ vanschelven ]; + }; +} diff --git a/pkgs/development/python-modules/grpcio/default.nix b/pkgs/development/python-modules/grpcio/default.nix index 265b631e1125..e53989bcbcfd 100644 --- a/pkgs/development/python-modules/grpcio/default.nix +++ b/pkgs/development/python-modules/grpcio/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "grpcio"; - version = "1.12.1"; + version = "1.13.0"; src = fetchPypi { inherit pname version; - sha256 = "f14faadfd09aa8526536cd2149e274563f45b767fca1736ccc53803a6af3f90e"; + sha256 = "6324581e215157f0fbe335dff2e21a65b4406db98ac7cca05f1e23b4f510b426"; }; propagatedBuildInputs = [ six protobuf ] @@ -16,7 +16,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "HTTP/2-based RPC framework"; - license = lib.licenses.bsd3; + license = lib.licenses.asl20; homepage = "https://grpc.io/grpc/python/"; maintainers = with maintainers; [ vanschelven ]; }; diff --git a/pkgs/development/python-modules/keyutils/default.nix b/pkgs/development/python-modules/keyutils/default.nix index b07dd4abd0d2..907af4d250b3 100644 --- a/pkgs/development/python-modules/keyutils/default.nix +++ b/pkgs/development/python-modules/keyutils/default.nix @@ -1,17 +1,19 @@ -{ lib, buildPythonPackage, fetchPypi, keyutils, pytestrunner }: +{ lib, buildPythonPackage, fetchFromGitHub, keyutils, pytestrunner, pytest }: buildPythonPackage rec { pname = "keyutils"; version = "0.5"; - src = fetchPypi { - inherit pname version; - sha256 = "0dskys71vkn59vlsfs1ljli0qnzk7b10iv4pawxawnk2hvyjrf10"; + # github version comes bundled with tests + src = fetchFromGitHub { + owner = "sassoftware"; + repo = "python-keyutils"; + rev = "v${version}"; + sha256 = "1gga60w8sb3r5bxa0bfp7d7wzg6s3db5y7aizr14p2pvp92d8bdi"; }; - checkInputs = [ keyutils pytestrunner ]; - - doCheck = false; + buildInputs = [ keyutils ]; + checkInputs = [ pytest pytestrunner ]; meta = { description = "A set of python bindings for keyutils"; diff --git a/pkgs/development/python-modules/python-prctl/default.nix b/pkgs/development/python-modules/python-prctl/default.nix new file mode 100644 index 000000000000..5d092f5e6eab --- /dev/null +++ b/pkgs/development/python-modules/python-prctl/default.nix @@ -0,0 +1,26 @@ +{ lib +, buildPythonPackage +, fetchPypi +, libcap +}: + +buildPythonPackage rec { + pname = "python-prctl"; + version = "1.7"; + + src = fetchPypi { + inherit pname version; + sha256 = "1njgixnavmwq45r3gpkhn1y760sax204clagg4gzwvvdc5bdbssp"; + }; + + patches = [ ./skip_bad_tests.patch ]; + buildInputs = [ libcap ]; + + meta = { + description = "Python(ic) interface to the linux prctl syscall"; + homepage = https://github.com/seveas/python-prctl; + license = lib.licenses.gpl3; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ catern ]; + }; +} diff --git a/pkgs/development/python-modules/python-prctl/skip_bad_tests.patch b/pkgs/development/python-modules/python-prctl/skip_bad_tests.patch new file mode 100644 index 000000000000..19d70f234a99 --- /dev/null +++ b/pkgs/development/python-modules/python-prctl/skip_bad_tests.patch @@ -0,0 +1,34 @@ +--- ./test_prctl.py 2018-01-26 16:02:52.000000000 -0500 ++++ ./test_prctl.py 2018-06-21 18:26:43.370065009 -0400 +@@ -154,6 +154,7 @@ + prctl.set_keepcaps(False) + self.assertEqual(prctl.get_keepcaps(), False) + ++ @unittest.skip("No access to /proc in the Nix build sandbox") + @require('set_mce_kill') + def test_mce_kill(self): + """Test the MCE_KILL setting""" +@@ -173,6 +174,7 @@ + prctl.set_name(name) + self.assertEqual(prctl.get_name(), name[:15]) + ++ @unittest.skip("The Nix build sandbox has no_new_privs already enabled") + @require('get_no_new_privs') + def test_no_new_privs(self): + """Test the no_new_privs function""" +@@ -189,6 +191,7 @@ + self.assertNotEqual(sp.returncode, 0) + os._exit(0) + ++ @unittest.skip("No access to /proc in the Nix build sandbox") + def test_proctitle(self): + """Test setting the process title, including too long titles""" + title = "This is a test!" +@@ -225,6 +228,7 @@ + os._exit(0) + self.assertRaises(OSError, prctl.set_ptracer, new_pid) + ++ @unittest.skip("The Nix build sandbox has seccomp already enabled") + @require('get_seccomp') + def test_seccomp(self): + """Test manipulation of the seccomp setting""" diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index 996e3932d2a2..dc8b4d1fb156 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -749,6 +749,10 @@ let patches = [ ./patches/BayesXsrc.patch ]; }); + rhdf5 = old.rhdf5.overrideDerivation (attrs: { + patches = [ ./patches/rhdf5.patch ]; + }); + rJava = old.rJava.overrideDerivation (attrs: { preConfigure = '' export JAVA_CPPFLAGS=-I${pkgs.jdk}/include/ diff --git a/pkgs/development/r-modules/patches/rhdf5.patch b/pkgs/development/r-modules/patches/rhdf5.patch new file mode 100644 index 000000000000..86ada84c722f --- /dev/null +++ b/pkgs/development/r-modules/patches/rhdf5.patch @@ -0,0 +1,12 @@ +diff --git a/configure b/configure +index e3e21e8..3d947b6 100755 +--- a/configure ++++ b/configure +@@ -2859,6 +2859,7 @@ fi; + + echo "building the bundled hdf5 library..."; + cd ${BASEPBNAME}; ++sed -i 's#/bin/mv#mv#' configure + ./configure --with-pic --enable-shared=no CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" CC="${CC}" CFLAGS="${CFLAGS}" F77="${F77}" + $MAKE lib + cd ../../ diff --git a/pkgs/development/ruby-modules/bundler/default.nix b/pkgs/development/ruby-modules/bundler/default.nix index 0c754fcfe3bc..2f9a82238325 100644 --- a/pkgs/development/ruby-modules/bundler/default.nix +++ b/pkgs/development/ruby-modules/bundler/default.nix @@ -4,8 +4,8 @@ buildRubyGem rec { inherit ruby; name = "${gemName}-${version}"; gemName = "bundler"; - version = "1.16.1"; - source.sha256 = "42b8e0f57093e1d10c15542f956a871446b759e7969d99f91caf3b6731c156e8"; + version = "1.16.2"; + source.sha256 = "3bb53e03db0a8008161eb4c816ccd317120d3c415ba6fee6f90bbc7f7eec8690"; dontPatchShebangs = true; postFixup = '' diff --git a/pkgs/development/tools/analysis/radare2-cutter/default.nix b/pkgs/development/tools/analysis/radare2-cutter/default.nix index d1ff712be2d3..a516e6e2a395 100644 --- a/pkgs/development/tools/analysis/radare2-cutter/default.nix +++ b/pkgs/development/tools/analysis/radare2-cutter/default.nix @@ -1,23 +1,28 @@ -{ stdenv, fetchFromGitHub, fetchpatch, qmake, pkgconfig, qtbase, qtsvg, radare2 }: +{ stdenv, fetchFromGitHub +# nativeBuildInputs +, qmake, pkgconfig +# Qt +, qtbase, qtsvg, qtwebengine +# buildInputs +, radare2 +, python3 }: stdenv.mkDerivation rec { name = "radare2-cutter-${version}"; - version = "1.3"; + version = "1.4"; src = fetchFromGitHub { owner = "radareorg"; repo = "cutter"; rev = "v${version}"; - sha256 = "1z76yz2i9k8mxjk85k2agdj941szdbl2gi66p3dh50878zqavfrr"; + sha256 = "0wsxb6jfpsmgsigmbnh08j99779bsjz02v6aasqcwl6hwjx0mjfk"; }; postUnpack = "export sourceRoot=$sourceRoot/src"; - patchFlags = [ "-p2" ]; - nativeBuildInputs = [ qmake pkgconfig ]; - buildInputs = [ qtbase qtsvg radare2 ]; + buildInputs = [ qtbase qtsvg qtwebengine radare2 python3 ]; enableParallelBuilding = true; diff --git a/pkgs/development/tools/analysis/snowman/default.nix b/pkgs/development/tools/analysis/snowman/default.nix index fba7d3d5cd41..638423ed5972 100644 --- a/pkgs/development/tools/analysis/snowman/default.nix +++ b/pkgs/development/tools/analysis/snowman/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "snowman-${version}"; - version = "2017-11-19"; + version = "0.1.2"; src = fetchFromGitHub { owner = "yegord"; repo = "snowman"; - rev = "d03c2d6ffbf262c0011584df59d6bd69c020e08e"; - sha256 = "0bzqp3zc100dzvybf57bj4dvnybvds0lmn1w2xjb19wkzm9liskn"; + rev = "v${version}"; + sha256 = "1ry14n8jydg6rzl52gyn0qhmv6bvivk7iwssp89lq5qk8k183x3k"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/tools/boomerang/default.nix b/pkgs/development/tools/boomerang/default.nix index f83353034a8f..7b5391725423 100644 --- a/pkgs/development/tools/boomerang/default.nix +++ b/pkgs/development/tools/boomerang/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "boomerang-${version}"; - version = "0.4.0-alpha-2018-01-18"; + version = "0.4.0-alpha-2018-07-03"; src = fetchFromGitHub { owner = "ceeac"; repo = "boomerang"; - rev = "b4ff8d573407a8ed6365d4bfe53d2d47d983e393"; - sha256 = "0x17vlm6y1paa49fi3pmzz7vzdqms19qkr274hkq32ql342b6i6x"; + rev = "377ff2d7db93d892c925e2d3e61aef818371ce7d"; + sha256 = "1ljbyj3b8xckr1wihyii3h576zgq0q88vli0ylpr3p4jxy5sm57j"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/tools/build-managers/bazel/default.nix b/pkgs/development/tools/build-managers/bazel/default.nix index 28214e94c7aa..112cd840a9f5 100644 --- a/pkgs/development/tools/build-managers/bazel/default.nix +++ b/pkgs/development/tools/build-managers/bazel/default.nix @@ -1,9 +1,9 @@ -{ stdenv, lib, fetchurl, jdk, zip, unzip, bash, writeCBin, coreutils, makeWrapper, which, python, gnused +{ stdenv, lib, writeText, writeScript, fetchurl, jdk, zip, unzip, bash, writeCBin, coreutils, binutils, makeWrapper, which, python, gnused # Always assume all markers valid (don't redownload dependencies). # Also, don't clean up environment variables. , enableNixHacks ? false # Apple dependencies -, libcxx, CoreFoundation, CoreServices, Foundation +, cctools, clang, libcxx, CoreFoundation, CoreServices, Foundation }: stdenv.mkDerivation rec { @@ -56,9 +56,396 @@ stdenv.mkDerivation rec { } ''; + buildFile = writeText "BUILD" '' + package(default_visibility = ['//visibility:public']) + + filegroup(name = "empty") + + cc_toolchain_suite( + name = "nix", + toolchains = { + "darwin|compiler": ":nix_darwin_toolchain", + "k8|compiler": ":nix_linux_toolchain", + }, + ) + + cc_toolchain( + name = "nix_darwin_toolchain", + all_files = ":osx_wrapper", + compiler_files = ":osx_wrapper", + cpu = "darwin", + dwp_files = ":empty", + dynamic_runtime_libs = [":empty"], + linker_files = ":osx_wrapper", + objcopy_files = ":empty", + static_runtime_libs = [":empty"], + strip_files = ":empty", + supports_param_files = 0, + ) + + cc_toolchain( + name = "nix_linux_toolchain", + all_files = ":empty", + compiler_files = ":empty", + cpu = "k8", + dwp_files = ":empty", + dynamic_runtime_libs = [":empty"], + linker_files = ":empty", + objcopy_files = ":empty", + static_runtime_libs = [":empty"], + strip_files = ":empty", + supports_param_files = 0, + ) + + filegroup( + name = "osx_wrapper", + srcs = ["osx_cc_wrapper.sh"], + ) + ''; + + crosstoolFile = writeText "CROSSTOOL" ('' + major_version: "local" + minor_version: "" + default_target_cpu: "same_as_host" + '' + lib.optionalString stdenv.isDarwin '' + default_toolchain { + cpu: "darwin" + toolchain_identifier: "local_darwin" + } + toolchain { + abi_version: "local" + abi_libc_version: "local" + builtin_sysroot: "" + compiler: "compiler" + host_system_name: "local" + needsPic: true + target_libc: "macosx" + target_cpu: "darwin" + target_system_name: "local" + toolchain_identifier: "local_darwin" + + tool_path { name: "ar" path: "${cctools}/bin/libtool" } + tool_path { name: "compat-ld" path: "${cctools}/bin/ld" } + tool_path { name: "cpp" path: "${clang}/bin/cpp" } + tool_path { name: "dwp" path: "${coreutils}/bin/false" } + tool_path { name: "gcc" path: "osx_cc_wrapper.sh" } + cxx_flag: "-std=c++0x" + linker_flag: "-lstdc++" + linker_flag: "-undefined" + linker_flag: "dynamic_lookup" + linker_flag: "-headerpad_max_install_names" + # We know all files in `/nix/store` are immutable so it's safe to disable inclusion checks for them + cxx_builtin_include_directory: "/nix/store" + tool_path { name: "gcov" path: "${coreutils}/bin/false" } + tool_path { name: "ld" path: "${cctools}/bin/ld" } + tool_path { name: "nm" path: "${cctools}/bin/nm" } + tool_path { name: "objcopy" path: "${binutils}/bin/objcopy" } + objcopy_embed_flag: "-I" + objcopy_embed_flag: "binary" + tool_path { name: "objdump" path: "${binutils}/bin/objdump" } + tool_path { name: "strip" path: "${cctools}/bin/strip" } + + # Anticipated future default. + unfiltered_cxx_flag: "-no-canonical-prefixes" + + # Make C++ compilation deterministic. Use linkstamping instead of these + # compiler symbols. + unfiltered_cxx_flag: "-Wno-builtin-macro-redefined" + unfiltered_cxx_flag: "-D__DATE__=\"redacted\"" + unfiltered_cxx_flag: "-D__TIMESTAMP__=\"redacted\"" + unfiltered_cxx_flag: "-D__TIME__=\"redacted\"" + + # Security hardening on by default. + # Conservative choice; -D_FORTIFY_SOURCE=2 may be unsafe in some cases. + compiler_flag: "-D_FORTIFY_SOURCE=1" + compiler_flag: "-fstack-protector" + + # Enable coloring even if there's no attached terminal. Bazel removes the + # escape sequences if --nocolor is specified. + compiler_flag: "-fcolor-diagnostics" + + # All warnings are enabled. Maybe enable -Werror as well? + compiler_flag: "-Wall" + # Enable a few more warnings that aren't part of -Wall. + compiler_flag: "-Wthread-safety" + compiler_flag: "-Wself-assign" + + # Keep stack frames for debugging, even in opt mode. + compiler_flag: "-fno-omit-frame-pointer" + + # Anticipated future default. + linker_flag: "-no-canonical-prefixes" + + compilation_mode_flags { + mode: DBG + # Enable debug symbols. + compiler_flag: "-g" + } + compilation_mode_flags { + mode: OPT + # No debug symbols. + # Maybe we should enable https://gcc.gnu.org/wiki/DebugFission for opt or even generally? + # However, that can't happen here, as it requires special handling in Bazel. + compiler_flag: "-g0" + + # Conservative choice for -O + # -O3 can increase binary size and even slow down the resulting binaries. + # Profile first and / or use FDO if you need better performance than this. + compiler_flag: "-O2" + + # Disable assertions + compiler_flag: "-DNDEBUG" + + # Removal of unused code and data at link time (can this increase binary size in some cases?). + compiler_flag: "-ffunction-sections" + compiler_flag: "-fdata-sections" + } + linking_mode_flags { mode: DYNAMIC } + } + '' + lib.optionalString stdenv.isLinux '' + default_toolchain { + cpu: "k8" + toolchain_identifier: "local_linux" + } + + toolchain { + abi_version: "local" + abi_libc_version: "local" + builtin_sysroot: "" + compiler: "compiler" + host_system_name: "local" + needsPic: true + supports_gold_linker: false + supports_incremental_linker: false + supports_fission: false + supports_interface_shared_objects: false + supports_normalizing_ar: false + supports_start_end_lib: false + target_libc: "local" + target_cpu: "k8" + target_system_name: "local" + toolchain_identifier: "local_linux" + + tool_path { name: "ar" path: "${binutils}/bin/ar" } + tool_path { name: "compat-ld" path: "${binutils}/bin/ld" } + tool_path { name: "cpp" path: "${stdenv.cc}/bin/cpp" } + tool_path { name: "dwp" path: "${coreutils}/bin/false" } + tool_path { name: "gcc" path: "${stdenv.cc}/bin/cc" } + cxx_flag: "-std=c++0x" + linker_flag: "-lstdc++" + # We know all files in `/nix/store` are immutable so it's safe to disable inclusion checks for them + cxx_builtin_include_directory: "/nix/store" + tool_path { name: "gcov" path: "${coreutils}/bin/false" } + + # C(++) compiles invoke the compiler (as that is the one knowing where + # to find libraries), but we provide LD so other rules can invoke the linker. + tool_path { name: "ld" path: "${binutils}/bin/ld" } + + tool_path { name: "nm" path: "${binutils}/bin/nm" } + tool_path { name: "objcopy" path: "${binutils}/bin/objcopy" } + objcopy_embed_flag: "-I" + objcopy_embed_flag: "binary" + tool_path { name: "objdump" path: "${binutils}/bin/objdump" } + tool_path { name: "strip" path: "${binutils}/bin/strip" } + + # Anticipated future default. + unfiltered_cxx_flag: "-no-canonical-prefixes" + unfiltered_cxx_flag: "-fno-canonical-system-headers" + + # Make C++ compilation deterministic. Use linkstamping instead of these + # compiler symbols. + unfiltered_cxx_flag: "-Wno-builtin-macro-redefined" + unfiltered_cxx_flag: "-D__DATE__=\"redacted\"" + unfiltered_cxx_flag: "-D__TIMESTAMP__=\"redacted\"" + unfiltered_cxx_flag: "-D__TIME__=\"redacted\"" + + # Security hardening on by default. + # Conservative choice; -D_FORTIFY_SOURCE=2 may be unsafe in some cases. + # We need to undef it before redefining it as some distributions now have + # it enabled by default. + compiler_flag: "-U_FORTIFY_SOURCE" + compiler_flag: "-D_FORTIFY_SOURCE=1" + compiler_flag: "-fstack-protector" + linker_flag: "-Wl,-z,relro,-z,now" + + # Enable coloring even if there's no attached terminal. Bazel removes the + # escape sequences if --nocolor is specified. This isn't supported by gcc + # on Ubuntu 14.04. + # compiler_flag: "-fcolor-diagnostics" + + # All warnings are enabled. Maybe enable -Werror as well? + compiler_flag: "-Wall" + # Enable a few more warnings that aren't part of -Wall. + compiler_flag: "-Wunused-but-set-parameter" + # But disable some that are problematic. + compiler_flag: "-Wno-free-nonheap-object" # has false positives + + # Keep stack frames for debugging, even in opt mode. + compiler_flag: "-fno-omit-frame-pointer" + + # Anticipated future default. + linker_flag: "-no-canonical-prefixes" + # Have gcc return the exit code from ld. + linker_flag: "-pass-exit-codes" + # Gold linker only? Can we enable this by default? + # linker_flag: "-Wl,--warn-execstack" + # linker_flag: "-Wl,--detect-odr-violations" + + compilation_mode_flags { + mode: DBG + # Enable debug symbols. + compiler_flag: "-g" + } + compilation_mode_flags { + mode: OPT + + # No debug symbols. + # Maybe we should enable https://gcc.gnu.org/wiki/DebugFission for opt or + # even generally? However, that can't happen here, as it requires special + # handling in Bazel. + compiler_flag: "-g0" + + # Conservative choice for -O + # -O3 can increase binary size and even slow down the resulting binaries. + # Profile first and / or use FDO if you need better performance than this. + compiler_flag: "-O2" + + # Disable assertions + compiler_flag: "-DNDEBUG" + + # Removal of unused code and data at link time (can this increase binary size in some cases?). + compiler_flag: "-ffunction-sections" + compiler_flag: "-fdata-sections" + linker_flag: "-Wl,--gc-sections" + } + linking_mode_flags { mode: DYNAMIC } + } + ''); + + osxCcWrapperFile = writeScript "osx_cc_wrapper.sh" (if stdenv.isDarwin then '' + #!${customBash}/bin/bash + # + # Copyright 2015 The Bazel Authors. All rights reserved. + # + # Licensed under the Apache License, Version 2.0 (the "License"); + # you may not use this file except in compliance with the License. + # You may obtain a copy of the License at + # + # http://www.apache.org/licenses/LICENSE-2.0 + # + # Unless required by applicable law or agreed to in writing, software + # distributed under the License is distributed on an "AS IS" BASIS, + # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + # See the License for the specific language governing permissions and + # limitations under the License. + # + # OS X relpath is not really working. This is a wrapper script around gcc + # to simulate relpath behavior. + # + # This wrapper uses install_name_tool to replace all paths in the binary + # (bazel-out/.../path/to/original/library.so) by the paths relative to + # the binary. It parses the command line to behave as rpath is supposed + # to work. + # + # See https://blogs.oracle.com/dipol/entry/dynamic_libraries_rpath_and_mac + # on how to set those paths for Mach-O binaries. + # + set -eu + + GCC="${clang}/bin/clang" + INSTALL_NAME_TOOL="${cctools}/bin/install_name_tool" + + LIBS= + LIB_DIRS= + RPATHS= + OUTPUT= + # let parse the option list + for i in "$@"; do + if [[ "''${OUTPUT}" = "1" ]]; then + OUTPUT=$i + elif [[ "$i" =~ ^-l(.*)$ ]]; then + LIBS="''${BASH_REMATCH[1]} $LIBS" + elif [[ "$i" =~ ^-L(.*)$ ]]; then + LIB_DIRS="''${BASH_REMATCH[1]} $LIB_DIRS" + elif [[ "$i" =~ ^-Wl,-rpath,\@loader_path/(.*)$ ]]; then + RPATHS="''${BASH_REMATCH[1]} ''${RPATHS}" + elif [[ "$i" = "-o" ]]; then + # output is coming + OUTPUT=1 + fi + done + + # Call gcc + ''${GCC} "$@" + + function get_library_path() { + for libdir in ''${LIB_DIRS}; do + if [ -f ''${libdir}/lib$1.so ]; then + echo "''${libdir}/lib$1.so" + elif [ -f ''${libdir}/lib$1.dylib ]; then + echo "''${libdir}/lib$1.dylib" + fi + done + } + + # A convenient method to return the actual path even for non symlinks + # and multi-level symlinks. + function get_realpath() { + local previous="$1" + local next=$(readlink "''${previous}") + while [ -n "''${next}" ]; do + previous="''${next}" + next=$(readlink "''${previous}") + done + echo "''${previous}" + } + + # Get the path of a lib inside a tool + function get_otool_path() { + # the lib path is the path of the original lib relative to the workspace + get_realpath $1 | sed 's|^.*/bazel-out/|bazel-out/|' + } + + # Do replacements in the output + for rpath in ''${RPATHS}; do + for lib in ''${LIBS}; do + unset libname + if [ -f "$(dirname ''${OUTPUT})/''${rpath}/lib''${lib}.so" ]; then + libname="lib''${lib}.so" + elif [ -f "$(dirname ''${OUTPUT})/''${rpath}/lib''${lib}.dylib" ]; then + libname="lib''${lib}.dylib" + fi + # ''${libname-} --> return $libname if defined, or undefined otherwise. This is to make + # this set -e friendly + if [[ -n "''${libname-}" ]]; then + libpath=$(get_library_path ''${lib}) + if [ -n "''${libpath}" ]; then + ''${INSTALL_NAME_TOOL} -change $(get_otool_path "''${libpath}") \ + "@loader_path/''${rpath}/''${libname}" "''${OUTPUT}" + fi + fi + done + done + '' else ""); + postPatch = stdenv.lib.optionalString stdenv.hostPlatform.isDarwin '' export NIX_LDFLAGS="$NIX_LDFLAGS -F${CoreFoundation}/Library/Frameworks -F${CoreServices}/Library/Frameworks -F${Foundation}/Library/Frameworks" + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -isystem ${libcxx}/include/c++/v1" '' + '' + mkdir nix + cp ${buildFile} nix/BUILD + cp ${crosstoolFile} nix/CROSSTOOL + line=70 + for flag in $NIX_CFLAGS_COMPILE; do + sed -i -e "$line a compiler_flag: \"$flag\"" nix/CROSSTOOL + line=$((line + 1)) + done + for flag in $NIX_LDFLAGS; do + sed -i -e "$line a linker_flag: \"-Wl,$flag\"" nix/CROSSTOOL + line=$((line + 1)) + done + + cp ${osxCcWrapperFile} nix/osx_cc_wrapper.sh find src/main/java/com/google/devtools -type f -print0 | while IFS="" read -r -d "" path; do substituteInPlace "$path" \ --replace /bin/bash ${customBash}/bin/bash \ @@ -67,15 +454,14 @@ stdenv.mkDerivation rec { # Fixup scripts that generate scripts. Not fixed up by patchShebangs below. substituteInPlace scripts/bootstrap/compile.sh \ --replace /bin/sh ${customBash}/bin/bash - echo "build --copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --copt=\"/g')\"" >> .bazelrc - echo "build --host_copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --host_copt=\"/g')\"" >> .bazelrc - echo "build --linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --linkopt=\"-Wl,/g')\"" >> .bazelrc - echo "build --host_linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --host_linkopt=\"-Wl,/g')\"" >> .bazelrc - sed -i -e "361 a --copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --copt=\"/g')\" \\\\" scripts/bootstrap/compile.sh - sed -i -e "361 a --host_copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --host_copt=\"/g')\" \\\\" scripts/bootstrap/compile.sh - sed -i -e "361 a --linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --linkopt=\"-Wl,/g')\" \\\\" scripts/bootstrap/compile.sh - sed -i -e "361 a --host_linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --host_linkopt=\"-Wl,/g')\" \\\\" scripts/bootstrap/compile.sh + sed -i -e "361 a --crosstool_top=//nix:nix --host_crosstool_top=//nix:nix \\\\" scripts/bootstrap/compile.sh patchShebangs . + '' + lib.optionalString stdenv.isDarwin '' + sed -i "s,/usr/bin/xcrun clang,clang $NIX_CFLAGS_COMPILE $NIX_LDFLAGS -framework CoreFoundation,g" \ + scripts/bootstrap/compile.sh \ + src/tools/xcode/realpath/BUILD \ + src/tools/xcode/stdredirect/BUILD \ + tools/osx/BUILD ''; buildInputs = [ @@ -83,13 +469,14 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ + gnused zip python unzip makeWrapper which customBash - ] ++ lib.optionals (stdenv.isDarwin) [ libcxx CoreFoundation CoreServices Foundation ]; + ] ++ lib.optionals (stdenv.isDarwin) [ cctools clang libcxx CoreFoundation CoreServices Foundation ]; # If TMPDIR is in the unpack dir we run afoul of blaze's infinite symlink # detector (see com.google.devtools.build.lib.skyframe.FileFunction). @@ -100,7 +487,8 @@ stdenv.mkDerivation rec { ./compile.sh ./output/bazel --output_user_root=/tmp/.bazel build //scripts:bash_completion \ --spawn_strategy=standalone \ - --genrule_strategy=standalone + --genrule_strategy=standalone \ + --crosstool_top=//nix:nix --host_crosstool_top=//nix:nix cp bazel-bin/scripts/bazel-complete.bash output/ ''; @@ -110,6 +498,7 @@ stdenv.mkDerivation rec { checkPhase = '' export TEST_TMPDIR=$(pwd) ./output/bazel test --test_output=errors \ + --crosstool_top=//nix:nix --host_crosstool_top=//nix:nix \ examples/cpp:hello-success_test \ examples/java-native/src/test/java/com/example/myproject:hello ''; diff --git a/pkgs/development/tools/build-managers/buildbot/default.nix b/pkgs/development/tools/build-managers/buildbot/default.nix index ed73d26768a4..3729abfe247d 100644 --- a/pkgs/development/tools/build-managers/buildbot/default.nix +++ b/pkgs/development/tools/build-managers/buildbot/default.nix @@ -14,11 +14,11 @@ let package = pythonPackages.buildPythonApplication rec { name = "${pname}-${version}"; pname = "buildbot"; - version = "1.1.1"; + version = "1.2.0"; src = pythonPackages.fetchPypi { inherit pname version; - sha256 = "1vcmanx3ma3cfyiddjcmsnx6qmxd3m5blqax04rcsiq2zq4dmzir"; + sha256 = "02gwmls8kgm6scy36hdy0bg645zs1pxlrgwkcn79wrl7cfmabcbv"; }; buildInputs = with pythonPackages; [ diff --git a/pkgs/development/tools/build-managers/buildbot/plugins.nix b/pkgs/development/tools/build-managers/buildbot/plugins.nix index c8a12c192647..430cdee3ca8c 100644 --- a/pkgs/development/tools/build-managers/buildbot/plugins.nix +++ b/pkgs/development/tools/build-managers/buildbot/plugins.nix @@ -11,7 +11,7 @@ src = pythonPackages.fetchPypi { inherit pname version format; - sha256 = "01v9w8iy9q6fwrmz6db7fanjixax7whn74k67bj0czrbjjkpfzvb"; + sha256 = "001kxjcyn5sxiq7m1izy4djj7alw6qpgaid4f518s9xgm4a8hwcb"; }; meta = with stdenv.lib; { @@ -29,7 +29,7 @@ src = pythonPackages.fetchPypi { inherit pname version; - sha256 = "1cwxkzpgwzk9b361rj980bbnmhzzsr46pgf94zqpg3na8xm6hpwj"; + sha256 = "11p9l9r9rh8cq0ihzjcdxfbi55n7inbsz45zqq67rkvqn5nhj5b6"; }; propagatedBuildInputs = with pythonPackages; [ buildbot-pkg ]; @@ -49,7 +49,7 @@ src = pythonPackages.fetchPypi { inherit pname version; - sha256 = "0ival58f50128315d0nck63pzya2zm7q6hvgmxfbjl0my8il9p2l"; + sha256 = "1yx63frfpbvwy4hfib1psyq5ad0wysyzfrla8d7lgbdaip021wzw"; }; propagatedBuildInputs = with pythonPackages; [ buildbot-pkg ]; @@ -69,7 +69,7 @@ src = pythonPackages.fetchPypi { inherit pname version; - sha256 = "0jiwfb699nqbmpcm88y187ig4ha6p7d4v98mjwa9blhm54dk8kh1"; + sha256 = "06my75hli3w1skdkx1qz6zqw2wckanhrcvlqm4inylj9v9pcrgv6"; }; propagatedBuildInputs = with pythonPackages; [ buildbot-pkg ]; @@ -89,7 +89,7 @@ src = pythonPackages.fetchPypi { inherit pname version; - sha256 = "00mfn24gbwr2p3n7nsijzv949l7hiksiafhma18nnh40r8f4l5f2"; + sha256 = "073gz44fa5k1p8k46k0ld9gg16j8zdj6sc297qfyqpiw28ybhc5s"; }; propagatedBuildInputs = with pythonPackages; [ buildbot-pkg ]; diff --git a/pkgs/development/tools/build-managers/buildbot/worker.nix b/pkgs/development/tools/build-managers/buildbot/worker.nix index b1cfb6aeaf2f..968411ca9cc5 100644 --- a/pkgs/development/tools/build-managers/buildbot/worker.nix +++ b/pkgs/development/tools/build-managers/buildbot/worker.nix @@ -3,11 +3,11 @@ pythonPackages.buildPythonApplication (rec { name = "${pname}-${version}"; pname = "buildbot-worker"; - version = "1.1.1"; + version = "1.2.0"; src = pythonPackages.fetchPypi { inherit pname version; - sha256 = "02xfzlcy3cnvc3cmpl9gs6209a3qm71yz5pahbws9jcyhv6fbrrm"; + sha256 = "0lcaga16zf75aa6ckl9ahjbrs3n3bw7nj6m8g03n77873cgh94x4"; }; buildInputs = with pythonPackages; [ setuptoolsTrial mock ]; diff --git a/pkgs/development/tools/build-managers/conan/default.nix b/pkgs/development/tools/build-managers/conan/default.nix index 46433233992b..d80769bf210b 100644 --- a/pkgs/development/tools/build-managers/conan/default.nix +++ b/pkgs/development/tools/build-managers/conan/default.nix @@ -20,12 +20,12 @@ let newPython = python.override { }; in newPython.pkgs.buildPythonApplication rec { - version = "1.4.5"; + version = "1.5.1"; pname = "conan"; src = newPython.pkgs.fetchPypi { inherit pname version; - sha256 = "1mjakrv1d7la3lrxsv6jjqprqwmslpjmfxkw3z7pk56rzlp99nv2"; + sha256 = "1b0iym41fpgv8vwbyys5hrh87pvh3hy2m9c01ybm72z2ki2pwxim"; }; postPatch = '' diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix index 7570c3be0679..f810f97ef497 100644 --- a/pkgs/development/tools/build-managers/gradle/default.nix +++ b/pkgs/development/tools/build-managers/gradle/default.nix @@ -52,12 +52,12 @@ rec { }; gradle_latest = gradleGen rec { - name = "gradle-4.8"; + name = "gradle-4.8.1"; nativeVersion = "0.14"; src = fetchurl { url = "http://services.gradle.org/distributions/${name}-bin.zip"; - sha256 = "1fpihf35nd2wqh3ghkk9x0x2nr1s4vx3dgrfn2q4xagsm299dqpk"; + sha256 = "0wgdf1iv0izi957hay1xfsk5xnl6s2vx5dammcwy8say9fclscxg"; }; }; diff --git a/pkgs/development/tools/build-managers/redo/default.nix b/pkgs/development/tools/build-managers/redo/default.nix index 8063b6747666..bd0562463fd7 100644 --- a/pkgs/development/tools/build-managers/redo/default.nix +++ b/pkgs/development/tools/build-managers/redo/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, perl }: stdenv.mkDerivation rec { - name = "redo-1.2"; + name = "redo-1.3"; src = fetchurl { url = "https://jdebp.eu./Repository/freebsd/${name}.tar.gz"; - sha256 = "0qr8plllxfn32r4rgnalzlhcs3b4l8a4ga8ig9v8i5iy1qnfhqnf"; + sha256 = "1yx7nd59s01j096hr1zbnbx6mvd6ljzd4vgawh7p2l644jgwj70r"; }; nativeBuildInputs = [ perl /* for pod2man */ ]; diff --git a/pkgs/development/tools/database/sqlitebrowser/default.nix b/pkgs/development/tools/database/sqlitebrowser/default.nix index 054eabdb5e43..1b4a4b7f50b2 100644 --- a/pkgs/development/tools/database/sqlitebrowser/default.nix +++ b/pkgs/development/tools/database/sqlitebrowser/default.nix @@ -33,7 +33,7 @@ mkDerivation rec { description = "DB Browser for SQLite"; homepage = http://sqlitebrowser.org/; license = licenses.gpl3; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ ma27 ]; platforms = platforms.linux; # can only test on linux }; } diff --git a/pkgs/development/tools/easyjson/default.nix b/pkgs/development/tools/easyjson/default.nix index 9277ebe363fb..253f5b374d3c 100644 --- a/pkgs/development/tools/easyjson/default.nix +++ b/pkgs/development/tools/easyjson/default.nix @@ -3,15 +3,15 @@ buildGoPackage rec { name = "easyjson-unstable-${version}"; - version = "2018-03-23"; - rev = "8b799c424f57fa123fc63a99d6383bc6e4c02578"; + version = "2018-06-06"; + rev = "3fdea8d05856a0c8df22ed4bc71b3219245e4485"; goPackagePath = "github.com/mailru/easyjson"; src = fetchgit { inherit rev; url = "https://github.com/mailru/easyjson"; - sha256 = "15ba6drfmw98lzw5qjh3ijcxh9iz9rcp3hid169yfd08l06z05w0"; + sha256 = "0g3crph77yhv4ipdnwqc32z4cp87ahi4ikad5kyy6q4znnxliz74"; }; goDeps = ./deps.nix; diff --git a/pkgs/development/tools/misc/gob2/default.nix b/pkgs/development/tools/misc/gob2/default.nix index 73c9021c5e9f..17aa3214ebcc 100644 --- a/pkgs/development/tools/misc/gob2/default.nix +++ b/pkgs/development/tools/misc/gob2/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = { description = "Preprocessor for making GObjects with inline C code"; - homepage = http://www.jirka.org/gob.html; + homepage = https://www.jirka.org/gob.html; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/development/tools/misc/tokei/default.nix b/pkgs/development/tools/misc/tokei/default.nix index d1f6cc4ea29b..0059c10afe0c 100644 --- a/pkgs/development/tools/misc/tokei/default.nix +++ b/pkgs/development/tools/misc/tokei/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { name = "tokei-${version}"; - version = "7.0.0"; + version = "7.0.3"; src = fetchFromGitHub { owner = "Aaronepower"; repo = "tokei"; rev = "v${version}"; - sha256 = "1c8m2arhy58ky8pzj0dp3w9gpacia9jwmayi0il640l4fm8nr734"; + sha256 = "1n2ddwmyd414p6a98khq8y0bmljwcclw30wy5zy5b6z1l40yxcza"; }; - cargoSha256 = "1cl4fjbvrw7zhpb8rxj566ddlxbj9vdsb1cp7mh6llmvaia2vgks"; + cargoSha256 = "0ngqk8nnw00s25y91vgsl37j26xl2ws75l3lvklf9gbd4bi01crv"; meta = with stdenv.lib; { description = "Count code, quickly"; diff --git a/pkgs/games/dwarf-fortress/default.nix b/pkgs/games/dwarf-fortress/default.nix index ee2e442daa28..b959ea3eda73 100644 --- a/pkgs/games/dwarf-fortress/default.nix +++ b/pkgs/games/dwarf-fortress/default.nix @@ -15,13 +15,10 @@ let # unfuck is linux-only right now, we will just use it there dwarf-fortress-unfuck = if stdenv.isLinux then callPackage ./unfuck.nix { } - else null; + else null; dwarf-fortress = callPackage ./wrapper { - themes = { - "phoebus" = phoebus-theme; - "cla" = cla-theme; - }; + inherit themes; }; dwarf-therapist-original = pkgs.qt5.callPackage ./dwarf-therapist { @@ -32,6 +29,8 @@ let dwarf-therapist = callPackage ./dwarf-therapist/wrapper.nix { }; + legends-browser = callPackage ./legends-browser {}; + themes = callPackage ./themes { stdenv = stdenvNoCC; }; diff --git a/pkgs/games/dwarf-fortress/dfhack/default.nix b/pkgs/games/dwarf-fortress/dfhack/default.nix index 11964c627da2..a6430fa3c260 100644 --- a/pkgs/games/dwarf-fortress/dfhack/default.nix +++ b/pkgs/games/dwarf-fortress/dfhack/default.nix @@ -5,11 +5,11 @@ }: let - dfVersion = "0.44.10"; - version = "${dfVersion}-r1"; + dfVersion = "0.44.11"; + version = "${dfVersion}-alpha1"; # revision of library/xml submodule - xmlRev = "3c0bf63674d5430deadaf7befaec42f0ec1e8bc5"; + xmlRev = "853bd161270f50b21fe4b751de339458f78f56d6"; arch = if stdenv.system == "x86_64-linux" then "64" @@ -40,7 +40,7 @@ in stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "DFHack"; repo = "dfhack"; - sha256 = "15hz90lfg7asgm4bqa2yi2lkwzrljphb42q6616sriwzs66xia6h"; + sha256 = "1vzrpdw0pn18calayf9dwqpyg37cb7wkzkvskxjx9nak5ilxzywm"; rev = version; fetchSubmodules = true; }; @@ -72,6 +72,6 @@ in stdenv.mkDerivation rec { homepage = https://github.com/DFHack/dfhack/; license = licenses.zlib; platforms = [ "x86_64-linux" "i686-linux" ]; - maintainers = with maintainers; [ robbinch a1russell abbradar ]; + maintainers = with maintainers; [ robbinch a1russell abbradar numinit ]; }; } diff --git a/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix b/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix index 305f3cdb1fa3..bd63e3eae91f 100644 --- a/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix +++ b/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "dwarf-therapist-original-${version}"; - version = "40.0.0"; + version = "40.1.0"; src = fetchFromGitHub { owner = "Dwarf-Therapist"; repo = "Dwarf-Therapist"; rev = "v${version}"; - sha256 = "0b5y7800nzydn0jcc0vglgi9mzkj8f3qhw16wd872cf5396xnag9"; + sha256 = "1aklwic5npgkp8rkrvz2q9idkipsm1h26mgd8q03135nzl1ld9q3"; }; buildInputs = [ qtbase qtdeclarative ]; @@ -20,8 +20,8 @@ stdenv.mkDerivation rec { '' else null; meta = with stdenv.lib; { - description = "Tool to manage dwarves in in a running game of Dwarf Fortress"; - maintainers = with maintainers; [ the-kenny abbradar bendlas ]; + description = "Tool to manage dwarves in a running game of Dwarf Fortress"; + maintainers = with maintainers; [ the-kenny abbradar bendlas numinit ]; license = licenses.mit; platforms = platforms.unix; homepage = https://github.com/Dwarf-Therapist/Dwarf-Therapist; diff --git a/pkgs/games/dwarf-fortress/game.nix b/pkgs/games/dwarf-fortress/game.nix index 477ba33b77c6..97a94c940cd4 100644 --- a/pkgs/games/dwarf-fortress/game.nix +++ b/pkgs/games/dwarf-fortress/game.nix @@ -9,7 +9,7 @@ with lib; let baseVersion = "44"; - patchVersion = "10"; + patchVersion = "11"; dfVersion = "0.${baseVersion}.${patchVersion}"; libpath = makeLibraryPath [ stdenv.cc.cc stdenv.cc.libc dwarf-fortress-unfuck SDL ]; @@ -21,15 +21,15 @@ let srcs = { "x86_64-linux" = fetchurl { url = "${homepage}df_${baseVersion}_${patchVersion}_linux.tar.bz2"; - sha256 = "1cqm43hn3ar9d8a7y7dwq48ajp72cirn1gclh8r2fykkypprxmp2"; + sha256 = "1qizfkxl2k6pn70is4vz94q4k55bc3pm13b2r6yqi6lw1cnna4sf"; }; "i686-linux" = fetchurl { url = "${homepage}df_${baseVersion}_${patchVersion}_linux32.tar.bz2"; - sha256 = "0gdb6sq8725nwdisxwha8f5b6arq570s73aj4gdrh611gxh13r6n"; + sha256 = "11m39lfyrsxlw1g7f269q7fzwichg06l21fxhqzgvlvmzmxsf8q5"; }; "x86_64-darwin" = fetchurl { url = "${homepage}df_${baseVersion}_${patchVersion}_osx.tar.bz2"; - sha256 = "1wpa45d81q8f5mhqmaxvdkz93k6cm3pg7vpsqjjjsp5s961gd74g"; + sha256 = "073hmcj7bm323m3xqi42605rkvmgmv83bnxz1byymgs8aqyfykkx"; }; }; @@ -88,6 +88,6 @@ stdenv.mkDerivation { inherit homepage; license = licenses.unfreeRedistributable; platforms = attrNames srcs; - maintainers = with maintainers; [ a1russell robbinch roconnor the-kenny abbradar ]; + maintainers = with maintainers; [ a1russell robbinch roconnor the-kenny abbradar numinit ]; }; } diff --git a/pkgs/games/dwarf-fortress/legends-browser/default.nix b/pkgs/games/dwarf-fortress/legends-browser/default.nix new file mode 100644 index 000000000000..3bc4fa9c4bb5 --- /dev/null +++ b/pkgs/games/dwarf-fortress/legends-browser/default.nix @@ -0,0 +1,36 @@ +{ stdenvNoCC, buildEnv, writeShellScriptBin, fetchurl, jre }: + +let + name = "legends-browser-${version}"; + version = "1.17.1"; + + jar = fetchurl { + url = "https://github.com/robertjanetzko/LegendsBrowser/releases/download/${version}/legendsbrowser-${version}.jar"; + sha256 = "05b4ksbl4481rh3ykfirbp6wvxhppcd5mvclhn9995gsrcaj8gx9"; + }; + + script = writeShellScriptBin "legends-browser" '' + set -eu + BASE="$HOME/.local/share/df_linux/legends-browser/" + mkdir -p "$BASE" + cd "$BASE" + if [[ ! -e legendsbrowser.properties ]]; then + echo 'Creating initial configuration for legends-browser' + echo "last=$(cd ..; pwd)" > legendsbrowser.properties + fi + ${jre}/bin/java -jar ${jar} + ''; +in + +buildEnv { + inherit name; + paths = [ script ]; + + meta = with stdenvNoCC.lib; { + description = "A multi-platform, open source, java-based legends viewer for dwarf fortress"; + maintainers = with maintainers; [ Baughn ]; + license = licenses.mit; + platforms = platforms.all; + homepage = https://github.com/robertjanetzko/LegendsBrowser; + }; +} diff --git a/pkgs/games/dwarf-fortress/soundsense.nix b/pkgs/games/dwarf-fortress/soundsense.nix index f09ac8435482..0a501bc3c052 100644 --- a/pkgs/games/dwarf-fortress/soundsense.nix +++ b/pkgs/games/dwarf-fortress/soundsense.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { version = "2016-1_196"; - dfVersion = "0.44.10"; + dfVersion = "0.44.11"; inherit soundPack; name = "soundsense-${version}"; src = fetchzip { diff --git a/pkgs/games/dwarf-fortress/unfuck.nix b/pkgs/games/dwarf-fortress/unfuck.nix index d816ba461b11..b9887fe4cfc0 100644 --- a/pkgs/games/dwarf-fortress/unfuck.nix +++ b/pkgs/games/dwarf-fortress/unfuck.nix @@ -3,7 +3,7 @@ , ncurses, glib, gtk2, libsndfile, zlib }: -let dfVersion = "0.44.10"; in +let dfVersion = "0.44.11"; in stdenv.mkDerivation { name = "dwarf_fortress_unfuck-${dfVersion}"; @@ -12,7 +12,7 @@ stdenv.mkDerivation { owner = "svenstaro"; repo = "dwarf_fortress_unfuck"; rev = dfVersion; - sha256 = "0vb19qx2ibc79j4bgbk9lskb883qfb0815zw1dfz9k7rqwal8mzj"; + sha256 = "0kkk8md2xq8l0c4m9hkg66qqjad3xi4jbb5z2ginhqixxpfbz8rf"; }; cmakeFlags = [ @@ -20,12 +20,26 @@ stdenv.mkDerivation { "-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2.out}/lib/gtk-2.0/include" ]; + makeFlags = [ + ''CFLAGS="-fkeep-inline-functions"'' + ''CXXFLAGS="-fkeep-inline-functions"'' + ]; + nativeBuildInputs = [ cmake ]; buildInputs = [ libSM SDL SDL_image SDL_ttf glew openalSoft ncurses gtk2 libsndfile zlib libGL ]; + postPatch = '' + substituteInPlace CMakeLists.txt --replace \ + 'set(CMAKE_BUILD_TYPE Release)' \ + 'set(CMAKE_BUILD_TYPE Debug)' + ''; + + # Don't strip unused symbols; dfhack hooks into some of them. + dontStrip = true; + installPhase = '' install -D -m755 ../build/libgraphics.so $out/lib/libgraphics.so ''; diff --git a/pkgs/games/dwarf-fortress/wrapper/default.nix b/pkgs/games/dwarf-fortress/wrapper/default.nix index e82cc2be680d..9b171fc88b76 100644 --- a/pkgs/games/dwarf-fortress/wrapper/default.nix +++ b/pkgs/games/dwarf-fortress/wrapper/default.nix @@ -17,15 +17,15 @@ let else theme; # These are in inverse order for first packages to override the next ones. - pkgs = lib.optional (theme != null) ptheme - ++ lib.optional enableDFHack dfhack_ + themePkg = lib.optional (theme != null) ptheme; + pkgs = lib.optional enableDFHack dfhack_ ++ lib.optional enableSoundSense soundSense ++ [ dwarf-fortress-original ]; env = buildEnv { name = "dwarf-fortress-env-${dwarf-fortress-original.dfVersion}"; - paths = pkgs; + paths = themePkg ++ pkgs; pathsToLink = [ "/" "/hack" "/hack/scripts" ]; ignoreCollisions = true; @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { src = ./dwarf-fortress-init.in; inherit env; exe = if stdenv.isLinux then "libs/Dwarf_Fortress" - else "dwarfort.exe"; + else "dwarfort.exe"; }; runDF = ./dwarf-fortress.in; diff --git a/pkgs/games/ezquake/default.nix b/pkgs/games/ezquake/default.nix index 2684a56a8286..ff39d1b99650 100644 --- a/pkgs/games/ezquake/default.nix +++ b/pkgs/games/ezquake/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, curl, expat -, jansson, libpng, libjpeg, libGLU_combined, pcre +, jansson, libpng, libjpeg, libGLU_combined, libXxf86vm, pcre , pkgconfig, SDL2, vimNox }: stdenv.mkDerivation rec { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - expat curl jansson libpng libjpeg libGLU_combined pcre SDL2 vimNox + expat curl jansson libpng libjpeg libGLU_combined libXxf86vm pcre SDL2 vimNox ]; installPhase = with stdenv.lib; let @@ -28,6 +28,8 @@ stdenv.mkDerivation rec { mv ezquake-${sys}-${arch} $out/bin/ezquake ''; + enableParallelBuilding = true; + meta = with stdenv.lib; { homepage = http://ezquake.github.io/; description = "A modern QuakeWorld client focused on competitive online play."; diff --git a/pkgs/games/ivan/default.nix b/pkgs/games/ivan/default.nix index 3431be5359ea..3281c3d28d12 100644 --- a/pkgs/games/ivan/default.nix +++ b/pkgs/games/ivan/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub, libpng, cmake, SDL2, SDL2_mixer, pkgconfig, pcre}: +{ stdenv, fetchFromGitHub, cmake, pkgconfig, SDL2, SDL2_mixer, alsaLib, libpng, pcre }: stdenv.mkDerivation rec { @@ -12,12 +12,12 @@ stdenv.mkDerivation rec { sha256 = "1r3fcccgpjmzzkg0lfmq76igjapr01kh97vz671z60jg7gyh301b"; }; - buildInputs = [SDL2 SDL2_mixer libpng pcre]; + nativeBuildInputs = [ cmake pkgconfig ]; - nativeBuildInputs = [cmake pkgconfig]; + buildInputs = [ SDL2 SDL2_mixer alsaLib libpng pcre ]; hardeningDisable = ["all"]; - + # To store bone and high score files in ~/.ivan of the current user patches = [./homedir.patch]; diff --git a/pkgs/games/liberal-crime-squad/default.nix b/pkgs/games/liberal-crime-squad/default.nix index d6a2afb26cb8..fef6e11d9be9 100644 --- a/pkgs/games/liberal-crime-squad/default.nix +++ b/pkgs/games/liberal-crime-squad/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, stdenv, ncurses, autoreconfHook, SDL2, SDL2_mixer }: +{ fetchFromGitHub, stdenv, autoreconfHook, libiconv, ncurses, SDL2, SDL2_mixer }: stdenv.mkDerivation rec { version = "2016-07-06"; @@ -12,7 +12,9 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ ncurses SDL2 SDL2_mixer ]; + buildInputs = [ libiconv ncurses SDL2 SDL2_mixer ]; + + enableParallelBuilding = true; meta = with stdenv.lib; { description = "A humorous politically themed ncurses game"; diff --git a/pkgs/games/scummvm/default.nix b/pkgs/games/scummvm/default.nix index fcde5b5ea59f..f4590081898a 100644 --- a/pkgs/games/scummvm/default.nix +++ b/pkgs/games/scummvm/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Program to run certain classic graphical point-and-click adventure games (such as Monkey Island)"; - homepage = http://www.scummvm.org/; + homepage = https://www.scummvm.org/; license = licenses.gpl2; maintainers = [ maintainers.peterhoeg ]; platforms = platforms.linux; diff --git a/pkgs/games/warzone2100/default.nix b/pkgs/games/warzone2100/default.nix index 6ed276c0695b..6165cacfdca5 100644 --- a/pkgs/games/warzone2100/default.nix +++ b/pkgs/games/warzone2100/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, perl, unzip, zip, which, pkgconfig -, qtbase, qtscript, SDL2, libtheora, openal, glew, physfs, fribidi +, qtbase, qtscript, SDL2, libtheora, openal, glew, physfs, fribidi, libXrandr , withVideos ? false }: @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { sha256 = "10kmpr4cby95zwqsl1zwx95d9achli6khq7flv6xmrq30a39xazw"; }; - buildInputs = [ qtbase qtscript SDL2 libtheora openal glew physfs fribidi ]; + buildInputs = [ qtbase qtscript SDL2 libtheora openal glew physfs fribidi libXrandr ]; nativeBuildInputs = [ perl zip unzip pkgconfig ]; postPatch = '' diff --git a/pkgs/misc/cups/drivers/canon/default.nix b/pkgs/misc/cups/drivers/canon/default.nix index 351a64abd331..1c0b8e13ab0b 100644 --- a/pkgs/misc/cups/drivers/canon/default.nix +++ b/pkgs/misc/cups/drivers/canon/default.nix @@ -1,10 +1,10 @@ -{stdenv, fetchurl, unzip, autoreconfHook, libtool, makeWrapper, cups, ghostscript, callPackage_i686 }: +{stdenv, fetchurl, unzip, autoreconfHook, libtool, makeWrapper, cups, ghostscript, pkgsi686Linux }: let - i686_NIX_GCC = callPackage_i686 ({gcc}: gcc) {}; - i686_libxml2 = callPackage_i686 ({libxml2}: libxml2) {}; - i686_glibc = callPackage_i686 ({glibc}: glibc) {}; + i686_NIX_GCC = pkgsi686Linux.callPackage ({gcc}: gcc) {}; + i686_libxml2 = pkgsi686Linux.callPackage ({libxml2}: libxml2) {}; + i686_glibc = pkgsi686Linux.callPackage ({glibc}: glibc) {}; src_canon = fetchurl { url = "https://files.canon-europe.com/files/soft45378/software/o147jen_linuxufrII_0290.zip"; diff --git a/pkgs/misc/cups/drivers/mfcl2740dwcupswrapper/default.nix b/pkgs/misc/cups/drivers/mfcl2740dwcupswrapper/default.nix new file mode 100644 index 000000000000..0da85498723f --- /dev/null +++ b/pkgs/misc/cups/drivers/mfcl2740dwcupswrapper/default.nix @@ -0,0 +1,45 @@ +{ stdenv, fetchurl, dpkg, makeWrapper, coreutils, gnugrep, gnused, perl, mfcl2740dwlpr }: + +stdenv.mkDerivation rec { + name = "mfcl2740dwcupswrapper-${version}"; + version = "3.2.0-1"; + + src = fetchurl { + url = "https://download.brother.com/welcome/dlf101726/${name}.i386.deb"; + sha256 = "078453e19f20ab6c7fc4d63c3e09f162f3d1410c04c23a294b6ffbd720b35ffb"; + }; + + nativeBuildInputs = [ dpkg makeWrapper ]; + + unpackPhase = "dpkg-deb -x $src $out"; + + installPhase = '' + basedir=${mfcl2740dwlpr}/opt/brother/Printers/MFCL2740DW + dir=$out/opt/brother/Printers/MFCL2740DW + + substituteInPlace $dir/cupswrapper/brother_lpdwrapper_MFCL2740DW \ + --replace /usr/bin/perl ${perl}/bin/perl \ + --replace "basedir =~" "basedir = \"$basedir\"; #" \ + --replace "PRINTER =~" "PRINTER = \"MFCL2740DW\"; #" + + substituteInPlace $dir/cupswrapper/paperconfigml1 \ + --replace /usr/bin/perl ${perl}/bin/perl + + wrapProgram $dir/cupswrapper/brother_lpdwrapper_MFCL2740DW \ + --prefix PATH : ${stdenv.lib.makeBinPath [ coreutils gnugrep gnused ]} + + mkdir -p $out/lib/cups/filter + mkdir -p $out/share/cups/model + + ln $dir/cupswrapper/brother_lpdwrapper_MFCL2740DW $out/lib/cups/filter + ln $dir/cupswrapper/brother-MFCL2740DW-cups-en.ppd $out/share/cups/model + ''; + + meta = { + description = "Brother MFC-L2740DW CUPS wrapper driver"; + homepage = http://www.brother.com/; + license = stdenv.lib.licenses.gpl2; + platforms = [ "x86_64-linux" "i686-linux" ]; + maintainers = [ stdenv.lib.maintainers.enzime ]; + }; +} diff --git a/pkgs/misc/cups/drivers/mfcl2740dwlpr/default.nix b/pkgs/misc/cups/drivers/mfcl2740dwlpr/default.nix new file mode 100644 index 000000000000..6d3cf18e5296 --- /dev/null +++ b/pkgs/misc/cups/drivers/mfcl2740dwlpr/default.nix @@ -0,0 +1,43 @@ +{ pkgsi686Linux, stdenv, fetchurl, dpkg, makeWrapper, coreutils, ghostscript, gnugrep, gnused, which, perl }: + +stdenv.mkDerivation rec { + name = "mfcl2740dwlpr-${version}"; + version = "3.2.0-1"; + + src = fetchurl { + url = "https://download.brother.com/welcome/dlf101727/${name}.i386.deb"; + sha256 = "10a2bc672bd54e718b478f3afc7e47d451557f7d5513167d3ad349a3d00bffaf"; + }; + + nativeBuildInputs = [ dpkg makeWrapper ]; + + unpackPhase = "dpkg-deb -x $src $out"; + + installPhase = '' + dir=$out/opt/brother/Printers/MFCL2740DW + + substituteInPlace $dir/lpd/filter_MFCL2740DW \ + --replace /usr/bin/perl ${perl}/bin/perl \ + --replace "BR_PRT_PATH =~" "BR_PRT_PATH = \"$dir\"; #" \ + --replace "PRINTER =~" "PRINTER = \"MFCL2740DW\"; #" + + wrapProgram $dir/lpd/filter_MFCL2740DW \ + --prefix PATH : ${stdenv.lib.makeBinPath [ + coreutils ghostscript gnugrep gnused which + ]} + + # need to use i686 glibc here, these are 32bit proprietary binaries + interpreter=${pkgsi686Linux.glibc}/lib/ld-linux.so.2 + patchelf --set-interpreter "$interpreter" $dir/inf/braddprinter + patchelf --set-interpreter "$interpreter" $dir/lpd/brprintconflsr3 + patchelf --set-interpreter "$interpreter" $dir/lpd/rawtobr3 + ''; + + meta = { + description = "Brother MFC-L2740DW lpr driver"; + homepage = http://www.brother.com/; + license = stdenv.lib.licenses.unfree; + platforms = [ "x86_64-linux" "i686-linux" ]; + maintainers = [ stdenv.lib.maintainers.enzime ]; + }; +} diff --git a/pkgs/misc/emulators/dolphin-emu/master.nix b/pkgs/misc/emulators/dolphin-emu/master.nix index 3bfbc2565f35..6959177b3c9d 100644 --- a/pkgs/misc/emulators/dolphin-emu/master.nix +++ b/pkgs/misc/emulators/dolphin-emu/master.nix @@ -1,26 +1,16 @@ { stdenv, fetchFromGitHub, makeWrapper, makeDesktopItem, pkgconfig, cmake, qt5 -, bluez, ffmpeg, libao, libGLU_combined, gtk2, glib, pcre, gettext, libXrandr -, libpthreadstubs, libusb, libXext, libXxf86vm, libXinerama, libSM, libXdmcp -, readline, openal, libevdev, portaudio, curl -, vulkan-loader ? null -, libpulseaudio ? null +, bluez, ffmpeg, libao, libGLU_combined, pcre, gettext, libXrandr, libusb, lzo +, libpthreadstubs, libXext, libXxf86vm, libXinerama, libSM, libXdmcp, readline +, openal, libudev, libevdev, portaudio, curl, alsaLib, miniupnpc, enet, polarssl +, soundtouch, sfml, vulkan-loader ? null, libpulseaudio ? null # - Inputs used for Darwin -, CoreBluetooth, cf-private, ForceFeedback, IOKit, OpenGL, wxGTK, libpng, hidapi - -# options -, dolphin-wxgui ? true -, dolphin-qtgui ? false }: - -# XOR: ensure only wx XOR qt are enabled -assert dolphin-wxgui || dolphin-qtgui; -assert !(dolphin-wxgui && dolphin-qtgui); +, CoreBluetooth, cf-private, ForceFeedback, IOKit, OpenGL, libpng, hidapi }: let desktopItem = makeDesktopItem { name = "dolphin-emu-master"; - exec = stdenv.lib.optionalString dolphin-wxgui "dolphin-emu-wx" - + stdenv.lib.optionalString dolphin-qtgui "dolphin-emu-qt"; + exec = "dolphin-emu-master"; icon = "dolphin-emu"; comment = "A Wii/GameCube Emulator"; desktopName = "Dolphin Emulator (master)"; @@ -30,63 +20,54 @@ let }; in stdenv.mkDerivation rec { name = "dolphin-emu-${version}"; - version = "2018-06-22"; + version = "2018-07-02"; src = fetchFromGitHub { owner = "dolphin-emu"; repo = "dolphin"; - rev = "971972069cc2813ee7fa5b630c67baab2b35d12d"; - sha256 = "0kf6dzvwmvhqb1iy15ldap0mmfbyyzl5f14jc65a110vwv5sww7n"; + rev = "87c5d00e2085090e51c1d44e4fd271437123c722"; + sha256 = "04f0my5k1vrj3pcg07m6wy4in4cs95db8367bp7zkraparmj1mjk"; }; enableParallelBuilding = true; nativeBuildInputs = [ cmake pkgconfig ] - ++ stdenv.lib.optionals stdenv.isLinux [ makeWrapper ]; + ++ stdenv.lib.optionals stdenv.isLinux [ makeWrapper ]; buildInputs = [ - curl ffmpeg libao libGLU_combined gtk2 glib pcre gettext libpthreadstubs - libXrandr libXext libXxf86vm libXinerama libSM readline openal libXdmcp - portaudio libusb libpulseaudio libpng hidapi - ] ++ stdenv.lib.optionals dolphin-qtgui [ qt5.qtbase ] - ++ stdenv.lib.optionals stdenv.isLinux [ bluez libevdev vulkan-loader ] - ++ stdenv.lib.optionals stdenv.isDarwin [ wxGTK CoreBluetooth cf-private - ForceFeedback IOKit OpenGL ]; + curl ffmpeg libao libGLU_combined pcre gettext libpthreadstubs libpulseaudio + libXrandr libXext libXxf86vm libXinerama libSM readline openal libXdmcp lzo + portaudio libusb libpng hidapi miniupnpc enet polarssl soundtouch sfml + qt5.qtbase + ] ++ stdenv.lib.optionals stdenv.isLinux [ + bluez libudev libevdev alsaLib vulkan-loader + ] ++ stdenv.lib.optionals stdenv.isDarwin [ + CoreBluetooth cf-private OpenGL ForceFeedback IOKit + ]; cmakeFlags = [ - "-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib.out}/lib/glib-2.0/include" - "-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2.out}/lib/gtk-2.0/include" - "-DGTK2_INCLUDE_DIRS=${gtk2.dev}/include/gtk-2.0" - "-DENABLE_LTO=True" - ] ++ stdenv.lib.optionals (!dolphin-qtgui) [ "-DENABLE_QT2=False" ] - ++ stdenv.lib.optionals stdenv.isDarwin [ - "-DOSX_USE_DEFAULT_SEARCH_PATH=True" - ]; + "-DUSE_SHARED_ENET=ON" + "-DENABLE_LTO=ON" + ] ++ stdenv.lib.optionals stdenv.isDarwin [ + "-DOSX_USE_DEFAULT_SEARCH_PATH=True" + ]; - # - Change install path to Applications relative to $out # - Allow Dolphin to use nix-provided libraries instead of building them - preConfigure = stdenv.lib.optionalString stdenv.isDarwin '' - sed -i -e 's,/Applications,Applications,g' \ - Source/Core/DolphinWX/CMakeLists.txt + preConfigure = '' + sed -i -e 's,DISTRIBUTOR "None",DISTRIBUTOR "NixOS",g' CMakeLists.txt + '' + stdenv.lib.optionalString stdenv.isDarwin '' + sed -i -e 's,if(NOT APPLE),if(true),g' CMakeLists.txt sed -i -e 's,if(LIBUSB_FOUND AND NOT APPLE),if(LIBUSB_FOUND),g' \ CMakeLists.txt - sed -i -e 's,if(NOT APPLE),if(true),g' CMakeLists.txt - ''; - - preInstall = stdenv.lib.optionalString stdenv.isDarwin '' - mkdir -p "$out/Applications" ''; postInstall = '' cp -r ${desktopItem}/share/applications $out/share + ln -sf $out/bin/dolphin-emu $out/bin/dolphin-emu-master '' + stdenv.lib.optionalString stdenv.isLinux '' wrapProgram $out/bin/dolphin-emu-nogui \ --prefix LD_LIBRARY_PATH : ${vulkan-loader}/lib - wrapProgram $out/bin/dolphin-emu-wx \ - --prefix LD_LIBRARY_PATH : ${vulkan-loader}/lib - '' + stdenv.lib.optionalString (dolphin-qtgui && stdenv.isLinux) '' wrapProgram $out/bin/dolphin-emu \ --prefix LD_LIBRARY_PATH : ${vulkan-loader}/lib - ln -sf $out/bin/dolphin-emu $out/bin/dolphin-emu-qt ''; meta = with stdenv.lib; { diff --git a/pkgs/misc/emulators/wine/packages.nix b/pkgs/misc/emulators/wine/packages.nix index d2305aa37ba6..156db148435e 100644 --- a/pkgs/misc/emulators/wine/packages.nix +++ b/pkgs/misc/emulators/wine/packages.nix @@ -1,11 +1,11 @@ -{ system, stdenv, stdenv_32bit, lib, pkgs, pkgsi686Linux, callPackage, callPackage_i686, +{ system, stdenv, stdenv_32bit, lib, pkgs, pkgsi686Linux, callPackage, wineRelease ? "stable", supportFlags }: let src = lib.getAttr wineRelease (callPackage ./sources.nix {}); in with src; { - wine32 = callPackage_i686 ./base.nix { + wine32 = pkgsi686Linux.callPackage ./base.nix { name = "wine-${version}"; inherit src version supportFlags; pkgArches = [ pkgsi686Linux ]; @@ -33,4 +33,3 @@ in with src; { platforms = [ "x86_64-linux" ]; }; } - diff --git a/pkgs/misc/mxt-app/default.nix b/pkgs/misc/mxt-app/default.nix index 813000492039..fe9e8d3f4b00 100644 --- a/pkgs/misc/mxt-app/default.nix +++ b/pkgs/misc/mxt-app/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, autoreconfHook, libtool }: stdenv.mkDerivation rec{ - version="1.27"; + version="1.28"; name = "mxt-app-${version}"; src = fetchFromGitHub { owner = "atmel-maxtouch"; repo = "mxt-app"; rev = "v${version}"; - sha256 = "0m1qxsdkwgajyd0sdw909l4w31csa26nw0xzr9ldddnvzb1va05h"; + sha256 = "1z2mir4ib9xzxmy0daazzvlga41n80zch1xyp1iz98rrdsnvd1la"; }; nativeBuildInputs = [ autoreconfHook ]; @@ -21,6 +21,6 @@ stdenv.mkDerivation rec{ homepage = https://github.com/atmel-maxtouch/mxt-app; license = licenses.bsd2; maintainers = [ maintainers.colemickens ]; - platforms = platforms.unix; + platforms = platforms.linux; }; } diff --git a/pkgs/misc/themes/jade1/default.nix b/pkgs/misc/themes/jade1/default.nix index 9870b3fefebb..e6096ef829d0 100644 --- a/pkgs/misc/themes/jade1/default.nix +++ b/pkgs/misc/themes/jade1/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "theme-jade1-${version}"; - version = "3.2"; + version = "3.3"; src = fetchFromGitHub { owner = "madmaxms"; repo = "theme-jade-1"; rev = "v${version}"; - sha256 = "0lf8cawn2s2x1b9af0cznhqzx3dsr8h18srcwjz7af3y5daxf311"; + sha256 = "06w06dvzs1llmzpyz3c5yycsw3gslsgikalfcq5l92d72z4kzfw7"; }; propagatedUserEnvPkgs = [ gtk-engine-murrine ]; diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix index 9486a504ac39..bac766c7b722 100644 --- a/pkgs/misc/uboot/default.nix +++ b/pkgs/misc/uboot/default.nix @@ -155,6 +155,12 @@ in rec { ''; }; + ubootNovena = buildUBoot rec { + defconfig = "novena_defconfig"; + extraMeta.platforms = ["armv7l-linux"]; + filesToInstall = ["u-boot.bin" "SPL"]; + }; + ubootOdroidXU3 = buildUBoot rec { defconfig = "odroid-xu3_defconfig"; extraMeta.platforms = ["armv7l-linux"]; diff --git a/pkgs/os-specific/gnu/default.nix b/pkgs/os-specific/gnu/default.nix index 478040132b82..5dc52c766f18 100644 --- a/pkgs/os-specific/gnu/default.nix +++ b/pkgs/os-specific/gnu/default.nix @@ -3,7 +3,7 @@ args@{ fetchgit, stdenv, autoconf, automake, automake111x, libtool , texinfo, glibcCross, hurdPartedCross, libuuid, samba , gccCrossStageStatic, gcc -, forceSystem, newScope, platform, config +, pkgsi686Linux, newScope, platform, config , targetPlatform, buildPlatform , overrides ? {} , buildPackages, pkgs @@ -90,7 +90,7 @@ let mig = callPackage ./mig { # Build natively, but force use of a 32-bit environment because we're # targeting `i586-pc-gnu'. - stdenv = (forceSystem "i686-linux" "i386").stdenv; + stdenv = pkgsi686Linux.stdenv; }; # XXX: Use this one for its `.crossDrv'. Using the one above from diff --git a/pkgs/os-specific/linux/kernel/hardened-config.nix b/pkgs/os-specific/linux/kernel/hardened-config.nix index 5ae128741129..7e277617b61a 100644 --- a/pkgs/os-specific/linux/kernel/hardened-config.nix +++ b/pkgs/os-specific/linux/kernel/hardened-config.nix @@ -28,7 +28,9 @@ ${optionalString (stdenv.platform.kernelArch == "x86_64") '' # Reduce attack surface by disabling various emulations IA32_EMULATION n X86_X32 n - MODIFY_LDT_SYSCALL? n + ${optionalString (versionOlder version "4.17") '' + MODIFY_LDT_SYSCALL? n + ''} VMAP_STACK y # Catch kernel stack overflows diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index cf6b254ee858..a4cf1b3e32af 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.14.52"; + version = "4.14.53"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0448z0sdwazk2xrwq1zrinv881qhl33f5r2n3pqb07pxnb3jdlm5"; + sha256 = "1gqbm26j7sayl854mlfjmwjvjh3gis2w1l2rl7s53ibxz5r2apx8"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.17.nix b/pkgs/os-specific/linux/kernel/linux-4.17.nix index 166a8572cf7a..d7e363f59049 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.17.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.17.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.17.3"; + version = "4.17.4"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1z8zja786x5dxwm69zgfkwsvfwjfznwbclf76301c2fd4wjancmg"; + sha256 = "0n5by04hshjdc8mh86yg4zkq9y6hhvjx78ialda9ysv2ac63gmk6"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix index 307276d04e70..b4a8ce5c8e04 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.4.138"; + version = "4.4.139"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1vn45hvwk49cfm283yg4j76k7dnn351rg5zy28z3bfp02x7cdyg6"; + sha256 = "0igdsv9ihblmxfsgj646xac5n2bdawmwsr9hwyz6yjld43a5aq5n"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix index 287d8c9cf37d..1ef58aecdbcf 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.9.110"; + version = "4.9.111"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0ypaqj9vs2jc4qiss5yyplx09rk55fa3hrlzdkm0x7x7f0x196ip"; + sha256 = "1par6wjpr05k00nj0laxnjr02z75szpzvwv66wb0yn6wb64marjr"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index 5e8059bb4655..4af7647a1a5c 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -1,13 +1,13 @@ { stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, libelf, utillinux, ... } @ args: buildLinux (args // rec { - version = "4.18-rc2"; - modDirVersion = "4.18.0-rc2"; + version = "4.18-rc3"; + modDirVersion = "4.18.0-rc3"; extraMeta.branch = "4.18"; src = fetchurl { url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz"; - sha256 = "04vflzj14wvvkj3lsbabsw0239y58cdd8g5kciqz1ydhdlgifpza"; + sha256 = "1kr9bhvcdp792micjmhl2hwhs5iid1srb4ia8hm4cpy1lnzdgrih"; }; # Should the testing kernels ever be built on Hydra? diff --git a/pkgs/os-specific/linux/nvidia-x11/generic.nix b/pkgs/os-specific/linux/nvidia-x11/generic.nix index 0fe0f3d92c92..b5435f23e71b 100644 --- a/pkgs/os-specific/linux/nvidia-x11/generic.nix +++ b/pkgs/os-specific/linux/nvidia-x11/generic.nix @@ -12,7 +12,7 @@ , patches ? [] }: -{ stdenv, callPackage, callPackage_i686, fetchurl, fetchpatch +{ stdenv, callPackage, pkgsi686Linux, fetchurl, fetchpatch , kernel ? null, xorg, zlib, perl, nukeReferences , # Whether to build the libraries only (i.e. not the kernel module or # nvidia-settings). Used to support 32-bit binaries on 64-bit @@ -70,7 +70,7 @@ let disallowedReferences = optional (!libsOnly) [ kernel.dev ]; passthru = { - settings = (if settings32Bit then callPackage_i686 else callPackage) (import ./settings.nix self settingsSha256) { + settings = (if settings32Bit then pkgsi686Linux.callPackage else callPackage) (import ./settings.nix self settingsSha256) { withGtk2 = preferGtk2; withGtk3 = !preferGtk2; }; diff --git a/pkgs/os-specific/linux/pps-tools/default.nix b/pkgs/os-specific/linux/pps-tools/default.nix new file mode 100644 index 000000000000..e4f7d4b3616e --- /dev/null +++ b/pkgs/os-specific/linux/pps-tools/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + baseName = "pps-tools"; + version = "1.0.2"; + name = "${baseName}-${version}"; + + src = fetchFromGitHub { + owner = "redlab-i"; + repo = "${baseName}"; + rev = "v${version}"; + sha256 = "1yh9g0l59dkq4ci0wbb03qin3c3cizfngmn9jy1vwm5zm6axlxhf"; + }; + + outputs = [ "out" "dev" ]; + + installPhase = '' + mkdir -p $out/bin + mkdir -p $dev/include + mkdir -p $out/{usr/bin,usr/include/sys} + make install DESTDIR=$out + mv $out/usr/bin/* $out/bin + mv $out/usr/include/* $dev/include/ + rm -rf $out/usr/ + ''; + + meta = with stdenv.lib;{ + description = "User-space tools for LinuxPPS"; + homepage = http://linuxpps.org/; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ sorki ]; + }; +} diff --git a/pkgs/os-specific/linux/pscircle/default.nix b/pkgs/os-specific/linux/pscircle/default.nix new file mode 100644 index 000000000000..a334465fb71d --- /dev/null +++ b/pkgs/os-specific/linux/pscircle/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchFromGitLab, meson, pkgconfig, ninja, cairo }: + +stdenv.mkDerivation rec { + name = "pscircle-${version}"; + version = "1.0.0"; + + src = fetchFromGitLab { + owner = "mildlyparallel"; + repo = "pscircle"; + rev = "v${version}"; + sha256 = "188d0db62215pycmx2qfmbbjpmih03vigsz2j448zhsbyxapavv3"; + }; + + buildInputs = [ + meson + pkgconfig + cairo + ninja + ]; + + meta = with stdenv.lib; { + homepage = https://gitlab.com/mildlyparallel/pscircle; + description = "Visualize Linux processes in a form of a radial tree"; + license = licenses.gpl2; + maintainers = [ maintainers.ldesgoui ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/servers/asterisk/default.nix b/pkgs/servers/asterisk/default.nix index d9c7877978b2..b1d60d8c1456 100644 --- a/pkgs/servers/asterisk/default.nix +++ b/pkgs/servers/asterisk/default.nix @@ -2,7 +2,7 @@ jansson, libxml2, libxslt, ncurses, openssl, sqlite, utillinux, dmidecode, libuuid, newt, lua, speex, - srtp, wget, curl + srtp, wget, curl, iksemel }: let @@ -10,7 +10,7 @@ let inherit version; name = "asterisk-${version}"; - buildInputs = [ jansson libxml2 libxslt ncurses openssl sqlite utillinux dmidecode libuuid newt lua speex srtp wget curl ]; + buildInputs = [ jansson libxml2 libxslt ncurses openssl sqlite utillinux dmidecode libuuid newt lua speex srtp wget curl iksemel ]; patches = [ # We want the Makefile to install the default /var skeleton diff --git a/pkgs/servers/dns/knot-resolver/default.nix b/pkgs/servers/dns/knot-resolver/default.nix index e2db0b860f4c..6ebd642ee35a 100644 --- a/pkgs/servers/dns/knot-resolver/default.nix +++ b/pkgs/servers/dns/knot-resolver/default.nix @@ -12,11 +12,11 @@ inherit (stdenv.lib) optional optionals optionalString concatStringsSep; unwrapped = stdenv.mkDerivation rec { name = "knot-resolver-${version}"; - version = "2.3.0"; + version = "2.4.0"; src = fetchurl { url = "https://secure.nic.cz/files/knot-resolver/${name}.tar.xz"; - sha256 = "2d19c5daf8440bd3d2acd1886b9ede65f04f7753c6fd4618a92a1a4ba3b27a9b"; + sha256 = "8c88c73dd50dad6f371bfc170f49cd374022e59f8005ac1fa6cd99764f72b4d1"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/servers/foundationdb/default.nix b/pkgs/servers/foundationdb/default.nix index 5ebb510be467..ecefc1d8fabd 100644 --- a/pkgs/servers/foundationdb/default.nix +++ b/pkgs/servers/foundationdb/default.nix @@ -1,17 +1,42 @@ -{ stdenv, fetchurl, fetchFromGitHub +{ stdenv49 +, lib, fetchurl, fetchFromGitHub + , which, findutils, m4, gawk -, python, openjdk, mono58, libressl_2_6 -, boost16x +, python, openjdk, mono58, libressl }: let + # hysterical raisins dictate a version of boost this old. however, + # we luckily do not need to build anything, we just need the header + # files. + boost152 = stdenv49.mkDerivation rec { + name = "boost-headers-1.52.0"; + + src = fetchurl { + url = "mirror://sourceforge/boost/boost_1_52_0.tar.bz2"; + sha256 = "14mc7gsnnahdjaxbbslzk79rc0d12h1i681cd3srdwr3fzynlar2"; + }; + + configurePhase = ":"; + buildPhase = ":"; + installPhase = "mkdir -p $out/include && cp -R boost $out/include/"; + }; + makeFdb = { version , branch - , rev, sha256 + , sha256 + + # the revision can be inferred from the fdb tagging policy + , rev ? "refs/tags/${version}" - # fdb 6.0+ support boost 1.6x+, so default to it - , boost ? boost16x + # in theory newer versions of fdb support newer compilers, but they + # don't :( maybe one day + , stdenv ? stdenv49 + + # in theory newer versions of fdb support newer boost versions, but they + # don't :( maybe one day + , boost ? boost152 }: stdenv.mkDerivation rec { name = "foundationdb-${version}"; inherit version; @@ -23,14 +48,20 @@ let }; nativeBuildInputs = [ gawk which m4 findutils mono58 ]; - buildInputs = [ python openjdk libressl_2_6 boost ]; + buildInputs = [ python openjdk libressl boost ]; patches = - [ ./fix-scm-version.patch - ./ldflags.patch - ]; + [ # For 5.2+, we need a slightly adjusted patch to fix all the ldflags + (if lib.versionAtLeast version "5.2" + then ./ldflags.patch + else ./ldflags-5.1.patch) + ] ++ + # for 6.0+, we do NOT need to apply this version fix, since we can specify + # it ourselves. see configurePhase + (lib.optional (!lib.versionAtLeast version "6.0") ./fix-scm-version.patch); postPatch = '' + # note: this does not do anything for 6.0+ substituteInPlace ./build/scver.mk \ --subst-var-by NIXOS_FDB_VERSION_ID "${rev}" \ --subst-var-by NIXOS_FDB_SCBRANCH "${branch}" @@ -51,7 +82,13 @@ let enableParallelBuilding = true; makeFlags = [ "all" "fdb_c" "fdb_java" "KVRELEASE=1" ]; - configurePhase = ":"; + # on 6.0 and later, we can specify all this information manually + configurePhase = lib.optionalString (lib.versionAtLeast version "6.0") '' + export SOURCE_CONTROL=GIT + export SCBRANCH="${branch}" + export VERSION_ID="${rev}" + ''; + installPhase = '' mkdir -vp $out/{bin,libexec/plugins} $lib/{lib,share/java} $dev/include/foundationdb @@ -85,45 +122,24 @@ let }; }; - # hysterical raisins dictate a version of boost this old. however, - # we luckily do not need to build anything, we just need the header - # files. - boost152 = stdenv.mkDerivation rec { - name = "boost-headers-1.52.0"; - - src = fetchurl { - url = "mirror://sourceforge/boost/boost_1_52_0.tar.bz2"; - sha256 = "14mc7gsnnahdjaxbbslzk79rc0d12h1i681cd3srdwr3fzynlar2"; - }; - - configurePhase = ":"; - buildPhase = ":"; - installPhase = "mkdir -p $out/include && cp -R boost $out/include/"; - }; - in with builtins; { - foundationdb51 = makeFdb { + foundationdb51 = makeFdb rec { version = "5.1.7"; branch = "release-5.1"; - rev = "9ad8d02386d4a6a5efecf898df80f2747695c627"; sha256 = "1rc472ih24f9s5g3xmnlp3v62w206ny0pvvw02bzpix2sdrpbp06"; - boost = boost152; }; foundationdb52 = makeFdb rec { - version = "5.2.0pre1488_${substring 0 8 rev}"; - branch = "master"; - rev = "18f345487ed8d90a5c170d813349fa625cf05b4e"; - sha256 = "0mz30fxj6q99cvjzg39s5zm992i6h2l2cb70lc58bdhsz92dz3vc"; - boost = boost152; + version = "5.2.5"; + branch = "release-5.2"; + sha256 = "00csr4v9cwl9y8r63p73grc6cvhlqmzcniwrf80i0klxv5asg7q7"; }; foundationdb60 = makeFdb rec { - version = "6.0.0pre1636_${substring 0 8 rev}"; + version = "6.0.0pre2227_${substring 0 8 rev}"; branch = "master"; - rev = "1265a7b6d5e632dd562b3012e70f0727979806bd"; - sha256 = "0z1i5bkbszsbn8cc48rlhr29m54n2s0gq3dln0n7f97gf58mi5yf"; + rev = "8caa6eaecf1eeec0298fc77db334761b0c1d1523"; + sha256 = "1q200rpsphl5fzwzp2vk7ifgsnqh95k0xfiicfi1c8253ylnsgll"; }; - } diff --git a/pkgs/servers/foundationdb/ldflags-5.1.patch b/pkgs/servers/foundationdb/ldflags-5.1.patch new file mode 100644 index 000000000000..4d523a7ecdd3 --- /dev/null +++ b/pkgs/servers/foundationdb/ldflags-5.1.patch @@ -0,0 +1,90 @@ +diff --git a/FDBLibTLS/local.mk b/FDBLibTLS/local.mk +index 0b6eac8..b1891ca 100644 +--- a/FDBLibTLS/local.mk ++++ b/FDBLibTLS/local.mk +@@ -1,6 +1,5 @@ + FDBLibTLS_CFLAGS := -fPIC -I/usr/local/include -I$(BOOSTDIR) +-FDBLibTLS_STATIC_LIBS := -ltls -lssl -lcrypto +-FDBLibTLS_LDFLAGS := -L/usr/local/lib -static-libstdc++ -static-libgcc -lrt ++FDBLibTLS_LDFLAGS := -L/usr/local/lib -static-libstdc++ -static-libgcc -lrt -ltls -lssl -lcrypto + FDBLibTLS_LDFLAGS += -Wl,-soname,FDBLibTLS.so -Wl,--version-script=FDBLibTLS/FDBLibTLS.map + + # The plugin isn't a typical library, so it feels more sensible to have a copy +diff --git a/bindings/c/local.mk b/bindings/c/local.mk +index 44f0c31..7aea5a4 100644 +--- a/bindings/c/local.mk ++++ b/bindings/c/local.mk +@@ -29,8 +29,8 @@ fdb_c_tests_HEADERS := -Ibindings/c + CLEAN_TARGETS += fdb_c_tests_clean + + ifeq ($(PLATFORM),linux) +- fdb_c_LIBS += lib/libstdc++.a -lm -lpthread -lrt -ldl +- fdb_c_LDFLAGS += -Wl,--version-script=bindings/c/fdb_c.map -static-libgcc -Wl,-z,nodelete ++ fdb_c_LIBS += lib/libstdc++.a ++ fdb_c_LDFLAGS += -Wl,--version-script=bindings/c/fdb_c.map -static-libgcc -Wl,-z,nodelete -lm -lpthread -lrt -ldl + fdb_c_tests_LIBS += -lpthread + endif + +diff --git a/bindings/flow/tester/local.mk b/bindings/flow/tester/local.mk +index 2ef4fcb..6e59625 100644 +--- a/bindings/flow/tester/local.mk ++++ b/bindings/flow/tester/local.mk +@@ -35,8 +35,7 @@ _fdb_flow_tester_clean: + @rm -rf bindings/flow/bin + + ifeq ($(PLATFORM),linux) +- fdb_flow_tester_LIBS += -ldl -lpthread -lrt +- fdb_flow_tester_LDFLAGS += -static-libstdc++ -static-libgcc ++ fdb_flow_tester_LDFLAGS += -static-libstdc++ -static-libgcc -ldl -lpthread -lrt + else ifeq ($(PLATFORM),osx) + fdb_flow_tester_LDFLAGS += -lc++ + endif +diff --git a/fdbbackup/local.mk b/fdbbackup/local.mk +index 033fe7d..865fc92 100644 +--- a/fdbbackup/local.mk ++++ b/fdbbackup/local.mk +@@ -25,8 +25,7 @@ fdbbackup_LDFLAGS := $(fdbrpc_LDFLAGS) + fdbbackup_LIBS := lib/libfdbclient.a lib/libfdbrpc.a lib/libflow.a + + ifeq ($(PLATFORM),linux) +- fdbbackup_LIBS += -ldl -lpthread -lrt +- fdbbackup_LDFLAGS += -static-libstdc++ -static-libgcc ++ fdbbackup_LDFLAGS += -static-libstdc++ -static-libgcc -ldl -lpthread -lrt + + # GPerfTools profiler (uncomment to use) + # fdbbackup_CFLAGS += -I/opt/gperftools/include -DUSE_GPERFTOOLS=1 +diff --git a/fdbcli/local.mk b/fdbcli/local.mk +index 81a4a42..892c079 100644 +--- a/fdbcli/local.mk ++++ b/fdbcli/local.mk +@@ -22,14 +22,13 @@ + + fdbcli_CFLAGS := $(fdbclient_CFLAGS) + fdbcli_LDFLAGS := $(fdbrpc_LDFLAGS) +-fdbcli_LIBS := lib/libfdbclient.a lib/libfdbrpc.a lib/libflow.a -ldl ++fdbcli_LIBS := lib/libfdbclient.a lib/libfdbrpc.a lib/libflow.a + fdbcli_STATIC_LIBS := + + fdbcli_GENERATED_SOURCES += versions.h + + ifeq ($(PLATFORM),linux) +- fdbcli_LDFLAGS += -static-libstdc++ -static-libgcc +- fdbcli_LIBS += -lpthread -lrt ++ fdbcli_LDFLAGS += -static-libstdc++ -static-libgcc -lpthread -lrt -ldl + else ifeq ($(PLATFORM),osx) + fdbcli_LDFLAGS += -lc++ + endif +diff --git a/fdbserver/local.mk b/fdbserver/local.mk +index 78cad1b..36f2c0f 100644 +--- a/fdbserver/local.mk ++++ b/fdbserver/local.mk +@@ -25,8 +25,7 @@ fdbserver_LDFLAGS := $(fdbrpc_LDFLAGS) + fdbserver_LIBS := lib/libfdbclient.a lib/libfdbrpc.a lib/libflow.a + + ifeq ($(PLATFORM),linux) +- fdbserver_LIBS += -ldl -lpthread -lrt +- fdbserver_LDFLAGS += -static-libstdc++ -static-libgcc ++ fdbserver_LDFLAGS += -static-libstdc++ -static-libgcc -ldl -lpthread -lrt + + # GPerfTools profiler (uncomment to use) + # fdbserver_CFLAGS += -I/opt/gperftools/include -DUSE_GPERFTOOLS=1 diff --git a/pkgs/servers/foundationdb/ldflags.patch b/pkgs/servers/foundationdb/ldflags.patch index 4d523a7ecdd3..ee5911e495f8 100644 --- a/pkgs/servers/foundationdb/ldflags.patch +++ b/pkgs/servers/foundationdb/ldflags.patch @@ -1,9 +1,9 @@ diff --git a/FDBLibTLS/local.mk b/FDBLibTLS/local.mk -index 0b6eac8..b1891ca 100644 +index 5e6b9cfb..73f4e5f3 100644 --- a/FDBLibTLS/local.mk +++ b/FDBLibTLS/local.mk @@ -1,6 +1,5 @@ - FDBLibTLS_CFLAGS := -fPIC -I/usr/local/include -I$(BOOSTDIR) + FDBLibTLS_CFLAGS := -fPIC -I/usr/local/include -I$(BOOSTDIR) -Ifdbrpc -FDBLibTLS_STATIC_LIBS := -ltls -lssl -lcrypto -FDBLibTLS_LDFLAGS := -L/usr/local/lib -static-libstdc++ -static-libgcc -lrt +FDBLibTLS_LDFLAGS := -L/usr/local/lib -static-libstdc++ -static-libgcc -lrt -ltls -lssl -lcrypto @@ -11,7 +11,7 @@ index 0b6eac8..b1891ca 100644 # The plugin isn't a typical library, so it feels more sensible to have a copy diff --git a/bindings/c/local.mk b/bindings/c/local.mk -index 44f0c31..7aea5a4 100644 +index 44f0c31b..7aea5a4f 100644 --- a/bindings/c/local.mk +++ b/bindings/c/local.mk @@ -29,8 +29,8 @@ fdb_c_tests_HEADERS := -Ibindings/c @@ -26,7 +26,7 @@ index 44f0c31..7aea5a4 100644 endif diff --git a/bindings/flow/tester/local.mk b/bindings/flow/tester/local.mk -index 2ef4fcb..6e59625 100644 +index 2ef4fcb7..6e59625c 100644 --- a/bindings/flow/tester/local.mk +++ b/bindings/flow/tester/local.mk @@ -35,8 +35,7 @@ _fdb_flow_tester_clean: @@ -40,7 +40,7 @@ index 2ef4fcb..6e59625 100644 fdb_flow_tester_LDFLAGS += -lc++ endif diff --git a/fdbbackup/local.mk b/fdbbackup/local.mk -index 033fe7d..865fc92 100644 +index 033fe7d4..865fc923 100644 --- a/fdbbackup/local.mk +++ b/fdbbackup/local.mk @@ -25,8 +25,7 @@ fdbbackup_LDFLAGS := $(fdbrpc_LDFLAGS) @@ -54,7 +54,7 @@ index 033fe7d..865fc92 100644 # GPerfTools profiler (uncomment to use) # fdbbackup_CFLAGS += -I/opt/gperftools/include -DUSE_GPERFTOOLS=1 diff --git a/fdbcli/local.mk b/fdbcli/local.mk -index 81a4a42..892c079 100644 +index 81a4a42e..892c079c 100644 --- a/fdbcli/local.mk +++ b/fdbcli/local.mk @@ -22,14 +22,13 @@ @@ -75,7 +75,7 @@ index 81a4a42..892c079 100644 fdbcli_LDFLAGS += -lc++ endif diff --git a/fdbserver/local.mk b/fdbserver/local.mk -index 78cad1b..36f2c0f 100644 +index 78cad1bf..36f2c0f7 100644 --- a/fdbserver/local.mk +++ b/fdbserver/local.mk @@ -25,8 +25,7 @@ fdbserver_LDFLAGS := $(fdbrpc_LDFLAGS) diff --git a/pkgs/servers/gpsd/0002-scons-envs-patch.patch b/pkgs/servers/gpsd/0002-scons-envs-patch.patch new file mode 100644 index 000000000000..fbb06db6aa39 --- /dev/null +++ b/pkgs/servers/gpsd/0002-scons-envs-patch.patch @@ -0,0 +1,11 @@ +--- b/SConstruct 2018-07-03 23:13:51.986746857 +0200 ++++ a/SConstruct 2018-07-03 23:14:50.495252914 +0200 +@@ -221,7 +221,7 @@ + 'STAGING_PREFIX', # Required by the OpenWRT and CeroWrt builds. + 'WRITE_PAD', # So we can test WRITE_PAD values on the fly. + ) +-envs = {} ++envs = os.environ + for var in import_env: + if var in os.environ: + envs[var] = os.environ[var] diff --git a/pkgs/servers/gpsd/default.nix b/pkgs/servers/gpsd/default.nix index 911f3b23f0c1..6e270192063b 100644 --- a/pkgs/servers/gpsd/default.nix +++ b/pkgs/servers/gpsd/default.nix @@ -2,6 +2,7 @@ , ncurses, libX11, libXt, libXpm, libXaw, libXext , libusb1, docbook_xml_dtd_412, docbook_xsl, bc , libxslt, xmlto, gpsdUser ? "gpsd", gpsdGroup ? "dialout" +, pps-tools , python2Packages }: @@ -23,7 +24,7 @@ stdenv.mkDerivation rec { buildInputs = [ python2Packages.python dbus dbus-glib ncurses libX11 libXt libXpm libXaw libXext - libxslt libusb1 + libxslt libusb1 pps-tools ]; pythonPath = [ @@ -37,6 +38,8 @@ stdenv.mkDerivation rec { # TODO: remove the patch with the next release ./0001-Use-pkgconfig-for-dbus-library.patch + # to be able to find pps-tools + ./0002-scons-envs-patch.patch ]; # - leapfetch=no disables going online at build time to fetch leap-seconds @@ -44,9 +47,15 @@ stdenv.mkDerivation rec { buildPhase = '' patchShebangs . sed -e "s|systemd_dir = .*|systemd_dir = '$out/lib/systemd/system'|" -i SConstruct - scons prefix="$out" leapfetch=no gpsd_user=${gpsdUser} gpsd_group=${gpsdGroup} \ - systemd=yes udevdir="$out/lib/udev" \ - python_libdir="$out/lib/${python2Packages.python.libPrefix}/site-packages" + scons \ + -j $NIX_BUILD_CORES \ + prefix="$out" \ + leapfetch=no \ + gpsd_user=${gpsdUser} \ + gpsd_group=${gpsdGroup} \ + systemd=yes \ + udevdir="$out/lib/udev" \ + python_libdir="$out/lib/${python2Packages.python.libPrefix}/site-packages" ''; checkPhase = '' diff --git a/pkgs/servers/http/yaws/default.nix b/pkgs/servers/http/yaws/default.nix index aae4589ebbe8..5f92fbf2c03f 100644 --- a/pkgs/servers/http/yaws/default.nix +++ b/pkgs/servers/http/yaws/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "yaws-${version}"; - version = "2.0.5"; + version = "2.0.6"; src = fetchurl { url = "http://yaws.hyber.org/download/${name}.tar.gz"; - sha256 = "00bnvf26xlhm3v3c6jzk5kcdk8jkwr1gbd2f4h329lyrpjsx30my"; + sha256 = "03nh97g7smsgm6sw5asssmlq7zgx6y2gnn7jn0lv2x5mkf5nzyb9"; }; # The tarball includes a symlink yaws -> yaws-1.95, which seems to be diff --git a/pkgs/servers/livepeer/default.nix b/pkgs/servers/livepeer/default.nix new file mode 100644 index 000000000000..105223f31a5b --- /dev/null +++ b/pkgs/servers/livepeer/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchFromGitHub, buildGoPackage +, pkgconfig, ffmpeg +}: + +buildGoPackage rec { + name = "livepeer-${version}"; + version = "0.2.4"; + + goPackagePath = "github.com/livepeer/go-livepeer"; + goDeps = ./deps.nix; + + src = fetchFromGitHub { + owner = "livepeer"; + repo = "go-livepeer"; + rev = version; + sha256 = "07vhw787wq5q4xm7zvswjdsmr20pwfa39wfkgamb7hkrffn3k2ia"; + }; + + buildInputs = [ pkgconfig ffmpeg ]; + + # XXX This removes the -O2 flag, to avoid errors like: + # cgo-dwarf-inference:2:8: error: enumerator value for '__cgo_enum__0' is not an integer constant + # This is a workaround for nixpkgs+golang BUG https://github.com/NixOS/nixpkgs/issues/25959 + hardeningDisable = [ "fortify" ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "Official Go implementation of the Livepeer protocol"; + homepage = http://livepeer.org; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ elitak ]; + }; +} diff --git a/pkgs/servers/livepeer/deps.nix b/pkgs/servers/livepeer/deps.nix new file mode 100644 index 000000000000..297d0724a496 --- /dev/null +++ b/pkgs/servers/livepeer/deps.nix @@ -0,0 +1,20 @@ +[ + { + goPackagePath = "github.com/golang/glog"; + fetch = { + type = "git"; + url = "https://github.com/golang/glog"; + rev = "23def4e6c14b4da8ac2ed8007337bc5eb5007998"; + sha256 = "0jb2834rw5sykfr937fxi8hxi2zy80sj2bdn9b3jb4b26ksqng30"; + }; + } + { + goPackagePath = "github.com/ericxtang/m3u8"; + fetch = { + type = "git"; + url = "https://github.com/ericxtang/m3u8"; + rev = "575aeb9f754a5dabcc03d4aa0ed05ecaee26499e"; + sha256 = "08811y4kg6rgj40v80cwjcwhy094qrfigdwjsgr8d6bn64cf9fz2"; + }; + } +] diff --git a/pkgs/servers/mail/rspamd/default.nix b/pkgs/servers/mail/rspamd/default.nix index 3e3132798068..4de63d694667 100644 --- a/pkgs/servers/mail/rspamd/default.nix +++ b/pkgs/servers/mail/rspamd/default.nix @@ -6,29 +6,25 @@ in stdenv.mkDerivation rec { name = "rspamd-${version}"; - version = "1.6.6"; + version = "1.7.3"; src = fetchFromGitHub { owner = "vstakhov"; repo = "rspamd"; rev = version; - sha256 = "04jqrki7rlxywdig264kavy1h5882rspi2drkbdzrk35jjq8rh3h"; + sha256 = "1gb4zg8i1nj337f65s434h299ad19c0d7jyawb2glvv3n4cshm97"; }; nativeBuildInputs = [ cmake pkgconfig perl ]; - buildInputs = [ glib gmime libevent libmagic luajit openssl pcre sqlite ragel icu libfann]; + buildInputs = [ glib gmime libevent libmagic luajit openssl pcre sqlite ragel icu libfann ]; - postPatch = '' - substituteInPlace conf/common.conf --replace "\$CONFDIR/rspamd.conf.local" "/etc/rspamd/rspamd.conf.local" - substituteInPlace conf/common.conf --replace "\$CONFDIR/rspamd.conf.local.override" "/etc/rspamd/rspamd.conf.local.override" - ''; - - cmakeFlags = '' - -DDEBIAN_BUILD=ON - -DRUNDIR=/var/run/rspamd - -DDBDIR=/var/lib/rspamd - -DLOGDIR=/var/log/rspamd - ''; + cmakeFlags = [ + "-DDEBIAN_BUILD=ON" + "-DRUNDIR=/var/run/rspamd" + "-DDBDIR=/var/lib/rspamd" + "-DLOGDIR=/var/log/rspamd" + "-DLOCAL_CONFDIR=/etc/rspamd" + ]; meta = with stdenv.lib; { homepage = https://github.com/vstakhov/rspamd; diff --git a/pkgs/servers/meguca/default.nix b/pkgs/servers/meguca/default.nix index bfe21543555d..67b2685262d8 100644 --- a/pkgs/servers/meguca/default.nix +++ b/pkgs/servers/meguca/default.nix @@ -1,35 +1,40 @@ -{ stdenv, buildGoPackage, fetchgit, pkgconfig, ffmpeg-full, graphicsmagick, ghostscript, quicktemplate, - go-bindata, easyjson, nodePackages, cmake, emscripten }: +{ stdenv, buildGoPackage, fetchgit, pkgconfig, cmake, ffmpeg-full, ghostscript +, graphicsmagick, quicktemplate, go-bindata, easyjson, nodePackages, emscripten }: buildGoPackage rec { name = "meguca-unstable-${version}"; - version = "2018-05-26"; - rev = "9f3d902fb899dbc874c1a91298d86fda7da59b1e"; + version = "2018-07-01"; + rev = "80db8298b6546c93944251c17fe03371e521671f"; goPackagePath = "github.com/bakape/meguca"; goDeps = ./server_deps.nix; - enableParallelBuilding = true; - nativeBuildInputs = [ pkgconfig cmake ]; - buildInputs = [ ffmpeg-full graphicsmagick ghostscript quicktemplate go-bindata easyjson emscripten ]; src = fetchgit { inherit rev; url = "https://github.com/bakape/meguca"; - sha256 = "0qblllf23pxcwi5fhaq8xc77iawll7v7xpk2mf9ngks3h8p7gddq"; + sha256 = "1yix0kxsjm9f3zw9jx2nb3pl8pbqjfhbvbrz42m1h20b1h02s5ml"; fetchSubmodules = true; }; - configurePhase = '' + enableParallelBuilding = true; + nativeBuildInputs = [ pkgconfig cmake ]; + + buildInputs = [ + ffmpeg-full graphicsmagick ghostscript quicktemplate go-bindata easyjson + emscripten + ]; + + buildPhase = '' export HOME=$PWD - export GOPATH=$GOPATH:$HOME/go + export GOPATH=$GOPATH:$HOME/go/src/github.com/bakape/meguca/go + cd $HOME/go/src/github.com/bakape/meguca ln -sf ${nodePackages.meguca}/lib/node_modules/meguca/node_modules sed -i "/npm install --progress false --depth 0/d" Makefile make generate_clean go generate meguca/... - ''; - - buildPhase = '' - go build -p $NIX_BUILD_CORES meguca - make -j $NIX_BUILD_CORES client wasm + go build -v -p $NIX_BUILD_CORES meguca + make -j $NIX_BUILD_CORES client + '' + stdenv.lib.optionalString (!stdenv.isDarwin) '' + make -j $NIX_BUILD_CORES wasm ''; installPhase = '' @@ -40,7 +45,7 @@ buildGoPackage rec { meta = with stdenv.lib; { homepage = "https://github.com/bakape/meguca"; - description = "Anonymous realtime imageboard focused on high performance, free speech and transparent moderation"; + description = "High performance anonymous realtime imageboard"; license = licenses.agpl3Plus; maintainers = with maintainers; [ chiiruno ]; platforms = platforms.all; diff --git a/pkgs/servers/meguca/server_deps.nix b/pkgs/servers/meguca/server_deps.nix index 493297b9757f..b2e31515ab48 100644 --- a/pkgs/servers/meguca/server_deps.nix +++ b/pkgs/servers/meguca/server_deps.nix @@ -1,12 +1,21 @@ # This file was generated by https://github.com/kamilchm/go2nix v1.2.1 [ { + goPackagePath = "github.com/ErikDubbelboer/gspt"; + fetch = { + type = "git"; + url = "https://github.com/ErikDubbelboer/gspt"; + rev = "08ed213262b5bb2cf6ccb0baa71c6b201d353e63"; + sha256 = "1vdgvwjagk1n4mwvpil59idgg7ibdj6frk9mz8c2ckbmxsfpp8rq"; + }; + } + { goPackagePath = "github.com/Masterminds/squirrel"; fetch = { type = "git"; url = "https://github.com/Masterminds/squirrel"; - rev = "40ef4f86bf59a996c348a9f56ddb4c4d3d49a6df"; - sha256 = "1zdv8hds2skqz9xrybf1pw5hfxzd27c35fsrfq11ryif1wxwbkyp"; + rev = "b127ed9be03443fe3c0877e391130e3dd3f3107a"; + sha256 = "04vgwm5g5486188656hiw1x56mrkv27s5g2s8mc1lz7z1ig5g5bg"; }; } { @@ -28,6 +37,15 @@ }; } { + goPackagePath = "github.com/badoux/goscraper"; + fetch = { + type = "git"; + url = "https://github.com/badoux/goscraper"; + rev = "0213ced7087832e81e8892e8d044150cfc153856"; + sha256 = "0bw5g6h0hypd38z8gfbh40pbw824n4qhk3c0kasw6gn4darx972w"; + }; + } + { goPackagePath = "github.com/bakape/mnemonics"; fetch = { type = "git"; @@ -41,8 +59,8 @@ fetch = { type = "git"; url = "https://github.com/bakape/thumbnailer"; - rev = "5b92eb4c4500fd8e004e4cc9eeb2038961e2004f"; - sha256 = "0z9myzp6rjyylh91ibd1nfpz7za1gxg4n3pnn7sw54i9zyws1l4x"; + rev = "fa88f595f3882773bc425b382eee71e3e2fa1291"; + sha256 = "19xfn8aj1nhh5dj93hskzrhaa07sayd8agmz1vkkh6varqrldanf"; }; } { @@ -95,8 +113,8 @@ fetch = { type = "git"; url = "https://github.com/go-playground/log"; - rev = "91a5908e654f9fc444a71ea3c51c72cb5c6c2442"; - sha256 = "0p67j453pi7ffv3axl5g97qadx8lj22vsi5xrzqrr3v6mj8b0lbm"; + rev = "736ecb55f80c7121af3754a7ea62e96733451fe1"; + sha256 = "1gr2658m8nwswiybnz5i54d4gzwx4nk79gnh7j5fj1rcmbxdkkjh"; }; } { @@ -113,8 +131,8 @@ fetch = { type = "git"; url = "https://github.com/gorilla/websocket"; - rev = "21ab95fa12b9bdd8fecf5fa3586aad941cc98785"; - sha256 = "1ygg6cr84461d6k3nzbja0dxhcgf5zvry2w10f6i7291ghrcwhyy"; + rev = "5ed622c449da6d44c3c8329331ff47a9e5844f71"; + sha256 = "1yhcwraijdk6lx7f6m9p6i1b3zfh2hq80l1nfpnckfn10gh72aw7"; }; } { @@ -158,8 +176,8 @@ fetch = { type = "git"; url = "https://github.com/mailru/easyjson"; - rev = "8b799c424f57fa123fc63a99d6383bc6e4c02578"; - sha256 = "15ba6drfmw98lzw5qjh3ijcxh9iz9rcp3hid169yfd08l06z05w0"; + rev = "3fdea8d05856a0c8df22ed4bc71b3219245e4485"; + sha256 = "0g3crph77yhv4ipdnwqc32z4cp87ahi4ikad5kyy6q4znnxliz74"; }; } { @@ -185,8 +203,8 @@ fetch = { type = "git"; url = "https://github.com/sevlyar/go-daemon"; - rev = "45a2ba1b7c6710a044163fa109bf08d060bc3afa"; - sha256 = "1fd8cwljgbxsm3w38pii0n02zg8s53x7j08w784csj3sfzq7rbv4"; + rev = "f9261e73885de99b1647d68bedadf2b9a99ad11f"; + sha256 = "1c4h85a3qfdkd61k8ipk1ffi3sdflq4wqp6d6h43zrca528m9ddc"; }; } { @@ -221,8 +239,17 @@ fetch = { type = "git"; url = "https://go.googlesource.com/crypto"; - rev = "a3beeb748656e13e54256fd2cde19e058f41f60f"; - sha256 = "0h0a1v2g3hf0dlfjfiv76vfvvy7r9sdhjyqc2snvh9dczm2k5zki"; + rev = "a49355c7e3f8fe157a85be2f77e6e269a0f89602"; + sha256 = "020q1laxjx5kcmnqy4wmdb63zhb0lyq6wpy40axhswzg2nd21s44"; + }; + } + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "4cb1c02c05b0e749b0365f61ae859a8e0cfceed9"; + sha256 = "05xdcj0pn245y3gpy9p5iamx09424zqwh1w34gwwn5kh51ybgv7k"; }; } { @@ -230,8 +257,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/sys"; - rev = "c11f84a56e43e20a78cee75a7c034031ecf57d1f"; - sha256 = "1fn1wwr94v6ca1zcbsrs5v79s95pajdjqzz9rm9lxkgcvv1rl189"; + rev = "7138fd3d9dc8335c567ca206f4333fb75eb05d56"; + sha256 = "09xgxk0d9b88m18sriy4f2l6qavicznxkgsbvjyv56x24r4kmiq0"; }; } { @@ -239,8 +266,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/text"; - rev = "5c1cf69b5978e5a34c5f9ba09a83e56acc4b7877"; - sha256 = "03br8p1sb1ffr02l8hyrgcyib7ms0z06wy3v4r1dj2l6q4ghwzfs"; + rev = "c0fe8dde8a10c9b32154bd9bdf080b8b3d635127"; + sha256 = "0zi15k236nmqrlpfy3hgnxnh3f0n1aag0h6gs41xlxdkr9lpmnsz"; }; } { diff --git a/pkgs/servers/nosql/apache-jena/fuseki-binary.nix b/pkgs/servers/nosql/apache-jena/fuseki-binary.nix index bd291356b436..d965485356c8 100644 --- a/pkgs/servers/nosql/apache-jena/fuseki-binary.nix +++ b/pkgs/servers/nosql/apache-jena/fuseki-binary.nix @@ -3,10 +3,10 @@ let s = # Generated upstream information rec { baseName="apache-jena-fuseki"; - version = "3.7.0"; + version = "3.8.0"; name="${baseName}-${version}"; url="http://archive.apache.org/dist/jena/binaries/apache-jena-fuseki-${version}.tar.gz"; - sha256 = "1824rvdrs9yhjinac2vkvkxvns8bfdvy91k5ghzzk0nrdcj31pmr"; + sha256 = "0jca96996zl3f1qc15sfv45n09rnnv24qxv87y16dnwnyc1ism0a"; }; buildInputs = [ makeWrapper diff --git a/pkgs/servers/web-apps/selfoss/default.nix b/pkgs/servers/web-apps/selfoss/default.nix index 4ed9d96510c8..615efa3b3672 100644 --- a/pkgs/servers/web-apps/selfoss/default.nix +++ b/pkgs/servers/web-apps/selfoss/default.nix @@ -19,10 +19,9 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Web-based news feed (RSS/Atom) aggregator"; + homepage = https://selfoss.aditu.de; license = licenses.gpl3; - homepage = http://http://selfoss.aditu.de/; + maintainers = with maintainers; [ jtojnar regnat ]; platforms = platforms.all; - maintainers = [ maintainers.regnat ]; }; } - diff --git a/pkgs/servers/web-apps/shaarli/default.nix b/pkgs/servers/web-apps/shaarli/default.nix index 8f6722ed86ec..cee098db6b27 100644 --- a/pkgs/servers/web-apps/shaarli/default.nix +++ b/pkgs/servers/web-apps/shaarli/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "shaarli-${version}"; - version = "0.9.6"; + version = "0.9.7"; src = fetchurl { url = "https://github.com/shaarli/Shaarli/releases/download/v${version}/shaarli-v${version}-full.tar.gz"; - sha256 = "0vi59988bjxb1cyifh0fynpxa7l6cl0v57hrxima5c9iid10pw54"; + sha256 = "191nnk4p6cpbljij1a30mpidqdvcwn1x6ndb4lgkqwbpnh86q57l"; }; outputs = [ "out" "doc" ]; diff --git a/pkgs/shells/xonsh/default.nix b/pkgs/shells/xonsh/default.nix index 20f39f40a240..6522985ab864 100644 --- a/pkgs/shells/xonsh/default.nix +++ b/pkgs/shells/xonsh/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { name = "xonsh-${version}"; - version = "0.6.7"; + version = "0.6.8"; src = fetchFromGitHub { owner = "scopatz"; repo = "xonsh"; rev = version; - sha256= "0vxdfq1wpajfypdl5lhvib50mk742dk8y375zf3h057hjb0khhgw"; + sha256= "1a74xpww7k432b2z44388rl31nqvckn2q3fswci04f48698hzs5l"; }; LC_ALL = "en_US.UTF-8"; diff --git a/pkgs/shells/zsh/gradle-completion/default.nix b/pkgs/shells/zsh/gradle-completion/default.nix new file mode 100644 index 000000000000..9a3f5ec3cc49 --- /dev/null +++ b/pkgs/shells/zsh/gradle-completion/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "gradle-completion-${version}"; + version = "1.3.1"; + + src = fetchFromGitHub { + owner = "gradle"; + repo = "gradle-completion"; + rev = "v${version}"; + sha256 = "02vv360r78ckwc6r4xbhmy5dxz6l9ya4lq9c62zh12ciq94y9kgx"; + }; + + # we just move two files into $out, + # this shouldn't bother Hydra. + preferLocalBuild = true; + + dontBuild = true; + installPhase = '' + runHook preInstall + + mkdir -p $out + install -Dm0644 ./_gradle $out/share/zsh/site-functions/_gradle + install -Dm0644 ./gradle-completion.bash $out/share/bash-completion/completions/gradle + + runHook postInstall + ''; + + meta = with stdenv.lib; { + description = "Gradle tab completion for bash and zsh"; + homepage = https://github.com/gradle/gradle-completion; + license = licenses.mit; + maintainers = with maintainers; [ ma27 ]; + }; +} diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix index 5ddc2432bd50..7523bab2e8c3 100644 --- a/pkgs/tools/X11/xpra/default.nix +++ b/pkgs/tools/X11/xpra/default.nix @@ -12,11 +12,11 @@ let inherit (python2Packages) python cython buildPythonApplication; in buildPythonApplication rec { name = "xpra-${version}"; - version = "2.3.1"; + version = "2.3.2"; src = fetchurl { url = "https://xpra.org/src/${name}.tar.xz"; - sha256 = "0wghjmrw77pkh6agc5rz7ynr6s8yyc68qvj9rnp0vlwa3x1fl3ry"; + sha256 = "02wpnlx43dwacaahpm8db5kbnjw2msm3ycq71gib0n2zamd71ni6"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/tools/admin/awscli/default.nix b/pkgs/tools/admin/awscli/default.nix index 4e7e2d402e90..b7d41ac7a960 100644 --- a/pkgs/tools/admin/awscli/default.nix +++ b/pkgs/tools/admin/awscli/default.nix @@ -19,11 +19,11 @@ let in py.pkgs.buildPythonApplication rec { pname = "awscli"; - version = "1.15.10"; + version = "1.15.49"; src = py.pkgs.fetchPypi { inherit pname version; - sha256 = "0nwpanbfx5h0bad8wwvvbhpjf9r6n885bbv2w8mw7vijdgclkq8x"; + sha256 = "1rn1d274vg2zq93cswh6w5ybgqw6gk2pgiqxhsyd04f2v4smr98i"; }; # No tests included diff --git a/pkgs/tools/compression/zstd/default.nix b/pkgs/tools/compression/zstd/default.nix index 8fa2d181de5e..edb771b5b3ec 100644 --- a/pkgs/tools/compression/zstd/default.nix +++ b/pkgs/tools/compression/zstd/default.nix @@ -4,10 +4,10 @@ stdenv.mkDerivation rec { name = "zstd-${version}"; - version = "1.3.4"; + version = "1.3.5"; src = fetchFromGitHub { - sha256 = "090ba7dnv5z2v4vlb8b275b0n7cqsdzjqvr3b6a0w65z13mgy2nw"; + sha256 = "0fpv8k16s14g0r552mhbh0mkr716cqy41d2znyrvks6qfphkgir4"; rev = "v${version}"; repo = "zstd"; owner = "facebook"; diff --git a/pkgs/tools/graphics/pngquant/default.nix b/pkgs/tools/graphics/pngquant/default.nix index b53a07bcfadf..4e7d1e361f91 100644 --- a/pkgs/tools/graphics/pngquant/default.nix +++ b/pkgs/tools/graphics/pngquant/default.nix @@ -1,13 +1,14 @@ -{ stdenv, fetchgit, pkgconfig, libpng, zlib, lcms2 }: +{ stdenv, fetchFromGitHub, pkgconfig, libpng, zlib, lcms2 }: stdenv.mkDerivation rec { name = "pngquant-${version}"; - version = "2.11.7"; + version = "2.12.1"; - src = fetchgit { - url = "https://www.github.com/pornel/pngquant.git"; - rev = "refs/tags/${version}"; - sha256 = "1qr5qr2wznzp0v9xwyz4r3982rcm9kys913w8gwmv7qd1akvx2qh"; + src = fetchFromGitHub { + owner = "pornel"; + repo = "pngquant"; + rev = version; + sha256 = "0jdvry3kvmmxcgwf5a3zbfz0idl6yl3700ag7pf8sk4lg4qp0llp"; fetchSubmodules = true; }; diff --git a/pkgs/tools/graphics/vulkan-tools/default.nix b/pkgs/tools/graphics/vulkan-tools/default.nix index 4e4f5a5db4a6..778a12341540 100644 --- a/pkgs/tools/graphics/vulkan-tools/default.nix +++ b/pkgs/tools/graphics/vulkan-tools/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "LunarG Vulkan loader"; - homepage = "http://www.lunarg.com"; + homepage = https://www.lunarg.com; platforms = platforms.linux; license = licenses.asl20; maintainers = [ maintainers.ralith ]; diff --git a/pkgs/tools/misc/arp-scan/default.nix b/pkgs/tools/misc/arp-scan/default.nix index 760757190c32..e1068c248b34 100644 --- a/pkgs/tools/misc/arp-scan/default.nix +++ b/pkgs/tools/misc/arp-scan/default.nix @@ -1,14 +1,31 @@ -{ stdenv, fetchurl, libpcap }: +{ stdenv, fetchFromGitHub, autoreconfHook, libpcap, makeWrapper, perlPackages }: stdenv.mkDerivation rec { - name = "arp-scan-1.9"; + name = "arp-scan-${version}"; + version = "1.9.5"; - src = fetchurl { - url = "http://www.nta-monitor.com/files/arp-scan/${name}.tar.gz"; - sha256 = "14nqjzbmnlx2nac7lwa93y5m5iqk3layakyxyvfmvs283k3qm46f"; + src = fetchFromGitHub { + owner = "royhills"; + repo = "arp-scan"; + rev = "4de863c2627a05177eda7159692a588f9f520cd1"; + sha256 = "15zpfdybk2kh98shqs8qqd0f9nyi2ch2wcyv729rfj7yp0hif5mb"; }; - buildInputs = [ libpcap ]; + perlModules = with perlPackages; [ + HTTPDate + HTTPMessage + LWPUserAgent + URI + ]; + + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ libpcap makeWrapper ]; + + postInstall = '' + for name in get-{oui,iab}; do + wrapProgram "$out/bin/$name" --set PERL5LIB "${stdenv.lib.makePerlPath perlModules }" + done; + ''; meta = with stdenv.lib; { description = "ARP scanning and fingerprinting tool"; @@ -19,6 +36,6 @@ stdenv.mkDerivation rec { homepage = http://www.nta-monitor.com/wiki/index.php/Arp-scan_Documentation; license = licenses.gpl3; platforms = platforms.linux; - maintainers = [ maintainers.bjornfor ]; + maintainers = with maintainers; [ bjornfor mikoim ]; }; } diff --git a/pkgs/tools/misc/asciinema/default.nix b/pkgs/tools/misc/asciinema/default.nix index 0808704ecb78..c1cca25c576e 100644 --- a/pkgs/tools/misc/asciinema/default.nix +++ b/pkgs/tools/misc/asciinema/default.nix @@ -1,10 +1,10 @@ -{ lib, python3Packages, fetchFromGitHub }: +{ lib, python3Packages, fetchFromGitHub, glibcLocales }: let pythonPackages = python3Packages; in pythonPackages.buildPythonApplication rec { name = "asciinema-${version}"; - version = "2.0.0"; + version = "2.0.1"; buildInputs = with pythonPackages; [ nose ]; propagatedBuildInputs = with pythonPackages; [ requests ]; @@ -13,7 +13,7 @@ in pythonPackages.buildPythonApplication rec { owner = "asciinema"; repo = "asciinema"; rev = "v${version}"; - sha256 = "1f92hv9w58jf1f7igspjxvrxqn3n21kgya2zb56spqyydr4jzwdk"; + sha256 = "09m9agkslrbm36y8pjqhg5nmyz9hppjyhafhzpglnadhfgwqzznr"; }; patchPhase = '' @@ -21,8 +21,10 @@ in pythonPackages.buildPythonApplication rec { rm tests/pty_recorder_test.py ''; + checkInputs = [ glibcLocales ]; + checkPhase = '' - nosetests + LC_ALL=en_US.UTF-8 nosetests ''; meta = { diff --git a/pkgs/tools/misc/debootstrap/default.nix b/pkgs/tools/misc/debootstrap/default.nix index 715996e8f61a..e68aaff1ddfb 100644 --- a/pkgs/tools/misc/debootstrap/default.nix +++ b/pkgs/tools/misc/debootstrap/default.nix @@ -4,13 +4,13 @@ # There is also cdebootstrap now. Is that easier to maintain? stdenv.mkDerivation rec { name = "debootstrap-${version}"; - version = "1.0.103"; + version = "1.0.105"; src = fetchurl { # git clone git://git.debian.org/d-i/debootstrap.git # I'd like to use the source. However it's lacking the lanny script ? (still true?) url = "mirror://debian/pool/main/d/debootstrap/debootstrap_${version}.tar.gz"; - sha256 = "07qqbm50ji1j04hgv1fmy7y1jwl4rjh8q57znh9g3rr4j6fmax7q"; + sha256 = "0m4630q8smn45pmck1azk5sv6cgdzza2r001paqvmasqa6qxbjq3"; }; buildInputs = [ dpkg gettext gawk perl ]; diff --git a/pkgs/tools/misc/sixpair/default.nix b/pkgs/tools/misc/sixpair/default.nix new file mode 100644 index 000000000000..055fa9418a9a --- /dev/null +++ b/pkgs/tools/misc/sixpair/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchurl, libusb }: +stdenv.mkDerivation { + name = "sixpair-2007-04-18"; + + src = fetchurl { + url = http://www.pabr.org/sixlinux/sixpair.c; + sha256 = "1b0a3k7gs544cbji7n29jxlrsscwfx6s1r2sgwdl6hmkc1l9gagr"; + }; + + # hcitool is depricated + patches = [ ./hcitool.patch ]; + + buildInputs = [ libusb ]; + + unpackPhase = '' + cp $src sixpair.c + ''; + + buildPhase = '' + cc -o sixpair sixpair.c -lusb + ''; + + installPhase = '' + mkdir -p $out/bin + cp sixpair $out/bin/sixpair + ''; + + meta = { + description = "Pair with SIXAXIS controllers over USB"; + longDescription = '' + This command-line utility searches USB buses for SIXAXIS controllers and tells them to connect to a new Bluetooth master. + ''; + homepage = http://www.pabr.org/sixlinux/; + license = stdenv.lib.licenses.gpl2; + maintainers = [ stdenv.lib.maintainers.tomsmeets ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/tools/misc/sixpair/hcitool.patch b/pkgs/tools/misc/sixpair/hcitool.patch new file mode 100644 index 000000000000..b66e791dd0e0 --- /dev/null +++ b/pkgs/tools/misc/sixpair/hcitool.patch @@ -0,0 +1,19 @@ +diff --git a/sixpair.c b/sixpair.c +index b009a6f..78b7ef0 100644 +--- a/sixpair.c ++++ b/sixpair.c +@@ -76,11 +76,11 @@ void process_device(int argc, char **argv, struct usb_device *dev, + exit(1); + } + } else { +- FILE *f = popen("hcitool dev", "r"); ++ FILE *f = popen("bluetoothctl list", "r"); + if ( !f || +- fscanf(f, "%*s\n%*s %x:%x:%x:%x:%x:%x", ++ fscanf(f, "%*s %x:%x:%x:%x:%x:%x", + &mac[0],&mac[1],&mac[2],&mac[3],&mac[4],&mac[5]) != 6 ) { +- printf("Unable to retrieve local bd_addr from `hcitool dev`.\n"); ++ printf("Unable to retrieve local bd_addr from `bluetoothctl list`.\n"); + printf("Please enable Bluetooth or specify an address manually.\n"); + exit(1); + } diff --git a/pkgs/tools/misc/you-get/default.nix b/pkgs/tools/misc/you-get/default.nix index bfce454473ad..e9cd23f5bbc4 100644 --- a/pkgs/tools/misc/you-get/default.nix +++ b/pkgs/tools/misc/you-get/default.nix @@ -2,7 +2,7 @@ buildPythonApplication rec { pname = "you-get"; - version = "0.4.1077"; + version = "0.4.1099"; # Tests aren't packaged, but they all hit the real network so # probably aren't suitable for a build environment anyway. @@ -10,7 +10,7 @@ buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "1qf4n1zgbr533a0qbxp8548f25jwqdwfl42gi5dyfhm4f1y1jk1a"; + sha256 = "1z9zhxv2vgbb20hgjiksyqm2zglwq71azbp27na1779hbqc467ik"; }; meta = with stdenv.lib; { diff --git a/pkgs/tools/networking/chrony/default.nix b/pkgs/tools/networking/chrony/default.nix index 27f5ca2c7dd1..2db26985dcf9 100644 --- a/pkgs/tools/networking/chrony/default.nix +++ b/pkgs/tools/networking/chrony/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, libcap, readline, texinfo, nss, nspr -, libseccomp }: +, libseccomp, pps-tools }: assert stdenv.isLinux -> libcap != null; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ readline texinfo nss nspr ] - ++ stdenv.lib.optionals stdenv.isLinux [ libcap libseccomp ]; + ++ stdenv.lib.optionals stdenv.isLinux [ libcap libseccomp pps-tools ]; nativeBuildInputs = [ pkgconfig ]; hardeningEnable = [ "pie" ]; diff --git a/pkgs/tools/networking/iperf/3.nix b/pkgs/tools/networking/iperf/3.nix index ed6ca57f3da8..86ee7578bb67 100644 --- a/pkgs/tools/networking/iperf/3.nix +++ b/pkgs/tools/networking/iperf/3.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, openssl, fetchpatch }: stdenv.mkDerivation rec { - name = "iperf-3.5"; + name = "iperf-3.6"; src = fetchurl { url = "https://downloads.es.net/pub/iperf/${name}.tar.gz"; - sha256 = "1m9cyycv70s8nlbgr1lqwr155ixk17np0nzqgwaw3f51vkndk6sk"; + sha256 = "0vllfmyqiy6nxgbagsx1zrs4pmfawyalzm5l1xcwqq64dpj52pfy"; }; buildInputs = [ openssl ]; diff --git a/pkgs/tools/networking/ntp/default.nix b/pkgs/tools/networking/ntp/default.nix index 6e566d3c4739..467b17e468a2 100644 --- a/pkgs/tools/networking/ntp/default.nix +++ b/pkgs/tools/networking/ntp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, openssl, perl, libcap ? null, libseccomp ? null }: +{ stdenv, lib, fetchurl, openssl, perl, libcap ? null, libseccomp ? null, pps-tools }: assert stdenv.isLinux -> libcap != null; assert stdenv.isLinux -> libseccomp != null; @@ -28,7 +28,9 @@ stdenv.mkDerivation rec { ] ++ stdenv.lib.optional stdenv.isLinux "--enable-linuxcaps" ++ stdenv.lib.optional withSeccomp "--enable-libseccomp"; - buildInputs = [ libcap openssl perl ] ++ lib.optional withSeccomp libseccomp; + buildInputs = [ libcap openssl perl ] + ++ lib.optional withSeccomp libseccomp + ++ lib.optional stdenv.isLinux pps-tools; hardeningEnable = [ "pie" ]; diff --git a/pkgs/tools/networking/unbound/python.nix b/pkgs/tools/networking/unbound/python.nix index 911afdd18bb0..67e6f2e9c43f 100644 --- a/pkgs/tools/networking/unbound/python.nix +++ b/pkgs/tools/networking/unbound/python.nix @@ -5,11 +5,11 @@ let in stdenv.mkDerivation rec { pname = "pyunbound"; name = "${pname}-${version}"; - version = "1.6.0"; + version = "1.7.3"; src = fetchurl { url = "http://unbound.net/downloads/unbound-${version}.tar.gz"; - sha256 = "1dzsxyp34ianp08wk4vf13qzl5ss5rr9v1p8zr1aggfywrsbhzbb"; + sha256 = "0bb0p8nbda77ghx20yfl7hqxm9x709223q35465v99i8v4ay27f1"; }; buildInputs = [ openssl expat libevent swig python ]; diff --git a/pkgs/tools/networking/xl2tpd/default.nix b/pkgs/tools/networking/xl2tpd/default.nix index f34b01fb484a..d86b1613a9a3 100644 --- a/pkgs/tools/networking/xl2tpd/default.nix +++ b/pkgs/tools/networking/xl2tpd/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "xl2tpd-${version}"; - version = "1.3.10.1"; + version = "1.3.12"; src = fetchFromGitHub { owner = "xelerance"; repo = "xl2tpd"; rev = "v${version}"; - sha256 = "0rz31bcjl7na89abn9bj5p3dbgqd6q6xsympzki15axxhyy57qan"; + sha256 = "0slza1v8qligy8c83j0x3jzb85m9ibjxyyvpwsykrkypav8a6ii1"; }; buildInputs = [ libpcap ]; diff --git a/pkgs/tools/package-management/createrepo_c/default.nix b/pkgs/tools/package-management/createrepo_c/default.nix index c2fd1293b791..f6314b655294 100644 --- a/pkgs/tools/package-management/createrepo_c/default.nix +++ b/pkgs/tools/package-management/createrepo_c/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig, bzip2, expat, glib, curl, libxml2, python2, rpm, openssl, sqlite, file, xz, pcre, bash-completion }: stdenv.mkDerivation rec { - rev = "0.10.0"; + rev = "0.11.0"; name = "createrepo_c-${rev}"; src = fetchFromGitHub { inherit rev; owner = "rpm-software-management"; repo = "createrepo_c"; - sha256 = "1sqzdkj9vigkvxsjlih1i0gylv53na2yic5if9w1s2sgxhqqz5zv"; + sha256 = "1w9yynj8mxhw714gvgr0fibfks584b4y0n4vjckcf7y97cpdhjkn"; }; patches = [ diff --git a/pkgs/tools/security/kbfs/default.nix b/pkgs/tools/security/kbfs/default.nix index 9e1f664f5d84..f019aa460aea 100644 --- a/pkgs/tools/security/kbfs/default.nix +++ b/pkgs/tools/security/kbfs/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "kbfs-${version}"; - version = "1.0.44"; + version = "2.1.1"; goPackagePath = "github.com/keybase/kbfs"; subPackages = [ "kbfsfuse" "kbfsgit/git-remote-keybase" ]; @@ -13,7 +13,7 @@ buildGoPackage rec { owner = "keybase"; repo = "kbfs"; rev = "v${version}"; - sha256 = "1vjgzif8ki9xrlcghpzkvqwfwvaq63llf52s03m3d2vkyigmgp78"; + sha256 = "1s1bgi9hcilz2is8w2kkvzi928i7w6m5j2x8avkb8zl9s3mrqz3q"; }; buildFlags = [ "-tags production" ]; diff --git a/pkgs/tools/security/keybase/default.nix b/pkgs/tools/security/keybase/default.nix index 47941a9d7787..1bccd4c9f957 100644 --- a/pkgs/tools/security/keybase/default.nix +++ b/pkgs/tools/security/keybase/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "keybase-${version}"; - version = "2.0.0"; + version = "2.1.0"; goPackagePath = "github.com/keybase/client"; subPackages = [ "go/keybase" ]; @@ -13,7 +13,7 @@ buildGoPackage rec { owner = "keybase"; repo = "client"; rev = "v${version}"; - sha256 = "0lapcw9csr18n4pc1mlljs1bd8w8imzsic4qgr07s53i80bd8l6n"; + sha256 = "16izsx5944byc930i6pqsbyrp316yyy8z5xvmzj0g8rgawajdx5h"; }; buildFlags = [ "-tags production" ]; diff --git a/pkgs/tools/security/keybase/gui.nix b/pkgs/tools/security/keybase/gui.nix index 1d50f5498c83..b53860e406d2 100644 --- a/pkgs/tools/security/keybase/gui.nix +++ b/pkgs/tools/security/keybase/gui.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, buildFHSUserEnv, writeTextFile, alsaLib, atk, cairo, cups -, dbus, expat, fontconfig, freetype, gcc, gdk_pixbuf, glib, gnome2, gtk2 +, dbus, expat, fontconfig, freetype, gcc, gdk_pixbuf, glib, gnome2, gtk3 , libnotify, nspr, nss, pango, systemd, xorg, utillinuxMinimal }: let @@ -16,7 +16,7 @@ let gdk_pixbuf glib gnome2.GConf - gtk2 + gtk3 libnotify nspr nss @@ -38,10 +38,10 @@ let in stdenv.mkDerivation rec { name = "keybase-gui-${version}"; - version = "1.0.44-20180223200436.9a9ccec79"; + version = "2.3.0-20180627160031.8e0438e6fb"; src = fetchurl { url = "https://s3.amazonaws.com/prerelease.keybase.io/linux_binaries/deb/keybase_${version}_amd64.deb"; - sha256 = "0dmi0fw39924kpahlsk853hbmpy8a6nj78lrh1wharayjpvj6jv3"; + sha256 = "0xaxxjdfdmgv0wfy75dspfa0a7cdwdpphyy6my9vw82v8jxl3ffx"; }; phases = ["unpackPhase" "installPhase" "fixupPhase"]; unpackPhase = '' diff --git a/pkgs/tools/system/hwinfo/default.nix b/pkgs/tools/system/hwinfo/default.nix index 73adb0828028..066848ea7be9 100644 --- a/pkgs/tools/system/hwinfo/default.nix +++ b/pkgs/tools/system/hwinfo/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "hwinfo-${version}"; - version = "21.55"; + version = "21.56"; src = fetchFromGitHub { owner = "opensuse"; repo = "hwinfo"; rev = "${version}"; - sha256 = "005xf5j2bbalsi6z2j9q9r4zf80a04f7mz0bd2jyb8rh3lnac6w8"; + sha256 = "09zc8k1d9l673bb41vjpz3zrzaxaymqgk8m1v7pccvg70rq005kv"; }; patchPhase = '' diff --git a/pkgs/tools/system/syslog-ng/default.nix b/pkgs/tools/system/syslog-ng/default.nix index 4f3795cf54c9..7abf9e85ab88 100644 --- a/pkgs/tools/system/syslog-ng/default.nix +++ b/pkgs/tools/system/syslog-ng/default.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "man" ]; meta = with stdenv.lib; { - homepage = http://www.balabit.com/network-security/syslog-ng/; + homepage = https://www.balabit.com/network-security/syslog-ng/; description = "Next-generation syslogd with advanced networking and filtering capabilities"; license = licenses.gpl2; maintainers = with maintainers; [ rickynils fpletz ]; diff --git a/pkgs/tools/text/languagetool/default.nix b/pkgs/tools/text/languagetool/default.nix index e60ead5bc8f5..42ba36adf310 100644 --- a/pkgs/tools/text/languagetool/default.nix +++ b/pkgs/tools/text/languagetool/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "LanguageTool-${version}"; - version = "4.1"; + version = "4.2"; src = fetchzip { url = "https://www.languagetool.org/download/${name}.zip"; - sha256 = "0qc4z5rl9239lqfi2jrggzmjkx4f33n0arlqm5xgfaqgi8wypz0l"; + sha256 = "01iy3cq6rwkm8sflj2nwp4ib29hyykd23hfsnrmqxji9csj8pf71"; }; nativeBuildInputs = [ makeWrapper ]; buildInputs = [ jre ]; diff --git a/pkgs/tools/typesetting/hevea/default.nix b/pkgs/tools/typesetting/hevea/default.nix index e125c8e7f2fe..aa32d52dfc6d 100644 --- a/pkgs/tools/typesetting/hevea/default.nix +++ b/pkgs/tools/typesetting/hevea/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, ocamlPackages }: stdenv.mkDerivation rec { - name = "hevea-2.31"; + name = "hevea-2.32"; src = fetchurl { url = "http://pauillac.inria.fr/~maranget/hevea/distri/${name}.tar.gz"; - sha256 = "15xrnnqlacz8dpr09h7jgijm65wss99rmy9mb1zmapplmwhavmzv"; + sha256 = "1s4yqphfcr1pf5mcj5c84mvmd107k525iiym5jdwsxz0ka0ccmfy"; }; buildInputs = with ocamlPackages; [ ocaml ocamlbuild ]; diff --git a/pkgs/tools/typesetting/tex/texlive/bin.nix b/pkgs/tools/typesetting/tex/texlive/bin.nix index 6555c999d7f2..32894748ac46 100644 --- a/pkgs/tools/typesetting/tex/texlive/bin.nix +++ b/pkgs/tools/typesetting/tex/texlive/bin.nix @@ -4,7 +4,7 @@ , freetype, t1lib, gd, libXaw, icu, ghostscript, ed, libXt, libXpm, libXmu, libXext , xextproto, perl, libSM, ruby, expat, curl, libjpeg, python, fontconfig, pkgconfig , poppler, libpaper, graphite2, zziplib, harfbuzz, texinfo, potrace, gmp, mpfr -, xpdf, cairo, pixman, xorg, clisp +, xpdf, cairo, pixman, xorg, clisp, biber , makeWrapper }: @@ -261,6 +261,7 @@ dvipng = stdenv.mkDerivation { }; +inherit biber; bibtexu = bibtex8; bibtex8 = stdenv.mkDerivation { name = "texlive-bibtex-x.bin-${version}"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6b1219690d7f..da42945760da 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5,7 +5,7 @@ * to merges. Please use the full-text search of your editor. ;) * Hint: ### starts category names. */ -{ lib, nixpkgsFun, noSysDirs, config}: +{ lib, noSysDirs, config}: self: pkgs: with pkgs; @@ -15,22 +15,6 @@ with pkgs; # Allow callPackage to fill in the pkgs argument inherit pkgs; - - # Override system. This is useful to build i686 packages on x86_64-linux. - forceSystem = system: kernel: nixpkgsFun { - localSystem = { - inherit system; - platform = platform // { kernelArch = kernel; }; - }; - }; - - # Used by wine, firefox with debugging version of Flash, ... - pkgsi686Linux = forceSystem "i686-linux" "i386"; - - callPackage_i686 = if stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux" - then pkgsi686Linux.callPackage - else throw "callPackage_i686 not supported on system '${stdenv.system}'"; - # A stdenv capable of building 32-bit binaries. On x86_64-linux, # it uses GCC compiled with multilib support; on i686-linux, it's # just the plain stdenv. @@ -872,6 +856,8 @@ with pkgs; blink1-tool = callPackage ../tools/misc/blink1-tool { }; + bliss = callPackage ../applications/science/math/bliss { }; + blitz = callPackage ../development/libraries/blitz { boost = boost160; }; @@ -2102,7 +2088,6 @@ with pkgs; dolphinEmuMaster = callPackage ../misc/emulators/dolphin-emu/master.nix { inherit (darwin.apple_sdk.frameworks) CoreBluetooth ForceFeedback IOKit OpenGL; inherit (darwin) cf-private; - wxGTK = wxGTK31; }; doomseeker = qt5.callPackage ../applications/misc/doomseeker { }; @@ -2408,7 +2393,7 @@ with pkgs; flamerobin = callPackage ../applications/misc/flamerobin { }; - flashtool = callPackage_i686 ../development/mobile/flashtool { + flashtool = pkgsi686Linux.callPackage ../development/mobile/flashtool { platformTools = androidenv.platformTools; }; @@ -2422,6 +2407,8 @@ with pkgs; flvstreamer = callPackage ../tools/networking/flvstreamer { }; + hmetis = pkgsi686Linux.callPackage ../applications/science/math/hmetis { }; + libbsd = callPackage ../development/libraries/libbsd { }; libbladeRF = callPackage ../development/libraries/libbladeRF { }; @@ -2520,14 +2507,16 @@ with pkgs; fuseiso = callPackage ../tools/filesystems/fuseiso { }; - fdbPackages = callPackage ../servers/foundationdb { stdenv = overrideCC stdenv gcc49; }; + fdbPackages = callPackage ../servers/foundationdb { + stdenv49 = overrideCC stdenv gcc49; + }; inherit (fdbPackages) foundationdb51 foundationdb52 foundationdb60; - foundationdb = callPackage ../servers/foundationdb { stdenv = overrideCC stdenv gcc49; }; + foundationdb = foundationdb52; fuse-7z-ng = callPackage ../tools/filesystems/fuse-7z-ng { }; @@ -2814,13 +2803,13 @@ with pkgs; groonga = callPackage ../servers/search/groonga { }; - grub = callPackage_i686 ../tools/misc/grub { + grub = pkgsi686Linux.callPackage ../tools/misc/grub { buggyBiosCDSupport = config.grub.buggyBiosCDSupport or true; }; - trustedGrub = callPackage_i686 ../tools/misc/grub/trusted.nix { }; + trustedGrub = pkgsi686Linux.callPackage ../tools/misc/grub/trusted.nix { }; - trustedGrub-for-HP = callPackage_i686 ../tools/misc/grub/trusted.nix { for_HP_laptop = true; }; + trustedGrub-for-HP = pkgsi686Linux.callPackage ../tools/misc/grub/trusted.nix { for_HP_laptop = true; }; grub2 = grub2_full; @@ -3300,7 +3289,7 @@ with pkgs; kbdd = callPackage ../applications/window-managers/kbdd { }; - kdbplus = callPackage_i686 ../applications/misc/kdbplus { }; + kdbplus = pkgsi686Linux.callPackage ../applications/misc/kdbplus { }; kde2-decoration = libsForQt5.callPackage ../misc/themes/kde2 { }; @@ -3419,7 +3408,7 @@ with pkgs; kippo = callPackage ../servers/kippo { }; - kzipmix = callPackage_i686 ../tools/compression/kzipmix { }; + kzipmix = pkgsi686Linux.callPackage ../tools/compression/kzipmix { }; mailcatcher = callPackage ../development/web/mailcatcher { }; @@ -3718,7 +3707,7 @@ with pkgs; lzip = callPackage ../tools/compression/lzip { }; luxcorerender = callPackage ../tools/graphics/luxcorerender { }; - + xz = callPackage ../tools/compression/xz { }; lz4 = callPackage ../tools/compression/lz4 { }; @@ -4622,6 +4611,8 @@ with pkgs; ps3netsrv = callPackage ../servers/ps3netsrv { }; + pscircle = callPackage ../os-specific/linux/pscircle { }; + psmisc = callPackage ../os-specific/linux/psmisc { }; pssh = callPackage ../tools/networking/pssh { }; @@ -4983,7 +4974,7 @@ with pkgs; securefs = callPackage ../tools/filesystems/securefs { }; seexpr = callPackage ../development/compilers/seexpr { }; - + setroot = callPackage ../tools/X11/setroot { }; setserial = callPackage ../tools/system/setserial { }; @@ -5051,6 +5042,8 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; }; + sixpair = callPackage ../tools/misc/sixpair {}; + skippy-xd = callPackage ../tools/X11/skippy-xd {}; sks = callPackage ../servers/sks { inherit (ocamlPackages_4_02) ocaml camlp4; }; @@ -5410,7 +5403,7 @@ with pkgs; torsocks = callPackage ../tools/security/tor/torsocks.nix { }; - toxvpn = callPackage ../tools/networking/toxvpn { libtoxcore = libtoxcore_0_1; }; + toxvpn = callPackage ../tools/networking/toxvpn { }; tpmmanager = callPackage ../applications/misc/tpmmanager { }; @@ -5540,6 +5533,8 @@ with pkgs; vacuum = callPackage ../applications/networking/instant-messengers/vacuum {}; + vampire = callPackage ../applications/science/logic/vampire {}; + volatility = callPackage ../tools/security/volatility { }; vbetool = callPackage ../tools/system/vbetool { }; @@ -5888,14 +5883,7 @@ with pkgs; xbursttools = callPackage ../tools/misc/xburst-tools { # It needs a cross compiler for mipsel to build the firmware it will # load into the Ben Nanonote - gccCross = - let - pkgsCross = nixpkgsFun { - # Ben Nanonote system - crossSystem = lib.systems.examples.ben-nanonote; - }; - in - pkgsCross.buildPackages.gccCrossStageStatic; + gccCross = pkgsCross.ben-nanonote.buildPackages.gccCrossStageStatic; }; xclip = callPackage ../tools/misc/xclip { }; @@ -6058,6 +6046,8 @@ with pkgs; bash-completion = callPackage ../shells/bash/bash-completion { }; + gradle-completion = callPackage ../shells/zsh/gradle-completion { }; + nix-bash-completions = callPackage ../shells/bash/nix-bash-completions { }; dash = callPackage ../shells/dash { }; @@ -6193,7 +6183,7 @@ with pkgs; cmdstan = callPackage ../development/compilers/cmdstan { }; - cmucl_binary = callPackage_i686 ../development/compilers/cmucl/binary.nix { }; + cmucl_binary = pkgsi686Linux.callPackage ../development/compilers/cmucl/binary.nix { }; compcert = callPackage ../development/compilers/compcert { }; @@ -6500,25 +6490,25 @@ with pkgs; gcl_2_6_13_pre = callPackage ../development/compilers/gcl/2.6.13-pre.nix { }; - gcc-arm-embedded-4_7 = callPackage_i686 ../development/compilers/gcc-arm-embedded { + gcc-arm-embedded-4_7 = pkgsi686Linux.callPackage ../development/compilers/gcc-arm-embedded { version = "4.7-2013q3-20130916"; releaseType = "update"; sha256 = "1bd9bi9q80xn2rpy0rn1vvj70rh15kb7dmah0qs4q2rv78fqj40d"; ncurses = pkgsi686Linux.ncurses5; }; - gcc-arm-embedded-4_8 = callPackage_i686 ../development/compilers/gcc-arm-embedded { + gcc-arm-embedded-4_8 = pkgsi686Linux.callPackage ../development/compilers/gcc-arm-embedded { version = "4.8-2014q1-20140314"; releaseType = "update"; sha256 = "ce92859550819d4a3d1a6e2672ea64882b30afa2c08cf67fa8e1d93788c2c577"; ncurses = pkgsi686Linux.ncurses5; }; - gcc-arm-embedded-4_9 = callPackage_i686 ../development/compilers/gcc-arm-embedded { + gcc-arm-embedded-4_9 = pkgsi686Linux.callPackage ../development/compilers/gcc-arm-embedded { version = "4.9-2015q1-20150306"; releaseType = "update"; sha256 = "c5e0025b065750bbd76b5357b4fc8606d88afbac9ff55b8a82927b4b96178154"; ncurses = pkgsi686Linux.ncurses5; }; - gcc-arm-embedded-5 = pkgs.callPackage_i686 ../development/compilers/gcc-arm-embedded { + gcc-arm-embedded-5 = pkgs.pkgsi686Linux.callPackage ../development/compilers/gcc-arm-embedded { dirName = "5.0"; subdirName = "5-2016-q2-update"; version = "5.4-2016q2-20160622"; @@ -6884,7 +6874,7 @@ with pkgs; manticore = callPackage ../development/compilers/manticore { }; mentorToolchains = recurseIntoAttrs ( - callPackage_i686 ../development/compilers/mentor {} + pkgsi686Linux.callPackage ../development/compilers/mentor {} ); mercury = callPackage ../development/compilers/mercury { }; @@ -7071,7 +7061,7 @@ with pkgs; smlnjBootstrap = callPackage ../development/compilers/smlnj/bootstrap.nix { }; smlnj = if stdenv.isDarwin then callPackage ../development/compilers/smlnj { } - else callPackage_i686 ../development/compilers/smlnj { }; + else pkgsi686Linux.callPackage ../development/compilers/smlnj { }; solc = callPackage ../development/compilers/solc { }; @@ -7133,6 +7123,8 @@ with pkgs; valadoc = callPackage ../development/tools/valadoc { }; + wcc = callPackage ../development/compilers/wcc { }; + wla-dx = callPackage ../development/compilers/wla-dx { }; wrapCCWith = @@ -7580,7 +7572,7 @@ with pkgs; scheme48 = callPackage ../development/interpreters/scheme48 { }; - self = callPackage_i686 ../development/interpreters/self { }; + self = pkgsi686Linux.callPackage ../development/interpreters/self { }; spark = spark_22; spark_22 = callPackage ../applications/networking/cluster/spark { version = "2.2.1"; }; @@ -7787,7 +7779,9 @@ with pkgs; bazel_0_4 = callPackage ../development/tools/build-managers/bazel/0.4.nix { }; bazel = callPackage ../development/tools/build-managers/bazel { + inherit (darwin) cctools; inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices Foundation; + binutils = binutils-unwrapped; }; bazel-buildtools = callPackage ../development/tools/build-managers/bazel/buildtools { }; @@ -10018,6 +10012,8 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) CoreServices; }; + libde265 = callPackage ../development/libraries/libde265 {}; + libdevil = callPackage ../development/libraries/libdevil { inherit (darwin.apple_sdk.frameworks) OpenGL; }; @@ -10178,6 +10174,8 @@ with pkgs; libf2c = callPackage ../development/libraries/libf2c {}; + libfive = callPackage ../development/libraries/libfive {}; + libfixposix = callPackage ../development/libraries/libfixposix {}; libffcall = callPackage ../development/libraries/libffcall { }; @@ -10232,6 +10230,8 @@ with pkgs; libhdhomerun = callPackage ../development/libraries/libhdhomerun { }; + libheif = callPackage ../development/libraries/libheif {}; + libhttpseverywhere = callPackage ../development/libraries/libhttpseverywhere { }; libHX = callPackage ../development/libraries/libHX { }; @@ -12752,6 +12752,8 @@ with pkgs; lighttpd = callPackage ../servers/http/lighttpd { }; + livepeer = callPackage ../servers/livepeer { ffmpeg = ffmpeg_3; }; + lwan = callPackage ../servers/http/lwan { }; labelImg = callPackage ../applications/science/machine-learning/labelimg { }; @@ -13650,14 +13652,6 @@ with pkgs; modDirVersionArg = linux_4_14.modDirVersion + "-hardened"; }); - linux_copperhead_stable = (linux_4_16.override { - kernelPatches = linux_4_16.kernelPatches ++ [ - kernelPatches.copperhead_4_16 - kernelPatches.tag_hardened - ]; - modDirVersionArg = linux_4_16.modDirVersion + "-hardened"; - }); - # linux mptcp is based on the 4.4 kernel linux_mptcp = callPackage ../os-specific/linux/kernel/linux-mptcp.nix { kernelPatches = @@ -13713,17 +13707,6 @@ with pkgs; ]; }; - linux_4_16 = callPackage ../os-specific/linux/kernel/linux-4.16.nix { - kernelPatches = - [ kernelPatches.bridge_stp_helper - # See pkgs/os-specific/linux/kernel/cpu-cgroup-v2-patches/README.md - # when adding a new linux version - # kernelPatches.cpu-cgroup-v2."4.11" - kernelPatches.modinst_arg_list_too_long - kernelPatches.bcm2835_mmal_v4l2_camera_driver # Only needed for 4.16! - ]; - }; - linux_4_17 = callPackage ../os-specific/linux/kernel/linux-4.17.nix { kernelPatches = [ kernelPatches.bridge_stp_helper @@ -13938,7 +13921,6 @@ with pkgs; linuxPackages_4_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_4); linuxPackages_4_9 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_9); linuxPackages_4_14 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_14); - linuxPackages_4_16 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_16); linuxPackages_4_17 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_17); # Don't forget to update linuxPackages_latest! @@ -13991,7 +13973,6 @@ with pkgs; linuxPackages_latest_xen_dom0_hardened = recurseIntoAttrs (hardenedLinuxPackagesFor (pkgs.linux_latest.override { features.xen_dom0=true; })); linuxPackages_copperhead_lts = recurseIntoAttrs (hardenedLinuxPackagesFor pkgs.linux_copperhead_lts); - linuxPackages_copperhead_stable = recurseIntoAttrs (hardenedLinuxPackagesFor pkgs.linux_copperhead_stable); # Samus kernels linuxPackages_samus_4_12 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_samus_4_12); @@ -14235,6 +14216,8 @@ with pkgs; powertop = callPackage ../os-specific/linux/powertop { }; + pps-tools = callPackage ../os-specific/linux/pps-tools { }; + prayer = callPackage ../servers/prayer { }; procps-ng = if stdenv.isLinux then callPackage ../os-specific/linux/procps-ng { } @@ -14373,6 +14356,7 @@ with pkgs; ubootClearfog ubootGuruplug ubootJetsonTK1 + ubootNovena ubootOdroidXU3 ubootOrangePiPc ubootPcduino3Nano @@ -14919,6 +14903,8 @@ with pkgs; source-serif-pro = callPackage ../data/fonts/source-serif-pro { }; + source-han-code-jp = callPackage ../data/fonts/source-han-code-jp { }; + sourceHanSansPackages = callPackage ../data/fonts/source-han-sans { }; source-han-sans-japanese = sourceHanSansPackages.japanese; source-han-sans-korean = sourceHanSansPackages.korean; @@ -15030,7 +15016,7 @@ with pkgs; requests requests_toolbelt sqlalchemy fusepy; }; - adobe-reader = callPackage_i686 ../applications/misc/adobe-reader { }; + adobe-reader = pkgsi686Linux.callPackage ../applications/misc/adobe-reader { }; masterpdfeditor = libsForQt5.callPackage ../applications/misc/masterpdfeditor { }; @@ -16636,6 +16622,8 @@ with pkgs; inherit (perlPackages.override { pkgs = pkgs // { imagemagick = imagemagickBig;}; }) PerlMagick; }; + iksemel = callPackage ../development/libraries/iksemel { }; + imagej = callPackage ../applications/graphics/imagej { }; imagemagick_light = imagemagick.override { @@ -16656,6 +16644,8 @@ with pkgs; libxml2 = null; openjpeg = null; libwebp = null; + libheif = null; + libde265 = null; }; imagemagick = callPackage ../applications/graphics/ImageMagick { @@ -16683,6 +16673,7 @@ with pkgs; libxml2 = null; openjpeg = null; libwebp = null; + libheif = null; }); imagemagick7 = lowPrio (imagemagick7Big.override { @@ -16698,7 +16689,7 @@ with pkgs; # Impressive, formerly known as "KeyJNote". impressive = callPackage ../applications/office/impressive { }; - inferno = callPackage_i686 ../applications/inferno { }; + inferno = pkgsi686Linux.callPackage ../applications/inferno { }; inginious = callPackage ../servers/inginious {}; @@ -16821,7 +16812,7 @@ with pkgs; keepnote = callPackage ../applications/office/keepnote { }; - kega-fusion = callPackage_i686 ../misc/emulators/kega-fusion { }; + kega-fusion = pkgsi686Linux.callPackage ../misc/emulators/kega-fusion { }; kermit = callPackage ../tools/misc/kermit { }; @@ -16964,6 +16955,8 @@ with pkgs; libreoffice = libreoffice-still-unwrapped; }); + libvmi = callPackage ../development/libraries/libvmi { }; + liferea = callPackage ../applications/networking/newsreaders/liferea { inherit (gnome3) libpeas gsettings-desktop-schemas dconf; }; @@ -17620,7 +17613,7 @@ with pkgs; ffmpeg = ffmpeg_2; }; - pcsx2 = callPackage_i686 ../misc/emulators/pcsx2 { }; + pcsx2 = pkgsi686Linux.callPackage ../misc/emulators/pcsx2 { }; pekwm = callPackage ../applications/window-managers/pekwm { }; @@ -17994,7 +17987,9 @@ with pkgs; rpcs3 = libsForQt5.callPackage ../misc/emulators/rpcs3 { }; - rstudio = libsForQt5.callPackage ../applications/editors/rstudio { }; + rstudio = libsForQt5.callPackage ../applications/editors/rstudio { + boost = boost166; + }; rsync = callPackage ../applications/networking/sync/rsync { enableACLs = !(stdenv.isDarwin || stdenv.isSunOS || stdenv.isFreeBSD); @@ -18835,6 +18830,8 @@ with pkgs; erlang = erlangR18; }; + write_stylus = libsForQt5.callPackage ../applications/graphics/write_stylus { }; + alsamixer.app = callPackage ../applications/window-managers/windowmaker/dockapps/alsamixer.app.nix { }; wllvm = callPackage ../development/tools/wllvm { }; @@ -19853,7 +19850,7 @@ with pkgs; terraria-server = callPackage ../games/terraria-server { }; - tibia = callPackage_i686 ../games/tibia { }; + tibia = pkgsi686Linux.callPackage ../games/tibia { }; tintin = callPackage ../games/tintin { }; @@ -19922,7 +19919,7 @@ with pkgs; vectoroids = callPackage ../games/vectoroids { }; - vessel = callPackage_i686 ../games/vessel { }; + vessel = pkgsi686Linux.callPackage ../games/vessel { }; vms-empire = callPackage ../games/vms-empire { }; @@ -20912,7 +20909,7 @@ with pkgs; bootil = callPackage ../development/libraries/bootil { }; - brgenml1lpr = callPackage_i686 ../misc/cups/drivers/brgenml1lpr {}; + brgenml1lpr = pkgsi686Linux.callPackage ../misc/cups/drivers/brgenml1lpr {}; brgenml1cupswrapper = callPackage ../misc/cups/drivers/brgenml1cupswrapper {}; @@ -20961,10 +20958,10 @@ with pkgs; cups-bjnp = callPackage ../misc/cups/drivers/cups-bjnp { }; - cups-brother-hl1110 = callPackage_i686 ../misc/cups/drivers/hl1110 { }; + cups-brother-hl1110 = pkgsi686Linux.callPackage ../misc/cups/drivers/hl1110 { }; # this driver ships with pre-compiled 32-bit binary libraries - cnijfilter_2_80 = callPackage_i686 ../misc/cups/drivers/cnijfilter_2_80 { }; + cnijfilter_2_80 = pkgsi686Linux.callPackage ../misc/cups/drivers/cnijfilter_2_80 { }; cnijfilter_4_00 = callPackage ../misc/cups/drivers/cnijfilter_4_00 { libusb = libusb1; @@ -21054,7 +21051,7 @@ with pkgs; gammu = callPackage ../applications/misc/gammu { }; - gensgs = callPackage_i686 ../misc/emulators/gens-gs { }; + gensgs = pkgsi686Linux.callPackage ../misc/emulators/gens-gs { }; ghostscript = callPackage ../misc/ghostscript rec { cupsSupport = config.ghostscript.cups or (!stdenv.isDarwin); @@ -21393,17 +21390,20 @@ with pkgs; hll2390dw-cups = callPackage ../misc/cups/drivers/hll2390dw-cups { }; mfcj470dw-cupswrapper = callPackage ../misc/cups/drivers/mfcj470dwcupswrapper { }; - mfcj470dwlpr = callPackage_i686 ../misc/cups/drivers/mfcj470dwlpr { }; + mfcj470dwlpr = pkgsi686Linux.callPackage ../misc/cups/drivers/mfcj470dwlpr { }; mfcj6510dw-cupswrapper = callPackage ../misc/cups/drivers/mfcj6510dwcupswrapper { }; - mfcj6510dwlpr = callPackage_i686 ../misc/cups/drivers/mfcj6510dwlpr { }; + mfcj6510dwlpr = pkgsi686Linux.callPackage ../misc/cups/drivers/mfcj6510dwlpr { }; mfcl2700dncupswrapper = callPackage ../misc/cups/drivers/mfcl2700dncupswrapper { }; - mfcl2700dnlpr = callPackage_i686 ../misc/cups/drivers/mfcl2700dnlpr { }; + mfcl2700dnlpr = pkgsi686Linux.callPackage ../misc/cups/drivers/mfcl2700dnlpr { }; mfcl2720dwcupswrapper = callPackage ../misc/cups/drivers/mfcl2720dwcupswrapper { }; mfcl2720dwlpr = callPackage ../misc/cups/drivers/mfcl2720dwlpr { }; + mfcl2740dwcupswrapper = callPackage ../misc/cups/drivers/mfcl2740dwcupswrapper { }; + mfcl2740dwlpr = callPackage ../misc/cups/drivers/mfcl2740dwlpr { }; + samsung-unified-linux-driver_1_00_37 = callPackage ../misc/cups/drivers/samsung { }; samsung-unified-linux-driver_4_01_17 = callPackage ../misc/cups/drivers/samsung/4.01.17.nix { }; samsung-unified-linux-driver = callPackage ../misc/cups/drivers/samsung/4.00.39 { }; @@ -21596,7 +21596,17 @@ with pkgs; pythonPackages = python3Packages; }; - winePackages = recurseIntoAttrs (callPackage ./wine-packages.nix { }); + winePackagesFor = wineBuild: lib.makeExtensible (self: with self; { + callPackage = newScope self; + + inherit wineBuild; + + inherit (callPackage ./wine-packages.nix {}) + minimal base full stable unstable staging; + }); + + winePackages = recurseIntoAttrs (winePackagesFor (config.wine.build or "wine32")); + wineWowPackages = recurseIntoAttrs (winePackagesFor "wineWow"); wine = winePackages.full; @@ -21705,7 +21715,7 @@ with pkgs; callPackage ../applications/networking/znc/modules.nix { } ); - zsnes = callPackage_i686 ../misc/emulators/zsnes { }; + zsnes = pkgsi686Linux.callPackage ../misc/emulators/zsnes { }; xcpc = callPackage ../misc/emulators/xcpc { }; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index a6044c7d6c4b..cb8135294b83 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -156,6 +156,11 @@ in rec { ghc = bh.compiler.ghc843; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.4.x.nix { }; }; + ghc861 = callPackage ../development/haskell-modules { + buildHaskellPackages = bh.packages.ghc861; + ghc = bh.compiler.ghc861; + compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.6.x.nix { }; + }; ghcHEAD = callPackage ../development/haskell-modules { buildHaskellPackages = bh.packages.ghcHEAD; ghc = bh.compiler.ghcHEAD; diff --git a/pkgs/top-level/make-tarball.nix b/pkgs/top-level/make-tarball.nix index ccd7b89fc12d..f7f128547bae 100644 --- a/pkgs/top-level/make-tarball.nix +++ b/pkgs/top-level/make-tarball.nix @@ -42,7 +42,7 @@ releaseTools.sourceTarball rec { echo 'abort "Illegal use of <nixpkgs> in Nixpkgs."' > $TMPDIR/barf.nix - # Make sure that Nixpkgs does not use <nixpkgs> + # Make sure that Nixpkgs does not use <nixpkgs>. badFiles=$(find pkgs -type f -name '*.nix' -print | xargs grep -l '^[^#]*<nixpkgs\/' || true) if [[ -n $badFiles ]]; then echo "Nixpkgs is not allowed to use <nixpkgs> to refer to itself." @@ -101,7 +101,7 @@ releaseTools.sourceTarball rec { stopNest header "checking find-tarballs.nix" - nix-instantiate --eval --strict --show-trace --json \ + nix-instantiate --readonly-mode --eval --strict --show-trace --json \ ./maintainers/scripts/find-tarballs.nix \ --arg expr 'import ./maintainers/scripts/all-tarballs.nix' > $TMPDIR/tarballs.json nrUrls=$(jq -r '.[].url' < $TMPDIR/tarballs.json | wc -l) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1563176c39a0..6a7f6f49fa1f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -440,6 +440,8 @@ in { python-periphery = callPackage ../development/python-modules/python-periphery { }; + python-prctl = callPackage ../development/python-modules/python-prctl { }; + python-sql = callPackage ../development/python-modules/python-sql { }; python-stdnum = callPackage ../development/python-modules/python-stdnum { }; @@ -6247,8 +6249,6 @@ in { google_cloud_speech = callPackage ../development/python-modules/google_cloud_speech { }; - google_gax = callPackage ../development/python-modules/google_gax { }; - gpgme = toPythonModule (pkgs.gpgme.override { withPython=true; }); grammalecte = callPackage ../development/python-modules/grammalecte { }; @@ -6263,6 +6263,8 @@ in { grpcio = callPackage ../development/python-modules/grpcio { }; + grpcio-tools = callPackage ../development/python-modules/grpcio-tools { }; + gspread = buildPythonPackage rec { version = "0.2.3"; name = "gspread-${version}"; diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index f78152a8931c..81f0874ca12d 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -25,6 +25,8 @@ let systemsWithAnySupport = supportedSystems ++ limitedSupportedSystems; + supportDarwin = builtins.elem "x86_64-darwin" systemsWithAnySupport; + jobs = { tarball = import ./make-tarball.nix { inherit pkgs nixpkgs officialRelease; }; @@ -33,7 +35,7 @@ let manual = import ../../doc; lib-tests = import ../../lib/tests/release.nix { inherit pkgs; }; - darwin-tested = pkgs.releaseTools.aggregate + darwin-tested = if supportDarwin then pkgs.releaseTools.aggregate { name = "nixpkgs-darwin-${jobs.tarball.version}"; meta.description = "Release-critical builds for the Nixpkgs darwin channel"; constituents = @@ -66,7 +68,7 @@ let jobs.tests.stdenv-inputs.x86_64-darwin jobs.tests.macOSSierraShared.x86_64-darwin ]; - }; + } else null; unstable = pkgs.releaseTools.aggregate { name = "nixpkgs-${jobs.tarball.version}"; @@ -77,65 +79,66 @@ let jobs.manual jobs.lib-tests jobs.stdenv.x86_64-linux - jobs.stdenv.x86_64-darwin jobs.linux.x86_64-linux jobs.python.x86_64-linux - jobs.python.x86_64-darwin jobs.python3.x86_64-linux - jobs.python3.x86_64-darwin # Needed by travis-ci to test PRs jobs.nox.x86_64-linux - jobs.nox.x86_64-darwin # Needed for support jobs.nix-info.x86_64-linux - jobs.nix-info.x86_64-darwin jobs.nix-info-tested.x86_64-linux - jobs.nix-info-tested.x86_64-darwin # Ensure that X11/GTK+ are in order. jobs.thunderbird.x86_64-linux - # Ensure that basic stuff works on darwin - jobs.git.x86_64-darwin - jobs.mariadb.x86_64-darwin - jobs.vim.x86_64-darwin - # Ensure that UI stuff works on darwin - jobs.inkscape.x86_64-darwin - jobs.qt5.qtmultimedia.x86_64-darwin jobs.tests.cc-wrapper.x86_64-linux - jobs.tests.cc-wrapper.x86_64-darwin jobs.tests.cc-wrapper-gcc7.x86_64-linux - jobs.tests.cc-wrapper-gcc7.x86_64-darwin jobs.tests.cc-wrapper-gcc8.x86_64-linux # broken see issue #40038 - # jobs.tests.cc-wrapper-gcc8.x86_64-darwin jobs.tests.cc-wrapper-clang.x86_64-linux - jobs.tests.cc-wrapper-clang.x86_64-darwin jobs.tests.cc-wrapper-libcxx.x86_64-linux - jobs.tests.cc-wrapper-libcxx.x86_64-darwin jobs.tests.cc-wrapper-clang-39.x86_64-linux - jobs.tests.cc-wrapper-clang-39.x86_64-darwin jobs.tests.cc-wrapper-libcxx-39.x86_64-linux - jobs.tests.cc-wrapper-libcxx-39.x86_64-darwin jobs.tests.cc-wrapper-clang-4.x86_64-linux - jobs.tests.cc-wrapper-clang-4.x86_64-darwin jobs.tests.cc-wrapper-libcxx-4.x86_64-linux - jobs.tests.cc-wrapper-libcxx-4.x86_64-darwin jobs.tests.cc-wrapper-clang-5.x86_64-linux - jobs.tests.cc-wrapper-clang-5.x86_64-darwin jobs.tests.cc-wrapper-libcxx-5.x86_64-linux - jobs.tests.cc-wrapper-libcxx-6.x86_64-darwin jobs.tests.cc-wrapper-clang-6.x86_64-linux - jobs.tests.cc-wrapper-clang-6.x86_64-darwin jobs.tests.cc-wrapper-libcxx-6.x86_64-linux - jobs.tests.cc-wrapper-libcxx-6.x86_64-darwin jobs.tests.cc-multilib-gcc.x86_64-linux jobs.tests.cc-multilib-clang.x86_64-linux jobs.tests.stdenv-inputs.x86_64-linux + ] + ++ lib.collect lib.isDerivation jobs.stdenvBootstrapTools + ++ lib.optionals supportDarwin [ + jobs.stdenv.x86_64-darwin + jobs.python.x86_64-darwin + jobs.python3.x86_64-darwin + jobs.nox.x86_64-darwin + jobs.nix-info.x86_64-darwin + jobs.nix-info-tested.x86_64-darwin + jobs.git.x86_64-darwin + jobs.mariadb.x86_64-darwin + jobs.vim.x86_64-darwin + jobs.inkscape.x86_64-darwin + jobs.qt5.qtmultimedia.x86_64-darwin + jobs.tests.cc-wrapper.x86_64-darwin + jobs.tests.cc-wrapper-gcc7.x86_64-darwin + # jobs.tests.cc-wrapper-gcc8.x86_64-darwin + jobs.tests.cc-wrapper-clang.x86_64-darwin + jobs.tests.cc-wrapper-libcxx.x86_64-darwin + jobs.tests.cc-wrapper-clang-39.x86_64-darwin + jobs.tests.cc-wrapper-libcxx-39.x86_64-darwin + jobs.tests.cc-wrapper-clang-4.x86_64-darwin + jobs.tests.cc-wrapper-libcxx-4.x86_64-darwin + jobs.tests.cc-wrapper-clang-5.x86_64-darwin + jobs.tests.cc-wrapper-libcxx-6.x86_64-darwin + jobs.tests.cc-wrapper-clang-6.x86_64-darwin + jobs.tests.cc-wrapper-libcxx-6.x86_64-darwin jobs.tests.stdenv-inputs.x86_64-darwin jobs.tests.macOSSierraShared.x86_64-darwin - ] ++ lib.collect lib.isDerivation jobs.stdenvBootstrapTools; + ]; }; stdenvBootstrapTools = with lib; @@ -148,7 +151,7 @@ let dist test; }) # darwin is special in this - // optionalAttrs (builtins.elem "x86_64-darwin" systemsWithAnySupport) { + // optionalAttrs supportDarwin { x86_64-darwin = let bootstrap = import ../stdenv/darwin/make-bootstrap-tools.nix { system = "x86_64-darwin"; }; diff --git a/pkgs/top-level/stage.nix b/pkgs/top-level/stage.nix index f9941a1c500d..cc70950c497c 100644 --- a/pkgs/top-level/stage.nix +++ b/pkgs/top-level/stage.nix @@ -93,7 +93,7 @@ let allPackages = self: super: let res = import ./all-packages.nix - { inherit lib nixpkgsFun noSysDirs config; } + { inherit lib noSysDirs config; } res self; in res; @@ -117,6 +117,49 @@ let lib.optionalAttrs allowCustomOverrides ((config.packageOverrides or (super: {})) super); + # Convenience attributes for instantitating package sets. Each of + # these will instantiate a new version of allPackages. Currently the + # following package sets are provided: + # + # - pkgsCross.<system> where system is a member of lib.systems.examples + # - pkgsMusl + # - pkgsi686Linux + otherPackageSets = self: super: { + # This maps each entry in lib.systems.examples to its own package + # set. Each of these will contain all packages cross compiled for + # that target system. For instance, pkgsCross.rasberryPi.hello, + # will refer to the "hello" package built for the ARM6-based + # Raspberry Pi. + pkgsCross = lib.mapAttrs (n: crossSystem: + nixpkgsFun { inherit crossSystem; }) + lib.systems.examples; + + # All packages built with the Musl libc. This will override the + # default GNU libc on Linux systems. Non-Linux systems are not + # supported. + pkgsMusl = if stdenv.hostPlatform.isLinux then nixpkgsFun { + localSystem = { + parsed = stdenv.hostPlatform.parsed // { + abi = { + "gnu" = lib.systems.parse.abis.musl; + "gnueabi" = lib.systems.parse.abis.musleabi; + "gnueabihf" = lib.systems.parse.abis.musleabihf; + }.${stdenv.hostPlatform.parsed.abi.name} or lib.systems.parse.abis.musl; + }; + }; + } else throw "Musl libc only supports Linux systems."; + + # All packages built for i686 Linux. + # Used by wine, firefox with debugging version of Flash, ... + pkgsi686Linux = assert stdenv.hostPlatform.isLinux; nixpkgsFun { + localSystem = { + parsed = stdenv.hostPlatform.parsed // { + cpu = lib.systems.parse.cpuTypes.i686; + }; + }; + }; + }; + # The complete chain of package set builders, applied from top to bottom. # stdenvOverlays must be last as it brings package forward from the # previous bootstrapping phases which have already been overlayed. @@ -127,6 +170,7 @@ let trivialBuilders splice allPackages + otherPackageSets aliases configOverrides ] ++ overlays ++ [ diff --git a/pkgs/top-level/wine-packages.nix b/pkgs/top-level/wine-packages.nix index 109f01362555..8ff2d46c24e0 100644 --- a/pkgs/top-level/wine-packages.nix +++ b/pkgs/top-level/wine-packages.nix @@ -1,9 +1,9 @@ -{ stdenv, config, callPackage }: +{ stdenv, config, callPackage, wineBuild }: rec { minimal = callPackage ../misc/emulators/wine { wineRelease = config.wine.release or "stable"; - wineBuild = config.wine.build or "wine32"; + inherit wineBuild; }; base = minimal.override { |