diff options
209 files changed, 3027 insertions, 2255 deletions
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 27f4da36f2d2..d84c6a595383 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -66,11 +66,11 @@ /doc/languages-frameworks/python.section.md @FRidh # Haskell -/pkgs/development/compilers/ghc @basvandijk @cdepillabout -/pkgs/development/haskell-modules @basvandijk @cdepillabout @infinisil -/pkgs/development/haskell-modules/default.nix @basvandijk @cdepillabout -/pkgs/development/haskell-modules/generic-builder.nix @basvandijk @cdepillabout -/pkgs/development/haskell-modules/hoogle.nix @basvandijk @cdepillabout +/pkgs/development/compilers/ghc @cdepillabout +/pkgs/development/haskell-modules @cdepillabout @infinisil +/pkgs/development/haskell-modules/default.nix @cdepillabout +/pkgs/development/haskell-modules/generic-builder.nix @cdepillabout +/pkgs/development/haskell-modules/hoogle.nix @cdepillabout # Perl /pkgs/development/interpreters/perl @volth diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index a8762be1143e..04f0d882d8d2 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2796,9 +2796,14 @@ name = "Graham Christensen"; }; grburst = { - email = "grburst@openmailbox.org"; - github = "grburst"; - name = "Julius Elias"; + email = "GRBurst@protonmail.com"; + github = "GRBurst"; + githubId = 4647221; + name = "GRBurst"; + keys = [{ + longkeyid = "rsa4096/0x797F623868CD00C2"; + fingerprint = "7FC7 98AB 390E 1646 ED4D 8F1F 797F 6238 68CD 00C2"; + }]; }; greydot = { email = "lanablack@amok.cc"; @@ -4294,6 +4299,16 @@ githubId = 1784379; name = "Kyohei Kadota"; }; + Luflosi = { + name = "Luflosi"; + email = "luflosi@luflosi.de"; + github = "Luflosi"; + githubId = 15217907; + keys = [{ + longkeyid = "rsa4096/0x6F987CCF224D20B9"; + fingerprint = "66D1 3048 2B5F 2069 81A6 6B83 6F98 7CCF 224D 20B9"; + }]; + }; luispedro = { email = "luis@luispedro.org"; github = "luispedro"; diff --git a/maintainers/scripts/update.nix b/maintainers/scripts/update.nix index bbc3004b1c4e..7c45e148e822 100755 --- a/maintainers/scripts/update.nix +++ b/maintainers/scripts/update.nix @@ -2,6 +2,7 @@ , maintainer ? null , path ? null , max-workers ? null +, include-overlays ? false , keep-going ? null }: @@ -20,9 +21,7 @@ let in [x] ++ nubOn f xs; - pkgs = import ./../../default.nix { - overlays = []; - }; + pkgs = import ./../../default.nix (if include-overlays then { } else { overlays = []; }); packagesWith = cond: return: set: nubOn (pkg: pkg.updateScript) diff --git a/nixos/modules/programs/fish_completion-generator.patch b/nixos/modules/programs/fish_completion-generator.patch index a8c797d185a6..997f38c5066d 100644 --- a/nixos/modules/programs/fish_completion-generator.patch +++ b/nixos/modules/programs/fish_completion-generator.patch @@ -1,11 +1,13 @@ --- a/create_manpage_completions.py +++ b/create_manpage_completions.py -@@ -776,8 +776,6 @@ def parse_manpage_at_path(manpage_path, output_directory): - +@@ -844,10 +844,6 @@ def parse_manpage_at_path(manpage_path, output_directory): + built_command_output.insert(0, "# " + CMDNAME) - + - # Output the magic word Autogenerated so we can tell if we can overwrite this -- built_command_output.insert(1, "# Autogenerated from man page " + manpage_path) +- built_command_output.insert( +- 1, "# Autogenerated from man page " + manpage_path +- ) # built_command_output.insert(2, "# using " + parser.__class__.__name__) # XXX MISATTRIBUTES THE CULPABILE PARSER! Was really using Type2 but reporting TypeDeroffManParser - + for line in built_command_output: diff --git a/nixos/modules/services/continuous-integration/buildkite-agents.nix b/nixos/modules/services/continuous-integration/buildkite-agents.nix index fbda2731bbf3..c17d89c387a1 100644 --- a/nixos/modules/services/continuous-integration/buildkite-agents.nix +++ b/nixos/modules/services/continuous-integration/buildkite-agents.nix @@ -258,7 +258,7 @@ in }); config.assertions = mapAgents (name: cfg: [ - { assertion = cfg.hooksPath == hooksDir || all (v: v == null) (attrValues cfg.hooks); + { assertion = cfg.hooksPath == (hooksDir cfg) || all (v: v == null) (attrValues cfg.hooks); message = '' Options `services.buildkite-agents.${name}.hooksPath' and `services.buildkite-agents.${name}.hooks.<name>' are mutually exclusive. diff --git a/nixos/modules/services/networking/dhcpcd.nix b/nixos/modules/services/networking/dhcpcd.nix index f476b147a576..c0619211c2fe 100644 --- a/nixos/modules/services/networking/dhcpcd.nix +++ b/nixos/modules/services/networking/dhcpcd.nix @@ -19,7 +19,7 @@ let map (i: i.name) (filter (i: if i.useDHCP != null then !i.useDHCP else i.ipv4.addresses != [ ]) interfaces) ++ mapAttrsToList (i: _: i) config.networking.sits ++ concatLists (attrValues (mapAttrs (n: v: v.interfaces) config.networking.bridges)) - ++ concatLists (attrValues (mapAttrs (n: v: v.interfaces) config.networking.vswitches)) + ++ flatten (concatMap (i: attrNames (filterAttrs (_: config: config.type != "internal") i.interfaces)) (attrValues config.networking.vswitches)) ++ concatLists (attrValues (mapAttrs (n: v: v.interfaces) config.networking.bonds)) ++ config.networking.dhcpcd.denyInterfaces; diff --git a/nixos/modules/services/networking/i2pd.nix b/nixos/modules/services/networking/i2pd.nix index 326d34f6ca92..93a21fd4c97e 100644 --- a/nixos/modules/services/networking/i2pd.nix +++ b/nixos/modules/services/networking/i2pd.nix @@ -158,10 +158,10 @@ let (sec "addressbook") (strOpt "defaulturl" cfg.addressbook.defaulturl) ] ++ (optionalEmptyList "subscriptions" cfg.addressbook.subscriptions) - ++ (flip mapAttrs - (collect (name: proto: proto ? port && proto ? address && proto ? name) cfg.proto) + ++ (flip map + (collect (proto: proto ? port && proto ? address) cfg.proto) (proto: let protoOpts = [ - (sec name) + (sec proto.name) (boolOpt "enabled" proto.enable) (strOpt "address" proto.address) (intOpt "port" proto.port) @@ -181,10 +181,10 @@ let tunnelConf = let opts = [ notice - (flip mapAttrs - (collect (name: tun: tun ? port && tun ? destination) cfg.outTunnels) + (flip map + (collect (tun: tun ? port && tun ? destination) cfg.outTunnels) (tun: let outTunOpts = [ - (sec name) + (sec tun.name) "type = client" (intOpt "port" tun.port) (strOpt "destination" tun.destination) @@ -204,10 +204,10 @@ let ++ (if tun ? crypto.tagsToSend then optionalNullInt "crypto.tagstosend" tun.crypto.tagsToSend else []); in concatStringsSep "\n" outTunOpts)) - (flip mapAttrs - (collect (name: tun: tun ? port && tun ? address) cfg.inTunnels) + (flip map + (collect (tun: tun ? port && tun ? address) cfg.inTunnels) (tun: let inTunOpts = [ - (sec name) + (sec tun.name) "type = server" (intOpt "port" tun.port) (strOpt "host" tun.address) @@ -606,7 +606,7 @@ in outTunnels = mkOption { default = {}; - type = with types; loaOf (submodule ( + type = with types; attrsOf (submodule ( { name, ... }: { options = { destinationPort = mkOption { @@ -627,7 +627,7 @@ in inTunnels = mkOption { default = {}; - type = with types; loaOf (submodule ( + type = with types; attrsOf (submodule ( { name, ... }: { options = { inPort = mkOption { diff --git a/nixos/modules/tasks/encrypted-devices.nix b/nixos/modules/tasks/encrypted-devices.nix index 2c9231f55236..bc0933f16fec 100644 --- a/nixos/modules/tasks/encrypted-devices.nix +++ b/nixos/modules/tasks/encrypted-devices.nix @@ -65,7 +65,7 @@ in boot.initrd = { luks = { devices = - map (dev: { name = dev.encrypted.label; device = dev.encrypted.blkDev; } ) keylessEncDevs; + builtins.listToAttrs (map (dev: { name = dev.encrypted.label; value = { device = dev.encrypted.blkDev; }; }) keylessEncDevs); forceLuksSupportInInitrd = true; }; postMountCommands = diff --git a/nixos/modules/tasks/network-interfaces-scripted.nix b/nixos/modules/tasks/network-interfaces-scripted.nix index 1726d05115ea..4d25137c5dfc 100644 --- a/nixos/modules/tasks/network-interfaces-scripted.nix +++ b/nixos/modules/tasks/network-interfaces-scripted.nix @@ -10,7 +10,7 @@ let slaves = concatMap (i: i.interfaces) (attrValues cfg.bonds) ++ concatMap (i: i.interfaces) (attrValues cfg.bridges) - ++ concatMap (i: i.interfaces) (attrValues cfg.vswitches) + ++ concatMap (i: attrNames (filterAttrs (_: config: config.type != "internal") i.interfaces)) (attrValues cfg.vswitches) ++ concatMap (i: [i.interface]) (attrValues cfg.macvlans) ++ concatMap (i: [i.interface]) (attrValues cfg.vlans); @@ -336,34 +336,47 @@ let createVswitchDevice = n: v: nameValuePair "${n}-netdev" (let - deps = concatLists (map deviceDependency v.interfaces); + deps = concatLists (map deviceDependency (attrNames (filterAttrs (_: config: config.type != "internal") v.interfaces))); + internalConfigs = concatMap (i: ["network-link-${i}.service" "network-addresses-${i}.service"]) (attrNames (filterAttrs (_: config: config.type == "internal") v.interfaces)); ofRules = pkgs.writeText "vswitch-${n}-openFlowRules" v.openFlowRules; in { description = "Open vSwitch Interface ${n}"; - wantedBy = [ "network-setup.service" "vswitchd.service" ] ++ deps; - bindsTo = [ "vswitchd.service" (subsystemDevice n) ] ++ deps; - partOf = [ "network-setup.service" "vswitchd.service" ]; - after = [ "network-pre.target" "vswitchd.service" ] ++ deps; - before = [ "network-setup.service" ]; + wantedBy = [ "network-setup.service" (subsystemDevice n) ] ++ internalConfigs; + # before = [ "network-setup.service" ]; + # should work without internalConfigs dependencies because address/link configuration depends + # on the device, which is created by ovs-vswitchd with type=internal, but it does not... + before = [ "network-setup.service" ] ++ internalConfigs; + partOf = [ "network-setup.service" ]; # shutdown the bridge when network is shutdown + bindsTo = [ "ovs-vswitchd.service" ]; # requires ovs-vswitchd to be alive at all times + after = [ "network-pre.target" "ovs-vswitchd.service" ] ++ deps; # start switch after physical interfaces and vswitch daemon + wants = deps; # if one or more interface fails, the switch should continue to run serviceConfig.Type = "oneshot"; serviceConfig.RemainAfterExit = true; path = [ pkgs.iproute config.virtualisation.vswitch.package ]; + preStart = '' + echo "Resetting Open vSwitch ${n}..." + ovs-vsctl --if-exists del-br ${n} -- add-br ${n} \ + -- set bridge ${n} protocols=${concatStringsSep "," v.supportedOpenFlowVersions} + ''; script = '' - echo "Removing old Open vSwitch ${n}..." - ovs-vsctl --if-exists del-br ${n} - - echo "Adding Open vSwitch ${n}..." - ovs-vsctl -- add-br ${n} ${concatMapStrings (i: " -- add-port ${n} ${i}") v.interfaces} \ + echo "Configuring Open vSwitch ${n}..." + ovs-vsctl ${concatStrings (mapAttrsToList (name: config: " -- add-port ${n} ${name}" + optionalString (config.vlan != null) " tag=${toString config.vlan}") v.interfaces)} \ + ${concatStrings (mapAttrsToList (name: config: optionalString (config.type != null) " -- set interface ${name} type=${config.type}") v.interfaces)} \ ${concatMapStrings (x: " -- set-controller ${n} " + x) v.controllers} \ ${concatMapStrings (x: " -- " + x) (splitString "\n" v.extraOvsctlCmds)} + echo "Adding OpenFlow rules for Open vSwitch ${n}..." - ovs-ofctl add-flows ${n} ${ofRules} + ovs-ofctl --protocols=${v.openFlowVersion} add-flows ${n} ${ofRules} ''; postStop = '' + echo "Cleaning Open vSwitch ${n}" + echo "Shuting down internal ${n} interface" ip link set ${n} down || true - ovs-ofctl del-flows ${n} || true - ovs-vsctl --if-exists del-br ${n} + echo "Deleting flows for ${n}" + ovs-ofctl --protocols=${v.openFlowVersion} del-flows ${n} || true + echo "Deleting Open vSwitch ${n}" + ovs-vsctl --if-exists del-br ${n} || true ''; }); @@ -476,9 +489,9 @@ let # Remove Dead Interfaces ip link show "${n}" >/dev/null 2>&1 && ip link delete "${n}" ip link add link "${v.interface}" name "${n}" type vlan id "${toString v.id}" - - # We try to bring up the logical VLAN interface. If the master - # interface the logical interface is dependent upon is not up yet we will + + # We try to bring up the logical VLAN interface. If the master + # interface the logical interface is dependent upon is not up yet we will # fail to immediately bring up the logical interface. The resulting logical # interface will brought up later when the master interface is up. ip link set "${n}" up || true diff --git a/nixos/modules/tasks/network-interfaces-systemd.nix b/nixos/modules/tasks/network-interfaces-systemd.nix index e25dc0c0b39a..41deceb000e6 100644 --- a/nixos/modules/tasks/network-interfaces-systemd.nix +++ b/nixos/modules/tasks/network-interfaces-systemd.nix @@ -1,4 +1,4 @@ -{ config, lib, utils, ... }: +{ config, lib, utils, pkgs, ... }: with utils; with lib; @@ -18,7 +18,10 @@ let concatLists (map (bond: bond.interfaces) (attrValues cfg.bonds)) ++ concatLists (map (bridge: bridge.interfaces) (attrValues cfg.bridges)) ++ map (sit: sit.dev) (attrValues cfg.sits) - ++ map (vlan: vlan.interface) (attrValues cfg.vlans); + ++ map (vlan: vlan.interface) (attrValues cfg.vlans) + # add dependency to physical or independently created vswitch member interface + # TODO: warn the user that any address configured on those interfaces will be useless + ++ concatMap (i: attrNames (filterAttrs (_: config: config.type != "internal") i.interfaces)) (attrValues cfg.vswitches); in @@ -51,11 +54,6 @@ in networking.dhcpcd.enable = mkDefault false; - systemd.services.network-local-commands = { - after = [ "systemd-networkd.service" ]; - bindsTo = [ "systemd-networkd.service" ]; - }; - systemd.network = let domains = cfg.search ++ (optional (cfg.domain != null) cfg.domain); @@ -233,6 +231,63 @@ in # This forces the network interface creator to initialize slaves. networking.interfaces = listToAttrs (map (i: nameValuePair i { }) slaves); + systemd.services = let + # We must escape interfaces due to the systemd interpretation + subsystemDevice = interface: + "sys-subsystem-net-devices-${escapeSystemdPath interface}.device"; + # support for creating openvswitch switches + createVswitchDevice = n: v: nameValuePair "${n}-netdev" + (let + deps = map subsystemDevice (attrNames (filterAttrs (_: config: config.type != "internal") v.interfaces)); + ofRules = pkgs.writeText "vswitch-${n}-openFlowRules" v.openFlowRules; + in + { description = "Open vSwitch Interface ${n}"; + wantedBy = [ "network.target" (subsystemDevice n) ]; + # and create bridge before systemd-networkd starts because it might create internal interfaces + before = [ "systemd-networkd.service" ]; + # shutdown the bridge when network is shutdown + partOf = [ "network.target" ]; + # requires ovs-vswitchd to be alive at all times + bindsTo = [ "ovs-vswitchd.service" ]; + # start switch after physical interfaces and vswitch daemon + after = [ "network-pre.target" "ovs-vswitchd.service" ] ++ deps; + wants = deps; # if one or more interface fails, the switch should continue to run + serviceConfig.Type = "oneshot"; + serviceConfig.RemainAfterExit = true; + path = [ pkgs.iproute config.virtualisation.vswitch.package ]; + preStart = '' + echo "Resetting Open vSwitch ${n}..." + ovs-vsctl --if-exists del-br ${n} -- add-br ${n} \ + -- set bridge ${n} protocols=${concatStringsSep "," v.supportedOpenFlowVersions} + ''; + script = '' + echo "Configuring Open vSwitch ${n}..." + ovs-vsctl ${concatStrings (mapAttrsToList (name: config: " -- add-port ${n} ${name}" + optionalString (config.vlan != null) " tag=${toString config.vlan}") v.interfaces)} \ + ${concatStrings (mapAttrsToList (name: config: optionalString (config.type != null) " -- set interface ${name} type=${config.type}") v.interfaces)} \ + ${concatMapStrings (x: " -- set-controller ${n} " + x) v.controllers} \ + ${concatMapStrings (x: " -- " + x) (splitString "\n" v.extraOvsctlCmds)} + + + echo "Adding OpenFlow rules for Open vSwitch ${n}..." + ovs-ofctl --protocols=${v.openFlowVersion} add-flows ${n} ${ofRules} + ''; + postStop = '' + echo "Cleaning Open vSwitch ${n}" + echo "Shuting down internal ${n} interface" + ip link set ${n} down || true + echo "Deleting flows for ${n}" + ovs-ofctl --protocols=${v.openFlowVersion} del-flows ${n} || true + echo "Deleting Open vSwitch ${n}" + ovs-vsctl --if-exists del-br ${n} || true + ''; + }); + in mapAttrs' createVswitchDevice cfg.vswitches + // { + "network-local-commands" = { + after = [ "systemd-networkd.service" ]; + bindsTo = [ "systemd-networkd.service" ]; + }; + }; }; } diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix index cef9c38c2e30..9542a60beeed 100644 --- a/nixos/modules/tasks/network-interfaces.nix +++ b/nixos/modules/tasks/network-interfaces.nix @@ -13,7 +13,7 @@ let slaves = concatMap (i: i.interfaces) (attrValues cfg.bonds) ++ concatMap (i: i.interfaces) (attrValues cfg.bridges) - ++ concatMap (i: i.interfaces) (attrValues cfg.vswitches); + ++ concatMap (i: attrNames (filterAttrs (name: config: ! (config.type == "internal" || hasAttr name cfg.interfaces)) i.interfaces)) (attrValues cfg.vswitches); slaveIfs = map (i: cfg.interfaces.${i}) (filter (i: cfg.interfaces ? ${i}) slaves); @@ -336,6 +336,32 @@ let }; + vswitchInterfaceOpts = {name, ...}: { + + options = { + + name = mkOption { + description = "Name of the interface"; + example = "eth0"; + type = types.str; + }; + + vlan = mkOption { + description = "Vlan tag to apply to interface"; + example = 10; + type = types.nullOr types.int; + default = null; + }; + + type = mkOption { + description = "Openvswitch type to assign to interface"; + example = "internal"; + type = types.nullOr types.str; + default = null; + }; + }; + }; + hexChars = stringToCharacters "0123456789abcdef"; isHexString = s: all (c: elem c hexChars) (stringToCharacters (toLower s)); @@ -486,8 +512,8 @@ in networking.vswitches = mkOption { default = { }; example = - { vs0.interfaces = [ "eth0" "eth1" ]; - vs1.interfaces = [ "eth2" "wlan0" ]; + { vs0.interfaces = { eth0 = { }; lo1 = { type="internal"; }; }; + vs1.interfaces = [ { name = "eth2"; } { name = "lo2"; type="internal"; } ]; }; description = '' @@ -504,9 +530,8 @@ in interfaces = mkOption { example = [ "eth0" "eth1" ]; - type = types.listOf types.str; - description = - "The physical network interfaces connected by the vSwitch."; + description = "The physical network interfaces connected by the vSwitch."; + type = with types; loaOf (submodule vswitchInterfaceOpts); }; controllers = mkOption { @@ -530,6 +555,25 @@ in ''; }; + # TODO: custom "openflow version" type, with list from existing openflow protocols + supportedOpenFlowVersions = mkOption { + type = types.listOf types.str; + example = [ "OpenFlow10" "OpenFlow13" "OpenFlow14" ]; + default = [ "OpenFlow13" ]; + description = '' + Supported versions to enable on this switch. + ''; + }; + + # TODO: use same type as elements from supportedOpenFlowVersions + openFlowVersion = mkOption { + type = types.str; + default = "OpenFlow13"; + description = '' + Version of OpenFlow protocol to use when communicating with the switch internally (e.g. with <literal>openFlowRules</literal>). + ''; + }; + extraOvsctlCmds = mkOption { type = types.lines; default = ""; diff --git a/nixos/modules/virtualisation/libvirtd.nix b/nixos/modules/virtualisation/libvirtd.nix index 52d852894ce5..9f7bac480e38 100644 --- a/nixos/modules/virtualisation/libvirtd.nix +++ b/nixos/modules/virtualisation/libvirtd.nix @@ -219,7 +219,7 @@ in { wantedBy = [ "multi-user.target" ]; requires = [ "libvirtd-config.service" ]; after = [ "systemd-udev-settle.service" "libvirtd-config.service" ] - ++ optional vswitch.enable "vswitchd.service"; + ++ optional vswitch.enable "ovs-vswitchd.service"; environment.LIBVIRTD_ARGS = ''--config "${configFile}" ${concatStringsSep " " cfg.extraOptions}''; diff --git a/nixos/modules/virtualisation/openvswitch.nix b/nixos/modules/virtualisation/openvswitch.nix index 6b8ad83661fe..c6a3ceddc3e0 100644 --- a/nixos/modules/virtualisation/openvswitch.nix +++ b/nixos/modules/virtualisation/openvswitch.nix @@ -124,7 +124,7 @@ in { ''; }; - systemd.services.vswitchd = { + systemd.services.ovs-vswitchd = { description = "Open_vSwitch Daemon"; wantedBy = [ "multi-user.target" ]; bindsTo = [ "ovsdb.service" ]; @@ -139,6 +139,8 @@ in { PIDFile = "/run/openvswitch/ovs-vswitchd.pid"; # Use service type 'forking' to correctly determine when vswitchd is ready. Type = "forking"; + Restart = "always"; + RestartSec = 3; }; }; @@ -182,4 +184,7 @@ in { ''; }; })])); + + meta.maintainers = with maintainers; [ netixx ]; + } diff --git a/nixos/tests/acme.nix b/nixos/tests/acme.nix index 732f41a4905d..e045f3415fa0 100644 --- a/nixos/tests/acme.nix +++ b/nixos/tests/acme.nix @@ -75,6 +75,7 @@ in import ./make-test-python.nix { systemd.services."acme-a.example.com" = { wants = [ "acme-finished-a.example.com.target" ]; before = [ "acme-finished-a.example.com.target" ]; + after = [ "nginx.service" ]; }; services.nginx.enable = true; diff --git a/nixos/tests/tinydns.nix b/nixos/tests/tinydns.nix index c7740d5ade35..b80e3451700a 100644 --- a/nixos/tests/tinydns.nix +++ b/nixos/tests/tinydns.nix @@ -21,6 +21,6 @@ import ./make-test-python.nix ({ lib, ...} : { testScript = '' nameserver.start() nameserver.wait_for_unit("tinydns.service") - nameserver.succeed("host bla.foo.bar | grep '1\.2\.3\.4'") + nameserver.succeed("host bla.foo.bar 192.168.1.1 | grep '1\.2\.3\.4'") ''; }) diff --git a/pkgs/applications/audio/picard/default.nix b/pkgs/applications/audio/picard/default.nix index b40ab6d4f7a5..d6cf17c159f4 100644 --- a/pkgs/applications/audio/picard/default.nix +++ b/pkgs/applications/audio/picard/default.nix @@ -4,13 +4,13 @@ let pythonPackages = python3Packages; in pythonPackages.buildPythonApplication rec { pname = "picard"; - version = "2.2.3"; + version = "2.3"; src = fetchFromGitHub { owner = "metabrainz"; repo = pname; rev = "release-${version}"; - sha256 = "0lb4pzl03mr5hrzrzva99rxqd5yfip62b7sjmlg4j0imw8mxaj16"; + sha256 = "0msdnp6wh97lnm3m084jsvbp95h5d35y5fm71j64cgf4g39zp5ds"; }; nativeBuildInputs = [ gettext qt5.wrapQtAppsHook qt5.qtbase ]; diff --git a/pkgs/applications/blockchains/clightning.nix b/pkgs/applications/blockchains/clightning.nix index f6c9fee7a1c5..0add60cc19e4 100644 --- a/pkgs/applications/blockchains/clightning.nix +++ b/pkgs/applications/blockchains/clightning.nix @@ -4,11 +4,11 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "clightning"; - version = "0.8.0"; + version = "0.8.1"; src = fetchurl { url = "https://github.com/ElementsProject/lightning/releases/download/v${version}/clightning-v${version}.zip"; - sha256 = "053e43bbe71564e9be8b2b56346a88986646ef6849a0af67cece01858b93306a"; + sha256 = "079d3yx7yr7qrilqgaayvn18lxl8h6a1gwwbsgm5xsyxj4vdlz7r"; }; enableParallelBuilding = true; diff --git a/pkgs/applications/editors/vim/common.nix b/pkgs/applications/editors/vim/common.nix index 485f1d0dca3d..e5ee1da75801 100644 --- a/pkgs/applications/editors/vim/common.nix +++ b/pkgs/applications/editors/vim/common.nix @@ -1,12 +1,12 @@ { lib, fetchFromGitHub }: rec { - version = "8.2.0013"; + version = "8.2.0227"; src = fetchFromGitHub { owner = "vim"; repo = "vim"; rev = "v${version}"; - sha256 = "00sc9zdjdww6f3svwf0nxpx8q2zp1n1r978h7ijapgvn2ysx2z1f"; + sha256 = "1yi7l2yd214iv6i8pr52m272mlzps5v3h6xdgr1770xfz4y1yc0h"; }; enableParallelBuilding = true; diff --git a/pkgs/applications/graphics/gnome-photos/default.nix b/pkgs/applications/graphics/gnome-photos/default.nix index 0eb4f21e53ca..6cbe5448b40a 100644 --- a/pkgs/applications/graphics/gnome-photos/default.nix +++ b/pkgs/applications/graphics/gnome-photos/default.nix @@ -35,13 +35,13 @@ stdenv.mkDerivation rec { pname = "gnome-photos"; - version = "3.34.0"; + version = "3.34.1"; outputs = [ "out" "installedTests" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "12j455id5g616cn0nnj73v83aqgpavrsqszw1r5yhbpyc76lg03m"; + sha256 = "1ifm8hmxpf9nnxddfcpkbc5wc5f5hz43yj83nnakzqr6x1mq7gdp"; }; patches = [ diff --git a/pkgs/applications/misc/alacritty/default.nix b/pkgs/applications/misc/alacritty/default.nix index a4d777151992..78e7249a0873 100644 --- a/pkgs/applications/misc/alacritty/default.nix +++ b/pkgs/applications/misc/alacritty/default.nix @@ -78,6 +78,10 @@ in buildRustPackage rec { ++ lib.optionals stdenv.isDarwin [ AppKit CoreGraphics CoreServices CoreText Foundation OpenGL ]; outputs = [ "out" "terminfo" ]; + postPatch = '' + substituteInPlace alacritty/src/config/mouse.rs \ + --replace xdg-open ${xdg_utils}/bin/xdg-open + ''; postBuild = lib.optionalString stdenv.isDarwin "make app"; diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix index 18f7153b1eb9..4b099270df54 100644 --- a/pkgs/applications/misc/hugo/default.nix +++ b/pkgs/applications/misc/hugo/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "hugo"; - version = "0.64.1"; + version = "0.65.1"; goPackagePath = "github.com/gohugoio/hugo"; @@ -10,10 +10,10 @@ buildGoModule rec { owner = "gohugoio"; repo = pname; rev = "v${version}"; - sha256 = "1h5n5d7g3l2lp25sjrcmavbkqqm1csgv2q5z7afwbb57j0m1nkn8"; + sha256 = "09kaa5zvi0kmmhms9n162fmrxacidga9241in0vrnn8lwl3rbgam"; }; - modSha256 = "18wfsp3ypfxj5qljmb19kzyc5byf413nkabz5mfvq8srjhcq1ifl"; + modSha256 = "1f320zbqnv2ybsp3qmlgn3rsjgp2zdb24qjd3gcys30mw48cx3na"; buildFlags = [ "-tags" "extended" ]; diff --git a/pkgs/applications/misc/kitty/default.nix b/pkgs/applications/misc/kitty/default.nix index 188e902614fa..cdba8c3f686b 100644 --- a/pkgs/applications/misc/kitty/default.nix +++ b/pkgs/applications/misc/kitty/default.nix @@ -74,10 +74,12 @@ buildPythonApplication rec { }) ] ++ stdenv.lib.optionals stdenv.isDarwin [ ./no-lto.patch - ./no-werror.patch ./png2icns.patch ]; + # Causes build failure due to warning + hardeningDisable = stdenv.lib.optional stdenv.isDarwin "strictoverflow"; + buildPhase = if stdenv.isDarwin then '' ${python.interpreter} setup.py kitty.app --update-check-interval=0 '' else '' @@ -123,6 +125,6 @@ buildPythonApplication rec { description = "A modern, hackable, featureful, OpenGL based terminal emulator"; license = licenses.gpl3; platforms = platforms.darwin ++ platforms.linux; - maintainers = with maintainers; [ tex rvolosatovs ma27 ]; + maintainers = with maintainers; [ tex rvolosatovs ma27 Luflosi ]; }; } diff --git a/pkgs/applications/misc/kitty/no-werror.patch b/pkgs/applications/misc/kitty/no-werror.patch deleted file mode 100644 index bc1b369d98d9..000000000000 --- a/pkgs/applications/misc/kitty/no-werror.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/setup.py -+++ b/setup.py -@@ -217,7 +217,7 @@ def init_env( - cflags = os.environ.get( - 'OVERRIDE_CFLAGS', ( - '-Wextra {} -Wno-missing-field-initializers -Wall -Wstrict-prototypes -std=c11' -- ' -pedantic-errors -Werror {} {} -fwrapv {} {} -pipe {} -fvisibility=hidden' -+ ' {} {} -fwrapv {} {} -pipe {} -fvisibility=hidden' - ).format( - float_conversion, - optimize, diff --git a/pkgs/applications/misc/lyx/default.nix b/pkgs/applications/misc/lyx/default.nix index 675f0adfc7f8..f9d8599e329c 100644 --- a/pkgs/applications/misc/lyx/default.nix +++ b/pkgs/applications/misc/lyx/default.nix @@ -3,12 +3,12 @@ }: mkDerivation rec { - version = "2.3.4"; + version = "2.3.4.3"; pname = "lyx"; src = fetchurl { url = "ftp://ftp.lyx.org/pub/lyx/stable/2.3.x/${pname}-${version}.tar.xz"; - sha256 = "0qgvc19flnf6ny3ffyj8civwaxrnwcdlw2v708hg49cbmg6f8igh"; + sha256 = "1rpp6wq0dc0bxwc0pipajv98vi7cpg391nq10d3c4pmpq38m08wx"; }; # LaTeX is used from $PATH, as people often want to have it with extra pkgs diff --git a/pkgs/development/python-modules/mps-youtube/default.nix b/pkgs/applications/misc/mps-youtube/default.nix index 753a0d24d0a3..b1118cfc5977 100644 --- a/pkgs/development/python-modules/mps-youtube/default.nix +++ b/pkgs/applications/misc/mps-youtube/default.nix @@ -1,17 +1,16 @@ -{ lib, buildPythonPackage, fetchFromGitHub, isPy3k -, pafy -}: +{ lib, python3Packages, fetchFromGitHub }: -buildPythonPackage rec { +with python3Packages; + +buildPythonApplication rec { pname = "mps-youtube"; - version = "0.2.8"; - disabled = (!isPy3k); + version = "unstable-2020-01-28"; src = fetchFromGitHub { owner = "mps-youtube"; repo = "mps-youtube"; - rev = "v${version}"; - sha256 = "1w1jhw9rg3dx7vp97cwrk5fymipkcy2wrbl1jaa38ivcjhqg596y"; + rev = "b808697133ec2ad7654953232d1e841b20aa7cc3"; + sha256 = "0lqprlpc0v092xqkjc0cc395ag45lijwgd34dpg2jy6i0f2szywv"; }; propagatedBuildInputs = [ pafy ]; @@ -30,6 +29,6 @@ buildPythonPackage rec { description = "Terminal based YouTube player and downloader"; homepage = "https://github.com/mps-youtube/mps-youtube"; license = licenses.gpl3; - maintainers = with maintainers; [ odi ]; + maintainers = with maintainers; [ koral odi ]; }; } diff --git a/pkgs/applications/misc/waybar/default.nix b/pkgs/applications/misc/waybar/default.nix index 212013fb655d..69d6ff842682 100644 --- a/pkgs/applications/misc/waybar/default.nix +++ b/pkgs/applications/misc/waybar/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchFromGitHub, meson, pkgconfig, ninja, wrapGAppsHook , wayland, wlroots, gtkmm3, libinput, libsigcxx, jsoncpp, fmt, scdoc, spdlog, gtk-layer-shell +, howard-hinnant-date, cmake , traySupport ? true, libdbusmenu-gtk3 , pulseSupport ? false, libpulseaudio , nlSupport ? true, libnl @@ -9,21 +10,21 @@ }: stdenv.mkDerivation rec { pname = "waybar"; - version = "0.9.0"; + version = "0.9.1"; src = fetchFromGitHub { owner = "Alexays"; repo = "Waybar"; rev = version; - sha256 = "1w8a6jih872ry288k8ic6mjfi9ccf1jwc24wnh9p5c7w73247c2c"; + sha256 = "0drlv8im5phz39jxp3gxkc40b6f85bb3piff2v3hmnfzh7ib915s"; }; nativeBuildInputs = [ - meson ninja pkgconfig scdoc wrapGAppsHook + meson ninja pkgconfig scdoc wrapGAppsHook cmake ]; buildInputs = with stdenv.lib; - [ wayland wlroots gtkmm3 libinput libsigcxx jsoncpp fmt spdlog gtk-layer-shell ] + [ wayland wlroots gtkmm3 libinput libsigcxx jsoncpp fmt spdlog gtk-layer-shell howard-hinnant-date ] ++ optional traySupport libdbusmenu-gtk3 ++ optional pulseSupport libpulseaudio ++ optional nlSupport libnl @@ -50,5 +51,6 @@ license = licenses.mit; maintainers = with maintainers; [ FlorianFranzen minijackson synthetica ]; platforms = platforms.unix; + homepage = "https://github.com/alexays/waybar"; }; } diff --git a/pkgs/applications/misc/zola/cargo-lock.patch b/pkgs/applications/misc/zola/cargo-lock.patch deleted file mode 100644 index b9d97e3c328a..000000000000 --- a/pkgs/applications/misc/zola/cargo-lock.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/Cargo.lock b/Cargo.lock -index df5fef3..80f071a 100644 ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -2158,12 +2158,12 @@ version = "0.2.2" - source = "registry+https://github.com/rust-lang/crates.io-index" - dependencies = [ - "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", -- "sass-sys 0.4.13 (registry+https://github.com/rust-lang/crates.io-index)", -+ "sass-sys 0.4.15 (registry+https://github.com/rust-lang/crates.io-index)", - ] - - [[package]] - name = "sass-sys" --version = "0.4.13" -+version = "0.4.15" - source = "registry+https://github.com/rust-lang/crates.io-index" - dependencies = [ - "cc 1.0.45 (registry+https://github.com/rust-lang/crates.io-index)", -@@ -3410,7 +3410,7 @@ dependencies = [ - "checksum safemem 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "d2b08423011dae9a5ca23f07cf57dac3857f5c885d352b76f6d95f4aea9434d0" - "checksum same-file 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "585e8ddcedc187886a30fa705c47985c3fa88d06624095856b36ca0b82ff4421" - "checksum sass-rs 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "cabcf7c6e55053f359911187ac401409aad2dc14338cae972dec266fee486abd" --"checksum sass-sys 0.4.13 (registry+https://github.com/rust-lang/crates.io-index)" = "6e16ac97c2335bc367e2d675f54c1823558f1b19a6c67671d48b70e30ae22972" -+"checksum sass-sys 0.4.15 (registry+https://github.com/rust-lang/crates.io-index)" = "304b6f9501d1da13f17404aeee85486d7383d06074906669b3ea032f81e83d22" - "checksum schannel 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)" = "87f550b06b6cba9c8b8be3ee73f391990116bf527450d2556e9b9ce263b9a021" - "checksum scoped_threadpool 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "1d51f5df5af43ab3f1360b429fa5e0152ac5ce8c0bd6485cae490332e96846a8" - "checksum scopeguard 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "94258f53601af11e6a49f722422f6e3425c52b06245a5cf9bc09908b174f5e27" diff --git a/pkgs/applications/misc/zola/default.nix b/pkgs/applications/misc/zola/default.nix index be00070d2a50..201a3eda3cc7 100644 --- a/pkgs/applications/misc/zola/default.nix +++ b/pkgs/applications/misc/zola/default.nix @@ -1,23 +1,19 @@ -{ stdenv, fetchFromGitHub, rustPlatform, cmake, pkgconfig, openssl, CoreServices }: +{ stdenv, fetchFromGitHub, rustPlatform, cmake, pkg-config, openssl, CoreServices }: rustPlatform.buildRustPackage rec { pname = "zola"; - version = "0.9.0"; + version = "0.10.0"; src = fetchFromGitHub { owner = "getzola"; repo = pname; rev = "v${version}"; - sha256 = "13kbgxh7r6124d1fjdf0x599j1kpgixp1y9d299zb5vrd6rf5wy5"; + sha256 = "112aqv21gy1fbly5v2x3ph32pr82d1mwh0q57yfaaqygz2madypb"; }; - cargoPatches = [ ./cargo-lock.patch ]; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; + cargoSha256 = "0hqa60bx8pxhgad7x6r4zbwddrkcspnnp53bl94zbf3j47p10ggz"; - cargoSha256 = "03rwf5l1l3ap03qi0xqcxsbyvpg3cqmr50j8ql6c5v55xl0ki9w8"; - - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ openssl ] ++ stdenv.lib.optional stdenv.isDarwin CoreServices; @@ -32,7 +28,7 @@ rustPlatform.buildRustPackage rec { meta = with stdenv.lib; { description = "A fast static site generator with everything built-in"; - homepage = https://www.getzola.org/; + homepage = "https://www.getzola.org/"; license = licenses.mit; maintainers = with maintainers; [ dywedir ]; platforms = platforms.all; diff --git a/pkgs/applications/networking/browsers/ephemeral/default.nix b/pkgs/applications/networking/browsers/ephemeral/default.nix index c25e41de5db3..20ecbebd6d8e 100644 --- a/pkgs/applications/networking/browsers/ephemeral/default.nix +++ b/pkgs/applications/networking/browsers/ephemeral/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "ephemeral"; - version = "6.2.0"; + version = "6.2.1"; src = fetchFromGitHub { owner = "cassidyjames"; repo = "ephemeral"; rev = version; - sha256 = "1y0n1p14kg24qnybi201181q7j6vm20ka4xwmgggjll9v6qflvaz"; + sha256 = "182kzk68l6rr878aaaqx31c6npb65x77qzhbc5rbqlrrdrb69zsg"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index 2b44263096b2..8256487b7518 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -8,6 +8,7 @@ , google_talk_plugin, fribid, gnome3/*.gnome-shell*/ , browserpass, chrome-gnome-shell, uget-integrator, plasma-browser-integration, bukubrow , tridactyl-native +, fx_cast_bridge , udev , kerberos }: @@ -71,6 +72,7 @@ let ++ lib.optional (cfg.enableGnomeExtensions or false) chrome-gnome-shell ++ lib.optional (cfg.enableUgetIntegrator or false) uget-integrator ++ lib.optional (cfg.enablePlasmaBrowserIntegration or false) plasma-browser-integration + ++ lib.optional (cfg.enableFXCastBridge or false) fx_cast_bridge ++ extraNativeMessagingHosts ); libs = lib.optional stdenv.isLinux udev diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix index 4824e6aabdda..12cf9b30fa61 100644 --- a/pkgs/applications/networking/browsers/qutebrowser/default.nix +++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix @@ -21,12 +21,12 @@ let in mkDerivationWith python3Packages.buildPythonApplication rec { pname = "qutebrowser"; - version = "1.10.0"; + version = "1.10.1"; # the release tarballs are different from the git checkout! src = fetchurl { url = "https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/${pname}-${version}.tar.gz"; - sha256 = "1prvd3cysmcjfybn0dmr3ih0bl6lm5ml9i7wd09fn8hb7047mkby"; + sha256 = "06bcnsfb4kz92bh8xjxwaghhy9x2mmcb76wk3fv868jb1ga75vd8"; }; # Needs tox diff --git a/pkgs/applications/networking/cluster/argocd/default.nix b/pkgs/applications/networking/cluster/argocd/default.nix index 4842f31c40d6..7f9ebda93c0a 100644 --- a/pkgs/applications/networking/cluster/argocd/default.nix +++ b/pkgs/applications/networking/cluster/argocd/default.nix @@ -3,6 +3,7 @@ buildGoModule rec { pname = "argocd"; version = "1.4.2"; + commit = "48cced9d925b5bc94f6aa9fa4a8a19b2a59e128a"; src = fetchFromGitHub { owner = "argoproj"; @@ -16,6 +17,14 @@ buildGoModule rec { nativeBuildInputs = [ packr ]; patches = [ ./use-go-module.patch ]; + + buildFlagsArray = '' + -ldflags= + -X github.com/argoproj/argo-cd/common.version=${version} + -X github.com/argoproj/argo-cd/common.buildDate=unknown + -X github.com/argoproj/argo-cd/common.gitCommit=${commit} + -X github.com/argoproj/argo-cd/common.gitTreeState=clean + ''; # run packr to embed assets preBuild = '' diff --git a/pkgs/applications/networking/cluster/helm/default.nix b/pkgs/applications/networking/cluster/helm/default.nix index 6ceee567592e..92ce038afa16 100644 --- a/pkgs/applications/networking/cluster/helm/default.nix +++ b/pkgs/applications/networking/cluster/helm/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "helm"; - version = "3.0.3"; + version = "3.1.0"; src = fetchFromGitHub { owner = "helm"; repo = "helm"; rev = "v${version}"; - sha256 = "1gdrm3zz7524c8v3g128drfzdyalxlipbzxmwhalm7px4p5z4n0j"; + sha256 = "0byc3si0ysjzbgb91vlbvbmawy8wprs1ajk5xzsb66c5hlhq1il9"; }; - modSha256 = "1kmm6yb03g9lsz380rvf32j4icp3rcq7ixxcgsxfgpwqvq08zkn6"; + modSha256 = "0618zzi4x37ahsrazsr82anghhfva8yaryzb3p5d737p3ixbiyv8"; subPackages = [ "cmd/helm" ]; buildFlagsArray = [ "-ldflags=-w -s -X helm.sh/helm/v3/internal/version.version=v${version}" ]; diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index 5c1319486497..da943c2aa7ea 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -112,8 +112,8 @@ in rec { terraform_0_11-full = terraform_0_11.full; terraform_0_12 = pluggable (generic { - version = "0.12.20"; - sha256 = "1k94iwhdvp1ifg9w7y26cl89ihki2w9kxv8mz06pp9bnfwfw67x5"; + version = "0.12.21"; + sha256 = "128mrqib8rigy6kk6fby0pjh4jh2qm2qwkrlbn0wgfln0637d9ff"; patches = [ ./provider-path.patch ]; passthru = { inherit plugins; }; }); diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix index a509d9be3294..4361679fc884 100644 --- a/pkgs/applications/networking/flexget/default.nix +++ b/pkgs/applications/networking/flexget/default.nix @@ -2,11 +2,11 @@ python3Packages.buildPythonApplication rec { pname = "FlexGet"; - version = "3.1.21"; + version = "3.1.26"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "ea2c9225bbf565215fc97eed97e718f426b4b7b3c8628bbd8edcc96e7bfe7e4e"; + sha256 = "0bd8ccc9ae8e9fd9d5aa4f61a1a5d8b62ff30257fc0f5b2ec61b2f4b26275eee"; }; postPatch = '' diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix index ea8626d6b06e..ee86ba658912 100644 --- a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix +++ b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix @@ -12,11 +12,11 @@ let in stdenv.mkDerivation rec { pname = "riot-web"; - version = "1.5.9"; + version = "1.5.10"; src = fetchurl { url = "https://github.com/vector-im/riot-web/releases/download/v${version}/riot-v${version}.tar.gz"; - sha256 = "1qibbgjzhiwn1lnfm3pbfn6jahphgyf6625mp4v0ah2is75x16ys"; + sha256 = "1c11x8903p38c0f9k3ff4pnpb3n7hzs4pj6g65a4cvp6jgg1zfnn"; }; installPhase = '' @@ -32,7 +32,7 @@ in stdenv.mkDerivation rec { meta = { description = "A glossy Matrix collaboration client for the web"; homepage = http://riot.im/; - maintainers = with stdenv.lib.maintainers; [ bachp pacien ]; + maintainers = with stdenv.lib.maintainers; [ bachp pacien ma27 ]; license = stdenv.lib.licenses.asl20; platforms = stdenv.lib.platforms.all; hydraPlatforms = []; diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index ec7e4e68312d..9cd181c591d6 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -19,12 +19,12 @@ with lib; mkDerivation rec { pname = "telegram-desktop"; - version = "1.9.13"; + version = "1.9.14"; # Telegram-Desktop with submodules src = fetchurl { url = "https://github.com/telegramdesktop/tdesktop/releases/download/v${version}/tdesktop-${version}-full.tar.gz"; - sha256 = "1cd1vy5f0hin01jp7agdr56axwd8539rkngb7c16x17bhj5r7rm7"; + sha256 = "0jsss4b51ylf4qk58frvh2yap1s3cjf3isnlc273cc0fh5g1skc6"; }; postPatch = '' diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix index 13ac80677ee9..96d7b3faaede 100644 --- a/pkgs/applications/networking/irc/weechat/default.nix +++ b/pkgs/applications/networking/irc/weechat/default.nix @@ -27,12 +27,12 @@ let in assert lib.all (p: p.enabled -> ! (builtins.elem null p.buildInputs)) plugins; stdenv.mkDerivation rec { - version = "2.7"; + version = "2.7.1"; pname = "weechat"; src = fetchurl { url = "https://weechat.org/files/src/weechat-${version}.tar.bz2"; - sha256 = "00hzchzw1w2181kczcrrnj8ngml3bwk7qciha3higxq3qynf0h8c"; + sha256 = "0acz41jg7lmipni9z2agfqw4dhmx5hf6k9w4pvr4zih1fhkldva2"; }; outputs = [ "out" "man" ] ++ map (p: p.name) enabledPlugins; diff --git a/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix b/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix index 845dd9287663..038611ca2898 100644 --- a/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix +++ b/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix @@ -64,7 +64,7 @@ in buildPythonPackage { --replace '/usr/bin/env -S python3' '${scriptPython}/bin/python' substituteInPlace $out/bin/matrix_decrypt \ --replace '/usr/bin/env python3' '${scriptPython}/bin/python' - + mkdir -p $out/${python.sitePackages} cp -r $src/matrix $out/${python.sitePackages}/matrix ''; @@ -75,7 +75,7 @@ in buildPythonPackage { description = "A Python plugin for Weechat that lets Weechat communicate over the Matrix protocol"; homepage = "https://github.com/poljar/weechat-matrix"; license = licenses.isc; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ tilpner emily ]; }; } diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix index 86ef850e291e..da7c5d4af741 100644 --- a/pkgs/applications/networking/mumble/default.nix +++ b/pkgs/applications/networking/mumble/default.nix @@ -19,7 +19,9 @@ let pname = overrides.type; version = source.version; - patches = (source.patches or []) ++ optional jackSupport ./mumble-jack-support.patch; + patches = (source.patches or []) + ++ optional jackSupport ./mumble-jack-support.patch + ++ [ ./fix-rnnoise-argument.patch ]; nativeBuildInputs = [ pkgconfig python qt5.qmake ] ++ (overrides.nativeBuildInputs or [ ]); diff --git a/pkgs/applications/networking/mumble/fix-rnnoise-argument.patch b/pkgs/applications/networking/mumble/fix-rnnoise-argument.patch new file mode 100644 index 000000000000..78e8ed24d58f --- /dev/null +++ b/pkgs/applications/networking/mumble/fix-rnnoise-argument.patch @@ -0,0 +1,16 @@ +nixpkgs has a more recent rnnoise than the one used by mumble, and rnnoise +changed the argument rnnoise_create[1], + +[1] https://github.com/xiph/rnnoise/commit/231b9c02d14a74cb449a98004cb7a2cf1bdeca2f + +--- old/src/mumble/AudioInput.cpp 2020-02-18 22:55:32.000000000 -0500 ++++ new/src/mumble/AudioInput.cpp 2020-02-18 22:58:08.000000000 -0500 +@@ -106,7 +106,7 @@ + #endif + + #ifdef USE_RNNOISE +- denoiseState = rnnoise_create(); ++ denoiseState = rnnoise_create(NULL); + #endif + + qWarning("AudioInput: %d bits/s, %d hz, %d sample", iAudioQuality, iSampleRate, iFrameSize); diff --git a/pkgs/applications/networking/remote/anydesk/default.nix b/pkgs/applications/networking/remote/anydesk/default.nix index 573752b5b533..8b194e53b445 100644 --- a/pkgs/applications/networking/remote/anydesk/default.nix +++ b/pkgs/applications/networking/remote/anydesk/default.nix @@ -5,7 +5,7 @@ let sha256 = { - x86_64-linux = "1ysd8fwzm0360qs6ijr6l0y2agqb3njz20h7am1x4kxmhy8ravq9"; + x86_64-linux = "0az7n4lhmd4pz0spjvyiwd4w1gnqbh8f1fvr1jinsssyq0j26ldj"; i386-linux = "0vjxbg5hwkqkh600rr75xviwy848r1xw9mxwf6bb6l8b0isvlsgg"; }.${stdenv.hostPlatform.system} or (throw "system ${stdenv.hostPlatform.system} not supported"); @@ -28,7 +28,7 @@ let in stdenv.mkDerivation rec { pname = "anydesk"; - version = "5.5.1"; + version = "5.5.2"; src = fetchurl { urls = [ diff --git a/pkgs/applications/science/logic/elan/default.nix b/pkgs/applications/science/logic/elan/default.nix index 2ac7c208a5f1..b77f5110521c 100644 --- a/pkgs/applications/science/logic/elan/default.nix +++ b/pkgs/applications/science/logic/elan/default.nix @@ -1,14 +1,9 @@ -{ stdenv, pkgconfig, curl, openssl, zlib, fetchFromGitHub, rustPlatform }: +{ lib, pkgconfig, curl, openssl, zlib, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage rec { pname = "elan"; version = "0.7.5"; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "0q0xlvyyf88dbz43r7kk9v8rrp6hj0nl5i2i9mg6ibk2gphgdv6v"; - src = fetchFromGitHub { owner = "kha"; repo = "elan"; @@ -16,6 +11,8 @@ rustPlatform.buildRustPackage rec { sha256 = "1147f3lzr6lgvf580ppspn20bdwnf6l8idh1h5ana0p0lf5a0dn1"; }; + cargoSha256 = "0vja1cq6z7jlr4nzfdzn4gl8l31yld82zmgzwihnalif13q3fcps"; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ curl zlib openssl ]; @@ -38,7 +35,7 @@ rustPlatform.buildRustPackage rec { $out/bin/elan completions zsh > "$out/share/zsh/site-functions/_elan" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Small tool to manage your installations of the Lean theorem prover"; homepage = "https://github.com/Kha/elan"; license = with licenses; [ asl20 /* or */ mit ]; diff --git a/pkgs/applications/science/machine-learning/shogun/default.nix b/pkgs/applications/science/machine-learning/shogun/default.nix index be15bba979ff..988ea8c855c0 100644 --- a/pkgs/applications/science/machine-learning/shogun/default.nix +++ b/pkgs/applications/science/machine-learning/shogun/default.nix @@ -1,8 +1,8 @@ -{ stdenv, lib, fetchFromGitHub, fetchpatch, ccache, cmake, ctags, swig +{ stdenv, lib, fetchFromGitHub, fetchpatch, fetchurl, cmake, ctags, swig # data, compression , bzip2, curl, hdf5, json_c, lzma, lzo, protobuf, snappy # maths -, openblasCompat, eigen, nlopt, lp_solve, colpack +, openblasCompat, eigen, nlopt, lp_solve, colpack, liblapack, glpk # libraries , libarchive, libxml2 # extra support @@ -13,47 +13,79 @@ assert pythonSupport -> pythonPackages != null; assert opencvSupport -> opencv != null; -stdenv.mkDerivation rec { +let pname = "shogun"; - version = "6.0.0"; - - src = fetchFromGitHub { - owner = pname + "-toolbox"; - repo = pname; - rev = pname + "_" + version; - sha256 = "0f2zwzvn5apvwypkfkq371xp7c5bdb4g1fwqfh8c2d57ysjxhmgf"; - fetchSubmodules = true; + version = "6.1.4"; + rxcppVersion = "4.0.0"; + gtestVersion = "1.8.0"; + srcs = { + toolbox = fetchFromGitHub { + owner = pname + "-toolbox"; + repo = pname; + rev = pname + "_" + version; + sha256 = "38aULxK50wQ2+/ERosSpRyBmssmYSGv5aaWfWSlrSRc="; + fetchSubmodules = true; + }; + # we need the packed archive + rxcpp = fetchurl { + url = "https://github.com/Reactive-Extensions/RxCpp/archive/v${rxcppVersion}.tar.gz"; + sha256 = "0y2isr8dy2n1yjr9c5570kpc9lvdlch6jv0jvw000amwn5d3krsh"; + }; + gtest = fetchurl { + url = "https://github.com/google/googletest/archive/release-${gtestVersion}.tar.gz"; + sha256 = "1n5p1m2m3fjrjdj752lf92f9wq3pl5cbsfrb49jqbg52ghkz99jq"; + }; }; +in + +stdenv.mkDerivation rec { + + inherit pname version; + + src = srcs.toolbox; + + postUnpack = '' + mkdir -p $sourceRoot/third_party/{rxcpp,gtest} + ln -s ${srcs.rxcpp} $sourceRoot/third_party/rxcpp/v${rxcppVersion}.tar.gz + ln -s ${srcs.gtest} $sourceRoot/third_party/gtest/release-${gtestVersion}.tar.gz + ''; + + # broken + doCheck = false; patches = [ (fetchpatch { - name = "Fix-meta-example-parser-bug-in-parallel-builds.patch"; - url = "https://github.com/shogun-toolbox/shogun/commit/ecd6a8f11ac52748e89d27c7fab7f43c1de39f05.patch"; - sha256 = "1hrwwrj78sxhwcvgaz7n4kvh5y9snfcc4jf5xpgji5hjymnl311n"; - }) - (fetchpatch { url = "https://github.com/awild82/shogun/commit/365ce4c4c700736d2eec8ba6c975327a5ac2cd9b.patch"; sha256 = "158hqv4xzw648pmjbwrhxjp7qcppqa7kvriif87gn3zdn711c49s"; }) ]; + CCACHE_DISABLE="1"; CCACHE_DIR=".ccache"; buildInputs = with lib; [ - openblasCompat bzip2 ccache cmake colpack curl ctags eigen hdf5 json_c lp_solve lzma lzo - protobuf nlopt snappy swig (libarchive.dev) libxml2 + openblasCompat bzip2 cmake colpack curl ctags eigen hdf5 json_c lp_solve lzma lzo + protobuf nlopt snappy swig (libarchive.dev) libxml2 liblapack glpk ] ++ optionals (pythonSupport) (with pythonPackages; [ python ply numpy ]) ++ optional (opencvSupport) opencv; - cmakeFlags = with lib; [] - ++ (optional (pythonSupport) "-DPythonModular=ON") - ++ (optional (opencvSupport) "-DOpenCV=ON") - ; + NIX_CFLAGS_COMPILE="-faligned-new"; + + cmakeFlags = + let + onOff = b: if b then "ON" else "OFF"; + flag = n: b: "-D"+n+"="+onOff b; + in + with lib; [ + (flag "ENABLE_TESTING" doCheck) + (flag "BUILD_META_EXAMPLES" doCheck) + (flag "CMAKE_VERBOSE_MAKEFILE:BOOL" doCheck) + (flag "PythonModular" pythonSupport) + (flag "OpenCV" opencvSupport) + ]; - # Previous attempts to fix parallel builds (see patch above) were not entirely successful. - # Sporadic build failures still exist. Dislable parallel builds for now. - enableParallelBuilding = false; + enableParallelBuilding = true; meta = with stdenv.lib; { description = "A toolbox which offers a wide range of efficient and unified machine learning methods"; diff --git a/pkgs/applications/science/math/geogebra/default.nix b/pkgs/applications/science/math/geogebra/default.nix index a08c0ee34033..de84d35c2e89 100644 --- a/pkgs/applications/science/math/geogebra/default.nix +++ b/pkgs/applications/science/math/geogebra/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "geogebra"; - version = "5-0-570-0"; + version = "5-0-573-0"; preferLocalBuild = true; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { "https://download.geogebra.org/installers/5.0/GeoGebra-Linux-Portable-${version}.tar.bz2" "http://web.archive.org/https://download.geogebra.org/installers/5.0/GeoGebra-Linux-Portable-${version}.tar.bz2" ]; - sha256 = "0q6brg5rkl2gyyg9vhiilvb8zy23zlp4a1xcwnv501xzcccv0p37"; + sha256 = "0lj0k49sjsjqs716n74xbq6a4gids5903f5s6fhqyahrwyldhzrj"; }; srcIcon = fetchurl { diff --git a/pkgs/applications/version-management/cvs-fast-export/default.nix b/pkgs/applications/version-management/cvs-fast-export/default.nix index 81b779f02069..fd4c9793d38b 100644 --- a/pkgs/applications/version-management/cvs-fast-export/default.nix +++ b/pkgs/applications/version-management/cvs-fast-export/default.nix @@ -7,7 +7,7 @@ with stdenv; with lib; mkDerivation rec { name = "cvs-fast-export-${meta.version}"; meta = { - version = "1.50"; + version = "1.51"; description = "Export an RCS or CVS history as a fast-import stream"; license = licenses.gpl2Plus; maintainers = with maintainers; [ dfoxfranke ]; @@ -16,8 +16,8 @@ mkDerivation rec { }; src = fetchurl { - url = "http://www.catb.org/~esr/cvs-fast-export/cvs-fast-export-1.50.tar.gz"; - sha256 = "01m5l9xnl387hpyik5jvyhghkffj5v1wyxqpxpjxv69q9ly905yk"; + url = "http://www.catb.org/~esr/cvs-fast-export/cvs-fast-export-1.51.tar.gz"; + sha256 = "0nn5cf8syb5nbjvkn8w561pk25clv187h4hs9pnc700g9w56chzf"; }; buildInputs = [ diff --git a/pkgs/applications/version-management/git-and-tools/gh/default.nix b/pkgs/applications/version-management/git-and-tools/gh/default.nix index 19f97e8994cf..594d2a3abae0 100644 --- a/pkgs/applications/version-management/git-and-tools/gh/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gh/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gh"; - version = "0.5.5"; + version = "0.5.7"; src = fetchFromGitHub { owner = "cli"; repo = "cli"; rev = "v${version}"; - sha256 = "0jmkcx95kngzylqhllg33s094rggpsrgky704z8v6j4969xgrfnc"; + sha256 = "14j8210c1dndnhb8l2ifxcljzhajjhil86lvk9y7ndjkq09805q1"; }; - modSha256 = "0ina3m2ixkkz2fws6ifwy34pmp6kn5s3j7w40alz6vmybn2smy1h"; + modSha256 = "1qwcl74sg5az9vaivnvn7f40p72ilmkms5rp52sp5imfrql81lxf"; buildFlagsArray = [ "-ldflags=-X github.com/cli/cli/command.Version=${version}" diff --git a/pkgs/applications/version-management/git-and-tools/git-remote-gcrypt/default.nix b/pkgs/applications/version-management/git-and-tools/git-remote-gcrypt/default.nix index ff0f702269c2..4e6e450657d2 100644 --- a/pkgs/applications/version-management/git-and-tools/git-remote-gcrypt/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-remote-gcrypt/default.nix @@ -5,14 +5,14 @@ stdenv.mkDerivation rec { pname = "git-remote-gcrypt"; - version = "1.2"; + version = "1.3"; rev = version; src = fetchFromGitHub { inherit rev; owner = "spwhitton"; repo = "git-remote-gcrypt"; - sha256 = "0isfg0vlmcphxzj4jm32dycprhym26ina1b28jgc4j57kiqqrdcy"; + sha256 = "0n8fzvr6y0pxrbvkywlky2bd8jvi0ayp4n9hwi84l1ldmv4a40dh"; }; outputs = [ "out" "man" ]; diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index d448f7b9c16a..9396c6cd99c4 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -21,7 +21,7 @@ assert sendEmailSupport -> perlSupport; assert svnSupport -> perlSupport; let - version = "2.25.0"; + version = "2.25.1"; svn = subversionClient.override { perlBindings = perlSupport; }; gitwebPerlLibs = with perlPackages; [ CGI HTMLParser CGIFast FCGI FCGIProcManager HTMLTagCloud ]; @@ -33,7 +33,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"; - sha256 = "1l58v42aazj0x9276gk8r9mwyl9pgp9w99aakz4xfhzv7wd2jq60"; + sha256 = "09lzwa183nblr6l8ib35g2xrjf9wm9yhk3szfvyzkwivdv69c9r2"; }; outputs = [ "out" ]; @@ -234,6 +234,7 @@ stdenv.mkDerivation { for prog in bin/gitk libexec/git-core/{git-gui,git-citool,git-gui--askpass}; do sed -i -e "s|exec 'wish'|exec '${tk}/bin/wish'|g" \ -e "s|exec wish|exec '${tk}/bin/wish'|g" \ + -e "s|exec \"[^\"]*/MacOS/Wish\"|exec '${tk}/bin/wish'|g" \ "$out/$prog" done ln -s $out/share/git/contrib/completion/git-completion.bash $out/share/bash-completion/completions/gitk diff --git a/pkgs/applications/version-management/meld/default.nix b/pkgs/applications/version-management/meld/default.nix index 5342a0697ab2..be1e8ff841dd 100644 --- a/pkgs/applications/version-management/meld/default.nix +++ b/pkgs/applications/version-management/meld/default.nix @@ -5,11 +5,11 @@ python3.pkgs.buildPythonApplication rec { pname = "meld"; - version = "3.20.1"; + version = "3.20.2"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0jdj7kd6vj1mdc16gvrj1kar88b2j5875ajq18fx7cbc9ny46j55"; + sha256 = "0a0x156zr3w2yg0rnhwy39giy3xnfm6sqcfa4xcw4i6ahvwqa2dc"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/version-management/yadm/default.nix b/pkgs/applications/version-management/yadm/default.nix index f3ddf8059b29..aab47ed1327b 100644 --- a/pkgs/applications/version-management/yadm/default.nix +++ b/pkgs/applications/version-management/yadm/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, git, gnupg }: -let version = "2.3.0"; in +let version = "2.4.0"; in stdenv.mkDerivation { pname = "yadm"; inherit version; @@ -11,7 +11,7 @@ stdenv.mkDerivation { owner = "TheLocehiliosan"; repo = "yadm"; rev = version; - sha256 = "1by21dh48qbi33wlyyvdwz7ac1lxrblzcr5v7hlnc4cbcgvgs1a0"; + sha256 = "0kpahznrkxkyj92vrhwjvldg2affi1askgwvpgbs4mg40f92szlp"; }; dontConfigure = true; diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index f7ac5ef58cdf..f1713fe29d4b 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -1,7 +1,8 @@ { config, stdenv, fetchurl, fetchFromGitHub, makeWrapper , addOpenGLRunpath, docutils, perl, pkgconfig, python3, wafHook, which , ffmpeg_4, freefont_ttf, freetype, libass, libpthreadstubs, mujs -, nv-codec-headers, lua, libuchardet, libiconv ? null, darwin +, nv-codec-headers, lua, libuchardet, libiconv ? null +, CoreFoundation, Cocoa, CoreAudio, MediaPlayer , waylandSupport ? stdenv.isLinux , wayland ? null @@ -38,11 +39,12 @@ , libpngSupport ? true, libpng ? null , pulseSupport ? config.pulseaudio or stdenv.isLinux, libpulseaudio ? null , rubberbandSupport ? stdenv.isLinux, rubberband ? null -, screenSaverSupport ? true, libXScrnSaver ? null , sambaSupport ? stdenv.isLinux, samba ? null +, screenSaverSupport ? true, libXScrnSaver ? null , sdl2Support ? true, SDL2 ? null , sndioSupport ? true, sndio ? null , speexSupport ? true, speex ? null +, swiftSupport ? false, swift ? null , theoraSupport ? true, libtheora ? null , vaapiSupport ? stdenv.isLinux, libva ? null , vdpauSupport ? true, libvdpau ? null @@ -119,7 +121,6 @@ in stdenv.mkDerivation rec { "--disable-libmpv-static" "--disable-static-build" "--disable-build-date" # Purity - "--disable-macos-cocoa-cb" # Disable whilst Swift isn't supported (enableFeature archiveSupport "libarchive") (enableFeature cddaSupport "cdda") (enableFeature dvdnavSupport "dvdnav") @@ -130,11 +131,13 @@ in stdenv.mkDerivation rec { (enableFeature vaapiSupport "vaapi") (enableFeature waylandSupport "wayland") (enableFeature stdenv.isLinux "dvbin") - ]; + ] # Disable whilst Swift isn't supported + ++ stdenv.lib.optional (!swiftSupport) "--disable-macos-cocoa-cb"; nativeBuildInputs = [ addOpenGLRunpath docutils makeWrapper perl pkgconfig python3 wafHook which - ]; + ] + ++ optional swiftSupport swift; buildInputs = [ ffmpeg_4 freetype libass libpthreadstubs @@ -171,9 +174,7 @@ in stdenv.mkDerivation rec { ++ optionals waylandSupport [ wayland wayland-protocols libxkbcommon ] ++ optionals x11Support [ libX11 libXext libGLU libGL libXxf86vm libXrandr ] ++ optionals vulkanSupport [ libplacebo shaderc vulkan-headers vulkan-loader ] - ++ optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ - CoreFoundation Cocoa CoreAudio - ]); + ++ optionals stdenv.isDarwin [ CoreFoundation Cocoa CoreAudio MediaPlayer ]; enableParallelBuilding = true; diff --git a/pkgs/applications/video/shotcut/default.nix b/pkgs/applications/video/shotcut/default.nix index 6926f7e8eae2..f0959284d669 100644 --- a/pkgs/applications/video/shotcut/default.nix +++ b/pkgs/applications/video/shotcut/default.nix @@ -8,13 +8,13 @@ assert stdenv.lib.versionAtLeast mlt.version "6.18.0"; mkDerivation rec { pname = "shotcut"; - version = "19.12.31"; + version = "20.02.17"; src = fetchFromGitHub { owner = "mltframework"; repo = "shotcut"; rev = "v${version}"; - sha256 = "1vwgah8pp2kbd0iaz952d3bwxphk06yxqc0pi4hk1mklkh87qzm9"; + sha256 = "0nsqlbapqgxccb7mnvxqw4hdddj944d4z5jxafpv0cwj7s3z8wj0"; }; patches = [ ./0001-encodedock.cpp-connect-to-VAAPI-via-DRM-not-X11.patch ]; diff --git a/pkgs/applications/virtualization/lkl/default.nix b/pkgs/applications/virtualization/lkl/default.nix index cd6600387cde..d56318555e5e 100644 --- a/pkgs/applications/virtualization/lkl/default.nix +++ b/pkgs/applications/virtualization/lkl/default.nix @@ -21,6 +21,8 @@ stdenv.mkDerivation rec { # Fix a /usr/bin/env reference in here that breaks sandboxed builds prePatch = "patchShebangs arch/lkl/scripts"; + # Fixup build with newer Linux headers: https://github.com/lkl/linux/pull/484 + postPatch = "sed '1i#include <linux/sockios.h>' -i tools/lkl/lib/hijack/xlate.c"; installPhase = '' mkdir -p $out/bin $lib/lib $dev diff --git a/pkgs/applications/window-managers/i3/default.nix b/pkgs/applications/window-managers/i3/default.nix index 403d9939e134..fd964215d455 100644 --- a/pkgs/applications/window-managers/i3/default.nix +++ b/pkgs/applications/window-managers/i3/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "i3"; - version = "4.17.1"; + version = "4.18"; src = fetchurl { url = "https://i3wm.org/downloads/${pname}-${version}.tar.bz2"; - sha256 = "0iazv2i2rgmakzh95pgj6iapyzn7bdpcbcd35a79mhlml4ry33qy"; + sha256 = "0dv5g8ycfmijxfjyw8hzsxaf80v09lb73zh7x2vszy78h3amifqz"; }; nativeBuildInputs = [ which pkgconfig makeWrapper ]; diff --git a/pkgs/applications/window-managers/i3/gaps.nix b/pkgs/applications/window-managers/i3/gaps.nix index e5c478987df4..731555ce9f8c 100644 --- a/pkgs/applications/window-managers/i3/gaps.nix +++ b/pkgs/applications/window-managers/i3/gaps.nix @@ -3,12 +3,12 @@ i3.overrideAttrs (oldAttrs : rec { name = "i3-gaps-${version}"; - version = "4.17.1"; + version = "4.18"; releaseDate = "2019-01-27"; src = fetchurl { url = "https://github.com/Airblader/i3/archive/${version}.tar.gz"; - sha256 = "02jpvwmfwv58dfdwvcvkdfcyca7l7zw7hx18aj4cqm3gg0r5pmqh"; + sha256 = "04sq2sik7j09kgnn1k87yg3vzy56pk4688bmxh49l6drl0wr1m2v"; }; nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [ autoreconfHook ]; diff --git a/pkgs/build-support/fetchgit/nix-prefetch-git b/pkgs/build-support/fetchgit/nix-prefetch-git index 8020ba46f3f1..abba76bd1ac9 100755 --- a/pkgs/build-support/fetchgit/nix-prefetch-git +++ b/pkgs/build-support/fetchgit/nix-prefetch-git @@ -25,7 +25,7 @@ commitDateStrict8601= if test -n "$deepClone"; then deepClone=true else - deepClone=false + deepClone= fi if test "$leaveDotGit" != 1; then @@ -53,6 +53,11 @@ Options: exit 1 } +# some git commands print to stdout, which would contaminate our JSON output +clean_git(){ + git "$@" >&2 +} + argi=0 argfun="" for arg; do @@ -65,7 +70,7 @@ for arg; do --branch-name) argfun=set_branchName;; --deepClone) deepClone=true;; --quiet) QUIET=true;; - --no-deepClone) deepClone=false;; + --no-deepClone) deepClone=;; --leave-dotGit) leaveDotGit=true;; --fetch-submodules) fetchSubmodules=true;; --builder) builder=true;; @@ -98,9 +103,9 @@ fi init_remote(){ local url=$1 - git init - git remote add origin "$url" - ( [ -n "$http_proxy" ] && git config http.proxy "$http_proxy" ) || true + clean_git init + clean_git remote add origin "$url" + ( [ -n "$http_proxy" ] && clean_git config http.proxy "$http_proxy" ) || true } # Return the reference of an hash if it exists on the remote repository. @@ -141,8 +146,8 @@ checkout_hash(){ hash=$(hash_from_ref "$ref") fi - git fetch -t ${builder:+--progress} origin || return 1 - git checkout -b "$branchName" "$hash" || return 1 + clean_git fetch -t ${builder:+--progress} origin || return 1 + clean_git checkout -b "$branchName" "$hash" || return 1 } # Fetch only a branch/tag and checkout it. @@ -150,7 +155,7 @@ checkout_ref(){ local hash="$1" local ref="$2" - if "$deepClone"; then + if [[ -n "$deepClone" ]]; then # The caller explicitly asked for a deep clone. Deep clones # allow "git describe" and similar tools to work. See # https://marc.info/?l=nix-dev&m=139641582514772 @@ -164,8 +169,8 @@ checkout_ref(){ if test -n "$ref"; then # --depth option is ignored on http repository. - git fetch ${builder:+--progress} --depth 1 origin +"$ref" || return 1 - git checkout -b "$branchName" FETCH_HEAD || return 1 + clean_git fetch ${builder:+--progress} --depth 1 origin +"$ref" || return 1 + clean_git checkout -b "$branchName" FETCH_HEAD || return 1 else return 1 fi @@ -174,7 +179,7 @@ checkout_ref(){ # Update submodules init_submodules(){ # Add urls into .git/config file - git submodule init + clean_git submodule init # list submodule directories and their hashes git submodule status | @@ -248,7 +253,7 @@ make_deterministic_repo(){ # Remove all remote branches. git branch -r | while read -r branch; do - git branch -rD "$branch" >&2 + clean_git branch -rD "$branch" done # Remove tags not reachable from HEAD. If we're exactly on a tag, don't @@ -256,19 +261,19 @@ make_deterministic_repo(){ maybe_tag=$(git tag --points-at HEAD) git tag --contains HEAD | while read -r tag; do if [ "$tag" != "$maybe_tag" ]; then - git tag -d "$tag" >&2 + clean_git tag -d "$tag" fi done # Do a full repack. Must run single-threaded, or else we lose determinism. - git config pack.threads 1 - git repack -A -d -f + clean_git config pack.threads 1 + clean_git repack -A -d -f rm -f .git/config # Garbage collect unreferenced objects. # Note: --keep-largest-pack prevents non-deterministic ordering of packs # listed in .git/objects/info/packs by only using a single pack - git gc --prune=all --keep-largest-pack + clean_git gc --prune=all --keep-largest-pack ) } @@ -369,7 +374,9 @@ print_results() { "rev": "$(json_escape "$fullRev")", "date": "$(json_escape "$commitDateStrict8601")", "$(json_escape "$hashType")": "$(json_escape "$hash")", - "fetchSubmodules": $([[ -n "$fetchSubmodules" ]] && echo true || echo false) + "fetchSubmodules": $([[ -n "$fetchSubmodules" ]] && echo true || echo false), + "deepClone": $([[ -n "$deepClone" ]] && echo true || echo false), + "leaveDotGit": $([[ -n "$leaveDotGit" ]] && echo true || echo false) } EOF fi diff --git a/pkgs/common-updater/scripts/update-source-version b/pkgs/common-updater/scripts/update-source-version index 7fb5e413a26a..6a66f94597f4 100755 --- a/pkgs/common-updater/scripts/update-source-version +++ b/pkgs/common-updater/scripts/update-source-version @@ -144,6 +144,10 @@ if [[ -n "$sri" ]]; then tempHash="$(nix to-sri --type "$oldHashAlgo" "$tempHash")" fi +# Escape regex metacharacter that are allowed in hashes (+) +oldHashEscaped=$(echo "$oldHash" | sed -re 's|[+]|\\&|g') +tempHashEscaped=$(echo "$tempHash" | sed -re 's|[+]|\\&|g') + # Replace new version sed -i.bak "$nixFile" -re "$pattern" if cmp -s "$nixFile" "$nixFile.bak"; then @@ -159,7 +163,7 @@ if [[ -n "$newUrl" ]]; then fi fi -sed -i "$nixFile" -re "s|\"$oldHash\"|\"$tempHash\"|" +sed -i "$nixFile" -re "s|\"$oldHashEscaped\"|\"$tempHash\"|" if cmp -s "$nixFile" "$nixFile.bak"; then die "Failed to replace source hash of '$attr' to a temporary hash!" fi @@ -168,12 +172,12 @@ fi if [[ -z "$newHash" ]]; then nix-build $systemArg --no-out-link -A "$attr.src" 2>"$attr.fetchlog" >/dev/null || true # FIXME: use nix-build --hash here once https://github.com/NixOS/nix/issues/1172 is fixed - newHash=$(grep --extended-regexp --invert-match "killing process|dependencies couldn't be built|wanted: " "$attr.fetchlog" | tail -n2 | sed "s~output path .* has .* hash ‘\(.*\)’ when .* was expected\|fixed-output derivation produced path '.*' with .* hash '\(.*\)' instead of the expected hash '.*'\| got: .*:\(.*\)~\1\2\3~" | head -n1) -fi + newHash=$(sed '1,/hash mismatch in fixed-output derivation/d' "$attr.fetchlog" | grep --perl-regexp --only-matching 'got: +.+[:-]\K.+') -if [[ -n "$sri" ]]; then - # nix-build preserves the hashing scheme so we can just convert the result to SRI using the old type - newHash="$(nix to-sri --type "$oldHashAlgo" "$newHash")" + if [[ -n "$sri" ]]; then + # nix-build preserves the hashing scheme so we can just convert the result to SRI using the old type + newHash="$(nix to-sri --type "$oldHashAlgo" "$newHash")" + fi fi if [[ -z "$newHash" ]]; then @@ -186,7 +190,7 @@ if [[ -z "${ignoreSameHash}" && "$oldVersion" != "$newVersion" && "$oldHash" = " die "Both the old and new source hashes of '$attr.src' were equivalent. Please fix the package's source URL to be dependent on '\${version}'!" fi -sed -i "$nixFile" -re "s|\"$tempHash\"|\"$newHash\"|" +sed -i "$nixFile" -re "s|\"$tempHashEscaped\"|\"$newHash\"|" if cmp -s "$nixFile" "$nixFile.bak"; then die "Failed to replace temporary source hash of '$attr' to the final source hash!" fi diff --git a/pkgs/data/fonts/uni-vga/default.nix b/pkgs/data/fonts/uni-vga/default.nix index cd719a62d99f..9cc0fb9adcc5 100644 --- a/pkgs/data/fonts/uni-vga/default.nix +++ b/pkgs/data/fonts/uni-vga/default.nix @@ -1,4 +1,8 @@ -{ stdenv, fetchurl, mkfontdir, mkfontscale }: +{ stdenv, fetchurl, perl, kbd, bdftopcf +, libfaketime, fonttosfnt, mkfontscale +}: + +with stdenv.lib; stdenv.mkDerivation { name = "uni-vga"; @@ -8,24 +12,50 @@ stdenv.mkDerivation { sha256 = "05sns8h5yspa7xkl81ri7y1yxf5icgsnl497f3xnaryhx11s2rv6"; }; - nativeBuildInputs = [ mkfontdir mkfontscale ]; + nativeBuildInputs = + [ bdftopcf libfaketime + fonttosfnt mkfontscale + ] ++ optionals stdenv.isLinux [ perl kbd ]; + + postPatch = "patchShebangs ."; + + buildPhase = '' + # convert font to compressed pcf + bdftopcf u_vga16.bdf | gzip -c -9 -n > u_vga16.pcf.gz + + # convert bdf font to otb + faketime -f "1970-01-01 00:00:01" \ + fonttosfnt -v -o u_vga16.otb u_vga16.bdf + '' + optionalString stdenv.isLinux '' + # convert font to compressed psf + ./bdf2psf.pl -s UniCyrX.sfm u_vga16.bdf \ + | psfaddtable - UniCyrX.sfm - \ + | gzip -c -9 -n > u_vga16.psf.gz + ''; installPhase = '' - mkdir -p $out/share/fonts - cp *.bdf $out/share/fonts - cd $out/share/fonts - mkfontdir - mkfontscale + # install pcf (for X11 applications) + install -m 644 -D *.pcf.gz -t "$out/share/fonts" + mkfontdir "$out/share/fonts" + + # install bdf font + install -m 644 -D *.bdf -t "$bdf/share/fonts" + mkfontdir "$bdf/share/fonts" + + # install otb font (for GTK applications) + install -m 644 -D *.otb -t "$otb/share/fonts" + mkfontdir "$otb/share/fonts" + '' + optionalString stdenv.isLinux '' + # install psf (for linux virtual terminal) + install -m 644 -D *.psf.gz -t "$out/share/consolefonts" ''; - outputHashAlgo = "sha256"; - outputHashMode = "recursive"; - outputHash = "0rfly7r6blr2ykxlv0f6my2w41vvxcw85chspljd2p1fxlr28jd7"; + outputs = [ "out" "bdf" "otb" ]; meta = { description = "Unicode VGA font"; - maintainers = [stdenv.lib.maintainers.ftrvxmtrx]; + maintainers = [ maintainers.ftrvxmtrx ]; homepage = http://www.inp.nsk.su/~bolkhov/files/fonts/univga/; - license = stdenv.lib.licenses.mit; + license = licenses.mit; }; } diff --git a/pkgs/desktops/gnome-3/apps/evolution/default.nix b/pkgs/desktops/gnome-3/apps/evolution/default.nix index a82bd0d18433..60c7fc3872bf 100644 --- a/pkgs/desktops/gnome-3/apps/evolution/default.nix +++ b/pkgs/desktops/gnome-3/apps/evolution/default.nix @@ -43,11 +43,11 @@ stdenv.mkDerivation rec { pname = "evolution"; - version = "3.34.3"; + version = "3.34.4"; src = fetchurl { url = "mirror://gnome/sources/evolution/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1s4y29iszvd3zppgxx2qc2jr1lg7ipl3072jnn8g2l3bghcvq7xq"; + sha256 = "136vpaq94ymyn8pf3a3z1w45xlk1xbvwjdnzasq0d7iwbac0jwks"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome-3/apps/file-roller/default.nix b/pkgs/desktops/gnome-3/apps/file-roller/default.nix index 387f0ebdc446..57c7a93a5337 100644 --- a/pkgs/desktops/gnome-3/apps/file-roller/default.nix +++ b/pkgs/desktops/gnome-3/apps/file-roller/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "file-roller"; - version = "3.32.3"; + version = "3.32.4"; src = fetchurl { url = "mirror://gnome/sources/file-roller/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0ap2hxvjljh4p6wsd9ikh2my3vsxp9r2nvjxxj3v87nwfyw1y4dy"; + sha256 = "05s046br4fcli1d3wngh4jmwi0aikpfkl1px1cahskj4rfzjqfqv"; }; LANG = "en_US.UTF-8"; # postinstall.py diff --git a/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix b/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix index 1fecf80e9ae9..4b76679f9eee 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix @@ -51,11 +51,11 @@ stdenv.mkDerivation rec { pname = "gnome-boxes"; - version = "3.34.3"; + version = "3.34.4"; src = fetchurl { url = "mirror://gnome/sources/gnome-boxes/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1izhqgsb658lzrzj12dw06w47bjhqdpfl0j74aq7bzql7nqsb3wa"; + sha256 = "1bqrl36nngbd8jpj31ipnywg2k0rg2j3bcgnyvn8r86ysh1gnm0f"; }; doCheck = true; diff --git a/pkgs/desktops/gnome-3/apps/gnome-music/default.nix b/pkgs/desktops/gnome-3/apps/gnome-music/default.nix index 9926672aa4be..26c46b1f7b9f 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-music/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-music/default.nix @@ -29,13 +29,13 @@ python3.pkgs.buildPythonApplication rec { pname = "gnome-music"; - version = "3.34.3"; + version = "3.34.4"; format = "other"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0kp7r6l8hb8aq9j2fdiw49p7hyls4gllz258qy6fp3bbfzmbn4g7"; + sha256 = "1l2jaf5jfdkqqpjxwahsjslb3sa2vlhjgpi1ib51is04ln729xb6"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome-3/core/dconf-editor/default.nix b/pkgs/desktops/gnome-3/core/dconf-editor/default.nix index 93d22a99e15c..19d2255ab5f9 100644 --- a/pkgs/desktops/gnome-3/core/dconf-editor/default.nix +++ b/pkgs/desktops/gnome-3/core/dconf-editor/default.nix @@ -3,13 +3,13 @@ let pname = "dconf-editor"; - version = "3.34.3"; + version = "3.34.4"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "12q2cjds5fbarc5zajmhbx9vrbfn28hrklrk1fbgdv1ykxm1ljcv"; + sha256 = "129a2klywvnrj49rz6p5camwsamajldqpsfkl1rgpm6nw0q2lnyy"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome-3/core/epiphany/default.nix b/pkgs/desktops/gnome-3/core/epiphany/default.nix index 46f0f4191dff..be917b64452c 100644 --- a/pkgs/desktops/gnome-3/core/epiphany/default.nix +++ b/pkgs/desktops/gnome-3/core/epiphany/default.nix @@ -34,11 +34,11 @@ stdenv.mkDerivation rec { pname = "epiphany"; - version = "3.34.3.1"; + version = "3.34.4"; src = fetchurl { url = "mirror://gnome/sources/epiphany/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0vga9bqcv792ivnlw6pbfz17zn0nh6wq01rp60c4px08l7xpkr00"; + sha256 = "13ar3s40cds1rplwbzx0fzigf120w0rydiv05r3k6zpc0zy91qb0"; }; # Tests need an X display diff --git a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix index d0273f0fac1d..ff4e499204c3 100644 --- a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix +++ b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "evolution-data-server"; - version = "3.34.3"; + version = "3.34.4"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/evolution-data-server/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1af3f218i5h3df81xkjdij0n9knsw355fsmhzdrfh1bflxfarpyj"; + sha256 = "1wz8mizblmvficxap6z9w62ymjwa8x99spnaljcwjl1wc55lnp4q"; }; patches = [ diff --git a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix b/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix index d23469583038..ea38ed883209 100644 --- a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix @@ -62,16 +62,17 @@ , vino , gnome-user-share , gnome-remote-desktop +, shadow , wrapGAppsHook }: stdenv.mkDerivation rec { pname = "gnome-control-center"; - version = "3.34.2"; + version = "3.34.4"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "054igagvmyzpaa5nwzz98gv7bk7l5dwp6g813707132si3szlpx8"; + sha256 = "0bi7lsmr5hcf0v17brsa8j33p6i0wnh620bzwycmxryfp6s6vshp"; }; nativeBuildInputs = [ @@ -138,6 +139,7 @@ stdenv.mkDerivation rec { (substituteAll { src = ./paths.patch; gcm = gnome-color-manager; + usermod = "${shadow}/bin/usermod"; gnome_desktop = gnome-desktop; inherit glibc libgnomekbd tzdata; inherit cups networkmanagerapplet; diff --git a/pkgs/desktops/gnome-3/core/gnome-control-center/paths.patch b/pkgs/desktops/gnome-3/core/gnome-control-center/paths.patch index 97d8f0bee683..63ca038d8027 100644 --- a/pkgs/desktops/gnome-3/core/gnome-control-center/paths.patch +++ b/pkgs/desktops/gnome-3/core/gnome-control-center/paths.patch @@ -55,7 +55,7 @@ index 96b25140c..1ad704d4a 100644 typedef struct _TzDB TzDB; typedef struct _TzLocation TzLocation; diff --git a/panels/info/cc-info-overview-panel.c b/panels/info/cc-info-overview-panel.c -index 4541986db..da7826bfe 100644 +index 7fce8691e..b839f8b69 100644 --- a/panels/info/cc-info-overview-panel.c +++ b/panels/info/cc-info-overview-panel.c @@ -187,7 +187,7 @@ load_gnome_version (char **version, @@ -84,10 +84,10 @@ index 9390a3308..d30b4a68e 100644 } diff --git a/panels/network/net-device-wifi.c b/panels/network/net-device-wifi.c -index 360fbfc72..870157a11 100644 +index dd99a7485..4baa88a4e 100644 --- a/panels/network/net-device-wifi.c +++ b/panels/network/net-device-wifi.c -@@ -1385,7 +1385,7 @@ device_wifi_edit (NetObject *object) +@@ -1445,7 +1445,7 @@ device_wifi_edit (NetObject *object) return; } uuid = nm_connection_get_uuid (NM_CONNECTION (connection)); @@ -123,10 +123,10 @@ index f53ba217e..d24bcaeb9 100644 /* Use SNMP to get printer's informations */ diff --git a/panels/region/cc-region-panel.c b/panels/region/cc-region-panel.c -index 35859526d..21486c917 100644 +index e0604b8c3..fc323c1b2 100644 --- a/panels/region/cc-region-panel.c +++ b/panels/region/cc-region-panel.c -@@ -755,10 +755,10 @@ row_layout_cb (CcRegionPanel *self, +@@ -763,10 +763,10 @@ row_layout_cb (CcRegionPanel *self, layout_variant = cc_input_source_get_layout_variant (source); if (layout_variant && layout_variant[0]) @@ -140,7 +140,7 @@ index 35859526d..21486c917 100644 g_spawn_command_line_async (commandline, NULL); diff --git a/panels/user-accounts/run-passwd.c b/panels/user-accounts/run-passwd.c -index 00239ce0f..617c98870 100644 +index 19934f186..9f41a9620 100644 --- a/panels/user-accounts/run-passwd.c +++ b/panels/user-accounts/run-passwd.c @@ -150,7 +150,7 @@ spawn_passwd (PasswdHandler *passwd_handler, GError **error) @@ -152,6 +152,19 @@ index 00239ce0f..617c98870 100644 argv[1] = NULL; envp = g_get_environ (); +diff --git a/panels/user-accounts/user-utils.c b/panels/user-accounts/user-utils.c +index 83d4cd091..e8784c722 100644 +--- a/panels/user-accounts/user-utils.c ++++ b/panels/user-accounts/user-utils.c +@@ -486,7 +486,7 @@ is_valid_username_async (const gchar *username, + * future, so it would be nice to have some official way for this + * instead of relying on the current "--login" implementation. + */ +- argv[0] = "/usr/sbin/usermod"; ++ argv[0] = "@usermod@"; + argv[1] = "--login"; + argv[2] = data->username; + argv[3] = "--"; diff --git a/tests/datetime/test-endianess.c b/tests/datetime/test-endianess.c index 9cb92007a..84d2f0fa3 100644 --- a/tests/datetime/test-endianess.c diff --git a/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix b/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix index 86739bb0f45a..15be3e3178ce 100644 --- a/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "gnome-disk-utility"; - version = "3.34.0"; + version = "3.34.4"; src = fetchurl { url = "mirror://gnome/sources/gnome-disk-utility/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1mb7q90lnlp97dhxhnadhjagcfd12dfqzp0vj9h6b1r61pzhy97y"; + sha256 = "0p7pifmihg1vpsvym4qabdjqdp96yx9b4cbc6cnmf5i055js7i8y"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix index c4fec93079a0..71d47a338a78 100644 --- a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix @@ -15,11 +15,11 @@ let in stdenv.mkDerivation rec { pname = "gnome-shell"; - version = "3.34.3"; + version = "3.34.4"; src = fetchurl { url = "mirror://gnome/sources/gnome-shell/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "12mxavjf83d96qd5m8k0z2jnpi1587i25al5w9xpv965hvrvwx14"; + sha256 = "0rm32h7lv4vyadi9x32sb6fwxslarwk70yzmvzjxbq872cazp779"; }; LANG = "en_US.UTF-8"; diff --git a/pkgs/desktops/gnome-3/core/mutter/default.nix b/pkgs/desktops/gnome-3/core/mutter/default.nix index 642a825d5396..8ed00edf6c54 100644 --- a/pkgs/desktops/gnome-3/core/mutter/default.nix +++ b/pkgs/desktops/gnome-3/core/mutter/default.nix @@ -42,13 +42,13 @@ stdenv.mkDerivation rec { pname = "mutter"; - version = "3.34.3"; + version = "3.34.4"; outputs = [ "out" "dev" "man" ]; src = fetchurl { url = "mirror://gnome/sources/mutter/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "12aaxmclg3aw7qkk3pzpw8f5vrk0cxwprdrjnx9bjpf31gfpvxfd"; + sha256 = "18hbw98p4h3d4qz57415smwmfg72s9a0nk8mb04ds1gn2lsm2d01"; }; mesonFlags = [ diff --git a/pkgs/desktops/gnome-3/core/simple-scan/default.nix b/pkgs/desktops/gnome-3/core/simple-scan/default.nix index 8d737b22a7ac..9b28ca7cf919 100644 --- a/pkgs/desktops/gnome-3/core/simple-scan/default.nix +++ b/pkgs/desktops/gnome-3/core/simple-scan/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "simple-scan"; - version = "3.34.2"; + version = "3.34.4"; src = fetchurl { url = "mirror://gnome/sources/simple-scan/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1fk3g4f9slckqfwm576jrjq1d1qihw0dlgzdf00ns7qbhzb0kxsp"; + sha256 = "0xvy672zyl6jsdlnxma8nc2aqsx9k92jhp6wfxs0msj9ppp1nd3z"; }; buildInputs = [ diff --git a/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix b/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix index 078b5051c846..94466b38e226 100644 --- a/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix +++ b/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "four-in-a-row"; - version = "3.34.3"; + version = "3.34.4"; src = fetchurl { url = "mirror://gnome/sources/four-in-a-row/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1agdjg9kcfcfaq3d2w4s4ksci6is1jzfnxanp3f84zqdq55s0k1y"; + sha256 = "1gw54llbmbv4w2rxmmkzq2wq6sacnpj99maw06zpn071cga0g4z5"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome-3/games/gnome-klotski/default.nix b/pkgs/desktops/gnome-3/games/gnome-klotski/default.nix index 5b2b797e3623..f7a7a75533db 100644 --- a/pkgs/desktops/gnome-3/games/gnome-klotski/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-klotski/default.nix @@ -5,13 +5,13 @@ let pname = "gnome-klotski"; - version = "3.34.3"; + version = "3.34.4"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0swbyjlgrkd1hgcmp23h7p8fpjm2rpmnn87n6is0jx1x4cl8ab18"; + sha256 = "1bg7hl64lmjryzvp51qfak5jqs7vbqfmj0s7h1g3c7snscca7rx6"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix b/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix index 00f138ee7626..623572f980b7 100644 --- a/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "gnome-taquin"; - version = "3.34.3"; + version = "3.34.4"; src = fetchurl { url = "mirror://gnome/sources/gnome-taquin/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0njlcqb316qbi0dm2j39s42ca8gc2fqmk5aqill5gpb57znb4d81"; + sha256 = "0s8gsgaj1mxldg5yaq6k9anfha9bc4n16wms66kbbpqi8k5hcm40"; }; passthru = { diff --git a/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix b/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix index 1337a8108072..843211822f91 100644 --- a/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "gnome-tetravex"; - version = "3.34.1"; + version = "3.34.4"; src = fetchurl { url = "mirror://gnome/sources/gnome-tetravex/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "05i9y6x9ai7fay0khr4zb4ji92qs49v88p3lqx9lac8hz04dnvg0"; + sha256 = "1sm90nkpig02hwk7bh5bnf65awgssxl63bvvh2a7gmlaln8x99iy"; }; passthru = { diff --git a/pkgs/desktops/gnome-3/games/iagno/default.nix b/pkgs/desktops/gnome-3/games/iagno/default.nix index 9f1b52990caa..028684114ecd 100644 --- a/pkgs/desktops/gnome-3/games/iagno/default.nix +++ b/pkgs/desktops/gnome-3/games/iagno/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "iagno"; - version = "3.34.4"; + version = "3.34.5"; src = fetchurl { url = "mirror://gnome/sources/iagno/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0v0x2dmgcgfcjmbx21arnrwdx9xwa5q05wrm8a9sgrjjzqx6ynwb"; + sha256 = "05qywjcar29vk29yvbxwlddxhwlrvllgjw7srmlz5811hc5m0a1m"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome-3/misc/geary/default.nix b/pkgs/desktops/gnome-3/misc/geary/default.nix index 07319337a9a0..7e2a8050b410 100644 --- a/pkgs/desktops/gnome-3/misc/geary/default.nix +++ b/pkgs/desktops/gnome-3/misc/geary/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "geary"; - version = "3.34.1"; + version = "3.34.2"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1bx57g8199pcqh1p90dlnca2g1kpyrifr6g8m1rdjmpm2a1r993v"; + sha256 = "1a6j70pzr57ga7m4nypqdkqwlzk2dablpz93yaympgrlqpf5zkvm"; }; nativeBuildInputs = [ diff --git a/pkgs/development/compilers/crystal/default.nix b/pkgs/development/compilers/crystal/default.nix index 124643443482..5253d6e5a9e3 100644 --- a/pkgs/development/compilers/crystal/default.nix +++ b/pkgs/development/compilers/crystal/default.nix @@ -178,15 +178,6 @@ let })); in rec { - binaryCrystal_0_26 = genericBinary { - version = "0.26.1"; - sha256s = { - x86_64-linux = "1xban102yiiwmlklxvn3xp3q546bp8hlxxpakayajkhhnpl6yv45"; - i686-linux = "1igspf1lrv7wpmz0pfrkbx8m1ykvnv4zhic53cav4nicppm2v0ic"; - x86_64-darwin = "1mri8bfrcldl69gczxpihxpv1shn4bijx28m3qby8vnk0ii63n9s"; - }; - }; - binaryCrystal_0_27 = genericBinary { version = "0.27.2"; sha256s = { @@ -223,20 +214,6 @@ in rec { }; }; - crystal_0_25 = generic { - version = "0.25.1"; - sha256 = "15xmbkalsdk9qpc6wfpkly3sifgw6a4ai5jzlv78dh3jp7glmgyl"; - doCheck = false; - binary = binaryCrystal_0_26; - }; - - crystal_0_26 = generic { - version = "0.26.1"; - sha256 = "0jwxrqm99zcjj82gyl6bzvnfj79nwzqf8sa1q3f66q9p50v44f84"; - doCheck = false; # about 20 tests out of more than 14000 are failing - binary = binaryCrystal_0_26; - }; - crystal_0_27 = generic { version = "0.27.2"; sha256 = "0vxqnpqi85yh0167nrkbksxsni476iwbh6y3znbvbjbbfhsi3nsj"; diff --git a/pkgs/development/compilers/go-jsonnet/default.nix b/pkgs/development/compilers/go-jsonnet/default.nix index 949190903673..a39ee351f21e 100644 --- a/pkgs/development/compilers/go-jsonnet/default.nix +++ b/pkgs/development/compilers/go-jsonnet/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "go-jsonnet"; - version = "0.14.0"; + version = "0.15.0"; src = fetchFromGitHub { owner = "google"; repo = "go-jsonnet"; rev = "v${version}"; - sha256 = "1q0mpydh8h0zrml605q9r259y8584kbwcr9g4sqcb1n13b4d1sgp"; + sha256 = "0l6cwky2xl7m8nnc9abp76bhkdcf2ldbbv3r8p30xv2yr5wd1j8i"; }; modSha256 = "1b6hz5a66hhlzpcv1badxr1b4nmk4lw0507d5jks7lqzvvwd0sxq"; diff --git a/pkgs/development/compilers/go/1.12.nix b/pkgs/development/compilers/go/1.12.nix index 8f02de2cddbb..78ffa9658752 100644 --- a/pkgs/development/compilers/go/1.12.nix +++ b/pkgs/development/compilers/go/1.12.nix @@ -30,11 +30,11 @@ in stdenv.mkDerivation rec { pname = "go"; - version = "1.12.16"; + version = "1.12.17"; src = fetchurl { url = "https://dl.google.com/go/go${version}.src.tar.gz"; - sha256 = "1y0x10fsvgpc1x24b9q9y6kv9b0kwf7879am3p0gym2abgc5wvnf"; + sha256 = "09cbl90maxry713wd18jdqrms3ivbvcm472csnxc78rsqhc851yy"; }; # perl is used for testing go vet @@ -242,7 +242,7 @@ stdenv.mkDerivation rec { homepage = http://golang.org/; description = "The Go Programming language"; license = licenses.bsd3; - maintainers = with maintainers; [ cstrahan orivej velovix mic92 rvolosatovs ]; + maintainers = with maintainers; [ cstrahan orivej velovix mic92 rvolosatovs Frostman ]; platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/pkgs/development/compilers/go/1.13.nix b/pkgs/development/compilers/go/1.13.nix index 9006725f639b..71a056109224 100644 --- a/pkgs/development/compilers/go/1.13.nix +++ b/pkgs/development/compilers/go/1.13.nix @@ -30,11 +30,11 @@ in stdenv.mkDerivation rec { pname = "go"; - version = "1.13.7"; + version = "1.13.8"; src = fetchurl { url = "https://dl.google.com/go/go${version}.src.tar.gz"; - sha256 = "1x21kfpzfkvmqd42pan6nl862m7jjl4niqxxpcgm46awbz645bg4"; + sha256 = "0d7cxffk72568h46srzswrxd0bsdip7amgkf499wzn6l6d3g0fxi"; }; # perl is used for testing go vet @@ -239,7 +239,7 @@ stdenv.mkDerivation rec { homepage = http://golang.org/; description = "The Go Programming language"; license = licenses.bsd3; - maintainers = with maintainers; [ cstrahan orivej velovix mic92 rvolosatovs kalbasit ]; + maintainers = with maintainers; [ cstrahan orivej velovix mic92 rvolosatovs kalbasit Frostman ]; platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/pkgs/development/compilers/graalvm/enterprise-edition.nix b/pkgs/development/compilers/graalvm/enterprise-edition.nix index c34c4695a236..f8271baa5883 100644 --- a/pkgs/development/compilers/graalvm/enterprise-edition.nix +++ b/pkgs/development/compilers/graalvm/enterprise-edition.nix @@ -5,33 +5,40 @@ let let graalvmXXX-ee = stdenv.mkDerivation rec { pname = "graalvm${javaVersion}-ee"; - version = "19.3.1"; + version = "20.0.0"; srcs = [ (requireFile { name = "graalvm-ee-java${javaVersion}-linux-amd64-${version}.tar.gz"; - sha256 = { "8" = "b4833f1996e0e271d8abde1d0af3420e2bc6797624515a3720bdbedfa99b1e82"; - "11" = "a965abb093934712f31cd2183f3f0d68ed1410a50365489f665a30e5382908dc"; + sha256 = { "8" = "2df9b31b96f7a24b6a2fe3ecea0b5e819d5d058fde6320016dba1787ce59e99e"; + "11" = "b704fd27b5993584a1ad659b41f42ff0ae8893c066b64a6f6a1719fbee382536"; }.${javaVersion}; url = "https://www.oracle.com/technetwork/graalvm/downloads/index.html"; }) (requireFile { name = "native-image-installable-svm-svmee-java${javaVersion}-linux-amd64-${version}.jar"; - sha256 = { "8" = "fe3447dd60fbe3da39c650654594796873cd6bc9995d1430a421363e71d41702"; - "11" = "53357b7facb36c7b38857a2369471d0e869c0ff45555aa8baf2ab84de0c4782c"; + sha256 = { "8" = "a9f3f86d880d133bd24ad3b1d95129a96e80ea1d8fbc865d09e9410b921e6897"; + "11" = "57086123a95f1e9d4e67b92f830bad9325431908c69a40ef10f28ed586d8bd35"; + }.${javaVersion}; + url = "https://www.oracle.com/technetwork/graalvm/downloads/index.html"; + }) + (requireFile { + name = "ruby-installable-svm-svmee-java${javaVersion}-linux-amd64-${version}.jar"; + sha256 = { "8" = "28b2910736f41070c84b97f1b1a3c5fa43ebdcd926ec92c8f145550b5b975b3c"; + "11" = "27ff1befa67fe5cc9eb0216b6b1105876f44d13eff6137f36f29f13377ea687b"; }.${javaVersion}; url = "https://www.oracle.com/technetwork/graalvm/downloads/index.html"; }) (requireFile { name = "python-installable-svm-svmee-java${javaVersion}-linux-amd64-${version}.jar"; - sha256 = { "8" = "003e9574e18656a82626aa5d310fac31979abc04955587d68ff977808829a91d"; - "11" = "65558e14a25802001f3c79571a09170fa11564de34df6987724163416d3889bf"; + sha256 = { "8" = "9c83bcd71e316805c2914c9002ce348ae44829606adc2375d9188b1eaaaf82f9"; + "11" = "5ca51478bcb5ea5bd9be35856dd7fb2ef03b888cd1b7284a8c15531979025fb4"; }.${javaVersion}; url = "https://www.oracle.com/technetwork/graalvm/downloads/index.html"; }) (requireFile { - name = "ruby-installable-svm-svmee-java${javaVersion}-linux-amd64-${version}.jar"; - sha256 = { "8" = "45abe74d10e09680f1e40101f93def5615e65f29ced328054a40c8517e054290"; - "11" = "3d4de372b78b68dbd966b36489d1c6d84a326990e91a0314fb77404eed0741ad"; + name = "wasm-installable-svm-svmee-java${javaVersion}-linux-amd64-${version}.jar"; + sha256 = { "8" = "e8bd14d3f9bf652104e4346e0899a0351afaecae030a9c0ce0f91b1f93d9e660"; + "11" = "d24eeb84625bb7a5e330b897fd6dde7fc579a687997b64625199c33fa83c40b4"; }.${javaVersion}; url = "https://www.oracle.com/technetwork/graalvm/downloads/index.html"; }) @@ -62,6 +69,7 @@ let unpack_jar ''${arr[1]} unpack_jar ''${arr[2]} unpack_jar ''${arr[3]} + unpack_jar ''${arr[4]} ''; installPhase = { diff --git a/pkgs/development/compilers/ocaml/4.10.nix b/pkgs/development/compilers/ocaml/4.10.nix index 046ea84a0d8a..234b2c446318 100644 --- a/pkgs/development/compilers/ocaml/4.10.nix +++ b/pkgs/development/compilers/ocaml/4.10.nix @@ -1,6 +1,6 @@ import ./generic.nix { major_version = "4"; minor_version = "10"; - patch_version = "0+rc1"; - sha256 = "1nzmn9wszixsyzz4bhpwqw8dx0m1iy83xmanp4g9f5dfywgcss2c"; + patch_version = "0+rc2"; + sha256 = "1iv8x9xr4k2s1x1p4rj4fqdh2iwzhgi56lyshvh6gg224i14rkbz"; } diff --git a/pkgs/development/compilers/rust/rls/default.nix b/pkgs/development/compilers/rust/rls/default.nix index 942e23c6170d..4cf507fbf5c7 100644 --- a/pkgs/development/compilers/rust/rls/default.nix +++ b/pkgs/development/compilers/rust/rls/default.nix @@ -23,7 +23,7 @@ rustPlatform.buildRustPackage { CARGO_BUILD_RUSTFLAGS = if stdenv.isDarwin then "-C rpath" else null; nativeBuildInputs = [ pkgconfig cmake ]; - buildInputs = [ openssh openssl curl zlib libiconv ] + buildInputs = [ openssh openssl curl zlib libiconv rustPlatform.rust.rustc.llvm ] ++ (stdenv.lib.optionals stdenv.isDarwin [ CoreFoundation Security ]); doCheck = true; @@ -37,7 +37,7 @@ rustPlatform.buildRustPackage { meta = with stdenv.lib; { description = "Rust Language Server - provides information about Rust programs to IDEs and other tools"; - homepage = https://github.com/rust-lang/rls/; + homepage = "https://github.com/rust-lang/rls/"; license = with licenses; [ asl20 /* or */ mit ]; maintainers = with maintainers; [ symphorien ]; platforms = platforms.all; diff --git a/pkgs/development/coq-modules/coq-ext-lib/default.nix b/pkgs/development/coq-modules/coq-ext-lib/default.nix index 977039223959..8bbf74b60784 100644 --- a/pkgs/development/coq-modules/coq-ext-lib/default.nix +++ b/pkgs/development/coq-modules/coq-ext-lib/default.nix @@ -2,11 +2,13 @@ let params = { - "8.5" = { version = "0.9.4"; sha256 = "1y66pamgsdxlq2w1338lj626ln70cwj7k53hxcp933g8fdsa4hp0"; }; - "8.6" = { version = "0.9.5"; sha256 = "1b4cvz3llxin130g13calw5n1zmvi6wdd5yb8a41q7yyn2hd3msg"; }; - "8.7" = { version = "0.9.7"; sha256 = "00v4bm4glv1hy08c8xsm467az6d1ashrznn8p2bmbmmp52lfg7ag"; }; - "8.8" = { version = "0.10.3"; sha256 = "0795gs2dlr663z826mp63c8h2zfadn541dr8q0fvnvi2z7kfyslb"; }; - "8.9" = { version = "0.10.3"; sha256 = "0795gs2dlr663z826mp63c8h2zfadn541dr8q0fvnvi2z7kfyslb"; }; + "8.5" = { version = "0.9.4"; sha256 = "1y66pamgsdxlq2w1338lj626ln70cwj7k53hxcp933g8fdsa4hp0"; }; + "8.6" = { version = "0.9.5"; sha256 = "1b4cvz3llxin130g13calw5n1zmvi6wdd5yb8a41q7yyn2hd3msg"; }; + "8.7" = { version = "0.9.7"; sha256 = "00v4bm4glv1hy08c8xsm467az6d1ashrznn8p2bmbmmp52lfg7ag"; }; + "8.8" = { version = "0.11.1"; sha256 = "0dmf1p9j8lm0hwaq0af18jxdwg869xi2jm8447zng7krrq3kvkg5"; }; + "8.9" = { version = "0.11.1"; sha256 = "0dmf1p9j8lm0hwaq0af18jxdwg869xi2jm8447zng7krrq3kvkg5"; }; + "8.10" = { version = "0.11.1"; sha256 = "0dmf1p9j8lm0hwaq0af18jxdwg869xi2jm8447zng7krrq3kvkg5"; }; + "8.11" = { version = "0.11.1"; sha256 = "0dmf1p9j8lm0hwaq0af18jxdwg869xi2jm8447zng7krrq3kvkg5"; }; }; param = params.${coq.coq-version}; in diff --git a/pkgs/development/interpreters/clojurescript/lumo/default.nix b/pkgs/development/interpreters/clojurescript/lumo/default.nix index 0e9d81d5e959..d6252a7506aa 100644 --- a/pkgs/development/interpreters/clojurescript/lumo/default.nix +++ b/pkgs/development/interpreters/clojurescript/lumo/default.nix @@ -1,18 +1,30 @@ -{ stdenv, lib, fetchurl, clojure, - nodejs, jre, unzip, nodePackages, - python, openssl, pkgs }: - -let # packageJSON=./package.json; - version = "1.9.0"; - nodeVersion = "10.9.0"; - nodeSources = fetchurl { - url="https://nodejs.org/dist/v${nodeVersion}/node-v${nodeVersion}.tar.gz"; - sha256="0wgawq3wzw07pir73bxz13dggcc1fj0538y7y69n3cc0a2kiplqy"; - }; - lumo-internal-classpath = "LUMO__INTERNAL__CLASSPATH"; +{ stdenv +, lib +, fetchurl +, clojure +, gnutar +, nodejs +, jre +, unzip +, nodePackages +, xcbuild +, python +, openssl +, pkgs +, fetchgit +, darwin +}: +let + version = "1.10.1"; + nodeVersion = "11.13.0"; + nodeSources = fetchurl { + url = "https://nodejs.org/dist/v${nodeVersion}/node-v${nodeVersion}.tar.gz"; + sha256 = "1cjzjbshxnysxkvbf41p3m8298cnhs9kfvdczgvvvlp6w16x4aac"; + }; + lumo-internal-classpath = "LUMO__INTERNAL__CLASSPATH"; - # as found in cljs/snapshot/lumo/repl.cljs - requireDeps = '' \ + # as found in cljs/snapshot/lumo/repl.cljs + requireDeps = '' \ cljs.analyzer \ cljs.compiler \ cljs.env \ @@ -50,104 +62,125 @@ let # packageJSON=./package.json; lumo.js-deps \ lumo.common ''; - compileClojurescript = (simple: '' - (require '[cljs.build.api :as cljs]) - (cljs/build \"src/cljs/snapshot\" - {:optimizations ${if simple then ":simple" else ":none"} - :main 'lumo.core - :cache-analysis true - :source-map false - :dump-core false - :static-fns true - :optimize-constants false - :npm-deps false - :verbose true - :closure-defines {'cljs.core/*target* \"nodejs\" - 'lumo.core/*lumo-version* \"${version}\"} - :compiler-stats true - :process-shim false - :fn-invoke-direct true - :parallel-build false - :browser-repl false - :target :nodejs - :hashbang false - ;; :libs [ \"src/cljs/bundled\" \"src/js\" ] - :output-dir ${if simple - then ''\"cljstmp\"'' - else ''\"target\"''} - :output-to ${if simple - then ''\"cljstmp/main.js\"'' - else ''\"target/deleteme.js\"'' }}) - ''); + compileClojurescript = (simple: '' + (require '[cljs.build.api :as cljs]) + (cljs/build \"src/cljs/snapshot\" + {:optimizations ${if simple then ":simple" else ":none"} + :main 'lumo.core + :cache-analysis true + :source-map false + :dump-core false + :static-fns true + :optimize-constants false + :npm-deps false + :verbose true + :closure-defines {'cljs.core/*target* \"nodejs\" + 'lumo.core/*lumo-version* \"${version}\"} + :compiler-stats true + :process-shim false + :fn-invoke-direct true + :parallel-build false + :browser-repl false + :target :nodejs + :hashbang false + ;; :libs [ \"src/cljs/bundled\" \"src/js\" ] + :output-dir ${if simple + then ''\"cljstmp\"'' + else ''\"target\"''} + :output-to ${if simple + then ''\"cljstmp/main.js\"'' + else ''\"target/deleteme.js\"'' }}) + '' + ); - cacheToJsons = '' - (import [java.io ByteArrayOutputStream FileInputStream]) - (require '[cognitect.transit :as transit] - '[clojure.edn :as edn] - '[clojure.string :as str]) + cacheToJsons = '' + (import [java.io ByteArrayOutputStream FileInputStream]) + (require '[cognitect.transit :as transit] + '[clojure.edn :as edn] + '[clojure.string :as str]) - (defn write-transit-json [cache] - (let [out (ByteArrayOutputStream. 1000000) - writer (transit/writer out :json)] - (transit/write writer cache) - (.toString out))) + (defn write-transit-json [cache] + (let [out (ByteArrayOutputStream. 1000000) + writer (transit/writer out :json)] + (transit/write writer cache) + (.toString out))) - (defn process-caches [] - (let [cache-aot-path \"target/cljs/core.cljs.cache.aot.edn\" - cache-aot-edn (edn/read-string (slurp cache-aot-path)) - cache-macros-path \"target/cljs/core\$macros.cljc.cache.json\" - cache-macros-stream (FileInputStream. cache-macros-path) - cache-macros-edn (transit/read (transit/reader cache-macros-stream :json)) - caches [[cache-aot-path cache-aot-edn] - [cache-macros-path cache-macros-edn]]] - (doseq [[path cache-edn] caches] - (doseq [key (keys cache-edn)] - (let [out-path (str/replace path #\"(\.json|\.edn)\$\" - (str \".\" (munge key) \".json\")) - tr-json (write-transit-json (key cache-edn))] - (spit out-path tr-json)))))) + (defn process-caches [] + (let [cache-aot-path \"target/cljs/core.cljs.cache.aot.edn\" + cache-aot-edn (edn/read-string (slurp cache-aot-path)) + cache-macros-path \"target/cljs/core\$macros.cljc.cache.json\" + cache-macros-stream (FileInputStream. cache-macros-path) + cache-macros-edn (transit/read (transit/reader cache-macros-stream :json)) + caches [[cache-aot-path cache-aot-edn] + [cache-macros-path cache-macros-edn]]] + (doseq [[path cache-edn] caches] + (doseq [key (keys cache-edn)] + (let [out-path (str/replace path #\"(\.json|\.edn)\$\" + (str \".\" (munge key) \".json\")) + tr-json (write-transit-json (key cache-edn))] + (spit out-path tr-json)))))) - (process-caches) - ''; + (process-caches) + ''; - trimMainJsEnd = '' - (let [string (slurp \"target/main.js\")] - (spit \"target/main.js\" - (subs string 0 (.indexOf string \"cljs.nodejs={};\")))) - ''; + trimMainJsEnd = '' + (let [string (slurp \"target/main.js\")] + (spit \"target/main.js\" + (subs string 0 (.indexOf string \"cljs.nodejs={};\")))) + ''; - cljdeps = import ./deps.nix { inherit pkgs; }; - classp = cljdeps.makeClasspaths { - extraClasspaths=["src/js" "src/cljs/bundled" "src/cljs/snapshot"]; - }; - + cljdeps = import ./deps.nix { inherit pkgs; }; + classp = cljdeps.makeClasspaths { + extraClasspaths = [ "src/js" "src/cljs/bundled" "src/cljs/snapshot" ]; + }; - getJarPath = jarName: (lib.findFirst (p: p.name == jarName) null cljdeps.packages).path.jar; -in stdenv.mkDerivation { + getJarPath = jarName: (lib.findFirst (p: p.name == jarName) null cljdeps.packages).path.jar; +in +stdenv.mkDerivation { inherit version; pname = "lumo"; - src = fetchurl { - url = "https://github.com/anmonteiro/lumo/archive/${version}.tar.gz"; - sha256 = "1mr3zjslznhv7y3mzvg1pmmvzn10d6di26izz4x8p4nfnshacwgw"; + src = fetchgit { + url = "https://github.com/anmonteiro/lumo.git"; + rev = "${version}"; + sha256 = "12agi6bacqic2wq6q3l28283badzamspajmajzqm7fbdl2aq1a4p"; }; + buildInputs = [ + nodejs + clojure + jre + unzip + python + openssl + gnutar + nodePackages."lumo-build-deps-../interpreters/clojurescript/lumo" + ] + ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + ApplicationServices + xcbuild + ] + ); - buildInputs = [ nodejs clojure jre unzip python openssl - nodePackages."lumo-build-deps-../interpreters/clojurescript/lumo" ]; + patches = [ ./no_mangle.patch ./mkdir_promise.patch ]; + + postPatch = '' + substituteInPlace $NIX_BUILD_TOP/lumo/vendor/nexe/exe.js \ + --replace 'glob.sync(dir + "/*")' 'glob.sync(dir + "/../*")' + ''; buildPhase = '' - # Copy over lumo-build-deps environment + # Copy over lumo-build-deps environment rm yarn.lock cp -rf ${nodePackages."lumo-build-deps-../interpreters/clojurescript/lumo"}/lib/node_modules/lumo-build-deps/* ./ # configure clojure-cli mkdir ./.cpcache export CLJ_CONFIG=`pwd` - export CLJ_CACHE=`pwd`/.cpcache + export CLJ_CACHE=`pwd`/.cpcache # require more namespaces for cljs-bundle sed -i "s!ns lumo.core! \ @@ -155,7 +188,7 @@ in stdenv.mkDerivation { (:require ${requireDeps}) \ (:require-macros [clojure.template :as temp] \ [cljs.test :as test])!g" \ - ./src/cljs/snapshot/lumo/core.cljs + ./src/cljs/snapshot/lumo/core.cljs # Step 1: compile clojurescript with :none and :simple ${clojure}/bin/clojure -Scp ${classp} -e "${compileClojurescript true}" @@ -204,7 +237,7 @@ in stdenv.mkDerivation { # Step 3: generate munged cache jsons ${clojure}/bin/clojure -Scp ${classp} -e "${cacheToJsons}" rm ./target/cljs/core\$macros\.cljc\.cache\.json - + # Step 4: Bunde javascript NODE_ENV=production node scripts/bundle.js @@ -215,21 +248,20 @@ in stdenv.mkDerivation { # Step 6: Package executeable 1st time # fetch node sources and copy to palce that nexe will find - mkdir -p tmp/${nodeVersion} - cp ${nodeSources} tmp/${nodeVersion}/node-${nodeVersion}.tar.gz - tar -C ./tmp/${nodeVersion} -xf ${nodeSources} - mv ./tmp/${nodeVersion}/node-v${nodeVersion}/* ./tmp/${nodeVersion}/ + mkdir -p tmp/node/${nodeVersion} + cp ${nodeSources} tmp/node/${nodeVersion}/node-${nodeVersion}.tar.gz + tar -C ./tmp/node/${nodeVersion} -xf ${nodeSources} --warning=no-unknown-keyword + mv ./tmp/node/${nodeVersion}/node-v${nodeVersion}/* ./tmp/node/${nodeVersion}/ rm -rf ${lumo-internal-classpath} - mv target ${lumo-internal-classpath} + cp -rf target ${lumo-internal-classpath} node scripts/package.js ${nodeVersion} - rm -rf ${lumo-internal-classpath} + rm -rf target + mv ${lumo-internal-classpath} target # Step 7: AOT Macros sh scripts/aot-bundle-macros.sh # Step 8: Package executeable 2nd time - rm -rf ${lumo-internal-classpath} - mv target ${lumo-internal-classpath} node scripts/package.js ${nodeVersion} ''; @@ -250,7 +282,6 @@ in stdenv.mkDerivation { homepage = https://github.com/anmonteiro/lumo; license = stdenv.lib.licenses.epl10; maintainers = [ stdenv.lib.maintainers.hlolli ]; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; }; } - diff --git a/pkgs/development/interpreters/clojurescript/lumo/deps.edn b/pkgs/development/interpreters/clojurescript/lumo/deps.edn index e1563599a8cc..7a2faee1d7a5 100644 --- a/pkgs/development/interpreters/clojurescript/lumo/deps.edn +++ b/pkgs/development/interpreters/clojurescript/lumo/deps.edn @@ -1,12 +1,12 @@ {:deps - {org.clojure/clojure {:mvn/version "1.10.0-beta5"} - org.clojure/clojurescript {:mvn/version "1.10.439"} - org.clojure/test.check {:mvn/version "0.10.0-alpha3"} + {org.clojure/clojure {:mvn/version "1.10.1"} + org.clojure/clojurescript {:mvn/version "1.10.520"} + org.clojure/test.check {:mvn/version "0.10.0-alpha4"} org.clojure/tools.reader {:mvn/version "1.3.2" :exclusions [org.clojure/clojure org.clojure/clojurescript]} com.cognitect/transit-cljs {:mvn/version "0.8.256" :exclusions [org.clojure/clojure org.clojure/clojurescript]} malabarba/lazy-map {:mvn/version "1.3" :exclusions [org.clojure/clojure org.clojure/clojurescript]} - fipp {:mvn/version "0.6.14" + fipp {:mvn/version "0.6.17" :exclusions [org.clojure/clojure org.clojure/clojurescript]}}} diff --git a/pkgs/development/interpreters/clojurescript/lumo/deps.nix b/pkgs/development/interpreters/clojurescript/lumo/deps.nix index 3e53c7f98dd7..4f3beff3b819 100644 --- a/pkgs/development/interpreters/clojurescript/lumo/deps.nix +++ b/pkgs/development/interpreters/clojurescript/lumo/deps.nix @@ -1,241 +1,240 @@ -# generated by clj2nix-1.0.3 +# generated by clj2nix-1.0.4 { pkgs }: - let repos = [ - "https://repo.clojars.org/" - "https://repo1.maven.org/" - "http://central.maven.org/maven2/" - "http://oss.sonatype.org/content/repositories/releases/" - "http://oss.sonatype.org/content/repositories/public/" - "http://repo.typesafe.com/typesafe/releases/" - ]; - - in rec { - makePaths = {extraClasspaths ? []}: (builtins.map (dep: if builtins.hasAttr "jar" dep.path then dep.path.jar else dep.path) packages) ++ extraClasspaths; - makeClasspaths = {extraClasspaths ? []}: builtins.concatStringsSep ":" (makePaths {inherit extraClasspaths;}); - - packages = [ - { - name = "com.cognitect/transit-java"; - path = pkgs.fetchMavenArtifact { - inherit repos; - artifactId = "transit-java"; - groupId = "com.cognitect"; - sha512 = "80365a4f244e052b6c4fdfd2fd3b91288835599cb4dd88e0e0dae19883dcda39afee83966810ed81beff342111c3a45a66f5601c443f3ad49904908c43631708"; - version = "0.8.332"; - }; - } - - { - name = "org.clojure/data.json"; - path = pkgs.fetchMavenArtifact { - inherit repos; - artifactId = "data.json"; - groupId = "org.clojure"; - sha512 = "ce526bef01bedd31b772954d921a61832ae60af06121f29080853f7932326438b33d183240a9cffbe57e00dc3744700220753948da26b8973ee21c30e84227a6"; - version = "0.2.6"; - }; - } - - { - name = "org.clojure/clojure"; - path = pkgs.fetchMavenArtifact { - inherit repos; - artifactId = "clojure"; - groupId = "org.clojure"; - sha512 = "f7a6b207b1bcbb6523d32ecfdd3c8c25d4d0b0a59c78baf06cdc69ba3c21c5e96b5dac8e9efcb331efd94e10bccbb9b54fca62a4312309db65a1f9d89d9da3f4"; - version = "1.10.0-beta5"; - }; - } - - { - name = "commons-codec/commons-codec"; - path = pkgs.fetchMavenArtifact { - inherit repos; - artifactId = "commons-codec"; - groupId = "commons-codec"; - sha512 = "8edecc0faf38e8620460909d8191837f34e2bb2ce853677c486c5e79bb79e88d043c3aed69c11f1365c4884827052ee4e1c18ca56e38d1a5bc0ce15c57daeee3"; - version = "1.10"; - }; - } - - { - name = "com.google.errorprone/error_prone_annotations"; - path = pkgs.fetchMavenArtifact { - inherit repos; - artifactId = "error_prone_annotations"; - groupId = "com.google.errorprone"; - sha512 = "bd2135cc9eb2c652658a2814ec9c565fa3e071d4cff590cbe17b853885c78c9f84c1b7b24ba736f4f30ed8cec60a6af983827fcbed61ff142f27ac808e97fc6b"; - version = "2.1.3"; - }; - } - - { - name = "org.clojure/core.specs.alpha"; - path = pkgs.fetchMavenArtifact { - inherit repos; - artifactId = "core.specs.alpha"; - groupId = "org.clojure"; - sha512 = "348c0ea0911bc0dcb08655e61b97ba040649b4b46c32a62aa84d0c29c245a8af5c16d44a4fa5455d6ab076f4bb5bbbe1ad3064a7befe583f13aeb9e32a169bf4"; - version = "0.2.44"; - }; - } - - { - name = "org.clojure/spec.alpha"; - path = pkgs.fetchMavenArtifact { - inherit repos; - artifactId = "spec.alpha"; - groupId = "org.clojure"; - sha512 = "18c97fb2b74c0bc2ff4f6dc722a3edec539f882ee85d0addf22bbf7e6fe02605d63f40c2b8a2905868ccd6f96cfc36a65f5fb70ddac31c6ec93da228a456edbd"; - version = "0.2.176"; - }; - } - - { - name = "org.codehaus.mojo/animal-sniffer-annotations"; - path = pkgs.fetchMavenArtifact { - inherit repos; - artifactId = "animal-sniffer-annotations"; - groupId = "org.codehaus.mojo"; - sha512 = "9e5e3ea9e06e0ac9463869fd0e08ed38f7042784995a7b50c9bfd7f692a53f0e1430b9e1367dc772d0d4eafe5fd2beabbcc60da5008bd792f9e7ec8436c0f136"; - version = "1.14"; - }; - } - - { - name = "com.googlecode.json-simple/json-simple"; - path = pkgs.fetchMavenArtifact { - inherit repos; - artifactId = "json-simple"; - groupId = "com.googlecode.json-simple"; - sha512 = "f8798bfbcc8ab8001baf90ce47ec2264234dc1da2d4aa97fdcdc0990472a6b5a5a32f828e776140777d598a99d8a0c0f51c6d0767ae1a829690ab9200ae35742"; - version = "1.1.1"; - }; - } - - { - name = "com.cognitect/transit-cljs"; - path = pkgs.fetchMavenArtifact { - inherit repos; - artifactId = "transit-cljs"; - groupId = "com.cognitect"; - sha512 = "318b98ddd63629f37b334bb90e625bc31ab6abcf0b1fa80d8e097551658f2d9219b5ee35869a31f2976d7d385da83bea0c07b0d097babcae241ecbd0fe8a7ecd"; - version = "0.8.256"; - }; - } - - { - name = "org.clojure/google-closure-library"; - path = pkgs.fetchMavenArtifact { - inherit repos; - artifactId = "google-closure-library"; - groupId = "org.clojure"; - sha512 = "75631182ef12f21723fe3eba1003d8cf9b8348a51512961e4e1b87bc24d8f3abb14a70c856f08cdaa5588a2d7c2b1b0c03aeaa3c4c5f2ed745a85f59ceeab83a"; - version = "0.0-20170809-b9c14c6b"; - }; - } - - { - name = "fipp"; - path = pkgs.fetchMavenArtifact { - inherit repos; - artifactId = "fipp"; - groupId = "fipp"; - sha512 = "155b5bb7045ac7c3a75c638e65464ca1fc90e5b4692328fc2da73b26792178fdbce5ab01ba0397e1986b6162b06b8904712d2c366f32ea43ea5fa2b454a526a5"; - version = "0.6.14"; - }; - } - - { - name = "org.clojure/clojurescript"; - path = pkgs.fetchMavenArtifact { - inherit repos; - artifactId = "clojurescript"; - groupId = "org.clojure"; - sha512 = "4aec5abdd48aaf95f7a729e11d225a99d02caa3a4ddff3e9e4f8db80dea83ab70a4440691cb372562c8c16e73c2850b22806a2851df3849c852fddd49b57fc58"; - version = "1.10.439"; - }; - } - - { - name = "com.google.jsinterop/jsinterop-annotations"; - path = pkgs.fetchMavenArtifact { - inherit repos; - artifactId = "jsinterop-annotations"; - groupId = "com.google.jsinterop"; - sha512 = "b6fd98a9167d031f6bff571567d4658fda62c132dc74d47ca85e02c9bb3ce8812b1012c67f4c81501ab0cbd9ccd9cda5dcf32d306e04368ace7a173cecae975d"; - version = "1.0.0"; - }; - } - - { - name = "com.fasterxml.jackson.core/jackson-core"; - path = pkgs.fetchMavenArtifact { - inherit repos; - artifactId = "jackson-core"; - groupId = "com.fasterxml.jackson.core"; - sha512 = "a1bd6c264b9ab07aad3d0f26b65757e35ff47904ab895bb7f997e3e1fd063129c177ad6f69876907b04ff8a43c6b1770a26f53a811633a29e66a5dce57194f64"; - version = "2.8.7"; - }; - } - - { - name = "malabarba/lazy-map"; - path = pkgs.fetchMavenArtifact { - inherit repos; - artifactId = "lazy-map"; - groupId = "malabarba"; - sha512 = "ce56d6f03ac344579e15f062cdd4c477c0323da716d4d4106c4edb746959699e0b294b25aacf8ecf1579a6bdd5556a60f4bcb1648d22832984c069a0431c840f"; - version = "1.3"; - }; - } - - { - name = "com.cognitect/transit-js"; - path = pkgs.fetchMavenArtifact { - inherit repos; - artifactId = "transit-js"; - groupId = "com.cognitect"; - sha512 = "6ca0978e633e41b45ff5a76df79099ba7c4900a8ca9f6acd2a903e4ab10a1ec0c83d4127009df9dac1337debaba01f7ff1d5cced1c2159c05ef94845f73f0623"; - version = "0.8.846"; - }; - } - - { - name = "org.mozilla/rhino"; - path = pkgs.fetchMavenArtifact { - inherit repos; - artifactId = "rhino"; - groupId = "org.mozilla"; - sha512 = "466e7a76303ea191802b5e7adb3dff64c1d6283a25ce87447296b693b87b166f4cdd191ef7dc130a5739bfa0e4a81b08550f607c84eec167406d9be2225562dc"; - version = "1.7R5"; - }; - } - - { - name = "org.clojure/google-closure-library-third-party"; - path = pkgs.fetchMavenArtifact { - inherit repos; - artifactId = "google-closure-library-third-party"; - groupId = "org.clojure"; - sha512 = "57fa84fbbca3eb9e612d2842e4476b74f64d13dd076ffca6c9d9e15c4ca8a2f2c56cc19307bcad0ab5b4f9cb0c3e7900ccc845bd570ebc92e2633885ab621f35"; - version = "0.0-20170809-b9c14c6b"; - }; - } - - { - name = "com.google.javascript/closure-compiler-externs"; - path = pkgs.fetchMavenArtifact { - inherit repos; - artifactId = "closure-compiler-externs"; - groupId = "com.google.javascript"; - sha512 = "1a47c8559144095c0b23a8e40acd7185625cea5a4c103eb75fbacd32d5809d087bfb60aaf57066329649c6017ec5f993756024e767a5b8f84926371ba6183a82"; - version = "v20180805"; - }; - } - - { +let repos = [ + "https://repo.clojars.org/" + "https://repo1.maven.org/" + "http://oss.sonatype.org/content/repositories/releases/" + "http://oss.sonatype.org/content/repositories/public/" + "http://repo.typesafe.com/typesafe/releases/" + ]; + +in rec { + makePaths = {extraClasspaths ? []}: (builtins.map (dep: if builtins.hasAttr "jar" dep.path then dep.path.jar else dep.path) packages) ++ extraClasspaths; + makeClasspaths = {extraClasspaths ? []}: builtins.concatStringsSep ":" (makePaths {inherit extraClasspaths;}); + + packages = [ + { + name = "com.cognitect/transit-java"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "transit-java"; + groupId = "com.cognitect"; + sha512 = "80365a4f244e052b6c4fdfd2fd3b91288835599cb4dd88e0e0dae19883dcda39afee83966810ed81beff342111c3a45a66f5601c443f3ad49904908c43631708"; + version = "0.8.332"; + }; + } + + { + name = "org.clojure/data.json"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "data.json"; + groupId = "org.clojure"; + sha512 = "ce526bef01bedd31b772954d921a61832ae60af06121f29080853f7932326438b33d183240a9cffbe57e00dc3744700220753948da26b8973ee21c30e84227a6"; + version = "0.2.6"; + }; + } + + { + name = "org.clojure/clojure"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "clojure"; + groupId = "org.clojure"; + sha512 = "f28178179483531862afae13e246386f8fda081afa523d3c4ea3a083ab607d23575d38ecb9ec0ee7f4d65cbe39a119f680e6de4669bc9cf593aa92be0c61562b"; + version = "1.10.1"; + }; + } + + { + name = "commons-codec/commons-codec"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "commons-codec"; + groupId = "commons-codec"; + sha512 = "8edecc0faf38e8620460909d8191837f34e2bb2ce853677c486c5e79bb79e88d043c3aed69c11f1365c4884827052ee4e1c18ca56e38d1a5bc0ce15c57daeee3"; + version = "1.10"; + }; + } + + { + name = "com.google.errorprone/error_prone_annotations"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "error_prone_annotations"; + groupId = "com.google.errorprone"; + sha512 = "bd2135cc9eb2c652658a2814ec9c565fa3e071d4cff590cbe17b853885c78c9f84c1b7b24ba736f4f30ed8cec60a6af983827fcbed61ff142f27ac808e97fc6b"; + version = "2.1.3"; + }; + } + + { + name = "org.clojure/core.specs.alpha"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "core.specs.alpha"; + groupId = "org.clojure"; + sha512 = "348c0ea0911bc0dcb08655e61b97ba040649b4b46c32a62aa84d0c29c245a8af5c16d44a4fa5455d6ab076f4bb5bbbe1ad3064a7befe583f13aeb9e32a169bf4"; + version = "0.2.44"; + }; + } + + { + name = "org.clojure/spec.alpha"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "spec.alpha"; + groupId = "org.clojure"; + sha512 = "18c97fb2b74c0bc2ff4f6dc722a3edec539f882ee85d0addf22bbf7e6fe02605d63f40c2b8a2905868ccd6f96cfc36a65f5fb70ddac31c6ec93da228a456edbd"; + version = "0.2.176"; + }; + } + + { + name = "org.codehaus.mojo/animal-sniffer-annotations"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "animal-sniffer-annotations"; + groupId = "org.codehaus.mojo"; + sha512 = "9e5e3ea9e06e0ac9463869fd0e08ed38f7042784995a7b50c9bfd7f692a53f0e1430b9e1367dc772d0d4eafe5fd2beabbcc60da5008bd792f9e7ec8436c0f136"; + version = "1.14"; + }; + } + + { + name = "com.googlecode.json-simple/json-simple"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "json-simple"; + groupId = "com.googlecode.json-simple"; + sha512 = "f8798bfbcc8ab8001baf90ce47ec2264234dc1da2d4aa97fdcdc0990472a6b5a5a32f828e776140777d598a99d8a0c0f51c6d0767ae1a829690ab9200ae35742"; + version = "1.1.1"; + }; + } + + { + name = "com.cognitect/transit-cljs"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "transit-cljs"; + groupId = "com.cognitect"; + sha512 = "318b98ddd63629f37b334bb90e625bc31ab6abcf0b1fa80d8e097551658f2d9219b5ee35869a31f2976d7d385da83bea0c07b0d097babcae241ecbd0fe8a7ecd"; + version = "0.8.256"; + }; + } + + { + name = "org.clojure/google-closure-library"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "google-closure-library"; + groupId = "org.clojure"; + sha512 = "75631182ef12f21723fe3eba1003d8cf9b8348a51512961e4e1b87bc24d8f3abb14a70c856f08cdaa5588a2d7c2b1b0c03aeaa3c4c5f2ed745a85f59ceeab83a"; + version = "0.0-20170809-b9c14c6b"; + }; + } + + { + name = "fipp"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "fipp"; + groupId = "fipp"; + sha512 = "d844ab63d28cb5e31657cc38e574bbc7072a78419c997f25445ac6ea4a719904a4f4844b37e3f664a8d2e49bd38ff1006a9e8c6e63fb4e2f0a2322d6c2638275"; + version = "0.6.17"; + }; + } + + { + name = "org.clojure/clojurescript"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "clojurescript"; + groupId = "org.clojure"; + sha512 = "b241959d6bd2ab659920965d301508226e26b3edcee469e4cd516cd4ed014b1a6b132c17ee7d96a8e66fe27fd01a74813ac8b85958d260f9fdbbeb4348d57ff1"; + version = "1.10.520"; + }; + } + + { + name = "com.google.jsinterop/jsinterop-annotations"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "jsinterop-annotations"; + groupId = "com.google.jsinterop"; + sha512 = "b6fd98a9167d031f6bff571567d4658fda62c132dc74d47ca85e02c9bb3ce8812b1012c67f4c81501ab0cbd9ccd9cda5dcf32d306e04368ace7a173cecae975d"; + version = "1.0.0"; + }; + } + + { + name = "com.fasterxml.jackson.core/jackson-core"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "jackson-core"; + groupId = "com.fasterxml.jackson.core"; + sha512 = "a1bd6c264b9ab07aad3d0f26b65757e35ff47904ab895bb7f997e3e1fd063129c177ad6f69876907b04ff8a43c6b1770a26f53a811633a29e66a5dce57194f64"; + version = "2.8.7"; + }; + } + + { + name = "malabarba/lazy-map"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "lazy-map"; + groupId = "malabarba"; + sha512 = "ce56d6f03ac344579e15f062cdd4c477c0323da716d4d4106c4edb746959699e0b294b25aacf8ecf1579a6bdd5556a60f4bcb1648d22832984c069a0431c840f"; + version = "1.3"; + }; + } + + { + name = "com.cognitect/transit-js"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "transit-js"; + groupId = "com.cognitect"; + sha512 = "6ca0978e633e41b45ff5a76df79099ba7c4900a8ca9f6acd2a903e4ab10a1ec0c83d4127009df9dac1337debaba01f7ff1d5cced1c2159c05ef94845f73f0623"; + version = "0.8.846"; + }; + } + + { + name = "org.mozilla/rhino"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "rhino"; + groupId = "org.mozilla"; + sha512 = "466e7a76303ea191802b5e7adb3dff64c1d6283a25ce87447296b693b87b166f4cdd191ef7dc130a5739bfa0e4a81b08550f607c84eec167406d9be2225562dc"; + version = "1.7R5"; + }; + } + + { + name = "org.clojure/google-closure-library-third-party"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "google-closure-library-third-party"; + groupId = "org.clojure"; + sha512 = "57fa84fbbca3eb9e612d2842e4476b74f64d13dd076ffca6c9d9e15c4ca8a2f2c56cc19307bcad0ab5b4f9cb0c3e7900ccc845bd570ebc92e2633885ab621f35"; + version = "0.0-20170809-b9c14c6b"; + }; + } + + { + name = "com.google.javascript/closure-compiler-externs"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "closure-compiler-externs"; + groupId = "com.google.javascript"; + sha512 = "1a47c8559144095c0b23a8e40acd7185625cea5a4c103eb75fbacd32d5809d087bfb60aaf57066329649c6017ec5f993756024e767a5b8f84926371ba6183a82"; + version = "v20180805"; + }; + } + + { name = "org.javassist/javassist"; path = pkgs.fetchMavenArtifact { inherit repos; @@ -307,8 +306,8 @@ inherit repos; artifactId = "core.rrb-vector"; groupId = "org.clojure"; - sha512 = "5f737bf3ca3acf567b2b5c14b5761c8c38e94e1f6168f8cba9f46d2ae41334ae3d68d2c00663827a6214094d96b9767f6803f66ab44b0012c6f2e3c2997b1796"; - version = "0.0.13"; + sha512 = "4e410c4a90a869e98d5d69a8a6dd6427e9d77b70e1a2b54cf24baf23389f22e7a208375783c2fdc5c1a5acfb8511a5c5ed57ad1a946d5bffd203f453d90a6155"; + version = "0.0.14"; }; } @@ -351,8 +350,8 @@ inherit repos; artifactId = "test.check"; groupId = "org.clojure"; - sha512 = "bf57571a9d31d50cf15b38134f4d7c34d03eb458bc62b30c7a1dbf233e300c67f1fda6673dbd1584a0497cf8875f972e6697e7f13d0c3e70e4254697b1b75cc6"; - version = "0.10.0-alpha3"; + sha512 = "60fa3bd38c32cf193c573f1bd47c6abd7e7a5bb2fc7f7f9f97aa9dcd54d5e2eab9e351f5f83b01bb96b32811a9f2f5ab384c6b7b7ebbb6c86d1ad4f2789351bf"; + version = "0.10.0-alpha4"; }; } diff --git a/pkgs/development/interpreters/clojurescript/lumo/mkdir_promise.patch b/pkgs/development/interpreters/clojurescript/lumo/mkdir_promise.patch new file mode 100644 index 000000000000..e9504bb5c1a0 --- /dev/null +++ b/pkgs/development/interpreters/clojurescript/lumo/mkdir_promise.patch @@ -0,0 +1,20 @@ +diff --git a/vendor/nexe/exe.js b/vendor/nexe/exe.js +index 21e78bb..ecbfca4 100644 +--- a/vendor/nexe/exe.js ++++ b/vendor/nexe/exe.js +@@ -254,9 +254,7 @@ return initModule._compile(${JSON.stringify(source)}, process.execPath); + */ + + function makeOutputDirectory(next) { +- mkdirp(path.dirname(options.output), function() { +- next(); +- }); ++ mkdirp(path.dirname(options.output)).then(() => next()); + }, + + /** +@@ -1107,4 +1105,3 @@ exports.package = function(path, options) { + + return obj; + } +- diff --git a/pkgs/development/interpreters/clojurescript/lumo/no_mangle.patch b/pkgs/development/interpreters/clojurescript/lumo/no_mangle.patch new file mode 100644 index 000000000000..9af223411958 --- /dev/null +++ b/pkgs/development/interpreters/clojurescript/lumo/no_mangle.patch @@ -0,0 +1,13 @@ +diff --git a/scripts/bundle.js b/scripts/bundle.js +index 16425a4..0d510fc 100644 +--- a/scripts/bundle.js ++++ b/scripts/bundle.js +@@ -73,6 +73,8 @@ const plugins = [ + if (!isDevBuild) { + plugins.push( + babelMinify({ ++ evaluate: false, ++ mangle: false, + comments: false, + removeConsole: true, + removeDebugger: true, diff --git a/pkgs/development/interpreters/clojurescript/lumo/package.json b/pkgs/development/interpreters/clojurescript/lumo/package.json index cfffdc890d1e..6ab3f9616c78 100644 --- a/pkgs/development/interpreters/clojurescript/lumo/package.json +++ b/pkgs/development/interpreters/clojurescript/lumo/package.json @@ -1,40 +1,49 @@ { "name": "lumo-build-deps", - "version": "1.9.0", + "version": "1.10.1", "dependencies": { "@babel/core": "^7.1.5", - "@babel/plugin-external-helpers": "7.0.0", + "@babel/plugin-external-helpers": "7.8.3", "@babel/plugin-proposal-class-properties": "^7.1.0", "@babel/plugin-proposal-object-rest-spread": "^7.0.0", "@babel/plugin-transform-runtime": "^7.1.0", "@babel/preset-env": "^7.1.5", - "@babel/preset-stage-2": "7.0.0", + "@babel/preset-stage-2": "7.8.3", "@babel/runtime": "^7.1.5", + "async": "^3.1.1", "async-retry": "^1.2.3", "babel-core": "^7.0.0-bridge.0", - "babel-eslint": "10.0.1", - "babel-jest": "^23.6.0", + "babel-eslint": "10.0.3", + "babel-jest": "^25.1.0", "babel-loader": "^8.0.4", "babel-plugin-transform-flow-strip-types": "6.22.0", - "chalk": "^2.4.1", - "cross-env": "5.2.0", + "browserify": "^16.2.3", + "chalk": "^3.0.0", + "colors": "^1.3.3", + "cross-env": "7.0.0", "death": "^1.1.0", - "flow-bin": "0.85.0", + "flow-bin": "0.118.0", "google-closure-compiler-js": "20170910.0.1", + "glob": "^7.1.3", + "gunzip-maybe": "^1.4.1", + "insert-module-globals": "^7.2.0", "jszip": "github:anmonteiro/jszip#patch-1", - "nexe": "3.0.0-beta.7", + "mkdirp": "^1.0.3", + "ncp": "^2.0.0", "node-fetch": "^2.2.1", - "paredit.js": "0.3.4", + "paredit.js": "0.3.6", "posix-getopt": "github:anmonteiro/node-getopt#master", - "prettier": "1.15.1", + "prettier": "1.19.1", "progress": "^2.0.0", - "read-pkg": "^4.0.1", - "rollup": "0.67.0", - "rollup-plugin-babel": "4.0.3", - "rollup-plugin-babel-minify": "6.1.1", - "rollup-plugin-commonjs": "9.2.0", - "rollup-plugin-node-resolve": "3.4.0", - "rollup-plugin-replace": "2.1.0", + "read-pkg": "^5.2.0", + "request": "^2.88.0", + "rollup": "^1.9.0", + "rollup-plugin-babel": "^4.3.2", + "rollup-plugin-babel-minify": "^9.1.1", + "rollup-plugin-commonjs": "^10.0.0", + "rollup-plugin-node-resolve": "^5.0.0", + "rollup-plugin-replace": "^2.1.1", + "tar-stream": "^2.0.1", "webpack": "^4.25.1", "webpack-cli": "^3.2.3", "which-promise": "^1.0.0" diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index 0fa605a4cac7..911795cc1922 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -263,23 +263,23 @@ let in { php72 = generic { - version = "7.2.26"; - sha256 = "0yw49v3rk3cd0fb4gsli74pgd4qrykhn9c37dyfr3zsprzp8cvgk"; + version = "7.2.27"; + sha256 = "0jbhc8x2i6xx6p7zc30ahg9xplsqlz334m1w13mhr1qv2xdnkh2v"; # https://bugs.php.net/bug.php?id=76826 extraPatches = optional stdenv.isDarwin ./php72-darwin-isfinite.patch; }; php73 = generic { - version = "7.3.13"; - sha256 = "1g376b9caw21mw8738z354llbzb3shzgc60m7naw7wql5038jysw"; + version = "7.3.14"; + sha256 = "0wn2qsfrnch90l8nxbpcjd2q0ijzdiiyhvcpbycngki9r6xwppxr"; # https://bugs.php.net/bug.php?id=76826 extraPatches = optional stdenv.isDarwin ./php73-darwin-isfinite.patch; }; php74 = generic { - version = "7.4.1"; - sha256 = "0klfwhm2935ariwzqdri1fwh4a0vbrk3jis53qzi18isp3qa073b"; + version = "7.4.2"; + sha256 = "05p8z0ld058yjanxaphy3ka20hn7x7d6nak5sm782w4wprs9k402"; }; } diff --git a/pkgs/development/libraries/freenect/default.nix b/pkgs/development/libraries/freenect/default.nix index 9520542481c8..17b2a6b7c990 100644 --- a/pkgs/development/libraries/freenect/default.nix +++ b/pkgs/development/libraries/freenect/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "freenect"; - version = "0.5.7"; + version = "0.6.0"; src = fetchFromGitHub { owner = "OpenKinect"; repo = "libfreenect"; rev = "v${version}"; - sha256 = "0vnc7z2avckh4mccqq6alsd2z7xvsh3kaslc5b0gnfxw0j269gl6"; + sha256 = "1963xndbiwgj01q17zv6xbqlsbhfd236dkbdwkbjw4b0gr8kqzq9"; }; buildInputs = [ libusb freeglut libGLU libGL libXi libXmu ] diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix index 7ccba0072e28..d1ff681097dd 100644 --- a/pkgs/development/libraries/glibc/common.nix +++ b/pkgs/development/libraries/glibc/common.nix @@ -24,7 +24,7 @@ , gd ? null, libpng ? null , libidn2 , bison -, python3 +, python3Minimal }: { name @@ -155,7 +155,7 @@ stdenv.mkDerivation ({ outputs = [ "out" "bin" "dev" "static" ]; depsBuildBuild = [ buildPackages.stdenv.cc ]; - nativeBuildInputs = [ bison python3 ]; + nativeBuildInputs = [ bison python3Minimal ]; buildInputs = [ linuxHeaders ] ++ lib.optionals withGd [ gd libpng ]; # Needed to install share/zoneinfo/zone.tab. Set to impure /bin/sh to diff --git a/pkgs/development/libraries/howard-hinnant-date/default.nix b/pkgs/development/libraries/howard-hinnant-date/default.nix new file mode 100644 index 000000000000..30e5c92b8f09 --- /dev/null +++ b/pkgs/development/libraries/howard-hinnant-date/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchFromGitHub, cmake, curl, fetchpatch }: + +stdenv.mkDerivation rec { + pname = "howard-hinnant-date-unstable"; + version = "2020-01-24"; + + src = fetchFromGitHub { + owner = "HowardHinnant"; + repo = "date"; + rev = "9a0ee2542848ab8625984fc8cdbfb9b5414c0082"; + sha256 = "0yxsn0hj22n61bjywysxqgfv7hj5xvsl6isma95fl8xrimpny083"; + }; + + patches = [ + (fetchpatch { + url = "https://github.com/HowardHinnant/date/commit/e56b2dce7e89a92e1b9b35caa13b3e938c4cedea.patch"; + sha256 = "0m3qbhq7kmm9qa3jm6d2px7c1dxdj5k9lffgdvqnrwmhxwj1p9n2"; + }) + ]; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ curl ]; + + cmakeFlags = [ + "-DBUILD_TZ_LIB=true" + "-DBUILD_SHARED_LIBS=true" + ]; + + outputs = [ "out" "dev" ]; + + meta = with stdenv.lib; { + license = licenses.mit; + description = "A date and time library based on the C++11/14/17 <chrono> header"; + homepage = "https://github.com/HowardHinnant/date"; + platforms = platforms.linux; + maintainers = with maintainers; [ ma27 ]; + }; +} diff --git a/pkgs/development/libraries/http-parser/default.nix b/pkgs/development/libraries/http-parser/default.nix index 4b1a695ca551..7c3b313dd60b 100644 --- a/pkgs/development/libraries/http-parser/default.nix +++ b/pkgs/development/libraries/http-parser/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: let - version = "2.9.2"; + version = "2.9.3"; in stdenv.mkDerivation { pname = "http-parser"; inherit version; @@ -10,7 +10,7 @@ in stdenv.mkDerivation { owner = "nodejs"; repo = "http-parser"; rev = "v${version}"; - sha256 = "1qs6x3n2nrcj1wiik5pg5i16inykf7rcfdfdy7rwyzf40pvdl3c2"; + sha256 = "189zi61vczqgmqjd2myjcjbbi5icrk7ccs0kn6nj8hxqiv5j3811"; }; NIX_CFLAGS_COMPILE = "-Wno-error"; diff --git a/pkgs/development/libraries/hunspell/default.nix b/pkgs/development/libraries/hunspell/default.nix index f2f8cdcab205..a9b28253171f 100644 --- a/pkgs/development/libraries/hunspell/default.nix +++ b/pkgs/development/libraries/hunspell/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ncurses, readline, autoreconfHook }: +{ stdenv, fetchurl, fetchpatch, ncurses, readline, autoreconfHook }: stdenv.mkDerivation rec { version = "1.7.0"; @@ -14,7 +14,14 @@ stdenv.mkDerivation rec { buildInputs = [ ncurses readline ]; nativeBuildInputs = [ autoreconfHook ]; - patches = [ ./0001-Make-hunspell-look-in-XDG_DATA_DIRS-for-dictionaries.patch ]; + patches = [ + ./0001-Make-hunspell-look-in-XDG_DATA_DIRS-for-dictionaries.patch + (fetchpatch { + name = "CVE-2019-16707.patch"; + url = "https://github.com/hunspell/hunspell/commit/ac938e2ecb48ab4dd21298126c7921689d60571b.patch"; + sha256 = "0bwfksz87iy7ikx3fb54zd5ww169qfm9kl076hsch3cs8p30s8az"; + }) + ]; postPatch = '' patchShebangs tests diff --git a/pkgs/development/libraries/libarchive/default.nix b/pkgs/development/libraries/libarchive/default.nix index 04b4e409b9bd..779ddfeb589a 100644 --- a/pkgs/development/libraries/libarchive/default.nix +++ b/pkgs/development/libraries/libarchive/default.nix @@ -10,13 +10,13 @@ assert xarSupport -> libxml2 != null; stdenv.mkDerivation rec { pname = "libarchive"; - version = "3.4.1"; + version = "3.4.2"; src = fetchFromGitHub { owner = "libarchive"; repo = "libarchive"; rev = "v${version}"; - sha256 = "0g0kzfl01zy1aabr5jcrh8480mb16vh3pacdhg6mm2bdv2f5w8z1"; + sha256 = "0mjm77wbqs8sbn9j44lj39nwbg6anmgz6pkyfxsww54a4rs0p3iz"; }; outputs = [ "out" "lib" "dev" ]; diff --git a/pkgs/development/libraries/libgee/default.nix b/pkgs/development/libraries/libgee/default.nix index b9e1d668cd3e..92c9f214ab46 100644 --- a/pkgs/development/libraries/libgee/default.nix +++ b/pkgs/development/libraries/libgee/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libgee"; - version = "0.20.2"; + version = "0.20.3"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0g1mhl7nidg82v4cikkk8dakzc18hg7wv0dsf2pbyijzfm5mq0wy"; + sha256 = "1pm525wm11dhwz24m8bpcln9547lmrigl6cxf3qsbg4cr3pyvdfh"; }; doCheck = true; diff --git a/pkgs/development/libraries/libiio/default.nix b/pkgs/development/libraries/libiio/default.nix index 9392061a269e..461c6f111645 100644 --- a/pkgs/development/libraries/libiio/default.nix +++ b/pkgs/development/libraries/libiio/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "libiio"; - version = "0.18"; + version = "0.19"; src = fetchFromGitHub { owner = "analogdevicesinc"; repo = "libiio"; rev = "refs/tags/v${version}"; - sha256 = "1cmg3ipam101iy9yncwz2y48idaqaw4fg7i9i4c8vfjisfcycnkk"; + sha256 = "1r67h5mayx9krh3mmzs5vz20mvwb2lw04hpbyyisygl01ndc77kq"; }; outputs = [ "out" "lib" "dev" "python" ]; diff --git a/pkgs/development/libraries/libinput/default.nix b/pkgs/development/libraries/libinput/default.nix index 5cbf7c9145db..4c3fb6704843 100644 --- a/pkgs/development/libraries/libinput/default.nix +++ b/pkgs/development/libraries/libinput/default.nix @@ -27,11 +27,11 @@ in with stdenv.lib; stdenv.mkDerivation rec { pname = "libinput"; - version = "1.15.0"; + version = "1.15.1"; src = fetchurl { url = "https://www.freedesktop.org/software/libinput/${pname}-${version}.tar.xz"; - sha256 = "1qa3b2fd4pv8ysf0mgwnyhqv9v48zgy3sy0q3a3vxcmwcvpizgxz"; + sha256 = "05hcjlsrc38yn1g1n7kia9m93nc703hx66gf977kw5vgbi4mfbvb"; }; outputs = [ "bin" "out" "dev" ]; diff --git a/pkgs/development/libraries/libmicrohttpd/default.nix b/pkgs/development/libraries/libmicrohttpd/default.nix index ba4d74e4d484..e3bce805d291 100644 --- a/pkgs/development/libraries/libmicrohttpd/default.nix +++ b/pkgs/development/libraries/libmicrohttpd/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libmicrohttpd"; - version = "0.9.69"; + version = "0.9.70"; src = fetchurl { url = "mirror://gnu/libmicrohttpd/${pname}-${version}.tar.gz"; - sha256 = "0zp34zgcahym5kp2r83gfb5wnr8yf643a26k6zk96x3qica6p6zv"; + sha256 = "01vkjy89b1ylmh22dy5yza2r414nfwcfixxh3v29nvzrjv9s7l4h"; }; outputs = [ "out" "dev" "devdoc" "info" ]; diff --git a/pkgs/development/libraries/libuninameslist/default.nix b/pkgs/development/libraries/libuninameslist/default.nix new file mode 100644 index 000000000000..5d4cc61fe7ac --- /dev/null +++ b/pkgs/development/libraries/libuninameslist/default.nix @@ -0,0 +1,28 @@ +{ stdenv +, fetchFromGitHub +, autoreconfHook +}: + +stdenv.mkDerivation rec { + pname = "libuninameslist"; + version = "20190701"; + + src = fetchFromGitHub { + owner = "fontforge"; + repo = pname; + rev = version; + sha256 = "sha256:034c8clnskvqbwyiq7si4dad1kbngi3jmnrj064i39msqixmpdzb"; + }; + + nativeBuildInputs = [ + autoreconfHook + ]; + + meta = with stdenv.lib; { + homepage = https://github.com/fontforge/libuninameslist/; + description = "A Library of Unicode names and annotation data"; + license = licenses.bsd3; + maintainers = with maintainers; [ erictapen ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/libraries/mimalloc/default.nix b/pkgs/development/libraries/mimalloc/default.nix index b3f63ec7e9b9..03a1e77e7bfb 100644 --- a/pkgs/development/libraries/mimalloc/default.nix +++ b/pkgs/development/libraries/mimalloc/default.nix @@ -7,39 +7,42 @@ let in stdenv.mkDerivation rec { pname = "mimalloc"; - version = "1.1.0"; + version = "1.6.1"; src = fetchFromGitHub { owner = "microsoft"; repo = pname; - rev = "refs/tags/v${version}"; - sha256 = "1i8pwzpcmbf7dxncb984xrnczn1737xqhf1jaizlyw0k1hpiam4v"; + rev = "v${version}"; + sha256 = "1zql498587wvb0gaavnzxj2zm535sgm22x0sjgl4ncfk7ragnv9c"; }; nativeBuildInputs = [ cmake ninja ]; enableParallelBuilding = true; cmakeFlags = stdenv.lib.optional secureBuild [ "-DMI_SECURE=ON" ]; - postInstall = '' + postInstall = let + rel = stdenv.lib.versions.majorMinor version; + in '' # first, install headers, that's easy mkdir -p $dev mv $out/lib/*/include $dev/include # move .a and .o files into place - mv $out/lib/mimalloc-1.0/libmimalloc*.a $out/lib/libmimalloc.a - mv $out/lib/mimalloc-1.0/mimalloc*.o $out/lib/mimalloc.o + find $out/lib + mv $out/lib/mimalloc-${rel}/libmimalloc*.a $out/lib/libmimalloc.a + mv $out/lib/mimalloc-${rel}/mimalloc*.o $out/lib/mimalloc.o '' + (if secureBuild then '' - mv $out/lib/mimalloc-1.0/libmimalloc-secure${soext}.1.0 $out/lib/libmimalloc-secure${soext}.1.0 - ln -sfv $out/lib/libmimalloc-secure${soext}.1.0 $out/lib/libmimalloc-secure${soext} - ln -sfv $out/lib/libmimalloc-secure${soext}.1.0 $out/lib/libmimalloc${soext} + mv $out/lib/mimalloc-${rel}/libmimalloc-secure${soext}.${rel} $out/lib/libmimalloc-secure${soext}.${rel} + ln -sfv $out/lib/libmimalloc-secure${soext}.${rel} $out/lib/libmimalloc-secure${soext} + ln -sfv $out/lib/libmimalloc-secure${soext}.${rel} $out/lib/libmimalloc${soext} '' else '' - mv $out/lib/mimalloc-1.0/libmimalloc${soext}.1.0 $out/lib/libmimalloc${soext}.1.0 - ln -sfv $out/lib/libmimalloc${soext}.1.0 $out/lib/libmimalloc${soext} + mv $out/lib/mimalloc-${rel}/libmimalloc${soext}.${rel} $out/lib/libmimalloc${soext}.${rel} + ln -sfv $out/lib/libmimalloc${soext}.${rel} $out/lib/libmimalloc${soext} '') + '' # remote duplicate dir. FIXME: try to fix the .cmake file distribution # so we can re-use it for dependencies... - rm -rf $out/lib/mimalloc-1.0 + rm -rf $out/lib/mimalloc-${rel} ''; outputs = [ "out" "dev" ]; @@ -50,5 +53,6 @@ stdenv.mkDerivation rec { license = licenses.bsd2; platforms = platforms.unix; maintainers = with maintainers; [ thoughtpolice ]; + badPlatforms = platforms.darwin; }; } diff --git a/pkgs/development/libraries/nco/default.nix b/pkgs/development/libraries/nco/default.nix index 7b03c32ada58..321e4e0560d9 100644 --- a/pkgs/development/libraries/nco/default.nix +++ b/pkgs/development/libraries/nco/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchzip, netcdf, netcdfcxx4, gsl, udunits, antlr, which, curl, flex }: stdenv.mkDerivation rec { - version = "4.9.1"; + version = "4.9.2"; pname = "nco"; nativeBuildInputs = [ flex which ]; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { src = fetchzip { url = "https://github.com/nco/nco/archive/${version}.tar.gz"; - sha256 = "14r44wi9ina8h8gh5cmkcddxl5ziwv42mv60sp4l5wfmjz5xwa4x"; + sha256 = "0nip9dmdx3d5nc30bz1d2w9his1dph136l53r160aa3bmb29xwqn"; }; meta = { diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index 9986c2217f7c..63657cfc5e6e 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -36,9 +36,7 @@ let outputs = [ "bin" "dev" "out" "man" ] ++ optional withDocs "doc"; setOutputFlags = false; - separateDebugInfo = !(stdenv.hostPlatform.useLLVM or false) - && stdenv.hostPlatform == stdenv.buildPlatform # unable to fix infinite recursion on stdenv.cc - && stdenv.cc.isGNU; + separateDebugInfo = !(stdenv.hostPlatform.useLLVM or false) && stdenv.cc.isGNU; nativeBuildInputs = [ perl ]; buildInputs = stdenv.lib.optional withCryptodev cryptodev; diff --git a/pkgs/development/libraries/qt-5/modules/qttools.nix b/pkgs/development/libraries/qt-5/modules/qttools.nix index 573472a8b5ab..c38eb0105e12 100644 --- a/pkgs/development/libraries/qt-5/modules/qttools.nix +++ b/pkgs/development/libraries/qt-5/modules/qttools.nix @@ -4,7 +4,7 @@ with lib; qtModule { name = "qttools"; - qtInputs = [ qtbase ]; + qtInputs = [ qtbase qtdeclarative ]; outputs = [ "out" "dev" "bin" ]; # fixQtBuiltinPaths overwrites a builtin path we should keep diff --git a/pkgs/development/libraries/science/math/openblas/default.nix b/pkgs/development/libraries/science/math/openblas/default.nix index a26cf38a9d09..9c411234357a 100644 --- a/pkgs/development/libraries/science/math/openblas/default.nix +++ b/pkgs/development/libraries/science/math/openblas/default.nix @@ -88,12 +88,12 @@ let in stdenv.mkDerivation rec { pname = "openblas"; - version = "0.3.7"; + version = "0.3.8"; src = fetchFromGitHub { owner = "xianyi"; repo = "OpenBLAS"; rev = "v${version}"; - sha256 = "0vs1dlzyla02wajpkfzz8x3lfpgmwiaaizq2nmdjbkzkb7jnxhhz"; + sha256 = "0s017qqi4n6jzrxl9cyx625wj26smnyn5g8s699s7h8v1srlrw6p"; }; inherit blas64; diff --git a/pkgs/development/libraries/sundials/default.nix b/pkgs/development/libraries/sundials/default.nix index d19ecf34ab95..fb6f773459eb 100644 --- a/pkgs/development/libraries/sundials/default.nix +++ b/pkgs/development/libraries/sundials/default.nix @@ -10,14 +10,14 @@ let openblas32 = openblas.override { blas64 = false; }; in stdenv.mkDerivation rec { pname = "sundials"; - version = "5.0.0"; + version = "5.1.0"; buildInputs = [ python ] ++ stdenv.lib.optionals (lapackSupport) [ gfortran openblas32 ]; nativeBuildInputs = [ cmake ]; src = fetchurl { url = "https://computation.llnl.gov/projects/${pname}/download/${pname}-${version}.tar.gz"; - sha256 = "1lvx5pddjxgyr8kqlira36kxckz7nxwc8xilzfyx0hf607n42l9l"; + sha256 = "08cvzmbr2qc09ayq4f5j07lw97hl06q4dl26vh4kh822mm7x28pv"; }; patches = [ @@ -26,11 +26,6 @@ in stdenv.mkDerivation rec { url = "https://github.com/LLNL/sundials/commit/1350421eab6c5ab479de5eccf6af2dcad1eddf30.patch"; sha256 = "0g67lixp9m85fqpb9rzz1hl1z8ibdg0ldwq5z6flj5zl8a7cw52l"; }) - (fetchurl { - # https://github.com/LLNL/sundials/pull/20 - url = "https://github.com/LLNL/sundials/pull/20/commits/2d951bbe1ff7842fcd0dafa28c61b0aa94015f66.patch"; - sha256 = "0lcr6m4lk14yqrxah4rdscpczny5l7m1zpfsjh8bgspadfsgk512"; - }) ]; cmakeFlags = [ diff --git a/pkgs/development/libraries/ucx/default.nix b/pkgs/development/libraries/ucx/default.nix new file mode 100644 index 000000000000..d1e3934d882c --- /dev/null +++ b/pkgs/development/libraries/ucx/default.nix @@ -0,0 +1,39 @@ +{ stdenv, fetchFromGitHub, autoreconfHook, doxygen +, numactl, rdma-core, libbfd, libiberty, perl, zlib +}: + +let + version = "1.7.0"; + +in stdenv.mkDerivation { + name = "ucx-${version}"; + + src = fetchFromGitHub { + owner = "openucx"; + repo = "ucx"; + rev = "v${version}"; + sha256 = "149p8s7jrg7pbbq0hw0qm8va119bsl19q4scgk94vjqliyc1s33h"; + }; + + nativeBuildInputs = [ autoreconfHook doxygen ]; + + buildInputs = [ numactl rdma-core libbfd libiberty perl zlib ]; + + configureFlags = [ + "--with-rdmacm=${rdma-core}" + "--with-dc" + "--with-rc" + "--with-dm" + "--with-verbs=${rdma-core}" + ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "Unified Communication X library"; + homepage = http://www.openucx.org; + license = licenses.bsd3; + platforms = platforms.linux; + maintainers = [ maintainers.markuskowa ]; + }; +} diff --git a/pkgs/development/libraries/virglrenderer/default.nix b/pkgs/development/libraries/virglrenderer/default.nix index 71bd608e93a1..5c508f133e14 100644 --- a/pkgs/development/libraries/virglrenderer/default.nix +++ b/pkgs/development/libraries/virglrenderer/default.nix @@ -1,24 +1,21 @@ -{ stdenv, fetchurl, pkgconfig, libGLU, epoxy, libX11, libdrm, mesa }: - +{ stdenv, fetchurl, cmake, meson, ninja, pkgconfig, python3 +, libGLU, epoxy, libX11, libdrm, mesa +}: stdenv.mkDerivation rec { - pname = "virglrenderer"; - version = "0.7.0"; + version = "0.8.1"; src = fetchurl { - url = "https://www.freedesktop.org/software/virgl/${pname}-${version}.tar.bz2"; - sha256 = "041agg1d6i8hg250y30f08n3via0hs9rbijxdrfifb8ara805v0m"; + url = "https://gitlab.freedesktop.org/virgl/virglrenderer/-/archive/virglrenderer-${version}/virglrenderer-virglrenderer-${version}.tar.bz2"; + sha256 = "0ac39mplmy6lmcd6cljmfsrfby7m6ac3dzvmnn5pv200drl415l4"; }; buildInputs = [ libGLU epoxy libX11 libdrm mesa ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ cmake meson ninja pkgconfig python3 ]; - # Fix use of fd_set without proper include - prePatch = '' - sed -e '1i#include <sys/select.h>' -i vtest/util.c - ''; + dontUseCmakeConfigure = true; meta = with stdenv.lib; { description = "A virtual 3D GPU library that allows a qemu guest to use the host GPU for accelerated 3D rendering"; @@ -27,5 +24,4 @@ stdenv.mkDerivation rec { platforms = platforms.linux; maintainers = [ maintainers.xeji ]; }; - } diff --git a/pkgs/development/libraries/wayland/default.nix b/pkgs/development/libraries/wayland/default.nix index 60d240552d4f..ef88e690067b 100644 --- a/pkgs/development/libraries/wayland/default.nix +++ b/pkgs/development/libraries/wayland/default.nix @@ -1,43 +1,66 @@ -{ lib, stdenv, fetchurl, pkgconfig +{ lib, stdenv, fetchurl, meson, pkgconfig, ninja , libffi, libxml2, wayland , expat ? null # Build wayland-scanner (currently cannot be disabled as of 1.7.0) +, withDocumentation ? false, graphviz-nox, doxygen, libxslt, xmlto, python3 +, docbook_xsl, docbook_xml_dtd_45, docbook_xml_dtd_42 }: # Require the optional to be enabled until upstream fixes or removes the configure flag assert expat != null; -stdenv.mkDerivation rec { +let + isCross = stdenv.buildPlatform != stdenv.hostPlatform; +in stdenv.mkDerivation rec { pname = "wayland"; - version = "1.17.0"; + version = "1.18.0"; src = fetchurl { url = "https://wayland.freedesktop.org/releases/${pname}-${version}.tar.xz"; - sha256 = "194ibzwpdcn6fvk4xngr4bf5axpciwg2bj82fdvz88kfmjw13akj"; + sha256 = "0k995rn96xkplrapz5k648j651wc43kq817xk1x8280h16gsfxa6"; }; separateDebugInfo = true; - configureFlags = [ - "--disable-documentation" - ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ - "--with-host-scanner" - ]; + mesonFlags = [ "-Ddocumentation=${lib.boolToString withDocumentation}" ]; + + patches = lib.optional isCross ./fix-wayland-cross-compilation.patch; + + postPatch = lib.optionalString withDocumentation '' + patchShebangs doc/doxygen/gen-doxygen.py + '' + lib.optionalString isCross '' + substituteInPlace egl/meson.build --replace \ + "find_program('nm').path()" \ + "find_program('${stdenv.cc.targetPrefix}nm').path()" + ''; nativeBuildInputs = [ - pkgconfig - ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ - # for wayland-scanner during build - wayland + meson pkgconfig ninja + ] ++ lib.optionals isCross [ + wayland # For wayland-scanner during the build + ] ++ lib.optionals withDocumentation [ + (graphviz-nox.override { pango = null; }) # To avoid an infinite recursion + doxygen libxslt xmlto python3 docbook_xml_dtd_45 ]; - buildInputs = [ libffi /* docbook_xsl doxygen graphviz libxslt xmlto */ expat libxml2 ]; + buildInputs = [ libffi expat libxml2 + ] ++ lib.optionals withDocumentation [ + docbook_xsl docbook_xml_dtd_45 docbook_xml_dtd_42 + ]; meta = { - description = "Reference implementation of the wayland protocol"; + description = "Core Wayland window system code and protocol"; + longDescription = '' + Wayland is a project to define a protocol for a compositor to talk to its + clients as well as a library implementation of the protocol. + The wayland protocol is essentially only about input handling and buffer + management, but also handles drag and drop, selections, window management + and other interactions that must go through the compositor (but not + rendering). + ''; homepage = https://wayland.freedesktop.org/; - license = lib.licenses.mit; + license = lib.licenses.mit; # Expat version platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ codyopel ]; + maintainers = with lib.maintainers; [ primeos codyopel ]; }; passthru.version = version; diff --git a/pkgs/development/libraries/wayland/fix-wayland-cross-compilation.patch b/pkgs/development/libraries/wayland/fix-wayland-cross-compilation.patch new file mode 100644 index 000000000000..77639acb6530 --- /dev/null +++ b/pkgs/development/libraries/wayland/fix-wayland-cross-compilation.patch @@ -0,0 +1,14 @@ +diff --git a/src/meson.build b/src/meson.build +index 3e8c9bf..75241cb 100644 +--- a/src/meson.build ++++ b/src/meson.build +@@ -55,8 +55,7 @@ pkgconfig.generate( + ) + + if meson.is_cross_build() +- scanner_dep = dependency('wayland-scanner', native: true, version: '>=1.14.0') +- wayland_scanner_for_build = find_program(scanner_dep.get_pkgconfig_variable('wayland_scanner')) ++ wayland_scanner_for_build = find_program('wayland-scanner', native: true, version: '>=1.14.0') + else + wayland_scanner_for_build = wayland_scanner + endif diff --git a/pkgs/development/libraries/wayland/protocols.nix b/pkgs/development/libraries/wayland/protocols.nix index 0b367f4a930f..8c2823d74b0a 100644 --- a/pkgs/development/libraries/wayland/protocols.nix +++ b/pkgs/development/libraries/wayland/protocols.nix @@ -17,10 +17,17 @@ stdenv.mkDerivation rec { meta = { description = "Wayland protocol extensions"; - homepage = https://wayland.freedesktop.org/; - license = lib.licenses.mit; + longDescription = '' + wayland-protocols contains Wayland protocols that add functionality not + available in the Wayland core protocol. Such protocols either add + completely new functionality, or extend the functionality of some other + protocol either in Wayland core, or some other protocol in + wayland-protocols. + ''; + homepage = https://gitlab.freedesktop.org/wayland/wayland-protocols; + license = lib.licenses.mit; # Expat version platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ ]; + maintainers = with lib.maintainers; [ primeos ]; }; passthru.version = version; diff --git a/pkgs/development/node-packages/node-packages-v10.nix b/pkgs/development/node-packages/node-packages-v10.nix index 5497679f4f67..7cfa47198915 100644 --- a/pkgs/development/node-packages/node-packages-v10.nix +++ b/pkgs/development/node-packages/node-packages-v10.nix @@ -535,13 +535,13 @@ let sha512 = "0fKu/QqildpXmPVaRBoXOlyBb3MC+J0A66x97qEfLOMkn3u6nfY5esWogQwi/K0BjASYy4DbnsEWnpNL6qT5Mw=="; }; }; - "@babel/plugin-external-helpers-7.0.0" = { + "@babel/plugin-external-helpers-7.8.3" = { name = "_at_babel_slash_plugin-external-helpers"; packageName = "@babel/plugin-external-helpers"; - version = "7.0.0"; + version = "7.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-external-helpers/-/plugin-external-helpers-7.0.0.tgz"; - sha512 = "tZKTMdhZvTy0KCEX5EGQQm1RHr7jUa36q/yax1baEA0yZapVYmu10yW7LTqijITgSq416gPVjrcexiA6y4pJlA=="; + url = "https://registry.npmjs.org/@babel/plugin-external-helpers/-/plugin-external-helpers-7.8.3.tgz"; + sha512 = "mx0WXDDiIl5DwzMtzWGRSPugXi9BxROS05GQrhLNbEamhBiicgn994ibwkyiBH+6png7bm/yA7AUsvHyCXi4Vw=="; }; }; "@babel/plugin-proposal-async-generator-functions-7.8.3" = { @@ -634,6 +634,15 @@ let sha512 = "tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw=="; }; }; + "@babel/plugin-syntax-bigint-7.8.3" = { + name = "_at_babel_slash_plugin-syntax-bigint"; + packageName = "@babel/plugin-syntax-bigint"; + version = "7.8.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-syntax-bigint/-/plugin-syntax-bigint-7.8.3.tgz"; + sha512 = "wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg=="; + }; + }; "@babel/plugin-syntax-dynamic-import-7.8.3" = { name = "_at_babel_slash_plugin-syntax-dynamic-import"; packageName = "@babel/plugin-syntax-dynamic-import"; @@ -1066,13 +1075,13 @@ let sha512 = "iCXFk+T4demnq+dNLLvlGOgvYF6sPZ/hS1EmswugOqh1Ysp2vuiqJzpgsnp5rW8+6dLJT/0CXDzye28ZH6BAfQ=="; }; }; - "@babel/preset-stage-2-7.0.0" = { + "@babel/preset-stage-2-7.8.3" = { name = "_at_babel_slash_preset-stage-2"; packageName = "@babel/preset-stage-2"; - version = "7.0.0"; + version = "7.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/preset-stage-2/-/preset-stage-2-7.0.0.tgz"; - sha512 = "A8ia2Wus0OAP6hh28ZgPSCBJEX3Jnql3kg9di/I+Lmg1gbJXgDZBrHr/UGZXl20Vi1lXgMuUq8c8J899KFr5gA=="; + url = "https://registry.npmjs.org/@babel/preset-stage-2/-/preset-stage-2-7.8.3.tgz"; + sha512 = "dStnEQgejNYIHFNACdDCigK4BF7wgW6Zahv9Dc2un7rGjbeVtZhBfR3sy0I7ZJOhBexkFxVdMZ5hqmll7BFShw=="; }; }; "@babel/preset-typescript-7.8.3" = { @@ -1156,15 +1165,6 @@ let sha512 = "jBD+G8+LWpMBBWvVcdr4QysjUE4mU/syrhN17o1u3gx0/WzJB1kwiVZAXRtWbsIPOwW8pF/YJV5+nmetPzepXg=="; }; }; - "@calebboyd/semaphore-1.3.1" = { - name = "_at_calebboyd_slash_semaphore"; - packageName = "@calebboyd/semaphore"; - version = "1.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@calebboyd/semaphore/-/semaphore-1.3.1.tgz"; - sha512 = "17z9me12RgAEcMhIgR7f+BiXKbzwF9p1VraI69OxrUUSWGuSMOyOTEHQNVtMKuVrkEDVD0/Av5uiGZPBMYZljw=="; - }; - }; "@cliqz-oss/firefox-client-0.3.1" = { name = "_at_cliqz-oss_slash_firefox-client"; packageName = "@cliqz-oss/firefox-client"; @@ -1183,13 +1183,22 @@ let sha512 = "O/IyiB5pfztCdmxQZg0/xeq5w+YiP3gtJz8d4We2EpLPKzbDVjOrtfLKYgVfm6Ya6mbvDge1uLkSRwaoVCWKnA=="; }; }; - "@comandeer/babel-plugin-banner-4.1.0" = { + "@cnakazawa/watch-1.0.4" = { + name = "_at_cnakazawa_slash_watch"; + packageName = "@cnakazawa/watch"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@cnakazawa/watch/-/watch-1.0.4.tgz"; + sha512 = "v9kIhKwjeZThiWrLmj0y17CWoyddASLj9O2yvbZkbvw/N3rWOYy9zkV66ursAoVr0mV15bL8g0c4QZUE6cdDoQ=="; + }; + }; + "@comandeer/babel-plugin-banner-5.0.0" = { name = "_at_comandeer_slash_babel-plugin-banner"; packageName = "@comandeer/babel-plugin-banner"; - version = "4.1.0"; + version = "5.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@comandeer/babel-plugin-banner/-/babel-plugin-banner-4.1.0.tgz"; - sha512 = "9hKVIN2+maygxkngnXDsZXRZqCYDY4pxIRljJqqJ5A+eJZzW3k/NZj5lixEmStjWFjlPlOHGYBytBehpf0l+hA=="; + url = "https://registry.npmjs.org/@comandeer/babel-plugin-banner/-/babel-plugin-banner-5.0.0.tgz"; + sha512 = "sR9Go0U6puXoXyW9UgIiIQhRcJ8jVOvGl4BptUiXAtheMs72WcakZ1udh6J0ZOivr3o8jAM+MTCHLP8FZMbVpQ=="; }; }; "@cronvel/get-pixels-3.3.1" = { @@ -1480,6 +1489,42 @@ let sha512 = "ODXbta2kvFNkMIEGwl7KX5gJTcZZHkzSLoBh3wND2H+EsG0KpIqOZKWMtkj+suuPut85wyLZ7fGfARnrNf7dtA=="; }; }; + "@istanbuljs/load-nyc-config-1.0.0" = { + name = "_at_istanbuljs_slash_load-nyc-config"; + packageName = "@istanbuljs/load-nyc-config"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.0.0.tgz"; + sha512 = "ZR0rq/f/E4f4XcgnDvtMWXCUJpi8eO0rssVhmztsZqLIEFA9UUP9zmpE0VxlM+kv/E1ul2I876Fwil2ayptDVg=="; + }; + }; + "@istanbuljs/schema-0.1.2" = { + name = "_at_istanbuljs_slash_schema"; + packageName = "@istanbuljs/schema"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.2.tgz"; + sha512 = "tsAQNx32a8CoFhjhijUIhI4kccIAgmGhy8LZMZgGfmXcpMbPRUqn5LWmgRttILi6yeGmBJd2xsPkFMs0PzgPCw=="; + }; + }; + "@jest/transform-25.1.0" = { + name = "_at_jest_slash_transform"; + packageName = "@jest/transform"; + version = "25.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@jest/transform/-/transform-25.1.0.tgz"; + sha512 = "4ktrQ2TPREVeM+KxB4zskAT84SnmG1vaz4S+51aTefyqn3zocZUnliLLm5Fsl85I3p/kFPN4CRp1RElIfXGegQ=="; + }; + }; + "@jest/types-25.1.0" = { + name = "_at_jest_slash_types"; + packageName = "@jest/types"; + version = "25.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@jest/types/-/types-25.1.0.tgz"; + sha512 = "VpOtt7tCrgvamWZh1reVsGADujKigBUFTi19mlRjqEGsE8qH4r3s+skY33dNdXOwyZIvuftZ5tqdF1IgsMejMA=="; + }; + }; "@kbrandwijk/swagger-to-graphql-2.4.3" = { name = "_at_kbrandwijk_slash_swagger-to-graphql"; packageName = "@kbrandwijk/swagger-to-graphql"; @@ -2965,6 +3010,42 @@ let sha512 = "dBtBbrc+qTHy1WdfHYjBwRln4+LWqASWakLHsWHR2NWHIFkv4W3O070IGoGLEBrJBvct3r0L1BUPuvURi7kYUQ=="; }; }; + "@types/babel__core-7.1.4" = { + name = "_at_types_slash_babel__core"; + packageName = "@types/babel__core"; + version = "7.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.4.tgz"; + sha512 = "c/5MuRz5HM4aizqL5ViYfW4iEnmfPcfbH4Xa6GgLT21dMc1NGeNnuS6egHheOmP+kCJ9CAzC4pv4SDCWTnRkbg=="; + }; + }; + "@types/babel__generator-7.6.1" = { + name = "_at_types_slash_babel__generator"; + packageName = "@types/babel__generator"; + version = "7.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.1.tgz"; + sha512 = "bBKm+2VPJcMRVwNhxKu8W+5/zT7pwNEqeokFOmbvVSqGzFneNxYcEBro9Ac7/N9tlsaPYnZLK8J1LWKkMsLAew=="; + }; + }; + "@types/babel__template-7.0.2" = { + name = "_at_types_slash_babel__template"; + packageName = "@types/babel__template"; + version = "7.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.0.2.tgz"; + sha512 = "/K6zCpeW7Imzgab2bLkLEbz0+1JlFSrUMdw7KoIIu+IUdu51GWaBZpd3y1VXGVXzynvGa4DaIaxNZHiON3GXUg=="; + }; + }; + "@types/babel__traverse-7.0.8" = { + name = "_at_types_slash_babel__traverse"; + packageName = "@types/babel__traverse"; + version = "7.0.8"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.0.8.tgz"; + sha512 = "yGeB2dHEdvxjP0y4UbRtQaSkXJ9649fYCmIdRoul5kfAoGCwxuCbMhag0k3RPfnuh9kPGm8x89btcfDEXdVWGw=="; + }; + }; "@types/babylon-6.16.5" = { name = "_at_types_slash_babylon"; packageName = "@types/babylon"; @@ -3064,6 +3145,15 @@ let sha512 = "EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw=="; }; }; + "@types/estree-0.0.42" = { + name = "_at_types_slash_estree"; + packageName = "@types/estree"; + version = "0.0.42"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/estree/-/estree-0.0.42.tgz"; + sha512 = "K1DPVvnBCPxzD+G51/cxVIoc2X8uUVl1zpJeE6iKcgHMj4+tbat5Xu4TjV7v2QSDbIeAfLi2hIk+u2+s0MlpUQ=="; + }; + }; "@types/events-3.0.0" = { name = "_at_types_slash_events"; packageName = "@types/events"; @@ -3136,6 +3226,33 @@ let sha512 = "c3Xy026kOF7QOTn00hbIllV1dLR9hG9NkSrLQgCVs8NF6sBU+VGWjD3wLPhmh1TYAc7ugCFsvHYMN4VcBN1U1A=="; }; }; + "@types/istanbul-lib-coverage-2.0.1" = { + name = "_at_types_slash_istanbul-lib-coverage"; + packageName = "@types/istanbul-lib-coverage"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.1.tgz"; + sha512 = "hRJD2ahnnpLgsj6KWMYSrmXkM3rm2Dl1qkx6IOFD5FnuNPXJIG5L0dhgKXCYTRMGzU4n0wImQ/xfmRc4POUFlg=="; + }; + }; + "@types/istanbul-lib-report-3.0.0" = { + name = "_at_types_slash_istanbul-lib-report"; + packageName = "@types/istanbul-lib-report"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz"; + sha512 = "plGgXAPfVKFoYfa9NpYDAkseG+g6Jr294RqeqcqDixSbU34MZVJRi/P+7Y8GDpzkEwLaGZZOpKIEmeVZNtKsrg=="; + }; + }; + "@types/istanbul-reports-1.1.1" = { + name = "_at_types_slash_istanbul-reports"; + packageName = "@types/istanbul-reports"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-1.1.1.tgz"; + sha512 = "UpYjBi8xefVChsCoBpKShdxTllC9pwISirfoZsUa2AAdQg/Jd2KQGtSbw+ya7GPo7x/wAPlH6JBhKhAsXUEZNA=="; + }; + }; "@types/js-yaml-3.12.2" = { name = "_at_types_slash_js-yaml"; packageName = "@types/js-yaml"; @@ -3226,22 +3343,22 @@ let sha1 = "69a23a3ad29caf0097f06eda59b361ee2f0639f6"; }; }; - "@types/node-10.17.15" = { + "@types/node-10.17.16" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "10.17.15"; + version = "10.17.16"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-10.17.15.tgz"; - sha512 = "daFGV9GSs6USfPgxceDA8nlSe48XrVCJfDeYm7eokxq/ye7iuOH87hKXgMtEAVLFapkczbZsx868PMDT1Y0a6A=="; + url = "https://registry.npmjs.org/@types/node/-/node-10.17.16.tgz"; + sha512 = "A4283YSA1OmnIivcpy/4nN86YlnKRiQp8PYwI2KdPCONEBN093QTb0gCtERtkLyVNGKKIGazTZ2nAmVzQU51zA=="; }; }; - "@types/node-13.7.1" = { + "@types/node-13.7.4" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "13.7.1"; + version = "13.7.4"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-13.7.1.tgz"; - sha512 = "Zq8gcQGmn4txQEJeiXo/KiLpon8TzAl0kmKH4zdWctPj05nWwp1ClMdAVEloqrQKfaC48PNLdgN/aVaLqUrluA=="; + url = "https://registry.npmjs.org/@types/node/-/node-13.7.4.tgz"; + sha512 = "oVeL12C6gQS/GAExndigSaLxTrKpQPxewx9bOcwfvJiJge4rr7wNaph4J+ns5hrmIV2as5qxqN8YKthn9qh0jw=="; }; }; "@types/node-6.14.9" = { @@ -3289,6 +3406,15 @@ let sha512 = "ewFXqrQHlFsgc09MK5jP5iR7vumV/BYayNC6PgJO2LPe8vrnNFyjQjSppfEngITi0qvfKtzFvgKymGheFM9UOA=="; }; }; + "@types/resolve-0.0.8" = { + name = "_at_types_slash_resolve"; + packageName = "@types/resolve"; + version = "0.0.8"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/resolve/-/resolve-0.0.8.tgz"; + sha512 = "auApPaJf3NPfe18hSoJkp8EbZzer2ISk7o8mCC3M9he/a04+gbMF97NkpD2S8riMGvm4BMRI59/SZQSaLTKpsQ=="; + }; + }; "@types/responselike-1.0.0" = { name = "_at_types_slash_responselike"; packageName = "@types/responselike"; @@ -3379,6 +3505,24 @@ let sha512 = "Pv2HGRE4gWLs31In7nsyXEH4uVVsd0HNV9i2dyASvtDIlOtSTr1eczPLDpdEuyv5LWH5LT20GIXwPjkshKWI1g=="; }; }; + "@types/yargs-15.0.3" = { + name = "_at_types_slash_yargs"; + packageName = "@types/yargs"; + version = "15.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.3.tgz"; + sha512 = "XCMQRK6kfpNBixHLyHUsGmXrpEmFFxzMrcnSXFMziHd8CoNJo8l16FkHyQq4x+xbM7E2XL83/O78OD8u+iZTdQ=="; + }; + }; + "@types/yargs-parser-15.0.0" = { + name = "_at_types_slash_yargs-parser"; + packageName = "@types/yargs-parser"; + version = "15.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-15.0.0.tgz"; + sha512 = "FA/BWv8t8ZWJ+gEOnLLd8ygxH/2UFbAvgEonyfN6yWGLKc7zVjbpl2Y4CTjid9h2RfgPP6SEt6uHwEOply00yw=="; + }; + }; "@types/zen-observable-0.8.0" = { name = "_at_types_slash_zen-observable"; packageName = "@types/zen-observable"; @@ -5368,15 +5512,6 @@ let sha512 = "F14aX2R/fKNYMvhuP2t9GD9fggID7zp5I96MF5QeKYWDWTrkRdHRp4+SVfXUVN+cXOaB/IebfvRtzPf25CM0zw=="; }; }; - "app-builder-5.2.0" = { - name = "app-builder"; - packageName = "app-builder"; - version = "5.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/app-builder/-/app-builder-5.2.0.tgz"; - sha512 = "RRj/vu8WhmMM71G9BxMLRvcwpr1QUJZ9NXURGGo1v3fPiauzkQfNi31kM7irRNqR87NV+lJ/qI62iTzcAc+V0Q=="; - }; - }; "app-module-path-2.2.0" = { name = "app-module-path"; packageName = "app-module-path"; @@ -6457,13 +6592,13 @@ let sha1 = "00f35b2d27ac91b1f0d3ef2084c98cf1d1f0adc3"; }; }; - "aws-sdk-2.620.0" = { + "aws-sdk-2.622.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.620.0"; + version = "2.622.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.620.0.tgz"; - sha512 = "j+PGKbYwk5OjzbCFbxzRkcJVEvfdn9YFkrU8dJdjleYf9AzUSUpTjMyZsyUPOKxJxdNdA9FYTs43WdtSKHZa0A=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.622.0.tgz"; + sha512 = "CV5RZjoh2PZ/wALQXx932dTYukPTZXZmfjlRTJqNibRhyN36/E1KwkX1va1CROii2AnfnxjzV7OqymH0TgKlUg=="; }; }; "aws-sign2-0.6.0" = { @@ -6529,13 +6664,13 @@ let sha512 = "poPX9mZH/5CSanm50Q+1toVci6pv5KSRv/5TWCwtzQS5XEwn40BcCrgIeMFWP9CKKIniKXNxoIOnOq4VVlGXhg=="; }; }; - "babel-eslint-10.0.1" = { + "babel-eslint-10.0.3" = { name = "babel-eslint"; packageName = "babel-eslint"; - version = "10.0.1"; + version = "10.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/babel-eslint/-/babel-eslint-10.0.1.tgz"; - sha512 = "z7OT1iNV+TjOwHNLLyJk+HN+YVWX+CLE6fPD2SymJZOZQBs+QIexFjhm4keGTm8MW9xr4EC9Q0PbaLB24V5GoQ=="; + url = "https://registry.npmjs.org/babel-eslint/-/babel-eslint-10.0.3.tgz"; + sha512 = "z3U7eMY6r/3f3/JB9mTsLjyxrv0Yb1zb8PCWCLpguxfCzBIZUwy23R1t/XKewP+8mEN2Ck8Dtr4q20z6ce6SoA=="; }; }; "babel-generator-6.26.1" = { @@ -6628,13 +6763,13 @@ let sha1 = "3471de9caec388e5c850e597e58a26ddf37602b2"; }; }; - "babel-jest-23.6.0" = { + "babel-jest-25.1.0" = { name = "babel-jest"; packageName = "babel-jest"; - version = "23.6.0"; + version = "25.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/babel-jest/-/babel-jest-23.6.0.tgz"; - sha512 = "lqKGG6LYXYu+DQh/slrQ8nxXQkEkhugdXsU6St7GmhVS7Ilc/22ArwqXNJrf0QaOBjZB0360qZMwXqDYQHXaew=="; + url = "https://registry.npmjs.org/babel-jest/-/babel-jest-25.1.0.tgz"; + sha512 = "tz0VxUhhOE2y+g8R2oFrO/2VtVjA1lkJeavlhExuRBg3LdNJY9gwQ+Vcvqt9+cqy71MCTJhewvTB7Qtnnr9SWg=="; }; }; "babel-loader-8.0.6" = { @@ -6664,22 +6799,22 @@ let sha512 = "o6qFkpeQEBxcqt0XYlWzAVxNCSCZdUgcR8IRlhD/8DylxjjO4foPcvTW0GGKa/cVt3rvxZ7o5ippJ+/0nvLhlQ=="; }; }; - "babel-plugin-istanbul-4.1.6" = { + "babel-plugin-istanbul-6.0.0" = { name = "babel-plugin-istanbul"; packageName = "babel-plugin-istanbul"; - version = "4.1.6"; + version = "6.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-4.1.6.tgz"; - sha512 = "PWP9FQ1AhZhS01T/4qLSKoHGY/xvkZdVBGlKM/HuxxS3+sC66HhTNR7+MpbO/so/cz/wY94MeSWJuP1hXIPfwQ=="; + url = "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.0.0.tgz"; + sha512 = "AF55rZXpe7trmEylbaE1Gv54wn6rwU03aptvRoVIGP8YykoSxqdVLV1TfwflBCE/QtHmqtP8SWlTENqbK8GCSQ=="; }; }; - "babel-plugin-jest-hoist-23.2.0" = { + "babel-plugin-jest-hoist-25.1.0" = { name = "babel-plugin-jest-hoist"; packageName = "babel-plugin-jest-hoist"; - version = "23.2.0"; + version = "25.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-23.2.0.tgz"; - sha1 = "e61fae05a1ca8801aadee57a6d66b8cefaf44167"; + url = "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-25.1.0.tgz"; + sha512 = "oIsopO41vW4YFZ9yNYoLQATnnN46lp+MZ6H4VvPKFkcc2/fkl3CfE/NZZSmnEIEsJRmJAgkVEK0R7Zbl50CpTw=="; }; }; "babel-plugin-minify-builtins-0.5.0" = { @@ -6952,13 +7087,13 @@ let sha1 = "379937abc67d7895970adc621f284cd966cf2153"; }; }; - "babel-preset-jest-23.2.0" = { + "babel-preset-jest-25.1.0" = { name = "babel-preset-jest"; packageName = "babel-preset-jest"; - version = "23.2.0"; + version = "25.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-23.2.0.tgz"; - sha1 = "8ec7a03a138f001a1a8fb1e8113652bf1a55da46"; + url = "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-25.1.0.tgz"; + sha512 = "eCGn64olaqwUMaugXsTtGAM2I0QTahjEtnRu0ql8Ie+gDWAc1N6wqN0k2NilnyTunM69Pad7gJY7LOtwLimoFQ=="; }; }; "babel-preset-minify-0.5.1" = { @@ -8203,6 +8338,15 @@ let sha1 = "aa4eb68e5d7b658baa6bf6a57e630cbd7a93d298"; }; }; + "browserify-zlib-0.1.4" = { + name = "browserify-zlib"; + packageName = "browserify-zlib"; + version = "0.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.1.4.tgz"; + sha1 = "bb35f8a519f600e0fa6b8485241c979d0141fb2d"; + }; + }; "browserify-zlib-0.2.0" = { name = "browserify-zlib"; packageName = "browserify-zlib"; @@ -8221,6 +8365,15 @@ let sha512 = "gFOnZNYBHrEyUML0xr5NJ6edFaaKbTFX9S9kQHlYfCP0Rit/boRIz4G+Avq6/4haEKJXdGGUnoolx+5MWW2BoA=="; }; }; + "bser-2.1.1" = { + name = "bser"; + packageName = "bser"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/bser/-/bser-2.1.1.tgz"; + sha512 = "gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ=="; + }; + }; "btoa-lite-1.0.0" = { name = "btoa-lite"; packageName = "btoa-lite"; @@ -8482,15 +8635,6 @@ let sha1 = "270f076c5a72c02f5b65a47df94c5fe3a278892f"; }; }; - "builtin-modules-2.0.0" = { - name = "builtin-modules"; - packageName = "builtin-modules"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/builtin-modules/-/builtin-modules-2.0.0.tgz"; - sha512 = "3U5kUA5VPsRUA3nofm/BXX7GVHKfxz0hOBAPxXrIvHzlDRkQVqEn6yi8QJegxl4LzOHLdvb7XF5dVawa/VVYBg=="; - }; - }; "builtin-modules-3.1.0" = { name = "builtin-modules"; packageName = "builtin-modules"; @@ -8932,13 +9076,22 @@ let sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw=="; }; }; - "caniuse-lite-1.0.30001027" = { + "caniuse-lite-1.0.30001028" = { name = "caniuse-lite"; packageName = "caniuse-lite"; - version = "1.0.30001027"; + version = "1.0.30001028"; src = fetchurl { - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001027.tgz"; - sha512 = "7xvKeErvXZFtUItTHgNtLgS9RJpVnwBlWX8jSo/BO8VsF6deszemZSkJJJA1KOKrXuzZH4WALpAJdq5EyfgMLg=="; + url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001028.tgz"; + sha512 = "Vnrq+XMSHpT7E+LWoIYhs3Sne8h9lx9YJV3acH3THNCwU/9zV93/ta4xVfzTtnqd3rvnuVpVjE3DFqf56tr3aQ=="; + }; + }; + "capture-exit-2.0.0" = { + name = "capture-exit"; + packageName = "capture-exit"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/capture-exit/-/capture-exit-2.0.0.tgz"; + sha512 = "PiT/hQmTonHhl/HFGN+Lx3JJUznrVYJ3+AQsnthneZbvW7x+f08Tk7yLJTLEOUvBTbduLeeBkxEaYXUOUrRq6g=="; }; }; "capture-stack-trace-1.0.1" = { @@ -9310,15 +9463,6 @@ let sha512 = "0td5ijfUPuubwLUu0OBoe98gZj8C/AA+RW3v67GPlGOrvxWjZmBXiBCRU+I8VEiNyJzjth40POfHiz2RB3gImA=="; }; }; - "cherow-1.6.9" = { - name = "cherow"; - packageName = "cherow"; - version = "1.6.9"; - src = fetchurl { - url = "https://registry.npmjs.org/cherow/-/cherow-1.6.9.tgz"; - sha512 = "pmmkpIQRcnDA7EawKcg9+ncSZNTYfXqDx+K3oqqYvpZlqVBChjTomTfw+hePnkqYR3Y013818c0R1Q5P/7PGrQ=="; - }; - }; "child-process-ext-2.1.0" = { name = "child-process-ext"; packageName = "child-process-ext"; @@ -11722,22 +11866,22 @@ let sha512 = "+SaJ2OfeRvfQqwXQ2kgr0Y5pzBR/lijf5OpnnaruwWnmI799JfWr2jN2ItOV9s3A/+TFOt6mxvKzQq5F0Jp6VQ=="; }; }; - "cross-env-5.2.0" = { + "cross-env-6.0.3" = { name = "cross-env"; packageName = "cross-env"; - version = "5.2.0"; + version = "6.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/cross-env/-/cross-env-5.2.0.tgz"; - sha512 = "jtdNFfFW1hB7sMhr/H6rW1Z45LFqyI431m3qU6bFXcQ3Eh7LtBuG3h74o7ohHZ3crrRkkqHlo4jYHFPcjroANg=="; + url = "https://registry.npmjs.org/cross-env/-/cross-env-6.0.3.tgz"; + sha512 = "+KqxF6LCvfhWvADcDPqo64yVIB31gv/jQulX2NGzKS/g3GEVz6/pt4wjHFtFWsHMddebWD/sDthJemzM4MaAag=="; }; }; - "cross-env-6.0.3" = { + "cross-env-7.0.0" = { name = "cross-env"; packageName = "cross-env"; - version = "6.0.3"; + version = "7.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/cross-env/-/cross-env-6.0.3.tgz"; - sha512 = "+KqxF6LCvfhWvADcDPqo64yVIB31gv/jQulX2NGzKS/g3GEVz6/pt4wjHFtFWsHMddebWD/sDthJemzM4MaAag=="; + url = "https://registry.npmjs.org/cross-env/-/cross-env-7.0.0.tgz"; + sha512 = "rV6M9ldNgmwP7bx5u6rZsTbYidzwvrwIYZnT08hSGLcQCcggofgFW+sNe7IhA1SRauPS0QuLbbX+wdNtpqE5CQ=="; }; }; "cross-fetch-2.2.2" = { @@ -11965,15 +12109,6 @@ let sha512 = "DMxWJg0rnz7UgxKT0Q1HU/L9BeJI0M6ksor0OgqOnF+aRCDWg/N2641HmVyU9KVIu0OVVWOb2IpC9A+BJRnejg=="; }; }; - "css-unit-converter-1.1.1" = { - name = "css-unit-converter"; - packageName = "css-unit-converter"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/css-unit-converter/-/css-unit-converter-1.1.1.tgz"; - sha1 = "d9b9281adcfd8ced935bdbaba83786897f64e996"; - }; - }; "css-what-2.1.3" = { name = "css-what"; packageName = "css-what"; @@ -12010,15 +12145,6 @@ let sha1 = "c814903e45623371a0477b40109aaafbeeaddbb4"; }; }; - "cssesc-2.0.0" = { - name = "cssesc"; - packageName = "cssesc"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/cssesc/-/cssesc-2.0.0.tgz"; - sha512 = "MsCAG1z9lPdoO/IUMLSBWBSVxVtJ1395VGIQ+Fc2gNdkQ1hNDnQdw3YhA71WJCBW1vdwA0cAnk/DnW6bqoEUYg=="; - }; - }; "cssesc-3.0.0" = { name = "cssesc"; packageName = "cssesc"; @@ -14368,13 +14494,13 @@ let sha512 = "7vmuyh5+kuUyJKePhQfRQBhXV5Ce+RnaeeQArKu1EAMpL3WbgMt5WG6uQZpEVvYSSsxMXRKOewtDk9RaTKXRlA=="; }; }; - "electron-to-chromium-1.3.353" = { + "electron-to-chromium-1.3.355" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.3.353"; + version = "1.3.355"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.353.tgz"; - sha512 = "CkG24biyy9qQTQs8U2vGQaiyWSFDxAXP/UGHBveXZ1TGoWOAw+eYZXryrX0UeIMKnQjcaHx33hzYuydv98kqGQ=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.355.tgz"; + sha512 = "zKO/wS+2ChI/jz9WAo647xSW8t2RmgRLFdbUb/77cORkUTargO+SCj4ctTHjBn2VeNFrsLgDT7IuDVrd3F8mLQ=="; }; }; "elegant-spinner-1.0.1" = { @@ -14495,6 +14621,15 @@ let sha1 = "4daa4d9db00f9819880c79fa457ae5b09a1fd389"; }; }; + "emojis-list-3.0.0" = { + name = "emojis-list"; + packageName = "emojis-list"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz"; + sha512 = "/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q=="; + }; + }; "emphasize-1.5.0" = { name = "emphasize"; packageName = "emphasize"; @@ -15242,15 +15377,6 @@ let sha512 = "MiIDOotoWseIfLIfGeDzF6sDvHkVvGd2JgkvjyHtN3q4RoxdAXrAMuI3SXTOKatljgacKwpNAYShmcKZa4yZzw=="; }; }; - "eslint-scope-3.7.1" = { - name = "eslint-scope"; - packageName = "eslint-scope"; - version = "3.7.1"; - src = fetchurl { - url = "https://registry.npmjs.org/eslint-scope/-/eslint-scope-3.7.1.tgz"; - sha1 = "3d63c3edfda02e06e01a452ad88caacc7cdcb6e8"; - }; - }; "eslint-scope-3.7.3" = { name = "eslint-scope"; packageName = "eslint-scope"; @@ -15476,15 +15602,6 @@ let sha512 = "39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw=="; }; }; - "estree-walker-0.5.2" = { - name = "estree-walker"; - packageName = "estree-walker"; - version = "0.5.2"; - src = fetchurl { - url = "https://registry.npmjs.org/estree-walker/-/estree-walker-0.5.2.tgz"; - sha512 = "XpCnW/AE10ws/kDAs37cngSkvgIR8aN3G0MS85m7dUpuK2EREo9VJ00uvw6Dg/hXEpfsE1I1TvJOJr+Z+TL+ig=="; - }; - }; "estree-walker-0.6.1" = { name = "estree-walker"; packageName = "estree-walker"; @@ -15755,6 +15872,15 @@ let sha512 = "FIUCJz1RbuS0FKTdaAafAByGS0CPvU3R0MeHxgtl+djzCc//F8HakL8GzmVNZanasTbTAY/3DRFA0KpVqj/eAw=="; }; }; + "exec-sh-0.3.4" = { + name = "exec-sh"; + packageName = "exec-sh"; + version = "0.3.4"; + src = fetchurl { + url = "https://registry.npmjs.org/exec-sh/-/exec-sh-0.3.4.tgz"; + sha512 = "sEFIkc61v75sWeOe72qyrqg2Qg0OuLESziUDk/O/z2qgS15y2gWVFrI6f2Qn/qw/0/NCfCEsmNA4zOjkwEZT1A=="; + }; + }; "execa-0.1.1" = { name = "execa"; packageName = "execa"; @@ -16466,6 +16592,15 @@ let sha512 = "D2y4bovYpzziGgbHYtGCMjlJM36vAl/y+xUyn1C+FVx8szd1E+86KwVw6XvYSzOP8iMpm1X0I4xJD+QtUb36OA=="; }; }; + "fb-watchman-2.0.1" = { + name = "fb-watchman"; + packageName = "fb-watchman"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.1.tgz"; + sha512 = "DkPJKQeY6kKwmuMretBhr7G6Vodr7bFwDYTXIkfG1gjvNpaxBTQV3PbXg6bR1c1UP4jPOX0jHUbbHANL9vRjVg=="; + }; + }; "fd-lock-1.0.2" = { name = "fd-lock"; packageName = "fd-lock"; @@ -17060,13 +17195,13 @@ let sha1 = "554440766da0a0d603999f433453f6c2fc6a75c1"; }; }; - "flow-bin-0.85.0" = { + "flow-bin-0.118.0" = { name = "flow-bin"; packageName = "flow-bin"; - version = "0.85.0"; + version = "0.118.0"; src = fetchurl { - url = "https://registry.npmjs.org/flow-bin/-/flow-bin-0.85.0.tgz"; - sha512 = "ougBA2q6Rn9sZrjZQ9r5pTFxCotlGouySpD2yRIuq5AYwwfIT8HHhVMeSwrN5qJayjHINLJyrnsSkkPCZyfMrQ=="; + url = "https://registry.npmjs.org/flow-bin/-/flow-bin-0.118.0.tgz"; + sha512 = "jlbUu0XkbpXeXhan5xyTqVK1jmEKNxE8hpzznI3TThHTr76GiFwK0iRzhDo4KNy+S9h/KxHaqVhTP86vA6wHCg=="; }; }; "flow-parser-0.118.0" = { @@ -19086,13 +19221,13 @@ let sha512 = "4FOv3ZKfA4WdOKJeHdz6B3F/vxBLSgmBcGeAFPf4n1F64ltJUvOOerNj0rsJxONQGdhUMynQIvd6LzB+1J5oKA=="; }; }; - "graphql-tools-4.0.6" = { + "graphql-tools-4.0.7" = { name = "graphql-tools"; packageName = "graphql-tools"; - version = "4.0.6"; + version = "4.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/graphql-tools/-/graphql-tools-4.0.6.tgz"; - sha512 = "jHLQw8x3xmSNRBCsaZqelXXsFfUSUSktSCUP8KYHiX1Z9qEuwcMpAf+FkdBzk8aTAFqOlPdNZ3OI4DKKqGKUqg=="; + url = "https://registry.npmjs.org/graphql-tools/-/graphql-tools-4.0.7.tgz"; + sha512 = "rApl8sT8t/W1uQRcwzxMYyUBiCl/XicluApiDkNze5TX/GR0BSTQMjM2UcRGdTmkbsb1Eqq6afkyyeG/zMxZYQ=="; }; }; "graphql-type-json-0.3.1" = { @@ -19266,6 +19401,15 @@ let sha1 = "e28c4d45d05ecbbed818363ce8f9c5926229ffe5"; }; }; + "gunzip-maybe-1.4.1" = { + name = "gunzip-maybe"; + packageName = "gunzip-maybe"; + version = "1.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/gunzip-maybe/-/gunzip-maybe-1.4.1.tgz"; + sha512 = "qtutIKMthNJJgeHQS7kZ9FqDq59/Wn0G2HYCRNjpup7yKfVI6/eqwpmroyZGFoCYaG+sW6psNVb4zoLADHpp2g=="; + }; + }; "handle-thing-2.0.0" = { name = "handle-thing"; packageName = "handle-thing"; @@ -21589,6 +21733,15 @@ let sha512 = "RGdriMmQQvZ2aqaQq3awNA6dCGtKpiDFcOzrTWrDAT2MiWrKQVPmxLGHl7Y2nNu6led0kEyoX0enY0qXYsv9zw=="; }; }; + "is-deflate-1.0.0" = { + name = "is-deflate"; + packageName = "is-deflate"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-deflate/-/is-deflate-1.0.0.tgz"; + sha1 = "c862901c3c161fb09dac7cdc7e784f80e98f2f14"; + }; + }; "is-descriptor-0.1.6" = { name = "is-descriptor"; packageName = "is-descriptor"; @@ -21796,6 +21949,15 @@ let sha512 = "5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg=="; }; }; + "is-gzip-1.0.0" = { + name = "is-gzip"; + packageName = "is-gzip"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-gzip/-/is-gzip-1.0.0.tgz"; + sha1 = "6ca8b07b99c77998025900e555ced8ed80879a83"; + }; + }; "is-hexadecimal-1.0.4" = { name = "is-hexadecimal"; packageName = "is-hexadecimal"; @@ -22174,6 +22336,15 @@ let sha1 = "1d03dded53bd8db0f30c26e4f95d36fc7c87dc24"; }; }; + "is-reference-1.1.4" = { + name = "is-reference"; + packageName = "is-reference"; + version = "1.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/is-reference/-/is-reference-1.1.4.tgz"; + sha512 = "uJA/CDPO3Tao3GTrxYn6AwkM4nUPJiGGYu5+cB8qbC7WGFlrKZbiRo7SFKxUAEpFUfiHofWCXBUNhvYJMh+6zw=="; + }; + }; "is-regex-1.0.5" = { name = "is-regex"; packageName = "is-regex"; @@ -22678,22 +22849,22 @@ let sha1 = "47e63f7af55afa6f92e1500e690eb8b8529c099a"; }; }; - "istanbul-lib-coverage-1.2.1" = { + "istanbul-lib-coverage-3.0.0" = { name = "istanbul-lib-coverage"; packageName = "istanbul-lib-coverage"; - version = "1.2.1"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-1.2.1.tgz"; - sha512 = "PzITeunAgyGbtY1ibVIUiV679EFChHjoMNRibEIobvmrCRaIgwLxNucOSimtNWUhEib/oO7QY2imD75JVgCJWQ=="; + url = "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.0.0.tgz"; + sha512 = "UiUIqxMgRDET6eR+o5HbfRYP1l0hqkWOs7vNxC/mggutCMUIhWMm8gAHb8tHlyfD3/l6rlgNA5cKdDzEAf6hEg=="; }; }; - "istanbul-lib-instrument-1.10.2" = { + "istanbul-lib-instrument-4.0.1" = { name = "istanbul-lib-instrument"; packageName = "istanbul-lib-instrument"; - version = "1.10.2"; + version = "4.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-1.10.2.tgz"; - sha512 = "aWHxfxDqvh/ZlxR8BBaEPVSWDPUkGD63VjGQn3jcw8jCp7sHEMKcrj4xfJn/ABzdMEHiQNyvDQhqm5o8+SQg7A=="; + url = "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.1.tgz"; + sha512 = "imIchxnodll7pvQBYOqUu88EufLCU56LMeFPZZM/fJZ1irYcYdqroaV+ACK1Ila8ls09iEYArp+nqyC6lW1Vfg=="; }; }; "isurl-1.0.0" = { @@ -22795,6 +22966,51 @@ let sha1 = "7a549bbd9ffe1585b0cd0a191e203055bee574b4"; }; }; + "jest-haste-map-25.1.0" = { + name = "jest-haste-map"; + packageName = "jest-haste-map"; + version = "25.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-25.1.0.tgz"; + sha512 = "/2oYINIdnQZAqyWSn1GTku571aAfs8NxzSErGek65Iu5o8JYb+113bZysRMcC/pjE5v9w0Yz+ldbj9NxrFyPyw=="; + }; + }; + "jest-regex-util-25.1.0" = { + name = "jest-regex-util"; + packageName = "jest-regex-util"; + version = "25.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-25.1.0.tgz"; + sha512 = "9lShaDmDpqwg+xAd73zHydKrBbbrIi08Kk9YryBEBybQFg/lBWR/2BDjjiSE7KIppM9C5+c03XiDaZ+m4Pgs1w=="; + }; + }; + "jest-serializer-25.1.0" = { + name = "jest-serializer"; + packageName = "jest-serializer"; + version = "25.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jest-serializer/-/jest-serializer-25.1.0.tgz"; + sha512 = "20Wkq5j7o84kssBwvyuJ7Xhn7hdPeTXndnwIblKDR2/sy1SUm6rWWiG9kSCgJPIfkDScJCIsTtOKdlzfIHOfKA=="; + }; + }; + "jest-util-25.1.0" = { + name = "jest-util"; + packageName = "jest-util"; + version = "25.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jest-util/-/jest-util-25.1.0.tgz"; + sha512 = "7did6pLQ++87Qsj26Fs/TIwZMUFBXQ+4XXSodRNy3luch2DnRXsSnmpVtxxQ0Yd6WTipGpbhh2IFP1mq6/fQGw=="; + }; + }; + "jest-worker-25.1.0" = { + name = "jest-worker"; + packageName = "jest-worker"; + version = "25.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jest-worker/-/jest-worker-25.1.0.tgz"; + sha512 = "ZHhHtlxOWSxCoNOKHGbiLzXnl42ga9CxDr27H36Qn+15pQZd3R/F24jrmjDelw9j/iHUIWMWs08/u2QN50HHOg=="; + }; + }; "jetpack-id-1.0.0" = { name = "jetpack-id"; packageName = "jetpack-id"; @@ -24533,6 +24749,15 @@ let sha512 = "fkpz8ejdnEMG3s37wGL07iSBDg99O9D5yflE9RGNH3hRdx9SOwYfnGYdZOUIZitN8E+E2vkq3MUMYMvPYl5ZZA=="; }; }; + "loader-utils-1.4.0" = { + name = "loader-utils"; + packageName = "loader-utils"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz"; + sha512 = "qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA=="; + }; + }; "locate-path-2.0.0" = { name = "locate-path"; packageName = "locate-path"; @@ -26207,13 +26432,13 @@ let sha512 = "rYKABKutXa6vXTXhoV18cBE7PaewPXHe/Bdq4v+ZLMhxbWApkFFplT0LcbMW+6BbjnQXzZ/sAvSE/JdguApG5w=="; }; }; - "make-error-1.3.5" = { + "make-error-1.3.6" = { name = "make-error"; packageName = "make-error"; - version = "1.3.5"; + version = "1.3.6"; src = fetchurl { - url = "https://registry.npmjs.org/make-error/-/make-error-1.3.5.tgz"; - sha512 = "c3sIjNUow0+8swNwVpqoH4YCShKNFkMaw6oH1mNS2haDZQqkeZFlHS3dhoeEbKKmJB4vXpJucU6oH75aDYeE9g=="; + url = "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz"; + sha512 = "s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw=="; }; }; "make-error-cause-1.2.2" = { @@ -26252,6 +26477,15 @@ let sha512 = "pxiuXh0iVEq7VM7KMIhs5gxsfxCux2URptUQaXo4iZZJxBAzTPOLE2BumO5dbfVYq/hBJFBR/a1mFDmOx5AGmw=="; }; }; + "makeerror-1.0.11" = { + name = "makeerror"; + packageName = "makeerror"; + version = "1.0.11"; + src = fetchurl { + url = "https://registry.npmjs.org/makeerror/-/makeerror-1.0.11.tgz"; + sha1 = "e01a5c9109f2af79660e4e8b9587790184f5a96c"; + }; + }; "mamacro-0.0.3" = { name = "mamacro"; packageName = "mamacro"; @@ -27161,6 +27395,15 @@ let sha512 = "MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg=="; }; }; + "micromatch-4.0.2" = { + name = "micromatch"; + packageName = "micromatch"; + version = "4.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/micromatch/-/micromatch-4.0.2.tgz"; + sha512 = "y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q=="; + }; + }; "middleware-handler-0.2.0" = { name = "middleware-handler"; packageName = "middleware-handler"; @@ -28767,15 +29010,6 @@ let sha1 = "4aa7bfd43f03f0b81c9702b13d6a858ddb326f3e"; }; }; - "nexe-3.0.0-beta.7" = { - name = "nexe"; - packageName = "nexe"; - version = "3.0.0-beta.7"; - src = fetchurl { - url = "https://registry.npmjs.org/nexe/-/nexe-3.0.0-beta.7.tgz"; - sha512 = "Vnvd/rHCDyvc3ZxEX/sSw6lCMsBLHqkhGQS627MtetIiFBj1G7oRw9y1All8a7Tzi560o+SGIkAbnjFR60wNlQ=="; - }; - }; "next-event-1.0.0" = { name = "next-event"; packageName = "next-event"; @@ -28839,22 +29073,22 @@ let sha1 = "04b035cb530d46859d1018839a518c029133f676"; }; }; - "nlcst-is-literal-1.2.0" = { + "nlcst-is-literal-1.2.1" = { name = "nlcst-is-literal"; packageName = "nlcst-is-literal"; - version = "1.2.0"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/nlcst-is-literal/-/nlcst-is-literal-1.2.0.tgz"; - sha512 = "0f7SKVXHdQvXvibPzLL90Lp8KXbhO0ktZGvythpwyoc7mmXKGe2VtDjnPRailPWBO8TgzHRzvQzkPIz81PSyBA=="; + url = "https://registry.npmjs.org/nlcst-is-literal/-/nlcst-is-literal-1.2.1.tgz"; + sha512 = "abNv1XY7TUoyLn5kSSorMIYHfRvVfXbgftNFNvEMiQQkyKteLdjrGuDqEMMyK70sMbn7uPA6oUbRvykM6pg+pg=="; }; }; - "nlcst-normalize-2.1.3" = { + "nlcst-normalize-2.1.4" = { name = "nlcst-normalize"; packageName = "nlcst-normalize"; - version = "2.1.3"; + version = "2.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/nlcst-normalize/-/nlcst-normalize-2.1.3.tgz"; - sha512 = "TtAmaUsjZPU6zH+yksmLwTezMti5Db8R+kdViCmWv44pWGxNr4C90p7X33YbiULxDfA7i7J7gUutDX4fT9pn7g=="; + url = "https://registry.npmjs.org/nlcst-normalize/-/nlcst-normalize-2.1.4.tgz"; + sha512 = "dWJ3XUoAoWoau24xOM59Y1FPozv7DyYWy+rdUaXj9Ow0hBCVuwqDQbXzTF7H+HskyTVpTkRPXYPu4YsMEScmRw=="; }; }; "nlcst-search-1.5.1" = { @@ -28866,13 +29100,13 @@ let sha512 = "G3ws0fgNlVsUvHvA2G1PTjyxzGOJ0caI0+WOvlZzev5iSUTX+R1q4lnlL4Y7E+he4ZMUW/0FMn9rYwdYon/13g=="; }; }; - "nlcst-to-string-2.0.3" = { + "nlcst-to-string-2.0.4" = { name = "nlcst-to-string"; packageName = "nlcst-to-string"; - version = "2.0.3"; + version = "2.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/nlcst-to-string/-/nlcst-to-string-2.0.3.tgz"; - sha512 = "OY2QhGdf6jpYfHqS4vJwqF7aIBZkaMjMUkcHcskMPitvXLuYNGdQvgVWI/5yKwkmIdmhft3ounSJv+Re2yydng=="; + url = "https://registry.npmjs.org/nlcst-to-string/-/nlcst-to-string-2.0.4.tgz"; + sha512 = "3x3jwTd6UPG7vi5k4GEzvxJ5rDA7hVUIRNHPblKuMVP9Z3xmlsd9cgLcpAMkc5uPOBna82EeshROFhsPkbnTZg=="; }; }; "no-case-2.3.2" = { @@ -31217,13 +31451,13 @@ let sha1 = "df94fd8cf6531ecf75e6bef9a0858fbc72be2247"; }; }; - "paredit.js-0.3.4" = { + "paredit.js-0.3.6" = { name = "paredit.js"; packageName = "paredit.js"; - version = "0.3.4"; + version = "0.3.6"; src = fetchurl { - url = "https://registry.npmjs.org/paredit.js/-/paredit.js-0.3.4.tgz"; - sha512 = "b6t7ORo/MwT6xvRiuu1c1do3+CAUd7/0rgc1d3qNHUeP64zxy4ttLIvK7SEHzyfyDLvD9pPuV9mYKHf6MgUkmg=="; + url = "https://registry.npmjs.org/paredit.js/-/paredit.js-0.3.6.tgz"; + sha512 = "Z97Go1ucly6XzJDWsX8g6aXKIapx610JElNEgAvOQ8DA3A5uTAzEIaPZyn3r/WskHS+HpaO17oALcy2dUsKlQA=="; }; }; "parent-module-1.0.1" = { @@ -31973,6 +32207,15 @@ let sha512 = "U/il5MsrZp7mGg3mSQfn742na2T+1/vHDCG5/iTI3X9MKUuYUZVLQhyRsg06mCgDBTd57TxzgZt7P+fYfjRLtA=="; }; }; + "peek-stream-1.1.3" = { + name = "peek-stream"; + packageName = "peek-stream"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/peek-stream/-/peek-stream-1.1.3.tgz"; + sha512 = "FhJ+YbOSBb9/rIl2ZeE/QHEsWn7PqNYt8ARAY3kIgNGOk13g9FGyIY6JIl/xB/3TFRVoTv5as0l11weORrTekA=="; + }; + }; "peer-wire-protocol-0.7.1" = { name = "peer-wire-protocol"; packageName = "peer-wire-protocol"; @@ -32460,13 +32703,22 @@ let sha512 = "IY4oRjpXWYshuTDFxMVkJDtWIk2LhsTlu8bZnbEJA4+bYT16Lvpo8Qv6EvDumhYRgzjZl489pmsY3qVgJQ08nA=="; }; }; - "postcss-calc-7.0.1" = { + "postcss-7.0.27" = { + name = "postcss"; + packageName = "postcss"; + version = "7.0.27"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss/-/postcss-7.0.27.tgz"; + sha512 = "WuQETPMcW9Uf1/22HWUWP9lgsIC+KEHg2kozMflKjbeUtw9ujvFX6QmIfozaErDkmLWS9WEnEdEe6Uo9/BNTdQ=="; + }; + }; + "postcss-calc-7.0.2" = { name = "postcss-calc"; packageName = "postcss-calc"; - version = "7.0.1"; + version = "7.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/postcss-calc/-/postcss-calc-7.0.1.tgz"; - sha512 = "oXqx0m6tb4N3JGdmeMSc/i91KppbYsFZKdH0xMOqK8V1rJlzrKlTdokz8ozUXLVejydRN6u2IddxpcijRj2FqQ=="; + url = "https://registry.npmjs.org/postcss-calc/-/postcss-calc-7.0.2.tgz"; + sha512 = "rofZFHUg6ZIrvRwPeFktv06GdbDYLcGqh9EwiMutZg+a0oePCCw1zHOEiji6LCpyRcjTREtPASuUqeAvYlEVvQ=="; }; }; "postcss-colormin-4.0.3" = { @@ -32730,15 +32982,6 @@ let sha512 = "h7fJ/5uWuRVyOtkO45pnt1Ih40CEleeyCHzipqAZO2e5H20g25Y48uYnFUiShvY4rZWNJ/Bib/KVPmanaCtOhA=="; }; }; - "postcss-selector-parser-5.0.0" = { - name = "postcss-selector-parser"; - packageName = "postcss-selector-parser"; - version = "5.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-5.0.0.tgz"; - sha512 = "w+zLE5Jhg6Liz8+rQOWEAwtwkyqpfnmsinXjXg6cY7YIONZZtgvE0v2O0uhQBs0peNomOJwWRKt6JBfTdTd3OQ=="; - }; - }; "postcss-selector-parser-6.0.2" = { name = "postcss-selector-parser"; packageName = "postcss-selector-parser"; @@ -32775,6 +33018,15 @@ let sha512 = "pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ=="; }; }; + "postcss-value-parser-4.0.3" = { + name = "postcss-value-parser"; + packageName = "postcss-value-parser"; + version = "4.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.0.3.tgz"; + sha512 = "N7h4pG+Nnu5BEIzyeaaIYWs0LI5XC40OrRh5L60z0QjFsqGWcHcbkBvpe1WYpcIS9yQ8sOi/vIPt1ejQCrMVrg=="; + }; + }; "posthtml-0.11.6" = { name = "posthtml"; packageName = "posthtml"; @@ -32865,15 +33117,6 @@ let sha1 = "815ed1f6ebc65926f865b310c0713bcb3315ce4b"; }; }; - "prettier-1.15.1" = { - name = "prettier"; - packageName = "prettier"; - version = "1.15.1"; - src = fetchurl { - url = "https://registry.npmjs.org/prettier/-/prettier-1.15.1.tgz"; - sha512 = "4rgV2hyc/5Pk0XHH4VjJWHRgVjgRbpMfLQjREAhHBtyW1UvTFkjJEsueGYNYYZd9mn97K+1qv0EBwm11zoaSgA=="; - }; - }; "prettier-1.19.1" = { name = "prettier"; packageName = "prettier"; @@ -34890,15 +35133,6 @@ let sha1 = "9cbc686978fee65d16c00e2b19c237fcf6e38389"; }; }; - "read-pkg-4.0.1" = { - name = "read-pkg"; - packageName = "read-pkg"; - version = "4.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/read-pkg/-/read-pkg-4.0.1.tgz"; - sha1 = "963625378f3e1c4d48c85872b5a6ec7d5d093237"; - }; - }; "read-pkg-5.2.0" = { name = "read-pkg"; packageName = "read-pkg"; @@ -35070,6 +35304,15 @@ let sha1 = "41059608ffc154757b715d9989d199ffbf372e35"; }; }; + "realpath-native-1.1.0" = { + name = "realpath-native"; + packageName = "realpath-native"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/realpath-native/-/realpath-native-1.1.0.tgz"; + sha512 = "wlgPA6cCIIg9gKz0fgAPjnzh4yR/LnXovwuo9hvyGvx3h8nX4+/iLZplfUWasXpqD8BdnGnP5njOFjkUwPzvjA=="; + }; + }; "recast-0.11.23" = { name = "recast"; packageName = "recast"; @@ -35889,15 +36132,6 @@ let sha1 = "00a9f7387556e27038eae232caa372a6a59b665a"; }; }; - "resolve-dependencies-2.2.3" = { - name = "resolve-dependencies"; - packageName = "resolve-dependencies"; - version = "2.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/resolve-dependencies/-/resolve-dependencies-2.2.3.tgz"; - sha512 = "EIZcqEE3q+fWNapzpQ2iiCPal+J7TsLfLnoeGq4h5L4GYjnf4xKzVHN7VBjLGgOJwUs/Z+a6nqA80AhwP7IPlQ=="; - }; - }; "resolve-dir-1.0.1" = { name = "resolve-dir"; packageName = "resolve-dir"; @@ -36330,58 +36564,58 @@ let sha512 = "jmaDhK9CO4YbQAV8zzCnq9vjAqeO489MS5ehZ+rXmFiPFFE6B+S9KYO6prjmLJ5A0zY3QxVlQdrIya7E/azz/Q=="; }; }; - "rollup-0.67.0" = { + "rollup-1.31.1" = { name = "rollup"; packageName = "rollup"; - version = "0.67.0"; + version = "1.31.1"; src = fetchurl { - url = "https://registry.npmjs.org/rollup/-/rollup-0.67.0.tgz"; - sha512 = "p34buXxArhwv9ieTdHvdhdo65Cbig68s/Z8llbZuiX5e+3zCqnBF02Ck9IH0tECrmvvrJVMws32Ry84hTnS1Tw=="; + url = "https://registry.npmjs.org/rollup/-/rollup-1.31.1.tgz"; + sha512 = "2JREN1YdrS/kpPzEd33ZjtuNbOuBC3ePfuZBdKEybvqcEcszW1ckyVqzcEiEe0nE8sqHK+pbJg+PsAgRJ8+1dg=="; }; }; - "rollup-plugin-babel-4.0.3" = { + "rollup-plugin-babel-4.3.3" = { name = "rollup-plugin-babel"; packageName = "rollup-plugin-babel"; - version = "4.0.3"; + version = "4.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/rollup-plugin-babel/-/rollup-plugin-babel-4.0.3.tgz"; - sha512 = "/PP0MgbPQyRywI4zRIJim6ySjTcOLo4kQbEbROqp9kOR3kHC3FeU++QpBDZhS2BcHtJTVZMVbBV46flbBN5zxQ=="; + url = "https://registry.npmjs.org/rollup-plugin-babel/-/rollup-plugin-babel-4.3.3.tgz"; + sha512 = "tKzWOCmIJD/6aKNz0H1GMM+lW1q9KyFubbWzGiOG540zxPPifnEAHTZwjo0g991Y+DyOZcLqBgqOdqazYE5fkw=="; }; }; - "rollup-plugin-babel-minify-6.1.1" = { + "rollup-plugin-babel-minify-9.1.1" = { name = "rollup-plugin-babel-minify"; packageName = "rollup-plugin-babel-minify"; - version = "6.1.1"; + version = "9.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/rollup-plugin-babel-minify/-/rollup-plugin-babel-minify-6.1.1.tgz"; - sha512 = "MX0lqOHp1vHd7WbHTK5OG679msgPxzGzYf4VBEg6kKptO05fgheCbN51i3EoFYSa+8/VtNDjPc23iDdZfhO2uw=="; + url = "https://registry.npmjs.org/rollup-plugin-babel-minify/-/rollup-plugin-babel-minify-9.1.1.tgz"; + sha512 = "/Jph4PungzuB4h8uPSNKJQ16GjxVTfaRT6f4EwZW5NfD7RU7niFSEMMCZAlM6ezf11MBo1ttQcei+FisyCxicg=="; }; }; - "rollup-plugin-commonjs-9.2.0" = { + "rollup-plugin-commonjs-10.1.0" = { name = "rollup-plugin-commonjs"; packageName = "rollup-plugin-commonjs"; - version = "9.2.0"; + version = "10.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/rollup-plugin-commonjs/-/rollup-plugin-commonjs-9.2.0.tgz"; - sha512 = "0RM5U4Vd6iHjL6rLvr3lKBwnPsaVml+qxOGaaNUWN1lSq6S33KhITOfHmvxV3z2vy9Mk4t0g4rNlVaJJsNQPWA=="; + url = "https://registry.npmjs.org/rollup-plugin-commonjs/-/rollup-plugin-commonjs-10.1.0.tgz"; + sha512 = "jlXbjZSQg8EIeAAvepNwhJj++qJWNJw1Cl0YnOqKtP5Djx+fFGkp3WRh+W0ASCaFG5w1jhmzDxgu3SJuVxPF4Q=="; }; }; - "rollup-plugin-node-resolve-3.4.0" = { + "rollup-plugin-node-resolve-5.2.0" = { name = "rollup-plugin-node-resolve"; packageName = "rollup-plugin-node-resolve"; - version = "3.4.0"; + version = "5.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/rollup-plugin-node-resolve/-/rollup-plugin-node-resolve-3.4.0.tgz"; - sha512 = "PJcd85dxfSBWih84ozRtBkB731OjXk0KnzN0oGp7WOWcarAFkVa71cV5hTJg2qpVsV2U8EUwrzHP3tvy9vS3qg=="; + url = "https://registry.npmjs.org/rollup-plugin-node-resolve/-/rollup-plugin-node-resolve-5.2.0.tgz"; + sha512 = "jUlyaDXts7TW2CqQ4GaO5VJ4PwwaV8VUGA7+km3n6k6xtOEacf61u0VXwN80phY/evMcaS+9eIeJ9MOyDxt5Zw=="; }; }; - "rollup-plugin-replace-2.1.0" = { + "rollup-plugin-replace-2.2.0" = { name = "rollup-plugin-replace"; packageName = "rollup-plugin-replace"; - version = "2.1.0"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/rollup-plugin-replace/-/rollup-plugin-replace-2.1.0.tgz"; - sha512 = "SxrAIgpH/B5/W4SeULgreOemxcpEgKs2gcD42zXw50bhqGWmcnlXneVInQpAqzA/cIly4bJrOpeelmB9p4YXSQ=="; + url = "https://registry.npmjs.org/rollup-plugin-replace/-/rollup-plugin-replace-2.2.0.tgz"; + sha512 = "/5bxtUPkDHyBJAKketb4NfaeZjL5yLZdeUihSfbF2PQMz+rSTEb8ARKoOl3UBT4m7/X+QOXJo3sLTcq+yMMYTA=="; }; }; "rollup-pluginutils-2.8.2" = { @@ -36438,6 +36672,15 @@ let sha512 = "OfWGQTb9vnwRjwtA2QwpG2ICclHC3pgXZO5xt8H2EfgDquO0qVdSb5T88L4qJVAEugbS56pAuV4XZM58UX8ulw=="; }; }; + "rsvp-4.8.5" = { + name = "rsvp"; + packageName = "rsvp"; + version = "4.8.5"; + src = fetchurl { + url = "https://registry.npmjs.org/rsvp/-/rsvp-4.8.5.tgz"; + sha512 = "nfMOlASu9OnRJo1mbEk2cz0D56a1MBNrJ7orjRZQG10XDyuvwksKbuXNp6qa+kbn839HwjwhBzhFmdsaEAfauA=="; + }; + }; "rttc-4.5.2" = { name = "rttc"; packageName = "rttc"; @@ -36708,6 +36951,15 @@ let sha512 = "jLYV0DORrzY3xaz/S9ydJL6Iz7essZeAfnAavsJ+zsJGZ1MOnsS52yRjU3uF3pJa/lla7+wisp//fxOwOH8SKQ=="; }; }; + "sane-4.1.0" = { + name = "sane"; + packageName = "sane"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/sane/-/sane-4.1.0.tgz"; + sha512 = "hhbzAgTIX8O7SHfp2c8/kREfEn4qO/9q8C9beyY6+tvZ87EpoZ3i1RIEvp27YBswnNbY9mWd6paKVmKbAgLfZA=="; + }; + }; "sanitize-filename-1.6.3" = { name = "sanitize-filename"; packageName = "sanitize-filename"; @@ -38004,22 +38256,22 @@ let sha512 = "43HbJj6QatuL2BNG+Uq2Taa73wdfSQSID8FJWW4q5/LYgd9D+RtdiE4lAMwxqYYbvThU9uuza4epuF/B1CAlYw=="; }; }; - "snyk-go-parser-1.3.1" = { + "snyk-go-parser-1.3.3" = { name = "snyk-go-parser"; packageName = "snyk-go-parser"; - version = "1.3.1"; + version = "1.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-go-parser/-/snyk-go-parser-1.3.1.tgz"; - sha512 = "jrFRfIk6yGHFeipGD66WV9ei/A/w/lIiGqI80w1ndMbg6D6M5pVNbK7ngDTmo4GdHrZDYqx/VBGBsUm2bol3Rg=="; + url = "https://registry.npmjs.org/snyk-go-parser/-/snyk-go-parser-1.3.3.tgz"; + sha512 = "h65vi4UDH3ier7+r/E1GTZhruBSbGv3z4dGmzB+pc+g8ljOJd0BfqN6pUPIHB7hjrIbLh6KxT/XtJcV4X7LdeQ=="; }; }; - "snyk-go-plugin-1.11.1" = { + "snyk-go-plugin-1.12.0" = { name = "snyk-go-plugin"; packageName = "snyk-go-plugin"; - version = "1.11.1"; + version = "1.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-go-plugin/-/snyk-go-plugin-1.11.1.tgz"; - sha512 = "IsNi7TmpHoRHzONOWJTT8+VYozQJnaJpKgnYNQjzNm2JlV8bDGbdGQ1a8LcEoChxnJ8v8aMZy7GTiQyGGABtEQ=="; + url = "https://registry.npmjs.org/snyk-go-plugin/-/snyk-go-plugin-1.12.0.tgz"; + sha512 = "8rba/qn/hrUtPL0tDgdhJvp5HoN/3OMOUTmrtPiI0JHfVW6fqBTM9UnCFXJdK7UCUt9ITKIWIL0UBAzTc4hgKg=="; }; }; "snyk-gradle-plugin-3.2.4" = { @@ -40686,13 +40938,13 @@ let sha512 = "YPPlu67mdnHGTup2A8ff7BC2Pjq0e0Yp/IyTFN03zWO0RcK07uLcbi7C2KpGR2FvWbaB0+bfE27a+sBKebSo7w=="; }; }; - "systeminformation-4.22.0" = { + "systeminformation-4.22.1" = { name = "systeminformation"; packageName = "systeminformation"; - version = "4.22.0"; + version = "4.22.1"; src = fetchurl { - url = "https://registry.npmjs.org/systeminformation/-/systeminformation-4.22.0.tgz"; - sha512 = "Sq6H99xxvBeN54kUdM9DCdbesSLb+S5MZnUD2qy7gutyfS0REYZ4QN6tfsWbYhcsaocrvcpCwoOHblbO+caN4A=="; + url = "https://registry.npmjs.org/systeminformation/-/systeminformation-4.22.1.tgz"; + sha512 = "TjUA91kxGOcwWCic/OLc+zI0twe+GyHFp4mpjZcpG9LpXh0EVMD4zMeIVaEqsmxCWVOM+/FA3V6OB3W/IpLypA=="; }; }; "syswide-cas-5.3.0" = { @@ -41074,13 +41326,13 @@ let sha512 = "a6sumDlzyHVJWb8+YofY4TW112G6p2FCPEAFk+59gIYHv3XHRhm9ltVQ9kli4hNWeQBwSpe8cRN25x0ROunMOw=="; }; }; - "terminal-kit-1.33.10" = { + "terminal-kit-1.33.15" = { name = "terminal-kit"; packageName = "terminal-kit"; - version = "1.33.10"; + version = "1.33.15"; src = fetchurl { - url = "https://registry.npmjs.org/terminal-kit/-/terminal-kit-1.33.10.tgz"; - sha512 = "xKJAeyfm9EIkHWWz0C/GXbYW5LytAMzuVT9xZdI9kgLnm9Z7lNkly0WdBCH8WOPD4inZpKjNzBKr0StEOJXBNA=="; + url = "https://registry.npmjs.org/terminal-kit/-/terminal-kit-1.33.15.tgz"; + sha512 = "zGZpZRXXAKJw/fyWxY7k8rOzo56OBzzhfPQGloPBP4irhQs6cv4VWMOoVFHze8o7L4YzwtijBotfI479xA4QxQ=="; }; }; "terser-3.17.0" = { @@ -41110,13 +41362,13 @@ let sha512 = "QMxecFz/gHQwteWwSo5nTc6UaICqN1bMedC5sMtUc7y3Ha3Q8y6ZO0iCR8pq4RJC8Hjf0FEPEHZqcMB/+DFCrA=="; }; }; - "test-exclude-4.2.3" = { + "test-exclude-6.0.0" = { name = "test-exclude"; packageName = "test-exclude"; - version = "4.2.3"; + version = "6.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/test-exclude/-/test-exclude-4.2.3.tgz"; - sha512 = "SYbXgY64PT+4GAL2ocI3HwPa4Q4TBKm0cwAVeKOt/Aoc0gSpNRjJX8w0pA1LMKZ3LBmd8pYBqApFNQLII9kavA=="; + url = "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz"; + sha512 = "cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w=="; }; }; "text-extensions-1.9.0" = { @@ -41569,6 +41821,15 @@ let sha512 = "8+Ah9aB1IRXCnIOxXZ0uFozV1nMU5xiu7hhFVUSxZ3bYu+psD4TzagCzVbexUCgNNGJnsmNDQlS4nG3mTyoNkw=="; }; }; + "tmpl-1.0.4" = { + name = "tmpl"; + packageName = "tmpl"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/tmpl/-/tmpl-1.0.4.tgz"; + sha1 = "23640dd7b42d00433911140820e5cf440e521dd1"; + }; + }; "to-absolute-glob-2.0.2" = { name = "to-absolute-glob"; packageName = "to-absolute-glob"; @@ -42631,13 +42892,13 @@ let sha512 = "pcnnhaoG6RtrvHJ1dFncAe8Od6Nuy30oaJ82ts6//sGSXOP5UjBMEthiProjXmMNHOfd93sqlkztifFMcb+4yw=="; }; }; - "uglify-js-3.7.7" = { + "uglify-js-3.8.0" = { name = "uglify-js"; packageName = "uglify-js"; - version = "3.7.7"; + version = "3.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.7.7.tgz"; - sha512 = "FeSU+hi7ULYy6mn8PKio/tXsdSXN35lm4KgV2asx00kzrLU9Pi3oAslcJT70Jdj7PHX29gGUPOT6+lXGBbemhA=="; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.8.0.tgz"; + sha512 = "ugNSTT8ierCsDHso2jkBHXYrU8Y5/fY2ZUprfrJUiD7YpuFvV4jODLFmb3h4btQjqr5Nh4TX4XtgDfCU1WdioQ=="; }; }; "uglify-to-browserify-1.0.2" = { @@ -44899,6 +45160,15 @@ let sha1 = "a16d025eb931bd03b52f308caed0f40fcebe9532"; }; }; + "walker-1.0.7" = { + name = "walker"; + packageName = "walker"; + version = "1.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/walker/-/walker-1.0.7.tgz"; + sha1 = "2f7f9b8fd10d677262b18a884e28d19618e028fb"; + }; + }; "ware-1.3.0" = { name = "ware"; packageName = "ware"; @@ -47338,7 +47608,7 @@ in ]; }) sources."to-utf8-0.0.1" - sources."uglify-js-3.7.7" + sources."uglify-js-3.8.0" sources."unc-path-regex-0.1.2" sources."unique-stream-2.3.1" sources."universalify-0.1.2" @@ -47554,7 +47824,7 @@ in sources."@apollo/federation-0.12.0" (sources."@apollo/protobufjs-1.0.3" // { dependencies = [ - sources."@types/node-10.17.15" + sources."@types/node-10.17.16" ]; }) sources."@apollographql/apollo-tools-0.4.3" @@ -47767,7 +48037,7 @@ in sources."@types/long-4.0.1" sources."@types/mime-2.0.1" sources."@types/minimatch-3.0.3" - sources."@types/node-13.7.1" + sources."@types/node-13.7.4" sources."@types/node-fetch-2.5.4" sources."@types/normalize-package-data-2.4.0" sources."@types/range-parser-1.2.3" @@ -47945,7 +48215,7 @@ in sources."callsites-2.0.0" sources."camel-case-3.0.0" sources."camelcase-4.1.0" - sources."caniuse-lite-1.0.30001027" + sources."caniuse-lite-1.0.30001028" sources."capture-stack-trace-1.0.1" sources."cardinal-2.1.1" sources."caseless-0.12.0" @@ -48110,7 +48380,7 @@ in sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" sources."ejs-2.7.4" - sources."electron-to-chromium-1.3.353" + sources."electron-to-chromium-1.3.355" sources."elegant-spinner-1.0.1" sources."emoji-regex-7.0.3" sources."encodeurl-1.0.2" @@ -48263,7 +48533,7 @@ in sources."graphql-extensions-0.10.10" sources."graphql-subscriptions-1.1.0" sources."graphql-tag-2.10.3" - sources."graphql-tools-4.0.6" + sources."graphql-tools-4.0.7" sources."graphql-type-json-0.3.1" sources."graphql-upload-8.1.0" sources."growly-1.3.0" @@ -48454,7 +48724,7 @@ in ]; }) sources."make-dir-1.3.0" - sources."make-error-1.3.5" + sources."make-error-1.3.6" sources."map-cache-0.2.2" sources."map-visit-1.0.0" sources."media-typer-0.3.0" @@ -49351,12 +49621,16 @@ in asar = nodeEnv.buildNodePackage { name = "asar"; packageName = "asar"; - version = "2.0.3"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/asar/-/asar-2.0.3.tgz"; - sha512 = "QdHKO+HOYVtE4B/M3up3i4LSJeJgsa2CTVBrjBf9GgLUPGGUFZowcdJ5yE4gOJuRAHNdqB9JFeRfFfaOu5x8Rw=="; + url = "https://registry.npmjs.org/asar/-/asar-2.1.0.tgz"; + sha512 = "d2Ovma+bfqNpvBzY/KU8oPY67ZworixTpkjSx0PCXnQi67c2cXmssaTxpFDUM0ttopXoGx/KRxNg/GDThYbXQA=="; }; dependencies = [ + sources."@types/events-3.0.0" + sources."@types/glob-7.1.1" + sources."@types/minimatch-3.0.3" + sources."@types/node-13.7.4" sources."balanced-match-1.0.0" sources."bluebird-3.7.2" sources."brace-expansion-1.1.11" @@ -49881,7 +50155,7 @@ in sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" sources."@types/long-4.0.1" - sources."@types/node-10.17.15" + sources."@types/node-10.17.16" sources."addr-to-ip-port-1.5.1" sources."airplay-js-0.2.16" sources."ajv-6.11.0" @@ -50454,7 +50728,7 @@ in sources."@types/events-3.0.0" sources."@types/glob-7.1.1" sources."@types/minimatch-3.0.3" - sources."@types/node-13.7.1" + sources."@types/node-13.7.4" sources."abbrev-1.1.1" sources."accepts-1.3.7" sources."ajv-6.11.0" @@ -51089,7 +51363,7 @@ in sources."@types/events-3.0.0" sources."@types/glob-7.1.1" sources."@types/minimatch-3.0.3" - sources."@types/node-13.7.1" + sources."@types/node-13.7.4" sources."arr-diff-4.0.0" sources."arr-flatten-1.1.0" sources."arr-union-3.1.0" @@ -51430,7 +51704,7 @@ in sources."@cycle/run-3.4.0" sources."@cycle/time-0.10.1" sources."@types/cookiejar-2.1.1" - sources."@types/node-13.7.1" + sources."@types/node-13.7.4" sources."@types/superagent-3.8.2" sources."ansi-escapes-3.2.0" sources."ansi-regex-2.1.1" @@ -52653,7 +52927,7 @@ in sources."assert-plus-1.0.0" sources."async-2.6.3" sources."asynckit-0.4.0" - sources."aws-sdk-2.620.0" + sources."aws-sdk-2.622.0" sources."aws-sign2-0.7.0" sources."aws4-1.9.1" sources."base64-js-1.3.1" @@ -53214,10 +53488,10 @@ in eslint_d = nodeEnv.buildNodePackage { name = "eslint_d"; packageName = "eslint_d"; - version = "8.0.0"; + version = "8.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint_d/-/eslint_d-8.0.0.tgz"; - sha512 = "9I+AC6Y7WTX4J1O3GGg1LqGiDxOUedLxzIxtKSWnD1FP3z2MPQbnWNNycg9Pq/L5B0NlszdaBlajUexZ8qzuag=="; + url = "https://registry.npmjs.org/eslint_d/-/eslint_d-8.1.0.tgz"; + sha512 = "cNZFOYG+Quphqj+GPoTNe9nsDCRJo2AjHVpu4RkvAxH8+vR2ckvm7ksr+Lwi+kkKuMf4h+QifTAXJ0HuBkJ7FA=="; }; dependencies = [ sources."@babel/code-frame-7.8.3" @@ -55724,10 +55998,10 @@ in gtop = nodeEnv.buildNodePackage { name = "gtop"; packageName = "gtop"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/gtop/-/gtop-1.0.1.tgz"; - sha512 = "rDONVL6bOSKi9H2PuZ+nItRvFML39EeLgV65JRkGPdLri5saUAMVISZV/4jW8LylZBRHysVmaI1nCu5S/0Iilg=="; + url = "https://registry.npmjs.org/gtop/-/gtop-1.0.2.tgz"; + sha512 = "Dn/8Kt57CsFLHd9vJIqWuhzXETpm+J86tD444rOz04uUu0kQBUTEBXmwu7zOVntb+TRr4EuyRxBo2tecJAPFmA=="; }; dependencies = [ sources."abbrev-1.1.1" @@ -55779,7 +56053,7 @@ in sources."string_decoder-0.10.31" sources."strip-ansi-3.0.1" sources."supports-color-2.0.0" - sources."systeminformation-4.22.0" + sources."systeminformation-4.22.1" sources."term-canvas-0.0.5" sources."wordwrap-0.0.3" sources."x256-0.0.2" @@ -56619,7 +56893,7 @@ in sources."param-case-2.1.1" sources."relateurl-0.2.7" sources."source-map-0.6.1" - sources."uglify-js-3.7.7" + sources."uglify-js-3.8.0" sources."upper-case-1.1.3" ]; buildInputs = globalBuildInputs; @@ -58311,7 +58585,7 @@ in sources."q-0.9.7" ]; }) - sources."terminal-kit-1.33.10" + sources."terminal-kit-1.33.15" (sources."tkwidgets-0.5.26" // { dependencies = [ sources."is-fullwidth-code-point-2.0.0" @@ -59616,7 +59890,7 @@ in sources."@types/events-3.0.0" sources."@types/glob-7.1.1" sources."@types/minimatch-3.0.3" - sources."@types/node-13.7.1" + sources."@types/node-13.7.4" sources."@zkochan/cmd-shim-3.1.0" sources."JSONStream-1.3.5" sources."abbrev-1.1.1" @@ -60381,7 +60655,7 @@ in sources."tweetnacl-0.14.5" sources."type-fest-0.3.1" sources."typedarray-0.0.6" - (sources."uglify-js-3.7.7" // { + (sources."uglify-js-3.8.0" // { dependencies = [ sources."source-map-0.6.1" ]; @@ -61406,7 +61680,7 @@ in "lumo-build-deps-../interpreters/clojurescript/lumo" = nodeEnv.buildNodePackage { name = "lumo-build-deps"; packageName = "lumo-build-deps"; - version = "1.9.0"; + version = "1.10.1"; src = ../interpreters/clojurescript/lumo; dependencies = [ sources."@babel/code-frame-7.8.3" @@ -61436,9 +61710,13 @@ in sources."@babel/helper-split-export-declaration-7.8.3" sources."@babel/helper-wrap-function-7.8.3" sources."@babel/helpers-7.8.4" - sources."@babel/highlight-7.8.3" + (sources."@babel/highlight-7.8.3" // { + dependencies = [ + sources."chalk-2.4.2" + ]; + }) sources."@babel/parser-7.8.4" - sources."@babel/plugin-external-helpers-7.0.0" + sources."@babel/plugin-external-helpers-7.8.3" sources."@babel/plugin-proposal-async-generator-functions-7.8.3" sources."@babel/plugin-proposal-class-properties-7.8.3" sources."@babel/plugin-proposal-dynamic-import-7.8.3" @@ -61449,6 +61727,7 @@ in sources."@babel/plugin-proposal-optional-chaining-7.8.3" sources."@babel/plugin-proposal-unicode-property-regex-7.8.3" sources."@babel/plugin-syntax-async-generators-7.8.4" + sources."@babel/plugin-syntax-bigint-7.8.3" sources."@babel/plugin-syntax-dynamic-import-7.8.3" sources."@babel/plugin-syntax-json-strings-7.8.3" sources."@babel/plugin-syntax-nullish-coalescing-operator-7.8.3" @@ -61489,22 +61768,35 @@ in sources."@babel/plugin-transform-typeof-symbol-7.8.4" sources."@babel/plugin-transform-unicode-regex-7.8.3" sources."@babel/preset-env-7.8.4" - sources."@babel/preset-stage-2-7.0.0" + sources."@babel/preset-stage-2-7.8.3" sources."@babel/runtime-7.8.4" sources."@babel/template-7.8.3" sources."@babel/traverse-7.8.4" sources."@babel/types-7.8.3" - sources."@calebboyd/semaphore-1.3.1" - sources."@comandeer/babel-plugin-banner-4.1.0" - sources."@mrmlnc/readdir-enhanced-2.2.1" - sources."@nodelib/fs.stat-1.1.3" - sources."@sindresorhus/is-0.7.0" - sources."@szmarczak/http-timer-1.1.2" - sources."@types/estree-0.0.39" - sources."@types/events-3.0.0" - sources."@types/glob-7.1.1" - sources."@types/minimatch-3.0.3" - sources."@types/node-13.7.1" + sources."@cnakazawa/watch-1.0.4" + sources."@comandeer/babel-plugin-banner-5.0.0" + sources."@istanbuljs/load-nyc-config-1.0.0" + sources."@istanbuljs/schema-0.1.2" + (sources."@jest/transform-25.1.0" // { + dependencies = [ + sources."source-map-0.6.1" + ]; + }) + sources."@jest/types-25.1.0" + sources."@types/babel__core-7.1.4" + sources."@types/babel__generator-7.6.1" + sources."@types/babel__template-7.0.2" + sources."@types/babel__traverse-7.0.8" + sources."@types/color-name-1.1.1" + sources."@types/estree-0.0.42" + sources."@types/istanbul-lib-coverage-2.0.1" + sources."@types/istanbul-lib-report-3.0.0" + sources."@types/istanbul-reports-1.1.1" + sources."@types/node-13.7.4" + sources."@types/normalize-package-data-2.4.0" + sources."@types/resolve-0.0.8" + sources."@types/yargs-15.0.3" + sources."@types/yargs-parser-15.0.0" sources."@webassemblyjs/ast-1.8.5" sources."@webassemblyjs/floating-point-hex-parser-1.8.5" sources."@webassemblyjs/helper-api-error-1.8.5" @@ -61525,69 +61817,25 @@ in sources."@webassemblyjs/wast-printer-1.8.5" sources."@xtuc/ieee754-1.2.0" sources."@xtuc/long-4.2.2" + sources."JSONStream-1.3.5" sources."ace.improved-0.2.1" - sources."acorn-6.4.0" + sources."acorn-7.1.0" + sources."acorn-node-1.8.2" + sources."acorn-walk-7.1.1" sources."ajv-6.11.0" sources."ajv-errors-1.0.1" sources."ajv-keywords-3.4.1" sources."amdefine-1.0.1" - sources."ansi-regex-2.1.1" - sources."ansi-styles-2.2.1" - (sources."anymatch-2.0.0" // { - dependencies = [ - sources."arr-diff-4.0.0" - sources."array-unique-0.3.2" - sources."braces-2.3.2" - sources."debug-2.6.9" - sources."define-property-1.0.0" - (sources."expand-brackets-2.1.4" // { - dependencies = [ - sources."define-property-0.2.5" - ]; - }) - sources."extend-shallow-2.0.1" - sources."extglob-2.0.4" - sources."fill-range-4.0.0" - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-5.1.0" - ]; - }) - (sources."is-number-3.0.0" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."isobject-3.0.1" - sources."kind-of-6.0.3" - sources."micromatch-3.1.10" - sources."ms-2.0.0" - ]; - }) - sources."app-builder-5.2.0" + sources."ansi-regex-4.1.0" + sources."ansi-styles-3.2.1" + sources."anymatch-3.1.1" sources."aproba-1.2.0" - (sources."archive-type-4.0.0" // { - dependencies = [ - sources."file-type-4.4.0" - ]; - }) - sources."arr-diff-2.0.0" + sources."argparse-1.0.10" + sources."arr-diff-4.0.0" sources."arr-flatten-1.1.0" sources."arr-union-3.1.0" - sources."array-union-1.0.2" - sources."array-uniq-1.0.3" - sources."array-unique-0.2.1" - sources."arrify-1.0.1" + sources."array-unique-0.3.2" + sources."asn1-0.2.4" sources."asn1.js-4.10.1" (sources."assert-1.5.0" // { dependencies = [ @@ -61595,23 +61843,17 @@ in sources."util-0.10.3" ]; }) + sources."assert-plus-1.0.0" sources."assign-symbols-1.0.0" + sources."async-3.1.1" sources."async-each-1.0.3" sources."async-retry-1.3.1" + sources."asynckit-0.4.0" sources."atob-2.1.2" - (sources."babel-code-frame-6.26.0" // { - dependencies = [ - sources."chalk-1.1.3" - sources."js-tokens-3.0.2" - ]; - }) + sources."aws-sign2-0.7.0" + sources."aws4-1.9.1" sources."babel-core-7.0.0-bridge.0" - sources."babel-eslint-10.0.1" - (sources."babel-generator-6.26.1" // { - dependencies = [ - sources."jsesc-1.3.0" - ]; - }) + sources."babel-eslint-10.0.3" sources."babel-helper-evaluate-path-0.5.0" sources."babel-helper-flip-expressions-0.4.3" sources."babel-helper-is-nodes-equiv-0.0.1" @@ -61619,16 +61861,16 @@ in sources."babel-helper-mark-eval-scopes-0.4.3" sources."babel-helper-remove-or-void-0.4.3" sources."babel-helper-to-multiple-sequence-expressions-0.5.0" - sources."babel-jest-23.6.0" + sources."babel-jest-25.1.0" (sources."babel-loader-8.0.6" // { dependencies = [ - sources."pify-4.0.1" + sources."minimist-0.0.8" + sources."mkdirp-0.5.1" ]; }) - sources."babel-messages-6.23.0" sources."babel-plugin-dynamic-import-node-2.3.0" - sources."babel-plugin-istanbul-4.1.6" - sources."babel-plugin-jest-hoist-23.2.0" + sources."babel-plugin-istanbul-6.0.0" + sources."babel-plugin-jest-hoist-25.1.0" sources."babel-plugin-minify-builtins-0.5.0" sources."babel-plugin-minify-constant-folding-0.5.0" sources."babel-plugin-minify-dead-code-elimination-0.5.1" @@ -61641,7 +61883,6 @@ in sources."babel-plugin-minify-simplify-0.5.1" sources."babel-plugin-minify-type-constructors-0.4.3" sources."babel-plugin-syntax-flow-6.18.0" - sources."babel-plugin-syntax-object-rest-spread-6.13.0" sources."babel-plugin-transform-flow-strip-types-6.22.0" sources."babel-plugin-transform-inline-consecutive-adds-0.4.3" sources."babel-plugin-transform-member-expression-literals-6.9.4" @@ -61654,44 +61895,50 @@ in sources."babel-plugin-transform-remove-undefined-0.5.0" sources."babel-plugin-transform-simplify-comparison-operators-6.9.4" sources."babel-plugin-transform-undefined-to-void-6.9.4" - sources."babel-preset-jest-23.2.0" + sources."babel-preset-jest-25.1.0" sources."babel-preset-minify-0.5.1" (sources."babel-runtime-6.26.0" // { dependencies = [ sources."regenerator-runtime-0.11.1" ]; }) - sources."babel-template-6.26.0" - (sources."babel-traverse-6.26.0" // { - dependencies = [ - sources."debug-2.6.9" - sources."globals-9.18.0" - sources."ms-2.0.0" - ]; - }) - (sources."babel-types-6.26.0" // { - dependencies = [ - sources."to-fast-properties-1.0.3" - ]; - }) - sources."babylon-6.18.0" sources."balanced-match-1.0.0" (sources."base-0.11.2" // { dependencies = [ sources."define-property-1.0.0" - sources."isobject-3.0.1" ]; }) sources."base64-js-1.3.1" + sources."bcrypt-pbkdf-1.0.2" sources."big.js-5.2.2" sources."binary-extensions-1.13.1" sources."bindings-1.5.0" - sources."bl-1.2.2" + (sources."bl-3.0.0" // { + dependencies = [ + sources."readable-stream-3.6.0" + ]; + }) sources."bluebird-3.7.2" sources."bn.js-4.11.8" sources."brace-expansion-1.1.11" - sources."braces-1.8.5" + (sources."braces-2.3.2" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) sources."brorand-1.1.0" + sources."browser-pack-6.1.0" + (sources."browser-resolve-1.11.3" // { + dependencies = [ + sources."resolve-1.1.7" + ]; + }) + (sources."browserify-16.5.0" // { + dependencies = [ + sources."minimist-0.0.8" + sources."mkdirp-0.5.1" + ]; + }) sources."browserify-aes-1.2.0" sources."browserify-cipher-1.0.1" sources."browserify-des-1.0.2" @@ -61699,57 +61946,47 @@ in sources."browserify-sign-4.0.4" sources."browserify-zlib-0.2.0" sources."browserslist-4.8.7" + sources."bser-2.1.1" sources."buffer-5.4.3" - sources."buffer-alloc-1.2.0" - sources."buffer-alloc-unsafe-1.1.0" - sources."buffer-crc32-0.2.13" - sources."buffer-fill-1.0.0" sources."buffer-from-1.1.1" sources."buffer-xor-1.0.3" - sources."builtin-modules-2.0.0" + sources."builtin-modules-3.1.0" sources."builtin-status-codes-3.0.0" - sources."cacache-12.0.3" - (sources."cache-base-1.0.1" // { - dependencies = [ - sources."isobject-3.0.1" - ]; - }) - (sources."cacheable-request-2.1.4" // { + (sources."cacache-12.0.3" // { dependencies = [ - sources."lowercase-keys-1.0.0" + sources."minimist-0.0.8" + sources."mkdirp-0.5.1" ]; }) - sources."call-me-maybe-1.0.1" + sources."cache-base-1.0.1" + sources."cached-path-relative-1.0.2" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001027" - sources."caw-2.0.1" - (sources."chalk-2.4.2" // { + sources."caniuse-lite-1.0.30001028" + sources."capture-exit-2.0.0" + sources."caseless-0.12.0" + (sources."chalk-3.0.0" // { dependencies = [ - sources."ansi-styles-3.2.1" - sources."supports-color-5.5.0" + sources."ansi-styles-4.2.1" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."has-flag-4.0.0" + sources."supports-color-7.1.0" ]; }) - sources."cherow-1.6.9" (sources."chokidar-2.1.8" // { dependencies = [ - sources."array-unique-0.3.2" - sources."braces-2.3.2" - sources."extend-shallow-2.0.1" - sources."fill-range-4.0.0" - (sources."glob-parent-3.1.0" // { + (sources."anymatch-2.0.0" // { dependencies = [ - sources."is-glob-3.1.0" + sources."normalize-path-2.1.1" ]; }) - sources."is-extglob-2.1.1" - sources."is-glob-4.0.1" - sources."is-number-3.0.0" - sources."isobject-3.0.1" - sources."normalize-path-3.0.0" + sources."fsevents-1.2.11" + sources."micromatch-3.1.10" ]; }) sources."chownr-1.1.4" sources."chrome-trace-event-1.0.2" + sources."ci-info-2.0.0" sources."cipher-base-1.0.4" (sources."class-utils-0.3.6" // { dependencies = [ @@ -61765,37 +62002,38 @@ in ]; }) sources."is-descriptor-0.1.6" - sources."isobject-3.0.1" sources."kind-of-5.1.0" ]; }) - sources."cli-cursor-2.1.0" - sources."cli-spinners-2.2.0" - (sources."cliui-5.0.0" // { - dependencies = [ - sources."ansi-regex-4.1.0" - sources."strip-ansi-5.2.0" - ]; - }) + sources."cliui-5.0.0" sources."clone-2.1.2" sources."clone-buffer-1.0.0" - sources."clone-response-1.0.2" sources."clone-stats-1.0.0" sources."cloneable-readable-1.1.3" sources."collection-visit-1.0.0" sources."color-convert-1.9.3" sources."color-name-1.1.3" - sources."commander-2.8.1" + sources."colors-1.4.0" + (sources."combine-source-map-0.8.0" // { + dependencies = [ + sources."convert-source-map-1.1.3" + ]; + }) + sources."combined-stream-1.0.8" + sources."commander-2.20.3" sources."commondir-1.0.1" sources."component-emitter-1.3.0" sources."concat-map-0.0.1" sources."concat-stream-1.6.2" - sources."config-chain-1.1.12" sources."console-browserify-1.2.0" sources."constants-browserify-1.0.0" - sources."content-disposition-0.5.3" sources."convert-source-map-1.7.0" - sources."copy-concurrently-1.0.5" + (sources."copy-concurrently-1.0.5" // { + dependencies = [ + sources."minimist-0.0.8" + sources."mkdirp-0.5.1" + ]; + }) sources."copy-descriptor-0.1.1" sources."core-js-2.6.11" (sources."core-js-compat-3.6.4" // { @@ -61807,143 +62045,68 @@ in sources."create-ecdh-4.0.3" sources."create-hash-1.2.0" sources."create-hmac-1.1.7" - sources."cross-env-5.2.0" + (sources."cross-env-7.0.0" // { + dependencies = [ + sources."cross-spawn-7.0.1" + sources."path-key-3.1.1" + sources."shebang-command-2.0.0" + sources."shebang-regex-3.0.0" + sources."which-2.0.2" + ]; + }) sources."cross-spawn-6.0.5" sources."crypto-browserify-3.12.0" sources."cyclist-1.0.1" + sources."dash-ast-1.0.0" + sources."dashdash-1.14.1" sources."death-1.1.0" sources."debug-4.1.1" sources."decamelize-1.2.0" sources."decode-uri-component-0.2.0" - (sources."decompress-4.2.0" // { - dependencies = [ - (sources."make-dir-1.3.0" // { - dependencies = [ - sources."pify-3.0.0" - ]; - }) - ]; - }) - sources."decompress-response-3.3.0" - (sources."decompress-tar-4.1.1" // { - dependencies = [ - sources."file-type-5.2.0" - ]; - }) - (sources."decompress-tarbz2-4.1.1" // { - dependencies = [ - sources."file-type-6.2.0" - ]; - }) - (sources."decompress-targz-4.1.1" // { - dependencies = [ - sources."file-type-5.2.0" - ]; - }) - (sources."decompress-unzip-4.0.1" // { - dependencies = [ - sources."file-type-3.9.0" - sources."get-stream-2.3.1" - ]; - }) - (sources."defaults-1.0.3" // { - dependencies = [ - sources."clone-1.0.4" - ]; - }) - sources."defer-to-connect-1.1.3" sources."define-properties-1.1.3" - (sources."define-property-2.0.2" // { - dependencies = [ - sources."isobject-3.0.1" - ]; - }) + sources."define-property-2.0.2" + sources."defined-1.0.0" + sources."delayed-stream-1.0.0" + sources."deps-sort-2.0.1" sources."des.js-1.0.1" sources."detect-file-1.0.0" - sources."detect-indent-4.0.0" + sources."detective-5.2.0" sources."diffie-hellman-5.0.3" - (sources."dir-glob-2.0.0" // { - dependencies = [ - sources."path-type-3.0.0" - sources."pify-3.0.0" - ]; - }) sources."domain-browser-1.2.0" - (sources."download-7.1.0" // { - dependencies = [ - sources."got-8.3.2" - sources."make-dir-1.3.0" - sources."pify-3.0.0" - ]; - }) - sources."duplexer3-0.1.4" + sources."duplexer2-0.1.4" sources."duplexify-3.7.1" - sources."electron-to-chromium-1.3.353" + sources."ecc-jsbn-0.1.2" + sources."electron-to-chromium-1.3.355" sources."elliptic-6.5.2" sources."emoji-regex-7.0.3" - sources."emojis-list-2.1.0" + sources."emojis-list-3.0.0" sources."end-of-stream-1.4.4" - sources."enhanced-resolve-4.1.1" + (sources."enhanced-resolve-4.1.1" // { + dependencies = [ + sources."memory-fs-0.5.0" + ]; + }) sources."errno-0.1.7" sources."error-ex-1.3.2" + sources."es-abstract-1.17.4" + sources."es-to-primitive-1.2.1" sources."escape-string-regexp-1.0.5" - sources."eslint-scope-3.7.1" + sources."eslint-scope-4.0.3" sources."eslint-visitor-keys-1.1.0" + sources."esprima-4.0.1" sources."esrecurse-4.2.1" sources."estraverse-4.3.0" sources."estree-walker-0.6.1" sources."esutils-2.0.3" - sources."events-3.1.0" + sources."events-2.1.0" sources."evp_bytestokey-1.0.3" - (sources."execa-1.0.0" // { - dependencies = [ - sources."get-stream-4.1.0" - ]; - }) - sources."expand-brackets-0.1.5" - sources."expand-range-1.8.2" - sources."expand-tilde-2.0.2" - sources."ext-list-2.2.2" - sources."ext-name-5.0.0" - (sources."extend-shallow-3.0.2" // { - dependencies = [ - sources."is-extendable-1.0.1" - ]; - }) - sources."extglob-0.3.2" - sources."fast-deep-equal-3.1.1" - (sources."fast-glob-2.2.7" // { + sources."exec-sh-0.3.4" + sources."execa-1.0.0" + (sources."expand-brackets-2.1.4" // { dependencies = [ - sources."arr-diff-4.0.0" - sources."array-unique-0.3.2" - (sources."braces-2.3.2" // { - dependencies = [ - sources."extend-shallow-2.0.1" - ]; - }) sources."debug-2.6.9" - (sources."expand-brackets-2.1.4" // { - dependencies = [ - sources."define-property-0.2.5" - sources."extend-shallow-2.0.1" - ]; - }) - (sources."extglob-2.0.4" // { - dependencies = [ - sources."define-property-1.0.0" - sources."extend-shallow-2.0.1" - ]; - }) - (sources."fill-range-4.0.0" // { - dependencies = [ - sources."extend-shallow-2.0.1" - ]; - }) - (sources."glob-parent-3.1.0" // { - dependencies = [ - sources."is-glob-3.1.0" - ]; - }) + sources."define-property-0.2.5" + sources."extend-shallow-2.0.1" (sources."is-accessor-descriptor-0.1.6" // { dependencies = [ sources."kind-of-3.2.2" @@ -61954,146 +62117,90 @@ in sources."kind-of-3.2.2" ]; }) - (sources."is-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-5.1.0" - ]; - }) - sources."is-extglob-2.1.1" - sources."is-glob-4.0.1" - (sources."is-number-3.0.0" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."isobject-3.0.1" - sources."kind-of-6.0.3" - sources."micromatch-3.1.10" + sources."is-descriptor-0.1.6" + sources."kind-of-5.1.0" sources."ms-2.0.0" ]; }) + sources."expand-tilde-2.0.2" + sources."extend-3.0.2" + (sources."extend-shallow-3.0.2" // { + dependencies = [ + sources."is-extendable-1.0.1" + ]; + }) + (sources."extglob-2.0.4" // { + dependencies = [ + sources."define-property-1.0.0" + sources."extend-shallow-2.0.1" + ]; + }) + sources."extsprintf-1.3.0" + sources."fast-deep-equal-3.1.1" sources."fast-json-stable-stringify-2.1.0" - sources."fd-slicer-1.1.0" + sources."fast-safe-stringify-2.0.7" + sources."fb-watchman-2.0.1" sources."figgy-pudding-3.5.1" - sources."file-type-8.1.0" sources."file-uri-to-path-1.0.0" - sources."filename-regex-2.0.1" - sources."filename-reserved-regex-2.0.0" - sources."filenamify-2.1.0" - sources."fill-range-2.2.4" + (sources."fill-range-4.0.0" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) sources."find-cache-dir-2.1.0" - sources."find-up-2.1.0" + sources."find-up-4.1.0" (sources."findup-sync-3.0.0" // { dependencies = [ - sources."arr-diff-4.0.0" - sources."array-unique-0.3.2" - sources."braces-2.3.2" - sources."debug-2.6.9" - sources."define-property-1.0.0" - (sources."expand-brackets-2.1.4" // { - dependencies = [ - sources."define-property-0.2.5" - ]; - }) - sources."extend-shallow-2.0.1" - sources."extglob-2.0.4" - sources."fill-range-4.0.0" - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-5.1.0" - ]; - }) - sources."is-extglob-2.1.1" - sources."is-glob-4.0.1" - (sources."is-number-3.0.0" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."isobject-3.0.1" - sources."kind-of-6.0.3" sources."micromatch-3.1.10" - sources."ms-2.0.0" ]; }) - sources."flow-bin-0.85.0" + sources."flow-bin-0.118.0" sources."flush-write-stream-1.1.1" sources."for-in-1.0.2" - sources."for-own-0.1.5" + sources."forever-agent-0.6.1" + sources."form-data-2.3.3" sources."fragment-cache-0.2.1" sources."from2-2.3.0" sources."fs-constants-1.0.0" sources."fs-write-stream-atomic-1.0.10" sources."fs.realpath-1.0.0" - sources."fsevents-1.2.11" + sources."fsevents-2.1.2" sources."function-bind-1.1.1" sources."gensync-1.0.0-beta.1" + sources."get-assigned-identifiers-1.2.0" sources."get-caller-file-2.0.5" - sources."get-proxy-2.1.0" - sources."get-stream-3.0.0" + sources."get-stream-4.1.0" sources."get-value-2.0.6" + sources."getpass-0.1.7" sources."glob-7.1.6" - sources."glob-base-0.3.0" - sources."glob-parent-2.0.0" - sources."glob-to-regexp-0.3.0" + (sources."glob-parent-3.1.0" // { + dependencies = [ + sources."is-glob-3.1.0" + ]; + }) (sources."global-modules-2.0.0" // { dependencies = [ sources."global-prefix-3.0.0" - sources."kind-of-6.0.3" ]; }) sources."global-prefix-1.0.2" sources."globals-11.12.0" - (sources."globby-8.0.2" // { - dependencies = [ - sources."pify-3.0.0" - ]; - }) sources."google-closure-compiler-js-20170910.0.1" - (sources."got-9.6.0" // { + sources."graceful-fs-4.2.3" + (sources."gunzip-maybe-1.4.1" // { dependencies = [ - sources."@sindresorhus/is-0.14.0" - (sources."cacheable-request-6.1.0" // { - dependencies = [ - sources."get-stream-5.1.0" - sources."lowercase-keys-2.0.0" - ]; - }) - sources."get-stream-4.1.0" - sources."http-cache-semantics-4.0.4" - sources."normalize-url-4.5.0" - sources."p-cancelable-1.1.0" + sources."browserify-zlib-0.1.4" + sources."pako-0.2.9" ]; }) - sources."graceful-fs-4.2.3" - sources."graceful-readlink-1.0.1" - sources."has-ansi-2.0.0" + sources."har-schema-2.0.0" + sources."har-validator-5.1.3" + sources."has-1.0.3" sources."has-flag-3.0.0" - sources."has-symbol-support-x-1.4.2" sources."has-symbols-1.0.1" - sources."has-to-string-tag-x-1.4.1" - (sources."has-value-1.0.0" // { - dependencies = [ - sources."isobject-3.0.1" - ]; - }) + sources."has-value-1.0.0" (sources."has-values-1.0.0" // { dependencies = [ - (sources."is-number-3.0.0" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) sources."kind-of-4.0.0" ]; }) @@ -62102,119 +62209,134 @@ in sources."hmac-drbg-1.0.1" sources."homedir-polyfill-1.0.3" sources."hosted-git-info-2.8.5" - sources."http-cache-semantics-3.8.1" + sources."htmlescape-1.1.1" + sources."http-signature-1.2.0" sources."https-browserify-1.0.0" sources."ieee754-1.1.13" sources."iferr-0.1.5" - sources."ignore-3.3.10" sources."import-local-2.0.0" sources."imurmurhash-0.1.4" sources."infer-owner-1.0.4" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.3.5" + sources."inline-source-map-0.6.2" + sources."insert-module-globals-7.2.0" sources."interpret-1.2.0" - sources."into-stream-3.1.0" sources."invariant-2.2.4" sources."invert-kv-2.0.0" - (sources."is-accessor-descriptor-1.0.0" // { - dependencies = [ - sources."kind-of-6.0.3" - ]; - }) + sources."is-accessor-descriptor-1.0.0" sources."is-arrayish-0.2.1" sources."is-binary-path-1.0.1" sources."is-buffer-1.1.6" - (sources."is-data-descriptor-1.0.0" // { - dependencies = [ - sources."kind-of-6.0.3" - ]; - }) - (sources."is-descriptor-1.0.2" // { - dependencies = [ - sources."kind-of-6.0.3" - ]; - }) - sources."is-dotfile-1.0.3" - sources."is-equal-shallow-0.1.3" + sources."is-callable-1.1.5" + sources."is-ci-2.0.0" + sources."is-data-descriptor-1.0.0" + sources."is-date-object-1.0.2" + sources."is-deflate-1.0.0" + sources."is-descriptor-1.0.2" sources."is-extendable-0.1.1" - sources."is-extglob-1.0.0" - sources."is-finite-1.1.0" + sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-2.0.0" - sources."is-glob-2.0.1" + sources."is-glob-4.0.1" + sources."is-gzip-1.0.0" sources."is-module-1.0.0" - sources."is-natural-number-4.0.1" - sources."is-number-2.1.0" - sources."is-object-1.0.1" - sources."is-plain-obj-1.1.0" - (sources."is-plain-object-2.0.4" // { + (sources."is-number-3.0.0" // { dependencies = [ - sources."isobject-3.0.1" + sources."kind-of-3.2.2" ]; }) - sources."is-posix-bracket-0.1.1" - sources."is-primitive-2.0.0" - sources."is-retry-allowed-1.2.0" + sources."is-plain-object-2.0.4" + (sources."is-reference-1.1.4" // { + dependencies = [ + sources."@types/estree-0.0.39" + ]; + }) + sources."is-regex-1.0.5" sources."is-stream-1.1.0" - sources."is-utf8-0.2.1" + sources."is-symbol-1.0.3" + sources."is-typedarray-1.0.0" sources."is-windows-1.0.2" sources."is-wsl-1.1.0" sources."isarray-1.0.0" sources."isexe-2.0.0" - sources."isobject-2.1.0" - sources."istanbul-lib-coverage-1.2.1" - sources."istanbul-lib-instrument-1.10.2" - sources."isurl-1.0.0" + sources."isobject-3.0.1" + sources."isstream-0.1.2" + sources."istanbul-lib-coverage-3.0.0" + (sources."istanbul-lib-instrument-4.0.1" // { + dependencies = [ + sources."semver-6.3.0" + ]; + }) + sources."jest-haste-map-25.1.0" + sources."jest-regex-util-25.1.0" + sources."jest-serializer-25.1.0" + (sources."jest-util-25.1.0" // { + dependencies = [ + sources."minimist-0.0.8" + sources."mkdirp-0.5.1" + ]; + }) + (sources."jest-worker-25.1.0" // { + dependencies = [ + sources."has-flag-4.0.0" + sources."supports-color-7.1.0" + ]; + }) sources."js-tokens-4.0.0" + sources."js-yaml-3.13.1" + sources."jsbn-0.1.1" sources."jsesc-2.5.2" - sources."json-buffer-3.0.0" sources."json-parse-better-errors-1.0.2" + sources."json-schema-0.2.3" sources."json-schema-traverse-0.4.1" + sources."json-stable-stringify-0.0.1" + sources."json-stringify-safe-5.0.1" sources."json5-2.1.1" + sources."jsonify-0.0.0" + sources."jsonparse-1.3.1" + sources."jsprim-1.4.1" sources."jszip-git://github.com/anmonteiro/jszip#patch-1" - sources."keyv-3.0.0" - sources."kind-of-3.2.2" + sources."kind-of-6.0.3" + sources."labeled-stream-splicer-2.0.2" sources."lcid-2.0.0" sources."leven-3.1.0" sources."levenary-1.1.1" - sources."load-json-file-1.1.0" + sources."lines-and-columns-1.1.6" sources."loader-runner-2.4.0" - (sources."loader-utils-1.2.3" // { + (sources."loader-utils-1.4.0" // { dependencies = [ sources."json5-1.0.1" ]; }) - sources."locate-path-2.0.0" + sources."locate-path-5.0.0" sources."lodash-4.17.15" - sources."log-symbols-2.2.0" + sources."lodash.memoize-3.0.4" sources."loose-envify-1.4.0" - sources."lowercase-keys-1.0.1" sources."lru-cache-5.1.1" sources."magic-string-0.25.6" - (sources."make-dir-2.1.0" // { - dependencies = [ - sources."pify-4.0.1" - ]; - }) + sources."make-dir-2.1.0" + sources."makeerror-1.0.11" sources."mamacro-0.0.3" sources."map-age-cleaner-0.1.3" sources."map-cache-0.2.2" sources."map-visit-1.0.0" - sources."math-random-1.0.4" sources."md5.js-1.3.5" - (sources."mem-4.3.0" // { + sources."mem-4.3.0" + sources."memory-fs-0.4.1" + sources."merge-stream-2.0.0" + (sources."micromatch-4.0.2" // { dependencies = [ - sources."mimic-fn-2.1.0" - sources."p-is-promise-2.1.0" + sources."braces-3.0.2" + sources."fill-range-7.0.1" + sources."is-number-7.0.0" + sources."to-regex-range-5.0.1" ]; }) - sources."memory-fs-0.5.0" - sources."merge2-1.3.0" - sources."micromatch-2.3.11" sources."miller-rabin-4.0.1" sources."mime-db-1.43.0" - sources."mimic-fn-1.2.0" - sources."mimic-response-1.0.1" + sources."mime-types-2.1.26" + sources."mimic-fn-2.1.0" sources."minimalistic-assert-1.0.1" sources."minimalistic-crypto-utils-1.0.1" sources."minimatch-3.0.4" @@ -62225,54 +62347,43 @@ in sources."is-extendable-1.0.1" ]; }) - (sources."mkdirp-0.5.1" // { + sources."mkdirp-1.0.3" + sources."module-deps-6.2.2" + (sources."move-concurrently-1.0.1" // { dependencies = [ sources."minimist-0.0.8" + sources."mkdirp-0.5.1" ]; }) - sources."move-concurrently-1.0.1" sources."ms-2.1.2" - sources."multistream-2.1.1" sources."nan-2.14.0" - (sources."nanomatch-1.2.13" // { - dependencies = [ - sources."arr-diff-4.0.0" - sources."array-unique-0.3.2" - sources."kind-of-6.0.3" - ]; - }) + sources."nanomatch-1.2.13" + sources."ncp-2.0.0" sources."neo-async-2.6.1" - (sources."nexe-3.0.0-beta.7" // { - dependencies = [ - sources."pify-4.0.1" - ]; - }) sources."nice-try-1.0.5" sources."node-fetch-2.6.0" + sources."node-int64-0.4.0" (sources."node-libs-browser-2.2.1" // { dependencies = [ sources."buffer-4.9.2" - sources."punycode-1.4.1" + sources."events-3.1.0" + sources."inherits-2.0.3" + sources."stream-http-2.8.3" + sources."timers-browserify-2.0.11" + sources."tty-browserify-0.0.0" + sources."util-0.11.1" ]; }) + sources."node-modules-regexp-1.0.0" (sources."node-releases-1.1.49" // { dependencies = [ sources."semver-6.3.0" ]; }) sources."normalize-package-data-2.5.0" - sources."normalize-path-2.1.1" - (sources."normalize-url-2.0.1" // { - dependencies = [ - sources."sort-keys-2.0.0" - ]; - }) - (sources."npm-conf-1.1.3" // { - dependencies = [ - sources."pify-3.0.0" - ]; - }) + sources."normalize-path-3.0.0" sources."npm-run-path-2.0.2" + sources."oauth-sign-0.9.0" sources."object-assign-4.1.1" (sources."object-copy-0.1.0" // { dependencies = [ @@ -62284,81 +62395,65 @@ in sources."kind-of-5.1.0" ]; }) + sources."kind-of-3.2.2" ]; }) + sources."object-inspect-1.7.0" sources."object-keys-1.1.1" - (sources."object-visit-1.0.1" // { - dependencies = [ - sources."isobject-3.0.1" - ]; - }) + sources."object-visit-1.0.1" sources."object.assign-4.1.0" - sources."object.omit-2.0.1" - (sources."object.pick-1.3.0" // { - dependencies = [ - sources."isobject-3.0.1" - ]; - }) + sources."object.getownpropertydescriptors-2.1.0" + sources."object.pick-1.3.0" sources."once-1.4.0" - sources."onetime-2.0.1" - (sources."ora-3.4.0" // { - dependencies = [ - sources."ansi-regex-4.1.0" - sources."strip-ansi-5.2.0" - ]; - }) sources."os-browserify-0.3.0" sources."os-locale-3.1.0" - sources."p-cancelable-0.4.1" sources."p-defer-1.0.0" - sources."p-event-2.3.1" sources."p-finally-1.0.0" - sources."p-is-promise-1.1.0" - sources."p-limit-1.3.0" - sources."p-locate-2.0.0" - sources."p-timeout-2.0.1" - sources."p-try-1.0.0" + sources."p-is-promise-2.1.0" + sources."p-limit-2.2.2" + sources."p-locate-4.1.0" + sources."p-try-2.2.0" sources."pako-1.0.11" sources."parallel-transform-1.2.0" - sources."paredit.js-0.3.4" + sources."paredit.js-0.3.6" + sources."parents-1.0.1" sources."parse-asn1-5.1.5" - sources."parse-glob-3.0.4" - sources."parse-json-2.2.0" + sources."parse-json-5.0.0" sources."parse-passwd-1.0.0" sources."pascalcase-0.1.1" sources."path-browserify-0.0.1" sources."path-dirname-1.0.2" - sources."path-exists-3.0.0" + sources."path-exists-4.0.0" sources."path-is-absolute-1.0.1" sources."path-key-2.0.1" sources."path-parse-1.0.6" - sources."path-type-1.1.0" + sources."path-platform-0.11.15" sources."pbkdf2-3.0.17" - sources."pend-1.2.0" - sources."pify-2.3.0" - sources."pinkie-2.0.4" - sources."pinkie-promise-2.0.1" + sources."peek-stream-1.1.3" + sources."performance-now-2.1.0" + sources."picomatch-2.2.1" + sources."pify-4.0.1" + sources."pinkie-1.0.0" + sources."pinkie-promise-1.0.0" + sources."pirates-4.0.1" (sources."pkg-dir-3.0.0" // { dependencies = [ sources."find-up-3.0.0" sources."locate-path-3.0.0" - sources."p-limit-2.2.2" sources."p-locate-3.0.0" - sources."p-try-2.2.0" + sources."path-exists-3.0.0" ]; }) sources."posix-character-classes-0.1.1" sources."posix-getopt-git://github.com/anmonteiro/node-getopt#master" - sources."prepend-http-2.0.0" - sources."preserve-0.2.0" - sources."prettier-1.15.1" + sources."prettier-1.19.1" sources."private-0.1.8" sources."process-0.11.10" sources."process-nextick-args-2.0.1" sources."progress-2.0.3" sources."promise-inflight-1.0.1" - sources."proto-list-1.2.4" sources."prr-1.0.1" + sources."psl-1.7.0" sources."public-encrypt-4.0.3" sources."pump-3.0.0" (sources."pumpify-1.5.1" // { @@ -62366,78 +62461,29 @@ in sources."pump-2.0.1" ]; }) - sources."punycode-2.1.1" - sources."query-string-5.1.1" + sources."punycode-1.4.1" + sources."qs-6.5.2" sources."querystring-0.2.0" sources."querystring-es3-0.2.1" - (sources."randomatic-3.1.1" // { - dependencies = [ - sources."is-number-4.0.0" - sources."kind-of-6.0.3" - ]; - }) sources."randombytes-2.1.0" sources."randomfill-1.0.4" - (sources."read-pkg-4.0.1" // { - dependencies = [ - sources."parse-json-4.0.0" - sources."pify-3.0.0" - ]; - }) - (sources."read-pkg-up-1.0.1" // { + sources."read-only-stream-2.0.0" + sources."read-pkg-5.2.0" + (sources."readable-stream-2.3.7" // { dependencies = [ - sources."find-up-1.1.2" - sources."path-exists-2.1.0" - sources."read-pkg-1.1.0" + sources."string_decoder-1.1.1" ]; }) - sources."readable-stream-2.3.7" (sources."readdirp-2.2.1" // { dependencies = [ - sources."arr-diff-4.0.0" - sources."array-unique-0.3.2" - sources."braces-2.3.2" - sources."debug-2.6.9" - sources."define-property-1.0.0" - (sources."expand-brackets-2.1.4" // { - dependencies = [ - sources."define-property-0.2.5" - ]; - }) - sources."extend-shallow-2.0.1" - sources."extglob-2.0.4" - sources."fill-range-4.0.0" - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-5.1.0" - ]; - }) - (sources."is-number-3.0.0" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."isobject-3.0.1" - sources."kind-of-6.0.3" sources."micromatch-3.1.10" - sources."ms-2.0.0" ]; }) + sources."realpath-native-1.1.0" sources."regenerate-1.4.0" sources."regenerate-unicode-properties-8.1.0" sources."regenerator-runtime-0.13.3" sources."regenerator-transform-0.14.1" - sources."regex-cache-0.4.4" sources."regex-not-1.0.2" sources."regexpu-core-4.6.0" sources."regjsgen-0.5.1" @@ -62449,24 +62495,14 @@ in sources."remove-trailing-separator-1.1.0" sources."repeat-element-1.1.3" sources."repeat-string-1.6.1" - sources."repeating-2.0.1" sources."replace-ext-1.0.0" + sources."request-2.88.2" sources."require-directory-2.1.1" - sources."require-main-filename-1.0.1" + sources."require-main-filename-2.0.0" sources."resolve-1.15.1" - sources."resolve-cwd-2.0.0" - (sources."resolve-dependencies-2.2.3" // { + (sources."resolve-cwd-2.0.0" // { dependencies = [ - sources."dir-glob-2.2.2" - sources."globby-9.2.0" - sources."ignore-4.0.6" - (sources."path-type-3.0.0" // { - dependencies = [ - sources."pify-3.0.0" - ]; - }) - sources."pify-4.0.1" - sources."slash-2.0.0" + sources."resolve-from-3.0.0" ]; }) (sources."resolve-dir-1.0.1" // { @@ -62474,30 +62510,32 @@ in sources."global-modules-1.0.0" ]; }) - sources."resolve-from-3.0.0" + sources."resolve-from-5.0.0" sources."resolve-url-0.2.1" - sources."responselike-1.0.2" - sources."restore-cursor-2.0.0" sources."ret-0.1.15" sources."retry-0.12.0" sources."rimraf-2.7.1" sources."ripemd160-2.0.2" - sources."rollup-0.67.0" - sources."rollup-plugin-babel-4.0.3" - sources."rollup-plugin-babel-minify-6.1.1" - (sources."rollup-plugin-commonjs-9.2.0" // { - dependencies = [ - sources."estree-walker-0.5.2" - ]; - }) - sources."rollup-plugin-node-resolve-3.4.0" - sources."rollup-plugin-replace-2.1.0" + sources."rollup-1.31.1" + sources."rollup-plugin-babel-4.3.3" + sources."rollup-plugin-babel-minify-9.1.1" + sources."rollup-plugin-commonjs-10.1.0" + sources."rollup-plugin-node-resolve-5.2.0" + sources."rollup-plugin-replace-2.2.0" sources."rollup-pluginutils-2.8.2" + sources."rsvp-4.8.5" sources."run-queue-1.0.3" sources."safe-buffer-5.1.2" sources."safe-regex-1.1.0" + sources."safer-buffer-2.1.2" + (sources."sane-4.1.0" // { + dependencies = [ + sources."anymatch-2.0.0" + sources."micromatch-3.1.10" + sources."normalize-path-2.1.1" + ]; + }) sources."schema-utils-1.0.0" - sources."seek-bzip-1.0.5" sources."semver-5.7.1" sources."serialize-javascript-2.1.2" sources."set-blocking-2.0.0" @@ -62508,10 +62546,14 @@ in }) sources."setimmediate-1.0.5" sources."sha.js-2.4.11" + sources."shasum-1.0.2" + sources."shasum-object-1.0.0" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" + sources."shell-quote-1.7.2" sources."signal-exit-3.0.2" - sources."slash-1.0.0" + sources."simple-concat-1.0.0" + sources."slash-3.0.0" (sources."snapdragon-0.8.2" // { dependencies = [ sources."debug-2.6.9" @@ -62535,12 +62577,13 @@ in (sources."snapdragon-node-2.1.1" // { dependencies = [ sources."define-property-1.0.0" - sources."isobject-3.0.1" ]; }) - sources."snapdragon-util-3.0.1" - sources."sort-keys-1.1.2" - sources."sort-keys-length-1.0.1" + (sources."snapdragon-util-3.0.1" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) sources."source-list-map-0.1.8" sources."source-map-0.5.7" sources."source-map-resolve-0.5.3" @@ -62556,6 +62599,8 @@ in sources."spdx-expression-parse-3.0.0" sources."spdx-license-ids-3.0.5" sources."split-string-3.1.0" + sources."sprintf-js-1.0.3" + sources."sshpk-1.16.1" sources."ssri-6.0.1" (sources."static-extend-0.1.2" // { dependencies = [ @@ -62575,28 +62620,36 @@ in ]; }) sources."stream-browserify-2.0.2" + sources."stream-combiner2-1.1.1" sources."stream-each-1.2.3" - sources."stream-http-2.8.3" + (sources."stream-http-3.1.0" // { + dependencies = [ + sources."readable-stream-3.6.0" + ]; + }) sources."stream-shift-1.0.1" - sources."strict-uri-encode-1.1.0" - (sources."string-width-3.1.0" // { + sources."stream-splicer-2.0.1" + sources."string-width-3.1.0" + sources."string.prototype.trimleft-2.1.1" + sources."string.prototype.trimright-2.1.1" + (sources."string_decoder-1.3.0" // { dependencies = [ - sources."ansi-regex-4.1.0" - sources."strip-ansi-5.2.0" + sources."safe-buffer-5.2.0" ]; }) - sources."string_decoder-1.1.1" - sources."strip-ansi-3.0.1" - sources."strip-bom-2.0.0" - sources."strip-dirs-2.1.0" + sources."strip-ansi-5.2.0" sources."strip-eof-1.0.0" - sources."strip-outer-1.0.1" - sources."supports-color-2.0.0" + sources."subarg-1.0.0" + sources."supports-color-5.5.0" + sources."syntax-error-1.4.0" sources."tapable-1.1.3" - sources."tar-stream-1.6.2" + (sources."tar-stream-2.1.0" // { + dependencies = [ + sources."readable-stream-3.6.0" + ]; + }) (sources."terser-4.6.3" // { dependencies = [ - sources."commander-2.20.3" sources."source-map-0.6.1" ]; }) @@ -62605,29 +62658,34 @@ in sources."source-map-0.6.1" ]; }) - sources."test-exclude-4.2.3" + sources."test-exclude-6.0.0" sources."through-2.3.8" sources."through2-2.0.5" - sources."timed-out-4.0.1" - sources."timers-browserify-2.0.11" + sources."timers-browserify-1.4.2" + sources."tmpl-1.0.4" sources."to-arraybuffer-1.0.1" - sources."to-buffer-1.1.1" sources."to-fast-properties-2.0.0" - sources."to-object-path-0.3.0" - sources."to-readable-stream-1.0.0" + (sources."to-object-path-0.3.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) sources."to-regex-3.0.2" - (sources."to-regex-range-2.1.1" // { + sources."to-regex-range-2.1.1" + (sources."tough-cookie-2.5.0" // { dependencies = [ - sources."is-number-3.0.0" + sources."punycode-2.1.1" ]; }) - sources."trim-repeated-1.0.0" - sources."trim-right-1.0.1" sources."tslib-1.10.0" - sources."tty-browserify-0.0.0" + sources."tty-browserify-0.0.1" sources."tunnel-agent-0.6.0" + sources."tweetnacl-0.14.5" + sources."type-fest-0.6.0" sources."typedarray-0.0.6" - sources."unbzip2-stream-1.3.3" + sources."typedarray-to-buffer-3.1.5" + sources."umd-3.0.3" + sources."undeclared-identifiers-1.1.3" sources."unicode-canonical-property-names-ecmascript-1.0.4" sources."unicode-match-property-ecmascript-1.0.4" sources."unicode-match-property-value-ecmascript-1.1.0" @@ -62643,79 +62701,55 @@ in ]; }) sources."has-values-0.1.4" - sources."isobject-3.0.1" ]; }) sources."upath-1.2.0" - sources."uri-js-4.2.2" + (sources."uri-js-4.2.2" // { + dependencies = [ + sources."punycode-2.1.1" + ]; + }) sources."urix-0.1.0" (sources."url-0.11.0" // { dependencies = [ sources."punycode-1.3.2" ]; }) - sources."url-parse-lax-3.0.0" - sources."url-to-options-1.0.1" sources."use-3.1.1" - (sources."util-0.11.1" // { + (sources."util-0.10.4" // { dependencies = [ sources."inherits-2.0.3" ]; }) sources."util-deprecate-1.0.2" + sources."util.promisify-1.0.1" + sources."uuid-3.4.0" sources."v8-compile-cache-2.0.3" sources."validate-npm-package-license-3.0.4" + sources."verror-1.10.0" sources."vinyl-2.2.0" sources."vm-browserify-1.1.2" + sources."walker-1.0.7" sources."watchpack-1.6.0" - sources."wcwidth-1.0.1" (sources."webpack-4.41.6" // { dependencies = [ - sources."arr-diff-4.0.0" - sources."array-unique-0.3.2" - sources."braces-2.3.2" - sources."debug-2.6.9" - sources."define-property-1.0.0" - sources."eslint-scope-4.0.3" - (sources."expand-brackets-2.1.4" // { - dependencies = [ - sources."define-property-0.2.5" - ]; - }) - sources."extend-shallow-2.0.1" - sources."extglob-2.0.4" - sources."fill-range-4.0.0" - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-5.1.0" - ]; - }) - (sources."is-number-3.0.0" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."isobject-3.0.1" - sources."kind-of-6.0.3" - sources."memory-fs-0.4.1" + sources."acorn-6.4.0" sources."micromatch-3.1.10" - sources."ms-2.0.0" + sources."minimist-0.0.8" + sources."mkdirp-0.5.1" ]; }) (sources."webpack-cli-3.3.11" // { dependencies = [ + (sources."chalk-2.4.2" // { + dependencies = [ + sources."supports-color-5.5.0" + ]; + }) + sources."emojis-list-2.1.0" sources."enhanced-resolve-4.1.0" - sources."memory-fs-0.4.1" + sources."json5-1.0.1" + sources."loader-utils-1.2.3" sources."supports-color-6.1.0" ]; }) @@ -62734,19 +62768,13 @@ in sources."which-module-2.0.0" (sources."which-promise-1.0.0" // { dependencies = [ - sources."pinkie-1.0.0" - sources."pinkie-promise-1.0.0" + sources."pify-2.3.0" ]; }) sources."worker-farm-1.7.0" - (sources."wrap-ansi-5.1.0" // { - dependencies = [ - sources."ansi-regex-4.1.0" - sources."ansi-styles-3.2.1" - sources."strip-ansi-5.2.0" - ]; - }) + sources."wrap-ansi-5.1.0" sources."wrappy-1.0.2" + sources."write-file-atomic-3.0.1" sources."xtend-4.0.2" sources."y18n-4.0.0" sources."yallist-3.1.1" @@ -62754,14 +62782,11 @@ in dependencies = [ sources."find-up-3.0.0" sources."locate-path-3.0.0" - sources."p-limit-2.2.2" sources."p-locate-3.0.0" - sources."p-try-2.2.0" - sources."require-main-filename-2.0.0" + sources."path-exists-3.0.0" ]; }) sources."yargs-parser-13.1.1" - sources."yauzl-2.10.0" ]; buildInputs = globalBuildInputs; meta = { @@ -63381,7 +63406,7 @@ in sources."longest-1.0.1" sources."lru-cache-2.7.3" sources."lru-queue-0.1.0" - sources."make-error-1.3.5" + sources."make-error-1.3.6" sources."make-error-cause-1.2.2" sources."make-iterator-1.0.1" sources."map-cache-0.2.2" @@ -63595,7 +63620,7 @@ in sources."tweetnacl-0.14.5" sources."type-1.2.0" sources."typescript-3.7.5" - (sources."uglify-js-3.7.7" // { + (sources."uglify-js-3.8.0" // { dependencies = [ sources."source-map-0.6.1" ]; @@ -66076,7 +66101,7 @@ in sources."callsites-2.0.0" sources."camelcase-5.3.1" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001027" + sources."caniuse-lite-1.0.30001028" sources."caseless-0.12.0" sources."chalk-2.4.2" sources."chokidar-2.1.8" @@ -66149,7 +66174,6 @@ in ]; }) sources."css-tree-1.0.0-alpha.37" - sources."css-unit-converter-1.1.1" sources."css-what-3.2.1" sources."cssesc-0.1.0" sources."cssnano-4.1.10" @@ -66212,7 +66236,7 @@ in sources."duplexer2-0.1.4" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.353" + sources."electron-to-chromium-1.3.355" sources."elliptic-6.5.2" sources."emoji-regex-7.0.3" sources."encodeurl-1.0.2" @@ -66509,12 +66533,16 @@ in sources."physical-cpu-count-2.0.0" sources."pn-1.1.0" sources."posix-character-classes-0.1.1" - (sources."postcss-7.0.26" // { + (sources."postcss-7.0.27" // { dependencies = [ sources."supports-color-6.1.0" ]; }) - sources."postcss-calc-7.0.1" + (sources."postcss-calc-7.0.2" // { + dependencies = [ + sources."postcss-value-parser-4.0.3" + ]; + }) sources."postcss-colormin-4.0.3" sources."postcss-convert-values-4.0.1" sources."postcss-discard-comments-4.0.2" @@ -66567,9 +66595,9 @@ in sources."postcss-ordered-values-4.1.2" sources."postcss-reduce-initial-4.0.3" sources."postcss-reduce-transforms-4.0.2" - (sources."postcss-selector-parser-5.0.0" // { + (sources."postcss-selector-parser-6.0.2" // { dependencies = [ - sources."cssesc-2.0.0" + sources."cssesc-3.0.0" ]; }) sources."postcss-svgo-4.0.2" @@ -66585,12 +66613,7 @@ in sources."psl-1.7.0" sources."public-encrypt-4.0.3" sources."punycode-2.1.1" - (sources."purgecss-1.4.2" // { - dependencies = [ - sources."cssesc-3.0.0" - sources."postcss-selector-parser-6.0.2" - ]; - }) + sources."purgecss-1.4.2" sources."q-1.5.1" sources."qs-6.5.2" sources."querystring-0.2.0" @@ -66753,9 +66776,7 @@ in sources."typedarray-0.0.6" (sources."uncss-0.17.3" // { dependencies = [ - sources."cssesc-3.0.0" sources."is-absolute-url-3.0.3" - sources."postcss-selector-parser-6.0.2" ]; }) sources."unicode-canonical-property-names-ecmascript-1.0.4" @@ -68288,10 +68309,10 @@ in serverless = nodeEnv.buildNodePackage { name = "serverless"; packageName = "serverless"; - version = "1.63.0"; + version = "1.64.0"; src = fetchurl { - url = "https://registry.npmjs.org/serverless/-/serverless-1.63.0.tgz"; - sha512 = "dMwUiAsVoE+25R2jmD0+DfRf9VpvjBN8mgqweXtvm3k6TP536a9Wug8Ue6pc0KpEPc++zg5lIyd1zlTlrSHnPg=="; + url = "https://registry.npmjs.org/serverless/-/serverless-1.64.0.tgz"; + sha512 = "N1Ls4ecV1++ZYqZ6RRVUOqMrHZrwBW/nvy/P1N7FCfJX1k9LQMtUe6wa4X5+q0kiFdhIHYYCteHcpSGJbyOwTw=="; }; dependencies = [ sources."2-thenable-1.0.0" @@ -68358,7 +68379,7 @@ in sources."async-limiter-1.0.1" sources."asynckit-0.4.0" sources."atob-2.1.2" - (sources."aws-sdk-2.620.0" // { + (sources."aws-sdk-2.622.0" // { dependencies = [ sources."buffer-4.9.1" sources."uuid-3.3.2" @@ -68469,32 +68490,19 @@ in sources."debug-4.1.1" sources."decamelize-1.2.0" sources."decode-uri-component-0.2.0" - (sources."decompress-4.2.0" // { - dependencies = [ - sources."pify-2.3.0" - ]; - }) + sources."decompress-4.2.0" sources."decompress-response-3.3.0" - (sources."decompress-tar-4.1.1" // { - dependencies = [ - sources."file-type-5.2.0" - ]; - }) + sources."decompress-tar-4.1.1" (sources."decompress-tarbz2-4.1.1" // { dependencies = [ sources."file-type-6.2.0" ]; }) - (sources."decompress-targz-4.1.1" // { - dependencies = [ - sources."file-type-5.2.0" - ]; - }) + sources."decompress-targz-4.1.1" (sources."decompress-unzip-4.0.1" // { dependencies = [ sources."file-type-3.9.0" sources."get-stream-2.3.1" - sources."pify-2.3.0" ]; }) sources."deep-extend-0.6.0" @@ -68508,6 +68516,7 @@ in dependencies = [ sources."@sindresorhus/is-0.7.0" sources."cacheable-request-2.1.4" + sources."file-type-8.1.0" sources."get-stream-3.0.0" sources."got-8.3.2" sources."http-cache-semantics-3.8.1" @@ -68515,6 +68524,7 @@ in sources."lowercase-keys-1.0.0" sources."normalize-url-2.0.1" sources."p-cancelable-0.4.1" + sources."pify-3.0.0" sources."sort-keys-2.0.0" ]; }) @@ -68553,7 +68563,7 @@ in sources."fast-levenshtein-2.0.6" sources."fd-slicer-1.1.0" sources."figures-3.2.0" - sources."file-type-8.1.0" + sources."file-type-5.2.0" sources."filename-reserved-regex-2.0.0" sources."filenamify-2.1.0" sources."filesize-3.6.1" @@ -68585,11 +68595,7 @@ in sources."glob-7.1.6" sources."glob-parent-5.1.0" sources."global-dirs-0.1.1" - (sources."globby-6.1.0" // { - dependencies = [ - sources."pify-2.3.0" - ]; - }) + sources."globby-6.1.0" sources."got-9.6.0" sources."graceful-fs-4.2.3" sources."graceful-readlink-1.0.1" @@ -68701,7 +68707,11 @@ in sources."lru-cache-4.1.5" sources."lru-queue-0.1.0" sources."lsmod-1.0.0" - sources."make-dir-1.3.0" + (sources."make-dir-1.3.0" // { + dependencies = [ + sources."pify-3.0.0" + ]; + }) sources."map-cache-0.2.2" sources."map-visit-1.0.0" sources."memoizee-0.4.14" @@ -68732,7 +68742,11 @@ in sources."node-fetch-1.7.3" sources."normalize-path-3.0.0" sources."normalize-url-4.5.0" - sources."npm-conf-1.1.3" + (sources."npm-conf-1.1.3" // { + dependencies = [ + sources."pify-3.0.0" + ]; + }) sources."npm-run-path-2.0.2" sources."object-assign-4.1.1" (sources."object-copy-0.1.0" // { @@ -68780,7 +68794,7 @@ in sources."path-loader-1.0.10" sources."pend-1.2.0" sources."picomatch-2.2.1" - sources."pify-3.0.0" + sources."pify-2.3.0" sources."pinkie-2.0.4" sources."pinkie-promise-2.0.1" sources."prepend-http-2.0.0" @@ -69639,10 +69653,10 @@ in snyk = nodeEnv.buildNodePackage { name = "snyk"; packageName = "snyk"; - version = "1.292.0"; + version = "1.294.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.292.0.tgz"; - sha512 = "ga4ouBqRc897Ts80yzdZG25zqGgbU3ah8VKtLyRjK1ZmApHy+PRi2zBVJcwMspyfhyaCh47vr1siIqHler4rxg=="; + url = "https://registry.npmjs.org/snyk/-/snyk-1.294.0.tgz"; + sha512 = "F+kDV9GvZUPtkAnssUae1bxoh471fNR2vNDUXsvgdAiZuqHw+N6i/ZTTWuCf3T7GWSuNb5OlGray/5uvS7WJAw=="; }; dependencies = [ sources."@snyk/cli-interface-2.3.0" @@ -69663,7 +69677,7 @@ in sources."@types/debug-4.1.5" sources."@types/events-3.0.0" sources."@types/js-yaml-3.12.2" - sources."@types/node-13.7.1" + sources."@types/node-13.7.4" sources."@types/restify-4.3.6" sources."@types/semver-5.5.0" sources."@types/xml2js-0.4.3" @@ -69921,8 +69935,8 @@ in sources."debug-4.1.1" ]; }) - sources."snyk-go-parser-1.3.1" - (sources."snyk-go-plugin-1.11.1" // { + sources."snyk-go-parser-1.3.3" + (sources."snyk-go-plugin-1.12.0" // { dependencies = [ sources."debug-4.1.1" ]; @@ -71194,7 +71208,7 @@ in sources."async-1.5.2" sources."async-limiter-1.0.1" sources."asynckit-0.4.0" - (sources."aws-sdk-2.620.0" // { + (sources."aws-sdk-2.622.0" // { dependencies = [ sources."uuid-3.3.2" ]; @@ -72614,7 +72628,7 @@ in sources."truncate-utf8-bytes-1.0.2" sources."type-is-1.6.18" sources."typedarray-0.0.6" - (sources."uglify-js-3.7.7" // { + (sources."uglify-js-3.8.0" // { dependencies = [ sources."source-map-0.6.1" ]; @@ -72685,7 +72699,7 @@ in sha256 = "886069ecc5eedf0371b948e8ff66e7f2943c85fe7cfdaa7183e1a3572d55852b"; }; dependencies = [ - sources."@types/node-13.7.1" + sources."@types/node-13.7.4" sources."ajv-6.11.0" sources."ansi-regex-4.1.0" sources."ansi-styles-3.2.1" @@ -73286,10 +73300,10 @@ in sources."minimatch-3.0.4" sources."minimist-1.2.0" sources."ms-2.1.2" - sources."nlcst-is-literal-1.2.0" - sources."nlcst-normalize-2.1.3" + sources."nlcst-is-literal-1.2.1" + sources."nlcst-normalize-2.1.4" sources."nlcst-search-1.5.1" - sources."nlcst-to-string-2.0.3" + sources."nlcst-to-string-2.0.4" sources."normalize-package-data-2.5.0" sources."npm-prefix-1.2.0" sources."npm-run-path-2.0.2" @@ -73824,7 +73838,7 @@ in sources."@types/color-name-1.1.1" sources."@types/http-cache-semantics-4.0.0" sources."@types/keyv-3.1.1" - sources."@types/node-13.7.1" + sources."@types/node-13.7.4" sources."@types/responselike-1.0.0" sources."abbrev-1.1.1" sources."abstract-logging-1.0.0" @@ -74714,10 +74728,10 @@ in uglify-js = nodeEnv.buildNodePackage { name = "uglify-js"; packageName = "uglify-js"; - version = "3.7.7"; + version = "3.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.7.7.tgz"; - sha512 = "FeSU+hi7ULYy6mn8PKio/tXsdSXN35lm4KgV2asx00kzrLU9Pi3oAslcJT70Jdj7PHX29gGUPOT6+lXGBbemhA=="; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.8.0.tgz"; + sha512 = "ugNSTT8ierCsDHso2jkBHXYrU8Y5/fY2ZUprfrJUiD7YpuFvV4jODLFmb3h4btQjqr5Nh4TX4XtgDfCU1WdioQ=="; }; dependencies = [ sources."commander-2.20.3" @@ -75489,7 +75503,7 @@ in sources."tslib-1.10.0" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" - sources."uglify-js-3.7.7" + sources."uglify-js-3.8.0" sources."uid-0.0.2" sources."unbzip2-stream-1.3.3" sources."unyield-0.0.1" @@ -75547,7 +75561,7 @@ in sources."@starptech/rehype-webparser-0.10.0" sources."@starptech/webparser-0.10.0" sources."@szmarczak/http-timer-1.1.2" - sources."@types/node-13.7.1" + sources."@types/node-13.7.4" sources."@types/unist-2.0.3" sources."@types/vfile-3.0.2" sources."@types/vfile-message-2.0.0" @@ -76544,7 +76558,7 @@ in sources."@szmarczak/http-timer-1.1.2" sources."@types/color-name-1.1.1" sources."@types/minimatch-3.0.3" - sources."@types/node-13.7.1" + sources."@types/node-13.7.4" sources."JSONSelect-0.2.1" sources."acorn-6.4.0" sources."acorn-jsx-5.1.0" @@ -77731,7 +77745,7 @@ in sources."domain-browser-1.2.0" sources."duplexify-3.7.1" sources."elliptic-6.5.2" - sources."emojis-list-2.1.0" + sources."emojis-list-3.0.0" sources."end-of-stream-1.4.4" (sources."enhanced-resolve-4.1.1" // { dependencies = [ @@ -77838,7 +77852,7 @@ in sources."json5-1.0.1" sources."kind-of-6.0.3" sources."loader-runner-2.4.0" - sources."loader-utils-1.2.3" + sources."loader-utils-1.4.0" sources."locate-path-3.0.0" sources."lru-cache-5.1.1" sources."make-dir-2.1.0" @@ -78424,7 +78438,7 @@ in sources."@types/events-3.0.0" sources."@types/glob-7.1.1" sources."@types/minimatch-3.0.3" - sources."@types/node-13.7.1" + sources."@types/node-13.7.4" sources."accepts-1.3.7" sources."ajv-6.11.0" sources."ajv-errors-1.0.1" @@ -79043,7 +79057,7 @@ in sources."cyclist-1.0.1" sources."dir-glob-2.2.2" sources."duplexify-3.7.1" - sources."emojis-list-2.1.0" + sources."emojis-list-3.0.0" sources."end-of-stream-1.4.4" sources."fast-deep-equal-3.1.1" sources."fast-json-stable-stringify-2.1.0" @@ -79081,7 +79095,7 @@ in sources."minimist-1.2.0" ]; }) - sources."loader-utils-1.2.3" + sources."loader-utils-1.4.0" sources."locate-path-3.0.0" sources."lru-cache-5.1.1" sources."make-dir-2.1.0" @@ -79170,7 +79184,7 @@ in sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" sources."@types/long-4.0.1" - sources."@types/node-10.17.15" + sources."@types/node-10.17.16" sources."addr-to-ip-port-1.5.1" sources."airplay-js-0.3.0" sources."balanced-match-1.0.0" diff --git a/pkgs/development/python-modules/aiohttp/default.nix b/pkgs/development/python-modules/aiohttp/default.nix index 737d1eec3c21..304a2a362e97 100644 --- a/pkgs/development/python-modules/aiohttp/default.nix +++ b/pkgs/development/python-modules/aiohttp/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { }; checkInputs = [ - pytestrunner pytest gunicorn pytest-timeout async_generator pytest_xdist + pytestrunner pytest gunicorn async_generator pytest_xdist pytest-mock pytestcov trustme brotlipy freezegun ]; diff --git a/pkgs/development/python-modules/aioresponses/default.nix b/pkgs/development/python-modules/aioresponses/default.nix index 446bb9e63791..01c37275fc31 100644 --- a/pkgs/development/python-modules/aioresponses/default.nix +++ b/pkgs/development/python-modules/aioresponses/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "aioresponses"; - version = "0.6.2"; + version = "0.6.3"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "0srqbxxxffi3idqd161n5b90xyqy9gibigxxmvqag3nxab5vw1j6"; + sha256 = "06w15iyr07s861hkzqfdclzxkpvgg83sx8f235mz8k2490hnyqvv"; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/aiorun/default.nix b/pkgs/development/python-modules/aiorun/default.nix index aa7462ba831f..16a8a167fbba 100644 --- a/pkgs/development/python-modules/aiorun/default.nix +++ b/pkgs/development/python-modules/aiorun/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "aiorun"; - version = "2020.1.3"; + version = "2020.2.1"; format = "flit"; disabled = isPy27; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "cjrh"; repo = pname; rev = "v${version}"; - sha256 = "0ka0pj6xr47j7rw6kd5mkrr5jyhn631pfpd95ig7vbln4434qnb4"; + sha256 = "0wcj8prkijb889ic8n6varms7xkwy028hhw0imgkd1i0p64lm3m4"; }; checkInputs = [ diff --git a/pkgs/development/python-modules/ansible-runner/default.nix b/pkgs/development/python-modules/ansible-runner/default.nix index 62f95c3cefce..6a71ae9e1d3e 100644 --- a/pkgs/development/python-modules/ansible-runner/default.nix +++ b/pkgs/development/python-modules/ansible-runner/default.nix @@ -6,6 +6,7 @@ , python-daemon , pyyaml , six +, stdenv , ansible , pytest , mock @@ -30,8 +31,12 @@ buildPythonPackage rec { six ]; + # test_process_isolation_settings is currently broken on Darwin Catalina + # https://github.com/ansible/ansible-runner/issues/413 checkPhase = '' - HOME=$(mktemp -d) pytest --ignore test/unit/test_runner.py -k "not test_prepare" + HOME=$TMPDIR pytest \ + --ignore test/unit/test_runner.py \ + -k "not prepare ${lib.optionalString stdenv.isDarwin "and not process_isolation_settings"}" ''; meta = with lib; { diff --git a/pkgs/development/python-modules/azure-core/default.nix b/pkgs/development/python-modules/azure-core/default.nix index aab979f3a8fb..24675200b5b1 100644 --- a/pkgs/development/python-modules/azure-core/default.nix +++ b/pkgs/development/python-modules/azure-core/default.nix @@ -11,14 +11,14 @@ }: buildPythonPackage rec { - version = "1.2.1"; + version = "1.2.2"; pname = "azure-core"; disabled = isPy27; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "1fff6g5lszn97qz1h4l1n255r9538yybb329ilb2rwdfq3q9kkg2"; + sha256 = "0bz4m6kmqymxlxf9qk6jw8v895d13rsggbgsjpsbvi9px6w15nwb"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/braintree/default.nix b/pkgs/development/python-modules/braintree/default.nix index b96e0b7874a6..db5ed5410e3e 100644 --- a/pkgs/development/python-modules/braintree/default.nix +++ b/pkgs/development/python-modules/braintree/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "braintree"; - version = "3.58.0"; + version = "3.59.0"; src = fetchPypi { inherit pname version; - sha256 = "0n8k9m3kifj34rzi2a3jgjsik91w8z32xaaxcmvqs7x8m5m3kjj4"; + sha256 = "08g8qlnsp9wd2zbf6x3npp1425g7ih4lyljzvybd3vazsbqlw4yq"; }; propagatedBuildInputs = [ requests ]; diff --git a/pkgs/development/python-modules/bsddb3/default.nix b/pkgs/development/python-modules/bsddb3/default.nix index a286249ea0f3..7a541a479527 100644 --- a/pkgs/development/python-modules/bsddb3/default.nix +++ b/pkgs/development/python-modules/bsddb3/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "bsddb3"; - version = "6.2.6"; + version = "6.2.7"; src = fetchPypi { inherit pname version; - sha256 = "42d621f4037425afcb16b67d5600c4556271a071a9a7f7f2c2b1ba65bc582d05"; + sha256 = "17yw0by4lycwpvnx06cnzbbchz4zvzbx3j89b20xa314xdizmxxh"; }; buildInputs = [ pkgs.db ]; diff --git a/pkgs/development/python-modules/can/default.nix b/pkgs/development/python-modules/can/default.nix index b9d2b4b7751a..8aa80a750678 100644 --- a/pkgs/development/python-modules/can/default.nix +++ b/pkgs/development/python-modules/can/default.nix @@ -24,12 +24,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ wrapt pyserial aenum ] ++ lib.optional (pythonOlder "3.5") typing; - checkInputs = [ nose mock pytest pytest-timeout hypothesis future ]; - - # Tests won't work with hypothesis 4.7.3 under Python 2. So skip the tests in - # that case. This clause can be removed once hypothesis has been upgraded in - # nixpkgs. - doCheck = !(isPy27 && (hypothesis.version == "4.7.3")); + checkInputs = [ nose mock pytest hypothesis future ]; # Add the scripts to PATH checkPhase = '' diff --git a/pkgs/development/python-modules/ckcc-protocol/default.nix b/pkgs/development/python-modules/ckcc-protocol/default.nix index 599f91f2d070..f1136851f8a8 100644 --- a/pkgs/development/python-modules/ckcc-protocol/default.nix +++ b/pkgs/development/python-modules/ckcc-protocol/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "ckcc-protocol"; - version = "0.8.0"; + version = "1.0.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "1mbs9l8qycy50j5lq6az7l5d8i40nb0vmlyhcyax298qp6c1r1gh"; + sha256 = "1glws7z7kk9qyl1j4446hb6vv3l4s5xca40zb4fzhsh6chm76h11"; }; checkInputs = [ diff --git a/pkgs/development/python-modules/decorator/default.nix b/pkgs/development/python-modules/decorator/default.nix index f23d59291925..efdd5023a246 100644 --- a/pkgs/development/python-modules/decorator/default.nix +++ b/pkgs/development/python-modules/decorator/default.nix @@ -1,5 +1,6 @@ { lib , buildPythonPackage +, fetchpatch , fetchPypi }: @@ -12,9 +13,12 @@ buildPythonPackage rec { sha256 = "54c38050039232e1db4ad7375cfce6748d7b41c29e95a081c8a6d2c30364a2ce"; }; - postPatch = '' - substituteInPlace src/tests/test.py --replace "DocumentationTestCase" "NoDocumentation" - ''; + patches = [ + (fetchpatch { + url = https://github.com/micheles/decorator/commit/3265f2755d16c0a3dfc9f1feee39722ddc11ee80.patch; + sha256 = "1q5nmff30vccqq5swf2ivm8cn7x3lhz8c9qpj0zddgs2y7fw8syz"; + }) + ]; meta = with lib; { homepage = https://pypi.python.org/pypi/decorator; diff --git a/pkgs/development/python-modules/docplex/default.nix b/pkgs/development/python-modules/docplex/default.nix new file mode 100644 index 000000000000..42f1270dc1b5 --- /dev/null +++ b/pkgs/development/python-modules/docplex/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, fetchPypi +, isPy27 +, futures +, docloud +, requests +}: + +buildPythonPackage rec { + pname = "docplex"; + version = "2.12.182"; + + # No source available from official repo + src = fetchPypi { + inherit pname version; + sha256 = "aaf150b06d44f07639aca48be1fca69c7732d57507e6adc4e8451c7a93489116"; + }; + + propagatedBuildInputs = [ + docloud + requests + ] ++ lib.optional isPy27 futures; + + doCheck = false; + pythonImportsCheck = [ "docplex" ]; + + meta = with lib; { + description = "IBM Decision Optimization CPLEX Modeling for Python"; + homepage = "https://onboarding-oaas.docloud.ibmcloud.com/software/analytics/docloud/"; + license = licenses.asl20; + maintainers = with maintainers; [ drewrisinger ]; + }; +} diff --git a/pkgs/development/python-modules/ecos/default.nix b/pkgs/development/python-modules/ecos/default.nix new file mode 100644 index 000000000000..6c07a5d485a6 --- /dev/null +++ b/pkgs/development/python-modules/ecos/default.nix @@ -0,0 +1,50 @@ +{ lib +, pythonOlder +, buildPythonPackage +, fetchFromGitHub +, pkgs +, numpy +, scipy + # check inputs +, nose +}: + +buildPythonPackage rec { + pname = "ecos"; + version = "2.0.7.post1"; + + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "embotech"; + repo = "ecos-python"; + rev = version; + sha256 = "1wzmamz2r4xr2zxgfwnm5q283185d1q6a7zn30vip18lxpys70z0"; + fetchSubmodules = true; + }; + + prePatch = '' + echo '__version__ = "${version}"' >> ./src/ecos/version.py + ''; + + propagatedBuildInputs = [ + numpy + scipy + ]; + + checkInputs = [ nose ]; + checkPhase = '' + # Run tests + cd ./src + nosetests test_interface.py test_interface_bb.py + ''; + pythonImportsCheck = [ "ecos" ]; + + meta = with lib; { + description = "Python package for ECOS: Embedded Cone Solver"; + downloadPage = "https://github.com/embotech/ecos-python/releases"; + homepage = pkgs.ecos.meta.homepage; + license = licenses.asl20; + maintainers = with maintainers; [ drewrisinger ]; + }; +} diff --git a/pkgs/development/python-modules/fuzzywuzzy/default.nix b/pkgs/development/python-modules/fuzzywuzzy/default.nix index 7091799decab..551f5f4c3dde 100644 --- a/pkgs/development/python-modules/fuzzywuzzy/default.nix +++ b/pkgs/development/python-modules/fuzzywuzzy/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "fuzzywuzzy"; - version = "0.17.0"; + version = "0.18.0"; src = fetchPypi { inherit pname version; - sha256 = "6f49de47db00e1c71d40ad16da42284ac357936fa9b66bea1df63fed07122d62"; + sha256 = "1s00zn75y2dkxgnbw8kl8dw4p1mc77cv78fwfa4yb0274s96w0a5"; }; propagatedBuildInputs = [ python-Levenshtein ]; diff --git a/pkgs/development/python-modules/nbsphinx/default.nix b/pkgs/development/python-modules/nbsphinx/default.nix index 788a8f73ab89..4557d6656502 100644 --- a/pkgs/development/python-modules/nbsphinx/default.nix +++ b/pkgs/development/python-modules/nbsphinx/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "nbsphinx"; - version = "0.5.0"; + version = "0.5.1"; src = fetchPypi { inherit pname version; - sha256 = "03g0mqbgk143cq3l3r42js2iy5l6iyvpckpqip4p468rlzrddyhn"; + sha256 = "0kh0d83xavpffdp4xp4hq8xy43l6lyv3d1a25rnc15jcbdf1nghw"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/nbval/default.nix b/pkgs/development/python-modules/nbval/default.nix index ff9d6f134e0f..020fab8f8887 100644 --- a/pkgs/development/python-modules/nbval/default.nix +++ b/pkgs/development/python-modules/nbval/default.nix @@ -15,11 +15,11 @@ buildPythonPackage rec { pname = "nbval"; - version = "0.9.4"; + version = "0.9.5"; src = fetchPypi { inherit pname version; - sha256 = "5273c2d958335e24b170fe59b689b13e4b1855b569626e18b1c7e420f5110cc6"; + sha256 = "1xh2p7g5s5g06caaraf3dsz69bpj7dgw2h3ss67kci789aspnwp8"; }; checkInputs = [ diff --git a/pkgs/development/python-modules/osqp/default.nix b/pkgs/development/python-modules/osqp/default.nix new file mode 100644 index 000000000000..237ad7a7a00a --- /dev/null +++ b/pkgs/development/python-modules/osqp/default.nix @@ -0,0 +1,51 @@ +{ lib +, buildPythonPackage +, fetchPypi +, cmake +, future +, numpy + # check inputs +, scipy +, pytestCheckHook +, mkl +}: + +buildPythonPackage rec { + pname = "osqp"; + version = "0.6.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "130frig5bznfacqp9jwbshmbqd2xw3ixdspsbkrwsvkdaab7kca7"; + }; + + nativeBuildInputs = [ cmake ]; + dontUseCmakeConfigure = true; + + propagatedBuildInputs = [ + numpy + future + ]; + + checkInputs = [ scipy pytestCheckHook mkl ]; + pythonImportsCheck = [ "osqp" ]; + dontUseSetuptoolsCheck = true; # running setup.py fails if false + preCheck = '' + export LD_LIBRARY_PATH=${lib.strings.makeLibraryPath [ mkl ]}:$LD_LIBRARY_PATH; + ''; + + meta = with lib; { + description = "The Operator Splitting QP Solver"; + longDescription = '' + Numerical optimization package for solving problems in the form + minimize 0.5 x' P x + q' x + subject to l <= A x <= u + + where x in R^n is the optimization variable + ''; + homepage = "https://osqp.org/"; + downloadPage = "https://github.com/oxfordcontrol/osqp"; + license = licenses.asl20; + maintainers = with lib.maintainers; [ drewrisinger ]; + }; +} diff --git a/pkgs/development/python-modules/pylatexenc/default.nix b/pkgs/development/python-modules/pylatexenc/default.nix new file mode 100644 index 000000000000..146aed9a3ecf --- /dev/null +++ b/pkgs/development/python-modules/pylatexenc/default.nix @@ -0,0 +1,31 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytest +}: + +buildPythonPackage rec { + pname = "pylatexenc"; + version = "2.1"; + + src = fetchFromGitHub { + owner = "phfaist"; + repo = pname; + rev = "v${version}"; + sha256 = "0wnl00y5dl56aw9j4y21kqapraaravbycwfxdmjsbgl11nk4llx9"; + }; + + pythonImportsCheck = [ "pylatexenc" ]; + checkInputs = [ pytest ]; + checkPhase = '' + pytest + ''; + + meta = with lib; { + description = "Simple LaTeX parser providing latex-to-unicode and unicode-to-latex conversion"; + homepage = "https://pylatexenc.readthedocs.io"; + downloadPage = "https;//www.github.com/phfaist/pylatexenc"; + license = licenses.mit; + maintainers = with maintainers; [ drewrisinger ]; + }; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/pyroute2/default.nix b/pkgs/development/python-modules/pyroute2/default.nix index 3563edce792e..e13472dafb4f 100644 --- a/pkgs/development/python-modules/pyroute2/default.nix +++ b/pkgs/development/python-modules/pyroute2/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pyroute2"; - version = "0.5.7"; + version = "0.5.9"; src = fetchPypi { inherit pname version; - sha256 = "963fce07da2841456d39e3b932b071f6de28d23dadfae014022d67a752916f98"; + sha256 = "1dymaa3rif05k42sh4c3g2m057v2dsc2f3f49hl2rw5yz8bd23i4"; }; # requires root priviledges diff --git a/pkgs/development/python-modules/pytest-flask/default.nix b/pkgs/development/python-modules/pytest-flask/default.nix index b58b934dadc4..0ad858444403 100644 --- a/pkgs/development/python-modules/pytest-flask/default.nix +++ b/pkgs/development/python-modules/pytest-flask/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pytest-flask"; - version = "0.15.0"; + version = "0.15.1"; src = fetchPypi { inherit pname version; - sha256 = "0jdzrib94vwfpl8524h34aqzqndh3h4xn706v32xh412c8dphx6q"; + sha256 = "1ri3p3hibb1r2wcblpvs64s4jz40ci4jki4s2nf3xf7iz2wwbn6b"; }; doCheck = false; diff --git a/pkgs/development/python-modules/scs/default.nix b/pkgs/development/python-modules/scs/default.nix new file mode 100644 index 000000000000..4e500d685352 --- /dev/null +++ b/pkgs/development/python-modules/scs/default.nix @@ -0,0 +1,56 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, blas +, liblapack +, numpy +, scipy +, scs + # check inputs +, nose +}: + +buildPythonPackage rec { + inherit (scs) pname version; + + src = fetchFromGitHub { + owner = "bodono"; + repo = "scs-python"; + rev = "f02abdc0e2e0a5851464e30f6766ccdbb19d73f0"; # need to choose commit manually, untagged + sha256 = "174b5s7cwgrn1m55jlrszdl403zhpzc4yl9acs6kjv9slmg1mmjr"; + }; + + preConfigure = '' + rm -r scs + ln -s ${scs.src} scs + ''; + + buildInputs = [ + liblapack + blas + ]; + + propagatedBuildInputs = [ + numpy + scipy + ]; + + checkInputs = [ nose ]; + checkPhase = '' + nosetests + ''; + pythonImportsCheck = [ "scs" ]; + + meta = with lib; { + description = "Python interface for SCS: Splitting Conic Solver"; + longDescription = '' + Solves convex cone programs via operator splitting. + Can solve: linear programs (LPs), second-order cone programs (SOCPs), semidefinite programs (SDPs), + exponential cone programs (ECPs), and power cone programs (PCPs), or problems with any combination of those cones. + ''; + homepage = "https://github.com/cvxgrp/scs"; # upstream C package + downloadPage = "https://github.com/bodono/scs-python"; + license = licenses.gpl3; + maintainers = with maintainers; [ drewrisinger ]; + }; +} diff --git a/pkgs/development/python-modules/vowpalwabbit/default.nix b/pkgs/development/python-modules/vowpalwabbit/default.nix index d23f45b122f5..65dbce862a46 100644 --- a/pkgs/development/python-modules/vowpalwabbit/default.nix +++ b/pkgs/development/python-modules/vowpalwabbit/default.nix @@ -1,5 +1,17 @@ -{ stdenv, lib, buildPythonPackage, fetchPypi, python, zlib, clang -, ncurses, pytest, docutils, pygments, numpy, scipy, scikitlearn }: +{ stdenv +, lib +, fetchPypi +, buildPythonPackage +, cmake +, python +, zlib +, ncurses +, pytest +, docutils +, pygments +, numpy +, scipy +, scikitlearn }: buildPythonPackage rec { pname = "vowpalwabbit"; @@ -10,21 +22,27 @@ buildPythonPackage rec { sha256 = "bd4c7e49a6ddaa1afedf97b22b822c7322328d686d45151b47a5127fc409c2af"; }; - # Should be fixed in next Python release after 8.5.0: - # https://github.com/JohnLangford/vowpal_wabbit/pull/1533 - patches = [ - ./vowpal-wabbit-find-boost.diff + nativeBuildInputs = [ + cmake ]; - # vw tries to write some explicit things to home - # python installed: The directory '/homeless-shelter/.cache/pip/http' - preInstall = '' - export HOME=$PWD - ''; + buildInputs = [ + docutils + ncurses + pygments + python.pkgs.boost + zlib.dev + ]; + + propagatedBuildInputs = [ + numpy + scikitlearn + scipy + ]; - nativeBuildInputs = [ clang ]; - buildInputs = [ python.pkgs.boost zlib.dev ncurses pytest docutils pygments ]; - propagatedBuildInputs = [ numpy scipy scikitlearn ]; + # Python build script uses CMake, but we don't want CMake to do the + # configuration. + dontUseCmakeConfigure = true; # Python ctypes.find_library uses DYLD_LIBRARY_PATH. preConfigure = lib.optionalString stdenv.isDarwin '' @@ -34,12 +52,12 @@ buildPythonPackage rec { checkPhase = '' # check-manifest requires a git clone, not a tarball # check-manifest --ignore "Makefile,PACKAGE.rst,*.cc,tox.ini,tests*,examples*,src*" - ${python.interpreter} setup.py check -mrs + ${python.interpreter} setup.py check -ms ''; meta = with lib; { description = "Vowpal Wabbit is a fast machine learning library for online learning, and this is the python wrapper for the project."; - homepage = https://github.com/JohnLangford/vowpal_wabbit; + homepage = "https://github.com/JohnLangford/vowpal_wabbit"; license = licenses.bsd3; broken = stdenv.isAarch64; maintainers = with maintainers; [ teh ]; diff --git a/pkgs/development/python-modules/vowpalwabbit/vowpal-wabbit-find-boost.diff b/pkgs/development/python-modules/vowpalwabbit/vowpal-wabbit-find-boost.diff deleted file mode 100644 index 645956594bf6..000000000000 --- a/pkgs/development/python-modules/vowpalwabbit/vowpal-wabbit-find-boost.diff +++ /dev/null @@ -1,34 +0,0 @@ ---- vowpalwabbit-8.5.0.orig/setup.py 2018-09-03 20:32:39.000000000 +0200 -+++ vowpalwabbit-8.5.0/setup.py 2018-09-03 20:34:09.000000000 +0200 -@@ -23,18 +23,11 @@ - - def find_boost(): - """Find correct boost-python library information """ -- if system == 'Linux': -+ if system == 'Linux' or system == 'Darwin': - # use version suffix if present -- boost_lib = 'boost_python-py{v[0]}{v[1]}'.format(v=sys.version_info) -- if sys.version_info.major == 3: -- for candidate in ['-py36', '-py35', '-py34', '3']: -- boost_lib = 'boost_python{}'.format(candidate) -- if find_library(boost_lib): -- exit -+ boost_lib = 'boost_python{v[0]}{v[1]}'.format(v=sys.version_info) - if not find_library(boost_lib): - boost_lib = "boost_python" -- elif system == 'Darwin': -- boost_lib = 'boost_python-mt' if sys.version_info[0] == 2 else 'boost_python3-mt' - elif system == 'Cygwin': - boost_lib = 'boost_python-mt' if sys.version_info[0] == 2 else 'boost_python3-mt' - else: ---- vowpalwabbit-8.5.0.orig/src/Makefile 2018-09-03 20:32:40.000000000 +0200 -+++ vowpalwabbit-8.5.0/src/Makefile 2018-09-03 21:42:30.000000000 +0200 -@@ -37,7 +37,7 @@ - NPROCS:=$(shell grep -c ^processor /proc/cpuinfo) - endif - ifeq ($(UNAME), Darwin) -- LIBS = -lboost_program_options-mt -lboost_serialization-mt -l pthread -l z -+ LIBS = -lboost_program_options -lboost_serialization -l pthread -l z - # On Macs, the location isn't always clear - # brew uses /usr/local - # but /opt/local seems to be preferred by some users diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index 088bcedf6de3..f26e33ca2427 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -294,6 +294,12 @@ in libv8 = attrs: { buildInputs = [ which v8 python ]; buildFlags = [ "--with-system-v8=true" ]; + dontBuild = false; + postPatch = '' + substituteInPlace ext/libv8/extconf.rb \ + --replace "location = Libv8::Location::Vendor.new" \ + "location = Libv8::Location::System.new" + ''; }; execjs = attrs: { diff --git a/pkgs/development/tools/analysis/brakeman/default.nix b/pkgs/development/tools/analysis/brakeman/default.nix index edf37efbce99..de351524f39b 100644 --- a/pkgs/development/tools/analysis/brakeman/default.nix +++ b/pkgs/development/tools/analysis/brakeman/default.nix @@ -4,12 +4,13 @@ buildRubyGem rec { inherit ruby; name = "${gemName}-${version}"; gemName = "brakeman"; - version = "4.7.2"; - source.sha256 = "1j1svldxvbl27kpyp9yngfwa0fdqal926sjk0cha7h520wvnz79k"; + version = "4.8.0"; + source.sha256 = "0xy28pq4x1i7xns5af9k8fx35sqffz2lg94fgbsi9zhi877b7srg"; meta = with lib; { description = "Static analysis security scanner for Ruby on Rails"; homepage = "https://brakemanscanner.org/"; + changelog = "https://github.com/presidentbeef/brakeman/releases/tag/v${version}"; license = [ licenses.unfreeRedistributable ]; platforms = ruby.meta.platforms; maintainers = [ maintainers.marsam ]; diff --git a/pkgs/development/tools/analysis/hopper/default.nix b/pkgs/development/tools/analysis/hopper/default.nix index c9214ae7e35d..f6c5dcaf1adb 100644 --- a/pkgs/development/tools/analysis/hopper/default.nix +++ b/pkgs/development/tools/analysis/hopper/default.nix @@ -1,42 +1,80 @@ -{ stdenv, fetchurl, pkgs, lib }: - +{ stdenv +, fetchurl +, lib +, autoPatchelfHook +, wrapQtAppsHook +, libbsd +, python27 +, gmpxx +, ncurses5 +, gnustep +, libffi +}: stdenv.mkDerivation rec { - pname = "hopper"; - version = "4.5.7"; + pname = "hopper"; + version = "4.5.19"; rev = "v${lib.versions.major version}"; src = fetchurl { url = "https://d2ap6ypl1xbe4k.cloudfront.net/Hopper-${rev}-${version}-Linux.pkg.tar.xz"; - sha256 = "1ce7a0f13126a940398aa8da4a74e250dff0401074f30446a8840ac3dbb902c0"; + sha256 = "1c9wbjwz5xn0skz2a1wpxyx78hhrm8vcbpzagsg4wwnyblap59db"; }; sourceRoot = "."; - ldLibraryPath = with pkgs; stdenv.lib.makeLibraryPath [ -libbsd.out libffi.out gmpxx.out python27Full.out python27Packages.libxml2 qt5.qtbase zlib xlibs.libX11.out xorg_sys_opengl.out xlibs.libXrender.out gcc-unwrapped.lib + nativeBuildInputs = [ + wrapQtAppsHook + autoPatchelfHook ]; - nativeBuildInputs = [ pkgs.qt5.wrapQtAppsHook ]; - - qtWrapperArgs = [ ''--suffix LD_LIBRARY_PATH : ${ldLibraryPath}'' ]; + buildInputs = [ + libbsd + python27 + gmpxx + ncurses5 + gnustep.libobjc + ]; installPhase = '' + runHook preInstall + mkdir -p $out/bin mkdir -p $out/lib mkdir -p $out/share + cp $sourceRoot/opt/hopper-${rev}/bin/Hopper $out/bin/hopper - cp -r $sourceRoot/opt/hopper-${rev}/lib $out - cp -r $sourceRoot/usr/share $out/share - patchelf \ - --set-interpreter ${stdenv.glibc}/lib/ld-linux-x86-64.so.2 \ - $out/bin/hopper + cp \ + --archive \ + $sourceRoot/opt/hopper-${rev}/lib/libBlocksRuntime.so* \ + $sourceRoot/opt/hopper-${rev}/lib/libdispatch.so* \ + $sourceRoot/opt/hopper-${rev}/lib/libgnustep-base.so* \ + $sourceRoot/opt/hopper-${rev}/lib/libHopperCore.so* \ + $sourceRoot/opt/hopper-${rev}/lib/libkqueue.so* \ + $sourceRoot/opt/hopper-${rev}/lib/libobjcxx.so* \ + $sourceRoot/opt/hopper-${rev}/lib/libpthread_workqueue.so* \ + $out/lib + + # we already ship libffi.so.7 + ln -s ${lib.getLib libffi}/lib/libffi.so $out/lib/libffi.so.6 + + cp -r $sourceRoot/usr/share $out + + runHook postInstall + ''; + + postFixup = '' + substituteInPlace "$out/share/applications/hopper-${rev}.desktop" \ + --replace "Exec=/opt/hopper-${rev}/bin/Hopper" "Exec=$out/bin/hopper" ''; - meta = { + meta = with stdenv.lib; { homepage = "https://www.hopperapp.com/index.html"; description = "A macOS and Linux Disassembler"; - license = stdenv.lib.licenses.unfree; - maintainers = [ stdenv.lib.maintainers.luis ]; - platforms = stdenv.lib.platforms.linux; + license = licenses.unfree; + maintainers = with maintainers; [ + luis + Enteee + ]; + platforms = platforms.linux; }; } diff --git a/pkgs/development/tools/analysis/radare2/default.nix b/pkgs/development/tools/analysis/radare2/default.nix index a1140dbab814..49c749b21237 100644 --- a/pkgs/development/tools/analysis/radare2/default.nix +++ b/pkgs/development/tools/analysis/radare2/default.nix @@ -110,17 +110,17 @@ in { #<generated> # DO NOT EDIT! Automatically generated by ./update.py radare2 = generic { - version_commit = "23710"; - gittap = "4.2.0"; - gittip = "57a60ba8c5e782ca0807e3c7b1d26a8b3923073d"; - rev = "4.2.0"; - version = "4.2.0"; - sha256 = "1xkvc9msbcvwgcasx9q10098ciw1zpnwgrciw397rq9ayrrvpngz"; + version_commit = "23781"; + gittap = "4.2.1"; + gittip = "08478fdd29d8ce2a6c61fbd7b207bffc10682938"; + rev = "4.2.1"; + version = "4.2.1"; + sha256 = "14b9433cgc2nabhz836zfgvgh2dwailcmvy05krsa0inmzbvx9fg"; cs_ver = "4.0.1"; cs_sha256 = "0ijwxxk71nr9z91yxw20zfj4bbsbrgvixps5c7cpj163xlzlwba6"; }; r2-for-cutter = generic { - version_commit = "23710"; + version_commit = "23781"; gittap = "4.2.1"; gittip = "08478fdd29d8ce2a6c61fbd7b207bffc10682938"; rev = "08478fdd29d8ce2a6c61fbd7b207bffc10682938"; diff --git a/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix b/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix index f2f3588ba29c..ffdeb01c2bb1 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix @@ -8,13 +8,13 @@ buildBazelPackage rec { name = "bazel-remote-${version}"; - version = "2020-01-29"; + version = "1.0.0"; src = fetchFromGitHub { owner = "buchgr"; repo = "bazel-remote"; - rev = "ae9378321552dd14066332f8fa55076040228cb7"; - sha256 = "1jbd319n255cmmncnjfdkdcpx0x62asp3dqwgl6vimx4dqqj8v1p"; + rev = "v${version}"; + sha256 = "1fpdw139d5q1377qnqbgkahmdr4mdaa17d2m10wkyvyvijwm4r2m"; }; nativeBuildInputs = [ go git ]; diff --git a/pkgs/development/tools/build-managers/bmake/default.nix b/pkgs/development/tools/build-managers/bmake/default.nix index d895261c4b5b..ed1e6a174ce4 100644 --- a/pkgs/development/tools/build-managers/bmake/default.nix +++ b/pkgs/development/tools/build-managers/bmake/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "bmake"; - version = "20181221"; + version = "20200212"; src = fetchurl { url = "http://www.crufty.net/ftp/pub/sjg/${pname}-${version}.tar.gz"; - sha256 = "0zp6yy27z52qb12bgm3hy1dwal2i570615pqqk71zwhcxfs4h2gw"; + sha256 = "134ibplk5rj7s3ig2czbhqs89l45jl6vswg3cy6xzm0anz5smhb2"; }; nativeBuildInputs = [ getopt ]; diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix index 33d762dbe92c..4eb531f59a8d 100644 --- a/pkgs/development/tools/build-managers/cmake/default.nix +++ b/pkgs/development/tools/build-managers/cmake/default.nix @@ -19,12 +19,12 @@ stdenv.mkDerivation rec { + lib.optionalString useNcurses "-cursesUI" + lib.optionalString withQt5 "-qt5UI" + lib.optionalString useQt4 "-qt4UI"; - version = "3.16.3"; + version = "3.16.4"; src = fetchurl { url = "${meta.homepage}files/v${lib.versions.majorMinor version}/cmake-${version}.tar.gz"; # compare with https://cmake.org/files/v${lib.versions.majorMinor version}/cmake-${version}-SHA-256.txt - sha256 = "0s06wrp0jnw2l4yq94skj53hwnz7lqrmhh96sq7w7njkkggickz5"; + sha256 = "0b5c77lqzfk5l7mnnih5c78i36d3skbkw20jjnph79lx9l8qrk4v"; }; patches = [ diff --git a/pkgs/development/tools/cloudflare-wrangler/default.nix b/pkgs/development/tools/cloudflare-wrangler/default.nix index 372de27ec59a..88c52318da46 100644 --- a/pkgs/development/tools/cloudflare-wrangler/default.nix +++ b/pkgs/development/tools/cloudflare-wrangler/default.nix @@ -1,25 +1,29 @@ -{ stdenv, fetchFromGitHub, rustPlatform, pkg-config, openssl +{ stdenv, fetchFromGitHub, rustPlatform, pkg-config, openssl, curl, darwin }: rustPlatform.buildRustPackage rec { pname = "cloudflare-wrangler"; - version = "1.4.0"; + version = "1.7.0"; src = fetchFromGitHub { owner = "cloudflare"; repo = "wrangler"; rev = "v" + version; - sha256 = "1agl1cg34iklvniygrkq8dqsampvg17d3nsm0dcr6c3n5rj09gbi"; + sha256 = "0vc7f3jki2fdwlgpwhaxzm58g2898wpwbib7dmibb9kxv4jna8gj"; }; # Delete this on next update; see #79975 for details legacyCargoFetcher = true; - - cargoSha256 = "0c2g6yghwqjy21yfdcri4v9aqizd06ww3zx2snns51gnqqk8r57k"; + cargoSha256 = "1f3gy3agpdg6pck5acxjfrd89hyp9x1byqhfizlizbfmwrqs4il8"; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl ]; + buildInputs = [ openssl ] ++ stdenv.lib.optionals stdenv.isDarwin [ + curl + darwin.apple_sdk.frameworks.Security + darwin.apple_sdk.frameworks.CoreServices + darwin.apple_sdk.frameworks.CoreFoundation + ]; # tries to use "/homeless-shelter" and fails doCheck = false; diff --git a/pkgs/development/tools/continuous-integration/drone/default.nix b/pkgs/development/tools/continuous-integration/drone/default.nix index 8e63daab2d61..05257f65af52 100644 --- a/pkgs/development/tools/continuous-integration/drone/default.nix +++ b/pkgs/development/tools/continuous-integration/drone/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { name = "drone.io-${version}"; - version = "1.6.0"; + version = "1.6.5"; goPackagePath = "github.com/drone/drone"; - modSha256 = "0l33qib9riknrjdpsvd7n6slqp485vx66xl6w7m24b5sc7yfsg7m"; + modSha256 = "1fyb9218s52w8c6c3v6rgivbyzy5hz4q4z8r75ng2yrmjmmiv2gr"; src = fetchFromGitHub { owner = "drone"; repo = "drone"; rev = "v${version}"; - sha256 = "0ij4a6rh17ib360bxrpncf8lp839b6sl17bd0fp3xvwmibk6xgjz"; + sha256 = "05cgd72qyss836fby0adhrm5p8g7639psk2yslhg6pmz0cqfbq9m"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/golangci-lint/default.nix b/pkgs/development/tools/golangci-lint/default.nix index 8304d95d99f2..75bb50f25a49 100644 --- a/pkgs/development/tools/golangci-lint/default.nix +++ b/pkgs/development/tools/golangci-lint/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "golangci-lint"; - version = "1.22.2"; + version = "1.23.6"; src = fetchFromGitHub { owner = "golangci"; repo = "golangci-lint"; rev = "v${version}"; - sha256 = "1wwp6ppm5p2cf7jbcgmqm6alzaj34sa079d98afw21yr81qxvvid"; + sha256 = "0y5kjlqbz9xxlxd8kagrsyz9wvjqf7i28i6zb2m8x9c9zg82kvsn"; }; - modSha256 = "02j2cf5778ds0vwz0kkd9c1x5ap732vkq20bfg440spfajscvndm"; + modSha256 = "0sckz298bvkf4p4fdmsmza0zrj2s2pvc86qwg6i76vdh9yzvq5gx"; subPackages = [ "cmd/golangci-lint" ]; meta = with lib; { diff --git a/pkgs/development/tools/heroku/default.nix b/pkgs/development/tools/heroku/default.nix index 58e9c67dd449..1e2359f10033 100644 --- a/pkgs/development/tools/heroku/default.nix +++ b/pkgs/development/tools/heroku/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "heroku"; - version = "7.35.1"; + version = "7.38.1"; src = fetchurl { url = "https://cli-assets.heroku.com/heroku-v${version}/heroku-v${version}.tar.xz"; - sha256 = "1b48jhl7a9nzvgankys32mfnv6i2kx11z874k7fz9px3kx8s7pbb"; + sha256 = "1sa4ph4d5y48yz2n06aivqgl07ljlgwgf5ik431vnrz5smxl6ngr"; }; nativeBuildInputs = [ makeWrapper ]; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = https://cli.heroku.com; + homepage = "https://cli.heroku.com"; description = "Everything you need to get started using Heroku"; maintainers = with lib.maintainers; [ aflatter mirdhyn peterhoeg ]; license = lib.licenses.mit; diff --git a/pkgs/development/tools/misc/terraform-lsp/default.nix b/pkgs/development/tools/misc/terraform-lsp/default.nix index 94492395a589..9a661f276772 100644 --- a/pkgs/development/tools/misc/terraform-lsp/default.nix +++ b/pkgs/development/tools/misc/terraform-lsp/default.nix @@ -1,17 +1,19 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: -buildGoModule rec { +buildGoPackage rec { pname = "terraform-lsp"; - version = "0.0.9"; + version = "0.0.10"; src = fetchFromGitHub { owner = "juliosueiras"; repo = pname; rev = "v${version}"; - sha256 = "1m133fznf58fkjl5yx0gxa3cjfb0h8f9fv760c9h1d5cg279bghk"; + sha256 = "1j69j1pkd0q6bds1c6pcaars5hl3hk93q2p31mymkzmy640k8zfn"; }; - modSha256 = "1mb3169vdlv4h10k15pg88s48s2b6y7v5frk9j9ahg52grygcqb2"; + goPackagePath = "github.com/juliosueiras/terraform-lsp"; + + buildFlagsArray = [ "-ldflags=-s -w -X main.Version=${version} -X main.GitCommit=${src.rev}" ]; meta = with lib; { description = "Language Server Protocol for Terraform"; diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/lib.nix b/pkgs/development/tools/poetry2nix/poetry2nix/lib.nix index 68d854f26488..d49e6ce36db3 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/lib.nix +++ b/pkgs/development/tools/poetry2nix/poetry2nix/lib.nix @@ -65,7 +65,7 @@ let else { pkg = []; str = null; }; # Fetch the artifacts from the PyPI index. Since we get all - # info we need from the lock file we don't use nixpkgs' fetchPyPi + # info we need from the lock file we don't use nixpkgs' fetchPypi # as it modifies casing while not providing anything we don't already # have. # diff --git a/pkgs/development/web/insomnia/default.nix b/pkgs/development/web/insomnia/default.nix index ae4302b74291..d05fbff5e0c1 100644 --- a/pkgs/development/web/insomnia/default.nix +++ b/pkgs/development/web/insomnia/default.nix @@ -16,12 +16,12 @@ let ]; in stdenv.mkDerivation rec { pname = "insomnia"; - version = "7.0.6"; + version = "7.1.0"; src = fetchurl { url = "https://github.com/getinsomnia/insomnia/releases/download/v${version}/insomnia_${version}_amd64.deb"; - sha256 = "125g40micavq5js5l7lpv01yl8635dwg240vldz8i2riqj65inq8"; + sha256 = "1aqzg01dwgm1jidavwxichydxsz1c4ck8xhgvlgw24qddx5gwq1y"; }; nativeBuildInputs = diff --git a/pkgs/development/web/nodejs/v12.nix b/pkgs/development/web/nodejs/v12.nix index e8a4634773d6..3fa5216ccf82 100644 --- a/pkgs/development/web/nodejs/v12.nix +++ b/pkgs/development/web/nodejs/v12.nix @@ -5,6 +5,6 @@ let in buildNodejs { inherit enableNpm; - version = "12.16.0"; - sha256 = "09grij355z210mkzkzarb6gwz8b02lnaxzdll1249kiz8wvhdjdq"; + version = "12.16.1"; + sha256 = "0ba1dla31z6i31z3723l74nky1v04irwbl3iaqmi0iicl1dq958a"; } diff --git a/pkgs/development/web/nodejs/v13.nix b/pkgs/development/web/nodejs/v13.nix index dcd0f3dd2b7d..89ef27c8c5e2 100644 --- a/pkgs/development/web/nodejs/v13.nix +++ b/pkgs/development/web/nodejs/v13.nix @@ -5,6 +5,6 @@ let in buildNodejs { inherit enableNpm; - version = "13.8.0"; - sha256 = "1h437yvg43xci35rvp55gvb94rddkf4j9i9iw81bmkwhvb4h8qdv"; + version = "13.9.0"; + sha256 = "0z68hj3z2y8aj4bc14h77mj5l99jb4ljjc10gp0dpg8s4g1x5xzw"; } diff --git a/pkgs/games/steam/chrootenv.nix b/pkgs/games/steam/chrootenv.nix index 8832f3bbc184..d7a962104299 100644 --- a/pkgs/games/steam/chrootenv.nix +++ b/pkgs/games/steam/chrootenv.nix @@ -100,6 +100,9 @@ in buildFHSUserEnv rec { # friends options won't display "Launch Game" without it lsof + + # called by steam's setup.sh + file ] ++ (if (!nativeOnly) then [ (steamPackages.steam-runtime-wrapped.override { inherit runtimeOnly; diff --git a/pkgs/misc/vim-plugins/vim-utils.nix b/pkgs/misc/vim-plugins/vim-utils.nix index 16c14b322189..81cd77f3edb5 100644 --- a/pkgs/misc/vim-plugins/vim-utils.nix +++ b/pkgs/misc/vim-plugins/vim-utils.nix @@ -330,9 +330,8 @@ let ); in '' - set packpath-=~/.vim/after - set packpath+=${packDir packages} - set packpath+=~/.vim/after + set packpath^=${packDir packages} + set runtimepath^=${packDir packages} filetype indent plugin on | syn on ''); diff --git a/pkgs/os-specific/darwin/apple-sdk/frameworks.nix b/pkgs/os-specific/darwin/apple-sdk/frameworks.nix index 09e0e4e48ecd..02e2421f3472 100644 --- a/pkgs/os-specific/darwin/apple-sdk/frameworks.nix +++ b/pkgs/os-specific/darwin/apple-sdk/frameworks.nix @@ -75,6 +75,7 @@ with frameworks; with libs; { LocalAuthentication = []; MapKit = []; MediaAccessibility = [ CoreGraphics CoreText QuartzCore ]; + MediaPlayer = []; MediaToolbox = [ AudioToolbox AudioUnit CoreMedia ]; Metal = []; MetalKit = [ ModelIO Metal ]; diff --git a/pkgs/os-specific/linux/can-utils/default.nix b/pkgs/os-specific/linux/can-utils/default.nix index 6e26ef4bbce8..1451a4e96c08 100644 --- a/pkgs/os-specific/linux/can-utils/default.nix +++ b/pkgs/os-specific/linux/can-utils/default.nix @@ -13,6 +13,12 @@ stdenv.mkDerivation { sha256 = "1ygzp8rjr8f1gs48mb1pz7psdgbfhlvr6kjdnmzbsqcml06zvrpr"; }; + # Fixup build with newer Linux headers. + postPatch = '' + sed '1i#include <linux/sockios.h>' -i \ + slcanpty.c cansniffer.c canlogserver.c isotpdump.c isotpsniffer.c isotpperf.c + ''; + preConfigure = ''makeFlagsArray+=(PREFIX="$out")''; meta = with stdenv.lib; { diff --git a/pkgs/os-specific/linux/dbus-broker/default.nix b/pkgs/os-specific/linux/dbus-broker/default.nix index 5f5005d8b97d..b61d99cead10 100644 --- a/pkgs/os-specific/linux/dbus-broker/default.nix +++ b/pkgs/os-specific/linux/dbus-broker/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "dbus-broker"; - version = "21"; + version = "22"; src = fetchFromGitHub { owner = "bus1"; repo = "dbus-broker"; rev = "v${version}"; - sha256 = "14lgjv0gxvfa1h5hsarh9nwpxns6jb2861nd7mcanpkm2jlxh5vm"; + sha256 = "0vxr73afix5wjxy8g4cckwhl242rrlazm52673iwmdyfz5nskj2x"; fetchSubmodules = true; }; diff --git a/pkgs/os-specific/linux/kernel-headers/default.nix b/pkgs/os-specific/linux/kernel-headers/default.nix index fb2b90689214..52b280c30261 100644 --- a/pkgs/os-specific/linux/kernel-headers/default.nix +++ b/pkgs/os-specific/linux/kernel-headers/default.nix @@ -1,7 +1,4 @@ -{ stdenvNoCC, lib, buildPackages -, fetchurl, perl -, elf-header -}: +{ stdenvNoCC, lib, buildPackages, fetchurl, perl, elf-header }: let makeLinuxHeaders = { src, version, patches ? [] }: stdenvNoCC.mkDerivation { @@ -39,29 +36,28 @@ let # Skip clean on darwin, case-sensitivity issues. buildPhase = lib.optionalString (!stdenvNoCC.buildPlatform.isDarwin) '' make mrproper $makeFlags - '' - # For some reason, doing `make install_headers` twice, first without - # INSTALL_HDR_PATH=$out then with, is neccessary to get this to work - # for darwin cross. @Ericson2314 has no idea why. - + '' - make headers_install $makeFlags + '' + '' + make headers $makeFlags ''; checkPhase = '' make headers_check $makeFlags ''; + # The following command requires rsync: + # make headers_install INSTALL_HDR_PATH=$out $makeFlags + # but rsync depends on popt which does not compile on aarch64 without + # updateAutotoolsGnuConfigScriptsHook which is not enabled in stage2, + # so we replicate it with cp. This also reduces bootstrap closure size. installPhase = '' - make headers_install INSTALL_HDR_PATH=$out $makeFlags + mkdir -p $out + cp -r usr/include $out + find $out -type f ! -name '*.h' -delete '' # Some builds (e.g. KVM) want a kernel.release. - + '' mkdir -p $out/include/config - echo "${version}-default" > $out/include/config/kernel.release - '' - # These oddly named file records the `SHELL` passed, which causes bootstrap - # tools run-time dependency. + '' - find "$out" -name '..install.cmd' -print0 | xargs -0 rm + mkdir -p $out/include/config + echo "${version}-default" > $out/include/config/kernel.release ''; meta = with lib; { @@ -73,16 +69,15 @@ let in { inherit makeLinuxHeaders; - linuxHeaders = let version = "4.19.16"; in + linuxHeaders = let version = "5.5"; in makeLinuxHeaders { inherit version; src = fetchurl { - url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1pqvn6dsh0xhdpawz4ag27vkw1abvb6sn3869i4fbrz33ww8i86q"; + url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; + sha256 = "0c131fi6s7vgvka1c0597vnvcmwn1pp968rci5kq64iwj3pd9yx6"; }; patches = [ ./no-relocs.patch # for building x86 kernel headers on non-ELF platforms - ./no-dynamic-cc-version-check.patch # so we can use `stdenvNoCC`, see `makeFlags` above ]; }; } diff --git a/pkgs/os-specific/linux/kernel-headers/no-dynamic-cc-version-check.patch b/pkgs/os-specific/linux/kernel-headers/no-dynamic-cc-version-check.patch deleted file mode 100644 index 9b582cac7153..000000000000 --- a/pkgs/os-specific/linux/kernel-headers/no-dynamic-cc-version-check.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff --git a/Makefile b/Makefile -index 863f58503bee..b778d5023208 100644 ---- a/Makefile -+++ b/Makefile -@@ -501,11 +501,9 @@ KBUILD_CFLAGS += $(call cc-option,-fno-PIE) - KBUILD_AFLAGS += $(call cc-option,-fno-PIE) - - # check for 'asm goto' --ifeq ($(shell $(CONFIG_SHELL) $(srctree)/scripts/gcc-goto.sh $(CC) $(KBUILD_CFLAGS)), y) - CC_HAVE_ASM_GOTO := 1 - KBUILD_CFLAGS += -DCC_HAVE_ASM_GOTO - KBUILD_AFLAGS += -DCC_HAVE_ASM_GOTO --endif - - # The expansion should be delayed until arch/$(SRCARCH)/Makefile is included. - # Some architectures define CROSS_COMPILE in arch/$(SRCARCH)/Makefile. -diff --git a/scripts/Kbuild.include b/scripts/Kbuild.include -index 065324a8046f..d09c67194549 100644 ---- a/scripts/Kbuild.include -+++ b/scripts/Kbuild.include -@@ -216,11 +216,8 @@ cc-disable-warning = $(call try-run-cached,\ - cc-name = $(call shell-cached,$(CC) -v 2>&1 | grep -q "clang version" && echo clang || echo gcc) - - # cc-version --cc-version = $(shell $(CONFIG_SHELL) $(srctree)/scripts/gcc-version.sh $(CC)) - - # cc-fullversion --cc-fullversion = $(shell $(CONFIG_SHELL) \ -- $(srctree)/scripts/gcc-version.sh -p $(CC)) - - # cc-ifversion - # Usage: EXTRA_CFLAGS += $(call cc-ifversion, -lt, 0402, -O1) diff --git a/pkgs/os-specific/linux/kernel-headers/no-relocs.patch b/pkgs/os-specific/linux/kernel-headers/no-relocs.patch index 67e8b19e23bd..32c88224b867 100644 --- a/pkgs/os-specific/linux/kernel-headers/no-relocs.patch +++ b/pkgs/os-specific/linux/kernel-headers/no-relocs.patch @@ -1,13 +1,7 @@ -diff --git a/arch/x86/Makefile b/arch/x86/Makefile -index fad55160dcb9..a48c8331cbb2 100644 --- a/arch/x86/Makefile +++ b/arch/x86/Makefile -@@ -239,7 +239,7 @@ ifdef CONFIG_RETPOLINE - endif - +@@ -231,3 +231,3 @@ endif archscripts: scripts_basic - $(Q)$(MAKE) $(build)=arch/x86/tools relocs + $(Q)$(MAKE) $(build)=arch/x86/tools - ### - # Syscall table generation diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix index 248e5334d507..53c44bc5b728 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.19.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.19.104"; + version = "4.19.105"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${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 = "1s3bsqcsjrpjiqlxwq89llb5pb37fkbr1pwircpnh1r6ijrgzsr3"; + sha256 = "04mz4amafbhia0lwyh7wc9mxiqg2kw4gz2y0wvfb7zh4nj57fb7q"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-5.4.nix b/pkgs/os-specific/linux/kernel/linux-5.4.nix index 4692ef7dc56f..ef021fa211dd 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.4.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.4.20"; + version = "5.4.21"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "1fv7bknwjyzh176rwn11dxvpymp97h5v94mhpdhxqx3hkb6nsgvr"; + sha256 = "1yjv8qg47kb4j4jkcpi9z7v07p0vz3gszpmhrfji5866j97748vd"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-5.5.nix b/pkgs/os-specific/linux/kernel/linux-5.5.nix index 375743dda150..806ba4d4f6c6 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.5.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.5.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.5.4"; + version = "5.5.5"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "1yx60d22c3x2qnwdhrwdr2nxir59gk33jh5d5334780bxc6zsh7a"; + sha256 = "11shmhalrj6k25alarsgyh9ml48sgpq9v9r59n99y59d7z07ph3s"; }; } // (args.argsOverride or {})) diff --git a/pkgs/servers/gotify/default.nix b/pkgs/servers/gotify/default.nix index 9782b2890550..f2014aac9fdc 100644 --- a/pkgs/servers/gotify/default.nix +++ b/pkgs/servers/gotify/default.nix @@ -12,13 +12,13 @@ buildGoModule rec { pname = "gotify-server"; # Note that when this is updated, along with the hash, the `ui.nix` file # should include the same changes to the version and the sha256. - version = "2.0.13"; + version = "2.0.14"; src = fetchFromGitHub { owner = "gotify"; repo = "server"; rev = "v${version}"; - sha256 = "11ycs1ci1z8wm4fjgk4454kgszr4s8q9dc96pl77yvlngi4dk46d"; + sha256 = "0hyy9fki2626cgd78l7fkk67lik6g1pkcpf6xr3gl07dxwcclyr8"; }; modSha256 = "1awhbc8qs2bwv6y2vwd92r4ys0l1bzymrb36iamr040x961682wv"; diff --git a/pkgs/servers/gotify/ui.nix b/pkgs/servers/gotify/ui.nix index 2c1bddec68f6..403f01c2a856 100644 --- a/pkgs/servers/gotify/ui.nix +++ b/pkgs/servers/gotify/ui.nix @@ -8,13 +8,13 @@ yarn2nix-moretea.mkYarnPackage rec { packageJSON = ./package.json; yarnNix = ./yarndeps.nix; - version = "2.0.13"; + version = "2.0.14"; src_all = fetchFromGitHub { owner = "gotify"; repo = "server"; rev = "v${version}"; - sha256 = "11ycs1ci1z8wm4fjgk4454kgszr4s8q9dc96pl77yvlngi4dk46d"; + sha256 = "0hyy9fki2626cgd78l7fkk67lik6g1pkcpf6xr3gl07dxwcclyr8"; }; src = "${src_all}/ui"; diff --git a/pkgs/servers/gotify/yarndeps.nix b/pkgs/servers/gotify/yarndeps.nix index 0e81e890a9fe..3f74ad74ccc2 100644 --- a/pkgs/servers/gotify/yarndeps.nix +++ b/pkgs/servers/gotify/yarndeps.nix @@ -1234,11 +1234,11 @@ }; } { - name = "_types_notifyjs___notifyjs_3.0.0.tgz"; + name = "_types_notifyjs___notifyjs_3.0.1.tgz"; path = fetchurl { - name = "_types_notifyjs___notifyjs_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/@types/notifyjs/-/notifyjs-3.0.0.tgz"; - sha1 = "a57126a90be2827d511d00a0615816cd5ca8a740"; + name = "_types_notifyjs___notifyjs_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/@types/notifyjs/-/notifyjs-3.0.1.tgz"; + sha1 = "eba3bec10e44309df4aba31a73bfd26a562bc755"; }; } { diff --git a/pkgs/servers/http/apache-modules/mod_wsgi/default.nix b/pkgs/servers/http/apache-modules/mod_wsgi/default.nix index c0e4cefa40a5..0e4804c1a39a 100644 --- a/pkgs/servers/http/apache-modules/mod_wsgi/default.nix +++ b/pkgs/servers/http/apache-modules/mod_wsgi/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mod_wsgi"; - version = "4.7.0"; + version = "4.7.1"; src = fetchurl { url = "https://github.com/GrahamDumpleton/mod_wsgi/archive/${version}.tar.gz"; - sha256 = "079f4py20jd6n3d7djak5l9j8p6hfq96lf577iir6qpfsk2p0k3n"; + sha256 = "0dbxhrp3x689ccrhvm2lw2icmmj8i4p86z2lq3xn1zlsf43fax16"; }; buildInputs = [ apacheHttpd python ncurses ]; diff --git a/pkgs/servers/plex/raw.nix b/pkgs/servers/plex/raw.nix index 2586171a7cf0..24422842e355 100644 --- a/pkgs/servers/plex/raw.nix +++ b/pkgs/servers/plex/raw.nix @@ -8,13 +8,13 @@ # server, and the FHS userenv and corresponding NixOS module should # automatically pick up the changes. stdenv.mkDerivation rec { - version = "1.18.6.2368-97add474d"; + version = "1.18.7.2438-f342a5a43"; pname = "plexmediaserver"; # Fetch the source src = fetchurl { url = "https://downloads.plex.tv/plex-media-server-new/${version}/redhat/plexmediaserver-${version}.x86_64.rpm"; - sha256 = "0d2nnvw9qpmsra6g044bz192v67igcp1mfayy4sk0j2yqgiqvcgl"; + sha256 = "07lill29ck5h6lnrxj4k709afh36d6giy4jzv1jwcvcq1hdrvmzh"; }; outputs = [ "out" "basedb" ]; diff --git a/pkgs/servers/roundcube/default.nix b/pkgs/servers/roundcube/default.nix index 27ff5b409f79..939424ff2bfd 100644 --- a/pkgs/servers/roundcube/default.nix +++ b/pkgs/servers/roundcube/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "roundcube"; - version = "1.4.2"; + version = "1.4.3"; src = fetchurl { url = "https://github.com/roundcube/roundcubemail/releases/download/${version}/roundcubemail-${version}-complete.tar.gz"; - sha256 = "0s8gkfnyid1r4xv07vjrbl6558xv6dyn4aapvx8snqdm79n78fn8"; + sha256 = "1gsl9rpdkv388i6zvciladhb15fw94a8xjyh4ai1664nkwl51wi4"; }; patches = [ ./0001-Don-t-resolve-symlinks-when-trying-to-find-INSTALL_P.patch ]; diff --git a/pkgs/servers/sql/postgresql/ext/cstore_fdw.nix b/pkgs/servers/sql/postgresql/ext/cstore_fdw.nix index 8e30683737db..8bd50c3974c8 100644 --- a/pkgs/servers/sql/postgresql/ext/cstore_fdw.nix +++ b/pkgs/servers/sql/postgresql/ext/cstore_fdw.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "cstore_fdw"; - version = "1.6.2"; + version = "1.7.0"; nativeBuildInputs = [ protobufc ]; buildInputs = [ postgresql ]; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { owner = "citusdata"; repo = "cstore_fdw"; rev = "refs/tags/v${version}"; - sha256 = "0kdmzpbhhjdg4p6i5963h7qbs88jzgpqc52gz450h7hwb9ckpv74"; + sha256 = "129mpq8rq16jg7idh6c1j6nij64iywrs7wl3cn02bdb3h8f19z1b"; }; installPhase = '' diff --git a/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix b/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix index 5946b8f5ec32..c872e8bf95d2 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "pg_auto_failover"; - version = "1.0.5"; + version = "1.0.6"; src = fetchFromGitHub { owner = "citusdata"; repo = pname; rev = "v${version}"; - sha256 = "1idlgqazr2qra5x702f2yjcl99zwm1i5fi84paplfy98i5jjmxm1"; + sha256 = "0fli8wxi5f3vyn9cjjqi0a2z4i9npx4nqndx2lqzzx95khqqknp1"; }; buildInputs = [ postgresql openssl zlib readline ]; diff --git a/pkgs/shells/zsh/bracketed-paste-magic.patch b/pkgs/shells/zsh/bracketed-paste-magic.patch deleted file mode 100644 index f22f6489ce7a..000000000000 --- a/pkgs/shells/zsh/bracketed-paste-magic.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/Functions/Zle/bracketed-paste-magic b/Functions/Zle/bracketed-paste-magic -index 4baae82..840091b 100644 ---- a/Functions/Zle/bracketed-paste-magic -+++ b/Functions/Zle/bracketed-paste-magic -@@ -162,7 +162,7 @@ bracketed-paste-magic() { - - # There are active widgets. Reprocess $PASTED as keystrokes. - NUMERIC=1 -- zle -U - $PASTED -+ zle -U - "$PASTED" - - # Just in case there are active undo widgets - -@@ -212,7 +212,7 @@ bracketed-paste-magic() { - # Arrange to display highlighting if necessary - if [[ -z $zle_highlight || -n ${(M)zle_highlight:#paste:*} ]]; then - zle -R -- zle .read-command && zle -U - $KEYS -+ zle .read-command && zle -U - "$KEYS" - fi - } - diff --git a/pkgs/shells/zsh/default.nix b/pkgs/shells/zsh/default.nix index 52bd3c71858e..8e050acef1fd 100644 --- a/pkgs/shells/zsh/default.nix +++ b/pkgs/shells/zsh/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, ncurses, pcre, buildPackages }: let - version = "5.7.1"; + version = "5.8"; documentation = fetchurl { url = "mirror://sourceforge/zsh/zsh-${version}-doc.tar.xz"; - sha256 = "1d1r88n1gfdavx4zy3svl1gljrvzim17jb2r834hafg2a016flrh"; + sha256 = "1i6wdzq6rfjx5yjrpzan1jf50hk2pfzy5qib9mb7cnnbjfar6klv"; }; in @@ -15,16 +15,9 @@ stdenv.mkDerivation { src = fetchurl { url = "mirror://sourceforge/zsh/zsh-${version}.tar.xz"; - sha256 = "1s3yww0mzgvpc48kp0x868mm3gbna42sbgzya0nknj0x5hn2jq3j"; + sha256 = "09yyaadq738zlrnlh1hd3ycj1mv3q5hh4xl1ank70mjnqm6bbi6w"; }; - patches = [ - # Bracketed-paste-magic error in Putty due to empty $PASTED variable - # http://www.zsh.org/mla/workers/2019/msg00808.html - # This patch included in the next version - ./bracketed-paste-magic.patch - ]; - buildInputs = [ ncurses pcre ]; configureFlags = [ diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix index 3b67d2a2280d..39672a7608a8 100644 --- a/pkgs/shells/zsh/oh-my-zsh/default.nix +++ b/pkgs/shells/zsh/oh-my-zsh/default.nix @@ -4,13 +4,13 @@ { stdenv, fetchgit }: stdenv.mkDerivation rec { - version = "2020-02-11"; + version = "2020-02-19"; pname = "oh-my-zsh"; - rev = "17428f3c9a99c8d81e57bcf565d39011669e65ed"; + rev = "bc9fe7423f5d8c639b208ebb9a7dbfce078bfd9b"; src = fetchgit { inherit rev; url = "https://github.com/ohmyzsh/ohmyzsh"; - sha256 = "1i2f5gvr8gdvwx4x135j949x4q1q721jq2936p33c1zk9wq4kzwc"; + sha256 = "0nhqnhgp6y70q2p70qi7n4qzhahcb9q6hyqij7wfcdsws0lbf6nn"; }; pathsToLink = [ "/share/oh-my-zsh" ]; diff --git a/pkgs/tools/admin/azure-cli/default.nix b/pkgs/tools/admin/azure-cli/default.nix index 9a6b512ce1fc..69e0a2afe6e2 100644 --- a/pkgs/tools/admin/azure-cli/default.nix +++ b/pkgs/tools/admin/azure-cli/default.nix @@ -1,12 +1,12 @@ { stdenv, lib, python, fetchFromGitHub, installShellFiles }: let - version = "2.0.81"; + version = "2.1.0"; src = fetchFromGitHub { owner = "Azure"; repo = "azure-cli"; rev = "azure-cli-${version}"; - sha256 = "1fpdc59qqkx9s5aip62jzcky92fhlbvc97hi1x047sldh9ibp02n"; + sha256 = "0f4wrqp9f4n4mk73ybx08ybvmxx88r6g5cvx8ld6ybhl2w8bbn9v"; }; # put packages that needs to be overriden in the py package scope diff --git a/pkgs/tools/admin/azure-cli/python-packages.nix b/pkgs/tools/admin/azure-cli/python-packages.nix index 4cf0a5d35545..2ac74a16edd1 100644 --- a/pkgs/tools/admin/azure-cli/python-packages.nix +++ b/pkgs/tools/admin/azure-cli/python-packages.nix @@ -119,11 +119,14 @@ let azure-mgmt-policyinsights = overrideAzureMgmtPackage super.azure-mgmt-policyinsights "0.4.0" "zip" "1b69rz9wm0jvc54vx3b7h633x8gags51xwxrkp6myar40jggxw6g"; - azure-mgmt-recoveryservicesbackup = overrideAzureMgmtPackage super.azure-mgmt-recoveryservicesbackup "0.5.0" "zip" - "0jhq8fi3dn2cncyv2rrgr4kldd254f30zgwf6p85rdgvg2p9k4hl"; + azure-mgmt-recoveryservicesbackup = overrideAzureMgmtPackage super.azure-mgmt-recoveryservicesbackup "0.6.0" "zip" + "13s2k4jl8570bj6jkqzm0w29z29rl7h5i7czd3kr6vqar5wj9xjd"; - azure-mgmt-resource = overrideAzureMgmtPackage super.azure-mgmt-resource "6.0.0" "zip" - "08n6r6ja7p20qlhb9pp51nwwxz2mal19an98zry276i8z5x8ckp0"; + azure-mgmt-resource = overrideAzureMgmtPackage super.azure-mgmt-resource "8.0.1" "zip" + "0gngm7w17r5922ji11pnpa6gp5vh5z6la025v9cda6smsnx0fxx7"; + + azure-mgmt-appconfiguration = overrideAzureMgmtPackage super.azure-mgmt-appconfiguration "0.4.0" "zip" + "1dn5585nsizszjivx6lp677ka0mrg0ayqgag4yzfdz9ml8mj1xl5"; azure-mgmt-compute = overrideAzureMgmtPackage super.azure-mgmt-compute "10.0.0" "zip" "1s3bx6knxw5dxycp43yimvgrh0i19drzd09asglcwz2x5mr3bpyg"; @@ -161,8 +164,8 @@ let azure-mgmt-dns = overrideAzureMgmtPackage super.azure-mgmt-dns "2.1.0" "zip" "1l55py4fzzwhxlmnwa41gpmqk9v2ncc79w7zq11sm9a5ynrv2c1p"; - azure-mgmt-network = overrideAzureMgmtPackage super.azure-mgmt-network "7.0.0" "zip" - "0ss5yc9k3dh78lb88nfh3z98yz1pcd8d7d7cfjlxmv4n3dlr1kij"; + azure-mgmt-network = overrideAzureMgmtPackage super.azure-mgmt-network "9.0.0" "zip" + "12bsdbh37xiz42hvrp8ghszyqkiali3pk50x44f3aip12pgx6kix"; azure-mgmt-media = overrideAzureMgmtPackage super.azure-mgmt-media "1.1.1" "zip" "16wk0ksycrscsn3n14qk4vvf7i567vq6f96lwf5dwbc81wx6n32x"; @@ -194,11 +197,11 @@ let azure-mgmt-relay = overrideAzureMgmtPackage super.azure-mgmt-relay "0.1.0" "zip" "1jss6qhvif8l5s0lblqw3qzijjf0h88agciiydaa7f4q577qgyfr"; - azure-mgmt-eventhub = overrideAzureMgmtPackage super.azure-mgmt-eventhub "2.6.0" "zip" - "1nnp2ki4iz4f4897psmwb0v5khrwh84fgxja7nl7g73g3ym20sz8"; + azure-mgmt-eventhub = overrideAzureMgmtPackage super.azure-mgmt-eventhub "3.0.0" "zip" + "05c6isg13dslds94kv28v6navxj4bp4c5lsd9df0g3ndsxvpdrxp"; - azure-mgmt-keyvault = overrideAzureMgmtPackage super.azure-mgmt-keyvault "1.1.0" "zip" - "16a0d3j5dilbp7pd7gbwf8jr46vzbjim1p9alcmisi12m4km7885"; + azure-mgmt-keyvault = overrideAzureMgmtPackage super.azure-mgmt-keyvault "2.1.0" "zip" + "1ikv8b2h1r91fa0srz95ymn54qpqgb5a4faxwp4hf92r5h85c8j9"; azure-mgmt-cdn = overrideAzureMgmtPackage super.azure-mgmt-cdn "4.0.0" "zip" "0aphqh4mvrc1yiyis8zvks0d19d1m3lqylr9jc8fj73iw84rwgm5"; @@ -218,8 +221,8 @@ let azure-mgmt-authorization = overrideAzureMgmtPackage super.azure-mgmt-authorization "0.52.0" "zip" "0357laxgldb7lvvws81r8xb6mrq9dwwnr1bnwdnyj4bw6p21i9hn"; - azure-mgmt-storage = overrideAzureMgmtPackage super.azure-mgmt-storage "7.1.0" "zip" - "03yjvw1dwkwsadsv60i625mr9zpdryy7ywvh7p8fg60djszh1p5l"; + azure-mgmt-storage = overrideAzureMgmtPackage super.azure-mgmt-storage "7.2.0" "zip" + "01ck1ankgr9ikvfghhdcs777yrl2j2p8cw9q8nfdrjp22lpchabl"; azure-mgmt-servicefabric = overrideAzureMgmtPackage super.azure-mgmt-servicefabric "0.4.0" "zip" "1x18grkjf2p2r1ihlwv607sna9yjvsr2jwnkjc55askrgrwx5jx2"; diff --git a/pkgs/tools/audio/abcm2ps/default.nix b/pkgs/tools/audio/abcm2ps/default.nix index 575517829fff..4a824050c9fd 100644 --- a/pkgs/tools/audio/abcm2ps/default.nix +++ b/pkgs/tools/audio/abcm2ps/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "abcm2ps"; - version = "8.14.6"; + version = "8.14.7"; src = fetchFromGitHub { owner = "leesavide"; repo = "abcm2ps"; rev = "v${version}"; - sha256 = "1gqjqbd8wj0655vi8gcg2r5jqzafdlnfjzwa9z331ywhrskpm53w"; + sha256 = "0k12wf37vl31w2qpj3dsmv8c4ifrsg3qa30gqsx553jw7n0f3ma2"; }; configureFlags = [ diff --git a/pkgs/tools/graphics/lepton/default.nix b/pkgs/tools/graphics/lepton/default.nix index 0b6c12639423..2a4f8a310ada 100644 --- a/pkgs/tools/graphics/lepton/default.nix +++ b/pkgs/tools/graphics/lepton/default.nix @@ -1,24 +1,24 @@ { stdenv, fetchFromGitHub, cmake, git, glibc }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { version = "1.2.1"; pname = "lepton"; src = fetchFromGitHub { repo = "lepton"; owner = "dropbox"; - rev = "c378cbfa2daaa99e8828be7395013f94cedb1bcc"; + rev = version; sha256 = "1f2vyp0crj4yw27bs53vykf2fqk4w57gv3lh9dp89dh3y7wwh1ba"; }; nativeBuildInputs = [ cmake git ]; - buildInputs = [ glibc.static ]; + buildInputs = stdenv.lib.optionals stdenv.isLinux [ glibc.static ]; meta = with stdenv.lib; { homepage = https://github.com/dropbox/lepton; description = "A tool to losslessly compress JPEGs"; license = licenses.asl20; - platforms = [ "x86_64-linux" ]; + platforms = [ "x86_64-linux" "x86_64-darwin" ]; maintainers = with maintainers; [ artemist ]; }; } diff --git a/pkgs/tools/misc/clipman/default.nix b/pkgs/tools/misc/clipman/default.nix index b8873e2bcac2..560dbecd4bf6 100644 --- a/pkgs/tools/misc/clipman/default.nix +++ b/pkgs/tools/misc/clipman/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "clipman"; - version = "unstable-2019-12-10"; + version = "1.3.0"; src = fetchFromGitHub { owner = "yory8"; repo = pname; - rev = "c57453be90bb4496f67275db8c0beb2116a6ce14"; - sha256 = "0zvqk3gcpx67dsn7qr0p9bgjp0sljl3yrlsfbqzrbrmj2lwr98ys"; + rev = "v${version}"; + sha256 = "0b27rgyjwvdm9qjq824imda3yjbxxcwwyv8rzzk95ggvyayxw8an"; }; modSha256 = "0aw0ng8pk8qzn1iv79iw0v9zr8xdc8p9xnigr3ij86038f7aqdhv"; diff --git a/pkgs/tools/misc/fontforge/default.nix b/pkgs/tools/misc/fontforge/default.nix index 6239e8395981..635d786da53a 100644 --- a/pkgs/tools/misc/fontforge/default.nix +++ b/pkgs/tools/misc/fontforge/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, lib -, autoconf, automake, gnum4, libtool, perl, gnulib, uthash, pkgconfig, gettext +, autoconf, automake, gnum4, libtool, perl, uthash, pkgconfig, gettext , python, freetype, zlib, glib, libungif, libpng, libjpeg, libtiff, libxml2, cairo, pango -, readline, woff2, zeromq +, readline, woff2, zeromq, libuninameslist , withSpiro ? false, libspiro , withGTK ? false, gtk2 , withPython ? true @@ -11,15 +11,13 @@ stdenv.mkDerivation rec { pname = "fontforge"; - version = "20190413"; + version = "20190801"; src = fetchurl { url = "https://github.com/${pname}/${pname}/releases/download/${version}/${pname}-${version}.tar.gz"; - sha256 = "05v640mnk4fy4jzmxb6c4n4qm800x7hy4sl5gcdgzmm3md2s0qk7"; + sha256 = "0lh8yx01asbzxm6car5cfi64njh5p4lxc7iv8dldr5rwg357a86r"; }; - patches = [ ./fontforge-20140813-use-system-uthash.patch ]; - # use $SOURCE_DATE_EPOCH instead of non-deterministic timestamps postPatch = '' find . -type f -name '*.c' -exec sed -r -i 's#\btime\(&(.+)\)#if (getenv("SOURCE_DATE_EPOCH")) \1=atol(getenv("SOURCE_DATE_EPOCH")); else &#g' {} \; @@ -34,7 +32,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig autoconf automake gnum4 libtool perl gettext ]; buildInputs = [ - readline uthash woff2 zeromq + readline uthash woff2 zeromq libuninameslist python freetype zlib glib libungif libpng libjpeg libtiff libxml2 ] ++ lib.optionals withSpiro [libspiro] @@ -53,9 +51,7 @@ stdenv.mkDerivation rec { export SOURCE_DATE_EPOCH=$(date -d ${version} +%s) export GIT="$(type -P true)" - cp -r "${gnulib}" ./gnulib - chmod +w -R ./gnulib - ./bootstrap --skip-git --gnulib-srcdir=./gnulib --force + ./bootstrap --skip-git --force ''; doCheck = false; # tries to wget some fonts @@ -74,5 +70,6 @@ stdenv.mkDerivation rec { homepage = http://fontforge.github.io; platforms = stdenv.lib.platforms.all; license = stdenv.lib.licenses.bsd3; + maintainers = [ stdenv.lib.maintainers.erictapen ]; }; } diff --git a/pkgs/tools/misc/fontforge/fontforge-20140813-use-system-uthash.patch b/pkgs/tools/misc/fontforge/fontforge-20140813-use-system-uthash.patch deleted file mode 100644 index fb53c619b2bc..000000000000 --- a/pkgs/tools/misc/fontforge/fontforge-20140813-use-system-uthash.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- a/Makefile.am.old 2014-08-12 10:07:32.000000000 +0530 -+++ b/Makefile.am 2014-09-08 16:23:56.046996941 +0530 -@@ -43,7 +43,6 @@ - AM_CPPFLAGS = - AM_LDFLAGS = - --BUILT_SOURCES = uthash/src - EXTRA_DIST = - CLEANFILES = - MOSTLYCLEANFILES = -@@ -113,8 +112,7 @@ - Packaging/FontForge-doc.spec \ - Packaging/FontForge.spec \ - Packaging/FontForge.static.spec \ - README \ -- uthash/src \ - $(NULL) - - #-------------------------------------------------------------------------- -@@ -129,11 +127,6 @@ - - - #-------------------------------------------------------------------------- --uthash/src: -- if [ ! -e uthash/src ]; then \ -- if [ -e uthash ] ; then rm -r uthash ; fi ; \ -- git clone https://github.com/troydhanson/uthash ; \ -- fi ; - - # We import a selection of targets from Frank's standard packaging Makefile. - diff --git a/pkgs/tools/misc/fx_cast/default.nix b/pkgs/tools/misc/fx_cast/default.nix new file mode 100644 index 000000000000..5fa57e830d22 --- /dev/null +++ b/pkgs/tools/misc/fx_cast/default.nix @@ -0,0 +1,85 @@ +{ stdenv, fetchurl, dpkg }: + +stdenv.mkDerivation rec { + pname = "fx_cast_bridge"; + version = "0.0.5"; + + src = fetchurl { + url = "https://github.com/hensm/fx_cast/releases/download/v${version}/${pname}-${version}-x64.deb"; + sha256 = "1qmp1d7miq7c2q8i4bhfp5ywxdngvyi7rjl6i82is2g5nhr7gbvv"; + }; + + nativeBuildInputs = [ dpkg ]; + + unpackPhase = '' + runHook preUnpack + dpkg-deb -xv $src ./ + runHook postUnpack + ''; + + dontBuild = true; + dontPatchELF = true; + + installPhase = '' + install -DT {opt/fx_cast,$out/bin}/${pname} + install -DT {usr,$out}/lib/mozilla/native-messaging-hosts/${pname}.json + + substituteInPlace $out/lib/mozilla/native-messaging-hosts/${pname}.json \ + --replace {/opt/fx_cast,$out/bin}/${pname} + ''; + + # See now-cli/default.nix + dontStrip = true; + preFixup = let + libPath = stdenv.lib.makeLibraryPath [stdenv.cc.cc stdenv.cc.libc]; + bin = "$out/bin/${pname}"; + in '' + + orig_size=$(stat --printf=%s ${bin}) + + patchelf --set-interpreter "${stdenv.cc.bintools.dynamicLinker}" ${bin} + patchelf --set-rpath ${libPath} ${bin} + chmod +x ${bin} + + new_size=$(stat --printf=%s ${bin}) + + ###### zeit-pkg fixing starts here. + # we're replacing plaintext js code that looks like + # PAYLOAD_POSITION = '1234 ' | 0 + # [...] + # PRELUDE_POSITION = '1234 ' | 0 + # ^-----20-chars-----^^------22-chars------^ + # ^-- grep points here + # + # var_* are as described above + # shift_by seems to be safe so long as all patchelf adjustments occur + # before any locations pointed to by hardcoded offsets + + var_skip=20 + var_select=22 + shift_by=$(expr $new_size - $orig_size) + + function fix_offset { + # $1 = name of variable to adjust + location=$(grep -obUam1 "$1" ${bin} | cut -d: -f1) + location=$(expr $location + $var_skip) + + value=$(dd if=${bin} iflag=count_bytes,skip_bytes skip=$location \ + bs=1 count=$var_select status=none) + value=$(expr $shift_by + $value) + + echo -n $value | dd of=${bin} bs=1 seek=$location conv=notrunc + } + + fix_offset PAYLOAD_POSITION + fix_offset PRELUDE_POSITION + + ''; + + meta = with stdenv.lib; { + description = "Implementation of the Chrome Sender API (Chromecast) within Firefox"; + homepage = https://hensm.github.io/fx_cast/; + license = licenses.mit; + maintainers = with maintainers; [ dtzWill ]; + }; +} diff --git a/pkgs/tools/misc/graylog/default.nix b/pkgs/tools/misc/graylog/default.nix index e331e43956e4..48b471e3b40b 100644 --- a/pkgs/tools/misc/graylog/default.nix +++ b/pkgs/tools/misc/graylog/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "graylog"; - version = "3.2.0"; + version = "3.2.1"; src = fetchurl { url = "https://packages.graylog2.org/releases/graylog/graylog-${version}.tgz"; - sha256 = "128hlk2m7dy1ajvxkkazbi2npx738jfrkkznvmhyxm0hllcw4r9z"; + sha256 = "1pilksik3bbd4sgmnpns9gg9sddybzxzxkn9sknn40dav08k1x6h"; }; dontBuild = true; diff --git a/pkgs/tools/misc/gti/default.nix b/pkgs/tools/misc/gti/default.nix index bca481cade45..cdb6be992539 100644 --- a/pkgs/tools/misc/gti/default.nix +++ b/pkgs/tools/misc/gti/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "gti"; - version = "1.6.1"; + version = "1.7.0"; src = fetchFromGitHub { owner = "rwos"; repo = "gti"; rev = "v${version}"; - sha256 = "19q3r4v22z2q1j4njap356f3mcq6kwh6v8nbbq2rw4x3cdxwdv51"; + sha256 = "1jivnjswlhwjfg5v9nwfg3vfssvqbdxxf9znwmfb5dgfblg9wxw9"; }; installPhase = '' diff --git a/pkgs/tools/misc/kepubify/default.nix b/pkgs/tools/misc/kepubify/default.nix new file mode 100644 index 000000000000..faa5e9d85e81 --- /dev/null +++ b/pkgs/tools/misc/kepubify/default.nix @@ -0,0 +1,26 @@ +{ lib, fetchFromGitHub, buildGoModule }: + +buildGoModule rec { + pname = "kepubify"; + version = "3.0.0"; + + src = fetchFromGitHub { + owner = "geek1011"; + repo = pname; + rev = "v${version}"; + sha256 = "168n4xbhjrzwzlhvakmsd0nwqjwgibphkwzq5hcxrk9ywpqpxjad"; + }; + + modSha256 = "18q9ywsjc2v1bsmw7307dpd4v5m7v80hbhijkfrkcyqzj34jrq43"; + + buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; + + subPackages = [ "." "covergen" "seriesmeta" ]; + + meta = with lib; { + description = "EPUB to KEPUB converter"; + homepage = "https://pgaskin.net/kepubify"; + license = licenses.mit; + maintainers = with maintainers; [ zowoq ]; + }; +} diff --git a/pkgs/tools/misc/neo-cowsay/default.nix b/pkgs/tools/misc/neo-cowsay/default.nix index 128d582e32e7..a4fe58fb1075 100644 --- a/pkgs/tools/misc/neo-cowsay/default.nix +++ b/pkgs/tools/misc/neo-cowsay/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "neo-cowsay"; - version = "1.0.0"; + version = "1.0.1"; src = fetchFromGitHub { owner = "Code-Hex"; repo = "Neo-cowsay"; rev = "v${version}"; - sha256 = "1in6kadczv05v62qhskqbdx7wppch0gwl0bshr5ihmi39k8l7v3z"; + sha256 = "0c6lygdqi26mczij41sn8ckc3g6qaakkkh3iasf10a4d07amxci1"; }; modSha256 = "063ds35dzv8m4bjk7v1q3f6jwyp7j5jrkrhrl41z1c1mbzzkagkq"; diff --git a/pkgs/tools/misc/plantuml/default.nix b/pkgs/tools/misc/plantuml/default.nix index b42be5b548cd..34a6cb03d8bb 100644 --- a/pkgs/tools/misc/plantuml/default.nix +++ b/pkgs/tools/misc/plantuml/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, makeWrapper, jre, graphviz }: stdenv.mkDerivation rec { - version = "1.2020.0"; + version = "1.2020.1"; pname = "plantuml"; src = fetchurl { url = "mirror://sourceforge/project/plantuml/${version}/plantuml.${version}.jar"; - sha256 = "1ibhyj51wib2d8q7zyjbzp65hqm0a1jczqwqdw3834zdmrb2v7bs"; + sha256 = "02a55na86561fnxf6pk0cpg13mx8qr7pvigyp65rqks0f9ygj9ga"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/misc/starship/default.nix b/pkgs/tools/misc/starship/default.nix index 0c0820837f50..338452e213cf 100644 --- a/pkgs/tools/misc/starship/default.nix +++ b/pkgs/tools/misc/starship/default.nix @@ -3,13 +3,13 @@ rustPlatform.buildRustPackage rec { pname = "starship"; - version = "0.36.0"; + version = "0.36.1"; src = fetchFromGitHub { owner = "starship"; repo = pname; rev = "v${version}"; - sha256 = "0vkp6yfafzyhilkk5rfvgka91gmhm9nrrvy3m6gdza4ayslmcpam"; + sha256 = "1ip6jfnlw0maabvihzbmmka453njnw1yf7hq3fd89l6dx57315m5"; }; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ libiconv Security ]; @@ -19,10 +19,7 @@ rustPlatform.buildRustPackage rec { --replace "/bin/echo" "echo" ''; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "05q527bd5q6a7kd03hwic4bynyc4sipyvi0bf2g2jqxzcsmswyyk"; + cargoSha256 = "16wsd8z4cfb5pplwfvwgi5qawwv8c0aa220wnvphplmgz8cpq35r"; checkPhase = "cargo test -- --skip directory::home_directory --skip directory::directory_in_root"; meta = with stdenv.lib; { diff --git a/pkgs/tools/misc/you-get/default.nix b/pkgs/tools/misc/you-get/default.nix index 223fb4883aee..466813ee75f7 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.1388"; + version = "0.4.1403"; # 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 = "1afnyb5srs0prqm73pz5qbfk5j4lb5g70nqg41r4igh753p2yi13"; + sha256 = "195c91xxcv3l3rd0v8ls5ghncf92ndfx0lpcbjr5zb41bl8alkcl"; }; meta = with stdenv.lib; { diff --git a/pkgs/tools/networking/amass/default.nix b/pkgs/tools/networking/amass/default.nix index 06eabec06183..a79540eaeca9 100644 --- a/pkgs/tools/networking/amass/default.nix +++ b/pkgs/tools/networking/amass/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "amass"; - version = "3.4.2"; + version = "3.4.4"; src = fetchFromGitHub { owner = "OWASP"; repo = "Amass"; rev = "v${version}"; - sha256 = "0mia01cqmaa17696m73qazpbyrcng7wldca79g46xgc4z96q1i7i"; + sha256 = "1qr9cd22m6w5r32bsvg08bmvyvzz7agaklrghf8n1d23ijj1563p"; }; - modSha256 = "1zwm7skdhql6isffyhixqsgvcgxw2436iv8bj92cxs70ipk537v9"; + modSha256 = "00pd0xi0m3w4xqdqq7ldqcpirq9plln45nhpjrsp5r9bz7yc5wn9"; outputs = [ "out" "wordlists" ]; diff --git a/pkgs/tools/networking/dnsmasq/default.nix b/pkgs/tools/networking/dnsmasq/default.nix index f224ab1ac935..2a6b776c14d5 100644 --- a/pkgs/tools/networking/dnsmasq/default.nix +++ b/pkgs/tools/networking/dnsmasq/default.nix @@ -27,6 +27,9 @@ stdenv.mkDerivation rec { sha256 = "1hnixij3jp1p6zc3bx2dr92yyf9jp1ahhl9hiiq7bkbhbrw6mbic"; }) ]; + postPatch = stdenv.lib.optionalString stdenv.hostPlatform.isLinux '' + sed '1i#include <linux/sockios.h>' -i src/dhcp.c + ''; preBuild = '' makeFlagsArray=("COPTS=${copts}") diff --git a/pkgs/tools/networking/eternal-terminal/default.nix b/pkgs/tools/networking/eternal-terminal/default.nix index 8dd18df28c7e..7ee959905cee 100644 --- a/pkgs/tools/networking/eternal-terminal/default.nix +++ b/pkgs/tools/networking/eternal-terminal/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "eternal-terminal"; - version = "6.0.5"; + version = "6.0.6"; src = fetchFromGitHub { owner = "MisterTea"; repo = "EternalTerminal"; rev = "et-v${version}"; - sha256 = "04jn0189vq5lc795izkxq1zdv9fnpxz2xchg2mm37armpz7n06id"; + sha256 = "0vhhiccyvp9pjdmmscwdwcynxfwd2kgv418z90blnir0yfkvsryq"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/tools/networking/netalyzr/default.nix b/pkgs/tools/networking/netalyzr/default.nix deleted file mode 100644 index 969084582aee..000000000000 --- a/pkgs/tools/networking/netalyzr/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ stdenv, fetchurl, jre, makeWrapper }: - -stdenv.mkDerivation { - pname = "netalyzr"; - version = "57861"; - - # unfortunately there is not a version specific download URL - src = fetchurl { - url = "http://netalyzr.icsi.berkeley.edu/NetalyzrCLI.jar"; - sha256 = "0fa3gvgp05p1nf1d711052wgvnp0xnvhj2h2bwk1mh1ih8qn50xb"; - }; - - phases = [ "installPhase" ]; - - nativeBuildInputs = [ makeWrapper ]; - - installPhase = '' - mkdir -p $out/{bin,share/netalyzr} - install -m644 $src $out/share/netalyzr/NetalyzrCLI.jar - makeWrapper ${stdenv.lib.getBin jre}/bin/java $out/bin/netalyzr \ - --add-flags "-jar $out/share/netalyzr/NetalyzrCLI.jar" - ''; - - meta = with stdenv.lib; { - description = "Network debugging and analysis tool"; - homepage = http://netalyzr.icsi.berkeley.edu; - maintainers = with maintainers; [ peterhoeg ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/tools/package-management/cargo-audit/default.nix b/pkgs/tools/package-management/cargo-audit/default.nix index 6c56fbe476d7..fba2b82ff32b 100644 --- a/pkgs/tools/package-management/cargo-audit/default.nix +++ b/pkgs/tools/package-management/cargo-audit/default.nix @@ -1,16 +1,16 @@ { stdenv, lib, rustPlatform, fetchFromGitHub, openssl, pkg-config, Security, libiconv }: rustPlatform.buildRustPackage rec { pname = "cargo-audit"; - version = "0.10.0"; + version = "0.11.2"; src = fetchFromGitHub { owner = "RustSec"; repo = "cargo-audit"; rev = "v${version}"; - sha256 = "1977ykablfi4mc6j2iil0bxc6diy07vi5hm56xmqj3n37ziavf1m"; + sha256 = "0py4z50ld4vs0g7vh8ga6v5h11nz2yfcpr3xqzpihf4p7sg1mdf4"; }; - cargoSha256 = "0bpqsg8mv94ivwmbfxfcnd89yx5vry33395ynqrzhqq9s1jwq0dq"; + cargoSha256 = "0n4q8767aby6fgq0z7wj966zgqydlwirrzgyahf234dz6arsxw2l"; buildInputs = [ openssl libiconv ] ++ lib.optionals stdenv.isDarwin [ Security ]; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/tools/package-management/nixpkgs-review/default.nix b/pkgs/tools/package-management/nixpkgs-review/default.nix index 928c946de2be..9f54d82d3cd2 100644 --- a/pkgs/tools/package-management/nixpkgs-review/default.nix +++ b/pkgs/tools/package-management/nixpkgs-review/default.nix @@ -8,13 +8,13 @@ python3.pkgs.buildPythonApplication rec { pname = "nixpkgs-review"; - version = "2.1.1"; + version = "2.2.0"; src = fetchFromGitHub { owner = "Mic92"; repo = "nixpkgs-review"; rev = version; - sha256 = "0rx0ld2ihsvlr1yiap5cq7h227jr79zf3xhkninh2m00x384s6bd"; + sha256 = "0qsvrcxl97nih1yprydzlqc6n1ppg726664d6harx5kjzp5776mr"; }; makeWrapperArgs = [ diff --git a/pkgs/tools/security/bitwarden_rs/vault.nix b/pkgs/tools/security/bitwarden_rs/vault.nix index 9cbf067d40b4..6c6ef6ccaa9f 100644 --- a/pkgs/tools/security/bitwarden_rs/vault.nix +++ b/pkgs/tools/security/bitwarden_rs/vault.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "bitwarden_rs-vault"; - version = "2.12.0b"; + version = "2.12.0c"; src = fetchurl { url = "https://github.com/dani-garcia/bw_web_builds/releases/download/v${version}/bw_web_v${version}.tar.gz"; - sha256 = "01jwyhcam9kh8lpxfgzzw7r3nn9sn6jbgmd78a7h8r50z5hy04g5"; + sha256 = "040bqbx6hpwq4qvv4s7d77gwp5n2ay9rr7kdb135582d80wjq5sp"; }; buildCommand = '' @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Integrates the web vault into bitwarden_rs"; - homepage = https://github.com/dani-garcia/bw_web_builds; + homepage = "https://github.com/dani-garcia/bw_web_builds"; platforms = platforms.all; license = licenses.gpl3; maintainers = with maintainers; [ msteen ]; diff --git a/pkgs/tools/security/tor/default.nix b/pkgs/tools/security/tor/default.nix index 698693be95e5..78d5b4441d53 100644 --- a/pkgs/tools/security/tor/default.nix +++ b/pkgs/tools/security/tor/default.nix @@ -28,6 +28,8 @@ stdenv.mkDerivation rec { buildInputs = [ libevent openssl zlib lzma zstd scrypt ] ++ stdenv.lib.optionals stdenv.isLinux [ libseccomp systemd libcap ]; + patches = [ ./disable-monotonic-timer-tests.patch ]; + NIX_CFLAGS_LINK = stdenv.lib.optionalString stdenv.cc.isGNU "-lgcc_s"; postPatch = '' @@ -39,7 +41,6 @@ stdenv.mkDerivation rec { ''; enableParallelBuilding = true; - enableParallelChecking = false; # 4 tests fail randomly doCheck = true; diff --git a/pkgs/tools/security/tor/disable-monotonic-timer-tests.patch b/pkgs/tools/security/tor/disable-monotonic-timer-tests.patch new file mode 100644 index 000000000000..a95a373bbb64 --- /dev/null +++ b/pkgs/tools/security/tor/disable-monotonic-timer-tests.patch @@ -0,0 +1,26 @@ +diff --git a/src/test/test_util.c b/src/test/test_util.c +index 0d86a5ab5..e93c6ba89 100644 +--- a/src/test/test_util.c ++++ b/src/test/test_util.c +@@ -5829,13 +5829,9 @@ test_util_monotonic_time(void *arg) + /* We need to be a little careful here since we don't know the system load. + */ + tt_i64_op(monotime_diff_msec(&mt1, &mt2), OP_GE, 175); +- tt_i64_op(monotime_diff_msec(&mt1, &mt2), OP_LT, 1000); + tt_i64_op(monotime_coarse_diff_msec(&mtc1, &mtc2), OP_GE, 125); +- tt_i64_op(monotime_coarse_diff_msec(&mtc1, &mtc2), OP_LT, 1000); + tt_u64_op(nsec2-nsec1, OP_GE, 175000000); +- tt_u64_op(nsec2-nsec1, OP_LT, 1000000000); + tt_u64_op(nsecc2-nsecc1, OP_GE, 125000000); +- tt_u64_op(nsecc2-nsecc1, OP_LT, 1000000000); + + tt_u64_op(msec1, OP_GE, nsec1 / 1000000); + tt_u64_op(usec1, OP_GE, nsec1 / 1000); +@@ -5849,7 +5845,6 @@ test_util_monotonic_time(void *arg) + uint64_t coarse_stamp_diff = + monotime_coarse_stamp_units_to_approx_msec(stamp2-stamp1); + tt_u64_op(coarse_stamp_diff, OP_GE, 120); +- tt_u64_op(coarse_stamp_diff, OP_LE, 1200); + + { + uint64_t units = monotime_msec_to_approx_coarse_stamp_units(5000); diff --git a/pkgs/tools/system/throttled/default.nix b/pkgs/tools/system/throttled/default.nix index 4f52b5e09455..02ff75113824 100644 --- a/pkgs/tools/system/throttled/default.nix +++ b/pkgs/tools/system/throttled/default.nix @@ -2,24 +2,24 @@ stdenv.mkDerivation rec { pname = "throttled"; - version = "0.6"; + version = "0.7"; src = fetchFromGitHub { owner = "erpalma"; repo = pname; rev = "v${version}"; - sha256 = "1icb2288pj25vbdnd16zvisw9c01hp8vkk25ilkc74gy76xhpcs4"; + sha256 = "1y1sczvj2qc8ml9i1rdzr8hklvci9bdphm3mmri2ncaqys8wdbh4"; }; nativeBuildInputs = [ python3Packages.wrapPython ]; - pythonPath = with python3Packages; [ + pythonPath = with python3Packages; [ configparser dbus-python pygobject3 ]; - # The upstream unit both assumes the install location, and tries to run in a virtualenv + # The upstream unit both assumes the install location, and tries to run in a virtualenv postPatch = ''sed -e 's|ExecStart=.*|ExecStart=${placeholder "out"}/bin/lenovo_fix.py|' -i systemd/lenovo_fix.service''; installPhase = '' diff --git a/pkgs/tools/text/ocrmypdf/default.nix b/pkgs/tools/text/ocrmypdf/default.nix index cdc6878bb5a7..6f7b4d487ef1 100644 --- a/pkgs/tools/text/ocrmypdf/default.nix +++ b/pkgs/tools/text/ocrmypdf/default.nix @@ -29,14 +29,14 @@ let in buildPythonApplication rec { pname = "ocrmypdf"; - version = "9.5.0"; + version = "9.6.0"; disabled = ! python3Packages.isPy3k; src = fetchFromGitHub { owner = "jbarlow83"; repo = "OCRmyPDF"; rev = "v${version}"; - sha256 = "0rvwxykyscpcvfgm8zzyvjgzl9x9ddi9cxmqyxrc031mxpc0lzyy"; + sha256 = "1cpj8fj1mzp6mbd1z9dj38fmlcg5q2gbya4vbag1ddd4vp7rvn2m"; }; nativeBuildInputs = with python3Packages; [ diff --git a/pkgs/tools/text/vale/default.nix b/pkgs/tools/text/vale/default.nix index 308f893e73b7..6035c2950a96 100644 --- a/pkgs/tools/text/vale/default.nix +++ b/pkgs/tools/text/vale/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "vale"; - version = "1.7.1"; + version = "2.0.0"; subPackages = [ "." ]; @@ -10,13 +10,15 @@ buildGoPackage rec { owner = "errata-ai"; repo = "vale"; rev = "v${version}"; - sha256 = "1qi3brjppiymk6as0xic2n3bhq8g8qw1z8d9a24w60x9gp52yq5m"; + sha256 = "068973ayd883kzkxl60lpammf3icjz090nw07kfccvhcf24x07bh"; }; goPackagePath = "github.com/errata-ai/vale"; + buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; + meta = with stdenv.lib; { - homepage = https://errata-ai.github.io/vale/; + homepage = "https://errata-ai.gitbook.io/vale/"; description = "A syntax-aware linter for prose built with speed and extensibility in mind"; license = licenses.mit; maintainers = [ maintainers.marsam ]; diff --git a/pkgs/tools/typesetting/satysfi/default.nix b/pkgs/tools/typesetting/satysfi/default.nix index 6a2ebb089d21..f2d447f66f6e 100644 --- a/pkgs/tools/typesetting/satysfi/default.nix +++ b/pkgs/tools/typesetting/satysfi/default.nix @@ -15,27 +15,35 @@ let src = fetchFromGitHub { owner = "gfngfn"; repo = "camlpdf"; - rev = "v2.2.1+satysfi"; - sha256 = "1s8v2i8nq52kz038bvc2n0spz68fpdq6kgxrabcs6zvml6n1frzy"; + rev = "v2.2.2+satysfi"; + sha256 = "1dkyibjd8qb9fzljlzdsfdhb798vc9m8xqkd7295fm6bcfpr5r5k"; }; }); otfm = ocamlPackages.otfm.overrideAttrs (o: { src = fetchFromGitHub { owner = "gfngfn"; repo = "otfm"; - rev = "v0.3.2+satysfi"; - sha256 = "1h795pdi5qi2nwymsfvb53x56h9pqi9iiqbzw10mi6fazgd2dzhd"; + rev = "v0.3.7+satysfi"; + sha256 = "0y8s0ij1vp1s4h5y1hn3ns76fzki2ba5ysqdib33akdav9krbj8p"; + }; + }); + yojson = ocamlPackages.yojson.overrideAttrs (o: { + src = fetchFromGitHub { + owner = "gfngfn"; + repo = "yojson"; + rev = "v1.4.1+satysfi"; + sha256 = "06lajzycwmvc6s26cf40s9xn001cjxrpxijgfha3s4f4rpybb1mp"; }; }); in stdenv.mkDerivation rec { pname = "satysfi"; - version = "0.0.3"; + version = "0.0.4"; src = fetchFromGitHub { owner = "gfngfn"; repo = "SATySFi"; rev = "v${version}"; - sha256 = "0qk284jhxnfb69s24j397a6155dhl4dcgamicin7sq04d0wj6c7f"; + sha256 = "0ilvgixglklqwavf8p9mcbrjq6cjfm9pk4kqx163c0irh0lh0adv"; fetchSubmodules = true; }; @@ -49,7 +57,7 @@ in buildInputs = [ camlpdf otfm ] ++ (with ocamlPackages; [ ocaml findlib menhir - batteries camlimages core_kernel ppx_deriving uutf yojson + batteries camlimages core_kernel ppx_deriving uutf yojson omd cppo re ]); installPhase = '' @@ -58,13 +66,15 @@ in cp -r ${lm}/* lib-satysfi/dist/fonts/ cp -r ${lm-math}/otf/latinmodern-math.otf lib-satysfi/dist/fonts/ make install PREFIX=$out LIBDIR=$out/share/satysfi + mkdir -p $out/share/satysfi/ + cp -r lib-satysfi/dist/ $out/share/satysfi/ ''; meta = with stdenv.lib; { homepage = https://github.com/gfngfn/SATySFi; description = "A statically-typed, functional typesetting system"; license = licenses.lgpl3; - maintainers = [ maintainers.mt-caret ]; + maintainers = [ maintainers.mt-caret maintainers.marsam ]; platforms = platforms.all; }; } diff --git a/pkgs/tools/video/rav1e/default.nix b/pkgs/tools/video/rav1e/default.nix index 9d4f7b514a35..099a02e8f658 100644 --- a/pkgs/tools/video/rav1e/default.nix +++ b/pkgs/tools/video/rav1e/default.nix @@ -2,7 +2,7 @@ rustPlatform.buildRustPackage rec { pname = "rav1e"; - version = "0.3.0"; + version = "0.3.1"; src = stdenv.mkDerivation rec { name = "${pname}-${version}-source"; @@ -11,11 +11,11 @@ rustPlatform.buildRustPackage rec { owner = "xiph"; repo = "rav1e"; rev = "v${version}"; - sha256 = "1z8wdwhmczd7qq61gpngnyhl9614csccm0vnavvzjmaqsljlm0qi"; + sha256 = "001v29baa77pkab13d7imi71llixyvffqax8kgjwhm1dhsqlm7bl"; }; cargoLock = fetchurl { url = "https://github.com/xiph/rav1e/releases/download/v${version}/Cargo.lock"; - sha256 = "0qhgiryb71qgil5nawy7n3mj5g9aiikl3hq3nlikg94rm9dl0dhv"; + sha256 = "06l8jj75ma5kvz1m14x58an2zvx12i6wcq70gzq5k47nvj5l0zax"; }; installPhase = '' @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec { # Delete this on next update; see #79975 for details legacyCargoFetcher = true; - cargoSha256 = "185jnmyirfhrv8bxvmwizf3lvq49sjj1696g3gflph31d8bfpb0c"; + cargoSha256 = "0jxc8qsp5fasnh5cbg6yl9d878n7dppay9gzjndlb65kj9j43h84"; nativeBuildInputs = [ nasm ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5733168d5cd2..4c8282ef729d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1562,6 +1562,8 @@ in datasette = with python3Packages; toPythonApplication datasette; + howard-hinnant-date = callPackage ../development/libraries/howard-hinnant-date { }; + datefudge = callPackage ../tools/system/datefudge { }; dateutils = callPackage ../tools/misc/dateutils { }; @@ -1774,6 +1776,8 @@ in fwup = callPackage ../tools/misc/fwup { }; + fx_cast_bridge = callPackage ../tools/misc/fx_cast { }; + fzf = callPackage ../tools/misc/fzf { }; fzf-zsh = callPackage ../shells/zsh/fzf-zsh { }; @@ -1880,7 +1884,7 @@ in hostsblock = callPackage ../tools/misc/hostsblock { }; - hopper = callPackage ../development/tools/analysis/hopper {}; + hopper = qt5.callPackage ../development/tools/analysis/hopper {}; hr = callPackage ../applications/misc/hr { }; @@ -6007,6 +6011,8 @@ in openmpi = callPackage ../development/libraries/openmpi { }; + ucx = callPackage ../development/libraries/ucx {}; + openmodelica = callPackage ../applications/science/misc/openmodelica { }; qarte = libsForQt5.callPackage ../applications/video/qarte { }; @@ -6726,8 +6732,6 @@ in w3m = w3m-batch; }; - netalyzr = callPackage ../tools/networking/netalyzr { }; - swaks = callPackage ../tools/networking/swaks { }; swiften = callPackage ../development/libraries/swiften { }; @@ -7364,9 +7368,13 @@ in xxkb = callPackage ../applications/misc/xxkb { }; - ugarit = callPackage ../tools/backup/ugarit { }; + ugarit = callPackage ../tools/backup/ugarit { + inherit (chickenPackages_4) eggDerivation fetchegg; + }; - ugarit-manifest-maker = callPackage ../tools/backup/ugarit-manifest-maker { }; + ugarit-manifest-maker = callPackage ../tools/backup/ugarit-manifest-maker { + inherit (chickenPackages_4) eggDerivation fetchegg; + }; unar = callPackage ../tools/archivers/unar { stdenv = clangStdenv; }; @@ -7935,8 +7943,6 @@ in stdenv = if stdenv.cc.isClang then llvmPackages_6.stdenv else stdenv; inherit (llvmPackages_6) clang llvm; }) - crystal_0_25 - crystal_0_26 crystal_0_27 crystal_0_29 crystal_0_30 @@ -9128,7 +9134,7 @@ in kanif = callPackage ../applications/networking/cluster/kanif { }; lumo = callPackage ../development/interpreters/clojurescript/lumo { - nodejs = nodejs-10_x; + nodejs = nodejs-13_x; }; lxappearance = callPackage ../desktops/lxde/core/lxappearance { @@ -10682,11 +10688,7 @@ in terracognita = callPackage ../development/tools/misc/terracognita { }; - terraform-lsp = callPackage ../development/tools/misc/terraform-lsp { - # Version 0.0.5 fails to build with go 1.13 due to dependency: - # build github.com/juliosueiras/terraform-lsp: cannot load github.com/googleapis/gax-go/v2: github.com/googleapis/gax-go@v2.0.0+incompatible: reading file:///nix/store/ihiyd3mqa5gvfm2k2716hpl16knak798-terraform-lsp-0.0.5-go-modules/github.com/googleapis/gax-go/@v/v2.0.0+incompatible.zip: Not Found - buildGoModule = buildGo112Module; - }; + terraform-lsp = callPackage ../development/tools/misc/terraform-lsp { }; texinfo413 = callPackage ../development/tools/misc/texinfo/4.13a.nix { }; texinfo4 = texinfo413; @@ -13109,6 +13111,8 @@ in libunibreak = callPackage ../development/libraries/libunibreak { }; + libuninameslist = callPackage ../development/libraries/libuninameslist { }; + libunique = callPackage ../development/libraries/libunique { }; libunique3 = callPackage ../development/libraries/libunique/3.x.nix { }; @@ -15412,7 +15416,7 @@ in miniHttpd = callPackage ../servers/http/mini-httpd {}; mlflow-server = callPackage ../servers/mlflow-server { }; - + mlmmj = callPackage ../servers/mail/mlmmj { }; moodle = callPackage ../servers/web-apps/moodle { }; @@ -18037,7 +18041,8 @@ in undefined-medium = callPackage ../data/fonts/undefined-medium { }; - uni-vga = callPackage ../data/fonts/uni-vga { }; + uni-vga = callPackage ../data/fonts/uni-vga + { inherit (buildPackages.xorg) fonttosfnt mkfontscale; }; unicode-character-database = callPackage ../data/misc/unicode-character-database { }; @@ -19932,6 +19937,8 @@ in kega-fusion = pkgsi686Linux.callPackage ../misc/emulators/kega-fusion { }; + kepubify = callPackage ../tools/misc/kepubify { }; + kermit = callPackage ../tools/misc/kermit { }; kexi = libsForQt5.callPackage ../applications/office/kexi { }; @@ -20443,6 +20450,8 @@ in mpc-qt = libsForQt5.callPackage ../applications/video/mpc-qt { }; + mps-youtube = callPackage ../applications/misc/mps-youtube { }; + mplayer = callPackage ../applications/video/mplayer ({ libdvdnav = libdvdnav_4_2_1; } // (config.mplayer or {})); @@ -20455,6 +20464,7 @@ in mpv = callPackage ../applications/video/mpv { inherit lua; + inherit (darwin.apple_sdk.frameworks) CoreFoundation Cocoa CoreAudio MediaPlayer; }; mpv-with-scripts = callPackage ../applications/video/mpv/wrapper.nix { }; @@ -20598,6 +20608,15 @@ in shogun = callPackage ../applications/science/machine-learning/shogun { stdenv = gcc8Stdenv; + + # Workaround for the glibc abi version mismatch. + # Please note that opencv builds are by default disabled. + opencv = opencv3.override { + stdenv = gcc8Stdenv; + openexr = openexr.override { + stdenv = gcc8Stdenv; + }; + }; }; sky = callPackage ../applications/networking/instant-messengers/sky {}; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index d16f65e4a93e..9401a76ca3e8 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3444,6 +3444,12 @@ let url = mirror://cpan/authors/id/A/AJ/AJGB/Crypt-Curve25519-0.06.tar.gz; sha256 = "1ir0gfxm8i7r9zyfs2zvil5jgwirl7j6cb9cm1p2kjpfnhyp0j4z"; }; + patches = [ + (fetchpatch { + url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/dev-perl/Crypt-Curve25519/files/Crypt-Curve25519-0.60.0-fmul-fixedvar.patch?id=cec727ad614986ca1e6b9468eea7f1a5a9183382"; + sha256 = "0l005jzxp6q6vyl3p43ji47if0v9inscnjl0vxaqzf6c17akgbhf"; + }) + ]; meta = { description = "Generate shared secret using elliptic-curve Diffie-Hellman function"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; @@ -11120,10 +11126,10 @@ let MathGMP = buildPerlPackage { pname = "Math-GMP"; - version = "2.19"; + version = "2.20"; src = fetchurl { - url = mirror://cpan/authors/id/S/SH/SHLOMIF/Math-GMP-2.19.tar.gz; - sha256 = "1c07521m4d38hy2yx21hkwz22n2672bvrc4i21ldc68h85qy1q8i"; + url = mirror://cpan/authors/id/S/SH/SHLOMIF/Math-GMP-2.20.tar.gz; + sha256 = "0psmpj3j8cw02b5bzb7qnkd4rcpxm82891rwpdi2hx2jxy0mznhn"; }; buildInputs = [ pkgs.gmp AlienGMP ]; NIX_CFLAGS_COMPILE = "-I${pkgs.gmp.dev}/include"; diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index e439ebe71881..eb0ddf2dc29f 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -287,6 +287,20 @@ let meta.broken = isPhp74; # Build error }; + pdo_oci = buildPecl rec { + inherit (php) src version; + + pname = "pdo_oci"; + sourceRoot = "php-${version}/ext/pdo_oci"; + + buildInputs = [ pkgs.oracle-instantclient ]; + configureFlags = [ "--with-pdo-oci=instantclient,${pkgs.oracle-instantclient.lib}/lib" ]; + + postPatch = '' + sed -i -e 's|OCISDKMANINC=`.*$|OCISDKMANINC="${pkgs.oracle-instantclient.dev}/include"|' config.m4 + ''; + }; + pdo_sqlsrv = buildPecl { version = "5.8.0"; pname = "pdo_sqlsrv"; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 63cde6669fe8..84672f066006 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2548,6 +2548,8 @@ in { docloud = callPackage ../development/python-modules/docloud { }; + docplex = callPackage ../development/python-modules/docplex { }; + docopt = callPackage ../development/python-modules/docopt { }; doctest-ignore-unicode = callPackage ../development/python-modules/doctest-ignore-unicode { }; @@ -2985,6 +2987,8 @@ in { oscrypto = callPackage ../development/python-modules/oscrypto { }; + osqp = callPackage ../development/python-modules/osqp { }; + oyaml = callPackage ../development/python-modules/oyaml { }; pamela = callPackage ../development/python-modules/pamela { }; @@ -3082,6 +3086,8 @@ in { pylama = callPackage ../development/python-modules/pylama { }; + pylatexenc = callPackage ../development/python-modules/pylatexenc { }; + pymbolic = callPackage ../development/python-modules/pymbolic { }; pymediainfo = callPackage ../development/python-modules/pymediainfo { }; @@ -3431,6 +3437,8 @@ in { ecdsa = callPackage ../development/python-modules/ecdsa { }; + ecos = callPackage ../development/python-modules/ecos { }; + effect = callPackage ../development/python-modules/effect {}; enum = callPackage ../development/python-modules/enum { }; @@ -5072,6 +5080,8 @@ in { python-simple-hipchat = callPackage ../development/python-modules/python-simple-hipchat {}; python_simple_hipchat = self.python-simple-hipchat; + scs = callPackage ../development/python-modules/scs { scs = pkgs.scs; }; + python_keyczar = callPackage ../development/python-modules/python_keyczar { }; python-language-server = callPackage ../development/python-modules/python-language-server {}; @@ -6483,8 +6493,6 @@ in { maildir-deduplicate = callPackage ../development/python-modules/maildir-deduplicate { }; - mps-youtube = callPackage ../development/python-modules/mps-youtube { }; - d2to1 = callPackage ../development/python-modules/d2to1 { }; ovh = callPackage ../development/python-modules/ovh { }; |