diff options
368 files changed, 4851 insertions, 5799 deletions
diff --git a/.github/workflows/wait-ofborg.yml b/.github/workflows/wait-ofborg.yml new file mode 100644 index 0000000000000..35c58b2e91205 --- /dev/null +++ b/.github/workflows/wait-ofborg.yml @@ -0,0 +1,31 @@ +name: "Wait for ofborg" +on: + pull_request: +jobs: + tests: + runs-on: ubuntu-latest + steps: + - name: Wait for ofborg CI + run: | + # wait for ~30min... + # ..in future a better fix would be to make ofborg mark CI as pending right away. + for i in $(seq 360); do + res=$(curl --silent \ + -H "Accept: application/vnd.github.antiope-preview+json" \ + -H "Authorization: token ${GITHUB_TOKEN}" \ + "https://api.github.com/repos/NixOS/nixpkgs/commits/${COMMIT}/check-runs" | \ + jq ".check_runs | map(.app) | map(.id) | contains([${OFBORG_APP_ID}])") + if [[ "$res" == "true" ]]; then + exit 0 + fi + sleep 5 + echo "." + done + echo "Timeout!" + exit 1 + # ofborg is not checking forks. + if: github.repository_owner == 'NixOS' + env: + GITHUB_TOKEN: ${{ github.token }} + COMMIT: ${{ github.event.pull_request.head.sha }} + OFBORG_APP_ID: 20500 diff --git a/flake.nix b/flake.nix index 0f0164de9c16e..e7c04417ac81b 100644 --- a/flake.nix +++ b/flake.nix @@ -12,7 +12,14 @@ lib = import ./lib; - systems = [ "x86_64-linux" "i686-linux" "x86_64-darwin" "aarch64-linux" ]; + systems = [ + "x86_64-linux" + "i686-linux" + "x86_64-darwin" + "aarch64-linux" + "armv6l-linux" + "armv7l-linux" + ]; forAllSystems = f: lib.genAttrs systems (system: f system); diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 49f428169e421..afd66bf1823b5 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -313,6 +313,12 @@ githubId = 43479487; name = "Titouan Biteau"; }; + alerque = { + email = "caleb@alerque.com"; + github = "alerque"; + githubId = 173595; + name = "Caleb Maclennan"; + }; alexarice = { email = "alexrice999@hotmail.co.uk"; github = "alexarice"; @@ -543,6 +549,12 @@ githubId = 750786; name = "Justin Wood"; }; + anna328p = { + email = "anna328p@gmail.com"; + github = "anna328p"; + githubId = 9790772; + name = "Anna"; + }; anmonteiro = { email = "anmonteiro@gmail.com"; github = "anmonteiro"; @@ -673,6 +685,12 @@ githubId = 3965744; name = "Arthur Lee"; }; + arturcygan = { + email = "arczicygan@gmail.com"; + github = "arcz"; + githubId = 4679721; + name = "Artur Cygan"; + }; artuuge = { email = "artuuge@gmail.com"; github = "artuuge"; @@ -1109,6 +1127,12 @@ githubId = 3465841; name = "Boris Sukholitko"; }; + bouk = { + name = "Bouke van der Bijl"; + email = "i@bou.ke"; + github = "bouk"; + githubId = 97820; + }; bradediger = { email = "brad@bradediger.com"; github = "bradediger"; @@ -1406,6 +1430,16 @@ githubId = 30435868; name = "Okina Matara"; }; + Chili-Man = { + email = "dr.elhombrechile@gmail.com"; + name = "Diego Rodriguez"; + github = "Chili-Man"; + githubId = 631802; + keys = [{ + longkeyid = "rsa4096/0xE0EBAD78F0190BD9"; + fingerprint = "099E 3F97 FA08 3D47 8C75 EBEC E0EB AD78 F019 0BD9"; + }]; + }; chkno = { email = "chuck@intelligence.org"; github = "chkno"; @@ -2052,12 +2086,6 @@ githubId = 1316469; name = "Naomi Morse"; }; - dkudriavtsev = { - email = "dkudriavtsev@gmail.com"; - github = "dkudriavtsev"; - githubId = 9790772; - name = "Dmitry Kudriavtsev"; - }; dmalikov = { email = "malikov.d.y@gmail.com"; github = "dmalikov"; @@ -4717,6 +4745,12 @@ githubId = 1202012; name = "Ignat Loskutov"; }; + louisdk1 = { + email = "louis@louis.dk"; + github = "louisdk1"; + githubId = 4969294; + name = "Louis Tim Larsen"; + }; lovek323 = { email = "jason@oconal.id.au"; github = "lovek323"; @@ -6166,6 +6200,12 @@ githubId = 20792; name = "Sebastian Galkin"; }; + parasrah = { + email = "nixos@parasrah.com"; + github = "parasrah"; + githubId = 14935550; + name = "Brad Pfannmuller"; + }; pashashocky = { email = "pashashocky@gmail.com"; github = "pashashocky"; @@ -6840,6 +6880,12 @@ githubId = 2507744; name = "Roland Koebler"; }; + rizary = { + email = "andika@numtide.com"; + github = "Rizary"; + githubId = 7221768; + name = "Andika Demas Riyandi"; + }; rkrzr = { email = "ops+nixpkgs@channable.com"; github = "rkrzr"; diff --git a/nixos/doc/manual/release-notes/rl-2009.xml b/nixos/doc/manual/release-notes/rl-2009.xml index 8d6bcccb9dae2..7da1f50237806 100644 --- a/nixos/doc/manual/release-notes/rl-2009.xml +++ b/nixos/doc/manual/release-notes/rl-2009.xml @@ -539,6 +539,23 @@ systemd.services.nginx.serviceConfig.ReadWritePaths = [ "/var/www" ]; to be used for every display-manager in NixOS. </para> </listitem> + <listitem> + <para> + The <literal>bitcoind</literal> module has changed to multi-instance, using submodules. + Therefore, it is now mandatory to name each instance, e.g.: +<programlisting> +services.bitcoind = { + enable = true; +}; +</programlisting> + requires a name now: +<programlisting> +services.bitcoind."example-mainnet" = { + enable = true; +}; +</programlisting> + </para> + </listitem> </itemizedlist> </section> diff --git a/nixos/lib/make-disk-image.nix b/nixos/lib/make-disk-image.nix index a72bdedb16fc8..4806fe9dbac71 100644 --- a/nixos/lib/make-disk-image.nix +++ b/nixos/lib/make-disk-image.nix @@ -5,21 +5,32 @@ config , # The size of the disk, in megabytes. - diskSize + # if "auto" size is calculated based on the contents copied to it and + # additionalSpace is taken into account. + diskSize ? "auto" - # The files and directories to be placed in the target file system. +, # additional disk space to be added to the image if diskSize "auto" + # is used + additionalSpace ? "512M" + +, # size of the boot partition, is only used if partitionTableType is + # either "efi" or "hybrid" + bootSize ? "256M" + +, # The files and directories to be placed in the target file system. # This is a list of attribute sets {source, target} where `source' # is the file system object (regular file or directory) to be # grafted in the file system at path `target'. -, contents ? [] + contents ? [] , # Type of partition table to use; either "legacy", "efi", or "none". # For "efi" images, the GPT partition table is used and a mandatory ESP # partition of reasonable size is created in addition to the root partition. - # If `installBootLoader` is true, GRUB will be installed in EFI mode. # For "legacy", the msdos partition table is used and a single large root - # partition is created. If `installBootLoader` is true, GRUB will be - # installed in legacy mode. + # partition is created. + # For "hybrid", the GPT partition table is used and a mandatory ESP + # partition of reasonable size is created in addition to the root partition. + # Also a legacy MBR will be present. # For "none", no partition table is created. Enabling `installBootLoader` # most likely fails as GRUB will probably refuse to install. partitionTableType ? "legacy" @@ -43,7 +54,7 @@ format ? "raw" }: -assert partitionTableType == "legacy" || partitionTableType == "efi" || partitionTableType == "none"; +assert partitionTableType == "legacy" || partitionTableType == "efi" || partitionTableType == "hybrid" || partitionTableType == "none"; # We use -E offset=X below, which is only supported by e2fsprogs assert partitionTableType != "none" -> fsType == "ext4"; @@ -65,6 +76,7 @@ let format' = format; in let rootPartition = { # switch-case legacy = "1"; efi = "2"; + hybrid = "3"; }.${partitionTableType}; partitionDiskScript = { # switch-case @@ -76,9 +88,18 @@ let format' = format; in let efi = '' parted --script $diskImage -- \ mklabel gpt \ - mkpart ESP fat32 8MiB 256MiB \ + mkpart ESP fat32 8MiB ${bootSize} \ set 1 boot on \ - mkpart primary ext4 256MiB -1 + mkpart primary ext4 ${bootSize} -1 + ''; + hybrid = '' + parted --script $diskImage -- \ + mklabel gpt \ + mkpart ESP fat32 8MiB ${bootSize} \ + set 1 boot on \ + mkpart no-fs 0 1024KiB \ + set 2 bios_grub on \ + mkpart primary ext4 ${bootSize} -1 ''; none = ""; }.${partitionTableType}; @@ -129,19 +150,6 @@ let format' = format; in let } mkdir $out - diskImage=nixos.raw - truncate -s ${toString diskSize}M $diskImage - - ${partitionDiskScript} - - ${if partitionTableType != "none" then '' - # Get start & length of the root partition in sectors to $START and $SECTORS. - eval $(partx $diskImage -o START,SECTORS --nr ${rootPartition} --pairs) - - mkfs.${fsType} -F -L ${label} $diskImage -E offset=$(sectorsToBytes $START) $(sectorsToKilobytes $SECTORS)K - '' else '' - mkfs.${fsType} -F -L ${label} $diskImage - ''} root="$PWD/root" mkdir -p $root @@ -186,6 +194,31 @@ let format' = format; in let nixos-install --root $root --no-bootloader --no-root-passwd \ --system ${config.system.build.toplevel} --channel ${channelSources} --substituters "" + diskImage=nixos.raw + + ${if diskSize == "auto" then '' + ${if partitionTableType == "efi" || partitionTableType == "hybrid" then '' + additionalSpace=$(( ($(numfmt --from=iec '${additionalSpace}') + $(numfmt --from=iec '${bootSize}')) / 1000 )) + '' else '' + additionalSpace=$(( $(numfmt --from=iec '${additionalSpace}') / 1000 )) + ''} + diskSize=$(( $(set -- $(du -d0 $root); echo "$1") + $additionalSpace )) + truncate -s "$diskSize"K $diskImage + '' else '' + truncate -s ${toString diskSize}M $diskImage + ''} + + ${partitionDiskScript} + + ${if partitionTableType != "none" then '' + # Get start & length of the root partition in sectors to $START and $SECTORS. + eval $(partx $diskImage -o START,SECTORS --nr ${rootPartition} --pairs) + + mkfs.${fsType} -F -L ${label} $diskImage -E offset=$(sectorsToBytes $START) $(sectorsToKilobytes $SECTORS)K + '' else '' + mkfs.${fsType} -F -L ${label} $diskImage + ''} + echo "copying staging root to image..." cptofs -p ${optionalString (partitionTableType != "none") "-P ${rootPartition}"} -t ${fsType} -i $diskImage $root/* / ''; @@ -219,7 +252,7 @@ in pkgs.vmTools.runInLinuxVM ( # Create the ESP and mount it. Unlike e2fsprogs, mkfs.vfat doesn't support an # '-E offset=X' option, so we can't do this outside the VM. - ${optionalString (partitionTableType == "efi") '' + ${optionalString (partitionTableType == "efi" || partitionTableType == "hybrid") '' mkdir -p /mnt/boot mkfs.vfat -n ESP /dev/vda1 mount /dev/vda1 /mnt/boot diff --git a/nixos/lib/utils.nix b/nixos/lib/utils.nix index 21f4c7c6988ff..543c8a8882ea6 100644 --- a/nixos/lib/utils.nix +++ b/nixos/lib/utils.nix @@ -2,9 +2,11 @@ pkgs: with pkgs.lib; rec { - # Check whenever fileSystem is needed for boot - fsNeededForBoot = fs: fs.neededForBoot - || elem fs.mountPoint [ "/" "/nix" "/nix/store" "/var" "/var/log" "/var/lib" "/etc" ]; + # Check whenever fileSystem is needed for boot. NOTE: Make sure + # pathsNeededForBoot is closed under the parent relationship, i.e. if /a/b/c + # is in the list, put /a and /a/b in as well. + pathsNeededForBoot = [ "/" "/nix" "/nix/store" "/var" "/var/log" "/var/lib" "/etc" ]; + fsNeededForBoot = fs: fs.neededForBoot || elem fs.mountPoint pathsNeededForBoot; # Check whenever `b` depends on `a` as a fileSystem fsBefore = a: b: a.mountPoint == b.device diff --git a/nixos/modules/hardware/video/uvcvideo/default.nix b/nixos/modules/hardware/video/uvcvideo/default.nix index 7e3e94fdf2bd6..cf6aa052abb05 100644 --- a/nixos/modules/hardware/video/uvcvideo/default.nix +++ b/nixos/modules/hardware/video/uvcvideo/default.nix @@ -26,7 +26,7 @@ in Whether to enable <command>uvcvideo</command> dynamic controls. Note that enabling this brings the <command>uvcdynctrl</command> tool - into your environement and register all dynamic controls from + into your environment and register all dynamic controls from specified <command>packages</command> to the <command>uvcvideo</command> driver. ''; }; diff --git a/nixos/modules/services/desktops/flatpak.nix b/nixos/modules/services/desktops/flatpak.nix index 7fb0024f37dc7..7da92cc9f2649 100644 --- a/nixos/modules/services/desktops/flatpak.nix +++ b/nixos/modules/services/desktops/flatpak.nix @@ -42,6 +42,7 @@ in { # It has been possible since https://github.com/flatpak/flatpak/releases/tag/1.3.2 # to build a SELinux policy module. + # TODO: use sysusers.d users.users.flatpak = { description = "Flatpak system helper"; group = "flatpak"; diff --git a/nixos/modules/services/desktops/malcontent.nix b/nixos/modules/services/desktops/malcontent.nix index 5d6912595b52d..1fbeb17e6aeb4 100644 --- a/nixos/modules/services/desktops/malcontent.nix +++ b/nixos/modules/services/desktops/malcontent.nix @@ -28,7 +28,10 @@ with lib; malcontent-ui ]; - services.dbus.packages = [ pkgs.malcontent ]; + services.dbus.packages = [ + # D-Bus services are in `out`, not the default `bin` output that would be picked up by `makeDbusConf`. + pkgs.malcontent.out + ]; services.accounts-daemon.enable = true; diff --git a/nixos/modules/services/misc/mautrix-telegram.nix b/nixos/modules/services/misc/mautrix-telegram.nix index 78a42fbb574b4..c5e8a5b85ec2d 100644 --- a/nixos/modules/services/misc/mautrix-telegram.nix +++ b/nixos/modules/services/misc/mautrix-telegram.nix @@ -125,7 +125,7 @@ in { if [ ! -f '${registrationFile}' ]; then ${pkgs.mautrix-telegram}/bin/mautrix-telegram \ --generate-registration \ - --base-config='${pkgs.mautrix-telegram}/example-config.yaml' \ + --base-config='${pkgs.mautrix-telegram}/${pkgs.mautrix-telegram.pythonModule.sitePackages}/mautrix_telegram/example-config.yaml' \ --config='${settingsFile}' \ --registration='${registrationFile}' fi diff --git a/nixos/modules/services/monitoring/do-agent.nix b/nixos/modules/services/monitoring/do-agent.nix index 2d3fe2f797687..4dfb6236727b5 100644 --- a/nixos/modules/services/monitoring/do-agent.nix +++ b/nixos/modules/services/monitoring/do-agent.nix @@ -4,6 +4,7 @@ with lib; let cfg = config.services.do-agent; + in { options.services.do-agent = { @@ -11,23 +12,13 @@ in }; config = mkIf cfg.enable { - environment.systemPackages = [ pkgs.do-agent ]; + systemd.packages = [ pkgs.do-agent ]; systemd.services.do-agent = { - description = "DigitalOcean Droplet Metrics Agent"; wantedBy = [ "multi-user.target" ]; - after = [ "network-online.target" ]; - wants = [ "network-online.target" ]; serviceConfig = { - ExecStart = "${pkgs.do-agent}/bin/do-agent --syslog"; - Restart = "always"; - OOMScoreAdjust = -900; - SyslogIdentifier = "DigitalOceanAgent"; - PrivateTmp = "yes"; - ProtectSystem = "full"; - ProtectHome = "yes"; - NoNewPrivileges = "yes"; - DynamicUser = "yes"; + ExecStart = [ "" "${pkgs.do-agent}/bin/do-agent --syslog" ]; + DynamicUser = true; }; }; }; diff --git a/nixos/modules/services/networking/bitcoind.nix b/nixos/modules/services/networking/bitcoind.nix index 4e00a88654747..38537ad2de72c 100644 --- a/nixos/modules/services/networking/bitcoind.nix +++ b/nixos/modules/services/networking/bitcoind.nix @@ -3,31 +3,8 @@ with lib; let - cfg = config.services.bitcoind; - pidFile = "${cfg.dataDir}/bitcoind.pid"; - configFile = pkgs.writeText "bitcoin.conf" '' - ${optionalString cfg.testnet "testnet=1"} - ${optionalString (cfg.dbCache != null) "dbcache=${toString cfg.dbCache}"} - ${optionalString (cfg.prune != null) "prune=${toString cfg.prune}"} - - # Connection options - ${optionalString (cfg.port != null) "port=${toString cfg.port}"} - - # RPC server options - ${optionalString (cfg.rpc.port != null) "rpcport=${toString cfg.rpc.port}"} - ${concatMapStringsSep "\n" - (rpcUser: "rpcauth=${rpcUser.name}:${rpcUser.passwordHMAC}") - (attrValues cfg.rpc.users) - } - # Extra config options (from bitcoind nixos service) - ${cfg.extraConfig} - ''; - cmdlineOptions = escapeShellArgs [ - "-conf=${cfg.configFile}" - "-datadir=${cfg.dataDir}" - "-pid=${pidFile}" - ]; + eachBitcoind = config.services.bitcoind; rpcUserOpts = { name, ... }: { options = { @@ -39,11 +16,14 @@ let ''; }; passwordHMAC = mkOption { - type = with types; uniq (strMatching "[0-9a-f]+\\$[0-9a-f]{64}"); + type = types.uniq (types.strMatching "[0-9a-f]+\\$[0-9a-f]{64}"); example = "f7efda5c189b999524f151318c0c86$d5b51b3beffbc02b724e5d095828e0bc8b2456e9ac8757ae3211a5d9b16a22ae"; description = '' Password HMAC-SHA-256 for JSON-RPC connections. Must be a string of the format <SALT-HEX>$<HMAC-HEX>. + + Tool (Python script) for HMAC generation is available here: + <link xlink:href="https://github.com/bitcoin/bitcoin/blob/master/share/rpcauth/rpcauth.py"/> ''; }; }; @@ -51,10 +31,10 @@ let name = mkDefault name; }; }; -in { - options = { - services.bitcoind = { + bitcoindOpts = { config, lib, name, ...}: { + options = { + enable = mkEnableOption "Bitcoin daemon"; package = mkOption { @@ -63,12 +43,14 @@ in { defaultText = "pkgs.bitcoind"; description = "The package providing bitcoin binaries."; }; + configFile = mkOption { - type = types.path; - default = configFile; - example = "/etc/bitcoind.conf"; + type = types.nullOr types.path; + default = null; + example = "/var/lib/${name}/bitcoin.conf"; description = "The configuration file path to supply bitcoind."; }; + extraConfig = mkOption { type = types.lines; default = ""; @@ -79,20 +61,22 @@ in { ''; description = "Additional configurations to be appended to <filename>bitcoin.conf</filename>."; }; + dataDir = mkOption { type = types.path; - default = "/var/lib/bitcoind"; + default = "/var/lib/bitcoind-${name}"; description = "The data directory for bitcoind."; }; user = mkOption { type = types.str; - default = "bitcoin"; + default = "bitcoind-${name}"; description = "The user as which to run bitcoind."; }; + group = mkOption { type = types.str; - default = cfg.user; + default = config.user; description = "The group as which to run bitcoind."; }; @@ -110,29 +94,36 @@ in { bob.passwordHMAC = "b2dd077cb54591a2f3139e69a897ac$4e71f08d48b4347cf8eff3815c0e25ae2e9a4340474079f55705f40574f4ec99"; } ''; - type = with types; loaOf (submodule rpcUserOpts); - description = '' - RPC user information for JSON-RPC connnections. - ''; + type = types.attrsOf (types.submodule rpcUserOpts); + description = "RPC user information for JSON-RPC connnections."; }; }; + pidFile = mkOption { + type = types.path; + default = "${config.dataDir}/bitcoind.pid"; + description = "Location of bitcoind pid file."; + }; + testnet = mkOption { type = types.bool; default = false; - description = "Whether to use the test chain."; + description = "Whether to use the testnet instead of mainnet."; }; + port = mkOption { type = types.nullOr types.port; default = null; description = "Override the default port on which to listen for connections."; }; + dbCache = mkOption { type = types.nullOr (types.ints.between 4 16384); default = null; example = 4000; - description = "Override the default database cache size in megabytes."; + description = "Override the default database cache size in MiB."; }; + prune = mkOption { type = types.nullOr (types.coercedTo (types.enum [ "disable" "manual" ]) @@ -149,45 +140,122 @@ in { and -rescan. Warning: Reverting this setting requires re-downloading the entire blockchain. ("disable" = disable pruning blocks, "manual" = allow manual pruning via RPC, >=550 = automatically prune block files - to stay under the specified target size in MiB) + to stay under the specified target size in MiB). + ''; + }; + + extraCmdlineOptions = mkOption { + type = types.listOf types.str; + default = []; + description = '' + Extra command line options to pass to bitcoind. + Run bitcoind --help to list all available options. ''; }; }; }; +in +{ - config = mkIf cfg.enable { - environment.systemPackages = [ cfg.package ]; - systemd.tmpfiles.rules = [ - "d '${cfg.dataDir}' 0770 '${cfg.user}' '${cfg.group}' - -" - "L '${cfg.dataDir}/bitcoin.conf' - - - - '${cfg.configFile}'" - ]; - systemd.services.bitcoind = { - description = "Bitcoin daemon"; - after = [ "network.target" ]; - wantedBy = [ "multi-user.target" ]; - serviceConfig = { - User = cfg.user; - Group = cfg.group; - ExecStart = "${cfg.package}/bin/bitcoind ${cmdlineOptions}"; - Restart = "on-failure"; - - # Hardening measures - PrivateTmp = "true"; - ProtectSystem = "full"; - NoNewPrivileges = "true"; - PrivateDevices = "true"; - MemoryDenyWriteExecute = "true"; - }; + options = { + services.bitcoind = mkOption { + type = types.attrsOf (types.submodule bitcoindOpts); + default = {}; + description = "Specification of one or more bitcoind instances."; }; - users.users.${cfg.user} = { + }; + + config = mkIf (eachBitcoind != {}) { + + assertions = flatten (mapAttrsToList (bitcoindName: cfg: [ + { + assertion = (cfg.prune != null) -> (builtins.elem cfg.prune [ "disable" "manual" 0 1 ] || (builtins.isInt cfg.prune && cfg.prune >= 550)); + message = '' + If set, services.bitcoind.${bitcoindName}.prune has to be "disable", "manual", 0 , 1 or >= 550. + ''; + } + { + assertion = (cfg.rpc.users != {}) -> (cfg.configFile == null); + message = '' + You cannot set both services.bitcoind.${bitcoindName}.rpc.users and services.bitcoind.${bitcoindName}.configFile + as they are exclusive. RPC user setting would have no effect if custom configFile would be used. + ''; + } + ]) eachBitcoind); + + environment.systemPackages = flatten (mapAttrsToList (bitcoindName: cfg: [ + cfg.package + ]) eachBitcoind); + + systemd.services = mapAttrs' (bitcoindName: cfg: ( + nameValuePair "bitcoind-${bitcoindName}" ( + let + configFile = pkgs.writeText "bitcoin.conf" '' + # If Testnet is enabled, we need to add [test] section + # otherwise, some options (e.g.: custom RPC port) will not work + ${optionalString cfg.testnet "[test]"} + # RPC users + ${concatMapStringsSep "\n" + (rpcUser: "rpcauth=${rpcUser.name}:${rpcUser.passwordHMAC}") + (attrValues cfg.rpc.users) + } + # Extra config options (from bitcoind nixos service) + ${cfg.extraConfig} + ''; + in { + description = "Bitcoin daemon"; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + User = cfg.user; + Group = cfg.group; + ExecStart = '' + ${cfg.package}/bin/bitcoind \ + ${if (cfg.configFile != null) then + "-conf=${cfg.configFile}" + else + "-conf=${configFile}" + } \ + -datadir=${cfg.dataDir} \ + -pid=${cfg.pidFile} \ + ${optionalString cfg.testnet "-testnet"}\ + ${optionalString (cfg.port != null) "-port=${toString cfg.port}"}\ + ${optionalString (cfg.prune != null) "-prune=${toString cfg.prune}"}\ + ${optionalString (cfg.dbCache != null) "-dbcache=${toString cfg.dbCache}"}\ + ${optionalString (cfg.rpc.port != null) "-rpcport=${toString cfg.rpc.port}"}\ + ${toString cfg.extraCmdlineOptions} + ''; + Restart = "on-failure"; + + # Hardening measures + PrivateTmp = "true"; + ProtectSystem = "full"; + NoNewPrivileges = "true"; + PrivateDevices = "true"; + MemoryDenyWriteExecute = "true"; + }; + } + ))) eachBitcoind; + + systemd.tmpfiles.rules = flatten (mapAttrsToList (bitcoindName: cfg: [ + "d '${cfg.dataDir}' 0770 '${cfg.user}' '${cfg.group}' - -" + ]) eachBitcoind); + + users.users = mapAttrs' (bitcoindName: cfg: ( + nameValuePair "bitcoind-${bitcoindName}" { name = cfg.user; group = cfg.group; description = "Bitcoin daemon user"; home = cfg.dataDir; isSystemUser = true; - }; - users.groups.${cfg.group} = { - name = cfg.group; - }; + })) eachBitcoind; + + users.groups = mapAttrs' (bitcoindName: cfg: ( + nameValuePair "${cfg.group}" { } + )) eachBitcoind; + }; + + meta.maintainers = with maintainers; [ maintainers."1000101" ]; + } diff --git a/nixos/modules/services/networking/skydns.nix b/nixos/modules/services/networking/skydns.nix index e79d6de926449..ea466de932750 100644 --- a/nixos/modules/services/networking/skydns.nix +++ b/nixos/modules/services/networking/skydns.nix @@ -64,7 +64,7 @@ in { extraConfig = mkOption { default = {}; type = types.attrsOf types.str; - description = "Skydns attribute set of extra config options passed as environemnt variables."; + description = "Skydns attribute set of extra config options passed as environment variables."; }; }; diff --git a/nixos/modules/services/networking/wpa_supplicant.nix b/nixos/modules/services/networking/wpa_supplicant.nix index a7dea95056a0e..08a17d20ed7fd 100644 --- a/nixos/modules/services/networking/wpa_supplicant.nix +++ b/nixos/modules/services/networking/wpa_supplicant.nix @@ -4,7 +4,7 @@ with lib; let cfg = config.networking.wireless; - configFile = if cfg.networks != {} then pkgs.writeText "wpa_supplicant.conf" '' + configFile = if cfg.networks != {} || cfg.extraConfig != "" || cfg.userControlled.enable then pkgs.writeText "wpa_supplicant.conf" '' ${optionalString cfg.userControlled.enable '' ctrl_interface=DIR=/run/wpa_supplicant GROUP=${cfg.userControlled.group} update_config=1''} diff --git a/nixos/modules/services/security/yubikey-agent.nix b/nixos/modules/services/security/yubikey-agent.nix index ac5d7054b2bb3..2972c64a36413 100644 --- a/nixos/modules/services/security/yubikey-agent.nix +++ b/nixos/modules/services/security/yubikey-agent.nix @@ -41,7 +41,7 @@ in }; }; - config = { + config = mkIf cfg.enable { environment.systemPackages = [ cfg.package ]; systemd.packages = [ cfg.package ]; @@ -51,11 +51,10 @@ in path = [ pkgs.pinentry.${pinentryFlavor} ]; }; - environment.extraInit = optionalString cfg.enable - '' - if [ -z "$SSH_AUTH_SOCK" -a -n "$XDG_RUNTIME_DIR" ]; then - export SSH_AUTH_SOCK="$XDG_RUNTIME_DIR/yubikey-agent/yubikey-agent.sock" - fi - ''; + environment.extraInit = '' + if [ -z "$SSH_AUTH_SOCK" -a -n "$XDG_RUNTIME_DIR" ]; then + export SSH_AUTH_SOCK="$XDG_RUNTIME_DIR/yubikey-agent/yubikey-agent.sock" + fi + ''; }; } diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix index 63005b26f6f53..7f13f67e8ef61 100644 --- a/nixos/modules/system/boot/stage-1.nix +++ b/nixos/modules/system/boot/stage-1.nix @@ -559,10 +559,12 @@ in default = false; type = types.bool; description = '' - If set, this file system will be mounted in the initial - ramdisk. By default, this applies to the root file system - and to the file system containing - <filename>/nix/store</filename>. + If set, this file system will be mounted in the initial ramdisk. + Note that the file system will always be mounted in the initial + ramdisk if its mount point is one of the following: + ${concatStringsSep ", " ( + forEach utils.pathsNeededForBoot (i: "<filename>${i}</filename>") + )}. ''; }; }); diff --git a/nixos/modules/tasks/encrypted-devices.nix b/nixos/modules/tasks/encrypted-devices.nix index bc0933f16fec4..9c3f2d8fccb23 100644 --- a/nixos/modules/tasks/encrypted-devices.nix +++ b/nixos/modules/tasks/encrypted-devices.nix @@ -37,7 +37,14 @@ let default = null; example = "/mnt-root/root/.swapkey"; type = types.nullOr types.str; - description = "File system location of keyfile. This unlocks the drive after the root has been mounted to <literal>/mnt-root</literal>."; + description = '' + Path to a keyfile used to unlock the backing encrypted + device. At the time this keyfile is accessed, the + <literal>neededForBoot</literal> filesystems (see + <literal>fileSystems.<name?>.neededForBoot</literal>) + will have been mounted under <literal>/mnt-root</literal>, + so the keyfile path should usually start with "/mnt-root/". + ''; }; }; }; @@ -65,12 +72,16 @@ in boot.initrd = { luks = { devices = - builtins.listToAttrs (map (dev: { name = dev.encrypted.label; value = { device = dev.encrypted.blkDev; }; }) keylessEncDevs); + builtins.listToAttrs (map (dev: { + name = dev.encrypted.label; + value = { device = dev.encrypted.blkDev; }; + }) keylessEncDevs); forceLuksSupportInInitrd = true; }; postMountCommands = - concatMapStrings (dev: "cryptsetup luksOpen --key-file ${dev.encrypted.keyFile} ${dev.encrypted.blkDev} ${dev.encrypted.label};\n") keyedEncDevs; + concatMapStrings (dev: + "cryptsetup luksOpen --key-file ${dev.encrypted.keyFile} ${dev.encrypted.blkDev} ${dev.encrypted.label};\n" + ) keyedEncDevs; }; }; } - diff --git a/nixos/modules/tasks/lvm.nix b/nixos/modules/tasks/lvm.nix index b8f7a01e44ede..2c3cc4c5467dc 100644 --- a/nixos/modules/tasks/lvm.nix +++ b/nixos/modules/tasks/lvm.nix @@ -22,7 +22,7 @@ in { config = mkMerge [ (mkIf (!config.boot.isContainer) { - environment.etc."tmpfiles.d/lvm2.conf".source = "${cfg.package}/lib/tmpfiles.d/lvm2.conf"; + systemd.tmpfiles.packages = [ cfg.package.out ]; environment.systemPackages = [ cfg.package ]; systemd.packages = [ cfg.package ]; diff --git a/nixos/release.nix b/nixos/release.nix index cf16986b21360..1f5c158126955 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -310,6 +310,11 @@ in rec { services.xserver.desktopManager.gnome3.enable = true; }); + pantheon = makeClosure ({ ... }: + { services.xserver.enable = true; + services.xserver.desktopManager.pantheon.enable = true; + }); + # Linux/Apache/PostgreSQL/PHP stack. lapp = makeClosure ({ pkgs, ... }: { services.httpd.enable = true; diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 60a99838ae698..12f3ee303311a 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -32,6 +32,7 @@ in beanstalkd = handleTest ./beanstalkd.nix {}; bees = handleTest ./bees.nix {}; bind = handleTest ./bind.nix {}; + bitcoind = handleTest ./bitcoind.nix {}; bittorrent = handleTest ./bittorrent.nix {}; blockbook-frontend = handleTest ./blockbook-frontend.nix {}; buildkite-agents = handleTest ./buildkite-agents.nix {}; diff --git a/nixos/tests/bitcoind.nix b/nixos/tests/bitcoind.nix new file mode 100644 index 0000000000000..95c6a5b91bce9 --- /dev/null +++ b/nixos/tests/bitcoind.nix @@ -0,0 +1,46 @@ +import ./make-test-python.nix ({ pkgs, ... }: { + name = "bitcoind"; + meta = with pkgs.stdenv.lib; { + maintainers = with maintainers; [ maintainers."1000101" ]; + }; + + machine = { ... }: { + services.bitcoind."mainnet" = { + enable = true; + rpc = { + port = 8332; + users.rpc.passwordHMAC = "acc2374e5f9ba9e62a5204d3686616cf$53abdba5e67a9005be6a27ca03a93ce09e58854bc2b871523a0d239a72968033"; + users.rpc2.passwordHMAC = "1495e4a3ad108187576c68f7f9b5ddc5$accce0881c74aa01bb8960ff3bdbd39f607fd33178147679e055a4ac35f53225"; + }; + }; + services.bitcoind."testnet" = { + enable = true; + configFile = "/test.blank"; + testnet = true; + rpc = { + port = 18332; + }; + extraCmdlineOptions = [ "-rpcuser=rpc" "-rpcpassword=rpc" "-rpcauth=rpc2:1495e4a3ad108187576c68f7f9b5ddc5$accce0881c74aa01bb8960ff3bdbd39f607fd33178147679e055a4ac35f53225" ]; + }; + }; + + testScript = '' + start_all() + + machine.wait_for_unit("bitcoind-mainnet.service") + machine.wait_for_unit("bitcoind-testnet.service") + + machine.wait_until_succeeds( + 'curl --user rpc:rpc --data-binary \'{"jsonrpc": "1.0", "id":"curltest", "method": "getblockchaininfo", "params": [] }\' -H \'content-type: text/plain;\' localhost:8332 | grep \'"chain":"main"\' ' + ) + machine.wait_until_succeeds( + 'curl --user rpc2:rpc2 --data-binary \'{"jsonrpc": "1.0", "id":"curltest", "method": "getblockchaininfo", "params": [] }\' -H \'content-type: text/plain;\' localhost:8332 | grep \'"chain":"main"\' ' + ) + machine.wait_until_succeeds( + 'curl --user rpc:rpc --data-binary \'{"jsonrpc": "1.0", "id":"curltest", "method": "getblockchaininfo", "params": [] }\' -H \'content-type: text/plain;\' localhost:18332 | grep \'"chain":"test"\' ' + ) + machine.wait_until_succeeds( + 'curl --user rpc2:rpc2 --data-binary \'{"jsonrpc": "1.0", "id":"curltest", "method": "getblockchaininfo", "params": [] }\' -H \'content-type: text/plain;\' localhost:18332 | grep \'"chain":"test"\' ' + ) + ''; +}) diff --git a/nixos/tests/installed-tests/default.nix b/nixos/tests/installed-tests/default.nix index b6bdfea227701..889a00d4b5686 100644 --- a/nixos/tests/installed-tests/default.nix +++ b/nixos/tests/installed-tests/default.nix @@ -50,6 +50,12 @@ let environment.systemPackages = with pkgs; [ gnome-desktop-testing ]; + # The installed tests need to be added to the test VM’s closure. + # Otherwise, their dependencies might not actually be registered + # as valid paths in the VM’s Nix store database, + # and `nix-store --query` commands run as part of the tests + # (for example when building Flatpak runtimes) will fail. + environment.variables.TESTED_PACKAGE_INSTALLED_TESTS = "${tested.installedTests}/share"; }; testScript = diff --git a/nixos/tests/installed-tests/flatpak.nix b/nixos/tests/installed-tests/flatpak.nix index 091c993266296..8aeeaca90f614 100644 --- a/nixos/tests/installed-tests/flatpak.nix +++ b/nixos/tests/installed-tests/flatpak.nix @@ -5,14 +5,11 @@ makeInstalledTest { withX11 = true; testConfig = { - services.xserver.desktopManager.gnome3.enable = true; # TODO: figure out minimal environment where the tests work - # common/x11.nix enables the auto display manager (lightdm) - services.xserver.displayManager.gdm.enable = false; - services.gnome3.core-utilities.enable = false; + xdg.portal.enable = true; services.flatpak.enable = true; - environment.systemPackages = with pkgs; [ gnupg ostree python2 ]; + environment.systemPackages = with pkgs; [ gnupg ostree python3 ]; virtualisation.memorySize = 2047; - virtualisation.diskSize = 1024; + virtualisation.diskSize = 3072; }; testRunnerFlags = "--timeout 3600"; diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix index 22132073142f0..02b839fee3f56 100644 --- a/nixos/tests/installer.nix +++ b/nixos/tests/installer.nix @@ -562,7 +562,7 @@ in { "sleep 1", "lvcreate --size 1G --name swap MyVolGroup", "sleep 1", - "lvcreate --size 2G --name nixos MyVolGroup", + "lvcreate --size 3G --name nixos MyVolGroup", "sleep 1", "mkswap -f /dev/MyVolGroup/swap -L swap", "swapon -L swap", diff --git a/nixos/tests/networking.nix b/nixos/tests/networking.nix index ebebbf90eb1a8..83d4f6465b686 100644 --- a/nixos/tests/networking.nix +++ b/nixos/tests/networking.nix @@ -32,14 +32,14 @@ let services.dhcpd4 = { enable = true; interfaces = map (n: "eth${toString n}") vlanIfs; - extraConfig = '' - '' + flip concatMapStrings vlanIfs (n: '' + extraConfig = flip concatMapStrings vlanIfs (n: '' subnet 192.168.${toString n}.0 netmask 255.255.255.0 { option routers 192.168.${toString n}.1; + range 192.168.${toString n}.2 192.168.${toString n}.254; } '') ; - machines = lib.flip map vlanIfs (vlan: + machines = flip map vlanIfs (vlan: { hostName = "client${toString vlan}"; ethernetAddress = qemu-flags.qemuNicMac vlan 1; diff --git a/pkgs/applications/audio/audacity/default.nix b/pkgs/applications/audio/audacity/default.nix index 18f2b4f67cdba..58f25d46e0bca 100644 --- a/pkgs/applications/audio/audacity/default.nix +++ b/pkgs/applications/audio/audacity/default.nix @@ -1,28 +1,21 @@ -{ stdenv, fetchzip, wxGTK30, pkgconfig, file, gettext, +{ stdenv, fetchzip, wxGTK31, pkgconfig, file, gettext, libvorbis, libmad, libjack2, lv2, lilv, serd, sord, sratom, suil, alsaLib, libsndfile, soxr, flac, lame, expat, libid3tag, ffmpeg_3, soundtouch, /*, portaudio - given up fighting their portaudio.patch */ - autoconf, automake, libtool + pcre, vamp-plugin-sdk, portmidi, twolame, git, + cmake, libtool }: with stdenv.lib; stdenv.mkDerivation rec { - version = "2.4.1"; + version = "2.4.2"; pname = "audacity"; src = fetchzip { url = "https://github.com/audacity/audacity/archive/Audacity-${version}.tar.gz"; - sha256 = "1xk0piv72d2xd3p7igr916fhcbrm76fhjr418k1rlqdzzg1hfljn"; + sha256 = "0lklcvqkxrr2gkb9gh3422iadzl2rv9v0a8s76rwq43lj2im7546"; }; - preConfigure = /* we prefer system-wide libs */ '' - autoreconf -vi # use system libraries - - # we will get a (possibly harmless) warning during configure without this - substituteInPlace configure \ - --replace /usr/bin/file ${file}/bin/file - ''; - configureFlags = [ "--with-libsamplerate" ]; @@ -43,11 +36,12 @@ stdenv.mkDerivation rec { "-lswscale" ]; - nativeBuildInputs = [ pkgconfig autoconf automake libtool ]; + nativeBuildInputs = [ pkgconfig cmake libtool git ]; buildInputs = [ - file gettext wxGTK30 expat alsaLib - libsndfile soxr libid3tag libjack2 lv2 lilv serd sord sratom suil wxGTK30.gtk + file gettext wxGTK31 expat alsaLib + libsndfile soxr libid3tag libjack2 lv2 lilv serd sord sratom suil wxGTK31.gtk ffmpeg_3 libmad lame libvorbis flac soundtouch + pcre vamp-plugin-sdk portmidi twolame ]; #ToDo: detach sbsms enableParallelBuilding = true; diff --git a/pkgs/applications/audio/lollypop/default.nix b/pkgs/applications/audio/lollypop/default.nix index fc4d211e39875..f325185920d70 100644 --- a/pkgs/applications/audio/lollypop/default.nix +++ b/pkgs/applications/audio/lollypop/default.nix @@ -1,5 +1,6 @@ { lib , fetchgit +, nix-update-script , meson , ninja , pkgconfig @@ -91,6 +92,13 @@ python3.pkgs.buildPythonApplication rec { makeWrapperArgs+=("''${gappsWrapperArgs[@]}") ''; + passthru = { + updateScript = nix-update-script { + attrPath = pname; + }; + }; + + meta = with lib; { changelog = "https://gitlab.gnome.org/World/lollypop/tags/${version}"; description = "A modern music player for GNOME"; diff --git a/pkgs/applications/audio/mixxx/default.nix b/pkgs/applications/audio/mixxx/default.nix index 84e445e8538c3..576dd4d97b35c 100644 --- a/pkgs/applications/audio/mixxx/default.nix +++ b/pkgs/applications/audio/mixxx/default.nix @@ -52,7 +52,7 @@ mkDerivation rec { homepage = "https://mixxx.org"; description = "Digital DJ mixing software"; license = licenses.gpl2Plus; - maintainers = [ maintainers.aszlig maintainers.goibhniu maintainers.bfortz ]; + maintainers = [ maintainers.goibhniu maintainers.bfortz ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/audio/mopidy/youtube.nix b/pkgs/applications/audio/mopidy/youtube.nix index ac16c182a50e0..a115812b86a6a 100644 --- a/pkgs/applications/audio/mopidy/youtube.nix +++ b/pkgs/applications/audio/mopidy/youtube.nix @@ -2,12 +2,12 @@ python3Packages.buildPythonApplication rec { pname = "mopidy-youtube"; - version = "3.0"; + version = "3.1"; src = python3Packages.fetchPypi { inherit version; pname = "Mopidy-YouTube"; - sha256 = "0x1q9rfnjx65n6hi8s5rw5ff4xv55h63zy52fwm8aksdnzppr7gd"; + sha256 = "1bn3nxianbal9f81z9wf2cxi893hndvrz2zdqvh1zpxrhs0cr038"; }; patchPhase = "sed s/bs4/beautifulsoup4/ -i setup.cfg"; diff --git a/pkgs/applications/audio/openmpt123/default.nix b/pkgs/applications/audio/openmpt123/default.nix index 6fec4df060d9f..15d38a1eea777 100644 --- a/pkgs/applications/audio/openmpt123/default.nix +++ b/pkgs/applications/audio/openmpt123/default.nix @@ -2,14 +2,14 @@ , usePulseAudio ? config.pulseaudio or false, libpulseaudio }: let - version = "0.5.0"; + version = "0.5.1"; in stdenv.mkDerivation { pname = "openmpt123"; inherit version; src = fetchurl { url = "https://lib.openmpt.org/files/libopenmpt/src/libopenmpt-${version}+release.autotools.tar.gz"; - sha256 = "0zl3djy9z7cpqk8g8pxrzmmikxsskb0y5qdabg6c683j7x5abjs3"; + sha256 = "1vpalfsrkbx4vyrh1qy564lr91jwdxlbjivv5gzf8zcywxasf0xa"; }; enableParallelBuilding = true; diff --git a/pkgs/applications/audio/qmmp/default.nix b/pkgs/applications/audio/qmmp/default.nix index 7b4d823006de6..84ff9f787d53f 100644 --- a/pkgs/applications/audio/qmmp/default.nix +++ b/pkgs/applications/audio/qmmp/default.nix @@ -29,11 +29,11 @@ # handle that. mkDerivation rec { - name = "qmmp-1.4.0"; + name = "qmmp-1.4.1"; src = fetchurl { url = "http://qmmp.ylsoftware.com/files/${name}.tar.bz2"; - sha256 = "13rhnk55d44svksl13w23w2qkfpkq4mc0jy5mi89nzqkzshwvfd8"; + sha256 = "0p18r2ri75vbyjzfa7bcl1dm372m6jvn9zj2p5ia2rh1g77fbm9a"; }; nativeBuildInputs = [ cmake pkgconfig ]; diff --git a/pkgs/applications/audio/sooperlooper/default.nix b/pkgs/applications/audio/sooperlooper/default.nix index e7a43ad8a5954..f1c76bf0d33c9 100644 --- a/pkgs/applications/audio/sooperlooper/default.nix +++ b/pkgs/applications/audio/sooperlooper/default.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "sooperlooper"; - version = "unstable-2019-09-30"; + version = "1.7.4"; src = fetchFromGitHub { owner = "essej"; repo = "sooperlooper"; - rev = "4d1da14176e16b0f56b727bb1e6c2e8957515625"; - sha256 = "1gsgqa7hdymzw2al1ymzv0f33y161dyhh3fmy88lpjwv3bfchamg"; + rev = "v${builtins.replaceStrings [ "." ] [ "_" ] version}"; + sha256 = "1jng9bkb7iikad0dy1fkiq9wjjdhh1xi1p0cp2lvnz1dsc4yk6iw"; }; autoreconfPhase = '' @@ -51,6 +51,8 @@ stdenv.mkDerivation rec { fftw ]; + enableParallelBuilding = true; + meta = with stdenv.lib; { description = "A live looping sampler capable of immediate loop recording, overdubbing, multiplying, reversing and more"; longDescription = '' diff --git a/pkgs/applications/audio/spotify-tui/default.nix b/pkgs/applications/audio/spotify-tui/default.nix index 693de28bf472f..16c8623bd7bd8 100644 --- a/pkgs/applications/audio/spotify-tui/default.nix +++ b/pkgs/applications/audio/spotify-tui/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "spotify-tui"; - version = "0.20.0"; + version = "0.21.0"; src = fetchFromGitHub { owner = "Rigellute"; repo = "spotify-tui"; rev = "v${version}"; - sha256 = "1gdsk620md5nv1r05jysmfhpbcidh15wzyiklkazsb6cppm6qsiy"; + sha256 = "0pvgq8r1bb7bdxm50hxl0n7ajplpzp1gnf6j55dn6xwck0syml9y"; }; - cargoSha256 = "0irfdmik6nrpfs9yzva5q351cfyf1cijxa2a08prwdccrivdk98a"; + cargoSha256 = "07v1qm5ky99j2lwbl00g80z0f8hfrpwgyqsm8fnda6y9s3vzzdgz"; nativeBuildInputs = stdenv.lib.optionals stdenv.isLinux [ pkgconfig python3 ]; buildInputs = [ ] diff --git a/pkgs/applications/audio/sublime-music/default.nix b/pkgs/applications/audio/sublime-music/default.nix new file mode 100644 index 0000000000000..515a653d6bc97 --- /dev/null +++ b/pkgs/applications/audio/sublime-music/default.nix @@ -0,0 +1,60 @@ +{ lib, python3Packages, gobject-introspection, gtk3, pango, wrapGAppsHook + +, chromecastSupport ? false +, serverSupport ? false +, keyringSupport ? true +, notifySupport ? true, libnotify +, networkSupport ? true, networkmanager +}: + +python3Packages.buildPythonApplication rec { + pname = "sublime-music"; + version = "0.11.0"; + + src = python3Packages.fetchPypi { + inherit pname version; + sha256 = "1rnjc8pjfaq67mq10gy939g77azc80lxf77s9nsaxds4q5j1yrl2"; + }; + + nativeBuildInputs = [ + gobject-introspection + python3Packages.setuptools + wrapGAppsHook + ]; + + buildInputs = [ + gtk3 + pango + ] + ++ lib.optional notifySupport libnotify + ++ lib.optional networkSupport networkmanager + ; + + propagatedBuildInputs = with python3Packages; [ + dataclasses-json + deepdiff + fuzzywuzzy + mpv + peewee + pygobject3 + python-Levenshtein + python-dateutil + requests + semver + ] + ++ lib.optional chromecastSupport PyChromecast + ++ lib.optional keyringSupport keyring + ++ lib.optional serverSupport bottle + ; + + # hook for gobject-introspection doesn't like strictDeps + # https://github.com/NixOS/nixpkgs/issues/56943 + strictDeps = false; + + meta = with lib; { + description = "GTK3 Subsonic/Airsonic client"; + homepage = "https://sublimemusic.app/"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ albakham ]; + }; +} diff --git a/pkgs/applications/audio/vocal/default.nix b/pkgs/applications/audio/vocal/default.nix index 6ef992ffff670..b519003a9ec95 100644 --- a/pkgs/applications/audio/vocal/default.nix +++ b/pkgs/applications/audio/vocal/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, nix-update-script , cmake , ninja , vala @@ -61,7 +62,7 @@ stdenv.mkDerivation rec { ]; passthru = { - updateScript = pantheon.updateScript { + updateScript = nix-update-script { attrPath = pname; }; }; diff --git a/pkgs/applications/blockchains/go-ethereum.nix b/pkgs/applications/blockchains/go-ethereum.nix index a042e75ccb3a5..421acfef6ba10 100644 --- a/pkgs/applications/blockchains/go-ethereum.nix +++ b/pkgs/applications/blockchains/go-ethereum.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "go-ethereum"; - version = "1.9.17"; + version = "1.9.18"; src = fetchFromGitHub { owner = "ethereum"; repo = pname; rev = "v${version}"; - sha256 = "175cy5cqkdhvh3kv2d0madybbz2sdbgxhm8xfb3ydbaf2hzihxmx"; + sha256 = "0nkzwmrzk0m9662cr18h5i54v07mw8v3fh0csvqx8n50z5fcvb7b"; }; usb = fetchFromGitHub { @@ -18,7 +18,7 @@ buildGoModule rec { sha256 = "0asd5fz2rhzkjmd8wjgmla5qmqyz4jaa6qf0n2ycia16jsck6wc2"; }; - vendorSha256 = "0w2214fllw93xbrlxayhl014aqbjsc8zz7mpik7w5b26m60hn5kr"; + vendorSha256 = "13wh6r9zi5qw72xkbzy3mcgn7lv9l981x4lniypjbnkwhq2dj5iz"; overrideModAttrs = (_: { postBuild = '' diff --git a/pkgs/applications/display-managers/lightdm/default.nix b/pkgs/applications/display-managers/lightdm/default.nix index 1a65ebd33577b..19ebedf1ea33e 100644 --- a/pkgs/applications/display-managers/lightdm/default.nix +++ b/pkgs/applications/display-managers/lightdm/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, nix-update-script , substituteAll , plymouth , pam @@ -127,6 +128,13 @@ stdenv.mkDerivation rec { rm -rf $out/etc/apparmor.d $out/etc/init $out/etc/pam.d ''; + passthru = { + updateScript = nix-update-script { + attrPath = pname; + }; + }; + + meta = { homepage = "https://github.com/CanonicalLtd/lightdm"; description = "A cross-desktop display manager"; diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index 01901ff47f197..c699f111e1e09 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -18,9 +18,9 @@ let sha256Hash = "11lkwcbzdl86cyz4lci65cx9z5jjhrc4z40maqx2r5hw1xka9290"; }; latestVersion = { # canary & dev - version = "4.2.0.4"; # "Android Studio 4.2 Canary 4" - build = "201.6636798"; - sha256Hash = "1v3893g5kx2azmv0zj2k1rxpiksapnapy7rgfq6x6fq4d2q87wbc"; + version = "4.2.0.5"; # "Android Studio 4.2 Canary 5" + build = "201.6682321"; + sha256Hash = "076q6d7kmi0wcsqak7n6ggp1qns4xj1134xcpdzb92qk3dmg3wrh"; }; in { # Attributes are named by their corresponding release channels diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index bfdf320aeb932..4e609462eaae3 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, callPackage, fetchurl , python , jdk, cmake, libxml2, zlib, python3, ncurses5 +, dotnet-sdk_3 }: with stdenv.lib; let mkJetBrainsProduct = callPackage ./common.nix { }; - # Sorted alphabetically buildClion = { name, version, src, license, description, wmClass, ... }: @@ -223,6 +223,8 @@ let # Patch built-in mono for ReSharperHost to start successfully interpreter=$(echo ${stdenv.glibc.out}/lib/ld-linux*.so.2) patchelf --set-interpreter "$interpreter" lib/ReSharperHost/linux-x64/mono/bin/mono-sgen + rm -rf lib/ReSharperHost/linux-x64/dotnet + ln -s ${dotnet-sdk_3} lib/ReSharperHost/linux-x64/dotnet ''); }); diff --git a/pkgs/applications/editors/quilter/default.nix b/pkgs/applications/editors/quilter/default.nix index 8fa85ab755704..c5062ab725a81 100644 --- a/pkgs/applications/editors/quilter/default.nix +++ b/pkgs/applications/editors/quilter/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, meson, ninja, python3, vala +{ stdenv, fetchFromGitHub, nix-update-script, pkgconfig, meson, ninja, python3, vala , gtk3, desktop-file-utils, gtksourceview, webkitgtk, gtkspell3, pantheon , libgee, discount, wrapGAppsHook }: @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = pantheon.updateScript { + updateScript = nix-update-script { attrPath = pname; }; }; diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix index 968cc69d92dbf..285b3a8a1806c 100644 --- a/pkgs/applications/editors/vscode/vscode.nix +++ b/pkgs/applications/editors/vscode/vscode.nix @@ -11,8 +11,8 @@ let archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "1c8gi2001p2f0zc165cqwwf9f8ls34fgg040qn9l08za7djb9hyv"; - x86_64-darwin = "06n17s3qa2jkmg5qx3zvshz6rvdx33dhxn65j0x5mi62dv93gjgg"; + x86_64-linux = "162qwjmm439zplcyjhbb961ircqpdfw13h9ybnik1q128f4650ky"; + x86_64-darwin = "1kmg1h1gnx9kdnigjzpqd6rlzv7bz01h29ldla2srfr2q6nr0r9v"; }.${system}; in callPackage ./generic.nix rec { @@ -21,7 +21,7 @@ in # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.46.1"; + version = "1.47.3"; pname = "vscode"; executableName = "code" + lib.optionalString isInsiders "-insiders"; diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix index cc0c73b73e9f0..149eb5cf86105 100644 --- a/pkgs/applications/editors/vscode/vscodium.nix +++ b/pkgs/applications/editors/vscode/vscodium.nix @@ -11,8 +11,8 @@ let archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "0l9sg2d0657k9dacy7k2jn8z07z50v8d1czgy4bkzbrj9vz7c6a7"; - x86_64-darwin = "0mnq0ykahwfrgs28rdy1jl366qyclipsr3apnmhym1xsylk0mpfx"; + x86_64-linux = "01wzdwb6laa0kwgwwvqri06ckdixg1w4fwcx400vhg3mby4n9wvl"; + x86_64-darwin = "1byh1x839w4r88yv0k7jpvxvida1xpf7pvnsp6vnawvqpbmdwlw0"; }.${system}; sourceRoot = { @@ -27,7 +27,7 @@ in # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.46.1"; + version = "1.47.3"; pname = "vscodium"; executableName = "codium"; diff --git a/pkgs/applications/graphics/drawio/default.nix b/pkgs/applications/graphics/drawio/default.nix index 69764daedebe1..22a58e81c97bf 100644 --- a/pkgs/applications/graphics/drawio/default.nix +++ b/pkgs/applications/graphics/drawio/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "drawio"; - version = "13.4.5"; + version = "13.5.1"; src = fetchurl { url = "https://github.com/jgraph/drawio-desktop/releases/download/v${version}/draw.io-x86_64-${version}.rpm"; - sha256 = "1vp5krgj0xzhkiidj658ij6j10d2p97l1nifx0nrqysblcz2km3g"; + sha256 = "00ggm867c5005qfm35qf8a94d87ln91irb1ir6012am2k5bn8c8p"; }; nativeBuildInputs = [ @@ -88,6 +88,7 @@ stdenv.mkDerivation rec { description = "A desktop application for creating diagrams"; homepage = "https://about.draw.io/"; license = licenses.asl20; + changelog = "https://github.com/jgraph/drawio-desktop/releases/tag/v${version}"; maintainers = with maintainers; [ danieldk ]; platforms = [ "x86_64-linux" ]; }; diff --git a/pkgs/applications/graphics/fondo/default.nix b/pkgs/applications/graphics/fondo/default.nix index cd0ee8e662b92..e80fbee1b71ef 100644 --- a/pkgs/applications/graphics/fondo/default.nix +++ b/pkgs/applications/graphics/fondo/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, nix-update-script , pantheon , vala , pkgconfig @@ -57,7 +58,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = pantheon.updateScript { + updateScript = nix-update-script { attrPath = pname; }; }; diff --git a/pkgs/applications/graphics/ideogram/default.nix b/pkgs/applications/graphics/ideogram/default.nix index 4bf414cf8dd5d..9ae7ae2cb8ce4 100644 --- a/pkgs/applications/graphics/ideogram/default.nix +++ b/pkgs/applications/graphics/ideogram/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, nix-update-script , fetchpatch , vala , pkgconfig @@ -51,7 +52,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = pantheon.updateScript { + updateScript = nix-update-script { attrPath = pname; }; }; diff --git a/pkgs/applications/graphics/write_stylus/default.nix b/pkgs/applications/graphics/write_stylus/default.nix index 31fc404502657..380f70c7c9366 100644 --- a/pkgs/applications/graphics/write_stylus/default.nix +++ b/pkgs/applications/graphics/write_stylus/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, stdenv, lib, qtbase, qtsvg, libglvnd, fetchurl, makeDesktopItem }: +{ mkDerivation, stdenv, lib, qtbase, qtsvg, libglvnd, libX11, libXi, fetchurl, makeDesktopItem }: let # taken from: https://www.iconfinder.com/icons/50835/edit_pencil_write_icon # license: Free for commercial use @@ -9,7 +9,7 @@ let in mkDerivation rec { pname = "write_stylus"; - version = "209"; + version = "300"; desktopItem = makeDesktopItem { name = "Write"; @@ -23,7 +23,7 @@ mkDerivation rec { src = fetchurl { url = "http://www.styluslabs.com/write/write${version}.tar.gz"; - sha256 = "1p6glp4vdpwl8hmhypayc4cvs3j9jfmjfhhrgqm2xkgl5bfbv2qd"; + sha256 = "1kg4qqxgg7iyxl13hkbl3j27dykra56dj67hbv0392mwdcgavihq"; }; sourceRoot = "."; @@ -44,7 +44,9 @@ mkDerivation rec { qtbase # libQt5PrintSupport.so.5 qtsvg # libQt5Svg.so.5 stdenv.cc.cc.lib # libstdc++.so.6 - libglvnd # ibGL.so.1 + libglvnd # libGL.so.1 + libX11 # libX11.so.6 + libXi # libXi.so.6 ]; in '' patchelf \ diff --git a/pkgs/applications/misc/appeditor/default.nix b/pkgs/applications/misc/appeditor/default.nix index 38b51efa240e2..ab58f9237647c 100644 --- a/pkgs/applications/misc/appeditor/default.nix +++ b/pkgs/applications/misc/appeditor/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, nix-update-script , vala , meson , ninja @@ -51,7 +52,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = pantheon.updateScript { + updateScript = nix-update-script { attrPath = pname; }; }; diff --git a/pkgs/applications/misc/cipher/default.nix b/pkgs/applications/misc/cipher/default.nix index eef05fe91d200..630519ff2bfff 100644 --- a/pkgs/applications/misc/cipher/default.nix +++ b/pkgs/applications/misc/cipher/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, nix-update-script , meson , ninja , vala @@ -48,7 +49,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = pantheon.updateScript { + updateScript = nix-update-script { attrPath = pname; }; }; diff --git a/pkgs/applications/misc/clight/default.nix b/pkgs/applications/misc/clight/default.nix index ed8767419d4df..2502459af106d 100644 --- a/pkgs/applications/misc/clight/default.nix +++ b/pkgs/applications/misc/clight/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "clight"; - version = "4.0"; + version = "4.1"; src = fetchFromGitHub { owner = "FedeDP"; repo = "Clight"; rev = version; - sha256 = "101fp9kwmfmfffpdvv41wf96kdjw0b16xk49g43w32a5wlr74zrq"; + sha256 = "1j7va217g1k8lxl3lly13js8myf0shjc6knalq8q6lakc6j1mkxx"; }; # bash-completion.pc completionsdir=${bash-completion.out} diff --git a/pkgs/applications/misc/ddgr/default.nix b/pkgs/applications/misc/ddgr/default.nix index 82730842baca6..1cac8811103d7 100644 --- a/pkgs/applications/misc/ddgr/default.nix +++ b/pkgs/applications/misc/ddgr/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, python3, installShellFiles }: stdenv.mkDerivation rec { - version = "1.8.1"; + version = "1.9"; pname = "ddgr"; src = fetchFromGitHub { owner = "jarun"; repo = "ddgr"; rev = "v${version}"; - sha256 = "0668wzh1gqin0xscy3fly9hz370n2ny175f3kya9bsld0x0jkd5p"; + sha256 = "0qbdq7k0mmvkjp6qzz88n7vf29liqn6y5w4y39ldqdc8hzw5sld7"; }; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/misc/formatter/default.nix b/pkgs/applications/misc/formatter/default.nix index b0224c052c4e1..85a70812cad11 100644 --- a/pkgs/applications/misc/formatter/default.nix +++ b/pkgs/applications/misc/formatter/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, nix-update-script , meson , ninja , vala @@ -62,7 +63,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = pantheon.updateScript { + updateScript = nix-update-script { attrPath = pname; }; }; diff --git a/pkgs/applications/misc/girara/default.nix b/pkgs/applications/misc/girara/default.nix index 45bca7d3fbf54..def70d7df3c68 100644 --- a/pkgs/applications/misc/girara/default.nix +++ b/pkgs/applications/misc/girara/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "girara"; - version = "0.3.4"; + version = "0.3.5"; outputs = [ "out" "dev" ]; src = fetchurl { url = "https://git.pwmt.org/pwmt/${pname}/-/archive/${version}/${pname}-${version}.tar.gz"; - sha256 = "08zdsr4zwi49facsl5596l0g1xqqv2jk3sqk841gkxwawcggim44"; + sha256 = "1n3i960b458172mc3pkq7m9dn5qxry6fms3c3k06v27cjp5whsyf"; }; nativeBuildInputs = [ meson ninja pkgconfig gettext check dbus xvfb_run ]; diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix index d80526d66fe71..3f0f8946c29a5 100644 --- a/pkgs/applications/misc/hugo/default.nix +++ b/pkgs/applications/misc/hugo/default.nix @@ -1,16 +1,14 @@ -{ stdenv, buildGoModule, fetchFromGitHub, libsass }: +{ stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "hugo"; - version = "0.73.0"; - - buildInputs = [ libsass ]; + version = "0.74.3"; src = fetchFromGitHub { owner = "gohugoio"; repo = pname; rev = "v${version}"; - sha256 = "0qhv8kdv5k1xfk6106lxvsz7f92k7w6wk05ngz7qxbkb6zkcnshw"; + sha256 = "0rikr4yrjvmrv8smvr8jdbcjqwf61y369wn875iywrj63pyr74r9"; }; golibsass = fetchFromGitHub { @@ -27,7 +25,7 @@ buildGoModule rec { ''; }); - vendorSha256 = "07dkmrldsxw59v6r4avj1gr4hsaxybhb14qv61hc777qix2kq9v1"; + vendorSha256 = "031k8bvca1pb1naw922vg5h95gnwp76dii1cjcs0b1qj93isdibk"; buildFlags = [ "-tags" "extended" ]; diff --git a/pkgs/applications/misc/notejot/default.nix b/pkgs/applications/misc/notejot/default.nix index 3498ef2786753..d5d6aea494617 100644 --- a/pkgs/applications/misc/notejot/default.nix +++ b/pkgs/applications/misc/notejot/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, vala, pkgconfig, meson, ninja, python3, pantheon +{ stdenv, fetchFromGitHub, nix-update-script, vala, pkgconfig, meson, ninja, python3, pantheon , gtk3, gtksourceview, json-glib, libgee, wrapGAppsHook }: stdenv.mkDerivation rec { @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = pantheon.updateScript { + updateScript = nix-update-script { attrPath = pname; }; }; diff --git a/pkgs/applications/misc/olifant/default.nix b/pkgs/applications/misc/olifant/default.nix index b3b2857df52cb..4358de03b5b15 100644 --- a/pkgs/applications/misc/olifant/default.nix +++ b/pkgs/applications/misc/olifant/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, nix-update-script , fetchpatch , vala , meson @@ -54,7 +55,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = pantheon.updateScript { + updateScript = nix-update-script { attrPath = pname; }; }; diff --git a/pkgs/applications/misc/sequeler/default.nix b/pkgs/applications/misc/sequeler/default.nix index 6f43774a128ac..d196217614079 100644 --- a/pkgs/applications/misc/sequeler/default.nix +++ b/pkgs/applications/misc/sequeler/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub +{ stdenv, fetchFromGitHub, nix-update-script , vala, meson, ninja, pkgconfig, pantheon, gettext, wrapGAppsHook, python3, desktop-file-utils , gtk3, glib, libgee, libgda, gtksourceview, libxml2, libsecret, libssh2 }: @@ -30,7 +30,7 @@ in stdenv.mkDerivation rec { ''; passthru = { - updateScript = pantheon.updateScript { + updateScript = nix-update-script { attrPath = pname; }; }; diff --git a/pkgs/applications/misc/synergy/default.nix b/pkgs/applications/misc/synergy/default.nix index bb922f3ca5b28..5c1cce192163a 100644 --- a/pkgs/applications/misc/synergy/default.nix +++ b/pkgs/applications/misc/synergy/default.nix @@ -75,7 +75,7 @@ stdenv.mkDerivation rec { description = "Share one mouse and keyboard between multiple computers"; homepage = "http://synergy-project.org/"; license = licenses.gpl2; - maintainers = with maintainers; [ aszlig enzime ]; + maintainers = with maintainers; [ enzime ]; platforms = platforms.all; }; } diff --git a/pkgs/applications/misc/tootle/default.nix b/pkgs/applications/misc/tootle/default.nix index 904782f3e1f85..9c6008b79349c 100644 --- a/pkgs/applications/misc/tootle/default.nix +++ b/pkgs/applications/misc/tootle/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, nix-update-script , fetchpatch , vala , meson @@ -63,7 +64,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = pantheon.updateScript { + updateScript = nix-update-script { attrPath = pname; }; }; diff --git a/pkgs/applications/misc/ulauncher/default.nix b/pkgs/applications/misc/ulauncher/default.nix index a9713ffed38ac..81e273dd39d8f 100644 --- a/pkgs/applications/misc/ulauncher/default.nix +++ b/pkgs/applications/misc/ulauncher/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchurl +, nix-update-script , python3Packages , gdk-pixbuf , glib @@ -103,6 +104,13 @@ python3Packages.buildPythonApplication rec { gappsWrapperArgs+=(--prefix PATH : "${stdenv.lib.makeBinPath [ wmctrl ]}") ''; + passthru = { + updateScript = nix-update-script { + attrPath = pname; + }; + }; + + meta = with stdenv.lib; { description = "A fast application launcher for Linux, written in Python, using GTK"; homepage = "https://ulauncher.io/"; diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix index 92282447d6650..81cc31aacc8fd 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix @@ -11,8 +11,8 @@ version = "86.0.4209.2"; }; stable = { - sha256 = "0yf6j0459qzr677zsa2apmfz0x0ndlscvwj1a5v40nqjijchv5qp"; - sha256bin64 = "1hzhgvs2ykqsncpnbnhzh09sw1vlsdfjhs06z5gc80l47brdi3wz"; - version = "84.0.4147.89"; + sha256 = "1b6cqnwx76pp4y5hvz3qm8lm1ayaxr5578k76164acr35bmypx6a"; + sha256bin64 = "0znxq5ncyvyysx3p8xikzg8jm8jr51k478y29m985x6c5p5a4zyw"; + version = "84.0.4147.105"; }; } diff --git a/pkgs/applications/networking/browsers/eolie/default.nix b/pkgs/applications/networking/browsers/eolie/default.nix index cfccacf1ae08c..ca868a0807747 100644 --- a/pkgs/applications/networking/browsers/eolie/default.nix +++ b/pkgs/applications/networking/browsers/eolie/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, meson, ninja, pkgconfig +{ stdenv, fetchgit, meson, ninja, pkgconfig, nix-update-script , python3, gtk3, libsecret, gst_all_1, webkitgtk , glib-networking, gtkspell3, hunspell, desktop-file-utils , gobject-introspection, wrapGAppsHook }: @@ -57,6 +57,13 @@ python3.pkgs.buildPythonApplication rec { patchPythonScript "$out/libexec/eolie-sp" ''; + passthru = { + updateScript = nix-update-script { + attrPath = pname; + }; + }; + + meta = with stdenv.lib; { description = "A new GNOME web browser"; homepage = "https://wiki.gnome.org/Apps/Eolie"; diff --git a/pkgs/applications/networking/browsers/ephemeral/default.nix b/pkgs/applications/networking/browsers/ephemeral/default.nix index 69e8179489cfa..5500767877886 100644 --- a/pkgs/applications/networking/browsers/ephemeral/default.nix +++ b/pkgs/applications/networking/browsers/ephemeral/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, nix-update-script , desktop-file-utils , vala , gettext @@ -55,7 +56,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = pantheon.updateScript { + updateScript = nix-update-script { attrPath = pname; }; }; diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix index f65ae2f46956b..5af14805bd859 100644 --- a/pkgs/applications/networking/browsers/qutebrowser/default.nix +++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix @@ -2,8 +2,9 @@ , mkDerivationWith, wrapQtAppsHook, wrapGAppsHook, qtbase, glib-networking , asciidoc, docbook_xml_dtd_45, docbook_xsl, libxml2 , libxslt, gst_all_1 ? null -, withPdfReader ? true -, withMediaPlayback ? true +, withPdfReader ? true +, withMediaPlayback ? true +, backend ? "webengine" }: assert withMediaPlayback -> gst_all_1 != null; @@ -19,6 +20,14 @@ let stripRoot = false; }; + backendPackage = + if backend == "webengine" then python3Packages.pyqtwebengine else + if backend == "webkit" then python3Packages.pyqt5_with_qtwebkit else + throw '' + Unknown qutebrowser backend "${backend}". + Valid choices are qtwebengine (recommended) or qtwebkit. + ''; + in mkDerivationWith python3Packages.buildPythonApplication rec { pname = "qutebrowser"; version = "1.13.0"; @@ -46,16 +55,14 @@ in mkDerivationWith python3Packages.buildPythonApplication rec { ]; propagatedBuildInputs = with python3Packages; [ - pyyaml pyqt5 pyqtwebengine jinja2 pygments + pyyaml backendPackage jinja2 pygments pypeg2 cssutils pyopengl attrs setuptools # scripts and userscripts libs tldextract beautifulsoup4 pyreadability pykeepass stem ]; - patches = [ - ./fix-restart.patch - ]; + patches = [ ./fix-restart.patch ]; dontWrapGApps = true; dontWrapQtApps = true; @@ -101,7 +108,8 @@ in mkDerivationWith python3Packages.buildPythonApplication rec { postFixup = '' wrapProgram $out/bin/qutebrowser \ "''${gappsWrapperArgs[@]}" \ - "''${qtWrapperArgs[@]}" + "''${qtWrapperArgs[@]}" \ + --add-flags '--backend ${backend}' ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/networking/cluster/argo/default.nix b/pkgs/applications/networking/cluster/argo/default.nix index 29c7fc4b3aa19..e2c7436a8ac1b 100644 --- a/pkgs/applications/networking/cluster/argo/default.nix +++ b/pkgs/applications/networking/cluster/argo/default.nix @@ -19,13 +19,13 @@ let in buildGoModule rec { pname = "argo"; - version = "2.9.3"; + version = "2.9.4"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo"; rev = "v${version}"; - sha256 = "1nflzcp8h4kc4986ah2ixws1rpndz1z225jqwfbiyr3yky3him4n"; + sha256 = "156102xqwmsq3g9jammfib0ri22a0nzk96zrv5774gidjvy2xb55"; }; vendorSha256 = "1vqmzz76lcwwnw89n4lyg4jjf7wbdgn9sdzwsgrjwkj8ax7d48cv"; diff --git a/pkgs/applications/networking/cluster/kube3d/default.nix b/pkgs/applications/networking/cluster/kube3d/default.nix index c6ae0629d7c61..a65ac2ec98b51 100644 --- a/pkgs/applications/networking/cluster/kube3d/default.nix +++ b/pkgs/applications/networking/cluster/kube3d/default.nix @@ -1,24 +1,33 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub, installShellFiles }: buildGoModule rec { pname = "kube3d"; - version = "1.7.0"; - k3sVersion = "1.17.3-k3s1"; + version = "3.0.0"; + k3sVersion = "1.18.6-k3s1"; goPackagePath = "github.com/rancher/k3d"; + excludedPackages = ''tools''; src = fetchFromGitHub { owner = "rancher"; repo = "k3d"; rev = "v${version}"; - sha256 = "0aij2l7zmg4cxbw7pwf7ddc64di25hpjvbmp1madhz9q28rwfa9w"; + sha256 = "1p4rqzi67cr8vf1ih7zqxkpssqq0vy4pb5crvkxbbf5ad5mwrjri"; }; buildFlagsArray = '' -ldflags= -w -s - -X github.com/rancher/k3d/version.Version=${version} - -X github.com/rancher/k3d/version.K3sVersion=v${k3sVersion} + -X github.com/rancher/k3d/v3/version.Version=v${version} + -X github.com/rancher/k3d/v3/version.K3sVersion=v${k3sVersion} + ''; + + nativeBuildInputs = [ installShellFiles ]; + postInstall = '' + for shell in bash zsh; do + $out/bin/k3d completion $shell > k3d.$shell + installShellCompletion k3d.$shell + done ''; vendorSha256 = null; diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index 78d4c6f797fe6..74aa881c999ca 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -48,6 +48,7 @@ let kalbasit marsam babariviere + Chili-Man ]; }; } // attrs'); @@ -118,8 +119,8 @@ in rec { terraform_0_11-full = terraform_0_11.full; terraform_0_12 = pluggable (generic { - version = "0.12.28"; - sha256 = "05ymr6vc0sqh1sia0qawhz0mag8jdrq157mbj9bkdpsnlyv209p3"; + version = "0.12.29"; + sha256 = "18i7vkvnvfybwzhww8d84cyh93xfbwswcnwfrgvcny1qwm8rsaj8"; patches = [ ./provider-path.patch (fetchpatch { diff --git a/pkgs/applications/networking/feedreaders/feedreader/default.nix b/pkgs/applications/networking/feedreaders/feedreader/default.nix index df266e18c23c9..d050b75ac30a1 100644 --- a/pkgs/applications/networking/feedreaders/feedreader/default.nix +++ b/pkgs/applications/networking/feedreaders/feedreader/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, vala, gettext, python3 +{ stdenv, fetchFromGitHub, nix-update-script, meson, ninja, pkgconfig, vala, gettext, python3 , appstream-glib, desktop-file-utils, wrapGAppsHook, gnome-online-accounts , gtk3, libgee, libpeas, librest, webkitgtk, gsettings-desktop-schemas, pantheon , curl, glib, gnome3, gst_all_1, json-glib, libnotify, libsecret, sqlite, gumbo, libxml2 @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = pantheon.updateScript { + updateScript = nix-update-script { attrPath = pname; }; }; diff --git a/pkgs/applications/networking/feedreaders/newsflash/cargo.lock.patch b/pkgs/applications/networking/feedreaders/newsflash/cargo.lock.patch deleted file mode 100644 index 496eaaad3559e..0000000000000 --- a/pkgs/applications/networking/feedreaders/newsflash/cargo.lock.patch +++ /dev/null @@ -1,3374 +0,0 @@ -diff --git a/Cargo.lock b/Cargo.lock -new file mode 100644 -index 0000000..fe8727a ---- /dev/null -+++ b/Cargo.lock -@@ -0,0 +1,3368 @@ -+# This file is automatically @generated by Cargo. -+# It is not intended for manual editing. -+[[package]] -+name = "addr2line" -+version = "0.13.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "1b6a2d3371669ab3ca9797670853d61402b03d0b4b9ebf33d677dfa720203072" -+dependencies = [ -+ "gimli", -+] -+ -+[[package]] -+name = "adler" -+version = "0.2.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ee2a4ec343196209d6594e19543ae87a39f96d5534d7174822a3ad825dd6ed7e" -+ -+[[package]] -+name = "adler32" -+version = "1.1.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "567b077b825e468cc974f0020d4082ee6e03132512f207ef1a02fd5d00d1f32d" -+ -+[[package]] -+name = "aes-soft" -+version = "0.4.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4925647ee64e5056cf231608957ce7c81e12d6d6e316b9ce1404778cc1d35fa7" -+dependencies = [ -+ "block-cipher", -+ "byteorder", -+ "opaque-debug 0.2.3", -+] -+ -+[[package]] -+name = "aho-corasick" -+version = "0.7.13" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "043164d8ba5c4c3035fec9bbee8647c0261d788f3474306f93bb65901cae0e86" -+dependencies = [ -+ "memchr", -+] -+ -+[[package]] -+name = "arc-swap" -+version = "0.4.7" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4d25d88fd6b8041580a654f9d0c581a047baee2b3efee13275f2fc392fc75034" -+ -+[[package]] -+name = "arrayref" -+version = "0.3.6" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544" -+ -+[[package]] -+name = "arrayvec" -+version = "0.5.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "cff77d8686867eceff3105329d4698d96c2391c176d5d03adc90c7389162b5b8" -+ -+[[package]] -+name = "article_scraper" -+version = "1.1.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "eed0c4b3fc148ecd8a241340da1d0b73befa0ee887b4492eafe7c9602935d47c" -+dependencies = [ -+ "base64 0.12.3", -+ "chrono", -+ "encoding_rs", -+ "failure", -+ "image", -+ "libxml", -+ "log", -+ "parking_lot 0.10.2", -+ "regex", -+ "reqwest", -+ "tokio", -+ "url", -+] -+ -+[[package]] -+name = "async-trait" -+version = "0.1.36" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a265e3abeffdce30b2e26b7a11b222fe37c6067404001b434101457d0385eb92" -+dependencies = [ -+ "proc-macro2", -+ "quote", -+ "syn", -+] -+ -+[[package]] -+name = "atk" -+version = "0.8.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "444daefa55f229af145ea58d77efd23725024ee1f6f3102743709aa6b18c663e" -+dependencies = [ -+ "atk-sys", -+ "bitflags", -+ "glib", -+ "glib-sys", -+ "gobject-sys", -+ "libc", -+] -+ -+[[package]] -+name = "atk-sys" -+version = "0.9.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e552c1776737a4c80110d06b36d099f47c727335f9aaa5d942a72b6863a8ec6f" -+dependencies = [ -+ "glib-sys", -+ "gobject-sys", -+ "libc", -+ "pkg-config", -+] -+ -+[[package]] -+name = "atty" -+version = "0.2.14" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" -+dependencies = [ -+ "hermit-abi", -+ "libc", -+ "winapi 0.3.9", -+] -+ -+[[package]] -+name = "autocfg" -+version = "0.1.7" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "1d49d90015b3c36167a20fe2810c5cd875ad504b39cff3d4eae7977e6b7c1cb2" -+ -+[[package]] -+name = "autocfg" -+version = "1.0.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f8aac770f1885fd7e387acedd76065302551364496e46b3dd00860b2f8359b9d" -+ -+[[package]] -+name = "backtrace" -+version = "0.3.50" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "46254cf2fdcdf1badb5934448c1bcbe046a56537b3987d96c51a7afc5d03f293" -+dependencies = [ -+ "addr2line", -+ "cfg-if", -+ "libc", -+ "miniz_oxide 0.4.0", -+ "object", -+ "rustc-demangle", -+] -+ -+[[package]] -+name = "base64" -+version = "0.11.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b41b7ea54a0c9d92199de89e20e58d49f02f8e699814ef3fdf266f6f748d15c7" -+ -+[[package]] -+name = "base64" -+version = "0.12.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "3441f0f7b02788e948e47f457ca01f1d7e6d92c693bc132c22b087d3141c03ff" -+ -+[[package]] -+name = "bitflags" -+version = "1.2.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" -+ -+[[package]] -+name = "blake2b_simd" -+version = "0.5.10" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d8fb2d74254a3a0b5cac33ac9f8ed0e44aa50378d9dbb2e5d83bd21ed1dc2c8a" -+dependencies = [ -+ "arrayref", -+ "arrayvec", -+ "constant_time_eq", -+] -+ -+[[package]] -+name = "block-buffer" -+version = "0.5.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d70f2a8c3126a2aec089e0aebcd945607e1155bfb5b89682eddf43c3ce386718" -+dependencies = [ -+ "block-padding", -+ "byte-tools 0.2.0", -+ "generic-array 0.11.1", -+] -+ -+[[package]] -+name = "block-buffer" -+version = "0.9.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4" -+dependencies = [ -+ "generic-array 0.14.3", -+] -+ -+[[package]] -+name = "block-cipher" -+version = "0.7.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "fa136449e765dc7faa244561ccae839c394048667929af599b5d931ebe7b7f10" -+dependencies = [ -+ "generic-array 0.14.3", -+] -+ -+[[package]] -+name = "block-modes" -+version = "0.5.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "dc7143fa8aadf0a3d8140f3f558063dcfc1b3205e5e837ad59485140f1575ae8" -+dependencies = [ -+ "block-cipher", -+ "block-padding", -+] -+ -+[[package]] -+name = "block-padding" -+version = "0.1.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "fa79dedbb091f449f1f39e53edf88d5dbe95f895dae6135a8d7b881fb5af73f5" -+dependencies = [ -+ "byte-tools 0.3.1", -+] -+ -+[[package]] -+name = "bumpalo" -+version = "3.4.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "2e8c087f005730276d1096a652e92a8bacee2e2472bcc9715a74d2bec38b5820" -+ -+[[package]] -+name = "byte-tools" -+version = "0.2.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "560c32574a12a89ecd91f5e742165893f86e3ab98d21f8ea548658eb9eef5f40" -+ -+[[package]] -+name = "byte-tools" -+version = "0.3.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7" -+ -+[[package]] -+name = "bytemuck" -+version = "1.2.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "37fa13df2292ecb479ec23aa06f4507928bef07839be9ef15281411076629431" -+ -+[[package]] -+name = "byteorder" -+version = "1.3.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "08c48aae112d48ed9f069b33538ea9e3e90aa263cfa3d1c24309612b1f7472de" -+ -+[[package]] -+name = "bytes" -+version = "0.4.12" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "206fdffcfa2df7cbe15601ef46c813fce0965eb3286db6b56c583b814b51c81c" -+dependencies = [ -+ "byteorder", -+ "iovec", -+] -+ -+[[package]] -+name = "bytes" -+version = "0.5.6" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "0e4cec68f03f32e44924783795810fa50a7035d8c8ebe78580ad7e6c703fba38" -+ -+[[package]] -+name = "cairo-rs" -+version = "0.8.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "157049ba9618aa3a61c39d5d785102c04d3b1f40632a706c621a9aedc21e6084" -+dependencies = [ -+ "bitflags", -+ "cairo-sys-rs", -+ "glib", -+ "glib-sys", -+ "gobject-sys", -+ "libc", -+] -+ -+[[package]] -+name = "cairo-sys-rs" -+version = "0.9.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ff65ba02cac715be836f63429ab00a767d48336efc5497c5637afb53b4f14d63" -+dependencies = [ -+ "glib-sys", -+ "libc", -+ "pkg-config", -+] -+ -+[[package]] -+name = "cc" -+version = "1.0.58" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f9a06fb2e53271d7c279ec1efea6ab691c35a2ae67ec0d91d7acec0caf13b518" -+ -+[[package]] -+name = "cfg-if" -+version = "0.1.10" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" -+ -+[[package]] -+name = "chrono" -+version = "0.4.13" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c74d84029116787153e02106bf53e66828452a4b325cc8652b788b5967c0a0b6" -+dependencies = [ -+ "num-integer", -+ "num-traits", -+ "time", -+] -+ -+[[package]] -+name = "cloudabi" -+version = "0.0.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f" -+dependencies = [ -+ "bitflags", -+] -+ -+[[package]] -+name = "cloudabi" -+version = "0.1.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4344512281c643ae7638bbabc3af17a11307803ec8f0fcad9fae512a8bf36467" -+dependencies = [ -+ "bitflags", -+] -+ -+[[package]] -+name = "color-backtrace" -+version = "0.4.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5356ae4e07c994a2763226a8a991e5829ded78ac23f8ac88b3f3e69970db5163" -+dependencies = [ -+ "atty", -+ "backtrace", -+ "termcolor", -+] -+ -+[[package]] -+name = "color_quant" -+version = "1.0.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "0dbbb57365263e881e805dc77d94697c9118fd94d8da011240555aa7b23445bd" -+ -+[[package]] -+name = "constant_time_eq" -+version = "0.1.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" -+ -+[[package]] -+name = "core-foundation" -+version = "0.7.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "57d24c7a13c43e870e37c1556b74555437870a04514f7685f5b354e090567171" -+dependencies = [ -+ "core-foundation-sys", -+ "libc", -+] -+ -+[[package]] -+name = "core-foundation-sys" -+version = "0.7.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b3a71ab494c0b5b860bdc8407ae08978052417070c2ced38573a9157ad75b8ac" -+ -+[[package]] -+name = "cpuid-bool" -+version = "0.1.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8aebca1129a03dc6dc2b127edd729435bbc4a37e1d5f4d7513165089ceb02634" -+ -+[[package]] -+name = "crc-any" -+version = "2.3.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c3784befdf9469f4d51c69ef0b774f6a99de6bcc655285f746f16e0dd63d9007" -+dependencies = [ -+ "debug-helper", -+] -+ -+[[package]] -+name = "crc32fast" -+version = "1.2.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ba125de2af0df55319f41944744ad91c71113bf74a4646efff39afe1f6842db1" -+dependencies = [ -+ "cfg-if", -+] -+ -+[[package]] -+name = "crossbeam-deque" -+version = "0.7.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9f02af974daeee82218205558e51ec8768b48cf524bd01d550abe5573a608285" -+dependencies = [ -+ "crossbeam-epoch", -+ "crossbeam-utils", -+ "maybe-uninit", -+] -+ -+[[package]] -+name = "crossbeam-epoch" -+version = "0.8.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "058ed274caafc1f60c4997b5fc07bf7dc7cca454af7c6e81edffe5f33f70dace" -+dependencies = [ -+ "autocfg 1.0.0", -+ "cfg-if", -+ "crossbeam-utils", -+ "lazy_static", -+ "maybe-uninit", -+ "memoffset", -+ "scopeguard", -+] -+ -+[[package]] -+name = "crossbeam-queue" -+version = "0.2.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "774ba60a54c213d409d5353bda12d49cd68d14e45036a285234c8d6f91f92570" -+dependencies = [ -+ "cfg-if", -+ "crossbeam-utils", -+ "maybe-uninit", -+] -+ -+[[package]] -+name = "crossbeam-utils" -+version = "0.7.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8" -+dependencies = [ -+ "autocfg 1.0.0", -+ "cfg-if", -+ "lazy_static", -+] -+ -+[[package]] -+name = "crypto-mac" -+version = "0.8.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b584a330336237c1eecd3e94266efb216c56ed91225d634cb2991c5f3fd1aeab" -+dependencies = [ -+ "generic-array 0.14.3", -+ "subtle", -+] -+ -+[[package]] -+name = "debug-helper" -+version = "0.3.9" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "176e6bb9f0e859d6f44fbcb4bbe63375d28b289175a46de1c0e79e788cb045a5" -+ -+[[package]] -+name = "deflate" -+version = "0.8.6" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "73770f8e1fe7d64df17ca66ad28994a0a623ea497fa69486e14984e715c5d174" -+dependencies = [ -+ "adler32", -+ "byteorder", -+] -+ -+[[package]] -+name = "des" -+version = "0.4.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4e6f17f2850a27f147a228d342a95bf3c613934464d77d531fe8d5151ccd9362" -+dependencies = [ -+ "block-cipher", -+ "byteorder", -+ "opaque-debug 0.2.3", -+] -+ -+[[package]] -+name = "diesel" -+version = "1.4.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "3e2de9deab977a153492a1468d1b1c0662c1cf39e5ea87d0c060ecd59ef18d8c" -+dependencies = [ -+ "byteorder", -+ "chrono", -+ "diesel_derives", -+ "libsqlite3-sys", -+ "r2d2", -+] -+ -+[[package]] -+name = "diesel_derives" -+version = "1.4.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "45f5098f628d02a7a0f68ddba586fb61e80edec3bdc1be3b921f4ceec60858d3" -+dependencies = [ -+ "proc-macro2", -+ "quote", -+ "syn", -+] -+ -+[[package]] -+name = "diesel_migrations" -+version = "1.4.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "bf3cde8413353dc7f5d72fa8ce0b99a560a359d2c5ef1e5817ca731cd9008f4c" -+dependencies = [ -+ "migrations_internals", -+ "migrations_macros", -+] -+ -+[[package]] -+name = "digest" -+version = "0.7.6" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "03b072242a8cbaf9c145665af9d250c59af3b958f83ed6824e13533cf76d5b90" -+dependencies = [ -+ "generic-array 0.9.0", -+] -+ -+[[package]] -+name = "digest" -+version = "0.9.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066" -+dependencies = [ -+ "generic-array 0.14.3", -+] -+ -+[[package]] -+name = "dirs" -+version = "2.0.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "13aea89a5c93364a98e9b37b2fa237effbb694d5cfe01c5b70941f7eb087d5e3" -+dependencies = [ -+ "cfg-if", -+ "dirs-sys", -+] -+ -+[[package]] -+name = "dirs" -+version = "3.0.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "142995ed02755914747cc6ca76fc7e4583cd18578746716d0508ea6ed558b9ff" -+dependencies = [ -+ "dirs-sys", -+] -+ -+[[package]] -+name = "dirs-sys" -+version = "0.3.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8e93d7f5705de3e49895a2b5e0b8855a1c27f080192ae9c32a6432d50741a57a" -+dependencies = [ -+ "libc", -+ "redox_users", -+ "winapi 0.3.9", -+] -+ -+[[package]] -+name = "dotenv" -+version = "0.15.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "77c90badedccf4105eca100756a0b1289e191f6fcbdadd3cee1d2f614f97da8f" -+ -+[[package]] -+name = "dtoa" -+version = "0.4.6" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "134951f4028bdadb9b84baf4232681efbf277da25144b9b0ad65df75946c422b" -+ -+[[package]] -+name = "either" -+version = "1.5.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "bb1f6b1ce1c140482ea30ddd3335fc0024ac7ee112895426e0a629a6c20adfe3" -+ -+[[package]] -+name = "encoding_rs" -+version = "0.8.23" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e8ac63f94732332f44fe654443c46f6375d1939684c17b0afb6cb56b0456e171" -+dependencies = [ -+ "cfg-if", -+] -+ -+[[package]] -+name = "entities" -+version = "1.0.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b5320ae4c3782150d900b79807611a59a99fc9a1d61d686faafc24b93fc8d7ca" -+ -+[[package]] -+name = "escaper" -+version = "0.1.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "39da344028c2227132b2dfa7c186e2104ecc153467583d00ed9c398f9ff693b0" -+dependencies = [ -+ "entities", -+] -+ -+[[package]] -+name = "failure" -+version = "0.1.8" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d32e9bd16cc02eae7db7ef620b392808b89f6a5e16bb3497d159c6b92a0f4f86" -+dependencies = [ -+ "backtrace", -+ "failure_derive", -+] -+ -+[[package]] -+name = "failure_derive" -+version = "0.1.8" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "aa4da3c766cd7a0db8242e326e9e4e081edd567072893ed320008189715366a4" -+dependencies = [ -+ "proc-macro2", -+ "quote", -+ "syn", -+ "synstructure", -+] -+ -+[[package]] -+name = "feed-rs" -+version = "0.3.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "04f46079ca09a708b97ee7efca048bf55714c74765271f6bd8fcd656963751cb" -+dependencies = [ -+ "chrono", -+ "lazy_static", -+ "mime", -+ "regex", -+ "serde", -+ "serde_json", -+ "siphasher 0.3.3", -+ "uuid", -+ "xml-rs", -+] -+ -+[[package]] -+name = "feedbin_api" -+version = "0.1.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d98fb4cc166a04aaee30fbf159830533ab1c0aecebd519b2ef72713d85e4dfb2" -+dependencies = [ -+ "chrono", -+ "failure", -+ "reqwest", -+ "serde", -+ "serde_derive", -+ "serde_json", -+ "tokio", -+ "url", -+] -+ -+[[package]] -+name = "feedly_api" -+version = "0.3.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "806369761536af622d4fd2995012138aa1db1eec9423fa0235767aa1b8a6143c" -+dependencies = [ -+ "chrono", -+ "failure", -+ "log", -+ "percent-encoding", -+ "reqwest", -+ "serde", -+ "serde_derive", -+ "serde_json", -+ "tokio", -+ "url", -+] -+ -+[[package]] -+name = "fever_api" -+version = "0.2.9" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e7eaf741803c002bfded1ea3b0134233e83201958c7175f5cf4aa5a71e6edc47" -+dependencies = [ -+ "failure", -+ "log", -+ "md5", -+ "reqwest", -+ "serde", -+ "serde_json", -+ "url", -+] -+ -+[[package]] -+name = "flate2" -+version = "1.0.16" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "68c90b0fc46cf89d227cc78b40e494ff81287a92dd07631e5af0d06fe3cf885e" -+dependencies = [ -+ "cfg-if", -+ "crc32fast", -+ "libc", -+ "miniz_oxide 0.4.0", -+] -+ -+[[package]] -+name = "fnv" -+version = "1.0.7" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" -+ -+[[package]] -+name = "foreign-types" -+version = "0.3.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" -+dependencies = [ -+ "foreign-types-shared", -+] -+ -+[[package]] -+name = "foreign-types-shared" -+version = "0.1.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" -+ -+[[package]] -+name = "fuchsia-cprng" -+version = "0.1.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba" -+ -+[[package]] -+name = "fuchsia-zircon" -+version = "0.3.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82" -+dependencies = [ -+ "bitflags", -+ "fuchsia-zircon-sys", -+] -+ -+[[package]] -+name = "fuchsia-zircon-sys" -+version = "0.3.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7" -+ -+[[package]] -+name = "futf" -+version = "0.1.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7c9c1ce3fa9336301af935ab852c437817d14cd33690446569392e65170aac3b" -+dependencies = [ -+ "mac", -+ "new_debug_unreachable", -+] -+ -+[[package]] -+name = "futures" -+version = "0.3.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "1e05b85ec287aac0dc34db7d4a569323df697f9c55b99b15d6b4ef8cde49f613" -+dependencies = [ -+ "futures-channel", -+ "futures-core", -+ "futures-executor", -+ "futures-io", -+ "futures-sink", -+ "futures-task", -+ "futures-util", -+] -+ -+[[package]] -+name = "futures-channel" -+version = "0.3.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f366ad74c28cca6ba456d95e6422883cfb4b252a83bed929c83abfdbbf2967d5" -+dependencies = [ -+ "futures-core", -+ "futures-sink", -+] -+ -+[[package]] -+name = "futures-core" -+version = "0.3.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "59f5fff90fd5d971f936ad674802482ba441b6f09ba5e15fd8b39145582ca399" -+ -+[[package]] -+name = "futures-executor" -+version = "0.3.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "10d6bb888be1153d3abeb9006b11b02cf5e9b209fda28693c31ae1e4e012e314" -+dependencies = [ -+ "futures-core", -+ "futures-task", -+ "futures-util", -+ "num_cpus", -+] -+ -+[[package]] -+name = "futures-io" -+version = "0.3.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "de27142b013a8e869c14957e6d2edeef89e97c289e69d042ee3a49acd8b51789" -+ -+[[package]] -+name = "futures-macro" -+version = "0.3.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d0b5a30a4328ab5473878237c447333c093297bded83a4983d10f4deea240d39" -+dependencies = [ -+ "proc-macro-hack", -+ "proc-macro2", -+ "quote", -+ "syn", -+] -+ -+[[package]] -+name = "futures-sink" -+version = "0.3.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "3f2032893cb734c7a05d85ce0cc8b8c4075278e93b24b66f9de99d6eb0fa8acc" -+ -+[[package]] -+name = "futures-task" -+version = "0.3.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "bdb66b5f09e22019b1ab0830f7785bcea8e7a42148683f99214f73f8ec21a626" -+dependencies = [ -+ "once_cell", -+] -+ -+[[package]] -+name = "futures-util" -+version = "0.3.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8764574ff08b701a084482c3c7031349104b07ac897393010494beaa18ce32c6" -+dependencies = [ -+ "futures-channel", -+ "futures-core", -+ "futures-io", -+ "futures-macro", -+ "futures-sink", -+ "futures-task", -+ "memchr", -+ "pin-project", -+ "pin-utils", -+ "proc-macro-hack", -+ "proc-macro-nested", -+ "slab", -+] -+ -+[[package]] -+name = "gdk" -+version = "0.12.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "fbe5e8772fc0865c52460cdd7a59d7d47700f44d9809d1dd00eecceb769a7589" -+dependencies = [ -+ "bitflags", -+ "cairo-rs", -+ "cairo-sys-rs", -+ "gdk-pixbuf", -+ "gdk-sys", -+ "gio", -+ "gio-sys", -+ "glib", -+ "glib-sys", -+ "gobject-sys", -+ "libc", -+ "pango", -+] -+ -+[[package]] -+name = "gdk-pixbuf" -+version = "0.8.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e248220c46b329b097d4b158d2717f8c688f16dd76d0399ace82b3e98062bdd7" -+dependencies = [ -+ "gdk-pixbuf-sys", -+ "gio", -+ "gio-sys", -+ "glib", -+ "glib-sys", -+ "gobject-sys", -+ "libc", -+] -+ -+[[package]] -+name = "gdk-pixbuf-sys" -+version = "0.9.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d8991b060a9e9161bafd09bf4a202e6fd404f5b4dd1a08d53a1e84256fb34ab0" -+dependencies = [ -+ "gio-sys", -+ "glib-sys", -+ "gobject-sys", -+ "libc", -+ "pkg-config", -+] -+ -+[[package]] -+name = "gdk-sys" -+version = "0.9.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "6adf679e91d1bff0c06860287f80403e7db54c2d2424dce0a470023b56c88fbb" -+dependencies = [ -+ "cairo-sys-rs", -+ "gdk-pixbuf-sys", -+ "gio-sys", -+ "glib-sys", -+ "gobject-sys", -+ "libc", -+ "pango-sys", -+ "pkg-config", -+] -+ -+[[package]] -+name = "generic-array" -+version = "0.9.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ef25c5683767570c2bbd7deba372926a55eaae9982d7726ee2a1050239d45b9d" -+dependencies = [ -+ "typenum", -+] -+ -+[[package]] -+name = "generic-array" -+version = "0.11.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8107dafa78c80c848b71b60133954b4a58609a3a1a5f9af037ecc7f67280f369" -+dependencies = [ -+ "typenum", -+] -+ -+[[package]] -+name = "generic-array" -+version = "0.14.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "60fb4bb6bba52f78a471264d9a3b7d026cc0af47b22cd2cffbc0b787ca003e63" -+dependencies = [ -+ "typenum", -+ "version_check", -+] -+ -+[[package]] -+name = "getrandom" -+version = "0.1.14" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7abc8dd8451921606d809ba32e95b6111925cd2906060d2dcc29c070220503eb" -+dependencies = [ -+ "cfg-if", -+ "libc", -+ "wasi", -+] -+ -+[[package]] -+name = "gettext-rs" -+version = "0.4.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "df454a42d8a718280c78666efe0707c120873736961ae91ead898f17ac66ce7c" -+dependencies = [ -+ "gettext-sys", -+ "locale_config", -+] -+ -+[[package]] -+name = "gettext-sys" -+version = "0.19.9" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e034c4ba5bb796730a6cc5eb0d654c16885006a7c3d6c6603581ed809434f153" -+dependencies = [ -+ "cc", -+] -+ -+[[package]] -+name = "gif" -+version = "0.10.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "471d90201b3b223f3451cd4ad53e34295f16a1df17b1edf3736d47761c3981af" -+dependencies = [ -+ "color_quant", -+ "lzw", -+] -+ -+[[package]] -+name = "gimli" -+version = "0.22.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "aaf91faf136cb47367fa430cd46e37a788775e7fa104f8b4bcb3861dc389b724" -+ -+[[package]] -+name = "gio" -+version = "0.8.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "0cd10f9415cce39b53f8024bf39a21f84f8157afa52da53837b102e585a296a5" -+dependencies = [ -+ "bitflags", -+ "futures-channel", -+ "futures-core", -+ "futures-io", -+ "futures-util", -+ "gio-sys", -+ "glib", -+ "glib-sys", -+ "gobject-sys", -+ "lazy_static", -+ "libc", -+] -+ -+[[package]] -+name = "gio-sys" -+version = "0.9.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4fad225242b9eae7ec8a063bb86974aca56885014672375e5775dc0ea3533911" -+dependencies = [ -+ "glib-sys", -+ "gobject-sys", -+ "libc", -+ "pkg-config", -+] -+ -+[[package]] -+name = "glib" -+version = "0.9.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "40fb573a09841b6386ddf15fd4bc6655b4f5b106ca962f57ecaecde32a0061c0" -+dependencies = [ -+ "bitflags", -+ "futures-channel", -+ "futures-core", -+ "futures-executor", -+ "futures-task", -+ "futures-util", -+ "glib-sys", -+ "gobject-sys", -+ "lazy_static", -+ "libc", -+] -+ -+[[package]] -+name = "glib-sys" -+version = "0.9.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "95856f3802f446c05feffa5e24859fe6a183a7cb849c8449afc35c86b1e316e2" -+dependencies = [ -+ "libc", -+ "pkg-config", -+] -+ -+[[package]] -+name = "gobject-sys" -+version = "0.9.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "31d1a804f62034eccf370006ccaef3708a71c31d561fee88564abe71177553d9" -+dependencies = [ -+ "glib-sys", -+ "libc", -+ "pkg-config", -+] -+ -+[[package]] -+name = "gtk" -+version = "0.8.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "87e1e8d70290239c668594002d1b174fcc7d7ef5d26670ee141490ede8facf8f" -+dependencies = [ -+ "atk", -+ "bitflags", -+ "cairo-rs", -+ "cairo-sys-rs", -+ "cc", -+ "gdk", -+ "gdk-pixbuf", -+ "gdk-pixbuf-sys", -+ "gdk-sys", -+ "gio", -+ "gio-sys", -+ "glib", -+ "glib-sys", -+ "gobject-sys", -+ "gtk-sys", -+ "lazy_static", -+ "libc", -+ "pango", -+ "pango-sys", -+] -+ -+[[package]] -+name = "gtk-sys" -+version = "0.9.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "53def660c7b48b00b510c81ef2d2fbd3c570f1527081d8d7947f471513e1a4c1" -+dependencies = [ -+ "atk-sys", -+ "cairo-sys-rs", -+ "gdk-pixbuf-sys", -+ "gdk-sys", -+ "gio-sys", -+ "glib-sys", -+ "gobject-sys", -+ "libc", -+ "pango-sys", -+ "pkg-config", -+] -+ -+[[package]] -+name = "h2" -+version = "0.2.6" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "993f9e0baeed60001cf565546b0d3dbe6a6ad23f2bd31644a133c641eccf6d53" -+dependencies = [ -+ "bytes 0.5.6", -+ "fnv", -+ "futures-core", -+ "futures-sink", -+ "futures-util", -+ "http", -+ "indexmap", -+ "slab", -+ "tokio", -+ "tokio-util", -+ "tracing", -+] -+ -+[[package]] -+name = "hashbrown" -+version = "0.8.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "34f595585f103464d8d2f6e9864682d74c1601fed5e07d62b1c9058dba8246fb" -+dependencies = [ -+ "autocfg 1.0.0", -+] -+ -+[[package]] -+name = "hermit-abi" -+version = "0.1.15" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "3deed196b6e7f9e44a2ae8d94225d80302d81208b1bb673fd21fe634645c85a9" -+dependencies = [ -+ "libc", -+] -+ -+[[package]] -+name = "hmac" -+version = "0.8.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "126888268dcc288495a26bf004b38c5fdbb31682f992c84ceb046a1f0fe38840" -+dependencies = [ -+ "crypto-mac", -+ "digest 0.9.0", -+] -+ -+[[package]] -+name = "html5ever" -+version = "0.24.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "025483b0a1e4577bb28578318c886ee5f817dda6eb62473269349044406644cb" -+dependencies = [ -+ "log", -+ "mac", -+ "markup5ever", -+ "proc-macro2", -+ "quote", -+ "syn", -+] -+ -+[[package]] -+name = "http" -+version = "0.2.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "28d569972648b2c512421b5f2a405ad6ac9666547189d0c5477a3f200f3e02f9" -+dependencies = [ -+ "bytes 0.5.6", -+ "fnv", -+ "itoa", -+] -+ -+[[package]] -+name = "http-body" -+version = "0.3.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "13d5ff830006f7646652e057693569bfe0d51760c0085a071769d142a205111b" -+dependencies = [ -+ "bytes 0.5.6", -+ "http", -+] -+ -+[[package]] -+name = "httparse" -+version = "1.3.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "cd179ae861f0c2e53da70d892f5f3029f9594be0c41dc5269cd371691b1dc2f9" -+ -+[[package]] -+name = "humantime" -+version = "1.3.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f" -+dependencies = [ -+ "quick-error", -+] -+ -+[[package]] -+name = "hyper" -+version = "0.13.7" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "3e68a8dd9716185d9e64ea473ea6ef63529252e3e27623295a0378a19665d5eb" -+dependencies = [ -+ "bytes 0.5.6", -+ "futures-channel", -+ "futures-core", -+ "futures-util", -+ "h2", -+ "http", -+ "http-body", -+ "httparse", -+ "itoa", -+ "pin-project", -+ "socket2", -+ "time", -+ "tokio", -+ "tower-service", -+ "tracing", -+ "want", -+] -+ -+[[package]] -+name = "hyper-tls" -+version = "0.4.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d979acc56dcb5b8dddba3917601745e877576475aa046df3226eabdecef78eed" -+dependencies = [ -+ "bytes 0.5.6", -+ "hyper", -+ "native-tls", -+ "tokio", -+ "tokio-tls", -+] -+ -+[[package]] -+name = "idna" -+version = "0.2.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "02e2673c30ee86b5b96a9cb52ad15718aa1f966f5ab9ad54a8b95d5ca33120a9" -+dependencies = [ -+ "matches", -+ "unicode-bidi", -+ "unicode-normalization", -+] -+ -+[[package]] -+name = "image" -+version = "0.23.7" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a2397fc43bd5648b7117aabb3c5e62d0e62c194826ec77b0b4d0c41e62744635" -+dependencies = [ -+ "bytemuck", -+ "byteorder", -+ "gif", -+ "jpeg-decoder", -+ "num-iter", -+ "num-rational", -+ "num-traits", -+ "png", -+ "scoped_threadpool", -+ "tiff", -+] -+ -+[[package]] -+name = "indexmap" -+version = "1.5.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5b88cd59ee5f71fea89a62248fc8f387d44400cefe05ef548466d61ced9029a7" -+dependencies = [ -+ "autocfg 1.0.0", -+ "hashbrown", -+] -+ -+[[package]] -+name = "instant" -+version = "0.1.6" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5b141fdc7836c525d4d594027d318c84161ca17aaf8113ab1f81ab93ae897485" -+ -+[[package]] -+name = "iovec" -+version = "0.1.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b2b3ea6ff95e175473f8ffe6a7eb7c00d054240321b84c57051175fe3c1e075e" -+dependencies = [ -+ "libc", -+] -+ -+[[package]] -+name = "itertools" -+version = "0.9.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "284f18f85651fe11e8a991b2adb42cb078325c996ed026d994719efcfca1d54b" -+dependencies = [ -+ "either", -+] -+ -+[[package]] -+name = "itoa" -+version = "0.4.6" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "dc6f3ad7b9d11a0c00842ff8de1b60ee58661048eb8049ed33c73594f359d7e6" -+ -+[[package]] -+name = "javascriptcore-rs" -+version = "0.9.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "2104be353e5c19d587e25f36ecb6d59504b5573ad84b96b06650b0cc99d02784" -+dependencies = [ -+ "glib", -+ "javascriptcore-rs-sys", -+] -+ -+[[package]] -+name = "javascriptcore-rs-sys" -+version = "0.2.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "3f46ada8a08dcd75a10afae872fbfb51275df4a8ae0d46b8cc7c708f08dd2998" -+dependencies = [ -+ "libc", -+] -+ -+[[package]] -+name = "jpeg-decoder" -+version = "0.1.20" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "cc797adac5f083b8ff0ca6f6294a999393d76e197c36488e2ef732c4715f6fa3" -+dependencies = [ -+ "byteorder", -+ "rayon", -+] -+ -+[[package]] -+name = "js-sys" -+version = "0.3.42" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "52732a3d3ad72c58ad2dc70624f9c17b46ecd0943b9a4f1ee37c4c18c5d983e2" -+dependencies = [ -+ "wasm-bindgen", -+] -+ -+[[package]] -+name = "kernel32-sys" -+version = "0.2.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d" -+dependencies = [ -+ "winapi 0.2.8", -+ "winapi-build", -+] -+ -+[[package]] -+name = "lazy_static" -+version = "1.4.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" -+ -+[[package]] -+name = "libc" -+version = "0.2.73" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "bd7d4bd64732af4bf3a67f367c27df8520ad7e230c5817b8ff485864d80242b9" -+ -+[[package]] -+name = "libhandy" -+version = "0.5.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "2aa9f5620e4143358bcd645fe7d7d27b974ed9148cbdd490bc811813899afa07" -+dependencies = [ -+ "bitflags", -+ "gdk", -+ "gdk-sys", -+ "gio", -+ "gio-sys", -+ "glib", -+ "glib-sys", -+ "gobject-sys", -+ "gtk", -+ "gtk-sys", -+ "lazy_static", -+ "libc", -+ "libhandy-sys", -+ "pango", -+] -+ -+[[package]] -+name = "libhandy-sys" -+version = "0.5.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d707af842e918719b71af0ac6cf31d1843f6e8a4d1e9c733b998d8d482e60446" -+dependencies = [ -+ "gdk", -+ "gdk-sys", -+ "gio", -+ "gio-sys", -+ "glib-sys", -+ "gobject-sys", -+ "gtk-sys", -+ "libc", -+ "pango-sys", -+ "pkg-config", -+] -+ -+[[package]] -+name = "libsqlite3-sys" -+version = "0.18.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "1e704a02bcaecd4a08b93a23f6be59d0bd79cd161e0963e9499165a0a35df7bd" -+dependencies = [ -+ "pkg-config", -+ "vcpkg", -+] -+ -+[[package]] -+name = "libxml" -+version = "0.2.14" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "56aa7ca31a98e8689fbb0647add450b1523e554c7c7c60d4ee51df32bb2c9566" -+dependencies = [ -+ "libc", -+ "pkg-config", -+] -+ -+[[package]] -+name = "linked-hash-map" -+version = "0.5.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8dd5a6d5999d9907cda8ed67bbd137d3af8085216c2ac62de5be860bd41f304a" -+ -+[[package]] -+name = "locale_config" -+version = "0.2.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "73ac19ebe45489e5d53b4346d8b90bb3dd03275c5fdf2ce22a982516d86b535c" -+dependencies = [ -+ "lazy_static", -+ "regex", -+ "winapi 0.3.9", -+] -+ -+[[package]] -+name = "lock_api" -+version = "0.3.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c4da24a77a3d8a6d4862d95f72e6fdb9c09a643ecdb402d754004a557f2bec75" -+dependencies = [ -+ "scopeguard", -+] -+ -+[[package]] -+name = "lock_api" -+version = "0.4.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "28247cc5a5be2f05fbcd76dd0cf2c7d3b5400cb978a28042abcd4fa0b3f8261c" -+dependencies = [ -+ "scopeguard", -+] -+ -+[[package]] -+name = "log" -+version = "0.4.11" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4fabed175da42fed1fa0746b0ea71f412aa9d35e76e95e59b192c64b9dc2bf8b" -+dependencies = [ -+ "cfg-if", -+ "serde", -+] -+ -+[[package]] -+name = "log-mdc" -+version = "0.1.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a94d21414c1f4a51209ad204c1776a3d0765002c76c6abcb602a6f09f1e881c7" -+ -+[[package]] -+name = "log4rs" -+version = "0.12.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f4d8e6e1d5f89acca713132acc6034f30bad09b961d1338161bdb71c08f6e4fa" -+dependencies = [ -+ "arc-swap", -+ "chrono", -+ "flate2", -+ "fnv", -+ "humantime", -+ "libc", -+ "log", -+ "log-mdc", -+ "parking_lot 0.10.2", -+ "serde", -+ "serde-value", -+ "serde_derive", -+ "serde_json", -+ "serde_yaml", -+ "thread-id", -+ "typemap", -+ "winapi 0.3.9", -+] -+ -+[[package]] -+name = "lzw" -+version = "0.10.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7d947cbb889ed21c2a84be6ffbaebf5b4e0f4340638cba0444907e38b56be084" -+ -+[[package]] -+name = "mac" -+version = "0.1.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c41e0c4fef86961ac6d6f8a82609f55f31b05e4fce149ac5710e439df7619ba4" -+ -+[[package]] -+name = "magic-crypt" -+version = "3.1.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "6ccb417db1f1736b5e40a73be0076a3506db2b107b198819c91321f6805e3b8f" -+dependencies = [ -+ "aes-soft", -+ "base64 0.12.3", -+ "block-modes", -+ "crc-any", -+ "des", -+ "digest 0.7.6", -+ "digest 0.9.0", -+ "md-5", -+ "sha2", -+ "tiger-digest", -+] -+ -+[[package]] -+name = "markup5ever" -+version = "0.9.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "65381d9d47506b8592b97c4efd936afcf673b09b059f2bef39c7211ee78b9d03" -+dependencies = [ -+ "log", -+ "phf", -+ "phf_codegen", -+ "serde", -+ "serde_derive", -+ "serde_json", -+ "string_cache", -+ "string_cache_codegen", -+ "tendril", -+] -+ -+[[package]] -+name = "matches" -+version = "0.1.8" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08" -+ -+[[package]] -+name = "maybe-uninit" -+version = "2.0.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00" -+ -+[[package]] -+name = "md-5" -+version = "0.9.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7b5a279bb9607f9f53c22d496eade00d138d1bdcccd07d74650387cf94942a15" -+dependencies = [ -+ "block-buffer 0.9.0", -+ "digest 0.9.0", -+ "opaque-debug 0.3.0", -+] -+ -+[[package]] -+name = "md5" -+version = "0.7.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "490cc448043f947bae3cbee9c203358d62dbee0db12107a74be5c30ccfd09771" -+ -+[[package]] -+name = "memchr" -+version = "2.3.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "3728d817d99e5ac407411fa471ff9800a778d88a24685968b36824eaf4bee400" -+ -+[[package]] -+name = "memoffset" -+version = "0.5.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c198b026e1bbf08a937e94c6c60f9ec4a2267f5b0d2eec9c1b21b061ce2be55f" -+dependencies = [ -+ "autocfg 1.0.0", -+] -+ -+[[package]] -+name = "migrations_internals" -+version = "1.4.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "2b4fc84e4af020b837029e017966f86a1c2d5e83e64b589963d5047525995860" -+dependencies = [ -+ "diesel", -+] -+ -+[[package]] -+name = "migrations_macros" -+version = "1.4.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9753f12909fd8d923f75ae5c3258cae1ed3c8ec052e1b38c93c21a6d157f789c" -+dependencies = [ -+ "migrations_internals", -+ "proc-macro2", -+ "quote", -+ "syn", -+] -+ -+[[package]] -+name = "mime" -+version = "0.3.16" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d" -+ -+[[package]] -+name = "mime_guess" -+version = "2.0.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "2684d4c2e97d99848d30b324b00c8fcc7e5c897b7cbb5819b09e7c90e8baf212" -+dependencies = [ -+ "mime", -+ "unicase", -+] -+ -+[[package]] -+name = "miniflux_api" -+version = "0.3.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "02199d30989a6e0346bbbfcbeb3aa1ee5cbc22f99021e6b469c9343307950793" -+dependencies = [ -+ "base64 0.12.3", -+ "dotenv", -+ "failure", -+ "log", -+ "reqwest", -+ "serde", -+ "serde_derive", -+ "serde_json", -+ "tokio", -+ "url", -+] -+ -+[[package]] -+name = "miniz_oxide" -+version = "0.3.7" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "791daaae1ed6889560f8c4359194f56648355540573244a5448a83ba1ecc7435" -+dependencies = [ -+ "adler32", -+] -+ -+[[package]] -+name = "miniz_oxide" -+version = "0.4.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "be0f75932c1f6cfae3c04000e40114adf955636e19040f9c0a2c380702aa1c7f" -+dependencies = [ -+ "adler", -+] -+ -+[[package]] -+name = "mio" -+version = "0.6.22" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "fce347092656428bc8eaf6201042cb551b8d67855af7374542a92a0fbfcac430" -+dependencies = [ -+ "cfg-if", -+ "fuchsia-zircon", -+ "fuchsia-zircon-sys", -+ "iovec", -+ "kernel32-sys", -+ "libc", -+ "log", -+ "miow", -+ "net2", -+ "slab", -+ "winapi 0.2.8", -+] -+ -+[[package]] -+name = "miow" -+version = "0.2.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8c1f2f3b1cf331de6896aabf6e9d55dca90356cc9960cca7eaaf408a355ae919" -+dependencies = [ -+ "kernel32-sys", -+ "net2", -+ "winapi 0.2.8", -+ "ws2_32-sys", -+] -+ -+[[package]] -+name = "native-tls" -+version = "0.2.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "2b0d88c06fe90d5ee94048ba40409ef1d9315d86f6f38c2efdaad4fb50c58b2d" -+dependencies = [ -+ "lazy_static", -+ "libc", -+ "log", -+ "openssl", -+ "openssl-probe", -+ "openssl-sys", -+ "schannel", -+ "security-framework", -+ "security-framework-sys", -+ "tempfile", -+] -+ -+[[package]] -+name = "net2" -+version = "0.2.34" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "2ba7c918ac76704fb42afcbbb43891e72731f3dcca3bef2a19786297baf14af7" -+dependencies = [ -+ "cfg-if", -+ "libc", -+ "winapi 0.3.9", -+] -+ -+[[package]] -+name = "new_debug_unreachable" -+version = "1.0.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e4a24736216ec316047a1fc4252e27dabb04218aa4a3f37c6e7ddbf1f9782b54" -+ -+[[package]] -+name = "news-flash" -+version = "1.0.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "61d283e47ad39a7958eb2ff9b6aa7a7a7496a8d2e907fc3abbe50d80bfab8fa1" -+dependencies = [ -+ "article_scraper", -+ "async-trait", -+ "base64 0.12.3", -+ "bitflags", -+ "chrono", -+ "diesel", -+ "diesel_migrations", -+ "escaper", -+ "failure", -+ "feed-rs", -+ "feedbin_api", -+ "feedly_api", -+ "fever_api", -+ "futures", -+ "hmac", -+ "image", -+ "itertools", -+ "lazy_static", -+ "libxml", -+ "log", -+ "magic-crypt", -+ "mime_guess", -+ "miniflux_api", -+ "obfstr", -+ "parking_lot 0.10.2", -+ "rayon", -+ "readability-fork", -+ "regex", -+ "reqwest", -+ "rust-embed", -+ "serde", -+ "serde_derive", -+ "serde_json", -+ "sha-1", -+ "sxd-document", -+ "tokio", -+ "url", -+] -+ -+[[package]] -+name = "news_flash_gtk" -+version = "0.0.0" -+dependencies = [ -+ "cairo-rs", -+ "chrono", -+ "color-backtrace", -+ "dirs 3.0.1", -+ "failure", -+ "feedly_api", -+ "futures", -+ "futures-util", -+ "gdk", -+ "gdk-pixbuf", -+ "gettext-rs", -+ "gio", -+ "glib", -+ "gtk", -+ "lazy_static", -+ "libhandy", -+ "log", -+ "log4rs", -+ "news-flash", -+ "num_cpus", -+ "open", -+ "pango", -+ "parking_lot 0.11.0", -+ "regex", -+ "reqwest", -+ "rust-embed", -+ "serde", -+ "serde_json", -+ "tokio", -+ "url", -+ "webkit2gtk", -+] -+ -+[[package]] -+name = "num-integer" -+version = "0.1.43" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8d59457e662d541ba17869cf51cf177c0b5f0cbf476c66bdc90bf1edac4f875b" -+dependencies = [ -+ "autocfg 1.0.0", -+ "num-traits", -+] -+ -+[[package]] -+name = "num-iter" -+version = "0.1.41" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7a6e6b7c748f995c4c29c5f5ae0248536e04a5739927c74ec0fa564805094b9f" -+dependencies = [ -+ "autocfg 1.0.0", -+ "num-integer", -+ "num-traits", -+] -+ -+[[package]] -+name = "num-rational" -+version = "0.3.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a5b4d7360f362cfb50dde8143501e6940b22f644be75a4cc90b2d81968908138" -+dependencies = [ -+ "autocfg 1.0.0", -+ "num-integer", -+ "num-traits", -+] -+ -+[[package]] -+name = "num-traits" -+version = "0.2.12" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ac267bcc07f48ee5f8935ab0d24f316fb722d7a1292e2913f0cc196b29ffd611" -+dependencies = [ -+ "autocfg 1.0.0", -+] -+ -+[[package]] -+name = "num_cpus" -+version = "1.13.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3" -+dependencies = [ -+ "hermit-abi", -+ "libc", -+] -+ -+[[package]] -+name = "obfstr" -+version = "0.1.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4fde677a726bbf8effc101af04b80e7c9464f5dc50fe28bc40c3d530facb899f" -+dependencies = [ -+ "obfstr-impl", -+] -+ -+[[package]] -+name = "obfstr-impl" -+version = "0.1.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d975ff8aca17dea6a5db9f740bc50f8741e9bf16d01d2f501dfc93ddd67e65e4" -+dependencies = [ -+ "rand 0.6.5", -+] -+ -+[[package]] -+name = "object" -+version = "0.20.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "1ab52be62400ca80aa00285d25253d7f7c437b7375c4de678f5405d3afe82ca5" -+ -+[[package]] -+name = "once_cell" -+version = "1.4.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "0b631f7e854af39a1739f401cf34a8a013dfe09eac4fa4dba91e9768bd28168d" -+ -+[[package]] -+name = "opaque-debug" -+version = "0.2.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "2839e79665f131bdb5782e51f2c6c9599c133c6098982a54c794358bf432529c" -+ -+[[package]] -+name = "opaque-debug" -+version = "0.3.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" -+ -+[[package]] -+name = "open" -+version = "1.4.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7c283bf0114efea9e42f1a60edea9859e8c47528eae09d01df4b29c1e489cc48" -+dependencies = [ -+ "winapi 0.3.9", -+] -+ -+[[package]] -+name = "openssl" -+version = "0.10.30" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8d575eff3665419f9b83678ff2815858ad9d11567e082f5ac1814baba4e2bcb4" -+dependencies = [ -+ "bitflags", -+ "cfg-if", -+ "foreign-types", -+ "lazy_static", -+ "libc", -+ "openssl-sys", -+] -+ -+[[package]] -+name = "openssl-probe" -+version = "0.1.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de" -+ -+[[package]] -+name = "openssl-sys" -+version = "0.9.58" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a842db4709b604f0fe5d1170ae3565899be2ad3d9cbc72dedc789ac0511f78de" -+dependencies = [ -+ "autocfg 1.0.0", -+ "cc", -+ "libc", -+ "pkg-config", -+ "vcpkg", -+] -+ -+[[package]] -+name = "ordered-float" -+version = "1.1.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "3741934be594d77de1c8461ebcbbe866f585ea616a9753aa78f2bdc69f0e4579" -+dependencies = [ -+ "num-traits", -+] -+ -+[[package]] -+name = "pango" -+version = "0.8.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "1e9c6b728f1be8edb5f9f981420b651d5ea30bdb9de89f1f1262d0084a020577" -+dependencies = [ -+ "bitflags", -+ "glib", -+ "glib-sys", -+ "gobject-sys", -+ "lazy_static", -+ "libc", -+ "pango-sys", -+] -+ -+[[package]] -+name = "pango-sys" -+version = "0.9.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "86b93d84907b3cf0819bff8f13598ba72843bee579d5ebc2502e4b0367b4be7d" -+dependencies = [ -+ "glib-sys", -+ "gobject-sys", -+ "libc", -+ "pkg-config", -+] -+ -+[[package]] -+name = "parking_lot" -+version = "0.10.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d3a704eb390aafdc107b0e392f56a82b668e3a71366993b5340f5833fd62505e" -+dependencies = [ -+ "lock_api 0.3.4", -+ "parking_lot_core 0.7.2", -+] -+ -+[[package]] -+name = "parking_lot" -+version = "0.11.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a4893845fa2ca272e647da5d0e46660a314ead9c2fdd9a883aabc32e481a8733" -+dependencies = [ -+ "instant", -+ "lock_api 0.4.1", -+ "parking_lot_core 0.8.0", -+] -+ -+[[package]] -+name = "parking_lot_core" -+version = "0.7.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d58c7c768d4ba344e3e8d72518ac13e259d7c7ade24167003b8488e10b6740a3" -+dependencies = [ -+ "cfg-if", -+ "cloudabi 0.0.3", -+ "libc", -+ "redox_syscall", -+ "smallvec", -+ "winapi 0.3.9", -+] -+ -+[[package]] -+name = "parking_lot_core" -+version = "0.8.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c361aa727dd08437f2f1447be8b59a33b0edd15e0fcee698f935613d9efbca9b" -+dependencies = [ -+ "cfg-if", -+ "cloudabi 0.1.0", -+ "instant", -+ "libc", -+ "redox_syscall", -+ "smallvec", -+ "winapi 0.3.9", -+] -+ -+[[package]] -+name = "percent-encoding" -+version = "2.1.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" -+ -+[[package]] -+name = "peresil" -+version = "0.3.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f658886ed52e196e850cfbbfddab9eaa7f6d90dd0929e264c31e5cec07e09e57" -+ -+[[package]] -+name = "phf" -+version = "0.7.24" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b3da44b85f8e8dfaec21adae67f95d93244b2ecf6ad2a692320598dcc8e6dd18" -+dependencies = [ -+ "phf_shared", -+] -+ -+[[package]] -+name = "phf_codegen" -+version = "0.7.24" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b03e85129e324ad4166b06b2c7491ae27fe3ec353af72e72cd1654c7225d517e" -+dependencies = [ -+ "phf_generator", -+ "phf_shared", -+] -+ -+[[package]] -+name = "phf_generator" -+version = "0.7.24" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "09364cc93c159b8b06b1f4dd8a4398984503483891b0c26b867cf431fb132662" -+dependencies = [ -+ "phf_shared", -+ "rand 0.6.5", -+] -+ -+[[package]] -+name = "phf_shared" -+version = "0.7.24" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "234f71a15de2288bcb7e3b6515828d22af7ec8598ee6d24c3b526fa0a80b67a0" -+dependencies = [ -+ "siphasher 0.2.3", -+] -+ -+[[package]] -+name = "pin-project" -+version = "0.4.22" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "12e3a6cdbfe94a5e4572812a0201f8c0ed98c1c452c7b8563ce2276988ef9c17" -+dependencies = [ -+ "pin-project-internal", -+] -+ -+[[package]] -+name = "pin-project-internal" -+version = "0.4.22" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "6a0ffd45cf79d88737d7cc85bfd5d2894bee1139b356e616fe85dc389c61aaf7" -+dependencies = [ -+ "proc-macro2", -+ "quote", -+ "syn", -+] -+ -+[[package]] -+name = "pin-project-lite" -+version = "0.1.7" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "282adbf10f2698a7a77f8e983a74b2d18176c19a7fd32a45446139ae7b02b715" -+ -+[[package]] -+name = "pin-utils" -+version = "0.1.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" -+ -+[[package]] -+name = "pkg-config" -+version = "0.3.18" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d36492546b6af1463394d46f0c834346f31548646f6ba10849802c9c9a27ac33" -+ -+[[package]] -+name = "png" -+version = "0.16.7" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "dfe7f9f1c730833200b134370e1d5098964231af8450bce9b78ee3ab5278b970" -+dependencies = [ -+ "bitflags", -+ "crc32fast", -+ "deflate", -+ "miniz_oxide 0.3.7", -+] -+ -+[[package]] -+name = "ppv-lite86" -+version = "0.2.8" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "237a5ed80e274dbc66f86bd59c1e25edc039660be53194b5fe0a482e0f2612ea" -+ -+[[package]] -+name = "precomputed-hash" -+version = "0.1.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" -+ -+[[package]] -+name = "proc-macro-hack" -+version = "0.5.16" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7e0456befd48169b9f13ef0f0ad46d492cf9d2dbb918bcf38e01eed4ce3ec5e4" -+ -+[[package]] -+name = "proc-macro-nested" -+version = "0.1.6" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "eba180dafb9038b050a4c280019bbedf9f2467b61e5d892dcad585bb57aadc5a" -+ -+[[package]] -+name = "proc-macro2" -+version = "1.0.19" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "04f5f085b5d71e2188cb8271e5da0161ad52c3f227a661a3c135fdf28e258b12" -+dependencies = [ -+ "unicode-xid", -+] -+ -+[[package]] -+name = "quick-error" -+version = "1.2.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" -+ -+[[package]] -+name = "quote" -+version = "1.0.7" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "aa563d17ecb180e500da1cfd2b028310ac758de548efdd203e18f283af693f37" -+dependencies = [ -+ "proc-macro2", -+] -+ -+[[package]] -+name = "r2d2" -+version = "0.8.9" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "545c5bc2b880973c9c10e4067418407a0ccaa3091781d1671d46eb35107cb26f" -+dependencies = [ -+ "log", -+ "parking_lot 0.11.0", -+ "scheduled-thread-pool", -+] -+ -+[[package]] -+name = "rand" -+version = "0.6.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "6d71dacdc3c88c1fde3885a3be3fbab9f35724e6ce99467f7d9c5026132184ca" -+dependencies = [ -+ "autocfg 0.1.7", -+ "libc", -+ "rand_chacha 0.1.1", -+ "rand_core 0.4.2", -+ "rand_hc 0.1.0", -+ "rand_isaac", -+ "rand_jitter", -+ "rand_os", -+ "rand_pcg", -+ "rand_xorshift", -+ "winapi 0.3.9", -+] -+ -+[[package]] -+name = "rand" -+version = "0.7.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" -+dependencies = [ -+ "getrandom", -+ "libc", -+ "rand_chacha 0.2.2", -+ "rand_core 0.5.1", -+ "rand_hc 0.2.0", -+] -+ -+[[package]] -+name = "rand_chacha" -+version = "0.1.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "556d3a1ca6600bfcbab7c7c91ccb085ac7fbbcd70e008a98742e7847f4f7bcef" -+dependencies = [ -+ "autocfg 0.1.7", -+ "rand_core 0.3.1", -+] -+ -+[[package]] -+name = "rand_chacha" -+version = "0.2.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" -+dependencies = [ -+ "ppv-lite86", -+ "rand_core 0.5.1", -+] -+ -+[[package]] -+name = "rand_core" -+version = "0.3.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b" -+dependencies = [ -+ "rand_core 0.4.2", -+] -+ -+[[package]] -+name = "rand_core" -+version = "0.4.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc" -+ -+[[package]] -+name = "rand_core" -+version = "0.5.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" -+dependencies = [ -+ "getrandom", -+] -+ -+[[package]] -+name = "rand_hc" -+version = "0.1.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7b40677c7be09ae76218dc623efbf7b18e34bced3f38883af07bb75630a21bc4" -+dependencies = [ -+ "rand_core 0.3.1", -+] -+ -+[[package]] -+name = "rand_hc" -+version = "0.2.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" -+dependencies = [ -+ "rand_core 0.5.1", -+] -+ -+[[package]] -+name = "rand_isaac" -+version = "0.1.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ded997c9d5f13925be2a6fd7e66bf1872597f759fd9dd93513dd7e92e5a5ee08" -+dependencies = [ -+ "rand_core 0.3.1", -+] -+ -+[[package]] -+name = "rand_jitter" -+version = "0.1.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "1166d5c91dc97b88d1decc3285bb0a99ed84b05cfd0bc2341bdf2d43fc41e39b" -+dependencies = [ -+ "libc", -+ "rand_core 0.4.2", -+ "winapi 0.3.9", -+] -+ -+[[package]] -+name = "rand_os" -+version = "0.1.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7b75f676a1e053fc562eafbb47838d67c84801e38fc1ba459e8f180deabd5071" -+dependencies = [ -+ "cloudabi 0.0.3", -+ "fuchsia-cprng", -+ "libc", -+ "rand_core 0.4.2", -+ "rdrand", -+ "winapi 0.3.9", -+] -+ -+[[package]] -+name = "rand_pcg" -+version = "0.1.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "abf9b09b01790cfe0364f52bf32995ea3c39f4d2dd011eac241d2914146d0b44" -+dependencies = [ -+ "autocfg 0.1.7", -+ "rand_core 0.4.2", -+] -+ -+[[package]] -+name = "rand_xorshift" -+version = "0.1.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "cbf7e9e623549b0e21f6e97cf8ecf247c1a8fd2e8a992ae265314300b2455d5c" -+dependencies = [ -+ "rand_core 0.3.1", -+] -+ -+[[package]] -+name = "rayon" -+version = "1.3.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "62f02856753d04e03e26929f820d0a0a337ebe71f849801eea335d464b349080" -+dependencies = [ -+ "autocfg 1.0.0", -+ "crossbeam-deque", -+ "either", -+ "rayon-core", -+] -+ -+[[package]] -+name = "rayon-core" -+version = "1.7.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e92e15d89083484e11353891f1af602cc661426deb9564c298b270c726973280" -+dependencies = [ -+ "crossbeam-deque", -+ "crossbeam-queue", -+ "crossbeam-utils", -+ "lazy_static", -+ "num_cpus", -+] -+ -+[[package]] -+name = "rdrand" -+version = "0.4.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2" -+dependencies = [ -+ "rand_core 0.3.1", -+] -+ -+[[package]] -+name = "readability-fork" -+version = "0.2.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f6ec2b0bd9b8bbab0eb27f1235e17e201ad31a2669bafe19e60924e11a113f42" -+dependencies = [ -+ "html5ever", -+ "lazy_static", -+ "regex", -+ "reqwest", -+ "url", -+] -+ -+[[package]] -+name = "redox_syscall" -+version = "0.1.57" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce" -+ -+[[package]] -+name = "redox_users" -+version = "0.3.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "09b23093265f8d200fa7b4c2c76297f47e681c655f6f1285a8780d6a022f7431" -+dependencies = [ -+ "getrandom", -+ "redox_syscall", -+ "rust-argon2", -+] -+ -+[[package]] -+name = "regex" -+version = "1.3.9" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9c3780fcf44b193bc4d09f36d2a3c87b251da4a046c87795a0d35f4f927ad8e6" -+dependencies = [ -+ "aho-corasick", -+ "memchr", -+ "regex-syntax", -+ "thread_local", -+] -+ -+[[package]] -+name = "regex-syntax" -+version = "0.6.18" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "26412eb97c6b088a6997e05f69403a802a92d520de2f8e63c2b65f9e0f47c4e8" -+ -+[[package]] -+name = "remove_dir_all" -+version = "0.5.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7" -+dependencies = [ -+ "winapi 0.3.9", -+] -+ -+[[package]] -+name = "reqwest" -+version = "0.10.6" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "3b82c9238b305f26f53443e3a4bc8528d64b8d0bee408ec949eb7bf5635ec680" -+dependencies = [ -+ "base64 0.12.3", -+ "bytes 0.5.6", -+ "encoding_rs", -+ "futures-core", -+ "futures-util", -+ "http", -+ "http-body", -+ "hyper", -+ "hyper-tls", -+ "js-sys", -+ "lazy_static", -+ "log", -+ "mime", -+ "mime_guess", -+ "native-tls", -+ "percent-encoding", -+ "pin-project-lite", -+ "serde", -+ "serde_json", -+ "serde_urlencoded", -+ "tokio", -+ "tokio-socks", -+ "tokio-tls", -+ "url", -+ "wasm-bindgen", -+ "wasm-bindgen-futures", -+ "web-sys", -+ "winreg", -+] -+ -+[[package]] -+name = "rust-argon2" -+version = "0.7.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "2bc8af4bda8e1ff4932523b94d3dd20ee30a87232323eda55903ffd71d2fb017" -+dependencies = [ -+ "base64 0.11.0", -+ "blake2b_simd", -+ "constant_time_eq", -+ "crossbeam-utils", -+] -+ -+[[package]] -+name = "rust-embed" -+version = "5.6.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "213acf1bc5a6dfcd70b62db1e9a7d06325c0e73439c312fcb8599d456d9686ee" -+dependencies = [ -+ "rust-embed-impl", -+ "rust-embed-utils", -+ "walkdir", -+] -+ -+[[package]] -+name = "rust-embed-impl" -+version = "5.6.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7903c2cf599db8f310b392332f38367ca4acc84420fa1aee3536299f433c10d5" -+dependencies = [ -+ "quote", -+ "rust-embed-utils", -+ "shellexpand", -+ "syn", -+ "walkdir", -+] -+ -+[[package]] -+name = "rust-embed-utils" -+version = "5.0.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "97655158074ccb2d2cfb1ccb4c956ef0f4054e43a2c1e71146d4991e6961e105" -+dependencies = [ -+ "walkdir", -+] -+ -+[[package]] -+name = "rustc-demangle" -+version = "0.1.16" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4c691c0e608126e00913e33f0ccf3727d5fc84573623b8d65b2df340b5201783" -+ -+[[package]] -+name = "ryu" -+version = "1.0.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e" -+ -+[[package]] -+name = "same-file" -+version = "1.0.6" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" -+dependencies = [ -+ "winapi-util", -+] -+ -+[[package]] -+name = "schannel" -+version = "0.1.19" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8f05ba609c234e60bee0d547fe94a4c7e9da733d1c962cf6e59efa4cd9c8bc75" -+dependencies = [ -+ "lazy_static", -+ "winapi 0.3.9", -+] -+ -+[[package]] -+name = "scheduled-thread-pool" -+version = "0.2.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "dc6f74fd1204073fa02d5d5d68bec8021be4c38690b61264b2fdb48083d0e7d7" -+dependencies = [ -+ "parking_lot 0.11.0", -+] -+ -+[[package]] -+name = "scoped_threadpool" -+version = "0.1.9" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "1d51f5df5af43ab3f1360b429fa5e0152ac5ce8c0bd6485cae490332e96846a8" -+ -+[[package]] -+name = "scopeguard" -+version = "1.1.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" -+ -+[[package]] -+name = "security-framework" -+version = "0.4.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "64808902d7d99f78eaddd2b4e2509713babc3dc3c85ad6f4c447680f3c01e535" -+dependencies = [ -+ "bitflags", -+ "core-foundation", -+ "core-foundation-sys", -+ "libc", -+ "security-framework-sys", -+] -+ -+[[package]] -+name = "security-framework-sys" -+version = "0.4.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "17bf11d99252f512695eb468de5516e5cf75455521e69dfe343f3b74e4748405" -+dependencies = [ -+ "core-foundation-sys", -+ "libc", -+] -+ -+[[package]] -+name = "serde" -+version = "1.0.114" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5317f7588f0a5078ee60ef675ef96735a1442132dc645eb1d12c018620ed8cd3" -+dependencies = [ -+ "serde_derive", -+] -+ -+[[package]] -+name = "serde-value" -+version = "0.6.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5a65a7291a8a568adcae4c10a677ebcedbc6c9cec91c054dee2ce40b0e3290eb" -+dependencies = [ -+ "ordered-float", -+ "serde", -+] -+ -+[[package]] -+name = "serde_derive" -+version = "1.0.114" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "2a0be94b04690fbaed37cddffc5c134bf537c8e3329d53e982fe04c374978f8e" -+dependencies = [ -+ "proc-macro2", -+ "quote", -+ "syn", -+] -+ -+[[package]] -+name = "serde_json" -+version = "1.0.56" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "3433e879a558dde8b5e8feb2a04899cf34fdde1fafb894687e52105fc1162ac3" -+dependencies = [ -+ "itoa", -+ "ryu", -+ "serde", -+] -+ -+[[package]] -+name = "serde_urlencoded" -+version = "0.6.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9ec5d77e2d4c73717816afac02670d5c4f534ea95ed430442cad02e7a6e32c97" -+dependencies = [ -+ "dtoa", -+ "itoa", -+ "serde", -+ "url", -+] -+ -+[[package]] -+name = "serde_yaml" -+version = "0.8.13" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ae3e2dd40a7cdc18ca80db804b7f461a39bb721160a85c9a1fa30134bf3c02a5" -+dependencies = [ -+ "dtoa", -+ "linked-hash-map", -+ "serde", -+ "yaml-rust", -+] -+ -+[[package]] -+name = "sha-1" -+version = "0.9.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "170a36ea86c864a3f16dd2687712dd6646f7019f301e57537c7f4dc9f5916770" -+dependencies = [ -+ "block-buffer 0.9.0", -+ "cfg-if", -+ "cpuid-bool", -+ "digest 0.9.0", -+ "opaque-debug 0.3.0", -+] -+ -+[[package]] -+name = "sha2" -+version = "0.9.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "2933378ddfeda7ea26f48c555bdad8bb446bf8a3d17832dc83e380d444cfb8c1" -+dependencies = [ -+ "block-buffer 0.9.0", -+ "cfg-if", -+ "cpuid-bool", -+ "digest 0.9.0", -+ "opaque-debug 0.3.0", -+] -+ -+[[package]] -+name = "shellexpand" -+version = "2.0.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9a2b22262a9aaf9464d356f656fea420634f78c881c5eebd5ef5e66d8b9bc603" -+dependencies = [ -+ "dirs 2.0.2", -+] -+ -+[[package]] -+name = "siphasher" -+version = "0.2.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "0b8de496cf83d4ed58b6be86c3a275b8602f6ffe98d3024a869e124147a9a3ac" -+ -+[[package]] -+name = "siphasher" -+version = "0.3.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "fa8f3741c7372e75519bd9346068370c9cdaabcc1f9599cbcf2a2719352286b7" -+ -+[[package]] -+name = "slab" -+version = "0.4.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8" -+ -+[[package]] -+name = "smallvec" -+version = "1.4.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "3757cb9d89161a2f24e1cf78efa0c1fcff485d18e3f55e0aa3480824ddaa0f3f" -+ -+[[package]] -+name = "socket2" -+version = "0.3.12" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "03088793f677dce356f3ccc2edb1b314ad191ab702a5de3faf49304f7e104918" -+dependencies = [ -+ "cfg-if", -+ "libc", -+ "redox_syscall", -+ "winapi 0.3.9", -+] -+ -+[[package]] -+name = "soup-sys" -+version = "0.9.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "48a2f246b51c81d4baa1ce611240c2f6e0323ae75f3b6cc9d2d2911e0567962c" -+dependencies = [ -+ "bitflags", -+ "gio-sys", -+ "glib-sys", -+ "gobject-sys", -+ "libc", -+ "pkg-config", -+] -+ -+[[package]] -+name = "string_cache" -+version = "0.7.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "89c058a82f9fd69b1becf8c274f412281038877c553182f1d02eb027045a2d67" -+dependencies = [ -+ "lazy_static", -+ "new_debug_unreachable", -+ "phf_shared", -+ "precomputed-hash", -+ "serde", -+ "string_cache_codegen", -+ "string_cache_shared", -+] -+ -+[[package]] -+name = "string_cache_codegen" -+version = "0.4.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f0f45ed1b65bf9a4bf2f7b7dc59212d1926e9eaf00fa998988e420fd124467c6" -+dependencies = [ -+ "phf_generator", -+ "phf_shared", -+ "proc-macro2", -+ "quote", -+ "string_cache_shared", -+] -+ -+[[package]] -+name = "string_cache_shared" -+version = "0.3.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b1884d1bc09741d466d9b14e6d37ac89d6909cbcac41dd9ae982d4d063bbedfc" -+ -+[[package]] -+name = "subtle" -+version = "2.2.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "502d53007c02d7605a05df1c1a73ee436952781653da5d0bf57ad608f66932c1" -+ -+[[package]] -+name = "sxd-document" -+version = "0.3.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "94d82f37be9faf1b10a82c4bd492b74f698e40082f0f40de38ab275f31d42078" -+dependencies = [ -+ "peresil", -+ "typed-arena", -+] -+ -+[[package]] -+name = "syn" -+version = "1.0.35" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "fb7f4c519df8c117855e19dd8cc851e89eb746fe7a73f0157e0d95fdec5369b0" -+dependencies = [ -+ "proc-macro2", -+ "quote", -+ "unicode-xid", -+] -+ -+[[package]] -+name = "synstructure" -+version = "0.12.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b834f2d66f734cb897113e34aaff2f1ab4719ca946f9a7358dba8f8064148701" -+dependencies = [ -+ "proc-macro2", -+ "quote", -+ "syn", -+ "unicode-xid", -+] -+ -+[[package]] -+name = "tempfile" -+version = "3.1.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9" -+dependencies = [ -+ "cfg-if", -+ "libc", -+ "rand 0.7.3", -+ "redox_syscall", -+ "remove_dir_all", -+ "winapi 0.3.9", -+] -+ -+[[package]] -+name = "tendril" -+version = "0.4.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "707feda9f2582d5d680d733e38755547a3e8fb471e7ba11452ecfd9ce93a5d3b" -+dependencies = [ -+ "futf", -+ "mac", -+ "utf-8", -+] -+ -+[[package]] -+name = "termcolor" -+version = "1.1.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "bb6bfa289a4d7c5766392812c0a1f4c1ba45afa1ad47803c11e1f407d846d75f" -+dependencies = [ -+ "winapi-util", -+] -+ -+[[package]] -+name = "thiserror" -+version = "1.0.20" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7dfdd070ccd8ccb78f4ad66bf1982dc37f620ef696c6b5028fe2ed83dd3d0d08" -+dependencies = [ -+ "thiserror-impl", -+] -+ -+[[package]] -+name = "thiserror-impl" -+version = "1.0.20" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "bd80fc12f73063ac132ac92aceea36734f04a1d93c1240c6944e23a3b8841793" -+dependencies = [ -+ "proc-macro2", -+ "quote", -+ "syn", -+] -+ -+[[package]] -+name = "thread-id" -+version = "3.3.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c7fbf4c9d56b320106cd64fd024dadfa0be7cb4706725fc44a7d7ce952d820c1" -+dependencies = [ -+ "libc", -+ "redox_syscall", -+ "winapi 0.3.9", -+] -+ -+[[package]] -+name = "thread_local" -+version = "1.0.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d40c6d1b69745a6ec6fb1ca717914848da4b44ae29d9b3080cbee91d72a69b14" -+dependencies = [ -+ "lazy_static", -+] -+ -+[[package]] -+name = "tiff" -+version = "0.5.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "3f3b8a87c4da944c3f27e5943289171ac71a6150a79ff6bacfff06d159dfff2f" -+dependencies = [ -+ "byteorder", -+ "lzw", -+ "miniz_oxide 0.3.7", -+] -+ -+[[package]] -+name = "tiger-digest" -+version = "0.1.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "68067e91b4b9bb2e1ce3dc55077c984bbe2fa2be65308264dab403c165257545" -+dependencies = [ -+ "block-buffer 0.5.1", -+ "byte-tools 0.2.0", -+ "digest 0.7.6", -+] -+ -+[[package]] -+name = "time" -+version = "0.1.43" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ca8a50ef2360fbd1eeb0ecd46795a87a19024eb4b53c5dc916ca1fd95fe62438" -+dependencies = [ -+ "libc", -+ "winapi 0.3.9", -+] -+ -+[[package]] -+name = "tinyvec" -+version = "0.3.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "53953d2d3a5ad81d9f844a32f14ebb121f50b650cd59d0ee2a07cf13c617efed" -+ -+[[package]] -+name = "tokio" -+version = "0.2.21" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d099fa27b9702bed751524694adbe393e18b36b204da91eb1cbbbbb4a5ee2d58" -+dependencies = [ -+ "bytes 0.5.6", -+ "fnv", -+ "futures-core", -+ "iovec", -+ "lazy_static", -+ "memchr", -+ "mio", -+ "pin-project-lite", -+ "slab", -+ "tokio-macros", -+] -+ -+[[package]] -+name = "tokio-macros" -+version = "0.2.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f0c3acc6aa564495a0f2e1d59fab677cd7f81a19994cfc7f3ad0e64301560389" -+dependencies = [ -+ "proc-macro2", -+ "quote", -+ "syn", -+] -+ -+[[package]] -+name = "tokio-socks" -+version = "0.2.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "1997788a0e25e09300e44680ba1ef9d44d6f634a883641f80109e8b59c928daf" -+dependencies = [ -+ "bytes 0.4.12", -+ "either", -+ "futures", -+ "thiserror", -+ "tokio", -+] -+ -+[[package]] -+name = "tokio-tls" -+version = "0.3.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9a70f4fcd7b3b24fb194f837560168208f669ca8cb70d0c4b862944452396343" -+dependencies = [ -+ "native-tls", -+ "tokio", -+] -+ -+[[package]] -+name = "tokio-util" -+version = "0.3.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "be8242891f2b6cbef26a2d7e8605133c2c554cd35b3e4948ea892d6d68436499" -+dependencies = [ -+ "bytes 0.5.6", -+ "futures-core", -+ "futures-sink", -+ "log", -+ "pin-project-lite", -+ "tokio", -+] -+ -+[[package]] -+name = "tower-service" -+version = "0.3.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e987b6bf443f4b5b3b6f38704195592cca41c5bb7aedd3c3693c7081f8289860" -+ -+[[package]] -+name = "tracing" -+version = "0.1.16" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c2e2a2de6b0d5cbb13fc21193a2296888eaab62b6044479aafb3c54c01c29fcd" -+dependencies = [ -+ "cfg-if", -+ "log", -+ "tracing-core", -+] -+ -+[[package]] -+name = "tracing-core" -+version = "0.1.11" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "94ae75f0d28ae10786f3b1895c55fe72e79928fd5ccdebb5438c75e93fec178f" -+dependencies = [ -+ "lazy_static", -+] -+ -+[[package]] -+name = "traitobject" -+version = "0.1.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "efd1f82c56340fdf16f2a953d7bda4f8fdffba13d93b00844c25572110b26079" -+ -+[[package]] -+name = "try-lock" -+version = "0.2.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" -+ -+[[package]] -+name = "typed-arena" -+version = "1.7.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a9b2228007eba4120145f785df0f6c92ea538f5a3635a612ecf4e334c8c1446d" -+ -+[[package]] -+name = "typemap" -+version = "0.3.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "653be63c80a3296da5551e1bfd2cca35227e13cdd08c6668903ae2f4f77aa1f6" -+dependencies = [ -+ "unsafe-any", -+] -+ -+[[package]] -+name = "typenum" -+version = "1.12.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "373c8a200f9e67a0c95e62a4f52fbf80c23b4381c05a17845531982fa99e6b33" -+ -+[[package]] -+name = "unicase" -+version = "2.6.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6" -+dependencies = [ -+ "version_check", -+] -+ -+[[package]] -+name = "unicode-bidi" -+version = "0.3.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5" -+dependencies = [ -+ "matches", -+] -+ -+[[package]] -+name = "unicode-normalization" -+version = "0.1.13" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "6fb19cf769fa8c6a80a162df694621ebeb4dafb606470b2b2fce0be40a98a977" -+dependencies = [ -+ "tinyvec", -+] -+ -+[[package]] -+name = "unicode-xid" -+version = "0.2.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564" -+ -+[[package]] -+name = "unsafe-any" -+version = "0.4.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f30360d7979f5e9c6e6cea48af192ea8fab4afb3cf72597154b8f08935bc9c7f" -+dependencies = [ -+ "traitobject", -+] -+ -+[[package]] -+name = "url" -+version = "2.1.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "829d4a8476c35c9bf0bbce5a3b23f4106f79728039b726d292bb93bc106787cb" -+dependencies = [ -+ "idna", -+ "matches", -+ "percent-encoding", -+] -+ -+[[package]] -+name = "utf-8" -+version = "0.7.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "05e42f7c18b8f902290b009cde6d651262f956c98bc51bca4cd1d511c9cd85c7" -+ -+[[package]] -+name = "uuid" -+version = "0.8.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9fde2f6a4bea1d6e007c4ad38c6839fa71cbb63b6dbf5b595aa38dc9b1093c11" -+dependencies = [ -+ "rand 0.7.3", -+] -+ -+[[package]] -+name = "vcpkg" -+version = "0.2.10" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "6454029bf181f092ad1b853286f23e2c507d8e8194d01d92da4a55c274a5508c" -+ -+[[package]] -+name = "version_check" -+version = "0.9.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b5a972e5669d67ba988ce3dc826706fb0a8b01471c088cb0b6110b805cc36aed" -+ -+[[package]] -+name = "walkdir" -+version = "2.3.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "777182bc735b6424e1a57516d35ed72cb8019d85c8c9bf536dccb3445c1a2f7d" -+dependencies = [ -+ "same-file", -+ "winapi 0.3.9", -+ "winapi-util", -+] -+ -+[[package]] -+name = "want" -+version = "0.3.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "1ce8a968cb1cd110d136ff8b819a556d6fb6d919363c61534f6860c7eb172ba0" -+dependencies = [ -+ "log", -+ "try-lock", -+] -+ -+[[package]] -+name = "wasi" -+version = "0.9.0+wasi-snapshot-preview1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" -+ -+[[package]] -+name = "wasm-bindgen" -+version = "0.2.65" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f3edbcc9536ab7eababcc6d2374a0b7bfe13a2b6d562c5e07f370456b1a8f33d" -+dependencies = [ -+ "cfg-if", -+ "serde", -+ "serde_json", -+ "wasm-bindgen-macro", -+] -+ -+[[package]] -+name = "wasm-bindgen-backend" -+version = "0.2.65" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "89ed2fb8c84bfad20ea66b26a3743f3e7ba8735a69fe7d95118c33ec8fc1244d" -+dependencies = [ -+ "bumpalo", -+ "lazy_static", -+ "log", -+ "proc-macro2", -+ "quote", -+ "syn", -+ "wasm-bindgen-shared", -+] -+ -+[[package]] -+name = "wasm-bindgen-futures" -+version = "0.4.15" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "41ad6e4e8b2b7f8c90b6e09a9b590ea15cb0d1dbe28502b5a405cd95d1981671" -+dependencies = [ -+ "cfg-if", -+ "js-sys", -+ "wasm-bindgen", -+ "web-sys", -+] -+ -+[[package]] -+name = "wasm-bindgen-macro" -+version = "0.2.65" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "eb071268b031a64d92fc6cf691715ca5a40950694d8f683c5bb43db7c730929e" -+dependencies = [ -+ "quote", -+ "wasm-bindgen-macro-support", -+] -+ -+[[package]] -+name = "wasm-bindgen-macro-support" -+version = "0.2.65" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "cf592c807080719d1ff2f245a687cbadb3ed28b2077ed7084b47aba8b691f2c6" -+dependencies = [ -+ "proc-macro2", -+ "quote", -+ "syn", -+ "wasm-bindgen-backend", -+ "wasm-bindgen-shared", -+] -+ -+[[package]] -+name = "wasm-bindgen-shared" -+version = "0.2.65" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "72b6c0220ded549d63860c78c38f3bcc558d1ca3f4efa74942c536ddbbb55e87" -+ -+[[package]] -+name = "web-sys" -+version = "0.3.42" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8be2398f326b7ba09815d0b403095f34dd708579220d099caae89be0b32137b2" -+dependencies = [ -+ "js-sys", -+ "wasm-bindgen", -+] -+ -+[[package]] -+name = "webkit2gtk" -+version = "0.9.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "af1de552309714f28c3242b0084f6cdcab4a8d19de849505202c49e7cfdf57a9" -+dependencies = [ -+ "bitflags", -+ "cairo-rs", -+ "gdk", -+ "gdk-sys", -+ "gio", -+ "gio-sys", -+ "glib", -+ "glib-sys", -+ "gobject-sys", -+ "gtk", -+ "gtk-sys", -+ "javascriptcore-rs", -+ "libc", -+ "webkit2gtk-sys", -+] -+ -+[[package]] -+name = "webkit2gtk-sys" -+version = "0.11.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7ed60661b81f0cc92f3c2043d83262e3a1ac253b08a616550a9fc008ae28c185" -+dependencies = [ -+ "atk-sys", -+ "bitflags", -+ "cairo-sys-rs", -+ "gdk-pixbuf-sys", -+ "gdk-sys", -+ "gio-sys", -+ "glib-sys", -+ "gobject-sys", -+ "gtk-sys", -+ "javascriptcore-rs-sys", -+ "libc", -+ "pango-sys", -+ "pkg-config", -+ "soup-sys", -+] -+ -+[[package]] -+name = "winapi" -+version = "0.2.8" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a" -+ -+[[package]] -+name = "winapi" -+version = "0.3.9" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" -+dependencies = [ -+ "winapi-i686-pc-windows-gnu", -+ "winapi-x86_64-pc-windows-gnu", -+] -+ -+[[package]] -+name = "winapi-build" -+version = "0.1.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc" -+ -+[[package]] -+name = "winapi-i686-pc-windows-gnu" -+version = "0.4.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" -+ -+[[package]] -+name = "winapi-util" -+version = "0.1.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" -+dependencies = [ -+ "winapi 0.3.9", -+] -+ -+[[package]] -+name = "winapi-x86_64-pc-windows-gnu" -+version = "0.4.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" -+ -+[[package]] -+name = "winreg" -+version = "0.7.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "0120db82e8a1e0b9fb3345a539c478767c0048d842860994d96113d5b667bd69" -+dependencies = [ -+ "winapi 0.3.9", -+] -+ -+[[package]] -+name = "ws2_32-sys" -+version = "0.2.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e" -+dependencies = [ -+ "winapi 0.2.8", -+ "winapi-build", -+] -+ -+[[package]] -+name = "xml-rs" -+version = "0.8.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b07db065a5cf61a7e4ba64f29e67db906fb1787316516c4e6e5ff0fea1efcd8a" -+ -+[[package]] -+name = "yaml-rust" -+version = "0.4.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "39f0c922f1a334134dc2f7a8b67dc5d25f0735263feec974345ff706bcf20b0d" -+dependencies = [ -+ "linked-hash-map", -+] diff --git a/pkgs/applications/networking/feedreaders/newsflash/default.nix b/pkgs/applications/networking/feedreaders/newsflash/default.nix index 3023ca28bfe35..92af28c9c93be 100644 --- a/pkgs/applications/networking/feedreaders/newsflash/default.nix +++ b/pkgs/applications/networking/feedreaders/newsflash/default.nix @@ -1,37 +1,34 @@ { lib , rustPlatform , fetchFromGitLab -, gdk-pixbuf -, glib , meson , ninja , pkg-config , wrapGAppsHook -, gsettings-desktop-schemas +, gdk-pixbuf +, glib , gtk3 , libhandy -, librsvg , openssl , sqlite , webkitgtk +, glib-networking +, librsvg +, gst_all_1 }: rustPlatform.buildRustPackage rec { pname = "newsflash"; - version = "1.0.1"; + version = "1.0.2"; src = fetchFromGitLab { owner = "news-flash"; repo = "news_flash_gtk"; rev = version; - sha256 = "1y2jj3z08m29s6ggl8q270mqnvdwibs0f2kxybqhi8mya5pyw902"; + sha256 = "17a8fd5rhs56qrqlfj9ckv45hwfcjhdb8j4cxlnvy7s770s225gd"; }; - cargoPatches = [ - ./cargo.lock.patch - ]; - - cargoSha256 = "0z3nhzpyckga112wn32zzwwlpqdgi6n53n8nwgggixvpbnh98112"; + cargoSha256 = "1p0m7la59fn9r2rr26q9mfd1nvyvxb630qiwj96x91p77xv1i30i"; patches = [ ./no-post-install.patch @@ -43,25 +40,37 @@ rustPlatform.buildRustPackage rec { ''; nativeBuildInputs = [ - gdk-pixbuf # provides setup hook to fix "Unrecognized image file format" - glib # provides glib-compile-resources to compile gresources meson ninja pkg-config wrapGAppsHook - ]; - buildInputs = [ + # Provides setup hook to fix "Unrecognized image file format" gdk-pixbuf + + # Provides glib-compile-resources to compile gresources glib - gsettings-desktop-schemas # used to get system default font in src/article_view/mod.rs + ]; + + buildInputs = [ gtk3 libhandy - librsvg # used by gdk-pixbuf & wrapGAppsHook setup hooks to fix "Unrecognized image file format" openssl sqlite webkitgtk - ]; + + # TLS support for loading external content in webkitgtk WebView + glib-networking + + # SVG support for gdk-pixbuf + librsvg + ] ++ (with gst_all_1; [ + # Audio & video & support for webkitgtk WebView + gstreamer + gst-plugins-base + gst-plugins-good + gst-plugins-bad + ]); # Unset default rust phases to use meson & ninja instead configurePhase = null; diff --git a/pkgs/applications/networking/ftp/taxi/default.nix b/pkgs/applications/networking/ftp/taxi/default.nix index b6c8a534545bd..c629a8a07cd8e 100644 --- a/pkgs/applications/networking/ftp/taxi/default.nix +++ b/pkgs/applications/networking/ftp/taxi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, ninja, python3, vala +{ stdenv, fetchFromGitHub, nix-update-script, pantheon, pkgconfig, meson, ninja, python3, vala , gtk3, libgee, libsoup, libsecret, gobject-introspection, wrapGAppsHook }: stdenv.mkDerivation rec { @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = pantheon.updateScript { + updateScript = nix-update-script { attrPath = pname; }; }; diff --git a/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json b/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json index 0a0983af0000a..074dcc0fdb7c5 100644 --- a/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json +++ b/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json @@ -1,8 +1,8 @@ { "name": "element-desktop", - "productName": "Element (Riot)", + "productName": "Element", "main": "src/electron-main.js", - "version": "1.7.1", + "version": "1.7.2", "description": "A feature-rich client for Matrix.org", "author": "Element", "repository": { @@ -42,13 +42,14 @@ "electron-builder-squirrel-windows": "^22.7.0", "electron-devtools-installer": "^2.2.4", "electron-notarize": "^0.2.0", - "eslint": "^5.8.0", + "eslint": "7.3.1", "eslint-config-google": "^0.7.1", + "eslint-config-matrix-org": "^0.1.2", "eslint-plugin-babel": "^4.1.2", "find-npm-prefix": "^1.0.2", "fs-extra": "^8.1.0", "glob": "^7.1.6", - "matrix-js-sdk": "7.1.0", + "matrix-js-sdk": "8.0.0", "mkdirp": "^1.0.3", "needle": "^2.5.0", "node-pre-gyp": "^0.15.0", diff --git a/pkgs/applications/networking/instant-messengers/element/element-desktop-yarndeps.nix b/pkgs/applications/networking/instant-messengers/element/element-desktop-yarndeps.nix index d46c1445ec3d9..f9596f3a098c9 100644 --- a/pkgs/applications/networking/instant-messengers/element/element-desktop-yarndeps.nix +++ b/pkgs/applications/networking/instant-messengers/element/element-desktop-yarndeps.nix @@ -26,6 +26,54 @@ }; } { + name = "_babel_code_frame___code_frame_7.10.4.tgz"; + path = fetchurl { + name = "_babel_code_frame___code_frame_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.10.4.tgz"; + sha1 = "168da1a36e90da68ae8d49c0f1b48c7c6249213a"; + }; + } + { + name = "_babel_generator___generator_7.10.5.tgz"; + path = fetchurl { + name = "_babel_generator___generator_7.10.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/generator/-/generator-7.10.5.tgz"; + sha1 = "1b903554bc8c583ee8d25f1e8969732e6b829a69"; + }; + } + { + name = "_babel_helper_function_name___helper_function_name_7.10.4.tgz"; + path = fetchurl { + name = "_babel_helper_function_name___helper_function_name_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.10.4.tgz"; + sha1 = "d2d3b20c59ad8c47112fa7d2a94bc09d5ef82f1a"; + }; + } + { + name = "_babel_helper_get_function_arity___helper_get_function_arity_7.10.4.tgz"; + path = fetchurl { + name = "_babel_helper_get_function_arity___helper_get_function_arity_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.4.tgz"; + sha1 = "98c1cbea0e2332f33f9a4661b8ce1505b2c19ba2"; + }; + } + { + name = "_babel_helper_split_export_declaration___helper_split_export_declaration_7.10.4.tgz"; + path = fetchurl { + name = "_babel_helper_split_export_declaration___helper_split_export_declaration_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.10.4.tgz"; + sha1 = "2c70576eaa3b5609b24cb99db2888cc3fc4251d1"; + }; + } + { + name = "_babel_helper_validator_identifier___helper_validator_identifier_7.10.4.tgz"; + path = fetchurl { + name = "_babel_helper_validator_identifier___helper_validator_identifier_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz"; + sha1 = "a78c7a7251e01f616512d31b10adcf52ada5e0d2"; + }; + } + { name = "_babel_highlight___highlight_7.5.0.tgz"; path = fetchurl { name = "_babel_highlight___highlight_7.5.0.tgz"; @@ -34,6 +82,22 @@ }; } { + name = "_babel_highlight___highlight_7.10.4.tgz"; + path = fetchurl { + name = "_babel_highlight___highlight_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.10.4.tgz"; + sha1 = "7d1bdfd65753538fabe6c38596cdb76d9ac60143"; + }; + } + { + name = "_babel_parser___parser_7.10.5.tgz"; + path = fetchurl { + name = "_babel_parser___parser_7.10.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/parser/-/parser-7.10.5.tgz"; + sha1 = "e7c6bf5a7deff957cec9f04b551e2762909d826b"; + }; + } + { name = "_babel_runtime___runtime_7.9.2.tgz"; path = fetchurl { name = "_babel_runtime___runtime_7.9.2.tgz"; @@ -42,6 +106,30 @@ }; } { + name = "_babel_template___template_7.10.4.tgz"; + path = fetchurl { + name = "_babel_template___template_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/template/-/template-7.10.4.tgz"; + sha1 = "3251996c4200ebc71d1a8fc405fba940f36ba278"; + }; + } + { + name = "_babel_traverse___traverse_7.10.5.tgz"; + path = fetchurl { + name = "_babel_traverse___traverse_7.10.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.10.5.tgz"; + sha1 = "77ce464f5b258be265af618d8fddf0536f20b564"; + }; + } + { + name = "_babel_types___types_7.10.5.tgz"; + path = fetchurl { + name = "_babel_types___types_7.10.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/types/-/types-7.10.5.tgz"; + sha1 = "d88ae7e2fde86bfbfe851d4d81afa70a997b5d15"; + }; + } + { name = "_develar_schema_utils___schema_utils_2.6.5.tgz"; path = fetchurl { name = "_develar_schema_utils___schema_utils_2.6.5.tgz"; @@ -90,6 +178,14 @@ }; } { + name = "_types_eslint_visitor_keys___eslint_visitor_keys_1.0.0.tgz"; + path = fetchurl { + name = "_types_eslint_visitor_keys___eslint_visitor_keys_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/@types/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz"; + sha1 = "1ee30d79544ca84d68d4b3cdb0af4f205663dd2d"; + }; + } + { name = "_types_fs_extra___fs_extra_9.0.1.tgz"; path = fetchurl { name = "_types_fs_extra___fs_extra_9.0.1.tgz"; @@ -98,6 +194,22 @@ }; } { + name = "_types_json_schema___json_schema_7.0.5.tgz"; + path = fetchurl { + name = "_types_json_schema___json_schema_7.0.5.tgz"; + url = "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.5.tgz"; + sha1 = "dcce4430e64b443ba8945f0290fb564ad5bac6dd"; + }; + } + { + name = "_types_json5___json5_0.0.29.tgz"; + path = fetchurl { + name = "_types_json5___json5_0.0.29.tgz"; + url = "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz"; + sha1 = "ee28707ae94e11d2b827bcbe5270bcea7f3e71ee"; + }; + } + { name = "_types_node___node_13.7.1.tgz"; path = fetchurl { name = "_types_node___node_13.7.1.tgz"; @@ -130,6 +242,54 @@ }; } { + name = "_typescript_eslint_eslint_plugin___eslint_plugin_3.7.0.tgz"; + path = fetchurl { + name = "_typescript_eslint_eslint_plugin___eslint_plugin_3.7.0.tgz"; + url = "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-3.7.0.tgz"; + sha1 = "0f91aa3c83d019591719e597fbdb73a59595a263"; + }; + } + { + name = "_typescript_eslint_experimental_utils___experimental_utils_3.7.0.tgz"; + path = fetchurl { + name = "_typescript_eslint_experimental_utils___experimental_utils_3.7.0.tgz"; + url = "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-3.7.0.tgz"; + sha1 = "0ee21f6c48b2b30c63211da23827725078d5169a"; + }; + } + { + name = "_typescript_eslint_parser___parser_3.7.0.tgz"; + path = fetchurl { + name = "_typescript_eslint_parser___parser_3.7.0.tgz"; + url = "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-3.7.0.tgz"; + sha1 = "3e9cd9df9ea644536feb6e5acdb8279ecff96ce9"; + }; + } + { + name = "_typescript_eslint_types___types_3.7.0.tgz"; + path = fetchurl { + name = "_typescript_eslint_types___types_3.7.0.tgz"; + url = "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-3.7.0.tgz"; + sha1 = "09897fab0cb95479c01166b10b2c03c224821077"; + }; + } + { + name = "_typescript_eslint_typescript_estree___typescript_estree_3.7.0.tgz"; + path = fetchurl { + name = "_typescript_eslint_typescript_estree___typescript_estree_3.7.0.tgz"; + url = "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-3.7.0.tgz"; + sha1 = "66872e6da120caa4b64e6b4ca5c8702afc74738d"; + }; + } + { + name = "_typescript_eslint_visitor_keys___visitor_keys_3.7.0.tgz"; + path = fetchurl { + name = "_typescript_eslint_visitor_keys___visitor_keys_3.7.0.tgz"; + url = "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-3.7.0.tgz"; + sha1 = "ac0417d382a136e4571a0b0dcfe52088cb628177"; + }; + } + { name = "JSONStream___JSONStream_1.3.5.tgz"; path = fetchurl { name = "JSONStream___JSONStream_1.3.5.tgz"; @@ -146,19 +306,19 @@ }; } { - name = "acorn_jsx___acorn_jsx_5.1.0.tgz"; + name = "acorn_jsx___acorn_jsx_5.2.0.tgz"; path = fetchurl { - name = "acorn_jsx___acorn_jsx_5.1.0.tgz"; - url = "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.1.0.tgz"; - sha1 = "294adb71b57398b0680015f0a38c563ee1db5384"; + name = "acorn_jsx___acorn_jsx_5.2.0.tgz"; + url = "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.2.0.tgz"; + sha1 = "4c66069173d6fdd68ed85239fc256226182b2ebe"; }; } { - name = "acorn___acorn_6.4.1.tgz"; + name = "acorn___acorn_7.3.1.tgz"; path = fetchurl { - name = "acorn___acorn_6.4.1.tgz"; - url = "https://registry.yarnpkg.com/acorn/-/acorn-6.4.1.tgz"; - sha1 = "531e58ba3f51b9dacb9a6646ca4debf5b14ca474"; + name = "acorn___acorn_7.3.1.tgz"; + url = "https://registry.yarnpkg.com/acorn/-/acorn-7.3.1.tgz"; + sha1 = "85010754db53c3fbaf3b9ea3e083aa5c5d147ffd"; }; } { @@ -194,6 +354,14 @@ }; } { + name = "ajv___ajv_6.12.3.tgz"; + path = fetchurl { + name = "ajv___ajv_6.12.3.tgz"; + url = "https://registry.yarnpkg.com/ajv/-/ajv-6.12.3.tgz"; + sha1 = "18c5af38a111ddeb4f2697bd78d68abc1cabd706"; + }; + } + { name = "ajv___ajv_6.10.2.tgz"; path = fetchurl { name = "ajv___ajv_6.10.2.tgz"; @@ -234,11 +402,19 @@ }; } { - name = "ansi_escapes___ansi_escapes_3.2.0.tgz"; + name = "ansi_colors___ansi_colors_4.1.1.tgz"; + path = fetchurl { + name = "ansi_colors___ansi_colors_4.1.1.tgz"; + url = "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.1.tgz"; + sha1 = "cbb9ae256bf750af1eab344f229aa27fe94ba348"; + }; + } + { + name = "ansi_escapes___ansi_escapes_4.3.1.tgz"; path = fetchurl { - name = "ansi_escapes___ansi_escapes_3.2.0.tgz"; - url = "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.2.0.tgz"; - sha1 = "8780b98ff9dbf5638152d1f1fe5c1d7b4442976b"; + name = "ansi_escapes___ansi_escapes_4.3.1.tgz"; + url = "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.1.tgz"; + sha1 = "a5c47cc43181f1f38ffd7076837700d395522a61"; }; } { @@ -386,6 +562,30 @@ }; } { + name = "array_includes___array_includes_3.1.1.tgz"; + path = fetchurl { + name = "array_includes___array_includes_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.1.tgz"; + sha1 = "cdd67e6852bdf9c1215460786732255ed2459348"; + }; + } + { + name = "array.prototype.flat___array.prototype.flat_1.2.3.tgz"; + path = fetchurl { + name = "array.prototype.flat___array.prototype.flat_1.2.3.tgz"; + url = "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.2.3.tgz"; + sha1 = "0de82b426b0318dbfdb940089e38b043d37f6c7b"; + }; + } + { + name = "array.prototype.flatmap___array.prototype.flatmap_1.2.3.tgz"; + path = fetchurl { + name = "array.prototype.flatmap___array.prototype.flatmap_1.2.3.tgz"; + url = "https://registry.yarnpkg.com/array.prototype.flatmap/-/array.prototype.flatmap-1.2.3.tgz"; + sha1 = "1c13f84a178566042dd63de4414440db9222e443"; + }; + } + { name = "asap___asap_2.0.6.tgz"; path = fetchurl { name = "asap___asap_2.0.6.tgz"; @@ -490,6 +690,14 @@ }; } { + name = "babel_eslint___babel_eslint_10.1.0.tgz"; + path = fetchurl { + name = "babel_eslint___babel_eslint_10.1.0.tgz"; + url = "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-10.1.0.tgz"; + sha1 = "6968e568a910b78fb3779cdd8b6ac2f479943232"; + }; + } + { name = "balanced_match___balanced_match_1.0.0.tgz"; path = fetchurl { name = "balanced_match___balanced_match_1.0.0.tgz"; @@ -858,11 +1066,11 @@ }; } { - name = "cli_cursor___cli_cursor_2.1.0.tgz"; + name = "cli_cursor___cli_cursor_3.1.0.tgz"; path = fetchurl { - name = "cli_cursor___cli_cursor_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-2.1.0.tgz"; - sha1 = "b35dac376479facc3e94747d41d0d0f5238ffcb5"; + name = "cli_cursor___cli_cursor_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-3.1.0.tgz"; + sha1 = "264305a7ae490d1d03bf0c9ba7c925d1753af307"; }; } { @@ -874,11 +1082,11 @@ }; } { - name = "cli_width___cli_width_2.2.0.tgz"; + name = "cli_width___cli_width_3.0.0.tgz"; path = fetchurl { - name = "cli_width___cli_width_2.2.0.tgz"; - url = "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.0.tgz"; - sha1 = "ff19ede8a9a5e579324147b0c11f0fbcbabed639"; + name = "cli_width___cli_width_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/cli-width/-/cli-width-3.0.0.tgz"; + sha1 = "a2f48437a2caa9a22436e794bf071ec9e61cedf6"; }; } { @@ -1066,6 +1274,14 @@ }; } { + name = "contains_path___contains_path_0.1.0.tgz"; + path = fetchurl { + name = "contains_path___contains_path_0.1.0.tgz"; + url = "https://registry.yarnpkg.com/contains-path/-/contains-path-0.1.0.tgz"; + sha1 = "fe8cf184ff6670b6baef01a9d4861a5cbec4120a"; + }; + } + { name = "content_type___content_type_1.0.4.tgz"; path = fetchurl { name = "content_type___content_type_1.0.4.tgz"; @@ -1130,6 +1346,14 @@ }; } { + name = "cross_spawn___cross_spawn_7.0.3.tgz"; + path = fetchurl { + name = "cross_spawn___cross_spawn_7.0.3.tgz"; + url = "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz"; + sha1 = "f73a85b9d5d41d045551c177e2882d4ac85728a6"; + }; + } + { name = "cross_unzip___cross_unzip_0.0.2.tgz"; path = fetchurl { name = "cross_unzip___cross_unzip_0.0.2.tgz"; @@ -1186,6 +1410,14 @@ }; } { + name = "debug___debug_2.6.9.tgz"; + path = fetchurl { + name = "debug___debug_2.6.9.tgz"; + url = "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz"; + sha1 = "5d128515df134ff327e90a4c93f4e077a536341f"; + }; + } + { name = "debug___debug_3.2.6.tgz"; path = fetchurl { name = "debug___debug_3.2.6.tgz"; @@ -1346,6 +1578,22 @@ }; } { + name = "doctrine___doctrine_1.5.0.tgz"; + path = fetchurl { + name = "doctrine___doctrine_1.5.0.tgz"; + url = "https://registry.yarnpkg.com/doctrine/-/doctrine-1.5.0.tgz"; + sha1 = "379dce730f6166f76cefa4e6707a159b02c5a6fa"; + }; + } + { + name = "doctrine___doctrine_2.1.0.tgz"; + path = fetchurl { + name = "doctrine___doctrine_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/doctrine/-/doctrine-2.1.0.tgz"; + sha1 = "5cd01fc101621b42c4cd7f5d1a66243716d3f39d"; + }; + } + { name = "doctrine___doctrine_3.0.0.tgz"; path = fetchurl { name = "doctrine___doctrine_3.0.0.tgz"; @@ -1530,6 +1778,14 @@ }; } { + name = "enquirer___enquirer_2.3.6.tgz"; + path = fetchurl { + name = "enquirer___enquirer_2.3.6.tgz"; + url = "https://registry.yarnpkg.com/enquirer/-/enquirer-2.3.6.tgz"; + sha1 = "2a7fe5dd634a1e4125a975ec994ff5456dc3734d"; + }; + } + { name = "env_paths___env_paths_1.0.0.tgz"; path = fetchurl { name = "env_paths___env_paths_1.0.0.tgz"; @@ -1570,6 +1826,14 @@ }; } { + name = "es_abstract___es_abstract_1.17.6.tgz"; + path = fetchurl { + name = "es_abstract___es_abstract_1.17.6.tgz"; + url = "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.17.6.tgz"; + sha1 = "9142071707857b2cacc7b89ecb670316c3e2d52a"; + }; + } + { name = "es_abstract___es_abstract_1.16.3.tgz"; path = fetchurl { name = "es_abstract___es_abstract_1.16.3.tgz"; @@ -1626,6 +1890,22 @@ }; } { + name = "eslint_config_esnext___eslint_config_esnext_4.1.0.tgz"; + path = fetchurl { + name = "eslint_config_esnext___eslint_config_esnext_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/eslint-config-esnext/-/eslint-config-esnext-4.1.0.tgz"; + sha1 = "8695b858fcf40d28c1aedca181f700528c7b60c6"; + }; + } + { + name = "eslint_config_google___eslint_config_google_0.14.0.tgz"; + path = fetchurl { + name = "eslint_config_google___eslint_config_google_0.14.0.tgz"; + url = "https://registry.yarnpkg.com/eslint-config-google/-/eslint-config-google-0.14.0.tgz"; + sha1 = "4f5f8759ba6e11b424294a219dbfa18c508bcc1a"; + }; + } + { name = "eslint_config_google___eslint_config_google_0.7.1.tgz"; path = fetchurl { name = "eslint_config_google___eslint_config_google_0.7.1.tgz"; @@ -1634,6 +1914,54 @@ }; } { + name = "eslint_config_matrix_org___eslint_config_matrix_org_0.1.2.tgz"; + path = fetchurl { + name = "eslint_config_matrix_org___eslint_config_matrix_org_0.1.2.tgz"; + url = "https://registry.yarnpkg.com/eslint-config-matrix-org/-/eslint-config-matrix-org-0.1.2.tgz"; + sha1 = "b5d7e193e4f3fc5041905967b53c5ddd6924c793"; + }; + } + { + name = "eslint_config_node___eslint_config_node_4.1.0.tgz"; + path = fetchurl { + name = "eslint_config_node___eslint_config_node_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/eslint-config-node/-/eslint-config-node-4.1.0.tgz"; + sha1 = "fc1f13946d83766d6b83b0e67699e2071a56f417"; + }; + } + { + name = "eslint_config_react_native___eslint_config_react_native_4.1.0.tgz"; + path = fetchurl { + name = "eslint_config_react_native___eslint_config_react_native_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/eslint-config-react-native/-/eslint-config-react-native-4.1.0.tgz"; + sha1 = "63e9401c7fac146804785f609e7df8f15b3e04eb"; + }; + } + { + name = "eslint_config_recommended___eslint_config_recommended_4.1.0.tgz"; + path = fetchurl { + name = "eslint_config_recommended___eslint_config_recommended_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/eslint-config-recommended/-/eslint-config-recommended-4.1.0.tgz"; + sha1 = "1adff90e0716d439be471d192977f233de171a46"; + }; + } + { + name = "eslint_import_resolver_node___eslint_import_resolver_node_0.3.4.tgz"; + path = fetchurl { + name = "eslint_import_resolver_node___eslint_import_resolver_node_0.3.4.tgz"; + url = "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.4.tgz"; + sha1 = "85ffa81942c25012d8231096ddf679c03042c717"; + }; + } + { + name = "eslint_module_utils___eslint_module_utils_2.6.0.tgz"; + path = fetchurl { + name = "eslint_module_utils___eslint_module_utils_2.6.0.tgz"; + url = "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.6.0.tgz"; + sha1 = "579ebd094f56af7797d19c9866c9c9486629bfa6"; + }; + } + { name = "eslint_plugin_babel___eslint_plugin_babel_4.1.2.tgz"; path = fetchurl { name = "eslint_plugin_babel___eslint_plugin_babel_4.1.2.tgz"; @@ -1642,11 +1970,59 @@ }; } { - name = "eslint_scope___eslint_scope_4.0.3.tgz"; + name = "eslint_plugin_babel___eslint_plugin_babel_5.3.1.tgz"; + path = fetchurl { + name = "eslint_plugin_babel___eslint_plugin_babel_5.3.1.tgz"; + url = "https://registry.yarnpkg.com/eslint-plugin-babel/-/eslint-plugin-babel-5.3.1.tgz"; + sha1 = "75a2413ffbf17e7be57458301c60291f2cfbf560"; + }; + } + { + name = "eslint_plugin_import___eslint_plugin_import_2.22.0.tgz"; path = fetchurl { - name = "eslint_scope___eslint_scope_4.0.3.tgz"; - url = "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-4.0.3.tgz"; - sha1 = "ca03833310f6889a3264781aa82e63eb9cfe7848"; + name = "eslint_plugin_import___eslint_plugin_import_2.22.0.tgz"; + url = "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.22.0.tgz"; + sha1 = "92f7736fe1fde3e2de77623c838dd992ff5ffb7e"; + }; + } + { + name = "eslint_plugin_react_native_globals___eslint_plugin_react_native_globals_0.1.2.tgz"; + path = fetchurl { + name = "eslint_plugin_react_native_globals___eslint_plugin_react_native_globals_0.1.2.tgz"; + url = "https://registry.yarnpkg.com/eslint-plugin-react-native-globals/-/eslint-plugin-react-native-globals-0.1.2.tgz"; + sha1 = "ee1348bc2ceb912303ce6bdbd22e2f045ea86ea2"; + }; + } + { + name = "eslint_plugin_react_native___eslint_plugin_react_native_3.8.1.tgz"; + path = fetchurl { + name = "eslint_plugin_react_native___eslint_plugin_react_native_3.8.1.tgz"; + url = "https://registry.yarnpkg.com/eslint-plugin-react-native/-/eslint-plugin-react-native-3.8.1.tgz"; + sha1 = "92811e37191ecb0d29c0f0a0c9e5c943ee573821"; + }; + } + { + name = "eslint_plugin_react___eslint_plugin_react_7.20.3.tgz"; + path = fetchurl { + name = "eslint_plugin_react___eslint_plugin_react_7.20.3.tgz"; + url = "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.20.3.tgz"; + sha1 = "0590525e7eb83890ce71f73c2cf836284ad8c2f1"; + }; + } + { + name = "eslint_rule_composer___eslint_rule_composer_0.3.0.tgz"; + path = fetchurl { + name = "eslint_rule_composer___eslint_rule_composer_0.3.0.tgz"; + url = "https://registry.yarnpkg.com/eslint-rule-composer/-/eslint-rule-composer-0.3.0.tgz"; + sha1 = "79320c927b0c5c0d3d3d2b76c8b4a488f25bbaf9"; + }; + } + { + name = "eslint_scope___eslint_scope_5.1.0.tgz"; + path = fetchurl { + name = "eslint_scope___eslint_scope_5.1.0.tgz"; + url = "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.0.tgz"; + sha1 = "d0f971dfe59c69e0cada684b23d49dbf82600ce5"; }; } { @@ -1658,6 +2034,14 @@ }; } { + name = "eslint_utils___eslint_utils_2.1.0.tgz"; + path = fetchurl { + name = "eslint_utils___eslint_utils_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-2.1.0.tgz"; + sha1 = "d2de5e03424e707dc10c74068ddedae708741b27"; + }; + } + { name = "eslint_visitor_keys___eslint_visitor_keys_1.1.0.tgz"; path = fetchurl { name = "eslint_visitor_keys___eslint_visitor_keys_1.1.0.tgz"; @@ -1666,19 +2050,43 @@ }; } { - name = "eslint___eslint_5.16.0.tgz"; + name = "eslint_visitor_keys___eslint_visitor_keys_1.3.0.tgz"; + path = fetchurl { + name = "eslint_visitor_keys___eslint_visitor_keys_1.3.0.tgz"; + url = "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz"; + sha1 = "30ebd1ef7c2fdff01c3a4f151044af25fab0523e"; + }; + } + { + name = "eslint___eslint_7.3.1.tgz"; + path = fetchurl { + name = "eslint___eslint_7.3.1.tgz"; + url = "https://registry.yarnpkg.com/eslint/-/eslint-7.3.1.tgz"; + sha1 = "76392bd7e44468d046149ba128d1566c59acbe19"; + }; + } + { + name = "eslint___eslint_6.8.0.tgz"; path = fetchurl { - name = "eslint___eslint_5.16.0.tgz"; - url = "https://registry.yarnpkg.com/eslint/-/eslint-5.16.0.tgz"; - sha1 = "a1e3ac1aae4a3fbd8296fcf8f7ab7314cbb6abea"; + name = "eslint___eslint_6.8.0.tgz"; + url = "https://registry.yarnpkg.com/eslint/-/eslint-6.8.0.tgz"; + sha1 = "62262d6729739f9275723824302fb227c8c93ffb"; }; } { - name = "espree___espree_5.0.1.tgz"; + name = "espree___espree_6.2.1.tgz"; path = fetchurl { - name = "espree___espree_5.0.1.tgz"; - url = "https://registry.yarnpkg.com/espree/-/espree-5.0.1.tgz"; - sha1 = "5d6526fa4fc7f0788a5cf75b15f30323e2f81f7a"; + name = "espree___espree_6.2.1.tgz"; + url = "https://registry.yarnpkg.com/espree/-/espree-6.2.1.tgz"; + sha1 = "77fc72e1fd744a2052c20f38a5b575832e82734a"; + }; + } + { + name = "espree___espree_7.2.0.tgz"; + path = fetchurl { + name = "espree___espree_7.2.0.tgz"; + url = "https://registry.yarnpkg.com/espree/-/espree-7.2.0.tgz"; + sha1 = "1c263d5b513dbad0ac30c4991b93ac354e948d69"; }; } { @@ -1698,6 +2106,14 @@ }; } { + name = "esquery___esquery_1.3.1.tgz"; + path = fetchurl { + name = "esquery___esquery_1.3.1.tgz"; + url = "https://registry.yarnpkg.com/esquery/-/esquery-1.3.1.tgz"; + sha1 = "b78b5828aa8e214e29fb74c4d5b752e1c033da57"; + }; + } + { name = "esrecurse___esrecurse_4.2.1.tgz"; path = fetchurl { name = "esrecurse___esrecurse_4.2.1.tgz"; @@ -1714,6 +2130,14 @@ }; } { + name = "estraverse___estraverse_5.1.0.tgz"; + path = fetchurl { + name = "estraverse___estraverse_5.1.0.tgz"; + url = "https://registry.yarnpkg.com/estraverse/-/estraverse-5.1.0.tgz"; + sha1 = "374309d39fd935ae500e7b92e8a6b4c720e59642"; + }; + } + { name = "esutils___esutils_2.0.3.tgz"; path = fetchurl { name = "esutils___esutils_2.0.3.tgz"; @@ -1818,11 +2242,11 @@ }; } { - name = "figures___figures_2.0.0.tgz"; + name = "figures___figures_3.2.0.tgz"; path = fetchurl { - name = "figures___figures_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/figures/-/figures-2.0.0.tgz"; - sha1 = "3ab1a2d2a62c8bfb431a0c94cb797a2fce27c962"; + name = "figures___figures_3.2.0.tgz"; + url = "https://registry.yarnpkg.com/figures/-/figures-3.2.0.tgz"; + sha1 = "625c18bd293c604dc4a8ddb2febf0c88341746af"; }; } { @@ -2090,6 +2514,14 @@ }; } { + name = "glob_parent___glob_parent_5.1.1.tgz"; + path = fetchurl { + name = "glob_parent___glob_parent_5.1.1.tgz"; + url = "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.1.tgz"; + sha1 = "b6c1ef417c4e5663ea498f1c45afac6916bbc229"; + }; + } + { name = "glob___glob_7.1.6.tgz"; path = fetchurl { name = "glob___glob_7.1.6.tgz"; @@ -2130,6 +2562,14 @@ }; } { + name = "globals___globals_12.4.0.tgz"; + path = fetchurl { + name = "globals___globals_12.4.0.tgz"; + url = "https://registry.yarnpkg.com/globals/-/globals-12.4.0.tgz"; + sha1 = "a18813576a41b00a24a97e7f815918c2e19925f8"; + }; + } + { name = "got___got_6.7.1.tgz"; path = fetchurl { name = "got___got_6.7.1.tgz"; @@ -2418,11 +2858,19 @@ }; } { - name = "inquirer___inquirer_6.5.2.tgz"; + name = "inquirer___inquirer_7.3.2.tgz"; + path = fetchurl { + name = "inquirer___inquirer_7.3.2.tgz"; + url = "https://registry.yarnpkg.com/inquirer/-/inquirer-7.3.2.tgz"; + sha1 = "25245d2e32dc9f33dbe26eeaada231daa66e9c7c"; + }; + } + { + name = "internal_slot___internal_slot_1.0.2.tgz"; path = fetchurl { - name = "inquirer___inquirer_6.5.2.tgz"; - url = "https://registry.yarnpkg.com/inquirer/-/inquirer-6.5.2.tgz"; - sha1 = "ad50942375d036d327ff528c08bd5fab089928ca"; + name = "internal_slot___internal_slot_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.2.tgz"; + sha1 = "9c2e9fb3cd8e5e4256c6f45fe310067fcfa378a3"; }; } { @@ -2490,6 +2938,14 @@ }; } { + name = "is_callable___is_callable_1.2.0.tgz"; + path = fetchurl { + name = "is_callable___is_callable_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.0.tgz"; + sha1 = "83336560b54a38e35e3a2df7afd0454d691468bb"; + }; + } + { name = "is_ci___is_ci_1.2.1.tgz"; path = fetchurl { name = "is_ci___is_ci_1.2.1.tgz"; @@ -2522,6 +2978,14 @@ }; } { + name = "is_extglob___is_extglob_2.1.1.tgz"; + path = fetchurl { + name = "is_extglob___is_extglob_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz"; + sha1 = "a88c02535791f02ed37c76a1b9ea9773c833f8c2"; + }; + } + { name = "is_fullwidth_code_point___is_fullwidth_code_point_1.0.0.tgz"; path = fetchurl { name = "is_fullwidth_code_point___is_fullwidth_code_point_1.0.0.tgz"; @@ -2554,6 +3018,14 @@ }; } { + name = "is_glob___is_glob_4.0.1.tgz"; + path = fetchurl { + name = "is_glob___is_glob_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.1.tgz"; + sha1 = "7567dbe9f2f5e2467bc77ab83c4a29482407a5dc"; + }; + } + { name = "is_installed_globally___is_installed_globally_0.1.0.tgz"; path = fetchurl { name = "is_installed_globally___is_installed_globally_0.1.0.tgz"; @@ -2618,14 +3090,6 @@ }; } { - name = "is_promise___is_promise_2.1.0.tgz"; - path = fetchurl { - name = "is_promise___is_promise_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/is-promise/-/is-promise-2.1.0.tgz"; - sha1 = "79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa"; - }; - } - { name = "is_redirect___is_redirect_1.0.0.tgz"; path = fetchurl { name = "is_redirect___is_redirect_1.0.0.tgz"; @@ -2642,6 +3106,14 @@ }; } { + name = "is_regex___is_regex_1.1.0.tgz"; + path = fetchurl { + name = "is_regex___is_regex_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.0.tgz"; + sha1 = "ece38e389e490df0dc21caea2bd596f987f767ff"; + }; + } + { name = "is_retry_allowed___is_retry_allowed_1.2.0.tgz"; path = fetchurl { name = "is_retry_allowed___is_retry_allowed_1.2.0.tgz"; @@ -2658,6 +3130,14 @@ }; } { + name = "is_string___is_string_1.0.5.tgz"; + path = fetchurl { + name = "is_string___is_string_1.0.5.tgz"; + url = "https://registry.yarnpkg.com/is-string/-/is-string-1.0.5.tgz"; + sha1 = "40493ed198ef3ff477b8c7f92f644ec82a5cd3a6"; + }; + } + { name = "is_symbol___is_symbol_1.0.3.tgz"; path = fetchurl { name = "is_symbol___is_symbol_1.0.3.tgz"; @@ -2778,6 +3258,14 @@ }; } { + name = "jsesc___jsesc_2.5.2.tgz"; + path = fetchurl { + name = "jsesc___jsesc_2.5.2.tgz"; + url = "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.2.tgz"; + sha1 = "80564d2e483dacf6e8ef209650a67df3f0c283a4"; + }; + } + { name = "json_buffer___json_buffer_3.0.0.tgz"; path = fetchurl { name = "json_buffer___json_buffer_3.0.0.tgz"; @@ -2826,6 +3314,14 @@ }; } { + name = "json5___json5_1.0.1.tgz"; + path = fetchurl { + name = "json5___json5_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/json5/-/json5-1.0.1.tgz"; + sha1 = "779fb0018604fa854eacbf6252180d83543e3dbe"; + }; + } + { name = "json5___json5_2.1.3.tgz"; path = fetchurl { name = "json5___json5_2.1.3.tgz"; @@ -2874,6 +3370,14 @@ }; } { + name = "jsx_ast_utils___jsx_ast_utils_2.4.1.tgz"; + path = fetchurl { + name = "jsx_ast_utils___jsx_ast_utils_2.4.1.tgz"; + url = "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-2.4.1.tgz"; + sha1 = "1114a4c1209481db06c690c2b4f488cc665f657e"; + }; + } + { name = "keyv___keyv_3.1.0.tgz"; path = fetchurl { name = "keyv___keyv_3.1.0.tgz"; @@ -2946,6 +3450,14 @@ }; } { + name = "levn___levn_0.4.1.tgz"; + path = fetchurl { + name = "levn___levn_0.4.1.tgz"; + url = "https://registry.yarnpkg.com/levn/-/levn-0.4.1.tgz"; + sha1 = "ae4562c007473b932a6200d403268dd2fffc6ade"; + }; + } + { name = "libcipm___libcipm_4.0.7.tgz"; path = fetchurl { name = "libcipm___libcipm_4.0.7.tgz"; @@ -3170,6 +3682,14 @@ }; } { + name = "lodash___lodash_4.17.15.tgz"; + path = fetchurl { + name = "lodash___lodash_4.17.15.tgz"; + url = "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz"; + sha1 = "b447f6670a0455bbfeedd11392eff330ea097548"; + }; + } + { name = "lodash___lodash_4.17.19.tgz"; path = fetchurl { name = "lodash___lodash_4.17.19.tgz"; @@ -3186,6 +3706,14 @@ }; } { + name = "loose_envify___loose_envify_1.4.0.tgz"; + path = fetchurl { + name = "loose_envify___loose_envify_1.4.0.tgz"; + url = "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz"; + sha1 = "71ee51fa7be4caec1a63839f7e682d8132d30caf"; + }; + } + { name = "lowercase_keys___lowercase_keys_1.0.1.tgz"; path = fetchurl { name = "lowercase_keys___lowercase_keys_1.0.1.tgz"; @@ -3250,11 +3778,11 @@ }; } { - name = "matrix_js_sdk___matrix_js_sdk_7.1.0.tgz"; + name = "matrix_js_sdk___matrix_js_sdk_8.0.0.tgz"; path = fetchurl { - name = "matrix_js_sdk___matrix_js_sdk_7.1.0.tgz"; - url = "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-7.1.0.tgz"; - sha1 = "b3e3304e890df45c827706831748935168ee839f"; + name = "matrix_js_sdk___matrix_js_sdk_8.0.0.tgz"; + url = "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-8.0.0.tgz"; + sha1 = "78efb071ed1f6430553a9d6937d7bcfbae24cce8"; }; } { @@ -3466,14 +3994,6 @@ }; } { - name = "mute_stream___mute_stream_0.0.7.tgz"; - path = fetchurl { - name = "mute_stream___mute_stream_0.0.7.tgz"; - url = "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz"; - sha1 = "3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab"; - }; - } - { name = "mute_stream___mute_stream_0.0.8.tgz"; path = fetchurl { name = "mute_stream___mute_stream_0.0.8.tgz"; @@ -3770,6 +4290,30 @@ }; } { + name = "object.assign___object.assign_4.1.0.tgz"; + path = fetchurl { + name = "object.assign___object.assign_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.0.tgz"; + sha1 = "968bf1100d7956bb3ca086f006f846b3bc4008da"; + }; + } + { + name = "object.entries___object.entries_1.1.2.tgz"; + path = fetchurl { + name = "object.entries___object.entries_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.2.tgz"; + sha1 = "bc73f00acb6b6bb16c203434b10f9a7e797d3add"; + }; + } + { + name = "object.fromentries___object.fromentries_2.0.2.tgz"; + path = fetchurl { + name = "object.fromentries___object.fromentries_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.2.tgz"; + sha1 = "4a09c9b9bb3843dd0f89acdb517a794d4f355ac9"; + }; + } + { name = "object.getownpropertydescriptors___object.getownpropertydescriptors_2.0.3.tgz"; path = fetchurl { name = "object.getownpropertydescriptors___object.getownpropertydescriptors_2.0.3.tgz"; @@ -3778,6 +4322,14 @@ }; } { + name = "object.values___object.values_1.1.1.tgz"; + path = fetchurl { + name = "object.values___object.values_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/object.values/-/object.values-1.1.1.tgz"; + sha1 = "68a99ecde356b7e9295a3c5e0ce31dc8c953de5e"; + }; + } + { name = "once___once_1.4.0.tgz"; path = fetchurl { name = "once___once_1.4.0.tgz"; @@ -3786,11 +4338,11 @@ }; } { - name = "onetime___onetime_2.0.1.tgz"; + name = "onetime___onetime_5.1.0.tgz"; path = fetchurl { - name = "onetime___onetime_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/onetime/-/onetime-2.0.1.tgz"; - sha1 = "067428230fd67443b2794b22bba528b6867962d4"; + name = "onetime___onetime_5.1.0.tgz"; + url = "https://registry.yarnpkg.com/onetime/-/onetime-5.1.0.tgz"; + sha1 = "fff0f3c91617fe62bb50189636e99ac8a6df7be5"; }; } { @@ -3810,6 +4362,14 @@ }; } { + name = "optionator___optionator_0.9.1.tgz"; + path = fetchurl { + name = "optionator___optionator_0.9.1.tgz"; + url = "https://registry.yarnpkg.com/optionator/-/optionator-0.9.1.tgz"; + sha1 = "4f236a6373dae0566a6d43e1326674f50c291499"; + }; + } + { name = "os_homedir___os_homedir_1.0.2.tgz"; path = fetchurl { name = "os_homedir___os_homedir_1.0.2.tgz"; @@ -4066,6 +4626,14 @@ }; } { + name = "path_key___path_key_3.1.1.tgz"; + path = fetchurl { + name = "path_key___path_key_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz"; + sha1 = "581f6ade658cbba65a0d3380de7753295054f375"; + }; + } + { name = "path_parse___path_parse_1.0.6.tgz"; path = fetchurl { name = "path_parse___path_parse_1.0.6.tgz"; @@ -4122,6 +4690,14 @@ }; } { + name = "pkg_dir___pkg_dir_2.0.0.tgz"; + path = fetchurl { + name = "pkg_dir___pkg_dir_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-2.0.0.tgz"; + sha1 = "f6d5d1109e19d63edf428e0bd57e12777615334b"; + }; + } + { name = "pkg_up___pkg_up_2.0.0.tgz"; path = fetchurl { name = "pkg_up___pkg_up_2.0.0.tgz"; @@ -4146,6 +4722,14 @@ }; } { + name = "prelude_ls___prelude_ls_1.2.1.tgz"; + path = fetchurl { + name = "prelude_ls___prelude_ls_1.2.1.tgz"; + url = "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz"; + sha1 = "debc6489d7a6e6b0e7611888cec880337d316396"; + }; + } + { name = "prelude_ls___prelude_ls_1.1.2.tgz"; path = fetchurl { name = "prelude_ls___prelude_ls_1.1.2.tgz"; @@ -4218,6 +4802,14 @@ }; } { + name = "prop_types___prop_types_15.7.2.tgz"; + path = fetchurl { + name = "prop_types___prop_types_15.7.2.tgz"; + url = "https://registry.yarnpkg.com/prop-types/-/prop-types-15.7.2.tgz"; + sha1 = "52c41e75b8c87e72b9d9360e0206b99dcbffa6c5"; + }; + } + { name = "proto_list___proto_list_1.2.4.tgz"; path = fetchurl { name = "proto_list___proto_list_1.2.4.tgz"; @@ -4354,6 +4946,14 @@ }; } { + name = "react_is___react_is_16.13.1.tgz"; + path = fetchurl { + name = "react_is___react_is_16.13.1.tgz"; + url = "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz"; + sha1 = "789729a4dc36de2999dc156dd6c1d9c18cea56a4"; + }; + } + { name = "read_chunk___read_chunk_1.0.1.tgz"; path = fetchurl { name = "read_chunk___read_chunk_1.0.1.tgz"; @@ -4490,6 +5090,14 @@ }; } { + name = "regexp.prototype.flags___regexp.prototype.flags_1.3.0.tgz"; + path = fetchurl { + name = "regexp.prototype.flags___regexp.prototype.flags_1.3.0.tgz"; + url = "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.3.0.tgz"; + sha1 = "7aba89b3c13a64509dabcf3ca8d9fbb9bdf5cb75"; + }; + } + { name = "regexpp___regexpp_2.0.1.tgz"; path = fetchurl { name = "regexpp___regexpp_2.0.1.tgz"; @@ -4498,6 +5106,14 @@ }; } { + name = "regexpp___regexpp_3.1.0.tgz"; + path = fetchurl { + name = "regexpp___regexpp_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/regexpp/-/regexpp-3.1.0.tgz"; + sha1 = "206d0ad0a5648cffbdb8ae46438f3dc51c9f78e2"; + }; + } + { name = "registry_auth_token___registry_auth_token_3.4.0.tgz"; path = fetchurl { name = "registry_auth_token___registry_auth_token_3.4.0.tgz"; @@ -4578,6 +5194,14 @@ }; } { + name = "resolve___resolve_1.17.0.tgz"; + path = fetchurl { + name = "resolve___resolve_1.17.0.tgz"; + url = "https://registry.yarnpkg.com/resolve/-/resolve-1.17.0.tgz"; + sha1 = "b25941b54968231cc2d1bb76a79cb7f2c0bf8444"; + }; + } + { name = "responselike___responselike_1.0.2.tgz"; path = fetchurl { name = "responselike___responselike_1.0.2.tgz"; @@ -4586,11 +5210,11 @@ }; } { - name = "restore_cursor___restore_cursor_2.0.0.tgz"; + name = "restore_cursor___restore_cursor_3.1.0.tgz"; path = fetchurl { - name = "restore_cursor___restore_cursor_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-2.0.0.tgz"; - sha1 = "9f7ee287f82fd326d4fd162923d62129eee0dfaf"; + name = "restore_cursor___restore_cursor_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-3.1.0.tgz"; + sha1 = "39f67c54b3a7a58cea5236d95cf0034239631f7e"; }; } { @@ -4634,11 +5258,11 @@ }; } { - name = "run_async___run_async_2.3.0.tgz"; + name = "run_async___run_async_2.4.1.tgz"; path = fetchurl { - name = "run_async___run_async_2.3.0.tgz"; - url = "https://registry.yarnpkg.com/run-async/-/run-async-2.3.0.tgz"; - sha1 = "0371ab4ae0bdd720d4166d7dfda64ff7a445a6c0"; + name = "run_async___run_async_2.4.1.tgz"; + url = "https://registry.yarnpkg.com/run-async/-/run-async-2.4.1.tgz"; + sha1 = "8440eccf99ea3e70bd409d49aab88e10c189a455"; }; } { @@ -4650,11 +5274,11 @@ }; } { - name = "rxjs___rxjs_6.5.3.tgz"; + name = "rxjs___rxjs_6.6.0.tgz"; path = fetchurl { - name = "rxjs___rxjs_6.5.3.tgz"; - url = "https://registry.yarnpkg.com/rxjs/-/rxjs-6.5.3.tgz"; - sha1 = "510e26317f4db91a7eb1de77d9dd9ba0a4899a3a"; + name = "rxjs___rxjs_6.6.0.tgz"; + url = "https://registry.yarnpkg.com/rxjs/-/rxjs-6.6.0.tgz"; + sha1 = "af2901eedf02e3a83ffa7f886240ff9018bbec84"; }; } { @@ -4770,6 +5394,14 @@ }; } { + name = "shebang_command___shebang_command_2.0.0.tgz"; + path = fetchurl { + name = "shebang_command___shebang_command_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz"; + sha1 = "ccd0af4f8835fbdc265b82461aaf0c36663f34ea"; + }; + } + { name = "shebang_regex___shebang_regex_1.0.0.tgz"; path = fetchurl { name = "shebang_regex___shebang_regex_1.0.0.tgz"; @@ -4778,6 +5410,22 @@ }; } { + name = "shebang_regex___shebang_regex_3.0.0.tgz"; + path = fetchurl { + name = "shebang_regex___shebang_regex_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz"; + sha1 = "ae16f1644d873ecad843b0307b143362d4c42172"; + }; + } + { + name = "side_channel___side_channel_1.0.2.tgz"; + path = fetchurl { + name = "side_channel___side_channel_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.2.tgz"; + sha1 = "df5d1abadb4e4bf4af1cd8852bf132d2f7876947"; + }; + } + { name = "signal_exit___signal_exit_3.0.2.tgz"; path = fetchurl { name = "signal_exit___signal_exit_3.0.2.tgz"; @@ -4850,6 +5498,14 @@ }; } { + name = "source_map___source_map_0.5.7.tgz"; + path = fetchurl { + name = "source_map___source_map_0.5.7.tgz"; + url = "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz"; + sha1 = "8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"; + }; + } + { name = "source_map___source_map_0.6.1.tgz"; path = fetchurl { name = "source_map___source_map_0.6.1.tgz"; @@ -5010,6 +5666,22 @@ }; } { + name = "string.prototype.matchall___string.prototype.matchall_4.0.2.tgz"; + path = fetchurl { + name = "string.prototype.matchall___string.prototype.matchall_4.0.2.tgz"; + url = "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-4.0.2.tgz"; + sha1 = "48bb510326fb9fdeb6a33ceaa81a6ea04ef7648e"; + }; + } + { + name = "string.prototype.trimend___string.prototype.trimend_1.0.1.tgz"; + path = fetchurl { + name = "string.prototype.trimend___string.prototype.trimend_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.1.tgz"; + sha1 = "85812a6b847ac002270f5808146064c995fb6913"; + }; + } + { name = "string.prototype.trimleft___string.prototype.trimleft_2.1.0.tgz"; path = fetchurl { name = "string.prototype.trimleft___string.prototype.trimleft_2.1.0.tgz"; @@ -5026,6 +5698,14 @@ }; } { + name = "string.prototype.trimstart___string.prototype.trimstart_1.0.1.tgz"; + path = fetchurl { + name = "string.prototype.trimstart___string.prototype.trimstart_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.1.tgz"; + sha1 = "14af6d9f34b053f7cfc89b72f8f2ee14b9039a54"; + }; + } + { name = "string_decoder___string_decoder_1.3.0.tgz"; path = fetchurl { name = "string_decoder___string_decoder_1.3.0.tgz"; @@ -5106,6 +5786,14 @@ }; } { + name = "strip_json_comments___strip_json_comments_3.1.1.tgz"; + path = fetchurl { + name = "strip_json_comments___strip_json_comments_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz"; + sha1 = "31f1281b3832630434831c310c01cccda8cbe006"; + }; + } + { name = "strip_json_comments___strip_json_comments_2.0.1.tgz"; path = fetchurl { name = "strip_json_comments___strip_json_comments_2.0.1.tgz"; @@ -5258,6 +5946,14 @@ }; } { + name = "to_fast_properties___to_fast_properties_2.0.0.tgz"; + path = fetchurl { + name = "to_fast_properties___to_fast_properties_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz"; + sha1 = "dc5e698cbd079265bc73e0377681a4e4e83f616e"; + }; + } + { name = "to_readable_stream___to_readable_stream_1.0.0.tgz"; path = fetchurl { name = "to_readable_stream___to_readable_stream_1.0.0.tgz"; @@ -5282,6 +5978,22 @@ }; } { + name = "tsconfig_paths___tsconfig_paths_3.9.0.tgz"; + path = fetchurl { + name = "tsconfig_paths___tsconfig_paths_3.9.0.tgz"; + url = "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.9.0.tgz"; + sha1 = "098547a6c4448807e8fcb8eae081064ee9a3c90b"; + }; + } + { + name = "tslib___tslib_1.13.0.tgz"; + path = fetchurl { + name = "tslib___tslib_1.13.0.tgz"; + url = "https://registry.yarnpkg.com/tslib/-/tslib-1.13.0.tgz"; + sha1 = "c881e13cc7015894ed914862d276436fa9a47043"; + }; + } + { name = "tslib___tslib_1.10.0.tgz"; path = fetchurl { name = "tslib___tslib_1.10.0.tgz"; @@ -5290,6 +6002,14 @@ }; } { + name = "tsutils___tsutils_3.17.1.tgz"; + path = fetchurl { + name = "tsutils___tsutils_3.17.1.tgz"; + url = "https://registry.yarnpkg.com/tsutils/-/tsutils-3.17.1.tgz"; + sha1 = "ed719917f11ca0dee586272b2ac49e015a2dd759"; + }; + } + { name = "tunnel_agent___tunnel_agent_0.6.0.tgz"; path = fetchurl { name = "tunnel_agent___tunnel_agent_0.6.0.tgz"; @@ -5306,6 +6026,14 @@ }; } { + name = "type_check___type_check_0.4.0.tgz"; + path = fetchurl { + name = "type_check___type_check_0.4.0.tgz"; + url = "https://registry.yarnpkg.com/type-check/-/type-check-0.4.0.tgz"; + sha1 = "07b8203bfa7056c0657050e3ccd2c37730bab8f1"; + }; + } + { name = "type_check___type_check_0.3.2.tgz"; path = fetchurl { name = "type_check___type_check_0.3.2.tgz"; @@ -5314,6 +6042,14 @@ }; } { + name = "type_fest___type_fest_0.11.0.tgz"; + path = fetchurl { + name = "type_fest___type_fest_0.11.0.tgz"; + url = "https://registry.yarnpkg.com/type-fest/-/type-fest-0.11.0.tgz"; + sha1 = "97abf0872310fed88a5c466b25681576145e33f1"; + }; + } + { name = "type_fest___type_fest_0.8.1.tgz"; path = fetchurl { name = "type_fest___type_fest_0.8.1.tgz"; @@ -5338,6 +6074,14 @@ }; } { + name = "typescript___typescript_3.9.7.tgz"; + path = fetchurl { + name = "typescript___typescript_3.9.7.tgz"; + url = "https://registry.yarnpkg.com/typescript/-/typescript-3.9.7.tgz"; + sha1 = "98d600a5ebdc38f40cb277522f12dc800e9e25fa"; + }; + } + { name = "uid_number___uid_number_0.0.6.tgz"; path = fetchurl { name = "uid_number___uid_number_0.0.6.tgz"; @@ -5538,6 +6282,14 @@ }; } { + name = "v8_compile_cache___v8_compile_cache_2.1.1.tgz"; + path = fetchurl { + name = "v8_compile_cache___v8_compile_cache_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.1.1.tgz"; + sha1 = "54bc3cdd43317bca91e35dcaf305b1a7237de745"; + }; + } + { name = "validate_npm_package_license___validate_npm_package_license_3.0.4.tgz"; path = fetchurl { name = "validate_npm_package_license___validate_npm_package_license_3.0.4.tgz"; @@ -5586,6 +6338,14 @@ }; } { + name = "which___which_2.0.2.tgz"; + path = fetchurl { + name = "which___which_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz"; + sha1 = "7c6a8dd0a636a0327e10b59c9286eee93f3f51b1"; + }; + } + { name = "wide_align___wide_align_1.1.3.tgz"; path = fetchurl { name = "wide_align___wide_align_1.1.3.tgz"; diff --git a/pkgs/applications/networking/instant-messengers/element/element-desktop.nix b/pkgs/applications/networking/instant-messengers/element/element-desktop.nix index 9faaba117007d..4bcde89fefea4 100644 --- a/pkgs/applications/networking/instant-messengers/element/element-desktop.nix +++ b/pkgs/applications/networking/instant-messengers/element/element-desktop.nix @@ -8,12 +8,12 @@ let executableName = "element-desktop"; - version = "1.7.1"; + version = "1.7.2"; src = fetchFromGitHub { owner = "vector-im"; repo = "riot-desktop"; rev = "v${version}"; - sha256 = "0sl45mxgp0sngxnba8ilsghzgv6cv36ggah1k2204ggzby13blg6"; + sha256 = "1b3ckmqbhbkfghlkckb3ixr4i2pzdisz6pi929q5qj91f3ihxv4x"; }; electron = electron_9; diff --git a/pkgs/applications/networking/instant-messengers/element/element-web.nix b/pkgs/applications/networking/instant-messengers/element/element-web.nix index 9284af07fe1a5..aa9541071af60 100644 --- a/pkgs/applications/networking/instant-messengers/element/element-web.nix +++ b/pkgs/applications/networking/instant-messengers/element/element-web.nix @@ -12,11 +12,11 @@ let in stdenv.mkDerivation rec { pname = "element-web"; - version = "1.7.1"; + version = "1.7.2"; src = fetchurl { url = "https://github.com/vector-im/riot-web/releases/download/v${version}/riot-v${version}.tar.gz"; - sha256 = "1axmf5h0k709kbpgh3ldsf6f8k9n2q623pk4j0nrshlxa9ighsay"; + sha256 = "0wjr5pd25c31f2w48amqvfmd720ih8hfr1rzd8mljvqb1fbakry3"; }; installPhase = '' diff --git a/pkgs/applications/networking/instant-messengers/fractal/default.nix b/pkgs/applications/networking/instant-messengers/fractal/default.nix index 05767d1a9cd6f..a516c0a251d19 100644 --- a/pkgs/applications/networking/instant-messengers/fractal/default.nix +++ b/pkgs/applications/networking/instant-messengers/fractal/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitLab +, nix-update-script , fetchpatch , meson , ninja @@ -78,6 +79,12 @@ rustPlatform.buildRustPackage rec { checkPhase = null; installPhase = null; + passthru = { + updateScript = nix-update-script { + attrPath = pname; + }; + }; + meta = with stdenv.lib; { description = "Matrix group messaging app"; homepage = "https://gitlab.gnome.org/GNOME/fractal"; diff --git a/pkgs/applications/networking/instant-messengers/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix index b2be635728d73..930d288c365fc 100644 --- a/pkgs/applications/networking/instant-messengers/gajim/default.nix +++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix @@ -62,7 +62,7 @@ python3.pkgs.buildPythonApplication rec { homepage = "http://gajim.org/"; description = "Jabber client written in PyGTK"; license = lib.licenses.gpl3Plus; - maintainers = with lib.maintainers; [ raskin aszlig abbradar ]; + maintainers = with lib.maintainers; [ raskin abbradar ]; downloadPage = "http://gajim.org/downloads.php"; updateWalker = true; platforms = lib.platforms.linux; diff --git a/pkgs/applications/networking/instant-messengers/ripcord/default.nix b/pkgs/applications/networking/instant-messengers/ripcord/default.nix index f003bbec222f9..9055b51d97565 100755 --- a/pkgs/applications/networking/instant-messengers/ripcord/default.nix +++ b/pkgs/applications/networking/instant-messengers/ripcord/default.nix @@ -5,12 +5,12 @@ mkDerivation rec { pname = "ripcord"; - version = "0.4.25"; + version = "0.4.26"; src = let appimage = fetchurl { url = "https://cancel.fm/dl/Ripcord-${version}-x86_64.AppImage"; - sha256 = "17s4fxqirmzdw0sn9s9zyk90gr00ivsmz4s6i6knsq354zhy5fda"; + sha256 = "0i9l21gyqga27ainzqp6icn8vbc22v1knq01pglgg1lg3p504ikq"; name = "${pname}-${version}.AppImage"; }; in appimageTools.extract { @@ -51,7 +51,8 @@ mkDerivation rec { --run "cd $out" \ --set FONTCONFIG_FILE "${fontsConf}" \ --prefix LD_LIBRARY_PATH ":" "${xorg.libXcursor}/lib" \ - --prefix QT_XKB_CONFIG_ROOT ":" "${xorg.xkeyboardconfig}/share/X11/xkb" + --prefix QT_XKB_CONFIG_ROOT ":" "${xorg.xkeyboardconfig}/share/X11/xkb" \ + --set RIPCORD_ALLOW_UPDATES 0 runHook postInstall ''; diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index 5f5e0f9e9bfe7..3f5b0811a0f32 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 = "2.1.13"; + version = "2.2.0"; # Telegram-Desktop with submodules src = fetchurl { url = "https://github.com/telegramdesktop/tdesktop/releases/download/v${version}/tdesktop-${version}-full.tar.gz"; - sha256 = "0mq3f7faxn1hfkhv5n37y5iajjnm38s2in631046m0q7c4w3lrfi"; + sha256 = "1chikb02df4qqnickcmx96lcx481b14kmksjsp7h94g0d223ypq0"; }; postPatch = '' diff --git a/pkgs/applications/networking/irc/convos/default.nix b/pkgs/applications/networking/irc/convos/default.nix index d4b140815ccb6..6adcaa7b3d6a2 100644 --- a/pkgs/applications/networking/irc/convos/default.nix +++ b/pkgs/applications/networking/irc/convos/default.nix @@ -6,13 +6,13 @@ with stdenv.lib; perlPackages.buildPerlPackage rec { pname = "convos"; - version = "4.23"; + version = "4.29"; - src = fetchFromGitHub rec { + src = fetchFromGitHub { owner = "Nordaaker"; repo = pname; rev = version; - sha256 = "0py9dvqf67vhgdlx20jzwnh313ns1d29yiiqgijydyfj2lflyz12"; + sha256 = "07m9lhwgqq77hi4n2zrya7n8apkjv8xi166bxa0n7pnlknlp74ar"; }; nativeBuildInputs = [ makeWrapper ] @@ -39,16 +39,6 @@ perlPackages.buildPerlPackage rec { substituteInPlace t/web-register-open-to-public.t \ --replace '!127.0.0.1!' '!localhost!' - # Time-impurity in test, (fixed in master) - # - substituteInPlace t/web-load-user.t \ - --replace '400' '410' - - # Disk-space check fails on zfs, (fixed in master) - # - substituteInPlace t/web-admin.t \ - --replace 'qr{/dev/}' 'qr{\w}' - # Module::Install is a runtime dependency not covered by the tests, so we add # a test for it. # diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix index 26f47dba4617a..57849b46fcbd1 100644 --- a/pkgs/applications/networking/mailreaders/notmuch/default.nix +++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix @@ -12,7 +12,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - version = "0.29.3"; + version = "0.30"; pname = "notmuch"; passthru = { @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://notmuchmail.org/releases/${pname}-${version}.tar.xz"; - sha256 = "0dfwa38vgnxk9cvvpza66szjgp8lir6iz6yy0cry9593lywh9xym"; + sha256 = "1ylnj12f7xr18v3ckb1nwc2aw2rj3ghqnj5f4rzccr8xw5pslfsy"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/p2p/torrential/default.nix b/pkgs/applications/networking/p2p/torrential/default.nix index e432818bec75e..d62e3b3b5a3f4 100644 --- a/pkgs/applications/networking/p2p/torrential/default.nix +++ b/pkgs/applications/networking/p2p/torrential/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, nix-update-script , cmake , pkgconfig , vala_0_40 @@ -51,7 +52,7 @@ stdenv.mkDerivation rec { ]; passthru = { - updateScript = pantheon.updateScript { + updateScript = nix-update-script { attrPath = pname; }; }; diff --git a/pkgs/applications/networking/ping/default.nix b/pkgs/applications/networking/ping/default.nix index ed63a72f2109b..8e4125ac72aad 100644 --- a/pkgs/applications/networking/ping/default.nix +++ b/pkgs/applications/networking/ping/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, nix-update-script , meson , ninja , vala @@ -52,7 +53,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = pantheon.updateScript { + updateScript = nix-update-script { attrPath = pname; }; }; diff --git a/pkgs/applications/networking/remote/wayvnc/add-missing-librt.patch b/pkgs/applications/networking/remote/wayvnc/add-missing-librt.patch deleted file mode 100644 index e2d617bcc7ca9..0000000000000 --- a/pkgs/applications/networking/remote/wayvnc/add-missing-librt.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/meson.build b/meson.build -index cc6fa03..7c2b280 100644 ---- a/meson.build -+++ b/meson.build -@@ -24,6 +24,7 @@ add_project_arguments(c_args, language: 'c') - cc = meson.get_compiler('c') - - libm = cc.find_library('m', required: false) -+librt = cc.find_library('rt', required: false) - - pixman = dependency('pixman-1') - libuv = dependency('libuv') -@@ -65,6 +66,7 @@ sources = [ - - dependencies = [ - libm, -+ librt, - pixman, - libuv, - egl, diff --git a/pkgs/applications/networking/remote/wayvnc/default.nix b/pkgs/applications/networking/remote/wayvnc/default.nix index 4ca6ae952580f..32373e22b762f 100644 --- a/pkgs/applications/networking/remote/wayvnc/default.nix +++ b/pkgs/applications/networking/remote/wayvnc/default.nix @@ -1,27 +1,20 @@ { stdenv, fetchFromGitHub, meson, pkg-config, ninja -, pixman, libuv, libGL, libxkbcommon, wayland, neatvnc, libdrm, libX11 +, pixman, libxkbcommon, wayland, neatvnc, libdrm, libX11, aml }: stdenv.mkDerivation rec { pname = "wayvnc"; - version = "0.1.2"; + version = "0.2.0"; src = fetchFromGitHub { owner = "any1"; repo = pname; rev = "v${version}"; - sha256 = "0aa12fkbwhzs0g2pqw1b27l33nn5dpbcvsf1z8h88kwsf9xdvb2r"; + sha256 = "1ddcf8hrxhx4rcwvbjwa5j3ygiwca2dpw26wl37pb0q0jr81wylv"; }; - patches = [ ./add-missing-librt.patch ]; - - postPatch = '' - substituteInPlace meson.build \ - --replace "version: '0.1.0'" "version: '${version}'" - ''; - - nativeBuildInputs = [ meson pkg-config ninja ]; - buildInputs = [ pixman libuv libGL libxkbcommon wayland neatvnc libdrm libX11 ]; + nativeBuildInputs = [ meson pkg-config ninja wayland ]; + buildInputs = [ pixman libxkbcommon wayland neatvnc libdrm libX11 aml ]; meta = with stdenv.lib; { description = "A VNC server for wlroots based Wayland compositors"; diff --git a/pkgs/applications/networking/weather/meteo/default.nix b/pkgs/applications/networking/weather/meteo/default.nix index 9887e34d7354b..c0591f24c96d9 100644 --- a/pkgs/applications/networking/weather/meteo/default.nix +++ b/pkgs/applications/networking/weather/meteo/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitLab, vala, python3, pkgconfig, meson, ninja, gtk3 -, json-glib, libsoup, webkitgtk, geocode-glib +, json-glib, libsoup, webkitgtk, geocode-glib, nix-update-script , libappindicator, desktop-file-utils, appstream, wrapGAppsHook }: stdenv.mkDerivation rec { @@ -38,6 +38,13 @@ stdenv.mkDerivation rec { patchShebangs meson/post_install.py ''; + passthru = { + updateScript = nix-update-script { + attrPath = pname; + }; + }; + + meta = with stdenv.lib; { description = "Know the forecast of the next hours & days"; homepage = "https://gitlab.com/bitseater/meteo"; diff --git a/pkgs/applications/office/aesop/default.nix b/pkgs/applications/office/aesop/default.nix index 4f8c115600afb..0e76c101545b0 100644 --- a/pkgs/applications/office/aesop/default.nix +++ b/pkgs/applications/office/aesop/default.nix @@ -1,4 +1,4 @@ -{ stdenv, vala, fetchFromGitHub, pantheon, pkgconfig, meson, ninja, python3, gtk3 +{ stdenv, vala, fetchFromGitHub, nix-update-script, pantheon, pkgconfig, meson, ninja, python3, gtk3 , desktop-file-utils, json-glib, libsoup, libgee, poppler, wrapGAppsHook, fetchpatch }: stdenv.mkDerivation rec { @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = pantheon.updateScript { + updateScript = nix-update-script { attrPath = pname; }; }; diff --git a/pkgs/applications/office/agenda/default.nix b/pkgs/applications/office/agenda/default.nix index f7028ad67659a..32cb2988ae301 100644 --- a/pkgs/applications/office/agenda/default.nix +++ b/pkgs/applications/office/agenda/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, nix-update-script , pantheon , meson , ninja @@ -50,7 +51,7 @@ stdenv.mkDerivation rec { doCheck = true; passthru = { - updateScript = pantheon.updateScript { + updateScript = nix-update-script { attrPath = pname; }; }; diff --git a/pkgs/applications/office/envelope/default.nix b/pkgs/applications/office/envelope/default.nix index 2a2f55a27a40e..450b52bc0ca11 100644 --- a/pkgs/applications/office/envelope/default.nix +++ b/pkgs/applications/office/envelope/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, nix-update-script , fetchpatch , meson , ninja @@ -65,7 +66,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = pantheon.updateScript { + updateScript = nix-update-script { attrPath = pname; }; }; diff --git a/pkgs/applications/office/khronos/default.nix b/pkgs/applications/office/khronos/default.nix index 1962528f6b68e..b5cb94cda9b2f 100644 --- a/pkgs/applications/office/khronos/default.nix +++ b/pkgs/applications/office/khronos/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, nix-update-script , meson , ninja , vala @@ -49,7 +50,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = pantheon.updateScript { + updateScript = nix-update-script { attrPath = pname; }; }; diff --git a/pkgs/applications/office/notes-up/default.nix b/pkgs/applications/office/notes-up/default.nix index 055b3a41d0918..6936387fb3cca 100644 --- a/pkgs/applications/office/notes-up/default.nix +++ b/pkgs/applications/office/notes-up/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, nix-update-script , pantheon , pkgconfig , vala_0_46 @@ -52,7 +53,7 @@ stdenv.mkDerivation rec { cmakeFlags = stdenv.lib.optional (!withPantheon) "-Dnoele=yes"; passthru = { - updateScript = pantheon.updateScript { + updateScript = nix-update-script { attrPath = pname; }; }; diff --git a/pkgs/applications/office/spice-up/default.nix b/pkgs/applications/office/spice-up/default.nix index fed00000af3a1..0cf7e8c53f145 100644 --- a/pkgs/applications/office/spice-up/default.nix +++ b/pkgs/applications/office/spice-up/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, nix-update-script , fetchpatch , cmake , gdk-pixbuf @@ -61,7 +62,7 @@ stdenv.mkDerivation rec { ]; passthru = { - updateScript = pantheon.updateScript { + updateScript = nix-update-script { attrPath = pname; }; }; diff --git a/pkgs/applications/office/timetable/default.nix b/pkgs/applications/office/timetable/default.nix index 1f1d44e749484..838b1724ee86c 100644 --- a/pkgs/applications/office/timetable/default.nix +++ b/pkgs/applications/office/timetable/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, nix-update-script , glib , gtk3 , vala @@ -48,7 +49,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = pantheon.updateScript { + updateScript = nix-update-script { attrPath = pname; }; }; diff --git a/pkgs/applications/science/biology/hmmer/default.nix b/pkgs/applications/science/biology/hmmer/default.nix index 3786b62f7477f..6ee7cd609c423 100644 --- a/pkgs/applications/science/biology/hmmer/default.nix +++ b/pkgs/applications/science/biology/hmmer/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - version = "3.3"; + version = "3.3.1"; pname = "hmmer"; src = fetchurl { url = "http://eddylab.org/software/hmmer/${pname}-${version}.tar.gz"; - sha256 = "0v3kcgkr6jihq0xmpgn2xd5q7wiwvj6yswa905k2c0v7mx0bz1h1"; + sha256 = "1mcvr74w6ffd5z0p8v3jss473mbgard9lz5whjnk95c661lnmrlc"; }; meta = with stdenv.lib; { @@ -20,6 +20,6 @@ stdenv.mkDerivation rec { homepage = "http://hmmer.org/"; license = licenses.gpl3; maintainers = [ maintainers.iimog ]; - platforms = [ "x86_64-linux" "i686-linux" ]; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/science/biology/itsx/default.nix b/pkgs/applications/science/biology/itsx/default.nix index ac534a4ec3cd4..6f66cfc9cc370 100644 --- a/pkgs/applications/science/biology/itsx/default.nix +++ b/pkgs/applications/science/biology/itsx/default.nix @@ -29,6 +29,6 @@ stdenv.mkDerivation rec { homepage = "https://microbiology.se/software/itsx/"; license = licenses.gpl3; maintainers = [ maintainers.bzizou ]; - platforms = [ "x86_64-linux" "i686-linux" ]; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/science/electronics/magic-vlsi/default.nix b/pkgs/applications/science/electronics/magic-vlsi/default.nix index 62b830547e534..96849c3002986 100644 --- a/pkgs/applications/science/electronics/magic-vlsi/default.nix +++ b/pkgs/applications/science/electronics/magic-vlsi/default.nix @@ -31,6 +31,6 @@ stdenv.mkDerivation { description = "VLSI layout tool written in Tcl"; homepage = "http://opencircuitdesign.com/magic/"; license = licenses.mit; - maintainers = [ maintainers.dkudriavtsev ]; + maintainers = [ maintainers.anna328p ]; }; } diff --git a/pkgs/applications/science/logic/drat-trim/default.nix b/pkgs/applications/science/logic/drat-trim/default.nix index 4099236e62800..81e20df334244 100644 --- a/pkgs/applications/science/logic/drat-trim/default.nix +++ b/pkgs/applications/science/logic/drat-trim/default.nix @@ -1,13 +1,14 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation { - name = "drat-trim-2017-08-31"; + pname = "drat-trim-unstable"; + version = "2020-06-05"; src = fetchFromGitHub { owner = "marijnheule"; repo = "drat-trim"; - rev = "37ac8f874826ffa3500a00698910e137498defac"; - sha256 = "1m9q47dfnvdli1z3kb1jvvbm0dgaw725k1aw6h9w00bggqb91bqh"; + rev = "9afad0f7156a1e9c6ce19dce5d72cf1cb9a3ef27"; + sha256 = "1zq585igfaknwqbvv2cji744016zxadbvr0ifr5l6yq13m0vvn3b"; }; postPatch = '' @@ -15,7 +16,7 @@ stdenv.mkDerivation { ''; installPhase = '' - install -Dt $out/bin drat-trim + install -Dt $out/bin drat-trim lrat-check ''; meta = with stdenv.lib; { @@ -31,6 +32,10 @@ stdenv.mkDerivation { annual SAT Competition in recent years, in order to check competing SAT solvers' work when they claim that a SAT instance is unsatisfiable. + + This package also contains the related tool LRAT-check, which checks a + proof format called LRAT which extends DRAT with hint statements to speed + up the checking process. ''; homepage = "https://www.cs.utexas.edu/~marijn/drat-trim/"; license = licenses.mit; diff --git a/pkgs/applications/science/machine-learning/finalfrontier/default.nix b/pkgs/applications/science/machine-learning/finalfrontier/default.nix new file mode 100644 index 0000000000000..8a4d5acede0f8 --- /dev/null +++ b/pkgs/applications/science/machine-learning/finalfrontier/default.nix @@ -0,0 +1,52 @@ +{ lib +, stdenv +, rustPlatform +, fetchFromGitHub +, installShellFiles +, pkg-config +, libiconv +, openssl +, Security +}: + +rustPlatform.buildRustPackage rec { + pname = "finalfrontier"; + version = "0.9.4"; + + src = fetchFromGitHub { + owner = "finalfusion"; + repo = pname; + rev = version; + sha256 = "1lvwv238p8hrl4sc5pmnvaargl2dd25p44gxl3kibq5ng03afd0n"; + }; + + cargoSha256 = "1ibn22v24brdlrar6j7fryiwimbbw7byak265hrw7a5agf1799x0"; + + nativeBuildInputs = [ + installShellFiles + pkg-config + ]; + + buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ + libiconv + Security + ]; + + postInstall = '' + installManPage man/*.1 + + # Install shell completions + for shell in bash fish zsh; do + $out/bin/finalfrontier completions $shell > finalfrontier.$shell + done + installShellCompletion finalfrontier.{bash,fish,zsh} + ''; + + meta = with stdenv.lib; { + description = "Utility for training word and subword embeddings"; + homepage = "https://github.com/finalfusion/finalfrontier/"; + license = licenses.asl20; + maintainers = with maintainers; [ danieldk ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/applications/system/monitor/default.nix b/pkgs/applications/system/monitor/default.nix index 637f20a0eb359..30ae9e51e9eb6 100644 --- a/pkgs/applications/system/monitor/default.nix +++ b/pkgs/applications/system/monitor/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, nix-update-script , meson , ninja , vala @@ -55,7 +56,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = pantheon.updateScript { + updateScript = nix-update-script { attrPath = pname; }; }; 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 27daf1a30aac5..65c49e3322835 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.11.0"; + version = "0.11.1"; src = fetchFromGitHub { owner = "cli"; repo = "cli"; rev = "v${version}"; - sha256 = "13nq7rvxwl9cld9gng7rm534yqrr2ii0bqyzqwlkpzh9m61m3ra2"; + sha256 = "0l1d75smvly2k6s3j55n674ld6i5hd8yn6lfhg8vvkvhxx2jjvb9"; }; - vendorSha256 = "1xvrxdxhyj5nz5plypc5mniw5dl17w1wxcrs77w24hisn90jphgd"; + vendorSha256 = "1xq1n583p0a3j78afprm2hk5f1hchdrx4vvphml95rv9786vjbcc"; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/version-management/git-and-tools/git-filter-repo/default.nix b/pkgs/applications/version-management/git-and-tools/git-filter-repo/default.nix index e4c57be2357c4..5a7e5bd32afb2 100644 --- a/pkgs/applications/version-management/git-and-tools/git-filter-repo/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-filter-repo/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "git-filter-repo"; - version = "2.27.1"; + version = "2.28.0"; src = fetchurl { url = "https://github.com/newren/git-filter-repo/releases/download/v${version}/${pname}-${version}.tar.xz"; - sha256 = "07r32n31ryflgz1ds3dz5s3ixv7li3scxwavy9mzbzdhq6bbzl28"; + sha256 = "0sa6h6k1mnhx8p8w5d88gx7cqbnxaazfj1dv47c107fk70hqvvpx"; }; buildInputs = [ pythonPackages.python ]; diff --git a/pkgs/applications/version-management/git-and-tools/git-workspace/default.nix b/pkgs/applications/version-management/git-and-tools/git-workspace/default.nix index 8894c4f0f7ad5..5de7fddbc0c67 100644 --- a/pkgs/applications/version-management/git-and-tools/git-workspace/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-workspace/default.nix @@ -2,22 +2,24 @@ , fetchFromGitHub , rustPlatform , Security +, pkgconfig, openssl }: rustPlatform.buildRustPackage rec { pname = "git-workspace"; - version = "0.6.0"; + version = "0.7.0"; src = fetchFromGitHub { owner = "orf"; repo = pname; rev = "v${version}"; - sha256 = "0n025bnisg724d9pjcindxagj1ry63sxr0pplpkh2f2qffzm78pi"; + sha256 = "1ckfk221ag6yhbqxfz432wpgbhddgzgdsaxhl1ymw90pwpnz717y"; }; - cargoSha256 = "0ikyp6pdlw2c1gr1n1snjbdmblm0fs5swx5awy36jskii99q6kr1"; + cargoSha256 = "0zkns037vgy96ybmn80px515ivz6yhj5br5mwbvxgl73va92wd9v"; - buildInputs = with stdenv; lib.optional isDarwin Security; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ openssl ] ++ stdenv.lib.optional stdenv.isDarwin Security; meta = with stdenv.lib; { description = "Sync personal and work git repositories from multiple providers"; diff --git a/pkgs/applications/version-management/gitea/default.nix b/pkgs/applications/version-management/gitea/default.nix index 0c60c10fb764b..70169bd90e5fb 100644 --- a/pkgs/applications/version-management/gitea/default.nix +++ b/pkgs/applications/version-management/gitea/default.nix @@ -8,11 +8,11 @@ with stdenv.lib; buildGoPackage rec { pname = "gitea"; - version = "1.12.2"; + version = "1.12.3"; src = fetchurl { url = "https://github.com/go-gitea/gitea/releases/download/v${version}/gitea-src-${version}.tar.gz"; - sha256 = "12zzb1c4cl07ccxaravkmia8vdyw5ffxrlx9v95ampvv6a0swpb9"; + sha256 = "05z1pp2lnbr82pw97wy0j0qk2vv1qv9c46df13d03xdfsc3gsm50"; }; unpackPhase = '' diff --git a/pkgs/applications/video/celluloid/default.nix b/pkgs/applications/video/celluloid/default.nix index 208cbb7f4e6a9..80a30852daeec 100644 --- a/pkgs/applications/video/celluloid/default.nix +++ b/pkgs/applications/video/celluloid/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, nix-update-script , meson , ninja , python3 @@ -49,6 +50,12 @@ stdenv.mkDerivation rec { doCheck = true; + passthru = { + updateScript = nix-update-script { + attrPath = pname; + }; + }; + meta = with stdenv.lib; { description = "Simple GTK frontend for the mpv video player"; longDescription = '' diff --git a/pkgs/applications/video/peek/default.nix b/pkgs/applications/video/peek/default.nix index 24c44c248f58a..6ca5c5bed2129 100644 --- a/pkgs/applications/video/peek/default.nix +++ b/pkgs/applications/video/peek/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, nix-update-script , meson , ninja , gettext @@ -68,6 +69,13 @@ stdenv.mkDerivation rec { gappsWrapperArgs+=(--prefix PATH : ${stdenv.lib.makeBinPath [ which ffmpeg_3 gifski ]}) ''; + passthru = { + updateScript = nix-update-script { + attrPath = pname; + }; + }; + + meta = with stdenv.lib; { homepage = "https://github.com/phw/peek"; description = "Simple animated GIF screen recorder with an easy to use interface"; diff --git a/pkgs/applications/virtualization/conmon/default.nix b/pkgs/applications/virtualization/conmon/default.nix index 83261c057a49d..675d713f4b4cd 100644 --- a/pkgs/applications/virtualization/conmon/default.nix +++ b/pkgs/applications/virtualization/conmon/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "conmon"; - version = "2.0.19"; + version = "2.0.20"; src = fetchFromGitHub { owner = "containers"; repo = pname; rev = "v${version}"; - sha256 = "005sz8aimbfm12d99q79yvsqczxbvbbgc725pavcbly3k1qva207"; + sha256 = "1f09wx5k98fa55r73y5v0sgf2lha675xhk40piyf0b7zqknl6lya"; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/virtualization/docker-slim/default.nix b/pkgs/applications/virtualization/docker-slim/default.nix index 996d52bacab20..6e5ba4abf3782 100644 --- a/pkgs/applications/virtualization/docker-slim/default.nix +++ b/pkgs/applications/virtualization/docker-slim/default.nix @@ -6,7 +6,7 @@ buildGoPackage rec { pname = "docker-slim"; - version = "1.29.0"; + version = "1.30.0"; goPackagePath = "github.com/docker-slim/docker-slim"; @@ -14,7 +14,7 @@ buildGoPackage rec { owner = "docker-slim"; repo = "docker-slim"; rev = version; - sha256 = "0qfjmwqxgghp9pqj4s2z71cmn8mi1l6655z6nbhh72yqaxh5a6ia"; + sha256 = "10w5v0qqj8yqd81hpz65pq1lx0j9pl112s7hl6y9p3i3f0m0931f"; }; subPackages = [ "cmd/docker-slim" "cmd/docker-slim-sensor" ]; @@ -41,10 +41,5 @@ buildGoPackage rec { homepage = "https://dockersl.im/"; license = licenses.asl20; maintainers = with maintainers; [ filalex77 marsam mbrgm ]; - # internal/app/sensor/monitors/ptrace/monitor.go:151:16: undefined: - # system.CallNumber - # internal/app/sensor/monitors/ptrace/monitor.go:161:15: undefined: - # system.CallReturnValue - badPlatforms = [ "aarch64-linux" ]; }; } diff --git a/pkgs/applications/virtualization/hercules/default.nix b/pkgs/applications/virtualization/hercules/default.nix index 901e2f0b6ec06..8746e66668ff2 100644 --- a/pkgs/applications/virtualization/hercules/default.nix +++ b/pkgs/applications/virtualization/hercules/default.nix @@ -13,6 +13,6 @@ stdenv.mkDerivation rec { description = "IBM mainframe emulator"; homepage = "http://www.hercules-390.eu"; license = licenses.qpl; - maintainers = [ maintainers.dkudriavtsev ]; + maintainers = [ maintainers.anna328p ]; }; } diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index c5dcc2fafc689..ada0d96910983 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -133,15 +133,18 @@ stdenv.mkDerivation rec { dontWrapGApps = true; postFixup = '' - # copy qemu-ga (guest agent) to separate output - mkdir -p $ga/bin - cp $out/bin/qemu-ga $ga/bin/ - '' + optionalString gtkSupport '' - # wrap GTK Binaries - for f in $out/bin/qemu-system-*; do - wrapGApp $f - done - ''; + # the .desktop is both invalid and pointless + rm $out/share/applications/qemu.desktop + + # copy qemu-ga (guest agent) to separate output + mkdir -p $ga/bin + cp $out/bin/qemu-ga $ga/bin/ + '' + optionalString gtkSupport '' + # wrap GTK Binaries + for f in $out/bin/qemu-system-*; do + wrapGApp $f + done + ''; # Add a ‘qemu-kvm’ wrapper for compatibility/convenience. postInstall = '' diff --git a/pkgs/applications/window-managers/i3/lock-color.nix b/pkgs/applications/window-managers/i3/lock-color.nix index c5e203ab1a58f..a64e5ea33693e 100644 --- a/pkgs/applications/window-managers/i3/lock-color.nix +++ b/pkgs/applications/window-managers/i3/lock-color.nix @@ -4,14 +4,14 @@ }: stdenv.mkDerivation rec { - version = "2.12.c.4"; + version = "2.12.c.5"; pname = "i3lock-color"; src = fetchFromGitHub { owner = "PandorasFox"; repo = "i3lock-color"; rev = version; - sha256 = "1jbk7kd49vgmakbldwwnbsp484fwh1pbzg8k8qvbq4dzbzf3q5hs"; + sha256 = "10h50a6p9ivqjz8hd5pn9l03vz6y9dxdx68bprqssfzdkzqnzaiv"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/common-updater/nix-update.nix b/pkgs/common-updater/nix-update.nix new file mode 100644 index 0000000000000..13b85bf52fff6 --- /dev/null +++ b/pkgs/common-updater/nix-update.nix @@ -0,0 +1,5 @@ +{ nix-update }: + +{ attrPath }: + +[ "${nix-update}/bin/nix-update" attrPath ] diff --git a/pkgs/data/fonts/cascadia-code/default.nix b/pkgs/data/fonts/cascadia-code/default.nix index 56894f9209541..220d2684eef57 100644 --- a/pkgs/data/fonts/cascadia-code/default.nix +++ b/pkgs/data/fonts/cascadia-code/default.nix @@ -1,44 +1,21 @@ -{ stdenv, fetchurl }: +{ lib, fetchzip }: +let + version = "2007.01"; +in +fetchzip { + name = "cascadia-code-${version}"; -stdenv.mkDerivation rec { - pname = "cascadia-code"; - version = "1911.21"; + url = "https://github.com/microsoft/cascadia-code/releases/download/v${version}/CascadiaCode-${version}.zip"; - srcs = [ - (fetchurl { - url = "https://github.com/microsoft/cascadia-code/releases/download/v${version}/Cascadia.ttf"; - sha256 = "1m5ymbngjg3n1g3p6vhcq7d825bwwln9afih651ar3jn7j9njnyg"; - }) - (fetchurl { - url = "https://github.com/microsoft/cascadia-code/releases/download/v${version}/CascadiaMono.ttf"; - sha256 = "0vkhm6rhspzd1iayxrzaag099wsc94azfqa3ips7f4x9s8fmbp80"; - }) - (fetchurl { - url = "https://github.com/microsoft/cascadia-code/releases/download/v${version}/CascadiaMonoPL.ttf"; - sha256 = "0xxqd8m2ydn97jngp1a3ik1mzpjbm65pfq02a82gfbbvajq5d673"; - }) - (fetchurl { - url = "https://github.com/microsoft/cascadia-code/releases/download/v${version}/CascadiaPL.ttf"; - sha256 = "1s83c9flvifd05nbhnk8knwnik7p621sr7i94smknigc7d72wqav"; - }) - ]; + sha256 = "173dpr0k4y5b02ps9426pyaazl2pxj1kw5l5jrikbi6zjv4590gb"; - unpackCmd = '' - ttfName=$(basename $(stripHash $curSrc)) - cp $curSrc ./$ttfName + postFetch = '' + mkdir -p $out/share/fonts/ + unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype + unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype ''; - sourceRoot = "."; - - installPhase = '' - install -Dm444 -t $out/share/fonts/truetype *.ttf - ''; - - outputHashAlgo = "sha256"; - outputHashMode = "recursive"; - outputHash = "1gkjs7qa409r4ykdy4ik8i0c3z49hzpklw6kyijhhifhyyyzhz4h"; - - meta = with stdenv.lib; { + meta = with lib; { description = "Monospaced font that includes programming ligatures and is designed to enhance the modern look and feel of the Windows Terminal"; homepage = "https://github.com/microsoft/cascadia-code"; license = licenses.ofl; diff --git a/pkgs/data/fonts/ibm-plex/default.nix b/pkgs/data/fonts/ibm-plex/default.nix index 70657f03281e9..4e1001adb6937 100644 --- a/pkgs/data/fonts/ibm-plex/default.nix +++ b/pkgs/data/fonts/ibm-plex/default.nix @@ -1,7 +1,7 @@ { lib, fetchzip }: let - version = "5.0.0"; + version = "5.1.0"; in fetchzip { name = "ibm-plex-${version}"; @@ -13,7 +13,7 @@ in fetchzip { unzip -j $downloadedFile "OpenType/*/*.otf" -d $out/share/fonts/opentype ''; - sha256 = "1m8a9p0bryrj05v7sg9kqvyp0ddhgdwd0zjbn0i4l296cj5s2k97"; + sha256 = "1lcbj6zkpnsq38s2xkx3z4d7bd43k630lmzmgdcv1w05gjij0pw5"; meta = with lib; { description = "IBM Plex Typeface"; diff --git a/pkgs/data/fonts/redhat-official/default.nix b/pkgs/data/fonts/redhat-official/default.nix index 44eea3774ffcc..37ca9db9fa0b1 100644 --- a/pkgs/data/fonts/redhat-official/default.nix +++ b/pkgs/data/fonts/redhat-official/default.nix @@ -1,16 +1,21 @@ -{ lib, fetchzip }: - -let version = "2.2.0"; in -fetchzip { +{ lib, fetchFromGitHub }: +let + version = "2.3.2"; +in +fetchFromGitHub { name = "redhat-official-${version}"; - url = "https://github.com/RedHatOfficial/RedHatFont/archive/${version}.zip"; + + owner = "RedHatOfficial"; + repo = "RedHatFont"; + rev = version; postFetch = '' - mkdir -p $out/share/fonts/opentype - unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype + tar xf $downloadedFile --strip=1 + install -m444 -Dt $out/share/fonts/opentype OTF/*.otf + install -m444 -Dt $out/share/fonts/truetype TTF/*.ttf ''; - sha256 = "0yb6shgq6jrv3kq9faky66qpdbv4g580c3jl942844grwyngymyj"; + sha256 = "1afvxmgif61hb17g8inmxvq30vkzwh30mydlqpf0zgvaaz8qdwmv"; meta = with lib; { homepage = "https://github.com/RedHatOfficial/RedHatFont"; diff --git a/pkgs/data/fonts/sarasa-gothic/default.nix b/pkgs/data/fonts/sarasa-gothic/default.nix index 96bfaf191c3db..9fce696b6e861 100644 --- a/pkgs/data/fonts/sarasa-gothic/default.nix +++ b/pkgs/data/fonts/sarasa-gothic/default.nix @@ -1,12 +1,12 @@ { lib, fetchurl, libarchive }: let - version = "0.12.6"; + version = "0.12.11"; in fetchurl { name = "sarasa-gothic-${version}"; url = "https://github.com/be5invis/Sarasa-Gothic/releases/download/v${version}/sarasa-gothic-ttc-${version}.7z"; - sha256 = "1b15gsmv2jr0r8xssr8216s8xsghr6w5wm3w3imm3qlh3kqk1qg8"; + sha256 = "0vcp8583by7pfqinq8p2jx2bn4dqq816x4bxgv05k0kb9ziwj7aj"; recursiveHash = true; downloadToTemp = true; diff --git a/pkgs/data/fonts/sudo/default.nix b/pkgs/data/fonts/sudo/default.nix index 8becdf83f5dc9..48ca0fea1e42e 100644 --- a/pkgs/data/fonts/sudo/default.nix +++ b/pkgs/data/fonts/sudo/default.nix @@ -1,11 +1,11 @@ { lib, fetchzip }: let - version = "0.42"; + version = "0.50"; in fetchzip { name = "sudo-font-${version}"; - url = "https://github.com/jenskutilek/sudo-font/releases/download/v${version}/sudo.zip"; - sha256 = "1rqpwihf2sakrhkaw041r3xc9fhafaqn22n79haqkmwv4vmnspch"; + url = "https://github.com/jenskutilek/sudo-font/raw/v${version}/dist/sudo.zip"; + sha256 = "1mk81r9p7ks6av3rj06c6n9vx2qv2hwx6zfbc2mk1filxjirk1ll"; postFetch = '' mkdir -p $out/share/fonts/ diff --git a/pkgs/data/themes/adwaita-qt/default.nix b/pkgs/data/themes/adwaita-qt/default.nix index c5c9bbbe37f08..ace93fa44950f 100644 --- a/pkgs/data/themes/adwaita-qt/default.nix +++ b/pkgs/data/themes/adwaita-qt/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, fetchFromGitHub, cmake, ninja, qtbase, pantheon }: +{ mkDerivation, lib, fetchFromGitHub, nix-update-script, cmake, ninja, qtbase, pantheon }: mkDerivation rec { pname = "adwaita-qt"; @@ -27,7 +27,7 @@ mkDerivation rec { ''; passthru = { - updateScript = pantheon.updateScript { + updateScript = nix-update-script { attrPath = pname; }; }; diff --git a/pkgs/desktops/enlightenment/enlightenment.nix b/pkgs/desktops/enlightenment/enlightenment.nix index 2d402b329892c..90a15a1d52351 100644 --- a/pkgs/desktops/enlightenment/enlightenment.nix +++ b/pkgs/desktops/enlightenment/enlightenment.nix @@ -19,11 +19,11 @@ stdenv.mkDerivation rec { pname = "enlightenment"; - version = "0.24.1"; + version = "0.24.2"; src = fetchurl { url = "http://download.enlightenment.org/rel/apps/${pname}/${pname}-${version}.tar.xz"; - sha256 = "02aadl5fqvpmpjnisrc4aw7ffwyp1109y4k1wvmp33ciihbvdqmf"; + sha256 = "1wfz0rwwsx7c1mkswn4hc9xw1i6bsdirhxiycf7ha2vcipqy465y"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome-3/extensions/arc-menu/default.nix b/pkgs/desktops/gnome-3/extensions/arc-menu/default.nix index 7bd31f587f675..336820b7938eb 100644 --- a/pkgs/desktops/gnome-3/extensions/arc-menu/default.nix +++ b/pkgs/desktops/gnome-3/extensions/arc-menu/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "gnome-shell-arc-menu"; - version = "43"; + version = "47"; src = fetchFromGitLab { - owner = "LinxGem33"; + owner = "arcmenu-team"; repo = "Arc-Menu"; rev = "v${version}-Stable"; - sha256 = "1rspl89bxqy0wla8cj0h1d29gp38xg1vmvhc1qg7bl46ank4yp5q"; + sha256 = "1hhjxdm1sm9pddhkkxx532hqqiv9ghvqgn9xszg1jwhj29380fv6"; }; patches = [ diff --git a/pkgs/desktops/gnome-3/extensions/arc-menu/fix_gmenu.patch b/pkgs/desktops/gnome-3/extensions/arc-menu/fix_gmenu.patch index 7f6b8489ea8bf..5d8584f52a6aa 100644 --- a/pkgs/desktops/gnome-3/extensions/arc-menu/fix_gmenu.patch +++ b/pkgs/desktops/gnome-3/extensions/arc-menu/fix_gmenu.patch @@ -1,12 +1,11 @@ --- a/extension.js +++ b/extension.js -@@ -29,6 +29,8 @@ - * https://github.com/The-Panacea-Projects/Gnomenu - */ - -+ -+imports.gi.GIRepository.Repository.prepend_search_path('@gmenu_path@'); - - // Import Libraries - const Main = imports.ui.main; +@@ -23,6 +23,8 @@ + + const Me = imports.misc.extensionUtils.getCurrentExtension(); ++imports.gi.GIRepository.Repository.prepend_search_path('@gmenu_path@'); ++ + const {GLib, Gio, St} = imports.gi; + const Constants = Me.imports.constants; + const Controller = Me.imports.controller; diff --git a/pkgs/desktops/gnome-3/extensions/mpris-indicator-button/default.nix b/pkgs/desktops/gnome-3/extensions/mpris-indicator-button/default.nix index 0c1d98b2fae00..4bf4b7508176a 100644 --- a/pkgs/desktops/gnome-3/extensions/mpris-indicator-button/default.nix +++ b/pkgs/desktops/gnome-3/extensions/mpris-indicator-button/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, nix-update-script , gnome3 }: @@ -23,6 +24,13 @@ stdenv.mkDerivation rec { runHook postInstall ''; + passthru = { + updateScript = nix-update-script { + attrPath = "gnomeExtensions.${pname}"; + }; + }; + + meta = with stdenv.lib; { description = "A simple MPRIS indicator button for GNOME Shell"; license = licenses.gpl3; diff --git a/pkgs/desktops/mate/atril/default.nix b/pkgs/desktops/mate/atril/default.nix index e71ca81142a7f..12c89ee1b111a 100644 --- a/pkgs/desktops/mate/atril/default.nix +++ b/pkgs/desktops/mate/atril/default.nix @@ -1,4 +1,25 @@ -{ stdenv, fetchurl, pkgconfig, gettext, gtk3, glib, libxml2, libsecret, poppler, itstool, hicolor-icon-theme, texlive, mate, wrapGAppsHook }: +{ stdenv +, fetchurl +, pkgconfig +, gettext +, gtk3 +, glib +, libxml2 +, libsecret +, poppler +, itstool +, hicolor-icon-theme +, texlive +, mate +, wrapGAppsHook +, enableEpub ? true, webkitgtk +, enableDjvu ? true, djvulibre +, enablePostScript ? true, libspectre +, enableXps ? true, libgxps +, enableImages ? false +}: + +with stdenv.lib; stdenv.mkDerivation rec { pname = "atril"; @@ -26,7 +47,19 @@ stdenv.mkDerivation rec { mate.mate-desktop hicolor-icon-theme texlive.bin.core # for synctex, used by the pdf back-end - ]; + ] + ++ optionals enableDjvu [ djvulibre ] + ++ optionals enableEpub [ webkitgtk ] + ++ optionals enablePostScript [ libspectre ] + ++ optionals enableXps [ libgxps ] + ; + + configureFlags = [ ] + ++ optionals (enableDjvu) [ "--enable-djvu" ] + ++ optionals (enableEpub) [ "--enable-epub" ] + ++ optionals (enablePostScript) [ "--enable-ps" ] + ++ optionals (enableXps) [ "--enable-xps" ] + ++ optionals (enableImages) [ "--enable-pixbuf" ]; NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; diff --git a/pkgs/desktops/pantheon/apps/appcenter/default.nix b/pkgs/desktops/pantheon/apps/appcenter/default.nix index 21e06a7fa6b42..2432389383864 100644 --- a/pkgs/desktops/pantheon/apps/appcenter/default.nix +++ b/pkgs/desktops/pantheon/apps/appcenter/default.nix @@ -1,4 +1,5 @@ { stdenv +, nix-update-script , appstream , appstream-glib , dbus @@ -30,17 +31,17 @@ stdenv.mkDerivation rec { pname = "appcenter"; - version = "3.4.0"; + version = "3.4.1"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "04q2gp9yyqsg4jd53rivcmikw52psxijrzfy2vxzjsx8fccd48ra"; + sha256 = "1bwkjxl4k49hvy88llif82hdancda9692vjwkw4bxy2cbz8444zx"; }; passthru = { - updateScript = pantheon.updateScript { + updateScript = nix-update-script { attrPath = "pantheon.${pname}"; }; }; diff --git a/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix b/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix index f2f6faedc5ad5..058148e07c822 100644 --- a/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, nix-update-script , pantheon , pkgconfig , meson @@ -30,7 +31,7 @@ stdenv.mkDerivation rec { }; passthru = { - updateScript = pantheon.updateScript { + updateScript = nix-update-script { attrPath = "pantheon.${pname}"; }; }; diff --git a/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix b/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix index adaec2498b86d..cdb5e860650c2 100644 --- a/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, nix-update-script , pantheon , pkgconfig , meson @@ -37,7 +38,7 @@ stdenv.mkDerivation rec { }; passthru = { - updateScript = pantheon.updateScript { + updateScript = nix-update-script { attrPath = "pantheon.${pname}"; }; }; diff --git a/pkgs/desktops/pantheon/apps/elementary-camera/default.nix b/pkgs/desktops/pantheon/apps/elementary-camera/default.nix index 712f2bec8d5e7..9874d87eae9fa 100644 --- a/pkgs/desktops/pantheon/apps/elementary-camera/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-camera/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, nix-update-script , pantheon , pkgconfig , meson @@ -35,7 +36,7 @@ stdenv.mkDerivation rec { }; passthru = { - updateScript = pantheon.updateScript { + updateScript = nix-update-script { attrPath = "pantheon.${pname}"; }; }; diff --git a/pkgs/desktops/pantheon/apps/elementary-code/default.nix b/pkgs/desktops/pantheon/apps/elementary-code/default.nix index 086e0cf7a57b9..635b5cfc73526 100644 --- a/pkgs/desktops/pantheon/apps/elementary-code/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-code/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, nix-update-script , pantheon , pkgconfig , meson @@ -39,7 +40,7 @@ stdenv.mkDerivation rec { }; passthru = { - updateScript = pantheon.updateScript { + updateScript = nix-update-script { attrPath = "pantheon.${pname}"; }; }; diff --git a/pkgs/desktops/pantheon/apps/elementary-feedback/default.nix b/pkgs/desktops/pantheon/apps/elementary-feedback/default.nix index e54841275f6f7..3b257b0812f00 100644 --- a/pkgs/desktops/pantheon/apps/elementary-feedback/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-feedback/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, nix-update-script , pantheon , pkgconfig , meson @@ -30,7 +31,7 @@ stdenv.mkDerivation rec { }; passthru = { - updateScript = pantheon.updateScript { + updateScript = nix-update-script { attrPath = "pantheon.${pname}"; }; }; diff --git a/pkgs/desktops/pantheon/apps/elementary-files/default.nix b/pkgs/desktops/pantheon/apps/elementary-files/default.nix index 346971d4fb415..f6215e5025b2a 100644 --- a/pkgs/desktops/pantheon/apps/elementary-files/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-files/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, nix-update-script , pantheon , pkgconfig , meson @@ -30,7 +31,7 @@ stdenv.mkDerivation rec { pname = "elementary-files"; - version = "4.4.3"; + version = "4.4.4"; repoName = "files"; @@ -40,11 +41,11 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = repoName; rev = version; - sha256 = "14i5icgpsy78mr7w6cav38p7shfk784b6nlxz9y72rbcxky036yc"; + sha256 = "1hsh9kg30l90r2aqrrap1nfmgjf0la8mfd8h4xm6d7acailcnhmb"; }; passthru = { - updateScript = pantheon.updateScript { + updateScript = nix-update-script { attrPath = "pantheon.${pname}"; }; }; diff --git a/pkgs/desktops/pantheon/apps/elementary-music/default.nix b/pkgs/desktops/pantheon/apps/elementary-music/default.nix index 85739a6ec2ec0..8849965eddecb 100644 --- a/pkgs/desktops/pantheon/apps/elementary-music/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-music/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, nix-update-script , pantheon , pkgconfig , meson @@ -41,7 +42,7 @@ stdenv.mkDerivation rec { }; passthru = { - updateScript = pantheon.updateScript { + updateScript = nix-update-script { attrPath = "pantheon.${pname}"; }; }; diff --git a/pkgs/desktops/pantheon/apps/elementary-photos/default.nix b/pkgs/desktops/pantheon/apps/elementary-photos/default.nix index 5c6d34a55a515..252791df1d5f8 100644 --- a/pkgs/desktops/pantheon/apps/elementary-photos/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-photos/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, nix-update-script , pantheon , meson , ninja @@ -45,7 +46,7 @@ stdenv.mkDerivation rec { }; passthru = { - updateScript = pantheon.updateScript { + updateScript = nix-update-script { attrPath = "pantheon.${pname}"; }; }; diff --git a/pkgs/desktops/pantheon/apps/elementary-screenshot-tool/default.nix b/pkgs/desktops/pantheon/apps/elementary-screenshot-tool/default.nix index 078d496bf0db8..611e683491fc8 100644 --- a/pkgs/desktops/pantheon/apps/elementary-screenshot-tool/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-screenshot-tool/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, nix-update-script , pantheon , pkgconfig , meson @@ -29,7 +30,7 @@ stdenv.mkDerivation rec { }; passthru = { - updateScript = pantheon.updateScript { + updateScript = nix-update-script { attrPath = "pantheon.${pname}"; }; }; diff --git a/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix b/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix index f9f81c37a4b9c..c7c1c8780ed6c 100644 --- a/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, nix-update-script , fetchpatch , pantheon , pkgconfig @@ -34,7 +35,7 @@ stdenv.mkDerivation rec { }; passthru = { - updateScript = pantheon.updateScript { + updateScript = nix-update-script { attrPath = "pantheon.${pname}"; }; }; diff --git a/pkgs/desktops/pantheon/apps/elementary-videos/default.nix b/pkgs/desktops/pantheon/apps/elementary-videos/default.nix index 8079d4e7887a3..03b730cecac59 100644 --- a/pkgs/desktops/pantheon/apps/elementary-videos/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-videos/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, nix-update-script , pantheon , pkgconfig , meson @@ -31,7 +32,7 @@ stdenv.mkDerivation rec { }; passthru = { - updateScript = pantheon.updateScript { + updateScript = nix-update-script { attrPath = "pantheon.${pname}"; }; }; diff --git a/pkgs/desktops/pantheon/apps/sideload/default.nix b/pkgs/desktops/pantheon/apps/sideload/default.nix index 379eede979f67..05f0f40db4a74 100644 --- a/pkgs/desktops/pantheon/apps/sideload/default.nix +++ b/pkgs/desktops/pantheon/apps/sideload/default.nix @@ -1,5 +1,6 @@ { stdenv , desktop-file-utils +, nix-update-script , elementary-gtk-theme , elementary-icon-theme , fetchFromGitHub @@ -31,7 +32,7 @@ stdenv.mkDerivation rec { }; passthru = { - updateScript = pantheon.updateScript { + updateScript = nix-update-script { attrPath = "pantheon.${pname}"; }; }; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/a11y/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/a11y/default.nix index 6348f7c93a306..d7a50fc7e5cc8 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/a11y/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/a11y/default.nix @@ -1,6 +1,7 @@ { stdenv , substituteAll , fetchFromGitHub +, nix-update-script , pantheon , meson , ninja @@ -32,7 +33,7 @@ stdenv.mkDerivation rec { ]; passthru = { - updateScript = pantheon.updateScript { + updateScript = nix-update-script { attrPath = "pantheon.${pname}"; }; }; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix index 7701217365683..3c810a5f4f321 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, nix-update-script , pantheon , substituteAll , meson @@ -26,7 +27,7 @@ stdenv.mkDerivation rec { }; passthru = { - updateScript = pantheon.updateScript { + updateScript = nix-update-script { attrPath = "pantheon.${pname}"; }; }; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix index 9cd92d0a5ed87..e5f423bea8a7b 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, nix-update-script , pantheon , meson , ninja @@ -23,7 +24,7 @@ stdenv.mkDerivation rec { }; passthru = { - updateScript = pantheon.updateScript { + updateScript = nix-update-script { attrPath = "pantheon.${pname}"; }; }; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/bluetooth/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/bluetooth/default.nix index a353dee27e581..425d278587836 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/bluetooth/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/bluetooth/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, nix-update-script , pantheon , meson , ninja @@ -24,7 +25,7 @@ stdenv.mkDerivation rec { }; passthru = { - updateScript = pantheon.updateScript { + updateScript = nix-update-script { attrPath = "pantheon.${pname}"; }; }; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/default.nix index 60762b13e0190..ee714e1962e53 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, nix-update-script , pantheon , meson , ninja @@ -26,7 +27,7 @@ stdenv.mkDerivation rec { }; passthru = { - updateScript = pantheon.updateScript { + updateScript = nix-update-script { attrPath = "pantheon.${pname}"; }; }; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/display/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/display/default.nix index c1017e2dbdddc..568d9bd24c8db 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/display/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/display/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, nix-update-script , pantheon , meson , ninja @@ -23,7 +24,7 @@ stdenv.mkDerivation rec { }; passthru = { - updateScript = pantheon.updateScript { + updateScript = nix-update-script { attrPath = "pantheon.${pname}"; }; }; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix index 10468cdc553bc..5f55edb77c7dc 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, nix-update-script , pantheon , fetchpatch , substituteAll @@ -29,7 +30,7 @@ stdenv.mkDerivation rec { }; passthru = { - updateScript = pantheon.updateScript { + updateScript = nix-update-script { attrPath = "pantheon.${pname}"; }; }; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix index c2b973f761600..27c7db368da06 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, nix-update-script , pantheon , meson , ninja @@ -25,7 +26,7 @@ stdenv.mkDerivation rec { }; passthru = { - updateScript = pantheon.updateScript { + updateScript = nix-update-script { attrPath = "pantheon.${pname}"; }; }; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix index 4a4874e3a3265..f6a22af75d7f3 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, nix-update-script , pantheon , meson , ninja @@ -27,7 +28,7 @@ stdenv.mkDerivation rec { }; passthru = { - updateScript = pantheon.updateScript { + updateScript = nix-update-script { attrPath = "pantheon.${pname}"; }; }; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/notifications/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/notifications/default.nix index 30df180eeb76b..09c61e1625da8 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/notifications/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/notifications/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, nix-update-script , fetchpatch , pantheon , meson @@ -25,7 +26,7 @@ stdenv.mkDerivation rec { }; passthru = { - updateScript = pantheon.updateScript { + updateScript = nix-update-script { attrPath = "pantheon.${pname}"; }; }; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix index 902703bc75e54..cbe65e68a6110 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, nix-update-script , fetchpatch , pantheon , meson @@ -30,7 +31,7 @@ stdenv.mkDerivation rec { }; passthru = { - updateScript = pantheon.updateScript { + updateScript = nix-update-script { attrPath = "pantheon.${pname}"; }; }; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix index a70fee63094f1..af65327fb82a2 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pantheon, meson, ninja, pkgconfig, vala, glib +{ stdenv, fetchFromGitHub, nix-update-script, pantheon, meson, ninja, pkgconfig, vala, glib , libgee, granite, gexiv2, elementary-settings-daemon, gtk3, gnome-desktop , gala, wingpanel, plank, switchboard, gettext, bamf, fetchpatch }: @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; passthru = { - updateScript = pantheon.updateScript { + updateScript = nix-update-script { attrPath = "pantheon.${pname}"; }; }; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix index 7357a790b360d..1405fb698d130 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, nix-update-script , pantheon , substituteAll , meson @@ -29,7 +30,7 @@ stdenv.mkDerivation rec { }; passthru = { - updateScript = pantheon.updateScript { + updateScript = nix-update-script { attrPath = "pantheon.${pname}"; }; }; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix index 8280ba483b868..fcb1f26eb9666 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, nix-update-script , fetchpatch , pantheon , meson @@ -25,7 +26,7 @@ stdenv.mkDerivation rec { }; passthru = { - updateScript = pantheon.updateScript { + updateScript = nix-update-script { attrPath = "pantheon.${pname}"; }; }; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix index e2732f3bd0394..df62a0b34b6ab 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, nix-update-script , pantheon , meson , python3 @@ -28,7 +29,7 @@ stdenv.mkDerivation rec { }; passthru = { - updateScript = pantheon.updateScript { + updateScript = nix-update-script { attrPath = "pantheon.${pname}"; }; }; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/sharing/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/sharing/default.nix index 55ed654f75faa..515660739d393 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/sharing/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/sharing/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, nix-update-script , fetchpatch , pantheon , meson @@ -24,7 +25,7 @@ stdenv.mkDerivation rec { }; passthru = { - updateScript = pantheon.updateScript { + updateScript = nix-update-script { attrPath = "pantheon.${pname}"; }; }; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix index 671c7d4544af2..6f89331593c33 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, nix-update-script , pantheon , meson , ninja @@ -26,7 +27,7 @@ stdenv.mkDerivation rec { }; passthru = { - updateScript = pantheon.updateScript { + updateScript = nix-update-script { attrPath = "pantheon.${pname}"; }; }; diff --git a/pkgs/desktops/pantheon/apps/switchboard/default.nix b/pkgs/desktops/pantheon/apps/switchboard/default.nix index 4c8e30bdbe8cc..9901879005354 100644 --- a/pkgs/desktops/pantheon/apps/switchboard/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, nix-update-script , pantheon , pkgconfig , meson @@ -27,7 +28,7 @@ stdenv.mkDerivation rec { }; passthru = { - updateScript = pantheon.updateScript { + updateScript = nix-update-script { attrPath = "pantheon.${pname}"; }; }; diff --git a/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix b/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix index 9deee9c9abe1d..78267e1bdd4ac 100644 --- a/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix +++ b/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, nix-update-script , pantheon , meson , ninja @@ -20,7 +21,7 @@ stdenv.mkDerivation rec { }; passthru = { - updateScript = pantheon.updateScript { + updateScript = nix-update-script { attrPath = "pantheon.${pname}"; }; }; diff --git a/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix b/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix index febec3144a963..39d23c05b745d 100644 --- a/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix +++ b/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, nix-update-script , pantheon , meson , python3 @@ -24,7 +25,7 @@ stdenv.mkDerivation rec { }; passthru = { - updateScript = pantheon.updateScript { + updateScript = nix-update-script { attrPath = "pantheon.${pname}"; }; }; diff --git a/pkgs/desktops/pantheon/artwork/elementary-sound-theme/default.nix b/pkgs/desktops/pantheon/artwork/elementary-sound-theme/default.nix index f95e68153058f..2abe677d748a5 100644 --- a/pkgs/desktops/pantheon/artwork/elementary-sound-theme/default.nix +++ b/pkgs/desktops/pantheon/artwork/elementary-sound-theme/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, nix-update-script , pantheon , meson , ninja @@ -26,7 +27,7 @@ stdenv.mkDerivation rec { ]; passthru = { - updateScript = pantheon.updateScript { + updateScript = nix-update-script { attrPath = "pantheon.${pname}"; }; }; diff --git a/pkgs/desktops/pantheon/artwork/elementary-wallpapers/default.nix b/pkgs/desktops/pantheon/artwork/elementary-wallpapers/default.nix index 82f45c95d6114..2d54580d3e651 100644 --- a/pkgs/desktops/pantheon/artwork/elementary-wallpapers/default.nix +++ b/pkgs/desktops/pantheon/artwork/elementary-wallpapers/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, nix-update-script , pantheon , meson , ninja @@ -26,7 +27,7 @@ stdenv.mkDerivation rec { ]; passthru = { - updateScript = pantheon.updateScript { + updateScript = nix-update-script { attrPath = "pantheon.${pname}"; }; }; diff --git a/pkgs/desktops/pantheon/default.nix b/pkgs/desktops/pantheon/default.nix index edcda88775448..8bae6f8fefe5f 100644 --- a/pkgs/desktops/pantheon/default.nix +++ b/pkgs/desktops/pantheon/default.nix @@ -23,10 +23,6 @@ lib.makeScope pkgs.newScope (self: with self; { wingpanel-indicator-session wingpanel-indicator-sound ]; - nixpkgs-github-update = callPackage ./nixpkgs_github_update { }; - - updateScript = callPackage ./update.nix { }; - maintainers = with pkgs.stdenv.lib.maintainers; [ worldofpeace ]; mutter = pkgs.gnome3.mutter334; diff --git a/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix b/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix index 91755b5a2266b..81cb4b51dc486 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, nix-update-script , pantheon , meson , ninja @@ -27,7 +28,7 @@ stdenv.mkDerivation rec { }; passthru = { - updateScript = pantheon.updateScript { + updateScript = nix-update-script { attrPath = "pantheon.${pname}"; }; }; diff --git a/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix b/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix index da18ab26e0838..42eb8fb37715b 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, nix-update-script , linkFarm , substituteAll , elementary-greeter @@ -40,7 +41,7 @@ stdenv.mkDerivation rec { }; passthru = { - updateScript = pantheon.updateScript { + updateScript = nix-update-script { attrPath = "pantheon.${pname}"; }; diff --git a/pkgs/desktops/pantheon/desktop/elementary-onboarding/default.nix b/pkgs/desktops/pantheon/desktop/elementary-onboarding/default.nix index 44766c7202b9d..2bfa1c2208862 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-onboarding/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-onboarding/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, nix-update-script , pantheon , fetchpatch , pkgconfig @@ -32,7 +33,7 @@ stdenv.mkDerivation rec { }; passthru = { - updateScript = pantheon.updateScript { + updateScript = nix-update-script { attrPath = "pantheon.${pname}"; }; }; diff --git a/pkgs/desktops/pantheon/desktop/elementary-print-shim/default.nix b/pkgs/desktops/pantheon/desktop/elementary-print-shim/default.nix index e8ea57b8bb9aa..0d6de8a77d505 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-print-shim/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-print-shim/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, nix-update-script , pantheon , meson , ninja @@ -22,7 +23,7 @@ stdenv.mkDerivation rec { }; passthru = { - updateScript = pantheon.updateScript { + updateScript = nix-update-script { attrPath = "pantheon.${pname}"; }; }; diff --git a/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix b/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix index 304009aa9b840..dba3c88950871 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, nix-update-script , substituteAll , desktop-file-utils , pkg-config @@ -120,7 +121,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = pantheon.updateScript { + updateScript = nix-update-script { attrPath = "pantheon.${pname}"; }; diff --git a/pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix b/pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix index 9578c4e025fb0..798757ba726eb 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, nix-update-script , pantheon , pkgconfig , meson @@ -29,7 +30,7 @@ stdenv.mkDerivation rec { }; passthru = { - updateScript = pantheon.updateScript { + updateScript = nix-update-script { attrPath = "pantheon.${pname}"; }; }; diff --git a/pkgs/desktops/pantheon/desktop/gala/default.nix b/pkgs/desktops/pantheon/desktop/gala/default.nix index 624a1bde61d82..eb865d695e299 100644 --- a/pkgs/desktops/pantheon/desktop/gala/default.nix +++ b/pkgs/desktops/pantheon/desktop/gala/default.nix @@ -1,5 +1,7 @@ { stdenv , fetchFromGitHub +, nix-update-script +, fetchpatch , pantheon , pkgconfig , meson @@ -36,7 +38,7 @@ stdenv.mkDerivation rec { }; passthru = { - updateScript = pantheon.updateScript { + updateScript = nix-update-script { attrPath = "pantheon.${pname}"; }; }; @@ -69,6 +71,13 @@ stdenv.mkDerivation rec { ]; patches = [ + # https://github.com/elementary/gala/pull/869 + # build failure in vala 0.48.7 + # https://github.com/elementary/gala/pull/869#issuecomment-657147695 + (fetchpatch { + url = "https://github.com/elementary/gala/commit/85d290c75eaa147b704ad34e6c67498071707ee8.patch"; + sha256 = "19jkvmxidf453qfrxkvi35igxzfz2cm8srwkabvyn9wyd1yhiw0l"; + }) ./plugins-dir.patch ./use-new-notifications-default.patch ]; diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix index deb6a958a22b6..45141dc1d3d93 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, nix-update-script , pantheon , substituteAll , meson @@ -39,7 +40,7 @@ stdenv.mkDerivation rec { }; passthru = { - updateScript = pantheon.updateScript { + updateScript = nix-update-script { attrPath = "pantheon.${pname}"; }; }; diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix index 979d6af8f0ccf..310f908d35d89 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, nix-update-script , pantheon , pkgconfig , meson @@ -27,7 +28,7 @@ stdenv.mkDerivation rec { }; passthru = { - updateScript = pantheon.updateScript { + updateScript = nix-update-script { attrPath = "pantheon.${pname}"; }; }; diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix index 494af85ecf3a0..1d2d94ad01aa6 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, nix-update-script , pantheon , pkgconfig , meson @@ -29,7 +30,7 @@ stdenv.mkDerivation rec { }; passthru = { - updateScript = pantheon.updateScript { + updateScript = nix-update-script { attrPath = "pantheon.${pname}"; }; }; diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/keyboard/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/keyboard/default.nix index 120cf8260a9f7..838c592c989f2 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/keyboard/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/keyboard/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, nix-update-script , pantheon , pkgconfig , meson @@ -27,7 +28,7 @@ stdenv.mkDerivation rec { }; passthru = { - updateScript = pantheon.updateScript { + updateScript = nix-update-script { attrPath = "pantheon.${pname}"; }; }; diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix index 652648b6884c7..76d6368fcebcd 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, nix-update-script , pantheon , pkgconfig , meson @@ -25,7 +26,7 @@ stdenv.mkDerivation rec { }; passthru = { - updateScript = pantheon.updateScript { + updateScript = nix-update-script { attrPath = "pantheon.${pname}"; }; }; diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/nightlight/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/nightlight/default.nix index 9ec593afe4a84..30456eee461ab 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/nightlight/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/nightlight/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, nix-update-script , pantheon , pkgconfig , meson @@ -24,7 +25,7 @@ stdenv.mkDerivation rec { }; passthru = { - updateScript = pantheon.updateScript { + updateScript = nix-update-script { attrPath = "pantheon.${pname}"; }; }; diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix index d8d5f44b82bce..bf206868f944e 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, nix-update-script , pantheon , pkgconfig , fetchpatch @@ -34,7 +35,7 @@ stdenv.mkDerivation rec { ]; passthru = { - updateScript = pantheon.updateScript { + updateScript = nix-update-script { attrPath = "pantheon.${pname}"; }; }; diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix index 907b31d930a6d..ac9f07232f128 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, nix-update-script , pantheon , pkgconfig , meson @@ -27,7 +28,7 @@ stdenv.mkDerivation rec { }; passthru = { - updateScript = pantheon.updateScript { + updateScript = nix-update-script { attrPath = "pantheon.${pname}"; }; }; diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/session/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/session/default.nix index 14c87036ec8c4..410acc3733022 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/session/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/session/default.nix @@ -1,5 +1,7 @@ { stdenv , fetchFromGitHub +, nix-update-script +, fetchpatch , pantheon , pkgconfig , meson @@ -23,8 +25,21 @@ stdenv.mkDerivation rec { sha256 = "02inp8xdxfx8qxjdf2nazw46ahp1gv3skd922ma6kgx5w4wxh5l8"; }; + patches = [ + # build failure in vala 0.48.7 + # https://github.com/elementary/gala/pull/869#issuecomment-657147695 + (fetchpatch { + url = "https://github.com/elementary/wingpanel-indicator-session/commit/ead6971c708eed8b844bd9acd7eed2ab8a97e803.patch"; + sha256 = "1v7w7zdia82d38ycr5zhckaxgf7gr15hsv05cv5khlki8frryn2x"; + }) + (fetchpatch { + url = "https://github.com/elementary/wingpanel-indicator-session/commit/85347e676054635ac878fc542bd057398ca70d3e.patch"; + sha256 = "1vw4zx0qbhxmfzqhdcmwdp4fxvij7n3f5lwcplf5v3k9qsr3wm0n"; + }) + ]; + passthru = { - updateScript = pantheon.updateScript { + updateScript = nix-update-script { attrPath = "pantheon.${pname}"; }; }; diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/sound/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/sound/default.nix index cd387a9fca480..eb1d4807325f9 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/sound/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/sound/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, nix-update-script , pantheon , pkgconfig , meson @@ -28,7 +29,7 @@ stdenv.mkDerivation rec { }; passthru = { - updateScript = pantheon.updateScript { + updateScript = nix-update-script { attrPath = "pantheon.${pname}"; }; }; diff --git a/pkgs/desktops/pantheon/desktop/wingpanel/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel/default.nix index 99cd7b69c1ccf..0c456b13111e4 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, nix-update-script , pantheon , wrapGAppsHook , pkgconfig @@ -30,7 +31,7 @@ stdenv.mkDerivation rec { }; passthru = { - updateScript = pantheon.updateScript { + updateScript = nix-update-script { attrPath = "pantheon.${pname}"; }; }; diff --git a/pkgs/desktops/pantheon/granite/default.nix b/pkgs/desktops/pantheon/granite/default.nix index 431c336610527..69b53c78ed2e8 100644 --- a/pkgs/desktops/pantheon/granite/default.nix +++ b/pkgs/desktops/pantheon/granite/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, nix-update-script , python3 , meson , ninja @@ -29,7 +30,7 @@ stdenv.mkDerivation rec { }; passthru = { - updateScript = pantheon.updateScript { + updateScript = nix-update-script { attrPath = "pantheon.${pname}"; }; }; diff --git a/pkgs/desktops/pantheon/nixpkgs_github_update/.envrc b/pkgs/desktops/pantheon/nixpkgs_github_update/.envrc deleted file mode 100644 index 1d953f4bd7359..0000000000000 --- a/pkgs/desktops/pantheon/nixpkgs_github_update/.envrc +++ /dev/null @@ -1 +0,0 @@ -use nix diff --git a/pkgs/desktops/pantheon/nixpkgs_github_update/.formatter.exs b/pkgs/desktops/pantheon/nixpkgs_github_update/.formatter.exs deleted file mode 100644 index d2cda26eddc91..0000000000000 --- a/pkgs/desktops/pantheon/nixpkgs_github_update/.formatter.exs +++ /dev/null @@ -1,4 +0,0 @@ -# Used by "mix format" -[ - inputs: ["{mix,.formatter}.exs", "{config,lib,test}/**/*.{ex,exs}"] -] diff --git a/pkgs/desktops/pantheon/nixpkgs_github_update/.gitignore b/pkgs/desktops/pantheon/nixpkgs_github_update/.gitignore deleted file mode 100644 index 877c95f1f63bf..0000000000000 --- a/pkgs/desktops/pantheon/nixpkgs_github_update/.gitignore +++ /dev/null @@ -1,32 +0,0 @@ -# The directory Mix will write compiled artifacts to. -_build/ - -# If you run "mix test --cover", coverage assets end up here. -cover/ - -# The directory Mix downloads your dependencies sources to. -deps/ - -# Where third-party dependencies like ExDoc output generated docs. -doc/ - -# Ignore .fetch files in case you like to edit your project deps locally. -.fetch - -# If the VM crashes, it generates a dump, let's ignore it too. -erl_crash.dump - -# Also ignore archive artifacts (built via "mix archive.build"). -*.ez - -# Ignore package tarball (built via "mix hex.build"). -nixpkgs_github_update-*.tar - -# Ignore elixir_ls -.elixir_ls - -# mix escript.build result -nixpkgs_github_update - -# lockfile. only because this is nixpkgs. -mix.lock diff --git a/pkgs/desktops/pantheon/nixpkgs_github_update/default.nix b/pkgs/desktops/pantheon/nixpkgs_github_update/default.nix deleted file mode 100644 index 834291222cf0c..0000000000000 --- a/pkgs/desktops/pantheon/nixpkgs_github_update/default.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ lib -, beamPackages -, makeWrapper -, common-updater-scripts -}: - -let - - poison_4 = beamPackages.buildMix { - name = "poison"; - version = "4.0.1"; - - src = beamPackages.fetchHex { - pkg = "poison"; - version = "4.0.1"; - sha256 = "098gdz7xzfmnjzgnnv80nl4h3zl8l9czqqd132vlnfabxbz3d25s"; - }; - }; - - -in - -beamPackages.buildMix { - name = "nixpkgs-github-update"; - version = "0.1.0"; - - src = lib.cleanSource ./.; - - nativeBuildInputs = [ - makeWrapper - ]; - - beamDeps = with beamPackages; [ erlang poison_4 ]; - - buildPhase = '' - export HEX_OFFLINE=1 - export HEX_HOME=`pwd` - export MIX_ENV=prod - export MIX_NO_DEPS=1 - - mix escript.build --no-deps-check - ''; - - installPhase = '' - mkdir -p $out/bin - cp nixpkgs_github_update $out/bin - ''; - - postFixup = '' - wrapProgram $out/bin/nixpkgs_github_update \ - --prefix PATH : "${lib.makeBinPath [ common-updater-scripts ]}" - ''; -} diff --git a/pkgs/desktops/pantheon/nixpkgs_github_update/lib/nixpkgs_github_update/cli.ex b/pkgs/desktops/pantheon/nixpkgs_github_update/lib/nixpkgs_github_update/cli.ex deleted file mode 100644 index e735c4285169f..0000000000000 --- a/pkgs/desktops/pantheon/nixpkgs_github_update/lib/nixpkgs_github_update/cli.ex +++ /dev/null @@ -1,71 +0,0 @@ -defmodule NixpkgsGitHubUpdate.CLI do - @moduledoc """ - Run updates on Nix Expressions that use fetchFromGitHub. - - Arguments the script accepts: - --attribute <attribute_path> - - Example usage: - ``` - ./nixpkgs_github_update --attribute "notes-up" - ``` - """ - alias NixpkgsGitHubUpdate.{Nix, GitHubLatestVersion} - - def help do - IO.puts(""" - Run updates on Nix Expressions that use fetchFromGitHub. - - Arguments the script accepts: - --attribute <attribute_path> - - Example usage: - ./nixpkgs_github_update --attribute "notes-up" - """) - end - - def main([]) do - help() - end - - def main(args) do - opts = parse_args(args) - - attribute = opts[:attribute] - - case Nix.attribute_exists?(attribute) do - true -> update(attribute) - _ -> exit("Requested attribute doesn't exist.") - end - end - - def parse_args(args) do - {options, _, _} = - args - |> OptionParser.parse(strict: [attribute: :string]) - - options - end - - def update(attribute) do - version = - Nix.get_owner_repo(attribute) - |> GitHubLatestVersion.fetch() - |> decode_response() - |> construct_version() - - Nix.update_source_version(attribute, version) - end - - def decode_response({:ok, response}), do: response - - def decode_response({:error, error}) do - IO.puts("Error getting latest release from GitHub: #{error["message"]}") - System.halt(2) - end - - def construct_version(response) do - Map.get(response, "tag_name") - |> String.trim_leading("v") - end -end diff --git a/pkgs/desktops/pantheon/nixpkgs_github_update/lib/nixpkgs_github_update/github_latest_version.ex b/pkgs/desktops/pantheon/nixpkgs_github_update/lib/nixpkgs_github_update/github_latest_version.ex deleted file mode 100644 index 5333ad154f5b7..0000000000000 --- a/pkgs/desktops/pantheon/nixpkgs_github_update/lib/nixpkgs_github_update/github_latest_version.ex +++ /dev/null @@ -1,42 +0,0 @@ -defmodule NixpkgsGitHubUpdate.GitHubLatestVersion do - @user_agent 'httpc' - - def fetch({owner, repo}) do - endpoint = releases_endpoint(owner, repo) - headers = construct_headers() - - :httpc.request(:get, {endpoint, headers}, [], []) - |> handle_response - end - - def releases_endpoint(owner, repo) do - 'https://api.github.com/repos/#{owner}/#{repo}/releases/latest' - end - - def construct_headers do - headers = %{'User-Agent' => @user_agent} - - put_token(headers, get_token()) - |> Map.to_list - end - - defp get_token do - System.get_env("OAUTH_TOKEN") - end - - defp put_token(headers, token) when token != nil do - Map.put_new(headers, 'Authorization', 'token #{String.to_charlist(token)}') - end - - defp put_token(headers, _), do: headers - - def handle_response({_, {{_httpv, status_code, _}, _headers, response}}) do - { - status_code |> check_for_error(), - response |> Poison.Parser.parse!(%{}) - } - end - - defp check_for_error(200), do: :ok - defp check_for_error(_), do: :error -end diff --git a/pkgs/desktops/pantheon/nixpkgs_github_update/lib/nixpkgs_github_update/nix.ex b/pkgs/desktops/pantheon/nixpkgs_github_update/lib/nixpkgs_github_update/nix.ex deleted file mode 100644 index d5d9af84a6baf..0000000000000 --- a/pkgs/desktops/pantheon/nixpkgs_github_update/lib/nixpkgs_github_update/nix.ex +++ /dev/null @@ -1,85 +0,0 @@ -defmodule NixpkgsGitHubUpdate.Nix do - def executable do - nix = System.find_executable("nix") - - if nix == nil do - raise RuntimeError, message: "missing executable for 'nix'" - end - - nix - end - - def eval!(attribute) do - System.cmd( - executable(), - [ - "eval", - "--json", - attribute - ], - stderr_to_stdout: true - ) - |> handle_eval - end - - defp handle_eval({eval_result, 0}) do - case eval_result do - "" -> eval_result - _ -> Poison.Parser.parse!(eval_result, %{}) - end - end - - defp handle_eval({eval_result, _}) do - raise RuntimeError, message: "Error running nix eval: #{eval_result}" - end - - def attribute_exists?(attribute) do - attr_exist_expression = """ - with import <nixpkgs> {}; - - let - attrSet = pkgs.lib.attrByPath (pkgs.lib.splitString "." "#{attribute}") null pkgs; - in - if attrSet == null then false - else true - """ - - eval!("(#{attr_exist_expression})") - end - - def update_source_version(attribute, version) do - System.cmd("update-source-version", [ - attribute, - version - ]) - end - - def get_url_attr(attribute) do - case attribute_exists?("#{attribute}.src.fetchSubmodules") do - true -> "url" - false -> "urls" - end - end - - def get_owner_repo(attribute) do - url_attr = get_url_attr(attribute) - - eval!("nixpkgs.#{attribute}.src.#{url_attr}") - |> case do - # It's fetchFromGitHub if we got a list - [url | _] -> - URI.parse(url).path - |> String.split("/archive", trim: true) - |> List.first() - |> String.split("/", trim: true) - - # It's fetchgit if we got a plain string - url -> - URI.parse(url).path - |> String.split(".git", trim: true) - |> List.first() - |> String.split("/", trim: true) - end - |> List.to_tuple() - end -end diff --git a/pkgs/desktops/pantheon/nixpkgs_github_update/mix.exs b/pkgs/desktops/pantheon/nixpkgs_github_update/mix.exs deleted file mode 100644 index 3498c7066a438..0000000000000 --- a/pkgs/desktops/pantheon/nixpkgs_github_update/mix.exs +++ /dev/null @@ -1,28 +0,0 @@ -defmodule NixpkgsGitHubUpdate.MixProject do - use Mix.Project - - def project do - [ - app: :nixpkgs_github_update, - version: "0.1.0", - elixir: "~> 1.9", - escript: [main_module: NixpkgsGitHubUpdate.CLI], - start_permanent: Mix.env() == :prod, - deps: deps() - ] - end - - # Run "mix help compile.app" to learn about applications. - def application do - [ - extra_applications: [:logger, :inets, :ssl] - ] - end - - # Run "mix help deps" to learn about dependencies. - defp deps do - [ - {:poison, "~> 4.0.1"} - ] - end -end diff --git a/pkgs/desktops/pantheon/nixpkgs_github_update/shell.nix b/pkgs/desktops/pantheon/nixpkgs_github_update/shell.nix deleted file mode 100644 index 0bb4e58a6a127..0000000000000 --- a/pkgs/desktops/pantheon/nixpkgs_github_update/shell.nix +++ /dev/null @@ -1,19 +0,0 @@ -with import <nixpkgs> {}; - -let - inherit (lib) optional; -in - -mkShell rec { - name = "nixpkgs-github-update-shell"; - - buildInputs = [ - elixir - erlang - common-updater-scripts - ] - ++ optional stdenv.isLinux libnotify # For ExUnit Notifier on Linux. - ++ optional stdenv.isLinux inotify-tools # For file_system on Linux. - ; - -} diff --git a/pkgs/desktops/pantheon/nixpkgs_github_update/test/nix_test.exs b/pkgs/desktops/pantheon/nixpkgs_github_update/test/nix_test.exs deleted file mode 100644 index c5a57698fed6a..0000000000000 --- a/pkgs/desktops/pantheon/nixpkgs_github_update/test/nix_test.exs +++ /dev/null @@ -1,49 +0,0 @@ -defmodule NixTest do - @fake_package "asanotehhhuh" - @fetchgit_package "polybar" - @fetchgithub_package "notes-up" - - use ExUnit.Case - - import NixpkgsGitHubUpdate.Nix - - def check_for_nix(_context) do - try do - executable() - rescue - RuntimeError -> - IO.puts("You need Nix installed to run these tests.") - System.halt(127) - end - - :ok - end - - setup_all :check_for_nix - - describe "evaluation tests" do - test "evaluation handling" do - exists_attr = "nixpkgs.#{@fetchgithub_package}" - - assert is_binary(eval!(exists_attr)) == true - catch_error(eval!(@fake_package) == 1) - end - - # This should always be true or false - test "package exists?" do - assert attribute_exists?(@fetchgithub_package) == true - assert attribute_exists?(@fake_package) == false - end - end - - test "owner repo" do - assert get_url_attr(@fetchgit_package) == "url" - assert get_url_attr(@fetchgithub_package) == "urls" - - assert get_owner_repo(@fetchgit_package) == - {@fetchgit_package, @fetchgit_package} - - assert get_owner_repo(@fetchgithub_package) == - {"Philip-Scott", String.capitalize(@fetchgithub_package)} - end -end diff --git a/pkgs/desktops/pantheon/nixpkgs_github_update/test/test_helper.exs b/pkgs/desktops/pantheon/nixpkgs_github_update/test/test_helper.exs deleted file mode 100644 index 869559e709ea1..0000000000000 --- a/pkgs/desktops/pantheon/nixpkgs_github_update/test/test_helper.exs +++ /dev/null @@ -1 +0,0 @@ -ExUnit.start() diff --git a/pkgs/desktops/pantheon/services/contractor/default.nix b/pkgs/desktops/pantheon/services/contractor/default.nix index 68532bdd81208..11152defc6548 100644 --- a/pkgs/desktops/pantheon/services/contractor/default.nix +++ b/pkgs/desktops/pantheon/services/contractor/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, nix-update-script , pantheon , meson , python3 @@ -25,7 +26,7 @@ stdenv.mkDerivation rec { }; passthru = { - updateScript = pantheon.updateScript { + updateScript = nix-update-script { attrPath = "pantheon.${pname}"; }; }; diff --git a/pkgs/desktops/pantheon/services/elementary-capnet-assist/default.nix b/pkgs/desktops/pantheon/services/elementary-capnet-assist/default.nix index 7f17fb5d5a9d5..2f7bfaa155bb2 100644 --- a/pkgs/desktops/pantheon/services/elementary-capnet-assist/default.nix +++ b/pkgs/desktops/pantheon/services/elementary-capnet-assist/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, nix-update-script , pantheon , pkgconfig , meson @@ -29,7 +30,7 @@ stdenv.mkDerivation rec { }; passthru = { - updateScript = pantheon.updateScript { + updateScript = nix-update-script { attrPath = "pantheon.${pname}"; }; }; diff --git a/pkgs/desktops/pantheon/services/elementary-dpms-helper/default.nix b/pkgs/desktops/pantheon/services/elementary-dpms-helper/default.nix index 7eeb156e02819..b8c87cfd546ea 100644 --- a/pkgs/desktops/pantheon/services/elementary-dpms-helper/default.nix +++ b/pkgs/desktops/pantheon/services/elementary-dpms-helper/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, nix-update-script , pantheon , meson , ninja @@ -24,7 +25,7 @@ stdenv.mkDerivation rec { }; passthru = { - updateScript = pantheon.updateScript { + updateScript = nix-update-script { attrPath = "pantheon.${pname}"; }; }; diff --git a/pkgs/desktops/pantheon/services/pantheon-agent-geoclue2/default.nix b/pkgs/desktops/pantheon/services/pantheon-agent-geoclue2/default.nix index 905e2cc9aadf5..4b9be31015a29 100644 --- a/pkgs/desktops/pantheon/services/pantheon-agent-geoclue2/default.nix +++ b/pkgs/desktops/pantheon/services/pantheon-agent-geoclue2/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, nix-update-script , pantheon , pkgconfig , meson @@ -25,7 +26,7 @@ stdenv.mkDerivation rec { }; passthru = { - updateScript = pantheon.updateScript { + updateScript = nix-update-script { attrPath = "pantheon.${pname}"; }; }; diff --git a/pkgs/desktops/pantheon/services/pantheon-agent-polkit/default.nix b/pkgs/desktops/pantheon/services/pantheon-agent-polkit/default.nix index 341d166f68774..61679320505c5 100644 --- a/pkgs/desktops/pantheon/services/pantheon-agent-polkit/default.nix +++ b/pkgs/desktops/pantheon/services/pantheon-agent-polkit/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, nix-update-script , pantheon , pkgconfig , meson @@ -24,7 +25,7 @@ stdenv.mkDerivation rec { }; passthru = { - updateScript = pantheon.updateScript { + updateScript = nix-update-script { attrPath = "pantheon.${pname}"; }; }; diff --git a/pkgs/desktops/pantheon/update.nix b/pkgs/desktops/pantheon/update.nix deleted file mode 100644 index 1137c53301691..0000000000000 --- a/pkgs/desktops/pantheon/update.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ nixpkgs-github-update }: - -{ attrPath }: - - -[ "${nixpkgs-github-update}/bin/nixpkgs_github_update" "--attribute" attrPath ] diff --git a/pkgs/development/compilers/flutter/default.nix b/pkgs/development/compilers/flutter/default.nix index afc8fbd7f4991..c58457b71a413 100644 --- a/pkgs/development/compilers/flutter/default.nix +++ b/pkgs/development/compilers/flutter/default.nix @@ -6,26 +6,28 @@ let let files = builtins.attrNames (builtins.readDir dir); in map (f: dir + ("/" + f)) files; in { - stable = mkFlutter { + stable = mkFlutter rec { pname = "flutter"; channel = "stable"; - version = "1.12.13+hotfix.9"; - sha256Hash = "1ql3zvmmk5zk47y30lajxaam04q6vr373dayq15jv4vpc0fzif1y"; + version = "1.17.5"; + filename = "flutter_linux_${version}-${channel}.tar.xz"; + sha256Hash = "0kapja3nh7dfhjbn2np02wghijrjnpzsv4hz10fj54hs8hdx19di"; patches = getPatches ./patches/stable; }; - beta = mkFlutter { + beta = mkFlutter rec { pname = "flutter-beta"; channel = "beta"; - version = "1.15.17"; - sha256Hash = "0iil6y6y477dhjgzx54ab5m9nj0jg4xl8x4zzd9iwh8m756r7qsd"; + version = "1.20.0-7.2.pre"; + filename = "flutter_linux_${version}-${channel}.tar.xz"; + sha256Hash = "0w89ig5vi4spa95mf08r4vvwni7bzzdlyhvr9sy1a35qmf7j9s6f"; patches = getPatches ./patches/beta; }; dev = mkFlutter rec { pname = "flutter-dev"; channel = "dev"; - version = "1.17.0-dev.5.0"; + version = "1.21.0-1.0.pre"; filename = "flutter_linux_${version}-${channel}.tar.xz"; - sha256Hash = "0ks2jf2bd42y2jsc91p33r57q7j3m94d8ihkmlxzwi53x1mwp0pk"; + sha256Hash = "14rx89jp6ivk3ai7iwbznkr5q445ndh8fppzbxg520kq10s2208r"; patches = getPatches ./patches/beta; }; } diff --git a/pkgs/development/compilers/flutter/patches/beta/disable-auto-update.patch b/pkgs/development/compilers/flutter/patches/beta/disable-auto-update.patch index 42c09c805cb5f..cd01577cc10f2 100644 --- a/pkgs/development/compilers/flutter/patches/beta/disable-auto-update.patch +++ b/pkgs/development/compilers/flutter/patches/beta/disable-auto-update.patch @@ -1,24 +1,24 @@ -diff --git a/bin/flutter b/bin/flutter -index e0c18e235..2c3fb7ddd 100755 ---- a/bin/flutter -+++ b/bin/flutter -@@ -185,8 +185,6 @@ fi - # FLUTTER_TOOL_ARGS="--enable-asserts $FLUTTER_TOOL_ARGS" - # FLUTTER_TOOL_ARGS="$FLUTTER_TOOL_ARGS --observe=65432" +diff --git a/bin/internal/shared.sh b/bin/internal/shared.sh +index 702bd9ed5..4d4dc94c6 100755 +--- a/bin/internal/shared.sh ++++ b/bin/internal/shared.sh +@@ -204,8 +204,6 @@ function shared::execute() { + # FLUTTER_TOOL_ARGS="--enable-asserts $FLUTTER_TOOL_ARGS" + # FLUTTER_TOOL_ARGS="$FLUTTER_TOOL_ARGS --observe=65432" --(upgrade_flutter) 3< "$PROG_NAME" +- upgrade_flutter 7< "$PROG_NAME" - - # FLUTTER_TOOL_ARGS isn't quoted below, because it is meant to be considered as - # separate space-separated args. - "$DART" --packages="$FLUTTER_TOOLS_DIR/.packages" $FLUTTER_TOOL_ARGS "$SNAPSHOT_PATH" "$@" + BIN_NAME="$(basename "$PROG_NAME")" + case "$BIN_NAME" in + flutter*) diff --git a/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart b/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart -index 99455ae64..f5b0cb59c 100644 +index 21be933e1..2ea73c4c0 100644 --- a/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart +++ b/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart -@@ -301,13 +301,6 @@ class FlutterCommandRunner extends CommandRunner<void> { +@@ -294,13 +294,6 @@ class FlutterCommandRunner extends CommandRunner<void> { + globals.flutterUsage.suppressAnalytics = true; } - _checkFlutterCopy(); - try { - await globals.flutterVersion.ensureVersionFile(); - } on FileSystemException catch (e) { diff --git a/pkgs/development/compilers/flutter/patches/beta/move-cache.patch b/pkgs/development/compilers/flutter/patches/beta/move-cache.patch index 4672d4c625d0f..64950d4476efe 100644 --- a/pkgs/development/compilers/flutter/patches/beta/move-cache.patch +++ b/pkgs/development/compilers/flutter/patches/beta/move-cache.patch @@ -1,5 +1,5 @@ diff --git a/dev/devicelab/lib/framework/runner.dart b/dev/devicelab/lib/framework/runner.dart -index 8e511eefd..fbc7d6ac3 100644 +index 8e511eefd..fef3cca8b 100644 --- a/dev/devicelab/lib/framework/runner.dart +++ b/dev/devicelab/lib/framework/runner.dart @@ -126,7 +126,7 @@ Future<void> cleanupSystem() async { @@ -12,31 +12,31 @@ index 8e511eefd..fbc7d6ac3 100644 if (!Platform.isWindows) { await exec( diff --git a/packages/flutter_tools/lib/src/asset.dart b/packages/flutter_tools/lib/src/asset.dart -index 79b06949f..9040ba0a8 100644 +index c680de599..480abfb77 100644 --- a/packages/flutter_tools/lib/src/asset.dart +++ b/packages/flutter_tools/lib/src/asset.dart -@@ -6,6 +6,7 @@ import 'dart:async'; - +@@ -8,6 +8,7 @@ import 'package:meta/meta.dart'; + import 'package:package_config/package_config.dart'; import 'package:yaml/yaml.dart'; +import 'base/common.dart'; import 'base/context.dart'; import 'base/file_system.dart'; import 'base/utils.dart'; -@@ -325,7 +326,7 @@ List<_Asset> _getMaterialAssets(String fontSet) { - for (final Map<dynamic, dynamic> font in family['fonts']) { +@@ -392,7 +393,7 @@ List<_Asset> _getMaterialAssets(String fontSet) { + for (final Map<dynamic, dynamic> font in (family['fonts'] as List<dynamic>).cast<Map<dynamic, dynamic>>()) { final Uri entryUri = globals.fs.path.toUri(font['asset'] as String); result.add(_Asset( - baseDir: globals.fs.path.join(Cache.flutterRoot, 'bin', 'cache', 'artifacts', 'material_fonts'), -+ baseDir: globals.fs.path.join(globals.fsUtils.homeDirPath, '.cache', 'flutter', 'artifacts', 'material_fonts'), ++ baseDir: globals.fs.path.join(globals.fsUtils.homeDirPath, '.cache', 'flutter', 'artifacts', 'material_fonts'), relativeUri: Uri(path: entryUri.pathSegments.last), entryUri: entryUri, - )); + package: null, diff --git a/packages/flutter_tools/lib/src/cache.dart b/packages/flutter_tools/lib/src/cache.dart -index 715189938..5afb2a0db 100644 +index c0946782c..bdbc35cb8 100644 --- a/packages/flutter_tools/lib/src/cache.dart +++ b/packages/flutter_tools/lib/src/cache.dart -@@ -189,8 +189,14 @@ class Cache { +@@ -202,8 +202,15 @@ class Cache { return; } assert(_lock == null); @@ -46,13 +46,14 @@ index 715189938..5afb2a0db 100644 + dir.createSync(recursive: true); + globals.os.chmod(dir, '755'); + } ++ final File lockFile = - globals.fs.file(globals.fs.path.join(flutterRoot, 'bin', 'cache', 'lockfile')); + globals.fs.file(globals.fs.path.join(globals.fsUtils.homeDirPath, '.cache', 'flutter', 'lockfile')); try { _lock = lockFile.openSync(mode: FileMode.write); } on FileSystemException catch (e) { -@@ -290,7 +296,7 @@ class Cache { +@@ -306,7 +313,7 @@ class Cache { if (_rootOverride != null) { return _fileSystem.directory(_fileSystem.path.join(_rootOverride.path, 'bin', 'cache')); } else { diff --git a/pkgs/development/compilers/flutter/patches/stable/disable-auto-update.patch b/pkgs/development/compilers/flutter/patches/stable/disable-auto-update.patch index 16fe504595f35..c77357ea13c50 100644 --- a/pkgs/development/compilers/flutter/patches/stable/disable-auto-update.patch +++ b/pkgs/development/compilers/flutter/patches/stable/disable-auto-update.patch @@ -1,5 +1,5 @@ diff --git a/bin/flutter b/bin/flutter -index 3955f8f39..1e7573d30 100755 +index cdf974233..1f7de1c1b 100755 --- a/bin/flutter +++ b/bin/flutter @@ -185,8 +185,6 @@ fi @@ -12,20 +12,20 @@ index 3955f8f39..1e7573d30 100755 # separate space-separated args. "$DART" --packages="$FLUTTER_TOOLS_DIR/.packages" $FLUTTER_TOOL_ARGS "$SNAPSHOT_PATH" "$@" diff --git a/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart b/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart -index 5e45819d9..ab748b059 100644 +index b3e69714f..a9eb76234 100644 --- a/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart +++ b/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart -@@ -377,13 +377,6 @@ class FlutterCommandRunner extends CommandRunner<void> { +@@ -301,13 +301,6 @@ class FlutterCommandRunner extends CommandRunner<void> { } _checkFlutterCopy(); - try { -- await FlutterVersion.instance.ensureVersionFile(); +- await globals.flutterVersion.ensureVersionFile(); - } on FileSystemException catch (e) { -- printError('Failed to write the version file to the artifact cache: "$e".'); -- printError('Please ensure you have permissions in the artifact cache directory.'); +- globals.printError('Failed to write the version file to the artifact cache: "$e".'); +- globals.printError('Please ensure you have permissions in the artifact cache directory.'); - throwToolExit('Failed to write the version file'); - } - if (topLevelResults.command?.name != 'upgrade' && topLevelResults['version-check'] as bool) { - await FlutterVersion.instance.checkFlutterVersionFreshness(); - } + final bool machineFlag = topLevelResults['machine'] as bool; + if (topLevelResults.command?.name != 'upgrade' && topLevelResults['version-check'] as bool && !machineFlag) { + await globals.flutterVersion.checkFlutterVersionFreshness(); diff --git a/pkgs/development/compilers/flutter/patches/stable/move-cache.patch b/pkgs/development/compilers/flutter/patches/stable/move-cache.patch index e5719a2867f90..64950d4476efe 100644 --- a/pkgs/development/compilers/flutter/patches/stable/move-cache.patch +++ b/pkgs/development/compilers/flutter/patches/stable/move-cache.patch @@ -1,5 +1,5 @@ diff --git a/dev/devicelab/lib/framework/runner.dart b/dev/devicelab/lib/framework/runner.dart -index 9fae74726..d88d6ecbb 100644 +index 8e511eefd..fef3cca8b 100644 --- a/dev/devicelab/lib/framework/runner.dart +++ b/dev/devicelab/lib/framework/runner.dart @@ -126,7 +126,7 @@ Future<void> cleanupSystem() async { @@ -7,57 +7,58 @@ index 9fae74726..d88d6ecbb 100644 final String gradlewBinaryName = Platform.isWindows ? 'gradlew.bat' : 'gradlew'; final Directory tempDir = Directory.systemTemp.createTempSync('flutter_devicelab_shutdown_gradle.'); - recursiveCopy(Directory(path.join(flutterDirectory.path, 'bin', 'cache', 'artifacts', 'gradle_wrapper')), tempDir); -+ recursiveCopy(Directory(path.join(homeDirPath, '.cache', 'flutter', 'artifacts', 'gradle_wrapper')), tempDir); ++ recursiveCopy(Directory(path.join(globals.fsUtils.homeDirPath, '.cache', 'flutter', 'artifacts', 'gradle_wrapper')), tempDir); copy(File(path.join(path.join(flutterDirectory.path, 'packages', 'flutter_tools'), 'templates', 'app', 'android.tmpl', 'gradle', 'wrapper', 'gradle-wrapper.properties')), Directory(path.join(tempDir.path, 'gradle', 'wrapper'))); if (!Platform.isWindows) { await exec( diff --git a/packages/flutter_tools/lib/src/asset.dart b/packages/flutter_tools/lib/src/asset.dart -index e6216c737..5ab497092 100644 +index c680de599..480abfb77 100644 --- a/packages/flutter_tools/lib/src/asset.dart +++ b/packages/flutter_tools/lib/src/asset.dart -@@ -6,6 +6,7 @@ import 'dart:async'; - +@@ -8,6 +8,7 @@ import 'package:meta/meta.dart'; + import 'package:package_config/package_config.dart'; import 'package:yaml/yaml.dart'; +import 'base/common.dart'; import 'base/context.dart'; import 'base/file_system.dart'; - import 'base/platform.dart'; -@@ -326,7 +327,7 @@ List<_Asset> _getMaterialAssets(String fontSet) { - for (Map<dynamic, dynamic> font in family['fonts']) { - final Uri entryUri = fs.path.toUri(font['asset'] as String); + import 'base/utils.dart'; +@@ -392,7 +393,7 @@ List<_Asset> _getMaterialAssets(String fontSet) { + for (final Map<dynamic, dynamic> font in (family['fonts'] as List<dynamic>).cast<Map<dynamic, dynamic>>()) { + final Uri entryUri = globals.fs.path.toUri(font['asset'] as String); result.add(_Asset( -- baseDir: fs.path.join(Cache.flutterRoot, 'bin', 'cache', 'artifacts', 'material_fonts'), -+ baseDir: fs.path.join(homeDirPath, '.cache', 'flutter', 'artifacts', 'material_fonts'), +- baseDir: globals.fs.path.join(Cache.flutterRoot, 'bin', 'cache', 'artifacts', 'material_fonts'), ++ baseDir: globals.fs.path.join(globals.fsUtils.homeDirPath, '.cache', 'flutter', 'artifacts', 'material_fonts'), relativeUri: Uri(path: entryUri.pathSegments.last), entryUri: entryUri, - )); + package: null, diff --git a/packages/flutter_tools/lib/src/cache.dart b/packages/flutter_tools/lib/src/cache.dart -index 5e1950b56..45585f9c0 100644 +index c0946782c..bdbc35cb8 100644 --- a/packages/flutter_tools/lib/src/cache.dart +++ b/packages/flutter_tools/lib/src/cache.dart -@@ -164,8 +164,14 @@ class Cache { +@@ -202,8 +202,15 @@ class Cache { return; } assert(_lock == null); + -+ final Directory dir = fs.directory(fs.path.join(homeDirPath, '.cache', 'flutter')); ++ final Directory dir = globals.fs.directory(globals.fs.path.join(globals.fsUtils.homeDirPath, '.cache', 'flutter')); + if (!dir.existsSync()) { + dir.createSync(recursive: true); -+ os.chmod(dir, '755'); ++ globals.os.chmod(dir, '755'); + } ++ final File lockFile = -- fs.file(fs.path.join(flutterRoot, 'bin', 'cache', 'lockfile')); -+ fs.file(fs.path.join(homeDirPath, '.cache', 'flutter', 'lockfile')); +- globals.fs.file(globals.fs.path.join(flutterRoot, 'bin', 'cache', 'lockfile')); ++ globals.fs.file(globals.fs.path.join(globals.fsUtils.homeDirPath, '.cache', 'flutter', 'lockfile')); try { _lock = lockFile.openSync(mode: FileMode.write); } on FileSystemException catch (e) { -@@ -239,7 +245,7 @@ class Cache { +@@ -306,7 +313,7 @@ class Cache { if (_rootOverride != null) { - return fs.directory(fs.path.join(_rootOverride.path, 'bin', 'cache')); + return _fileSystem.directory(_fileSystem.path.join(_rootOverride.path, 'bin', 'cache')); } else { -- return fs.directory(fs.path.join(flutterRoot, 'bin', 'cache')); -+ return fs.directory(fs.path.join(homeDirPath, '.cache', 'flutter')); +- return _fileSystem.directory(_fileSystem.path.join(flutterRoot, 'bin', 'cache')); ++ return _fileSystem.directory(_fileSystem.path.join(globals.fsUtils.homeDirPath, '.cache', 'flutter')); } } diff --git a/pkgs/development/compilers/llvm/10/bintools.nix b/pkgs/development/compilers/llvm/10/bintools.nix index 72a2a73319304..53f7941e33699 100644 --- a/pkgs/development/compilers/llvm/10/bintools.nix +++ b/pkgs/development/compilers/llvm/10/bintools.nix @@ -11,9 +11,19 @@ in runCommand "llvm-binutils-${version}" { preferLocalBuild = true; } '' ln -s $prog $out/bin/${prefix}$(basename $prog) done for prog in ${llvm}/bin/*; do - ln -s $prog $out/bin/${prefix}$(echo $(basename $prog) | sed -e "s|llvm-||") ln -sf $prog $out/bin/${prefix}$(basename $prog) done - rm -f $out/bin/${prefix}cat + + ln -s ${llvm}/bin/llvm-ar $out/bin/${prefix}ar + ln -s ${llvm}/bin/llvm-as $out/bin/${prefix}as + ln -s ${llvm}/bin/llvm-dwp $out/bin/${prefix}dwp + ln -s ${llvm}/bin/llvm-nm $out/bin/${prefix}nm + ln -s ${llvm}/bin/llvm-objcopy $out/bin/${prefix}objcopy + ln -s ${llvm}/bin/llvm-objdump $out/bin/${prefix}objdump + ln -s ${llvm}/bin/llvm-ranlib $out/bin/${prefix}ranlib + ln -s ${llvm}/bin/llvm-readelf $out/bin/${prefix}readelf + ln -s ${llvm}/bin/llvm-size $out/bin/${prefix}size + ln -s ${llvm}/bin/llvm-strip $out/bin/${prefix}strip + ln -s ${lld}/bin/lld $out/bin/${prefix}ld '' diff --git a/pkgs/development/compilers/llvm/10/clang/clang-extension-handling.patch b/pkgs/development/compilers/llvm/10/clang/clang-extension-handling.patch deleted file mode 100644 index a74d10989ffa0..0000000000000 --- a/pkgs/development/compilers/llvm/10/clang/clang-extension-handling.patch +++ /dev/null @@ -1,18 +0,0 @@ -Compressed diff from -``` -git show d21664cce1db8debe2528f36b1fbd2b8af9c9401 87dac7da68ea1e0adac78c59ef1891dcf9632b67 3a0f6e699bb6d96dc62dce6faef20ac26cf103fd -``` -with the purpose of avoiding linker errors arising in the polly-flavoured clang. - -diff --git a/clang/CMakeLists.txt b/clang/CMakeLists.txt -index 781c3eb7f2f..dc1413f4b59 100644 ---- clang/CMakeLists.txt -+++ clang/CMakeLists.txt -@@ -864,6 +864,7 @@ add_subdirectory(utils/hmaptool) - - if(CLANG_BUILT_STANDALONE) - llvm_distribution_add_targets() -+ process_llvm_pass_plugins() - endif() - - configure_file( diff --git a/pkgs/development/compilers/llvm/10/clang/default.nix b/pkgs/development/compilers/llvm/10/clang/default.nix index 10026ca4eb19a..63a0af69a2327 100644 --- a/pkgs/development/compilers/llvm/10/clang/default.nix +++ b/pkgs/development/compilers/llvm/10/clang/default.nix @@ -8,7 +8,7 @@ let pname = "clang"; inherit version; - src = fetch "clang" "08fbxa2a0kr3ni35ckppj0kyvlcyaywrhpqwcdrdy0z900mhcnw8"; + src = fetch "clang" "091bvcny2lh32zy8f3m9viayyhb2zannrndni7325rl85cwgr6pr"; unpackPhase = '' unpackFile $src @@ -36,9 +36,6 @@ let ]; patches = [ - # 10.0.0 only, this should be present in 10.0.1 - ./clang-extension-handling.patch - ./purity.patch # https://reviews.llvm.org/D51899 ./compiler-rt-baremetal.patch diff --git a/pkgs/development/compilers/llvm/10/compiler-rt.nix b/pkgs/development/compilers/llvm/10/compiler-rt.nix index 00c4f0677ebcf..47bbe808ac203 100644 --- a/pkgs/development/compilers/llvm/10/compiler-rt.nix +++ b/pkgs/development/compilers/llvm/10/compiler-rt.nix @@ -11,7 +11,7 @@ in stdenv.mkDerivation rec { pname = "compiler-rt"; inherit version; - src = fetch pname "0x9c531k6ww21s2mkdwqx1vbdjmx6d4wmfb8gdbj0wqa796sczba"; + src = fetch pname "1yjqjri753w0fzmxcyz687nvd97sbc9rsqrxzpq720na47hwh3fr"; nativeBuildInputs = [ cmake python3 llvm ]; buildInputs = stdenv.lib.optional stdenv.hostPlatform.isDarwin libcxxabi; diff --git a/pkgs/development/compilers/llvm/10/default.nix b/pkgs/development/compilers/llvm/10/default.nix index 870d5110d145d..cd77eed9ac804 100644 --- a/pkgs/development/compilers/llvm/10/default.nix +++ b/pkgs/development/compilers/llvm/10/default.nix @@ -5,8 +5,8 @@ }: let - release_version = "10.0.0"; - version = release_version; # differentiating these (variables) is important for rc's + release_version = "10.0.1"; + version = release_version; # differentiating these (variables) is important for RCs targetConfig = stdenv.targetPlatform.config; fetch = name: sha256: fetchurl { @@ -14,7 +14,7 @@ let inherit sha256; }; - clang-tools-extra_src = fetch "clang-tools-extra" "074ija5s2jsdn0k035r2dzmryjmqxdnyg4xwvaqych2bazv8rpxc"; + clang-tools-extra_src = fetch "clang-tools-extra" "06n1yp638rh24xdxv9v2df0qajxbjz4w59b7dd4ky36drwmpi4yh"; tools = stdenv.lib.makeExtensible (tools: let callPackage = newScope (tools // { inherit stdenv cmake libxml2 python3 isl release_version version fetch; }); @@ -36,20 +36,22 @@ let inherit clang-tools-extra_src; }; - llvm-manpages = lowPrio (tools.llvm.override { - enableManpages = true; - python3 = pkgs.python3; # don't use python-boot - }); + # disabled until recommonmark supports sphinx 3 + #Llvm-manpages = lowPrio (tools.llvm.override { + # enableManpages = true; + # python3 = pkgs.python3; # don't use python-boot + #}); clang-manpages = lowPrio (tools.clang-unwrapped.override { enableManpages = true; python3 = pkgs.python3; # don't use python-boot }); - lldb-manpages = lowPrio (tools.lldb.override { - enableManpages = true; - python3 = pkgs.python3; # don't use python-boot - }); + # disabled until recommonmark supports sphinx 3 + # lldb-manpages = lowPrio (tools.lldb.override { + # enableManpages = true; + # python3 = pkgs.python3; # don't use python-boot + # }); libclang = tools.clang-unwrapped.lib; diff --git a/pkgs/development/compilers/llvm/10/libc++/default.nix b/pkgs/development/compilers/llvm/10/libc++/default.nix index 872865ec474b9..651f1887553d8 100644 --- a/pkgs/development/compilers/llvm/10/libc++/default.nix +++ b/pkgs/development/compilers/llvm/10/libc++/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { pname = "libc++"; inherit version; - src = fetch "libcxx" "1isnj78diknh0nvd73mlq8p8g209f9bab2mbysq826bg2wzql3r7"; + src = fetch "libcxx" "0v78bfr6h2zifvdqnj2wlfk4pvxzrqn3hg1v6lqk3y12bx9p9xny"; postUnpack = '' unpackFile ${libcxxabi.src} diff --git a/pkgs/development/compilers/llvm/10/libc++abi.nix b/pkgs/development/compilers/llvm/10/libc++abi.nix index ab45f27d24f42..00371b862adb6 100644 --- a/pkgs/development/compilers/llvm/10/libc++abi.nix +++ b/pkgs/development/compilers/llvm/10/libc++abi.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { pname = "libc++abi"; inherit version; - src = fetch "libcxxabi" "1q8lrbh68a9v4lr88b8xsjpmwx5z96sa5wnkb92xx7ccm1ssq6z7"; + src = fetch "libcxxabi" "0yqs722y76cwvmfsq0lb917r9m3fci7bf5z3yzl71yz9n88ghzm9"; nativeBuildInputs = [ cmake ]; buildInputs = stdenv.lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD && !stdenv.hostPlatform.isWasm) libunwind; diff --git a/pkgs/development/compilers/llvm/10/libunwind.nix b/pkgs/development/compilers/llvm/10/libunwind.nix index 4e55b28c24308..b13bacb363801 100644 --- a/pkgs/development/compilers/llvm/10/libunwind.nix +++ b/pkgs/development/compilers/llvm/10/libunwind.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { pname = "libunwind"; inherit version; - src = fetch pname "09n66dl9cc17d81qflj5h1l4garmhvzfi2lhcb7rx00l8z65xp09"; + src = fetch pname "09syx66idnm2pr46x2vmk0jn3iwdv0lkd04xy4zjbwmz3vn066bl"; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/compilers/llvm/10/lld.nix b/pkgs/development/compilers/llvm/10/lld.nix index 6a0032de2ac4c..5d513462820e7 100644 --- a/pkgs/development/compilers/llvm/10/lld.nix +++ b/pkgs/development/compilers/llvm/10/lld.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { pname = "lld"; inherit version; - src = fetch pname "026pwcbczcg0j5c9h7hxxrn3ki81ia9m9sfn0sy0bvzffv2xg85r"; + src = fetch pname "0ynzi35r4fckvp6842alpd43qr810j3728yfslc66fk2mbh4j52r"; nativeBuildInputs = [ cmake ]; buildInputs = [ llvm libxml2 ]; diff --git a/pkgs/development/compilers/llvm/10/lldb.nix b/pkgs/development/compilers/llvm/10/lldb.nix index 90716f67f836f..47215caa53e37 100644 --- a/pkgs/development/compilers/llvm/10/lldb.nix +++ b/pkgs/development/compilers/llvm/10/lldb.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation (rec { pname = "lldb"; inherit version; - src = fetch pname "0ddikvc0kbqlqvsypsm9nhfwmyw4prp4rv49f0bgacyh5ssgq7yx"; + src = fetch pname "051p5b04y6z3g730rmc2n2v71lipbw7k69riww3a6sl74myfiaq7"; patches = [ ./lldb-procfs.patch ]; diff --git a/pkgs/development/compilers/llvm/10/llvm-extension-handling.patch b/pkgs/development/compilers/llvm/10/llvm-extension-handling.patch deleted file mode 100644 index cf4b1eaacf7dc..0000000000000 --- a/pkgs/development/compilers/llvm/10/llvm-extension-handling.patch +++ /dev/null @@ -1,146 +0,0 @@ -Compressed diff from -``` -git show d21664cce1db8debe2528f36b1fbd2b8af9c9401 87dac7da68ea1e0adac78c59ef1891dcf9632b67 3a0f6e699bb6d96dc62dce6faef20ac26cf103fd -``` -with the purpose of avoiding linker errors arising in the polly-flavoured clang. - -diff --git a/llvm/CMakeLists.txt b/llvm/CMakeLists.txt -index a02c2a5a23f..faf8f561faa 100644 ---- llvm/CMakeLists.txt -+++ llvm/CMakeLists.txt -@@ -1069,6 +1069,7 @@ endif() - # after all targets are created. - include(LLVMDistributionSupport) - llvm_distribution_add_targets() -+process_llvm_pass_plugins(GEN_CONFIG) - - # This allows us to deploy the Universal CRT DLLs by passing -DCMAKE_INSTALL_UCRT_LIBRARIES=ON to CMake - if (MSVC AND CMAKE_HOST_SYSTEM_NAME STREQUAL "Windows" AND CMAKE_INSTALL_UCRT_LIBRARIES) -@@ -1093,5 +1094,3 @@ endif() - if (LLVM_INCLUDE_UTILS AND LLVM_INCLUDE_TOOLS) - add_subdirectory(utils/llvm-locstats) - endif() -- --process_llvm_pass_plugins() -diff --git a/llvm/cmake/modules/AddLLVM.cmake b/llvm/cmake/modules/AddLLVM.cmake -index fd69786544a..8fbb33a22fd 100644 ---- llvm/cmake/modules/AddLLVM.cmake -+++ llvm/cmake/modules/AddLLVM.cmake -@@ -884,53 +884,71 @@ function(add_llvm_pass_plugin name) - if (TARGET intrinsics_gen) - add_dependencies(obj.${name} intrinsics_gen) - endif() -- message(STATUS "Registering ${name} as a pass plugin (static build: ${LLVM_${name_upper}_LINK_INTO_TOOLS})") -- set_property(GLOBAL APPEND PROPERTY LLVM_COMPILE_EXTENSIONS ${name}) -+ set_property(GLOBAL APPEND PROPERTY LLVM_STATIC_EXTENSIONS ${name}) - elseif(NOT ARG_NO_MODULE) - add_llvm_library(${name} MODULE ${ARG_UNPARSED_ARGUMENTS}) - else() - add_llvm_library(${name} OBJECT ${ARG_UNPARSED_ARGUMENTS}) - endif() -+ message(STATUS "Registering ${name} as a pass plugin (static build: ${LLVM_${name_upper}_LINK_INTO_TOOLS})") - - endfunction(add_llvm_pass_plugin) - --# Generate X Macro file for extension handling. It provides a --# HANDLE_EXTENSION(extension_namespace, ExtensionProject) call for each extension --# allowing client code to define HANDLE_EXTENSION to have a specific code be run for --# each extension. -+# process_llvm_pass_plugins([GEN_CONFIG]) -+# -+# Correctly set lib dependencies between plugins and tools, based on tools -+# registered with the ENABLE_PLUGINS option. -+# -+# if GEN_CONFIG option is set, also generate X Macro file for extension -+# handling. It provides a HANDLE_EXTENSION(extension_namespace, ExtensionProject) -+# call for each extension allowing client code to define -+# HANDLE_EXTENSION to have a specific code be run for each extension. - # --# Also correctly set lib dependencies between plugins and tools. - function(process_llvm_pass_plugins) -- get_property(LLVM_EXTENSIONS GLOBAL PROPERTY LLVM_COMPILE_EXTENSIONS) -- file(WRITE "${LLVM_BINARY_DIR}/include/llvm/Support/Extension.def.tmp" "//extension handlers\n") -- foreach(llvm_extension ${LLVM_EXTENSIONS}) -- string(TOLOWER ${llvm_extension} llvm_extension_lower) -- -- string(TOUPPER ${llvm_extension} llvm_extension_upper) -- string(SUBSTRING ${llvm_extension_upper} 0 1 llvm_extension_upper_first) -- string(SUBSTRING ${llvm_extension_lower} 1 -1 llvm_extension_lower_tail) -- string(CONCAT llvm_extension_project ${llvm_extension_upper_first} ${llvm_extension_lower_tail}) -- -- if(LLVM_${llvm_extension_upper}_LINK_INTO_TOOLS) -- file(APPEND "${LLVM_BINARY_DIR}/include/llvm/Support/Extension.def.tmp" "HANDLE_EXTENSION(${llvm_extension_project})\n") -- -- get_property(llvm_plugin_targets GLOBAL PROPERTY LLVM_PLUGIN_TARGETS) -- foreach(llvm_plugin_target ${llvm_plugin_targets}) -- set_property(TARGET ${llvm_plugin_target} APPEND PROPERTY LINK_LIBRARIES ${llvm_extension}) -- set_property(TARGET ${llvm_plugin_target} APPEND PROPERTY INTERFACE_LINK_LIBRARIES ${llvm_extension}) -- endforeach() -- else() -- add_llvm_library(${llvm_extension_lower} MODULE obj.${llvm_extension_lower}) -- endif() -+ cmake_parse_arguments(ARG -+ "GEN_CONFIG" "" "" -+ ${ARGN}) - -+ if(ARG_GEN_CONFIG) -+ get_property(LLVM_STATIC_EXTENSIONS GLOBAL PROPERTY LLVM_STATIC_EXTENSIONS) -+ else() -+ include(LLVMConfigExtensions) -+ endif() -+ -+ # Add static plugins to each plugin target. -+ foreach(llvm_extension ${LLVM_STATIC_EXTENSIONS}) -+ get_property(llvm_plugin_targets GLOBAL PROPERTY LLVM_PLUGIN_TARGETS) -+ foreach(llvm_plugin_target ${llvm_plugin_targets}) -+ set_property(TARGET ${llvm_plugin_target} APPEND PROPERTY LINK_LIBRARIES ${llvm_extension}) -+ set_property(TARGET ${llvm_plugin_target} APPEND PROPERTY INTERFACE_LINK_LIBRARIES ${llvm_extension}) -+ endforeach() - endforeach() -- file(APPEND "${LLVM_BINARY_DIR}/include/llvm/Support/Extension.def.tmp" "#undef HANDLE_EXTENSION\n") - -- # only replace if there's an actual change -- execute_process(COMMAND ${CMAKE_COMMAND} -E copy_if_different -- "${LLVM_BINARY_DIR}/include/llvm/Support/Extension.def.tmp" -- "${LLVM_BINARY_DIR}/include/llvm/Support/Extension.def") -- file(REMOVE "${LLVM_BINARY_DIR}/include/llvm/Support/Extension.def.tmp") -+ # Eventually generate the extension header, and store config to a cmake file -+ # for usage in third-party configuration. -+ if(ARG_GEN_CONFIG) -+ set(LLVM_INSTALL_PACKAGE_DIR lib${LLVM_LIBDIR_SUFFIX}/cmake/llvm) -+ set(llvm_cmake_builddir "${LLVM_BINARY_DIR}/${LLVM_INSTALL_PACKAGE_DIR}") -+ file(WRITE -+ "${llvm_cmake_builddir}/LLVMConfigExtensions.cmake" -+ "set(LLVM_STATIC_EXTENSIONS ${LLVM_STATIC_EXTENSIONS})") -+ install(FILES -+ ${llvm_cmake_builddir}/LLVMConfigExtensions.cmake -+ DESTINATION ${LLVM_INSTALL_PACKAGE_DIR} -+ COMPONENT cmake-exports) -+ -+ file(WRITE "${LLVM_BINARY_DIR}/include/llvm/Support/Extension.def.tmp" "//extension handlers\n") -+ foreach(llvm_extension ${LLVM_STATIC_EXTENSIONS}) -+ file(APPEND "${LLVM_BINARY_DIR}/include/llvm/Support/Extension.def.tmp" "HANDLE_EXTENSION(${llvm_extension})\n") -+ endforeach() -+ file(APPEND "${LLVM_BINARY_DIR}/include/llvm/Support/Extension.def.tmp" "#undef HANDLE_EXTENSION\n") -+ -+ # only replace if there's an actual change -+ execute_process(COMMAND ${CMAKE_COMMAND} -E copy_if_different -+ "${LLVM_BINARY_DIR}/include/llvm/Support/Extension.def.tmp" -+ "${LLVM_BINARY_DIR}/include/llvm/Support/Extension.def") -+ file(REMOVE "${LLVM_BINARY_DIR}/include/llvm/Support/Extension.def.tmp") -+ endif() - endfunction() - - function(export_executable_symbols target) -diff --git a/llvm/cmake/modules/CMakeLists.txt b/llvm/cmake/modules/CMakeLists.txt -index 9cf22b436fa..af757d6199a 100644 ---- llvm/cmake/modules/CMakeLists.txt -+++ llvm/cmake/modules/CMakeLists.txt -@@ -136,6 +136,7 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) - FILES_MATCHING PATTERN *.cmake - PATTERN .svn EXCLUDE - PATTERN LLVMConfig.cmake EXCLUDE -+ PATTERN LLVMConfigExtensions.cmake EXCLUDE - PATTERN LLVMConfigVersion.cmake EXCLUDE - PATTERN LLVM-Config.cmake EXCLUDE - PATTERN GetHostTriple.cmake EXCLUDE) diff --git a/pkgs/development/compilers/llvm/10/llvm.nix b/pkgs/development/compilers/llvm/10/llvm.nix index dd0728b40c948..742beb876404e 100644 --- a/pkgs/development/compilers/llvm/10/llvm.nix +++ b/pkgs/development/compilers/llvm/10/llvm.nix @@ -32,8 +32,8 @@ in stdenv.mkDerivation (rec { pname = "llvm"; inherit version; - src = fetch pname "1pwgm6cr0xr5a0hrbqs1zvsvvjvy0yq1y47c96804wcs795s90yz"; - polly_src = fetch "polly" "15sd3dq0w60jsb76pis09lkagj5iy43h9hg4kd9gx5l8cbnsdyrm"; + src = fetch pname "1wydhbp9kyjp5y0rc627imxgkgqiv3dfirbqil9dgpnbaw5y7n65"; + polly_src = fetch "polly" "0nm2d8niz47yjsa3r17v3p13b70igkd338ib8191znr1dfw0pyyj"; unpackPhase = '' unpackFile $src @@ -55,11 +55,6 @@ in stdenv.mkDerivation (rec { propagatedBuildInputs = [ ncurses zlib ]; - patches = [ - # 10.0.0rc3-only - ./llvm-extension-handling.patch - ]; - postPatch = optionalString stdenv.isDarwin '' substituteInPlace cmake/modules/AddLLVM.cmake \ --replace 'set(_install_name_dir INSTALL_NAME_DIR "@rpath")' "set(_install_name_dir)" \ diff --git a/pkgs/development/compilers/llvm/10/openmp.nix b/pkgs/development/compilers/llvm/10/openmp.nix index 624c99bc86835..0927448d2b498 100644 --- a/pkgs/development/compilers/llvm/10/openmp.nix +++ b/pkgs/development/compilers/llvm/10/openmp.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { pname = "openmp"; inherit version; - src = fetch pname "1ymd13gj07x0b0vxziygm0p41vrq6nsgx837jqg9ll6h8ndg57rv"; + src = fetch pname "0i4bn84lkpm5w3qkpvwm5z6jdj8fynp7d3bcasa1xyq4is6757yi"; nativeBuildInputs = [ cmake perl ]; buildInputs = [ llvm ]; diff --git a/pkgs/development/compilers/llvm/7/bintools.nix b/pkgs/development/compilers/llvm/7/bintools.nix index 72a2a73319304..53f7941e33699 100644 --- a/pkgs/development/compilers/llvm/7/bintools.nix +++ b/pkgs/development/compilers/llvm/7/bintools.nix @@ -11,9 +11,19 @@ in runCommand "llvm-binutils-${version}" { preferLocalBuild = true; } '' ln -s $prog $out/bin/${prefix}$(basename $prog) done for prog in ${llvm}/bin/*; do - ln -s $prog $out/bin/${prefix}$(echo $(basename $prog) | sed -e "s|llvm-||") ln -sf $prog $out/bin/${prefix}$(basename $prog) done - rm -f $out/bin/${prefix}cat + + ln -s ${llvm}/bin/llvm-ar $out/bin/${prefix}ar + ln -s ${llvm}/bin/llvm-as $out/bin/${prefix}as + ln -s ${llvm}/bin/llvm-dwp $out/bin/${prefix}dwp + ln -s ${llvm}/bin/llvm-nm $out/bin/${prefix}nm + ln -s ${llvm}/bin/llvm-objcopy $out/bin/${prefix}objcopy + ln -s ${llvm}/bin/llvm-objdump $out/bin/${prefix}objdump + ln -s ${llvm}/bin/llvm-ranlib $out/bin/${prefix}ranlib + ln -s ${llvm}/bin/llvm-readelf $out/bin/${prefix}readelf + ln -s ${llvm}/bin/llvm-size $out/bin/${prefix}size + ln -s ${llvm}/bin/llvm-strip $out/bin/${prefix}strip + ln -s ${lld}/bin/lld $out/bin/${prefix}ld '' diff --git a/pkgs/development/compilers/llvm/8/bintools.nix b/pkgs/development/compilers/llvm/8/bintools.nix index 72a2a73319304..53f7941e33699 100644 --- a/pkgs/development/compilers/llvm/8/bintools.nix +++ b/pkgs/development/compilers/llvm/8/bintools.nix @@ -11,9 +11,19 @@ in runCommand "llvm-binutils-${version}" { preferLocalBuild = true; } '' ln -s $prog $out/bin/${prefix}$(basename $prog) done for prog in ${llvm}/bin/*; do - ln -s $prog $out/bin/${prefix}$(echo $(basename $prog) | sed -e "s|llvm-||") ln -sf $prog $out/bin/${prefix}$(basename $prog) done - rm -f $out/bin/${prefix}cat + + ln -s ${llvm}/bin/llvm-ar $out/bin/${prefix}ar + ln -s ${llvm}/bin/llvm-as $out/bin/${prefix}as + ln -s ${llvm}/bin/llvm-dwp $out/bin/${prefix}dwp + ln -s ${llvm}/bin/llvm-nm $out/bin/${prefix}nm + ln -s ${llvm}/bin/llvm-objcopy $out/bin/${prefix}objcopy + ln -s ${llvm}/bin/llvm-objdump $out/bin/${prefix}objdump + ln -s ${llvm}/bin/llvm-ranlib $out/bin/${prefix}ranlib + ln -s ${llvm}/bin/llvm-readelf $out/bin/${prefix}readelf + ln -s ${llvm}/bin/llvm-size $out/bin/${prefix}size + ln -s ${llvm}/bin/llvm-strip $out/bin/${prefix}strip + ln -s ${lld}/bin/lld $out/bin/${prefix}ld '' diff --git a/pkgs/development/compilers/llvm/8/default.nix b/pkgs/development/compilers/llvm/8/default.nix index 34b1f5e641b8a..984e7ab74b74d 100644 --- a/pkgs/development/compilers/llvm/8/default.nix +++ b/pkgs/development/compilers/llvm/8/default.nix @@ -42,10 +42,11 @@ let enablePolly = true; }; - llvm-manpages = lowPrio (tools.llvm.override { - enableManpages = true; - python3 = pkgs.python3; # don't use python-boot - }); + # disabled until recommonmark supports sphinx 3 + #llvm-manpages = lowPrio (tools.llvm.override { + # enableManpages = true; + # python3 = pkgs.python3; # don't use python-boot + #}); clang-manpages = lowPrio (tools.clang-unwrapped.override { enableManpages = true; diff --git a/pkgs/development/compilers/llvm/9/bintools.nix b/pkgs/development/compilers/llvm/9/bintools.nix index 72a2a73319304..53f7941e33699 100644 --- a/pkgs/development/compilers/llvm/9/bintools.nix +++ b/pkgs/development/compilers/llvm/9/bintools.nix @@ -11,9 +11,19 @@ in runCommand "llvm-binutils-${version}" { preferLocalBuild = true; } '' ln -s $prog $out/bin/${prefix}$(basename $prog) done for prog in ${llvm}/bin/*; do - ln -s $prog $out/bin/${prefix}$(echo $(basename $prog) | sed -e "s|llvm-||") ln -sf $prog $out/bin/${prefix}$(basename $prog) done - rm -f $out/bin/${prefix}cat + + ln -s ${llvm}/bin/llvm-ar $out/bin/${prefix}ar + ln -s ${llvm}/bin/llvm-as $out/bin/${prefix}as + ln -s ${llvm}/bin/llvm-dwp $out/bin/${prefix}dwp + ln -s ${llvm}/bin/llvm-nm $out/bin/${prefix}nm + ln -s ${llvm}/bin/llvm-objcopy $out/bin/${prefix}objcopy + ln -s ${llvm}/bin/llvm-objdump $out/bin/${prefix}objdump + ln -s ${llvm}/bin/llvm-ranlib $out/bin/${prefix}ranlib + ln -s ${llvm}/bin/llvm-readelf $out/bin/${prefix}readelf + ln -s ${llvm}/bin/llvm-size $out/bin/${prefix}size + ln -s ${llvm}/bin/llvm-strip $out/bin/${prefix}strip + ln -s ${lld}/bin/lld $out/bin/${prefix}ld '' diff --git a/pkgs/development/compilers/llvm/9/default.nix b/pkgs/development/compilers/llvm/9/default.nix index 5d93ca8709fa0..816a4f3d2302f 100644 --- a/pkgs/development/compilers/llvm/9/default.nix +++ b/pkgs/development/compilers/llvm/9/default.nix @@ -42,10 +42,11 @@ let enablePolly = true; }; - llvm-manpages = lowPrio (tools.llvm.override { - enableManpages = true; - python3 = pkgs.python3; # don't use python-boot - }); + # disabled until recommonmark supports sphinx 3 + #llvm-manpages = lowPrio (tools.llvm.override { + # enableManpages = true; + # python3 = pkgs.python3; # don't use python-boot + #}); clang-manpages = lowPrio (tools.clang-unwrapped.override { enableManpages = true; diff --git a/pkgs/development/compilers/rust/rls/default.nix b/pkgs/development/compilers/rust/rls/default.nix index 63a3c96a8f923..b603675a6f177 100644 --- a/pkgs/development/compilers/rust/rls/default.nix +++ b/pkgs/development/compilers/rust/rls/default.nix @@ -20,6 +20,11 @@ rustPlatform.buildRustPackage { # a nightly compiler is required unless we use this cheat code. RUSTC_BOOTSTRAP=1; + # As of rustc 1.45.0, these env vars are required to build rls + # (due to https://github.com/rust-lang/rust/pull/72001) + CFG_RELEASE = "${rustPlatform.rust.rustc.version}-nightly"; + CFG_RELEASE_CHANNEL = "nightly"; + # rls-rustc links to rustc_private crates CARGO_BUILD_RUSTFLAGS = if stdenv.isDarwin then "-C rpath" else null; diff --git a/pkgs/development/compilers/wla-dx/default.nix b/pkgs/development/compilers/wla-dx/default.nix index f50d9e0598b1f..2d3a527fa142a 100644 --- a/pkgs/development/compilers/wla-dx/default.nix +++ b/pkgs/development/compilers/wla-dx/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "wla-dx"; - version = "9.8"; + version = "9.11"; src = fetchFromGitHub { owner = "vhelin"; repo = "wla-dx"; rev = "v${version}-fix"; - sha256 = "1dsxhy19nif983lr20vxl099giwzgmzqyh7ass705hkphmwagcv6"; + sha256 = "0sz1vqafl7ii3z1710sk0ilvczv8pb4b6lkmg9pr7hqj3kaxndii"; }; installPhase = '' diff --git a/pkgs/development/interpreters/clojure/default.nix b/pkgs/development/interpreters/clojure/default.nix index 814af36811c7d..7d0857f4e7898 100644 --- a/pkgs/development/interpreters/clojure/default.nix +++ b/pkgs/development/interpreters/clojure/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "clojure"; - version = "1.10.1.547"; + version = "1.10.1.590"; src = fetchurl { url = "https://download.clojure.org/install/clojure-tools-${version}.tar.gz"; - sha256 = "06lg4z3q0fzxlbmx92g5qb0w3nw83dbwkzh3zjdy9ixrpm7b84i0"; + sha256 = "18x8xkxsqwnv3k1mf42ylfv7zzjllm7yiagq16b2gkq62j5sm1k7"; }; nativeBuildInputs = [ @@ -18,20 +18,20 @@ stdenv.mkDerivation rec { let binPath = stdenv.lib.makeBinPath [ rlwrap jdk11 ]; in - '' - mkdir -p $out/libexec - cp clojure-tools-${version}.jar $out/libexec - cp example-deps.edn $out - cp deps.edn $out + '' + mkdir -p $out/libexec + cp clojure-tools-${version}.jar $out/libexec + cp example-deps.edn $out + cp deps.edn $out - substituteInPlace clojure --replace PREFIX $out + substituteInPlace clojure --replace PREFIX $out - install -Dt $out/bin clj clojure - wrapProgram $out/bin/clj --prefix PATH : $out/bin:${binPath} - wrapProgram $out/bin/clojure --prefix PATH : $out/bin:${binPath} + install -Dt $out/bin clj clojure + wrapProgram $out/bin/clj --prefix PATH : $out/bin:${binPath} + wrapProgram $out/bin/clojure --prefix PATH : $out/bin:${binPath} - installManPage clj.1 clojure.1 - ''; + installManPage clj.1 clojure.1 + ''; doInstallCheck = true; installCheckPhase = '' diff --git a/pkgs/development/interpreters/evcxr/default.nix b/pkgs/development/interpreters/evcxr/default.nix index 5d3d3de85dd39..5e67103b1bdca 100644 --- a/pkgs/development/interpreters/evcxr/default.nix +++ b/pkgs/development/interpreters/evcxr/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "evcxr"; - version = "0.5.1"; + version = "0.5.2"; src = fetchFromGitHub { owner = "google"; repo = "evcxr"; - rev = "582ce09f216d4812f7d152f6eedf0b034fc4dbbd"; - sha256 = "12hlqgh74z8vmd7fkxh4vk3dqp8hlhzkxnbyywk6nphi562n6w5w"; + rev = "v${version}"; + sha256 = "09xziv2vmjd30yy095l3n33v9vdkbbkyjdcc5azyd76m2fk9vi42"; }; - cargoSha256 = "0yr8vwlpfsg47sg0032yrsdcgxyky0hy4963zkh0pmjykbyqkb3h"; + cargoSha256 = "1cdj5qh3z4bnz2267s83chw6n1kg9zl1hrawkis5rr9vq7llrb24"; nativeBuildInputs = [ pkgconfig makeWrapper cmake ]; buildInputs = stdenv.lib.optional stdenv.isDarwin Security; diff --git a/pkgs/development/interpreters/hy/default.nix b/pkgs/development/interpreters/hy/default.nix index a3aca532b0f3e..a8890b048fbe4 100644 --- a/pkgs/development/interpreters/hy/default.nix +++ b/pkgs/development/interpreters/hy/default.nix @@ -2,11 +2,11 @@ python3Packages.buildPythonApplication rec { pname = "hy"; - version = "0.18.0"; + version = "0.19.0"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "04dfwm336gw61fmgwikvh0cnxk682p19b4w555wl5d7mlym4rwj2"; + sha256 = "05k05qmiiysiwdc05sxmanwhv1crfwbb3l8swxfisbzbvmv1snis"; }; checkInputs = with python3Packages; [ flake8 pytest ]; diff --git a/pkgs/development/libraries/aml/default.nix b/pkgs/development/libraries/aml/default.nix new file mode 100644 index 0000000000000..0b753618ba6a1 --- /dev/null +++ b/pkgs/development/libraries/aml/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchFromGitHub, meson, pkg-config, ninja }: + +stdenv.mkDerivation rec { + pname = "aml"; + version = "0.1.0"; + + src = fetchFromGitHub { + owner = "any1"; + repo = pname; + rev = "v${version}"; + sha256 = "1pmiflkd9idnf6p0rnmccqqlj87k8crz9ixpx6rix671vnpk0xzi"; + }; + + nativeBuildInputs = [ meson pkg-config ninja ]; + + meta = with stdenv.lib; { + description = "Another main loop"; + inherit (src.meta) homepage; + license = licenses.isc; + platforms = platforms.unix; + maintainers = with maintainers; [ primeos ]; + }; +} diff --git a/pkgs/development/libraries/caf/default.nix b/pkgs/development/libraries/caf/default.nix index 605df2381016c..74ca27f2e3c09 100644 --- a/pkgs/development/libraries/caf/default.nix +++ b/pkgs/development/libraries/caf/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "actor-framework"; - version = "0.17.5"; + version = "0.17.6"; src = fetchFromGitHub { owner = "actor-framework"; repo = "actor-framework"; rev = version; - sha256 = "1w7sanxhh4sv4ap3ildqzlziazcy7ydx2pbjjrf3k60lcwq0lzn6"; + sha256 = "03pi2jcdvdxncvv3hmzlamask0db1fc5l79k9rgq9agl0swd0mnz"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/flatpak/default.nix b/pkgs/development/libraries/flatpak/default.nix index ceca7e24fb6e9..40cea4f730e7e 100644 --- a/pkgs/development/libraries/flatpak/default.nix +++ b/pkgs/development/libraries/flatpak/default.nix @@ -1,21 +1,23 @@ { stdenv , fetchurl -, autoreconfHook +, fetchpatch +, autoconf +, automake +, libtool , docbook_xml_dtd_412 , docbook_xml_dtd_42 , docbook_xml_dtd_43 -, docbook_xsl +, docbook-xsl-nons , which , libxml2 , gobject-introspection , gtk-doc , intltool , libxslt -, pkgconfig +, pkg-config , xmlto , appstream-glib , substituteAll -, glibcLocales , yacc , xdg-dbus-proxy , p11-kit @@ -39,6 +41,7 @@ , nixosTests , libsoup , lzma +, zstd , ostree , polkit , python3 @@ -54,14 +57,14 @@ stdenv.mkDerivation rec { pname = "flatpak"; - version = "1.6.3"; + version = "1.8.1"; # TODO: split out lib once we figure out what to do with triggerdir - outputs = [ "out" "dev" "man" "doc" "installedTests" ]; + outputs = [ "out" "dev" "man" "doc" "devdoc" "installedTests" ]; src = fetchurl { url = "https://github.com/flatpak/flatpak/releases/download/${version}/${pname}-${version}.tar.xz"; - sha256 = "17s8nqdxd4xdy7ag9bw06adxccha78jmlsa3zpqnl3qh92pg0hji"; + sha256 = "ZpFLZvmmQHk4bMCXpAoZ+oQZVo33+0VvLkB/D3asnq0="; }; patches = [ @@ -69,7 +72,7 @@ stdenv.mkDerivation rec { # https://github.com/flatpak/flatpak/issues/1460 (substituteAll { src = ./fix-test-paths.patch; - inherit coreutils gettext glibcLocales socat gtk3; + inherit coreutils gettext socat gtk3; smi = shared-mime-info; dfu = desktop-file-utils; hicolorIconTheme = hicolor-icon-theme; @@ -101,21 +104,31 @@ stdenv.mkDerivation rec { # But we want the GDK_PIXBUF_MODULE_FILE from the wrapper affect the icon validator. ./validate-icon-pixbuf.patch + + # Fix `flatpak/test-oci-registry@{user,system}.wrap.test` installed tests. + # https://github.com/flatpak/flatpak/pull/3762 + (fetchpatch { + url = "https://github.com/flatpak/flatpak/commit/c1447dadecd50f384b6d11dac18b014245267d00.patch"; + sha256 = "UAA/wGr8/aMbx5MV+8Ilro2kgKkx2QOn88lDUjCgeDA="; + }) ]; nativeBuildInputs = [ - autoreconfHook + autoconf + automake + libtool libxml2 + # TODO: replace with docbook_xml_dtd_45 https://github.com/flatpak/flatpak/pull/3760 docbook_xml_dtd_412 docbook_xml_dtd_42 docbook_xml_dtd_43 - docbook_xsl + docbook-xsl-nons which gobject-introspection gtk-doc intltool libxslt - pkgconfig + pkg-config xmlto appstream-glib yacc @@ -134,6 +147,7 @@ stdenv.mkDerivation rec { libseccomp libsoup lzma + # zstd # TODO: broken paths in .pc file polkit python3 systemd @@ -166,6 +180,7 @@ stdenv.mkDerivation rec { "--with-system-dbus-proxy=${xdg-dbus-proxy}/bin/xdg-dbus-proxy" "--with-dbus-config-dir=${placeholder "out"}/share/dbus-1/system.d" "--localstatedir=/var" + "--enable-gtk-doc" "--enable-installed-tests" ]; @@ -174,9 +189,24 @@ stdenv.mkDerivation rec { "installed_test_metadir=${placeholder "installedTests"}/share/installed-tests/flatpak" ]; - postPatch = '' + postPatch = let + vsc-py = python3.withPackages (pp: [ + pp.pyparsing + ]); + in '' patchShebangs buildutil patchShebangs tests + PATH=${stdenv.lib.makeBinPath [vsc-py]}:$PATH patchShebangs --build variant-schema-compiler/variant-schema-compiler + ''; + + preConfigure = '' + # TODO: remove the condition once autogen.sh is shipped in the tarball + # https://github.com/flatpak/flatpak/pull/3761 + if [[ -f autogen.sh ]]; then + NOCONFIGURE=1 ./autogen.sh + else + autoreconf --install --force --verbose + fi ''; passthru = { diff --git a/pkgs/development/libraries/flatpak/fix-test-paths.patch b/pkgs/development/libraries/flatpak/fix-test-paths.patch index 8ea2f0159a316..dcba666818582 100644 --- a/pkgs/development/libraries/flatpak/fix-test-paths.patch +++ b/pkgs/development/libraries/flatpak/fix-test-paths.patch @@ -1,5 +1,5 @@ diff --git a/app/flatpak-builtins-build-export.c b/app/flatpak-builtins-build-export.c -index 5de89d62..bf6bdb52 100644 +index 43fd0563..4067bd36 100644 --- a/app/flatpak-builtins-build-export.c +++ b/app/flatpak-builtins-build-export.c @@ -458,7 +458,7 @@ validate_desktop_file (GFile *desktop_file, @@ -12,10 +12,10 @@ index 5de89d62..bf6bdb52 100644 { if (!g_error_matches (local_error, G_SPAWN_ERROR, G_SPAWN_ERROR_NOENT)) diff --git a/tests/libtest.sh b/tests/libtest.sh -index e64be49f..a9a53e12 100644 +index acb2095b..b361da16 100644 --- a/tests/libtest.sh +++ b/tests/libtest.sh -@@ -367,7 +367,7 @@ if [ -z "${FLATPAK_BWRAP:-}" ]; then +@@ -431,7 +431,7 @@ if [ -z "${FLATPAK_BWRAP:-}" ]; then # running installed-tests: assume we know what we're doing _flatpak_bwrap_works=true elif ! "$FLATPAK_BWRAP" --unshare-ipc --unshare-net --unshare-pid \ @@ -24,7 +24,7 @@ index e64be49f..a9a53e12 100644 _flatpak_bwrap_works=false else _flatpak_bwrap_works=true -@@ -440,7 +440,7 @@ dbus-daemon --fork --config-file=session.conf --print-address=3 --print-pid=4 \ +@@ -504,7 +504,7 @@ dbus-daemon --fork --config-file=session.conf --print-address=3 --print-pid=4 \ export DBUS_SESSION_BUS_ADDRESS="$(cat dbus-session-bus-address)" DBUS_SESSION_BUS_PID="$(cat dbus-session-bus-pid)" @@ -33,7 +33,7 @@ index e64be49f..a9a53e12 100644 assert_not_reached "Failed to start dbus-daemon" fi -@@ -449,7 +449,7 @@ gdb_bt () { +@@ -519,7 +519,7 @@ commit_to_path () { } cleanup () { @@ -43,10 +43,10 @@ index e64be49f..a9a53e12 100644 fusermount -u $XDG_RUNTIME_DIR/doc || : kill $(jobs -p) &> /dev/null || true diff --git a/tests/make-test-app.sh b/tests/make-test-app.sh -index e51e21a6..7d39efb5 100755 +index 612f914f..4b890da2 100755 --- a/tests/make-test-app.sh +++ b/tests/make-test-app.sh -@@ -149,13 +149,13 @@ msgid "Hello world" +@@ -151,13 +151,13 @@ msgid "Hello world" msgstr "Hallo Welt" EOF mkdir -p ${DIR}/files/de/share/de/LC_MESSAGES @@ -63,10 +63,10 @@ index e51e21a6..7d39efb5 100755 flatpak build-finish ${DIR} mkdir -p repos diff --git a/tests/make-test-runtime.sh b/tests/make-test-runtime.sh -index 5d2c309b..cf61a3cf 100755 +index af289625..7db51c17 100755 --- a/tests/make-test-runtime.sh +++ b/tests/make-test-runtime.sh -@@ -25,9 +25,10 @@ EOF +@@ -28,9 +28,10 @@ EOF # On Debian derivatives, /usr/sbin and /sbin aren't in ordinary users' # PATHs, but ldconfig is kept in /sbin @@ -78,7 +78,7 @@ index 5d2c309b..cf61a3cf 100755 mkdir -p ${DIR}/usr/bin mkdir -p ${DIR}/usr/lib ln -s ../lib ${DIR}/usr/lib64 -@@ -37,48 +38,24 @@ if test -f /sbin/ldconfig.real; then +@@ -40,40 +41,17 @@ if test -f /sbin/ldconfig.real; then else cp `which ldconfig` ${DIR}/usr/bin fi @@ -129,11 +129,18 @@ index 5d2c309b..cf61a3cf 100755 done ln -s bash ${DIR}/usr/bin/sh +@@ -84,11 +62,13 @@ echo "Hello world, from a runtime$EXTRA" + EOF + chmod a+x ${DIR}/usr/bin/runtime_hello.sh + -# We copy the C.UTF8 locale and call it en_US. Its a bit of a lie, but -# the real en_US locale is often not available, because its in the -# local archive. -mkdir -p ${DIR}/usr/lib/locale/ -cp -r /usr/lib/locale/C.* ${DIR}/usr/lib/locale/en_US ++# We do not copy C.UTF8 locale because it is in locale archive and ++# that is already copied with glibc. ++ +mv ${DIR}/nix/store ${DIR}/usr/store # files outside /usr are not permitted, we will have to replace /nix/store with /usr/store +chmod -R u+w ${DIR} # nix store has read-only directories which would cause problems during clean-up, files need to be writable for sed +find ${DIR} -type f -print0 | xargs -0 sed -i 's~/nix/store/~/usr/store/~g' # replace hardcoded paths @@ -142,10 +149,10 @@ index 5d2c309b..cf61a3cf 100755 if [ x$COLLECTION_ID != x ]; then collection_args=--collection-id=${COLLECTION_ID} diff --git a/tests/testlibrary.c b/tests/testlibrary.c -index 44ae28e3..76bf619f 100644 +index 509ce6cc..6a333c9c 100644 --- a/tests/testlibrary.c +++ b/tests/testlibrary.c -@@ -1343,7 +1343,7 @@ check_bwrap_support (void) +@@ -1399,7 +1399,7 @@ check_bwrap_support (void) { gint exit_code = 0; char *argv[] = { (char *) bwrap, "--unshare-ipc", "--unshare-net", diff --git a/pkgs/development/libraries/graphene/default.nix b/pkgs/development/libraries/graphene/default.nix index 3fc0094f104f7..ee147d82afdbf 100644 --- a/pkgs/development/libraries/graphene/default.nix +++ b/pkgs/development/libraries/graphene/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, nix-update-script , pkgconfig , meson , ninja @@ -62,6 +63,10 @@ stdenv.mkDerivation rec { tests = { installedTests = nixosTests.installed-tests.graphene; }; + + updateScript = nix-update-script { + attrPath = pname; + }; }; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/hunspell/dictionaries.nix b/pkgs/development/libraries/hunspell/dictionaries.nix index a330691c6a582..2cdc30109d90b 100644 --- a/pkgs/development/libraries/hunspell/dictionaries.nix +++ b/pkgs/development/libraries/hunspell/dictionaries.nix @@ -754,4 +754,33 @@ in rec { readmeFile = "README_sk.txt"; license = with stdenv.lib.licenses; [ gpl2 lgpl21 mpl11 ]; }; + + /* DANISH */ + + da_DK = da-dk; + da-dk = mkDict rec { + name = "hunspell-dict-da-dk-${version}"; + version = "2.5.137"; + + src = fetchurl { + url = "https://stavekontrolden.dk/dictionaries/da_DK/da_DK-${version}.oxt"; + sha256 = "16y0smkg1mq0133r1fbw5ak6s2xw39281knk5ivhanakayq789qx"; + }; + + shortName = "da-dk"; + shortDescription = "Danish (Danmark)"; + dictFileName = "da_DK"; + readmeFile = "README_da_DK.txt"; + nativeBuildInputs = [ unzip ]; + unpackCmd = '' + unzip $src ${dictFileName}.dic ${dictFileName}.aff ${readmeFile} -d ${dictFileName} + ''; + + meta = with stdenv.lib; { + description = "Hunspell dictionary for Danish (Denmark) from Stavekontrolden"; + homepage = "https://github.com/jeppebundsgaard/stavekontrolden"; + license = with stdenv.lib.licenses; [ gpl2Only lgpl21Only mpl11 ]; + maintainers = with maintainers; [ louisdk1 ]; + }; + }; } diff --git a/pkgs/development/libraries/igraph/default.nix b/pkgs/development/libraries/igraph/default.nix index 7f494e8bddc18..6a55359e168bc 100644 --- a/pkgs/development/libraries/igraph/default.nix +++ b/pkgs/development/libraries/igraph/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { homepage = "https://igraph.org/"; license = lib.licenses.gpl2; # NB: Known to fail tests on aarch64. - platforms = [ "x86_64-linux" ]; + platforms = [ "x86_64-linux" ] ++ lib.platforms.darwin; maintainers = [ lib.maintainers.MostAwesomeDude ]; }; } diff --git a/pkgs/development/libraries/java/jzmq/default.nix b/pkgs/development/libraries/java/jzmq/default.nix deleted file mode 100644 index 5bc0f15b205d3..0000000000000 --- a/pkgs/development/libraries/java/jzmq/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, zeromq3, jdk }: - -stdenv.mkDerivation rec { - pname = "jzmq"; - version = "3.1.0"; - - src = fetchFromGitHub { - owner = "zeromq"; - repo = "jzmq"; - rev = "v${version}"; - sha256 = "1wlzs604mgmqmrgpk4pljx2nrlxzdfi3r8k59qlm90fx8qkqkc63"; - }; - - nativeBuildInputs = [ autoreconfHook pkgconfig ]; - buildInputs = [ zeromq3 jdk ]; - - preConfigure = '' - ${if stdenv.hostPlatform.system == "x86_64-darwin" then - '' sed -i -e 's~/Headers~/include~' -e 's~_JNI_INC_SUBDIRS=\".*\"~_JNI_INC_SUBDIRS=\"darwin\"~' configure - '' else ""} - ''; - - meta = { - homepage = "http://www.zeromq.org"; - description = "Java bindings for ZeroMQ"; - platforms = stdenv.lib.platforms.unix; - license = stdenv.lib.licenses.lgpl3; - maintainers = [ stdenv.lib.maintainers.vizanto ]; - }; -} diff --git a/pkgs/development/libraries/libpcap/default.nix b/pkgs/development/libraries/libpcap/default.nix index fcb599e00f571..604fd3ee44653 100644 --- a/pkgs/development/libraries/libpcap/default.nix +++ b/pkgs/development/libraries/libpcap/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { ++ optionals withBluez [ bluez.dev pkgconfig ]; # We need to force the autodetection because detection doesn't - # work in pure build enviroments. + # work in pure build environments. configureFlags = [ ("--with-pcap=" + { linux = "linux"; diff --git a/pkgs/development/libraries/libredwg/default.nix b/pkgs/development/libraries/libredwg/default.nix index 76f01f9a50379..71667460e2394 100644 --- a/pkgs/development/libraries/libredwg/default.nix +++ b/pkgs/development/libraries/libredwg/default.nix @@ -6,13 +6,14 @@ let in stdenv.mkDerivation rec { pname = "libredwg"; - version = "0.10.1"; + version = "0.10.1.3707"; src = fetchFromGitHub { owner = "LibreDWG"; repo = pname; rev = version; - sha256 = "1zd721z2nriw1jlrh4y1fj59b0dnymhd4kwp8rqw16bs84gda37n"; + sha256 = "009n96lx4ahf05ryvm09z0l9956vz94r8pliyb88j0jficl0pxkf"; + fetchSubmodules = true; }; nativeBuildInputs = [ autoreconfHook pkg-config texinfo ] diff --git a/pkgs/development/libraries/libsignon-glib/default.nix b/pkgs/development/libraries/libsignon-glib/default.nix index 77a43872d4ea4..1f453dc291e48 100644 --- a/pkgs/development/libraries/libsignon-glib/default.nix +++ b/pkgs/development/libraries/libsignon-glib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, pkgconfig, meson, ninja, vala, python3, gtk-doc, docbook_xsl, docbook_xml_dtd_43, docbook_xml_dtd_412, glib, check, gobject-introspection }: +{ stdenv, fetchgit, nix-update-script, pkgconfig, meson, ninja, vala, python3, gtk-doc, docbook_xsl, docbook_xml_dtd_43, docbook_xml_dtd_412, glib, check, gobject-introspection }: stdenv.mkDerivation rec { pname = "libsignon-glib"; @@ -42,6 +42,12 @@ stdenv.mkDerivation rec { patchShebangs build-aux/gen-error-map.py ''; + passthru = { + updateScript = nix-update-script { + attrPath = pname; + }; + }; + meta = with stdenv.lib; { description = "A library for managing single signon credentials which can be used from GLib applications"; homepage = "https://gitlab.com/accounts-sso/libsignon-glib"; diff --git a/pkgs/development/libraries/lime/default.nix b/pkgs/development/libraries/lime/default.nix index 3ebcc7ad78a6c..aa34ff2e927c4 100644 --- a/pkgs/development/libraries/lime/default.nix +++ b/pkgs/development/libraries/lime/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { pname = "lime"; - version = "4.3.1"; + version = "4.4.0"; src = fetchFromGitLab { domain = "gitlab.linphone.org"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { group = "BC"; repo = pname; rev = version; - sha256 = "1ilpp9ai4sah23ngnxisvmwhrv5jkk5f831yp7smpl225z5nv83g"; + sha256 = "14jg1zisjbzflw3scfqdbwy48wq3cp93l867vigb8l40lkc6n26z"; }; buildInputs = [ bctoolbox soci belle-sip sqlite ]; diff --git a/pkgs/development/libraries/malcontent/better-separation.patch b/pkgs/development/libraries/malcontent/better-separation.patch index cd91760bff594..ef42650e249d1 100644 --- a/pkgs/development/libraries/malcontent/better-separation.patch +++ b/pkgs/development/libraries/malcontent/better-separation.patch @@ -1,18 +1,42 @@ +commit 363c5be465dd6dde35c3d31abd7b5cca9b1f3a9f +Author: Jan Tojnar <jtojnar@gmail.com> +Date: Thu Jul 23 18:49:03 2020 +0200 + + Improve separation between malcontent and malcontent-ui packages + + These artefacts go into both packages by default: + + * malcontent-control – a CLI tool + * PAM module + * gettext locale data + * help pages ✨ + * AccountService/D-Bus interfaces + * Polkit com.endlessm.ParentalControls rules and policy + + Items marked with ✨ will go to ui package, while the rest is installed with the base library. + + See also the packaging done by upstream in Endless: + https://github.com/endlessm/malcontent/tree/5482b7eb99aee9b8c344629bc078e193d3c26ffc/debian + + Cannot upstream this since they are worried about maintainability: + https://gitlab.freedesktop.org/pwithnall/malcontent/merge_requests/38#note_437946 + diff --git a/meson.build b/meson.build -index a6c477d..f7b2f0a 100644 +index 6e1dfa5..196350b 100644 --- a/meson.build +++ b/meson.build -@@ -125,8 +125,8 @@ test_env = [ +@@ -123,9 +123,8 @@ test_env = [ 'LC_ALL=C.UTF-8', ] -subdir('accounts-service') +-subdir('help') if not get_option('use_system_libmalcontent') + subdir('accounts-service') subdir('libmalcontent') else libmalcontent_api_version = '0' -@@ -137,11 +137,17 @@ endif +@@ -136,11 +135,16 @@ endif if get_option('ui').enabled() subdir('libmalcontent-ui') endif @@ -22,14 +46,13 @@ index a6c477d..f7b2f0a 100644 +endif if get_option('ui').enabled() subdir('malcontent-control') - endif --subdir('pam') ++ subdir('help') ++endif +if not get_option('use_system_libmalcontent') + subdir('pam') -+endif - subdir('po') ++ subdir('po') + endif +-subdir('pam') +-subdir('po') --meson.add_install_script('build-aux/meson_post_install.py') -+if get_option('ui').enabled() -+ meson.add_install_script('build-aux/meson_post_install.py') -+endif + meson.add_install_script('build-aux/meson_post_install.py') diff --git a/pkgs/development/libraries/malcontent/default.nix b/pkgs/development/libraries/malcontent/default.nix index f574ab1969306..3371bd45e7125 100644 --- a/pkgs/development/libraries/malcontent/default.nix +++ b/pkgs/development/libraries/malcontent/default.nix @@ -3,7 +3,7 @@ , fetchpatch , meson , ninja -, pkgconfig +, pkg-config , gobject-introspection , wrapGAppsHook , glib @@ -19,16 +19,16 @@ stdenv.mkDerivation rec { pname = "malcontent"; - version = "0.7.0"; + version = "0.8.0"; - outputs = [ "bin" "out" "dev" "man" "installedTests" ]; + outputs = [ "bin" "out" "lib" "pam" "dev" "man" "installedTests" ]; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "pwithnall"; repo = pname; rev = version; - sha256 = "0lxakzj75pvpgwbjfyfkg0gyzvry00zhc9h9cd8f0wksg7mabzbh"; + sha256 = "Y9HzysChzzmKW5PuCLm9AZ4oaBLMpB0I5NyZUOYFzm4="; }; patches = [ @@ -37,19 +37,12 @@ stdenv.mkDerivation rec { # Do not build things that are part of malcontent-ui package ./better-separation.patch - - # Fix pam installed test - # https://gitlab.freedesktop.org/pwithnall/malcontent/merge_requests/50 - (fetchpatch { - url = "https://gitlab.freedesktop.org/pwithnall/malcontent/commit/5d102eeb0604e65fc977ca77d4b249e986e634cc.patch"; - sha256 = "1vs35zfp2sa2rps5h1240h73kvlspmv7mfr6f8mcbzvhj1wgzw74"; - }) ]; nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config gobject-introspection wrapGAppsHook ]; @@ -72,6 +65,7 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Dinstalled_tests=true" "-Dinstalled_test_prefix=${placeholder "installedTests"}" + "-Dpamlibdir=${placeholder "pam"}/lib/security" "-Dui=disabled" ]; @@ -83,6 +77,13 @@ stdenv.mkDerivation rec { --replace "/bin/false" "${coreutils}/bin/false" ''; + postInstall = '' + # `giDiscoverSelf` only picks up paths in `out` output. + # This needs to be in `postInstall` so that it runs before + # `gappsWrapperArgsHook` that runs as one of `preFixupPhases`. + addToSearchPath GI_TYPELIB_PATH "$lib/lib/girepository-1.0" + ''; + passthru = { tests = { installedTests = nixosTests.installed-tests.malcontent; @@ -90,6 +91,10 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { + # We need to install Polkit & AccountsService data files in `out` + # but `buildEnv` only uses `bin` when both `bin` and `out` are present. + outputsToInstall = [ "bin" "out" "man" ]; + description = "Parental controls library"; homepage = "https://gitlab.freedesktop.org/pwithnall/malcontent"; license = licenses.lgpl21Plus; diff --git a/pkgs/development/libraries/malcontent/ui.nix b/pkgs/development/libraries/malcontent/ui.nix index af1fa6b413873..c69f987c70e8e 100644 --- a/pkgs/development/libraries/malcontent/ui.nix +++ b/pkgs/development/libraries/malcontent/ui.nix @@ -3,6 +3,7 @@ , ninja , pkg-config , gobject-introspection +, itstool , wrapGAppsHook , glib , accountsservice @@ -20,7 +21,7 @@ stdenv.mkDerivation rec { inherit (malcontent) version src; - outputs = [ "bin" "out" "dev" ]; + outputs = [ "out" "lib" "dev" ]; patches = [ # Allow installing installed tests to a separate output. @@ -35,6 +36,7 @@ stdenv.mkDerivation rec { ninja pkg-config gobject-introspection + itstool desktop-file-utils wrapGAppsHook ]; diff --git a/pkgs/development/libraries/neatvnc/default.nix b/pkgs/development/libraries/neatvnc/default.nix index 127f25a50bead..2c4357e1e9365 100644 --- a/pkgs/development/libraries/neatvnc/default.nix +++ b/pkgs/development/libraries/neatvnc/default.nix @@ -1,24 +1,20 @@ { stdenv, fetchFromGitHub, meson, pkg-config, ninja -, pixman, libuv, gnutls, libdrm -# libjpeg_turbo: Optional, for tight encoding (disabled because experimental) -, enableCpuAcceleration ? false # Whether to use CPU extensions (e.g. AVX) +, pixman, gnutls, libdrm, libjpeg_turbo, zlib, aml }: stdenv.mkDerivation rec { pname = "neatvnc"; - version = "0.1.0"; + version = "0.2.0"; src = fetchFromGitHub { owner = "any1"; repo = pname; rev = "v${version}"; - sha256 = "04wcpwxlcf0bczcs97j21346mn6finfj7xgc2dsrwrw9xq8qa7wc"; + sha256 = "036kzhbabbwc3gvsw8kqf6rs0gh8kgn6i0by9pxski38mi0qs1qs"; }; nativeBuildInputs = [ meson pkg-config ninja ]; - buildInputs = [ pixman libuv gnutls libdrm ]; - - patches = stdenv.lib.optional (!enableCpuAcceleration) ./disable-cpu-acceleration.patch; + buildInputs = [ pixman gnutls libdrm libjpeg_turbo zlib aml ]; meta = with stdenv.lib; { description = "A VNC server library"; @@ -30,6 +26,7 @@ stdenv.mkDerivation rec { - Interoperability with the Freedesktop.org ecosystem ''; inherit (src.meta) homepage; + changelog = "https://github.com/any1/neatvnc/releases/tag/v${version}"; license = licenses.isc; platforms = platforms.linux; maintainers = with maintainers; [ primeos ]; diff --git a/pkgs/development/libraries/neatvnc/disable-cpu-acceleration.patch b/pkgs/development/libraries/neatvnc/disable-cpu-acceleration.patch deleted file mode 100644 index 97b77c02df48c..0000000000000 --- a/pkgs/development/libraries/neatvnc/disable-cpu-acceleration.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/meson.build b/meson.build -index 31dd8b8..8761087 100644 ---- a/meson.build -+++ b/meson.build -@@ -21,12 +21,6 @@ endif - - cpu = host_machine.cpu_family() - --if cpu == 'x86_64' -- c_args += '-mavx' --elif cpu == 'arm' -- c_args += '-mfpu=neon' --endif -- - add_project_arguments(c_args, language: 'c') - - cc = meson.get_compiler('c') diff --git a/pkgs/development/libraries/opendmarc/default.nix b/pkgs/development/libraries/opendmarc/default.nix new file mode 100644 index 0000000000000..9b45cc244f260 --- /dev/null +++ b/pkgs/development/libraries/opendmarc/default.nix @@ -0,0 +1,40 @@ +{ stdenv, fetchFromGitHub, autoreconfHook, libmilter, perl, perlPackages, makeWrapper }: + +stdenv.mkDerivation rec { + pname = "opendmarc"; + version = "1.3.3"; + + src = fetchFromGitHub { + owner = "trusteddomainproject"; + repo = "opendmarc"; + rev = "rel-opendmarc-${builtins.replaceStrings [ "." ] [ "-" ] version}"; + sha256 = "sha256-SQH85FLfVEEtYhR1+A1XxCDMiTjDgLQX6zifbLxCa5c="; + }; + + outputs = [ "bin" "dev" "out" "doc" ]; + + buildInputs = [ perl ]; + nativeBuildInputs = [ autoreconfHook makeWrapper ]; + + postPatch = '' + substituteInPlace configure.ac --replace ' docs/Makefile' "" + patchShebangs contrib reports + ''; + + configureFlags = [ + "--with-milter=${libmilter}" + ]; + + postFixup = '' + for b in $bin/bin/opendmarc-{expire,import,params,reports}; do + wrapProgram $b --set PERL5LIB ${perlPackages.makeFullPerlPath (with perlPackages; [ Switch DBI DBDmysql HTTPMessage ])} + done + ''; + + meta = with stdenv.lib; { + description = "A free open source software implementation of the DMARC specification"; + homepage = "http://www.trusteddomain.org/opendmarc/"; + license = with licenses; [ bsd3 sendmail ]; + maintainers = with maintainers; [ ajs124 das_j ]; + }; +} diff --git a/pkgs/development/libraries/openfst/default.nix b/pkgs/development/libraries/openfst/default.nix index db644287d2e1b..f652c5ee7b7ca 100644 --- a/pkgs/development/libraries/openfst/default.nix +++ b/pkgs/development/libraries/openfst/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "openfst"; - version = "1.7.7"; + version = "1.7.9"; src = fetchurl { url = "http://www.openfst.org/twiki/pub/FST/FstDownload/${pname}-${version}.tar.gz"; - sha256 = "1gpkpkls78xlidqq241scdz9vagxl8c4ksc4lqj4ycwx6vzyliij"; + sha256 = "1pmx1yhn2gknj0an0zwqmzgwjaycapi896244np50a8y3nrsw6ck"; }; configureFlags = [ diff --git a/pkgs/development/libraries/physics/lhapdf/default.nix b/pkgs/development/libraries/physics/lhapdf/default.nix index 8d4e91265f5e1..7d412f86596d4 100644 --- a/pkgs/development/libraries/physics/lhapdf/default.nix +++ b/pkgs/development/libraries/physics/lhapdf/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "lhapdf"; - version = "6.2.3"; + version = "6.3.0"; src = fetchurl { url = "https://www.hepforge.org/archive/lhapdf/LHAPDF-${version}.tar.gz"; - sha256 = "1l9dv37k4jz18wahyfm9g53nyl81v5bgqgy4dllbcmvcqpfkmrnn"; + sha256 = "0pcvigpjqzfng06n98bshhhpimiqfg416ak8lz8jdgp6nxr8fkgd"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/libraries/protobuf/3.12.nix b/pkgs/development/libraries/protobuf/3.12.nix index 6f9add8adc2ae..6ea64a023800d 100644 --- a/pkgs/development/libraries/protobuf/3.12.nix +++ b/pkgs/development/libraries/protobuf/3.12.nix @@ -1,6 +1,6 @@ { callPackage, ... }: callPackage ./generic-v3.nix { - version = "3.12.3"; - sha256 = "0q4sn9d6x8w0zgzydfx9f7b2zdk0kiplk8h9jxyxhw6m9qn276ax"; + version = "3.12.4"; + sha256 = "1gzvnd0g5hmx5ln39w7p4z4qphw87ksgsa1fgbpvi8d0asmwab2p"; } diff --git a/pkgs/development/libraries/qgnomeplatform/default.nix b/pkgs/development/libraries/qgnomeplatform/default.nix index a82d048b32b20..3ff642bbfb980 100644 --- a/pkgs/development/libraries/qgnomeplatform/default.nix +++ b/pkgs/development/libraries/qgnomeplatform/default.nix @@ -1,6 +1,7 @@ { mkDerivation , lib , fetchFromGitHub +, nix-update-script , pkgconfig , gtk3 , glib @@ -52,7 +53,7 @@ mkDerivation rec { ''; passthru = { - updateScript = pantheon.updateScript { + updateScript = nix-update-script { attrPath = pname; }; }; diff --git a/pkgs/development/libraries/xmlsec/default.nix b/pkgs/development/libraries/xmlsec/default.nix index 1a18dfce85d55..a1e6afd48b930 100644 --- a/pkgs/development/libraries/xmlsec/default.nix +++ b/pkgs/development/libraries/xmlsec/default.nix @@ -1,6 +1,7 @@ { stdenv, fetchurl, libxml2, gnutls, libxslt, pkgconfig, libgcrypt, libtool -, openssl, nss, makeWrapper }: +, openssl, nss, lib, runCommandCC, writeText }: +lib.fix (self: let version = "1.2.28"; in @@ -13,9 +14,16 @@ stdenv.mkDerivation { sha256 = "1m12caglhyx08g8lh2sl3nkldlpryzdx2d572q73y3m33s0w9vhk"; }; + patches = [ + ./lt_dladdsearchdir.patch + ]; + postPatch = '' + substituteAllInPlace src/dl.c + ''; + outputs = [ "out" "dev" ]; - nativeBuildInputs = [ makeWrapper pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libxml2 gnutls libxslt libgcrypt libtool openssl nss ]; @@ -34,8 +42,26 @@ stdenv.mkDerivation { moveToOutput "lib/xmlsec1Conf.sh" "$dev" ''; - postFixup = '' - wrapProgram "$out/bin/xmlsec1" --prefix LD_LIBRARY_PATH ":" "$out/lib" + passthru.tests.libxmlsec1-crypto = runCommandCC "libxmlsec1-crypto-test" + { + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ self libxml2 libxslt libtool ]; + } '' + $CC $(pkg-config --cflags --libs xmlsec1) -o crypto-test ${writeText "crypto-test.c" '' + #include <xmlsec/xmlsec.h> + #include <xmlsec/crypto.h> + + int main(int argc, char **argv) { + return xmlSecInit() || + xmlSecCryptoDLLoadLibrary(argc > 1 ? argv[1] : 0) || + xmlSecCryptoInit(); + } + ''} + + for crypto in "" gcrypt gnutls nss openssl; do + ./crypto-test $crypto + done + touch $out ''; meta = { @@ -47,3 +73,4 @@ stdenv.mkDerivation { updateWalker = true; }; } +) diff --git a/pkgs/development/libraries/xmlsec/lt_dladdsearchdir.patch b/pkgs/development/libraries/xmlsec/lt_dladdsearchdir.patch new file mode 100644 index 0000000000000..17dedb0d6c81c --- /dev/null +++ b/pkgs/development/libraries/xmlsec/lt_dladdsearchdir.patch @@ -0,0 +1,16 @@ +diff --git a/src/dl.c b/src/dl.c +index b13f9d46..d761855b 100644 +--- a/src/dl.c ++++ b/src/dl.c +@@ -346,6 +346,11 @@ xmlSecCryptoDLInit(void) { + xmlSecIOError("lt_dlinit", NULL, NULL); + return(-1); + } ++ ret = lt_dladdsearchdir("@out@/lib"); ++ if(ret != 0) { ++ xmlSecIOError("lt_dladdsearchdir", NULL, NULL); ++ return(-1); ++ } + #endif /* XMLSEC_DL_LIBLTDL */ + + return(0); diff --git a/pkgs/development/libraries/xxHash/default.nix b/pkgs/development/libraries/xxHash/default.nix index 58bf562b08096..e572e8bb31ff3 100644 --- a/pkgs/development/libraries/xxHash/default.nix +++ b/pkgs/development/libraries/xxHash/default.nix @@ -2,18 +2,18 @@ stdenv.mkDerivation rec { pname = "xxHash"; - version = "0.7.4"; + version = "0.8.0"; src = fetchFromGitHub { owner = "Cyan4973"; repo = "xxHash"; rev = "v${version}"; - sha256 = "08j7wxshhzpyrnyilfnvhyv5ycm0yv5m7jf6q4kxcd7j4dcbhmpb"; + sha256 = "0hpbzdd6kfki5f61g103vp7pfczqkdj0js63avl0ss552jfb8h96"; }; outputs = [ "out" "dev" ]; - makeFlags = [ "PREFIX=$(out)" "INCLUDEDIR=$(dev)/include" ]; + makeFlags = [ "PREFIX=$(dev)" "EXEC_PREFIX=$(out)" ]; meta = with stdenv.lib; { description = "Extremely fast hash algorithm"; diff --git a/pkgs/development/libraries/zeromq/3.x.nix b/pkgs/development/libraries/zeromq/3.x.nix deleted file mode 100644 index 29981f358a57c..0000000000000 --- a/pkgs/development/libraries/zeromq/3.x.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ stdenv, fetchurl, libuuid }: - -stdenv.mkDerivation rec { - name = "zeromq-3.2.5"; - - src = fetchurl { - url = "http://download.zeromq.org/${name}.tar.gz"; - sha256 = "0911r7q4i1x9gnfinj39vx08fnz59mf05vl75zdkws36lib3wr89"; - }; - - buildInputs = [ libuuid ]; - - doCheck = false; # fails all the tests (ctest) - - meta = with stdenv.lib; { - branch = "3"; - homepage = "http://www.zeromq.org"; - description = "The Intelligent Transport Layer"; - license = licenses.gpl3; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index 4c9603307c703..e84c9322f0c5f 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -149,6 +149,7 @@ , "pyright" , "react-native-cli" , "react-tools" +, "redoc-cli" , "reveal.js" , "rollup" , { "rust-analyzer-build-deps": "../../misc/vscode-extensions/rust-analyzer/build-deps" } diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 3083a2081501e..52a7474ad45a4 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -22,22 +22,22 @@ let sha512 = "t4WmWoGV9gyzypwG3y3JlcK2t8fKLtvzBA7xEoFTj9SMPvOuLsf13uh4ikK0RRaaa9RPPWLgFUdOyIRaQvCpwQ=="; }; }; - "@angular-devkit/architect-0.1000.3" = { + "@angular-devkit/architect-0.1000.4" = { name = "_at_angular-devkit_slash_architect"; packageName = "@angular-devkit/architect"; - version = "0.1000.3"; + version = "0.1000.4"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1000.3.tgz"; - sha512 = "8ZszTAkRvGGMXERFvyLT6SJPfJXjNNfHamA76uDPTBXy+EijJ1XVTUr1+SYEe73E4ovtxqxAnsApEFxS7/Ni5w=="; + url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1000.4.tgz"; + sha512 = "n0DXdrecxXupxKf37sv5Oky5QpQXOHPgLDAmyAwevr31yLEwyZ3OQoVxaC68AMQJFYMlHYYMwi6gdIcFmL6W0g=="; }; }; - "@angular-devkit/core-10.0.3" = { + "@angular-devkit/core-10.0.4" = { name = "_at_angular-devkit_slash_core"; packageName = "@angular-devkit/core"; - version = "10.0.3"; + version = "10.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/core/-/core-10.0.3.tgz"; - sha512 = "m27ogjq44j80x64RnEswSvy8UewUqeCVJBbEuY6fzrWoaiCf12sgPlrSCwjwfhtQrLgl1e/i9zYA7U6ulGRXyg=="; + url = "https://registry.npmjs.org/@angular-devkit/core/-/core-10.0.4.tgz"; + sha512 = "Pe60BJCcAVtOkhXn2c+ql1NfyMCu421jWmKwl1KsW1DXclpGB+UIa560ICBgEwla6DyltMKEN/lX+P4WOskpkQ=="; }; }; "@angular-devkit/core-9.1.7" = { @@ -58,13 +58,13 @@ let sha512 = "SWgBh4an/Vezjw2BZ5S+bKvuK5lH6gOtR8d5YjN9vxpJSZ0GimrGjfnLlWOkwWAsU8jfn4JzofECUHwX/7EW6Q=="; }; }; - "@angular-devkit/schematics-10.0.3" = { + "@angular-devkit/schematics-10.0.4" = { name = "_at_angular-devkit_slash_schematics"; packageName = "@angular-devkit/schematics"; - version = "10.0.3"; + version = "10.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-10.0.3.tgz"; - sha512 = "TjA2ZSPCgUK9l4FiRTIQY7DceXMAvNzOMWffy9o3kv2HPtxG9kuBrQXk++Z99zpylK0cAsugV7t/5ANpUkrIiA=="; + url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-10.0.4.tgz"; + sha512 = "k9b73XkKQK8yFbq+dQqJnxAMG3mm/YR1KQlsQzOEVdw8cqqEALLoUXg/73hT5eUnSsNWmyDLBzEAyNtemmmI4w=="; }; }; "@angular-devkit/schematics-9.1.7" = { @@ -1435,6 +1435,33 @@ let sha512 = "Ce3xE2JvTSEbASFbRbA1gAIcMcZWdS2yUYRaQbeM0nbOzaZrUYfa3ePtcriYRZOZmr+CkKA+zbjhvTpIOAYVcw=="; }; }; + "@emotion/is-prop-valid-0.8.8" = { + name = "_at_emotion_slash_is-prop-valid"; + packageName = "@emotion/is-prop-valid"; + version = "0.8.8"; + src = fetchurl { + url = "https://registry.npmjs.org/@emotion/is-prop-valid/-/is-prop-valid-0.8.8.tgz"; + sha512 = "u5WtneEAr5IDG2Wv65yhunPSMLIpuKsbuOktRojfrEiEvRyC85LgPMZI63cr7NUqT8ZIGdSVg8ZKGxIug4lXcA=="; + }; + }; + "@emotion/memoize-0.7.4" = { + name = "_at_emotion_slash_memoize"; + packageName = "@emotion/memoize"; + version = "0.7.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@emotion/memoize/-/memoize-0.7.4.tgz"; + sha512 = "Ja/Vfqe3HpuzRsG1oBtWTHk2PGZ7GR+2Vz5iYGelAw8dx32K0y7PjVuxK6z1nMpZOqAFsRUPCkK1YjJ56qJlgw=="; + }; + }; + "@emotion/unitless-0.7.5" = { + name = "_at_emotion_slash_unitless"; + packageName = "@emotion/unitless"; + version = "0.7.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@emotion/unitless/-/unitless-0.7.5.tgz"; + sha512 = "OWORNpfjMsSSUBVrRBVGECkhWcULOAJz9ZW8uK9qgxD+87M7jHRcvh/A96XXNhXTLmKcoYSQtBEX7lHMO7YRwg=="; + }; + }; "@endemolshinegroup/cosmiconfig-typescript-loader-1.0.2" = { name = "_at_endemolshinegroup_slash_cosmiconfig-typescript-loader"; packageName = "@endemolshinegroup/cosmiconfig-typescript-loader"; @@ -1498,94 +1525,94 @@ let sha512 = "oJZb4PScX25ZGObpw9n7/bJBE7R0oF6hJ4ABe+WvMqSCI3kxaReMTgJJNIrxpmbXscxWM8U1ndLefP5IjPcU7Q=="; }; }; - "@graphql-tools/delegate-6.0.14" = { + "@graphql-tools/delegate-6.0.15" = { name = "_at_graphql-tools_slash_delegate"; packageName = "@graphql-tools/delegate"; - version = "6.0.14"; + version = "6.0.15"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/delegate/-/delegate-6.0.14.tgz"; - sha512 = "RVqwL+PLj6aQFmkUjHTQzkAOaWUNOe7BoAdldoXhTmzL8tgGvWWzlqFNBv54sj1FAaqP1p8DtAztH3mph97sSw=="; + url = "https://registry.npmjs.org/@graphql-tools/delegate/-/delegate-6.0.15.tgz"; + sha512 = "GG/zp29PMfG6eXpfe1M5C3U1EI1f3tJu2glFN8t0RIfp4FEgZs/PRvZuuep5orFge8dvX/LQpJY8Vl2JmU4WMg=="; }; }; - "@graphql-tools/graphql-file-loader-6.0.14" = { + "@graphql-tools/graphql-file-loader-6.0.15" = { name = "_at_graphql-tools_slash_graphql-file-loader"; packageName = "@graphql-tools/graphql-file-loader"; - version = "6.0.14"; + version = "6.0.15"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/graphql-file-loader/-/graphql-file-loader-6.0.14.tgz"; - sha512 = "zYQ8OTHlKQj0YrT012QLnnqNLvPbqw1vmSU3u/4OJ571nQ75CUbUnwyjU+eb7n9sFG2lgrlN4ZOtgoRp0rJ1tQ=="; + url = "https://registry.npmjs.org/@graphql-tools/graphql-file-loader/-/graphql-file-loader-6.0.15.tgz"; + sha512 = "QbCf731A2A2hrHP+cMSAKvY3D7IauFNqp5bAGdbLwSHRqaxUIfKi7Q76/9pZ3rN/e6yu/zVz+t1rkf7lT2/8OA=="; }; }; - "@graphql-tools/import-6.0.14" = { + "@graphql-tools/import-6.0.15" = { name = "_at_graphql-tools_slash_import"; packageName = "@graphql-tools/import"; - version = "6.0.14"; + version = "6.0.15"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/import/-/import-6.0.14.tgz"; - sha512 = "KohPGp6P56Vh50pOfQEkFc64JT5OCqJei+kC5QD8rdlZLvIeVczgQ70zSrsqHf8bCHZAIoM2LwU+R61ZucCrTA=="; + url = "https://registry.npmjs.org/@graphql-tools/import/-/import-6.0.15.tgz"; + sha512 = "YaQizD031nlrObiAJj+DO+0Wf2ompR2G5OFNQZIOgUlm1+kfH3GPIFoE5Ww74YH6vy9s4UyYYeZJz6APxPdMzg=="; }; }; - "@graphql-tools/json-file-loader-6.0.14" = { + "@graphql-tools/json-file-loader-6.0.15" = { name = "_at_graphql-tools_slash_json-file-loader"; packageName = "@graphql-tools/json-file-loader"; - version = "6.0.14"; + version = "6.0.15"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/json-file-loader/-/json-file-loader-6.0.14.tgz"; - sha512 = "uq2fkiXobZd63K43+t97tbMeqWhdw2wG9kFeEcLpikj+CJSH+UiRbm1AS/+BeMpWXlpRjseXUn8nMkbkI7hnaw=="; + url = "https://registry.npmjs.org/@graphql-tools/json-file-loader/-/json-file-loader-6.0.15.tgz"; + sha512 = "SQO7w+KPxW6Q3snE3G4eNOA8CcBBDYHpk8JILj93oe4BassuPY5NCUOeZ+2PYczwZQbTNDQXeW1oQou44U1aBg=="; }; }; - "@graphql-tools/load-6.0.14" = { + "@graphql-tools/load-6.0.15" = { name = "_at_graphql-tools_slash_load"; packageName = "@graphql-tools/load"; - version = "6.0.14"; + version = "6.0.15"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/load/-/load-6.0.14.tgz"; - sha512 = "XI6KNoTUJL4wQSKTYNFA0yIs2NGGmBWwWOVxFPqIJA4uX6iZQmdtwEK+HRzdMG75IPYiO8XJDqZ8sEcuAOJIBw=="; + url = "https://registry.npmjs.org/@graphql-tools/load/-/load-6.0.15.tgz"; + sha512 = "STH3ZjbViRqDyCw+f7PZrnDs6yhP7m2l4x5lJBMyMeLaLwuO1z+WhgtqYZNpCYlQY2jNSLXWCa0nWmpYvdLnlA=="; }; }; - "@graphql-tools/merge-6.0.14" = { + "@graphql-tools/merge-6.0.15" = { name = "_at_graphql-tools_slash_merge"; packageName = "@graphql-tools/merge"; - version = "6.0.14"; + version = "6.0.15"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/merge/-/merge-6.0.14.tgz"; - sha512 = "j/Gi+9qFKip0nHIU/7G2Gy/sV1WX1XK90FaGmfpdduuRjuET+44X/XBQbYMWMTtSFKHU+nzqv4J7vVxbi0m3lg=="; + url = "https://registry.npmjs.org/@graphql-tools/merge/-/merge-6.0.15.tgz"; + sha512 = "qusTLzkf6GtxS6LRQnEAWIwA1BeJj5SkZ2pnE4/wVe9gs0grpEsOKYxvGpBi8IZR7r8UeNpkdgk2HP0jlq/WWA=="; }; }; - "@graphql-tools/schema-6.0.14" = { + "@graphql-tools/schema-6.0.15" = { name = "_at_graphql-tools_slash_schema"; packageName = "@graphql-tools/schema"; - version = "6.0.14"; + version = "6.0.15"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/schema/-/schema-6.0.14.tgz"; - sha512 = "vXRme8I8r3Ps2xTGrs614L+PRvNMxW0PW1EEtkV7CHdFWl1w5qkVeWWriZuqdj9r/AxHj950ilAf6V/k+2oAZw=="; + url = "https://registry.npmjs.org/@graphql-tools/schema/-/schema-6.0.15.tgz"; + sha512 = "Wo+d6/OPjeXjwB1pcqsWmqLdweGH+BVhvKe/YPQA/uiWr8ikgShvNLNiuF03gc/1AMR487A09XcPEyabRKJLew=="; }; }; - "@graphql-tools/url-loader-6.0.14" = { + "@graphql-tools/url-loader-6.0.15" = { name = "_at_graphql-tools_slash_url-loader"; packageName = "@graphql-tools/url-loader"; - version = "6.0.14"; + version = "6.0.15"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/url-loader/-/url-loader-6.0.14.tgz"; - sha512 = "dBgN1Gk5mqW5UxfiYI8pd40CMA08DoJbcGR7VPpMNxowh6OOWJmBmDD8k97UfxC50xSEYqqYrKJqFw2SqyWI5w=="; + url = "https://registry.npmjs.org/@graphql-tools/url-loader/-/url-loader-6.0.15.tgz"; + sha512 = "/iGuK7J9yCECYMYQJqKNWnz4ytPHppkxh4YS5Ud9QPDNl488e+eInyNbkdiWcFGyZ4KHqEnXSDdRFg3mFNrMnw=="; }; }; - "@graphql-tools/utils-6.0.14" = { + "@graphql-tools/utils-6.0.15" = { name = "_at_graphql-tools_slash_utils"; packageName = "@graphql-tools/utils"; - version = "6.0.14"; + version = "6.0.15"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/utils/-/utils-6.0.14.tgz"; - sha512 = "2VCOJtbVOde5m553JJE8NhP/eYR63Zqo/YdSlhZkpTGmWXg0sJKIIJ0c1eozCm+JSVMu3P08BatgnEC7DIl92A=="; + url = "https://registry.npmjs.org/@graphql-tools/utils/-/utils-6.0.15.tgz"; + sha512 = "VG5cMLPgh9RDLGHamGpXVnBrNw7bZGT46LrxK7IIqDZI9H0GPsRCo8+p+CfDkw0IlDiEECb624WVCpm9IYNecA=="; }; }; - "@graphql-tools/wrap-6.0.14" = { + "@graphql-tools/wrap-6.0.15" = { name = "_at_graphql-tools_slash_wrap"; packageName = "@graphql-tools/wrap"; - version = "6.0.14"; + version = "6.0.15"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/wrap/-/wrap-6.0.14.tgz"; - sha512 = "DM29MsOjgxcdMntC4C8eA4ElI/2ERXtEmsZjowCW/fwpPkMONX1yNcw8xwiyZC7x1UGE4VkhqTGB9FUTMnYRog=="; + url = "https://registry.npmjs.org/@graphql-tools/wrap/-/wrap-6.0.15.tgz"; + sha512 = "yWiDBrbzml6PRl4aeJBLNGPw385LFtszMfkfYwjLSWvNyVILDCMa/XWHThw4FMaZ1nPL0GuLggW2bVkUBi3TYA=="; }; }; "@gulp-sourcemaps/identity-map-1.0.2" = { @@ -2641,13 +2668,13 @@ let sha512 = "jE/lE/IKIz2v1+/P0u4fJqv0kYwXOTujKemJMFr6FeopsxlIK3+wKDCJGnysg81XID5TgZQbIfuJ5J0lnTiuyQ=="; }; }; - "@octokit/endpoint-6.0.4" = { + "@octokit/endpoint-6.0.5" = { name = "_at_octokit_slash_endpoint"; packageName = "@octokit/endpoint"; - version = "6.0.4"; + version = "6.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-6.0.4.tgz"; - sha512 = "ZJHIsvsClEE+6LaZXskDvWIqD3Ao7+2gc66pRG5Ov4MQtMvCU9wGu1TItw9aGNmRuU9x3Fei1yb+uqGaQnm0nw=="; + url = "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-6.0.5.tgz"; + sha512 = "70K5u6zd45ItOny6aHQAsea8HHQjlQq85yqOMe+Aj8dkhN2qSJ9T+Q3YjUjEYfPRBcuUWNgMn62DQnP/4LAIiQ=="; }; }; "@octokit/plugin-enterprise-rest-6.0.1" = { @@ -2686,13 +2713,13 @@ let sha512 = "EZi/AWhtkdfAYi01obpX0DF7U6b1VRr30QNQ5xSFPITMdLSfhcBqjamE3F+sKcxPbD7eZuMHu3Qkk2V+JGxBDQ=="; }; }; - "@octokit/request-5.4.6" = { + "@octokit/request-5.4.7" = { name = "_at_octokit_slash_request"; packageName = "@octokit/request"; - version = "5.4.6"; + version = "5.4.7"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/request/-/request-5.4.6.tgz"; - sha512 = "9r8Sn4CvqFI9LDLHl9P17EZHwj3ehwQnTpTE+LEneb0VBBqSiI/VS4rWIBfBhDrDs/aIGEGZRSB0QWAck8u+2g=="; + url = "https://registry.npmjs.org/@octokit/request/-/request-5.4.7.tgz"; + sha512 = "FN22xUDP0i0uF38YMbOfx6TotpcENP5W8yJM1e/LieGXn6IoRxDMnBf7tx5RKSW4xuUZ/1P04NFZy5iY3Rax1A=="; }; }; "@octokit/request-error-1.2.1" = { @@ -2731,13 +2758,13 @@ let sha512 = "O75k56TYvJ8WpAakWwYRN8Bgu60KrmX0z1KqFp1kNiFNkgW+JW+9EBKZ+S33PU6SLvbihqd+3drvPxKK68Ee8Q=="; }; }; - "@octokit/types-5.1.0" = { + "@octokit/types-5.1.1" = { name = "_at_octokit_slash_types"; packageName = "@octokit/types"; - version = "5.1.0"; + version = "5.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/types/-/types-5.1.0.tgz"; - sha512 = "OFxUBgrEllAbdEmWp/wNmKIu5EuumKHG4sgy56vjZ8lXPgMhF05c76hmulfOdFHHYRpPj49ygOZJ8wgVsPecuA=="; + url = "https://registry.npmjs.org/@octokit/types/-/types-5.1.1.tgz"; + sha512 = "8LDEbrxJrYiwzBrfZhoMFEq9+1o7Kg4ydiNgZt2DBU6n34iEd37qNqOkawrjJZZ6iUS5IXYf6EmGONn34YLgzw=="; }; }; "@parcel/fs-1.11.0" = { @@ -2929,13 +2956,13 @@ let sha512 = "MI4Xx6LHs4Webyvi6EbspgyAb4D2Q2VtnCQ1blOJcoLS6mVa8lNN2rkIy1CVxfTUpoyIbCTkXES1rLXztFD1lg=="; }; }; - "@schematics/angular-10.0.3" = { + "@schematics/angular-10.0.4" = { name = "_at_schematics_slash_angular"; packageName = "@schematics/angular"; - version = "10.0.3"; + version = "10.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/@schematics/angular/-/angular-10.0.3.tgz"; - sha512 = "Or2pCqjpPbAvmbxtfMosGwQbNbSL4xodK5Key7678ZAPGB+rcxrVkBI9yxEJ/qzF/LrmMoKqy0JCmVLK7Grpog=="; + url = "https://registry.npmjs.org/@schematics/angular/-/angular-10.0.4.tgz"; + sha512 = "wTpuVfPKALOcOHfD7Y222r/IfqJgpqASyoXdkzf7dZVrLXjNy/XrKuc2Vfn85Ce9lnme0xT5ww+KjbSRc0cSUw=="; }; }; "@schematics/schematics-0.901.9" = { @@ -2947,13 +2974,13 @@ let sha512 = "Nca8Ig/mFFnhLmosbdWysX4N2HiwVOzA4gQj2TZnMCJ98Cftdebs388LstjsJwGtJyvAa2v4yoaPaUMIGVgQ9w=="; }; }; - "@schematics/update-0.1000.3" = { + "@schematics/update-0.1000.4" = { name = "_at_schematics_slash_update"; packageName = "@schematics/update"; - version = "0.1000.3"; + version = "0.1000.4"; src = fetchurl { - url = "https://registry.npmjs.org/@schematics/update/-/update-0.1000.3.tgz"; - sha512 = "Nncdklmzi1tyzkoAh7GlSslxriRhftlmfqPVmFHrrPRttYACtT/QH5qcWsrPgTPpHGINYEHrPjpeljsMoMchBQ=="; + url = "https://registry.npmjs.org/@schematics/update/-/update-0.1000.4.tgz"; + sha512 = "NkIUsqnEqG6jhW6b1xXYmgW02WYAN9/IoswnZnaQrbGzxroNVQKURiV4AP22sZLCr7gQ9NJwjXxO5rxbzbY8wg=="; }; }; "@serverless/cli-1.5.1" = { @@ -3028,13 +3055,13 @@ let sha512 = "+Y+u8wSO67oIsNuI1spfwTjN1zw0OwsU/wQ4IDZsKiyAxs+ww0STDoJfVQdwNzuhw0IwnBO0Wtv8AaLHdNQYTw=="; }; }; - "@serverless/platform-client-china-1.0.26" = { + "@serverless/platform-client-china-1.0.27" = { name = "_at_serverless_slash_platform-client-china"; packageName = "@serverless/platform-client-china"; - version = "1.0.26"; + version = "1.0.27"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/platform-client-china/-/platform-client-china-1.0.26.tgz"; - sha512 = "AYkxcAVmGZqr2mByZNOhb5+cnyCtKThE3/F4DoWgHIIVgSl/y9nPlyWP8W7ss571+x8yDJb8GVnrJ0YCJBfr5Q=="; + url = "https://registry.npmjs.org/@serverless/platform-client-china/-/platform-client-china-1.0.27.tgz"; + sha512 = "hdZSoZHUvHEFBnUHfm3+8L5ySf7M4Dr0Y9QHkTukpgQXI+RfuS9CZ3x0P7ST9vxDIs233h/wQiOgvpniUD2r6Q=="; }; }; "@serverless/platform-sdk-2.3.1" = { @@ -3064,13 +3091,13 @@ let sha512 = "aI/cpGVUhWbJUR8QDMtPue28EU4ViG/L4/XKuZDfAN2uNQv3NRjwEFIBi/cxyfQnMTYVtMLe9wDjuwzOT4ENzA=="; }; }; - "@serverless/utils-china-0.1.18" = { + "@serverless/utils-china-0.1.19" = { name = "_at_serverless_slash_utils-china"; packageName = "@serverless/utils-china"; - version = "0.1.18"; + version = "0.1.19"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/utils-china/-/utils-china-0.1.18.tgz"; - sha512 = "wrE9SHtzHMSKDuIRVp2I/AJ09aZOkjStRBiASIpG4HgJPaTQ82AP0FPU3ln8QfgmZitApgSrSxd83wWtq7gnzA=="; + url = "https://registry.npmjs.org/@serverless/utils-china/-/utils-china-0.1.19.tgz"; + sha512 = "DFoEpaqFDkUUAgsl0RxxOSO27iEv2iVPc0koOWws0SuSY8YPWcXq/p7fXCYs4IypyzSo/w9OoFxPUrzyC19GSg=="; }; }; "@sindresorhus/is-0.14.0" = { @@ -3136,22 +3163,22 @@ let sha512 = "jmZyxVHqzYU1GfdnWCGdd68WY/lAzpPVyqalHazPj4tFJehrSfEFc82RMTYAMgXEJuvFRFIwhsvXh3sWUhIQmg=="; }; }; - "@snyk/cli-interface-2.5.0" = { + "@snyk/cli-interface-2.8.0" = { name = "_at_snyk_slash_cli-interface"; packageName = "@snyk/cli-interface"; - version = "2.5.0"; + version = "2.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/@snyk/cli-interface/-/cli-interface-2.5.0.tgz"; - sha512 = "XMc2SCFH4RBSncZgoPb+BBlNq0NYpEpCzptKi69qyMpBy0VsRqIQqddedaazMCU1xEpXTytq6KMYpzUafZzp5Q=="; + url = "https://registry.npmjs.org/@snyk/cli-interface/-/cli-interface-2.8.0.tgz"; + sha512 = "St/G39iJG1zQK15L24kcVYM2gmFc/ylBCcBqU2DMZKJKwOPccKLUO6s+dWIUXMccQ+DFS6TuHPvuAKQNi9C4Yg=="; }; }; - "@snyk/cli-interface-2.8.0" = { + "@snyk/cli-interface-2.8.1" = { name = "_at_snyk_slash_cli-interface"; packageName = "@snyk/cli-interface"; - version = "2.8.0"; + version = "2.8.1"; src = fetchurl { - url = "https://registry.npmjs.org/@snyk/cli-interface/-/cli-interface-2.8.0.tgz"; - sha512 = "St/G39iJG1zQK15L24kcVYM2gmFc/ylBCcBqU2DMZKJKwOPccKLUO6s+dWIUXMccQ+DFS6TuHPvuAKQNi9C4Yg=="; + url = "https://registry.npmjs.org/@snyk/cli-interface/-/cli-interface-2.8.1.tgz"; + sha512 = "pALcfgoY0hAavy/pBlDIqEu+FFC5m+D4bMnCwlQ26mObL/zzxp2+Ohx+HykCIom62u2J94SzAtRLFdm/2TgoOw=="; }; }; "@snyk/cocoapods-lockfile-parser-3.4.0" = { @@ -3199,6 +3226,15 @@ let sha512 = "/0phOICMk4hkX2KtZgi+4KNd5G9oYDIlxQDQk+ui2xl4gonPvK6Q5MFzHP7Xet1YY/XoU33ox41i+IO48qZ+zQ=="; }; }; + "@snyk/dep-graph-1.19.3" = { + name = "_at_snyk_slash_dep-graph"; + packageName = "@snyk/dep-graph"; + version = "1.19.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@snyk/dep-graph/-/dep-graph-1.19.3.tgz"; + sha512 = "WJLUFKBokoFK5imi0t8Dkyj+uqtS/5Ziuf4oE/OOFX30UqP1ffMDkv9/3sqBJQVQ9FjdgsX3Cm8JZMtMlYRc6w=="; + }; + }; "@snyk/docker-registry-v2-client-1.13.5" = { name = "_at_snyk_slash_docker-registry-v2-client"; packageName = "@snyk/docker-registry-v2-client"; @@ -3226,6 +3262,15 @@ let sha512 = "uFO/pNMm3pN15QB+hVMU7uaQXhsBNwEA8lOET/VDcdOzLptODhXzkJqSHqt0tZlpdAz6/6Uaj8jY00UvPFgFMA=="; }; }; + "@snyk/graphlib-2.1.9-patch.2" = { + name = "_at_snyk_slash_graphlib"; + packageName = "@snyk/graphlib"; + version = "2.1.9-patch.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@snyk/graphlib/-/graphlib-2.1.9-patch.2.tgz"; + sha512 = "BjJzOXDNzoEMBOjSks7vadu5f0c39SeorJMi9vUvvWM5dcE22CZqcN9VMRW5DYTifUJiCWszkm5TOyfYfB0bfg=="; + }; + }; "@snyk/inquirer-6.2.2-patch" = { name = "_at_snyk_slash_inquirer"; packageName = "@snyk/inquirer"; @@ -3235,13 +3280,13 @@ let sha512 = "IUq5bHRL0vtVKtfvd4GOccAIaLYHbcertug2UVZzk5+yY6R/CxfYsnFUTho1h4BdkfNdin2tPjE/5jRF4SKSrw=="; }; }; - "@snyk/java-call-graph-builder-1.10.0" = { + "@snyk/java-call-graph-builder-1.11.1" = { name = "_at_snyk_slash_java-call-graph-builder"; packageName = "@snyk/java-call-graph-builder"; - version = "1.10.0"; + version = "1.11.1"; src = fetchurl { - url = "https://registry.npmjs.org/@snyk/java-call-graph-builder/-/java-call-graph-builder-1.10.0.tgz"; - sha512 = "x3vKElHJRsPjlMBRACeD6kHtki54ffahYeAm4ny5epVpxm16/OT6f6AjNjPuX8DbxcauaD7wqirtc62OPH3YqA=="; + url = "https://registry.npmjs.org/@snyk/java-call-graph-builder/-/java-call-graph-builder-1.11.1.tgz"; + sha512 = "1SiAE78D8HQCE5fDKj6CeToFE/S52318oSP/X4flRwgFj9N78gD8i5O4oTkP9WwNMeFtW4Viqctc0sOK6Iea/w=="; }; }; "@snyk/lodash-4.17.15-patch" = { @@ -3775,13 +3820,13 @@ let sha512 = "DO1L53rGqIDUEvOjJKmbMEQ5Z+BM2cIEPy/eV3En+s166Gz+FeuzRerxcab757u/U4v4XF4RYrZPmqKa+aY/2w=="; }; }; - "@types/express-serve-static-core-4.17.8" = { + "@types/express-serve-static-core-4.17.9" = { name = "_at_types_slash_express-serve-static-core"; packageName = "@types/express-serve-static-core"; - version = "4.17.8"; + version = "4.17.9"; src = fetchurl { - url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.8.tgz"; - sha512 = "1SJZ+R3Q/7mLkOD9ewCBDYD2k0WyZQtWYqF/2VvoNN2/uhI49J9CDN4OAm+wGMA0DbArA4ef27xl4+JwMtGggw=="; + url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.9.tgz"; + sha512 = "DG0BYg6yO+ePW+XoDENYz8zhNGC3jDDEpComMYn7WJc4mY1Us8Rw9ax2YhJXxpyk2SF47PQAoQ0YyVT1a0bEkA=="; }; }; "@types/fs-capacitor-2.0.0" = { @@ -3946,13 +3991,13 @@ let sha512 = "B8nG/OoE1ORZqCkBVsup/AKcvjdgoHnfi4pZMn5UwAPCbhk/96xyv284eBYW8JlQbQ7zDmnpFr68I/40mFoIBQ=="; }; }; - "@types/lodash-4.14.157" = { + "@types/lodash-4.14.158" = { name = "_at_types_slash_lodash"; packageName = "@types/lodash"; - version = "4.14.157"; + version = "4.14.158"; src = fetchurl { - url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.157.tgz"; - sha512 = "Ft5BNFmv2pHDgxV5JDsndOWTRJ+56zte0ZpYLowp03tW+K+t8u8YMOzAnpuqPgzX6WO1XpDIUm7u04M8vdDiVQ=="; + url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.158.tgz"; + sha512 = "InCEXJNTv/59yO4VSfuvNrZHt7eeNtWQEgnieIA+mIC+MOWM9arOWG2eQ8Vhk6NbOre6/BidiXhkZYeDY9U35w=="; }; }; "@types/long-4.0.1" = { @@ -3964,13 +4009,13 @@ let sha512 = "5tXH6Bx/kNGd3MgffdmP4dy2Z+G4eaXw0SE81Tq3BNadtnMR5/ySMzX4SLEzHJzSmPNn4HIdpQsBvXMUykr58w=="; }; }; - "@types/mime-2.0.2" = { + "@types/mime-2.0.3" = { name = "_at_types_slash_mime"; packageName = "@types/mime"; - version = "2.0.2"; + version = "2.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@types/mime/-/mime-2.0.2.tgz"; - sha512 = "4kPlzbljFcsttWEq6aBW0OZe6BDajAmyvr2xknBG92tejQnvdGtT9+kXSZ580DqpxY9qG2xeQVF9Dq0ymUTo5Q=="; + url = "https://registry.npmjs.org/@types/mime/-/mime-2.0.3.tgz"; + sha512 = "Jus9s4CDbqwocc5pOAnh8ShfrnMcPHuJYzVcSUU7lrh8Ni5HuIqX3oilL86p3dlTrk0LzHRCgA/GQ7uNCw6l2Q=="; }; }; "@types/minimatch-3.0.3" = { @@ -4027,13 +4072,13 @@ let sha512 = "Az3QsOt1U/K1pbCQ0TXGELTuTkPLOiFIQf3ILzbOyo0FqgV9SxRnxbxM5QlAveERZMHpZY+7u3Jz2tKyl+yg6g=="; }; }; - "@types/node-14.0.23" = { + "@types/node-14.0.24" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "14.0.23"; + version = "14.0.24"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-14.0.23.tgz"; - sha512 = "Z4U8yDAl5TFkmYsZdFPdjeMa57NOvnaf1tljHzhouaPEp7LCj2JKkejpI1ODviIAQuW4CcQmxkQ77rnLsOOoKw=="; + url = "https://registry.npmjs.org/@types/node/-/node-14.0.24.tgz"; + sha512 = "btt/oNOiDWcSuI721MdL8VQGnjsKjlTMdrKyTcLCKeQp/n4AAMFJ961wMbp+09y8WuGPClDEv07RIItdXKIXAA=="; }; }; "@types/node-6.14.10" = { @@ -4342,13 +4387,13 @@ let sha512 = "te5lMAWii1uEJ4FwLjzdlbw3+n0FZNOvFXHxQDKeT0dilh7HOzdMzV2TrJVUzq8ep7J4Na8OUYPRLSQkJHAlrg=="; }; }; - "@typescript-eslint/eslint-plugin-3.6.1" = { + "@typescript-eslint/eslint-plugin-3.7.0" = { name = "_at_typescript-eslint_slash_eslint-plugin"; packageName = "@typescript-eslint/eslint-plugin"; - version = "3.6.1"; + version = "3.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-3.6.1.tgz"; - sha512 = "06lfjo76naNeOMDl+mWG9Fh/a0UHKLGhin+mGaIw72FUMbMGBkdi/FEJmgEDzh4eE73KIYzHWvOCYJ0ak7nrJQ=="; + url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-3.7.0.tgz"; + sha512 = "4OEcPON3QIx0ntsuiuFP/TkldmBGXf0uKxPQlGtS/W2F3ndYm8Vgdpj/woPJkzUc65gd3iR+qi3K8SDQP/obFg=="; }; }; "@typescript-eslint/experimental-utils-1.13.0" = { @@ -4360,13 +4405,13 @@ let sha512 = "zmpS6SyqG4ZF64ffaJ6uah6tWWWgZ8m+c54XXgwFtUv0jNz8aJAVx8chMCvnk7yl6xwn8d+d96+tWp7fXzTuDg=="; }; }; - "@typescript-eslint/experimental-utils-3.6.1" = { + "@typescript-eslint/experimental-utils-3.7.0" = { name = "_at_typescript-eslint_slash_experimental-utils"; packageName = "@typescript-eslint/experimental-utils"; - version = "3.6.1"; + version = "3.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-3.6.1.tgz"; - sha512 = "oS+hihzQE5M84ewXrTlVx7eTgc52eu+sVmG7ayLfOhyZmJ8Unvf3osyFQNADHP26yoThFfbxcibbO0d2FjnYhg=="; + url = "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-3.7.0.tgz"; + sha512 = "xpfXXAfZqhhqs5RPQBfAFrWDHoNxD5+sVB5A46TF58Bq1hRfVROrWHcQHHUM9aCBdy9+cwATcvCbRg8aIRbaHQ=="; }; }; "@typescript-eslint/parser-1.13.0" = { @@ -4378,22 +4423,22 @@ let sha512 = "ITMBs52PCPgLb2nGPoeT4iU3HdQZHcPaZVw+7CsFagRJHUhyeTgorEwHXhFf3e7Evzi8oujKNpHc8TONth8AdQ=="; }; }; - "@typescript-eslint/parser-3.6.1" = { + "@typescript-eslint/parser-3.7.0" = { name = "_at_typescript-eslint_slash_parser"; packageName = "@typescript-eslint/parser"; - version = "3.6.1"; + version = "3.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-3.6.1.tgz"; - sha512 = "SLihQU8RMe77YJ/jGTqOt0lMq7k3hlPVfp7v/cxMnXA9T0bQYoMDfTsNgHXpwSJM1Iq2aAJ8WqekxUwGv5F67Q=="; + url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-3.7.0.tgz"; + sha512 = "2LZauVUt7jAWkcIW7djUc3kyW+fSarNEuM3RF2JdLHR9BfX/nDEnyA4/uWz0wseoWVZbDXDF7iF9Jc342flNqQ=="; }; }; - "@typescript-eslint/types-3.6.1" = { + "@typescript-eslint/types-3.7.0" = { name = "_at_typescript-eslint_slash_types"; packageName = "@typescript-eslint/types"; - version = "3.6.1"; + version = "3.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-3.6.1.tgz"; - sha512 = "NPxd5yXG63gx57WDTW1rp0cF3XlNuuFFB5G+Kc48zZ+51ZnQn9yjDEsjTPQ+aWM+V+Z0I4kuTFKjKvgcT1F7xQ=="; + url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-3.7.0.tgz"; + sha512 = "reCaK+hyKkKF+itoylAnLzFeNYAEktB0XVfSQvf0gcVgpz1l49Lt6Vo9x4MVCCxiDydA0iLAjTF/ODH0pbfnpg=="; }; }; "@typescript-eslint/typescript-estree-1.13.0" = { @@ -4414,22 +4459,22 @@ let sha512 = "OMAr+nJWKdlVM9LOqCqh3pQQPwxHAN7Du8DR6dmwCrAmxtiXQnhHJ6tBNtf+cggqfo51SG/FCwnKhXCIM7hnVg=="; }; }; - "@typescript-eslint/typescript-estree-3.6.1" = { + "@typescript-eslint/typescript-estree-3.7.0" = { name = "_at_typescript-eslint_slash_typescript-estree"; packageName = "@typescript-eslint/typescript-estree"; - version = "3.6.1"; + version = "3.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-3.6.1.tgz"; - sha512 = "G4XRe/ZbCZkL1fy09DPN3U0mR6SayIv1zSeBNquRFRk7CnVLgkC2ZPj8llEMJg5Y8dJ3T76SvTGtceytniaztQ=="; + url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-3.7.0.tgz"; + sha512 = "xr5oobkYRebejlACGr1TJ0Z/r0a2/HUf0SXqPvlgUMwiMqOCu/J+/Dr9U3T0IxpE5oLFSkqMx1FE/dKaZ8KsOQ=="; }; }; - "@typescript-eslint/visitor-keys-3.6.1" = { + "@typescript-eslint/visitor-keys-3.7.0" = { name = "_at_typescript-eslint_slash_visitor-keys"; packageName = "@typescript-eslint/visitor-keys"; - version = "3.6.1"; + version = "3.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-3.6.1.tgz"; - sha512 = "qC8Olwz5ZyMTZrh4Wl3K4U6tfms0R/mzU4/5W3XeUZptVraGVmbptJbn6h2Ey6Rb3hOs3zWoAUebZk8t47KGiQ=="; + url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-3.7.0.tgz"; + sha512 = "k5PiZdB4vklUpUX4NBncn5RBKty8G3ihTY+hqJsCdMuD0v4jofI5xuqwnVcWxfv6iTm2P/dfEa2wMUnsUY8ODw=="; }; }; "@vue/cli-shared-utils-4.4.6" = { @@ -7474,13 +7519,13 @@ let sha1 = "00f35b2d27ac91b1f0d3ef2084c98cf1d1f0adc3"; }; }; - "aws-sdk-2.715.0" = { + "aws-sdk-2.718.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.715.0"; + version = "2.718.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.715.0.tgz"; - sha512 = "O6ytb66IXFCowp0Ng2bSPM6v/cZVOhjJWFTR1CG4ieG4IroAaVgB3YQKkfPKA0Cy9B/Ovlsm7B737iuroKsd0w=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.718.0.tgz"; + sha512 = "YMWR1RJ3VuSbUOGeOfDw2QqRzwX51oa9TCm2G6SW+JywJUy0FTxi/Nj0VjVEQvKC0GqGu5QCgUTaarF7S0nQdw=="; }; }; "aws-sign2-0.6.0" = { @@ -7771,6 +7816,15 @@ let sha1 = "1bc6f15b87f7ab1085d42b330b717657a2156500"; }; }; + "babel-plugin-styled-components-1.10.7" = { + name = "babel-plugin-styled-components"; + packageName = "babel-plugin-styled-components"; + version = "1.10.7"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-plugin-styled-components/-/babel-plugin-styled-components-1.10.7.tgz"; + sha512 = "MBMHGcIA22996n9hZRf/UJLVVgkEOITuR2SvjHLb5dSTUyR4ZRGn+ngITapes36FI3WLxZHfRhkA1ffHxihOrg=="; + }; + }; "babel-plugin-syntax-flow-6.18.0" = { name = "babel-plugin-syntax-flow"; packageName = "babel-plugin-syntax-flow"; @@ -7780,6 +7834,15 @@ let sha1 = "4c3ab20a2af26aa20cd25995c398c4eb70310c8d"; }; }; + "babel-plugin-syntax-jsx-6.18.0" = { + name = "babel-plugin-syntax-jsx"; + packageName = "babel-plugin-syntax-jsx"; + version = "6.18.0"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-plugin-syntax-jsx/-/babel-plugin-syntax-jsx-6.18.0.tgz"; + sha1 = "0af32a9a6e13ca7a3fd5069e62d7b0f58d0d8946"; + }; + }; "babel-plugin-transform-flow-strip-types-6.22.0" = { name = "babel-plugin-transform-flow-strip-types"; packageName = "babel-plugin-transform-flow-strip-types"; @@ -9868,6 +9931,15 @@ let sha512 = "YrwaA0vEKazPBkn0ipTiMpSajYDSe+KjQfrjhcBMxJt/znbvlHd8Pw/Vamaz5EB4Wfhs3SUR3Z9mwRu/P3s3Yg=="; }; }; + "camelize-1.0.0" = { + name = "camelize"; + packageName = "camelize"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/camelize/-/camelize-1.0.0.tgz"; + sha1 = "164a5483e630fa4321e5af07020e531831b2609b"; + }; + }; "caniuse-api-3.0.0" = { name = "caniuse-api"; packageName = "caniuse-api"; @@ -9877,13 +9949,13 @@ let sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw=="; }; }; - "caniuse-lite-1.0.30001103" = { + "caniuse-lite-1.0.30001105" = { name = "caniuse-lite"; packageName = "caniuse-lite"; - version = "1.0.30001103"; + version = "1.0.30001105"; src = fetchurl { - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001103.tgz"; - sha512 = "EJkTPrZrgy712tjZ7GQDye5A67SQOyNS6X9b6GS/e5QFu5Renv5qfkx3GHq1S+vObxKzbWWYuPO/7nt4kYW/gA=="; + url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001105.tgz"; + sha512 = "JupOe6+dGMr7E20siZHIZQwYqrllxotAhiaej96y6x00b/48rPt42o+SzOSCPbrpsDWvRja40Hwrj0g0q6LZJg=="; }; }; "capital-case-1.0.3" = { @@ -10588,6 +10660,15 @@ let sha512 = "qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg=="; }; }; + "classnames-2.2.6" = { + name = "classnames"; + packageName = "classnames"; + version = "2.2.6"; + src = fetchurl { + url = "https://registry.npmjs.org/classnames/-/classnames-2.2.6.tgz"; + sha512 = "JR/iSQOSt+LQIWwrwEzJ9uk0xfN3mTVYMwt1Ir5mUcSN6pU+V4zQFFaJsclJbPuAUQH+yfWef6tm7l1quW3C8Q=="; + }; + }; "cldr-5.6.0" = { name = "cldr"; packageName = "cldr"; @@ -11128,6 +11209,15 @@ let sha512 = "2EF8zTQOxYq70Y4XKtorQupqF0m49MBz2/yf5Bj+MHjvpG3Hy7sImifnqD6UA+TKYxeSV+u6qqQPawN5UvnpKQ=="; }; }; + "clsx-1.1.1" = { + name = "clsx"; + packageName = "clsx"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/clsx/-/clsx-1.1.1.tgz"; + sha512 = "6/bPho624p3S2pMyvP5kKBPXnI3ufHLObBFCfgx+LkeR5lg2XYy2hqZqUf45ypD8COn2bhgGJSUE+l5dhNBieA=="; + }; + }; "cmd-shim-3.0.3" = { name = "cmd-shim"; packageName = "cmd-shim"; @@ -12947,6 +13037,15 @@ let sha512 = "oUnjmWpy0niI3x/mPL8dVEI1l7MnG3+HHyRPHf+YFSbK+svOhXpmSOcDURUh2aOCgl2grzrOPt1nHLuCVFULLw=="; }; }; + "css-color-keywords-1.0.0" = { + name = "css-color-keywords"; + packageName = "css-color-keywords"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/css-color-keywords/-/css-color-keywords-1.0.0.tgz"; + sha1 = "fea2616dc676b2962686b3af8dbdbe180b244e05"; + }; + }; "css-color-names-0.0.4" = { name = "css-color-names"; packageName = "css-color-names"; @@ -13019,13 +13118,22 @@ let sha512 = "jQVeeRG70QI08vSTwf1jHxp74JoZsr2XSgETae8/xC8ovSnL2WF87GTLO86Sbwdt2lK4Umg4HnnwMO4YF3Ce7w=="; }; }; - "css-selector-tokenizer-0.7.2" = { + "css-selector-tokenizer-0.7.3" = { name = "css-selector-tokenizer"; packageName = "css-selector-tokenizer"; - version = "0.7.2"; + version = "0.7.3"; src = fetchurl { - url = "https://registry.npmjs.org/css-selector-tokenizer/-/css-selector-tokenizer-0.7.2.tgz"; - sha512 = "yj856NGuAymN6r8bn8/Jl46pR+OC3eEvAhfGYDUe7YPtTPAYrSSw4oAniZ9Y8T5B92hjhwTBLUen0/vKPxf6pw=="; + url = "https://registry.npmjs.org/css-selector-tokenizer/-/css-selector-tokenizer-0.7.3.tgz"; + sha512 = "jWQv3oCEL5kMErj4wRnK/OPoBi0D+P1FR2cDCKYPaMeD2eW3/mttav8HT4hT1CKopiJI/psEULjkClhvJo4Lvg=="; + }; + }; + "css-to-react-native-2.3.2" = { + name = "css-to-react-native"; + packageName = "css-to-react-native"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/css-to-react-native/-/css-to-react-native-2.3.2.tgz"; + sha512 = "VOFaeZA053BqvvvqIA8c9n0+9vFppVBAHCp6JgFTtTMU3Mzi+XnelJ9XC9ul3BqFzZyQ5N+H0SnwsWT2Ebchxw=="; }; }; "css-tree-1.0.0-alpha.37" = { @@ -13604,13 +13712,13 @@ let sha512 = "jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q=="; }; }; - "dayjs-1.8.29" = { + "dayjs-1.8.30" = { name = "dayjs"; packageName = "dayjs"; - version = "1.8.29"; + version = "1.8.30"; src = fetchurl { - url = "https://registry.npmjs.org/dayjs/-/dayjs-1.8.29.tgz"; - sha512 = "Vm6teig8ZWK7rH/lxzVGxZJCljPdmUr6q/3f4fr5F0VWNGVkZEjZOQJsAN8hUHUqn+NK4XHNEpJZS1MwLyDcLw=="; + url = "https://registry.npmjs.org/dayjs/-/dayjs-1.8.30.tgz"; + sha512 = "5s5IGuP5bVvIbOWkEDcfmXsUj24fZW1NMHVVSdSFF/kW8d+alZcI9SpBKC+baEyBe+z3fUp17y75ulstv5swUw=="; }; }; "de-indent-1.0.2" = { @@ -13811,6 +13919,15 @@ let sha512 = "1K5Y6MykxQYfHBcFfAj2uBaLmwreq4MsjsvrlgcEOvg+X82IeeXlIVIVkBMiypksu+yo9vcYP6lfU3qTedofSQ=="; }; }; + "decko-1.2.0" = { + name = "decko"; + packageName = "decko"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/decko/-/decko-1.2.0.tgz"; + sha1 = "fd43c735e967b8013306884a56fbe665996b6817"; + }; + }; "decode-uri-component-0.2.0" = { name = "decode-uri-component"; packageName = "decode-uri-component"; @@ -15170,6 +15287,15 @@ let sha512 = "3VdM/SXBZX2omc9JF9nOPCtDaYQ67BGp5CoLpIQlO2KCAPETs8TcDHacF26jXadGbvUteZzRTeos2fhID5+ucQ=="; }; }; + "dompurify-2.0.12" = { + name = "dompurify"; + packageName = "dompurify"; + version = "2.0.12"; + src = fetchurl { + url = "https://registry.npmjs.org/dompurify/-/dompurify-2.0.12.tgz"; + sha512 = "Fl8KseK1imyhErHypFPA8qpq9gPzlsJ/EukA6yk9o0gX23p1TzC+rh9LqNg1qvErRTc0UNMYlKxEGSfSh43NDg=="; + }; + }; "domutils-1.4.3" = { name = "domutils"; packageName = "domutils"; @@ -15629,13 +15755,13 @@ let sha512 = "wmtrUGyfSC23GC/B1SMv2ogAUgbQEtDmTIhfqielrG5ExIM9TP4UoYdi90jLF1aTcsWCJNEO0UrgKzP0y3nTSg=="; }; }; - "electron-to-chromium-1.3.501" = { + "electron-to-chromium-1.3.504" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.3.501"; + version = "1.3.504"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.501.tgz"; - sha512 = "tyzuKaV2POw2mtqBBzQGNBojMZzH0MRu8bT8T/50x+hWeucyG/9pkgAATy+PcM2ySNM9+8eG2VllY9c6j4i+bg=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.504.tgz"; + sha512 = "yOXnuPaaLAIZUVuXHYDCo3EeaiEfbFgYWCPH1tBMp+jznCq/zQYKnf6HmkKBmLJ0VES81avl18JZO1lx/XAHOw=="; }; }; "elegant-spinner-1.0.1" = { @@ -16071,13 +16197,13 @@ let sha512 = "jDgnJaF/Btomk+m3PZDTTCb5XIIIX3zYItnCRfF73zVgvinLoRomuhi75Y4su0PtQxWz4v66XnLLckyvyJTOIQ=="; }; }; - "envinfo-7.5.1" = { + "envinfo-7.7.2" = { name = "envinfo"; packageName = "envinfo"; - version = "7.5.1"; + version = "7.7.2"; src = fetchurl { - url = "https://registry.npmjs.org/envinfo/-/envinfo-7.5.1.tgz"; - sha512 = "hQBkDf2iO4Nv0CNHpCuSBeaSrveU6nThVxFGTrq/eDlV716UQk09zChaJae4mZRsos1x4YLY2TaH3LHUae3ZmQ=="; + url = "https://registry.npmjs.org/envinfo/-/envinfo-7.7.2.tgz"; + sha512 = "k3Eh5bKuQnZjm49/L7H4cHzs2FlL5QjbTB3JrPxoTI8aJG7hVMe4uKyJxSYH4ahseby2waUwk5OaKX/nAsaYgg=="; }; }; "epidemic-broadcast-trees-7.0.0" = { @@ -16980,13 +17106,13 @@ let sha512 = "3Zmiobend8P9DjmKAty0Era4jV8oJ0yGYe2nJJAxgymF9+N8F2m0hhZiMoWtcfepExzNKZumFU3ksdQbInGWCg=="; }; }; - "events-3.1.0" = { + "events-3.2.0" = { name = "events"; packageName = "events"; - version = "3.1.0"; + version = "3.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/events/-/events-3.1.0.tgz"; - sha512 = "Rv+u8MLHNOdMjTAFeT3nCjHn2aGlx435FP/sDHNaRhDEMwyI/aB22Kj2qIN8R0cw3z28psEQLYwxVKLsKrMgWg=="; + url = "https://registry.npmjs.org/events/-/events-3.2.0.tgz"; + sha512 = "/46HWwbfCX2xTawVfkKLGxMifJYQBWMwY1mjywRtb4c9x8l5NP3KoJtnIOiL1hfdRkIuYhETxQlo62IF8tcnlg=="; }; }; "events.node-0.4.9" = { @@ -18717,6 +18843,15 @@ let sha1 = "d6170107e9efdc4ed30c9dc39016df942b5cb58b"; }; }; + "format-util-1.0.5" = { + name = "format-util"; + packageName = "format-util"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/format-util/-/format-util-1.0.5.tgz"; + sha512 = "varLbTj0e0yVyRpqQhuWV+8hlePAgaoFRhNFj50BNjEIrw1/DphHSObtqwskVCPWNgzwPoQrZAbfa/SBiicNeg=="; + }; + }; "formidable-1.0.11" = { name = "formidable"; packageName = "formidable"; @@ -18753,13 +18888,13 @@ let sha1 = "98c23dab1175657b8c0573e8ceccd91b0ff18c84"; }; }; - "fp-ts-2.7.0" = { + "fp-ts-2.7.1" = { name = "fp-ts"; packageName = "fp-ts"; - version = "2.7.0"; + version = "2.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/fp-ts/-/fp-ts-2.7.0.tgz"; - sha512 = "J7EIg4MEVuOm1vZspQDVYRD/CTsQECQk01cP5VEBvQ5LnSSjp6sckun1m1eUPSuvtMIlGgm9NqqOxE0+QyntWQ=="; + url = "https://registry.npmjs.org/fp-ts/-/fp-ts-2.7.1.tgz"; + sha512 = "rYy41jF1gVhBNYbPwup50dtyT686OKOoa86PXwh8aKpBRfmvPhnBh2zUkOYj84GIMSCsgY+oJ/RVhVKRvWNPTA=="; }; }; "fragment-cache-0.2.1" = { @@ -19860,13 +19995,13 @@ let sha1 = "b95b4a8df74b39c83298b0c05c978b4d9a3b710b"; }; }; - "glob-watcher-5.0.3" = { + "glob-watcher-5.0.5" = { name = "glob-watcher"; packageName = "glob-watcher"; - version = "5.0.3"; + version = "5.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/glob-watcher/-/glob-watcher-5.0.3.tgz"; - sha512 = "8tWsULNEPHKQ2MR4zXuzSmqbdyV5PtwwCaWSGQ1WwHsJ07ilNeN1JB8ntxhckbnpSHaf9dXFUHzIWvm1I13dsg=="; + url = "https://registry.npmjs.org/glob-watcher/-/glob-watcher-5.0.5.tgz"; + sha512 = "zOZgGGEHPklZNjZQaZ9f41i7F2YwE+tS5ZHrDhbBCk3stwahn5vQxnFmBJZHoYdusR6R1bLSXeGUy/BhctwKzw=="; }; }; "glob2base-0.0.12" = { @@ -22499,13 +22634,13 @@ let sha512 = "E0c4rPwr9ByePfNlTIB8z51kK1s2n6jrHuJeEHENl/sbq2G/S1auvibgEwNR4uSyiU+PiYHqSwsgGiXjG8p5ZQ=="; }; }; - "inquirer-7.3.2" = { + "inquirer-7.3.3" = { name = "inquirer"; packageName = "inquirer"; - version = "7.3.2"; + version = "7.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/inquirer/-/inquirer-7.3.2.tgz"; - sha512 = "DF4osh1FM6l0RJc5YWYhSDB6TawiBRlbV9Cox8MWlidU218Tb7fm3lQTULyUJDfJ0tjbzl0W4q651mrCCEM55w=="; + url = "https://registry.npmjs.org/inquirer/-/inquirer-7.3.3.tgz"; + sha512 = "JG3eIAj5V9CwcGvuOmoo6LB9kbAYT8HXffUl6memuszlwDC/qvFAJw49XJ5NROSFNPxp3iQg1GqkFhaY/CR0IA=="; }; }; "inquirer-autocomplete-prompt-1.0.2" = { @@ -23435,13 +23570,13 @@ let sha512 = "gmh/eWXROncUzRnIa1Ubrt5b8ep/MGSnfAUI3aRp+sqTCs1tv1Isl8d8F6JmkN3dXKc3ehZMrtiPN9eL03NuaQ=="; }; }; - "is-my-json-valid-2.20.4" = { + "is-my-json-valid-2.20.5" = { name = "is-my-json-valid"; packageName = "is-my-json-valid"; - version = "2.20.4"; + version = "2.20.5"; src = fetchurl { - url = "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.20.4.tgz"; - sha512 = "Ym0D5NOxJ+f+zzQHkLfu5n9B1134ra+KwskpDD86200xYQBsAb9OKX81eSsI4oKN9GNAhDAReS7t8Mxtih/l+A=="; + url = "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.20.5.tgz"; + sha512 = "VTPuvvGQtxvCeghwspQu1rBgjYUT6FGxPlvFKbYuFtgc4ADsX3U5ihZOYN0qyU6u+d4X9xXb0IT5O6QpXKt87A=="; }; }; "is-natural-number-4.0.1" = { @@ -23651,13 +23786,13 @@ let sha512 = "h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og=="; }; }; - "is-plain-object-3.0.1" = { + "is-plain-object-4.1.0" = { name = "is-plain-object"; packageName = "is-plain-object"; - version = "3.0.1"; + version = "4.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/is-plain-object/-/is-plain-object-3.0.1.tgz"; - sha512 = "Xnpx182SBMrr/aBik8y+GuR4U1L9FqMSojwDQwPMmxyC6bvEqly9UBCxhauBF5vNh2gwWJNX6oDV7O+OM4z34g=="; + url = "https://registry.npmjs.org/is-plain-object/-/is-plain-object-4.1.0.tgz"; + sha512 = "1N1OpoS8S4Ua+FsH6Mhvgaj0di3uRXgulcv2dnFu2J/WcEsDNbBoiUX6mYmhQ2cAzZ+B/lTJtX1qUSL5RwsGug=="; }; }; "is-posix-bracket-0.1.1" = { @@ -24011,6 +24146,15 @@ let sha512 = "pi4vhbhVHGLxohUw7PhGsueT4vRGFoXhP7+RGN0jKIv9+8PWYCQTqtADngrxOm2g46hoH0+g8uZZBzMrvVGDmw=="; }; }; + "is-what-3.10.0" = { + name = "is-what"; + packageName = "is-what"; + version = "3.10.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-what/-/is-what-3.10.0.tgz"; + sha512 = "U4RYCXNOmATQHlOPlOCHCfXyKEFIPqvyaKDqYRuLbD6EYKcTTfc3YXkAYjzOVxO3zt34L+Wh2feIyWrYiZ7kng=="; + }; + }; "is-whitespace-character-1.0.4" = { name = "is-whitespace-character"; packageName = "is-whitespace-character"; @@ -24812,6 +24956,15 @@ let sha1 = "13f14ce02eed4e981297b64eb9e3b932e2dd13dc"; }; }; + "json-pointer-0.6.0" = { + name = "json-pointer"; + packageName = "json-pointer"; + version = "0.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/json-pointer/-/json-pointer-0.6.0.tgz"; + sha1 = "8e500550a6aac5464a473377da57aa6cc22828d7"; + }; + }; "json-refs-2.1.7" = { name = "json-refs"; packageName = "json-refs"; @@ -24866,6 +25019,15 @@ let sha1 = "51d3ca48955d8fe734f591d747b72453be5a78f2"; }; }; + "json-schema-ref-parser-6.1.0" = { + name = "json-schema-ref-parser"; + packageName = "json-schema-ref-parser"; + version = "6.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/json-schema-ref-parser/-/json-schema-ref-parser-6.1.0.tgz"; + sha512 = "pXe9H1m6IgIpXmE5JSb8epilNTGsmTb2iPohAXpOdhqGFbQjNeHHsZxU+C8w6T81GZxSPFLeUoqDJmzxx5IGuw=="; + }; + }; "json-schema-traverse-0.3.1" = { name = "json-schema-traverse"; packageName = "json-schema-traverse"; @@ -26829,6 +26991,15 @@ let sha1 = "e23f3f9c4f8fbdde872529c1071857a086e5ccef"; }; }; + "lodash.constant-3.0.0" = { + name = "lodash.constant"; + packageName = "lodash.constant"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.constant/-/lodash.constant-3.0.0.tgz"; + sha1 = "bfe05cce7e515b3128925d6362138420bd624910"; + }; + }; "lodash.debounce-4.0.8" = { name = "lodash.debounce"; packageName = "lodash.debounce"; @@ -26937,6 +27108,15 @@ let sha1 = "0b08a1dcf68397c397855c3239783832df7403d1"; }; }; + "lodash.has-4.5.2" = { + name = "lodash.has"; + packageName = "lodash.has"; + version = "4.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.has/-/lodash.has-4.5.2.tgz"; + sha1 = "d19f4dc1095058cccbe2b0cdf4ee0fe4aa37c862"; + }; + }; "lodash.identity-2.4.1" = { name = "lodash.identity"; packageName = "lodash.identity"; @@ -27000,6 +27180,15 @@ let sha1 = "79e4eb88c36a8122af86f844aa9bcd851b5fbb55"; }; }; + "lodash.isarray-4.0.0" = { + name = "lodash.isarray"; + packageName = "lodash.isarray"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-4.0.0.tgz"; + sha1 = "2aca496b28c4ca6d726715313590c02e6ea34403"; + }; + }; "lodash.isboolean-3.0.3" = { name = "lodash.isboolean"; packageName = "lodash.isboolean"; @@ -27036,6 +27225,15 @@ let sha1 = "2cfd575c73e498ab57e319b77fa02adef13a94d1"; }; }; + "lodash.isfunction-3.0.9" = { + name = "lodash.isfunction"; + packageName = "lodash.isfunction"; + version = "3.0.9"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.isfunction/-/lodash.isfunction-3.0.9.tgz"; + sha512 = "AirXNj15uRIMMPihnkInB4i3NHeb4iBtNg9WRWuK2o31S+ePwwNmDPaTL3o7dTJ+VXNZim7rFs4rxN4YU1oUJw=="; + }; + }; "lodash.isinteger-4.0.4" = { name = "lodash.isinteger"; packageName = "lodash.isinteger"; @@ -27090,6 +27288,15 @@ let sha1 = "d527dfb5456eca7cc9bb95d5daeaf88ba54a5451"; }; }; + "lodash.isundefined-3.0.1" = { + name = "lodash.isundefined"; + packageName = "lodash.isundefined"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.isundefined/-/lodash.isundefined-3.0.1.tgz"; + sha1 = "23ef3d9535565203a66cefd5b830f848911afb48"; + }; + }; "lodash.iteratee-4.7.0" = { name = "lodash.iteratee"; packageName = "lodash.iteratee"; @@ -27117,6 +27324,15 @@ let sha1 = "4dbc0472b156be50a0b286855d1bd0b0c656098a"; }; }; + "lodash.keys-4.2.0" = { + name = "lodash.keys"; + packageName = "lodash.keys"; + version = "4.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.keys/-/lodash.keys-4.2.0.tgz"; + sha1 = "a08602ac12e4fb83f91fc1fb7a360a4d9ba35205"; + }; + }; "lodash.map-4.6.0" = { name = "lodash.map"; packageName = "lodash.map"; @@ -27279,6 +27495,15 @@ let sha1 = "d8757b1da807dde24816b0d6a84bea1a76230b23"; }; }; + "lodash.size-4.2.0" = { + name = "lodash.size"; + packageName = "lodash.size"; + version = "4.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.size/-/lodash.size-4.2.0.tgz"; + sha1 = "71fe75ed3eabdb2bcb73a1b0b4f51c392ee27b86"; + }; + }; "lodash.some-4.6.0" = { name = "lodash.some"; packageName = "lodash.some"; @@ -27369,6 +27594,15 @@ let sha1 = "3b6deaa37d60fb116713c46c5f17ea190ec48d64"; }; }; + "lodash.transform-4.6.0" = { + name = "lodash.transform"; + packageName = "lodash.transform"; + version = "4.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.transform/-/lodash.transform-4.6.0.tgz"; + sha1 = "12306422f63324aed8483d3f38332b5f670547a0"; + }; + }; "lodash.unescape-4.0.1" = { name = "lodash.unescape"; packageName = "lodash.unescape"; @@ -27405,6 +27639,15 @@ let sha1 = "a3a17bbf62eeb6240f491846e97c1c4e2a5e1e21"; }; }; + "lodash.values-4.3.0" = { + name = "lodash.values"; + packageName = "lodash.values"; + version = "4.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.values/-/lodash.values-4.3.0.tgz"; + sha1 = "a3a6c2b0ebecc5c2cba1c17e6e620fe81b53d347"; + }; + }; "lodash.xorby-4.7.0" = { name = "lodash.xorby"; packageName = "lodash.xorby"; @@ -27855,6 +28098,15 @@ let sha512 = "rlAEsgU9Bnavca2w1WJ6+6cdeHMXNyadcersyk3ZpuhgWb5HBNj8l4WwJz9PjksAhYDlpQffCVXPctOn+wCIVA=="; }; }; + "lunr-2.3.8" = { + name = "lunr"; + packageName = "lunr"; + version = "2.3.8"; + src = fetchurl { + url = "https://registry.npmjs.org/lunr/-/lunr-2.3.8.tgz"; + sha512 = "oxMeX/Y35PNFuZoHp+jUj5OSEmLCaIH4KTFJh7a93cHBoFmpw2IoPs22VIz7vyO2YUnx2Tn9dzIwO2P/4quIRg=="; + }; + }; "lynx-0.2.0" = { name = "lynx"; packageName = "lynx"; @@ -27900,13 +28152,13 @@ let sha1 = "d25e32e97c3c2cb89568ba8c98d229d5c305e391"; }; }; - "macos-release-2.4.0" = { + "macos-release-2.4.1" = { name = "macos-release"; packageName = "macos-release"; - version = "2.4.0"; + version = "2.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/macos-release/-/macos-release-2.4.0.tgz"; - sha512 = "ko6deozZYiAkqa/0gmcsz+p4jSy3gY7/ZsCEokPaYd8k+6/aXGkiTgr61+Owup7Sf+xjqW8u2ElhoM9SEcEfuA=="; + url = "https://registry.npmjs.org/macos-release/-/macos-release-2.4.1.tgz"; + sha512 = "H/QHeBIN1fIGJX517pvK8IEK53yQOW7YcEI55oYtgjDdoCQQz7eJS94qt5kNrscReEyuD/JcdFCm2XBEcGOITg=="; }; }; "magic-string-0.22.5" = { @@ -28026,13 +28278,13 @@ let sha512 = "07JHC0r1ykIoruKO8ifMXu+xEU8qOXDFETylktdug6vJDACnP+HKevOu3PXyNPzFyTSlz8vrBYlBO1JZRe8Cag=="; }; }; - "make-fetch-happen-8.0.8" = { + "make-fetch-happen-8.0.9" = { name = "make-fetch-happen"; packageName = "make-fetch-happen"; - version = "8.0.8"; + version = "8.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-8.0.8.tgz"; - sha512 = "kILd4WtBFqylc65LRq9sTx/GG0r9yMoomjz9ZMGxzZKWXhnidDhROhnjtZEQDHSWbwQJ5ojI4XZk46DdHwslGg=="; + url = "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-8.0.9.tgz"; + sha512 = "uHa4gv/NIdm9cUvfOhYb57nxrCY08iyMRXru0jbpaH57Q3NCge/ypY7fOvgCr8tPyucKrGbVndKhjXE0IX0VfQ=="; }; }; "make-iterator-1.0.1" = { @@ -28170,6 +28422,15 @@ let sha1 = "ecdca8f13144e660f1b5bd41f12f3479d98dfb8f"; }; }; + "mark.js-8.11.1" = { + name = "mark.js"; + packageName = "mark.js"; + version = "8.11.1"; + src = fetchurl { + url = "https://registry.npmjs.org/mark.js/-/mark.js-8.11.1.tgz"; + sha1 = "180f1f9ebef8b0e638e4166ad52db879beb2ffc5"; + }; + }; "markdown-escapes-1.0.4" = { name = "markdown-escapes"; packageName = "markdown-escapes"; @@ -28719,6 +28980,15 @@ let sha512 = "f/xxz2TpdKv6uDn6GtHee8ivFyxwxmPuXatBb1FBwxYNuVpbM3k/Y1Z+vC0mH/dIXXrukYfe3qe5J32Dfjg93A=="; }; }; + "memoize-one-5.1.1" = { + name = "memoize-one"; + packageName = "memoize-one"; + version = "5.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/memoize-one/-/memoize-one-5.1.1.tgz"; + sha512 = "HKeeBpWvqiVJD57ZUAsJNm71eHTykffzcLZVYWiVfQeI1rJtuEaS7hQiEpWfVVk18donPwJEcFKIkCmPJNOhHA=="; + }; + }; "memoizeasync-1.1.0" = { name = "memoizeasync"; packageName = "memoizeasync"; @@ -28881,6 +29151,15 @@ let sha512 = "VjFo4P5Whtj4vsLzsYBu5ayHhoHJ0UqNm7ibvShmbmoz7tGi0vXaoJbGdB+GmDMLUdg8DpQXEIeVDAe8MaABvQ=="; }; }; + "merge-anything-2.4.4" = { + name = "merge-anything"; + packageName = "merge-anything"; + version = "2.4.4"; + src = fetchurl { + url = "https://registry.npmjs.org/merge-anything/-/merge-anything-2.4.4.tgz"; + sha512 = "l5XlriUDJKQT12bH+rVhAHjwIuXWdAIecGwsYjv2LJo+dA1AeRTmeQS+3QBpO6lEthBMDi2IUMpLC1yyRvGlwQ=="; + }; + }; "merge-descriptors-1.0.1" = { name = "merge-descriptors"; packageName = "merge-descriptors"; @@ -29358,13 +29637,13 @@ let sha512 = "Q4r8ghd80yhO/0j1O3B2BjweX3fiHg9cdOwjJd2J76Q135c+NDxGCqdYKQ1SKBuFfgWbAUzBfvYjPUEeNgqN1A=="; }; }; - "minimisted-2.0.0" = { + "minimisted-2.0.1" = { name = "minimisted"; packageName = "minimisted"; - version = "2.0.0"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/minimisted/-/minimisted-2.0.0.tgz"; - sha512 = "oP88Dw3LK/pdrKyMdlbmg3W50969UNr4ctISzJfPl+YPYHTAOrS+dihXnsgRNKSRIzDsrnV3eE2CCVlZbpOKdQ=="; + url = "https://registry.npmjs.org/minimisted/-/minimisted-2.0.1.tgz"; + sha512 = "1oPjfuLQa2caorJUM8HV8lGgWCc0qqAO1MNv/k05G4qslmsndV/5WdNZrqCiyqiz3wohia2Ij2B7w2Dr7/IyrA=="; }; }; "minipass-2.9.0" = { @@ -29394,13 +29673,13 @@ let sha512 = "6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA=="; }; }; - "minipass-fetch-1.2.1" = { + "minipass-fetch-1.3.0" = { name = "minipass-fetch"; packageName = "minipass-fetch"; - version = "1.2.1"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-1.2.1.tgz"; - sha512 = "ssHt0dkljEDaKmTgQ04DQgx2ag6G2gMPxA5hpcsoeTbfDgRf2fC2gNSRc6kISjD7ckCpHwwQvXxuTBK8402fXg=="; + url = "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-1.3.0.tgz"; + sha512 = "Yb23ESZZ/8QxiBvSpJ4atbVMVDx2CXrerzrtQzQ67eLqKg+zFIkYFTagk3xh6fdo+e/FvDtVuCD4QcuYDRR3hw=="; }; }; "minipass-flush-1.0.5" = { @@ -29583,6 +29862,33 @@ let sha1 = "ebb3a977e7af1c683ae6fda12b545a6ba6c5853d"; }; }; + "mobx-4.15.4" = { + name = "mobx"; + packageName = "mobx"; + version = "4.15.4"; + src = fetchurl { + url = "https://registry.npmjs.org/mobx/-/mobx-4.15.4.tgz"; + sha512 = "nyuHPqmKnVOnbvkjR8OrijBtovxAHYC+JU8/qBqvBw4Dez/n+zzxqNHbZNFy7/07+wwc/Qz7JS9WSfy1LcYISA=="; + }; + }; + "mobx-react-6.1.5" = { + name = "mobx-react"; + packageName = "mobx-react"; + version = "6.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/mobx-react/-/mobx-react-6.1.5.tgz"; + sha512 = "EfWoXmGE2CfozH4Xirb65+il1ynHFCmxBSUabMSf+511YfjVs6QRcCrHkiVw+Il8iWp1gIyfa9qKkUgbDA9/2w=="; + }; + }; + "mobx-react-lite-1.5.2" = { + name = "mobx-react-lite"; + packageName = "mobx-react-lite"; + version = "1.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/mobx-react-lite/-/mobx-react-lite-1.5.2.tgz"; + sha512 = "PyZmARqqWtpuQaAoHF5pKX7h6TKNLwq6vtovm4zZvG6sEbMRHHSqioGXSeQbpRmG8Kw8uln3q/W1yMO5IfL5Sg=="; + }; + }; "mocha-2.5.3" = { name = "mocha"; packageName = "mocha"; @@ -30402,13 +30708,13 @@ let sha512 = "p7KTHxU0CUrcOXe62Zfrb5Z13nLvPhSWR/so3kFulUQU0sgUll2Z0LwpsLN351eOOD+hRGu/F1g+6xDfPeD++Q=="; }; }; - "ncjsm-4.0.1" = { + "ncjsm-4.1.0" = { name = "ncjsm"; packageName = "ncjsm"; - version = "4.0.1"; + version = "4.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/ncjsm/-/ncjsm-4.0.1.tgz"; - sha512 = "gxh5Sgait8HyclaulfhgetHQGyhFm00ZQqISIfqtwFVnyWJ20rk+55SUamo9n3KhM6Vk63gemKPxIDYiSV/xZw=="; + url = "https://registry.npmjs.org/ncjsm/-/ncjsm-4.1.0.tgz"; + sha512 = "YElRGtbz5iIartetOI3we+XAkcGE29F0SdNC0qRy500/u4WceQd2z9Nhlx24OHmIDIKz9MHdJwf/fkSG0hdWcQ=="; }; }; "nconf-0.10.0" = { @@ -31007,13 +31313,13 @@ let sha512 = "dSq1xmcPDKPZ2EED2S6zw/b9NKsqzXRE6dVr8TVQnI3FJOTteUMuqF3Qqs6LZg+mLGYJWqQzMbIjMtJqTv87nQ=="; }; }; - "node-gyp-build-4.2.2" = { + "node-gyp-build-4.2.3" = { name = "node-gyp-build"; packageName = "node-gyp-build"; - version = "4.2.2"; + version = "4.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.2.2.tgz"; - sha512 = "Lqh7mrByWCM8Cf9UPqpeoVBBo5Ugx+RKu885GAzmLBVYjeywScxHXPGLa4JfYNZmcNGwzR0Glu5/9GaQZMFqyA=="; + url = "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.2.3.tgz"; + sha512 = "MN6ZpzmfNCRM+3t57PTJHgHyw/h4OWnZ6mR8P5j/uZtqQr46RRuDE/P+g3n0YR/AiYXeWixZZzaip77gdICfRg=="; }; }; "node-int64-0.4.0" = { @@ -31160,13 +31466,13 @@ let sha512 = "j1g/VtSCI2tBrBnCD+u8iSo9tH0nvn70k1O1SxkHk3+qx7tHUyOKQc7wNc4rUs9J1PkGngUC3qEDd5cL7Z/klg=="; }; }; - "node-releases-1.1.59" = { + "node-releases-1.1.60" = { name = "node-releases"; packageName = "node-releases"; - version = "1.1.59"; + version = "1.1.60"; src = fetchurl { - url = "https://registry.npmjs.org/node-releases/-/node-releases-1.1.59.tgz"; - sha512 = "H3JrdUczbdiwxN5FuJPyCHnGHIFqQ0wWxo+9j1kAXAzqNMAHlo+4I/sYYxpyK0irQ73HgdiyzD32oqQDcU2Osw=="; + url = "https://registry.npmjs.org/node-releases/-/node-releases-1.1.60.tgz"; + sha512 = "gsO4vjEdQaTusZAEebUWp2a5d7dF5DYoIpDG7WySnk7BuZDW+GPpHXoXXuYawRBr/9t5q54tirPz79kFIWg4dA=="; }; }; "node-source-walk-4.2.0" = { @@ -31619,13 +31925,13 @@ let sha512 = "yQ0/U4fYpCCqmueB2g8sc+89ckQ3eXpmU4+Yi2j5o/r0WkKvE2+Y0tK3DEILAtn2UaQTkjTHxIXe2/CSdit+/Q=="; }; }; - "npm-registry-fetch-8.1.2" = { + "npm-registry-fetch-8.1.3" = { name = "npm-registry-fetch"; packageName = "npm-registry-fetch"; - version = "8.1.2"; + version = "8.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-8.1.2.tgz"; - sha512 = "/m5W4t5xSAO0vwI+nDMh/msTimROztmrQcMxWRoWqWQsNYUavE4zSQCvpfDZb+V6CVs4J2tHvCP0g3me2nNU7w=="; + url = "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-8.1.3.tgz"; + sha512 = "xpBFcg13wkFR0SsscvemmrIe1Sxe1SPgGUOAb7+5Uo6fR8SIRMenMHeDSjfyulv1px66/y0Ib40rtKO20PcgPg=="; }; }; "npm-run-path-2.0.2" = { @@ -32331,6 +32637,15 @@ let sha512 = "5NcSkPHhwTVFIQN+TUqXoS5+dlElHXdpAWu9I0HP20YOtIi+aZ0Ct82jdlILDxjLEAWwvm+qj1m6aEtsDVmm6Q=="; }; }; + "ono-4.0.11" = { + name = "ono"; + packageName = "ono"; + version = "4.0.11"; + src = fetchurl { + url = "https://registry.npmjs.org/ono/-/ono-4.0.11.tgz"; + sha512 = "jQ31cORBFE6td25deYeD80wxKBMj+zBmHTrVxnc6CKhx8gho6ipmWM5zj/oeoqioZ99yqBls9Z/9Nss7J26G2g=="; + }; + }; "opal-runtime-1.0.11" = { name = "opal-runtime"; packageName = "opal-runtime"; @@ -32385,6 +32700,24 @@ let sha512 = "brSA+/yq+b08Hsr4c8fsEW2CRzk1BmfN3SAK/5VCHQ9bdoZJ4qa/+AfR0xHjlbbZUyPkUHs1b8x1RqdyZdkVqQ=="; }; }; + "open-7.1.0" = { + name = "open"; + packageName = "open"; + version = "7.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/open/-/open-7.1.0.tgz"; + sha512 = "lLPI5KgOwEYCDKXf4np7y1PBEkj7HYIyP2DY8mVDRnx0VIIu6bNrRB0R66TuO7Mack6EnTNLm4uvcl1UoklTpA=="; + }; + }; + "openapi-sampler-1.0.0-beta.15" = { + name = "openapi-sampler"; + packageName = "openapi-sampler"; + version = "1.0.0-beta.15"; + src = fetchurl { + url = "https://registry.npmjs.org/openapi-sampler/-/openapi-sampler-1.0.0-beta.15.tgz"; + sha512 = "wUD/vD3iBHKik/sME3uwUu4X3HFA53rDrPcVvLzgEELjHLbnTpSYfm4Jo9qZT1dPfBRowAnrF/VRQfOjL5QRAw=="; + }; + }; "openapi-to-graphql-2.1.0" = { name = "openapi-to-graphql"; packageName = "openapi-to-graphql"; @@ -32997,13 +33330,13 @@ let sha512 = "3cRXXn3/O0o3+eVmUroJPSj/esxoEFIm0ZOno/T+NzG/VZgPOqQ8WKmlNqubSEpZmCIngEy34unkHGg83ZIBmg=="; }; }; - "p-queue-6.5.0" = { + "p-queue-6.6.0" = { name = "p-queue"; packageName = "p-queue"; - version = "6.5.0"; + version = "6.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/p-queue/-/p-queue-6.5.0.tgz"; - sha512 = "FLaTTD9Am6TeDfNuN0d+INeyVJoICoBS+OVP5K1S84v4w51LN3nRkCT+WC7xLBepV2s+N4LibM7Ys7xcSc0+1A=="; + url = "https://registry.npmjs.org/p-queue/-/p-queue-6.6.0.tgz"; + sha512 = "zPHXPNy9jZsiym0PpJjvnHQysx1fSd/QdaNVwiDRLU2KFChD6h9CkCB6b8i3U8lBwJyA+mHgNZCzcy77glUssQ=="; }; }; "p-reduce-1.0.0" = { @@ -33141,13 +33474,13 @@ let sha1 = "5860587a944873a6b7e6d26e8e51ffb22315bf17"; }; }; - "packet-stream-2.0.4" = { + "packet-stream-2.0.5" = { name = "packet-stream"; packageName = "packet-stream"; - version = "2.0.4"; + version = "2.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/packet-stream/-/packet-stream-2.0.4.tgz"; - sha512 = "7+oxHdMMs6VhLvvbrDUc8QNuelE9fPKLDdToXBIKLPKOlnoBeMim+/35edp+AnFTLzk3xcogVvQ/jrZyyGsEiw=="; + url = "https://registry.npmjs.org/packet-stream/-/packet-stream-2.0.5.tgz"; + sha512 = "+4S+qBUdqD57ka5MDd6nAYGBPril5eyLpbga2y0kPyYhrKvjb8CYTP9r40WLbSxgT/qEGmvgWOrvQe+FYtCI7w=="; }; }; "packet-stream-codec-1.1.2" = { @@ -33159,13 +33492,13 @@ let sha1 = "79b302fc144cdfbb4ab6feba7040e6a5d99c79c7"; }; }; - "pacote-11.1.10" = { + "pacote-11.1.11" = { name = "pacote"; packageName = "pacote"; - version = "11.1.10"; + version = "11.1.11"; src = fetchurl { - url = "https://registry.npmjs.org/pacote/-/pacote-11.1.10.tgz"; - sha512 = "xJSSSxcHLo1CZJESvIZ2hbC5/5WP2oDHeUeTV2FvVDPOZG7+ixbxnV0n3TkdaUqlbC0RwnwMQ3wkJ/YywYM0Cg=="; + url = "https://registry.npmjs.org/pacote/-/pacote-11.1.11.tgz"; + sha512 = "r6PHtCEhkaGv+QPx1JdE/xRdkSkZUG7dE2oloNk/CGTPGNOtaJyYqZPFeN6d6UcUrTPRvZXFo3IBzJIBopPuSA=="; }; }; "pacote-9.5.12" = { @@ -34086,6 +34419,15 @@ let sha1 = "7a57eb550a6783f9115331fcf4663d5c8e007a50"; }; }; + "perfect-scrollbar-1.5.0" = { + name = "perfect-scrollbar"; + packageName = "perfect-scrollbar"; + version = "1.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/perfect-scrollbar/-/perfect-scrollbar-1.5.0.tgz"; + sha512 = "NrNHJn5mUGupSiheBTy6x+6SXCFbLlm8fVZh9moIzw/LgqElN5q4ncR4pbCBCYuCJ8Kcl9mYM0NgDxvW+b4LxA=="; + }; + }; "performance-now-0.2.0" = { name = "performance-now"; packageName = "performance-now"; @@ -34509,13 +34851,22 @@ let sha1 = "11d1e12b9cb64d63e30c143a330f4c1f567da85f"; }; }; - "portfinder-1.0.26" = { + "polished-3.6.5" = { + name = "polished"; + packageName = "polished"; + version = "3.6.5"; + src = fetchurl { + url = "https://registry.npmjs.org/polished/-/polished-3.6.5.tgz"; + sha512 = "VwhC9MlhW7O5dg/z7k32dabcAFW1VI2+7fSe8cE/kXcfL7mVdoa5UxciYGW2sJU78ldDLT6+ROEKIZKFNTnUXQ=="; + }; + }; + "portfinder-1.0.27" = { name = "portfinder"; packageName = "portfinder"; - version = "1.0.26"; + version = "1.0.27"; src = fetchurl { - url = "https://registry.npmjs.org/portfinder/-/portfinder-1.0.26.tgz"; - sha512 = "Xi7mKxJHHMI3rIUrnm/jjUgwhbYMkp/XKEcZX3aG4BrumLpq3nmoQMX+ClYnDZnZ/New7IatC1no5RX0zo1vXQ=="; + url = "https://registry.npmjs.org/portfinder/-/portfinder-1.0.27.tgz"; + sha512 = "bJ3U3MThKnyJ9Dx1Idtm5pQmxXqw08+XOHhi/Lie8OF1OlhVaBFhsntAIhkZYjfDcCzszSr0w1yCbccThhzgxQ=="; }; }; "posix-character-classes-0.1.1" = { @@ -36769,13 +37120,13 @@ let sha512 = "AMD7w5hRXcFSb8s9u38acBZ+309u6GsiibP4/0YacJeaurRshogB7v/ZcVPxP5gD5+zIw6ixRHdutiYUJfwKHw=="; }; }; - "queue-microtask-1.1.3" = { + "queue-microtask-1.1.4" = { name = "queue-microtask"; packageName = "queue-microtask"; - version = "1.1.3"; + version = "1.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.1.3.tgz"; - sha512 = "zC1ZDLKFhZSa8vAdFbkOGouHcOUMgUAI/2/3on/KktpY+BaVqABkzDSsCSvJfmLbICOnrEuF9VIMezZf+T0mBA=="; + url = "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.1.4.tgz"; + sha512 = "eY/4Obve9cE5FK8YvC1cJsm5cr7XvAurul8UtBDJ2PR1p5NmAwHtvAt5ftcLtwYRCUKNhxCneZZlxmUDFoSeKA=="; }; }; "quick-format-unescaped-4.0.1" = { @@ -37093,6 +37444,24 @@ let sha512 = "YMZQQq32xHLX0bz5Mnibv1/LHb3Sqzngu7xstSM+vrkE5Kzr9xE0yMByK5kMoTK30YVJE61WfbxIFFvfeDKT1w=="; }; }; + "react-dom-16.13.1" = { + name = "react-dom"; + packageName = "react-dom"; + version = "16.13.1"; + src = fetchurl { + url = "https://registry.npmjs.org/react-dom/-/react-dom-16.13.1.tgz"; + sha512 = "81PIMmVLnCNLO/fFOQxdQkvEq/+Hfpv24XNJfpyZhTRfO0QcmQIF/PgCa1zCOj2w1hrn12MFLyaJ/G0+Mxtfag=="; + }; + }; + "react-dropdown-1.7.0" = { + name = "react-dropdown"; + packageName = "react-dropdown"; + version = "1.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/react-dropdown/-/react-dropdown-1.7.0.tgz"; + sha512 = "zFZ73pgLA32hArpE4j/7DtOEhOMg240XG5QvbAb0/VinGekkHDVIakMyAFUKC5jDz8jqXEltgriqFW9R5iCtPQ=="; + }; + }; "react-is-16.13.1" = { name = "react-is"; packageName = "react-is"; @@ -37111,6 +37480,15 @@ let sha512 = "gAGnwWkf+NOTig9oOowqid9O0HjTDC+XVGBCAmJYYJ2A2cN/O4gDdIuuUQjv8A4v6GDwVfJkagpBBLW5OW9HSw=="; }; }; + "react-tabs-3.1.1" = { + name = "react-tabs"; + packageName = "react-tabs"; + version = "3.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/react-tabs/-/react-tabs-3.1.1.tgz"; + sha512 = "HpySC29NN1BkzBAnOC+ajfzPbTaVZcSWzMSjk56uAhPC/rBGtli8lTysR4CfPAyEE/hfweIzagOIoJ7nu80yng=="; + }; + }; "read-1.0.7" = { name = "read"; packageName = "read"; @@ -37525,6 +37903,15 @@ let sha1 = "8984b5815d99cb220469c99eeeffe38913e6cc0b"; }; }; + "redoc-2.0.0-rc.29" = { + name = "redoc"; + packageName = "redoc"; + version = "2.0.0-rc.29"; + src = fetchurl { + url = "https://registry.npmjs.org/redoc/-/redoc-2.0.0-rc.29.tgz"; + sha512 = "G2PX4QG/XdNKqRvxPpszJdPPRcODJjkuGidjNr4m/eP04aoNjWpytcH1XxZUC7fVW6zBUtJTaktv1HnVF+2GmA=="; + }; + }; "reduce-component-1.0.1" = { name = "reduce-component"; packageName = "reduce-component"; @@ -37588,13 +37975,13 @@ let sha512 = "MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg=="; }; }; - "regenerator-runtime-0.13.5" = { + "regenerator-runtime-0.13.7" = { name = "regenerator-runtime"; packageName = "regenerator-runtime"; - version = "0.13.5"; + version = "0.13.7"; src = fetchurl { - url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz"; - sha512 = "ZS5w8CpKFinUzOwW3c83oPeVXoNsrLsaCoLtJvAClH135j/R77RuymhiSErhm2lKcwSCIpmvIWSbDkIfAqKQlA=="; + url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.7.tgz"; + sha512 = "a54FxoJDIr27pgf7IgeQGxmqUNYrcV338lf/6gH456HZ/PhX+5BcwHXG9ajESmwe6WRO0tAzRUrRmNONWgkrew=="; }; }; "regenerator-transform-0.14.5" = { @@ -38146,22 +38533,22 @@ let sha1 = "5d36bb57961c673aa5b788dbc8141fdf23b44e08"; }; }; - "request-promise-core-1.1.3" = { + "request-promise-core-1.1.4" = { name = "request-promise-core"; packageName = "request-promise-core"; - version = "1.1.3"; + version = "1.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/request-promise-core/-/request-promise-core-1.1.3.tgz"; - sha512 = "QIs2+ArIGQVp5ZYbWD5ZLCY29D5CfWizP8eWnm8FoGD1TX61veauETVQbrV60662V0oFBkrDOuaBI8XgtuyYAQ=="; + url = "https://registry.npmjs.org/request-promise-core/-/request-promise-core-1.1.4.tgz"; + sha512 = "TTbAfBBRdWD7aNNOoVOBH4pN/KigV6LyapYNNlAPA8JwbovRti1E88m3sYAwsLi5ryhPKsE9APwnjFTgdUjTpw=="; }; }; - "request-promise-native-1.0.8" = { + "request-promise-native-1.0.9" = { name = "request-promise-native"; packageName = "request-promise-native"; - version = "1.0.8"; + version = "1.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/request-promise-native/-/request-promise-native-1.0.8.tgz"; - sha512 = "dapwLGqkHtwL5AEbfenuzjTYg35Jd6KPytsC2/TLkVMz8rm+tNt72MGUWT1RP/aYawMpN6HqbNGBQaRcBtjQMQ=="; + url = "https://registry.npmjs.org/request-promise-native/-/request-promise-native-1.0.9.tgz"; + sha512 = "wcW+sIUiWnKgNY0dqCpOZkUbF/I+YPi+f09JZIDa39Ec+q82CpSYniDp+ISgTTbKmnpJWASeJBPZmoxH84wt3g=="; }; }; "requestretry-4.1.1" = { @@ -38776,13 +39163,13 @@ let sha512 = "/2HA0Ec70TvQnXdzynFffkjA6XN+1e2pEv/uKS5Ulca40g2L7KuOE3riasHoNVHOsFD5KKZgDsMk1CP3Tw9s+A=="; }; }; - "rollup-2.22.1" = { + "rollup-2.22.2" = { name = "rollup"; packageName = "rollup"; - version = "2.22.1"; + version = "2.22.2"; src = fetchurl { - url = "https://registry.npmjs.org/rollup/-/rollup-2.22.1.tgz"; - sha512 = "K9AUQUCJkVqC+A7uUDacfhmpEeAjc2uOmSpvGI5xaYsm8pXgy4ZWEM8wHPfKj11xvCwFZppkRDo8a0RESJXCnw=="; + url = "https://registry.npmjs.org/rollup/-/rollup-2.22.2.tgz"; + sha512 = "2a4Mch4f0W2lEvkPuxtz0GfrtfgLj9bdd/oC9L3LozGOCnmLqO7ivMfKbCJoRgqWIU2UqAcbxRFSwmIKx+uStA=="; }; }; "rollup-plugin-babel-4.4.0" = { @@ -38875,13 +39262,13 @@ let sha512 = "1JKFzLHeteNandmlVBUWgLPmipFEllhdUQlmNvkXd6ju4VFOlGr0VmtlQaxzZoVysG2nbGb8eAtzNqQTxzQ+AQ=="; }; }; - "rss-parser-3.8.0" = { + "rss-parser-3.9.0" = { name = "rss-parser"; packageName = "rss-parser"; - version = "3.8.0"; + version = "3.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/rss-parser/-/rss-parser-3.8.0.tgz"; - sha512 = "EvjM0r3IymXnk+SCUawLhdH36D2WQCwpEfIyvu4hpPswYuMSk/jlCLOcg24OvXwVdcJcEocAlTZVjGNjOOSJXg=="; + url = "https://registry.npmjs.org/rss-parser/-/rss-parser-3.9.0.tgz"; + sha512 = "wlRSfGrotOXuWo19Dtl2KmQt7o9i5zzCExUrxpechE0O54BAx7JD+xhWyGumPPqiJj771ndflV3sE3bTHen0HQ=="; }; }; "rsvp-3.6.2" = { @@ -39217,13 +39604,13 @@ let sha512 = "y/52Mcy7aw3gRm7IrcGDFx/bCk4AhRh2eI9luHOQM86nZsqwiRkkq2GekHXBBD+SmPidc8i2PqtYZl+pWJ8Oeg=="; }; }; - "sass-formatter-0.4.12" = { + "sass-formatter-0.4.13" = { name = "sass-formatter"; packageName = "sass-formatter"; - version = "0.4.12"; + version = "0.4.13"; src = fetchurl { - url = "https://registry.npmjs.org/sass-formatter/-/sass-formatter-0.4.12.tgz"; - sha512 = "dGDTzujNHdj2nnHPZ1y+5ybJOdrGDmkzwRwwzYVlprXs0QBiACydA3h+1KUEbAJbZ84CtiVHAuBLfakWqcbGEA=="; + url = "https://registry.npmjs.org/sass-formatter/-/sass-formatter-0.4.13.tgz"; + sha512 = "EhNMkRZSZHcHrg/w0XgBoW96pcY11SBJ69mCI2S3Eo2sce2CSd66AqxAS05eC8yoc4BVg/Fr2KZty5B3gt6xGw=="; }; }; "sass-lookup-3.0.0" = { @@ -39289,6 +39676,15 @@ let sha512 = "agTSHR1Nbfi6ulI0kYNK0203joW2Y5W4po4l+v03tOoiJKpTBbxpNhWDvqc/4IcOw+KLmSiQLTasZ4cab2/UWQ=="; }; }; + "scheduler-0.19.1" = { + name = "scheduler"; + packageName = "scheduler"; + version = "0.19.1"; + src = fetchurl { + url = "https://registry.npmjs.org/scheduler/-/scheduler-0.19.1.tgz"; + sha512 = "n/zwRWRYSUj0/3g/otKDRPMh6qv2SYMWNq85IEa8iZyAv8od9zDYpGSnpBEjNgcMNq6Scbu5KfIPxNF72R/2EA=="; + }; + }; "schema-utils-1.0.0" = { name = "schema-utils"; packageName = "schema-utils"; @@ -40477,6 +40873,15 @@ let sha1 = "56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707"; }; }; + "slugify-1.4.4" = { + name = "slugify"; + packageName = "slugify"; + version = "1.4.4"; + src = fetchurl { + url = "https://registry.npmjs.org/slugify/-/slugify-1.4.4.tgz"; + sha512 = "N2+9NJ8JzfRMh6PQLrBeDEnVDQZSytE/W4BTC4fNNPmO90Uu58uNwSlIJSs+lmPgWsaAF79WLhVPe5tuy7spjw=="; + }; + }; "smart-buffer-4.1.0" = { name = "smart-buffer"; packageName = "smart-buffer"; @@ -40594,13 +40999,13 @@ let sha512 = "3UlyogA67/9WOssJ7s4d7gqWQRWyO/LbgdBBNMhhmFDKa7eTUSW+A782CVHgyDSJZ2kNANcMWwMiOL+h3p6zQg=="; }; }; - "snyk-docker-plugin-3.13.1" = { + "snyk-docker-plugin-3.16.0" = { name = "snyk-docker-plugin"; packageName = "snyk-docker-plugin"; - version = "3.13.1"; + version = "3.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-docker-plugin/-/snyk-docker-plugin-3.13.1.tgz"; - sha512 = "4GEZ8Rx+1K33i0SuMRO03T+n8jAosLae4iuo1TZu9ugkxdQzbBStzVFz2N6x1s0GI/psWQNOWSLKfzFJYMOctw=="; + url = "https://registry.npmjs.org/snyk-docker-plugin/-/snyk-docker-plugin-3.16.0.tgz"; + sha512 = "i11WxMhsZxcFKn123LeA+u77NN7uWqWgPfQ6dvkACJnvouWHZidkOAxBOmYU49x8VS7dEQSe2Ym0bgr6EHn4cQ=="; }; }; "snyk-go-parser-1.4.1" = { @@ -40612,13 +41017,13 @@ let sha512 = "StU3uHB85VMEkcgXta63M0Fgd+9cs5sMCjQXTBoYTdE4dxarPn7U67yCuwkRRdZdny1ZXtzfY8LKns9i0+dy9w=="; }; }; - "snyk-go-plugin-1.14.2" = { + "snyk-go-plugin-1.16.0" = { name = "snyk-go-plugin"; packageName = "snyk-go-plugin"; - version = "1.14.2"; + version = "1.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-go-plugin/-/snyk-go-plugin-1.14.2.tgz"; - sha512 = "r/uaM3gk/RF7m/VGYswxlnA6I+kMgK3eVPsPyf7400BhqF8noh8K7v10CEg67mHA4JM0l7dZASqejr/5kKw9ZQ=="; + url = "https://registry.npmjs.org/snyk-go-plugin/-/snyk-go-plugin-1.16.0.tgz"; + sha512 = "XNGHEFyP+pCzcqmXnj5T/1Oy6AZzm2WkTSuUpohWQ/09ecMRCCv2yrr/kwMQemrKN4+7CoJS/9xfm3GnNlzVHA=="; }; }; "snyk-gradle-plugin-3.5.1" = { @@ -40657,13 +41062,13 @@ let sha512 = "HHuOYEAACpUpkFgU8HT57mmxmonaJ4O3YADoSkVhnhkmJ+AowqZyJOau703dYHNrq2DvQ7qYw81H7yyxS1Nfjw=="; }; }; - "snyk-mvn-plugin-2.17.1" = { + "snyk-mvn-plugin-2.17.3" = { name = "snyk-mvn-plugin"; packageName = "snyk-mvn-plugin"; - version = "2.17.1"; + version = "2.17.3"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-mvn-plugin/-/snyk-mvn-plugin-2.17.1.tgz"; - sha512 = "U7ZKrKVnUW2gcyYIzvc0w9nRYh4NXv+wShTIcs++ARCAJOG9A4nxh+ZRmINQ7Sy7EB2qLIRwN4Ssr17+y2mhuA=="; + url = "https://registry.npmjs.org/snyk-mvn-plugin/-/snyk-mvn-plugin-2.17.3.tgz"; + sha512 = "yDlqPuNacYUdf4JlyW8dHcxJJC3BMOU01m5cuGhX6s8j88T79A0qrwUu8AJwCIjbDXpD1YSoS1Wb7gRdvDlbKA=="; }; }; "snyk-nodejs-lockfile-parser-1.22.0" = { @@ -42169,6 +42574,15 @@ let sha1 = "ac8382de415d0c99a5a2b5fa0c404b174a8ed59b"; }; }; + "stickyfill-1.1.1" = { + name = "stickyfill"; + packageName = "stickyfill"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/stickyfill/-/stickyfill-1.1.1.tgz"; + sha1 = "39413fee9d025c74a7e59ceecb23784cc0f17f02"; + }; + }; "stream-browserify-2.0.2" = { name = "stream-browserify"; packageName = "stream-browserify"; @@ -42475,13 +42889,13 @@ let sha512 = "78lwMoCcn0nNu8LszbP1UA7g55OeE4v7rCeWnM5B453rnNr4aq+5it3FEYtZrSEiMvHZOZ9Jlqb0OD0M2VInqg=="; }; }; - "string-kit-0.11.7" = { + "string-kit-0.11.8" = { name = "string-kit"; packageName = "string-kit"; - version = "0.11.7"; + version = "0.11.8"; src = fetchurl { - url = "https://registry.npmjs.org/string-kit/-/string-kit-0.11.7.tgz"; - sha512 = "YELCRaRSTnwupnKqxqsm6xQ9EJjE23dpqg9ca6uBebfA2s601sm2dj42KPH7I50rvGf93Fz+o0mKKw81mK6Lrw=="; + url = "https://registry.npmjs.org/string-kit/-/string-kit-0.11.8.tgz"; + sha512 = "lJyXXoptFpgOXL9cWZXtf45jxdbP5qYtaGZsmtFm4CZy9q6wwzvRzQcJiFeLx8I/0RpzBao9WCOGpbyfW2CMWA=="; }; }; "string-length-2.0.0" = { @@ -43006,6 +43420,15 @@ let sha1 = "7958c793e47e32e07d2b5cafe5c0bf8e12e77902"; }; }; + "styled-components-4.4.1" = { + name = "styled-components"; + packageName = "styled-components"; + version = "4.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/styled-components/-/styled-components-4.4.1.tgz"; + sha512 = "RNqj14kYzw++6Sr38n7197xG33ipEOktGElty4I70IKzQF1jzaD1U4xQ+Ny/i03UUhHlC5NWEO+d8olRCDji6g=="; + }; + }; "stylehacks-4.0.3" = { name = "stylehacks"; packageName = "stylehacks"; @@ -43060,6 +43483,24 @@ let sha512 = "luHn2OAMGJouOnadm6Fim6WXodQ2AWDkWjYq0rMdyEwzO5PdE4LzoXAEn9LL2snmBAlwUp1URVOTF7lZR3KU+Q=="; }; }; + "stylis-3.5.4" = { + name = "stylis"; + packageName = "stylis"; + version = "3.5.4"; + src = fetchurl { + url = "https://registry.npmjs.org/stylis/-/stylis-3.5.4.tgz"; + sha512 = "8/3pSmthWM7lsPBKv7NXkzn2Uc9W7NotcwGNpJaa3k7WMM1XDCA4MgT5k/8BIexd5ydZdboXtU90XH9Ec4Bv/Q=="; + }; + }; + "stylis-rule-sheet-0.0.10" = { + name = "stylis-rule-sheet"; + packageName = "stylis-rule-sheet"; + version = "0.0.10"; + src = fetchurl { + url = "https://registry.npmjs.org/stylis-rule-sheet/-/stylis-rule-sheet-0.0.10.tgz"; + sha512 = "nTbZoaqoBnmK+ptANthb10ZRZOGC+EmTLLUxeYIuHNkEKcmKgXX1XWKkUBT2Ac4es3NybooPe0SmvKdhKJZAuw=="; + }; + }; "stylus-0.54.8" = { name = "stylus"; packageName = "stylus"; @@ -43889,13 +44330,13 @@ let sha512 = "a6sumDlzyHVJWb8+YofY4TW112G6p2FCPEAFk+59gIYHv3XHRhm9ltVQ9kli4hNWeQBwSpe8cRN25x0ROunMOw=="; }; }; - "terminal-kit-1.37.0" = { + "terminal-kit-1.41.0" = { name = "terminal-kit"; packageName = "terminal-kit"; - version = "1.37.0"; + version = "1.41.0"; src = fetchurl { - url = "https://registry.npmjs.org/terminal-kit/-/terminal-kit-1.37.0.tgz"; - sha512 = "/lb76HOwjVKHIbv+1897c2F/7Rv94QmVIEMKjFZDHPhZhpmCM4wsJ1VNWDdIGcWYRtr+eotob2BvjLQE5BlgMw=="; + url = "https://registry.npmjs.org/terminal-kit/-/terminal-kit-1.41.0.tgz"; + sha512 = "BMP/2gyUCIRAB3Y07jX8fwQeSx5FKD3EAyoSHShbuudeov+nVOSd3/x6QEA3320iDZboQf/HWjqYgTdIxA1pKA=="; }; }; "terser-3.17.0" = { @@ -44366,6 +44807,15 @@ let sha512 = "J7Z2K08jbGcdA1kkQpJSqLF6T0tdQqpR2pnSUXsIchbPdTI9v3e85cLW0d6WDhwuAleOV71j2xWs8qMPfK7nKw=="; }; }; + "tmp-0.2.0" = { + name = "tmp"; + packageName = "tmp"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/tmp/-/tmp-0.2.0.tgz"; + sha512 = "spsb5g6EiPmteS5TcOAECU3rltCMDMp4VMU2Sb0+WttN4qGobEkMAd+dkr1cubscN08JGNDX765dPbGImbG7MQ=="; + }; + }; "tmp-0.2.1" = { name = "tmp"; packageName = "tmp"; @@ -46625,6 +47075,15 @@ let sha1 = "16b5cafc07dbe3676c1b1999177823d6503acb0c"; }; }; + "url-template-2.0.8" = { + name = "url-template"; + packageName = "url-template"; + version = "2.0.8"; + src = fetchurl { + url = "https://registry.npmjs.org/url-template/-/url-template-2.0.8.tgz"; + sha1 = "fc565a3cccbff7730c775f5641f9555791439f21"; + }; + }; "url-to-options-1.0.1" = { name = "url-to-options"; packageName = "url-to-options"; @@ -49872,23 +50331,23 @@ in "@angular/cli" = nodeEnv.buildNodePackage { name = "_at_angular_slash_cli"; packageName = "@angular/cli"; - version = "10.0.3"; + version = "10.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/@angular/cli/-/cli-10.0.3.tgz"; - sha512 = "ONK8YG20KuakQetY0lPKDAOA3uBoLurdpSfFspFkcECyDimwJYSEydi3FUnCxEexeoKvrQWcol+q+u9YPoHCyg=="; + url = "https://registry.npmjs.org/@angular/cli/-/cli-10.0.4.tgz"; + sha512 = "hmr1fXT8+6wOoh7abIg154wdP9QCMPHMShWPEYHks6ARmlRfX5k+BykQMzgI8H6tMNLoR+DAlO5+pPouJEyilQ=="; }; dependencies = [ - sources."@angular-devkit/architect-0.1000.3" - sources."@angular-devkit/core-10.0.3" - sources."@angular-devkit/schematics-10.0.3" - sources."@schematics/angular-10.0.3" - sources."@schematics/update-0.1000.3" + sources."@angular-devkit/architect-0.1000.4" + sources."@angular-devkit/core-10.0.4" + sources."@angular-devkit/schematics-10.0.4" + sources."@schematics/angular-10.0.4" + sources."@schematics/update-0.1000.4" sources."@types/color-name-1.1.1" sources."@yarnpkg/lockfile-1.1.0" sources."JSONStream-1.3.5" sources."agent-base-4.3.0" sources."agentkeepalive-3.5.2" - sources."ajv-6.12.2" + sources."ajv-6.12.3" sources."ansi-colors-4.1.1" sources."ansi-escapes-4.3.1" sources."ansi-regex-5.0.0" @@ -50457,7 +50916,7 @@ in sources."minimatch-3.0.4" sources."minimatch-all-1.1.0" sources."minimist-1.2.5" - sources."minimisted-2.0.0" + sources."minimisted-2.0.1" sources."multi-progress-2.0.0" sources."neo-async-2.6.2" sources."normalize-path-2.1.1" @@ -50686,8 +51145,8 @@ in sources."punycode-2.1.1" sources."qs-6.5.2" sources."request-2.88.2" - sources."request-promise-core-1.1.3" - sources."request-promise-native-1.0.8" + sources."request-promise-core-1.1.4" + sources."request-promise-native-1.0.9" sources."restore-cursor-2.0.0" sources."run-async-2.4.1" sources."rxjs-6.6.0" @@ -50779,7 +51238,7 @@ in sources."@types/anymatch-1.3.1" sources."@types/color-name-1.1.1" sources."@types/json5-0.0.29" - sources."@types/node-14.0.23" + sources."@types/node-14.0.24" sources."@types/parse-json-4.0.0" sources."@types/source-list-map-0.1.2" sources."@types/tapable-1.0.6" @@ -50983,7 +51442,7 @@ in sources."eslint-scope-4.0.3" sources."esrecurse-4.2.1" sources."estraverse-4.3.0" - sources."events-3.1.0" + sources."events-3.2.0" sources."evp_bytestokey-1.0.3" sources."execa-1.0.0" (sources."expand-brackets-2.1.4" // { @@ -51111,7 +51570,7 @@ in ]; }) sources."lru-cache-5.1.1" - sources."macos-release-2.4.0" + sources."macos-release-2.4.1" sources."magic-string-0.25.7" sources."make-dir-2.1.0" sources."map-cache-0.2.2" @@ -51680,7 +52139,7 @@ in sources."@types/cookies-0.7.4" sources."@types/cors-2.8.6" sources."@types/express-4.17.4" - sources."@types/express-serve-static-core-4.17.8" + sources."@types/express-serve-static-core-4.17.9" sources."@types/fs-capacitor-2.0.0" sources."@types/glob-7.1.3" sources."@types/graphql-upload-8.0.3" @@ -51689,9 +52148,9 @@ in sources."@types/koa-2.11.3" sources."@types/koa-compose-3.2.5" sources."@types/long-4.0.1" - sources."@types/mime-2.0.2" + sources."@types/mime-2.0.3" sources."@types/minimatch-3.0.3" - sources."@types/node-14.0.23" + sources."@types/node-14.0.24" (sources."@types/node-fetch-2.5.7" // { dependencies = [ sources."form-data-3.0.0" @@ -51928,7 +52387,7 @@ in sources."callsites-2.0.0" sources."camel-case-4.1.1" sources."camelcase-4.1.0" - sources."caniuse-lite-1.0.30001103" + sources."caniuse-lite-1.0.30001105" sources."capital-case-1.0.3" sources."capture-stack-trace-1.0.1" sources."cardinal-2.1.1" @@ -51937,7 +52396,11 @@ in sources."chalk-2.4.2" sources."change-case-4.1.1" sources."chardet-0.7.0" - sources."cheerio-1.0.0-rc.3" + (sources."cheerio-1.0.0-rc.3" // { + dependencies = [ + sources."entities-1.1.2" + ]; + }) (sources."chokidar-2.1.8" // { dependencies = [ sources."braces-2.3.2" @@ -52124,7 +52587,11 @@ in sources."dicer-0.3.0" sources."diff-4.0.2" sources."dir-glob-3.0.1" - sources."dom-serializer-0.1.1" + (sources."dom-serializer-0.1.1" // { + dependencies = [ + sources."entities-1.1.2" + ]; + }) sources."domelementtype-1.3.1" sources."domhandler-2.4.2" sources."domutils-1.5.1" @@ -52146,14 +52613,14 @@ in sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" sources."ejs-2.7.4" - sources."electron-to-chromium-1.3.501" + sources."electron-to-chromium-1.3.504" sources."elegant-spinner-1.0.1" sources."emoji-regex-7.0.3" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" - sources."entities-1.1.2" + sources."entities-2.0.3" sources."env-ci-3.2.2" - sources."envinfo-7.5.1" + sources."envinfo-7.7.2" sources."error-ex-1.3.2" sources."es-abstract-1.17.6" sources."es-to-primitive-1.2.1" @@ -52364,6 +52831,7 @@ in sources."hosted-git-info-2.8.8" (sources."htmlparser2-3.10.1" // { dependencies = [ + sources."entities-1.1.2" sources."readable-stream-3.6.0" ]; }) @@ -52391,7 +52859,7 @@ in sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.3.5" - (sources."inquirer-7.3.2" // { + (sources."inquirer-7.3.3" // { dependencies = [ sources."ansi-escapes-4.3.1" sources."ansi-styles-4.2.1" @@ -52616,7 +53084,7 @@ in sources."semver-6.3.0" ]; }) - sources."node-releases-1.1.59" + sources."node-releases-1.1.60" (sources."nodemon-1.19.4" // { dependencies = [ sources."debug-3.2.6" @@ -52711,7 +53179,7 @@ in sources."pinkie-promise-2.0.1" sources."pirates-4.0.1" sources."pkg-dir-3.0.0" - (sources."portfinder-1.0.26" // { + (sources."portfinder-1.0.27" // { dependencies = [ sources."debug-3.2.6" sources."ms-2.1.2" @@ -52778,7 +53246,7 @@ in sources."redeyed-2.1.1" sources."regenerate-1.4.1" sources."regenerate-unicode-properties-8.2.0" - sources."regenerator-runtime-0.13.5" + sources."regenerator-runtime-0.13.7" sources."regenerator-transform-0.14.5" (sources."regex-not-1.0.2" // { dependencies = [ @@ -52808,7 +53276,7 @@ in sources."retry-0.12.0" sources."reusify-1.0.4" sources."rimraf-3.0.2" - sources."rss-parser-3.8.0" + sources."rss-parser-3.9.0" sources."run-async-2.4.1" sources."run-parallel-1.1.9" sources."rxjs-6.6.0" @@ -53496,7 +53964,7 @@ in dependencies = [ sources."@types/glob-7.1.3" sources."@types/minimatch-3.0.3" - sources."@types/node-14.0.23" + sources."@types/node-14.0.24" sources."balanced-match-1.0.0" sources."brace-expansion-1.1.11" sources."chromium-pickle-js-0.2.0" @@ -53616,8 +54084,8 @@ in sources."punycode-2.1.1" sources."qs-6.5.2" sources."request-2.88.2" - sources."request-promise-core-1.1.3" - sources."request-promise-native-1.0.8" + sources."request-promise-core-1.1.4" + sources."request-promise-native-1.0.9" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" sources."sax-1.2.4" @@ -54676,10 +55144,10 @@ in coc-lists = nodeEnv.buildNodePackage { name = "coc-lists"; packageName = "coc-lists"; - version = "1.3.8"; + version = "1.3.10"; src = fetchurl { - url = "https://registry.npmjs.org/coc-lists/-/coc-lists-1.3.8.tgz"; - sha512 = "fQUlrvZ06EacKHDQDNEgO6wW/5u6oY/0dm3JsdqRVfBcK3+hyGf9rfsDom1qxpjBt4CgPiLTRwbDqmvpwaI0Zg=="; + url = "https://registry.npmjs.org/coc-lists/-/coc-lists-1.3.10.tgz"; + sha512 = "XbwltkjxhzzfN5In3w43TBKFbR1b8+3OgIldwYQOUYHlUxF1KO2mJj8ngkzKsaglIPeMYuWtWizOS02L74fKkA=="; }; buildInputs = globalBuildInputs; meta = { @@ -54718,7 +55186,7 @@ in sources."fb-watchman-2.0.1" sources."flatted-2.0.2" sources."follow-redirects-1.12.1" - sources."fp-ts-2.7.0" + sources."fp-ts-2.7.1" sources."fs-extra-8.1.0" sources."fs-minipass-1.2.7" sources."fs.realpath-1.0.0" @@ -54832,11 +55300,11 @@ in sources."@types/color-name-1.1.1" sources."@types/eslint-visitor-keys-1.0.0" sources."@types/json-schema-7.0.5" - sources."@typescript-eslint/experimental-utils-3.6.1" - sources."@typescript-eslint/parser-3.6.1" - sources."@typescript-eslint/types-3.6.1" - sources."@typescript-eslint/typescript-estree-3.6.1" - sources."@typescript-eslint/visitor-keys-3.6.1" + sources."@typescript-eslint/experimental-utils-3.7.0" + sources."@typescript-eslint/parser-3.7.0" + sources."@typescript-eslint/types-3.7.0" + sources."@typescript-eslint/typescript-estree-3.7.0" + sources."@typescript-eslint/visitor-keys-3.7.0" sources."acorn-7.3.1" sources."acorn-jsx-5.2.0" sources."ajv-6.12.3" @@ -54899,7 +55367,7 @@ in sources."callsites-3.1.0" sources."camelcase-2.1.1" sources."camelcase-keys-2.1.0" - sources."caniuse-lite-1.0.30001103" + sources."caniuse-lite-1.0.30001105" sources."capture-stack-trace-1.0.1" sources."ccount-1.0.5" sources."chalk-2.4.2" @@ -54996,7 +55464,7 @@ in sources."domutils-1.7.0" sources."dot-prop-5.2.0" sources."duplexer3-0.1.4" - sources."electron-to-chromium-1.3.501" + sources."electron-to-chromium-1.3.504" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."entities-1.1.2" @@ -55174,7 +55642,7 @@ in sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.3.5" - (sources."inquirer-7.3.2" // { + (sources."inquirer-7.3.3" // { dependencies = [ sources."ansi-styles-4.2.1" sources."chalk-4.1.0" @@ -55925,7 +56393,7 @@ in sources."@nodelib/fs.stat-1.1.3" sources."@types/glob-7.1.3" sources."@types/minimatch-3.0.3" - sources."@types/node-14.0.23" + sources."@types/node-14.0.24" sources."@types/unist-2.0.3" sources."@types/vfile-3.0.2" sources."@types/vfile-message-2.0.0" @@ -55976,7 +56444,7 @@ in sources."callsites-2.0.0" sources."camelcase-4.1.0" sources."camelcase-keys-4.2.0" - sources."caniuse-lite-1.0.30001103" + sources."caniuse-lite-1.0.30001105" sources."ccount-1.0.5" sources."chalk-2.4.2" sources."character-entities-1.2.4" @@ -56036,7 +56504,7 @@ in sources."domhandler-2.4.2" sources."domutils-1.7.0" sources."dot-prop-5.2.0" - sources."electron-to-chromium-1.3.501" + sources."electron-to-chromium-1.3.504" sources."emoji-regex-8.0.0" sources."entities-1.1.2" sources."error-ex-1.3.2" @@ -56218,7 +56686,7 @@ in sources."mkdirp-0.5.5" sources."ms-2.1.2" sources."nanomatch-1.2.13" - sources."node-releases-1.1.59" + sources."node-releases-1.1.60" sources."normalize-package-data-2.5.0" sources."normalize-range-0.1.2" sources."normalize-selector-0.2.0" @@ -56639,7 +57107,7 @@ in sources."@types/json-schema-7.0.5" sources."@types/minimatch-3.0.3" sources."@types/minimist-1.2.0" - sources."@types/node-14.0.23" + sources."@types/node-14.0.24" sources."@types/normalize-package-data-2.4.0" sources."@types/unist-2.0.3" sources."@types/vfile-3.0.2" @@ -57020,7 +57488,7 @@ in sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.3.5" - (sources."inquirer-7.3.2" // { + (sources."inquirer-7.3.3" // { dependencies = [ sources."ansi-regex-5.0.0" sources."ansi-styles-4.2.1" @@ -57337,7 +57805,7 @@ in sources."safe-buffer-5.1.2" sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" - sources."sass-formatter-0.4.12" + sources."sass-formatter-0.4.13" sources."sax-1.2.4" sources."semver-5.7.1" sources."semver-diff-2.1.0" @@ -57633,10 +58101,10 @@ in coc-vimtex = nodeEnv.buildNodePackage { name = "coc-vimtex"; packageName = "coc-vimtex"; - version = "1.0.3"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/coc-vimtex/-/coc-vimtex-1.0.3.tgz"; - sha512 = "zDliD5/CMHMdKm2aOu5lMW2z7Anbkl8cb7JnyQoeG5y6x4huZ1WtNVdkWVJkeyctOot/Js5YGt3imud0e5hLZQ=="; + url = "https://registry.npmjs.org/coc-vimtex/-/coc-vimtex-1.0.4.tgz"; + sha512 = "gE04Ruk/7Of+jhVlWUT3M5xW5LEN24335rpSPHu7u1uzasuv9SsNehXbZpkj1SEYM4K7+5bw8NC+EFshuZm6Vw=="; }; buildInputs = globalBuildInputs; meta = { @@ -57881,7 +58349,7 @@ in sources."@nodelib/fs.stat-1.1.3" sources."@types/glob-7.1.3" sources."@types/minimatch-3.0.3" - sources."@types/node-14.0.23" + sources."@types/node-14.0.24" sources."abbrev-1.1.1" sources."accepts-1.3.7" sources."ajv-6.12.3" @@ -58182,7 +58650,7 @@ in sources."loud-rejection-2.2.0" sources."lowercase-keys-1.0.1" sources."lru-cache-4.1.5" - sources."macos-release-2.4.0" + sources."macos-release-2.4.1" sources."make-dir-1.3.0" sources."map-cache-0.2.2" sources."map-visit-1.0.0" @@ -58493,7 +58961,7 @@ in sources."@types/glob-7.1.3" sources."@types/minimatch-3.0.3" sources."@types/minimist-1.2.0" - sources."@types/node-14.0.23" + sources."@types/node-14.0.24" sources."@types/normalize-package-data-2.4.0" sources."aggregate-error-3.0.1" sources."ansi-styles-3.2.1" @@ -58861,7 +59329,7 @@ in sources."@cycle/run-3.4.0" sources."@cycle/time-0.10.1" sources."@types/cookiejar-2.1.1" - sources."@types/node-14.0.23" + sources."@types/node-14.0.24" sources."@types/superagent-3.8.2" sources."ansi-escapes-3.2.0" sources."ansi-regex-2.1.1" @@ -59393,7 +59861,7 @@ in sources."fast-json-stable-stringify-2.1.0" (sources."fd-lock-1.1.1" // { dependencies = [ - sources."node-gyp-build-4.2.2" + sources."node-gyp-build-4.2.3" ]; }) sources."fd-read-stream-1.1.0" @@ -59686,7 +60154,7 @@ in sources."sodium-javascript-0.5.6" (sources."sodium-native-2.4.9" // { dependencies = [ - sources."node-gyp-build-4.2.2" + sources."node-gyp-build-4.2.3" ]; }) sources."sodium-universal-2.0.0" @@ -59794,7 +60262,7 @@ in sources."utile-0.3.0" (sources."utp-native-2.2.1" // { dependencies = [ - sources."node-gyp-build-4.2.2" + sources."node-gyp-build-4.2.3" sources."readable-stream-3.6.0" sources."unordered-set-2.0.1" ]; @@ -59884,10 +60352,10 @@ in elasticdump = nodeEnv.buildNodePackage { name = "elasticdump"; packageName = "elasticdump"; - version = "6.32.0"; + version = "6.33.1"; src = fetchurl { - url = "https://registry.npmjs.org/elasticdump/-/elasticdump-6.32.0.tgz"; - sha512 = "l+9f1cBOZs1YZgApKXTOEIpIHJu+htPTGJmnHEquwPCQjjlPKE324iyl7GN0QvbJa/8NosX4XnLgWK4H9/7jWw=="; + url = "https://registry.npmjs.org/elasticdump/-/elasticdump-6.33.1.tgz"; + sha512 = "g+SeRgxjkNJjyqA2fKZsCcAQFMXSnPa9RXC5zggPT6D1YwJFndYfdHNXBg93gjc2c1P89DrvqZpdfCI6r9sQrw=="; }; dependencies = [ sources."JSONStream-1.3.5" @@ -59896,7 +60364,7 @@ in sources."assert-plus-1.0.0" sources."async-2.6.3" sources."asynckit-0.4.0" - sources."aws-sdk-2.715.0" + sources."aws-sdk-2.718.0" sources."aws-sign2-0.7.0" sources."aws4-1.10.0" sources."base64-js-1.3.1" @@ -59950,7 +60418,7 @@ in sources."minimist-1.2.5" sources."oauth-sign-0.9.0" sources."p-finally-1.0.0" - sources."p-queue-6.5.0" + sources."p-queue-6.6.0" sources."p-timeout-3.2.0" sources."performance-now-2.1.0" sources."process-nextick-args-2.0.1" @@ -60075,7 +60543,7 @@ in sources."@types/http-cache-semantics-4.0.0" sources."@types/keyv-3.1.1" sources."@types/minimist-1.2.0" - sources."@types/node-14.0.23" + sources."@types/node-14.0.24" sources."@types/normalize-package-data-2.4.0" sources."@types/responselike-1.0.0" sources."@types/yoga-layout-1.9.2" @@ -60919,7 +61387,7 @@ in sources."human-signals-1.1.1" sources."iconv-lite-0.4.24" sources."indent-string-4.0.0" - (sources."inquirer-7.3.2" // { + (sources."inquirer-7.3.3" // { dependencies = [ sources."chalk-4.1.0" ]; @@ -61516,7 +61984,7 @@ in sources."is-canonical-base64-1.1.1" sources."is-electron-2.2.0" sources."is-my-ip-valid-1.0.0" - sources."is-my-json-valid-2.20.4" + sources."is-my-json-valid-2.20.5" sources."is-property-1.0.2" sources."is-valid-domain-0.0.14" sources."json-buffer-2.0.11" @@ -61542,12 +62010,12 @@ in sources."muxrpc-6.5.0" sources."nan-2.14.1" sources."nearley-2.19.5" - sources."node-gyp-build-4.2.2" + sources."node-gyp-build-4.2.3" sources."node-polyglot-1.0.0" sources."non-private-ip-1.4.4" sources."options-0.0.6" sources."os-homedir-1.0.2" - sources."packet-stream-2.0.4" + sources."packet-stream-2.0.5" sources."packet-stream-codec-1.1.2" sources."pako-1.0.11" sources."private-box-0.3.1" @@ -61799,7 +62267,7 @@ in sources."imurmurhash-0.1.4" sources."indent-string-4.0.0" sources."ini-1.3.5" - sources."inquirer-7.3.2" + sources."inquirer-7.3.3" (sources."inquirer-autocomplete-prompt-1.0.2" // { dependencies = [ sources."ansi-escapes-3.2.0" @@ -61991,32 +62459,32 @@ in sources."@babel/runtime-7.10.5" sources."@graphql-cli/common-4.0.0" sources."@graphql-cli/init-4.0.0" - sources."@graphql-tools/delegate-6.0.14" - (sources."@graphql-tools/graphql-file-loader-6.0.14" // { + sources."@graphql-tools/delegate-6.0.15" + (sources."@graphql-tools/graphql-file-loader-6.0.15" // { dependencies = [ sources."fs-extra-9.0.1" ]; }) - (sources."@graphql-tools/import-6.0.14" // { + (sources."@graphql-tools/import-6.0.15" // { dependencies = [ sources."fs-extra-9.0.1" ]; }) - (sources."@graphql-tools/json-file-loader-6.0.14" // { + (sources."@graphql-tools/json-file-loader-6.0.15" // { dependencies = [ sources."fs-extra-9.0.1" ]; }) - sources."@graphql-tools/load-6.0.14" - sources."@graphql-tools/merge-6.0.14" - sources."@graphql-tools/schema-6.0.14" - (sources."@graphql-tools/url-loader-6.0.14" // { + sources."@graphql-tools/load-6.0.15" + sources."@graphql-tools/merge-6.0.15" + sources."@graphql-tools/schema-6.0.15" + (sources."@graphql-tools/url-loader-6.0.15" // { dependencies = [ sources."cross-fetch-3.0.5" ]; }) - sources."@graphql-tools/utils-6.0.14" - sources."@graphql-tools/wrap-6.0.14" + sources."@graphql-tools/utils-6.0.15" + sources."@graphql-tools/wrap-6.0.15" sources."@kwsites/exec-p-0.4.0" sources."@nodelib/fs.scandir-2.1.3" sources."@nodelib/fs.stat-2.0.3" @@ -62024,7 +62492,7 @@ in sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" sources."@types/color-name-1.1.1" - sources."@types/node-14.0.23" + sources."@types/node-14.0.24" sources."@types/parse-json-4.0.0" sources."@types/websocket-1.0.1" sources."aggregate-error-3.0.1" @@ -62367,7 +62835,7 @@ in sources."qs-6.5.2" sources."rc-1.2.8" sources."reftools-1.1.3" - sources."regenerator-runtime-0.13.5" + sources."regenerator-runtime-0.13.7" sources."regexp.prototype.flags-1.3.0" sources."registry-auth-token-4.2.0" sources."registry-url-5.1.0" @@ -62864,7 +63332,11 @@ in sources."ansi-gray-0.1.1" sources."ansi-regex-2.1.1" sources."ansi-wrap-0.1.0" - sources."anymatch-2.0.0" + (sources."anymatch-2.0.0" // { + dependencies = [ + sources."normalize-path-2.1.1" + ]; + }) sources."append-buffer-1.0.2" sources."archy-1.0.0" sources."arr-diff-4.0.0" @@ -62914,11 +63386,7 @@ in sources."buffer-from-1.1.1" sources."cache-base-1.0.1" sources."camelcase-3.0.0" - (sources."chokidar-2.1.8" // { - dependencies = [ - sources."normalize-path-3.0.0" - ]; - }) + sources."chokidar-2.1.8" (sources."class-utils-0.3.6" // { dependencies = [ sources."define-property-0.2.5" @@ -63037,7 +63505,7 @@ in ]; }) sources."glob-stream-6.1.0" - sources."glob-watcher-5.0.3" + sources."glob-watcher-5.0.5" sources."global-modules-1.0.0" sources."global-prefix-1.0.2" sources."glogg-1.0.2" @@ -63115,7 +63583,7 @@ in sources."nanomatch-1.2.13" sources."next-tick-1.0.0" sources."normalize-package-data-2.5.0" - sources."normalize-path-2.1.1" + sources."normalize-path-3.0.0" sources."now-and-later-2.0.1" sources."number-is-nan-1.0.1" (sources."object-copy-0.1.0" // { @@ -63291,7 +63759,11 @@ in sources."value-or-function-3.0.0" sources."vinyl-2.2.0" sources."vinyl-fs-3.0.3" - sources."vinyl-sourcemap-1.1.0" + (sources."vinyl-sourcemap-1.1.0" // { + dependencies = [ + sources."normalize-path-2.1.1" + ]; + }) sources."which-1.3.1" sources."which-module-1.0.0" sources."wrap-ansi-2.1.0" @@ -63830,7 +64302,7 @@ in sources."mkdirp-0.5.5" sources."ms-2.1.2" sources."opener-1.5.1" - sources."portfinder-1.0.26" + sources."portfinder-1.0.27" sources."qs-6.9.4" sources."requires-port-1.0.0" sources."secure-compare-3.0.1" @@ -64182,7 +64654,7 @@ in sources."imurmurhash-0.1.4" sources."inflight-1.0.6" sources."inherits-2.0.4" - (sources."inquirer-7.3.2" // { + (sources."inquirer-7.3.3" // { dependencies = [ sources."ansi-escapes-4.3.1" sources."ansi-styles-4.2.1" @@ -64231,7 +64703,7 @@ in ]; }) sources."lru-cache-5.1.1" - sources."macos-release-2.4.0" + sources."macos-release-2.4.1" sources."methods-1.1.2" sources."mime-2.4.6" sources."mime-db-1.44.0" @@ -64253,7 +64725,7 @@ in }) sources."once-1.4.0" sources."onetime-2.0.1" - sources."open-7.0.4" + sources."open-7.1.0" sources."optionator-0.8.3" sources."os-name-3.1.0" sources."os-tmpdir-1.0.2" @@ -65435,8 +65907,8 @@ in sources."tough-cookie-2.5.0" ]; }) - sources."request-promise-core-1.1.3" - (sources."request-promise-native-1.0.8" // { + sources."request-promise-core-1.1.4" + (sources."request-promise-native-1.0.9" // { dependencies = [ sources."tough-cookie-2.5.0" ]; @@ -65537,7 +66009,7 @@ in sources."statuses-1.5.0" sources."stealthy-require-1.1.1" sources."strict-uri-encode-1.1.0" - sources."string-kit-0.11.7" + sources."string-kit-0.11.8" sources."string-padding-1.0.2" (sources."string-to-stream-1.1.1" // { dependencies = [ @@ -65584,7 +66056,7 @@ in sources."q-0.9.7" ]; }) - sources."terminal-kit-1.37.0" + sources."terminal-kit-1.41.0" (sources."tkwidgets-0.5.26" // { dependencies = [ sources."is-fullwidth-code-point-2.0.0" @@ -65750,10 +66222,10 @@ in jsdoc = nodeEnv.buildNodePackage { name = "jsdoc"; packageName = "jsdoc"; - version = "3.6.4"; + version = "3.6.5"; src = fetchurl { - url = "https://registry.npmjs.org/jsdoc/-/jsdoc-3.6.4.tgz"; - sha512 = "3G9d37VHv7MFdheviDCjUfQoIjdv4TC5zTTf5G9VODLtOnVS6La1eoYBDlbWfsRT3/Xo+j2MIqki2EV12BZfwA=="; + url = "https://registry.npmjs.org/jsdoc/-/jsdoc-3.6.5.tgz"; + sha512 = "SbY+i9ONuxSK35cgVHaI8O9senTE4CDYAmGSDJ5l3+sfe62Ff4gy96osy6OW84t4K4A8iGnMrlRrsSItSNp3RQ=="; }; dependencies = [ sources."@babel/parser-7.10.5" @@ -66912,9 +67384,9 @@ in sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.stat-1.1.3" sources."@octokit/auth-token-2.4.2" - (sources."@octokit/endpoint-6.0.4" // { + (sources."@octokit/endpoint-6.0.5" // { dependencies = [ - sources."is-plain-object-3.0.1" + sources."is-plain-object-4.1.0" sources."universal-user-agent-6.0.0" ]; }) @@ -66930,10 +67402,10 @@ in sources."@octokit/types-2.16.2" ]; }) - (sources."@octokit/request-5.4.6" // { + (sources."@octokit/request-5.4.7" // { dependencies = [ sources."@octokit/request-error-2.0.2" - sources."is-plain-object-3.0.1" + sources."is-plain-object-4.1.0" sources."universal-user-agent-6.0.0" ]; }) @@ -66943,11 +67415,11 @@ in ]; }) sources."@octokit/rest-16.43.2" - sources."@octokit/types-5.1.0" + sources."@octokit/types-5.1.1" sources."@types/glob-7.1.3" sources."@types/minimatch-3.0.3" sources."@types/minimist-1.2.0" - sources."@types/node-14.0.23" + sources."@types/node-14.0.24" sources."@types/normalize-package-data-2.4.0" sources."@zkochan/cmd-shim-3.1.0" sources."JSONStream-1.3.5" @@ -67138,7 +67610,7 @@ in sources."encoding-0.1.13" sources."end-of-stream-1.4.4" sources."env-paths-2.2.0" - sources."envinfo-7.5.1" + sources."envinfo-7.7.2" sources."err-code-1.1.2" sources."error-ex-1.3.2" sources."es-abstract-1.17.6" @@ -67412,7 +67884,7 @@ in sources."lodash.uniq-4.5.0" sources."loud-rejection-1.6.0" sources."lru-cache-5.1.1" - sources."macos-release-2.4.0" + sources."macos-release-2.4.1" sources."make-dir-1.3.0" sources."make-fetch-happen-5.0.2" sources."map-cache-0.2.2" @@ -68855,7 +69327,7 @@ in sources."@types/istanbul-lib-report-3.0.0" sources."@types/istanbul-reports-1.1.2" sources."@types/json-schema-7.0.5" - sources."@types/node-14.0.23" + sources."@types/node-14.0.24" sources."@types/normalize-package-data-2.4.0" sources."@types/resolve-0.0.8" sources."@types/yargs-15.0.5" @@ -69036,7 +69508,7 @@ in sources."cache-base-1.0.1" sources."cached-path-relative-1.0.2" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001103" + sources."caniuse-lite-1.0.30001105" sources."capture-exit-2.0.0" sources."caseless-0.12.0" (sources."chalk-3.0.0" // { @@ -69158,7 +69630,7 @@ in sources."duplexer2-0.1.4" sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" - sources."electron-to-chromium-1.3.501" + sources."electron-to-chromium-1.3.504" (sources."elliptic-6.5.3" // { dependencies = [ sources."bn.js-4.11.9" @@ -69451,7 +69923,7 @@ in (sources."node-libs-browser-2.2.1" // { dependencies = [ sources."buffer-4.9.2" - sources."events-3.1.0" + sources."events-3.2.0" sources."inherits-2.0.3" sources."punycode-1.4.1" sources."stream-http-2.8.3" @@ -69461,7 +69933,7 @@ in ]; }) sources."node-modules-regexp-1.0.0" - sources."node-releases-1.1.59" + sources."node-releases-1.1.60" sources."normalize-package-data-2.5.0" sources."normalize-path-3.0.0" sources."npm-run-path-2.0.2" @@ -69558,7 +70030,7 @@ in sources."realpath-native-2.0.0" sources."regenerate-1.4.1" sources."regenerate-unicode-properties-8.2.0" - sources."regenerator-runtime-0.13.5" + sources."regenerator-runtime-0.13.7" sources."regenerator-transform-0.14.5" sources."regex-not-1.0.2" sources."regexpu-core-4.7.0" @@ -70136,7 +70608,7 @@ in sources."interpret-1.4.0" sources."is-fullwidth-code-point-1.0.0" sources."is-my-ip-valid-1.0.0" - sources."is-my-json-valid-2.20.4" + sources."is-my-json-valid-2.20.5" sources."is-property-1.0.2" sources."is-resolvable-1.1.0" sources."is-typedarray-1.0.0" @@ -71472,10 +71944,10 @@ in node-gyp-build = nodeEnv.buildNodePackage { name = "node-gyp-build"; packageName = "node-gyp-build"; - version = "4.2.2"; + version = "4.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.2.2.tgz"; - sha512 = "Lqh7mrByWCM8Cf9UPqpeoVBBo5Ugx+RKu885GAzmLBVYjeywScxHXPGLa4JfYNZmcNGwzR0Glu5/9GaQZMFqyA=="; + url = "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.2.3.tgz"; + sha512 = "MN6ZpzmfNCRM+3t57PTJHgHyw/h4OWnZ6mR8P5j/uZtqQr46RRuDE/P+g3n0YR/AiYXeWixZZzaip77gdICfRg=="; }; buildInputs = globalBuildInputs; meta = { @@ -72259,7 +72731,7 @@ in sources."rc-1.2.8" sources."read-1.0.7" sources."readable-stream-3.6.0" - sources."regenerator-runtime-0.13.5" + sources."regenerator-runtime-0.13.7" sources."reinterval-1.1.0" sources."remove-trailing-separator-1.1.0" (sources."request-2.88.0" // { @@ -72728,10 +73200,10 @@ in npm = nodeEnv.buildNodePackage { name = "npm"; packageName = "npm"; - version = "6.14.6"; + version = "6.14.7"; src = fetchurl { - url = "https://registry.npmjs.org/npm/-/npm-6.14.6.tgz"; - sha512 = "axnz6iHFK6WPE0js/+mRp+4IOwpHn5tJEw5KB6FiCU764zmffrhsYHbSHi2kKqNkRBt53XasXjngZfBD3FQzrQ=="; + url = "https://registry.npmjs.org/npm/-/npm-6.14.7.tgz"; + sha512 = "swhsdpNpyXg4GbM6LpOQ6qaloQuIKizZ+Zh6JPXJQc59ka49100Js0WvZx594iaKSoFgkFq2s8uXFHS3/Xy2WQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -72931,7 +73403,7 @@ in sources."semver-6.3.0" ]; }) - sources."make-fetch-happen-8.0.8" + sources."make-fetch-happen-8.0.9" sources."mime-db-1.44.0" sources."mime-types-2.1.27" sources."mimic-response-1.0.1" @@ -72939,7 +73411,7 @@ in sources."minimist-1.2.5" sources."minipass-3.1.3" sources."minipass-collect-1.0.2" - (sources."minipass-fetch-1.2.1" // { + (sources."minipass-fetch-1.3.0" // { dependencies = [ sources."minizlib-2.1.0" ]; @@ -72978,7 +73450,7 @@ in sources."npm-package-arg-8.0.1" sources."npm-packlist-2.1.2" sources."npm-pick-manifest-6.1.0" - (sources."npm-registry-fetch-8.1.2" // { + (sources."npm-registry-fetch-8.1.3" // { dependencies = [ sources."minizlib-2.1.0" ]; @@ -73001,7 +73473,7 @@ in sources."semver-6.3.0" ]; }) - sources."pacote-11.1.10" + sources."pacote-11.1.11" sources."path-exists-4.0.0" sources."path-is-absolute-1.0.1" sources."path-parse-1.0.6" @@ -73551,7 +74023,7 @@ in sources."caller-path-2.0.0" sources."callsites-2.0.0" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001103" + sources."caniuse-lite-1.0.30001105" sources."caseless-0.12.0" sources."chalk-2.4.2" sources."chokidar-2.1.8" @@ -73613,7 +74085,7 @@ in }) sources."css-select-2.1.0" sources."css-select-base-adapter-0.1.1" - sources."css-selector-tokenizer-0.7.2" + sources."css-selector-tokenizer-0.7.3" sources."css-tree-1.0.0-alpha.37" sources."css-what-3.3.0" sources."cssesc-3.0.0" @@ -73685,7 +74157,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.501" + sources."electron-to-chromium-1.3.504" (sources."elliptic-6.5.3" // { dependencies = [ sources."bn.js-4.11.9" @@ -73693,7 +74165,7 @@ in }) sources."encodeurl-1.0.2" sources."entities-1.1.2" - sources."envinfo-7.5.1" + sources."envinfo-7.7.2" sources."error-ex-1.3.2" (sources."es-abstract-1.17.6" // { dependencies = [ @@ -73709,7 +74181,7 @@ in sources."estraverse-4.3.0" sources."esutils-2.0.3" sources."etag-1.8.1" - sources."events-3.1.0" + sources."events-3.2.0" sources."evp_bytestokey-1.0.3" (sources."expand-brackets-2.1.4" // { dependencies = [ @@ -73940,7 +74412,7 @@ in sources."punycode-1.4.1" ]; }) - sources."node-releases-1.1.59" + sources."node-releases-1.1.60" sources."normalize-html-whitespace-1.0.0" sources."normalize-path-3.0.0" sources."normalize-url-3.3.0" @@ -74079,7 +74551,7 @@ in sources."readdirp-2.2.1" sources."regenerate-1.4.1" sources."regenerate-unicode-properties-8.2.0" - sources."regenerator-runtime-0.13.5" + sources."regenerator-runtime-0.13.7" sources."regenerator-transform-0.14.5" (sources."regex-not-1.0.2" // { dependencies = [ @@ -74098,8 +74570,8 @@ in sources."repeat-element-1.1.3" sources."repeat-string-1.6.1" sources."request-2.88.2" - sources."request-promise-core-1.1.3" - sources."request-promise-native-1.0.8" + sources."request-promise-core-1.1.4" + sources."request-promise-native-1.0.9" sources."resolve-1.17.0" sources."resolve-from-3.0.0" sources."resolve-url-0.2.1" @@ -75254,10 +75726,10 @@ in pnpm = nodeEnv.buildNodePackage { name = "pnpm"; packageName = "pnpm"; - version = "5.4.0"; + version = "5.4.3"; src = fetchurl { - url = "https://registry.npmjs.org/pnpm/-/pnpm-5.4.0.tgz"; - sha512 = "qdNKfChd8TfSje29oDsYzVRg1eWhKbvgQR82QL9gc3d4abNRc4Z4EKsGVblezSCu8RUdVXsT2h/AQgJ5DZpBgQ=="; + url = "https://registry.npmjs.org/pnpm/-/pnpm-5.4.3.tgz"; + sha512 = "Q9H70UBLnTJT8ikESW4ERC1/Yz7nPj1OmJbzNwuVcKVRHNMzSDTEBWjt0a3WFXsHi4Cfwd9gtBppTvY8lmkN/A=="; }; buildInputs = globalBuildInputs; meta = { @@ -75743,10 +76215,10 @@ in purescript-language-server = nodeEnv.buildNodePackage { name = "purescript-language-server"; packageName = "purescript-language-server"; - version = "0.13.2"; + version = "0.13.5"; src = fetchurl { - url = "https://registry.npmjs.org/purescript-language-server/-/purescript-language-server-0.13.2.tgz"; - sha512 = "m8Jb+PfODoyi8fzz50ckK+gYCxNIDuG0URe98lp1v4SkR5cxt9FHVEJayy75d3E4rhsghB+TxJ90ngjZWOGp5w=="; + url = "https://registry.npmjs.org/purescript-language-server/-/purescript-language-server-0.13.5.tgz"; + sha512 = "4Q0xNmAUBXJnoYJAe48nl0VAJm0gWqMbNDaXRR4XWwMike4AfFbPankC6uAVtSm7BabRJ0+hPD6ba+wiy1lPDw=="; }; dependencies = [ sources."isexe-2.0.0" @@ -75807,10 +76279,10 @@ in pyright = nodeEnv.buildNodePackage { name = "pyright"; packageName = "pyright"; - version = "1.1.54"; + version = "1.1.55"; src = fetchurl { - url = "https://registry.npmjs.org/pyright/-/pyright-1.1.54.tgz"; - sha512 = "IGNhLdclyqCQ7sOFsJVD98Qj0tvKKhigh2IRpFrUd/JYvWKZZM58KIif060qRYcZ3SibweO5hEGgae8hk4zL3g=="; + url = "https://registry.npmjs.org/pyright/-/pyright-1.1.55.tgz"; + sha512 = "sIcjNNfazzwyjUxx7pUS52W3oaxY6j6GnpyV8x0o3e6lqmLa2eU76QuVpx2jl87Zk9YG2o2EKXZEUWyHd87o3A=="; }; buildInputs = globalBuildInputs; meta = { @@ -75974,6 +76446,411 @@ in bypassCache = true; reconstructLock = true; }; + redoc-cli = nodeEnv.buildNodePackage { + name = "redoc-cli"; + packageName = "redoc-cli"; + version = "0.9.8"; + src = fetchurl { + url = "https://registry.npmjs.org/redoc-cli/-/redoc-cli-0.9.8.tgz"; + sha512 = "JW7krzhX+P3qSjTvBMpTRjX/JHrnvHeIWcpZB4RaaC0qTL/DwcgA+IJNpiQ0+jV+bkHaPjHcT0T4pjWh+5VTaw=="; + }; + dependencies = [ + sources."@babel/code-frame-7.10.4" + (sources."@babel/generator-7.10.5" // { + dependencies = [ + sources."source-map-0.5.7" + ]; + }) + sources."@babel/helper-annotate-as-pure-7.10.4" + sources."@babel/helper-function-name-7.10.4" + sources."@babel/helper-get-function-arity-7.10.4" + sources."@babel/helper-module-imports-7.10.4" + sources."@babel/helper-split-export-declaration-7.10.4" + sources."@babel/helper-validator-identifier-7.10.4" + sources."@babel/highlight-7.10.4" + sources."@babel/parser-7.10.5" + sources."@babel/runtime-7.10.5" + sources."@babel/template-7.10.4" + sources."@babel/traverse-7.10.5" + sources."@babel/types-7.10.5" + sources."@emotion/is-prop-valid-0.8.8" + sources."@emotion/memoize-0.7.4" + sources."@emotion/unitless-0.7.5" + sources."@types/color-name-1.1.1" + sources."@types/node-13.13.14" + sources."ajv-5.5.2" + sources."ansi-regex-5.0.0" + sources."ansi-styles-3.2.1" + sources."anymatch-3.1.1" + sources."argparse-1.0.10" + (sources."asn1.js-4.10.1" // { + dependencies = [ + sources."bn.js-4.11.9" + ]; + }) + (sources."assert-1.5.0" // { + dependencies = [ + sources."util-0.10.3" + ]; + }) + sources."babel-plugin-styled-components-1.10.7" + sources."babel-plugin-syntax-jsx-6.18.0" + sources."base64-js-1.3.1" + sources."better-ajv-errors-0.6.7" + sources."binary-extensions-2.1.0" + sources."bn.js-5.1.2" + sources."braces-3.0.2" + sources."brorand-1.1.0" + sources."browserify-aes-1.2.0" + sources."browserify-cipher-1.0.1" + sources."browserify-des-1.0.2" + (sources."browserify-rsa-4.0.1" // { + dependencies = [ + sources."bn.js-4.11.9" + ]; + }) + (sources."browserify-sign-4.2.0" // { + dependencies = [ + sources."inherits-2.0.4" + sources."readable-stream-3.6.0" + ]; + }) + sources."browserify-zlib-0.2.0" + (sources."buffer-4.9.2" // { + dependencies = [ + sources."isarray-1.0.0" + ]; + }) + sources."buffer-xor-1.0.3" + sources."builtin-status-codes-3.0.0" + sources."call-me-maybe-1.0.1" + sources."camelcase-5.3.1" + sources."camelize-1.0.0" + sources."chalk-2.4.2" + sources."chokidar-3.4.1" + sources."cipher-base-1.0.4" + sources."classnames-2.2.6" + sources."clipboard-2.0.6" + sources."cliui-6.0.0" + sources."clsx-1.1.1" + sources."co-4.6.0" + sources."code-error-fragment-0.0.230" + sources."code-point-at-1.1.0" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + sources."console-browserify-1.2.0" + sources."constants-browserify-1.0.0" + sources."core-js-3.6.5" + sources."core-util-is-1.0.2" + (sources."create-ecdh-4.0.3" // { + dependencies = [ + sources."bn.js-4.11.9" + ]; + }) + sources."create-hash-1.2.0" + sources."create-hmac-1.1.7" + sources."cross-spawn-6.0.5" + sources."crypto-browserify-3.12.0" + sources."css-color-keywords-1.0.0" + sources."css-to-react-native-2.3.2" + sources."debug-4.2.0" + sources."decamelize-1.2.0" + sources."decko-1.2.0" + sources."delegate-3.2.0" + sources."des.js-1.0.1" + (sources."diffie-hellman-5.0.3" // { + dependencies = [ + sources."bn.js-4.11.9" + ]; + }) + sources."domain-browser-1.2.0" + sources."dompurify-2.0.12" + (sources."elliptic-6.5.3" // { + dependencies = [ + sources."bn.js-4.11.9" + ]; + }) + sources."emoji-regex-8.0.0" + sources."end-of-stream-1.4.4" + sources."es6-promise-3.3.1" + sources."escape-string-regexp-1.0.5" + sources."esprima-4.0.1" + sources."eventemitter3-4.0.4" + sources."events-3.2.0" + sources."evp_bytestokey-1.0.3" + sources."execa-1.0.0" + sources."fast-deep-equal-1.1.0" + sources."fast-json-stable-stringify-2.1.0" + sources."fast-safe-stringify-2.0.7" + sources."fill-range-7.0.1" + sources."find-up-4.1.0" + sources."foreach-2.0.5" + sources."format-util-1.0.5" + sources."fsevents-2.1.3" + sources."get-caller-file-2.0.5" + sources."get-stream-4.1.0" + sources."glob-parent-5.1.1" + sources."globals-11.12.0" + sources."good-listener-1.2.2" + sources."grapheme-splitter-1.0.4" + sources."handlebars-4.7.6" + sources."has-flag-3.0.0" + (sources."hash-base-3.1.0" // { + dependencies = [ + sources."inherits-2.0.4" + sources."readable-stream-3.6.0" + ]; + }) + (sources."hash.js-1.1.7" // { + dependencies = [ + sources."inherits-2.0.4" + ]; + }) + sources."hmac-drbg-1.0.1" + sources."http2-client-1.3.3" + sources."https-browserify-1.0.0" + sources."ieee754-1.1.13" + sources."inherits-2.0.1" + sources."invert-kv-2.0.0" + sources."is-binary-path-2.1.0" + sources."is-extglob-2.1.1" + sources."is-fullwidth-code-point-3.0.0" + sources."is-glob-4.0.1" + sources."is-number-7.0.0" + sources."is-stream-1.1.0" + sources."is-what-3.10.0" + sources."isarray-2.0.5" + sources."isexe-2.0.0" + sources."js-tokens-4.0.0" + sources."js-yaml-3.14.0" + sources."jsesc-2.5.2" + sources."json-pointer-0.6.0" + sources."json-schema-ref-parser-6.1.0" + sources."json-schema-traverse-0.3.1" + sources."json-to-ast-2.1.0" + sources."jsonpointer-4.1.0" + sources."lcid-2.0.0" + sources."leven-3.1.0" + sources."locate-path-5.0.0" + sources."lodash-4.17.19" + sources."loose-envify-1.4.0" + sources."lunr-2.3.8" + sources."map-age-cleaner-0.1.3" + sources."mark.js-8.11.1" + sources."marked-0.7.0" + sources."md5.js-1.3.5" + sources."mem-4.3.0" + sources."memoize-one-5.1.1" + sources."merge-anything-2.4.4" + (sources."miller-rabin-4.0.1" // { + dependencies = [ + sources."bn.js-4.11.9" + ]; + }) + sources."mimic-fn-2.1.0" + sources."minimalistic-assert-1.0.1" + sources."minimalistic-crypto-utils-1.0.1" + sources."minimist-1.2.5" + sources."mkdirp-0.5.5" + sources."mobx-4.15.4" + sources."mobx-react-6.1.5" + sources."mobx-react-lite-1.5.2" + sources."ms-2.1.2" + sources."neo-async-2.6.2" + sources."nice-try-1.0.5" + sources."node-fetch-h2-2.3.0" + sources."node-libs-browser-2.2.1" + sources."node-readfiles-0.2.0" + sources."normalize-path-3.0.0" + sources."npm-run-path-2.0.2" + sources."number-is-nan-1.0.1" + sources."oas-kit-common-1.0.8" + sources."oas-linter-3.1.3" + (sources."oas-resolver-2.4.1" // { + dependencies = [ + sources."yargs-15.4.1" + ]; + }) + sources."oas-schema-walker-1.1.4" + sources."oas-validator-3.4.0" + sources."object-assign-4.1.1" + sources."once-1.4.0" + sources."ono-4.0.11" + sources."openapi-sampler-1.0.0-beta.15" + sources."os-browserify-0.3.0" + sources."os-locale-3.1.0" + sources."p-defer-1.0.0" + sources."p-finally-1.0.0" + sources."p-is-promise-2.1.0" + sources."p-limit-2.3.0" + sources."p-locate-4.1.0" + sources."p-try-2.2.0" + sources."pako-1.0.11" + sources."parse-asn1-5.1.5" + sources."path-browserify-0.0.1" + sources."path-exists-4.0.0" + sources."path-key-2.0.1" + sources."pbkdf2-3.1.1" + sources."perfect-scrollbar-1.5.0" + sources."picomatch-2.2.2" + sources."polished-3.6.5" + sources."postcss-value-parser-3.3.1" + sources."prismjs-1.20.0" + sources."process-0.11.10" + sources."process-nextick-args-2.0.1" + sources."prop-types-15.7.2" + (sources."public-encrypt-4.0.3" // { + dependencies = [ + sources."bn.js-4.11.9" + ]; + }) + sources."pump-3.0.0" + sources."punycode-1.4.1" + sources."querystring-0.2.0" + sources."querystring-es3-0.2.1" + sources."randombytes-2.1.0" + sources."randomfill-1.0.4" + sources."react-16.13.1" + sources."react-dom-16.13.1" + sources."react-dropdown-1.7.0" + sources."react-is-16.13.1" + sources."react-tabs-3.1.1" + (sources."readable-stream-2.3.7" // { + dependencies = [ + sources."inherits-2.0.4" + sources."isarray-1.0.0" + sources."safe-buffer-5.1.2" + sources."string_decoder-1.1.1" + ]; + }) + sources."readdirp-3.4.0" + sources."redoc-2.0.0-rc.29" + sources."reftools-1.1.3" + sources."regenerator-runtime-0.13.7" + sources."require-directory-2.1.1" + sources."require-main-filename-2.0.0" + sources."ripemd160-2.0.2" + sources."safe-buffer-5.2.1" + sources."scheduler-0.19.1" + sources."select-1.1.2" + sources."semver-5.7.1" + sources."set-blocking-2.0.0" + sources."setimmediate-1.0.5" + sources."sha.js-2.4.11" + sources."shebang-command-1.2.0" + sources."shebang-regex-1.0.0" + sources."should-13.2.3" + sources."should-equal-2.0.0" + sources."should-format-3.0.3" + sources."should-type-1.4.0" + sources."should-type-adaptors-1.1.0" + sources."should-util-1.0.1" + sources."signal-exit-3.0.3" + sources."slugify-1.4.4" + sources."source-map-0.6.1" + sources."sprintf-js-1.0.3" + sources."stickyfill-1.1.1" + sources."stream-browserify-2.0.2" + sources."stream-http-2.8.3" + sources."string-width-4.2.0" + sources."string_decoder-1.3.0" + sources."strip-ansi-6.0.0" + sources."strip-eof-1.0.0" + sources."styled-components-4.4.1" + sources."stylis-3.5.4" + sources."stylis-rule-sheet-0.0.10" + sources."supports-color-5.5.0" + (sources."swagger2openapi-5.4.0" // { + dependencies = [ + sources."ansi-regex-3.0.0" + sources."cliui-4.1.0" + sources."find-up-3.0.0" + sources."get-caller-file-1.0.3" + sources."is-fullwidth-code-point-1.0.0" + sources."locate-path-3.0.0" + sources."p-locate-3.0.0" + sources."path-exists-3.0.0" + sources."require-main-filename-1.0.1" + (sources."string-width-2.1.1" // { + dependencies = [ + sources."is-fullwidth-code-point-2.0.0" + ]; + }) + sources."strip-ansi-4.0.0" + (sources."wrap-ansi-2.1.0" // { + dependencies = [ + sources."ansi-regex-2.1.1" + sources."string-width-1.0.2" + sources."strip-ansi-3.0.1" + ]; + }) + sources."yargs-12.0.5" + sources."yargs-parser-11.1.1" + ]; + }) + sources."timers-browserify-2.0.11" + sources."tiny-emitter-2.1.0" + sources."to-arraybuffer-1.0.1" + sources."to-fast-properties-2.0.0" + sources."to-regex-range-5.0.1" + sources."tslib-1.13.0" + sources."tty-browserify-0.0.0" + sources."uglify-js-3.10.0" + (sources."url-0.11.0" // { + dependencies = [ + sources."punycode-1.3.2" + ]; + }) + sources."url-template-2.0.8" + (sources."util-0.11.1" // { + dependencies = [ + sources."inherits-2.0.3" + ]; + }) + sources."util-deprecate-1.0.2" + sources."vm-browserify-1.1.2" + sources."which-1.3.1" + sources."which-module-2.0.0" + sources."wordwrap-1.0.0" + (sources."wrap-ansi-6.2.0" // { + dependencies = [ + sources."ansi-styles-4.2.1" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + ]; + }) + sources."wrappy-1.0.2" + sources."xtend-4.0.2" + sources."y18n-4.0.0" + sources."yaml-1.10.0" + (sources."yargs-13.3.2" // { + dependencies = [ + sources."ansi-regex-4.1.0" + sources."cliui-5.0.0" + sources."emoji-regex-7.0.3" + sources."find-up-3.0.0" + sources."is-fullwidth-code-point-2.0.0" + sources."locate-path-3.0.0" + sources."p-locate-3.0.0" + sources."path-exists-3.0.0" + sources."string-width-3.1.0" + sources."strip-ansi-5.2.0" + sources."wrap-ansi-5.1.0" + sources."yargs-parser-13.1.2" + ]; + }) + sources."yargs-parser-18.1.3" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "ReDoc's Command Line Interface"; + homepage = "https://github.com/Redocly/redoc#readme"; + license = "MIT"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; "reveal.js" = nodeEnv.buildNodePackage { name = "reveal.js"; packageName = "reveal.js"; @@ -75995,10 +76872,10 @@ in rollup = nodeEnv.buildNodePackage { name = "rollup"; packageName = "rollup"; - version = "2.22.1"; + version = "2.22.2"; src = fetchurl { - url = "https://registry.npmjs.org/rollup/-/rollup-2.22.1.tgz"; - sha512 = "K9AUQUCJkVqC+A7uUDacfhmpEeAjc2uOmSpvGI5xaYsm8pXgy4ZWEM8wHPfKj11xvCwFZppkRDo8a0RESJXCnw=="; + url = "https://registry.npmjs.org/rollup/-/rollup-2.22.2.tgz"; + sha512 = "2a4Mch4f0W2lEvkPuxtz0GfrtfgLj9bdd/oC9L3LozGOCnmLqO7ivMfKbCJoRgqWIU2UqAcbxRFSwmIKx+uStA=="; }; dependencies = [ sources."fsevents-2.1.3" @@ -76040,20 +76917,20 @@ in sources."@types/node-fetch-2.5.7" sources."@types/resolve-1.17.1" sources."@types/vscode-1.47.0" - (sources."@typescript-eslint/eslint-plugin-3.6.1" // { + (sources."@typescript-eslint/eslint-plugin-3.7.0" // { dependencies = [ sources."semver-7.3.2" ]; }) - sources."@typescript-eslint/experimental-utils-3.6.1" - sources."@typescript-eslint/parser-3.6.1" - sources."@typescript-eslint/types-3.6.1" - (sources."@typescript-eslint/typescript-estree-3.6.1" // { + sources."@typescript-eslint/experimental-utils-3.7.0" + sources."@typescript-eslint/parser-3.7.0" + sources."@typescript-eslint/types-3.7.0" + (sources."@typescript-eslint/typescript-estree-3.7.0" // { dependencies = [ sources."semver-7.3.2" ]; }) - sources."@typescript-eslint/visitor-keys-3.6.1" + sources."@typescript-eslint/visitor-keys-3.7.0" sources."acorn-7.3.1" sources."acorn-jsx-5.2.0" sources."agent-base-4.3.0" @@ -76295,7 +77172,7 @@ in sources."resolve-1.17.0" sources."resolve-from-4.0.0" sources."rimraf-2.6.3" - sources."rollup-2.22.1" + sources."rollup-2.22.2" sources."safe-buffer-5.2.1" sources."semver-6.3.0" sources."serialize-javascript-3.0.0" @@ -76690,7 +77567,7 @@ in sources."@serverless/event-mocks-1.1.1" sources."@serverless/inquirer-1.1.2" sources."@serverless/platform-client-1.0.10" - (sources."@serverless/platform-client-china-1.0.26" // { + (sources."@serverless/platform-client-china-1.0.27" // { dependencies = [ sources."archiver-4.0.2" sources."async-3.2.0" @@ -76707,17 +77584,17 @@ in }) sources."@serverless/template-1.1.3" sources."@serverless/utils-1.2.0" - sources."@serverless/utils-china-0.1.18" + sources."@serverless/utils-china-0.1.19" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" sources."@tencent-sdk/capi-0.2.17" sources."@types/caseless-0.12.2" sources."@types/chalk-2.2.0" sources."@types/glob-7.1.3" - sources."@types/lodash-4.14.157" + sources."@types/lodash-4.14.158" sources."@types/long-4.0.1" sources."@types/minimatch-3.0.3" - sources."@types/node-14.0.23" + sources."@types/node-14.0.24" sources."@types/object-assign-4.0.30" sources."@types/request-2.48.5" sources."@types/request-promise-native-1.0.17" @@ -76786,7 +77663,7 @@ in sources."async-limiter-1.0.1" sources."asynckit-0.4.0" sources."atob-2.1.2" - (sources."aws-sdk-2.715.0" // { + (sources."aws-sdk-2.718.0" // { dependencies = [ sources."buffer-4.9.2" sources."isarray-1.0.0" @@ -76929,7 +77806,7 @@ in ]; }) sources."dashdash-1.14.1" - sources."dayjs-1.8.29" + sources."dayjs-1.8.30" sources."debug-3.1.0" sources."decamelize-1.2.0" sources."decode-uri-component-0.2.0" @@ -77430,7 +78307,7 @@ in sources."nanoid-2.1.11" sources."nanomatch-1.2.13" sources."native-promise-only-0.8.1" - sources."ncjsm-4.0.1" + sources."ncjsm-4.1.0" sources."next-tick-1.0.0" sources."nice-try-1.0.5" sources."node-dir-0.1.17" @@ -77468,7 +78345,7 @@ in sources."once-1.4.0" sources."one-time-0.0.4" sources."onetime-2.0.1" - (sources."open-7.0.4" // { + (sources."open-7.1.0" // { dependencies = [ sources."is-docker-2.0.0" ]; @@ -77538,7 +78415,7 @@ in sources."rc-1.2.8" sources."readable-stream-3.6.0" sources."readdirp-3.4.0" - sources."regenerator-runtime-0.13.5" + sources."regenerator-runtime-0.13.7" sources."regex-not-1.0.2" sources."registry-auth-token-4.2.0" sources."registry-url-5.1.0" @@ -77550,8 +78427,8 @@ in sources."form-data-2.3.3" ]; }) - sources."request-promise-core-1.1.3" - sources."request-promise-native-1.0.8" + sources."request-promise-core-1.1.4" + sources."request-promise-native-1.0.9" sources."requirejs-2.3.6" sources."requirejs-config-file-3.1.2" sources."resolve-1.17.0" @@ -78450,10 +79327,10 @@ in snyk = nodeEnv.buildNodePackage { name = "snyk"; packageName = "snyk"; - version = "1.362.1"; + version = "1.364.2"; src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.362.1.tgz"; - sha512 = "zMi1gcEiySvOyLWWXUJ8+Vc7Yz6NnHjuddUidc295P5SficdniC7gPFrjJFIki0d/CTS0fm4zi17usvPgnJy4A=="; + url = "https://registry.npmjs.org/snyk/-/snyk-1.364.2.tgz"; + sha512 = "fzJXS3wTSlSN9COYTZR+f+4+HGQljkIoJ72xrLCidZzla594fl7YMAVi5/vBfaHYYGLAlWp3bTse7UcpLUpz+Q=="; }; dependencies = [ sources."@arcanis/slice-ansi-1.0.2" @@ -78461,7 +79338,7 @@ in sources."@nodelib/fs.stat-2.0.3" sources."@nodelib/fs.walk-1.2.4" sources."@sindresorhus/is-3.0.0" - (sources."@snyk/cli-interface-2.8.0" // { + (sources."@snyk/cli-interface-2.8.1" // { dependencies = [ (sources."@snyk/dep-graph-1.19.0" // { dependencies = [ @@ -78486,13 +79363,9 @@ in sources."@snyk/gemfile-1.2.0" sources."@snyk/graphlib-2.1.9-patch" sources."@snyk/inquirer-6.2.2-patch" - sources."@snyk/java-call-graph-builder-1.10.0" + sources."@snyk/java-call-graph-builder-1.11.1" sources."@snyk/lodash-4.17.15-patch" - (sources."@snyk/rpm-parser-2.0.0" // { - dependencies = [ - sources."event-loop-spinner-2.0.0" - ]; - }) + sources."@snyk/rpm-parser-2.0.0" sources."@snyk/ruby-semver-2.2.0" (sources."@snyk/snyk-cocoapods-plugin-2.3.0" // { dependencies = [ @@ -78533,6 +79406,7 @@ in sources."color-name-1.1.4" sources."cross-spawn-7.0.3" sources."has-flag-4.0.0" + sources."mkdirp-0.5.5" sources."path-key-3.1.1" sources."semver-7.3.2" sources."shebang-command-2.0.0" @@ -78690,7 +79564,7 @@ in sources."esprima-4.0.1" sources."estraverse-4.3.0" sources."esutils-2.0.3" - sources."event-loop-spinner-1.1.0" + sources."event-loop-spinner-2.0.0" sources."execa-1.0.0" sources."extend-3.0.2" sources."external-editor-3.1.0" @@ -78796,17 +79670,31 @@ in sources."lodash.assignin-4.2.0" sources."lodash.clone-4.5.0" sources."lodash.clonedeep-4.5.0" + sources."lodash.constant-3.0.0" + sources."lodash.filter-4.6.0" sources."lodash.flatmap-4.5.0" sources."lodash.flatten-4.4.0" + sources."lodash.foreach-4.5.0" sources."lodash.get-4.4.2" + sources."lodash.has-4.5.2" + sources."lodash.isarray-4.0.0" sources."lodash.isempty-4.4.0" sources."lodash.isequal-4.5.0" + sources."lodash.isfunction-3.0.9" + sources."lodash.isundefined-3.0.1" + sources."lodash.keys-4.2.0" + sources."lodash.map-4.6.0" + sources."lodash.reduce-4.6.0" sources."lodash.set-4.3.2" + sources."lodash.size-4.2.0" sources."lodash.topairs-4.3.0" + sources."lodash.transform-4.6.0" + sources."lodash.union-4.6.0" + sources."lodash.values-4.3.0" sources."logic-solver-2.0.1" sources."lowercase-keys-2.0.0" sources."lru-cache-5.1.1" - sources."macos-release-2.4.0" + sources."macos-release-2.4.1" sources."make-dir-3.1.0" sources."merge2-1.4.1" sources."micromatch-4.0.2" @@ -78816,7 +79704,7 @@ in sources."minimist-1.2.5" sources."minipass-2.9.0" sources."minizlib-1.3.3" - sources."mkdirp-0.5.5" + sources."mkdirp-1.0.4" sources."ms-2.1.2" sources."mute-stream-0.0.7" sources."nconf-0.10.0" @@ -78836,7 +79724,7 @@ in sources."object.assign-4.1.0" sources."once-1.4.0" sources."onetime-2.0.1" - sources."open-7.0.4" + sources."open-7.1.0" sources."optionator-0.8.3" sources."os-locale-1.4.0" sources."os-name-3.1.0" @@ -78927,21 +79815,43 @@ in sources."slash-3.0.0" sources."smart-buffer-4.1.0" sources."snyk-config-3.1.0" - (sources."snyk-docker-plugin-3.13.1" // { + (sources."snyk-docker-plugin-3.16.0" // { dependencies = [ sources."rimraf-3.0.2" - sources."snyk-nodejs-lockfile-parser-1.22.0" + (sources."snyk-nodejs-lockfile-parser-1.22.0" // { + dependencies = [ + sources."event-loop-spinner-1.1.0" + sources."uuid-3.4.0" + ]; + }) sources."tmp-0.2.1" + sources."uuid-8.2.0" ]; }) sources."snyk-go-parser-1.4.1" - (sources."snyk-go-plugin-1.14.2" // { + (sources."snyk-go-plugin-1.16.0" // { dependencies = [ - sources."tmp-0.1.0" + (sources."@snyk/dep-graph-1.19.3" // { + dependencies = [ + sources."@snyk/graphlib-2.1.9-patch.2" + ]; + }) + sources."rimraf-3.0.2" + sources."tmp-0.2.0" ]; }) (sources."snyk-gradle-plugin-3.5.1" // { dependencies = [ + (sources."@snyk/cli-interface-2.8.0" // { + dependencies = [ + (sources."@snyk/dep-graph-1.19.0" // { + dependencies = [ + sources."tslib-2.0.0" + ]; + }) + sources."tslib-1.13.0" + ]; + }) sources."ansi-styles-4.2.1" sources."chalk-3.0.0" sources."color-convert-2.0.1" @@ -78954,18 +79864,13 @@ in ]; }) sources."snyk-module-3.1.0" - (sources."snyk-mvn-plugin-2.17.1" // { + (sources."snyk-mvn-plugin-2.17.3" // { dependencies = [ - sources."@snyk/cli-interface-2.5.0" sources."tmp-0.1.0" sources."tslib-1.11.1" ]; }) - (sources."snyk-nodejs-lockfile-parser-1.26.3" // { - dependencies = [ - sources."event-loop-spinner-2.0.0" - ]; - }) + sources."snyk-nodejs-lockfile-parser-1.26.3" (sources."snyk-nuget-plugin-1.18.1" // { dependencies = [ sources."jszip-3.3.0" @@ -79057,7 +79962,11 @@ in sources."strip-eof-1.0.0" sources."strip-json-comments-2.0.1" sources."supports-color-5.5.0" - sources."tar-4.4.13" + (sources."tar-4.4.13" // { + dependencies = [ + sources."mkdirp-0.5.5" + ]; + }) (sources."tar-stream-2.1.3" // { dependencies = [ sources."readable-stream-3.6.0" @@ -79819,7 +80728,7 @@ in sources."ncp-2.0.0" sources."nearley-2.19.5" sources."nice-try-1.0.5" - sources."node-gyp-build-4.2.2" + sources."node-gyp-build-4.2.3" sources."non-private-ip-1.4.4" sources."normalize-path-2.1.1" sources."normalize-uri-1.1.3" @@ -79866,7 +80775,7 @@ in sources."os-homedir-1.0.2" sources."os-tmpdir-1.0.2" sources."osenv-0.1.5" - sources."packet-stream-2.0.4" + sources."packet-stream-2.0.5" sources."packet-stream-codec-1.1.2" sources."parse-entities-1.2.2" sources."parse-glob-3.0.4" @@ -80336,7 +81245,7 @@ in sources."async-1.5.2" sources."async-limiter-1.0.1" sources."asynckit-0.4.0" - (sources."aws-sdk-2.715.0" // { + (sources."aws-sdk-2.718.0" // { dependencies = [ sources."uuid-3.3.2" ]; @@ -80593,7 +81502,7 @@ in }) sources."is-fullwidth-code-point-1.0.0" sources."is-my-ip-valid-1.0.0" - sources."is-my-json-valid-2.20.4" + sources."is-my-json-valid-2.20.5" sources."is-promise-2.2.2" sources."is-property-1.0.2" sources."is-regex-1.1.0" @@ -83014,7 +83923,7 @@ in sources."@types/debug-4.1.5" sources."@types/http-cache-semantics-4.0.0" sources."@types/keyv-3.1.1" - sources."@types/node-14.0.23" + sources."@types/node-14.0.24" sources."@types/responselike-1.0.0" sources."abbrev-1.1.1" sources."abstract-logging-1.0.0" @@ -83317,7 +84226,7 @@ in sources."read-chunk-3.2.0" sources."readable-stream-3.6.0" sources."readable-web-to-node-stream-2.0.0" - sources."regenerator-runtime-0.13.5" + sources."regenerator-runtime-0.13.7" sources."registry-auth-token-4.2.0" sources."registry-url-5.1.0" (sources."request-2.88.2" // { @@ -83950,7 +84859,7 @@ in sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" sources."@types/color-name-1.1.1" - sources."@types/node-14.0.23" + sources."@types/node-14.0.24" sources."abbrev-1.1.1" sources."accepts-1.3.7" sources."after-0.8.2" @@ -84643,7 +85552,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-14.0.23" + sources."@types/node-14.0.24" sources."@types/unist-2.0.3" sources."@types/vfile-3.0.2" sources."@types/vfile-message-2.0.0" @@ -85596,7 +86505,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-14.0.23" + sources."@types/node-14.0.24" sources."JSONSelect-0.2.1" sources."acorn-6.4.1" sources."acorn-jsx-5.2.0" @@ -86290,7 +87199,7 @@ in ]; }) sources."rechoir-0.6.2" - sources."regenerator-runtime-0.13.5" + sources."regenerator-runtime-0.13.7" sources."regex-not-1.0.2" sources."regexp.prototype.flags-1.3.0" sources."regexpp-2.0.1" @@ -86763,7 +87672,7 @@ in sources."eslint-scope-4.0.3" sources."esrecurse-4.2.1" sources."estraverse-4.3.0" - sources."events-3.1.0" + sources."events-3.2.0" sources."evp_bytestokey-1.0.3" (sources."expand-brackets-2.1.4" // { dependencies = [ @@ -87443,7 +88352,7 @@ in dependencies = [ sources."@types/glob-7.1.3" sources."@types/minimatch-3.0.3" - sources."@types/node-14.0.23" + sources."@types/node-14.0.24" sources."accepts-1.3.7" sources."ajv-6.12.3" sources."ajv-errors-1.0.1" @@ -87786,7 +88695,7 @@ in sources."pinkie-2.0.4" sources."pinkie-promise-2.0.1" sources."pkg-dir-3.0.0" - (sources."portfinder-1.0.26" // { + (sources."portfinder-1.0.27" // { dependencies = [ sources."debug-3.2.6" sources."ms-2.1.2" @@ -88136,10 +89045,10 @@ in webtorrent-cli = nodeEnv.buildNodePackage { name = "webtorrent-cli"; packageName = "webtorrent-cli"; - version = "3.0.6"; + version = "3.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/webtorrent-cli/-/webtorrent-cli-3.0.6.tgz"; - sha512 = "+rvs1eWn20qTdfIxnT+BwddHNxyR6n1re3+PSmWzwc8jj1ikfJ4Pk+ecTsYmVjZ2I67YPdX/iXkuVAqkoogR6g=="; + url = "https://registry.npmjs.org/webtorrent-cli/-/webtorrent-cli-3.0.7.tgz"; + sha512 = "7psSgPvy+nL4hQ8zIv1RW1pdFZVrxB6jHnIEwmDU6xP6zst/t5pgerrdnZerzgQBzlGjpRQQ9fQtZoHxK7zgtw=="; }; dependencies = [ sources."@protobufjs/aspromise-1.1.2" @@ -88306,7 +89215,7 @@ in sources."nodebmc-0.0.7" sources."on-finished-2.3.0" sources."once-1.4.0" - sources."open-7.0.4" + sources."open-7.1.0" sources."package-json-versionify-1.0.4" sources."parse-numeric-range-1.2.0" (sources."parse-torrent-7.1.3" // { @@ -88329,7 +89238,7 @@ in sources."protobufjs-6.10.1" sources."pump-3.0.0" sources."qap-3.3.1" - sources."queue-microtask-1.1.3" + sources."queue-microtask-1.1.4" sources."random-access-file-2.1.4" sources."random-access-storage-1.4.1" sources."random-iterate-1.0.1" @@ -88562,7 +89471,7 @@ in sources."@types/color-name-1.1.1" sources."@types/glob-7.1.3" sources."@types/minimatch-3.0.3" - sources."@types/node-14.0.23" + sources."@types/node-14.0.24" sources."@types/normalize-package-data-2.4.0" sources."JSONStream-1.3.5" sources."aggregate-error-3.0.1" @@ -88954,7 +89863,7 @@ in sources."loud-rejection-1.6.0" sources."lowercase-keys-1.0.1" sources."lru-cache-4.1.5" - sources."macos-release-2.4.0" + sources."macos-release-2.4.1" sources."make-dir-1.3.0" sources."map-age-cleaner-0.1.3" sources."map-cache-0.2.2" @@ -89136,7 +90045,7 @@ in sources."indent-string-2.1.0" ]; }) - sources."regenerator-runtime-0.13.5" + sources."regenerator-runtime-0.13.7" sources."regex-not-1.0.2" sources."registry-auth-token-3.4.0" sources."registry-url-3.1.0" @@ -89410,7 +90319,7 @@ in sources."figures-3.2.0" sources."get-stream-5.1.0" sources."has-flag-4.0.0" - (sources."inquirer-7.3.2" // { + (sources."inquirer-7.3.3" // { dependencies = [ sources."chalk-4.1.0" sources."strip-ansi-6.0.0" diff --git a/pkgs/development/ocaml-modules/ocsigen-server/default.nix b/pkgs/development/ocaml-modules/ocsigen-server/default.nix index 0d56f2c783fb4..30ddd005b79b8 100644 --- a/pkgs/development/ocaml-modules/ocsigen-server/default.nix +++ b/pkgs/development/ocaml-modules/ocsigen-server/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchFromGitHub, which, ocaml, findlib, lwt_react, ssl, lwt_ssl , lwt_log, ocamlnet, ocaml_pcre, cryptokit, tyxml, xml-light, ipaddr , pgocaml, camlzip, ocaml_sqlite3 -, makeWrapper +, makeWrapper, fetchpatch }: -if !stdenv.lib.versionAtLeast ocaml.version "4.03" +if !stdenv.lib.versionAtLeast ocaml.version "4.06.1" then throw "ocsigenserver is not available for OCaml ${ocaml.version}" else @@ -13,16 +13,22 @@ let mkpath = p: n: in stdenv.mkDerivation rec { - version = "2.15.0"; + version = "2.16.0"; pname = "ocsigenserver"; src = fetchFromGitHub { owner = "ocsigen"; repo = "ocsigenserver"; rev = version; - sha256 = "15qdkxcbl9c1bbn0fh9awjw0hjn7r6awcn288a9vyxln7icdbifw"; + sha256 = "0dd7zfk8dlajv0297dswaaqh96hjk2ppy8zb67jbkd26nimahk9y"; }; + # unreleased fix for Makefile typos breaking compilation + patches = [ (fetchpatch { + url = "https://github.com/ocsigen/ocsigenserver/commit/014aefc4e460686a361b974f16ebb7e0c993b36b.patch"; + sha256 = "0xda4fj8p5102lh9xmrn5mv3s0ps6yykqj3mpjf72gf4zd6fzcn7"; + }) ]; + buildInputs = [ which makeWrapper ocaml findlib lwt_react pgocaml camlzip ocaml_sqlite3 ]; diff --git a/pkgs/development/perl-modules/crypt-openpgp-remove-impure-keygen-tests.patch b/pkgs/development/perl-modules/crypt-openpgp-remove-impure-keygen-tests.patch new file mode 100644 index 0000000000000..70dc0826276b6 --- /dev/null +++ b/pkgs/development/perl-modules/crypt-openpgp-remove-impure-keygen-tests.patch @@ -0,0 +1,30 @@ +diff --git a/t/13-keygen.t b/t/13-keygen.t +index f430ffb..2050624 100644 +--- a/t/13-keygen.t ++++ b/t/13-keygen.t +@@ -1,5 +1,5 @@ + use strict; +-use Test::More tests => 29; ++use Test::More tests => 25; + + use Crypt::OpenPGP; + use Crypt::OpenPGP::Message; +@@ -26,9 +26,6 @@ for my $type ( qw( RSA DSA ) ) { + isa_ok $pub->key, 'Crypt::OpenPGP::Certificate'; + isa_ok $sec->key, 'Crypt::OpenPGP::Certificate'; + +- is $pub->key->key_id, $sec->key->key_id, +- 'public key_id matches secret key_id'; +- + is $pub->primary_uid, $id, 'primary_uid matches'; + + is $pub->key->key->size, $bits, 'keysize (in bits) matches for pubkey'; +@@ -47,8 +44,6 @@ for my $type ( qw( RSA DSA ) ) { + isa_ok $pieces[1], 'Crypt::OpenPGP::UserID'; + isa_ok $pieces[2], 'Crypt::OpenPGP::Signature'; + +- is $pieces[0]->key_id, $sec->key->key_id, +- 'serialized public key_id matches secret key_id'; + } + + { diff --git a/pkgs/development/python-modules/aenum/default.nix b/pkgs/development/python-modules/aenum/default.nix index f688c39485338..6f40e03c35931 100644 --- a/pkgs/development/python-modules/aenum/default.nix +++ b/pkgs/development/python-modules/aenum/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "aenum"; - version = "2.2.3"; + version = "2.2.4"; src = fetchPypi { inherit pname version; - sha256 = "a4334cabf47c167d44ab5a6198837b80deec5d5bad1b5cf70c966c3a330260e8"; + sha256 = "0r1812bjm72x73pl7y4yhffr4zbdjgxa08avsy4b3di0pqgqv0l1"; }; # For Python 3, locale has to be set to en_US.UTF-8 for diff --git a/pkgs/development/python-modules/ase/default.nix b/pkgs/development/python-modules/ase/default.nix index 870f0598e5e7e..dfac628139678 100644 --- a/pkgs/development/python-modules/ase/default.nix +++ b/pkgs/development/python-modules/ase/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "ase"; - version = "3.19.1"; + version = "3.19.2"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "03xzpmpask2q2609kkq0hfgzsfvkyjpbjws7qx00nnfrbbnjk443"; + sha256 = "0qkfa7506cadvd9ps3radyhhanjs16jlhwhcixsz142d34ynli49"; }; propagatedBuildInputs = [ numpy scipy matplotlib flask pillow psycopg2 ]; diff --git a/pkgs/development/python-modules/astroquery/default.nix b/pkgs/development/python-modules/astroquery/default.nix index c6620de3d0c3e..e82dca3e95537 100644 --- a/pkgs/development/python-modules/astroquery/default.nix +++ b/pkgs/development/python-modules/astroquery/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "astroquery"; - version = "0.4"; + version = "0.4.1"; src = fetchPypi { inherit pname version; - sha256 = "1ddwnj9vpvxkrfb45c4pwv5f5za9kn2q0040dpw2ymj2bwlpl61h"; + sha256 = "0xpqrl9h7sg55mql38xsfpbz9rxsm3mxfha1biqyly1gmxpmd47a"; }; disabled = !isPy3k; diff --git a/pkgs/development/python-modules/azure-identity/default.nix b/pkgs/development/python-modules/azure-identity/default.nix index d1baeb380327f..e3a79e7ae05f4 100644 --- a/pkgs/development/python-modules/azure-identity/default.nix +++ b/pkgs/development/python-modules/azure-identity/default.nix @@ -38,6 +38,13 @@ buildPythonPackage rec { msrestazure ]; + prePatch = '' + substituteInPlace setup.py \ + --replace msal-extensions~=0.1.3 msal-extensions + ''; + + pythonImportsCheck = [ "azure.identity" ]; + # Requires checkout from mono-repo and a mock account: # https://github.com/Azure/azure-sdk-for-python/blob/master/sdk/identity/tests.yml doCheck = false; diff --git a/pkgs/development/python-modules/azure-mgmt-loganalytics/default.nix b/pkgs/development/python-modules/azure-mgmt-loganalytics/default.nix index 69c1aaffada35..247e1ef3fed06 100644 --- a/pkgs/development/python-modules/azure-mgmt-loganalytics/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-loganalytics/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "azure-mgmt-loganalytics"; - version = "0.6.0"; + version = "0.7.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "a1527fe8b1e8a47558bfa03bd6c587706d8fb9213142aea42da07397daa2d039"; + sha256 = "18n2lqvrhq40gdqhlzzg8mc03571i02c7qq7jv771lc58rqpzysh"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/bravia-tv/default.nix b/pkgs/development/python-modules/bravia-tv/default.nix index 8050f886db5a3..00d554ef14b11 100644 --- a/pkgs/development/python-modules/bravia-tv/default.nix +++ b/pkgs/development/python-modules/bravia-tv/default.nix @@ -2,14 +2,14 @@ buildPythonPackage rec { pname = "bravia-tv"; - version = "1.0.5"; + version = "1.0.6"; disabled = isPy27; src = fetchFromGitHub { owner = "dcnielsen90"; repo = "python-bravia-tv"; rev = "v${version}"; - sha256 = "17nd0v3pgmbfafi3vypls9jnpg4dk7wyh7fl7gpzcnkq1f8pf087"; + sha256 = "07i1j3y04w2jwylff8w1aimmy4fj1g42wq8iz83an7dl4cz3rap9"; }; propagatedBuildInputs = [ requests ]; diff --git a/pkgs/development/python-modules/crc32c/default.nix b/pkgs/development/python-modules/crc32c/default.nix index 6fd31d007f6c2..dd2c9059ed5f6 100644 --- a/pkgs/development/python-modules/crc32c/default.nix +++ b/pkgs/development/python-modules/crc32c/default.nix @@ -1,14 +1,14 @@ { lib, buildPythonPackage, fetchFromGitHub }: buildPythonPackage rec { - version = "2.0"; + version = "2.0.1"; pname = "crc32c"; src = fetchFromGitHub { owner = "ICRAR"; repo = pname; rev = "v${version}"; - sha256 = "15x1sj23n50qdjmi8mjq5wgf5jfn1yv78vjc59wplvl0s50w2dnk"; + sha256 = "0vyac7pchh083h5qdjwhhacfq77frkrq1bjzsn51qv1vwcdrpnrf"; }; meta = { diff --git a/pkgs/development/python-modules/daphne/default.nix b/pkgs/development/python-modules/daphne/default.nix index 49e6c3b3c475f..80fa1c35d6324 100644 --- a/pkgs/development/python-modules/daphne/default.nix +++ b/pkgs/development/python-modules/daphne/default.nix @@ -1,10 +1,10 @@ -{ stdenv, buildPythonPackage, isPy3k, fetchFromGitHub, fetchpatch +{ stdenv, buildPythonPackage, isPy3k, fetchFromGitHub , asgiref, autobahn, twisted, pytestrunner -, hypothesis, pytest, pytest-asyncio +, hypothesis, pytest, pytest-asyncio, service-identity, pyopenssl }: buildPythonPackage rec { pname = "daphne"; - version = "2.3.0"; + version = "2.5.0"; disabled = !isPy3k; @@ -12,20 +12,12 @@ buildPythonPackage rec { owner = "django"; repo = pname; rev = version; - sha256 = "020afrvbnid13gkgjpqznl025zpynisa96kybmf8q7m3wp1iq1nl"; + sha256 = "0qkhmblj3a5s3z65cgz46xsvq1b6x4m3kr6aljjnxnv7hcwib02n"; }; - patches = [ - # Fix compatibility with Hypothesis 4. See: https://github.com/django/daphne/pull/261 - (fetchpatch { - url = "https://github.com/django/daphne/commit/2df5096c5b63a791c209e12198ad89c998869efd.patch"; - sha256 = "0046krzcn02mihqmsjd80kk5h5flv44nqxpapa17g6dvq3jnb97n"; - }) - ]; - nativeBuildInputs = [ pytestrunner ]; - propagatedBuildInputs = [ asgiref autobahn twisted ]; + propagatedBuildInputs = [ asgiref autobahn twisted service-identity pyopenssl ]; checkInputs = [ hypothesis pytest pytest-asyncio ]; diff --git a/pkgs/development/python-modules/dataclasses-json/default.nix b/pkgs/development/python-modules/dataclasses-json/default.nix new file mode 100644 index 0000000000000..76de351d05c49 --- /dev/null +++ b/pkgs/development/python-modules/dataclasses-json/default.nix @@ -0,0 +1,30 @@ +{ lib +, buildPythonPackage +, fetchPypi +, stringcase +, typing-inspect +, marshmallow-enum +}: + +buildPythonPackage rec { + pname = "dataclasses-json"; + version = "0.5.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "0nkgp4pd7j7ydrciiix4x0w56l5w6qvj2vgxpwj42h4f2wdv2f3f"; + }; + + propagatedBuildInputs = [ + stringcase + typing-inspect + marshmallow-enum + ]; + + meta = with lib; { + description = "Simple API for encoding and decoding dataclasses to and from JSON"; + homepage = "https://github.com/lidatong/dataclasses-json"; + license = licenses.mit; + maintainers = with maintainers; [ albakham ]; + }; +} diff --git a/pkgs/development/python-modules/django_silk/default.nix b/pkgs/development/python-modules/django_silk/default.nix index 95a991f341782..8efd62d7d1812 100644 --- a/pkgs/development/python-modules/django_silk/default.nix +++ b/pkgs/development/python-modules/django_silk/default.nix @@ -23,14 +23,14 @@ buildPythonPackage rec { pname = "django-silk"; - version = "3.0.4"; + version = "4.0.1"; # pypi tarball doesn't include test project src = fetchFromGitHub { owner = "jazzband"; repo = "django-silk"; rev = version; - sha256 = "10542yvbchcy8hik2hw3jclb4ic89mxkw0sykag4bw9sv43xv7vx"; + sha256 = "0yy9rzxvwlp2xvnw76r9hnqajlp417snam92xpb6ay0hxwslwqyb"; }; # "test_time_taken" tests aren't suitable for reproducible execution, but django's # test runner doesn't have an easy way to ignore tests - so instead prevent it from picking @@ -38,6 +38,8 @@ buildPythonPackage rec { postPatch = '' substituteInPlace project/tests/test_silky_profiler.py \ --replace "def test_time_taken" "def _test_time_taken" + substituteInPlace setup.py \ + --replace 'use_scm_version=True' 'version="${version}"' ''; buildInputs = [ mock ]; @@ -54,7 +56,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Silky smooth profiling for the Django Framework"; - homepage = "https://github.com/mtford90/silk"; + homepage = "https://github.com/jazzband/django-silk"; license = licenses.mit; maintainers = with maintainers; [ ris ]; }; diff --git a/pkgs/development/python-modules/dpkt/default.nix b/pkgs/development/python-modules/dpkt/default.nix index 567cd85fa9437..0238cf4706f7e 100644 --- a/pkgs/development/python-modules/dpkt/default.nix +++ b/pkgs/development/python-modules/dpkt/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "dpkt"; - version = "1.9.2"; + version = "1.9.3"; src = fetchPypi { inherit pname version; - sha256 = "0m0ym219zsqfjl6jwivw5as3igjbmhpcn4dvabc5nkd0bk6jxaaj"; + sha256 = "18jcanxpzkd5n2gjbfpwbvvkm1hpxr59463z28py23vkbx57wmvg"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/dropbox/default.nix b/pkgs/development/python-modules/dropbox/default.nix index 401437ceec4c5..f271411a285c2 100644 --- a/pkgs/development/python-modules/dropbox/default.nix +++ b/pkgs/development/python-modules/dropbox/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "dropbox"; - version = "10.2.0"; + version = "10.3.0"; src = fetchPypi { inherit pname version; - sha256 = "4372916da70aad82e7227e7c31a8cfa2310e41c9d34d32883daedf43ed403f86"; + sha256 = "082ylb6xn8xzix61lv2n8ya1k0gd494kr9vr2ys8ldbwxq9nyaaz"; }; # Set DROPBOX_TOKEN environment variable to a valid token. diff --git a/pkgs/development/python-modules/ecdsa/default.nix b/pkgs/development/python-modules/ecdsa/default.nix index 7c991c528cdda..0f224bd8ab0b8 100644 --- a/pkgs/development/python-modules/ecdsa/default.nix +++ b/pkgs/development/python-modules/ecdsa/default.nix @@ -22,7 +22,6 @@ buildPythonPackage rec { description = "ECDSA cryptographic signature library"; homepage = "https://github.com/warner/python-ecdsa"; license = licenses.mit; - maintainers = with maintainers; [ aszlig ]; }; } diff --git a/pkgs/development/python-modules/flask-testing/default.nix b/pkgs/development/python-modules/flask-testing/default.nix index ece8843209c9a..feb3766067bf9 100644 --- a/pkgs/development/python-modules/flask-testing/default.nix +++ b/pkgs/development/python-modules/flask-testing/default.nix @@ -1,7 +1,4 @@ -{ stdenv, fetchPypi, buildPythonPackage, pythonOlder -, flask, blinker, twill }: - -with stdenv.lib; +{ stdenv, fetchPypi, buildPythonPackage, isPy3k, flask, blinker, twill }: buildPythonPackage rec { pname = "Flask-Testing"; @@ -13,13 +10,20 @@ buildPythonPackage rec { }; postPatch = '' - sed -i -e 's/twill==0.9.1/twill/' setup.py + substituteInPlace setup.py --replace "twill==0.9.1" "twill" ''; - buildInputs = optionals (pythonOlder "3.0") [ twill ]; - propagatedBuildInputs = [ flask blinker ]; + propagatedBuildInputs = [ flask ]; + + checkInputs = [ blinker ] ++ stdenv.lib.optionals (!isPy3k) [ twill ]; + + # twill integration is outdated in Python 2, hence it the tests fails. + # Some of the tests use localhost networking on darwin. + doCheck = isPy3k && !stdenv.isDarwin; + + pythonImportsCheck = [ "flask_testing" ]; - meta = { + meta = with stdenv.lib; { description = "Flask unittest integration."; homepage = "https://pythonhosted.org/Flask-Testing/"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/h5netcdf/default.nix b/pkgs/development/python-modules/h5netcdf/default.nix index b80a910371796..3d66291aed892 100644 --- a/pkgs/development/python-modules/h5netcdf/default.nix +++ b/pkgs/development/python-modules/h5netcdf/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "h5netcdf"; - version = "0.8.0"; + version = "0.8.1"; src = fetchPypi { inherit pname version; - sha256 = "b0df12f4692817cf6d8e2fca95f689e61aa68f2f39aea90fd1790fe5ac8d2cbb"; + sha256 = "09bbnpsvwksb07wijn7flyyza56h5b2g2cw0hb3slmwxz6cgcjmr"; }; propagatedBuildInputs = [ @@ -31,7 +31,7 @@ buildPythonPackage rec { meta = { description = "netCDF4 via h5py"; - homepage = https://github.com/shoyer/h5netcdf; + homepage = "https://github.com/shoyer/h5netcdf"; license = lib.licenses.bsd3; }; diff --git a/pkgs/development/python-modules/ihatemoney/default.nix b/pkgs/development/python-modules/ihatemoney/default.nix index 38d762ec36075..bcca68600e989 100644 --- a/pkgs/development/python-modules/ihatemoney/default.nix +++ b/pkgs/development/python-modules/ihatemoney/default.nix @@ -67,6 +67,11 @@ buildPythonPackage rec { url = "https://github.com/spiral-project/ihatemoney/commit/6129191b26784b895e203fa3eafb89cee7d88b71.patch"; sha256 = "0yc24gsih9x3pnh2mhj4v5i71x02dq93a9jd2r8b1limhcl4p1sw"; }) + (fetchpatch { + name = "CVE-2020-15120.patch"; + url = "https://github.com/spiral-project/ihatemoney/commit/8d77cf5d5646e1d2d8ded13f0660638f57e98471.patch"; + sha256 = "0y855sk3qsbpq7slj876k2ifa1lccc2dccag98pkyaadpz5gbabv"; + }) ]; postPatch = '' @@ -117,7 +122,6 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://ihatemoney.org"; description = "A simple shared budget manager web application"; - platforms = platforms.linux; license = licenses.beerware; maintainers = [ maintainers.symphorien ]; }; diff --git a/pkgs/development/python-modules/mautrix/default.nix b/pkgs/development/python-modules/mautrix/default.nix index 01cabdd9b32da..50b81cef945db 100644 --- a/pkgs/development/python-modules/mautrix/default.nix +++ b/pkgs/development/python-modules/mautrix/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "mautrix"; - version = "0.5.7"; + version = "0.5.8"; src = fetchPypi { inherit pname version; - sha256 = "0czymj9k9faky4dyrbxpr8rfrsb28xz9c0p66dcxvchk3m3ac49k"; + sha256 = "1hqg32n7pmjhap0ybfcf05zgfcyyirb4fm1m7gf44dwh40da6qz0"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/nest-asyncio/default.nix b/pkgs/development/python-modules/nest-asyncio/default.nix index 27c959cee0fb5..993e5e413e4ca 100644 --- a/pkgs/development/python-modules/nest-asyncio/default.nix +++ b/pkgs/development/python-modules/nest-asyncio/default.nix @@ -5,13 +5,13 @@ }: buildPythonPackage rec { - version = "1.3.3"; + version = "1.4.0"; pname = "nest_asyncio"; disabled = !(pythonAtLeast "3.5"); src = fetchPypi { inherit pname version; - sha256 = "75dad56eaa7078e2e29c6630f114077fc5060069658d74545b0409e63ca8a028"; + sha256 = "1j2rbb31wdq9k15cmj2y0kypzvfc3v05py1n0809nmqlpi5hawsp"; }; # tests not packaged with source dist as of 1.3.2/1.3.2, and diff --git a/pkgs/development/python-modules/nvchecker/default.nix b/pkgs/development/python-modules/nvchecker/default.nix index bfb15bbc6d606..909be251386bd 100644 --- a/pkgs/development/python-modules/nvchecker/default.nix +++ b/pkgs/development/python-modules/nvchecker/default.nix @@ -1,24 +1,21 @@ -{ stdenv, buildPythonPackage, fetchPypi, pythonOlder, pytest, setuptools, structlog, pytest-asyncio, flaky, tornado, pycurl, pytest-httpbin }: +{ stdenv, buildPythonPackage, fetchPypi, pythonOlder, pytestCheckHook, setuptools, structlog, pytest-asyncio, flaky, tornado, pycurl, aiohttp, pytest-httpbin }: buildPythonPackage rec { pname = "nvchecker"; - version = "1.6.post1"; + version = "1.7"; src = fetchPypi { inherit pname version; - sha256 = "7d2e889a4ba2eeb75dd6649ed5e99f8cbfed45b2194657e8f46c978ec58d4175"; + sha256 = "01be0e5587d346ad783b4b2dc45bd8eefe477081b33fff18cc2fdea58c2a38ef"; }; - propagatedBuildInputs = [ setuptools structlog tornado pycurl ]; - checkInputs = [ pytest pytest-asyncio flaky pytest-httpbin ]; - - # disable `test_ubuntupkg` because it requires network - checkPhase = '' - py.test -m "not needs_net" --ignore=tests/test_ubuntupkg.py - ''; + propagatedBuildInputs = [ setuptools structlog tornado pycurl aiohttp ]; + checkInputs = [ pytestCheckHook pytest-asyncio flaky pytest-httpbin ]; disabled = pythonOlder "3.5"; + pytestFlagsArray = [ "-m 'not needs_net'" ]; + meta = with stdenv.lib; { homepage = "https://github.com/lilydjwg/nvchecker"; description = "New version checker for software"; diff --git a/pkgs/development/python-modules/ordered-set/default.nix b/pkgs/development/python-modules/ordered-set/default.nix index 4a9e6fefe0662..7546566cb3aac 100644 --- a/pkgs/development/python-modules/ordered-set/default.nix +++ b/pkgs/development/python-modules/ordered-set/default.nix @@ -2,14 +2,14 @@ buildPythonPackage rec { pname = "ordered-set"; - version = "4.0.1"; + version = "4.0.2"; disabled = isPy27; checkInputs = [ pytest ]; src = fetchPypi { inherit pname version; - sha256 = "a31008c57f9c9776b12eb8841b1f61d1e4d70dfbbe8875ccfa2403c54af3d51b"; + sha256 = "159syfbqnwqnivzjfn3x7ak3xwrxmnzbji7c2qhj1jjv0pgv54xs"; }; checkPhase = '' diff --git a/pkgs/development/python-modules/pandas/default.nix b/pkgs/development/python-modules/pandas/default.nix index a2d16f603f5d3..eddf3f74e0f33 100644 --- a/pkgs/development/python-modules/pandas/default.nix +++ b/pkgs/development/python-modules/pandas/default.nix @@ -21,6 +21,7 @@ , tables , xlwt , runtimeShell +, isPy38 , libcxx ? null }: @@ -67,7 +68,9 @@ in buildPythonPackage rec { "['pandas/src/klib', 'pandas/src', '$cpp_sdk']" ''; - setupPyBuildFlags = [ + # Parallel Cythonization is broken in Python 3.8 on Darwin. Fixed in the next + # release. https://github.com/pandas-dev/pandas/pull/30862 + setupPyBuildFlags = optionals (!(isPy38 && isDarwin)) [ # As suggested by # https://pandas.pydata.org/pandas-docs/stable/development/contributing.html#creating-a-python-environment "--parallel=$NIX_BUILD_CORES" diff --git a/pkgs/development/python-modules/paramiko/default.nix b/pkgs/development/python-modules/paramiko/default.nix index 2fefbde744856..6c490cb344b1d 100644 --- a/pkgs/development/python-modules/paramiko/default.nix +++ b/pkgs/development/python-modules/paramiko/default.nix @@ -37,7 +37,6 @@ buildPythonPackage rec { homepage = "https://github.com/paramiko/paramiko/"; description = "Native Python SSHv2 protocol library"; license = licenses.lgpl21Plus; - maintainers = with maintainers; [ aszlig ]; longDescription = '' This is a library for making SSH2 connections (client or server). diff --git a/pkgs/development/python-modules/pc-ble-driver-py/default.nix b/pkgs/development/python-modules/pc-ble-driver-py/default.nix index c8967fa5eabf3..6250b5a2202d9 100644 --- a/pkgs/development/python-modules/pc-ble-driver-py/default.nix +++ b/pkgs/development/python-modules/pc-ble-driver-py/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { doCheck = false; nativeBuildInputs = [ cmake swig git setuptools scikit-build ]; - buildInputs = [ boost udev pc-ble-driver ]; + buildInputs = [ boost pc-ble-driver ]; propagatedBuildInputs = [ enum34 wrapt future ]; dontUseCmakeConfigure = true; diff --git a/pkgs/development/python-modules/poetry/default.nix b/pkgs/development/python-modules/poetry/default.nix index e0be5f5ed0aa2..a81e1e52aeaa4 100644 --- a/pkgs/development/python-modules/poetry/default.nix +++ b/pkgs/development/python-modules/poetry/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { pname = "poetry"; - version = "1.0.9"; + version = "1.0.10"; format = "pyproject"; disabled = isPy27; @@ -34,7 +34,7 @@ buildPythonPackage rec { owner = "python-poetry"; repo = pname; rev = version; - sha256 = "0gi1li55rim60hf1gdpgpx84zlkaj0wv12wbv7dib9malhfj3pnz"; + sha256 = "00qfzjjs6clh93gfl1px3ma9km8qxl3f4z819nmyl58zc8ni3zyv"; }; postPatch = '' diff --git a/pkgs/development/python-modules/process-tests/default.nix b/pkgs/development/python-modules/process-tests/default.nix index 5ebda6bf04c8f..de43ea71fd48f 100644 --- a/pkgs/development/python-modules/process-tests/default.nix +++ b/pkgs/development/python-modules/process-tests/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "process-tests"; - version = "2.0.2"; + version = "2.1.1"; src = fetchPypi { inherit pname version; - sha256 = "7ae24a680cc7c44e7687e3723e6e64597a28223ad664989999efe10dd38c2431"; + sha256 = "15yrgr1hb7i0fq31dh6k8hmc3jnk6yn5nh4xh3gmszk9vag5zrqk"; }; # No tests diff --git a/pkgs/development/python-modules/pymysql/default.nix b/pkgs/development/python-modules/pymysql/default.nix index a43dcfb26fcdd..c0419d025b0bd 100644 --- a/pkgs/development/python-modules/pymysql/default.nix +++ b/pkgs/development/python-modules/pymysql/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "PyMySQL"; - version = "0.9.3"; + version = "0.10.0"; src = fetchPypi { inherit pname version; - sha256 = "1ry8lxgdc1p3k7gbw20r405jqi5lvhi5wk83kxdbiv8xv3f5kh6q"; + sha256 = "0dwqw556qmjl5359wsylnh5kmw3ns8qkw1pn1gwf0l70hjy70h71"; }; propagatedBuildInputs = [ cryptography ]; diff --git a/pkgs/development/python-modules/python-jsonrpc-server/default.nix b/pkgs/development/python-modules/python-jsonrpc-server/default.nix index 586c6edfa8290..12ad5170a7c5c 100644 --- a/pkgs/development/python-modules/python-jsonrpc-server/default.nix +++ b/pkgs/development/python-modules/python-jsonrpc-server/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { postPatch = '' sed -i 's/version=versioneer.get_version(),/version="${version}",/g' setup.py # https://github.com/palantir/python-jsonrpc-server/issues/36 - sed -i -e 's!ujson<=!ujson>=!' setup.py + sed -iEe "s!'ujson.*\$!'ujson',!" setup.py ''; checkInputs = [ diff --git a/pkgs/development/python-modules/python-rtmidi/default.nix b/pkgs/development/python-modules/python-rtmidi/default.nix index 24d86289bf2af..3538db60793da 100644 --- a/pkgs/development/python-modules/python-rtmidi/default.nix +++ b/pkgs/development/python-modules/python-rtmidi/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi, isPy27 -, tox, flake8, alabaster +, pkg-config, alsaLib, libjack2, tox, flake8, alabaster }: buildPythonPackage rec { @@ -12,6 +12,8 @@ buildPythonPackage rec { sha256 = "0b0y3hnjl2fvm3jyfvp1msfikp19vbqqqi7lawgy3azisvdyrgq7"; }; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ alsaLib libjack2 ]; checkInputs = [ tox flake8 diff --git a/pkgs/development/python-modules/recommonmark/default.nix b/pkgs/development/python-modules/recommonmark/default.nix index 26ba8a68d87ad..472f873e30a05 100644 --- a/pkgs/development/python-modules/recommonmark/default.nix +++ b/pkgs/development/python-modules/recommonmark/default.nix @@ -5,6 +5,7 @@ , CommonMark , docutils , sphinx +, isPy3k }: buildPythonPackage rec { @@ -30,6 +31,8 @@ buildPythonPackage rec { "test_integration" ]; + disabled = isPy3k; # Not yet compatible with latest Sphinx. + meta = { description = "A docutils-compatibility bridge to CommonMark"; homepage = "https://github.com/rtfd/recommonmark"; diff --git a/pkgs/development/python-modules/sentry-sdk/default.nix b/pkgs/development/python-modules/sentry-sdk/default.nix index 9d2a533ecb6e7..3018cabd02592 100644 --- a/pkgs/development/python-modules/sentry-sdk/default.nix +++ b/pkgs/development/python-modules/sentry-sdk/default.nix @@ -30,10 +30,10 @@ buildPythonPackage rec { sha256 = "0e5e947d0f7a969314aa23669a94a9712be5a688ff069ff7b9fc36c66adc160c"; }; - checkInputs = [ django flask tornado bottle rq falcon sqlalchemy werkzeug ] + checkInputs = [ django flask tornado bottle rq falcon sqlalchemy werkzeug trytond ] ++ stdenv.lib.optionals isPy3k [ celery pyramid sanic aiohttp ]; - propagatedBuildInputs = [ urllib3 certifi trytond ]; + propagatedBuildInputs = [ urllib3 certifi ]; meta = with stdenv.lib; { homepage = "https://github.com/getsentry/sentry-python"; diff --git a/pkgs/development/python-modules/starlette/default.nix b/pkgs/development/python-modules/starlette/default.nix index 842622e56f866..130a098a23f8f 100644 --- a/pkgs/development/python-modules/starlette/default.nix +++ b/pkgs/development/python-modules/starlette/default.nix @@ -26,14 +26,14 @@ buildPythonPackage rec { # https://github.com/tiangolo/fastapi/issues/683. Please update when # possible. FastAPI is currently Starlette's only dependent. - version = "0.13.4"; + version = "0.13.6"; disabled = isPy27; src = fetchFromGitHub { owner = "encode"; repo = pname; rev = version; - sha256 = "1rk20rj62iigkkikb80bmalriyg1j3g28s25l8z2gijagv1v5c7l"; + sha256 = "08d1d4qdwhi1xxag4am5ijingdyn0mbyqajs9ql5shxnybyjv321"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/stripe/default.nix b/pkgs/development/python-modules/stripe/default.nix index d675a1fd350d9..ea48474045ad6 100644 --- a/pkgs/development/python-modules/stripe/default.nix +++ b/pkgs/development/python-modules/stripe/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "stripe"; - version = "2.48.0"; + version = "2.49.0"; # Tests require network connectivity and there's no easy way to disable # them. ~ C. @@ -10,7 +10,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "1w9ns4jjj0p50im9vbjn084zph1g2sfa6l01ydl98qsyj76f4psi"; + sha256 = "10dgll0x709n91p8m9qmifsdhx2sc2920xxhqzd335l4z20iwcw9"; }; propagatedBuildInputs = [ requests ]; diff --git a/pkgs/development/python-modules/tiledb/default.nix b/pkgs/development/python-modules/tiledb/default.nix index cf688d75f01e5..808a6c54825c6 100644 --- a/pkgs/development/python-modules/tiledb/default.nix +++ b/pkgs/development/python-modules/tiledb/default.nix @@ -51,10 +51,15 @@ buildPythonPackage rec { # Hardcode path to shared object substituteInPlace tiledb/__init__.py --replace \ 'os.path.join(lib_dir, lib_name)' 'os.path.join("${tiledb}/lib", lib_name)' - + # Disable failing test substituteInPlace tiledb/tests/test_examples.py --replace \ "test_docs" "dont_test_docs" + # these tests don't always fail + substituteInPlace tiledb/tests/test_libtiledb.py --replace \ + "test_varlen_write_int_subarray" "dont_test_varlen_write_int_subarray" + substituteInPlace tiledb/tests/test_metadata.py --replace \ + "test_metadata_consecutive" "dont_test_metadata_consecutive" ''; checkPhase = '' diff --git a/pkgs/development/python-modules/twill/default.nix b/pkgs/development/python-modules/twill/default.nix index 4466724ffe193..2f365fc00398c 100644 --- a/pkgs/development/python-modules/twill/default.nix +++ b/pkgs/development/python-modules/twill/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { doCheck = false; # pypi package comes without tests, other homepage does not provide all verisons meta = with lib; { - homepage = "http://twill.idyll.org/"; + homepage = "https://twill-tools.github.io/twill/"; description = "A simple scripting language for Web browsing"; license = licenses.mit; maintainers = with maintainers; [ mic92 ]; diff --git a/pkgs/development/python-modules/typing-inspect/default.nix b/pkgs/development/python-modules/typing-inspect/default.nix new file mode 100644 index 0000000000000..849b56d2d0c21 --- /dev/null +++ b/pkgs/development/python-modules/typing-inspect/default.nix @@ -0,0 +1,29 @@ +{ lib +, buildPythonPackage +, fetchPypi +, typing-extensions +, mypy-extensions +}: + +buildPythonPackage rec { + pname = "typing-inspect"; + version = "0.6.0"; + + src = fetchPypi { + inherit version; + pname = "typing_inspect"; + sha256 = "1dzs9a1pr23dhbvmnvms2jv7l7jk26023g5ysf0zvnq8b791s6wg"; + }; + + propagatedBuildInputs = [ + typing-extensions + mypy-extensions + ]; + + meta = with lib; { + description = "Runtime inspection utilities for Python typing module"; + homepage = "https://github.com/ilevkivskyi/typing_inspect"; + license = licenses.mit; + maintainers = with maintainers; [ albakham ]; + }; +} diff --git a/pkgs/development/python-modules/urwid/default.nix b/pkgs/development/python-modules/urwid/default.nix index 3e71cae26e394..6a6cc44d66dcd 100644 --- a/pkgs/development/python-modules/urwid/default.nix +++ b/pkgs/development/python-modules/urwid/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "urwid"; - version = "2.1.0"; + version = "2.1.1"; src = fetchPypi { inherit pname version; - sha256 = "0896f36060beb6bf3801cb554303fef336a79661401797551ba106d23ab4cd86"; + sha256 = "09nmi2nmvpcmbh3w3fb0dn0c7yp7r20i5pfcr6q722xh6mp8cw3q"; }; # tests need to be able to set locale diff --git a/pkgs/development/python-modules/webdavclient3/default.nix b/pkgs/development/python-modules/webdavclient3/default.nix new file mode 100644 index 0000000000000..eb13cd6b9bbfb --- /dev/null +++ b/pkgs/development/python-modules/webdavclient3/default.nix @@ -0,0 +1,30 @@ +{ buildPythonPackage, fetchPypi, isPy27, lib, dateutil, lxml, requests +, pytestCheckHook }: + +buildPythonPackage rec { + pname = "webdavclient3"; + version = "3.14.5"; + + disabled = isPy27; + + src = fetchPypi { + inherit pname version; + sha256 = "0yw3n5m70ysjn1ch48znpn4zr4a1bd0lsm7q2grqz7q5hfjzjwk0"; + }; + + propagatedBuildInputs = [ dateutil lxml requests ]; + + checkInputs = [ pytestCheckHook ]; + + # disable tests completely, as most of them fail due to urllib3 not being able to establish a http connection + doCheck = false; + + pythonImportsCheck = [ "webdav3.client" ]; + + meta = with lib; { + description = "Easy to use WebDAV Client for Python 3.x"; + homepage = "https://github.com/ezhov-evgeny/webdav-client-python-3"; + license = licenses.mit; + maintainers = with maintainers; [ dmrauh ]; + }; +} diff --git a/pkgs/development/python-modules/yamllint/default.nix b/pkgs/development/python-modules/yamllint/default.nix index b6e23f9e8e74d..892a9840a3415 100644 --- a/pkgs/development/python-modules/yamllint/default.nix +++ b/pkgs/development/python-modules/yamllint/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "yamllint"; - version = "1.23.0"; + version = "1.24.2"; src = fetchPypi { inherit pname version; - sha256 = "1agl80csxhiqglm0idwhw98iqfpp61c9inzcdaz4czsfyivzzwsr"; + sha256 = "07xn11i0c7x72xjxkkzrq9zxl40vfdr41mfvhlayrk6dpbk8vdj0"; }; checkInputs = [ nose ]; diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index 7291d25cf34fc..2d2839c0e007f 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -334,7 +334,7 @@ let rtiff = [ pkgs.libtiff.dev ]; runjags = [ pkgs.jags ]; RVowpalWabbit = [ pkgs.zlib.dev pkgs.boost ]; - rzmq = [ pkgs.zeromq3 ]; + rzmq = [ pkgs.zeromq ]; SAVE = [ pkgs.zlib pkgs.bzip2 pkgs.icu pkgs.lzma pkgs.pcre ]; sdcTable = [ pkgs.gmp pkgs.glpk ]; seewave = [ pkgs.fftw.dev pkgs.libsndfile.dev ]; diff --git a/pkgs/development/tools/analysis/eresi/default.nix b/pkgs/development/tools/analysis/eresi/default.nix index c8c0d0c696016..b8abad44f241c 100644 --- a/pkgs/development/tools/analysis/eresi/default.nix +++ b/pkgs/development/tools/analysis/eresi/default.nix @@ -61,7 +61,6 @@ stdenv.mkDerivation rec { description = "The ERESI Reverse Engineering Software Interface"; license = lib.licenses.gpl2; homepage = "http://www.eresi-project.org/"; - maintainers = [ lib.maintainers.aszlig ]; platforms = lib.platforms.linux; }; } diff --git a/pkgs/development/tools/build-managers/bloop/default.nix b/pkgs/development/tools/build-managers/bloop/default.nix index 51ca62d052022..dd1342a37de0e 100644 --- a/pkgs/development/tools/build-managers/bloop/default.nix +++ b/pkgs/development/tools/build-managers/bloop/default.nix @@ -1,78 +1,92 @@ -{ stdenv, lib, fetchurl, coursier, python, makeWrapper }: - -let - baseName = "bloop"; - version = "1.3.4"; - nailgunCommit = "d7ed5db"; # Fetched from https://github.com/scalacenter/bloop/releases/download/v${version}/install.py - - client = stdenv.mkDerivation { - name = "${baseName}-client-${version}"; - - src = fetchurl { - url = "https://raw.githubusercontent.com/scalacenter/nailgun/${nailgunCommit}/pynailgun/ng.py"; - sha256 = "0lrj25m0nvphz2i5mqjwccpyrd7gn8a5k22k5khrpdh6ldxqis8a"; - }; - - phases = [ "installPhase" ]; +{ stdenv +, fetchurl +, coursier +, autoPatchelfHook +, installShellFiles +, jre +, lib +, zlib +}: + +stdenv.mkDerivation rec { + pname = "bloop"; + version = "1.4.3"; + + bloop-coursier-channel = fetchurl { + url = "https://github.com/scalacenter/bloop/releases/download/v${version}/bloop-coursier.json"; + sha256 = "0abl91l2sb08pwr98mw910zibzwk6lss9r62h2s3g7qnnxp3z59r"; + }; - installPhase = ''cp $src $out''; + bloop-bash = fetchurl { + url = "https://github.com/scalacenter/bloop/releases/download/v${version}/bash-completions"; + sha256 = "1ldxlqv353gvhdn4yq7z506ywvnjv6fjsi8wigwhzg89876pwsys"; }; - server = stdenv.mkDerivation { - name = "${baseName}-server-${version}"; - buildCommand = '' - mkdir -p $out/bin + bloop-fish = fetchurl { + url = "https://github.com/scalacenter/bloop/releases/download/v${version}/fish-completions"; + sha256 = "1pa8h81l2498q8dbd83fzipr99myjwxpy8xdgzhvqzdmfv6aa4m0"; + }; - export COURSIER_CACHE=$(pwd) - ${coursier}/bin/coursier bootstrap ch.epfl.scala:bloop-frontend_2.12:${version} \ - -r "bintray:scalameta/maven" \ - -r "bintray:scalacenter/releases" \ - -r "https://oss.sonatype.org/content/repositories/staging" \ - --deterministic \ - -f --main bloop.Server -o $out/bin/blp-server - ''; - outputHashMode = "recursive"; - outputHashAlgo = "sha256"; - outputHash = "1z33ip6hgfwiixm2gimz819p5cnxn1fmxb3ryyf77jzwsx7py718"; + bloop-zsh = fetchurl { + url = "https://github.com/scalacenter/bloop/releases/download/v${version}/zsh-completions"; + sha256 = "1xzg0qfkjdmzm3mvg82mc4iia8cl7b6vbl8ng4ir2xsz00zjrlsq"; }; - zsh = stdenv.mkDerivation { - name = "${baseName}-zshcompletion-${version}"; + bloop-coursier = stdenv.mkDerivation rec { + name = "${pname}-coursier-${version}"; - src = fetchurl { - url = "https://raw.githubusercontent.com/scalacenter/bloop/v${version}/etc/zsh/_bloop"; - sha256 = "09qq5888vaqlqan2jbs2qajz2c3ff13zj8r0x2pcxsqmvlqr02hp"; - }; + platform = if stdenv.isLinux && stdenv.isx86_64 then "x86_64-pc-linux" + else if stdenv.isDarwin && stdenv.isx86_64 then "x86_64-apple-darwin" + else throw "unsupported platform"; phases = [ "installPhase" ]; + installPhase = '' + export COURSIER_CACHE=$(pwd) + export COURSIER_JVM_CACHE=$(pwd) - installPhase = ''cp $src $out''; - }; -in -stdenv.mkDerivation { - name = "${baseName}-${version}"; + mkdir channel + ln -s ${bloop-coursier-channel} channel/bloop.json + ${coursier}/bin/coursier install --install-dir $out --install-platform ${platform} --default-channels=false --channel channel --only-prebuilt=true bloop + + # Remove binary part of the coursier launcher script to make derivation output hash stable + sed -i '5,$ d' $out/bloop + ''; - buildInputs = [ makeWrapper ]; + outputHashMode = "recursive"; + outputHashAlgo = "sha256"; + outputHash = if stdenv.isLinux && stdenv.isx86_64 then "1ncl34f39mvk0zb5jl1l77cwjdg3xfnhjxbzz11pdfqw0d7wqywj" + else if stdenv.isDarwin && stdenv.isx86_64 then "06c885w088yvh8l1r1jbrz0549gx2xvc8xr6rlxy6y27jk5655p2" + else throw "unsupported platform"; + }; - phases = [ "installPhase" ]; + dontUnpack = true; + nativeBuildInputs = [ autoPatchelfHook installShellFiles ]; + buildInputs = [ stdenv.cc.cc.lib zlib ]; + propagatedBuildInputs = [ jre ]; installPhase = '' + export COURSIER_CACHE=$(pwd) + export COURSIER_JVM_CACHE=$(pwd) + mkdir -p $out/bin - mkdir -p $out/share/zsh/site-functions + cp ${bloop-coursier}/bloop $out/bloop + cp ${bloop-coursier}/.bloop.aux $out/.bloop.aux + ln -s $out/bloop $out/bin/bloop - ln -s ${server}/bin/blp-server $out/blp-server - ln -s ${zsh} $out/share/zsh/site-functions/_bloop + # patch the bloop launcher so that it works when symlinked + sed "s|\$(dirname \"\$0\")|$out|" -i $out/bloop - cp ${client} $out/bloop - chmod +x $out/bloop - makeWrapper $out/bloop $out/bin/bloop \ - --prefix PATH : ${lib.makeBinPath [ python ]} + #Install completions + installShellCompletion --name bloop --bash ${bloop-bash} + installShellCompletion --name _bloop --zsh ${bloop-zsh} + installShellCompletion --name bloop.fish --fish ${bloop-fish} ''; meta = with stdenv.lib; { homepage = "https://scalacenter.github.io/bloop/"; license = licenses.asl20; description = "Bloop is a Scala build server and command-line tool to make the compile and test developer workflows fast and productive in a build-tool-agnostic way."; + platforms = [ "x86_64-linux" "x86_64-darwin" ]; maintainers = with maintainers; [ tomahna ]; }; } diff --git a/pkgs/development/tools/buildkit/default.nix b/pkgs/development/tools/buildkit/default.nix index 2626ae7194207..d4c143b0bd02c 100644 --- a/pkgs/development/tools/buildkit/default.nix +++ b/pkgs/development/tools/buildkit/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "buildkit"; - version = "0.7.1"; + version = "0.7.2"; goPackagePath = "github.com/moby/buildkit"; subPackages = [ "cmd/buildctl" ] ++ stdenv.lib.optionals stdenv.isLinux [ "cmd/buildkitd" ]; @@ -11,10 +11,10 @@ buildGoPackage rec { owner = "moby"; repo = "buildkit"; rev = "v${version}"; - sha256 = "048h69ffgmpir2ix9ldi6zrzlwxa5yz3idg5ajspz2dihmzmnwws"; + sha256 = "0kn2ad0rh3xlcxjxslkyrfxhv3cx88996nhxn86605x1mybxb2iq"; }; - buildFlagsArray = [ "-ldflags=-s -w -X ${goPackagePath}/version.Version=${version}" ]; + buildFlagsArray = [ "-ldflags=-s -w -X ${goPackagePath}/version.Version=${version} -X ${goPackagePath}/version.Revision=${src.rev}" ]; meta = with stdenv.lib; { description = "Concurrent, cache-efficient, and Dockerfile-agnostic builder toolkit"; diff --git a/pkgs/development/tools/cmake-format/default.nix b/pkgs/development/tools/cmake-format/default.nix index 394dc7b2f514d..b0e97de5500f2 100644 --- a/pkgs/development/tools/cmake-format/default.nix +++ b/pkgs/development/tools/cmake-format/default.nix @@ -10,12 +10,12 @@ buildPythonApplication rec { pname = "cmake-format"; - version = "0.6.10"; + version = "0.6.11"; src = fetchPypi { inherit version; pname = "cmake_format"; - sha256 = "14ypplkjah4hcb1ad8978xip4vvzxy1nkysvyi1wn9b24cbfzw42"; + sha256 = "1wvmv8242xjkxgr266dkn4vrn5wm94fwn333pn7sxm5warhhwgda"; }; propagatedBuildInputs = [ autopep8 flake8 jinja2 pylint pyyaml ]; diff --git a/pkgs/development/tools/continuous-integration/jenkins/default.nix b/pkgs/development/tools/continuous-integration/jenkins/default.nix index 6086d204b333c..5f0807cad8764 100644 --- a/pkgs/development/tools/continuous-integration/jenkins/default.nix +++ b/pkgs/development/tools/continuous-integration/jenkins/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "jenkins"; - version = "2.235.2"; + version = "2.235.3"; src = fetchurl { url = "http://mirrors.jenkins.io/war-stable/${version}/jenkins.war"; - sha256 = "16rn5fbafkiriwzk6mr37am1270d64w6ngijr81kf7hpmz7lq4lp"; + sha256 = "109rycgy8bg3na173vz5f3bq7w33a6kap8158kx6zhignni451p8"; }; buildCommand = '' diff --git a/pkgs/development/tools/go-task/default.nix b/pkgs/development/tools/go-task/default.nix new file mode 100644 index 0000000000000..eb20ec726e33b --- /dev/null +++ b/pkgs/development/tools/go-task/default.nix @@ -0,0 +1,33 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "go-task"; + version = "2.8.1"; + + src = fetchFromGitHub { + owner = pname; + repo = "task"; + rev = "v${version}"; + sha256 = "1yf5s22q4hsxvgzrj4k6gbbq0whl5b9j12mbwimxaf53q535wy4q"; + }; + + vendorSha256 = null; + + subPackages = [ "cmd/task" ]; + + buildFlagsArray = [ + "-ldflags=-s -w -X main.version=${version}" + ]; + + postInstall = '' + mv $out/bin/task $out/bin/go-task + ''; + + meta = with lib; { + homepage = "https://taskfile.dev/"; + description = "A task runner / simpler Make alternative written in Go"; + license = licenses.mit; + platforms = platforms.all; + maintainers = with maintainers; [ parasrah ]; + }; +} diff --git a/pkgs/development/tools/kustomize/default.nix b/pkgs/development/tools/kustomize/default.nix index e35cc1c8fbd51..c7a1ba35fec3d 100644 --- a/pkgs/development/tools/kustomize/default.nix +++ b/pkgs/development/tools/kustomize/default.nix @@ -1,29 +1,30 @@ -{ lib, buildGoModule, fetchFromGitHub, tree }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "kustomize"; - version = "3.3.1"; - # rev is the 3.3.1 commit, mainly for kustomize version command output - rev = "f2ac5a2d0df13c047fb20cbc12ef1a3b41ce2dad"; + version = "3.8.0"; + # rev is the 3.8.0 commit, mainly for kustomize version command output + rev = "6a50372dd5686df22750b0c729adaf369fbf193c"; - buildFlagsArray = let t = "sigs.k8s.io/kustomize/v3/provenance"; in '' - -ldflags= - -s -X ${t}.version=${version} - -X ${t}.gitCommit=${rev} - -X ${t}.buildDate=unknown - ''; + buildFlagsArray = let t = "sigs.k8s.io/kustomize/api/provenance"; in + '' + -ldflags= + -s -X ${t}.version=${version} + -X ${t}.gitCommit=${rev} + ''; src = fetchFromGitHub { owner = "kubernetes-sigs"; repo = pname; - rev = "v${version}"; - sha256 = "0yxxz0b56r18w178y32s619zy8ci6l93c6vlzx11hhxhbw43f6v6"; + rev = "kustomize/v${version}"; + sha256 = "1v86gqn16xh28gi2fa6jgbbk0clrcng3sbr1az42iy4mm4nmsriy"; }; # avoid finding test and development commands sourceRoot = "source/kustomize"; - vendorSha256 = "06mf5zvxn10g5rqjpqv3afvhj9xmijbj8ag8pqcg1996s4rp4p7a"; + deleteVendor = true; + vendorSha256 = "03z40gi9nrj120cd57pa3fmi8grldyxa65a1lkvlc2r3z9g29vdw"; meta = with lib; { description = "Customization of kubernetes YAML configurations"; @@ -36,4 +37,4 @@ buildGoModule rec { license = licenses.asl20; maintainers = with maintainers; [ carlosdagos vdemeester periklis zaninime ]; }; -} \ No newline at end of file +} diff --git a/pkgs/development/tools/misc/elfinfo/default.nix b/pkgs/development/tools/misc/elfinfo/default.nix index bd8a9fecee675..3778793b71cd2 100644 --- a/pkgs/development/tools/misc/elfinfo/default.nix +++ b/pkgs/development/tools/misc/elfinfo/default.nix @@ -2,14 +2,14 @@ buildGoPackage rec { pname = "elfinfo"; - version = "1.0.1"; + version = "1.1.0"; goPackagePath = "github.com/xyproto/elfinfo"; src = fetchFromGitHub { rev = version; owner = "xyproto"; repo = "elfinfo"; - sha256 = "1iahivc1jm9gv1dijykw2pryjdwb896bv42xmq9v6ax86rsnzqww"; + sha256 = "1n8bg0rcq9fqa6rdnk6x9ngvm59hcayblkpjv9j5myn2vmm6fv8m"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/misc/linuxkit/default.nix b/pkgs/development/tools/misc/linuxkit/default.nix index 4fe7740cadf4a..eeb2102bdf0ce 100644 --- a/pkgs/development/tools/misc/linuxkit/default.nix +++ b/pkgs/development/tools/misc/linuxkit/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "linuxkit"; - version = "0.7"; + version = "0.8"; goPackagePath = "github.com/linuxkit/linuxkit"; @@ -10,14 +10,12 @@ buildGoPackage rec { owner = "linuxkit"; repo = "linuxkit"; rev = "v${version}"; - sha256 = "1mnaqzd4r0fdgjhjvbi4p0wwvz69i82b33iizz81wvkr1mkakgl2"; + sha256 = "15jj60k8wz9cahjbdscnwyyfb1k1grjh7yrilb1cj4r8mby4sp2g"; }; subPackages = [ "src/cmd/linuxkit" ]; - preBuild = '' - buildFlagsArray+=("-ldflags" "-X github.com/linuxkit/linuxkit/src/cmd/linuxkit/version.Version=${src.rev}") - ''; + buildFlagsArray = [ "-ldflags=-s -w -X ${goPackagePath}/src/cmd/linuxkit/version.GitCommit=${src.rev} -X ${goPackagePath}/src/cmd/linuxkit/version.Version=${version}" ]; meta = with lib; { description = "A toolkit for building secure, portable and lean operating systems for containers"; diff --git a/pkgs/development/tools/misc/lit/default.nix b/pkgs/development/tools/misc/lit/default.nix index 1e511cc0f0b02..7c7549e3844c2 100644 --- a/pkgs/development/tools/misc/lit/default.nix +++ b/pkgs/development/tools/misc/lit/default.nix @@ -2,11 +2,11 @@ python3.pkgs.buildPythonApplication rec { pname = "lit"; - version = "0.9.0"; + version = "0.10.0"; src = python3.pkgs.fetchPypi { inherit pname version; - sha256 = "0vkqv0ijjkfg70j26cxqz75bpn2p78all5j5cw2gfcrn4c5aldf0"; + sha256 = "13s8v9s2f284fnh47xdyc75gq2i9pndl39q8v4wl7v7lwri2hv8r"; }; passthru = { diff --git a/pkgs/development/tools/mockgen/default.nix b/pkgs/development/tools/mockgen/default.nix new file mode 100644 index 0000000000000..13a66422a46e0 --- /dev/null +++ b/pkgs/development/tools/mockgen/default.nix @@ -0,0 +1,20 @@ +{ buildGoModule, lib, fetchFromGitHub }: +buildGoModule rec { + pname = "mockgen"; + version = "1.4.3"; + src = fetchFromGitHub { + owner = "golang"; + repo = "mock"; + rev = "v${version}"; + sha256 = "1p37xnja1dgq5ykx24n7wincwz2gahjh71b95p8vpw7ss2g8j8wx"; + }; + vendorSha256 = "1kpiij3pimwv3gn28rbrdvlw9q5c76lzw6zpa12q6pgck76acdw4"; + subPackages = [ "mockgen" ]; + + meta = with lib; { + description = "GoMock is a mocking framework for the Go programming language."; + homepage = "https://github.com/golang/mock"; + license = licenses.asl20; + maintainers = with maintainers; [ bouk ]; + }; +} diff --git a/pkgs/development/tools/open-policy-agent/default.nix b/pkgs/development/tools/open-policy-agent/default.nix index d1ecdd1efd962..48a3bf8e0a6df 100644 --- a/pkgs/development/tools/open-policy-agent/default.nix +++ b/pkgs/development/tools/open-policy-agent/default.nix @@ -13,6 +13,11 @@ buildGoPackage rec { }; goDeps = ./deps.nix; + buildFlagsArray = '' + -ldflags= + -X ${goPackagePath}/version.Version=${version} + ''; + meta = with lib; { description = "General-purpose policy engine"; homepage = "https://www.openpolicyagent.org"; diff --git a/pkgs/development/tools/rust/racer/default.nix b/pkgs/development/tools/rust/racer/default.nix index f74e757184e0a..da7fe98aafe2c 100644 --- a/pkgs/development/tools/rust/racer/default.nix +++ b/pkgs/development/tools/rust/racer/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "racer"; - version = "2.1.33"; + version = "2.1.35"; src = fetchFromGitHub { owner = "racer-rust"; repo = "racer"; rev = "v${version}"; - sha256 = "0fxcif42k8x70zwpi76h2jxyr048mjzakh52yzqavyr8irl55ll2"; + sha256 = "0c00b81s7abnadjbf4i39lhdkipx7z44sr8p78jd1fl61yyrspli"; }; - cargoSha256 = "115ydgv4wd4bf3xhm96zlc9z1lhmrcnm1v5pgzl9846l27ka1z13"; + cargoSha256 = "1nbp2jp65fqwsq9i04iyi4pbszs035w6id50p5ypw234cqxznikm"; nativeBuildInputs = [ makeWrapper ]; buildInputs = stdenv.lib.optional stdenv.isDarwin Security; diff --git a/pkgs/development/tools/skopeo/default.nix b/pkgs/development/tools/skopeo/default.nix index 4bf87a2eda6fc..f9b1bbd9c451b 100644 --- a/pkgs/development/tools/skopeo/default.nix +++ b/pkgs/development/tools/skopeo/default.nix @@ -15,13 +15,13 @@ buildGoModule rec { pname = "skopeo"; - version = "1.1.0"; + version = "1.1.1"; src = fetchFromGitHub { rev = "v${version}"; owner = "containers"; repo = "skopeo"; - sha256 = "1cxhwfrp5cjdq56vzy7gmidvm1z02f0rz2r1lv0d9ymnjlsjp9s3"; + sha256 = "0wkpw8fizxjpfypflp7rs1q128dg4hadwzdvn8k41h7f8cbcb39x"; }; outputs = [ "out" "man" ]; diff --git a/pkgs/development/web/nodejs/v14.nix b/pkgs/development/web/nodejs/v14.nix index a315911789ead..572c256dccee8 100644 --- a/pkgs/development/web/nodejs/v14.nix +++ b/pkgs/development/web/nodejs/v14.nix @@ -9,6 +9,6 @@ let in buildNodejs { inherit enableNpm; - version = "14.6.0"; - sha256 = "153a07ffrmvwbsc78wrc0xnwymmzrhva0kn6mgnfi3086v3h1wss"; + version = "14.7.0"; + sha256 = "0vwf523ahw0145wp17zkaflwm5823v1vz1kkglj25gzjydiiqbya"; } diff --git a/pkgs/games/minecraft/default.nix b/pkgs/games/minecraft/default.nix index ac09b5078afd4..9d23515c03946 100644 --- a/pkgs/games/minecraft/default.nix +++ b/pkgs/games/minecraft/default.nix @@ -87,11 +87,11 @@ in stdenv.mkDerivation rec { pname = "minecraft-launcher"; - version = "2.1.15852"; + version = "2.1.16102"; src = fetchurl { url = "https://launcher.mojang.com/download/linux/x86_64/minecraft-launcher_${version}.tar.gz"; - sha256 = "06k3npsk878dh93r7fws5r438hwll3x3kxi0zslb10z634marn2x"; + sha256 = "17zgxmijk9mq651h7ymkr7h2099cw23kc0r7jyfkdccp60dfd60i"; }; icon = fetchurl { diff --git a/pkgs/games/osu-lazer/default.nix b/pkgs/games/osu-lazer/default.nix index 93c04e8852fe6..9ed7061b196d1 100644 --- a/pkgs/games/osu-lazer/default.nix +++ b/pkgs/games/osu-lazer/default.nix @@ -13,13 +13,13 @@ let in stdenv.mkDerivation rec { pname = "osu-lazer"; - version = "2020.714.0"; + version = "2020.725.0"; src = fetchFromGitHub { owner = "ppy"; repo = "osu"; rev = version; - sha256 = "1dh3krvs7mfiyyr3cjkp396zaipcibw2s45smfzr9aqrznsqx64v"; + sha256 = "0s7pgqnszz1ahjg4jni7q6009n1xpa46ndzsv179czz4xa09namf"; }; nativeBuildInputs = [ dotnet-sdk dotnetPackages.Nuget makeWrapper ]; diff --git a/pkgs/games/osu-lazer/deps.nix b/pkgs/games/osu-lazer/deps.nix index 53703652cc185..3e7174d8ad431 100644 --- a/pkgs/games/osu-lazer/deps.nix +++ b/pkgs/games/osu-lazer/deps.nix @@ -581,8 +581,8 @@ }) (fetchNuGet { name = "ppy.osu.Framework"; - version = "2020.714.1"; - sha256 = "0x3f9grxi9ww151n9bppzrjf2s2bqfggv2chj0fhi9lm3ai2wvqc"; + version = "2020.723.0"; + sha256 = "19cijwky9rq77ba1kpgihl46jclif30bkhnpfj4x17bhwc4f8cs6"; }) (fetchNuGet { name = "ppy.osu.Framework.NativeLibs"; @@ -591,13 +591,13 @@ }) (fetchNuGet { name = "ppy.osu.Game.Resources"; - version = "2020.714.0"; - sha256 = "15papgd97pjvdx951hjm9w0d99rscvq2i5l98f746c6w87l1fk2n"; + version = "2020.715.0"; + sha256 = "1d1zx6n6z1gjvmw12z29hsy9g0iqqipfgs125zmy4ydsx09xb6vc"; }) (fetchNuGet { name = "ppy.osuTK.NS20"; - version = "1.0.159"; - sha256 = "0k69vc8f0vvyf49c5xb1brnw1a1g8s4k2ljw3za1dq1ilqxw7wm2"; + version = "1.0.161"; + sha256 = "0li5vcpki1ih605c8h1hjf15m9wawkdaizcxib6v3mfjf860ma3s"; }) (fetchNuGet { name = "ppy.SDL2-CS"; diff --git a/pkgs/misc/drivers/epson-escpr2/default.nix b/pkgs/misc/drivers/epson-escpr2/default.nix index 80aa410017da9..2e587cbd0449c 100644 --- a/pkgs/misc/drivers/epson-escpr2/default.nix +++ b/pkgs/misc/drivers/epson-escpr2/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "epson-inkjet-printer-escpr2"; - version = "1.1.13"; + version = "1.1.15"; src = fetchurl { # To find new versions, visit @@ -11,10 +11,10 @@ stdenv.mkDerivation rec { # version. # NOTE: Don't forget to update the webarchive link too! urls = [ - "https://download3.ebz.epson.net/dsc/f/03/00/11/33/72/48e6a853e518a1bedaee575113e087c0bd5d6e2e/epson-inkjet-printer-escpr2-1.1.13-1lsb3.2.src.rpm" - "https://web.archive.org/web/20200629154055if_/https://download3.ebz.epson.net/dsc/f/03/00/11/33/72/48e6a853e518a1bedaee575113e087c0bd5d6e2e/epson-inkjet-printer-escpr2-1.1.13-1lsb3.2.src.rpm" + "https://download3.ebz.epson.net/dsc/f/03/00/11/56/43/b1a6f1193e073c4c049da9404806c61052b62419/epson-inkjet-printer-escpr2-1.1.15-1lsb3.2.src.rpm" + "https://web.archive.org/web/20200726093746if_/https://download3.ebz.epson.net/dsc/f/03/00/11/56/43/b1a6f1193e073c4c049da9404806c61052b62419/epson-inkjet-printer-escpr2-1.1.15-1lsb3.2.src.rpm" ]; - sha256 = "07g62vndn2wh9bablvdl2cxn9wq3hzn16mqji27j20h33cwqmzj1"; + sha256 = "0a6pzpx281dv9g148jp60l5z0brf260zb54dq6g1ixz4bmjz3f1f"; }; patches = [ ./cups-filter-ppd-dirs.patch ]; diff --git a/pkgs/misc/emulators/snes9x-gtk/default.nix b/pkgs/misc/emulators/snes9x-gtk/default.nix index 6560024b19e0e..f33af245f7102 100644 --- a/pkgs/misc/emulators/snes9x-gtk/default.nix +++ b/pkgs/misc/emulators/snes9x-gtk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig +{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, wrapGAppsHook , SDL2, zlib, gtk3, libxml2, libXv, epoxy, minizip, pulseaudio, portaudio }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; enableParallelBuilding = true; - nativeBuildInputs = [ meson ninja pkgconfig ]; + nativeBuildInputs = [ meson ninja pkgconfig wrapGAppsHook ]; buildInputs = [ SDL2 zlib gtk3 libxml2 libXv epoxy minizip pulseaudio portaudio ]; preConfigure = "cd gtk"; diff --git a/pkgs/misc/screensavers/light-locker/default.nix b/pkgs/misc/screensavers/light-locker/default.nix index 4d257650338c0..c4915bec8959a 100644 --- a/pkgs/misc/screensavers/light-locker/default.nix +++ b/pkgs/misc/screensavers/light-locker/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, nix-update-script , meson , ninja , pkgconfig @@ -65,7 +66,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = pantheon.updateScript { + updateScript = nix-update-script { attrPath = pname; }; }; diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index d559b69fcf679..e623a9c56f821 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.14.189"; + version = "4.14.190"; # 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 = "1qgr6hb714xi7rav4za4vk4l7c0ma3ndf0f2ca3q8ly5gd2j3rd7"; + sha256 = "0h9zxm8l8hn19x7n31z3185y2frh5ij8lidyffx1a2pgjcvml5vg"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix index 5cf6cd26cab1d..68733f185c47b 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.134"; + version = "4.19.135"; # 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 = "0vrsiqqsiv0z4jhafqch2g27ig28nmw69hw32a8lc5fkcm7shzbx"; + sha256 = "165g6agfvjxi5qi9gm5ilnfn6d01shjwypia3n4370i5lv5cxmrk"; }; } // (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 6f0a0eb785e5a..3bef7aac9ccda 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.53"; + version = "5.4.54"; # 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 = "08bd7lgj2c26h3rm8lm7w6dvi8zhjiilmrxf1rpp5m90jbwvd9zs"; + sha256 = "0xzlvd9h9vf9m9x088kacwd25whn1anq4bxpd3bg9s5c1r7a3qh3"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-5.7.nix b/pkgs/os-specific/linux/kernel/linux-5.7.nix index c32f4a2352f9c..43b05c8925d9b 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.7.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.7.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.7.10"; + version = "5.7.11"; # 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 = "0i1x347q1rs9r11f7qic62d5465dzngxs0n44ryknmxpcl6469a7"; + sha256 = "1wb0xm9srkrzrrs6zi7ydykyiwn0247r3z9axf79khqkm8r30ack"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-libre.nix b/pkgs/os-specific/linux/kernel/linux-libre.nix index 4f84d0092a8ae..9fd107661c049 100644 --- a/pkgs/os-specific/linux/kernel/linux-libre.nix +++ b/pkgs/os-specific/linux/kernel/linux-libre.nix @@ -1,8 +1,8 @@ { stdenv, lib, fetchsvn, linux , scripts ? fetchsvn { url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/"; - rev = "17570"; - sha256 = "1qh1krxd8i6j18apnn6k104kw35h2yph8cb0igvnj6ymxdh1k3qs"; + rev = "17583"; + sha256 = "0d65in4ggnqyc0s2qry883y6pjkakd2h7rdaai1763jsq6inm3ha"; } , ... }: diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index feb62f371fffd..a2163ba323a9b 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.8-rc6"; + version = "5.8-rc7"; extraMeta.branch = "5.8"; # modDirVersion needs to be x.y.z, will always add .0 @@ -11,7 +11,7 @@ buildLinux (args // rec { src = fetchurl { url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz"; - sha256 = "0nlbp28rxi48qhwd04bf7v3pcgf5g3cgijdsn9sqkwkmaj855r47"; + sha256 = "1v6ch9lwbckmv66w6ysj24ap41pfxq55ssrfkg0qyz2pv0mc1rxc"; }; # Should the testing kernels ever be built on Hydra? diff --git a/pkgs/os-specific/linux/multipath-tools/default.nix b/pkgs/os-specific/linux/multipath-tools/default.nix index 1c00ed9887dfb..02853f6497fc0 100644 --- a/pkgs/os-specific/linux/multipath-tools/default.nix +++ b/pkgs/os-specific/linux/multipath-tools/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ]; postPatch = '' - substituteInPlace libmultipath/Makefile --replace /usr/include/libdevmapper.h ${lvm2}/include/libdevmapper.h + substituteInPlace libmultipath/Makefile --replace /usr/include/libdevmapper.h ${stdenv.lib.getDev lvm2}/include/libdevmapper.h sed -i -re ' s,^( *#define +DEFAULT_MULTIPATHDIR\>).*,\1 "'"$out/lib/multipath"'", ' libmultipath/defaults.h diff --git a/pkgs/os-specific/linux/open-iscsi/default.nix b/pkgs/os-specific/linux/open-iscsi/default.nix index 43859dc9af3a1..01bbd9a9cc16d 100644 --- a/pkgs/os-specific/linux/open-iscsi/default.nix +++ b/pkgs/os-specific/linux/open-iscsi/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { pname = "open-iscsi"; - version = "2.1.1"; + version = "2.1.2"; nativeBuildInputs = [ autoconf automake gettext libtool perl pkgconf ]; buildInputs = [ kmod openisns.lib openssl systemd utillinux ]; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { owner = "open-iscsi"; repo = "open-iscsi"; rev = version; - sha256 = "1xa3mbid9mkajp8mr8jx6cymv0kd7yqs96jvff54n6wb9qhn9qll"; + sha256 = "0fazf2ighj0akrvcj3jm3kd6wl9lgznvr38g6icwfkqk7bykjkam"; }; DESTDIR = "$(out)"; diff --git a/pkgs/os-specific/linux/pcm/default.nix b/pkgs/os-specific/linux/pcm/default.nix index f8f0d165d74b4..06126a929582b 100644 --- a/pkgs/os-specific/linux/pcm/default.nix +++ b/pkgs/os-specific/linux/pcm/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - version = "202005"; + version = "202007"; pname = "pcm"; src = fetchFromGitHub { owner = "opcm"; repo = "pcm"; rev = version; - sha256 = "10dyjgbxb263i64p4zfvy6xjb2hp7wg2k6ygsr8ikjawllxp8m01"; + sha256 = "1qqp51mvi52jvf6zf4g1fzv6nh9p37y0i7r2y273gwcdygbidzma"; }; installPhase = '' diff --git a/pkgs/os-specific/linux/sd-switch/default.nix b/pkgs/os-specific/linux/sd-switch/default.nix index df929278e924c..7cbad8d6df3bf 100644 --- a/pkgs/os-specific/linux/sd-switch/default.nix +++ b/pkgs/os-specific/linux/sd-switch/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "sd-switch"; - version = "0.1.0"; + version = "0.2.0"; src = fetchFromGitLab { owner = "rycee"; repo = pname; rev = version; - sha256 = "0njihfqvvp4lm2572sw5xadwg3nrvx2i1qrfm7fi0i3v5pxdc7g0"; + sha256 = "1bhks4ma3sn95bsszs6lj9cwfr8zgmja0hqfp8xr5iq77ww2p6k3"; }; - cargoSha256 = "0ba2j0v2z90fivwdr5akdrsz9f479gz20yh85yiy05rkjhjy8cvv"; + cargoSha256 = "0lskxakzh3yji0rzk8jcfz1sv4j19b5kmdsaj7401m5w84s1cbjw"; nativeBuildInputs = [ pkg-config ]; buildInputs = [ dbus ]; diff --git a/pkgs/servers/computing/storm/default.nix b/pkgs/servers/computing/storm/default.nix index d55dd14601e8b..b8ae0bc4e852d 100644 --- a/pkgs/servers/computing/storm/default.nix +++ b/pkgs/servers/computing/storm/default.nix @@ -1,24 +1,27 @@ { stdenv, lib, fetchurl, zip, unzip -, jzmq, jdk, python -, confFile ? "", extraLibraryPaths ? [], extraJars ? [] }: +, jdk, python +, confFile ? "" +, extraLibraryPaths ? [] +, extraJars ? [] +}: stdenv.mkDerivation rec { - name = "apache-storm-" + version; - version = "1.2.1"; + pname = "apache-storm"; + version = "2.1.0"; + name = "${pname}-${version}"; + src = fetchurl { - url = - "mirror://apache/storm/${name}/${name}.tar.gz"; - sha256 = "177dqgbviagrpvalg8h67mwiwwgmiqsg0hh97hcqqcjg71ypnjkv"; + url = "mirror://apache/storm/${name}/${name}.tar.gz"; + sha256 = "1i3z08rfy7aavshrbrskv9dmlhx1fjgrhhqm0pczfam4vnas8yg2"; }; - buildInputs = [ zip unzip jzmq ]; + buildInputs = [ zip unzip ]; installPhase = '' mkdir -p $out/share/${name} mv public $out/docs mv examples $out/share/${name}/. - rm -f lib/jzmq* || exit 1 mv external extlib* lib $out/. mv conf bin $out/. mv log4j2 $out/conf/. @@ -35,21 +38,22 @@ stdenv.mkDerivation rec { -e "s|STORM_CONF_DIR = .*|STORM_CONF_DIR = os.getenv('STORM_CONF_DIR','$out/conf')|" \ -e 's|STORM_LOG4J2_CONF_DIR =.*|STORM_LOG4J2_CONF_DIR = os.path.join(STORM_CONF_DIR, "log4j2")|' \ $out/bin/storm.py + # Default jdk location sed -i -e 's|#.*export JAVA_HOME=.*|export JAVA_HOME="${jdk.home}"|' \ $out/conf/storm-env.sh - unzip $out/lib/storm-core-${version}.jar defaults.yaml; - zip -d $out/lib/storm-core-${version}.jar defaults.yaml; + ls -lh $out/lib + unzip $out/lib/storm-client-${version}.jar defaults.yaml; + zip -d $out/lib/storm-client-${version}.jar defaults.yaml; sed -i \ - -e 's|java.library.path: .*|java.library.path: "${jzmq}/lib:${lib.concatStringsSep ":" extraLibraryPaths}"|' \ + -e 's|java.library.path: .*|java.library.path: "${lib.concatStringsSep ":" extraLibraryPaths}"|' \ -e 's|storm.log4j2.conf.dir: .*|storm.log4j2.conf.dir: "conf/log4j2"|' \ defaults.yaml ${if confFile != "" then ''cat ${confFile} >> defaults.yaml'' else ""} mv defaults.yaml $out/conf; - # Link to jzmq jar and extra jars + # Link to extra jars cd $out/lib; - ln -s ${jzmq}/share/java/*.jar; ${lib.concatMapStrings (jar: "ln -s ${jar};\n") extraJars} ''; diff --git a/pkgs/servers/dict/default.nix b/pkgs/servers/dict/default.nix index fbffecbafafe6..5e4d625c187b7 100644 --- a/pkgs/servers/dict/default.nix +++ b/pkgs/servers/dict/default.nix @@ -13,23 +13,26 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ bison flex libtool which ]; - # Makefile(.in) contains "clientparse.c clientparse.h: clientparse.y" which - # causes bison to run twice, and break the build when this happens in - # parallel. Test with "make -j clientparse.c clientparse.h". The error - # message may be "mv: cannot move 'y.tab.c' to 'clientparse.c'". - enableParallelBuilding = false; + # In earlier versions, parallel building was not supported but it's OK with 1.13 + enableParallelBuilding = true; patchPhase = "patch -p0 < ${./buildfix.diff}"; + configureFlags = [ "--enable-dictorg" "--datadir=/run/current-system/sw/share/dictd" + "--sysconfdir=/etc" ]; + postInstall = '' + install -Dm444 -t $out/share/doc/${pname} NEWS README + ''; + meta = with stdenv.lib; { description = "Dict protocol server and client"; - homepage = "http://www.dict.org"; - license = licenses.gpl2; + homepage = "http://www.dict.org"; + license = licenses.gpl2; maintainers = with maintainers; [ ]; - platforms = platforms.linux; + platforms = platforms.linux; }; } diff --git a/pkgs/servers/dns/ncdns/default.nix b/pkgs/servers/dns/ncdns/default.nix index 15e400ebad5f6..de28c01474cb3 100644 --- a/pkgs/servers/dns/ncdns/default.nix +++ b/pkgs/servers/dns/ncdns/default.nix @@ -14,7 +14,7 @@ buildGoPackage rec { sha256 = "12q5al48mkjhgyk7z5wyklzzrdbcqhwxl79axa4gh9ld75prghbq"; }; - patches = [ ./fix-tpl-path.nix ]; + patches = [ ./fix-tpl-path.patch ]; buildInputs = [ libcap ]; diff --git a/pkgs/servers/dns/ncdns/fix-tpl-path.nix b/pkgs/servers/dns/ncdns/fix-tpl-path.patch index 850fb4d1b189f..850fb4d1b189f 100644 --- a/pkgs/servers/dns/ncdns/fix-tpl-path.nix +++ b/pkgs/servers/dns/ncdns/fix-tpl-path.patch diff --git a/pkgs/servers/gobetween/default.nix b/pkgs/servers/gobetween/default.nix index 2b474d818ad2a..e8e03a3779fad 100644 --- a/pkgs/servers/gobetween/default.nix +++ b/pkgs/servers/gobetween/default.nix @@ -1,38 +1,27 @@ -{ rsync, buildGoModule, fetchFromGitHub, lib, runCommand, enableStatic ? false }: +{ buildGoModule, fetchFromGitHub, lib, enableStatic ? false }: buildGoModule rec { pname = "gobetween"; - version = "0.7.0"; + version = "0.8.0"; src = fetchFromGitHub { owner = "yyyar"; repo = "gobetween"; rev = version; - sha256 = "f01593509ccece063acd47002c4fc52261fbbbcdbf14b088d813b7d8e38fcca8"; + sha256 = "0bxf89l53sqan9qq23rwawjkcanv9p61sw56zjqhyx78f0bh0zbc"; }; - patches = [ ./gomod.patch ]; deleteVendor = true; + patches = [ + ./gomod.patch + ]; + buildPhase = '' make -e build${lib.optionalString enableStatic "-static"} ''; - lxd = fetchFromGitHub { - owner = "lxc"; - repo = "lxd"; - rev = "41efd98813f3b42f1752ff6c2c7569a054924623"; - sha256 = "02vnvjjkzl7b0i2cn03f1lb3jgj5rd3wdkii4pqi9bvmhzszg0l2"; - }; - - overrideModAttrs = (_: { - postBuild = '' - rm -r vendor/github.com/lxc/lxd - cp -r --reflink=auto ${lxd} vendor/github.com/lxc/lxd - ''; - }); - - vendorSha256 = "1pd0zrjwpw6yv2s86a818yy2ma2fkazd3sb2h6zfp9mvyixgxgri"; + vendorSha256 = "1nkni9ikpc0wngh5v0qmlpn5s9v85lb2ih22f3h3lih7nc29yv87"; installPhase = '' mkdir -p $out/bin diff --git a/pkgs/servers/gobetween/gomod.patch b/pkgs/servers/gobetween/gomod.patch index 98181e3fe794b..2f0fb408061fa 100644 --- a/pkgs/servers/gobetween/gomod.patch +++ b/pkgs/servers/gobetween/gomod.patch @@ -1,21 +1,13 @@ -diff --git a/go.mod b/go.mod -index 536631a..f91e862 100644 ---- a/go.mod -+++ b/go.mod -@@ -7,7 +7,7 @@ require ( - github.com/burntsushi/toml v0.3.1 - github.com/elgs/gojq v0.0.0-20160421194050-81fa9a608a13 - github.com/elgs/gosplitargs v0.0.0-20161028071935-a491c5eeb3c8 // indirect -- github.com/flosch/pongo2 v0.0.0-20181225140029-79872a7b2769 // indirect -+ github.com/flosch/pongo2 v0.0.0-20190707114632-bbf5a6c351f4 // indirect - github.com/fsouza/go-dockerclient v1.3.6 - github.com/gin-contrib/cors v0.0.0-20190301062745-f9e10995c85a - github.com/gin-gonic/gin v1.3.0 -@@ -20,7 +20,6 @@ require ( +diff --git a/src/go.mod b/src/go.mod +index 3242342..795c306 100644 +--- a/src/go.mod ++++ b/src/go.mod +@@ -28,7 +28,7 @@ require ( github.com/juju/go4 v0.0.0-20160222163258-40d72ab9641a // indirect github.com/juju/persistent-cookiejar v0.0.0-20171026135701-d5e5a8405ef9 // indirect - github.com/juju/schema v0.0.0-20181210140654-64a6158e9071 // indirect -- github.com/juju/utils v0.0.0-20180820210520-bf9cc5bdd62d // indirect - github.com/juju/webbrowser v0.0.0-20180907093207-efb9432b2bcb // indirect - github.com/julienschmidt/httprouter v1.2.0 // indirect - github.com/lxc/lxd v0.0.0-20190314233831-41efd98813f3 + github.com/juju/webbrowser v1.0.0 // indirect +- github.com/lxc/lxd v0.0.0-20200706202337-814c96fcec74 ++ github.com/lxc/lxd v0.0.0-20200727014606-0d408e8e8ebb + github.com/mattn/go-colorable v0.1.7 // indirect + github.com/miekg/dns v1.1.30 + github.com/mitchellh/go-testing-interface v1.14.0 // indirect diff --git a/pkgs/servers/mail/exim/default.nix b/pkgs/servers/mail/exim/default.nix index 4d63a7b39c709..210863aa00788 100644 --- a/pkgs/servers/mail/exim/default.nix +++ b/pkgs/servers/mail/exim/default.nix @@ -4,6 +4,7 @@ , enableAuthDovecot ? false, dovecot , enablePAM ? false, pam , enableSPF ? true, libspf2 +, enableDMARC ? true, opendmarc }: stdenv.mkDerivation rec { @@ -21,7 +22,8 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optionals enableMySQL [ libmysqlclient zlib ] ++ stdenv.lib.optional enableAuthDovecot dovecot ++ stdenv.lib.optional enablePAM pam - ++ stdenv.lib.optional enableSPF libspf2; + ++ stdenv.lib.optional enableSPF libspf2 + ++ stdenv.lib.optional enableDMARC opendmarc; preBuild = '' sed ' @@ -71,6 +73,10 @@ stdenv.mkDerivation rec { s:^# \(SUPPORT_SPF\)=.*:\1=yes: s:^# \(LDFLAGS += -lspf2\):\1: ''} + ${stdenv.lib.optionalString enableDMARC '' + s:^# \(SUPPORT_DMARC\)=.*:\1=yes: + s:^# \(LDFLAGS += -lopendmarc\):\1: + ''} #/^\s*#.*/d #/^\s*$/d ' < src/EDITME > Local/Makefile diff --git a/pkgs/servers/mautrix-telegram/default.nix b/pkgs/servers/mautrix-telegram/default.nix index da4f77e3394c9..8d5349dbf3665 100644 --- a/pkgs/servers/mautrix-telegram/default.nix +++ b/pkgs/servers/mautrix-telegram/default.nix @@ -1,15 +1,17 @@ -{ lib, python3, mautrix-telegram }: +{ lib, python3, mautrix-telegram, fetchFromGitHub }: with python3.pkgs; buildPythonPackage rec { pname = "mautrix-telegram"; - version = "0.8.1"; + version = "0.8.2"; disabled = pythonOlder "3.6"; - src = fetchPypi { - inherit pname version; - sha256 = "1gz6d28dq3ykvr3wp85wkc05lbppdzf5j9i62pgx0blmx3jh0yrk"; + src = fetchFromGitHub { + owner = "tulir"; + repo = pname; + rev = "v${version}"; + sha256 = "0mhy9b933haz1bldkglvn81warjxdjdzgkviiv5k6fykghq473jf"; }; postPatch = '' diff --git a/pkgs/servers/metabase/default.nix b/pkgs/servers/metabase/default.nix index a85e6bbf71ea0..f7d96fb52139b 100644 --- a/pkgs/servers/metabase/default.nix +++ b/pkgs/servers/metabase/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "metabase"; - version = "0.35.4"; + version = "0.36.0"; src = fetchurl { url = "http://downloads.metabase.com/v${version}/metabase.jar"; - sha256 = "1mggrkd4ih8fak4nk3a8z5677nblvihjvkvgmix080cps44bcfd8"; + sha256 = "19nfr0mryc0m4qg2vjixxnpkbp6is0c21c7mkb0qisvd2d939yd0"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/servers/monitoring/do-agent/default.nix b/pkgs/servers/monitoring/do-agent/default.nix index 1d6bb7198e5b4..8c851715e07c1 100644 --- a/pkgs/servers/monitoring/do-agent/default.nix +++ b/pkgs/servers/monitoring/do-agent/default.nix @@ -18,6 +18,10 @@ buildGoModule rec { vendorSha256 = null; + postInstall = '' + install -Dm444 -t $out/lib/systemd/system $src/packaging/etc/systemd/system/do-agent.service + ''; + meta = with lib; { description = "DigitalOcean droplet system metrics agent"; longDescription = '' @@ -30,4 +34,4 @@ buildGoModule rec { maintainers = with maintainers; [ yvt ]; platforms = platforms.linux; }; -} \ No newline at end of file +} diff --git a/pkgs/servers/monitoring/kapacitor/default.nix b/pkgs/servers/monitoring/kapacitor/default.nix index 6f2e51fffd61c..0a15daf71c613 100644 --- a/pkgs/servers/monitoring/kapacitor/default.nix +++ b/pkgs/servers/monitoring/kapacitor/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "kapacitor"; - version = "1.5.5"; + version = "1.5.6"; goPackagePath = "github.com/influxdata/kapacitor"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "influxdata"; repo = "kapacitor"; rev = "v${version}"; - sha256 = "17zk7fs6yl5hmhr3inwkafwmg2ihaicj43gdi5888dinhpa9bij1"; + sha256 = "1jb04lnxjrms7x5nlrsd1s465rramm9z4zkqpfw1vfdsqa2dd8rc"; }; meta = with lib; { diff --git a/pkgs/shells/dash/0001-fix-dirent64-et-al-on-darwin.patch b/pkgs/shells/dash/0001-fix-dirent64-et-al-on-darwin.patch new file mode 100644 index 0000000000000..f2e0802f79813 --- /dev/null +++ b/pkgs/shells/dash/0001-fix-dirent64-et-al-on-darwin.patch @@ -0,0 +1,41 @@ +From 7e75779eaeacdbb46a387a59d9aaf1481a1da3e5 Mon Sep 17 00:00:00 2001 +From: Adrian Gierakowski <agierakowski@gmail.com> +Date: Sun, 19 Jul 2020 08:38:05 +0100 +Subject: [PATCH] fix dirent64 et al on darwin + +--- + configure.ac | 11 +++++++++++ + 1 file changed, 11 insertions(+) + +diff --git a/configure.ac b/configure.ac +index b8faca9..cee1e4d 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -139,6 +139,7 @@ if test "$ac_cv_func_signal" != yes; then + [klibc has bsd_signal instead of signal])]) + fi + ++dnl TODO: stat64 is deprecated since macOS 10.6 + dnl Check for stat64 (dietlibc/klibc). + AC_CHECK_FUNC(stat64,, [ + AC_DEFINE(fstat64, fstat, [64-bit operations are the same as 32-bit]) +@@ -155,6 +156,16 @@ AC_CHECK_FUNC(open64,, [ + AC_DEFINE(open64, open, [64-bit operations are the same as 32-bit]) + ]) + ++dnl OS X apparently has stat64 but not readdir64. ++AC_CHECK_FUNC(readdir64,, [ ++ AC_DEFINE(readdir64, readdir, [64-bit operations are the same as 32-bit]) ++]) ++ ++dnl OS X apparently has stat64 but not dirent64. ++AC_CHECK_TYPE(struct dirent64,, [ ++ AC_DEFINE(dirent64, dirent, [64-bit operations are the same as 32-bit]) ++],[#include <dirent.h>]) ++ + dnl Check if struct stat has st_mtim. + AC_MSG_CHECKING(for stat::st_mtim) + AC_COMPILE_IFELSE( +-- +2.15.1 + diff --git a/pkgs/shells/dash/default.nix b/pkgs/shells/dash/default.nix index c76191cfd3778..f9dd578ad98b2 100644 --- a/pkgs/shells/dash/default.nix +++ b/pkgs/shells/dash/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ autoreconfHook, lib, stdenv, fetchurl }: stdenv.mkDerivation rec { name = "dash-0.5.11.1"; @@ -10,6 +10,10 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; + # Temporary fix until a proper one is accepted upstream + patches = lib.lists.optional stdenv.isDarwin ./0001-fix-dirent64-et-al-on-darwin.patch; + nativeBuildInputs = lib.lists.optional stdenv.isDarwin autoreconfHook; + meta = with stdenv.lib; { homepage = "http://gondor.apana.org.au/~herbert/dash/"; description = "A POSIX-compliant implementation of /bin/sh that aims to be as small as possible"; diff --git a/pkgs/tools/admin/mycli/default.nix b/pkgs/tools/admin/mycli/default.nix index 7a7022c917642..07106a72585f7 100644 --- a/pkgs/tools/admin/mycli/default.nix +++ b/pkgs/tools/admin/mycli/default.nix @@ -7,11 +7,11 @@ with python3.pkgs; buildPythonApplication rec { pname = "mycli"; - version = "1.21.1"; + version = "1.22.1"; src = fetchPypi { inherit pname version; - sha256 = "1q9p0yik9cpvpxjs048anvhicfcna84mpl7axv9bwgr48w40lqwg"; + sha256 = "18qxxrpdksg3s73va7nkbkwi34kg9m1pls7w4fh5f4jk4p434zsf"; }; propagatedBuildInputs = [ @@ -24,13 +24,8 @@ buildPythonApplication rec { export HOME=. export LC_ALL="en_US.UTF-8" - py.test - ''; - - # TODO: remove with next release - postPatch = '' - substituteInPlace setup.py \ - --replace "prompt_toolkit>=2.0.6,<3.0.0" "prompt_toolkit" + py.test \ + --ignore=mycli/packages/paramiko_stub/__init__.py ''; meta = { diff --git a/pkgs/tools/graphics/lprof/keep-environment.patch b/pkgs/tools/graphics/lprof/keep-environment.patch index 4dcb5b0448ddf..7d0beaed587a8 100644 --- a/pkgs/tools/graphics/lprof/keep-environment.patch +++ b/pkgs/tools/graphics/lprof/keep-environment.patch @@ -3,7 +3,7 @@ @@ -22,12 +22,7 @@ # opts.Add(BoolOption('qt-mt-lib', 'Flag used to set QT library to either qt-mt or qt. Value of 1 = qt-mt, 0 = qt.', 'yes')) - # setup base environemnt + # setup base environment -env = Environment( - ENV = { - 'PATH' : os.environ[ 'PATH' ], diff --git a/pkgs/tools/misc/hashit/default.nix b/pkgs/tools/misc/hashit/default.nix index 5793382838b9b..e33201c706bac 100644 --- a/pkgs/tools/misc/hashit/default.nix +++ b/pkgs/tools/misc/hashit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, vala, pantheon, python3, libgee, gtk3, desktop-file-utils, wrapGAppsHook }: +{ stdenv, fetchFromGitHub, nix-update-script, meson, ninja, pkgconfig, vala, pantheon, python3, libgee, gtk3, desktop-file-utils, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "hashit"; @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = pantheon.updateScript { + updateScript = nix-update-script { attrPath = pname; }; }; diff --git a/pkgs/tools/misc/lf/default.nix b/pkgs/tools/misc/lf/default.nix index 8627003db5f9e..e32bdd71b5ede 100644 --- a/pkgs/tools/misc/lf/default.nix +++ b/pkgs/tools/misc/lf/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "lf"; - version = "14"; + version = "15"; src = fetchFromGitHub { owner = "gokcehan"; repo = "lf"; rev = "r${version}"; - sha256 = "0kl9yrgph1i0jbxhlg3k0411436w80xw1s8dzd7v7h2raygkb4is"; + sha256 = "1fjwkng6fnbl6dlicbxj0z92hl9xggni5zfi3nsxn3fa6rmzbiay"; }; - vendorSha256 = "1zb2z3c2w4gnq9cjczg1y7r7jg4mlrm2hsb12dqd9w8mh44rvr37"; + vendorSha256 = "10na3jzvln353ygcvbhj4243yr83skw5zf3r2n8p6d7i83i86c8w"; nativeBuildInputs = [ installShellFiles ]; @@ -47,4 +47,4 @@ buildGoModule rec { platforms = platforms.unix; maintainers = with maintainers; [ primeos ]; }; -} \ No newline at end of file +} diff --git a/pkgs/tools/misc/lorri/default.nix b/pkgs/tools/misc/lorri/default.nix index 002a6e2eaec97..c0f5aec1e4db2 100644 --- a/pkgs/tools/misc/lorri/default.nix +++ b/pkgs/tools/misc/lorri/default.nix @@ -12,9 +12,9 @@ , Security }: -rustPlatform.buildRustPackage rec { +(rustPlatform.buildRustPackage rec { pname = "lorri"; - version = "1.1"; + version = "1.1.1"; meta = with stdenv.lib; { description = "Your project's nix-env"; @@ -28,11 +28,11 @@ rustPlatform.buildRustPackage rec { repo = pname; # Run `eval $(nix-build -A lorri.updater)` after updating the revision! # ALSO don’t forget to update the cargoSha256! - rev = "93d93013217cd9aa09d2bd316d6c3abf827a6601"; - sha256 = "0wbkx8hmikngfp6fp0y65yla22f3k0jszq8a6pas80q0b33llwm5"; + rev = "05ea21170a18800e83b3dcf1e3d347f83a9fa992"; + sha256 = "1lgig5q1anmmmc1i1qnbx8rd8mqvm5csgnlaxlj4l4rxjmgiv06n"; }; - cargoSha256 = "1a3n1ylyp63x6v7b07nnqpfxjzmsgwmgraza23lx8z4gh167gv46"; + cargoSha256 = "16asbpq47f3zcv4j9rzqx9v1317qz7xjr7dxd019vpr88zyk4fi1"; doCheck = false; BUILD_REV_COUNT = src.revCount or 1; @@ -42,6 +42,17 @@ rustPlatform.buildRustPackage rec { buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices Security ]; + # copy the docs to the $man and $doc outputs + postInstall = '' + install -Dm644 lorri.1 $man/share/man/man1/lorri.1 + install -Dm644 -t $doc/share/doc/lorri/ \ + README.md \ + CONTRIBUTING.md \ + LICENSE \ + MAINTAINERS.md + cp -r contrib/ $doc/share/doc/lorri/contrib + ''; + passthru = { updater = writers.writeBash "copy-runtime-nix.sh" '' set -euo pipefail @@ -52,4 +63,7 @@ rustPlatform.buildRustPackage rec { nixos = nixosTests.lorri; }; }; -} +}).overrideAttrs (old: { + # add man and doc outputs to put our documentation into + outputs = old.outputs or [ "out" ] ++ [ "man" "doc" ]; +}) diff --git a/pkgs/tools/misc/mc/default.nix b/pkgs/tools/misc/mc/default.nix index 07c5f9b351748..fb279f313b4d5 100644 --- a/pkgs/tools/misc/mc/default.nix +++ b/pkgs/tools/misc/mc/default.nix @@ -20,11 +20,11 @@ stdenv.mkDerivation rec { pname = "mc"; - version = "4.8.24"; + version = "4.8.25"; src = fetchurl { url = "https://www.midnight-commander.org/downloads/${pname}-${version}.tar.xz"; - sha256 = "0ikd2yql44p7nagmb08dmjqdwadclnvgr7ri9pmzc2s5f301r7w5"; + sha256 = "12jlnabnc91xsm35g99g2wnh96jmznvrhffd18rj7fqfy8brdhgz"; }; nativeBuildInputs = [ pkgconfig autoreconfHook ]; diff --git a/pkgs/tools/misc/miniserve/default.nix b/pkgs/tools/misc/miniserve/default.nix index 503131898c8f8..5da2a366cf88d 100644 --- a/pkgs/tools/misc/miniserve/default.nix +++ b/pkgs/tools/misc/miniserve/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "miniserve"; - version = "0.7.0"; + version = "0.8.0"; src = fetchFromGitHub { owner = "svenstaro"; repo = "miniserve"; rev = "v${version}"; - sha256 = "06nrb84xfvx02yc4bjn1szfq3bjy8mqgxwwrjghl7vpcw51qhlk5"; + sha256 = "1h4872jb0xz8yzs02q8wfvqrp20y7kdva5ka6bh6nq4jrnnky8zb"; }; - cargoSha256 = "0mk8hvhjqggfr410yka9ygb41l1bnsizs8py3100xf685yxy5mhl"; + cargoSha256 = "1vq1rrav9r9z4y0v7hpn0fcq64slq4zrm2pybmnmb7h9nfxxyr6k"; RUSTC_BOOTSTRAP = 1; diff --git a/pkgs/tools/misc/mprime/default.nix b/pkgs/tools/misc/mprime/default.nix index 363e90ab5f238..3189e41de8d4f 100644 --- a/pkgs/tools/misc/mprime/default.nix +++ b/pkgs/tools/misc/mprime/default.nix @@ -1,34 +1,45 @@ { stdenv, lib, fetchurl, unzip, curl, hwloc, gmp }: let - srcDir = - if stdenv.hostPlatform.system == "x86_64-linux" then "linux64" - else if stdenv.hostPlatform.system == "i686-linux" then "linux" - else if stdenv.hostPlatform.system == "x86_64-darwin" then "macosx64" - else throwSystem; throwSystem = throw "Unsupported system: ${stdenv.hostPlatform.system}"; - gwnum = - if stdenv.hostPlatform.system == "x86_64-linux" then "make64" - else if stdenv.hostPlatform.system == "i686-linux" then "makefile" - else if stdenv.hostPlatform.system == "x86_64-darwin" then "makemac" - else throwSystem; + + srcDir = { + x86_64-linux = "linux64"; + i686-linux = "linux"; + x86_64-darwin = "macosx64"; + }."${stdenv.hostPlatform.system}" or throwSystem; + + gwnum = { + x86_64-linux = "make64"; + i686-linux = "makefile"; + x86_64-darwin = "makemac"; + }."${stdenv.hostPlatform.system}" or throwSystem; in stdenv.mkDerivation rec { pname = "mprime"; - version = "29.4b7"; + version = "29.8b7"; src = fetchurl { url = "https://www.mersenne.org/ftp_root/gimps/p95v${lib.replaceStrings ["."] [""] version}.source.zip"; - sha256 = "0idaqm46m4yis7vl014scx57lpccvjbnyy79gmj8caxghyajws0m"; + sha256 = "0x5dk2dcppfnq17n79297lmn6p56rd66cbwrh1ds4l8r4hmwsjaj"; }; - unpackCmd = "unzip -d src -q $curSrc || true"; + postPatch = '' + sed -i ${srcDir}/makefile \ + -e 's/^LFLAGS =.*//' + substituteInPlace ${srcDir}/makefile \ + --replace '-Wl,-Bstatic' "" \ + --replace '-Wl,-Bdynamic' "" + ''; + + sourceRoot = "."; nativeBuildInputs = [ unzip ]; + buildInputs = [ curl hwloc gmp ]; - patches = [ ./makefile.patch ]; + enableParallelBuilding = true; buildPhase = '' make -C gwnum -f ${gwnum} @@ -36,10 +47,10 @@ stdenv.mkDerivation rec { ''; installPhase = '' - install -D ${srcDir}/mprime $out/bin/mprime + install -Dm555 -t $out/bin ${srcDir}/mprime ''; - - meta = { + + meta = with lib; { description = "Mersenne prime search / System stability tester"; longDescription = '' MPrime is the Linux command-line interface version of Prime95, to be run @@ -50,7 +61,7 @@ stdenv.mkDerivation rec { homepage = "https://www.mersenne.org/"; # Unfree, because of a license requirement to share prize money if you find # a suitable prime. http://www.mersenne.org/legal/#EULA - license = stdenv.lib.licenses.unfree; + license = licenses.unfree; # Untested on linux-32 and osx. Works in theory. platforms = ["i686-linux" "x86_64-linux" "x86_64-darwin"]; }; diff --git a/pkgs/tools/misc/mprime/makefile.patch b/pkgs/tools/misc/mprime/makefile.patch deleted file mode 100644 index 6ed9cf69384d8..0000000000000 --- a/pkgs/tools/misc/mprime/makefile.patch +++ /dev/null @@ -1,41 +0,0 @@ -diff -dur src.old/linux/makefile src.new/linux/makefile ---- src.old/linux/makefile 2018-01-04 20:49:00.000000000 +0300 -+++ src.new/linux/makefile 2018-02-15 12:32:02.913011604 +0300 -@@ -28,8 +28,8 @@ - CPP = g++ - CPPFLAGS = -I.. -I../gwnum -O2 -march=i486 -malign-double - --LFLAGS = -Wl,-M -Wl,-L/usr/local/lib --LIBS = ../gwnum/gwnum.a ../gwnum/gwnum.ld -lm -lpthread -Wl,-Bstatic -lhwloc -Wl,-Bstatic -lcurl -Wl,-Bdynamic -lrt -lstdc++ -ldl -lgmp -+LFLAGS = -+LIBS = ../gwnum/gwnum.a ../gwnum/gwnum.ld -lm -lpthread -lhwloc -lcurl -lrt -lstdc++ -ldl -lgmp - - FACTOROBJ = factor32.o - LINUXOBJS = prime.o menu.o -diff -dur src.old/linux64/makefile src.new/linux64/makefile ---- src.old/linux64/makefile 2018-01-04 20:49:00.000000000 +0300 -+++ src.new/linux64/makefile 2018-02-15 12:32:28.836286995 +0300 -@@ -26,9 +26,9 @@ - CPP = g++ - CPPFLAGS = -I.. -I../gwnum -DX86_64 -O2 - --LFLAGS = -Wl,-M -Wl,-L/usr/local/lib -+LFLAGS = - #LIBS = ../gwnum/gwnum.a ../gwnum/gwnum.ld -lm -lpthread -Wl,-Bstatic -lhwloc -Wl,-Bstatic -lcurl -Wl,-Bdynamic -lrt -lstdc++ -lz -lxml2 -ldl -lgmp --LIBS = ../gwnum/gwnum.a ../gwnum/gwnum.ld -lm -lpthread -Wl,-Bstatic -lhwloc -Wl,-Bstatic -lcurl -Wl,-Bdynamic -lrt -lstdc++ -ldl -lgmp -+LIBS = ../gwnum/gwnum.a ../gwnum/gwnum.ld -lm -lpthread -lhwloc -lcurl -lrt -lstdc++ -ldl -lgmp - - FACTOROBJ = factor64.o - LINUXOBJS = prime.o menu.o -diff -dur src.old/macosx64/makefile src.new/macosx64/makefile ---- src.old/macosx64/makefile 2018-01-04 20:49:02.000000000 +0300 -+++ src.new/macosx64/makefile 2018-02-15 12:33:32.401902535 +0300 -@@ -12,7 +12,7 @@ - CPP = g++ - CPPFLAGS = -I.. -I../gwnum -I../linux -O2 -DX86_64 -DCOMMAND_LINE_MPRIME -m64 - --LFLAGS = -m64 -Wl,-no_pie -L/usr/local/lib -+LFLAGS = -m64 -Wl,-no_pie - LIBS = ../gwnum/amd64/release/gwnum.a -lm -lpthread -lhwloc -lcurl -framework IOKit -framework CoreFoundation -lstdc++ -lgmp - - FACTOROBJ = ../prime95/macosx64/factor64.o diff --git a/pkgs/tools/misc/skim/default.nix b/pkgs/tools/misc/skim/default.nix index fca2d35e37cc1..f5b446539cccd 100644 --- a/pkgs/tools/misc/skim/default.nix +++ b/pkgs/tools/misc/skim/default.nix @@ -1,27 +1,19 @@ -{ stdenv, fetchFromGitHub, rustPlatform, fetchpatch }: +{ stdenv, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage rec { pname = "skim"; - version = "0.8.1"; + version = "0.8.2"; src = fetchFromGitHub { owner = "lotabout"; repo = pname; rev = "v${version}"; - sha256 = "0xjb8slrlkrzdqvzmf63lq6rgggrjw3hf9an6h8xf6vizz1vfni0"; + sha256 = "0paxrf03rqzahbpr4gnsj62vl09vcxvw248n9wzhjq14dqlwcr9w"; }; outputs = [ "out" "vim" ]; - cargoSha256 = "14p4ppbl2mak21jvxpbd1b28jaw2629bc8kv7875cdzy3ksxyji3"; - - patches = [ - # Fix bash completion. Remove with the next release - (fetchpatch { - url = "https://github.com/lotabout/skim/commit/60ca3484090c2e73a1de396500c73a6ad6e0bde9.patch"; - sha256 = "07nibr13vmxscbwavrckhcbsvxwkpan4a6ml0qfr1ny36xbc6y3p"; - }) - ]; + cargoSha256 = "0rxxdad60fpwkb4wx5407ihd89wqpf2ldcnp7nsx17xh4brp1l9r"; postPatch = '' sed -i -e "s|expand('<sfile>:h:h')|'$out'|" plugin/skim.vim diff --git a/pkgs/tools/misc/wlr-randr/default.nix b/pkgs/tools/misc/wlr-randr/default.nix index c9f4396469611..7bdffb6f72210 100644 --- a/pkgs/tools/misc/wlr-randr/default.nix +++ b/pkgs/tools/misc/wlr-randr/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "wlr-randr"; - version = "unstable-2019-03-21"; + version = "0.1.0"; src = fetchFromGitHub { owner = "emersion"; repo = pname; - rev = "c4066aa3249963dc7877119cffce10f3fa8b6304"; - sha256 = "1ahw4sv07xg5rh9vr7j28636iaxs06vnybm3li6y8dz2sky7hk88"; + rev = "v${version}"; + sha256 = "10c8zzp78s5bw34vvjhilipa28bsdx3jbyhnxgp8f8kawh3cvgsc"; }; nativeBuildInputs = [ meson ninja cmake pkgconfig ]; diff --git a/pkgs/tools/misc/you-get/default.nix b/pkgs/tools/misc/you-get/default.nix index 74599dc7d1e5a..8314dc2c9a35a 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.1432"; + version = "0.4.1456"; # 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 = "0i3gsl7wk1cn8jw79gnyv58mrrn0hmkvymrd3ic67z2ackp726s2"; + sha256 = "14miw5gmj571584rmdzjxf88icmb1psrsfbwpabn8blz8l5aq6bv"; }; meta = with stdenv.lib; { diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index 94f4de6e364f8..07dae0b9600a5 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -18,11 +18,11 @@ buildPythonPackage rec { # The websites youtube-dl deals with are a very moving target. That means that # downloads break constantly. Because of that, updates should always be backported # to the latest stable release. - version = "2020.06.16.1"; + version = "2020.07.28"; src = fetchurl { url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz"; - sha256 = "1q0080cvxpfakgbzigbnl9adnga3jz1sqig2rsiq52rarqbc01px"; + sha256 = "1if7xyi7g9rpni1jbs7gv5m12s34qdb15dpfbbjn8120h16y7cqz"; }; nativeBuildInputs = [ installShellFiles makeWrapper ]; diff --git a/pkgs/tools/networking/mu/default.nix b/pkgs/tools/networking/mu/default.nix index fc693bae212da..250e7a2f7ddb1 100644 --- a/pkgs/tools/networking/mu/default.nix +++ b/pkgs/tools/networking/mu/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "mu"; - version = "1.4.10"; + version = "1.4.12"; src = fetchFromGitHub { owner = "djcb"; repo = "mu"; rev = version; - sha256 = "10vnqlpphjkkiji42sfs954l1zfgwnic7mmpr4nx6yx44z619v0y"; + sha256 = "0xc36z5k9c70jg5f2878ya5w45gb2gfxrfljzhs9pafk955j8ir9"; }; postPatch = stdenv.lib.optionalString (batchSize != null) '' diff --git a/pkgs/tools/networking/urlwatch/default.nix b/pkgs/tools/networking/urlwatch/default.nix index 639bea38f0ac7..f23aed3707bee 100644 --- a/pkgs/tools/networking/urlwatch/default.nix +++ b/pkgs/tools/networking/urlwatch/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { name = "urlwatch-${version}"; - version = "2.18"; + version = "2.19"; src = fetchFromGitHub { owner = "thp"; repo = "urlwatch"; rev = version; - sha256 = "14dmyk95v3kajhn1w2lpil3rjs78y0wxylsxclv6zjxgjcc1xsi3"; + sha256 = "05vxs0x8gnsv2r9cy0brqny1y5jnj2mw11lqc8lqahx84xcs2m00"; }; propagatedBuildInputs = with python3Packages; [ diff --git a/pkgs/tools/nix/rnix-hashes/default.nix b/pkgs/tools/nix/rnix-hashes/default.nix new file mode 100644 index 0000000000000..607884b8ac90c --- /dev/null +++ b/pkgs/tools/nix/rnix-hashes/default.nix @@ -0,0 +1,21 @@ +{ lib, rustPlatform, fetchFromGitHub, fetchpatch }: +rustPlatform.buildRustPackage rec { + pname = "rnix-hashes"; + version = "0.2.0"; + + src = fetchFromGitHub { + owner = "numtide"; + repo = pname; + rev = "v${version}"; + sha256 = "SzHyG5cEjaaPjTkn8puht6snjHMl8DtorOGDjxakJfA="; + }; + + cargoSha256 = "vaG+0t+XAckV9F4iIgcTkbIUurxdQsTCfOnRnrOKoRc="; + + meta = with lib; { + description = "Nix Hash Converter"; + homepage = "https://github.com/numtide/rnix-hashes"; + license = licenses.asl20; + maintainers = with maintainers; [ rizary ]; + }; +} diff --git a/pkgs/tools/security/bitwarden_rs/default.nix b/pkgs/tools/security/bitwarden_rs/default.nix index f2d0eb9b7d3ad..78e0bb7a87d4f 100644 --- a/pkgs/tools/security/bitwarden_rs/default.nix +++ b/pkgs/tools/security/bitwarden_rs/default.nix @@ -8,13 +8,13 @@ let in rustPlatform.buildRustPackage rec { pname = "bitwarden_rs"; - version = "1.15.1"; + version = "1.16.1"; src = fetchFromGitHub { owner = "dani-garcia"; repo = pname; rev = version; - sha256 = "1982bfprixdp8mx2hwidfvsi0zy7wmzf40m9m3cl5r7i2qydznwb"; + sha256 = "18w6fan133ym8n01h2yfv84h1gh1vyib75ksd6c6a554b8ka864s"; }; nativeBuildInputs = [ pkgconfig ]; @@ -25,7 +25,7 @@ in rustPlatform.buildRustPackage rec { RUSTC_BOOTSTRAP = 1; - cargoSha256 = "08cygzgv82i10cj8lkjdah0arrdmlfcbdjwc8piwa629rr0584zf"; + cargoSha256 = "11a1a6q53n8gby7j2ghp8d2yi766fp9wklg48ap5i5afngj5lgzp"; cargoBuildFlags = [ featuresFlag ]; checkPhase = '' diff --git a/pkgs/tools/security/nsjail/default.nix b/pkgs/tools/security/nsjail/default.nix index 27712e4d42f51..4522d0e897af7 100644 --- a/pkgs/tools/security/nsjail/default.nix +++ b/pkgs/tools/security/nsjail/default.nix @@ -4,26 +4,24 @@ stdenv.mkDerivation rec { pname = "nsjail"; - version = "2.9"; + version = "3.0"; src = fetchFromGitHub { owner = "google"; repo = "nsjail"; rev = version; fetchSubmodules = true; - sha256 = "0218n0qjb45fawqqfj3gdxgd0fw5k0vxn9iggi0ciljmr9zywkgh"; + sha256 = "1w6x8xcrs0i1y3q41gyq8z3cq9x24qablklc4jiydf855lhqn4dh"; }; - postPatch = '' - substituteInPlace user.cc \ - --replace "/usr/bin/newgidmap" "${shadow}/bin/newgidmap" \ - --replace "/usr/bin/newuidmap" "${shadow}/bin/newuidmap" - ''; - nativeBuildInputs = [ autoconf bison flex libtool pkgconfig which ]; buildInputs = [ libnl protobuf protobufc ]; enableParallelBuilding = true; + preBuild = '' + makeFlagsArray+=(USER_DEFINES='-DNEWUIDMAP_PATH=${shadow}/bin/newuidmap -DNEWGIDMAP_PATH=${shadow}/bin/newgidmap') + ''; + installPhase = '' mkdir -p $out/bin $out/share/man/man1 install nsjail $out/bin/ @@ -34,7 +32,7 @@ stdenv.mkDerivation rec { description = "A light-weight process isolation tool, making use of Linux namespaces and seccomp-bpf syscall filters"; homepage = "http://nsjail.com/"; license = licenses.asl20; - maintainers = with maintainers; [ bosu c0bw3b ]; + maintainers = with maintainers; [ arturcygan bosu c0bw3b ]; platforms = platforms.linux; }; } diff --git a/pkgs/tools/security/tor/default.nix b/pkgs/tools/security/tor/default.nix index 1e033fa31cee9..c535bf706708d 100644 --- a/pkgs/tools/security/tor/default.nix +++ b/pkgs/tools/security/tor/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, libevent, openssl, zlib, torsocks -, libseccomp, systemd, libcap, lzma, zstd, scrypt +, libseccomp, systemd, libcap, lzma, zstd, scrypt, nixosTests # for update.nix , writeScript @@ -15,11 +15,11 @@ stdenv.mkDerivation rec { pname = "tor"; - version = "0.4.3.5"; + version = "0.4.3.6"; src = fetchurl { url = "https://dist.torproject.org/${pname}-${version}.tar.gz"; - sha256 = "0s6qspi102drn1nk3gfxs51x992xarc44gkfsi8y3l48wr50wsk1"; + sha256 = "0qmcrkjip0ywq77232m73pjwqiaj0q2klwklqlpbw575shvhcbba"; }; outputs = [ "out" "geoip" ]; @@ -54,19 +54,22 @@ stdenv.mkDerivation rec { rm -rf $out/share/tor ''; - passthru.updateScript = import ./update.nix { - inherit (stdenv) lib; - inherit - writeScript - common-updater-scripts - bash - coreutils - curl - gnupg - gnugrep - gnused - nix - ; + passthru = { + tests.tor = nixosTests.tor; + updateScript = import ./update.nix { + inherit (stdenv) lib; + inherit + writeScript + common-updater-scripts + bash + coreutils + curl + gnupg + gnugrep + gnused + nix + ; + }; }; meta = with stdenv.lib; { diff --git a/pkgs/tools/security/vault/default.nix b/pkgs/tools/security/vault/default.nix index 82d5022f90a53..50a7844356ff1 100644 --- a/pkgs/tools/security/vault/default.nix +++ b/pkgs/tools/security/vault/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "vault"; - version = "1.4.3"; + version = "1.5.0"; src = fetchFromGitHub { owner = "hashicorp"; repo = "vault"; rev = "v${version}"; - sha256 = "145zvkh3n503l7zkqkw8laqmqcwd0igd42s4xj0nw78xj2ppj9b8"; + sha256 = "1bdhcsx7hwz4kb68jrrrzlbr7k744g0pym996dq1p5rvz05j3pqc"; }; goPackagePath = "github.com/hashicorp/vault"; @@ -17,10 +17,7 @@ buildGoPackage rec { nativeBuildInputs = [ installShellFiles ]; - buildFlagsArray = [ - "-tags='vault'" - "-ldflags=\"-X github.com/hashicorp/vault/sdk/version.GitCommit='v${version}'\"" - ]; + buildFlagsArray = [ "-tags=vault" "-ldflags=-s -w -X ${goPackagePath}/sdk/version.GitCommit=${src.rev}" ]; postInstall = '' echo "complete -C $out/bin/vault vault" > vault.bash diff --git a/pkgs/tools/security/yubikey-agent/default.nix b/pkgs/tools/security/yubikey-agent/default.nix index c3b2329d472dc..6b6ed8e02854a 100644 --- a/pkgs/tools/security/yubikey-agent/default.nix +++ b/pkgs/tools/security/yubikey-agent/default.nix @@ -25,7 +25,7 @@ buildGoModule rec { substituteInPlace main.go --replace 'notify-send' ${libnotify}/bin/notify-send ''; - vendorSha256 = "1x7934p6522i0yyv08xzb4134d0kr5x6igsrp26vh79d8fndbywr"; + vendorSha256 = "128mlsagj3im6h0p0ndhzk29ya47g19im9dldx3nmddf2jlccj2h"; subPackages = [ "." ]; diff --git a/pkgs/tools/security/yubikey-agent/use-piv-go-75.patch b/pkgs/tools/security/yubikey-agent/use-piv-go-75.patch index cd7337292229b..73967d817d963 100644 --- a/pkgs/tools/security/yubikey-agent/use-piv-go-75.patch +++ b/pkgs/tools/security/yubikey-agent/use-piv-go-75.patch @@ -1,24 +1,22 @@ -From 56a465d463273b2a2a24cf668c4c33938b198b16 Mon Sep 17 00:00:00 2001 +From 547695fff9cbfc4037168cdeb07cfe16bd89b6db Mon Sep 17 00:00:00 2001 From: Philip Potter <philip.g.potter@gmail.com> -Date: Sun, 12 Jul 2020 16:54:57 +0100 -Subject: [PATCH] Pull in go-piv/piv-go#75 +Date: Sat, 25 Jul 2020 21:59:50 +0100 +Subject: [PATCH] Pull in piv-go#75 --- - go.mod | 1 + - 1 file changed, 1 insertion(+) + go.mod | 2 ++ + 1 file changed, 2 insertions(+) diff --git a/go.mod b/go.mod -index d4d13c8..e24d53d 100644 +index d4d13c8..f75be2d 100644 --- a/go.mod +++ b/go.mod -@@ -2,6 +2,7 @@ module filippo.io/yubikey-agent - - go 1.14 - -+replace github.com/go-piv/piv-go => github.com/rawkode/piv-go v1.5.1-0.20200711221619-a4158f9b8204 - require ( - github.com/go-piv/piv-go v1.5.1-0.20200523071327-a3e5767e8b72 +@@ -7,3 +7,5 @@ require ( github.com/gopasspw/gopass v1.9.1 + golang.org/x/crypto v0.0.0-20200429183012-4b2356b1ed79 + ) ++ ++replace github.com/go-piv/piv-go => github.com/rawkode/piv-go v1.5.1-0.20200725154545-1c3200c75a28 -- 2.27.0 diff --git a/pkgs/tools/system/cm-rgb/default.nix b/pkgs/tools/system/cm-rgb/default.nix new file mode 100644 index 0000000000000..acfe440b5d5c9 --- /dev/null +++ b/pkgs/tools/system/cm-rgb/default.nix @@ -0,0 +1,63 @@ +{ stdenv +, buildPythonApplication +, fetchFromGitHub +, atk +, gobject-introspection +, wrapGAppsHook +, click +, hidapi +, psutil +, pygobject3 +}: + +buildPythonApplication rec { + pname = "cm-rgb"; + version = "0.3.4"; + + src = fetchFromGitHub { + owner = "gfduszynski"; + repo = pname; + rev = "v${version}"; + sha256 = "04brldaa2zpvzkcg43i5hpbj03d1nqrgiplm5nh4shn12cif19ag"; + }; + + nativeBuildInputs = [ + atk + + # Populate GI_TYPELIB_PATH + gobject-introspection + wrapGAppsHook + ]; + + propagatedBuildInputs = [ + click + hidapi + psutil + pygobject3 + ]; + + postInstall = '' + # Remove this line when/if this PR gets merged: + # https://github.com/gfduszynski/cm-rgb/pull/43 + install -m0755 scripts/cm-rgb-gui $out/bin/cm-rgb-gui + + mkdir -p $out/etc/udev/rules.d + echo 'SUBSYSTEM=="usb", ATTR{idVendor}=="2516", ATTR{idProduct}=="0051", TAG+="uaccess"' \ + > $out/etc/udev/rules.d/60-cm-rgb.rules + ''; + + meta = with stdenv.lib; { + description = "Control AMD Wraith Prism RGB LEDs"; + longDescription = '' + cm-rgb controls AMD Wraith Prism RGB LEDS. + + To permit non-root accounts to change use this utility on + NixOS, add this package to <literal>services.udev.packages</literal> + in <filename>configuration.nix</filename>. + ''; + homepage = "https://github.com/gfduszynski/cm-rgb"; + license = licenses.mit; + platforms = platforms.all; + maintainers = with maintainers; [ danieldk ]; + }; +} diff --git a/pkgs/tools/system/datefudge/default.nix b/pkgs/tools/system/datefudge/default.nix index fd0cc5f582a23..819071f3f068e 100644 --- a/pkgs/tools/system/datefudge/default.nix +++ b/pkgs/tools/system/datefudge/default.nix @@ -1,22 +1,15 @@ { stdenv, fetchgit, fetchpatch }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "datefudge"; - version = "1.23"; + version = "1.24"; src = fetchgit { - url = "https://salsa.debian.org/debian/datefudge.git"; - rev = "090d3aace17640478f7f5119518b2f4196f62617"; - sha256 = "0r9g8v9xnv60hq3j20wqy34kyig3sc2pisjxl4irn7jjx85f1spv"; + url = "https://salsa.debian.org/debian/${pname}.git"; + rev = "debian/${version}"; + sha256 = "1nh433yx4y4djp0bs6aawqbwk7miq7fsbs9wpjlyh2k9dvil2lrm"; }; - patches = [ - (fetchpatch { - url = "https://src.fedoraproject.org/rpms/datefudge/raw/master/f/datefudge_1.23-tz.patch"; - sha256 = "19c2fvhm06wnp3059b0rnd7dqdchkan8iycjh8jk8y25j870zkvn"; - }) - ]; - postPatch = '' substituteInPlace Makefile \ --replace "/usr" "/" \ diff --git a/pkgs/tools/system/disk-filltest/default.nix b/pkgs/tools/system/disk-filltest/default.nix index 074b06aa4e666..7bcf592012a48 100644 --- a/pkgs/tools/system/disk-filltest/default.nix +++ b/pkgs/tools/system/disk-filltest/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "disk-filltest"; - version = "0.8.1"; + version = "0.8.2"; src = fetchFromGitHub { owner = "bingmann"; repo = "disk-filltest"; rev = "v${version}"; - sha256 = "1vcb43hdln7xlklz1n0fsfp5x1j9pn829wbad4b110hrc7nwrnvm"; + sha256 = "0qmcf5k5j7946wsbxrw4rqfj48mwl3r6kb4l3gppl97k7iyni6kj"; }; preBuild = '' diff --git a/pkgs/tools/system/inxi/default.nix b/pkgs/tools/system/inxi/default.nix index 8842c97902e92..a513a68c5f0e2 100644 --- a/pkgs/tools/system/inxi/default.nix +++ b/pkgs/tools/system/inxi/default.nix @@ -22,13 +22,13 @@ let ++ recommendedDisplayInformationPrograms; in stdenv.mkDerivation rec { pname = "inxi"; - version = "3.1.04-1"; + version = "3.1.05-2"; src = fetchFromGitHub { owner = "smxi"; repo = "inxi"; rev = version; - sha256 = "1mirnrrqfjyl2r7fwnpjlk37i5hf8f7lxv2yxcbdfjf2b3dfbpvl"; + sha256 = "1a7nl2wk49yz5hcrph692xh5phv1mdg1m5cbvgv3ya12c6r32pa2"; }; buildInputs = [ perl makeWrapper ]; diff --git a/pkgs/tools/system/plan9port/builder.sh b/pkgs/tools/system/plan9port/builder.sh index 7750de700617f..b5196e512f418 100644 --- a/pkgs/tools/system/plan9port/builder.sh +++ b/pkgs/tools/system/plan9port/builder.sh @@ -24,7 +24,6 @@ configurePhase() i?86-*) echo OBJTYPE=386;; *power*) echo OBJTYPE=power;; *sparc*) echo OBJTYPE=sparc;; - *) exit 12 esac if [[ $system =~ .*linux.* ]]; then echo SYSVERSION=2.6.x diff --git a/pkgs/tools/system/plan9port/default.nix b/pkgs/tools/system/plan9port/default.nix index 54e88f5d06994..8164dfa9136da 100644 --- a/pkgs/tools/system/plan9port/default.nix +++ b/pkgs/tools/system/plan9port/default.nix @@ -89,7 +89,7 @@ stdenv.mkDerivation { license = licenses.lpl-102; maintainers = with maintainers; [ AndersonTorres bbarker ftrvxmtrx kovirobi ]; - platforms = remove "aarch64-linux" platforms.unix; + platforms = platforms.unix; }; } # TODO: investigate the mouse chording support patch diff --git a/pkgs/tools/text/snippetpixie/default.nix b/pkgs/tools/text/snippetpixie/default.nix index 991b496777c2d..0026150774672 100644 --- a/pkgs/tools/text/snippetpixie/default.nix +++ b/pkgs/tools/text/snippetpixie/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, nix-update-script , meson , ninja , vala @@ -69,7 +70,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = pantheon.updateScript { + updateScript = nix-update-script { attrPath = pname; }; }; diff --git a/pkgs/tools/typesetting/sile/default.nix b/pkgs/tools/typesetting/sile/default.nix index a8969fd459854..209385c378eab 100644 --- a/pkgs/tools/typesetting/sile/default.nix +++ b/pkgs/tools/typesetting/sile/default.nix @@ -1,37 +1,78 @@ -{ stdenv, darwin, fetchurl, makeWrapper, pkgconfig, autoconf, automake -, harfbuzz, icu -, fontconfig, lua, libiconv -, makeFontsConf, gentium +{ stdenv +, darwin +, fetchurl +, makeWrapper +, pkg-config +, autoconf +, automake +, poppler_utils +, harfbuzz +, icu +, fontconfig +, lua +, libiconv +, makeFontsConf +, gentium }: -with stdenv.lib; - let - luaEnv = lua.withPackages(ps: with ps;[cassowary cosmo compat53 linenoise lpeg lua-zlib lua_cliargs luaepnf luaexpat luafilesystem luarepl luasec luasocket stdlib vstruct]); - + luaEnv = lua.withPackages(ps: with ps; [ + cassowary + cosmo + compat53 + linenoise + lpeg + lua-zlib + lua_cliargs + luaepnf + luaexpat + luafilesystem + luarepl + luasec + luasocket + stdlib + vstruct + ]); in stdenv.mkDerivation rec { pname = "sile"; - version = "0.10.4"; + version = "0.10.9"; src = fetchurl { - url = "https://github.com/sile-typesetter/sile/releases/download/v${version}/${pname}-${version}.tar.bz2"; - sha256 = "08j2vv6spnzz8bsh62wbdv1pjiziiba71cadscsy5hw6pklzndni"; + url = "https://github.com/sile-typesetter/sile/releases/download/v${version}/${pname}-${version}.tar.xz"; + sha256 = "0r55c1nz5bkgzfviw72lyh38nls9s49zi3pja7mld6q5dclazsj4"; }; - configureFlags = [ "--with-system-luarocks" ]; - - nativeBuildInputs = [ autoconf automake pkgconfig makeWrapper ]; - buildInputs = [ harfbuzz icu fontconfig libiconv luaEnv ] - ++ optional stdenv.isDarwin darwin.apple_sdk.frameworks.AppKit + configureFlags = [ + "--with-system-luarocks" + "--with-manual" + ]; + + nativeBuildInputs = [ + autoconf + automake + pkg-config + makeWrapper + ]; + buildInputs = [ + harfbuzz + icu + fontconfig + libiconv + luaEnv + ] + ++ stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.AppKit ; + checkInputs = [ + poppler_utils + ]; - preConfigure = optionalString stdenv.isDarwin '' + preConfigure = stdenv.lib.optionalString stdenv.isDarwin '' sed -i -e 's|@import AppKit;|#import <AppKit/AppKit.h>|' src/macfonts.m ''; - NIX_LDFLAGS = optionalString stdenv.isDarwin "-framework AppKit"; + NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-framework AppKit"; FONTCONFIG_FILE = makeFontsConf { fontDirectories = [ @@ -39,11 +80,7 @@ stdenv.mkDerivation rec { ]; }; - # TODO: needs to tweak Makefile-fonts to avoid download fonts - doCheck = false; /*stdenv.targetPlatform == stdenv.hostPlatform - && ! stdenv.isAarch64 # random seg. faults - && ! stdenv.isDarwin; # dy lib not found - */ + doCheck = true; enableParallelBuilding = true; @@ -52,18 +89,12 @@ stdenv.mkDerivation rec { --replace "ASSERT(ht && ht->table && iter);" "ASSERT(ht && iter);" ''; - checkTarget = "examples"; - - postInstall = '' - install -D -t $out/share/doc/sile documentation/sile.pdf - ''; - # Hack to avoid TMPDIR in RPATHs. preFixup = ''rm -rf "$(pwd)" && mkdir "$(pwd)" ''; - outputs = [ "out" "doc" ]; + outputs = [ "out" "doc" "man" "dev" ]; - meta = { + meta = with stdenv.lib; { description = "A typesetting system"; longDescription = '' SILE is a typesetting system; its job is to produce beautiful @@ -77,6 +108,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://sile-typesetter.org/"; platforms = platforms.unix; + maintainers = with maintainers; [ doronbehar alerque ]; license = licenses.mit; }; } diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 42fc91f375f80..5bc4021ea0870 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -449,8 +449,6 @@ mapAliases ({ rdiff_backup = rdiff-backup; # added 2014-11-23 rdmd = dtools; # added 2017-08-19 rhc = throw "deprecated in 2019-04-09: abandoned by upstream."; - riot-desktop = element-desktop; # added 2020-07-15 - riot-web = element-web; # added 2020-07-15 rng_tools = rng-tools; # added 2018-10-24 robomongo = robo3t; #added 2017-09-28 rssglx = rss-glx; #added 2015-03-25 @@ -678,6 +676,10 @@ mapAliases ({ # added 2019-09-06 zeroc_ice = pkgs.zeroc-ice; + + # added 2020-06-22 + zeromq3 = throw "zeromq3 has been deprecated by zeromq4."; + jzmq = throw "jzmq has been removed from nixpkgs, as it was unmaintained"; } // (with ocaml-ng; { # added 2016-09-14 ocaml_4_00_1 = ocamlPackages_4_00_1.ocaml; ocaml_4_01_0 = ocamlPackages_4_01_0.ocaml; @@ -712,4 +714,8 @@ mapAliases ({ sqldeveloper_18 = throw "sqldeveloper_18 is not maintained anymore!"; # added 2020-02-04 gcc-snapshot = throw "Marked as broken for >2 years, additionally this 'snapshot' pointed to a fairly old one from gcc7."; + + /* Cleanup before 21.03 */ + riot-desktop = throw "riot-desktop is now element-desktop!"; + riot-web = throw "riot-web is now element-web"; }) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9b66022e75d3a..8344ae4031943 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -94,6 +94,8 @@ in genericUpdater = callPackage ../common-updater/generic-updater.nix { }; + nix-update-script = callPackage ../common-updater/nix-update.nix { }; + ### Push NixOS tests inside the fixed point nixosTests = import ../../nixos/tests/all-tests.nix { @@ -5553,6 +5555,8 @@ in notable = callPackage ../applications/misc/notable { }; + nvchecker = with python3Packages; toPythonApplication nvchecker; + miller = callPackage ../tools/text/miller { }; milu = callPackage ../applications/misc/milu { }; @@ -6396,6 +6400,8 @@ in recoll = callPackage ../applications/search/recoll { }; + redoc-cli = nodePackages.redoc-cli; + reflex = callPackage ../development/tools/reflex { }; reiser4progs = callPackage ../tools/filesystems/reiser4progs { }; @@ -7191,12 +7197,7 @@ in inherit (darwin.apple_sdk.frameworks) Foundation; }; - tor = callPackage ../tools/security/tor { - # remove this, when libevent's openssl is upgraded to 1_1_0 or newer. - libevent = libevent.override { - sslSupport = false; - }; - }; + tor = callPackage ../tools/security/tor { }; tor-arm = callPackage ../tools/security/tor/tor-arm.nix { }; @@ -9300,7 +9301,6 @@ in rocm-opencl-icd = callPackage ../development/libraries/rocm-opencl-icd { }; rocm-opencl-runtime = callPackage ../development/libraries/rocm-opencl-runtime { - stdenv = overrideCC stdenv llvmPackages_rocm.clang; inherit (llvmPackages_rocm) clang clang-unwrapped lld llvm; }; @@ -10903,6 +10903,8 @@ in mkdocs = callPackage ../development/tools/documentation/mkdocs { }; + mockgen = callPackage ../development/tools/mockgen { }; + modd = callPackage ../development/tools/modd { }; msgpack-tools = callPackage ../development/tools/msgpack-tools { }; @@ -11426,6 +11428,8 @@ in amdvlk = callPackage ../development/libraries/amdvlk {}; + aml = callPackage ../development/libraries/aml { }; + amrnb = callPackage ../development/libraries/amrnb { }; amrwb = callPackage ../development/libraries/amrwb { }; @@ -14258,6 +14262,8 @@ in opencolorio = callPackage ../development/libraries/opencolorio { }; + opendmarc = callPackage ../development/libraries/opendmarc { }; + ois = callPackage ../development/libraries/ois {}; openh264 = callPackage ../development/libraries/openh264 { }; @@ -15532,7 +15538,6 @@ in zlog = callPackage ../development/libraries/zlog { }; - zeromq3 = callPackage ../development/libraries/zeromq/3.x.nix {}; zeromq4 = callPackage ../development/libraries/zeromq/4.x.nix {}; zeromq = zeromq4; @@ -15612,8 +15617,6 @@ in junixsocket = callPackage ../development/libraries/java/junixsocket { }; - jzmq = callPackage ../development/libraries/java/jzmq { }; - lombok = callPackage ../development/libraries/java/lombok { }; lucene = callPackage ../development/libraries/java/lucene { }; @@ -16879,6 +16882,8 @@ in cifs-utils = callPackage ../os-specific/linux/cifs-utils { }; + cm-rgb = python3Packages.callPackage ../tools/system/cm-rgb { }; + cpustat = callPackage ../os-specific/linux/cpustat { }; cockroachdb = callPackage ../servers/sql/cockroachdb { }; @@ -17726,6 +17731,8 @@ in gotags = callPackage ../development/tools/gotags { }; + go-task = callPackage ../development/tools/go-task { }; + golint = callPackage ../development/tools/golint { }; golangci-lint = callPackage ../development/tools/golangci-lint { }; @@ -19832,6 +19839,10 @@ in FIL-plugins = callPackage ../applications/audio/FIL-plugins { }; + finalfrontier = callPackage ../applications/science/machine-learning/finalfrontier { + inherit (darwin.apple_sdk.frameworks) Security; + }; + flacon = libsForQt5.callPackage ../applications/audio/flacon { }; flexget = callPackage ../applications/networking/flexget { }; @@ -22633,6 +22644,8 @@ in pythonBindings = true; }); + sublime-music = callPackage ../applications/audio/sublime-music { }; + subunit = callPackage ../development/libraries/subunit { }; surf = callPackage ../applications/networking/browsers/surf { gtk = gtk2; }; @@ -26395,6 +26408,8 @@ in nixpkgs-fmt = callPackage ../tools/nix/nixpkgs-fmt { }; + rnix-hashes = callPackage ../tools/nix/rnix-hashes { }; + nixos-artwork = callPackage ../data/misc/nixos-artwork { }; nixos-icons = callPackage ../data/misc/nixos-artwork/icons.nix { }; nixos-grub2-theme = callPackage ../data/misc/nixos-artwork/grub2-theme.nix { }; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 43e2eda774a9a..597d5c6acdaf7 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -303,6 +303,22 @@ let }; }; + AltCryptRSABigInt = buildPerlPackage { + pname = "Alt-Crypt-RSA-BigInt"; + version = "0.06"; + src = fetchurl { + url = "mirror://cpan/authors/id/D/DA/DANAJ/Alt-Crypt-RSA-BigInt-0.06.tar.gz"; + sha256 = "76f434cab36999cdf09811345bb39d6b7cbed7e085b02338328c7f46e08b38f3"; + }; + propagatedBuildInputs = [ ClassLoader ConvertASCIIArmour CryptBlowfish CryptCBC DataBuffer DigestMD2 MathBigIntGMP MathPrimeUtil MathPrimeUtilGMP SortVersions TieEncryptedHash ]; + meta = { + homepage = "https://github.com/danaj/Alt-Crypt-RSA-BigInt"; + description = "RSA public-key cryptosystem, using Math::BigInt"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = [ maintainers.sgo ]; + }; + }; + AnyEvent = buildPerlPackage { pname = "AnyEvent"; version = "7.17"; @@ -3329,6 +3345,20 @@ let }; }; + ConvertASCIIArmour = buildPerlPackage { + pname = "Convert-ASCII-Armour"; + version = "1.4"; + src = fetchurl { + url = "mirror://cpan/authors/id/V/VI/VIPUL/Convert-ASCII-Armour-1.4.tar.gz"; + sha256 = "97e8acb6eb2a2a91af7d6cf0d2dff6fa42aaf939fc7d6d1c6057a4f0df52c904"; + }; + meta = { + description = "Convert binary octets into ASCII armoured messages"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = [ maintainers.sgo ]; + }; + }; + ConvertASN1 = buildPerlPackage { pname = "Convert-ASN1"; version = "0.27"; @@ -3640,6 +3670,20 @@ let }; }; + CryptCAST5_PP = buildPerlPackage { + pname = "Crypt-CAST5_PP"; + version = "1.04"; + src = fetchurl { + url = "mirror://cpan/authors/id/B/BO/BOBMATH/Crypt-CAST5_PP-1.04.tar.gz"; + sha256 = "cba98a80403fb898a14c928f237f44816b4848641840ce2517363c2c071b5327"; + }; + meta = { + description = "CAST5 block cipher in pure Perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = [ maintainers.sgo ]; + }; + }; + CryptCBC = buildPerlPackage { pname = "Crypt-CBC"; version = "2.33"; @@ -3677,6 +3721,21 @@ let }; }; + CryptDES_EDE3 = buildPerlPackage { + pname = "Crypt-DES_EDE3"; + version = "0.01"; + src = fetchurl { + url = "mirror://cpan/authors/id/B/BT/BTROTT/Crypt-DES_EDE3-0.01.tar.gz"; + sha256 = "9cb2e04b625e9cc0833cd499f76fd12556583ececa782a9758a55e3f969748d6"; + }; + propagatedBuildInputs = [ CryptDES ]; + meta = { + description = "Triple-DES EDE encryption/decryption"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = [ maintainers.sgo ]; + }; + }; + CryptDH = buildPerlPackage { pname = "Crypt-DH"; version = "0.07"; @@ -3699,6 +3758,21 @@ let NIX_CFLAGS_LINK = "-L${pkgs.gmp.out}/lib -lgmp"; }; + CryptDSA = buildPerlPackage { + pname = "Crypt-DSA"; + version = "1.17"; + src = fetchurl { + url = "mirror://cpan/authors/id/A/AD/ADAMK/Crypt-DSA-1.17.tar.gz"; + sha256 = "d1b8585f6bf746f76e5dc5da3641d325ed656bc2e5f344b54514b55c31009a03"; + }; + propagatedBuildInputs = [ DataBuffer DigestSHA1 FileWhich ]; + meta = { + description = "DSA Signatures and Key Generation"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = [ maintainers.sgo ]; + }; + }; + CryptECB = buildPerlPackage { pname = "Crypt-ECB"; version = "2.22"; @@ -3846,6 +3920,21 @@ let }; }; + CryptRIPEMD160 = buildPerlPackage { + pname = "Crypt-RIPEMD160"; + version = "0.06"; + src = fetchurl { + url = "mirror://cpan/authors/id/T/TO/TODDR/Crypt-RIPEMD160-0.06.tar.gz"; + sha256 = "ea64a1e9eb42f3d79855a392e7cca6b86e8e0bcc9aabcc5efa5fa32415b67dba"; + }; + meta = { + homepage = "http://wiki.github.com/toddr/Crypt-RIPEMD160"; + description = "Perl extension for the RIPEMD-160 Hash function"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = [ maintainers.sgo ]; + }; + }; + CryptMySQL = buildPerlModule { pname = "Crypt-MySQL"; version = "0.04"; @@ -3915,6 +4004,47 @@ let }; }; + CryptTwofish = buildPerlPackage { + pname = "Crypt-Twofish"; + version = "2.17"; + src = fetchurl { + url = "mirror://cpan/authors/id/A/AM/AMS/Crypt-Twofish-2.17.tar.gz"; + sha256 = "eed502012f0c63927a1a32e3154071cc81175d1992a893ec41f183b6e3e5d758"; + }; + meta = { + description = "The Twofish Encryption Algorithm"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = [ maintainers.sgo ]; + }; + }; + + CryptOpenPGP = buildPerlPackage { + pname = "Crypt-OpenPGP"; + version = "1.12"; + src = fetchurl { + url = "mirror://cpan/authors/id/S/SR/SROMANOV/Crypt-OpenPGP-1.12.tar.gz"; + sha256 = "e8a7ff2a993b76a69ad6dffdbe55755be5678b84e6ec494dcd9ab966f766f50e"; + }; + patches = [ + # See https://github.com/NixOS/nixpkgs/pull/93599 + ../development/perl-modules/crypt-openpgp-remove-impure-keygen-tests.patch + ]; + buildInputs = [ TestException ]; + propagatedBuildInputs = [ AltCryptRSABigInt CryptBlowfish CryptCAST5_PP CryptDES_EDE3 CryptDSA CryptIDEA CryptRIPEMD160 CryptRijndael CryptTwofish DataBuffer FileHomeDir LWP TermReadKey URI BytesRandomSecure ]; + + nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin shortenPerlShebang; + postInstall = stdenv.lib.optionalString stdenv.isDarwin '' + shortenPerlShebang $out/bin/pgplet + ''; + + meta = { + homepage = "https://github.com/btrott/Crypt-OpenPGP"; + description = "Pure-Perl OpenPGP implementation"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = [ maintainers.sgo ]; + }; + }; + CryptOpenSSLAES = buildPerlPackage { pname = "Crypt-OpenSSL-AES"; version = "0.02"; @@ -5598,6 +5728,20 @@ let }; }; + DataBuffer = buildPerlPackage { + pname = "Data-Buffer"; + version = "0.04"; + src = fetchurl { + url = "mirror://cpan/authors/id/B/BT/BTROTT/Data-Buffer-0.04.tar.gz"; + sha256 = "2b3d09b7bcf389fc116207b283bee250e348d44c9c63460bee67efab4dd21bb4"; + }; + meta = { + description = "Read/write buffer class"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = [ maintainers.sgo ]; + }; + }; + DBIxIntrospector = buildPerlPackage { pname = "DBIx-Introspector"; version = "0.001005"; @@ -5806,6 +5950,20 @@ let }; }; + DigestMD2 = buildPerlPackage { + pname = "Digest-MD2"; + version = "2.04"; + src = fetchurl { + url = "mirror://cpan/authors/id/G/GA/GAAS/Digest-MD2-2.04.tar.gz"; + sha256 = "d0aabf4834c20ac411bea427c4a308b59a5fcaa327679ef5294c1d68ab71eed3"; + }; + meta = { + description = "Perl interface to the MD2 Algorithm"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = [ maintainers.sgo ]; + }; + }; + DigestMD4 = buildPerlPackage { pname = "Digest-MD4"; version = "1.9"; @@ -11663,6 +11821,40 @@ let buildInputs = [ DataFloat MathBigIntLite NumberFraction ]; }; + MathPrimeUtil = buildPerlPackage { + pname = "Math-Prime-Util"; + version = "0.73"; + src = fetchurl { + url = "mirror://cpan/authors/id/D/DA/DANAJ/Math-Prime-Util-0.73.tar.gz"; + sha256 = "4afa6dd8cdb97499bd4eca6925861812c29d9f5a0f1ac27ad9d2d9c9b5602894"; + }; + propagatedBuildInputs = [ MathPrimeUtilGMP ]; + meta = { + homepage = "https://github.com/danaj/Math-Prime-Util"; + description = "Utilities related to prime numbers, including fast sieves and factoring"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = [ maintainers.sgo ]; + }; + }; + + MathPrimeUtilGMP = buildPerlPackage { + pname = "Math-Prime-Util-GMP"; + version = "0.52"; + src = fetchurl { + url = "mirror://cpan/authors/id/D/DA/DANAJ/Math-Prime-Util-GMP-0.52.tar.gz"; + sha256 = "2697c7fd5c7e35fdec7f50ed56a67be807a2f22657589e637dad3592744003be"; + }; + buildInputs = [ pkgs.gmp ]; + NIX_CFLAGS_COMPILE = "-I${pkgs.gmp.dev}/include"; + NIX_CFLAGS_LINK = "-L${pkgs.gmp.out}/lib -lgmp"; + meta = { + homepage = "https://github.com/danaj/Math-Prime-Util-GMP"; + description = "Utilities related to prime numbers, using GMP"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = [ maintainers.sgo ]; + }; + }; + MathRandom = buildPerlPackage { pname = "Math-Random"; version = "0.72"; @@ -20574,6 +20766,21 @@ let }; }; + TieEncryptedHash = buildPerlPackage { + pname = "Tie-EncryptedHash"; + version = "1.24"; + src = fetchurl { + url = "mirror://cpan/authors/id/V/VI/VIPUL/Tie-EncryptedHash-1.24.tar.gz"; + sha256 = "aa9a083a231e4046170a5894644e3c59679c7dbd0aa2d1217dc85150df2c1e21"; + }; + propagatedBuildInputs = [ CryptBlowfish CryptCBC CryptDES ]; + meta = { + description = "Hashes (and objects based on hashes) with encrypting fields"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = [ maintainers.sgo ]; + }; + }; + TieFile = buildPerlPackage { pname = "Tie-File"; version = "1.05"; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6a5cfebd51fce..61ee091dab0c7 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1713,6 +1713,8 @@ in { webapp2 = callPackage ../development/python-modules/webapp2 { }; + webdavclient3 = callPackage ../development/python-modules/webdavclient3 { }; + wordcloud = callPackage ../development/python-modules/wordcloud { }; wrf-python = callPackage ../development/python-modules/wrf-python { }; @@ -2158,6 +2160,8 @@ in { dataclasses = callPackage ../development/python-modules/dataclasses { }; + dataclasses-json = callPackage ../development/python-modules/dataclasses-json { }; + debian = callPackage ../development/python-modules/debian {}; defusedxml = callPackage ../development/python-modules/defusedxml {}; @@ -5909,6 +5913,8 @@ in { typing-extensions = callPackage ../development/python-modules/typing-extensions { }; + typing-inspect = callPackage ../development/python-modules/typing-inspect { }; + typeguard = callPackage ../development/python-modules/typeguard { }; typesentry = callPackage ../development/python-modules/typesentry { }; |