diff --git a/.github/workflows/wait-ofborg.yml b/.github/workflows/wait-ofborg.yml
new file mode 100644
index 000000000000..35c58b2e9120
--- /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 e37621c6fc1c..e7c04417ac81 100644
--- a/flake.nix
+++ b/flake.nix
@@ -12,23 +12,30 @@
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);
in
{
- lib = lib // {
+ lib = lib.extend (final: prev: {
nixosSystem = { modules, ... } @ args:
import ./nixos/lib/eval-config.nix (args // {
modules = modules ++
[ { system.nixos.versionSuffix =
- ".${lib.substring 0 8 (self.lastModifiedDate or self.lastModified)}.${self.shortRev or "dirty"}";
- system.nixos.revision = lib.mkIf (self ? rev) self.rev;
+ ".${final.substring 0 8 (self.lastModifiedDate or self.lastModified)}.${self.shortRev or "dirty"}";
+ system.nixos.revision = final.mkIf (self ? rev) self.rev;
}
];
});
- };
+ });
checks.x86_64-linux.tarball = jobs.tarball;
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index b9c93d878156..3185a8f77e23 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -543,6 +543,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 +679,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 +1121,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 +1424,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 +2080,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";
@@ -6160,6 +6182,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";
@@ -6334,6 +6362,12 @@
githubId = 119460;
name = "Perry Barnoy";
};
+ pjjw = {
+ email = "peter@shortbus.org";
+ github = "pjjw";
+ githubId = 638;
+ name = "Peter Woodman";
+ };
pjones = {
email = "pjones@devalot.com";
github = "pjones";
@@ -6828,6 +6862,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 97b94c5756a7..7da1f5023780 100644
--- a/nixos/doc/manual/release-notes/rl-2009.xml
+++ b/nixos/doc/manual/release-notes/rl-2009.xml
@@ -525,12 +525,37 @@ systemd.services.nginx.serviceConfig.ReadWritePaths = [ "/var/www" ];
automatically if stateVersion is 20.09 or higher.
+
+
+ udpt experienced a complete rewrite from C++ to rust. The configuration format changed from ini to toml.
+ The new configuration documentation can be found at
+ the official website and example
+ configuration is packaged in ${udpt}/share/udpt/udpt.toml.
+
+
We now have a unified option interface
to be used for every display-manager in NixOS.
+
+
+ The bitcoind module has changed to multi-instance, using submodules.
+ Therefore, it is now mandatory to name each instance, e.g.:
+
+services.bitcoind = {
+ enable = true;
+};
+
+ requires a name now:
+
+services.bitcoind."example-mainnet" = {
+ enable = true;
+};
+
+
+
diff --git a/nixos/lib/make-disk-image.nix b/nixos/lib/make-disk-image.nix
index a72bdedb16fc..4806fe9dbac7 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/modules/hardware/video/uvcvideo/default.nix b/nixos/modules/hardware/video/uvcvideo/default.nix
index 7e3e94fdf2bd..cf6aa052abb0 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 uvcvideo dynamic controls.
Note that enabling this brings the uvcdynctrl tool
- into your environement and register all dynamic controls from
+ into your environment and register all dynamic controls from
specified packages to the uvcvideo driver.
'';
};
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 2681a9d3a9e8..585cef9b42ec 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -814,6 +814,7 @@
./services/security/torsocks.nix
./services/security/usbguard.nix
./services/security/vault.nix
+ ./services/security/yubikey-agent.nix
./services/system/cloud-init.nix
./services/system/dbus.nix
./services/system/earlyoom.nix
@@ -885,6 +886,7 @@
./services/web-servers/meguca.nix
./services/web-servers/mighttpd2.nix
./services/web-servers/minio.nix
+ ./services/web-servers/molly-brown.nix
./services/web-servers/nginx/default.nix
./services/web-servers/nginx/gitweb.nix
./services/web-servers/phpfpm/default.nix
diff --git a/nixos/modules/programs/gnupg.nix b/nixos/modules/programs/gnupg.nix
index 7a3cb588ee71..ce8799b21d69 100644
--- a/nixos/modules/programs/gnupg.nix
+++ b/nixos/modules/programs/gnupg.nix
@@ -70,6 +70,7 @@ in
agent.pinentryFlavor = mkOption {
type = types.nullOr (types.enum pkgs.pinentry.flavors);
example = "gnome3";
+ default = defaultPinentryFlavor;
description = ''
Which pinentry interface to use. If not null, the path to the
pinentry binary will be passed to gpg-agent via commandline and
@@ -91,8 +92,6 @@ in
};
config = mkIf cfg.agent.enable {
- programs.gnupg.agent.pinentryFlavor = mkDefault defaultPinentryFlavor;
-
# This overrides the systemd user unit shipped with the gnupg package
systemd.user.services.gpg-agent = mkIf (cfg.agent.pinentryFlavor != null) {
serviceConfig.ExecStart = [ "" ''
diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix
index 688344852aeb..565c15dec24b 100644
--- a/nixos/modules/security/pam.nix
+++ b/nixos/modules/security/pam.nix
@@ -36,6 +36,17 @@ let
'';
};
+ p11Auth = mkOption {
+ default = config.security.pam.p11.enable;
+ type = types.bool;
+ description = ''
+ If set, keys listed in
+ ~/.ssh/authorized_keys and
+ ~/.eid/authorized_certificates
+ can be used to log in with the associated PKCS#11 tokens.
+ '';
+ };
+
u2fAuth = mkOption {
default = config.security.pam.u2f.enable;
type = types.bool;
@@ -352,6 +363,8 @@ let
"auth sufficient ${pkgs.pam_ssh_agent_auth}/libexec/pam_ssh_agent_auth.so file=~/.ssh/authorized_keys:~/.ssh/authorized_keys2:/etc/ssh/authorized_keys.d/%u"}
${optionalString cfg.fprintAuth
"auth sufficient ${pkgs.fprintd}/lib/security/pam_fprintd.so"}
+ ${let p11 = config.security.pam.p11; in optionalString cfg.p11Auth
+ "auth ${p11.control} ${pkgs.pam_p11}/lib/security/pam_p11.so ${pkgs.opensc}/lib/opensc-pkcs11.so"}
${let u2f = config.security.pam.u2f; in optionalString cfg.u2fAuth
"auth ${u2f.control} ${pkgs.pam_u2f}/lib/security/pam_u2f.so ${optionalString u2f.debug "debug"} ${optionalString (u2f.authFile != null) "authfile=${u2f.authFile}"} ${optionalString u2f.interactive "interactive"} ${optionalString u2f.cue "cue"}"}
${optionalString cfg.usbAuth
@@ -566,6 +579,39 @@ in
security.pam.enableOTPW = mkEnableOption "the OTPW (one-time password) PAM module";
+ security.pam.p11 = {
+ enable = mkOption {
+ default = false;
+ type = types.bool;
+ description = ''
+ Enables P11 PAM (pam_p11) module.
+
+ If set, users can log in with SSH keys and PKCS#11 tokens.
+
+ More information can be found here.
+ '';
+ };
+
+ control = mkOption {
+ default = "sufficient";
+ type = types.enum [ "required" "requisite" "sufficient" "optional" ];
+ description = ''
+ This option sets pam "control".
+ If you want to have multi factor authentication, use "required".
+ If you want to use the PKCS#11 device instead of the regular password,
+ use "sufficient".
+
+ Read
+
+ pam.conf
+ 5
+
+ for better understanding of this option.
+ '';
+ };
+ };
+
security.pam.u2f = {
enable = mkOption {
default = false;
@@ -747,6 +793,7 @@ in
++ optionals config.krb5.enable [pam_krb5 pam_ccreds]
++ optionals config.security.pam.enableOTPW [ pkgs.otpw ]
++ optionals config.security.pam.oath.enable [ pkgs.oathToolkit ]
+ ++ optionals config.security.pam.p11.enable [ pkgs.pam_p11 ]
++ optionals config.security.pam.u2f.enable [ pkgs.pam_u2f ];
boot.supportedFilesystems = optionals config.security.pam.enableEcryptfs [ "ecryptfs" ];
diff --git a/nixos/modules/services/audio/roon-server.nix b/nixos/modules/services/audio/roon-server.nix
index 6aed485638cc..eceb65044c5b 100644
--- a/nixos/modules/services/audio/roon-server.nix
+++ b/nixos/modules/services/audio/roon-server.nix
@@ -45,14 +45,14 @@ in {
environment.ROON_DATAROOT = "/var/lib/${name}";
serviceConfig = {
- ExecStart = "${pkgs.roon-server}/opt/start.sh";
+ ExecStart = "${pkgs.roon-server}/start.sh";
LimitNOFILE = 8192;
User = cfg.user;
Group = cfg.group;
StateDirectory = name;
};
};
-
+
networking.firewall = mkIf cfg.openFirewall {
allowedTCPPortRanges = [
{ from = 9100; to = 9200; }
@@ -60,7 +60,7 @@ in {
allowedUDPPorts = [ 9003 ];
};
-
+
users.groups.${cfg.group} = {};
users.users.${cfg.user} =
if cfg.user == "roon-server" then {
diff --git a/nixos/modules/services/desktops/flatpak.nix b/nixos/modules/services/desktops/flatpak.nix
index 7fb0024f37dc..7da92cc9f264 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 5d6912595b52..1fbeb17e6aeb 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 78a42fbb574b..c5e8a5b85ec2 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 2d3fe2f79768..4dfb6236727b 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 4e00a8865474..38537ad2de72 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:
+
'';
};
};
@@ -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 bitcoin.conf.";
};
+
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/dhcpd.nix b/nixos/modules/services/networking/dhcpd.nix
index 67f7d8118870..8966deac76cb 100644
--- a/nixos/modules/services/networking/dhcpd.nix
+++ b/nixos/modules/services/networking/dhcpd.nix
@@ -11,7 +11,7 @@ let
''
default-lease-time 600;
max-lease-time 7200;
- authoritative;
+ ${optionalString (!cfg.authoritative) "not "}authoritative;
ddns-update-style interim;
log-facility local1; # see dhcpd.nix
@@ -176,6 +176,16 @@ let
'';
};
+ authoritative = mkOption {
+ type = types.bool;
+ default = true;
+ description = ''
+ Whether the DHCP server shall send DHCPNAK messages to misconfigured
+ clients. If this is not done, clients may be unable to get a correct
+ IP address after changing subnets until their old lease has expired.
+ '';
+ };
+
};
in
diff --git a/nixos/modules/services/networking/skydns.nix b/nixos/modules/services/networking/skydns.nix
index e79d6de92644..ea466de93275 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 a7dea95056a0..08a17d20ed7f 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/networking/yggdrasil.nix b/nixos/modules/services/networking/yggdrasil.nix
index 0fe9a200a1b6..a71c635c9f6e 100644
--- a/nixos/modules/services/networking/yggdrasil.nix
+++ b/nixos/modules/services/networking/yggdrasil.nix
@@ -195,5 +195,8 @@ in {
# Make yggdrasilctl available on the command line.
environment.systemPackages = [ cfg.package ];
});
- meta.maintainers = with lib.maintainers; [ gazally ehmry ];
+ meta = {
+ doc = ./yggdrasil.xml;
+ maintainers = with lib.maintainers; [ gazally ehmry ];
+ };
}
diff --git a/nixos/modules/services/networking/yggdrasil.xml b/nixos/modules/services/networking/yggdrasil.xml
new file mode 100644
index 000000000000..c012cd4a9294
--- /dev/null
+++ b/nixos/modules/services/networking/yggdrasil.xml
@@ -0,0 +1,157 @@
+
+
+ Yggdrasil
+
+ Source:
+ modules/services/networking/yggdrasil/default.nix
+
+
+ Upstream documentation:
+
+
+
+Yggdrasil is an early-stage implementation of a fully end-to-end encrypted,
+self-arranging IPv6 network.
+
+
+ Configuration
+
+ Simple ephemeral node
+
+An annotated example of a simple configuration:
+
+{
+ services.yggdrasil = {
+ enable = true;
+ persistentKeys = false;
+ # The NixOS module will generate new keys and a new IPv6 address each time
+ # it is started if persistentKeys is not enabled.
+
+ config = {
+ Peers = [
+ # Yggdrasil will automatically connect and "peer" with other nodes it
+ # discovers via link-local multicast annoucements. Unless this is the
+ # case (it probably isn't) a node needs peers within the existing
+ # network that it can tunnel to.
+ "tcp://1.2.3.4:1024"
+ "tcp://1.2.3.5:1024"
+ # Public peers can be found at
+ # https://github.com/yggdrasil-network/public-peers
+ ];
+ };
+ };
+}
+
+
+
+
+ Persistent node with prefix
+
+A node with a fixed address that announces a prefix:
+
+let
+ address = "210:5217:69c0:9afc:1b95:b9f:8718:c3d2";
+ prefix = "310:5217:69c0:9afc";
+ # taken from the output of "yggdrasilctl getself".
+in {
+
+ services.yggdrasil = {
+ enable = true;
+ persistentKeys = true; # Maintain a fixed public key and IPv6 address.
+ config = {
+ Peers = [ "tcp://1.2.3.4:1024" "tcp://1.2.3.5:1024" ];
+ NodeInfo = {
+ # This information is visible to the network.
+ name = config.networking.hostName;
+ location = "The North Pole";
+ };
+ };
+ };
+
+ boot.kernel.sysctl."net.ipv6.conf.all.forwarding" = 1;
+ # Forward traffic under the prefix.
+
+ networking.interfaces.${eth0}.ipv6.addresses = [{
+ # Set a 300::/8 address on the local physical device.
+ address = prefix + "::1";
+ prefixLength = 64;
+ }];
+
+ services.radvd = {
+ # Annouce the 300::/8 prefix to eth0.
+ enable = true;
+ config = ''
+ interface eth0
+ {
+ AdvSendAdvert on;
+ AdvDefaultLifetime 0;
+ prefix ${prefix}::/64 {
+ AdvOnLink on;
+ AdvAutonomous on;
+ };
+ route 200::/8 {};
+ };
+ '';
+ };
+}
+
+
+
+
+ Yggdrasil attached Container
+
+A NixOS container attached to the Yggdrasil network via a node running on the
+host:
+
+let
+ yggPrefix64 = "310:5217:69c0:9afc";
+ # Again, taken from the output of "yggdrasilctl getself".
+in
+{
+ boot.kernel.sysctl."net.ipv6.conf.all.forwarding" = 1;
+ # Enable IPv6 forwarding.
+
+ networking = {
+ bridges.br0.interfaces = [ ];
+ # A bridge only to containers…
+
+ interfaces.br0 = {
+ # … configured with a prefix address.
+ ipv6.addresses = [{
+ address = "${yggPrefix64}::1";
+ prefixLength = 64;
+ }];
+ };
+ };
+
+ containers.foo = {
+ autoStart = true;
+ privateNetwork = true;
+ hostBridge = "br0";
+ # Attach the container to the bridge only.
+ config = { config, pkgs, ... }: {
+ networking.interfaces.eth0.ipv6 = {
+ addresses = [{
+ # Configure a prefix address.
+ address = "${yggPrefix64}::2";
+ prefixLength = 64;
+ }];
+ routes = [{
+ # Configure the prefix route.
+ address = "200::";
+ prefixLength = 7;
+ via = "${yggPrefix64}::1";
+ }];
+ };
+
+ services.httpd.enable = true;
+ networking.firewall.allowedTCPPorts = [ 80 ];
+ };
+ };
+
+}
+
+
+
+
+
diff --git a/nixos/modules/services/security/yubikey-agent.nix b/nixos/modules/services/security/yubikey-agent.nix
new file mode 100644
index 000000000000..2972c64a3641
--- /dev/null
+++ b/nixos/modules/services/security/yubikey-agent.nix
@@ -0,0 +1,60 @@
+# Global configuration for yubikey-agent.
+
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+ cfg = config.services.yubikey-agent;
+
+ # reuse the pinentryFlavor option from the gnupg module
+ pinentryFlavor = config.programs.gnupg.agent.pinentryFlavor;
+in
+{
+ ###### interface
+
+ meta.maintainers = with maintainers; [ philandstuff rawkode ];
+
+ options = {
+
+ services.yubikey-agent = {
+ enable = mkOption {
+ type = types.bool;
+ default = false;
+ description = ''
+ Whether to start yubikey-agent when you log in. Also sets
+ SSH_AUTH_SOCK to point at yubikey-agent.
+
+ Note that yubikey-agent will use whatever pinentry is
+ specified in programs.gnupg.agent.pinentryFlavor.
+ '';
+ };
+
+ package = mkOption {
+ type = types.package;
+ default = pkgs.yubikey-agent;
+ defaultText = "pkgs.yubikey-agent";
+ description = ''
+ The package used for the yubikey-agent daemon.
+ '';
+ };
+ };
+ };
+
+ config = mkIf cfg.enable {
+ environment.systemPackages = [ cfg.package ];
+ systemd.packages = [ cfg.package ];
+
+ # This overrides the systemd user unit shipped with the
+ # yubikey-agent package
+ systemd.user.services.yubikey-agent = mkIf (pinentryFlavor != null) {
+ path = [ pkgs.pinentry.${pinentryFlavor} ];
+ };
+
+ 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/services/web-servers/molly-brown.nix b/nixos/modules/services/web-servers/molly-brown.nix
new file mode 100644
index 000000000000..e9052a184b2d
--- /dev/null
+++ b/nixos/modules/services/web-servers/molly-brown.nix
@@ -0,0 +1,117 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+ cfg = config.services.molly-brown;
+
+ settingsType = with types;
+ attrsOf (oneOf [
+ int
+ str
+ (listOf str)
+ (attrsOf (oneOf [ int str (listOf str) (attrsOf str) ]))
+ ]) // {
+ description = "primitive expression convertable to TOML";
+ };
+
+ configFile = pkgs.runCommand "molly-brown.toml" {
+ buildInputs = [ pkgs.remarshal ];
+ preferLocalBuild = true;
+ passAsFile = [ "settings" ];
+ settings = builtins.toJSON cfg.settings;
+ } "remarshal -if json -of toml < $settingsPath > $out";
+in {
+
+ options.services.molly-brown = {
+
+ enable = mkEnableOption "Molly-Brown Gemini server";
+
+ port = mkOption {
+ default = 1965;
+ type = types.port;
+ description = ''
+ TCP port for molly-brown to bind to.
+ '';
+ };
+
+ hostName = mkOption {
+ type = types.str;
+ example = literalExample "config.networking.hostName";
+ default = config.networking.hostName;
+ description = ''
+ The hostname to respond to requests for. Requests for URLs with
+ other hosts will result in a status 53 (PROXY REQUEST REFUSED)
+ response.
+ '';
+ };
+
+ certPath = mkOption {
+ type = types.path;
+ example = "/var/lib/acme/example.com/cert.pem";
+ description = ''
+ Path to TLS certificate. An ACME certificate and key may be
+ shared with an HTTP server, but only if molly-brown has
+ permissions allowing it to read such keys.
+
+ As an example:
+
+ security.acme.certs."example.com".allowKeysForGroup = true;
+ systemd.services.molly-brown.serviceConfig.SupplementaryGroups =
+ [ config.security.acme.certs."example.com".group ];
+
+ '';
+ };
+
+ keyPath = mkOption {
+ type = types.path;
+ example = "/var/lib/acme/example.com/key.pem";
+ description = "Path to TLS key. See .";
+ };
+
+ docBase = mkOption {
+ type = types.path;
+ example = "/var/lib/molly-brown";
+ description = "Base directory for Gemini content.";
+ };
+
+ settings = mkOption {
+ type = settingsType;
+ default = { };
+ description = ''
+ molly-brown configuration. Refer to
+
+ for details on supported values.
+ '';
+ };
+
+ };
+
+ config = mkIf cfg.enable {
+
+ services.molly-brown.settings = let logDir = "/var/log/molly-brown";
+ in {
+ Port = cfg.port;
+ Hostname = cfg.hostName;
+ CertPath = cfg.certPath;
+ KeyPath = cfg.keyPath;
+ DocBase = cfg.docBase;
+ AccessLog = "${logDir}/access.log";
+ ErrorLog = "${logDir}/error.log";
+ };
+
+ systemd.services.molly-brown = {
+ description = "Molly Brown gemini server";
+ after = [ "network.target" ];
+ wantedBy = [ "multi-user.target" ];
+ serviceConfig = {
+ DynamicUser = true;
+ LogsDirectory = "molly-brown";
+ ExecStart = "${pkgs.molly-brown}/bin/molly-brown -c ${configFile}";
+ Restart = "always";
+ };
+ };
+
+ };
+
+}
diff --git a/nixos/modules/tasks/lvm.nix b/nixos/modules/tasks/lvm.nix
index b8f7a01e44ed..2c3cc4c5467d 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 cf16986b2136..1f5c15812695 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 7f3bb9bcc819..12f3ee303311 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 {};
@@ -319,6 +320,7 @@ in
sudo = handleTest ./sudo.nix {};
switchTest = handleTest ./switch-test.nix {};
sympa = handleTest ./sympa.nix {};
+ syncthing = handleTest ./syncthing.nix {};
syncthing-init = handleTest ./syncthing-init.nix {};
syncthing-relay = handleTest ./syncthing-relay.nix {};
systemd = handleTest ./systemd.nix {};
diff --git a/nixos/tests/bitcoind.nix b/nixos/tests/bitcoind.nix
new file mode 100644
index 000000000000..95c6a5b91bce
--- /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 b6bdfea22770..889a00d4b568 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 091c99326629..8aeeaca90f61 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/installed-tests/ostree.nix b/nixos/tests/installed-tests/ostree.nix
index eef7cace54cc..90e09ad4ddf4 100644
--- a/nixos/tests/installed-tests/ostree.nix
+++ b/nixos/tests/installed-tests/ostree.nix
@@ -3,21 +3,10 @@
makeInstalledTest {
tested = pkgs.ostree;
- # TODO: Wrap/patch the tests directly in the package
testConfig = {
environment.systemPackages = with pkgs; [
- (python3.withPackages (p: with p; [ pyyaml ]))
gnupg
ostree
];
-
- # for GJS tests
- environment.variables.GI_TYPELIB_PATH = lib.makeSearchPath "lib/girepository-1.0" (with pkgs; [
- gtk3
- pango.out
- ostree
- gdk-pixbuf
- atk
- ]);
};
}
diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix
index 22132073142f..02b839fee3f5 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/molly-brown.nix b/nixos/tests/molly-brown.nix
new file mode 100644
index 000000000000..09ce42726ca9
--- /dev/null
+++ b/nixos/tests/molly-brown.nix
@@ -0,0 +1,71 @@
+import ./make-test-python.nix ({ pkgs, ... }:
+
+ let testString = "NixOS Gemini test successful";
+ in {
+
+ name = "molly-brown";
+ meta = with pkgs.stdenv.lib.maintainers; { maintainers = [ ehmry ]; };
+
+ nodes = {
+
+ geminiServer = { config, pkgs, ... }:
+ let
+ inherit (config.networking) hostName;
+ cfg = config.services.molly-brown;
+ in {
+
+ environment.systemPackages = [
+ (pkgs.writeScriptBin "test-gemini" ''
+ #!${pkgs.python3}/bin/python
+
+ import socket
+ import ssl
+ import tempfile
+ import textwrap
+ import urllib.parse
+
+ url = "gemini://geminiServer/init.gmi"
+ parsed_url = urllib.parse.urlparse(url)
+
+ s = socket.create_connection((parsed_url.netloc, 1965))
+ context = ssl.SSLContext()
+ context.check_hostname = False
+ context.verify_mode = ssl.CERT_NONE
+ s = context.wrap_socket(s, server_hostname=parsed_url.netloc)
+ s.sendall((url + "\r\n").encode("UTF-8"))
+ fp = s.makefile("rb")
+ print(fp.readline().strip())
+ print(fp.readline().strip())
+ print(fp.readline().strip())
+ '')
+ ];
+
+ networking.firewall.allowedTCPPorts = [ cfg.settings.Port ];
+
+ services.molly-brown = {
+ enable = true;
+ docBase = "/tmp/docs";
+ certPath = "/tmp/cert.pem";
+ keyPath = "/tmp/key.pem";
+ };
+
+ systemd.services.molly-brown.preStart = ''
+ ${pkgs.openssl}/bin/openssl genrsa -out "/tmp/key.pem"
+ ${pkgs.openssl}/bin/openssl req -new \
+ -subj "/CN=${config.networking.hostName}" \
+ -key "/tmp/key.pem" -out /tmp/request.pem
+ ${pkgs.openssl}/bin/openssl x509 -req -days 3650 \
+ -in /tmp/request.pem -signkey "/tmp/key.pem" -out "/tmp/cert.pem"
+
+ mkdir -p "${cfg.settings.DocBase}"
+ echo "${testString}" > "${cfg.settings.DocBase}/test.gmi"
+ '';
+ };
+ };
+ testScript = ''
+ geminiServer.wait_for_unit("molly-brown")
+ geminiServer.wait_for_open_port(1965)
+ geminiServer.succeed("test-gemini")
+ '';
+
+ })
diff --git a/nixos/tests/mongodb.nix b/nixos/tests/mongodb.nix
index a637ec4bfc00..453fb569e8c4 100644
--- a/nixos/tests/mongodb.nix
+++ b/nixos/tests/mongodb.nix
@@ -15,7 +15,7 @@ import ./make-test-python.nix ({ pkgs, ... }:
node.wait_for_open_port(27017)
assert "hello" in node.succeed(
- "mongo ${testQuery}"
+ "${pkg}/bin/mongo ${testQuery}"
)
node.execute(
@@ -36,6 +36,7 @@ import ./make-test-python.nix ({ pkgs, ... }:
mongodb-3_4
mongodb-3_6
mongodb-4_0
+ mongodb-4_2
];
};
};
@@ -46,6 +47,7 @@ import ./make-test-python.nix ({ pkgs, ... }:
+ runMongoDBTest pkgs.mongodb-3_4
+ runMongoDBTest pkgs.mongodb-3_6
+ runMongoDBTest pkgs.mongodb-4_0
+ + runMongoDBTest pkgs.mongodb-4_2
+ ''
node.shutdown()
'';
diff --git a/nixos/tests/networking.nix b/nixos/tests/networking.nix
index ebebbf90eb1a..83d4f6465b68 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/nixos/tests/syncthing.nix b/nixos/tests/syncthing.nix
new file mode 100644
index 000000000000..9e2a8e01e3fb
--- /dev/null
+++ b/nixos/tests/syncthing.nix
@@ -0,0 +1,65 @@
+import ./make-test-python.nix ({ lib, pkgs, ... }: {
+ name = "syncthing";
+ meta.maintainers = with pkgs.stdenv.lib.maintainers; [ chkno ];
+
+ nodes = rec {
+ a = {
+ environment.systemPackages = with pkgs; [ curl libxml2 syncthing ];
+ services.syncthing = {
+ enable = true;
+ openDefaultPorts = true;
+ };
+ };
+ b = a;
+ };
+
+ testScript = ''
+ import json
+ import shlex
+
+ confdir = "/var/lib/syncthing/.config/syncthing"
+
+
+ def addPeer(host, name, deviceID):
+ APIKey = host.succeed(
+ "xmllint --xpath 'string(configuration/gui/apikey)' %s/config.xml" % confdir
+ ).strip()
+ oldConf = host.succeed(
+ "curl -Ss -H 'X-API-Key: %s' 127.0.0.1:8384/rest/system/config" % APIKey
+ )
+ conf = json.loads(oldConf)
+ conf["devices"].append({"deviceID": deviceID, "id": name})
+ conf["folders"].append(
+ {
+ "devices": [{"deviceID": deviceID}],
+ "id": "foo",
+ "path": "/var/lib/syncthing/foo",
+ "rescanIntervalS": 1,
+ }
+ )
+ newConf = json.dumps(conf)
+ host.succeed(
+ "curl -Ss -H 'X-API-Key: %s' 127.0.0.1:8384/rest/system/config -d %s"
+ % (APIKey, shlex.quote(newConf))
+ )
+
+
+ start_all()
+ a.wait_for_unit("syncthing.service")
+ b.wait_for_unit("syncthing.service")
+ a.wait_for_open_port(22000)
+ b.wait_for_open_port(22000)
+
+ aDeviceID = a.succeed("syncthing -home=%s -device-id" % confdir).strip()
+ bDeviceID = b.succeed("syncthing -home=%s -device-id" % confdir).strip()
+ addPeer(a, "b", bDeviceID)
+ addPeer(b, "a", aDeviceID)
+
+ a.wait_for_file("/var/lib/syncthing/foo")
+ b.wait_for_file("/var/lib/syncthing/foo")
+ a.succeed("echo a2b > /var/lib/syncthing/foo/a2b")
+ b.succeed("echo b2a > /var/lib/syncthing/foo/b2a")
+ a.wait_for_file("/var/lib/syncthing/foo/b2a")
+ b.wait_for_file("/var/lib/syncthing/foo/a2b")
+ '';
+})
diff --git a/nixos/tests/yggdrasil.nix b/nixos/tests/yggdrasil.nix
index 9ceb79747339..1d7541308b48 100644
--- a/nixos/tests/yggdrasil.nix
+++ b/nixos/tests/yggdrasil.nix
@@ -7,6 +7,7 @@ let
SigningPrivateKey = "fe3add8da35316c05f6d90d3ca79bd2801e6ccab6d37e5339fef4152589398abe2c43349083bc1e998e4ec4535b4c6a8f44ca9a5a8e07336561267253b2be5f4";
};
bobIp6 = "201:ebbd:bde9:f138:c302:4afa:1fb6:a19a";
+ bobPrefix = "301:ebbd:bde9:f138";
bobConfig = {
InterfacePeers = {
eth1 = [ "tcp://192.168.1.200:12345" ];
@@ -18,6 +19,7 @@ let
SigningPublicKey = "de111da0ec781e45bf6c63ecb45a78c24d7d4655abfaeea83b26c36eb5c0fd5b";
SigningPrivateKey = "2a6c21550f3fca0331df50668ffab66b6dce8237bcd5728e571e8033b363e247de111da0ec781e45bf6c63ecb45a78c24d7d4655abfaeea83b26c36eb5c0fd5b";
};
+ danIp6 = bobPrefix + "::2";
in import ./make-test-python.nix ({ pkgs, ...} : {
name = "yggdrasil";
@@ -69,6 +71,41 @@ in import ./make-test-python.nix ({ pkgs, ...} : {
text = builtins.toJSON bobConfig;
});
};
+
+ boot.kernel.sysctl."net.ipv6.conf.all.forwarding" = 1;
+
+ networking = {
+ bridges.br0.interfaces = [ ];
+ interfaces.br0 = {
+ ipv6.addresses = [{
+ address = bobPrefix + "::1";
+ prefixLength = 64;
+ }];
+ };
+ };
+
+ # dan is a node inside a container running on bob's host.
+ containers.dan = {
+ autoStart = true;
+ privateNetwork = true;
+ hostBridge = "br0";
+ config = { config, pkgs, ... }: {
+ networking.interfaces.eth0.ipv6 = {
+ addresses = [{
+ address = bobPrefix + "::2";
+ prefixLength = 64;
+ }];
+ routes = [{
+ address = "200::";
+ prefixLength = 7;
+ via = bobPrefix + "::1";
+ }];
+ };
+ services.httpd.enable = true;
+ services.httpd.adminAddr = "foo@example.org";
+ networking.firewall.allowedTCPPorts = [ 80 ];
+ };
+ };
};
# Carol only does local peering. Carol's yggdrasil config is all Nix.
@@ -100,7 +137,7 @@ in import ./make-test-python.nix ({ pkgs, ...} : {
bob.start()
carol.start()
- bob.wait_for_unit("yggdrasil.service")
+ bob.wait_for_unit("default.target")
carol.wait_for_unit("yggdrasil.service")
ip_addr_show = "ip -o -6 addr show dev ygg0 scope global"
@@ -117,10 +154,13 @@ in import ./make-test-python.nix ({ pkgs, ...} : {
carol.succeed("ping -c 1 ${aliceIp6}")
carol.succeed("ping -c 1 ${bobIp6}")
+ carol.succeed("ping -c 1 ${bobPrefix}::1")
+ carol.succeed("ping -c 8 ${danIp6}")
carol.fail("journalctl -u dhcpcd | grep ygg0")
alice.wait_for_unit("httpd.service")
carol.succeed("curl --fail -g http://[${aliceIp6}]")
+ carol.succeed("curl --fail -g http://[${danIp6}]")
'';
})
diff --git a/pkgs/applications/audio/audacity/default.nix b/pkgs/applications/audio/audacity/default.nix
index 18f2b4f67cdb..58f25d46e0bc 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/mixxx/default.nix b/pkgs/applications/audio/mixxx/default.nix
index 84e445e8538c..576dd4d97b35 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 ac16c182a50e..a115812b86a6 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 6fec4df060d9..15d38a1eea77 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 7b4d823006de..84ff9f787d53 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 e7a43ad8a595..f1c76bf0d33c 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 693de28bf472..16c8623bd7bd 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 000000000000..515a653d6bc9
--- /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/blockchains/go-ethereum.nix b/pkgs/applications/blockchains/go-ethereum.nix
index a042e75ccb3a..421acfef6ba1 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/editors/emacs/default.nix b/pkgs/applications/editors/emacs/default.nix
index 570dc28c684f..b88aa00d42d4 100644
--- a/pkgs/applications/editors/emacs/default.nix
+++ b/pkgs/applications/editors/emacs/default.nix
@@ -2,6 +2,8 @@
, Xaw3d, libXcursor, pkgconfig, gettext, libXft, dbus, libpng, libjpeg, libungif
, libtiff, librsvg, gconf, libxml2, imagemagick, gnutls, libselinux
, alsaLib, cairo, acl, gpm, AppKit, GSS, ImageIO, m17n_lib, libotf
+, jansson, harfbuzz
+, libgccjit, targetPlatform, binutils, binutils-unwrapped, makeWrapper # native-comp params
, systemd ? null
, withX ? !stdenv.isDarwin
, withNS ? stdenv.isDarwin
@@ -11,6 +13,7 @@
, withCsrc ? true
, srcRepo ? false, autoconf ? null, automake ? null, texinfo ? null
, siteStart ? ./site-start.el
+, nativeComp ? false
, toolkit ? (
if withGTK2 then "gtk2"
else if withGTK3 then "gtk3"
@@ -28,10 +31,13 @@ assert withGTK3 -> !withGTK2 && gtk3-x11 != null;
assert withXwidgets -> withGTK3 && webkitgtk != null;
-stdenv.mkDerivation rec {
- name = "emacs-${version}${versionModifier}";
+let
version = "26.3";
versionModifier = "";
+ name = "emacs-${version}${versionModifier}";
+
+in stdenv.mkDerivation {
+ inherit name version;
src = fetchurl {
url = "mirror://gnu/emacs/${name}.tar.xz";
@@ -50,29 +56,50 @@ stdenv.mkDerivation rec {
})
];
- postPatch = lib.optionalString srcRepo ''
- rm -fr .git
- '';
+ postPatch = lib.concatStringsSep "\n" [
+ (lib.optionalString srcRepo ''
+ rm -fr .git
+ '')
+
+ # Make native compilation work both inside and outside of nix build
+ (lib.optionalString nativeComp (let
+ libPath = lib.concatStringsSep ":" [
+ "${lib.getLib libgccjit}/lib/gcc/${targetPlatform.config}/${libgccjit.version}"
+ "${lib.getLib stdenv.cc.cc}/lib"
+ "${lib.getLib stdenv.glibc}/lib"
+ ];
+ in ''
+ substituteInPlace lisp/emacs-lisp/comp.el --replace \
+ "(defcustom comp-async-env-modifier-form nil" \
+ "(defcustom comp-async-env-modifier-form '((setenv \"LIBRARY_PATH\" (string-join (seq-filter (lambda (v) (null (eq v nil))) (list (getenv \"LIBRARY_PATH\") \"${libPath}\")) \":\")))"
+
+ ''))
+
+ ""
+ ];
CFLAGS = "-DMAC_OS_X_VERSION_MAX_ALLOWED=101200";
- nativeBuildInputs = [ pkgconfig ]
+ LIBRARY_PATH = if nativeComp then "${lib.getLib stdenv.cc.libc}/lib" else "";
+
+ nativeBuildInputs = [ pkgconfig makeWrapper ]
++ lib.optionals srcRepo [ autoconf automake texinfo ]
++ lib.optional (withX && (withGTK3 || withXwidgets)) wrapGAppsHook;
buildInputs =
- [ ncurses gconf libxml2 gnutls alsaLib acl gpm gettext ]
+ [ ncurses gconf libxml2 gnutls alsaLib acl gpm gettext jansson harfbuzz.dev ]
++ lib.optionals stdenv.isLinux [ dbus libselinux systemd ]
++ lib.optionals withX
[ xlibsWrapper libXaw Xaw3d libXpm libpng libjpeg libungif libtiff libXft
- gconf ]
+ gconf cairo ]
++ lib.optionals (withX || withNS) [ imagemagick librsvg ]
++ lib.optionals (stdenv.isLinux && withX) [ m17n_lib libotf ]
++ lib.optional (withX && withGTK2) gtk2-x11
++ lib.optionals (withX && withGTK3) [ gtk3-x11 gsettings-desktop-schemas ]
- ++ lib.optional (stdenv.isDarwin && withX) cairo
++ lib.optionals (withX && withXwidgets) [ webkitgtk glib-networking ]
- ++ lib.optionals withNS [ AppKit GSS ImageIO ];
+ ++ lib.optionals withNS [ AppKit GSS ImageIO ]
+ ++ lib.optionals nativeComp [ libgccjit ]
+ ;
hardeningDisable = [ "format" ];
@@ -88,7 +115,9 @@ stdenv.mkDerivation rec {
then [ "--with-x-toolkit=${toolkit}" "--with-xft" ]
else [ "--with-x=no" "--with-xpm=no" "--with-jpeg=no" "--with-png=no"
"--with-gif=no" "--with-tiff=no" ])
- ++ lib.optional withXwidgets "--with-xwidgets";
+ ++ lib.optional withXwidgets "--with-xwidgets"
+ ++ lib.optional nativeComp "--with-nativecomp"
+ ;
preConfigure = lib.optionalString srcRepo ''
./autogen.sh
@@ -106,13 +135,16 @@ stdenv.mkDerivation rec {
postInstall = ''
mkdir -p $out/share/emacs/site-lisp
cp ${siteStart} $out/share/emacs/site-lisp/site-start.el
+
$out/bin/emacs --batch -f batch-byte-compile $out/share/emacs/site-lisp/site-start.el
+ siteVersionDir=`ls $out/share/emacs | grep -v site-lisp | head -n 1`
+
rm -rf $out/var
- rm -rf $out/share/emacs/${version}/site-lisp
+ rm -rf $siteVersionDir
'' + lib.optionalString withCsrc ''
for srcdir in src lisp lwlib ; do
- dstdir=$out/share/emacs/${version}/$srcdir
+ dstdir=$siteVersionDir/$srcdir
mkdir -p $dstdir
find $srcdir -name "*.[chm]" -exec cp {} $dstdir \;
cp $srcdir/TAGS $dstdir
@@ -123,16 +155,24 @@ stdenv.mkDerivation rec {
mv nextstep/Emacs.app $out/Applications
'';
- postFixup =
- let libPath = lib.makeLibraryPath [
- libXcursor
- ];
- in lib.optionalString (stdenv.isLinux && withX && toolkit == "lucid") ''
+ postFixup = lib.concatStringsSep "\n" [
+
+ (lib.optionalString (stdenv.isLinux && withX && toolkit == "lucid") ''
patchelf --set-rpath \
- "$(patchelf --print-rpath "$out/bin/emacs"):${libPath}" \
+ "$(patchelf --print-rpath "$out/bin/emacs"):${lib.makeLibraryPath [ libXcursor ]}" \
"$out/bin/emacs"
patchelf --add-needed "libXcursor.so.1" "$out/bin/emacs"
- '';
+ '')
+
+ (lib.optionalString nativeComp ''
+ wrapProgram $out/bin/emacs-* --prefix PATH : "${lib.makeBinPath [ binutils binutils-unwrapped ]}"
+ '')
+
+ ];
+
+ passthru = {
+ inherit nativeComp;
+ };
meta = with stdenv.lib; {
description = "The extensible, customizable GNU text editor";
diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix
index 968cc69d92db..285b3a8a1806 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 cc0c73b73e9f..149eb5cf8610 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 69764daedebe..22a58e81c97b 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/renderdoc/default.nix b/pkgs/applications/graphics/renderdoc/default.nix
index 2683206c8e4c..5f39116e85fb 100644
--- a/pkgs/applications/graphics/renderdoc/default.nix
+++ b/pkgs/applications/graphics/renderdoc/default.nix
@@ -13,14 +13,14 @@ let
pythonPackages = python3Packages;
in
mkDerivation rec {
- version = "1.8";
+ version = "1.9";
pname = "renderdoc";
src = fetchFromGitHub {
owner = "baldurk";
repo = "renderdoc";
rev = "v${version}";
- sha256 = "177j893abplj8wd8j4ava58m1mr7qq8fsffsq0w4hf5xgl5w8fq8";
+ sha256 = "18nparkd435hdbm924jfdvmym7f3xd2fcy96jr4lrkl5rhj2sf85";
};
buildInputs = [
diff --git a/pkgs/applications/misc/clight/default.nix b/pkgs/applications/misc/clight/default.nix
index ed8767419d4d..2502459af106 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 82730842baca..1cac8811103d 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/dunst/default.nix b/pkgs/applications/misc/dunst/default.nix
index 7da2ae421d7a..a906669e7c6b 100644
--- a/pkgs/applications/misc/dunst/default.nix
+++ b/pkgs/applications/misc/dunst/default.nix
@@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
pname = "dunst";
- version = "1.4.1";
+ version = "1.5.0";
src = fetchFromGitHub {
owner = "dunst-project";
repo = "dunst";
rev = "v${version}";
- sha256 = "0xjj1f2jr1ja5grj6wrx5jjz1sx5fpqnvkw7nqi4452j3nc4p4l2";
+ sha256 = "0irwkqcgwkqaylcpvqgh25gn2ysbdm2kydipxfzcq1ddj9ns6f9c";
};
nativeBuildInputs = [ perl pkgconfig which systemd makeWrapper ];
diff --git a/pkgs/applications/misc/girara/default.nix b/pkgs/applications/misc/girara/default.nix
index 45bca7d3fbf5..def70d7df3c6 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 d80526d66fe7..3f0f8946c29a 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/pdfsam-basic/default.nix b/pkgs/applications/misc/pdfsam-basic/default.nix
index dcf4a0a621ba..22add00c84d8 100644
--- a/pkgs/applications/misc/pdfsam-basic/default.nix
+++ b/pkgs/applications/misc/pdfsam-basic/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "pdfsam-basic";
- version = "4.1.3";
+ version = "4.1.4";
src = fetchurl {
url = "https://github.com/torakiki/pdfsam/releases/download/v${version}/pdfsam_${version}-1_amd64.deb";
- sha256 = "1rhv6mf6pr9aaa8516i3b7v6h622qb1p8c4jsy3j0s5wrdry5l9l";
+ sha256 = "1gw3cmc8c1xxc55bm71v1dz9x9560lbhx9nkwprarhxlmn0m0zzp";
};
unpackPhase = ''
diff --git a/pkgs/applications/misc/synergy/default.nix b/pkgs/applications/misc/synergy/default.nix
index bb922f3ca5b2..5c1cce192163 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/tut/default.nix b/pkgs/applications/misc/tut/default.nix
index dbe5b971edd5..d65e894417e6 100644
--- a/pkgs/applications/misc/tut/default.nix
+++ b/pkgs/applications/misc/tut/default.nix
@@ -2,7 +2,7 @@
buildGoPackage rec {
pname = "tut";
- version = "0.0.13";
+ version = "0.0.14";
goPackagePath = "github.com/RasmusLindroth/tut";
goDeps = ./deps.nix;
@@ -11,7 +11,7 @@ buildGoPackage rec {
owner = "RasmusLindroth";
repo = pname;
rev = version;
- sha256 = "085qiv9q2hzv1v6qmbddra23acsmmkbwmjqc3cp81gfgl893z7sm";
+ sha256 = "1l7lc6cjx97v9zhc0b6lfzqjmyv1i3qj83drkck36if3mc60vvwi";
};
meta = with stdenv.lib; {
diff --git a/pkgs/applications/networking/Sylk/default.nix b/pkgs/applications/networking/Sylk/default.nix
index f6a88f26e9a2..3f2e4ca99be6 100644
--- a/pkgs/applications/networking/Sylk/default.nix
+++ b/pkgs/applications/networking/Sylk/default.nix
@@ -2,7 +2,7 @@
let
pname = "Sylk";
- version = "2.7.2";
+ version = "2.8.0";
in
appimageTools.wrapType2 rec {
@@ -10,7 +10,7 @@ appimageTools.wrapType2 rec {
src = fetchurl {
url = "http://download.ag-projects.com/Sylk/Sylk-${version}-x86_64.AppImage";
- sha256 = "1hz41jan8hw56ahpaajlb1yy5zjkyxrclzmqhklm5x59b76pd0zx";
+ hash = "sha256:09j1kijs31yk3iw2lj7szv1nwkqiqydj3zkkmr49qlib1qj717wh";
};
profile = ''
diff --git a/pkgs/applications/networking/browsers/chromium/browser.nix b/pkgs/applications/networking/browsers/chromium/browser.nix
index 7c0609730c24..51e3fb032f2b 100644
--- a/pkgs/applications/networking/browsers/chromium/browser.nix
+++ b/pkgs/applications/networking/browsers/chromium/browser.nix
@@ -90,5 +90,6 @@ mkChromiumDerivation (base: rec {
platforms = platforms.linux;
hydraPlatforms = if channel == "stable" then ["aarch64-linux" "x86_64-linux"] else [];
timeout = 172800; # 48 hours
+ broken = channel == "dev"; # Requires LLVM 11
};
})
diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix
index d9a1398d0909..c74b7e25090d 100644
--- a/pkgs/applications/networking/browsers/chromium/default.nix
+++ b/pkgs/applications/networking/browsers/chromium/default.nix
@@ -44,7 +44,7 @@ let
sha256 = "00y2d35wvqmx9glaqhfb62wdgbfpwr77v0934nnvh9ks71vnsjqy";
};
});
- } // lib.optionalAttrs (channel == "dev") {
+ } // lib.optionalAttrs (channel == "beta") {
gnChromium = gn.overrideAttrs (oldAttrs: {
version = "2020-05-19";
src = fetchgit {
@@ -53,6 +53,15 @@ let
sha256 = "0197msabskgfbxvhzq73gc3wlr3n9cr4bzrhy5z5irbvy05lxk17";
};
});
+ } // lib.optionalAttrs (channel == "dev") {
+ gnChromium = gn.overrideAttrs (oldAttrs: {
+ version = "2020-07-20";
+ src = fetchgit {
+ url = "https://gn.googlesource.com/gn";
+ rev = "3028c6a426a4aaf6da91c4ebafe716ae370225fe";
+ sha256 = "0h3wf4152zdvrbb0jbj49q6814lfl3rcy5mj8b2pl9s0ahvkbc6q";
+ };
+ });
});
browser = callPackage ./browser.nix { inherit channel enableWideVine; };
diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix
index 874e45307ebf..81cc31aacc8f 100644
--- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix
+++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix
@@ -1,18 +1,18 @@
# This file is autogenerated from update.sh in the same directory.
{
beta = {
- sha256 = "0yf6j0459qzr677zsa2apmfz0x0ndlscvwj1a5v40nqjijchv5qp";
- sha256bin64 = "017ix9a74f2gzlg6in0x6fqgiw8bpk0rypr6wsqqkslywprypjd0";
- version = "84.0.4147.89";
+ sha256 = "06cl77yi7cb6r7n8mn38d61zmgwxi690qxrkd56hg2773hn06wq5";
+ sha256bin64 = "0a6c44qb0n2hdc42p5xqybnbhgdxd51lyygkqz42fmym6id65v88";
+ version = "85.0.4183.39";
};
dev = {
- sha256 = "1dbbr7s8vbhxd0sk4k2yqp630zp1r4gzkkd2a86pzlzq2mjhsk8a";
- sha256bin64 = "0bphfwi6nkj9nzrjjaffiv27xfblgdikyifsbjl6vv2pawkh335q";
- version = "85.0.4183.15";
+ sha256 = "1l2d3gk7si1djxn3901fjgykv7nzc8g970m3fb9pjflfrr8f17v6";
+ sha256bin64 = "0flsmy5blrc9gs6cikag7mdlvgkm6mzm745kcq0shfmhanvlkykn";
+ 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/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix
index a68a97b6bb12..4ecdec77ddbb 100644
--- a/pkgs/applications/networking/browsers/firefox/common.nix
+++ b/pkgs/applications/networking/browsers/firefox/common.nix
@@ -51,7 +51,7 @@
# https://github.com/NixOS/nixpkgs/issues/31843#issuecomment-346372756 we
# have permission to use the official firefox branding.
#
-# Fur purposes of documentation the statement of @sylvestre:
+# For purposes of documentation the statement of @sylvestre:
# > As the person who did part of the work described in the LWN article
# > and release manager working for Mozilla, I can confirm the statement
# > that I made in
diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix
index 40393f85b1ad..424c45d305e8 100644
--- a/pkgs/applications/networking/browsers/firefox/wrapper.nix
+++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix
@@ -27,6 +27,7 @@ let
, nameSuffix ? ""
, icon ? browserName
, extraNativeMessagingHosts ? []
+ , pkcs11Modules ? []
, forceWayland ? false
, useGlvnd ? true
, cfg ? config.${browserName} or {}
@@ -74,7 +75,8 @@ let
++ lib.optionals (cfg.enableQuakeLive or false)
(with xorg; [ stdenv.cc libX11 libXxf86dga libXxf86vm libXext libXt alsaLib zlib ])
++ lib.optional (enableAdobeFlash && (cfg.enableAdobeFlashDRM or false)) hal-flash
- ++ lib.optional (config.pulseaudio or true) libpulseaudio;
+ ++ lib.optional (config.pulseaudio or true) libpulseaudio
+ ++ pkcs11Modules;
gtk_modules = [ libcanberra-gtk2 ];
in stdenv.mkDerivation {
@@ -154,6 +156,11 @@ let
ln -sLt $out/lib/mozilla/native-messaging-hosts $ext/lib/mozilla/native-messaging-hosts/*
done
+ mkdir -p $out/lib/mozilla/pkcs11-modules
+ for ext in ${toString pkcs11Modules}; do
+ ln -sLt $out/lib/mozilla/pkcs11-modules $ext/lib/mozilla/pkcs11-modules/*
+ done
+
# For manpages, in case the program supplies them
mkdir -p $out/nix-support
echo ${browser} > $out/nix-support/propagated-user-env-packages
diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix
index f65ae2f46956..5af14805bd85 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/browsers/tor-browser-bundle-bin/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
index 1b4fa5ef595a..4b8a1238c010 100644
--- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
+++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
@@ -46,7 +46,8 @@
# Hardening
, graphene-hardened-malloc
-, useHardenedMalloc ? graphene-hardened-malloc != null && builtins.elem stdenv.system graphene-hardened-malloc.meta.platforms
+# crashes with intel driver
+, useHardenedMalloc ? false
# Whether to disable multiprocess support to work around crashing tabs
# TODO: fix the underlying problem instead of this terrible work-around
diff --git a/pkgs/applications/networking/browsers/ungoogled-chromium/common.nix b/pkgs/applications/networking/browsers/ungoogled-chromium/common.nix
index a5bea6cf34a9..567a75a31aba 100644
--- a/pkgs/applications/networking/browsers/ungoogled-chromium/common.nix
+++ b/pkgs/applications/networking/browsers/ungoogled-chromium/common.nix
@@ -4,7 +4,7 @@
, bzip2, flac, speex, libopus
, libevent, expat, libjpeg, snappy
, libpng, libcap
-, xdg_utils, yasm, minizip, libwebp
+, xdg_utils, yasm, nasm, minizip, libwebp
, libusb1, pciutils, nss, re2, zlib
, python2Packages, perl, pkgconfig
@@ -13,10 +13,12 @@
, bison, gperf
, glib, gtk3, dbus-glib
, glibc
+, xorg
, libXScrnSaver, libXcursor, libXtst, libGLU, libGL
, protobuf, speechd, libXdamage, cups
, ffmpeg_3, libxslt, libxml2, at-spi2-core
, jre
+, pipewire_0_2
# optional dependencies
, libgcrypt ? null # gnomeSupport || cupsSupport
@@ -74,7 +76,7 @@ let
in attrs: concatStringsSep " " (attrValues (mapAttrs toFlag attrs));
gnSystemLibraries = [
- "flac" "libwebp" "libxslt" "yasm" "opus" "snappy" "libpng"
+ "flac" "libwebp" "libxslt" "opus" "snappy" "libpng"
# "zlib" # version 77 reports unresolved dependency on //third_party/zlib:zlib_config
# "libjpeg" # fails with multiple undefined references to chromium_jpeg_*
# "re2" # fails with linker errors
@@ -91,9 +93,10 @@ let
bzip2 flac speex opusWithCustomModes
libevent expat libjpeg snappy
libpng libcap
- xdg_utils yasm minizip libwebp
+ xdg_utils minizip libwebp
libusb1 re2 zlib
ffmpeg_3 libxslt libxml2
+ nasm
# harfbuzz # in versions over 63 harfbuzz and freetype are being built together
# so we can't build with one from system and other from source
];
@@ -128,8 +131,9 @@ let
nativeBuildInputs = [
ninja which python2Packages.python perl pkgconfig
python2Packages.ply python2Packages.jinja2 nodejs
- gnutar
- ] ++ optional (versionAtLeast version "83") python2Packages.setuptools;
+ gnutar python2Packages.setuptools
+ (xorg.xcbproto.override { python = python2Packages.python; })
+ ];
buildInputs = defaultDependencies ++ [
nspr nss systemd
@@ -139,6 +143,7 @@ let
libXScrnSaver libXcursor libXtst libGLU libGL
pciutils protobuf speechd libXdamage at-spi2-core
jre
+ pipewire_0_2
] ++ optional useVaapi libva
++ optional gnomeKeyringSupport libgnome-keyring3
++ optionals gnomeSupport [ gnome.GConf libgcrypt ]
@@ -161,13 +166,10 @@ let
#
# ++ optionals (channel == "dev") [ ( githubPatch "" "0000000000000000000000000000000000000000000000000000000000000000" ) ]
# ++ optional (versionRange "68" "72") ( githubPatch "" "0000000000000000000000000000000000000000000000000000000000000000" )
- ] ++ optionals (useVaapi) ([ # Fixes for the VA-API build:
+ ] ++ optionals (useVaapi) [ # Improvements for the VA-API build:
./patches/enable-vdpau-support-for-nvidia.patch # https://aur.archlinux.org/cgit/aur.git/tree/vdpau-support.patch?h=chromium-vaapi
./patches/enable-video-acceleration-on-linux.patch # Can be controlled at runtime (i.e. without rebuilding Chromium)
- ] ++ optionals (versionRange "81" "82") [
- (githubPatch "5b2ff215473e0526b5b24aeff4ad90d369b21c75" "0n00vh8wfpn2ay5fqsxcsx0zadnv7mihm72bcvnrfzh75nzbg902")
- (githubPatch "98e343ab369e4262511b5fce547728e3e5eefba8" "00wwp653jk0k0yvix00vr7ymgck9dj7fxjwx4nc67ynn84dh6064")
- ]);
+ ];
postPatch = ''
# We want to be able to specify where the sandbox is via CHROME_DEVEL_SANDBOX
@@ -187,6 +189,11 @@ let
'/usr/share/locale/' \
'${glibc}/share/locale/'
+ substituteInPlace ui/gfx/x/BUILD.gn \
+ --replace \
+ '/usr/share/xcb' \
+ '${xorg.xcbproto}/share/xcb/'
+
sed -i -e 's@"\(#!\)\?.*xdg-@"\1${xdg_utils}/bin/xdg-@' \
chrome/browser/shell_integration_linux.cc
@@ -239,7 +246,6 @@ let
'';
gnFlags = mkGnFlags ({
- linux_use_bundled_binutils = false;
use_lld = false;
use_gold = true;
gold_path = "${stdenv.cc}/bin";
@@ -257,6 +263,8 @@ let
# added later in the wrapped -wv build or downloaded from Google.
enable_widevine = true;
use_cups = cupsSupport;
+ # Provides the enable-webrtc-pipewire-capturer flag to support Wayland screen capture.
+ rtc_use_pipewire = true;
treat_warnings_as_errors = false;
is_clang = stdenv.cc.isClang;
diff --git a/pkgs/applications/networking/browsers/ungoogled-chromium/default.nix b/pkgs/applications/networking/browsers/ungoogled-chromium/default.nix
index 4b6c33221827..9051fc55feb4 100644
--- a/pkgs/applications/networking/browsers/ungoogled-chromium/default.nix
+++ b/pkgs/applications/networking/browsers/ungoogled-chromium/default.nix
@@ -1,7 +1,8 @@
{ newScope, config, stdenv, llvmPackages_9, llvmPackages_10
-, makeWrapper, ed
+, makeWrapper, ed, gnugrep
, glib, gtk3, gnome3, gsettings-desktop-schemas, gn, fetchgit
, libva ? null
+, pipewire_0_2
, gcc, nspr, nss, runCommand
, lib
@@ -23,9 +24,7 @@
}:
let
- llvmPackages = if channel != "stable"
- then llvmPackages_10
- else llvmPackages_9;
+ llvmPackages = llvmPackages_10;
stdenv = llvmPackages.stdenv;
callPackage = newScope chromium;
@@ -38,8 +37,6 @@ let
mkChromiumDerivation = callPackage ./common.nix ({
inherit gnome gnomeSupport gnomeKeyringSupport proprietaryCodecs cupsSupport pulseSupport useOzone;
inherit ungoogled;
- gnChromium = gn;
- } // lib.optionalAttrs (channel != "stable") {
# TODO: Remove after we can update gn for the stable channel (backward incompatible changes):
gnChromium = gn.overrideAttrs (oldAttrs: {
version = "2020-03-23";
@@ -49,6 +46,15 @@ let
sha256 = "00y2d35wvqmx9glaqhfb62wdgbfpwr77v0934nnvh9ks71vnsjqy";
};
});
+ } // lib.optionalAttrs (channel == "dev") {
+ gnChromium = gn.overrideAttrs (oldAttrs: {
+ version = "2020-05-19";
+ src = fetchgit {
+ url = "https://gn.googlesource.com/gn";
+ rev = "d0a6f072070988e7b038496c4e7d6c562b649732";
+ sha256 = "0197msabskgfbxvhzq73gc3wlr3n9cr4bzrhy5z5irbvy05lxk17";
+ };
+ });
});
browser = callPackage ./browser.nix { inherit channel enableWideVine; };
@@ -140,7 +146,7 @@ let
(!enableVaapi)
"--add-flags --disable-accelerated-video-decode --add-flags --disable-accelerated-video-encode";
in stdenv.mkDerivation {
- name = "chromium${suffix}-${version}";
+ name = "ungoogled-chromium${suffix}-${version}";
inherit version;
buildInputs = [
@@ -158,7 +164,7 @@ in stdenv.mkDerivation {
buildCommand = let
browserBinary = "${chromiumWV}/libexec/chromium/chromium";
getWrapperFlags = plugin: "$(< \"${plugin}/nix-support/wrapper-flags\")";
- libPath = stdenv.lib.makeLibraryPath [ libva ];
+ libPath = stdenv.lib.makeLibraryPath [ libva pipewire_0_2 ];
in with stdenv.lib; ''
mkdir -p "$out/bin"
@@ -185,7 +191,7 @@ in stdenv.mkDerivation {
'' + ''
# libredirect causes chromium to deadlock on startup
- export LD_PRELOAD="\$(echo -n "\$LD_PRELOAD" | tr ':' '\n' | grep -v /lib/libredirect\\\\.so$ | tr '\n' ':')"
+ export LD_PRELOAD="\$(echo -n "\$LD_PRELOAD" | tr ':' '\n' | ${gnugrep}/bin/grep -v /lib/libredirect\\\\.so$ | tr '\n' ':')"
export XDG_DATA_DIRS=$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH\''${XDG_DATA_DIRS:+:}\$XDG_DATA_DIRS
diff --git a/pkgs/applications/networking/browsers/ungoogled-chromium/patches/enable-vdpau-support-for-nvidia.patch b/pkgs/applications/networking/browsers/ungoogled-chromium/patches/enable-vdpau-support-for-nvidia.patch
index b5372d1a2556..8d879de7bfd8 100644
--- a/pkgs/applications/networking/browsers/ungoogled-chromium/patches/enable-vdpau-support-for-nvidia.patch
+++ b/pkgs/applications/networking/browsers/ungoogled-chromium/patches/enable-vdpau-support-for-nvidia.patch
@@ -31,15 +31,6 @@
// TODO(crbug.com/912295): Enable a better BufferAllocationMode for IMPORT
// |output_mode_| as well.
if (output_mode_ == VideoDecodeAccelerator::Config::OutputMode::IMPORT)
-@@ -1105,7 +1113,7 @@ VaapiVideoDecodeAccelerator::DecideBufferAllocationMode() {
- // depends on the bitstream and sometimes it's not enough to cover the amount
- // of frames needed by the client pipeline (see b/133733739).
- // TODO(crbug.com/911754): Enable for VP9 Profile 2.
-- if (IsGeminiLakeOrLater() &&
-+ if (false && IsGeminiLakeOrLater() &&
- (profile_ == VP9PROFILE_PROFILE0 || profile_ == VP8PROFILE_ANY)) {
- // Add one to the reference frames for the one being currently egressed, and
- // an extra allocation for both |client_| and |decoder_|, see
--- a/media/gpu/vaapi/vaapi_video_decode_accelerator.h
+++ b/media/gpu/vaapi/vaapi_video_decode_accelerator.h
@@ -204,6 +204,7 @@ class MEDIA_GPU_EXPORT VaapiVideoDecodeAccelerator
diff --git a/pkgs/applications/networking/browsers/ungoogled-chromium/plugins.nix b/pkgs/applications/networking/browsers/ungoogled-chromium/plugins.nix
index 663d8e7f6b67..54da49b9e301 100644
--- a/pkgs/applications/networking/browsers/ungoogled-chromium/plugins.nix
+++ b/pkgs/applications/networking/browsers/ungoogled-chromium/plugins.nix
@@ -44,11 +44,11 @@ let
flash = stdenv.mkDerivation rec {
pname = "flashplayer-ppapi";
- version = "32.0.0.371";
+ version = "32.0.0.403";
src = fetchzip {
url = "https://fpdownload.adobe.com/pub/flashplayer/pdc/${version}/flash_player_ppapi_linux.x86_64.tar.gz";
- sha256 = "1nks2wx74b21hv0l7bnrzkxn7c6p6r8zgwbqvy3cqpi8famyr5v9";
+ sha256 = "1xirngiqypylgm8f3ddvny2ghqxgj8i98bm1carcj2vryw53wwal";
stripRoot = false;
};
diff --git a/pkgs/applications/networking/browsers/ungoogled-chromium/ungoogled-src.nix b/pkgs/applications/networking/browsers/ungoogled-chromium/ungoogled-src.nix
index c393f7fe28ec..109e410d5eef 100644
--- a/pkgs/applications/networking/browsers/ungoogled-chromium/ungoogled-src.nix
+++ b/pkgs/applications/networking/browsers/ungoogled-chromium/ungoogled-src.nix
@@ -1,6 +1,6 @@
{
- "81.0.4044.138" = {
- rev = "81.0.4044.138-1";
- sha256 = "1qa5lw2psaqxr2zklaldx4sm6by4gsw3mfrp01ijc4kkp9jmvg7r";
+ "84.0.4147.89" = {
+ rev = "84.0.4147.89-1";
+ sha256 = "1bqvcq3dj6615198j7cz3ylyyic5zpis06capvl6ybl1na3ainb0";
};
}
diff --git a/pkgs/applications/networking/browsers/ungoogled-chromium/upstream-info.nix b/pkgs/applications/networking/browsers/ungoogled-chromium/upstream-info.nix
index defb58822a03..874e45307ebf 100644
--- a/pkgs/applications/networking/browsers/ungoogled-chromium/upstream-info.nix
+++ b/pkgs/applications/networking/browsers/ungoogled-chromium/upstream-info.nix
@@ -1,18 +1,18 @@
# This file is autogenerated from update.sh in the same directory.
{
beta = {
- sha256 = "0z9p4v5mkinf7hbdagh4bz6ymqjxg3df3wjpvm201ilzzngmjqz1";
- sha256bin64 = "1srvlirhnynh0q2a17p8z13p7r54z0cchh1d1h07hqljnwmsf8qj";
- version = "83.0.4103.34";
+ sha256 = "0yf6j0459qzr677zsa2apmfz0x0ndlscvwj1a5v40nqjijchv5qp";
+ sha256bin64 = "017ix9a74f2gzlg6in0x6fqgiw8bpk0rypr6wsqqkslywprypjd0";
+ version = "84.0.4147.89";
};
dev = {
- sha256 = "178fc112bsbrgj2hss78y8rhnz8hl85fr33gawk9fz88zk5qz7xd";
- sha256bin64 = "06qra245l2bbgxc3k04aabkgq1qnzybnrjhrjb25vriv31ji36b1";
- version = "84.0.4128.3";
+ sha256 = "1dbbr7s8vbhxd0sk4k2yqp630zp1r4gzkkd2a86pzlzq2mjhsk8a";
+ sha256bin64 = "0bphfwi6nkj9nzrjjaffiv27xfblgdikyifsbjl6vv2pawkh335q";
+ version = "85.0.4183.15";
};
stable = {
- sha256 = "19kpzmqmld0m0nflx13w9flxfal19msnxhzl3lip1jqih65z4y7l";
- sha256bin64 = "0sl4wv7npc3rhi7jgn679hi7j5ykzwpx5dahy78h87yfg4fx84wx";
- version = "81.0.4044.138";
+ sha256 = "0yf6j0459qzr677zsa2apmfz0x0ndlscvwj1a5v40nqjijchv5qp";
+ sha256bin64 = "1hzhgvs2ykqsncpnbnhzh09sw1vlsdfjhs06z5gc80l47brdi3wz";
+ version = "84.0.4147.89";
};
}
diff --git a/pkgs/applications/networking/cluster/argo/default.nix b/pkgs/applications/networking/cluster/argo/default.nix
index 29c7fc4b3aa1..e2c7436a8ac1 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 c6ae0629d7c6..a65ac2ec98b5 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/luigi/default.nix b/pkgs/applications/networking/cluster/luigi/default.nix
index c6e2b7d85598..f69082bff3a7 100644
--- a/pkgs/applications/networking/cluster/luigi/default.nix
+++ b/pkgs/applications/networking/cluster/luigi/default.nix
@@ -2,11 +2,11 @@
python3Packages.buildPythonApplication rec {
pname = "luigi";
- version = "3.0.0";
+ version = "3.0.1";
src = python3Packages.fetchPypi {
inherit pname version;
- sha256 = "1km9fnq4pf0iqqcmz94idm0zb3l92zinz0bn6ip86xqhchafd4vf";
+ sha256 = "02c480f5pjgqsvqnkaw7f6n4nhdspmhq5w7lw8sgg2v3jghg8n7i";
};
propagatedBuildInputs = with python3Packages; [ dateutil tornado_4 python-daemon boto3 ];
diff --git a/pkgs/applications/networking/cluster/terraform-compliance/default.nix b/pkgs/applications/networking/cluster/terraform-compliance/default.nix
new file mode 100644
index 000000000000..e906f035fda2
--- /dev/null
+++ b/pkgs/applications/networking/cluster/terraform-compliance/default.nix
@@ -0,0 +1,56 @@
+{ lib
+, GitPython
+, buildPythonApplication
+, emoji
+, fetchFromGitHub
+, filetype
+, ipython
+, junit-xml
+, lxml
+, mock
+, netaddr
+, pytestCheckHook
+, python3Packages
+, radish-bdd
+, semver
+}:
+
+buildPythonApplication rec {
+ pname = "terraform-compliance";
+ version = "1.2.11";
+
+ # No tests in Pypi package
+ src = fetchFromGitHub {
+ owner = "eerkunt";
+ repo = pname;
+ rev = version;
+ sha256 = "161mszmxqp3wypnda48ama2mmq8yjilkxahwc1mxjwzy1n19sn7v";
+ };
+
+ checkInputs = [ pytestCheckHook ];
+
+ disabledTests = [
+ "test_which_success"
+ "test_readable_plan_file_is_not_json"
+ ];
+
+ propagatedBuildInputs = [
+ GitPython
+ emoji
+ filetype
+ ipython
+ junit-xml
+ lxml
+ mock
+ netaddr
+ radish-bdd
+ semver
+ ];
+
+ meta = with lib; {
+ description = "BDD test framework for terraform";
+ homepage = https://github.com/eerkunt/terraform-compliance;
+ license = licenses.mit;
+ maintainers = with maintainers; [ kalbasit ];
+ };
+}
diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix
index 34c4d3022155..74aa881c999c 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 {
@@ -131,8 +132,8 @@ in rec {
});
terraform_0_13 = pluggable (generic {
- version = "0.13.0-beta3";
- sha256 = "199rrw0kjp9qwa8llwmihgnqrgs4vr0zrbik5w5bfkrldyqp2ynb";
+ version = "0.13.0-rc1";
+ sha256 = "1lja2s9viz5ja40qmlf49p6hk3rwdz6q0rw3ff1894b464zbsnk2";
patches = [ ./provider-path.patch ];
passthru = { inherit plugins; };
});
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 496eaaad3559..000000000000
--- 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 3023ca28bfe3..92af28c9c93b 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
+
+ # Provides setup hook to fix "Unrecognized image file format"
+ gdk-pixbuf
+
+ # Provides glib-compile-resources to compile gresources
+ glib
];
buildInputs = [
- gdk-pixbuf
- glib
- gsettings-desktop-schemas # used to get system default font in src/article_view/mod.rs
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/instant-messengers/element/element-desktop-package.json b/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json
index 0a0983af0000..074dcc0fdb7c 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 d46c1445ec3d..f9596f3a098c 100644
--- a/pkgs/applications/networking/instant-messengers/element/element-desktop-yarndeps.nix
+++ b/pkgs/applications/networking/instant-messengers/element/element-desktop-yarndeps.nix
@@ -25,6 +25,54 @@
sha1 = "bc0782f6d69f7b7d49531219699b988f669a8f9d";
};
}
+ {
+ 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 {
@@ -33,6 +81,22 @@
sha1 = "56d11312bd9248fa619591d02472be6e8cb32540";
};
}
+ {
+ 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 {
@@ -41,6 +105,30 @@
sha1 = "d90df0583a3a252f09aaa619665367bae518db06";
};
}
+ {
+ 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 {
@@ -89,6 +177,14 @@
sha1 = "b14efa8852b7768d898906613c23f688713e02cd";
};
}
+ {
+ 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 {
@@ -97,6 +193,22 @@
sha1 = "91c8fc4c51f6d5dbe44c2ca9ab09310bd00c7918";
};
}
+ {
+ 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 {
@@ -129,6 +241,54 @@
sha1 = "947e9a6561483bdee9adffc983e91a6902af8b79";
};
}
+ {
+ 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 {
@@ -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";
};
}
{
@@ -193,6 +353,14 @@
sha1 = "ef916e271c64ac12171fd8384eaae6b2345854da";
};
}
+ {
+ 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 {
@@ -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_escapes___ansi_escapes_3.2.0.tgz";
- url = "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.2.0.tgz";
- sha1 = "8780b98ff9dbf5638152d1f1fe5c1d7b4442976b";
+ 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_4.3.1.tgz";
+ url = "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.1.tgz";
+ sha1 = "a5c47cc43181f1f38ffd7076837700d395522a61";
};
}
{
@@ -385,6 +561,30 @@
sha1 = "bcd6791ea5ae09725e17e5ad988134cd40b3d911";
};
}
+ {
+ 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 {
@@ -489,6 +689,14 @@
sha1 = "24390e6ad61386b0a747265754d2a17219de862c";
};
}
+ {
+ 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 {
@@ -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";
};
}
{
@@ -1065,6 +1273,14 @@
sha1 = "3d7cf4464db6446ea644bf4b39507f9851008e8e";
};
}
+ {
+ 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 {
@@ -1129,6 +1345,14 @@
sha1 = "4a5ec7c64dfae22c3a14124dbacdee846d80cbc4";
};
}
+ {
+ 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 {
@@ -1185,6 +1409,14 @@
sha1 = "5bb5a0672628b64149566ba16819e61518c67261";
};
}
+ {
+ 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 {
@@ -1345,6 +1577,22 @@
sha1 = "ead7e7c046cbdc52d29d302a4455f6668cdf7d45";
};
}
+ {
+ 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 {
@@ -1529,6 +1777,14 @@
sha1 = "5ae64a5f45057baf3626ec14da0ca5e4b2431eb0";
};
}
+ {
+ 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 {
@@ -1569,6 +1825,14 @@
sha1 = "b4ac40648107fdcdcfae242f428bea8a14d4f1bf";
};
}
+ {
+ 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 {
@@ -1625,6 +1889,22 @@
sha1 = "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4";
};
}
+ {
+ 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 {
@@ -1633,6 +1913,54 @@
sha1 = "5598f8498e9e078420f34b80495b8d959f651fb2";
};
}
+ {
+ 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 {
@@ -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_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_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_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";
};
}
{
@@ -1657,6 +2033,14 @@
sha1 = "74fec7c54d0776b6f67e0251040b5806564e981f";
};
}
+ {
+ 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 {
@@ -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___eslint_5.16.0.tgz";
- url = "https://registry.yarnpkg.com/eslint/-/eslint-5.16.0.tgz";
- sha1 = "a1e3ac1aae4a3fbd8296fcf8f7ab7314cbb6abea";
+ 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 = "espree___espree_5.0.1.tgz";
+ name = "eslint___eslint_7.3.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 = "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_6.8.0.tgz";
+ url = "https://registry.yarnpkg.com/eslint/-/eslint-6.8.0.tgz";
+ sha1 = "62262d6729739f9275723824302fb227c8c93ffb";
+ };
+ }
+ {
+ name = "espree___espree_6.2.1.tgz";
+ path = fetchurl {
+ 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";
};
}
{
@@ -1697,6 +2105,14 @@
sha1 = "406c51658b1f5991a5f9b62b1dc25b00e3e5c708";
};
}
+ {
+ 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 {
@@ -1713,6 +2129,14 @@
sha1 = "398ad3f3c5a24948be7725e83d11a7de28cdbd1d";
};
}
+ {
+ 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 {
@@ -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";
};
}
{
@@ -2089,6 +2513,14 @@
sha1 = "5eff8e3e684d569ae4cb2b1282604e8ba62149fa";
};
}
+ {
+ 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 {
@@ -2129,6 +2561,14 @@
sha1 = "ab8795338868a0babd8525758018c2a7eb95c42e";
};
}
+ {
+ 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 {
@@ -2418,11 +2858,19 @@
};
}
{
- name = "inquirer___inquirer_6.5.2.tgz";
+ name = "inquirer___inquirer_7.3.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 = "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 = "internal_slot___internal_slot_1.0.2.tgz";
+ url = "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.2.tgz";
+ sha1 = "9c2e9fb3cd8e5e4256c6f45fe310067fcfa378a3";
};
}
{
@@ -2489,6 +2937,14 @@
sha1 = "1e1adf219e1eeb684d691f9d6a05ff0d30a24d75";
};
}
+ {
+ 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 {
@@ -2521,6 +2977,14 @@
sha1 = "9aa20eb6aeebbff77fbd33e74ca01b33581d3a16";
};
}
+ {
+ 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 {
@@ -2553,6 +3017,14 @@
sha1 = "12cfb98b65b57dd3d193a3121f5f6e2f437602b5";
};
}
+ {
+ 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 {
@@ -2617,14 +3089,6 @@
sha1 = "f5220fc82a3e233757291dddc9c5877f2a1f3017";
};
}
- {
- 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 {
@@ -2641,6 +3105,14 @@
sha1 = "5517489b547091b0930e095654ced25ee97e9491";
};
}
+ {
+ 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 {
@@ -2657,6 +3129,14 @@
sha1 = "12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44";
};
}
+ {
+ 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 {
@@ -2777,6 +3257,14 @@
sha1 = "a5e654c2e5a2deb5f201d96cefbca80c0ef2f513";
};
}
+ {
+ 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 {
@@ -2825,6 +3313,14 @@
sha1 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb";
};
}
+ {
+ 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 {
@@ -2873,6 +3369,14 @@
sha1 = "313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2";
};
}
+ {
+ 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 {
@@ -2945,6 +3449,14 @@
sha1 = "3b09924edf9f083c0490fdd4c0bc4421e04764ee";
};
}
+ {
+ 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 {
@@ -3169,6 +3681,14 @@
sha1 = "3cd4574a00b67bae373a94b748772640507b7aac";
};
}
+ {
+ 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 {
@@ -3185,6 +3705,14 @@
sha1 = "0ee6300cc058db6b3551fa1c4bf73b83bb771312";
};
}
+ {
+ 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 {
@@ -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";
};
}
{
@@ -3465,14 +3993,6 @@
sha1 = "d09d1f357b443f493382a8eb3ccd183872ae6009";
};
}
- {
- 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 {
@@ -3769,6 +4289,30 @@
sha1 = "1c47f272df277f3b1daf061677d9c82e2322c60e";
};
}
+ {
+ 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 {
@@ -3777,6 +4321,14 @@
sha1 = "8758c846f5b407adab0f236e0986f14b051caa16";
};
}
+ {
+ 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 {
@@ -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";
};
}
{
@@ -3809,6 +4361,14 @@
sha1 = "84fa1d036fe9d3c7e21d99884b601167ec8fb495";
};
}
+ {
+ 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 {
@@ -4065,6 +4625,14 @@
sha1 = "411cadb574c5a140d3a4b1910d40d80cc9f40b40";
};
}
+ {
+ 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 {
@@ -4121,6 +4689,14 @@
sha1 = "8f47dcec5011b477b67db03c243bc1f3085e8854";
};
}
+ {
+ 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 {
@@ -4145,6 +4721,14 @@
sha1 = "99ca7d725965fb655814eaf65f38f12bbdbf555f";
};
}
+ {
+ 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 {
@@ -4217,6 +4801,14 @@
sha1 = "26a5d6ee8c7dee4cb12208305acfb93ba382a9ee";
};
}
+ {
+ 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 {
@@ -4353,6 +4945,14 @@
sha1 = "cd924bf5200a075b83c188cd6b9e211b7fc0d3ed";
};
}
+ {
+ 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 {
@@ -4489,6 +5089,14 @@
sha1 = "6b30724e306a27833eeb171b66ac8890ba37e41c";
};
}
+ {
+ 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 {
@@ -4497,6 +5105,14 @@
sha1 = "8d19d31cf632482b589049f8281f93dbcba4d07f";
};
}
+ {
+ 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 {
@@ -4577,6 +5193,14 @@
sha1 = "be0aa4c06acd53083505abb35f4d66932ab35d16";
};
}
+ {
+ 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 {
@@ -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";
};
}
{
@@ -4769,6 +5393,14 @@
sha1 = "44aac65b695b03398968c39f363fee5deafdf1ea";
};
}
+ {
+ 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 {
@@ -4777,6 +5409,22 @@
sha1 = "da42f49740c0b42db2ca9728571cb190c98efea3";
};
}
+ {
+ 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 {
@@ -4849,6 +5497,14 @@
sha1 = "a98b62f86dcaf4f67399648c085291ab9e8fed61";
};
}
+ {
+ 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 {
@@ -5009,6 +5665,22 @@
sha1 = "952182c46cc7b2c313d1596e623992bd163b72b5";
};
}
+ {
+ 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 {
@@ -5025,6 +5697,14 @@
sha1 = "669d164be9df9b6f7559fa8e89945b168a5a6c58";
};
}
+ {
+ 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 {
@@ -5105,6 +5785,14 @@
sha1 = "bb43ff5598a6eb05d89b59fcd129c983313606bf";
};
}
+ {
+ 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 {
@@ -5257,6 +5945,14 @@
sha1 = "6d34335889768d21b2bcda0aa277ced3b1bfadf9";
};
}
+ {
+ 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 {
@@ -5281,6 +5977,22 @@
sha1 = "405923909592d56f78a5818434b0b78489ca5f2b";
};
}
+ {
+ 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 {
@@ -5289,6 +6001,14 @@
sha1 = "c3c19f95973fb0a62973fb09d90d961ee43e5c8a";
};
}
+ {
+ 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 {
@@ -5305,6 +6025,14 @@
sha1 = "5ae68177f192d4456269d108afa93ff8743f4f64";
};
}
+ {
+ 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 {
@@ -5313,6 +6041,14 @@
sha1 = "5884cab512cf1d355e3fb784f30804b2b520db72";
};
}
+ {
+ 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 {
@@ -5337,6 +6073,14 @@
sha1 = "867ac74e3864187b1d3d47d996a78ec5c8830777";
};
}
+ {
+ 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 {
@@ -5537,6 +6281,14 @@
sha1 = "b23e4358afa8a202fe7a100af1f5f883f02007ee";
};
}
+ {
+ 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 {
@@ -5585,6 +6337,14 @@
sha1 = "a45043d54f5805316da8d62f9f50918d3da70b0a";
};
}
+ {
+ 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 {
diff --git a/pkgs/applications/networking/instant-messengers/element/element-desktop.nix b/pkgs/applications/networking/instant-messengers/element/element-desktop.nix
index 9faaba117007..4bcde89fefea 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 9284af07fe1a..aa9541071af6 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/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix
index b2be635728d7..930d288c365f 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/rambox/default.nix b/pkgs/applications/networking/instant-messengers/rambox/default.nix
index d94749bdc4c3..6bf3efa53640 100644
--- a/pkgs/applications/networking/instant-messengers/rambox/default.nix
+++ b/pkgs/applications/networking/instant-messengers/rambox/default.nix
@@ -35,8 +35,10 @@ in stdenv.mkDerivation rec {
--replace Exec=/opt/Rambox/rambox Exec=rambox
'';
- postFixup = ''
- wrapProgram $out/opt/Rambox/rambox --prefix PATH : ${xdg_utils}/bin
+ preFixup = ''
+ gappsWrapperArgs+=(
+ --prefix PATH : ${xdg_utils}/bin
+ )
'';
meta = with stdenv.lib; {
diff --git a/pkgs/applications/networking/instant-messengers/ripcord/default.nix b/pkgs/applications/networking/instant-messengers/ripcord/default.nix
index f003bbec222f..9055b51d9756 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 5f5e0f9e9bfe..3f5b0811a0f3 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/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix
index 26f47dba4617..57849b46fcbd 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/remote/wayvnc/add-missing-librt.patch b/pkgs/applications/networking/remote/wayvnc/add-missing-librt.patch
deleted file mode 100644
index e2d617bcc7ca..000000000000
--- 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 4ca6ae952580..32373e22b762 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/office/softmaker/generic.nix b/pkgs/applications/office/softmaker/generic.nix
index 82ac2b58f68a..c7803fa3d1d2 100644
--- a/pkgs/applications/office/softmaker/generic.nix
+++ b/pkgs/applications/office/softmaker/generic.nix
@@ -17,8 +17,11 @@ let
inherit makeDesktopItem pname suiteName;
};
shortEdition = builtins.substring 2 2 edition;
-in stdenv.mkDerivation rec {
- inherit pname version edition shortEdition src;
+in stdenv.mkDerivation {
+ inherit pname src;
+
+ version = "${edition}.${version}";
+
nativeBuildInputs = [
autoPatchelfHook
makeWrapper
diff --git a/pkgs/applications/science/biology/hmmer/default.nix b/pkgs/applications/science/biology/hmmer/default.nix
index 3786b62f7477..6ee7cd609c42 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 ac534a4ec3cd..6f66cfc9cc37 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/kicad/default.nix b/pkgs/applications/science/electronics/kicad/default.nix
index a99f1b2d8d7a..a8340a2c22c4 100644
--- a/pkgs/applications/science/electronics/kicad/default.nix
+++ b/pkgs/applications/science/electronics/kicad/default.nix
@@ -1,4 +1,5 @@
-{ lib, stdenv, gnome3, pkgs, wxGTK30, wxGTK31
+{ lib, stdenv, gnome3, wxGTK30, wxGTK31
+, makeWrapper
, gsettings-desktop-schemas, hicolor-icon-theme
, callPackage, callPackages
, librsvg, cups
@@ -8,7 +9,7 @@
, oceSupport ? false, opencascade
, withOCCT ? true, opencascade-occt
, ngspiceSupport ? true, libngspice
-, scriptingSupport ? true, swig, python3
+, scriptingSupport ? false, swig, python3
, debug ? false, valgrind
, with3d ? true
, withI18n ? true
@@ -31,9 +32,8 @@ let
# but brings high DPI support?
else wxGTK31.override { withGtk2 = false; };
- pythonPackages = python.pkgs;
python = python3;
- wxPython = pythonPackages.wxPython_4_0;
+ wxPython = python.pkgs.wxPython_4_0;
in
stdenv.mkDerivation rec {
@@ -55,10 +55,11 @@ stdenv.mkDerivation rec {
dontFixup = true;
pythonPath = optionals (scriptingSupport)
- [ wxPython pythonPackages.six ];
+ [ wxPython python.pkgs.six ];
- nativeBuildInputs = optionals (scriptingSupport)
- [ pythonPackages.wrapPython ];
+ nativeBuildInputs = [ makeWrapper ]
+ ++ optionals (scriptingSupport)
+ [ python.pkgs.wrapPython ];
# wrapGAppsHook added the equivalent to ${base}/share
# though i noticed no difference without it
diff --git a/pkgs/applications/science/electronics/kicad/versions.nix b/pkgs/applications/science/electronics/kicad/versions.nix
index 4a9ed0cb86dc..7299e8ee907b 100644
--- a/pkgs/applications/science/electronics/kicad/versions.nix
+++ b/pkgs/applications/science/electronics/kicad/versions.nix
@@ -27,23 +27,23 @@
};
"kicad-unstable" = {
kicadVersion = {
- version = "2020-05-14";
+ version = "2020-07-21";
src = {
- rev = "3b8465359135e9f6dea4b0a5fcb62377753fe890";
- sha256 = "18xsg2s0pxx176rnblygq1f8xpmryw59lcjzm897gifz0sj0nhvx";
+ rev = "9a801d8b72f24e297a7d9d6e8cee2eef6cab2988";
+ sha256 = "0yilmmng7y3rz1bxw2b0s0aqs8hdqr7ach2r45bx8v1f4bih4ka9";
};
};
libVersion = {
- version = "2020-05-14";
+ version = "2020-07-21";
libSources = {
- i18n.rev = "c4460d0d8e1075691d43dc928ffc332fa1282592";
- i18n.sha256 = "1gkrbfyfzsr5q7sahhlyhgfpfwm6b83lzf0q1v854gwxdfabvi0y";
- symbols.rev = "614b5f6256fbae82c2bba399086506bbe435bd94";
- symbols.sha256 = "10ix3wdcl832r4ha5q8phpx8j97gzngb41nczdli1qkhjmiw9y8r";
- templates.rev = "7db8d4d0ea0711f1961d117853547fb3edbc3857";
- templates.sha256 = "1hppcsrkn4dk6ggby6ckh0q65qxkywrbyxa4lwpaf7pxjyv498xg";
- footprints.rev = "240804c6c89b66af808379e1fc94ea6011433cbe";
- footprints.sha256 = "1jh71004lrn7bl384zfmbqqdbs28gjb6diwn6hyb587jpivdnl3g";
+ i18n.rev = "a311975d139caf8be9848dd613a9800570adc245";
+ i18n.sha256 = "1bkn2hhwcg8xdpn9yfm9nnqsg02c1nizhpxd4yhpxgifhh4psz1g";
+ symbols.rev = "18572c4c118fe8ef779edf3131eebf2c33c6fa46";
+ symbols.sha256 = "0hqx0aznzrnlbdkpsnl8mbs9bdgiv029d6zjh10nyjzcw27q3hxz";
+ templates.rev = "ae16953b81055855bcede4a33305413599d86a15";
+ templates.sha256 = "1pkv90p3liy3bj4nklxsvpzh9m56p0k5ldr22armvgqfaqaadx9v";
+ footprints.rev = "4835f80b4a52256aa7a3eb650e6e0fef33a77d0d";
+ footprints.sha256 = "00rc6phxmkry35i0xzry14axvh2akvvkly45s3xxi06vaydaw7i5";
packages3d.rev = "9b560cf94a35b692ca516d37bdaf392ce10e549d";
packages3d.sha256 = "0b9jglf77fy0n0r8xs4yqkv6zvipyfvp0z5dnqlzp32csy5aqpi1";
};
diff --git a/pkgs/applications/science/electronics/magic-vlsi/default.nix b/pkgs/applications/science/electronics/magic-vlsi/default.nix
index 62b830547e53..96849c300298 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 4099236e6280..81e20df33424 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/logic/sad/default.nix b/pkgs/applications/science/logic/sad/default.nix
index f1066abf6931..77613a135710 100644
--- a/pkgs/applications/science/logic/sad/default.nix
+++ b/pkgs/applications/science/logic/sad/default.nix
@@ -35,5 +35,6 @@ stdenv.mkDerivation {
maintainers = [ stdenv.lib.maintainers.schmitthenner ];
homepage = "http://nevidal.org/sad.en.html";
platforms = stdenv.lib.platforms.linux;
+ broken = true; # ghc-8.4.4 is gone from Nixpkgs
};
}
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 000000000000..8a4d5acede0f
--- /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/science/math/geogebra/default.nix b/pkgs/applications/science/math/geogebra/default.nix
index 1dd92267a837..5cebef83a4a9 100644
--- a/pkgs/applications/science/math/geogebra/default.nix
+++ b/pkgs/applications/science/math/geogebra/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
pname = "geogebra";
- version = "5-0-574-0";
+ version = "5-0-593-0";
preferLocalBuild = true;
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
"https://download.geogebra.org/installers/5.0/GeoGebra-Linux-Portable-${version}.tar.bz2"
"http://web.archive.org/https://download.geogebra.org/installers/5.0/GeoGebra-Linux-Portable-${version}.tar.bz2"
];
- sha256 = "0jbci4spqkf33yb079lsnsc684y4mdf1p8lm9r0037av8jlsrgrc";
+ sha256 = "d84c27a3299e6df08881733d22215a18decedcba4c2d97a9e5424c39cd57db35";
};
srcIcon = fetchurl {
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 27daf1a30aac..65c49e332283 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 e4c57be2357c..5a7e5bd32afb 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 8894c4f0f7ad..5de7fddbc0c6 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/video/makemkv/default.nix b/pkgs/applications/video/makemkv/default.nix
index 56247b278260..d3cb12924c26 100644
--- a/pkgs/applications/video/makemkv/default.nix
+++ b/pkgs/applications/video/makemkv/default.nix
@@ -3,21 +3,21 @@
}:
let
- version = "1.15.1";
+ version = "1.15.2";
# Using two URLs as the first one will break as soon as a new version is released
src_bin = fetchurl {
urls = [
"http://www.makemkv.com/download/makemkv-bin-${version}.tar.gz"
"http://www.makemkv.com/download/old/makemkv-bin-${version}.tar.gz"
];
- sha256 = "0c9661sdlld8b1g2pk8lbn3gz7cikh9bjqss11ffkriwii1x9fw0";
+ sha256 = "1dbips0qllbwhak44c50nlwn8n3kx8i6773cal5zl3dv4v2nf6ql";
};
src_oss = fetchurl {
urls = [
"http://www.makemkv.com/download/makemkv-oss-${version}.tar.gz"
"http://www.makemkv.com/download/old/makemkv-oss-${version}.tar.gz"
];
- sha256 = "0rm1zykqagy2g8hb7pjrc6akdsym8pgdnx66hnna161jbah3sssy";
+ sha256 = "1wnhzlz5fw6qwh82hjcpimg60xb3a9a54zb6gcjhqr9zdly2zphy";
};
in mkDerivation {
pname = "makemkv";
@@ -55,6 +55,6 @@ in mkDerivation {
license = licenses.unfree;
homepage = "http://makemkv.com";
platforms = [ "x86_64-linux" ];
- maintainers = [ maintainers.titanous ];
+ maintainers = with maintainers; [ danieldk titanous ];
};
}
diff --git a/pkgs/applications/virtualization/cloud-hypervisor/cargo-lock-vendor-fix.patch b/pkgs/applications/virtualization/cloud-hypervisor/cargo-lock-vendor-fix.patch
new file mode 100644
index 000000000000..7a7378faa58b
--- /dev/null
+++ b/pkgs/applications/virtualization/cloud-hypervisor/cargo-lock-vendor-fix.patch
@@ -0,0 +1,53 @@
+diff --git a/Cargo.lock b/Cargo.lock
+index e566ed25..a661a963 100644
+--- a/Cargo.lock
++++ b/Cargo.lock
+@@ -689,7 +689,7 @@ dependencies = [
+ "serde",
+ "serde_derive",
+ "serde_json",
+- "vfio-bindings 0.2.0 (git+https://github.com/rust-vmm/vfio-bindings)",
++ "vfio-bindings",
+ "vfio-ioctls",
+ "vm-allocator",
+ "vm-device",
+@@ -1346,17 +1346,12 @@ checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191"
+ [[package]]
+ name = "vfio-bindings"
+ version = "0.2.0"
+-source = "git+https://github.com/rust-vmm/vfio-bindings#f08cbcbf4041c981441d9c036c49ebad5098ed1c"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "4a21f546f2bda37f5a8cfb138c87f95b8e34d2d78d6a7a92ba3785f4e08604a7"
+ dependencies = [
+ "vmm-sys-util",
+ ]
+
+-[[package]]
+-name = "vfio-bindings"
+-version = "0.2.0"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "4a21f546f2bda37f5a8cfb138c87f95b8e34d2d78d6a7a92ba3785f4e08604a7"
+-
+ [[package]]
+ name = "vfio-ioctls"
+ version = "0.1.0"
+@@ -1366,7 +1361,7 @@ dependencies = [
+ "kvm-bindings",
+ "kvm-ioctls",
+ "log 0.4.8",
+- "vfio-bindings 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "vfio-bindings",
+ "vm-memory",
+ "vmm-sys-util",
+ ]
+diff --git a/pci/Cargo.toml b/pci/Cargo.toml
+index 9c6955c7..4ecf8e6b 100644
+--- a/pci/Cargo.toml
++++ b/pci/Cargo.toml
+@@ -23,5 +23,5 @@ vm-memory = "0.2.1"
+ vm-migration = { path = "../vm-migration" }
+
+ [dependencies.vfio-bindings]
+-git = "https://github.com/rust-vmm/vfio-bindings"
++version = "0.2.0"
+ features = ["fam-wrappers"]
diff --git a/pkgs/applications/virtualization/cloud-hypervisor/default.nix b/pkgs/applications/virtualization/cloud-hypervisor/default.nix
new file mode 100644
index 000000000000..59c97c4a8dea
--- /dev/null
+++ b/pkgs/applications/virtualization/cloud-hypervisor/default.nix
@@ -0,0 +1,28 @@
+{ lib, fetchFromGitHub, rustPlatform, pkgconfig, openssl }:
+
+rustPlatform.buildRustPackage rec {
+ pname = "cloud-hypervisor";
+ version = "0.8.0";
+
+ src = fetchFromGitHub {
+ owner = "cloud-hypervisor";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "h2aWWjycTm84TS89/vhqnAvwOqeeSDtvvCt+Is6I0eI=";
+ };
+
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ openssl ];
+
+ cargoPatches = [ ./cargo-lock-vendor-fix.patch ];
+ cargoSha256 = "fOIB+qVDqAAgQPW3bK2NfST24GzYJeRXgaMFXyNPcPQ=";
+
+ meta = with lib; {
+ homepage = "https://github.com/cloud-hypervisor/cloud-hypervisor";
+ description = "Open source Virtual Machine Monitor (VMM) that runs on top of KVM";
+ changelog = "https://github.com/cloud-hypervisor/cloud-hypervisor/releases/tag/v${version}";
+ license = with licenses; [ asl20 bsd3 ];
+ maintainers = with maintainers; [ offline ];
+ platforms = [ "x86_64-linux" ];
+ };
+}
diff --git a/pkgs/applications/virtualization/conmon/default.nix b/pkgs/applications/virtualization/conmon/default.nix
index 83261c057a49..675d713f4b4c 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 996d52bacab2..6e5ba4abf378 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 901e2f0b6ec0..8746e66668ff 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/podman/default.nix b/pkgs/applications/virtualization/podman/default.nix
index 5c8321a3c9ce..bae218d1cad7 100644
--- a/pkgs/applications/virtualization/podman/default.nix
+++ b/pkgs/applications/virtualization/podman/default.nix
@@ -16,13 +16,13 @@
buildGoModule rec {
pname = "podman";
- version = "2.0.2";
+ version = "2.0.3";
src = fetchFromGitHub {
owner = "containers";
repo = "podman";
rev = "v${version}";
- sha256 = "12iqj71xjszbjbbz5f2dk5chcvfrrq0n737ki7xxkjcw38k2cnqz";
+ sha256 = "1jqdv3kij2q97qn4niqxxgfva9ajr4wjgx40qk5yhs01d3g0qgmd";
};
vendorSha256 = null;
diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix
index c5dcc2fafc68..ada0d9691098 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/virtualization/singularity/default.nix b/pkgs/applications/virtualization/singularity/default.nix
index f6a1a3bc6a91..8cec24534d43 100644
--- a/pkgs/applications/virtualization/singularity/default.nix
+++ b/pkgs/applications/virtualization/singularity/default.nix
@@ -1,13 +1,16 @@
{stdenv
, removeReferencesTo
, lib
-, fetchFromGitHub
+, fetchurl
, utillinux
+, gpgme
, openssl
+, libuuid
, coreutils
, go
, which
, makeWrapper
+, cryptsetup
, squashfsTools
, buildGoPackage}:
@@ -15,24 +18,22 @@ with lib;
buildGoPackage rec {
pname = "singularity";
- version = "3.2.1";
+ version = "3.6.1";
- src = fetchFromGitHub {
- owner = "sylabs";
- repo = "singularity";
- rev = "v${version}";
- sha256 = "14lhxwy21s7q081x7kbnvkjsbxgsg2f181qlzmlxcn6n7gfav3kj";
+ src = fetchurl {
+ url = "https://github.com/hpcng/singularity/releases/download/v${version}/singularity-${version}.tar.gz";
+ sha256 = "070jj6kbiw23sd2p4xhvmyb8gd83imwgisdf18ahkwp7dq85db3c";
};
goPackagePath = "github.com/sylabs/singularity";
goDeps = ./deps.nix;
- buildInputs = [ openssl utillinux ];
- nativeBuildInputs = [ removeReferencesTo which makeWrapper ];
+ buildInputs = [ gpgme openssl libuuid ];
+ nativeBuildInputs = [ removeReferencesTo utillinux which makeWrapper cryptsetup ];
propagatedBuildInputs = [ coreutils squashfsTools ];
- prePatch = ''
- substituteInPlace internal/pkg/build/copy/copy.go \
+ postPatch = ''
+ substituteInPlace internal/pkg/build/files/copy.go \
--replace /bin/cp ${coreutils}/bin/cp
'';
@@ -46,24 +47,28 @@ buildGoPackage rec {
# Don't install SUID binaries
sed -i 's/-m 4755/-m 755/g' builddir/Makefile
-
'';
buildPhase = ''
+ runHook preBuild
make -C builddir
+ runHook postBuild
'';
installPhase = ''
+ runHook preInstall
make -C builddir install LOCALSTATEDIR=$out/var
chmod 755 $out/libexec/singularity/bin/starter-suid
- wrapProgram $out/bin/singularity --prefix PATH : ${stdenv.lib.makeBinPath propagatedBuildInputs}
+
+ # Explicitly configure paths in the config file
+ sed -i 's|^# mksquashfs path =.*$|mksquashfs path = ${stdenv.lib.makeBinPath [squashfsTools]}/mksquashfs|' $out/etc/singularity/singularity.conf
+ sed -i 's|^# cryptsetup path =.*$|cryptsetup path = ${stdenv.lib.makeBinPath [cryptsetup]}/cryptsetup|' $out/etc/singularity/singularity.conf
+
+ runHook postInstall
'';
postFixup = ''
find $out/libexec/ -type f -executable -exec remove-references-to -t ${go} '{}' + || true
-
- # These etc scripts shouldn't have their paths patched
- cp etc/actions/* $out/etc/singularity/actions/
'';
meta = with stdenv.lib; {
diff --git a/pkgs/applications/window-managers/i3/lock-color.nix b/pkgs/applications/window-managers/i3/lock-color.nix
index c5e203ab1a58..a64e5ea33693 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/applications/window-managers/qtile/0001-Substitution-vars-for-absolute-paths.patch b/pkgs/applications/window-managers/qtile/0001-Substitution-vars-for-absolute-paths.patch
index 219d6dcbe207..ed22ed99b078 100644
--- a/pkgs/applications/window-managers/qtile/0001-Substitution-vars-for-absolute-paths.patch
+++ b/pkgs/applications/window-managers/qtile/0001-Substitution-vars-for-absolute-paths.patch
@@ -1,25 +1,8 @@
-diff --git a/libqtile/pangocffi.py b/libqtile/pangocffi.py
-index 1e8f5c04..e860d43a 100644
---- a/libqtile/pangocffi.py
-+++ b/libqtile/pangocffi.py
-@@ -58,9 +58,9 @@ except ImportError:
- else:
- raise ImportError("No module named libqtile._ffi_pango, be sure to run `python ./libqtile/ffi_build.py`")
-
--gobject = ffi.dlopen('libgobject-2.0.so.0')
--pango = ffi.dlopen('libpango-1.0.so.0')
--pangocairo = ffi.dlopen('libpangocairo-1.0.so.0')
-+gobject = ffi.dlopen('@glib@/lib/libgobject-2.0.so.0')
-+pango = ffi.dlopen('@pango@/lib/libpango-1.0.so.0')
-+pangocairo = ffi.dlopen('@pango@/lib/libpangocairo-1.0.so.0')
-
-
- def CairoContext(cairo_t):
-diff --git a/libqtile/xcursors.py b/libqtile/xcursors.py
-index f1133555..3e61204a 100644
---- a/libqtile/xcursors.py
-+++ b/libqtile/xcursors.py
-@@ -112,7 +112,7 @@ class Cursors(dict):
+diff --git a/libqtile/backend/x11/xcursors.py b/libqtile/backend/x11/xcursors.py
+index 24454b83..ef37875c 100644
+--- a/libqtile/backend/x11/xcursors.py
++++ b/libqtile/backend/x11/xcursors.py
+@@ -107,7 +107,7 @@ class Cursors(dict):
def _setup_xcursor_binding(self):
try:
@@ -28,3 +11,21 @@ index f1133555..3e61204a 100644
except OSError:
logger.warning("xcb-cursor not found, fallback to font pointer")
return False
+diff --git a/libqtile/pangocffi.py b/libqtile/pangocffi.py
+index dbae27ed..54c2c35f 100644
+--- a/libqtile/pangocffi.py
++++ b/libqtile/pangocffi.py
+@@ -52,10 +52,9 @@ try:
+ except ImportError:
+ raise ImportError("No module named libqtile._ffi_pango, be sure to run `./scripts/ffibuild`")
+
+-gobject = ffi.dlopen('libgobject-2.0.so.0')
+-pango = ffi.dlopen('libpango-1.0.so.0')
+-pangocairo = ffi.dlopen('libpangocairo-1.0.so.0')
+-
++gobject = ffi.dlopen('@glib@/lib/libgobject-2.0.so.0')
++pango = ffi.dlopen('@pango@/lib/libpango-1.0.so.0')
++pangocairo = ffi.dlopen('@pango@/lib/libpangocairo-1.0.so.0')
+
+ def patch_cairo_context(cairo_t):
+ def create_layout():
diff --git a/pkgs/applications/window-managers/qtile/0002-Restore-PATH-and-PYTHONPATH.patch b/pkgs/applications/window-managers/qtile/0002-Restore-PATH-and-PYTHONPATH.patch
index a01f14062f1d..1eaa5b84174c 100644
--- a/pkgs/applications/window-managers/qtile/0002-Restore-PATH-and-PYTHONPATH.patch
+++ b/pkgs/applications/window-managers/qtile/0002-Restore-PATH-and-PYTHONPATH.patch
@@ -1,5 +1,5 @@
diff --git a/bin/qshell b/bin/qshell
-index 2ba7e61c..0ac2a2ef 100755
+index 5c652b7a..2d169eb2 100755
--- a/bin/qshell
+++ b/bin/qshell
@@ -28,5 +28,6 @@ base_dir = os.path.abspath(os.path.join(this_dir, ".."))
@@ -10,7 +10,7 @@ index 2ba7e61c..0ac2a2ef 100755
from libqtile.scripts import qshell
qshell.main()
diff --git a/bin/qtile b/bin/qtile
-index 3e82814d..335b5cea 100755
+index ebc8fab5..08a965ef 100755
--- a/bin/qtile
+++ b/bin/qtile
@@ -29,5 +29,6 @@ base_dir = os.path.abspath(os.path.join(this_dir, ".."))
@@ -20,8 +20,19 @@ index 3e82814d..335b5cea 100755
+ __import__("importlib").import_module("libqtile.utils").restore_os_environment()
from libqtile.scripts import qtile
qtile.main()
+diff --git a/bin/qtile-cmd b/bin/qtile-cmd
+index a2136ee6..3d37a6d9 100755
+--- a/bin/qtile-cmd
++++ b/bin/qtile-cmd
+@@ -8,5 +8,6 @@ base_dir = os.path.abspath(os.path.join(this_dir, ".."))
+ sys.path.insert(0, base_dir)
+
+ if __name__ == '__main__':
++ __import__("importlib").import_module("libqtile.utils").restore_os_environment()
+ from libqtile.scripts import qtile_cmd
+ qtile_cmd.main()
diff --git a/bin/qtile-run b/bin/qtile-run
-index e4b121be..1c203bc9 100755
+index ac4cb1fd..74c589cb 100755
--- a/bin/qtile-run
+++ b/bin/qtile-run
@@ -8,5 +8,6 @@ base_dir = os.path.abspath(os.path.join(this_dir, ".."))
@@ -32,7 +43,7 @@ index e4b121be..1c203bc9 100755
from libqtile.scripts import qtile_run
qtile_run.main()
diff --git a/bin/qtile-top b/bin/qtile-top
-index 5316e0e7..272c6430 100755
+index a6251f27..0d524b1d 100755
--- a/bin/qtile-top
+++ b/bin/qtile-top
@@ -8,5 +8,6 @@ base_dir = os.path.abspath(os.path.join(this_dir, ".."))
@@ -43,14 +54,13 @@ index 5316e0e7..272c6430 100755
from libqtile.scripts import qtile_top
qtile_top.main()
diff --git a/libqtile/utils.py b/libqtile/utils.py
-index 550ed02677e..1358a66f3df 100644
+index 2628c898..05117be7 100644
--- a/libqtile/utils.py
+++ b/libqtile/utils.py
-@@ -272,3 +272,11 @@ def safe_import(module_names, class_name, globals_, fallback=None):
- logger.debug("%s", traceback.format_exc())
- if fallback:
- globals_[class_name] = fallback(module_path, class_name, error)
-+
+@@ -270,3 +270,10 @@ def guess_terminal():
+ return terminal
+
+ logger.error('Default terminal has not been found.')
+
+def restore_os_environment():
+ pythonpath = os.environ.pop("QTILE_SAVED_PYTHONPATH", "")
@@ -58,3 +68,4 @@ index 550ed02677e..1358a66f3df 100644
+ path = os.environ.pop("QTILE_SAVED_PATH", None)
+ if path:
+ os.environ["PATH"] = path
+
diff --git a/pkgs/applications/window-managers/qtile/0003-Restart-executable.patch b/pkgs/applications/window-managers/qtile/0003-Restart-executable.patch
index 87fd19773794..c04d8a83c1a2 100644
--- a/pkgs/applications/window-managers/qtile/0003-Restart-executable.patch
+++ b/pkgs/applications/window-managers/qtile/0003-Restart-executable.patch
@@ -1,8 +1,8 @@
-diff --git a/libqtile/manager.py b/libqtile/manager.py
-index fc198e9bae7..860b97d8db1 100644
---- a/libqtile/manager.py
-+++ b/libqtile/manager.py
-@@ -1402,7 +1402,7 @@ class Qtile(command.CommandObject):
+diff --git a/libqtile/core/manager.py b/libqtile/core/manager.py
+index c22eeb6a..2ffe4eab 100644
+--- a/libqtile/core/manager.py
++++ b/libqtile/core/manager.py
+@@ -278,7 +278,7 @@ class Qtile(CommandObject):
logger.error("Unable to pickle qtile state")
argv = [s for s in argv if not s.startswith('--with-state')]
argv.append('--with-state=' + buf.getvalue().decode())
@@ -10,4 +10,4 @@ index fc198e9bae7..860b97d8db1 100644
+ self._restart = (os.environ.get("QTILE_WRAPPER", "@out@/bin/qtile"), argv[1:])
self.stop()
- def cmd_spawn(self, cmd):
+ async def finalize(self):
diff --git a/pkgs/applications/window-managers/qtile/default.nix b/pkgs/applications/window-managers/qtile/default.nix
index eb56e9c16390..eccf5c163a8e 100644
--- a/pkgs/applications/window-managers/qtile/default.nix
+++ b/pkgs/applications/window-managers/qtile/default.nix
@@ -7,13 +7,13 @@ in
python37Packages.buildPythonApplication rec {
name = "qtile-${version}";
- version = "0.13.0";
+ version = "0.16.0";
src = fetchFromGitHub {
owner = "qtile";
repo = "qtile";
rev = "v${version}";
- sha256 = "1lyclnn8hs6wl4w9v5b4hh2q0pvmsn7cyibpskhbpw0cgv7bvi90";
+ sha256 = "1klv1k9847nyx71sfrhqyl1k51k2w8phqnp2bns4dvbqii7q125l";
};
patches = [
@@ -23,16 +23,18 @@ python37Packages.buildPythonApplication rec {
];
postPatch = ''
- substituteInPlace libqtile/manager.py --subst-var-by out $out
+ substituteInPlace libqtile/core/manager.py --subst-var-by out $out
substituteInPlace libqtile/pangocffi.py --subst-var-by glib ${glib.out}
substituteInPlace libqtile/pangocffi.py --subst-var-by pango ${pango.out}
- substituteInPlace libqtile/xcursors.py --subst-var-by xcb-cursor ${xcbutilcursor.out}
+ substituteInPlace libqtile/backend/x11/xcursors.py --subst-var-by xcb-cursor ${xcbutilcursor.out}
'';
+ SETUPTOOLS_SCM_PRETEND_VERSION = version;
+
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ glib libxcb cairo pango python37Packages.xcffib ];
- pythonPath = with python37Packages; [ xcffib cairocffi-xcffib setuptools ];
+ pythonPath = with python37Packages; [ xcffib cairocffi-xcffib setuptools setuptools_scm ];
postInstall = ''
wrapProgram $out/bin/qtile \
@@ -41,7 +43,7 @@ python37Packages.buildPythonApplication rec {
--run 'export QTILE_SAVED_PATH=$PATH'
'';
- doCheck = false; # Requires X server.
+ doCheck = false; # Requires X server #TODO this can be worked out with the existing NixOS testing infrastructure.
meta = with stdenv.lib; {
homepage = "http://www.qtile.org/";
diff --git a/pkgs/build-support/emacs/generic.nix b/pkgs/build-support/emacs/generic.nix
index 6fa27f098392..956787ad59e4 100644
--- a/pkgs/build-support/emacs/generic.nix
+++ b/pkgs/build-support/emacs/generic.nix
@@ -56,6 +56,16 @@ stdenv.mkDerivation ({
meta = defaultMeta // meta;
}
+// lib.optionalAttrs (emacs.nativeComp or false) {
+
+ LIBRARY_PATH = "${lib.getLib stdenv.cc.libc}/lib";
+
+ postInstall = ''
+ find $out/share/emacs -type f -name '*.el' -print0 | xargs -0 -n 1 -I {} -P $NIX_BUILD_CORES sh -c "emacs --batch -f batch-native-compile {} || true"
+ '';
+
+}
+
// removeAttrs args [ "buildInputs" "packageRequires"
"meta"
])
diff --git a/pkgs/build-support/singularity-tools/default.nix b/pkgs/build-support/singularity-tools/default.nix
index 54749e416ea3..f1d4808e3cce 100644
--- a/pkgs/build-support/singularity-tools/default.nix
+++ b/pkgs/build-support/singularity-tools/default.nix
@@ -97,6 +97,7 @@ rec {
cd ..
mkdir -p /var/singularity/mnt/{container,final,overlay,session,source}
echo "root:x:0:0:System administrator:/root:/bin/sh" > /etc/passwd
+ echo > /etc/resolv.conf
TMPDIR=$(pwd -P) singularity build $out ./img
'');
diff --git a/pkgs/build-support/writers/default.nix b/pkgs/build-support/writers/default.nix
index af492d80db01..4673b4e6cd87 100644
--- a/pkgs/build-support/writers/default.nix
+++ b/pkgs/build-support/writers/default.nix
@@ -22,7 +22,30 @@ rec {
inherit interpreter;
contentPath = content;
}) ''
- echo "#! $interpreter" > $out
+ # On darwin a script cannot be used as an interpreter in a shebang but
+ # there doesn't seem to be a limit to the size of shebang and multiple
+ # arguments to the interpreter are allowed.
+ if [[ -n "${toString pkgs.stdenvNoCC.isDarwin}" ]] && isScript $interpreter
+ then
+ wrapperInterpreterLine=$(head -1 "$interpreter" | tail -c+3)
+ # Get first word from the line (note: xargs echo remove leading spaces)
+ wrapperInterpreter=$(echo "$wrapperInterpreterLine" | xargs echo | cut -d " " -f1)
+
+ if isScript $wrapperInterpreter
+ then
+ echo "error: passed interpreter ($interpreter) is a script which has another script ($wrapperInterpreter) as an interpreter, which is not supported."
+ exit 1
+ fi
+
+ # This should work as long as wrapperInterpreter is a shell, which is
+ # the case for programs wrapped with makeWrapper, like
+ # python3.withPackages etc.
+ interpreterLine="$wrapperInterpreterLine $interpreter"
+ else
+ interpreterLine=$interpreter
+ fi
+
+ echo "#! $interpreterLine" > $out
cat "$contentPath" >> $out
${optionalString (check != "") ''
${check} $out
@@ -227,6 +250,24 @@ rec {
writePerlBin = name:
writePerl "/bin/${name}";
+ # makePythonWriter takes python and compatible pythonPackages and produces python script writer,
+ # which validates the script with flake8 at build time. If any libraries are specified,
+ # python.withPackages is used as interpreter, otherwise the "bare" python is used.
+ makePythonWriter = python: pythonPackages: name: { libraries ? [], flakeIgnore ? [] }:
+ let
+ ignoreAttribute = optionalString (flakeIgnore != []) "--ignore ${concatMapStringsSep "," escapeShellArg flakeIgnore}";
+ in
+ makeScriptWriter {
+ interpreter =
+ if libraries == []
+ then "${python}/bin/python"
+ else "${python.withPackages (ps: libraries)}/bin/python"
+ ;
+ check = writeDash "python2check.sh" ''
+ exec ${pythonPackages.flake8}/bin/flake8 --show-source ${ignoreAttribute} "$1"
+ '';
+ } name;
+
# writePython2 takes a name an attributeset with libraries and some python2 sourcecode and
# returns an executable
#
@@ -239,17 +280,7 @@ rec {
#
# print Test.a
# ''
- writePython2 = name: { libraries ? [], flakeIgnore ? [] }:
- let
- py = pkgs.python2.withPackages (ps: libraries);
- ignoreAttribute = optionalString (flakeIgnore != []) "--ignore ${concatMapStringsSep "," escapeShellArg flakeIgnore}";
- in
- makeScriptWriter {
- interpreter = "${py}/bin/python";
- check = writeDash "python2check.sh" ''
- exec ${pkgs.python2Packages.flake8}/bin/flake8 --show-source ${ignoreAttribute} "$1"
- '';
- } name;
+ writePython2 = makePythonWriter pkgs.python2 pkgs.python2Packages;
# writePython2Bin takes the same arguments as writePython2 but outputs a directory (like writeScriptBin)
writePython2Bin = name:
@@ -267,17 +298,7 @@ rec {
# """)
# print(y[0]['test'])
# ''
- writePython3 = name: { libraries ? [], flakeIgnore ? [] }:
- let
- py = pkgs.python3.withPackages (ps: libraries);
- ignoreAttribute = optionalString (flakeIgnore != []) "--ignore ${concatMapStringsSep "," escapeShellArg flakeIgnore}";
- in
- makeScriptWriter {
- interpreter = "${py}/bin/python";
- check = writeDash "python3check.sh" ''
- exec ${pkgs.python3Packages.flake8}/bin/flake8 --show-source ${ignoreAttribute} "$1"
- '';
- } name;
+ writePython3 = makePythonWriter pkgs.python3 pkgs.python3Packages;
# writePython3Bin takes the same arguments as writePython3 but outputs a directory (like writeScriptBin)
writePython3Bin = name:
diff --git a/pkgs/build-support/writers/test.nix b/pkgs/build-support/writers/test.nix
index 3cd0a080ae8f..d284bda43d05 100644
--- a/pkgs/build-support/writers/test.nix
+++ b/pkgs/build-support/writers/test.nix
@@ -152,6 +152,14 @@ let
""")
print(y[0]['test'])
'';
+
+ python2NoLibs = writePython2 "test_python2_no_libs" {} ''
+ print("success")
+ '';
+
+ python3NoLibs = writePython3 "test_python3_no_libs" {} ''
+ print("success")
+ '';
};
diff --git a/pkgs/data/fonts/redhat-official/default.nix b/pkgs/data/fonts/redhat-official/default.nix
index 44eea3774ffc..37ca9db9fa0b 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/misc/hackage/default.nix b/pkgs/data/misc/hackage/default.nix
index 5027371035ff..c7528db49f11 100644
--- a/pkgs/data/misc/hackage/default.nix
+++ b/pkgs/data/misc/hackage/default.nix
@@ -1,6 +1,6 @@
{ fetchurl }:
fetchurl {
- url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/ccbc2765586cc6f71894919f1f096714ca6ae453.tar.gz";
- sha256 = "001crq0myhn0bvyrbl10i8hski6z2a0hg9ij4plbjgvl5cldkzji";
+ url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/8af27e77a015d06c7a8fe49a430fd5334a93ebf7.tar.gz";
+ sha256 = "1w5cfcvliy1ly8iq42l76ai5wgfnrwxf6hw5kq6p913qhhrcn5wr";
}
diff --git a/pkgs/desktops/gnome-3/extensions/arc-menu/default.nix b/pkgs/desktops/gnome-3/extensions/arc-menu/default.nix
index 7bd31f587f67..336820b7938e 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 7f6b8489ea8b..5d8584f52a6a 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/mate/atril/default.nix b/pkgs/desktops/mate/atril/default.nix
index e71ca81142a7..12c89ee1b111 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/elementary-files/default.nix b/pkgs/desktops/pantheon/apps/elementary-files/default.nix
index 346971d4fb41..6ada1a340d17 100644
--- a/pkgs/desktops/pantheon/apps/elementary-files/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-files/default.nix
@@ -30,7 +30,7 @@
stdenv.mkDerivation rec {
pname = "elementary-files";
- version = "4.4.3";
+ version = "4.4.4";
repoName = "files";
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
owner = "elementary";
repo = repoName;
rev = version;
- sha256 = "14i5icgpsy78mr7w6cav38p7shfk784b6nlxz9y72rbcxky036yc";
+ sha256 = "1hsh9kg30l90r2aqrrap1nfmgjf0la8mfd8h4xm6d7acailcnhmb";
};
passthru = {
diff --git a/pkgs/desktops/pantheon/desktop/gala/default.nix b/pkgs/desktops/pantheon/desktop/gala/default.nix
index 624a1bde61d8..4519a2287f7f 100644
--- a/pkgs/desktops/pantheon/desktop/gala/default.nix
+++ b/pkgs/desktops/pantheon/desktop/gala/default.nix
@@ -1,5 +1,6 @@
{ stdenv
, fetchFromGitHub
+, fetchpatch
, pantheon
, pkgconfig
, meson
@@ -69,6 +70,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/session/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/session/default.nix
index 14c87036ec8c..e93135258210 100644
--- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/session/default.nix
+++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/session/default.nix
@@ -1,5 +1,6 @@
{ stdenv
, fetchFromGitHub
+, fetchpatch
, pantheon
, pkgconfig
, meson
@@ -23,6 +24,19 @@ 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 {
attrPath = "pantheon.${pname}";
diff --git a/pkgs/development/compilers/binaryen/default.nix b/pkgs/development/compilers/binaryen/default.nix
index 651c88704da3..e9dc939b5edf 100644
--- a/pkgs/development/compilers/binaryen/default.nix
+++ b/pkgs/development/compilers/binaryen/default.nix
@@ -1,11 +1,11 @@
{ stdenv, cmake, python3, fetchFromGitHub, emscriptenRev ? null, substituteAll }:
let
- defaultVersion = "94";
+ defaultVersion = "95";
# Map from git revs to SHA256 hashes
sha256s = {
- version_94 = "1wk20fhyppb2ljni7ifqnsx9kl1kcl6c0svc0qljf0bs6rvr9qdm";
+ version_95 = "1w4js9bm5qv5aws8bzz4f0n3ni2l7h4fidkq9v5bldf0zxncy8m3";
"1.39.1" = "0ygm9m5322h4vfpf3j63q32qxk2l26yk62hh7dkb49j51zwl1y3y";
};
in
diff --git a/pkgs/development/compilers/bluespec/default.nix b/pkgs/development/compilers/bluespec/default.nix
index 49737b48c575..09e76d63235c 100644
--- a/pkgs/development/compilers/bluespec/default.nix
+++ b/pkgs/development/compilers/bluespec/default.nix
@@ -6,7 +6,6 @@
, fontconfig
, gmp
, gperf
-, haskell
, libX11
, libpoly
, perl
@@ -14,16 +13,14 @@
, verilog
, xorg
, zlib
+, ghc
}:
let
# yices wants a libgmp.a and fails otherwise
gmpStatic = gmp.override { withStatic = true; };
- # Compiling PreludeBSV fails with more recent GHC versions
- # > imperative statement (not BVI context)
- # https://github.com/B-Lang-org/bsc/issues/20#issuecomment-583724030
- ghcWithPackages = haskell.packages.ghc844.ghc.withPackages (g: (with g; [old-time regex-compat syb]));
+ ghcWithPackages = ghc.withPackages (g: (with g; [old-time regex-compat syb]));
in stdenv.mkDerivation rec {
pname = "bluespec";
version = "unstable-2020.02.09";
diff --git a/pkgs/development/compilers/flutter/default.nix b/pkgs/development/compilers/flutter/default.nix
index afc8fbd7f499..c58457b71a41 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 42c09c805cb5..cd01577cc10f 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 {
+@@ -294,13 +294,6 @@ class FlutterCommandRunner extends CommandRunner {
+ 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 4672d4c625d0..64950d4476ef 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 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 font in family['fonts']) {
+@@ -392,7 +393,7 @@ List<_Asset> _getMaterialAssets(String fontSet) {
+ for (final Map font in (family['fonts'] as List).cast>()) {
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 16fe504595f3..c77357ea13c5 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 {
+@@ -301,13 +301,6 @@ class FlutterCommandRunner extends CommandRunner {
}
_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 e5719a2867f9..64950d4476ef 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 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 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 font in (family['fonts'] as List).cast>()) {
+ 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/ghc/8.10.1.nix b/pkgs/development/compilers/ghc/8.10.1.nix
index c70efe1fdef3..bd7f17b53be3 100644
--- a/pkgs/development/compilers/ghc/8.10.1.nix
+++ b/pkgs/development/compilers/ghc/8.10.1.nix
@@ -23,6 +23,9 @@
, # If enabled, use -fPIC when compiling static libs.
enableRelocatedStaticLibs ? stdenv.targetPlatform != stdenv.hostPlatform
+ # aarch64 outputs otherwise exceed 2GB limit
+, enableProfiliedLibs ? !stdenv.targetPlatform.isAarch64
+
, # Whether to build dynamic libs for the standard library (on the target
# platform). Static libs are always built.
enableShared ? !stdenv.targetPlatform.isWindows && !stdenv.targetPlatform.useiOSPrebuilt
@@ -128,6 +131,8 @@ stdenv.mkDerivation (rec {
export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}"
'' + stdenv.lib.optionalString stdenv.isDarwin ''
export NIX_LDFLAGS+=" -no_dtrace_dof"
+ '' + stdenv.lib.optionalString (!enableProfiliedLibs) ''
+ GhcLibWays = "v dyn"
'' + stdenv.lib.optionalString targetPlatform.useAndroidPrebuilt ''
sed -i -e '5i ,("armv7a-unknown-linux-androideabi", ("e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64", "cortex-a8", ""))' llvm-targets
'' + stdenv.lib.optionalString targetPlatform.isMusl ''
diff --git a/pkgs/development/compilers/ghc/8.4.4.nix b/pkgs/development/compilers/ghc/8.8.4.nix
similarity index 79%
rename from pkgs/development/compilers/ghc/8.4.4.nix
rename to pkgs/development/compilers/ghc/8.8.4.nix
index a4174c47046e..02f1f85839ba 100644
--- a/pkgs/development/compilers/ghc/8.4.4.nix
+++ b/pkgs/development/compilers/ghc/8.8.4.nix
@@ -2,12 +2,15 @@
# build-tools
, bootPkgs
-, autoconf, automake, coreutils, fetchurl, fetchpatch, perl, python3, m4, sphinx
+, autoconf, automake, coreutils, fetchurl, perl, python3, m4, sphinx
, bash
, libiconv ? null, ncurses
-, useLLVM ? !stdenv.targetPlatform.isx86 || (stdenv.targetPlatform.isMusl && stdenv.hostPlatform != stdenv.targetPlatform) || stdenv.targetPlatform.isiOS
+, # GHC can be built with system libffi or a bundled one.
+ libffi ? null
+
+, useLLVM ? !stdenv.targetPlatform.isx86
, # LLVM is conceptually a run-time-only depedendency, but for
# non-x86, we need LLVM to bootstrap later stages, so it becomes a
# build-time dependency too.
@@ -20,6 +23,9 @@
, # If enabled, use -fPIC when compiling static libs.
enableRelocatedStaticLibs ? stdenv.targetPlatform != stdenv.hostPlatform
+ # aarch64 outputs otherwise exceed 2GB limit
+, enableProfiliedLibs ? !stdenv.targetPlatform.isAarch64
+
, # Whether to build dynamic libs for the standard library (on the target
# platform). Static libs are always built.
enableShared ? !stdenv.targetPlatform.isWindows && !stdenv.targetPlatform.useiOSPrebuilt
@@ -29,11 +35,12 @@
, # What flavour to build. An empty string indicates no
# specific flavour and falls back to ghc default values.
- ghcFlavour ? stdenv.lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform) "perf-cross"
-, # Whether to backport https://phabricator.haskell.org/D4388 for
- # deterministic profiling symbol names, at the cost of a slightly
- # non-standard GHC API
- deterministicProfiling ? false
+ ghcFlavour ? stdenv.lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform)
+ (if useLLVM then "perf-cross" else "perf-cross-ncg")
+
+, # Whether to disable the large address space allocator
+ # necessary fix for iOS: https://www.reddit.com/r/haskell/comments/4ttdz1/building_an_osxi386_to_iosarm64_cross_compiler/d5qvd67/
+ disableLargeAddressSpace ? stdenv.targetPlatform.isDarwin && stdenv.targetPlatform.isAarch64
}:
assert !enableIntegerSimple -> gmp != null;
@@ -70,6 +77,7 @@ let
# Splicer will pull out correct variations
libDeps = platform: stdenv.lib.optional enableTerminfo ncurses
+ ++ [libffi]
++ stdenv.lib.optional (!enableIntegerSimple) gmp
++ stdenv.lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv;
@@ -85,39 +93,18 @@ let
in
stdenv.mkDerivation (rec {
- version = "8.4.4";
+ version = "8.8.4";
name = "${targetPrefix}ghc-${version}";
src = fetchurl {
url = "https://downloads.haskell.org/ghc/${version}/ghc-${version}-src.tar.xz";
- sha256 = "1ch4j2asg7pr52ai1hwzykxyj553wndg7wq93i47ql4fllspf48i";
+ sha256 = "0bgwbxxvdn56l91bp9p5d083gzcfdi6z8l8b17qzjpr3n8w5wl7h";
};
enableParallelBuilding = true;
outputs = [ "out" "doc" ];
- patches = [(fetchpatch {
- url = "https://github.com/haskell/hsc2hs/commit/738f3666c878ee9e79c3d5e819ef8b3460288edf.diff";
- sha256 = "0plzsbfaq6vb1023lsarrjglwgr9chld4q3m99rcfzx0yx5mibp3";
- extraPrefix = "utils/hsc2hs/";
- stripLen = 1;
- }) (fetchpatch rec { # https://phabricator.haskell.org/D5123
- url = "http://tarballs.nixos.org/sha256/${sha256}";
- name = "D5123.diff";
- sha256 = "0nhqwdamf2y4gbwqxcgjxs0kqx23w9gv5kj0zv6450dq19rji82n";
- })] ++ stdenv.lib.optional deterministicProfiling
- (fetchpatch rec {
- url = "http://tarballs.nixos.org/sha256/${sha256}";
- name = "D4388.diff";
- sha256 = "0w6sdcvnqjlnlzpvnzw20b80v150ijjyjvs9548ildc1928j0w7s";
- })
- ++ stdenv.lib.optional stdenv.isDarwin ./backport-dylib-command-size-limit.patch
- ++ stdenv.lib.optional (targetPlatform.isAarch32 || targetPlatform.isAarch64) (fetchpatch {
- url = "https://github.com/ghc/ghc/commit/d8495549ba9d194815c2d0eaee6797fc7c00756a.diff";
- sha256 = "1yjcma507c609bcim4rnxq0gaj2dg4d001jklmbpbqpzqzxkn5sz";
- });
-
postPatch = "patchShebangs .";
# GHC is a bit confused on its cross terminology.
@@ -144,6 +131,8 @@ stdenv.mkDerivation (rec {
export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}"
'' + stdenv.lib.optionalString stdenv.isDarwin ''
export NIX_LDFLAGS+=" -no_dtrace_dof"
+ '' + stdenv.lib.optionalString (!enableProfiliedLibs) ''
+ GhcLibWays = "v dyn"
'' + stdenv.lib.optionalString targetPlatform.useAndroidPrebuilt ''
sed -i -e '5i ,("armv7a-unknown-linux-androideabi", ("e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64", "cortex-a8", ""))' llvm-targets
'' + stdenv.lib.optionalString targetPlatform.isMusl ''
@@ -167,22 +156,28 @@ stdenv.mkDerivation (rec {
# TODO(@Ericson2314): Always pass "--target" and always prefix.
configurePlatforms = [ "build" "host" ]
++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
+
# `--with` flags for libraries needed for RTS linker
configureFlags = [
"--datadir=$doc/share/doc/ghc"
"--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib"
+ ] ++ stdenv.lib.optionals (libffi != null) [
+ "--with-system-libffi"
+ "--with-ffi-includes=${targetPackages.libffi.dev}/include"
+ "--with-ffi-libraries=${targetPackages.libffi.out}/lib"
] ++ stdenv.lib.optionals (targetPlatform == hostPlatform && !enableIntegerSimple) [
- "--with-gmp-includes=${targetPackages.gmp.dev}/include" "--with-gmp-libraries=${targetPackages.gmp.out}/lib"
+ "--with-gmp-includes=${targetPackages.gmp.dev}/include"
+ "--with-gmp-libraries=${targetPackages.gmp.out}/lib"
] ++ stdenv.lib.optionals (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [
- "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib"
+ "--with-iconv-includes=${libiconv}/include"
+ "--with-iconv-libraries=${libiconv}/lib"
] ++ stdenv.lib.optionals (targetPlatform != hostPlatform) [
"--enable-bootstrap-with-devel-snapshot"
] ++ stdenv.lib.optionals useLdGold [
"CFLAGS=-fuse-ld=gold"
"CONF_GCC_LINKER_OPTS_STAGE1=-fuse-ld=gold"
"CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=gold"
- ] ++ stdenv.lib.optionals (targetPlatform.isDarwin && targetPlatform.isAarch64) [
- # fix for iOS: https://www.reddit.com/r/haskell/comments/4ttdz1/building_an_osxi386_to_iosarm64_cross_compiler/d5qvd67/
+ ] ++ stdenv.lib.optionals (disableLargeAddressSpace) [
"--disable-large-address-space"
];
@@ -190,7 +185,7 @@ stdenv.mkDerivation (rec {
strictDeps = true;
# Don’t add -liconv to LDFLAGS automatically so that GHC will add it itself.
- dontAddExtraLibs = true;
+ dontAddExtraLibs = true;
nativeBuildInputs = [
perl autoconf automake m4 python3 sphinx
@@ -212,10 +207,6 @@ stdenv.mkDerivation (rec {
# that in turn causes GHCi to abort
stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols";
- # See #63511 - the only unstripped file is the debug rts which isn't meant to
- # be stripped.
- dontStrip = true;
-
checkTarget = "test";
hardeningDisable = [ "format" ] ++ stdenv.lib.optional stdenv.targetPlatform.isMusl "pie";
@@ -239,7 +230,7 @@ stdenv.mkDerivation (rec {
inherit enableShared;
# Our Cabal compiler name
- haskellCompilerName = "ghc-8.4.4";
+ haskellCompilerName = "ghc-${version}";
};
meta = {
diff --git a/pkgs/development/compilers/gleam/default.nix b/pkgs/development/compilers/gleam/default.nix
index 1fa8720a400a..e7d9287e0d50 100644
--- a/pkgs/development/compilers/gleam/default.nix
+++ b/pkgs/development/compilers/gleam/default.nix
@@ -1,19 +1,22 @@
-{ stdenv, rustPlatform, fetchFromGitHub, Security }:
+{ stdenv, rustPlatform, fetchFromGitHub, pkg-config, openssl, Security }:
rustPlatform.buildRustPackage rec {
pname = "gleam";
- version = "0.8.0";
+ version = "0.10.1";
src = fetchFromGitHub {
owner = "gleam-lang";
repo = pname;
rev = "v${version}";
- sha256 = "05n8a7b63i9946fvbxphfh8n6ib20qnbv44ghlzcjwca9qvlx7i7";
+ sha256 = "0cgs0halxhp2hh3sf0nvy5ybllhraxircxxbfj9jbs3446dzflbk";
};
- buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
+ nativeBuildInputs = [ pkg-config ];
- cargoSha256 = "1ga5dinkmibkg53bfr6vc0i4bbgyn2y3d5qjf5bd965c1v7ba1jl";
+ buildInputs = [ openssl ] ++
+ stdenv.lib.optionals stdenv.isDarwin [ Security ];
+
+ cargoSha256 = "12lpxighjk3ydfa288llj6xqas7z9fbfjpwnl870189awvp2fjxx";
meta = with stdenv.lib; {
description = "A statically typed language for the Erlang VM";
diff --git a/pkgs/development/compilers/llvm/10/bintools.nix b/pkgs/development/compilers/llvm/10/bintools.nix
index 72a2a7331930..53f7941e3369 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 a74d10989ffa..000000000000
--- 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 35092a53c3ea..1788ac2d96f0 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
@@ -37,9 +37,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 00c4f0677ebc..47bbe808ac20 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 870d5110d145..cd77eed9ac80 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 872865ec474b..651f1887553d 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 ab45f27d24f4..00371b862adb 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 4e55b28c2430..b13bacb36380 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 6a0032de2ac4..5d513462820e 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 90716f67f836..47215caa53e3 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 cf4b1eaacf7d..000000000000
--- 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 dd0728b40c94..742beb876404 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 624c99bc8683..0927448d2b49 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 72a2a7331930..53f7941e3369 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 72a2a7331930..53f7941e3369 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 34b1f5e641b8..984e7ab74b74 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 72a2a7331930..53f7941e3369 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 5d93ca8709fa..816a4f3d2302 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/openjdk/11.nix b/pkgs/development/compilers/openjdk/11.nix
index 9edb70074c7d..b2f86343d0a9 100644
--- a/pkgs/development/compilers/openjdk/11.nix
+++ b/pkgs/development/compilers/openjdk/11.nix
@@ -47,6 +47,7 @@ let
configureFlags = [
"--with-boot-jdk=${openjdk11-bootstrap.home}"
+ "--with-version-pre="
"--enable-unlimited-crypto"
"--with-native-debug-symbols=internal"
"--with-libjpeg=system"
diff --git a/pkgs/development/compilers/openjdk/12.nix b/pkgs/development/compilers/openjdk/12.nix
index 16c2fd766bce..3576608e13e6 100644
--- a/pkgs/development/compilers/openjdk/12.nix
+++ b/pkgs/development/compilers/openjdk/12.nix
@@ -55,6 +55,7 @@ let
configureFlags = [
"--with-boot-jdk=${openjdk11.home}"
+ "--with-version-pre="
"--enable-unlimited-crypto"
"--with-native-debug-symbols=internal"
"--with-libjpeg=system"
diff --git a/pkgs/development/compilers/openjdk/13.nix b/pkgs/development/compilers/openjdk/13.nix
index b3842ba7cad2..31ffb4baf012 100644
--- a/pkgs/development/compilers/openjdk/13.nix
+++ b/pkgs/development/compilers/openjdk/13.nix
@@ -55,6 +55,7 @@ let
configureFlags = [
"--with-boot-jdk=${openjdk13-bootstrap.home}"
+ "--with-version-pre="
"--enable-unlimited-crypto"
"--with-native-debug-symbols=internal"
"--with-libjpeg=system"
diff --git a/pkgs/development/compilers/polyml/default.nix b/pkgs/development/compilers/polyml/default.nix
index 657673465375..7b15a988e38a 100644
--- a/pkgs/development/compilers/polyml/default.nix
+++ b/pkgs/development/compilers/polyml/default.nix
@@ -2,20 +2,12 @@
stdenv.mkDerivation rec {
pname = "polyml";
- version = "5.8";
+ version = "5.8.1";
prePatch = stdenv.lib.optionalString stdenv.isDarwin ''
substituteInPlace configure.ac --replace stdc++ c++
'';
- patches = [
- (fetchpatch {
- name = "new-libffi-FFI_SYSV.patch";
- url = "https://github.com/polyml/polyml/commit/ad32de7f181acaffaba78d5c3d9e5aa6b84a741c.patch";
- sha256 = "007q3r2h9kfh3c1nv0dyhipmak44q468ab9bwnz4kk4a2dq76n8v";
- })
- ];
-
buildInputs = [ libffi gmp ];
nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin autoreconfHook;
@@ -30,7 +22,7 @@ stdenv.mkDerivation rec {
owner = "polyml";
repo = "polyml";
rev = "v${version}";
- sha256 = "1s7q77bivppxa4vd7gxjj5dbh66qnirfxnkzh1ql69rfx1c057n3";
+ sha256 = "0gcx2fjiwsiazlyfhm7zlrd563blc4fy9w2mspib9divbavaxin6";
};
meta = with stdenv.lib; {
diff --git a/pkgs/development/compilers/rust/rls/default.nix b/pkgs/development/compilers/rust/rls/default.nix
index 63a3c96a8f92..b603675a6f17 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 f50d9e0598b1..2d3a527fa142 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/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 5a5204c3db36..8810444cce64 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -69,7 +69,7 @@ self: super: {
name = "git-annex-${super.git-annex.version}-src";
url = "git://git-annex.branchable.com/";
rev = "refs/tags/" + super.git-annex.version;
- sha256 = "1b5lb1h7pqfhmp54zzwha17ms20xvxai1dl7s6787m9asli4q406";
+ sha256 = "vwKcY7Yk+R0YkaXjJ7xKyQWGjySTUPox0xIaurbQZk0=";
};
}).override {
dbus = if pkgs.stdenv.isLinux then self.dbus else null;
@@ -202,12 +202,18 @@ self: super: {
# base bound
digit = doJailbreak super.digit;
- # 2020-06-05: HACK: does not passes own build suite - `dontCheck` We should
+ # 2020-06-05: HACK: does not pass own build suite - `dontCheck` We should
# generate optparse-applicative completions for the hnix executable. Sadly
# building of the executable has been disabled for ghc < 8.10 in hnix.
# Generating the completions should be activated again, once we default to
# ghc 8.10.
- hnix = dontCheck super.hnix;
+ hnix = dontCheck (super.hnix.override {
+ # The neat-interpolation package from stack is to old for hnix.
+ # https://github.com/haskell-nix/hnix/issues/676
+ # Once neat-interpolation >= 0.4 is in our stack release,
+ # (which should happen soon), we can remove this override
+ neat-interpolation = self.neat-interpolation_0_5_1_1;
+ });
# Fails for non-obvious reasons while attempting to use doctest.
search = dontCheck super.search;
@@ -910,21 +916,10 @@ self: super: {
# https://github.com/haskell-servant/servant-auth/issues/113
servant-auth-client = dontCheck super.servant-auth-client;
- # 2020-06-04: HACK: dontCheck - The test suite attempts to use the network.
- # Should be solved when: https://github.com/dhall-lang/dhall-haskell/issues/1837
- dhall = (generateOptparseApplicativeCompletion "dhall" (dontCheck super.dhall)).override { repline = self.repline_0_3_0_0; };
- dhall_1_30_0 = dontCheck super.dhall_1_30_0;
- repline_0_3_0_0 = super.repline_0_3_0_0.override { haskeline = self.haskeline_0_8_0_0; };
- haskeline_0_8_0_0 = dontCheck super.haskeline_0_8_0_0;
-
- dhall-json =
- generateOptparseApplicativeCompletions ["dhall-to-json" "dhall-to-yaml"]
- super.dhall-json;
-
- dhall-nix =
- generateOptparseApplicativeCompletion "dhall-to-nix" (
- super.dhall-nix
- );
+ # Generate cli completions for dhall.
+ dhall = generateOptparseApplicativeCompletion "dhall" super.dhall;
+ dhall-json = generateOptparseApplicativeCompletions ["dhall-to-json" "dhall-to-yaml"] super.dhall-json;
+ dhall-nix = generateOptparseApplicativeCompletion "dhall-to-nix" (super.dhall-nix);
# https://github.com/haskell-hvr/netrc/pull/2#issuecomment-469526558
netrc = doJailbreak super.netrc;
@@ -1231,14 +1226,6 @@ self: super: {
# Requested version bump on upstream https://github.com/obsidiansystems/constraints-extras/issues/32
constraints-extras = doJailbreak super.constraints-extras;
- # 2020-06-22: NOTE: > 0.10.0.0 => rm dhall override: https://github.com/srid/rib/issues/161
- rib = doJailbreak (super.rib.override {
- dhall = self.dhall_1_30_0;
- });
- # Necessary for neuron 0.4.0
- neuron = super.neuron.override {
- dhall = self.dhall_1_30_0;
- };
# Necessary for stack
# x509-validation test suite hangs: upstream https://github.com/vincenthz/hs-certificate/issues/120
@@ -1317,15 +1304,8 @@ self: super: {
sha256 = "0v6kv1d4syjzgzc2s7a76c6k4vminlcq62n7jg3nn9xd00gwmmv7";
});
- # Picking fixed version constraint from upstream
- # Issue: https://github.com/ghcjs/jsaddle/issues/115
# Tests disabled because they assume to run in the whole jsaddle repo and not the hackage tarbal of jsaddle-warp.
- jsaddle-warp = dontCheck (appendPatch super.jsaddle-warp (pkgs.fetchpatch {
- url = "https://github.com/ghcjs/jsaddle/commit/86b166033186c1724d4d52eeaf0935f0f29fe1ca.patch";
- sha256 = "0j4g3hcqrandlnzr9n9mixygg86accdyk2nyj9hh9g4p7mrcyb7j";
- stripLen = 2;
- extraPrefix = "";
- }));
+ jsaddle-warp = dontCheck super.jsaddle-warp;
# 2020-06-24: Jailbreaking because of restrictive test dep bounds
# Upstream issue: https://github.com/kowainik/trial/issues/62
@@ -1352,15 +1332,18 @@ self: super: {
# haskell-language-server uses its own fork of ghcide
# Test disabled: it seems to freeze (is it just that it takes a long time ?)
hls-ghcide =
- dontCheck (
+ dontCheck ((
overrideCabal super.hls-ghcide
(old: {
# The integration test run by lsp-test requires the executable to be in the PATH
preCheck = ''
export PATH=$PATH:dist/build/ghcide
'';
- })
- );
+ })).override {
+ # we are faster than stack here
+ hie-bios = dontCheck self.hie-bios_0_6_1;
+ lsp-test = dontCheck self.lsp-test_0_11_0_2;
+ });
haskell-language-server = (overrideCabal super.haskell-language-server
(old: {
@@ -1368,6 +1351,8 @@ self: super: {
preCheck = ''
export PATH=$PATH:dist/build/haskell-language-server
'';
+ # The wrapper test does not work for now.
+ testTarget = "func-test";
# test needs the git tool
testToolDepends = old.testToolDepends
@@ -1375,8 +1360,9 @@ self: super: {
})).override {
# use a fork of ghcide
ghcide = self.hls-ghcide;
- # use specific version
- ormolu = super.ormolu_0_0_5_0;
+ # we are faster than stack here
+ hie-bios = dontCheck self.hie-bios_0_6_1;
+ lsp-test = dontCheck self.lsp-test_0_11_0_2;
};
# https://github.com/kowainik/policeman/issues/57
@@ -1391,4 +1377,78 @@ self: super: {
gi-soup = doJailbreak super.gi-soup;
gi-webkit2 = doJailbreak super.gi-webkit2;
+ # Missing -Iinclude parameter to doc-tests (pull has been accepted, so should be resolved when 0.5.3 released)
+ # https://github.com/lehins/massiv/pull/104
+ massiv = dontCheck super.massiv;
+
+ # Upstream PR: https://github.com/jkff/splot/pull/9
+ splot = appendPatch super.splot (pkgs.fetchpatch {
+ url = "https://github.com/jkff/splot/commit/a6710b05470d25cb5373481cf1cfc1febd686407.patch";
+ sha256 = "1c5ck2ibag2gcyag6rjivmlwdlp5k0dmr8nhk7wlkzq2vh7zgw63";
+ });
+
+ # The current LTS 15.x version has a bug in the test suite.
+ streaming-commons = self.streaming-commons_0_2_2_1;
+
+ # Version bumps have not been merged by upstream yet.
+ # https://github.com/obsidiansystems/dependent-sum-aeson-orphans/pull/5
+ dependent-sum-aeson-orphans = appendPatch super.dependent-sum-aeson-orphans (pkgs.fetchpatch {
+ url = "https://github.com/obsidiansystems/dependent-sum-aeson-orphans/commit/5a369e433ad7e3eef54c7c3725d34270f6aa48cc.patch";
+ sha256 = "1lzrcicvdg77hd8j2fg37z19amp5yna5xmw1fc06zi0j95csll4r";
+ });
+
+ # Tests are broken because of missing files in hackage tarball.
+ # https://github.com/jgm/commonmark-hs/issues/55
+ commonmark-extensions = dontCheck super.commonmark-extensions;
+
+ # The overrides in the following lines all have the following causes:
+ # * neuron needs commonmark-pandoc
+ # * which needs a newer pandoc-types (>= 1.21)
+ # * which means we need a newer pandoc (>= 2.10)
+ # * which needs a newer hslua (1.1.2) and a newer jira-wiki-markup (1.3.2)
+ # Then we need to apply those overrides to all transitive dependencies
+ # All of this will be obsolete, when pandoc 2.10 hits stack lts.
+ commonmark-pandoc = super.commonmark-pandoc.override {
+ pandoc-types = self.pandoc-types_1_21;
+ };
+ reflex-dom-pandoc = super.reflex-dom-pandoc.override {
+ pandoc-types = self.pandoc-types_1_21;
+ };
+ pandoc_2_10_1 = super.pandoc_2_10_1.override {
+ pandoc-types = self.pandoc-types_1_21;
+ hslua = self.hslua_1_1_2;
+ texmath = self.texmath.override {
+ pandoc-types = self.pandoc-types_1_21;
+ };
+ tasty-lua = self.tasty-lua.override {
+ hslua = self.hslua_1_1_2;
+ };
+ hslua-module-text = self.hslua-module-text.override {
+ hslua = self.hslua_1_1_2;
+ };
+ hslua-module-system = self.hslua-module-system.override {
+ hslua = self.hslua_1_1_2;
+ };
+ jira-wiki-markup = self.jira-wiki-markup_1_3_2;
+ };
+
+ # Apply version-bump patch that is not contained in released version yet.
+ # Upstream PR: https://github.com/srid/neuron/pull/304
+ neuron = (appendPatch super.neuron (pkgs.fetchpatch {
+ url= "https://github.com/srid/neuron/commit/9ddcb7e9d63b8266d1372ef7c14c13b6b5277990.patch";
+ sha256 = "01f9v3jnl05fnpd624wv3a0j5prcbnf62ysa16fbc0vabw19zv1b";
+ excludes = [ "commonmark-hs/github.json" ];
+ stripLen = 2;
+ extraPrefix = "";
+ }))
+ # See comment about overrides above commonmark-pandoc
+ .override {
+ pandoc = self.pandoc_2_10_1;
+ pandoc-types = self.pandoc-types_1_21;
+ rib = super.rib.override {
+ pandoc = self.pandoc_2_10_1;
+ pandoc-types = self.pandoc-types_1_21;
+ };
+ };
+
} // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super
diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix
index b0585d17989d..69f212dad9af 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix
@@ -67,6 +67,7 @@ self: super: {
unliftio-core = doJailbreak super.unliftio-core;
# Use the latest version to fix the build.
+ dhall = self.dhall_1_33_1;
lens = self.lens_4_19_2;
optics-core = self.optics-core_0_3;
repline = self.repline_0_4_0_0;
@@ -86,6 +87,7 @@ self: super: {
serialise = doJailbreak super.serialise;
setlocale = doJailbreak super.setlocale;
shellmet = doJailbreak super.shellmet;
+ shower = doJailbreak super.shower;
# The shipped Setup.hs file is broken.
csv = overrideCabal super.csv (drv: { preCompileBuildDriver = "rm Setup.hs"; });
diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
index 57c38b22ccd8..339fda5d6fbf 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
@@ -64,6 +64,7 @@ self: super: {
monad-par = dontCheck super.monad-par; # https://github.com/simonmar/monad-par/issues/66
github = dontCheck super.github; # hspec upper bound exceeded; https://github.com/phadej/github/pull/341
binary-orphans = dontCheck super.binary-orphans; # tasty upper bound exceeded; https://github.com/phadej/binary-orphans/commit/8ce857226595dd520236ff4c51fa1a45d8387b33
+ rebase = doJailbreak super.rebase; # time ==1.9.* is too low
# https://github.com/jgm/skylighting/issues/55
skylighting-core = dontCheck super.skylighting-core;
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 8805958a78dd..b0cce0cc6909 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -72,7 +72,7 @@ default-package-overrides:
# gi-gdkx11-4.x requires gtk-4.x, which is still under development and
# not yet available in Nixpkgs
- gi-gdkx11 < 4
- # LTS Haskell 16.3
+ # LTS Haskell 16.6
- abstract-deque ==0.3
- abstract-par ==0.3.3
- AC-Angle ==1.0
@@ -262,11 +262,11 @@ default-package-overrides:
- attoparsec-path ==0.0.0.1
- audacity ==0.0.2
- aur ==7.0.3
- - aura ==3.1.4
+ - aura ==3.1.5
- authenticate ==1.3.5
- authenticate-oauth ==1.6.0.1
- auto ==0.4.3.1
- - autoexporter ==1.1.17
+ - autoexporter ==1.1.18
- auto-update ==0.1.6
- avers ==0.0.17.1
- avro ==0.5.2.0
@@ -279,7 +279,7 @@ default-package-overrides:
- base32-lens ==0.1.0.0
- base32string ==0.9.1
- base58string ==0.10.0
- - base64 ==0.4.2.1
+ - base64 ==0.4.2.2
- base64-bytestring ==1.0.0.3
- base64-bytestring-type ==1.0.1
- base64-lens ==0.3.0
@@ -334,7 +334,7 @@ default-package-overrides:
- blaze-bootstrap ==0.1.0.1
- blaze-builder ==0.4.1.0
- blaze-html ==0.9.1.2
- - blaze-markup ==0.8.2.5
+ - blaze-markup ==0.8.2.7
- blaze-svg ==0.3.6.1
- blaze-textual ==0.2.1.0
- bmp ==1.2.6.3
@@ -383,7 +383,7 @@ default-package-overrides:
- bzlib-conduit ==0.3.0.2
- c2hs ==0.28.6
- cabal-appimage ==0.3.0.0
- - cabal-debian ==5.0.2
+ - cabal-debian ==5.0.3
- cabal-doctest ==1.0.8
- cabal-rpm ==2.0.6
- cache ==0.1.3.0
@@ -406,7 +406,7 @@ default-package-overrides:
- cast ==0.1.0.2
- category ==0.2.5.0
- cayley-client ==0.4.13
- - cborg ==0.2.3.0
+ - cborg ==0.2.4.0
- cborg-json ==0.2.2.0
- cereal ==0.5.8.1
- cereal-conduit ==0.8.0
@@ -439,9 +439,9 @@ default-package-overrides:
- cipher-des ==0.0.6
- cipher-rc4 ==0.1.4
- circle-packing ==0.1.0.6
- - clash-ghc ==1.2.2
- - clash-lib ==1.2.2
- - clash-prelude ==1.2.2
+ - clash-ghc ==1.2.3
+ - clash-lib ==1.2.3
+ - clash-prelude ==1.2.3
- classy-prelude ==1.5.0
- classy-prelude-conduit ==1.5.0
- classy-prelude-yesod ==1.5.0
@@ -687,7 +687,7 @@ default-package-overrides:
- dynamic-state ==0.3.1
- dyre ==0.8.12
- eap ==0.9.0.2
- - earcut ==0.1.0.2
+ - earcut ==0.1.0.4
- Earley ==0.13.0.1
- easy-file ==0.2.2
- Ebnf2ps ==1.0.15
@@ -749,7 +749,7 @@ default-package-overrides:
- exception-hierarchy ==0.1.0.3
- exception-mtl ==0.4.0.1
- exceptions ==0.10.4
- - exception-transformers ==0.4.0.8
+ - exception-transformers ==0.4.0.9
- executable-path ==0.0.3.1
- exit-codes ==1.0.0
- exomizer ==1.0.0
@@ -760,7 +760,7 @@ default-package-overrides:
- extended-reals ==0.2.4.0
- extensible-effects ==5.0.0.1
- extensible-exceptions ==0.1.1.4
- - extra ==1.7.3
+ - extra ==1.7.4
- extractable-singleton ==0.0.1
- extrapolate ==0.4.2
- fail ==4.9.0.0
@@ -781,7 +781,7 @@ default-package-overrides:
- filecache ==0.4.1
- file-embed ==0.0.11.2
- file-embed-lzma ==0
- - filelock ==0.1.1.4
+ - filelock ==0.1.1.5
- filemanip ==0.3.6.3
- file-modules ==0.1.2.4
- file-path-th ==0.1.0.0
@@ -904,7 +904,7 @@ default-package-overrides:
- ghcjs-codemirror ==0.0.0.2
- ghc-lib ==8.10.1.20200523
- ghc-lib-parser ==8.10.1.20200523
- - ghc-lib-parser-ex ==8.10.0.14
+ - ghc-lib-parser-ex ==8.10.0.15
- ghc-parser ==0.2.2.0
- ghc-paths ==0.1.0.12
- ghc-prof ==1.4.1.7
@@ -944,8 +944,8 @@ default-package-overrides:
- gl ==0.9
- glabrous ==2.0.2
- GLFW-b ==3.3.0.0
- - Glob ==0.10.0
- - gloss ==1.13.1.1
+ - Glob ==0.10.1
+ - gloss ==1.13.1.2
- gloss-rendering ==1.13.1.1
- GLURaw ==2.0.0.4
- GLUT ==2.7.0.15
@@ -974,7 +974,7 @@ default-package-overrides:
- haddock-library ==1.8.0
- hadolint ==1.18.0
- hadoop-streaming ==0.2.0.3
- - hakyll ==4.13.3.0
+ - hakyll ==4.13.4.0
- half ==0.3
- hamtsolo ==1.0.3
- HandsomeSoup ==0.4.2
@@ -1012,7 +1012,7 @@ default-package-overrides:
- hasty-hamiltonian ==1.3.3
- HaTeX ==3.22.2.0
- HaXml ==1.25.5
- - haxr ==3000.11.4
+ - haxr ==3000.11.4.1
- HCodecs ==0.5.2
- hdaemonize ==0.5.6
- HDBC ==2.4.0.3
@@ -1021,7 +1021,7 @@ default-package-overrides:
- heap ==1.0.4
- heaps ==0.3.6.1
- hebrew-time ==0.1.2
- - hedgehog ==1.0.2
+ - hedgehog ==1.0.3
- hedgehog-corpus ==0.2.0
- hedgehog-fakedata ==0.0.1.3
- hedgehog-fn ==1.0
@@ -1102,7 +1102,7 @@ default-package-overrides:
- hspec-expectations ==0.8.2
- hspec-expectations-lifted ==0.10.0
- hspec-expectations-pretty-diff ==0.7.2.5
- - hspec-golden ==0.1.0.1
+ - hspec-golden ==0.1.0.2
- hspec-golden-aeson ==0.7.0.0
- hspec-hedgehog ==0.0.1.2
- hspec-leancheck ==0.0.4
@@ -1128,7 +1128,7 @@ default-package-overrides:
- html-entities ==1.1.4.3
- html-entity-map ==0.1.0.0
- htoml ==1.0.0.3
- - http2 ==2.0.4
+ - http2 ==2.0.5
- HTTP ==4000.3.14
- http-api-data ==0.4.1.1
- http-client ==0.6.4.1
@@ -1149,7 +1149,7 @@ default-package-overrides:
- human-readable-duration ==0.2.1.4
- HUnit ==1.6.0.0
- HUnit-approx ==1.1.1.1
- - hunit-dejafu ==2.0.0.3
+ - hunit-dejafu ==2.0.0.4
- hvect ==0.4.0.0
- hvega ==0.9.1.0
- hw-balancedparens ==0.4.1.0
@@ -1228,7 +1228,7 @@ default-package-overrides:
- intro ==0.7.0.0
- intset-imperative ==0.1.0.0
- invariant ==0.5.3
- - invertible ==0.2.0.5
+ - invertible ==0.2.0.6
- invertible-grammar ==0.1.2
- io-machine ==0.2.0.0
- io-manager ==0.1.0.2
@@ -1287,7 +1287,7 @@ default-package-overrides:
- kind-generics-th ==0.2.2.0
- kmeans ==0.1.3
- koofr-client ==1.0.0.3
- - krank ==0.2.1
+ - krank ==0.2.2
- kubernetes-webhook-haskell ==0.2.0.2
- l10n ==0.1.0.1
- labels ==0.3.3
@@ -1338,7 +1338,7 @@ default-package-overrides:
- libyaml ==0.1.2
- LibZip ==1.0.1
- life-sync ==1.1.1.0
- - lifted-async ==0.10.0.6
+ - lifted-async ==0.10.1.1
- lifted-base ==0.2.3.12
- lift-generics ==0.1.3
- line ==4.0.1
@@ -1347,7 +1347,7 @@ default-package-overrides:
- linux-file-extents ==0.2.0.0
- linux-namespaces ==0.1.3.0
- List ==0.6.2
- - ListLike ==4.7
+ - ListLike ==4.7.1
- list-predicate ==0.1.0.1
- listsafe ==0.1.0.1
- list-singleton ==1.0.0.4
@@ -1388,7 +1388,7 @@ default-package-overrides:
- markdown ==0.1.17.4
- markdown-unlit ==0.5.0
- markov-chain ==0.0.3.4
- - massiv ==0.5.3.1
+ - massiv ==0.5.3.2
- massiv-io ==0.2.1.0
- massiv-test ==0.1.3.1
- mathexpr ==0.3.0.0
@@ -1418,7 +1418,7 @@ default-package-overrides:
- metrics ==0.4.1.1
- mfsolve ==0.3.2.0
- microlens ==0.4.11.2
- - microlens-aeson ==2.3.0.4
+ - microlens-aeson ==2.3.1
- microlens-contra ==0.1.0.2
- microlens-ghc ==0.4.12
- microlens-mtl ==0.2.0.1
@@ -1453,7 +1453,7 @@ default-package-overrides:
- mmorph ==1.1.3
- mnist-idx ==0.1.2.8
- mockery ==0.3.5
- - mod ==0.1.1.0
+ - mod ==0.1.2.0
- model ==0.5
- modern-uri ==0.3.2.0
- modular ==0.1.0.8
@@ -1464,7 +1464,7 @@ default-package-overrides:
- monad-extras ==0.6.0
- monadic-arrays ==0.2.2
- monad-journal ==0.8.1
- - monad-logger ==0.3.32
+ - monad-logger ==0.3.34
- monad-logger-json ==0.1.0.0
- monad-logger-prefix ==0.1.11
- monad-loops ==0.4.3
@@ -1489,13 +1489,13 @@ default-package-overrides:
- monoid-subclasses ==1.0.1
- monoid-transformer ==0.0.4
- mono-traversable ==1.0.15.1
- - mono-traversable-instances ==0.1.0.0
+ - mono-traversable-instances ==0.1.1.0
- mono-traversable-keys ==0.1.0
- more-containers ==0.2.2.0
- morpheus-graphql ==0.12.0
- morpheus-graphql-core ==0.12.0
- mountpoints ==1.0.2
- - mpi-hs ==0.7.1.2
+ - mpi-hs ==0.7.2.0
- mpi-hs-binary ==0.1.1.0
- mpi-hs-cereal ==0.1.0.0
- mtl-compat ==0.2.2
@@ -1753,7 +1753,7 @@ default-package-overrides:
- profiterole ==0.1
- profunctors ==5.5.2
- projectroot ==0.2.0.1
- - project-template ==0.2.0.1
+ - project-template ==0.2.1.0
- prometheus-client ==1.0.0.1
- promises ==0.3
- prompt ==0.1.1.2
@@ -1783,7 +1783,7 @@ default-package-overrides:
- PyF ==0.9.0.1
- qchas ==1.1.0.1
- qm-interpolated-string ==0.3.0.0
- - qrcode-core ==0.9.3
+ - qrcode-core ==0.9.4
- qrcode-juicypixels ==0.8.1
- quadratic-irrational ==0.1.1
- QuasiText ==0.1.2.6
@@ -1857,7 +1857,7 @@ default-package-overrides:
- regex-posix ==0.96.0.0
- regex-tdfa ==1.3.1.0
- regex-with-pcre ==1.1.0.0
- - registry ==0.1.9.0
+ - registry ==0.1.9.1
- reinterpret-cast ==0.1.0
- relapse ==1.0.0.0
- relational-query ==0.12.2.3
@@ -1894,7 +1894,7 @@ default-package-overrides:
- rope-utf16-splay ==0.3.1.0
- rosezipper ==0.2
- rot13 ==0.2.0.1
- - rpmbuild-order ==0.3
+ - rpmbuild-order ==0.3.1
- RSA ==2.4.1
- runmemo ==1.0.0.1
- safe ==0.3.19
@@ -1934,14 +1934,14 @@ default-package-overrides:
- securemem ==0.1.10
- selda ==0.5.1.0
- selda-json ==0.1.1.0
- - selective ==0.4.1
- - semialign ==1.1
+ - selective ==0.4.1.1
+ - semialign ==1.1.0.1
- semialign-indexed ==1.1
- semialign-optics ==1.1
- semigroupoid-extras ==5
- semigroupoids ==5.3.4
- semigroups ==0.19.1
- - semirings ==0.5.3
+ - semirings ==0.5.4
- semiring-simple ==1.0.0.1
- semver ==0.3.4
- sendfile ==0.7.11.1
@@ -1967,7 +1967,7 @@ default-package-overrides:
- servant-elm ==0.7.2
- servant-errors ==0.1.6.0
- servant-foreign ==0.15
- - servant-js ==0.9.4.1
+ - servant-js ==0.9.4.2
- servant-JuicyPixels ==0.3.0.5
- servant-lucid ==0.9
- servant-machines ==0.15
@@ -1993,7 +1993,7 @@ default-package-overrides:
- setlocale ==1.0.0.9
- sexp-grammar ==2.1.0
- SHA ==1.6.4.4
- - shake-plus ==0.1.7.0
+ - shake-plus ==0.1.10.0
- shakespeare ==2.0.24.1
- shared-memory ==0.2.0.0
- shell-conduit ==4.7.0
@@ -2041,7 +2041,7 @@ default-package-overrides:
- smash-microlens ==0.1.0.0
- smoothie ==0.4.2.11
- snap-blaze ==0.2.1.5
- - snap-core ==1.0.4.1
+ - snap-core ==1.0.4.2
- snap-server ==1.1.1.2
- snowflake ==0.1.1.1
- soap ==0.2.3.6
@@ -2072,7 +2072,7 @@ default-package-overrides:
- squeather ==0.4.0.0
- srcloc ==0.5.1.2
- stache ==2.1.1
- - stackcollapse-ghc ==0.0.1.1
+ - stackcollapse-ghc ==0.0.1.2
- stack-templatizer ==0.1.0.2
- starter ==0.3.0
- stateref ==0.3
@@ -2096,7 +2096,7 @@ default-package-overrides:
- stratosphere ==0.53.0
- streaming ==0.2.3.0
- streaming-bytestring ==0.1.6
- - streaming-commons ==0.2.1.2
+ - streaming-commons ==0.2.2.0
- streamly ==0.7.2
- streamly-bytestring ==0.1.2
- streams ==3.3
@@ -2158,7 +2158,7 @@ default-package-overrides:
- tardis ==0.4.1.0
- tasty ==1.2.3
- tasty-ant-xml ==1.1.6
- - tasty-dejafu ==2.0.0.5
+ - tasty-dejafu ==2.0.0.6
- tasty-discover ==4.2.1
- tasty-expected-failure ==0.11.1.2
- tasty-golden ==2.3.3.2
@@ -2220,8 +2220,8 @@ default-package-overrides:
- th-data-compat ==0.1.0.0
- th-desugar ==1.10
- th-env ==0.1.0.2
- - these ==1.1
- - these-lens ==1
+ - these ==1.1.1.1
+ - these-lens ==1.0.0.1
- these-optics ==1
- th-expand-syns ==0.4.6.0
- th-extras ==0.0.0.4
@@ -2356,7 +2356,7 @@ default-package-overrides:
- urbit-hob ==0.3.3
- uri-bytestring ==0.3.2.2
- uri-bytestring-aeson ==0.1.0.8
- - uri-encode ==1.5.0.5
+ - uri-encode ==1.5.0.6
- url ==2.1.3
- users ==0.5.0.0
- utf8-conversions ==0.1.0.4
@@ -2488,7 +2488,7 @@ default-package-overrides:
- xml-picklers ==0.3.6
- xml-to-json ==2.0.1
- xml-to-json-fast ==2.0.0
- - xml-types ==0.3.7
+ - xml-types ==0.3.8
- xmonad ==0.15
- xmonad-contrib ==0.16
- xmonad-extras ==0.15.2
@@ -2501,7 +2501,7 @@ default-package-overrides:
- yesod-auth ==1.6.10
- yesod-auth-fb ==1.10.1
- yesod-auth-hashdb ==1.7.1.2
- - yesod-bin ==1.6.0.4
+ - yesod-bin ==1.6.0.5
- yesod-core ==1.6.18
- yesod-fb ==0.6.1
- yesod-form ==1.6.7
@@ -2511,7 +2511,7 @@ default-package-overrides:
- yesod-persistent ==1.6.0.4
- yesod-recaptcha2 ==1.0.0
- yesod-sitemap ==1.6.0
- - yesod-static ==1.6.0.1
+ - yesod-static ==1.6.1.0
- yesod-test ==1.6.10
- yesod-websockets ==0.3.0.2
- yes-precure5-command ==5.5.3
@@ -2556,7 +2556,6 @@ extra-packages:
- dbus <1 # for xmonad-0.26
- deepseq == 1.3.0.1 # required to build Cabal with GHC 6.12.3
- dhall == 1.29.0 # required for spago 0.14.0.
- - dhall == 1.30.0 # required for neuron 0.4.0.0.
- doctemplates == 0.8 # required by pandoc-2.9.x
- generic-deriving == 1.10.5.* # new versions don't compile with GHC 7.10.x
- ghc-check == 0.3.0.1 # only version compatible with ghcide 0.2.0
@@ -2666,7 +2665,6 @@ package-maintainers:
cdepillabout:
- pretty-simple
- spago
- - termonad
rkrzr:
- icepeak
terlar:
@@ -2675,10 +2673,10 @@ package-maintainers:
- reflex-dom
- ghcide
- cabal-fmt
- - neuron
- shh
- brittany
- hlint
+ - neuron
- releaser
- taskwarrior
sorki:
@@ -2691,6 +2689,8 @@ package-maintainers:
# - ttn-client
- update-nix-fetchgit
- zre
+ utdemir:
+ - nix-tree
unsupported-platforms:
alsa-mixer: [ x86_64-darwin ]
@@ -2957,6 +2957,7 @@ broken-packages:
- alerta
- alex-prelude
- alfred
+ - alfred-margaret
- alga
- algebra-dag
- algebra-sql
@@ -3103,6 +3104,7 @@ broken-packages:
- artifact
- asap
- ascii
+ - ascii-cows
- ascii-flatten
- ascii-string
- ascii-table
@@ -3202,6 +3204,7 @@ broken-packages:
- aws-kinesis-client
- aws-kinesis-reshard
- aws-lambda
+ - aws-lambda-haskell-runtime-wai
- aws-mfa-credentials
- aws-performance-tests
- aws-route53
@@ -3213,6 +3216,7 @@ broken-packages:
- aws-sns
- axel
- axiom
+ - azimuth-hs
- azubi
- azure-acs
- azure-email
@@ -3406,6 +3410,7 @@ broken-packages:
- BirdPP
- birds-of-paradise
- bisect-binary
+ - bishbosh
- bit-array
- bit-stream
- bitcoin-address
@@ -3496,6 +3501,8 @@ broken-packages:
- bounded-array
- bowntz
- box
+ - box-csv
+ - box-socket
- braid
- brain-bleep
- Bravo
@@ -3554,6 +3561,8 @@ broken-packages:
- bv-sized
- bytable
- bytearray-parsing
+ - bytebuild
+ - bytelog
- bytestring-arbitrary
- bytestring-builder-varword
- bytestring-class
@@ -3894,7 +3903,6 @@ broken-packages:
- collections-api
- collections-base-instances
- colonnade
- - Color
- color-counter
- colorless
- colorless-http-client
@@ -4019,6 +4027,7 @@ broken-packages:
- constraint-manip
- ConstraintKinds
- constraints-emerge
+ - construct
- constructible
- constructive-algebra
- consul-haskell
@@ -4089,6 +4098,7 @@ broken-packages:
- cparsing
- CPBrainfuck
- cpio-conduit
+ - cpkg
- CPL
- cplusplus-th
- cprng-aes-effect
@@ -4352,7 +4362,6 @@ broken-packages:
- dependent-hashmap
- dependent-monoidal-map
- dependent-state
- - dependent-sum-aeson-orphans
- depends
- dephd
- deptrack-core
@@ -4405,6 +4414,7 @@ broken-packages:
- diagrams-wx
- dialogflow-fulfillment
- dib
+ - dice
- dice-entropy-conduit
- dice2tex
- dicom
@@ -4824,6 +4834,7 @@ broken-packages:
- f-ree-hack-cheats-free-v-bucks-generator
- Facebook-Password-Hacker-Online-Latest-Version
- faceted
+ - factory
- Facts
- facts
- factual-api
@@ -4950,6 +4961,7 @@ broken-packages:
- first-class-instances
- firstify
- FirstOrderTheory
+ - fishfood
- fit
- fits-parse
- fitsio
@@ -5058,6 +5070,7 @@ broken-packages:
- frag
- Frames-beam
- Frames-dsv
+ - Frames-map-reduce
- franchise
- Frank
- fraxl
@@ -5141,8 +5154,12 @@ broken-packages:
- funpat
- funsat
- funspection
+ - fused-effects-exceptions
+ - fused-effects-optics
+ - fused-effects-random
- fused-effects-readline
- fused-effects-squeal
+ - fused-effects-th
- fusion
- fusion-plugin
- futun
@@ -5259,6 +5276,7 @@ broken-packages:
- ghc-parmake
- ghc-pkg-autofix
- ghc-pkg-lib
+ - ghc-plugs-out
- ghc-proofs
- ghc-session
- ghc-simple
@@ -5285,15 +5303,27 @@ broken-packages:
- ghcprofview
- ght
- gi-cairo-again
+ - gi-ggit
+ - gi-girepository
- gi-graphene
- gi-gsk
+ - gi-gst
+ - gi-gstaudio
+ - gi-gstbase
- gi-gstpbutils
- gi-gsttag
+ - gi-gstvideo
- gi-gtkosxapplication
+ - gi-gtksource
- gi-handy
+ - gi-harfbuzz
- gi-ibus
+ - gi-notify
+ - gi-ostree
+ - gi-pangocairo
- gi-poppler
- gi-secret
+ - gi-vte
- gi-wnck
- giak
- Gifcurry
@@ -5305,6 +5335,7 @@ broken-packages:
- git-all
- git-checklist
- git-config
+ - git-cuk
- git-date
- git-fmt
- git-gpush
@@ -5696,6 +5727,7 @@ broken-packages:
- has-th
- HasCacBDD
- hascar
+ - hascard
- hascas
- Haschoo
- HasGP
@@ -5733,10 +5765,12 @@ broken-packages:
- haskell-docs
- haskell-eigen-util
- haskell-exp-parser
+ - haskell-fake-user-agent
- haskell-formatter
- haskell-ftp
- haskell-generate
- haskell-go-checkers
+ - haskell-google-trends
- haskell-in-space
- haskell-kubernetes
- haskell-lsp-client
@@ -5786,6 +5820,7 @@ broken-packages:
- haskell2020
- haskell98
- haskell98libraries
+ - HaskellAnalysisProgram
- haskelldb
- haskelldb-connect-hdbc
- haskelldb-connect-hdbc-catchio-mtl
@@ -6036,6 +6071,7 @@ broken-packages:
- hexpress
- hexquote
- hext
+ - hextra
- heyefi
- heyting-algebras
- hF2
@@ -6237,6 +6273,7 @@ broken-packages:
- hoodle-types
- hoogle-index
- hooks-dir
+ - hoop
- hoopl
- hoovie
- hopencc
@@ -6512,7 +6549,6 @@ broken-packages:
- http-client-auth
- http-client-lens
- http-client-request-modifiers
- - http-client-restricted
- http-client-session
- http-client-streams
- http-conduit-browser
@@ -6766,6 +6802,7 @@ broken-packages:
- InternedData
- internetmarke
- intero
+ - interp
- interpol
- interpolatedstring-qq
- interpolatedstring-qq-mwotton
@@ -7110,6 +7147,7 @@ broken-packages:
- language-csharp
- language-css
- language-dart
+ - language-dickinson
- language-dockerfile
- language-ecmascript-analysis
- language-eiffel
@@ -7185,6 +7223,7 @@ broken-packages:
- learn
- learn-physics-examples
- Learning
+ - learning-hmm
- leetify
- legion
- legion-discovery
@@ -7219,6 +7258,7 @@ broken-packages:
- lhe
- lhs2TeX-hl
- lhslatex
+ - libarchive
- LibClang
- libconfig
- libcspm
@@ -7523,9 +7563,6 @@ broken-packages:
- marxup
- masakazu-bot
- MASMGen
- - massiv
- - massiv-io
- - massiv-test
- master-plan
- matchable
- matchable-th
@@ -7539,6 +7576,7 @@ broken-packages:
- mathflow
- mathlink
- matrix-as-xyz
+ - matrix-lens
- matrix-market
- matrix-sized
- matsuri
@@ -7657,6 +7695,7 @@ broken-packages:
- minst-idx
- mios
- mirror-tweet
+ - misfortune
- miso-action-logger
- miso-examples
- miss
@@ -8102,6 +8141,9 @@ broken-packages:
- numhask-test
- Nussinov78
- Nutri
+ - nvim-hs
+ - nvim-hs-contrib
+ - nvim-hs-ghcid
- NXT
- NXTDSL
- nylas
@@ -8151,6 +8193,7 @@ broken-packages:
- onama
- ONC-RPC
- oneormore
+ - online
- online-csv
- onpartitions
- OnRmt
@@ -8261,6 +8304,7 @@ broken-packages:
- pam
- pan-os-syslog
- panda
+ - pandoc-crossref
- pandoc-emphasize-code
- pandoc-filter-graphviz
- pandoc-include
@@ -8296,6 +8340,7 @@ broken-packages:
- paphragen
- pappy
- paprika
+ - par-dual
- paragon
- Paraiso
- Parallel-Arrows-Eden
@@ -8764,6 +8809,7 @@ broken-packages:
- purescript
- purescript-iso
- purescript-tsd-gen
+ - pursuit-client
- push-notifications
- push-notify
- push-notify-apn
@@ -8796,6 +8842,7 @@ broken-packages:
- quantfin
- quantum-arrow
- quantum-random
+ - quarantimer
- qudb
- Quelea
- quenya-verb
@@ -8870,12 +8917,18 @@ broken-packages:
- random-derive
- random-eff
- random-effin
+ - random-extras
+ - random-fu
+ - random-fu-multivariate
- random-hypergeometric
+ - random-source
- random-stream
- RandomDotOrg
+ - Randometer
- Range
- range-space
- rangemin
+ - rank-product
- rank1dynamic
- Ranka
- rapid
@@ -8963,6 +9016,7 @@ broken-packages:
- Referees
- references
- refh
+ - refined-http-api-data
- reflection-extras
- reflex-animation
- reflex-backend-socket
@@ -9028,6 +9082,7 @@ broken-packages:
- relacion
- relation
- relational-postgresql8
+ - relational-query-postgresql-pure
- relative-date
- relevant-time
- reload
@@ -9067,6 +9122,7 @@ broken-packages:
- req-url-extra
- request-monad
- require
+ - rescue
- reserve
- reservoir
- resin
@@ -9200,6 +9256,7 @@ broken-packages:
- rungekutta
- runmany
- runtime-arbitrary
+ - rvar
- rws
- RxHaskell
- s-expression
@@ -9271,7 +9328,6 @@ broken-packages:
- scgi
- schedevr
- schedule-planner
- - scheduler
- schedyield
- schema
- schemas
@@ -9411,6 +9467,9 @@ broken-packages:
- servant-pushbullet-client
- servant-py
- servant-quickcheck
+ - servant-rawm-client
+ - servant-rawm-docs
+ - servant-rawm-server
- servant-reason
- servant-reflex
- servant-router
@@ -9422,6 +9481,7 @@ broken-packages:
- servant-streaming-docs
- servant-streaming-server
- servant-swagger-tags
+ - servant-to-elm
- servant-waargonaut
- servant-zeppelin
- servant-zeppelin-client
@@ -9470,6 +9530,7 @@ broken-packages:
- shake-pack
- shake-path
- shake-persist
+ - shake-plus-extended
- shakebook
- shaker
- shakespeare-babel
@@ -9613,6 +9674,7 @@ broken-packages:
- smartconstructor
- smartGroup
- smartword
+ - smash-optics
- smcdel
- sme
- smerdyakov
@@ -9768,7 +9830,6 @@ broken-packages:
- splines
- split-morphism
- splitter
- - splot
- Spock
- Spock-api-ghcjs
- Spock-api-server
@@ -9799,6 +9860,7 @@ broken-packages:
- sqlvalue-list
- sqsd-local
- squeal-postgresql
+ - squeeze
- sr-extra
- srcinst
- sscan
@@ -9840,6 +9902,7 @@ broken-packages:
- stackage-types
- stackage-upload
- stackage2nix
+ - stan
- standalone-derive-topdown
- standalone-haddock
- starling
@@ -9916,6 +9979,7 @@ broken-packages:
- streaming-png
- streaming-process
- streaming-sort
+ - streamly-lmdb
- streamproc
- strelka
- strict-data
@@ -10013,6 +10077,7 @@ broken-packages:
- symbolic-link
- symengine
- symengine-hs
+ - symmetry-operations-symbols
- sync
- sync-mht
- syncthing-hs
@@ -10143,6 +10208,7 @@ broken-packages:
- termbox-bindings
- terminal-text
- termination-combinators
+ - termonad
- termplot
- terntup
- terrahs
@@ -10272,6 +10338,7 @@ broken-packages:
- timeutils
- timezone-olson-th
- timezone-unix
+ - tini
- tintin
- tiny-scheduler
- TinyLaunchbury
@@ -10378,6 +10445,8 @@ broken-packages:
- treemap-html-tools
- TreeStructures
- Treiber
+ - trek-app
+ - trek-db
- tremulous-query
- TrendGraph
- trhsx
@@ -10567,6 +10636,7 @@ broken-packages:
- urembed
- uri
- uri-conduit
+ - uri-encoder
- uri-enumerator
- uri-enumerator-file
- uri-parse
@@ -10591,6 +10661,7 @@ broken-packages:
- usb-id-database
- usb-iteratee
- usb-safe
+ - useragents
- users-mysql-haskell
- users-persistent
- utf8-prelude
@@ -10826,11 +10897,13 @@ broken-packages:
- webshow
- websockets-rpc
- webwire
+ - weekdaze
- weighted
- weighted-regexp
- welshy
- werewolf
- werewolf-slack
+ - what4
- Wheb
- wheb-mongo
- wheb-redis
@@ -10840,6 +10913,7 @@ broken-packages:
- whiskers
- whitespace
- whois
+ - wholepixels
- why3
- WikimediaParser
- wikipedia4epub
@@ -10986,7 +11060,6 @@ broken-packages:
- xournal-parser
- xournal-render
- xournal-types
- - xrefcheck
- xsact
- XSaiga
- xsd
diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index 232a99eed2c3..7016192e91a0 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -719,11 +719,6 @@ self: super: builtins.intersectAttrs super {
# break infinite recursion with base-orphans
primitive = dontCheck super.primitive;
- # dhall's tests access the network.
- dhall_1_29_0 = dontCheck super.dhall_1_29_0;
- dhall_1_31_1 = dontCheck super.dhall_1_31_1;
- dhall_1_32_0 = dontCheck super.dhall_1_32_0;
-
cut-the-crap =
let path = pkgs.stdenv.lib.makeBinPath [ pkgs.ffmpeg_3 ];
in overrideCabal (addBuildTool super.cut-the-crap pkgs.makeWrapper) (_drv: {
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 8af74952a021..c320df264ae8 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -1031,6 +1031,20 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "Aoide" = callPackage
+ ({ mkDerivation, base, bytestring, mtl, process, template-haskell
+ }:
+ mkDerivation {
+ pname = "Aoide";
+ version = "0.1.0.2";
+ sha256 = "1nldvg8fwgbvn50prar3vs1nh704s1603fikyg2lhpz754yp0qbc";
+ libraryHaskellDepends = [
+ base bytestring mtl process template-haskell
+ ];
+ description = "A simple music library with the capability of generating .ly and .mid files.";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"ApplePush" = callPackage
({ mkDerivation, base, binary, bytestring, haskell98, json, mtl
, network
@@ -1104,18 +1118,15 @@ self: {
}) {};
"AspectAG" = callPackage
- ({ mkDerivation, base, containers, ghc-prim, mtl, tagged
- , template-haskell, th-strict-compat
+ ({ mkDerivation, base, containers, mtl, poly-rec, requirements
+ , tagged, template-haskell
}:
mkDerivation {
pname = "AspectAG";
- version = "0.5.0.0";
- sha256 = "039k40swscsg21b4k4a3q95migvkflcp7sgx2a8gpzanrkx3ckz2";
- revision = "2";
- editedCabalFile = "1afrgn3hhkfrb3khfnbj7x9p4dh8j682zjhp5lc7s7syr8zp8pxy";
+ version = "0.6.0.0";
+ sha256 = "09lm1hs9l3h6ndv385adhh0kf9id10fjf0n1bczgzqgxmiykx2kn";
libraryHaskellDepends = [
- base containers ghc-prim mtl tagged template-haskell
- th-strict-compat
+ base containers mtl poly-rec requirements tagged template-haskell
];
description = "Strongly typed Attribute Grammars implemented using type-level programming";
license = stdenv.lib.licenses.gpl3;
@@ -2044,10 +2055,8 @@ self: {
}:
mkDerivation {
pname = "BlogLiterately";
- version = "0.8.6.3";
- sha256 = "02a4mjz9lbx19plkanmdlm730dwphkdi79a5b5hcnrbilcy8k71n";
- revision = "1";
- editedCabalFile = "1nhnrchv8lr1clbsfyya4xfqy8qdi8wrfp8364anaq7mpfnslxws";
+ version = "0.8.7";
+ sha256 = "01x8q04bs0qr2vg434yl2mfnshjd6licyard6pjfvhalk2phxcp2";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -3318,8 +3327,6 @@ self: {
benchmarkHaskellDepends = [ base colour criterion deepseq random ];
description = "Color spaces and conversions between them";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"Color_0_2_0" = callPackage
@@ -3340,7 +3347,6 @@ self: {
description = "Color spaces and conversions between them";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"Combinatorrent" = callPackage
@@ -6443,6 +6449,8 @@ self: {
];
description = "Frames wrapper for map-reduce-folds and some extra folds helpers";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"Frank" = callPackage
@@ -6812,8 +6820,8 @@ self: {
({ mkDerivation, async, base, containers, GLFW-b, GPipe, stm }:
mkDerivation {
pname = "GPipe-GLFW";
- version = "1.4.1.2";
- sha256 = "0i63pxz6bvzixjgi1hbipxhrg7nykd37zii555qhss2m7x4pydak";
+ version = "1.4.1.3";
+ sha256 = "0czrq3zhcxfl9pzypmxpxgn11faqb0kw05m5k3apr4b88prbj1ij";
enableSeparateDataOutput = true;
libraryHaskellDepends = [ async base containers GLFW-b GPipe stm ];
description = "GLFW OpenGL context creation for GPipe";
@@ -7224,10 +7232,8 @@ self: {
}:
mkDerivation {
pname = "Glob";
- version = "0.10.0";
- sha256 = "0953f91f62ncna402vsrfzdcyxhdpjna3bgdw017kad0dfymacs7";
- revision = "1";
- editedCabalFile = "0zfd4wimwgnmgqkz9g9jqj2dq2r50wdcqmcz6v7is1zrpwhszk5v";
+ version = "0.10.1";
+ sha256 = "05fknrb114qvfzv6324ngx0fz43cwgrhrc700l3h2is9jinlgr6a";
libraryHaskellDepends = [
base containers directory dlist filepath transformers
transformers-compat
@@ -9971,6 +9977,31 @@ self: {
broken = true;
}) {};
+ "HaskellAnalysisProgram" = callPackage
+ ({ mkDerivation, base, bytestring, cassava, containers, csv
+ , directory, fgl, filepath, graphviz, haskell-src-exts, HUnit
+ , pretty, split, syb, text, vector
+ }:
+ mkDerivation {
+ pname = "HaskellAnalysisProgram";
+ version = "0.1.0";
+ sha256 = "14z8nwvx306822nlna0p7vihrldk87z518c23aka17h3fxwfzzma";
+ isLibrary = false;
+ isExecutable = true;
+ executableHaskellDepends = [
+ base bytestring cassava containers csv directory fgl filepath
+ graphviz haskell-src-exts pretty split syb text vector
+ ];
+ testHaskellDepends = [
+ base bytestring cassava containers csv directory fgl filepath
+ graphviz haskell-src-exts HUnit pretty split syb text vector
+ ];
+ description = "Haskell source code analysis program";
+ license = stdenv.lib.licenses.asl20;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"HaskellForMaths" = callPackage
({ mkDerivation, array, base, containers, random }:
mkDerivation {
@@ -10843,8 +10874,8 @@ self: {
pname = "HsYAML-aeson";
version = "0.2.0.0";
sha256 = "12sxww260pc0bbpiyirm7911haxhljdi2f08a9ddpbgw8d5n7ffg";
- revision = "1";
- editedCabalFile = "1454jwcjaala8drxn7x765bqnzivdys99nl95mbd3yv2c6s1173g";
+ revision = "2";
+ editedCabalFile = "0sf4clxx3i3s6666w3il65fijx2xmgb1mxml9jgc5y40sj3qb3mm";
libraryHaskellDepends = [
aeson base bytestring containers HsYAML mtl scientific text
unordered-containers vector
@@ -12618,27 +12649,6 @@ self: {
}) {};
"ListLike" = callPackage
- ({ mkDerivation, array, base, bytestring, containers, deepseq
- , dlist, fmlist, HUnit, QuickCheck, random, text, utf8-string
- , vector
- }:
- mkDerivation {
- pname = "ListLike";
- version = "4.7";
- sha256 = "1209xa73cxzajp8wx2bw2017vjb84yibm5q5sp0i0ifhi5syv4jl";
- libraryHaskellDepends = [
- array base bytestring containers deepseq dlist fmlist text
- utf8-string vector
- ];
- testHaskellDepends = [
- array base bytestring containers dlist fmlist HUnit QuickCheck
- random text utf8-string vector
- ];
- description = "Generalized support for list-like structures";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "ListLike_4_7_1" = callPackage
({ mkDerivation, array, base, bytestring, containers, deepseq
, dlist, fmlist, HUnit, QuickCheck, random, text, utf8-string
, vector
@@ -12657,7 +12667,6 @@ self: {
];
description = "Generalized support for list-like structures";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"ListT" = callPackage
@@ -13119,6 +13128,19 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "MapWith" = callPackage
+ ({ mkDerivation, base }:
+ mkDerivation {
+ pname = "MapWith";
+ version = "0.1.0.0";
+ sha256 = "1dk5b9bi29917sf3mk3q85iqjkfc7vczwb8x8cg6w6gxfqn0444v";
+ libraryHaskellDepends = [ base ];
+ testHaskellDepends = [ base ];
+ benchmarkHaskellDepends = [ base ];
+ description = "mapWith: like fmap, but with additional arguments (isFirst, isLast, etc)";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"Mapping" = callPackage
({ mkDerivation, base }:
mkDerivation {
@@ -16321,16 +16343,14 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "QuickCheck_2_14" = callPackage
+ "QuickCheck_2_14_1" = callPackage
({ mkDerivation, base, containers, deepseq, process, random
, splitmix, template-haskell, transformers
}:
mkDerivation {
pname = "QuickCheck";
- version = "2.14";
- sha256 = "0jiqdk8ma8m68vg6vbxd0s1x0djmfjn1zm06masz7x8rzc3i9gjj";
- revision = "1";
- editedCabalFile = "0i8hh6f8y2jxn9hfchhbp9w5mb65fs6yy12z08wyrxxyhr5nllrz";
+ version = "2.14.1";
+ sha256 = "0ms71pphgihmqsvh4v88xd99n8xg3nlz1wxxxcf2vgns32mcbz63";
libraryHaskellDepends = [
base containers deepseq random splitmix template-haskell
transformers
@@ -16818,6 +16838,8 @@ self: {
executableHaskellDepends = [ base random-fu ];
description = "Randomness intuition trainer";
license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"Range" = callPackage
@@ -16904,6 +16926,22 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "Rattus" = callPackage
+ ({ mkDerivation, base, Cabal, containers, ghc, simple-affine-space
+ }:
+ mkDerivation {
+ pname = "Rattus";
+ version = "0.1.1.0";
+ sha256 = "1f7dv71bamszjfsdva88iwiy85pb1gpn6i016dndzzydlxsrrvsz";
+ setupHaskellDepends = [ base Cabal ];
+ libraryHaskellDepends = [
+ base containers ghc simple-affine-space
+ ];
+ testHaskellDepends = [ base containers ];
+ description = "A modal FRP language";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"ReadArgs" = callPackage
({ mkDerivation, base, hspec, system-filepath, text }:
mkDerivation {
@@ -20527,8 +20565,8 @@ self: {
({ mkDerivation, base, bytestring, transformers, vector, vulkan }:
mkDerivation {
pname = "VulkanMemoryAllocator";
- version = "0.3.3";
- sha256 = "0kjyyqwck2b4vv9z2121b3x1bnsc6zswp41idcpmqjxrwhs7whcz";
+ version = "0.3.5";
+ sha256 = "1j8xnb29ad172qjfrnd4mc4v5a4bfd6ka8xadfknb2d5a5d7r5nn";
libraryHaskellDepends = [
base bytestring transformers vector vulkan
];
@@ -24124,8 +24162,8 @@ self: {
pname = "aeson-extra";
version = "0.4.1.3";
sha256 = "1k15vkyf635nh904diyg931ziwdngikvp7c9c339pys3savf5qr2";
- revision = "3";
- editedCabalFile = "04j4af350hfyl01dwxhn6051cgxsaj46f3vy55d1kbwg1ajffdqq";
+ revision = "4";
+ editedCabalFile = "0gwjgxpgq7lncylfpccikmn3jk2jmz54vsgjialhwa26iv9f9n4a";
libraryHaskellDepends = [
aeson aeson-compat attoparsec attoparsec-iso8601 base
base-compat-batteries bytestring containers deepseq exceptions
@@ -24751,14 +24789,14 @@ self: {
}:
mkDerivation {
pname = "aeson-with";
- version = "0.1.1.0";
- sha256 = "1w1f3rni01v4scfd2lccx6ijxsy9q54dyad500xm06la1lnw40k6";
+ version = "0.1.1.1";
+ sha256 = "0dfb7ra2gl24vdi5am23rpz7p5mrjig9pxhrb4i7pbqhjlnhhk2g";
libraryHaskellDepends = [
aeson base hashmap lens lens-aeson mtl scientific text
unordered-containers vector
];
description = "withXField combinators for aeson";
- license = stdenv.lib.licenses.bsd3;
+ license = stdenv.lib.licenses.mit;
}) {};
"aeson-yak" = callPackage
@@ -25582,6 +25620,28 @@ self: {
broken = true;
}) {};
+ "alfred-margaret" = callPackage
+ ({ mkDerivation, base, containers, deepseq, hashable, hspec
+ , hspec-expectations, primitive, QuickCheck, quickcheck-instances
+ , text, vector
+ }:
+ mkDerivation {
+ pname = "alfred-margaret";
+ version = "1.0.0.0";
+ sha256 = "0dapvcxwwd6ylyqxfjf58jink2rh9i6k1lw1ii6j8jb28qfvy400";
+ libraryHaskellDepends = [
+ base containers deepseq hashable primitive text vector
+ ];
+ testHaskellDepends = [
+ base deepseq hspec hspec-expectations QuickCheck
+ quickcheck-instances text
+ ];
+ description = "Fast Aho-Corasick string searching";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"alg" = callPackage
({ mkDerivation, base, dual, util }:
mkDerivation {
@@ -28911,8 +28971,8 @@ self: {
}:
mkDerivation {
pname = "amqp-streamly";
- version = "0.1.0";
- sha256 = "103srk8i4lpaxbr6sd1c3qq2ag1bv7x0qvzr1a4rqh3ra8wn46qq";
+ version = "0.2.0";
+ sha256 = "0f6w574pq9nl4iq6di99cip4sxn62yrwpjqc22nwlvbqr6bgl79f";
libraryHaskellDepends = [ amqp base streamly text ];
testHaskellDepends = [
amqp base bytestring hspec process streamly testcontainers text
@@ -30053,8 +30113,8 @@ self: {
({ mkDerivation, base, ghc-prim, integer-gmp }:
mkDerivation {
pname = "aop-prelude";
- version = "0.3.1.0";
- sha256 = "0zc1pifcr3s5zklm3rp9wjj370x4fwc7xhahdsqmkx67dpfqyiap";
+ version = "0.4.0.0";
+ sha256 = "0jg572zz9lbhpp4bxldrc0gs0ac0f4hfcrxds77gr51xizxfa7cn";
libraryHaskellDepends = [ base ghc-prim integer-gmp ];
testHaskellDepends = [ base ghc-prim ];
description = "prelude for Algebra of Programming";
@@ -32640,6 +32700,8 @@ self: {
libraryHaskellDepends = [ base random-extras random-fu text ];
description = "A collection of ASCII cows. Moo.";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"ascii-flatten" = callPackage
@@ -34632,8 +34694,44 @@ self: {
}:
mkDerivation {
pname = "aura";
- version = "3.1.4";
- sha256 = "0zb83kq207d4gcmlq61972rkjr598zxxk1svs8x25q1i9f92km0z";
+ version = "3.1.5";
+ sha256 = "17xihg6gifg47vmskp5wk3x485y3qc3ky769hh7nnrw138nhvkgn";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ aeson algebraic-graphs aur base bytestring containers filepath
+ hashable http-client http-types language-bash megaparsec
+ network-uri prettyprinter prettyprinter-ansi-terminal rio scheduler
+ stm text time transformers typed-process versions
+ ];
+ executableHaskellDepends = [
+ aeson aur base bytestring containers http-client http-client-tls
+ megaparsec optparse-applicative prettyprinter
+ prettyprinter-ansi-terminal rio scheduler text transformers
+ typed-process versions
+ ];
+ testHaskellDepends = [
+ base bytestring containers megaparsec rio tasty tasty-hunit text
+ versions
+ ];
+ description = "A secure package manager for Arch Linux and the AUR";
+ license = stdenv.lib.licenses.gpl3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
+ "aura_3_1_6" = callPackage
+ ({ mkDerivation, aeson, algebraic-graphs, aur, base, bytestring
+ , containers, filepath, hashable, http-client, http-client-tls
+ , http-types, language-bash, megaparsec, network-uri
+ , optparse-applicative, prettyprinter, prettyprinter-ansi-terminal
+ , rio, scheduler, stm, tasty, tasty-hunit, text, time, transformers
+ , typed-process, versions
+ }:
+ mkDerivation {
+ pname = "aura";
+ version = "3.1.6";
+ sha256 = "14qix9zpw6hanj3hrqnwl13fjfjrw0klkm7wm91lh8zpj5amjzcc";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -34807,8 +34905,8 @@ self: {
({ mkDerivation, base, Cabal, directory, filepath }:
mkDerivation {
pname = "autoexporter";
- version = "1.1.17";
- sha256 = "0h2pgbrslfbmwns6jz4gpkp7s82l04215fqzlmzrfm7pck27prcg";
+ version = "1.1.18";
+ sha256 = "0pzszi5q7h1qxqh2fpds8d43miq0cf4mfzcwggi8409s72pyf9xl";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [ base Cabal directory filepath ];
@@ -35707,8 +35805,8 @@ self: {
}:
mkDerivation {
pname = "aws-lambda-haskell-runtime";
- version = "3.0.1";
- sha256 = "17f41ppgc4irahp1g3ngrdb24kqhdfld11jdmc6cw6mg2r820l8i";
+ version = "3.0.2";
+ sha256 = "18gdr7jmaq7csh5c27aam5cbyydw9d0bzv9frnck3ggpfqjnb84i";
libraryHaskellDepends = [
aeson base bytestring case-insensitive http-client http-types path
path-io safe-exceptions-checked template-haskell text
@@ -35726,8 +35824,8 @@ self: {
}:
mkDerivation {
pname = "aws-lambda-haskell-runtime-wai";
- version = "1.0.0";
- sha256 = "03mqaxx726hm4pz18l37cg818jhq0fpfhfn20jfk497cm90clpzp";
+ version = "1.0.1";
+ sha256 = "0kzk5nnya39k2h0nn321qg16ss1h6yvymy7r77cbrk015572yck9";
libraryHaskellDepends = [
aeson aws-lambda-haskell-runtime base binary bytestring
case-insensitive http-types iproute network text
@@ -35740,6 +35838,8 @@ self: {
];
description = "Run wai applications on AWS Lambda";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"aws-lambda-runtime" = callPackage
@@ -36088,6 +36188,26 @@ self: {
broken = true;
}) {control-invariants = null;};
+ "azimuth-hs" = callPackage
+ ({ mkDerivation, base, data-default-class, exceptions, haskoin-core
+ , hspec, memory, mtl, shelly, text, urbit-hob, web3
+ }:
+ mkDerivation {
+ pname = "azimuth-hs";
+ version = "0.1.1";
+ sha256 = "123an5smr2kzxaagnpshh3vcz51p3njkp5hrjcm3x37vr8qrla3x";
+ enableSeparateDataOutput = true;
+ libraryHaskellDepends = [
+ base data-default-class exceptions haskoin-core memory mtl text
+ urbit-hob web3
+ ];
+ testHaskellDepends = [ base hspec shelly text urbit-hob ];
+ description = "Interact with Azimuth from Haskell";
+ license = stdenv.lib.licenses.mpl20;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"azubi" = callPackage
({ mkDerivation, base, Diff, directory, filepath, hspec, options
, process, unix
@@ -36276,34 +36396,39 @@ self: {
"b9" = callPackage
({ mkDerivation, aeson, async, base, base64-bytestring, bifunctors
, binary, boxes, bytestring, conduit, conduit-extra, ConfigFile
- , directory, exceptions, extensible-effects, filepath, free
- , hashable, hspec, hspec-expectations, lens, monad-control, mtl
- , optparse-applicative, parallel, parsec, pretty, pretty-show
- , process, QuickCheck, random, shake, syb, tagged, template, text
- , time, transformers, unordered-containers, vector, yaml
+ , containers, directory, exceptions, extensible-effects, filepath
+ , free, hashable, hspec, hspec-expectations, lens, monad-control
+ , mtl, neat-interpolation, optparse-applicative, parallel, parsec
+ , pretty, pretty-show, process, QuickCheck, random, shake, syb
+ , tagged, template, text, time, transformers, unordered-containers
+ , vector, yaml
}:
mkDerivation {
pname = "b9";
- version = "1.0.1";
- sha256 = "1g1172d2bxjhxn5p1jxyxr1bf19fkd8yrrp05hvzv9mdiqynji14";
+ version = "2.0.0";
+ sha256 = "1ymapbsx3gzkxmaikxnsszdgcnyks535msf0ydbq99v54jvbb2yz";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
aeson async base base64-bytestring bifunctors binary boxes
- bytestring conduit conduit-extra ConfigFile directory exceptions
- extensible-effects filepath free hashable hspec hspec-expectations
- lens monad-control mtl optparse-applicative parallel parsec pretty
- pretty-show process QuickCheck random shake syb tagged template
- text time transformers unordered-containers vector yaml
+ bytestring conduit conduit-extra ConfigFile containers directory
+ exceptions extensible-effects filepath free hashable hspec
+ hspec-expectations lens monad-control mtl neat-interpolation
+ optparse-applicative parallel parsec pretty pretty-show process
+ QuickCheck random shake syb tagged template text time transformers
+ unordered-containers vector yaml
];
executableHaskellDepends = [
- base bytestring directory extensible-effects hspec
- hspec-expectations lens optparse-applicative text
+ aeson base binary bytestring containers directory
+ extensible-effects filepath hspec hspec-expectations lens
+ neat-interpolation optparse-applicative QuickCheck shake text
+ unordered-containers vector yaml
];
testHaskellDepends = [
- aeson base binary bytestring directory extensible-effects hspec
- hspec-expectations lens QuickCheck text unordered-containers vector
- yaml
+ aeson base binary bytestring containers directory
+ extensible-effects filepath hspec hspec-expectations lens
+ neat-interpolation optparse-applicative QuickCheck shake text
+ unordered-containers vector yaml
];
description = "A tool and library for building virtual machine images";
license = stdenv.lib.licenses.mit;
@@ -37154,6 +37279,31 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "base16_0_3_0_0" = callPackage
+ ({ mkDerivation, base, base16-bytestring, bytestring, criterion
+ , deepseq, primitive, QuickCheck, random-bytestring, tasty
+ , tasty-hunit, tasty-quickcheck, text, text-short
+ }:
+ mkDerivation {
+ pname = "base16";
+ version = "0.3.0.0";
+ sha256 = "151g3lxma65z0hqi3pqy57bidkhibvdsppkl37p1cldg7whvc708";
+ libraryHaskellDepends = [
+ base bytestring deepseq primitive text text-short
+ ];
+ testHaskellDepends = [
+ base base16-bytestring bytestring QuickCheck random-bytestring
+ tasty tasty-hunit tasty-quickcheck text text-short
+ ];
+ benchmarkHaskellDepends = [
+ base base16-bytestring bytestring criterion deepseq
+ random-bytestring text
+ ];
+ description = "Fast RFC 4648-compliant Base16 encoding";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"base16-bytestring" = callPackage
({ mkDerivation, base, bytestring, ghc-prim }:
mkDerivation {
@@ -37174,6 +37324,8 @@ self: {
pname = "base16-lens";
version = "0.1.2.0";
sha256 = "1mgy1adhlw2sra8lfc2cklfn9w7jj2f9pilifnnfk2jq6hwalpn8";
+ revision = "1";
+ editedCabalFile = "0ann8lmr7w1p11c0yxb1q1j776hi1dj8xm6xg8c2nq3x396gcnlp";
setupHaskellDepends = [ base Cabal cabal-doctest ];
libraryHaskellDepends = [ base base16 bytestring lens text ];
testHaskellDepends = [ base doctest lens ];
@@ -37200,6 +37352,30 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "base32_0_2_0_0" = callPackage
+ ({ mkDerivation, base, bytestring, criterion, deepseq
+ , ghc-byteorder, memory, QuickCheck, random-bytestring, tasty
+ , tasty-hunit, tasty-quickcheck, text, text-short
+ }:
+ mkDerivation {
+ pname = "base32";
+ version = "0.2.0.0";
+ sha256 = "0xvilxcdcvz07f3qpad35whjd35c9ykicip2cdsd54ysxg71mwzm";
+ libraryHaskellDepends = [
+ base bytestring deepseq ghc-byteorder text text-short
+ ];
+ testHaskellDepends = [
+ base bytestring memory QuickCheck random-bytestring tasty
+ tasty-hunit tasty-quickcheck text text-short
+ ];
+ benchmarkHaskellDepends = [
+ base bytestring criterion deepseq memory random-bytestring text
+ ];
+ description = "Fast RFC 4648-compliant Base32 encoding";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"base32-bytestring" = callPackage
({ mkDerivation, base, bits-extras, bytestring, cpu, criterion
, hspec, QuickCheck
@@ -37225,6 +37401,8 @@ self: {
pname = "base32-lens";
version = "0.1.0.0";
sha256 = "0yhaaz5y8cwyjcclmjw0hk31388z233041ycfpwm2a3f0vgpilvn";
+ revision = "1";
+ editedCabalFile = "1sj9dc2prfhbc3b7bvxmw6wfq0iql6dwvdx928z13rdc4vwj0nv0";
setupHaskellDepends = [ base Cabal cabal-doctest ];
libraryHaskellDepends = [ base base32 bytestring lens text ];
testHaskellDepends = [ base doctest lens ];
@@ -37345,21 +37523,19 @@ self: {
"base64" = callPackage
({ mkDerivation, base, base64-bytestring, bytestring, criterion
- , deepseq, ghc-byteorder, QuickCheck, quickcheck-instances
- , random-bytestring, tasty, tasty-hunit, tasty-quickcheck, text
- , text-short
+ , deepseq, ghc-byteorder, QuickCheck, random-bytestring, tasty
+ , tasty-hunit, tasty-quickcheck, text, text-short
}:
mkDerivation {
pname = "base64";
- version = "0.4.2.1";
- sha256 = "14ssr4h59bx71fln3igi0nxrn749lqkanj49wahn77z3izm2s2xd";
+ version = "0.4.2.2";
+ sha256 = "05ins0i1561d4gfz6h7fxx8pj8i1qkskz8dgh8pfxa1llzmr856i";
libraryHaskellDepends = [
- base bytestring ghc-byteorder text text-short
+ base bytestring deepseq ghc-byteorder text text-short
];
testHaskellDepends = [
- base base64-bytestring bytestring QuickCheck quickcheck-instances
- random-bytestring tasty tasty-hunit tasty-quickcheck text
- text-short
+ base base64-bytestring bytestring QuickCheck random-bytestring
+ tasty tasty-hunit tasty-quickcheck text text-short
];
benchmarkHaskellDepends = [
base base64-bytestring bytestring criterion deepseq
@@ -38409,6 +38585,34 @@ self: {
license = stdenv.lib.licenses.asl20;
}) {};
+ "bech32_1_1_0" = callPackage
+ ({ mkDerivation, array, base, base58-bytestring, bytestring
+ , containers, deepseq, extra, hspec, hspec-discover, memory
+ , optparse-applicative, process, QuickCheck, text, vector
+ }:
+ mkDerivation {
+ pname = "bech32";
+ version = "1.1.0";
+ sha256 = "0s7kqy128k71rnpv22awf643djhsyd8ipihx38lvslsxk8klr8i0";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ array base bytestring containers extra text
+ ];
+ executableHaskellDepends = [
+ base base58-bytestring bytestring extra memory optparse-applicative
+ text
+ ];
+ testHaskellDepends = [
+ base base58-bytestring bytestring containers deepseq extra hspec
+ memory process QuickCheck text vector
+ ];
+ testToolDepends = [ hspec-discover ];
+ description = "Implementation of the Bech32 cryptocurrency address format (BIP 0173)";
+ license = stdenv.lib.licenses.asl20;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"bech32-th" = callPackage
({ mkDerivation, base, bech32, hspec, hspec-discover
, template-haskell, text
@@ -39069,6 +39273,8 @@ self: {
pname = "bifunctors";
version = "5.5.7";
sha256 = "0cimvd64jzd6dyxjw2kx8wqhd1x0z89pj0ppmsikj4afa3aa5cw8";
+ revision = "1";
+ editedCabalFile = "01jlhshvacdc9pi5il7jd6sphg33nf0iy3nlfkgn19xsrbc7168p";
libraryHaskellDepends = [
base base-orphans comonad containers tagged template-haskell
th-abstraction transformers
@@ -39871,8 +40077,8 @@ self: {
({ mkDerivation, base, binaryen }:
mkDerivation {
pname = "binaryen";
- version = "0.0.1.1";
- sha256 = "059j67lq63nzyivsmkwblsmbw8f3x079bng9cb174snp8yra8v8k";
+ version = "0.0.2.0";
+ sha256 = "111laqm68cs5ck4nc1cj8hy5anw6gkxv5yc1jrw87gn3i3va5046";
libraryHaskellDepends = [ base ];
librarySystemDepends = [ binaryen ];
description = "Haskell bindings to binaryen";
@@ -41150,8 +41356,8 @@ self: {
({ mkDerivation, base }:
mkDerivation {
pname = "birds-of-paradise";
- version = "0.1.1.0";
- sha256 = "1s7d10m6p9zw9m3mkf20k45nna3ayvb4y2r9z3vslm9ahqazk5l8";
+ version = "0.2.0.0";
+ sha256 = "1jkj8li8yxl9kk5i8p63p9jkdcvdznmh473n12dxzimxnh15sf1y";
libraryHaskellDepends = [ base ];
testHaskellDepends = [ base ];
description = "Birds of Paradise";
@@ -41227,6 +41433,8 @@ self: {
];
description = "Plays chess";
license = "GPL";
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"bit-array" = callPackage
@@ -42618,23 +42826,6 @@ self: {
}) {};
"blaze-markup" = callPackage
- ({ mkDerivation, base, blaze-builder, bytestring, containers, HUnit
- , QuickCheck, tasty, tasty-hunit, tasty-quickcheck, text
- }:
- mkDerivation {
- pname = "blaze-markup";
- version = "0.8.2.5";
- sha256 = "0qbnydx79pappwd4mzmmqq0pilpkiq7f6rqmqzpi2jjyfxlbmlqv";
- libraryHaskellDepends = [ base blaze-builder bytestring text ];
- testHaskellDepends = [
- base blaze-builder bytestring containers HUnit QuickCheck tasty
- tasty-hunit tasty-quickcheck text
- ];
- description = "A blazingly fast markup combinator library for Haskell";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "blaze-markup_0_8_2_7" = callPackage
({ mkDerivation, base, blaze-builder, bytestring, containers, HUnit
, QuickCheck, tasty, tasty-hunit, tasty-quickcheck, text
}:
@@ -42649,7 +42840,6 @@ self: {
];
description = "A blazingly fast markup combinator library for Haskell";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"blaze-shields" = callPackage
@@ -44107,34 +44297,77 @@ self: {
}) {};
"box" = callPackage
- ({ mkDerivation, async, attoparsec, base, concurrency
+ ({ mkDerivation, attoparsec, base, comonad, concurrency
, contravariant, dejafu, doctest, exceptions, foldl, generic-lens
- , lens, managed, mtl, pipes, profunctors, protolude, random
+ , lens, mmorph, mtl, numhask, optparse-generic, profunctors, random
, streaming, text, time, transformers, transformers-base
- , typed-process, websockets
+ , websockets
}:
mkDerivation {
pname = "box";
- version = "0.4.0";
- sha256 = "0vacsh2b6sdsy360513hpij5bdwr74x0aawfm64m7iw3a7909fpj";
+ version = "0.5.0";
+ sha256 = "1r3jcnrdjyn894y574fjymrpfrpbwgrfmmvxgbkpa0m1ny8j3nln";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
- async attoparsec base concurrency contravariant exceptions foldl
- lens pipes profunctors protolude streaming text time transformers
- transformers-base typed-process
+ attoparsec base comonad concurrency contravariant exceptions foldl
+ lens mmorph numhask profunctors streaming text time transformers
+ transformers-base
];
executableHaskellDepends = [
- base concurrency dejafu generic-lens lens managed mtl protolude
- random streaming text transformers websockets
+ base concurrency dejafu exceptions generic-lens lens mtl numhask
+ optparse-generic random streaming text transformers websockets
];
- testHaskellDepends = [ base doctest ];
+ testHaskellDepends = [ base doctest numhask ];
description = "boxes";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
broken = true;
}) {};
+ "box-csv" = callPackage
+ ({ mkDerivation, attoparsec, base, box, doctest, foldl
+ , generic-lens, lens, numhask, scientific, text, time
+ }:
+ mkDerivation {
+ pname = "box-csv";
+ version = "0.0.1";
+ sha256 = "1vyqrc527d4xfv55qw6d0arpsrac3jfzsymh8fqi33s592fnz61d";
+ libraryHaskellDepends = [
+ attoparsec base box foldl generic-lens lens numhask scientific text
+ time
+ ];
+ testHaskellDepends = [ base doctest numhask ];
+ description = "See readme.md";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
+ "box-socket" = callPackage
+ ({ mkDerivation, base, box, concurrency, doctest, exceptions
+ , generic-lens, lens, numhask, optparse-generic, websockets
+ }:
+ mkDerivation {
+ pname = "box-socket";
+ version = "0.0.1";
+ sha256 = "1r9ghvhizm468mw3bfwjwrdncggswjvl4hq7pwfxl5c8rp6va74q";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ base box concurrency exceptions generic-lens lens numhask
+ websockets
+ ];
+ executableHaskellDepends = [
+ base box concurrency generic-lens lens numhask optparse-generic
+ ];
+ testHaskellDepends = [ base doctest numhask ];
+ description = "See readme.md";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"box-tuples" = callPackage
({ mkDerivation, base, ghc-prim }:
mkDerivation {
@@ -44356,7 +44589,7 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "brick_0_54" = callPackage
+ "brick_0_55" = callPackage
({ mkDerivation, base, bytestring, config-ini, containers
, contravariant, data-clist, deepseq, directory, dlist, exceptions
, filepath, microlens, microlens-mtl, microlens-th, QuickCheck, stm
@@ -44365,8 +44598,8 @@ self: {
}:
mkDerivation {
pname = "brick";
- version = "0.54";
- sha256 = "10a20w01wyi6rg883s9gcgkyr8vn317y67bmf7wa71lrhl283khv";
+ version = "0.55";
+ sha256 = "0n51vh8j75a2b6qbfah9k9zrp15m4rkq7fywpp811v93h8zf02fy";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -45989,6 +46222,8 @@ self: {
];
description = "Serialize to a small byte arrays";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"bytedump" = callPackage
@@ -46044,6 +46279,8 @@ self: {
];
description = "Fast logging";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"byteorder" = callPackage
@@ -46810,8 +47047,8 @@ self: {
({ mkDerivation, base }:
mkDerivation {
pname = "c-storable";
- version = "0.2";
- sha256 = "03ynlm6nbm2hsqp0bpcqj3kp1hbg2pnif44zrgj8rda8dmsczm9j";
+ version = "0.3";
+ sha256 = "0i39cm4sgd8bmx8yhfbdm8625fvig12f5m709v6603v7qdzlygz4";
enableSeparateDataOutput = true;
libraryHaskellDepends = [ base ];
description = "CStorable class";
@@ -47215,30 +47452,6 @@ self: {
}) {};
"cabal-debian" = callPackage
- ({ mkDerivation, ansi-wl-pprint, base, bifunctors, Cabal
- , containers, data-default, debian, deepseq, Diff, directory
- , exceptions, filepath, hsemail, HUnit, lens, mtl, network-uri
- , newtype-generics, optparse-applicative, parsec, pretty, process
- , pureMD5, regex-tdfa, syb, text, unix, unliftio, utf8-string
- }:
- mkDerivation {
- pname = "cabal-debian";
- version = "5.0.2";
- sha256 = "0586sjda7ar8p243m92csz3d35smpzlxvyh09rl4fllgzhazxn5f";
- isLibrary = true;
- isExecutable = true;
- libraryHaskellDepends = [
- ansi-wl-pprint base bifunctors Cabal containers data-default debian
- deepseq Diff directory exceptions filepath hsemail HUnit lens mtl
- network-uri newtype-generics optparse-applicative parsec pretty
- process pureMD5 regex-tdfa syb text unix unliftio utf8-string
- ];
- executableHaskellDepends = [ base Cabal debian lens mtl pretty ];
- description = "Create a Debianization for a Cabal package";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "cabal-debian_5_0_3" = callPackage
({ mkDerivation, ansi-wl-pprint, base, bifunctors, Cabal
, containers, data-default, debian, deepseq, Diff, directory
, exceptions, filepath, hsemail, HUnit, lens, mtl, network-uri
@@ -47260,7 +47473,6 @@ self: {
executableHaskellDepends = [ base Cabal debian lens mtl pretty ];
description = "Create a Debianization for a Cabal package";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"cabal-dependency-licenses" = callPackage
@@ -47332,6 +47544,27 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "cabal-edit" = callPackage
+ ({ mkDerivation, base, bytestring, Cabal, containers, directory
+ , filepath, Glob, hackage-db, optparse-applicative, process, store
+ , time
+ }:
+ mkDerivation {
+ pname = "cabal-edit";
+ version = "0.1.0.0";
+ sha256 = "1irk50d1m0zzhp2s5c1qs4nq1ivp5638lapbzlc3ygx92nrskvr7";
+ revision = "1";
+ editedCabalFile = "176sa5lms18gxnswgfil2y1a7qf6w96wavb5kpwic05fnxw6s26m";
+ isLibrary = false;
+ isExecutable = true;
+ executableHaskellDepends = [
+ base bytestring Cabal containers directory filepath Glob hackage-db
+ optparse-applicative process store time
+ ];
+ description = "Cabal utility";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
"cabal-file" = callPackage
({ mkDerivation, base, bytestring, Cabal, directory, extra
, filepath, hackage-security, optparse-applicative, simple-cabal
@@ -48748,13 +48981,13 @@ self: {
, http-date, http-types, lens, lens-aeson, megaparsec, mime-types
, mtl, polysemy, polysemy-plugin, reflection, safe-exceptions
, scientific, stm, stm-chans, stm-containers, text, text-show, time
- , typerep-map, unagi-chan, unordered-containers, vector, websockets
- , wreq, wuss
+ , typerep-map, unagi-chan, unboxing-vector, unordered-containers
+ , vector, websockets, wreq, wuss
}:
mkDerivation {
pname = "calamity";
- version = "0.1.17.1";
- sha256 = "1nxv3zm48jpdg4a7plnfqvkn314wl7hr8f86b9ih527m7yldv27w";
+ version = "0.1.18.0";
+ sha256 = "146p8w9ydamzfzp55w6zh9rawsgnsayc755wjqfa7vhjfa6dqmfq";
libraryHaskellDepends = [
aeson async base bytestring colour concurrent-extra containers
data-default-class data-flags deepseq deque df1 di-polysemy
@@ -48762,8 +48995,8 @@ self: {
generic-override-aeson hashable http-date http-types lens
lens-aeson megaparsec mime-types mtl polysemy polysemy-plugin
reflection safe-exceptions scientific stm stm-chans stm-containers
- text text-show time typerep-map unagi-chan unordered-containers
- vector websockets wreq wuss
+ text text-show time typerep-map unagi-chan unboxing-vector
+ unordered-containers vector websockets wreq wuss
];
description = "A library for writing discord bots in haskell";
license = stdenv.lib.licenses.mit;
@@ -48914,8 +49147,8 @@ self: {
}:
mkDerivation {
pname = "call-alloy";
- version = "0.2.0.4";
- sha256 = "0j1vvnjvgjs11ffy7r5h87vsxywyp51cs8kvqlgi5vnlwb2zfxg9";
+ version = "0.2.0.5";
+ sha256 = "1qgvrvb9la7nsx04ql8qvlsavalyimbsc7j6pdc14pmyqnrh3y60";
libraryHaskellDepends = [
base bytestring containers directory file-embed filepath hashable
lens mtl process split trifecta unix
@@ -49684,16 +49917,17 @@ self: {
"casa-abbreviations-and-acronyms" = callPackage
({ mkDerivation, base, bytestring, containers, fuzzy, lens
- , monoid-subclasses, optparse-applicative, these, wreq
+ , monoid-subclasses, optparse-applicative, profunctors, these, wreq
}:
mkDerivation {
pname = "casa-abbreviations-and-acronyms";
- version = "0.0.7";
- sha256 = "16xdkbgym1jjqnmx10h3yfq2zw3mzpf7jskssf4nzm6dsvj1msp5";
+ version = "0.0.8";
+ sha256 = "01vfzkd8ap3ambsnzns6j537a21nvml0fa7qbqvk2knzhlyr7lv6";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
- base bytestring containers fuzzy lens monoid-subclasses these wreq
+ base bytestring containers fuzzy lens monoid-subclasses profunctors
+ these wreq
];
executableHaskellDepends = [
base bytestring containers fuzzy lens monoid-subclasses
@@ -50255,6 +50489,28 @@ self: {
broken = true;
}) {};
+ "cassava-conduit_0_6_0" = callPackage
+ ({ mkDerivation, array, base, bifunctors, bytestring, cassava
+ , conduit, containers, criterion, mtl, QuickCheck, text
+ }:
+ mkDerivation {
+ pname = "cassava-conduit";
+ version = "0.6.0";
+ sha256 = "114ab0kxy7rj1hps1sy9i0mkj2lp046zjlpll2apmf3mxdminva0";
+ libraryHaskellDepends = [
+ array base bifunctors bytestring cassava conduit containers mtl
+ text
+ ];
+ testHaskellDepends = [
+ base bytestring cassava conduit QuickCheck text
+ ];
+ benchmarkHaskellDepends = [ base criterion ];
+ description = "Conduit interface for cassava package";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"cassava-embed" = callPackage
({ mkDerivation, base, bytestring, cassava, template-haskell
, vector
@@ -50757,10 +51013,8 @@ self: {
}:
mkDerivation {
pname = "cborg";
- version = "0.2.3.0";
- sha256 = "14y7yckj1xzldadyq8g84dgsdaygf9ss0gd38vjfw62smdjq1in8";
- revision = "2";
- editedCabalFile = "1qphglprccmyvjh3v2asikmwgdim4rndin5vls6iwb71hl703h2r";
+ version = "0.2.4.0";
+ sha256 = "0zrn75jx3lprdagl99r88jfhccalw783fn9jjk9zhy50zypkibil";
libraryHaskellDepends = [
array base bytestring containers deepseq ghc-prim half integer-gmp
primitive text
@@ -51794,28 +52048,27 @@ self: {
}) {};
"chart-svg" = callPackage
- ({ mkDerivation, attoparsec, base, bifunctors, Color, containers
- , foldl, generic-lens, javascript-bridge, lens, lucid, lucid-svg
- , numhask-space, pretty-simple, protolude, scientific, scotty
- , tagsoup, text, text-format, time, transformers
- , unordered-containers, wai-middleware-static, web-rep
+ ({ mkDerivation, attoparsec, base, Color, containers, doctest
+ , foldl, generic-lens, lens, lucid, numhask, numhask-space
+ , pretty-simple, scientific, tagsoup, text, time, transformers
+ , unordered-containers, web-rep
}:
mkDerivation {
pname = "chart-svg";
- version = "0.0.3";
- sha256 = "04p2ijvsf47j9r1hck5qby6w2x18r8mpk40pywc4wsbgxcdw6rfa";
+ version = "0.1.1";
+ sha256 = "0k3z2950dv5cj5mzxkipfkav44jckv60xj0b9zlli8xnj1gzrx58";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
- attoparsec base bifunctors Color foldl generic-lens lens lucid
- lucid-svg numhask-space pretty-simple protolude scientific tagsoup
- text text-format time transformers web-rep
+ attoparsec base Color foldl generic-lens lens lucid numhask
+ numhask-space pretty-simple scientific tagsoup text time
+ transformers web-rep
];
executableHaskellDepends = [
- base bifunctors containers generic-lens javascript-bridge lens
- lucid-svg numhask-space protolude scotty text transformers
- unordered-containers wai-middleware-static web-rep
+ base containers generic-lens lens lucid numhask numhask-space text
+ transformers unordered-containers web-rep
];
+ testHaskellDepends = [ base doctest numhask ];
description = "Charts in SVG";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
@@ -52217,8 +52470,8 @@ self: {
}:
mkDerivation {
pname = "chessIO";
- version = "0.3.1.1";
- sha256 = "05jwz1nq5wiqdpnwn31wyc4gpryh9b4qzil4rkgx7vhavck2w1ap";
+ version = "0.3.1.2";
+ sha256 = "0x79cgngxbrk43f28pprqq85n54cg2i2chhpycdcnkx16iva5bbf";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -52671,6 +52924,23 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "chronologique_0_3_1_3" = callPackage
+ ({ mkDerivation, aeson, base, bytestring, hourglass, hspec
+ , QuickCheck, text, time, vector
+ }:
+ mkDerivation {
+ pname = "chronologique";
+ version = "0.3.1.3";
+ sha256 = "0bb75dijnjnhvgik4qf0zqj9q2wfdqyx70gs18cbxkrqg9956fwh";
+ libraryHaskellDepends = [ aeson base hourglass text time vector ];
+ testHaskellDepends = [
+ aeson base bytestring hourglass hspec QuickCheck vector
+ ];
+ description = "Time to manipulate time";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"chronos" = callPackage
({ mkDerivation, aeson, attoparsec, base, bytestring, criterion
, deepseq, doctest, hashable, HUnit, old-locale, primitive
@@ -53402,13 +53672,13 @@ self: {
}) {};
"cl3" = callPackage
- ({ mkDerivation, base, criterion, QuickCheck, random }:
+ ({ mkDerivation, base, criterion, deepseq, random }:
mkDerivation {
pname = "cl3";
- version = "1.0.0.4";
- sha256 = "18q5r2m4sr7h8z35nivq2fndmxamyw3217j11na4gq361rq1340v";
- libraryHaskellDepends = [ base random ];
- testHaskellDepends = [ base QuickCheck ];
+ version = "2.0.0.0";
+ sha256 = "0ibril0fjhm848za1grvpi6pdcshbxbfjwkflzh7zw4b9y5b7g89";
+ libraryHaskellDepends = [ base deepseq random ];
+ testHaskellDepends = [ base criterion random ];
benchmarkHaskellDepends = [ base criterion ];
description = "Clifford Algebra of three dimensional space";
license = stdenv.lib.licenses.bsd3;
@@ -53418,8 +53688,8 @@ self: {
({ mkDerivation, base, cl3, hmatrix }:
mkDerivation {
pname = "cl3-hmatrix-interface";
- version = "1.0.0.1";
- sha256 = "1fixwb8y2v0zwww6p08rwsq7wfz63aj3zv2yjs9z0rp2xm3mq67w";
+ version = "2.0.0.0";
+ sha256 = "0sa1gaclh7b3mpqiiyqqn2gqfwkwj2ig5yzjk1y0hkzyc7rz4l3k";
libraryHaskellDepends = [ base cl3 hmatrix ];
description = "Interface to/from Cl3 and HMatrix";
license = stdenv.lib.licenses.bsd3;
@@ -53429,8 +53699,8 @@ self: {
({ mkDerivation, base, cl3, linear }:
mkDerivation {
pname = "cl3-linear-interface";
- version = "1.0.0.1";
- sha256 = "1i4f9xxsdzba49h1dv8x14zz1bv1zamhvw2ngi5d6a17qd11g319";
+ version = "2.0.0.0";
+ sha256 = "15431azhvwk2fcd3aca5snpqrp8kf7zdlbyxh99i1xfdhvq4vc78";
libraryHaskellDepends = [ base cl3 linear ];
description = "Interface to/from Cl3 and Linear";
license = stdenv.lib.licenses.bsd3;
@@ -53643,9 +53913,9 @@ self: {
}) {};
"clash-ghc" = callPackage
- ({ mkDerivation, array, base, bifunctors, bytestring, clash-lib
- , clash-prelude, concurrent-supply, containers, deepseq, directory
- , filepath, ghc, ghc-boot, ghc-prim, ghc-typelits-extra
+ ({ mkDerivation, array, base, bifunctors, bytestring, Cabal
+ , clash-lib, clash-prelude, concurrent-supply, containers, deepseq
+ , directory, filepath, ghc, ghc-boot, ghc-prim, ghc-typelits-extra
, ghc-typelits-knownnat, ghc-typelits-natnormalise, ghci, hashable
, haskeline, integer-gmp, lens, mtl, primitive, process, reflection
, split, template-haskell, text, time, transformers, uniplate, unix
@@ -53653,12 +53923,12 @@ self: {
}:
mkDerivation {
pname = "clash-ghc";
- version = "1.2.2";
- sha256 = "0nx7rgwhviqkzkly6ay3dcyphqmqqxg3mzb1v3r08icfg2yasmsf";
+ version = "1.2.3";
+ sha256 = "1ifd8skqbgqcsclm5sxaikc25gwv5da5dv64kjy23r45sxlv11by";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
- array base bifunctors bytestring clash-lib clash-prelude
+ array base bifunctors bytestring Cabal clash-lib clash-prelude
concurrent-supply containers deepseq directory filepath ghc
ghc-boot ghc-prim ghc-typelits-extra ghc-typelits-knownnat
ghc-typelits-natnormalise ghci hashable haskeline integer-gmp lens
@@ -53684,8 +53954,8 @@ self: {
}:
mkDerivation {
pname = "clash-lib";
- version = "1.2.2";
- sha256 = "0igqm964cb1x0kvh5hyvabxcn9mjfcnzzlfxqy996z2lzgz044xn";
+ version = "1.2.3";
+ sha256 = "0cxhw8wgzvpmg7kfyjf9ys38n98vynndr1fn1pzyc03s4mn2rszm";
enableSeparateDataOutput = true;
libraryHaskellDepends = [
aeson ansi-terminal attoparsec base binary bytestring clash-prelude
@@ -53736,8 +54006,8 @@ self: {
}:
mkDerivation {
pname = "clash-prelude";
- version = "1.2.2";
- sha256 = "0b7s9rbxh6z7liifzr8d0sqs2hdrz75hzg27lgncdl53v8bicpkw";
+ version = "1.2.3";
+ sha256 = "0k3xariqr314c9s53jcf1w6azivcdrq0lnnsbj889453ys0sw9jg";
setupHaskellDepends = [ base Cabal cabal-doctest ];
libraryHaskellDepends = [
array base bifunctors binary bytestring constraints containers
@@ -55355,18 +55625,19 @@ self: {
"cmdargs-browser" = callPackage
({ mkDerivation, base, bytestring, cmdargs, directory, filepath
- , http-types, process, text, transformers, wai, wai-handler-launch
+ , http-types, js-jquery, process, text, transformers, wai
+ , wai-handler-launch
}:
mkDerivation {
pname = "cmdargs-browser";
- version = "0.1.3";
- sha256 = "1k0g2vh7sqkblzjsfvyhfiy1fcwkw0i10kgl4n2r68w7v52mmzd0";
+ version = "0.1.4";
+ sha256 = "0rp1k7fl4ci9ngi6ywdiahs5njff2py6y9ya9qv5x123ibxgpz2y";
isLibrary = false;
isExecutable = true;
enableSeparateDataOutput = true;
executableHaskellDepends = [
- base bytestring cmdargs directory filepath http-types process text
- transformers wai wai-handler-launch
+ base bytestring cmdargs directory filepath http-types js-jquery
+ process text transformers wai wai-handler-launch
];
description = "Helper to enter cmdargs command lines using a web browser";
license = stdenv.lib.licenses.bsd3;
@@ -55732,8 +56003,8 @@ self: {
}:
mkDerivation {
pname = "cobot-io";
- version = "0.1.3.5";
- sha256 = "0h3pray036ddjwxvda5m6x7nx8p3ksaj4fkbw2afwgvn3gl7y991";
+ version = "0.1.3.6";
+ sha256 = "0ry01h9vkr5zyiwp60vqb8mp2lfg3yhfbaz0c7jammk034dszkf1";
libraryHaskellDepends = [
array attoparsec base binary bytestring containers data-msgpack
deepseq http-conduit hyraxAbif lens linear mtl split text vector
@@ -57175,6 +57446,87 @@ self: {
broken = true;
}) {};
+ "commonmark" = callPackage
+ ({ mkDerivation, base, bytestring, containers, criterion, parsec
+ , QuickCheck, tasty, tasty-hunit, tasty-quickcheck, text
+ , transformers
+ }:
+ mkDerivation {
+ pname = "commonmark";
+ version = "0.1.0.1";
+ sha256 = "1p5z52n795ncrx94q9v1kyw3y1fqdi6vdz5iyg6n9pis7raqiy0i";
+ libraryHaskellDepends = [
+ base bytestring containers parsec text transformers
+ ];
+ testHaskellDepends = [
+ base parsec QuickCheck tasty tasty-hunit tasty-quickcheck text
+ ];
+ benchmarkHaskellDepends = [
+ base bytestring containers criterion text transformers
+ ];
+ description = "Pure Haskell commonmark parser";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
+ "commonmark-cli" = callPackage
+ ({ mkDerivation, aeson, ansi-terminal, base, bytestring, commonmark
+ , commonmark-extensions, commonmark-pandoc, containers, mtl
+ , pandoc-types, pretty-simple, text
+ }:
+ mkDerivation {
+ pname = "commonmark-cli";
+ version = "0.1.0.1";
+ sha256 = "1k7s7wzphllfydki1ifzab6b4x865vwxg50xldqdar141425s84l";
+ isLibrary = false;
+ isExecutable = true;
+ executableHaskellDepends = [
+ aeson ansi-terminal base bytestring commonmark
+ commonmark-extensions commonmark-pandoc containers mtl pandoc-types
+ pretty-simple text
+ ];
+ description = "Command-line commonmark converter and highlighter";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
+ "commonmark-extensions" = callPackage
+ ({ mkDerivation, base, bytestring, commonmark, containers
+ , criterion, emojis, parsec, QuickCheck, tasty, tasty-hunit
+ , tasty-quickcheck, text, transformers
+ }:
+ mkDerivation {
+ pname = "commonmark-extensions";
+ version = "0.2.0.1";
+ sha256 = "08i6167d78b5wf6aqsrjz2sb1qaanwrjzhpfg1jn4grd9g8i2ql6";
+ libraryHaskellDepends = [
+ base bytestring commonmark containers emojis parsec text
+ transformers
+ ];
+ testHaskellDepends = [
+ base commonmark parsec QuickCheck tasty tasty-hunit
+ tasty-quickcheck text
+ ];
+ benchmarkHaskellDepends = [
+ base bytestring commonmark containers criterion text transformers
+ ];
+ description = "Pure Haskell commonmark parser";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
+ "commonmark-pandoc" = callPackage
+ ({ mkDerivation, base, commonmark, commonmark-extensions
+ , containers, pandoc-types, text
+ }:
+ mkDerivation {
+ pname = "commonmark-pandoc";
+ version = "0.2.0.0";
+ sha256 = "1dis51lknwfk7ka0n6pbw03hwn4y5zk23kypkl84iwg2ydxvwbxh";
+ libraryHaskellDepends = [
+ base commonmark commonmark-extensions containers pandoc-types text
+ ];
+ description = "Bridge between commonmark and pandoc AST";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"commsec" = callPackage
({ mkDerivation, base, bytestring, cipher-aes128, crypto-api
, network
@@ -57806,8 +58158,8 @@ self: {
}:
mkDerivation {
pname = "composite-aeson";
- version = "0.7.1.0";
- sha256 = "1jv9frfv1ixqyby8zgldp2nkc051fnz0nqwcrnk1mqhav7rf3ilx";
+ version = "0.7.2.0";
+ sha256 = "18rdrp8j2vjg6yp2zxiw10wsq8r5gjz0jywzxc13nd4g3l5a2wcm";
libraryHaskellDepends = [
aeson aeson-better-errors base composite-base containers
contravariant generic-deriving hashable lens mmorph mtl profunctors
@@ -57832,8 +58184,8 @@ self: {
}:
mkDerivation {
pname = "composite-aeson-refined";
- version = "0.7.1.0";
- sha256 = "12nqw9mg25vblz5my5rrd0w2nwgpvykw0nnlmaibpj7z5z5fnfv6";
+ version = "0.7.2.0";
+ sha256 = "1xdl5phr1yj5m2rdb9jv71l71apbx6j94qvcs0932dz7xjgb8llr";
libraryHaskellDepends = [
aeson-better-errors base composite-aeson mtl refined
];
@@ -57850,8 +58202,8 @@ self: {
}:
mkDerivation {
pname = "composite-base";
- version = "0.7.1.0";
- sha256 = "11sbpl43z65gkafz0y69b33irg51ag4hjg7yswaqiwv1b6qn80w4";
+ version = "0.7.2.0";
+ sha256 = "091s9gi1q7h6rq4xyfgs08p3z0afqslwwnmpa6qvqjy1im991n35";
libraryHaskellDepends = [
base exceptions lens monad-control mtl profunctors template-haskell
text transformers transformers-base unliftio-core vinyl
@@ -57872,8 +58224,8 @@ self: {
}:
mkDerivation {
pname = "composite-ekg";
- version = "0.7.1.0";
- sha256 = "1w2vlbzaxrxj95q3k2vmvzd34d51cz1pj4fv3x34icmp4rx92qvz";
+ version = "0.7.2.0";
+ sha256 = "0620ix1zyixrlxgcc6yh7zj4ypz69xddf41bf7spyxf9zxdllwli";
libraryHaskellDepends = [
base composite-base ekg-core lens text vinyl
];
@@ -57890,8 +58242,8 @@ self: {
}:
mkDerivation {
pname = "composite-opaleye";
- version = "0.7.1.0";
- sha256 = "1p5nrq5i5ssdiqy38p0qraig8r3z1djfa2hrb7wg5pandiplngr8";
+ version = "0.7.2.0";
+ sha256 = "11rc4bzqhfhrhs3ap08pzywx7qsmprs4cin7az036kp09b790frv";
libraryHaskellDepends = [
base bytestring composite-base lens opaleye postgresql-simple
product-profunctors profunctors template-haskell text vinyl
@@ -57914,8 +58266,8 @@ self: {
}:
mkDerivation {
pname = "composite-swagger";
- version = "0.7.1.0";
- sha256 = "0npzy42ls7r8i4zldkn3569l5nfdcm905mycd5zda7pkjyyi36q4";
+ version = "0.7.2.0";
+ sha256 = "0l2h6m527xakr20gj6vqnaagcw66bqchvs8yn4qbsli67kmm5br7";
libraryHaskellDepends = [
base composite-base insert-ordered-containers lens swagger2
template-haskell text vinyl
@@ -60122,18 +60474,18 @@ self: {
}) {};
"connections" = callPackage
- ({ mkDerivation, base, containers, hedgehog, lawz, rings
- , semigroupoids
+ ({ mkDerivation, base, containers, finite-typelits, hedgehog
+ , transformers, universe-base
}:
mkDerivation {
pname = "connections";
- version = "0.0.3";
- sha256 = "112m18l4apg9djgi9m9pg4222dy7wfkl0z9l98yf92yzw9pq08zv";
+ version = "0.1.0";
+ sha256 = "0lnskpdfgxjbkqlg82i1gxz8dsns36szyw1mv45nlq7jqspfspgp";
libraryHaskellDepends = [
- base containers lawz rings semigroupoids
+ base containers finite-typelits transformers universe-base
];
- testHaskellDepends = [ base hedgehog lawz rings ];
- description = "Partial orders, Galois connections, and lattices";
+ testHaskellDepends = [ base hedgehog ];
+ description = "Orders, Galois connections, and lattices";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
broken = true;
@@ -60474,6 +60826,8 @@ self: {
pname = "constraints-extras";
version = "0.3.0.2";
sha256 = "1n3k5ld6qzq7vlwsqwrm3gsg4z7mk11ah3amazzbvbmxwz8wviys";
+ revision = "2";
+ editedCabalFile = "09mdfzrmnl0mc57n7h0w68i8xgp89y5729p2d2h6qb2qj81qsfq1";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [ base constraints template-haskell ];
@@ -60496,17 +60850,17 @@ self: {
"construct" = callPackage
({ mkDerivation, attoparsec, base, bytestring, Cabal, cabal-doctest
, cereal, directory, doctest, filepath, incremental-parser
- , markdown-unlit, monoid-subclasses, parsers, rank2classes, tasty
- , tasty-hunit, text
+ , input-parsers, markdown-unlit, monoid-subclasses, parsers
+ , rank2classes, tasty, tasty-hunit, text
}:
mkDerivation {
pname = "construct";
- version = "0.2.0.1";
- sha256 = "1j2xc1j9f71shins5nnj0xg41k4vx2r1jgimnnlcdln2g24v71l2";
+ version = "0.3";
+ sha256 = "06h3b1lbq0gdpzz2q5ga0dpgbvyh186z1brzslrwdmkp8qxx883x";
enableSeparateDataOutput = true;
setupHaskellDepends = [ base Cabal cabal-doctest ];
libraryHaskellDepends = [
- attoparsec base bytestring cereal incremental-parser
+ attoparsec base bytestring cereal incremental-parser input-parsers
monoid-subclasses parsers rank2classes text
];
testHaskellDepends = [
@@ -60517,6 +60871,8 @@ self: {
testToolDepends = [ markdown-unlit ];
description = "Haskell version of the Construct library for easy specification of file formats";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"constructible" = callPackage
@@ -60654,12 +61010,12 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
- "containers_0_6_2_1" = callPackage
+ "containers_0_6_3_1" = callPackage
({ mkDerivation, array, base, deepseq }:
mkDerivation {
pname = "containers";
- version = "0.6.2.1";
- sha256 = "05h0sc70xy4jm0hvzv0pnqy1sbi61f73whawk46jwcjzyfa5f30k";
+ version = "0.6.3.1";
+ sha256 = "04v59j9xnaq4bab08b3b0m5lwpkjm2awdhd4q9i8rwmxf8977acg";
libraryHaskellDepends = [ array base deepseq ];
description = "Assorted concrete container types";
license = stdenv.lib.licenses.bsd3;
@@ -60700,8 +61056,8 @@ self: {
({ mkDerivation, base, base-unicode-symbols, containers }:
mkDerivation {
pname = "containers-unicode-symbols";
- version = "0.3.1.1";
- sha256 = "0ccv7rqkykfk5wmr73mc0kwrnwyzakgp5x495dgwn5nila3g4ma6";
+ version = "0.3.1.2";
+ sha256 = "006znsrwz3sssvg53mail2xd98hq6y4l83140sd2fzyg4df25js7";
libraryHaskellDepends = [ base base-unicode-symbols containers ];
description = "Unicode alternatives for common functions and operators";
license = stdenv.lib.licenses.bsd3;
@@ -61083,14 +61439,14 @@ self: {
}:
mkDerivation {
pname = "control-monad-exception";
- version = "0.11.2";
- sha256 = "0vdms5if6c04459ksix5q38l9cflgc5bwnchd422fp2qfji5j14p";
+ version = "0.11.4";
+ sha256 = "124qqhr4w9b224bdfm88dvxfsalcki46yc06swm52jirag06hn6r";
libraryHaskellDepends = [
base failure lifted-base monad-control monadloc transformers
transformers-base
];
description = "Explicitly typed, checked exceptions with stack traces";
- license = stdenv.lib.licenses.mit;
+ license = stdenv.lib.licenses.publicDomain;
hydraPlatforms = stdenv.lib.platforms.none;
broken = true;
}) {};
@@ -62052,16 +62408,16 @@ self: {
"country" = callPackage
({ mkDerivation, aeson, attoparsec, base, bytestring, deepseq
- , ghc-prim, hashable, primitive, QuickCheck, quickcheck-classes
- , scientific, tasty, tasty-quickcheck, text, unordered-containers
+ , hashable, primitive, QuickCheck, quickcheck-classes, scientific
+ , tasty, tasty-quickcheck, text, unordered-containers
}:
mkDerivation {
pname = "country";
- version = "0.2";
- sha256 = "09qimpqgg4zhiiyw13n5r1ckswr5x3m8k1hdx9hwhd52j45zhbkg";
+ version = "0.2.1";
+ sha256 = "0nc9vjwagmih0m8h423lbsamkbxxyzhk3cr9cm7a7wwbl2bddq3a";
libraryHaskellDepends = [
- aeson attoparsec base bytestring deepseq ghc-prim hashable
- primitive scientific text unordered-containers
+ aeson attoparsec base bytestring deepseq hashable primitive
+ scientific text unordered-containers
];
testHaskellDepends = [
base QuickCheck quickcheck-classes tasty tasty-quickcheck
@@ -62153,8 +62509,8 @@ self: {
({ mkDerivation, base, groups, primitive, refined, semirings }:
mkDerivation {
pname = "coya";
- version = "0.1";
- sha256 = "1s5si8w7s16l6s89gnhzmpyr555njb0gws7xipp017m7130pwgx3";
+ version = "0.1.0.1";
+ sha256 = "0cz4n27akgima9w75ilpg9ngapsh47gw3fdy01fx8z50cll6v02y";
libraryHaskellDepends = [
base groups primitive refined semirings
];
@@ -62215,6 +62571,8 @@ self: {
pname = "cpkg";
version = "0.2.5.6";
sha256 = "1fvwvaqd9nn4pnblyi874kwb450h85gg2afa6khp4vsz1bybc8ch";
+ revision = "1";
+ editedCabalFile = "07scy0rvrinfiwj4l7gfwi8srnrp3v5w0pbjsqsp738akmlbbgna";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -62231,6 +62589,8 @@ self: {
testHaskellDepends = [ base hspec hspec-megaparsec megaparsec ];
description = "Build tool for C";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"cplex-hs" = callPackage
@@ -63365,6 +63725,23 @@ self: {
broken = true;
}) {};
+ "cronus" = callPackage
+ ({ mkDerivation, base, bytestring, comonad, containers, deepseq
+ , hashable, mtl, profunctors, text, transformers
+ , unordered-containers, vector
+ }:
+ mkDerivation {
+ pname = "cronus";
+ version = "0.1.0.0";
+ sha256 = "10mypmm3q1icxdmgqxpvha8igyr6nddwmpbhpxkksaqfgy7a6g63";
+ libraryHaskellDepends = [
+ base bytestring comonad containers deepseq hashable mtl profunctors
+ text transformers unordered-containers vector
+ ];
+ description = "Another bloated standard library";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
"cruncher-types" = callPackage
({ mkDerivation, aeson, base, containers, hlint, lens, text }:
mkDerivation {
@@ -64976,23 +65353,23 @@ self: {
}) {};
"curl-runnings" = callPackage
- ({ mkDerivation, aeson, base, bytestring, case-insensitive, clock
- , cmdargs, connection, directory, hspec, hspec-expectations
- , http-client-tls, http-conduit, http-types, megaparsec
- , pretty-simple, raw-strings-qq, regex-posix, tar, text, time
- , unordered-containers, vector, yaml, zlib
+ ({ mkDerivation, aeson, base, base64-bytestring, bytestring
+ , case-insensitive, clock, cmdargs, connection, directory, hspec
+ , hspec-expectations, http-client-tls, http-conduit, http-types
+ , megaparsec, pretty-simple, raw-strings-qq, regex-posix, tar, text
+ , time, unordered-containers, vector, yaml, zlib
}:
mkDerivation {
pname = "curl-runnings";
- version = "0.12.0";
- sha256 = "091csiklwxhc8qjzqh3jmq7qvrr5z5z1mgndbli03wd33jhq5rw8";
+ version = "0.14.0";
+ sha256 = "1f4b44b8sw4fpbkcl3naj5y3d3j8d6sb9lxf7k0vy49aghmw50p6";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
- aeson base bytestring case-insensitive clock connection directory
- hspec hspec-expectations http-client-tls http-conduit http-types
- megaparsec pretty-simple regex-posix text time unordered-containers
- vector yaml
+ aeson base base64-bytestring bytestring case-insensitive clock
+ connection directory hspec hspec-expectations http-client-tls
+ http-conduit http-types megaparsec pretty-simple regex-posix text
+ time unordered-containers vector yaml
];
executableHaskellDepends = [
aeson base bytestring cmdargs directory http-conduit tar text zlib
@@ -65305,8 +65682,8 @@ self: {
}:
mkDerivation {
pname = "curve25519";
- version = "0.2.4";
- sha256 = "1ckwdd9x03y6008ikl757sp7hkqscad144l9djmcm6pq5isjn7jh";
+ version = "0.2.5";
+ sha256 = "1j2fc1wv6xx95sicx2m44dm41gdfspb74qmh58592pp5fcv54vbb";
libraryHaskellDepends = [ base bytestring crypto-api ];
testHaskellDepends = [
base bytestring crypto-api DRBG HUnit QuickCheck tagged
@@ -65385,29 +65762,27 @@ self: {
"cut-the-crap" = callPackage
({ mkDerivation, base, exceptions, generic-lens, hspec, hspec-core
- , lens, optparse-applicative, optparse-generic, regex-tdfa, shelly
- , system-filepath, temporary, text, unliftio-core
+ , lens, optparse-applicative, regex-tdfa, shelly, system-filepath
+ , temporary, text, unliftio-core
}:
mkDerivation {
pname = "cut-the-crap";
- version = "1.0.0";
- sha256 = "0mq6hzv48ry3n8y0b60qbf3ddkfk2aqny4c1hzn92mqffhg4r0zr";
+ version = "1.2.0";
+ sha256 = "0p7h3g1b5qxrvggrbnaskx6f5ywd0v0yv5gqbl1yc560dzv323qx";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
- base exceptions generic-lens lens optparse-applicative
- optparse-generic regex-tdfa shelly system-filepath temporary text
- unliftio-core
+ base exceptions generic-lens lens optparse-applicative regex-tdfa
+ shelly system-filepath temporary text unliftio-core
];
executableHaskellDepends = [
- base exceptions generic-lens lens optparse-applicative
- optparse-generic regex-tdfa shelly system-filepath temporary text
- unliftio-core
+ base exceptions generic-lens lens optparse-applicative regex-tdfa
+ shelly system-filepath temporary text unliftio-core
];
testHaskellDepends = [
base exceptions generic-lens hspec hspec-core lens
- optparse-applicative optparse-generic regex-tdfa shelly
- system-filepath temporary text unliftio-core
+ optparse-applicative regex-tdfa shelly system-filepath temporary
+ text unliftio-core
];
description = "Cuts out uninteresting parts of videos by detecting silences";
license = stdenv.lib.licenses.mit;
@@ -66965,6 +67340,18 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "data-fix_0_3_0" = callPackage
+ ({ mkDerivation, base, deepseq, hashable }:
+ mkDerivation {
+ pname = "data-fix";
+ version = "0.3.0";
+ sha256 = "184rz8ypgrb3sxy9wiaq321d82p689w7dcwkc0qkjlabd7nv6ncy";
+ libraryHaskellDepends = [ base deepseq hashable ];
+ description = "Fixpoint data types";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"data-fix-cse" = callPackage
({ mkDerivation, base, containers, data-fix, transformers }:
mkDerivation {
@@ -68113,8 +68500,8 @@ self: {
}:
mkDerivation {
pname = "dataflower";
- version = "0.2.1.0";
- sha256 = "14pypk9lv5fri55waigl5526nq9rrbk4q3i5nxn4cyxra4gk3946";
+ version = "0.2.2.0";
+ sha256 = "169m0yngaslc2pysdpf65pmf9zr037ij7y95rqi6bp3dxcxfcwlg";
libraryHaskellDepends = [
base hashable mtl pretty-show stm time transformers vector
];
@@ -70264,8 +70651,6 @@ self: {
];
description = "JSON instances for DSum, DMap, and Some";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"dependent-sum-template" = callPackage
@@ -70948,8 +71333,8 @@ self: {
}:
mkDerivation {
pname = "devtools";
- version = "0.0.1";
- sha256 = "0jlzwvh49x1psxnn6gz75g2pipcmzljgg71b2j1807ia82wn01j3";
+ version = "0.0.2";
+ sha256 = "1p5695sgp48mznk9pb9kl24j9wa9gwq344hr3cdzzsvabfi1pkz2";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -71166,59 +71551,7 @@ self: {
benchmarkHaskellDepends = [
base bytestring containers directory gauge serialise text
];
- description = "A configuration language guaranteed to terminate";
- license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- }) {};
-
- "dhall_1_30_0" = callPackage
- ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, atomic-write
- , base, bytestring, case-insensitive, cborg, cborg-json, containers
- , contravariant, cryptonite, data-fix, deepseq, Diff, directory
- , doctest, dotgen, either, exceptions, filepath, foldl, gauge
- , generic-random, hashable, haskeline, http-client, http-client-tls
- , http-types, lens-family-core, megaparsec, memory, mockery, mtl
- , network-uri, optparse-applicative, parser-combinators, parsers
- , pretty-simple, prettyprinter, prettyprinter-ansi-terminal
- , profunctors, QuickCheck, quickcheck-instances, repline
- , scientific, semigroups, serialise, special-values, spoon, tasty
- , tasty-expected-failure, tasty-hunit, tasty-quickcheck
- , template-haskell, text, th-lift-instances, transformers
- , transformers-compat, turtle, unordered-containers, uri-encode
- , vector
- }:
- mkDerivation {
- pname = "dhall";
- version = "1.30.0";
- sha256 = "10aagimwa5ycrq15240ff2g7r0n995waa33vaz0h51nqvncrbgpj";
- revision = "1";
- editedCabalFile = "1pazhb3h1rabb80wxh29k5yfp915zqp1gmhcv4mx7ibzv9zw7miq";
- isLibrary = true;
- isExecutable = true;
- libraryHaskellDepends = [
- aeson aeson-pretty ansi-terminal atomic-write base bytestring
- case-insensitive cborg cborg-json containers contravariant
- cryptonite data-fix deepseq Diff directory dotgen either exceptions
- filepath hashable haskeline http-client http-client-tls http-types
- lens-family-core megaparsec memory mtl network-uri
- optparse-applicative parser-combinators parsers pretty-simple
- prettyprinter prettyprinter-ansi-terminal profunctors repline
- scientific serialise template-haskell text th-lift-instances
- transformers transformers-compat unordered-containers uri-encode
- vector
- ];
- executableHaskellDepends = [ base ];
- testHaskellDepends = [
- base bytestring cborg containers data-fix deepseq directory doctest
- either filepath foldl generic-random lens-family-core megaparsec
- mockery prettyprinter QuickCheck quickcheck-instances scientific
- semigroups serialise special-values spoon tasty
- tasty-expected-failure tasty-hunit tasty-quickcheck text
- transformers turtle unordered-containers vector
- ];
- benchmarkHaskellDepends = [
- base bytestring containers directory gauge serialise text
- ];
+ doCheck = false;
description = "A configuration language guaranteed to terminate";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
@@ -71273,6 +71606,7 @@ self: {
benchmarkHaskellDepends = [
base bytestring containers directory gauge serialise text
];
+ doCheck = false;
description = "A configuration language guaranteed to terminate";
license = stdenv.lib.licenses.bsd3;
}) {};
@@ -71297,6 +71631,8 @@ self: {
pname = "dhall";
version = "1.33.1";
sha256 = "17l6qh5zhy0gnxw0x5v4c6n00dmgk279lfyi65n2hsbpaspw7h2k";
+ revision = "2";
+ editedCabalFile = "0hxk6ay7kqfi8kwni8hdca4q8qm30xdhfwdgxbl360s3ngps7jg0";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -71324,6 +71660,7 @@ self: {
benchmarkHaskellDepends = [
base bytestring containers directory gauge serialise text
];
+ doCheck = false;
description = "A configuration language guaranteed to terminate";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
@@ -71393,6 +71730,33 @@ self: {
broken = true;
}) {};
+ "dhall-docs" = callPackage
+ ({ mkDerivation, base, bytestring, containers, dhall, directory
+ , doctest, file-embed, filepath, HaXml, lucid, megaparsec, mmark
+ , mtl, optparse-applicative, path, path-io, pretty, prettyprinter
+ , tar, tasty, tasty-silver, text
+ }:
+ mkDerivation {
+ pname = "dhall-docs";
+ version = "0.0.1";
+ sha256 = "1cb3xlb27bw8csvg7a73whr4ld608g1w9i5nc7z799ry3pp64m0n";
+ isLibrary = true;
+ isExecutable = true;
+ enableSeparateDataOutput = true;
+ libraryHaskellDepends = [
+ base bytestring containers dhall directory file-embed filepath
+ lucid megaparsec mmark mtl optparse-applicative path path-io
+ prettyprinter tar text
+ ];
+ executableHaskellDepends = [ base dhall ];
+ testHaskellDepends = [
+ base containers directory doctest filepath HaXml path path-io
+ pretty tasty tasty-silver text
+ ];
+ description = "Generate HTML docs from a dhall package";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"dhall-fly" = callPackage
({ mkDerivation, aeson, aeson-casing, aeson-yaml, base, bytestring
, dhall, dhall-json, hspec, hspec-discover, optparse-applicative
@@ -71546,6 +71910,8 @@ self: {
pname = "dhall-nix";
version = "1.1.15";
sha256 = "0ynbl5nrsql9y0nh7kiyvf9h0z61d2d5v1iga8vidaqvdkih383h";
+ revision = "1";
+ editedCabalFile = "0fkc59w12pdd7wzf11x8glkvvq1jj482dmzzq1d2h1xd8z616zkz";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -71652,6 +72018,8 @@ self: {
pname = "dhall-yaml";
version = "1.2.0";
sha256 = "0jvz8xjj2f0g8pxaspgvg7rzhfyccz1rgvp4l3c9zjri3wirxpwp";
+ revision = "1";
+ editedCabalFile = "0qkwnckzr04442iz6x0cba7m8nclw18pb4icnpxrxnn9fxc7blx5";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -72468,6 +72836,8 @@ self: {
libraryHaskellDepends = [ base parsec random-fu transformers ];
description = "Simplistic D&D style dice-rolling system";
license = stdenv.lib.licenses.publicDomain;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"dice-entropy-conduit" = callPackage
@@ -73708,8 +74078,8 @@ self: {
}:
mkDerivation {
pname = "discord-haskell";
- version = "1.6.0";
- sha256 = "1abjkssssxj4a7zmb9dq7dgpkrmkjblz5smrj4qd3kpjhai6vs7c";
+ version = "1.6.1";
+ sha256 = "0id3y2zg1hg0mj6ymjm4khmsdnjdl3i7sm9b7jvw5vy44956cf5y";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -74742,8 +75112,8 @@ self: {
pname = "distributive";
version = "0.6.2";
sha256 = "1j93zkfffm6s16kgr0j0z87y5ds28rw0r2gyc5ncwcylvrqy4kl2";
- revision = "1";
- editedCabalFile = "1m1fv0ar214pqfsa4lbsn2b94npnqpnbg56wp2gim9i896fkdlhs";
+ revision = "2";
+ editedCabalFile = "11y4qanr09880d7sxkhrzrh3cpmqbx001hiqhsr2s75xrnmrpkia";
setupHaskellDepends = [ base Cabal cabal-doctest ];
libraryHaskellDepends = [ base base-orphans tagged transformers ];
testHaskellDepends = [ base doctest generic-deriving hspec ];
@@ -74948,6 +75318,19 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "dlist_1_0" = callPackage
+ ({ mkDerivation, base, deepseq, QuickCheck }:
+ mkDerivation {
+ pname = "dlist";
+ version = "1.0";
+ sha256 = "0581a60xw4gw7pmqlmg5w2hr4hm9yjgx4c2z6v63y5xv51rn6g8p";
+ libraryHaskellDepends = [ base deepseq ];
+ testHaskellDepends = [ base QuickCheck ];
+ description = "Difference lists";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"dlist-instances" = callPackage
({ mkDerivation, base, dlist, semigroups }:
mkDerivation {
@@ -75236,8 +75619,8 @@ self: {
({ mkDerivation, base, dobutokO-frequency }:
mkDerivation {
pname = "dobutokO-effects";
- version = "0.4.0.0";
- sha256 = "1w4n4sag05qggj79ygdkxjgnyy4c7azl29gvhkqpf38gd4jqdysy";
+ version = "0.12.0.0";
+ sha256 = "1x14wybv1r0da3hjwv3ya5byvy5ah819c2b3yyrsx0y4i3vhc8a4";
libraryHaskellDepends = [ base dobutokO-frequency ];
description = "A library to deal with SoX effects and possibilities";
license = stdenv.lib.licenses.mit;
@@ -78149,8 +78532,8 @@ self: {
({ mkDerivation, base, vector }:
mkDerivation {
pname = "earcut";
- version = "0.1.0.2";
- sha256 = "080picb31ihv0gzxg0nnxx90g0n08l0hz9y57k2jihsibmkszwsi";
+ version = "0.1.0.4";
+ sha256 = "0nssl7n697rzwlfb5lq4kl64j4mrb4i19rp5kzjpmc7iin9fzxsf";
libraryHaskellDepends = [ base vector ];
description = "Binding to C++ earcut library";
license = stdenv.lib.licenses.isc;
@@ -78975,6 +79358,22 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "effet" = callPackage
+ ({ mkDerivation, base, containers, monad-control, template-haskell
+ , transformers, transformers-base
+ }:
+ mkDerivation {
+ pname = "effet";
+ version = "0.1.0.0";
+ sha256 = "0ykyrirm2ncsaaak2q1p71zy15qw3wjkppnzfmzyas1jxpwvgi2v";
+ libraryHaskellDepends = [
+ base containers monad-control template-haskell transformers
+ transformers-base
+ ];
+ description = "An Effect System based on Type Classes";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"effin" = callPackage
({ mkDerivation, base, mtl }:
mkDerivation {
@@ -81300,10 +81699,8 @@ self: {
({ mkDerivation, base, containers, deepseq, template-haskell }:
mkDerivation {
pname = "enummapset-th";
- version = "0.6.1.1";
- sha256 = "0anmarswk8vvd9c8qhkhgwzmr5h2yq0bdx48ww5lbca1zf6h5hkw";
- revision = "1";
- editedCabalFile = "0fyjwcw7ibm0x5k2281q53drwm1ddsmkc890fywcv7r6b9jdx5py";
+ version = "0.6.2";
+ sha256 = "010cldc2jhhizllqj810ani5rffakfzmxm1rj69v5q489fnngswl";
libraryHaskellDepends = [
base containers deepseq template-haskell
];
@@ -83590,25 +83987,6 @@ self: {
}) {};
"exception-transformers" = callPackage
- ({ mkDerivation, base, HUnit, stm, test-framework
- , test-framework-hunit, transformers, transformers-compat
- }:
- mkDerivation {
- pname = "exception-transformers";
- version = "0.4.0.8";
- sha256 = "079vwd0lkv7y5cijpjxsxn6wyba1y22fw9mfirzgjpiswx46isrr";
- libraryHaskellDepends = [
- base stm transformers transformers-compat
- ];
- testHaskellDepends = [
- base HUnit test-framework test-framework-hunit transformers
- transformers-compat
- ];
- description = "Type classes and monads for unchecked extensible exceptions";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "exception-transformers_0_4_0_9" = callPackage
({ mkDerivation, base, HUnit, test-framework, test-framework-hunit
, transformers, transformers-compat
}:
@@ -83623,7 +84001,6 @@ self: {
];
description = "Type classes and monads for unchecked extensible exceptions";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"exceptional" = callPackage
@@ -84808,8 +85185,8 @@ self: {
}:
mkDerivation {
pname = "extra";
- version = "1.7.3";
- sha256 = "19dw4y6zk3z2rf7nq1dxfclhlca9a9znb9x2qnpaqa4gz8q3j6na";
+ version = "1.7.4";
+ sha256 = "0vcn8vid3ps7122zn3h0dzlwkx7kkxzsfhlwymalx6ph1fmxbq9y";
libraryHaskellDepends = [
base clock directory filepath process time unix
];
@@ -85027,6 +85404,8 @@ self: {
];
description = "Rational arithmetic in an irrational world";
license = "GPL";
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"facts" = callPackage
@@ -87205,10 +87584,8 @@ self: {
({ mkDerivation, base-noprelude, integer-gmp, semirings }:
mkDerivation {
pname = "fib";
- version = "0.1";
- sha256 = "19ppp760993wz4d1w3i5s60k4yqcx40il7l0ak0ylcqqym619zlk";
- revision = "1";
- editedCabalFile = "1pi7hhil698v9yk17ncw7raw0sf20yj679jvs2d0p7q8ypl9b1lh";
+ version = "0.1.0.1";
+ sha256 = "17pk2fzgr4jjmpam52vmqg69927gfsl81w61h7q9zsf1vzd0qnix";
libraryHaskellDepends = [ base-noprelude integer-gmp semirings ];
description = "fibonacci algebra";
license = stdenv.lib.licenses.bsd3;
@@ -87379,14 +87756,14 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "file-embed_0_0_12_0" = callPackage
+ "file-embed_0_0_13_0" = callPackage
({ mkDerivation, base, bytestring, directory, filepath
, template-haskell
}:
mkDerivation {
pname = "file-embed";
- version = "0.0.12.0";
- sha256 = "13b2bcyifyrs1i9yk0qkj5md68ysnwma7zb1xrb1x2i4z3lk342p";
+ version = "0.0.13.0";
+ sha256 = "1sp1qq1ph2gr5a8ismn7n9vijnfwjyh38iqn338wa8mxn2mnhc6i";
libraryHaskellDepends = [
base bytestring directory filepath template-haskell
];
@@ -87552,18 +87929,6 @@ self: {
}) {};
"filelock" = callPackage
- ({ mkDerivation, async, base, process, unix }:
- mkDerivation {
- pname = "filelock";
- version = "0.1.1.4";
- sha256 = "189n4pvq7f4d235smg2iqs2m5rqmnjdxflifq0mnb2qdbc4jjznr";
- libraryHaskellDepends = [ base unix ];
- testHaskellDepends = [ async base process ];
- description = "Portable interface to file locking (flock / LockFileEx)";
- license = stdenv.lib.licenses.publicDomain;
- }) {};
-
- "filelock_0_1_1_5" = callPackage
({ mkDerivation, async, base, process, unix }:
mkDerivation {
pname = "filelock";
@@ -87573,7 +87938,6 @@ self: {
testHaskellDepends = [ async base process ];
description = "Portable interface to file locking (flock / LockFileEx)";
license = stdenv.lib.licenses.publicDomain;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"filemanip" = callPackage
@@ -87854,6 +88218,8 @@ self: {
pname = "filtrable";
version = "0.1.3.0";
sha256 = "1viazb01xnw7siwrsynaxqcjrgc96gqfgmj4vxl5r3lbnb34wdl0";
+ revision = "1";
+ editedCabalFile = "15ghhsvd9r18ifrqh3x76p6hln4as185dnj5zzanbbfv684j9qsc";
libraryHaskellDepends = [ base ];
description = "Class of filtrable containers";
license = stdenv.lib.licenses.bsd3;
@@ -88325,6 +88691,8 @@ self: {
];
description = "Calculates file-size frequency-distribution";
license = "GPL";
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"fit" = callPackage
@@ -91498,6 +91866,8 @@ self: {
pname = "free";
version = "5.1.3";
sha256 = "0b9f9jrfgkq13333px6p1faxpcypqvzi0m9dnbj2rm8s79pdcw1c";
+ revision = "1";
+ editedCabalFile = "0w0bxkdsspw1blhr01bb9n98wlmqpgjpdbbp2f50qmhapav2fk30";
libraryHaskellDepends = [
base comonad containers distributive exceptions mtl profunctors
semigroupoids template-haskell transformers transformers-base
@@ -91512,8 +91882,8 @@ self: {
}:
mkDerivation {
pname = "free-algebras";
- version = "0.0.8.1";
- sha256 = "07p1nmg88b6nvqi33q80vb2aj6svx9r33ax85ry6d7adkg83s4jz";
+ version = "0.0.8.2";
+ sha256 = "0mq9wwsylbmkiwwpvb1frym6nif587920rxkgq1gacwmh6dssymz";
libraryHaskellDepends = [
base containers data-fix dlist free groups kan-extensions mtl
transformers
@@ -91543,8 +91913,8 @@ self: {
}:
mkDerivation {
pname = "free-category";
- version = "0.0.4.1";
- sha256 = "1d7r9mcq4163g665bgzwxhvrk2iiypgss8s3j2lmqccb461s7a4j";
+ version = "0.0.4.2";
+ sha256 = "1nnf7y0m5pv36ka54vmfbhj6v0354gk36r539ss4zzp6jc8mzvdl";
libraryHaskellDepends = [ base free-algebras ];
testHaskellDepends = [
base free-algebras QuickCheck tasty tasty-quickcheck
@@ -91943,6 +92313,17 @@ self: {
broken = true;
}) {};
+ "freer-indexed" = callPackage
+ ({ mkDerivation, base }:
+ mkDerivation {
+ pname = "freer-indexed";
+ version = "0.1.0.0";
+ sha256 = "14d5683z37xyahrw6dbcv516lmc8vasl1bc6zvdy3wr4y4g1qyzd";
+ libraryHaskellDepends = [ base ];
+ description = "Freer indexed monad for type-level resource-aware effectual operations";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"freer-simple" = callPackage
({ mkDerivation, base, criterion, extensible-effects, free, mtl
, natural-transformation, QuickCheck, tasty, tasty-hunit
@@ -93505,14 +93886,35 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "fused-effects_1_1_0_0" = callPackage
+ ({ mkDerivation, base, containers, gauge, hedgehog, hedgehog-fn
+ , inspection-testing, markdown-unlit, tasty, tasty-hedgehog
+ , tasty-hunit, transformers
+ }:
+ mkDerivation {
+ pname = "fused-effects";
+ version = "1.1.0.0";
+ sha256 = "0ns1h03skgywfm3i5748q9hxvla5769p7hb72zw8yhdfpgwh9rlx";
+ libraryHaskellDepends = [ base transformers ];
+ testHaskellDepends = [
+ base containers hedgehog hedgehog-fn inspection-testing tasty
+ tasty-hedgehog tasty-hunit transformers
+ ];
+ testToolDepends = [ markdown-unlit ];
+ benchmarkHaskellDepends = [ base gauge transformers ];
+ description = "A fast, flexible, fused effect system";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"fused-effects-exceptions" = callPackage
({ mkDerivation, base, fused-effects, markdown-unlit, tasty
, tasty-hunit, transformers
}:
mkDerivation {
pname = "fused-effects-exceptions";
- version = "1.0.0.0";
- sha256 = "13ki1fzjsqd762bbc5ia9k4agsa634lflidnzs6lahxmar1sqmid";
+ version = "1.1.0.0";
+ sha256 = "0r5xfv5cknxz21viqcpa8xjd57sbadp2vf7nk7z9j1sd5faprmji";
libraryHaskellDepends = [ base fused-effects transformers ];
testHaskellDepends = [
base fused-effects tasty tasty-hunit transformers
@@ -93520,33 +93922,46 @@ self: {
testToolDepends = [ markdown-unlit ];
description = "Handle exceptions thrown in IO with fused-effects";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"fused-effects-lens" = callPackage
({ mkDerivation, base, fused-effects, hspec, microlens }:
mkDerivation {
pname = "fused-effects-lens";
- version = "1.2.0.0";
- sha256 = "1g9shz0fi0maflgdj9lng27424jm3swgl6jl97d3v0k8syybdha6";
+ version = "1.2.0.1";
+ sha256 = "12bm84bfvvjw1rpmjbk445gd7mx42crsp9ba0jbgiyb8ryhzl9lx";
libraryHaskellDepends = [ base fused-effects microlens ];
testHaskellDepends = [ base fused-effects hspec microlens ];
description = "Monadic lens combinators for fused-effects";
license = stdenv.lib.licenses.bsd3;
}) {};
+ "fused-effects-optics" = callPackage
+ ({ mkDerivation, base, fused-effects, optics-core }:
+ mkDerivation {
+ pname = "fused-effects-optics";
+ version = "0.1.0.0";
+ sha256 = "16q5b7b46k4hi8c46kq57dxidh2djzksc7s8jb65k341bbvlsy1w";
+ libraryHaskellDepends = [ base fused-effects optics-core ];
+ description = "Bridge between the optics and fused-effects ecosystems";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"fused-effects-random" = callPackage
- ({ mkDerivation, base, fused-effects, MonadRandom, random
- , transformers
- }:
+ ({ mkDerivation, base, fused-effects, random, transformers }:
mkDerivation {
pname = "fused-effects-random";
- version = "1.0.0.0";
- sha256 = "14s65ndb5ik47wasn62pd0m5ls02a0v2vinv69jz9z630q9y7ay4";
- libraryHaskellDepends = [
- base fused-effects MonadRandom random transformers
- ];
+ version = "1.1.0.0";
+ sha256 = "0krcyx4hhvkxh0rbfwxb52xgb4rl45dflyx3aw8xryp6wn9my770";
+ libraryHaskellDepends = [ base fused-effects random transformers ];
description = "Random number generation for fused-effects";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"fused-effects-readline" = callPackage
@@ -93556,8 +93971,8 @@ self: {
}:
mkDerivation {
pname = "fused-effects-readline";
- version = "0.0.0.0";
- sha256 = "089f6b3y48ymhd45x1rxmimrwjygkjk3ykhz6nx7cf235d3cg83l";
+ version = "0.1.0.0";
+ sha256 = "1s9s5dbj0gs4y0cngqb7ynykx840n065bixx1c22xz1i481bf52m";
libraryHaskellDepends = [
base directory filepath fused-effects haskeline prettyprinter
prettyprinter-ansi-terminal terminal-size transformers
@@ -93600,6 +94015,24 @@ self: {
broken = true;
}) {};
+ "fused-effects-th" = callPackage
+ ({ mkDerivation, base, fused-effects, tasty, tasty-hunit
+ , template-haskell
+ }:
+ mkDerivation {
+ pname = "fused-effects-th";
+ version = "0.1.0.0";
+ sha256 = "05apm97hlk1k0h6px5sf25gwb6wnrg5za3z8r64rcxmzcfhd10c9";
+ libraryHaskellDepends = [ base fused-effects template-haskell ];
+ testHaskellDepends = [
+ base fused-effects tasty tasty-hunit template-haskell
+ ];
+ description = "Template Haskell helpers for fused-effects";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"fusion" = callPackage
({ mkDerivation, base, directory, doctest, filepath, pipes-safe
, transformers, void
@@ -93659,8 +94092,8 @@ self: {
}:
mkDerivation {
pname = "futhark";
- version = "0.15.8";
- sha256 = "1pdfdfgimvlz741jxyzscj99xjw888mzbar7rjy1zlfqbmac6r9f";
+ version = "0.16.2";
+ sha256 = "06kiig31z5c2sgpqisbf2dx3ipbglq49ga7w3sx1p89wakzkqyi5";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -93777,14 +94210,14 @@ self: {
"fuzzy-parse" = callPackage
({ mkDerivation, attoparsec, base, containers, hspec
- , hspec-discover, interpolatedstring-perl6, mtl, text, time
+ , hspec-discover, interpolatedstring-perl6, mtl, safe, text, time
}:
mkDerivation {
pname = "fuzzy-parse";
- version = "0.1.0.0";
- sha256 = "0sy5006m6ylvf01b8bnimql6ragmkdigcgiylxdm6y40a7wz34km";
+ version = "0.1.2.0";
+ sha256 = "0mf0bbs1vcxf6vf56n8r908c8jf6f11fyc86mk74b8dgqwjn7xfb";
libraryHaskellDepends = [
- attoparsec base containers mtl text time
+ attoparsec base containers mtl safe text time
];
testHaskellDepends = [
base hspec hspec-discover interpolatedstring-perl6 text
@@ -94846,6 +95279,60 @@ self: {
broken = true;
}) {};
+ "gemini-router" = callPackage
+ ({ mkDerivation, base, gemini-server, network-uri, transformers }:
+ mkDerivation {
+ pname = "gemini-router";
+ version = "0.1.0.0";
+ sha256 = "1k1fa4vi93ijj8yf1sfjgmy5kibs0z77z994pvzs1bm8sx73h8kr";
+ revision = "1";
+ editedCabalFile = "1pb52h8md6g422y5rj7nyy1mkgxccggfal27i42c3qsn8x9frrpz";
+ libraryHaskellDepends = [
+ base gemini-server network-uri transformers
+ ];
+ description = "A simple Happstack-style Gemini router";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
+ "gemini-server" = callPackage
+ ({ mkDerivation, base, bytestring, hslogger, network, network-run
+ , network-uri, text, utf8-string
+ }:
+ mkDerivation {
+ pname = "gemini-server";
+ version = "0.1.0.0";
+ sha256 = "0m98dc66469gbnsra8sp0clrlbyzn817vnd7aini576g5gv4sxr5";
+ revision = "1";
+ editedCabalFile = "091wv6ar78dhhz1y6rknslxc2wh020b50n38928abl0a939gwvh9";
+ libraryHaskellDepends = [
+ base bytestring hslogger network network-run network-uri text
+ utf8-string
+ ];
+ description = "A lightweight server for the Gemini protocol";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
+ "gemini-textboard" = callPackage
+ ({ mkDerivation, base, cache, clock, gemini-router, gemini-server
+ , language-gemini, network-uri, nonce, sqlite-simple, text, time
+ , transformers
+ }:
+ mkDerivation {
+ pname = "gemini-textboard";
+ version = "0.1.0.0";
+ sha256 = "1z8nkrkar4das4kpgsg03hsgg3i5y2639h7sik8cjdvyvwi8dpsn";
+ revision = "1";
+ editedCabalFile = "1h1fxigslzpbsjskrdaqa3gd063r4c7z6vvwaa6dk5d3mf67dbwq";
+ isLibrary = false;
+ isExecutable = true;
+ executableHaskellDepends = [
+ base cache clock gemini-router gemini-server language-gemini
+ network-uri nonce sqlite-simple text time transformers
+ ];
+ description = "A barebones textboard for the Gemini protocol";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"gemstone" = callPackage
({ mkDerivation, array, base, bitmap, bitmap-opengl, containers
, FTGL, lens, linear, OpenGL, random, SDL, SDL-image, stb-image
@@ -97102,15 +97589,15 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "ghc-exactprint_0_6_3_1" = callPackage
+ "ghc-exactprint_0_6_3_2" = callPackage
({ mkDerivation, base, bytestring, containers, Diff, directory
, filemanip, filepath, free, ghc, ghc-boot, ghc-paths, HUnit, mtl
, silently, syb
}:
mkDerivation {
pname = "ghc-exactprint";
- version = "0.6.3.1";
- sha256 = "16rfmiyzp4s40vw75wpavfd28a6nanjv4abpjgy5zv13ayymx0rd";
+ version = "0.6.3.2";
+ sha256 = "1bzf8mafz20pn7cq2483b9w3hjrwfbb0ahbcb3y7xy5yy52qvmln";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -97130,8 +97617,8 @@ self: {
({ mkDerivation, base, directory, filepath, process }:
mkDerivation {
pname = "ghc-gc-tune";
- version = "0.3";
- sha256 = "0ghp3f86m91zi6kl8zq157717s2p73nwdgln4aiclq830m72ys9w";
+ version = "0.3.2";
+ sha256 = "1q77q0vavypdc9iqf1hrnxzhwj851a9s9qk646w98qkncm4ifblp";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [ base directory filepath process ];
@@ -97265,6 +97752,8 @@ self: {
pname = "ghc-lib";
version = "8.10.1.20200523";
sha256 = "0qqcygmndgpmjm7hdr81bj298mc0gmnswm4i14r0fwnyc00zr4yy";
+ revision = "1";
+ editedCabalFile = "1hs46w2h5wz2gvdmhqvkyl413jryba8gbpbg23hjrsz5c1divym7";
enableSeparateDataOutput = true;
libraryHaskellDepends = [
array base binary bytestring containers deepseq directory filepath
@@ -97284,6 +97773,8 @@ self: {
pname = "ghc-lib-parser";
version = "8.10.1.20200523";
sha256 = "1g2jki7f1in5c2y80zhz3hxrm4c7m063slxpg1lrvqrgrlwag5cb";
+ revision = "1";
+ editedCabalFile = "18q82c1iixph91kaypa2dzbcjf1dl46w1i5ckifgmdqh9zxibs9c";
enableSeparateDataOutput = true;
libraryHaskellDepends = [
array base binary bytestring containers deepseq directory filepath
@@ -97300,8 +97791,8 @@ self: {
}:
mkDerivation {
pname = "ghc-lib-parser-ex";
- version = "8.10.0.14";
- sha256 = "0p78j7pai6fl6dy7bwdd7w5b2khmc9njr2ankasixpn1a0mcfkf9";
+ version = "8.10.0.15";
+ sha256 = "1i4xslw53bijvbvba4h0b8c9cy0zr2d4gzm3dfxizss1bz8qcscn";
libraryHaskellDepends = [
base bytestring containers ghc-lib-parser uniplate
];
@@ -97516,6 +98007,23 @@ self: {
broken = true;
}) {};
+ "ghc-plugs-out" = callPackage
+ ({ mkDerivation, base, ghc, th-printf }:
+ mkDerivation {
+ pname = "ghc-plugs-out";
+ version = "1.0.0.0";
+ sha256 = "0a6zqqwpsz38x07qj8jafjhp1pinb9xh1qs5ld56ms329aml2ymw";
+ isLibrary = false;
+ isExecutable = false;
+ libraryHaskellDepends = [ base ghc th-printf ];
+ testHaskellDepends = [ base ];
+ doHaddock = false;
+ description = "Type checker plugins without the type checking";
+ license = stdenv.lib.licenses.mpl20;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"ghc-prim_0_6_1" = callPackage
({ mkDerivation, rts }:
mkDerivation {
@@ -97729,20 +98237,21 @@ self: {
}) {};
"ghc-tags-core" = callPackage
- ({ mkDerivation, attoparsec, base, bytestring, criterion, deepseq
- , directory, filepath, filepath-bytestring, ghc, lattices, mtl
- , pipes, pipes-attoparsec, pipes-bytestring, QuickCheck
+ ({ mkDerivation, attoparsec, base, bytestring, cpphs, criterion
+ , deepseq, directory, filepath, filepath-bytestring, ghc, lattices
+ , mtl, pipes, pipes-attoparsec, pipes-bytestring, QuickCheck
, quickcheck-instances, tasty, tasty-golden, tasty-quickcheck, text
, transformers
}:
mkDerivation {
pname = "ghc-tags-core";
- version = "0.2.0.0";
- sha256 = "1i7jr8zzkybh1f0ljg3l4airfc4ayy4z7v16avj6j5h3k8dksd3f";
+ version = "0.2.2.0";
+ sha256 = "1hnknqqswn3w1l6bk70b44vhbyf43yh0zjfcgsjj1sc2864jikpb";
libraryHaskellDepends = [
attoparsec base bytestring directory filepath-bytestring ghc mtl
pipes pipes-attoparsec pipes-bytestring text transformers
];
+ libraryToolDepends = [ cpphs ];
testHaskellDepends = [
attoparsec base bytestring directory filepath filepath-bytestring
lattices mtl pipes QuickCheck quickcheck-instances tasty
@@ -97760,20 +98269,20 @@ self: {
"ghc-tags-plugin" = callPackage
({ mkDerivation, base, bytestring, directory, filepath
- , filepath-bytestring, ghc, ghc-tags-core, mtl
+ , filepath-bytestring, ghc, ghc-tags-core, lukko, mtl
, optparse-applicative, pipes, pipes-attoparsec, pipes-bytestring
- , pipes-safe, text, unix
+ , pipes-safe, text
}:
mkDerivation {
pname = "ghc-tags-plugin";
- version = "0.2.0.0";
- sha256 = "0prl25wd8fcga2ndx78rvsyzk4ar9m7wrs10mbcmia9pi4kax7y9";
+ version = "0.2.2.0";
+ sha256 = "0gsvhljr8q2a8w8va4c3ggghpvhny3ip2vh2vaizl9806126i7q7";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
base bytestring directory filepath filepath-bytestring ghc
- ghc-tags-core mtl optparse-applicative pipes pipes-attoparsec
- pipes-bytestring pipes-safe text unix
+ ghc-tags-core lukko mtl optparse-applicative pipes pipes-attoparsec
+ pipes-bytestring pipes-safe text
];
description = "A compiler plugin which generates tags file from GHC parsed syntax tree";
license = stdenv.lib.licenses.mpl20;
@@ -98949,6 +99458,8 @@ self: {
libraryPkgconfigDepends = [ libgit2-glib ];
description = "libgit2-glib bindings";
license = stdenv.lib.licenses.lgpl21;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {inherit (pkgs) libgit2-glib;};
"gi-gio" = callPackage
@@ -99007,6 +99518,8 @@ self: {
libraryPkgconfigDepends = [ gobject-introspection ];
description = "GIRepository (gobject-introspection) bindings";
license = stdenv.lib.licenses.lgpl21;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {inherit (pkgs) gobject-introspection;};
"gi-glib" = callPackage
@@ -99172,6 +99685,8 @@ self: {
libraryPkgconfigDepends = [ gstreamer ];
description = "GStreamer bindings";
license = stdenv.lib.licenses.lgpl21;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {inherit (pkgs.gst_all_1) gstreamer;};
"gi-gstaudio" = callPackage
@@ -99193,6 +99708,8 @@ self: {
libraryPkgconfigDepends = [ gst-plugins-base ];
description = "GStreamerAudio bindings";
license = stdenv.lib.licenses.lgpl21;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {inherit (pkgs.gst_all_1) gst-plugins-base;};
"gi-gstbase" = callPackage
@@ -99214,6 +99731,8 @@ self: {
libraryPkgconfigDepends = [ gst-plugins-base ];
description = "GStreamerBase bindings";
license = stdenv.lib.licenses.lgpl21;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {inherit (pkgs.gst_all_1) gst-plugins-base;};
"gi-gstpbutils" = callPackage
@@ -99284,6 +99803,8 @@ self: {
libraryPkgconfigDepends = [ gst-plugins-base ];
description = "GStreamerVideo bindings";
license = stdenv.lib.licenses.lgpl21;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {inherit (pkgs.gst_all_1) gst-plugins-base;};
"gi-gtk" = callPackage
@@ -99457,6 +99978,8 @@ self: {
libraryPkgconfigDepends = [ gtksourceview3 ];
description = "GtkSource bindings";
license = stdenv.lib.licenses.lgpl21;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {inherit (pkgs) gtksourceview3;};
"gi-handy" = callPackage
@@ -99502,6 +100025,8 @@ self: {
libraryPkgconfigDepends = [ harfbuzz ];
description = "HarfBuzz bindings";
license = stdenv.lib.licenses.lgpl21;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {inherit (pkgs) harfbuzz;};
"gi-ibus" = callPackage
@@ -99566,6 +100091,8 @@ self: {
libraryPkgconfigDepends = [ libnotify ];
description = "Libnotify bindings";
license = stdenv.lib.licenses.lgpl21;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {inherit (pkgs) libnotify;};
"gi-ostree" = callPackage
@@ -99588,6 +100115,8 @@ self: {
description = "OSTree bindings";
license = stdenv.lib.licenses.lgpl21;
platforms = [ "i686-linux" "x86_64-linux" ];
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {inherit (pkgs) ostree;};
"gi-pango" = callPackage
@@ -99663,6 +100192,8 @@ self: {
'';
description = "PangoCairo bindings";
license = stdenv.lib.licenses.lgpl21;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {inherit (pkgs) cairo; inherit (pkgs) pango;};
"gi-poppler" = callPackage
@@ -99754,6 +100285,8 @@ self: {
libraryPkgconfigDepends = [ vte_291 ];
description = "Vte bindings";
license = stdenv.lib.licenses.lgpl21;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {vte_291 = pkgs.vte;};
"gi-webkit" = callPackage
@@ -100141,9 +100674,10 @@ self: {
, clientsession, concurrent-output, conduit, connection, containers
, crypto-api, cryptonite, curl, data-default, DAV, dbus, deepseq
, directory, disk-free-space, dlist, edit-distance, exceptions
- , fdo-notify, feed, filepath, filepath-bytestring, free, git, gnupg
- , hinotify, hslogger, http-client, http-client-tls, http-conduit
- , http-types, IfElse, lsof, magic, memory, microlens, monad-control
+ , fdo-notify, feed, filepath, filepath-bytestring, free, git
+ , git-lfs, gnupg, hinotify, hslogger, http-client
+ , http-client-restricted, http-client-tls, http-conduit, http-types
+ , IfElse, lsof, magic, memory, microlens, monad-control
, monad-logger, mountpoints, mtl, network, network-bsd
, network-info, network-multicast, network-uri, old-locale, openssh
, optparse-applicative, path-pieces, perl, persistent
@@ -100158,8 +100692,8 @@ self: {
}:
mkDerivation {
pname = "git-annex";
- version = "8.20200617";
- sha256 = "1vgpqbscvxm03ibxy6cjnp9vd1wpsr3gkajp4z3m9nnkmjz5r4q4";
+ version = "8.20200720.1";
+ sha256 = "0g4wlfkwr9w21hvdywc7sk077rxlnigdr4m4yz41rc0s2nbjc9fn";
configureFlags = [
"-fassistant" "-f-benchmark" "-fdbus" "-f-debuglocks" "-fmagicmime"
"-fnetworkbsd" "-fpairing" "-fproduction" "-fs3" "-ftorrentparser"
@@ -100177,17 +100711,18 @@ self: {
bytestring case-insensitive clientsession concurrent-output conduit
connection containers crypto-api cryptonite data-default DAV dbus
deepseq directory disk-free-space dlist edit-distance exceptions
- fdo-notify feed filepath filepath-bytestring free hinotify hslogger
- http-client http-client-tls http-conduit http-types IfElse magic
- memory microlens monad-control monad-logger mountpoints mtl network
- network-bsd network-info network-multicast network-uri old-locale
- optparse-applicative path-pieces persistent persistent-sqlite
- persistent-template process QuickCheck random regex-tdfa resourcet
- SafeSemaphore sandi securemem shakespeare socks split stm stm-chans
- tagsoup tasty tasty-hunit tasty-quickcheck tasty-rerun
- template-haskell text time torrent transformers unix unix-compat
- unliftio-core unordered-containers utf8-string uuid vector wai
- wai-extra warp warp-tls yesod yesod-core yesod-form yesod-static
+ fdo-notify feed filepath filepath-bytestring free git-lfs hinotify
+ hslogger http-client http-client-restricted http-client-tls
+ http-conduit http-types IfElse magic memory microlens monad-control
+ monad-logger mountpoints mtl network network-bsd network-info
+ network-multicast network-uri old-locale optparse-applicative
+ path-pieces persistent persistent-sqlite persistent-template
+ process QuickCheck random regex-tdfa resourcet SafeSemaphore sandi
+ securemem shakespeare socks split stm stm-chans tagsoup tasty
+ tasty-hunit tasty-quickcheck tasty-rerun template-haskell text time
+ torrent transformers unix unix-compat unliftio-core
+ unordered-containers utf8-string uuid vector wai wai-extra warp
+ warp-tls yesod yesod-core yesod-form yesod-static
];
executableSystemDepends = [
bup curl git gnupg lsof openssh perl rsync wget which
@@ -100271,6 +100806,27 @@ self: {
broken = true;
}) {};
+ "git-cuk" = callPackage
+ ({ mkDerivation, ansi-terminal, base, base-noprelude, github
+ , gitrev, optparse-applicative, process, relude, text
+ }:
+ mkDerivation {
+ pname = "git-cuk";
+ version = "0.0.1";
+ sha256 = "176027wag30imq3471c7qi8fdyb5myixlsphyq28394y47yz638i";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ ansi-terminal base-noprelude github gitrev optparse-applicative
+ process relude text
+ ];
+ executableHaskellDepends = [ base relude ];
+ description = "Haskell Git Helper Tool";
+ license = stdenv.lib.licenses.mpl20;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"git-date" = callPackage
({ mkDerivation, base, bytestring, old-locale, QuickCheck
, test-framework, test-framework-quickcheck2, time, unexceptionalio
@@ -100699,8 +101255,8 @@ self: {
}:
mkDerivation {
pname = "github-backup";
- version = "1.20191219";
- sha256 = "0yi0i342qh1wm7j81qa6mhyfjp4psbw4vrpp0m1c9zjbymfpcymk";
+ version = "1.20200721";
+ sha256 = "0d0sc2l6crkr42nwkhbcixlxrywx6gsn6vzgdpwh0r6vxlc83hcw";
isLibrary = false;
isExecutable = true;
setupHaskellDepends = [
@@ -100770,8 +101326,8 @@ self: {
}:
mkDerivation {
pname = "github-release";
- version = "1.3.3";
- sha256 = "15im4vsz04sx0iq83xmvk5ak4p7rj33jawk5lxkmv1ajwvklbpk7";
+ version = "1.3.4";
+ sha256 = "04gzafg85fivaslsdi019f4blwrjpda01caly4dd8y7nmmc8xy0y";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -100910,8 +101466,8 @@ self: {
}:
mkDerivation {
pname = "github-webhooks";
- version = "0.14.0";
- sha256 = "0rjbavfcwhbi817dsvg2q9qmf5ln7mp5kgs1wlq23p0603jgm211";
+ version = "0.15.0";
+ sha256 = "0cmavbh7c59pimspjj42mwlac5jmlgagjsw4239hcsrna5yi4wdz";
libraryHaskellDepends = [
aeson base base16-bytestring bytestring cryptonite deepseq
deepseq-generics memory text time vector
@@ -101878,10 +102434,8 @@ self: {
}:
mkDerivation {
pname = "gloss";
- version = "1.13.1.1";
- sha256 = "1bmjwd2vfbxfypr2g23810yyp921m30wxbb6f3m0wkk65iypjnls";
- revision = "1";
- editedCabalFile = "1bcjm3issssqxd60jd2y6032y8plcs0sm3wbnha1f6fa3z46z9n0";
+ version = "1.13.1.2";
+ sha256 = "0jyvjpd1gzzb9aiw5708822p8qyw14jj6j19gby9q9wjbpd4sd4d";
libraryHaskellDepends = [
base bmp bytestring containers ghc-prim gloss-rendering GLUT OpenGL
];
@@ -101908,10 +102462,8 @@ self: {
({ mkDerivation, base, containers, ghc-prim, gloss }:
mkDerivation {
pname = "gloss-algorithms";
- version = "1.13.0.1";
- sha256 = "0vbqcsvyicb409a60fab0c0shixny4l5z2l15n8hrrr1dsvisf95";
- revision = "1";
- editedCabalFile = "140zmk3br0nn98mjc6ri36nk8yl93n4v69zybzv2vc41yxgvnac5";
+ version = "1.13.0.2";
+ sha256 = "0wx546hm1afgq0al5bk1g2qfgg9r520whm6igz18lkc9fsksjfgd";
libraryHaskellDepends = [ base containers ghc-prim gloss ];
description = "Data structures and algorithms for working with 2D graphics";
license = stdenv.lib.licenses.mit;
@@ -101954,8 +102506,8 @@ self: {
}:
mkDerivation {
pname = "gloss-examples";
- version = "1.13.0.2";
- sha256 = "1g2l3jjj2mmmw9w45bmasqn9nbbsxxny6zhdvda931r6ryanq8db";
+ version = "1.13.0.3";
+ sha256 = "0bvy9hww3i2mk3fim5spg2fd66mhxz5njil7xjrw6wbjs4ryrr92";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -102029,8 +102581,8 @@ self: {
}:
mkDerivation {
pname = "gloss-raster";
- version = "1.13.1.1";
- sha256 = "199b1avi4mils3x9xpk66992id40hdyk0lpjnyyxy8c22s0adgb9";
+ version = "1.13.1.2";
+ sha256 = "0sn1pnkpl76q6lf6w9ji7fh1fcb89vaz2jz9slz7fih2ksrnwlsa";
libraryHaskellDepends = [
base containers ghc-prim gloss gloss-rendering repa
];
@@ -102092,8 +102644,8 @@ self: {
}:
mkDerivation {
pname = "glpk-headers";
- version = "0.4.0";
- sha256 = "1xljpxgcp5lxrxgx718fqqg3xrjc7rfzj5zxi1f1z8cdsg00cvmc";
+ version = "0.4.1";
+ sha256 = "1r77p0h9iyffl903ag008cb3v21jw021129cfxpr2mp1mgnkhdjd";
libraryHaskellDepends = [ base derive-storable ];
testHaskellDepends = [
base derive-storable tasty tasty-discover tasty-hunit
@@ -105571,17 +106123,18 @@ self: {
}) {};
"gotta-go-fast" = callPackage
- ({ mkDerivation, base, brick, cmdargs, directory, random, text
- , time, vty, word-wrap
+ ({ mkDerivation, base, brick, cmdargs, directory, file-embed
+ , random, split, text, time, vty, word-wrap
}:
mkDerivation {
pname = "gotta-go-fast";
- version = "0.1.4.0";
- sha256 = "15gip4nggw3wxa3k546sqqbiqzhkw5acxwmwy3iv911d61s89gvb";
+ version = "0.3.0.0";
+ sha256 = "067jmp0p21bw7mpsrlpawphjmlq9f85lsfiihp37pvs8sxb36lg9";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
- base brick cmdargs directory random text time vty word-wrap
+ base brick cmdargs directory file-embed random split text time vty
+ word-wrap
];
description = "A command line utility for practicing typing";
license = stdenv.lib.licenses.bsd3;
@@ -109646,8 +110199,8 @@ self: {
pname = "hackage-security";
version = "0.6.0.1";
sha256 = "05rgz31cmp52137j4jk0074z8lfgk8mrf2x56bzw28asmxrv8qli";
- revision = "1";
- editedCabalFile = "0cq9apkfhvxgsmvqbi452aqpsdz1mpvhaw7paafh9kc3jhic5270";
+ revision = "2";
+ editedCabalFile = "12m1a5jggzjz3d1q5j41dcs51hi1vwqqxrba0h9jiajv11f3hb39";
libraryHaskellDepends = [
base base16-bytestring base64-bytestring bytestring Cabal
containers cryptohash-sha256 directory ed25519 filepath ghc-prim
@@ -110685,43 +111238,6 @@ self: {
}) {};
"hakyll" = callPackage
- ({ mkDerivation, base, binary, blaze-html, blaze-markup, bytestring
- , containers, cryptonite, data-default, deepseq, directory
- , file-embed, filepath, fsnotify, http-conduit, http-types
- , lrucache, memory, mtl, network-uri, optparse-applicative, pandoc
- , pandoc-citeproc, parsec, process, QuickCheck, random, regex-tdfa
- , resourcet, scientific, tagsoup, tasty, tasty-hunit
- , tasty-quickcheck, template-haskell, text, time
- , time-locale-compat, unordered-containers, utillinux, vector, wai
- , wai-app-static, warp, yaml
- }:
- mkDerivation {
- pname = "hakyll";
- version = "4.13.3.0";
- sha256 = "1wadcvxpr7w1gm1pmi9j8bm6x0i44ik806j73mzfb1d4wb1ck10p";
- isLibrary = true;
- isExecutable = true;
- enableSeparateDataOutput = true;
- libraryHaskellDepends = [
- base binary blaze-html blaze-markup bytestring containers
- cryptonite data-default deepseq directory file-embed filepath
- fsnotify http-conduit http-types lrucache memory mtl network-uri
- optparse-applicative pandoc pandoc-citeproc parsec process random
- regex-tdfa resourcet scientific tagsoup template-haskell text time
- time-locale-compat unordered-containers vector wai wai-app-static
- warp yaml
- ];
- executableHaskellDepends = [ base directory filepath ];
- testHaskellDepends = [
- base bytestring containers filepath QuickCheck tasty tasty-hunit
- tasty-quickcheck text unordered-containers yaml
- ];
- testToolDepends = [ utillinux ];
- description = "A static website compiler library";
- license = stdenv.lib.licenses.bsd3;
- }) {inherit (pkgs) utillinux;};
-
- "hakyll_4_13_4_0" = callPackage
({ mkDerivation, base, binary, blaze-html, blaze-markup, bytestring
, containers, cryptonite, data-default, deepseq, directory
, file-embed, filepath, fsnotify, http-conduit, http-types
@@ -110756,7 +111272,6 @@ self: {
testToolDepends = [ utillinux ];
description = "A static website compiler library";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {inherit (pkgs) utillinux;};
"hakyll-R" = callPackage
@@ -111140,10 +111655,8 @@ self: {
}:
mkDerivation {
pname = "hal";
- version = "0.4.1";
- sha256 = "09wmpscvwfdy57haszwnjxwqxqqf5s458h0b1pkk90pskfg7lf1d";
- revision = "1";
- editedCabalFile = "0n5b57l3q6wpzd7kbsn11802y1mcpsrs01sszsd5l4l57hkc71gd";
+ version = "0.4.2";
+ sha256 = "0z12a4avydwcld5rwzb5fvffz6dpqqc4h04i43f9nih8dr19zpdp";
libraryHaskellDepends = [
aeson base bytestring containers envy exceptions http-conduit
http-types mtl text time
@@ -111274,9 +111787,9 @@ self: {
}:
mkDerivation {
pname = "hall-symbols";
- version = "0.1.0.2";
- sha256 = "05jp1l5v9vz4ai9pbz6nwcm3mzxx0k2nsj85ryi2nl9pkhfwa0l4";
- libraryHaskellDepends = [ base doctest matrix parsec ];
+ version = "0.1.0.6";
+ sha256 = "1gf0whwmwlrnir01zi5v6bsp0864nh0qjvy59hql27hv12yypdwa";
+ libraryHaskellDepends = [ base matrix parsec ];
testHaskellDepends = [
base doctest hspec matrix matrix-as-xyz parsec QuickCheck
];
@@ -113154,6 +113667,42 @@ self: {
broken = true;
}) {};
+ "hascard" = callPackage
+ ({ mkDerivation, base, brick, containers, directory, filepath
+ , microlens, microlens-platform, mwc-random, optparse-applicative
+ , ordered-containers, parsec, process, random-fu, strict, text
+ , vector, vty, word-wrap
+ }:
+ mkDerivation {
+ pname = "hascard";
+ version = "0.1.4.0";
+ sha256 = "1w57jw8b3hiqhl372zc5fj30lgvh9nywhg70fqpz4jlm86a2bjqw";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ base brick containers directory filepath microlens
+ microlens-platform mwc-random optparse-applicative
+ ordered-containers parsec process random-fu strict text vector vty
+ word-wrap
+ ];
+ executableHaskellDepends = [
+ base brick containers directory filepath microlens
+ microlens-platform mwc-random optparse-applicative
+ ordered-containers parsec process random-fu strict text vector vty
+ word-wrap
+ ];
+ testHaskellDepends = [
+ base brick containers directory filepath microlens
+ microlens-platform mwc-random optparse-applicative
+ ordered-containers parsec process random-fu strict text vector vty
+ word-wrap
+ ];
+ description = "A TUI for reviewing notes using 'flashcards' written with markdown-like syntax";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"hascas" = callPackage
({ mkDerivation, base, binary, bytestring, containers
, data-binary-ieee754, hspec, mtl, network, safe-exceptions, stm
@@ -114295,6 +114844,8 @@ self: {
libraryHaskellDepends = [ base bytestring lens tagsoup wreq ];
description = "Simple library for retrieving current user agent strings";
license = stdenv.lib.licenses.publicDomain;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"haskell-formatter" = callPackage
@@ -114516,6 +115067,8 @@ self: {
];
description = "Simple library for accessing Google Trends";
license = stdenv.lib.licenses.publicDomain;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"haskell-holes-th" = callPackage
@@ -115359,8 +115912,8 @@ self: {
}:
mkDerivation {
pname = "haskell-to-elm";
- version = "0.3.0.0";
- sha256 = "02gspfwiif3a38fsfv0pxia7lcqyqppf9pnrbirnqdcry721mcvy";
+ version = "0.3.1.0";
+ sha256 = "0gplmz0s874zi8y8m06mlr3lipyffw0p6lfz6snl0sgdmynjg786";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -116678,18 +117231,18 @@ self: {
license = stdenv.lib.licenses.publicDomain;
}) {};
- "haskoin-core_0_14_1" = callPackage
+ "haskoin-core_0_15_0" = callPackage
({ mkDerivation, aeson, array, base, base16-bytestring, bytestring
, cereal, conduit, containers, cryptonite, deepseq, entropy
- , hashable, hspec, hspec-discover, HUnit, memory, mtl, murmur3
- , network, QuickCheck, safe, scientific, secp256k1-haskell, split
- , string-conversions, text, time, transformers
- , unordered-containers, vector
+ , hashable, hspec, hspec-discover, HUnit, lens, lens-aeson, memory
+ , mtl, murmur3, network, QuickCheck, safe, scientific
+ , secp256k1-haskell, split, string-conversions, text, time
+ , transformers, unordered-containers, vector
}:
mkDerivation {
pname = "haskoin-core";
- version = "0.14.1";
- sha256 = "0ii32r1c72jvsgrcx0hhqckvbmsq27kzvs9akdlzrhm65jir6fc6";
+ version = "0.15.0";
+ sha256 = "1mvhp7khbjf3wxvgwgdxgbl8ylb4vhgiirq50dwi62p65w75xw1v";
libraryHaskellDepends = [
aeson array base base16-bytestring bytestring cereal conduit
containers cryptonite deepseq entropy hashable hspec memory mtl
@@ -116699,9 +117252,9 @@ self: {
];
testHaskellDepends = [
aeson array base base16-bytestring bytestring cereal conduit
- containers cryptonite deepseq entropy hashable hspec HUnit memory
- mtl murmur3 network QuickCheck safe scientific secp256k1-haskell
- split string-conversions text time transformers
+ containers cryptonite deepseq entropy hashable hspec HUnit lens
+ lens-aeson memory mtl murmur3 network QuickCheck safe scientific
+ secp256k1-haskell split string-conversions text time transformers
unordered-containers vector
];
testToolDepends = [ hspec-discover ];
@@ -116766,29 +117319,30 @@ self: {
broken = true;
}) {};
- "haskoin-node_0_14_1" = callPackage
+ "haskoin-node_0_16_0" = callPackage
({ mkDerivation, base, base64, bytestring, cereal, conduit
, conduit-extra, containers, data-default, hashable, haskoin-core
, hspec, hspec-discover, HUnit, monad-logger, mtl, network, nqe
- , random, resourcet, rocksdb-haskell, rocksdb-query, safe
+ , random, resourcet, rocksdb-haskell-jprupp, rocksdb-query, safe
, string-conversions, text, time, transformers, unliftio
, unordered-containers
}:
mkDerivation {
pname = "haskoin-node";
- version = "0.14.1";
- sha256 = "110yhfxzwsca7c29zmg4dd1wkb2ylpkmcrzrg3fq1a03q6jsc22s";
+ version = "0.16.0";
+ sha256 = "0az8lv5xkbhfff9hq3r0kndz2hp3q6f1h6za85qj8v5755za61c8";
libraryHaskellDepends = [
base bytestring cereal conduit conduit-extra containers
data-default hashable haskoin-core monad-logger mtl network nqe
- random resourcet rocksdb-haskell rocksdb-query string-conversions
- text time transformers unliftio unordered-containers
+ random resourcet rocksdb-haskell-jprupp rocksdb-query
+ string-conversions text time transformers unliftio
+ unordered-containers
];
testHaskellDepends = [
base base64 bytestring cereal conduit conduit-extra containers
data-default hashable haskoin-core hspec HUnit monad-logger mtl
- network nqe random resourcet rocksdb-haskell rocksdb-query safe
- string-conversions text time transformers unliftio
+ network nqe random resourcet rocksdb-haskell-jprupp rocksdb-query
+ safe string-conversions text time transformers unliftio
unordered-containers
];
testToolDepends = [ hspec-discover ];
@@ -116849,22 +117403,24 @@ self: {
, cereal, conduit, containers, data-default, deepseq, filepath
, hashable, haskoin-core, haskoin-node, haskoin-store-data, hedis
, hspec, hspec-discover, http-types, monad-logger, mtl, network
- , nqe, optparse-applicative, QuickCheck, random, rocksdb-haskell
- , rocksdb-query, scotty, string-conversions, text, time
- , transformers, unliftio, unordered-containers, wai, warp
+ , nqe, optparse-applicative, QuickCheck, random
+ , rocksdb-haskell-jprupp, rocksdb-query, scotty, string-conversions
+ , text, time, transformers, unliftio, unordered-containers, wai
+ , warp
}:
mkDerivation {
pname = "haskoin-store";
- version = "0.34.5";
- sha256 = "1ha9jz8zq2sxsm0557x5qy4ckjcmzsfn2qfl5mrq1vihfn3frdsl";
+ version = "0.37.0";
+ sha256 = "1ig2968p7b6zncazsqn258c4zz0j12sxka8g64nav7581d1sbfg4";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
aeson aeson-pretty base bytestring cereal conduit containers
data-default deepseq hashable haskoin-core haskoin-node
haskoin-store-data hedis http-types monad-logger mtl network nqe
- random rocksdb-haskell rocksdb-query scotty string-conversions text
- time transformers unliftio unordered-containers wai warp
+ random rocksdb-haskell-jprupp rocksdb-query scotty
+ string-conversions text time transformers unliftio
+ unordered-containers wai warp
];
executableHaskellDepends = [
aeson aeson-pretty base bytestring cereal conduit containers
@@ -116877,7 +117433,7 @@ self: {
aeson aeson-pretty base base64 bytestring cereal conduit containers
data-default deepseq hashable haskoin-core haskoin-node
haskoin-store-data hedis hspec http-types monad-logger mtl network
- nqe QuickCheck random rocksdb-haskell rocksdb-query scotty
+ nqe QuickCheck random rocksdb-haskell-jprupp rocksdb-query scotty
string-conversions text time transformers unliftio
unordered-containers wai warp
];
@@ -116896,8 +117452,8 @@ self: {
}:
mkDerivation {
pname = "haskoin-store-data";
- version = "0.34.5";
- sha256 = "0m6wvcagdi8bfb2g6cih0j729sk5h2vl0p3pgvqy6qfqys1rv5z2";
+ version = "0.37.0";
+ sha256 = "1qgn75mqp8xq33hn3y0myycwp4y5j6l3g3y8pj0hhyiwn7brsjbw";
libraryHaskellDepends = [
aeson base bytestring cereal containers data-default deepseq
hashable haskoin-core http-client http-types lens mtl network
@@ -117777,7 +118333,7 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
- "hasql_1_4_4" = callPackage
+ "hasql_1_4_4_2" = callPackage
({ mkDerivation, attoparsec, base, base-prelude, bug, bytestring
, bytestring-strict-builder, contravariant, contravariant-extras
, criterion, dlist, hashable, hashtables, loch-th, mtl
@@ -117788,8 +118344,8 @@ self: {
}:
mkDerivation {
pname = "hasql";
- version = "1.4.4";
- sha256 = "09rsbd6f28nzpmibcx1mqsycz7pl7wga30d6728d6k55670mlhlb";
+ version = "1.4.4.2";
+ sha256 = "09j532mcgs9q1gwr7czvcd85byf3ds3gs4nr5cvlajv4ciaym0di";
libraryHaskellDepends = [
attoparsec base base-prelude bytestring bytestring-strict-builder
contravariant contravariant-extras dlist hashable hashtables
@@ -117898,8 +118454,8 @@ self: {
}:
mkDerivation {
pname = "hasql-dynamic-statements";
- version = "0.2.0.1";
- sha256 = "087zkb89cr0d3brjrpq414jpwswvzvxkbzvw63ahcvmv7lfgaknh";
+ version = "0.2.0.2";
+ sha256 = "017ngp4h1vhlv7lg3hj7l1qr77hf5pqj404dgdq2lqv1qxr7adjg";
libraryHaskellDepends = [
base bytestring containers hasql hasql-implicits ptr
];
@@ -117935,15 +118491,15 @@ self: {
"hasql-implicits" = callPackage
({ mkDerivation, aeson, base, bytestring, containers, hasql
- , network-ip, ptr, scientific, text, time, uuid, vector
+ , network-ip, scientific, text, time, uuid, vector
}:
mkDerivation {
pname = "hasql-implicits";
- version = "0.1.0.1";
- sha256 = "1b9j2za960h3sp48mxqk8lxhjsbhs47lnsvyah8p9wahf69qki5f";
+ version = "0.1.0.2";
+ sha256 = "0kg74bqm9mxf3b1gfbkj78zh859pmivvawi4aqk4h34xvmjx7217";
libraryHaskellDepends = [
- aeson base bytestring containers hasql network-ip ptr scientific
- text time uuid vector
+ aeson base bytestring containers hasql network-ip scientific text
+ time uuid vector
];
description = "Implicit definitions for Hasql, such as default codecs for standard types";
license = stdenv.lib.licenses.mit;
@@ -118086,8 +118642,8 @@ self: {
}:
mkDerivation {
pname = "hasql-queue";
- version = "1.0.1.1";
- sha256 = "0ng1abkhlf8kd8916vpmm0z5m1czvsfnxq4lqsny15qh8bq1pkjl";
+ version = "1.2.0.2";
+ sha256 = "0d8ylf92ydhg12v2rjxxnijzjkkpmws0r1nnxm63w5arwz947n5m";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -118742,8 +119298,8 @@ self: {
}:
mkDerivation {
pname = "haxr";
- version = "3000.11.4";
- sha256 = "1pyf0wjifsvsnx7zzhbn8ps0n578r0p89p2ib0nx1rsi2f1x21i5";
+ version = "3000.11.4.1";
+ sha256 = "12f3acc253x88pk20b60z1qzyhbngvg7zzb9j6azbii0hx8yxxhy";
libraryHaskellDepends = [
array base base-compat base64-bytestring blaze-builder bytestring
HaXml HsOpenSSL http-streams http-types io-streams mtl mtl-compat
@@ -120270,33 +120826,6 @@ self: {
}) {};
"hedgehog" = callPackage
- ({ mkDerivation, ansi-terminal, async, base, bytestring
- , concurrent-output, containers, directory, erf, exceptions, fail
- , lifted-async, mmorph, monad-control, mtl, pretty-show, primitive
- , random, resourcet, semigroups, stm, template-haskell, text, time
- , transformers, transformers-base, wl-pprint-annotated
- }:
- mkDerivation {
- pname = "hedgehog";
- version = "1.0.2";
- sha256 = "1058d5fcv3hhvlx34a8xkg8r75p93l2yhacdbga8d4radiayy34f";
- revision = "3";
- editedCabalFile = "0y9glrf68jx8h8wsrrcdgxwmf0im1rh3g050mf0lk8iv0cdvdd2m";
- libraryHaskellDepends = [
- ansi-terminal async base bytestring concurrent-output containers
- directory erf exceptions fail lifted-async mmorph monad-control mtl
- pretty-show primitive random resourcet semigroups stm
- template-haskell text time transformers transformers-base
- wl-pprint-annotated
- ];
- testHaskellDepends = [
- base containers mmorph mtl pretty-show semigroups text transformers
- ];
- description = "Release with confidence";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "hedgehog_1_0_3" = callPackage
({ mkDerivation, ansi-terminal, async, base, bytestring
, concurrent-output, containers, deepseq, directory, erf
, exceptions, fail, lifted-async, mmorph, monad-control, mtl
@@ -120320,7 +120849,6 @@ self: {
];
description = "Release with confidence";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"hedgehog-checkers" = callPackage
@@ -121258,8 +121786,8 @@ self: {
}:
mkDerivation {
pname = "hercules-ci-agent";
- version = "0.7.2";
- sha256 = "0yzrn08xl1mgr8614vmwn4j7n2rw7bajabn589sdqp83s0fc7bgi";
+ version = "0.7.3";
+ sha256 = "19mz8cqrk7v49h8k2bcpv31qnplx7r10k010gzcwmhhfyrlyrqyg";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -121310,8 +121838,8 @@ self: {
}:
mkDerivation {
pname = "hercules-ci-api-agent";
- version = "0.2.1.0";
- sha256 = "1ir15sssrldsp7d70p9m541ihlas3mxfr48hl67s2fkd3w2s46ah";
+ version = "0.2.2.0";
+ sha256 = "1pp0ink132wwj2wzj7ficxzxhj09bl3fm62fmslrl3l579ycbp7d";
libraryHaskellDepends = [
aeson base base64-bytestring-type bytestring containers cookie
exceptions hashable hercules-ci-api-core http-api-data http-media
@@ -121386,13 +121914,13 @@ self: {
}:
mkDerivation {
pname = "heredocs";
- version = "0.1.6";
- sha256 = "12qsa6vcdc255dx7dc4nfmgy3aam7w6qy92x4811mxx4mxrsr81r";
+ version = "0.2.0.0";
+ sha256 = "1649vhzymizmmi3ggmqxyq4b0fhrpipj4ljy1w7hca2wyh4jm1yw";
libraryHaskellDepends = [
base bytestring doctest parsec template-haskell text
];
testHaskellDepends = [ base bytestring doctest text ];
- description = "heredocument";
+ description = "Heredocument on Haskell";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
broken = true;
@@ -122143,11 +122671,13 @@ self: {
({ mkDerivation, base }:
mkDerivation {
pname = "hextra";
- version = "0.3.0.0";
- sha256 = "13rpdrdq32d8fg9y5mgmfyxjmlpmclsck67fj6zsc1fwxx8c8f8f";
+ version = "0.3.0.3";
+ sha256 = "1vqx8wqac0xy1h2g36ylhyikqw9rd1m2704z27vc97g58vmhxbli";
libraryHaskellDepends = [ base ];
description = "Generic and niche utility functions and more for Haskell";
license = stdenv.lib.licenses.mpl20;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"hextream" = callPackage
@@ -122881,8 +123411,8 @@ self: {
}:
mkDerivation {
pname = "hhp";
- version = "0.0.2";
- sha256 = "0c9hcxvkrsz750r7hqviwn19r1slad4y5cj5m8ip84yiww44bfz4";
+ version = "0.0.3";
+ sha256 = "1d9hhsnf21f2v0hcmw5wpj33qdqw6xbcz979lkp2ilk8mxqgwf32";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -123129,6 +123659,37 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "hie-bios_0_6_1" = callPackage
+ ({ mkDerivation, aeson, base, base16-bytestring, bytestring
+ , conduit, conduit-extra, containers, cryptohash-sha1, deepseq
+ , directory, extra, file-embed, filepath, ghc, hslogger
+ , hspec-expectations, process, tasty, tasty-expected-failure
+ , tasty-hunit, temporary, text, time, transformers, unix-compat
+ , unordered-containers, vector, yaml
+ }:
+ mkDerivation {
+ pname = "hie-bios";
+ version = "0.6.1";
+ sha256 = "0lvsfhv2ahzzqh9jv7837akcy5c4mnyfwrb5k2jlkpq3ywr13x8c";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ aeson base base16-bytestring bytestring conduit conduit-extra
+ containers cryptohash-sha1 deepseq directory extra file-embed
+ filepath ghc hslogger process temporary text time transformers
+ unix-compat unordered-containers vector yaml
+ ];
+ executableHaskellDepends = [ base directory filepath ghc ];
+ testHaskellDepends = [
+ base directory extra filepath ghc hspec-expectations tasty
+ tasty-expected-failure tasty-hunit temporary text
+ unordered-containers yaml
+ ];
+ description = "Set up a GHC API session";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"hie-core" = callPackage
({ mkDerivation, aeson, async, base, binary, bytestring, containers
, data-default, deepseq, directory, extra, filepath, ghc, ghc-boot
@@ -126164,46 +126725,42 @@ self: {
"hnix" = callPackage
({ mkDerivation, aeson, array, base, base16-bytestring, binary
- , bytestring, comonad, containers, contravariant, criterion
- , data-fix, deepseq, deriving-compat, Diff, directory, exceptions
- , filepath, free, generic-random, Glob, hashable, hashing, hedgehog
- , hnix-store-core, http-client, http-client-tls, http-types
- , interpolate, lens-family, lens-family-core, lens-family-th
- , logict, megaparsec, monad-control, monadlist, mtl
- , optparse-applicative, parser-combinators, pretty-show
- , prettyprinter, process, ref-tf, regex-tdfa, scientific, semialign
- , semialign-indexed, semigroups, serialise, some, split, syb, tasty
- , tasty-hedgehog, tasty-hunit, tasty-quickcheck, tasty-th
+ , bytestring, comonad, containers, criterion, data-fix, deepseq
+ , deriving-compat, Diff, directory, exceptions, filepath, free
+ , Glob, hashable, hashing, hedgehog, hnix-store-core, http-client
+ , http-client-tls, http-types, lens-family, lens-family-core
+ , lens-family-th, logict, megaparsec, monad-control, monadlist, mtl
+ , neat-interpolation, optparse-applicative, parser-combinators
+ , pretty-show, prettyprinter, process, ref-tf, regex-tdfa
+ , scientific, semialign, semialign-indexed, serialise, some, split
+ , syb, tasty, tasty-hedgehog, tasty-hunit, tasty-th
, template-haskell, text, these, time, transformers
, transformers-base, unix, unordered-containers, vector, xml
}:
mkDerivation {
pname = "hnix";
- version = "0.9.0";
- sha256 = "17lj5gaqigkrxchdzkhwxab613zzahgh5d8jpqa9jiz7037wgv2w";
- revision = "1";
- editedCabalFile = "0ccn3a2pp4dnd4ibhankrvi2hg7v1660w68wrmw2gabcwfir53lr";
+ version = "0.9.1";
+ sha256 = "1vxb55ih0gpaazb8kvms2sw21l78hb36cbz5217vg94i3yvk8zls";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
aeson array base base16-bytestring binary bytestring comonad
- containers contravariant data-fix deepseq deriving-compat directory
- exceptions filepath free hashable hashing hnix-store-core
- http-client http-client-tls http-types interpolate lens-family
- lens-family-core lens-family-th logict megaparsec monad-control
- monadlist mtl optparse-applicative parser-combinators pretty-show
- prettyprinter process ref-tf regex-tdfa scientific semialign
- semialign-indexed semigroups serialise some split syb
+ containers data-fix deepseq deriving-compat directory exceptions
+ filepath free hashable hashing hnix-store-core http-client
+ http-client-tls http-types lens-family lens-family-core
+ lens-family-th logict megaparsec monad-control monadlist mtl
+ neat-interpolation optparse-applicative parser-combinators
+ pretty-show prettyprinter process ref-tf regex-tdfa scientific
+ semialign semialign-indexed serialise some split syb
template-haskell text these time transformers transformers-base
unix unordered-containers vector xml
];
testHaskellDepends = [
base base16-bytestring bytestring containers data-fix deepseq Diff
- directory exceptions filepath generic-random Glob hedgehog
- interpolate megaparsec mtl optparse-applicative pretty-show
- prettyprinter process serialise split tasty tasty-hedgehog
- tasty-hunit tasty-quickcheck tasty-th template-haskell text time
- transformers unix unordered-containers
+ directory exceptions filepath Glob hedgehog megaparsec mtl
+ neat-interpolation optparse-applicative pretty-show prettyprinter
+ process serialise split tasty tasty-hedgehog tasty-hunit tasty-th
+ template-haskell text time transformers unix unordered-containers
];
benchmarkHaskellDepends = [
base base16-bytestring bytestring containers criterion data-fix
@@ -127311,8 +127868,8 @@ self: {
}:
mkDerivation {
pname = "hoogle";
- version = "5.0.17.15";
- sha256 = "0yl2izlxb863a3vxj4dhqn65qnwmmja799bgm004kcmk646r24jx";
+ version = "5.0.18";
+ sha256 = "16vbjivwwjn687cidg0v9bkdyk9mkv4gn6fmaxcfj8m94vrqdbdx";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -127382,6 +127939,29 @@ self: {
license = stdenv.lib.licenses.isc;
}) {};
+ "hoop" = callPackage
+ ({ mkDerivation, base, containers, haskell-src-exts
+ , haskell-src-meta, hspec, lens, mtl, parsec, pretty
+ , template-haskell, text
+ }:
+ mkDerivation {
+ pname = "hoop";
+ version = "0.3.0.0";
+ sha256 = "1p6094gwivk4lj3alb3c1w43n7qchga8kdnrz09sfyldcygycss8";
+ libraryHaskellDepends = [
+ base containers haskell-src-exts haskell-src-meta lens mtl parsec
+ pretty template-haskell text
+ ];
+ testHaskellDepends = [
+ base containers haskell-src-exts haskell-src-meta hspec lens mtl
+ parsec pretty template-haskell text
+ ];
+ description = "Object-Oriented Programming in Haskell";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"hoopl" = callPackage
({ mkDerivation, base, containers, filepath, mtl, parsec
, test-framework, test-framework-hunit
@@ -128356,8 +128936,8 @@ self: {
}:
mkDerivation {
pname = "hpath-directory";
- version = "0.13.4";
- sha256 = "0cg80zsh0cwkaq4hd6y41afvn340a4byrk6h4dspiksgym5i8ny0";
+ version = "0.14.0";
+ sha256 = "1rv2f0vqbivzqgpk3msxgymqmwp159bi6h2hcdgf65v5j3rhv52n";
libraryHaskellDepends = [
base bytestring exceptions hpath-filepath hpath-posix IfElse
safe-exceptions streamly streamly-bytestring streamly-posix time
@@ -128389,8 +128969,8 @@ self: {
}:
mkDerivation {
pname = "hpath-io";
- version = "0.13.2";
- sha256 = "10dph69qsl73k5rjvr5mvcplwgcmq7qylaxmr2yx7hzcjzsdgg4z";
+ version = "0.14.0";
+ sha256 = "12awqghnway7fhcyzyy6dj5f9p1z15gbp31r1781n892w3vvk4l9";
libraryHaskellDepends = [
base bytestring exceptions hpath hpath-directory hpath-posix
safe-exceptions streamly time unix
@@ -128548,20 +129128,23 @@ self: {
"hpdft" = callPackage
({ mkDerivation, attoparsec, base, binary, bytestring, containers
- , directory, file-embed, parsec, text, utf8-string, zlib
+ , directory, file-embed, memory, optparse-applicative, parsec
+ , semigroups, text, utf8-string, zlib
}:
mkDerivation {
pname = "hpdft";
- version = "0.1.0.5";
- sha256 = "1wcbkxcfwnmfbwfa3dqlqgf825b00x0fvmp4fp3jfxs6s5dyi6lh";
+ version = "0.1.0.6";
+ sha256 = "04r5a9z36dglpfz7j01cz3yizi9l0633rf630ypg2sfxkhn2384w";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
libraryHaskellDepends = [
attoparsec base binary bytestring containers directory file-embed
- parsec text utf8-string zlib
+ memory optparse-applicative parsec semigroups text utf8-string zlib
+ ];
+ executableHaskellDepends = [
+ base bytestring memory optparse-applicative semigroups utf8-string
];
- executableHaskellDepends = [ base bytestring utf8-string ];
description = "A tool for looking through PDF file using Haskell";
license = stdenv.lib.licenses.mit;
hydraPlatforms = stdenv.lib.platforms.none;
@@ -131599,8 +132182,8 @@ self: {
}:
mkDerivation {
pname = "hsinspect-lsp";
- version = "0.0.3";
- sha256 = "0y7y8ldlyajczpiy216jm4inapmpssyri0mv0v7h86xxmgzz5c02";
+ version = "0.0.6";
+ sha256 = "0z02hismrc14yw36ly0xgzavam9n4svwyv0g31yjrg9szyadn1i8";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -132524,23 +133107,6 @@ self: {
}) {};
"hspec-golden" = callPackage
- ({ mkDerivation, base, directory, hspec, hspec-core
- , optparse-applicative, silently
- }:
- mkDerivation {
- pname = "hspec-golden";
- version = "0.1.0.1";
- sha256 = "1h29jffq33r5ffcni50ypa03x7qvx8yymdrp5nck9q8ykiivry22";
- isLibrary = true;
- isExecutable = true;
- libraryHaskellDepends = [ base directory hspec-core ];
- executableHaskellDepends = [ base directory optparse-applicative ];
- testHaskellDepends = [ base directory hspec hspec-core silently ];
- description = "Golden tests for hspec";
- license = stdenv.lib.licenses.mit;
- }) {};
-
- "hspec-golden_0_1_0_2" = callPackage
({ mkDerivation, base, directory, hspec, hspec-core
, optparse-applicative, silently
}:
@@ -132555,7 +133121,6 @@ self: {
testHaskellDepends = [ base directory hspec hspec-core silently ];
description = "Golden tests for hspec";
license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"hspec-golden-aeson" = callPackage
@@ -134883,8 +135448,6 @@ self: {
];
description = "restricting the servers that http-client will use";
license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"http-client-session" = callPackage
@@ -135678,37 +136241,6 @@ self: {
}) {};
"http2" = callPackage
- ({ mkDerivation, aeson, aeson-pretty, array, base
- , base16-bytestring, bytestring, case-insensitive, containers
- , directory, doctest, filepath, gauge, Glob, heaps, hspec
- , http-types, mwc-random, network, network-byte-order, psqueues
- , stm, text, time-manager, unordered-containers, vector
- }:
- mkDerivation {
- pname = "http2";
- version = "2.0.4";
- sha256 = "0rqfx6vvcrlic4sw5xlqzk3xvdsbw13d0ymppx8yjhkkzign6227";
- isLibrary = true;
- isExecutable = true;
- libraryHaskellDepends = [
- array base bytestring case-insensitive containers http-types
- network network-byte-order psqueues stm time-manager
- ];
- testHaskellDepends = [
- aeson aeson-pretty array base base16-bytestring bytestring
- case-insensitive containers directory doctest filepath Glob hspec
- http-types network network-byte-order psqueues stm text
- time-manager unordered-containers vector
- ];
- benchmarkHaskellDepends = [
- array base bytestring case-insensitive containers gauge heaps
- mwc-random network-byte-order psqueues stm
- ];
- description = "HTTP/2 library";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "http2_2_0_5" = callPackage
({ mkDerivation, aeson, aeson-pretty, array, base
, base16-bytestring, bytestring, case-insensitive, containers
, directory, doctest, filepath, gauge, Glob, heaps, hspec
@@ -135737,7 +136269,6 @@ self: {
];
description = "HTTP/2 library";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"http2-client" = callPackage
@@ -136254,17 +136785,6 @@ self: {
}) {};
"hunit-dejafu" = callPackage
- ({ mkDerivation, base, dejafu, exceptions, HUnit }:
- mkDerivation {
- pname = "hunit-dejafu";
- version = "2.0.0.3";
- sha256 = "03kjpc26bpym06ccz0kvbid2n38xdq5j0nd1cywfjbii8zyjmgzg";
- libraryHaskellDepends = [ base dejafu exceptions HUnit ];
- description = "Deja Fu support for the HUnit test framework";
- license = stdenv.lib.licenses.mit;
- }) {};
-
- "hunit-dejafu_2_0_0_4" = callPackage
({ mkDerivation, base, dejafu, exceptions, HUnit }:
mkDerivation {
pname = "hunit-dejafu";
@@ -136273,7 +136793,6 @@ self: {
libraryHaskellDepends = [ base dejafu exceptions HUnit ];
description = "Deja Fu support for the HUnit test framework";
license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"hunit-gui" = callPackage
@@ -139054,8 +139573,8 @@ self: {
}:
mkDerivation {
pname = "hzenity";
- version = "0.3";
- sha256 = "1kggc8xfdc5ychbciyzipyv6skfvyhrgjcb805vrpkz3l2b8h0g8";
+ version = "0.4";
+ sha256 = "1zyj7wnjcmv5pmgzn6cgly2zalys5i9waik17b4n46kk38f2pv1i";
libraryHaskellDepends = [
base containers data-default process process-extras text time
];
@@ -139337,6 +139856,17 @@ self: {
maintainers = with stdenv.lib.maintainers; [ rkrzr ];
}) {};
+ "icfpc2020-galaxy" = callPackage
+ ({ mkDerivation, base, ghc-prim, transformers }:
+ mkDerivation {
+ pname = "icfpc2020-galaxy";
+ version = "0.1.0.1";
+ sha256 = "1nd925iwyy73imw2h0xa3n9vi8rr487v541l9mlb834l20v6mpzl";
+ libraryHaskellDepends = [ base ghc-prim transformers ];
+ description = "A strange message received at the Pegovka observatory";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
"icon-fonts" = callPackage
({ mkDerivation, base }:
mkDerivation {
@@ -141232,6 +141762,30 @@ self: {
license = stdenv.lib.licenses.gpl3;
}) {};
+ "incremental-parser_0_5" = callPackage
+ ({ mkDerivation, base, bytestring, checkers, criterion, deepseq
+ , input-parsers, monoid-subclasses, parsers, QuickCheck
+ , rank2classes, tasty, tasty-quickcheck, text, transformers
+ }:
+ mkDerivation {
+ pname = "incremental-parser";
+ version = "0.5";
+ sha256 = "1r3lmk8y0rg7fb7633ngp68izd2939yv2123vrcmwrvdha99w0g6";
+ libraryHaskellDepends = [
+ base input-parsers monoid-subclasses parsers rank2classes
+ transformers
+ ];
+ testHaskellDepends = [
+ base checkers monoid-subclasses QuickCheck tasty tasty-quickcheck
+ ];
+ benchmarkHaskellDepends = [
+ base bytestring criterion deepseq monoid-subclasses text
+ ];
+ description = "Generic parser library capable of providing partial results from partial input";
+ license = stdenv.lib.licenses.gpl3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"incremental-sat-solver" = callPackage
({ mkDerivation, base, containers, mtl }:
mkDerivation {
@@ -141780,7 +142334,7 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "influxdb_1_8_0" = callPackage
+ "influxdb_1_9_0" = callPackage
({ mkDerivation, aeson, attoparsec, base, bytestring, Cabal
, cabal-doctest, clock, containers, doctest, foldl, http-client
, http-types, lens, network, optional-args, raw-strings-qq
@@ -141789,8 +142343,8 @@ self: {
}:
mkDerivation {
pname = "influxdb";
- version = "1.8.0";
- sha256 = "02hpav4j9shrx4gbfdf2mdfx53x5q24s8qr3yvi7ia4ssbr0bcfd";
+ version = "1.9.0";
+ sha256 = "1d580f2j71x0iww0q2mg47jbhjsd83yarrnnmcp9f2bx7cix174v";
isLibrary = true;
isExecutable = true;
setupHaskellDepends = [ base Cabal cabal-doctest ];
@@ -142086,19 +142640,22 @@ self: {
}) {};
"inline-java" = callPackage
- ({ mkDerivation, base, bytestring, Cabal, directory, filepath, ghc
- , hspec, jni, jvm, language-java, mtl, process, template-haskell
- , temporary, text
+ ({ mkDerivation, base, bytestring, Cabal, criterion, deepseq
+ , directory, filepath, ghc, hspec, jni, jvm, language-java, mtl
+ , process, singletons, template-haskell, temporary, text
}:
mkDerivation {
pname = "inline-java";
- version = "0.8.4";
- sha256 = "1ddgwhk40g23lc71f8wbbfck9pqymil0syi14wsawc25sx6zb52v";
+ version = "0.9.1";
+ sha256 = "12p59gf4dk4q00zpjwp0bzgljfa0nhr32x5schg0hj9bgsj6c6pk";
libraryHaskellDepends = [
base bytestring Cabal directory filepath ghc jni jvm language-java
mtl process template-haskell temporary text
];
testHaskellDepends = [ base hspec jni jvm text ];
+ benchmarkHaskellDepends = [
+ base criterion deepseq jni jvm singletons
+ ];
description = "Java interop via inline Java code in Haskell modules";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
@@ -142161,6 +142718,22 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "input-parsers" = callPackage
+ ({ mkDerivation, attoparsec, base, binary, bytestring
+ , monoid-subclasses, parsec, parsers, text, transformers
+ }:
+ mkDerivation {
+ pname = "input-parsers";
+ version = "0.1.0.1";
+ sha256 = "0wqp98ly2f9vnqd97q9jphmxqr284aal40dlrgi4hwy216p67vzz";
+ libraryHaskellDepends = [
+ attoparsec base binary bytestring monoid-subclasses parsec parsers
+ text transformers
+ ];
+ description = "Extension of the parsers library with more capability and efficiency";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"inquire" = callPackage
({ mkDerivation, aether, base, text }:
mkDerivation {
@@ -142657,6 +143230,26 @@ self: {
broken = true;
}) {intel_aes = null;};
+ "intensional-datatys" = callPackage
+ ({ mkDerivation, aeson, base, containers, directory, extra
+ , filepath, ghc, hashable, haskeline, mtl, unordered-containers
+ }:
+ mkDerivation {
+ pname = "intensional-datatys";
+ version = "0.2.0.0";
+ sha256 = "194f5z6h1pl5jh26zl1rw3d16q60m04a3wdy16vfvwaj2w1bkgz2";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ aeson base containers directory extra filepath ghc hashable
+ haskeline mtl unordered-containers
+ ];
+ testHaskellDepends = [ base ];
+ doHaddock = false;
+ description = "A GHC Core plugin for intensional datatype refinement checking";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"interact" = callPackage
({ mkDerivation, base, bytestring, hspec, main-tester, mtl
, silently
@@ -142865,6 +143458,8 @@ self: {
];
description = "Tracery-like randomized text interpolation";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"interpol" = callPackage
@@ -143017,6 +143612,28 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "interpolator_1_1_0_2" = callPackage
+ ({ mkDerivation, aeson, base, containers, either, hspec
+ , mono-traversable, mtl, product-profunctors, profunctors
+ , QuickCheck, template-haskell, text
+ }:
+ mkDerivation {
+ pname = "interpolator";
+ version = "1.1.0.2";
+ sha256 = "1lrng3y109brnm6jlqnbhrdi38qgwlb0lymxjdv2yv71x7rwdgvf";
+ libraryHaskellDepends = [
+ aeson base containers either mono-traversable mtl
+ product-profunctors profunctors QuickCheck template-haskell text
+ ];
+ testHaskellDepends = [
+ aeson base containers either hspec mono-traversable mtl
+ product-profunctors profunctors QuickCheck template-haskell text
+ ];
+ description = "Runtime interpolation of environment variables in records using profunctors";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"interprocess" = callPackage
({ mkDerivation, base, typed-process }:
mkDerivation {
@@ -143078,6 +143695,18 @@ self: {
broken = true;
}) {};
+ "interval-functor" = callPackage
+ ({ mkDerivation, base, hedgehog, transformers }:
+ mkDerivation {
+ pname = "interval-functor";
+ version = "0.0.0.0";
+ sha256 = "0fkpqav61s47mjvfkhbg2hrx6p78v3jrs6vjj75aixccfg4k8n43";
+ libraryHaskellDepends = [ base transformers ];
+ testHaskellDepends = [ base hedgehog ];
+ description = "Intervals of functors";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"intervals" = callPackage
({ mkDerivation, array, base, Cabal, cabal-doctest, directory
, distributive, doctest, filepath, ghc-prim, QuickCheck
@@ -143309,24 +143938,6 @@ self: {
}) {};
"invertible" = callPackage
- ({ mkDerivation, base, haskell-src-meta, invariant, lens
- , partial-isomorphisms, QuickCheck, semigroupoids, template-haskell
- , transformers
- }:
- mkDerivation {
- pname = "invertible";
- version = "0.2.0.5";
- sha256 = "1fwdbg0pimi9hfyp20fsvyxpicjd7jxg4vsh5kykkxviyfhxl2ha";
- libraryHaskellDepends = [
- base haskell-src-meta invariant lens partial-isomorphisms
- semigroupoids template-haskell transformers
- ];
- testHaskellDepends = [ base QuickCheck transformers ];
- description = "bidirectional arrows, bijective functions, and invariant functors";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "invertible_0_2_0_6" = callPackage
({ mkDerivation, base, haskell-src-meta, invariant, lens
, partial-isomorphisms, QuickCheck, semigroupoids, template-haskell
, transformers
@@ -143342,7 +143953,6 @@ self: {
testHaskellDepends = [ base QuickCheck transformers ];
description = "bidirectional arrows, bijective functions, and invariant functors";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"invertible-grammar" = callPackage
@@ -143847,8 +144457,8 @@ self: {
}:
mkDerivation {
pname = "ipfs";
- version = "1.0.3";
- sha256 = "0m39ixc5xkk1r0k7d5hfszr2hp66i9xdab3y4iqcqxl45nf9q2f2";
+ version = "1.1.0";
+ sha256 = "0qya888h0bf1d1mah3vn5kidv89j5lh0fra9r3i4x0837y7bh5bv";
libraryHaskellDepends = [
aeson base bytestring envy flow Glob ip lens monad-logger
regex-compat rio servant-client servant-server swagger2 text vector
@@ -145386,6 +145996,22 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "ixset-typed-conversions" = callPackage
+ ({ mkDerivation, base, exceptions, hashable, ixset-typed
+ , unordered-containers, zipper-extra
+ }:
+ mkDerivation {
+ pname = "ixset-typed-conversions";
+ version = "0.1.0.0";
+ sha256 = "1ls2hd748pacrdr5w5w3dl9byxas8rhn52rhrs3937l6czmynji0";
+ libraryHaskellDepends = [
+ base exceptions hashable ixset-typed unordered-containers
+ zipper-extra
+ ];
+ description = "Conversions from ixset-typed to other containers";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
"ixshader" = callPackage
({ mkDerivation, base, ghc-prim, indexed, language-glsl, parsec
, prettyclass, singletons, template-haskell, text
@@ -146241,18 +146867,19 @@ self: {
"jni" = callPackage
({ mkDerivation, base, bytestring, choice, constraints, containers
- , cpphs, deepseq, inline-c, jdk, singletons
+ , cpphs, deepseq, hspec, inline-c, jdk, singletons
}:
mkDerivation {
pname = "jni";
- version = "0.6.1";
- sha256 = "1z71vp8qskymgd4bjv8wxxjn34n49m28vnph0p0wbxgpz2wpn4hz";
+ version = "0.7.0";
+ sha256 = "0dznaw0aqkmmymabws4dg7d71acgj72gfn5r587bi5gq0x86sgr3";
libraryHaskellDepends = [
base bytestring choice constraints containers deepseq inline-c
singletons
];
librarySystemDepends = [ jdk ];
libraryToolDepends = [ cpphs ];
+ testHaskellDepends = [ base hspec singletons ];
description = "Complete JNI raw bindings";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
@@ -146568,8 +147195,8 @@ self: {
}:
mkDerivation {
pname = "jsaddle";
- version = "0.9.7.0";
- sha256 = "1hd1ybacng2qydf23dn4qggls2mmz21aay7q947ifdaxg83mv6aq";
+ version = "0.9.7.1";
+ sha256 = "1igkv5lvlbq0xl2dp6d8fp4ybwnwmgrc3r4sfjsric0bj8sq2k86";
libraryHaskellDepends = [
aeson attoparsec base base-compat base64-bytestring bytestring
containers deepseq exceptions filepath ghc-prim http-types lens
@@ -146586,8 +147213,8 @@ self: {
}:
mkDerivation {
pname = "jsaddle-clib";
- version = "0.9.7.0";
- sha256 = "1n1mafr6gnfzmndjs4w7g813dx2khaq4knkhcaqbr2lsbr5yrmg1";
+ version = "0.9.7.1";
+ sha256 = "07s2iy136dm526mr7q43mxqq9qndg8jbi9kz1652qgl0ivn8lapc";
libraryHaskellDepends = [
aeson base base-compat bytestring data-default jsaddle text
];
@@ -146601,8 +147228,8 @@ self: {
}:
mkDerivation {
pname = "jsaddle-dom";
- version = "0.9.4.0";
- sha256 = "0k70x8dv67v585qm9ycb1m32cc47zvr2ka8nbqxazyw09i498h22";
+ version = "0.9.4.1";
+ sha256 = "190r17hfwkkwycj9ikdfvhvfpga30k5rnspib9hi8dygwxgifc6j";
setupHaskellDepends = [ base Cabal ];
libraryHaskellDepends = [
base base-compat exceptions jsaddle lens text transformers
@@ -146635,8 +147262,8 @@ self: {
}:
mkDerivation {
pname = "jsaddle-warp";
- version = "0.9.7.0";
- sha256 = "09pqcnyy2pj48xm8qzs1jyav8a4si0bfw43w0qql74ak137ll60c";
+ version = "0.9.7.1";
+ sha256 = "1piyxxmik1bwdzkz46vgdhdp0gw4p01fww591zqbxzjk6rmrpby0";
libraryHaskellDepends = [
aeson base bytestring containers foreign-store http-types jsaddle
stm text time transformers wai wai-websockets warp websockets
@@ -146660,8 +147287,8 @@ self: {
}:
mkDerivation {
pname = "jsaddle-webkit2gtk";
- version = "0.9.7.0";
- sha256 = "1q4sz2s95pknsr6r8cdqrlmw0b64q4nzllrlhb80knpfxamzyjzp";
+ version = "0.9.7.1";
+ sha256 = "0f2siaid0b03zrjzpb3lr9k9w5np2vml6apd961zd97dghvvhiix";
libraryHaskellDepends = [
aeson base bytestring directory gi-gio gi-glib gi-gtk
gi-javascriptcore gi-webkit2 haskell-gi-base haskell-gi-overloading
@@ -146697,8 +147324,8 @@ self: {
}:
mkDerivation {
pname = "jsaddle-wkwebview";
- version = "0.9.7.0";
- sha256 = "04ni6q8x9c5zqmdm1kfp3yygcflpdf5hx4r568fm5b6rjxi3zhf6";
+ version = "0.9.7.1";
+ sha256 = "0dfaysw7fzmv2b62wi5id45f4i0x2vbjp9irbdkmv1h2z3ydwy20";
libraryHaskellDepends = [
aeson base bytestring containers data-default directory jsaddle
text
@@ -148063,19 +148690,19 @@ self: {
"jvm" = callPackage
({ mkDerivation, base, bytestring, choice, constraints, criterion
, deepseq, distributed-closure, exceptions, hspec, jni, singletons
- , text, vector
+ , template-haskell, text, vector
}:
mkDerivation {
pname = "jvm";
- version = "0.4.2";
- sha256 = "1z3lk2f7bmhi8bj4v32fymjr2bf9czjd73qm6gk33z4mxknddwbh";
+ version = "0.5.0";
+ sha256 = "18n0b5bvy5hhq5x4ynbxa3zbqbh4z5isvzgg9h6hgs7366jyrqhf";
libraryHaskellDepends = [
base bytestring choice constraints distributed-closure exceptions
- jni singletons text vector
+ jni singletons template-haskell text vector
];
testHaskellDepends = [ base bytestring hspec jni text ];
benchmarkHaskellDepends = [
- base criterion deepseq jni singletons
+ base criterion deepseq jni singletons text
];
description = "Call JVM methods from Haskell";
license = stdenv.lib.licenses.bsd3;
@@ -148090,8 +148717,8 @@ self: {
}:
mkDerivation {
pname = "jvm-batching";
- version = "0.1.1";
- sha256 = "06vxhlpvb8ilj0xm5k7chzpsn0f7m48l7728g2m7likh55rs2dxq";
+ version = "0.1.2";
+ sha256 = "1if6yklllgja48bhaqggvmhsx5klbscx2clq37am7vapic5gydai";
setupHaskellDepends = [ base Cabal inline-java ];
libraryHaskellDepends = [
base bytestring distributed-closure inline-java jni jvm singletons
@@ -148168,8 +148795,8 @@ self: {
}:
mkDerivation {
pname = "jvm-streaming";
- version = "0.3.1";
- sha256 = "0kgr2l1gcxy2z30xr89fx1f51h5yycphhh3mpf00wahlkdz7q6wd";
+ version = "0.3.2";
+ sha256 = "16qr1wb8ria2n26irpirfvgr43ibhjfypxbyvzc0vwi941m7np4m";
setupHaskellDepends = [ base Cabal inline-java jvm-batching ];
libraryHaskellDepends = [
base distributed-closure inline-java jni jvm jvm-batching
@@ -150412,36 +151039,6 @@ self: {
}) {};
"krank" = callPackage
- ({ mkDerivation, aeson, base, bytestring, containers, hspec
- , hspec-expectations, http-client, http-types, lifted-async, mtl
- , optparse-applicative, pcre-heavy, pretty-terminal, PyF, req
- , safe-exceptions, text, unordered-containers
- }:
- mkDerivation {
- pname = "krank";
- version = "0.2.1";
- sha256 = "0lg7g5zzjpzjvdzd7ps3dygiqp33891dph35jrf704hkf3ksmqs2";
- isLibrary = true;
- isExecutable = true;
- libraryHaskellDepends = [
- aeson base bytestring containers http-client http-types
- lifted-async mtl pcre-heavy pretty-terminal PyF req safe-exceptions
- text unordered-containers
- ];
- executableHaskellDepends = [
- base containers mtl optparse-applicative pcre-heavy pretty-terminal
- PyF text
- ];
- testHaskellDepends = [
- aeson base bytestring containers hspec hspec-expectations
- http-client http-types lifted-async mtl pcre-heavy pretty-terminal
- PyF req safe-exceptions text unordered-containers
- ];
- description = "Krank checks your code source comments for important markers";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "krank_0_2_2" = callPackage
({ mkDerivation, aeson, base, bytestring, containers, hspec
, hspec-expectations, http-client, http-types, lifted-async, mtl
, optparse-applicative, pcre-heavy, pretty-terminal, PyF, req
@@ -150469,7 +151066,6 @@ self: {
];
description = "Krank checks your code source comments for important markers";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"krapsh" = callPackage
@@ -151199,8 +151795,8 @@ self: {
}:
mkDerivation {
pname = "lambdabot";
- version = "5.3";
- sha256 = "0sw1ghxrgs0zr71icalcs2w03km5bgsrhcwckyil77sjgy0sqx5w";
+ version = "5.3.0.1";
+ sha256 = "0jkp4qr2d37pd0nr074fzrvjn95jg7x7zjwnddsqw5m4m2l1iqsr";
isLibrary = false;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -151218,23 +151814,23 @@ self: {
"lambdabot-core" = callPackage
({ mkDerivation, base, binary, bytestring, containers
, dependent-map, dependent-sum, dependent-sum-template, directory
- , edit-distance, filepath, haskeline, hslogger, HTTP, lifted-base
- , monad-control, mtl, network, network-bsd, parsec, prim-uniq
- , random, random-fu, random-source, regex-tdfa, SafeSemaphore
- , split, syb, template-haskell, time, transformers
+ , edit-distance, exceptions, filepath, haskeline, hslogger, HTTP
+ , lifted-base, monad-control, mtl, network, network-bsd, parsec
+ , prim-uniq, random, random-fu, random-source, regex-tdfa
+ , SafeSemaphore, split, syb, template-haskell, time, transformers
, transformers-base, unix, utf8-string, zlib
}:
mkDerivation {
pname = "lambdabot-core";
- version = "5.3";
- sha256 = "1rbqqrpf6pdvn9mwwh6j0mn6p9w4lf54ax4gkrqsczxqv8gf557s";
+ version = "5.3.0.1";
+ sha256 = "05xx68f3gpc7s1k8p81pwphmiznf7niradf52p39rss3nx8rr3ay";
libraryHaskellDepends = [
base binary bytestring containers dependent-map dependent-sum
- dependent-sum-template directory edit-distance filepath haskeline
- hslogger HTTP lifted-base monad-control mtl network network-bsd
- parsec prim-uniq random random-fu random-source regex-tdfa
- SafeSemaphore split syb template-haskell time transformers
- transformers-base unix utf8-string zlib
+ dependent-sum-template directory edit-distance exceptions filepath
+ haskeline hslogger HTTP lifted-base monad-control mtl network
+ network-bsd parsec prim-uniq random random-fu random-source
+ regex-tdfa SafeSemaphore split syb template-haskell time
+ transformers transformers-base unix utf8-string zlib
];
description = "Lambdabot core functionality";
license = "GPL";
@@ -151411,8 +152007,8 @@ self: {
}:
mkDerivation {
pname = "lambdabot-xmpp";
- version = "0.1.0.4";
- sha256 = "0jgj1vyfw26asnj6zxlfzax6hs3syn29c0abp5b7blzl27iy5pdm";
+ version = "0.1.0.5";
+ sha256 = "1lnha3ivh5hv54k21gl8pir3dbkdlnqdnz5nz5gxcdfajz9bqpxd";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -152153,24 +152749,23 @@ self: {
"language-dickinson" = callPackage
({ mkDerivation, alex, array, base, binary, bytestring
- , composition-prelude, containers, criterion, deepseq, directory
- , filepath, happy, haskeline, microlens, microlens-mtl, mtl
- , optparse-applicative, pretty-simple, prettyprinter, random, tasty
- , tasty-golden, tasty-hunit, text, transformers, zstd
+ , composition-prelude, containers, cpphs, criterion, deepseq
+ , directory, filepath, happy, haskeline, microlens, microlens-mtl
+ , mtl, optparse-applicative, pretty-simple, prettyprinter, random
+ , tasty, tasty-golden, tasty-hunit, template-haskell, text
+ , transformers, zstd
}:
mkDerivation {
pname = "language-dickinson";
- version = "0.1.0.1";
- sha256 = "0ry3mkgvabm4hvax8lm7pdm8bsmp1qiaq6kndfj5m95fc0ddd1j4";
- revision = "1";
- editedCabalFile = "16ys3vfs2cdifvmij9qxa8sgvkvhfhvk47bha865zx78iml6cy58";
+ version = "1.1.0.0";
+ sha256 = "0hq74ijqqlmddins28m35jbyckfs27462jymc9kdjyzvmcp01fh9";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
libraryHaskellDepends = [
array base binary bytestring composition-prelude containers deepseq
directory filepath microlens microlens-mtl mtl prettyprinter random
- text transformers
+ template-haskell text transformers
];
libraryToolDepends = [ alex happy ];
executableHaskellDepends = [
@@ -152178,14 +152773,19 @@ self: {
microlens microlens-mtl mtl optparse-applicative prettyprinter
random text zstd
];
+ executableToolDepends = [ cpphs ];
testHaskellDepends = [
base bytestring filepath pretty-simple prettyprinter tasty
tasty-golden tasty-hunit text
];
- benchmarkHaskellDepends = [ base binary bytestring criterion ];
+ benchmarkHaskellDepends = [
+ base binary bytestring criterion text
+ ];
doHaddock = false;
description = "A language for generative literature";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"language-docker" = callPackage
@@ -152361,6 +152961,19 @@ self: {
broken = true;
}) {};
+ "language-gemini" = callPackage
+ ({ mkDerivation, base, text }:
+ mkDerivation {
+ pname = "language-gemini";
+ version = "0.1.0.0";
+ sha256 = "1pfx1vn3bmjmvf019gdw7pfibfg23spvcpg147gy8ymf4yr7rxz6";
+ revision = "1";
+ editedCabalFile = "0gkllr25h5msjvlcx1pch6a4ndm7yymdqh4ya95drc7gns0kz1zc";
+ libraryHaskellDepends = [ base text ];
+ description = "Datatypes and parsing/printing functions to represent the Gemini markup language";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"language-glsl" = callPackage
({ mkDerivation, base, HUnit, parsec, prettyclass, test-framework
, test-framework-hunit
@@ -152863,10 +153476,8 @@ self: {
}:
mkDerivation {
pname = "language-python";
- version = "0.5.6";
- sha256 = "10xjxyhfamywpydjrimfyk2379inqyi7k7ps41v0pi657ipvbgkr";
- revision = "1";
- editedCabalFile = "0394np5jdxz83qd2mzj0wlvdrp65rxifga4121jq18359r6pcf7f";
+ version = "0.5.8";
+ sha256 = "1mf3czvnh9582klv0c9g7pcn1wx4qjwpvhv8la6afaifv6y5lki2";
libraryHaskellDepends = [
array base containers monads-tf pretty transformers utf8-string
];
@@ -152898,8 +153509,8 @@ self: {
({ mkDerivation, base, language-python }:
mkDerivation {
pname = "language-python-test";
- version = "0.5.4";
- sha256 = "13pd76xv9bd5jdwfzmbi6074dqcpg4m99xxhycbgj3b6b2kmb4g3";
+ version = "0.5.8";
+ sha256 = "0gsh5sziznzsy623izx7fs1s68xdmgf4vmk8rwhmvh5hhxvyazb6";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [ base language-python ];
@@ -154358,6 +154969,8 @@ self: {
];
description = "Yet another library for hidden Markov models";
license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"leb128" = callPackage
@@ -155652,10 +156265,8 @@ self: {
}:
mkDerivation {
pname = "libarchive";
- version = "2.2.5.0";
- sha256 = "0vsrjkg4ijk63rgsl7cqdi1inpnv7ballrg5c5pgrrapwxfb5v4x";
- revision = "1";
- editedCabalFile = "1yc1rjcrxsq2f5hadma9fzrxcmxi1wdb03ynskhza2ynz111hjk3";
+ version = "2.2.5.2";
+ sha256 = "1qydgw1c74c0xp2d5d85qbyyng9rgqgxgvj6fhh94wzgkxj99al6";
setupHaskellDepends = [ base Cabal chs-cabal ];
libraryHaskellDepends = [
base bytestring composition-prelude deepseq dlist filepath mtl
@@ -155673,6 +156284,8 @@ self: {
];
description = "Haskell interface to libarchive";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {inherit (pkgs) libarchive;};
"libarchive-conduit" = callPackage
@@ -156699,8 +157312,8 @@ self: {
}:
mkDerivation {
pname = "lifted-async";
- version = "0.10.0.6";
- sha256 = "1nnhb9sdn5ilwzdrzk9hfchcgvk3kb28fciriqhhxzi2qqzmdxbj";
+ version = "0.10.1.1";
+ sha256 = "1x02dhcih1diw2076b918r3646xw3vbzg99sqpm6iw8yd5sds20p";
libraryHaskellDepends = [
async base constraints lifted-base monad-control transformers-base
];
@@ -156713,15 +157326,15 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "lifted-async_0_10_1_1" = callPackage
+ "lifted-async_0_10_1_2" = callPackage
({ mkDerivation, async, base, constraints, criterion, deepseq
, HUnit, lifted-base, monad-control, mtl, tasty
, tasty-expected-failure, tasty-hunit, tasty-th, transformers-base
}:
mkDerivation {
pname = "lifted-async";
- version = "0.10.1.1";
- sha256 = "1x02dhcih1diw2076b918r3646xw3vbzg99sqpm6iw8yd5sds20p";
+ version = "0.10.1.2";
+ sha256 = "04spjv6l7bpdl3wla78yqg8misq5ym6vi4q8d03iaw2kg4cwn95x";
libraryHaskellDepends = [
async base constraints lifted-base monad-control transformers-base
];
@@ -159606,14 +160219,14 @@ self: {
}:
mkDerivation {
pname = "locators";
- version = "0.2.4.4";
- sha256 = "19csw13qbxxv7lr3blx856k2y21sidgpnv56dq45la3f4100jv9d";
+ version = "0.3.0.2";
+ sha256 = "0bzf88cjd58rf0pp197ziy4fqs4a8bqfj44pr796gszhqggnjr95";
libraryHaskellDepends = [ base bytestring containers cryptohash ];
testHaskellDepends = [
base bytestring containers cryptohash hspec HUnit QuickCheck
];
description = "Human exchangable identifiers and locators";
- license = stdenv.lib.licenses.bsd3;
+ license = stdenv.lib.licenses.mit;
}) {};
"loch" = callPackage
@@ -161347,6 +161960,17 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "lucid-cdn" = callPackage
+ ({ mkDerivation, base, lucid }:
+ mkDerivation {
+ pname = "lucid-cdn";
+ version = "0.1.1.0";
+ sha256 = "1z70mgwa3krd9a4za32psdnqzrvqb9205saqfhxpkny8sd2g14rc";
+ libraryHaskellDepends = [ base lucid ];
+ description = "Curated list of CDN imports for lucid";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
"lucid-colonnade" = callPackage
({ mkDerivation, base, colonnade, lucid, text }:
mkDerivation {
@@ -162301,8 +162925,8 @@ self: {
}:
mkDerivation {
pname = "mackerel-client";
- version = "0.2.0";
- sha256 = "05x0c05h3k8c1qrxmmi4dlj1wxpmfqj6n3man5cqpqp0sxayxv9c";
+ version = "0.3.0";
+ sha256 = "1gzrj2nf3v7d55ddfmjvxijcg78l671b18av25hzsr9ymbbljafb";
libraryHaskellDepends = [
aeson base bytestring data-default directory filepath htoml
http-client http-client-tls http-types parsec split text
@@ -162560,12 +163184,14 @@ self: {
}) {};
"magma" = callPackage
- ({ mkDerivation, base, deepseq, profunctors, semigroups }:
+ ({ mkDerivation, base, deepseq, ghc-prim, profunctors, semigroups
+ }:
mkDerivation {
pname = "magma";
- version = "0.5.0.0";
- sha256 = "17ca22bs44whr597p7shv4fnpngbrb8vdxs6zbglfhb69bgjljyy";
+ version = "0.6.0.0";
+ sha256 = "054drdwpks29mf22imwng8k6i7701yl9hijb4wh2a8wa4axssn9w";
libraryHaskellDepends = [ base deepseq profunctors semigroups ];
+ testHaskellDepends = [ base ghc-prim ];
description = "magma is an algebraic structure";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
@@ -164113,8 +164739,8 @@ self: {
}:
mkDerivation {
pname = "massiv";
- version = "0.5.3.1";
- sha256 = "0biwxrs1k5jzaxvcpjw7ryzm3w5rpb67vzdn3zgi6azci1kqqs78";
+ version = "0.5.3.2";
+ sha256 = "0fprcp231ynl9rax7xniqfr8ryavcbgc0j2h6w3c11n8bnrabrrr";
libraryHaskellDepends = [
base bytestring data-default-class deepseq exceptions primitive
scheduler unliftio-core vector
@@ -164125,8 +164751,6 @@ self: {
];
description = "Massiv (Массив) is an Array Library";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"massiv-io" = callPackage
@@ -164152,8 +164776,6 @@ self: {
];
description = "Import/export of Image files into massiv Arrays";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"massiv-io_0_3_0_1" = callPackage
@@ -164177,7 +164799,6 @@ self: {
description = "Import/export of Image files into massiv Arrays";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"massiv-scheduler" = callPackage
@@ -164220,8 +164841,6 @@ self: {
];
description = "Library that contains generators, properties and tests for Massiv Array Library";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"master-plan" = callPackage
@@ -164415,8 +165034,8 @@ self: {
}:
mkDerivation {
pname = "math-programming";
- version = "0.3.0";
- sha256 = "1dvkg1z1q97lq37v40z92r3rbir2g1x5d3g6nx131cjm034rm5ha";
+ version = "0.4.0";
+ sha256 = "0c154gvx0h1xincmmx2jcrvaivni36ahglbrwx08v8z3wdp51k0m";
libraryHaskellDepends = [ base containers mtl text ];
testHaskellDepends = [
base containers mtl tasty tasty-discover tasty-hunit
@@ -164434,8 +165053,8 @@ self: {
}:
mkDerivation {
pname = "math-programming-glpk";
- version = "0.3.0";
- sha256 = "0cc0888fkhfkj73yfdgpzvvrmkm9z3i1rl4phx13mc3b00qdna56";
+ version = "0.4.1";
+ sha256 = "1ikg8a3pspcrk46rr87lnwkhziihzfpjd543bisqs0pl2db1ll5b";
libraryHaskellDepends = [
base containers glpk-headers math-programming mtl text
];
@@ -164457,8 +165076,8 @@ self: {
}:
mkDerivation {
pname = "math-programming-tests";
- version = "0.3.0";
- sha256 = "15ly6fhcl6p5frbdyavjighqyagi2zby3lzla1s0nn9vsqx6iwgk";
+ version = "0.4.0";
+ sha256 = "01d6yb4zm2jky8jm8jzd1365nhjsa4c50b5a5yx3r7g078lk91pi";
libraryHaskellDepends = [
base math-programming tasty tasty-hunit tasty-quickcheck text
];
@@ -164664,9 +165283,9 @@ self: {
}:
mkDerivation {
pname = "matrix-as-xyz";
- version = "0.1.1.1";
- sha256 = "1hca54xrd0ia4vcqpgkjn65qgk35rzrs3hjl6d758dj3gshq30xp";
- libraryHaskellDepends = [ base hspec matrix parsec QuickCheck ];
+ version = "0.1.1.3";
+ sha256 = "1wrc9605w3wswx14dx8qfsc5a5pyg0mh2f7bkr6hca2a8c59dlym";
+ libraryHaskellDepends = [ base matrix parsec ];
testHaskellDepends = [
base doctest hspec matrix parsec QuickCheck
];
@@ -164676,6 +165295,26 @@ self: {
broken = true;
}) {};
+ "matrix-lens" = callPackage
+ ({ mkDerivation, base, hedgehog, lens, matrix, tasty
+ , tasty-discover, tasty-hedgehog, tasty-hspec, vector
+ }:
+ mkDerivation {
+ pname = "matrix-lens";
+ version = "0.1.0.0";
+ sha256 = "077dwgvm73qlh12ss725ipbry8gqzl3y1xmg6r34r97vcah5a0fy";
+ libraryHaskellDepends = [ base lens matrix vector ];
+ testHaskellDepends = [
+ base hedgehog lens matrix tasty tasty-discover tasty-hedgehog
+ tasty-hspec vector
+ ];
+ testToolDepends = [ tasty-discover ];
+ description = "Optics for the \"matrix\" package";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"matrix-market" = callPackage
({ mkDerivation, base, bytestring }:
mkDerivation {
@@ -167037,8 +167676,8 @@ self: {
}:
mkDerivation {
pname = "microlens-aeson";
- version = "2.3.0.4";
- sha256 = "0w630kk5bnily1qh41081gqgbwmslrh5ad21899gwnb2r3jripyw";
+ version = "2.3.1";
+ sha256 = "074mzpk7av6i0xf7xy42jpzgljlmyw805md1vz4sqy85m99f0ikr";
libraryHaskellDepends = [
aeson attoparsec base bytestring deepseq hashable microlens
scientific text unordered-containers vector
@@ -168280,6 +168919,8 @@ self: {
executableHaskellDepends = [ monad-loops regex-base regex-pcre ];
description = "fortune-mod clone";
license = stdenv.lib.licenses.publicDomain;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"mismi-core" = callPackage
@@ -168406,15 +169047,15 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "miso_1_7_0_0" = callPackage
+ "miso_1_7_1_0" = callPackage
({ mkDerivation, aeson, base, bytestring, containers, http-api-data
, http-types, lucid, network-uri, servant, servant-lucid, text
, transformers, vector
}:
mkDerivation {
pname = "miso";
- version = "1.7.0.0";
- sha256 = "1qww479hwydbazv2jsmrhy9n6v6miyjq5dnld431sav70l9y2y48";
+ version = "1.7.1.0";
+ sha256 = "1hkfcinwymrff8mmvywhnlzbj5804hwkk4rhzxzhzsycdf4v7a41";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -168443,8 +169084,8 @@ self: {
({ mkDerivation }:
mkDerivation {
pname = "miso-examples";
- version = "1.7.0.0";
- sha256 = "0k69yqg1qx31cbf8d3kq57yyl19b5q5a7wsa0ab3l5dhc0jdbkwc";
+ version = "1.7.1.0";
+ sha256 = "1z6zcydai6k9hj1phws1axdcbvdplhxv833is7pzfv8sq9mfyfsc";
isLibrary = false;
isExecutable = true;
description = "A tasty Haskell front-end framework";
@@ -168773,8 +169414,8 @@ self: {
pname = "mmark";
version = "0.0.7.2";
sha256 = "1wwszzba6fvg0r4q5z2dzashim0nkaxzx4rmjl216kdi08jkp7mm";
- revision = "1";
- editedCabalFile = "15mjdasllgy543ipfwapaf3r8lz6i9sxh9ry7xbs0j1gg81px6h6";
+ revision = "2";
+ editedCabalFile = "1wwcar2a5hdwac8r1c1wlqhk7dnidvq98qsgnxyhfh8iblpn81hb";
enableSeparateDataOutput = true;
libraryHaskellDepends = [
aeson base case-insensitive containers deepseq dlist email-validate
@@ -169119,17 +169760,20 @@ self: {
}) {};
"mod" = callPackage
- ({ mkDerivation, base, deepseq, integer-gmp, quickcheck-classes
- , quickcheck-classes-base, semirings, tasty, tasty-quickcheck, time
+ ({ mkDerivation, base, deepseq, integer-gmp, primitive
+ , quickcheck-classes, quickcheck-classes-base, semirings, tasty
+ , tasty-quickcheck, time, vector
}:
mkDerivation {
pname = "mod";
- version = "0.1.1.0";
- sha256 = "03v942bd1hqcvikg71639f1p4s2zrx3zpf1yhwfrkl22c62cy99k";
- libraryHaskellDepends = [ base deepseq integer-gmp semirings ];
+ version = "0.1.2.0";
+ sha256 = "116dm3cid2hh4gii4k806670xz7syxajxmbxka61d43f3719z65y";
+ libraryHaskellDepends = [
+ base deepseq integer-gmp primitive semirings vector
+ ];
testHaskellDepends = [
- base quickcheck-classes quickcheck-classes-base semirings tasty
- tasty-quickcheck
+ base primitive quickcheck-classes quickcheck-classes-base semirings
+ tasty tasty-quickcheck vector
];
benchmarkHaskellDepends = [ base time ];
description = "Fast type-safe modular arithmetic";
@@ -169768,6 +170412,21 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "monad-control-identity" = callPackage
+ ({ mkDerivation, base, monad-control, transformers
+ , transformers-base
+ }:
+ mkDerivation {
+ pname = "monad-control-identity";
+ version = "0.1.0.2";
+ sha256 = "0662yps3s6r3ifrjw0mqn4shzawaz4llhxn68806xc88dzgb4a3a";
+ libraryHaskellDepends = [
+ base monad-control transformers transformers-base
+ ];
+ description = "Stronger classes than monad-control";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"monad-coroutine" = callPackage
({ mkDerivation, base, monad-parallel, transformers
, transformers-compat
@@ -170025,8 +170684,8 @@ self: {
}:
mkDerivation {
pname = "monad-logger";
- version = "0.3.32";
- sha256 = "14f1igbrkvwxxyhk58apc7swpzadaimfyaf75hwmsf5xc7xvjxyr";
+ version = "0.3.34";
+ sha256 = "0sxphrd7g1iwb0nlx0g4y3a661sdsgh098cbyisrm288k9iws91f";
libraryHaskellDepends = [
base bytestring conduit conduit-extra exceptions fast-logger
lifted-base monad-control monad-loops mtl resourcet stm stm-chans
@@ -170037,28 +170696,6 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
- "monad-logger_0_3_33" = callPackage
- ({ mkDerivation, base, bytestring, conduit, conduit-extra
- , exceptions, fast-logger, lifted-base, monad-control, monad-loops
- , mtl, resourcet, stm, stm-chans, template-haskell, text
- , transformers, transformers-base, transformers-compat
- , unliftio-core
- }:
- mkDerivation {
- pname = "monad-logger";
- version = "0.3.33";
- sha256 = "0529blrs6883cw71h2rhw35dlm68rmp5hwr32kkmmzrhxcvdnkjc";
- libraryHaskellDepends = [
- base bytestring conduit conduit-extra exceptions fast-logger
- lifted-base monad-control monad-loops mtl resourcet stm stm-chans
- template-haskell text transformers transformers-base
- transformers-compat unliftio-core
- ];
- description = "A class of monads which can log messages";
- license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
- }) {};
-
"monad-logger-json" = callPackage
({ mkDerivation, aeson, base, monad-logger, template-haskell, text
}:
@@ -170863,8 +171500,8 @@ self: {
}:
mkDerivation {
pname = "monadic-recursion-schemes";
- version = "0.1.11.0";
- sha256 = "0gi9g4vwd2wyff2gjjbjyd1hmx8hv55qmj6kl3c0f3mafxg5vfyj";
+ version = "0.1.12.0";
+ sha256 = "0h5syc9p4imlf03qfb1rjsk4rq2kqry522zvw67x122q1xzdnwnw";
libraryHaskellDepends = [
base comonad containers free mtl recursion-schemes transformers
];
@@ -171282,8 +171919,8 @@ self: {
}:
mkDerivation {
pname = "mono-traversable-instances";
- version = "0.1.0.0";
- sha256 = "0zh81hvqnracil2nvkx14xzwv9vavsnx739acp6gycdyrs5jpzxm";
+ version = "0.1.1.0";
+ sha256 = "1fnkz8dlfz0bl7mx2p5y96w91zdhdvnzx1a9a8zlfxz06mwarhgb";
libraryHaskellDepends = [
base comonad containers dlist dlist-instances mono-traversable
semigroupoids semigroups transformers vector-instances
@@ -172343,27 +172980,6 @@ self: {
}) {inherit (pkgs) mpg123;};
"mpi-hs" = callPackage
- ({ mkDerivation, base, bytestring, c2hs, monad-loops, mpich }:
- mkDerivation {
- pname = "mpi-hs";
- version = "0.7.1.2";
- sha256 = "0dhhvvncmsg6rnb16pi1da4zb82hlwyia0l5xxqz6s7518q0amkh";
- isLibrary = true;
- isExecutable = true;
- libraryHaskellDepends = [ base bytestring monad-loops ];
- librarySystemDepends = [ mpich ];
- libraryToolDepends = [ c2hs ];
- executableHaskellDepends = [ base ];
- executableSystemDepends = [ mpich ];
- testHaskellDepends = [ base monad-loops ];
- testSystemDepends = [ mpich ];
- description = "MPI bindings for Haskell";
- license = stdenv.lib.licenses.asl20;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
- }) {inherit (pkgs) mpich;};
-
- "mpi-hs_0_7_2_0" = callPackage
({ mkDerivation, base, bytestring, c2hs, monad-loops, mpich }:
mkDerivation {
pname = "mpi-hs";
@@ -172665,8 +173281,8 @@ self: {
({ mkDerivation, base, hspec }:
mkDerivation {
pname = "mr-env";
- version = "0.1.0.3";
- sha256 = "01dq9wac3jvbhll3kqjid5xy66hf11r382w8c1hhvmfd5j9bp0n4";
+ version = "0.1.0.4";
+ sha256 = "05f89d0lxmi8w7hgdlqrgxh2abnjghcgjhzmra41p28h26adqnfm";
libraryHaskellDepends = [ base ];
testHaskellDepends = [ base hspec ];
description = "A simple way to read environment variables in Haskell";
@@ -174617,21 +175233,22 @@ self: {
}) {};
"musicScroll" = callPackage
- ({ mkDerivation, async, base, bytestring, containers, cryptonite
- , dbus, deepseq, directory, gi-gtk, gi-gtk-hs, gtk3, mtl, req
- , sqlite-simple, stm, tagsoup, text, transformers, xdg-basedir
+ ({ mkDerivation, async, base, bytestring, containers, contravariant
+ , cryptonite, dbus, deepseq, directory, gi-gtk, gi-gtk-hs, gtk3
+ , mtl, pipes, pipes-concurrency, req, sqlite-simple, stm, tagsoup
+ , text, transformers, xdg-basedir
}:
mkDerivation {
pname = "musicScroll";
- version = "0.2.3.3";
- sha256 = "029k470w8mkqjjan615pbdgzln0fbrcqnpwqhzcc3r79kz4yafzj";
+ version = "0.3.1.0";
+ sha256 = "0ssf841r00zgy8h1l2041hs936mpsqpp4nwr3v6w4b5bva2p9jhn";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
libraryHaskellDepends = [
- async base bytestring containers cryptonite dbus deepseq directory
- gi-gtk gi-gtk-hs mtl req sqlite-simple stm tagsoup text
- transformers xdg-basedir
+ async base bytestring containers contravariant cryptonite dbus
+ deepseq directory gi-gtk gi-gtk-hs mtl pipes pipes-concurrency req
+ sqlite-simple stm tagsoup text transformers xdg-basedir
];
executableHaskellDepends = [ base ];
executablePkgconfigDepends = [ gtk3 ];
@@ -174807,17 +175424,17 @@ self: {
}) {};
"mutable" = callPackage
- ({ mkDerivation, base, constraints, criterion, deepseq, directory
- , generic-lens, generic-lens-core, microlens, microlens-th
- , primitive, reflection, time, transformers, vector, vinyl
+ ({ mkDerivation, base, criterion, deepseq, directory, generic-lens
+ , generic-lens-core, microlens, microlens-th, primitive
+ , template-haskell, time, transformers, vector, vinyl
}:
mkDerivation {
pname = "mutable";
- version = "0.1.0.1";
- sha256 = "1hcyijjq0s71jpa3bwxgk3dbnmyfq07cd8bwssj1aykpaaay3k9j";
+ version = "0.2.2.0";
+ sha256 = "03ahbhnn52mc1wsja3x6cc6ykxx4vqfjb5w5lgi4qiqsc387j16q";
libraryHaskellDepends = [
- base constraints generic-lens generic-lens-core primitive
- reflection transformers vector vinyl
+ base generic-lens generic-lens-core primitive template-haskell
+ transformers vector vinyl
];
benchmarkHaskellDepends = [
base criterion deepseq directory microlens microlens-th time
@@ -175849,6 +176466,46 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "named-servant" = callPackage
+ ({ mkDerivation, base, named, servant }:
+ mkDerivation {
+ pname = "named-servant";
+ version = "0.0.2";
+ sha256 = "0i20c41gwyz5b75sn6a90c3yks4zgkpr5vfb6iqxqxpwyw76g3is";
+ libraryHaskellDepends = [ base named servant ];
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
+ "named-servant-client" = callPackage
+ ({ mkDerivation, base, named, named-servant, servant
+ , servant-client-core
+ }:
+ mkDerivation {
+ pname = "named-servant-client";
+ version = "0.0.2";
+ sha256 = "06a5v4hxb3xafp7745iz8mfd26b4y3j31n2vsivn5v6r0prpi03c";
+ libraryHaskellDepends = [
+ base named named-servant servant servant-client-core
+ ];
+ description = "client support for named-servant";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
+ "named-servant-server" = callPackage
+ ({ mkDerivation, base, named, named-servant, servant
+ , servant-server
+ }:
+ mkDerivation {
+ pname = "named-servant-server";
+ version = "0.0.2";
+ sha256 = "1whsg23kw1qydiy2a59ni57sr97dfhnwlaq7bbgzv2vxmsq2s1g7";
+ libraryHaskellDepends = [
+ base named named-servant servant servant-server
+ ];
+ description = "server support for named-servant";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"named-sop" = callPackage
({ mkDerivation, base, singletons, tasty, tasty-hunit, text }:
mkDerivation {
@@ -176556,15 +177213,15 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
- "neat-interpolation_0_5_1" = callPackage
+ "neat-interpolation_0_5_1_1" = callPackage
({ mkDerivation, base, megaparsec, QuickCheck, quickcheck-instances
, rerebase, tasty, tasty-hunit, tasty-quickcheck, template-haskell
, text
}:
mkDerivation {
pname = "neat-interpolation";
- version = "0.5.1";
- sha256 = "0hfyd74f83mxakahgj6q3wy2r1yg1zbsw1750k7zmwaqn3f8gzjz";
+ version = "0.5.1.1";
+ sha256 = "1bjl2k3b42kqwq15fsnjxxcadsch5dck9cwf8zvnh4gkyfmkbbx4";
libraryHaskellDepends = [ base megaparsec template-haskell text ];
testHaskellDepends = [
QuickCheck quickcheck-instances rerebase tasty tasty-hunit
@@ -178831,42 +179488,54 @@ self: {
"neuron" = callPackage
({ mkDerivation, aeson, aeson-gadt-th, algebraic-graphs, base, clay
- , containers, data-default, dependent-sum, dependent-sum-template
- , dhall, directory, exceptions, file-embed, filepath, filepattern
- , foldl, gitrev, hspec, lucid, megaparsec, mmark, mmark-ext
- , modern-uri, mtl, optparse-applicative, pandoc, parser-combinators
- , QuickCheck, relude, rib, shake, text, time, unix, uuid, which
+ , commonmark, commonmark-extensions, commonmark-pandoc, containers
+ , data-default, dependent-sum, dependent-sum-aeson-orphans
+ , dependent-sum-template, dhall, directory, either, exceptions
+ , file-embed, filepath, filepattern, foldl, hspec, HsYAML
+ , iso8601-time, megaparsec, modern-uri, mtl, optparse-applicative
+ , pandoc, pandoc-types, parsec, parser-combinators, QuickCheck
+ , reflex, reflex-dom-core, reflex-dom-pandoc, relude, rib, shake
+ , shower, skylighting-core, tagged, text, time, unix, uuid, which
, with-utf8
}:
mkDerivation {
pname = "neuron";
- version = "0.4.0.0";
- sha256 = "1iw63qnq484zhi2fil050hswz1hl9cvygpqalhbbhnvry3f9bqkf";
+ version = "0.6.0.0";
+ sha256 = "1gqkypmlhv9hl0d3afjllv9a1ld0dw9qxnk9v1qlmgz65g22b6nr";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
libraryHaskellDepends = [
- aeson algebraic-graphs base containers filepath filepattern
- megaparsec mmark mtl parser-combinators relude text time
+ aeson aeson-gadt-th algebraic-graphs base clay commonmark
+ commonmark-extensions commonmark-pandoc containers data-default
+ dependent-sum dependent-sum-aeson-orphans dependent-sum-template
+ filepath filepattern HsYAML megaparsec modern-uri mtl pandoc-types
+ parsec parser-combinators reflex reflex-dom-core reflex-dom-pandoc
+ relude tagged text time
];
executableHaskellDepends = [
- aeson aeson-gadt-th algebraic-graphs base clay containers
- data-default dependent-sum dependent-sum-template dhall directory
- exceptions file-embed filepath filepattern foldl gitrev lucid
- megaparsec mmark mmark-ext modern-uri mtl optparse-applicative
- pandoc parser-combinators relude rib shake text time unix uuid
- which with-utf8
+ aeson aeson-gadt-th algebraic-graphs base clay commonmark
+ commonmark-extensions commonmark-pandoc containers data-default
+ dependent-sum dependent-sum-aeson-orphans dependent-sum-template
+ dhall directory either exceptions file-embed filepath filepattern
+ foldl HsYAML iso8601-time megaparsec modern-uri mtl
+ optparse-applicative pandoc pandoc-types parsec parser-combinators
+ reflex reflex-dom-core reflex-dom-pandoc relude rib shake shower
+ skylighting-core tagged text time unix uuid which with-utf8
];
testHaskellDepends = [
- aeson aeson-gadt-th algebraic-graphs base clay containers
- data-default dependent-sum dependent-sum-template dhall directory
- exceptions file-embed filepath filepattern foldl gitrev hspec lucid
- megaparsec mmark mmark-ext modern-uri mtl optparse-applicative
- pandoc parser-combinators QuickCheck relude rib shake text time
- unix uuid which with-utf8
+ aeson aeson-gadt-th algebraic-graphs base clay commonmark
+ commonmark-extensions commonmark-pandoc containers data-default
+ dependent-sum dependent-sum-aeson-orphans dependent-sum-template
+ dhall directory either exceptions file-embed filepath filepattern
+ foldl hspec HsYAML iso8601-time megaparsec modern-uri mtl
+ optparse-applicative pandoc pandoc-types parsec parser-combinators
+ QuickCheck reflex reflex-dom-core reflex-dom-pandoc relude rib
+ shake shower skylighting-core tagged text time unix uuid which
+ with-utf8
];
- description = "Haskell meets Zettelkasten, for your plain-text delight";
- license = stdenv.lib.licenses.bsd3;
+ description = "Future-proof system for plain-text notes";
+ license = stdenv.lib.licenses.agpl3;
maintainers = with stdenv.lib.maintainers; [ maralorn ];
}) {};
@@ -179010,6 +179679,8 @@ self: {
pname = "newtype";
version = "0.2.2.0";
sha256 = "1b7bamnd0p8vmxvlg39g5d4a2av49kx10rdyz04ixa28pg8zy01s";
+ revision = "1";
+ editedCabalFile = "0261ljw57c7l7mw3z553s6ak8lmgyqwmfhk1m2jv6snra2i5shs4";
libraryHaskellDepends = [ base ];
description = "A typeclass and set of functions for working with newtypes";
license = stdenv.lib.licenses.bsd3;
@@ -179226,7 +179897,7 @@ self: {
}) {};
"ngx-export-tools-extra" = callPackage
- ({ mkDerivation, aeson, ansi-wl-pprint, base, base64, binary
+ ({ mkDerivation, aeson, ansi-wl-pprint, array, base, base64, binary
, bytestring, case-insensitive, containers, ede
, enclosed-exceptions, http-client, http-types, ngx-export
, ngx-export-tools, safe, snap-core, snap-server, template-haskell
@@ -179234,12 +179905,12 @@ self: {
}:
mkDerivation {
pname = "ngx-export-tools-extra";
- version = "0.5.1.0";
- sha256 = "0yq5m5mkyzy90vi23pbsrmnymvf7h6s8f63wyz9dzwd9s7yvr9a4";
+ version = "0.5.3.0";
+ sha256 = "1vp869aq7qi62bj02m11mg3hg1jz8qg3i67r945rhhjg9qzkn5ax";
libraryHaskellDepends = [
- aeson ansi-wl-pprint base base64 binary bytestring case-insensitive
- containers ede enclosed-exceptions http-client http-types
- ngx-export ngx-export-tools safe snap-core snap-server
+ aeson ansi-wl-pprint array base base64 binary bytestring
+ case-insensitive containers ede enclosed-exceptions http-client
+ http-types ngx-export ngx-export-tools safe snap-core snap-server
template-haskell text time trifecta unordered-containers
];
description = "More extra tools for Nginx haskell module";
@@ -179469,8 +180140,8 @@ self: {
}:
mkDerivation {
pname = "niv";
- version = "0.2.13";
- sha256 = "11znn37j15gzwg6nh6z4k5ijxyyc7gbirnrwlhh4b8868d9axjfy";
+ version = "0.2.14";
+ sha256 = "10iyddplwwfbvj8m3fv0kzjbjnv8yhp17b3xi23dv5pyxzmacp6l";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -179708,6 +180379,7 @@ self: {
];
description = "Interactively browse a Nix store paths dependencies";
license = stdenv.lib.licenses.bsd3;
+ maintainers = with stdenv.lib.maintainers; [ utdemir ];
}) {};
"nixdu" = callPackage
@@ -180071,6 +180743,20 @@ self: {
broken = true;
}) {};
+ "noli" = callPackage
+ ({ mkDerivation, base, cmark, directory, lucid, regex-compat, text
+ }:
+ mkDerivation {
+ pname = "noli";
+ version = "0.1.0.3";
+ sha256 = "1zyihhvr1aag9kzp9j3ksvp8imv1d2waab5grcnf5gdmnfcdchg8";
+ libraryHaskellDepends = [
+ base cmark directory lucid regex-compat text
+ ];
+ description = "A static site generator";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
"nom" = callPackage
({ mkDerivation, algebra, base, base-compat, Cabal, cabal-doctest
, containers, data-default, doctest, extra, finite-typelits, flow
@@ -181381,13 +182067,17 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "numhask_0_5_0" = callPackage
- ({ mkDerivation, base }:
+ "numhask_0_6_0_2" = callPackage
+ ({ mkDerivation, base, bifunctors, mmorph, protolude, text
+ , transformers
+ }:
mkDerivation {
pname = "numhask";
- version = "0.5.0";
- sha256 = "0lqwpa3kmgphimy48asi6dxa1mhkjkjvn2bsy1sl5mkf2y93gwrb";
- libraryHaskellDepends = [ base ];
+ version = "0.6.0.2";
+ sha256 = "1x8p92plblqz5kykqci86wjfvb79gsi00l0a5i2r1frs6imjvkjf";
+ libraryHaskellDepends = [
+ base bifunctors mmorph protolude text transformers
+ ];
description = "numeric classes";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
@@ -181395,20 +182085,16 @@ self: {
"numhask-array" = callPackage
({ mkDerivation, adjunctions, base, deepseq, distributive, doctest
- , hedgehog, hmatrix, numhask, numhask-hedgehog, numhask-prelude
- , protolude, vector
+ , hmatrix, numhask, vector
}:
mkDerivation {
pname = "numhask-array";
- version = "0.6.0";
- sha256 = "1pi9rp6j27pbh4ijbzhazznmyz2079b4h1p3sbnsn09bj35zh7z3";
+ version = "0.7.0";
+ sha256 = "1izfym0y9920i2pbzil3z3sn8rzk23lj1rbgj0x0hc7y2p0w5lbm";
libraryHaskellDepends = [
- adjunctions base deepseq distributive hmatrix numhask
- numhask-prelude protolude vector
- ];
- testHaskellDepends = [
- base doctest hedgehog numhask-hedgehog numhask-prelude
+ adjunctions base deepseq distributive hmatrix numhask vector
];
+ testHaskellDepends = [ base doctest numhask ];
description = "n-dimensional arrays";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
@@ -181494,13 +182180,13 @@ self: {
}:
mkDerivation {
pname = "numhask-space";
- version = "0.4.0";
- sha256 = "0p7pr314wm9mqmsn2jwxpr4z7dplb9nq7rih7c3qxc01lla3i59j";
+ version = "0.5.0";
+ sha256 = "0ygx5qkmsxf9qr1kbv96aqcm2rwb20v57zkn62ibhp01adj8n1gs";
libraryHaskellDepends = [
adjunctions base containers distributive foldl lattices protolude
semigroupoids tdigest text time
];
- testHaskellDepends = [ base doctest ];
+ testHaskellDepends = [ base doctest protolude ];
description = "numerical spaces";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
@@ -181622,8 +182308,8 @@ self: {
}:
mkDerivation {
pname = "nvim-hs";
- version = "2.1.0.3";
- sha256 = "19834hldpywsg52144i9b372msmw5pcj7v0fwiii14pns4sf6v7v";
+ version = "2.1.0.4";
+ sha256 = "0bg94adja6xvzlv1x849nrfpb0i5mjbp19f9cwhaa4iw1qs532rf";
libraryHaskellDepends = [
base bytestring cereal cereal-conduit conduit containers
data-default deepseq foreign-store hslogger megaparsec messagepack
@@ -181645,6 +182331,8 @@ self: {
testToolDepends = [ hspec-discover ];
description = "Haskell plugin backend for neovim";
license = stdenv.lib.licenses.asl20;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"nvim-hs-contrib" = callPackage
@@ -181668,6 +182356,8 @@ self: {
testToolDepends = [ hspec-discover ];
description = "Haskell plugin backend for neovim";
license = stdenv.lib.licenses.asl20;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"nvim-hs-ghcid" = callPackage
@@ -181688,6 +182378,8 @@ self: {
executableHaskellDepends = [ base nvim-hs ];
description = "Neovim plugin that runs ghcid to update the quickfix list";
license = stdenv.lib.licenses.asl20;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"nvvm" = callPackage
@@ -181807,6 +182499,28 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "o-clock_1_2_0" = callPackage
+ ({ mkDerivation, base, doctest, ghc-prim, Glob, hedgehog
+ , markdown-unlit, tasty, tasty-hedgehog, tasty-hspec, type-spec
+ }:
+ mkDerivation {
+ pname = "o-clock";
+ version = "1.2.0";
+ sha256 = "0l8bwv0sagfpyfray4g1nnwb8zl4b2nljwxxwhh71vfhz620vrkx";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [ base ghc-prim ];
+ executableHaskellDepends = [ base ];
+ testHaskellDepends = [
+ base doctest Glob hedgehog markdown-unlit tasty tasty-hedgehog
+ tasty-hspec type-spec
+ ];
+ testToolDepends = [ doctest markdown-unlit ];
+ description = "Type-safe time library";
+ license = stdenv.lib.licenses.mpl20;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"oanda-rest-api" = callPackage
({ mkDerivation, aeson, base, bytestring, conduit, containers
, Decimal, hlint, hspec, http-client, http-conduit, HUnit, lens
@@ -182312,8 +183026,8 @@ self: {
}:
mkDerivation {
pname = "odd-jobs";
- version = "0.2.1";
- sha256 = "0s0sjy91pq7lqhc75cf6z478b956af7af2959g9qaa879vw9bx2k";
+ version = "0.2.2";
+ sha256 = "1l6nyyn27yjn2gkd6yvdxi5iai5af96srkxia24npl5rna2cngfp";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -182936,19 +183650,25 @@ self: {
}) {};
"online" = callPackage
- ({ mkDerivation, backprop, base, doctest, foldl, tasty, tdigest
- , vector, vector-algorithms
+ ({ mkDerivation, adjunctions, backprop, base, containers, doctest
+ , foldl, folds, generic-lens, hmatrix, lens, mwc-probability
+ , mwc-random, numhask, numhask-array, primitive, profunctors
+ , tdigest, text, vector, vector-algorithms
}:
mkDerivation {
pname = "online";
- version = "0.5.0";
- sha256 = "1z7b2aq0zmd65qdi3s6hq17svkw2v62bap586za6kvnbq8fz5cys";
+ version = "0.6.0";
+ sha256 = "1yr3jq4gpjmgfd9q95n3b0g9ib2xjccc56m8mxlzsjxhnqc149jy";
libraryHaskellDepends = [
- backprop base foldl tdigest vector vector-algorithms
+ adjunctions backprop base containers foldl folds generic-lens
+ hmatrix lens mwc-probability mwc-random numhask numhask-array
+ primitive profunctors tdigest text vector vector-algorithms
];
- testHaskellDepends = [ base doctest tasty ];
- description = "online statistics";
+ testHaskellDepends = [ base doctest numhask ];
+ description = "See readme.md";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"online-csv" = callPackage
@@ -183854,14 +184574,14 @@ self: {
license = stdenv.lib.licenses.asl20;
}) {};
- "opentelemetry_0_5_1" = callPackage
+ "opentelemetry_0_6_0" = callPackage
({ mkDerivation, base, bytestring, exceptions, ghc-trace-events
, hashable
}:
mkDerivation {
pname = "opentelemetry";
- version = "0.5.1";
- sha256 = "1rr58ygz83xgrb160yykibz561gd5byzm9w31jp6qx8m9xy8w200";
+ version = "0.6.0";
+ sha256 = "0gl3xax7gz89fc12lyw468qhailgja06skj6siscq9pip03gj6ck";
libraryHaskellDepends = [
base bytestring exceptions ghc-trace-events hashable
];
@@ -183905,19 +184625,19 @@ self: {
broken = true;
}) {};
- "opentelemetry-extra_0_5_1" = callPackage
+ "opentelemetry-extra_0_6_0" = callPackage
({ mkDerivation, aeson, async, base, binary, bytestring, clock
, containers, directory, exceptions, filepath, gauge
, generic-arbitrary, ghc-events, hashable, hashtables, http-client
, http-client-tls, http-types, hvega, opentelemetry, process
- , QuickCheck, random, scientific, splitmix, stm, tasty
- , tasty-discover, tasty-hunit, tasty-quickcheck, text, text-show
- , typed-process, unordered-containers
+ , QuickCheck, quickcheck-instances, random, scientific, splitmix
+ , stm, tasty, tasty-discover, tasty-hunit, tasty-quickcheck, text
+ , text-show, typed-process, unordered-containers
}:
mkDerivation {
pname = "opentelemetry-extra";
- version = "0.5.1";
- sha256 = "10scwjyxsfl7bl6bml1a5aj8fa1a39hmarwgzdnvw2kk6m4p82d0";
+ version = "0.6.0";
+ sha256 = "025fsryqzv0cfny1myrhs4bdrdg8sfp86rvxf671sbl8nli48x1a";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -183927,14 +184647,14 @@ self: {
text-show unordered-containers
];
executableHaskellDepends = [
- async base clock containers directory exceptions filepath
- hashtables http-client http-client-tls hvega opentelemetry process
- text typed-process
+ async base bytestring clock containers directory exceptions
+ filepath hashtables http-client http-client-tls hvega opentelemetry
+ process text typed-process
];
testHaskellDepends = [
base bytestring generic-arbitrary ghc-events hashable opentelemetry
- QuickCheck tasty tasty-discover tasty-hunit tasty-quickcheck text
- text-show unordered-containers
+ QuickCheck quickcheck-instances splitmix tasty tasty-discover
+ tasty-hunit tasty-quickcheck text text-show unordered-containers
];
testToolDepends = [ tasty-discover ];
benchmarkHaskellDepends = [ base gauge opentelemetry ];
@@ -183986,7 +184706,7 @@ self: {
broken = true;
}) {};
- "opentelemetry-lightstep_0_5_1" = callPackage
+ "opentelemetry-lightstep_0_6_0" = callPackage
({ mkDerivation, aeson, async, base, bytestring, clock, containers
, exceptions, filepath, ghc-events, http-client, http-client-tls
, http-types, network, opentelemetry, opentelemetry-extra
@@ -183995,8 +184715,8 @@ self: {
}:
mkDerivation {
pname = "opentelemetry-lightstep";
- version = "0.5.1";
- sha256 = "0nwz7z3lc4iav8wgwpz5ik6jv66fg4wix446n4qwqbhphsr6pymw";
+ version = "0.6.0";
+ sha256 = "09xqda7hxx4dn85hs2zh7y3jjxvi7xprcpv8mmam38hzyhjw2rv7";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -184030,14 +184750,14 @@ self: {
broken = true;
}) {};
- "opentelemetry-wai_0_5_1" = callPackage
+ "opentelemetry-wai_0_6_0" = callPackage
({ mkDerivation, base, bytestring, http-types, opentelemetry, text
, wai
}:
mkDerivation {
pname = "opentelemetry-wai";
- version = "0.5.1";
- sha256 = "0h7xvxgzhbqqvyrx8lp47hjmfnpzrs0zaanag6bfi995mkc8mvkm";
+ version = "0.6.0";
+ sha256 = "1bqq1fs7krckx43w2j4pvfncbyy60rrh6w8n1pcvb629dary5lwn";
libraryHaskellDepends = [
base bytestring http-types opentelemetry text wai
];
@@ -185240,8 +185960,8 @@ self: {
}:
mkDerivation {
pname = "org-mode-lucid";
- version = "1.3.0";
- sha256 = "0a6iy2x0k9r3072zx0sf4k27xnihwckyd1h2pcqd61sxkgf3qkn3";
+ version = "1.4.0";
+ sha256 = "01h8lf3cdkq5s4nx5iy2835sdbly4vrdn2ml34qgaby703drlci4";
libraryHaskellDepends = [
base containers hashable lucid org-mode text
];
@@ -185452,6 +186172,8 @@ self: {
pname = "ormolu";
version = "0.1.2.0";
sha256 = "14ndqfcbx0y71d3q5i7d0scbvg9nd5qr5pdn7qvylxlkgpbc77qp";
+ revision = "1";
+ editedCabalFile = "0c20myzc42zvfhy8lwqgjrhsna5dg8xfbha5y2v7hsapa0km3ri4";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -185471,17 +186193,20 @@ self: {
}) {};
"os-release" = callPackage
- ({ mkDerivation, base, containers, hlint, hspec, parsec, process
- , regex-compat, temporary, transformers
+ ({ mkDerivation, aeson, base, bytestring, filepath, hspec
+ , hspec-megaparsec, megaparsec, pretty-simple, safe-exceptions
+ , tasty, tasty-golden, tasty-hspec, text, unordered-containers
}:
mkDerivation {
pname = "os-release";
- version = "0.2.2";
- sha256 = "19rc9l7i1zq67r5i223pd9m6c1fyy98c29wdhsk5qsb1q7z5f4x9";
- libraryHaskellDepends = [ base containers parsec transformers ];
+ version = "1.0.1";
+ sha256 = "05ajgnihm82ikxgvfnam0msn7id2apiyin9757jrc8wfsh3xvkmx";
+ libraryHaskellDepends = [
+ aeson base megaparsec safe-exceptions text unordered-containers
+ ];
testHaskellDepends = [
- base containers hlint hspec parsec process regex-compat temporary
- transformers
+ base bytestring filepath hspec hspec-megaparsec megaparsec
+ pretty-simple tasty tasty-golden tasty-hspec text
];
description = "/etc/os-release helpers";
license = stdenv.lib.licenses.bsd3;
@@ -186444,10 +187169,11 @@ self: {
maintainers = with stdenv.lib.maintainers; [ peti ];
}) {};
- "pandoc_2_10" = callPackage
+ "pandoc_2_10_1" = callPackage
({ mkDerivation, aeson, aeson-pretty, attoparsec, base
, base64-bytestring, binary, blaze-html, blaze-markup, bytestring
- , case-insensitive, cmark-gfm, connection, containers, criterion
+ , case-insensitive, commonmark, commonmark-extensions
+ , commonmark-pandoc, connection, containers, criterion
, data-default, deepseq, Diff, directory, doclayout, doctemplates
, emojis, exceptions, executable-path, filepath, Glob
, haddock-library, hslua, hslua-module-system, hslua-module-text
@@ -186462,23 +187188,24 @@ self: {
}:
mkDerivation {
pname = "pandoc";
- version = "2.10";
- sha256 = "11jj4pxbbl3b585bcfx641m7bk3hl4vl6fgriv76mach5wljl5j1";
+ version = "2.10.1";
+ sha256 = "16i2sc5nf2gx5aykbd0jmbjcj2ivj5941bvkdj4dxlvy1adlr2lk";
configureFlags = [ "-fhttps" "-f-trypandoc" ];
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
libraryHaskellDepends = [
aeson aeson-pretty attoparsec base base64-bytestring binary
- blaze-html blaze-markup bytestring case-insensitive cmark-gfm
- connection containers data-default deepseq directory doclayout
- doctemplates emojis exceptions filepath Glob haddock-library hslua
- hslua-module-system hslua-module-text HsYAML HTTP http-client
- http-client-tls http-types ipynb jira-wiki-markup JuicyPixels mtl
- network network-uri pandoc-types parsec process random safe
- scientific SHA skylighting skylighting-core split syb tagsoup
- temporary texmath text text-conversions time unicode-transforms
- unix unordered-containers xml zip-archive zlib
+ blaze-html blaze-markup bytestring case-insensitive commonmark
+ commonmark-extensions commonmark-pandoc connection containers
+ data-default deepseq directory doclayout doctemplates emojis
+ exceptions filepath Glob haddock-library hslua hslua-module-system
+ hslua-module-text HsYAML HTTP http-client http-client-tls
+ http-types ipynb jira-wiki-markup JuicyPixels mtl network
+ network-uri pandoc-types parsec process random safe scientific SHA
+ skylighting skylighting-core split syb tagsoup temporary texmath
+ text text-conversions time unicode-transforms unix
+ unordered-containers xml zip-archive zlib
];
executableHaskellDepends = [ base ];
testHaskellDepends = [
@@ -186541,8 +187268,8 @@ self: {
}:
mkDerivation {
pname = "pandoc-citeproc-preamble";
- version = "1.3";
- sha256 = "1lnsklvqvi9569wxdkyk2qwc33mm5d3n28xj64847i8g9af2jqs9";
+ version = "1.5";
+ sha256 = "06zv358m9kzcmpbvl4a3bxzx46nf9g67rk12hbh9cc0crq5kyqdf";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -186561,8 +187288,8 @@ self: {
}:
mkDerivation {
pname = "pandoc-crossref";
- version = "0.3.6.4";
- sha256 = "1k6gfjhfgzvqgm4j6qv9y3gg5p8f87kvqhql3819qzwpsm8nx3k6";
+ version = "0.3.7.0";
+ sha256 = "1mw5bcl0z1vps4xz72pznr1b9ag1g9sxhm2f51wm3236z9q28za6";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -186586,6 +187313,8 @@ self: {
];
description = "Pandoc filter for cross-references";
license = stdenv.lib.licenses.gpl2;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"pandoc-csv2table" = callPackage
@@ -186834,6 +187563,8 @@ self: {
pname = "pandoc-plot";
version = "0.6.1.0";
sha256 = "0jyhb1ab6h990r159a3gdw0cbxxvjrjsd35yyca5bd5rqxzlvnay";
+ revision = "1";
+ editedCabalFile = "1kn5k6xrjs1gh273hc8zrp85w8g72g3rz79v5n4qk33n0pg6ydvw";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -186860,7 +187591,7 @@ self: {
broken = true;
}) {};
- "pandoc-plot_0_7_2_0" = callPackage
+ "pandoc-plot_0_8_0_0" = callPackage
({ mkDerivation, base, bytestring, containers, criterion, directory
, filepath, githash, hashable, hspec, hspec-expectations
, lifted-async, mtl, optparse-applicative, pandoc, pandoc-types
@@ -186869,8 +187600,8 @@ self: {
}:
mkDerivation {
pname = "pandoc-plot";
- version = "0.7.2.0";
- sha256 = "1ah7j0pnf6dm7kzf01d07md5gr3023f03im5z494037hh8g7qd0d";
+ version = "0.8.0.0";
+ sha256 = "10pv918mxyiv6fcpwdybymd4xrzif5qxpqdr9qarbjz6nh90ih2s";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -186878,8 +187609,8 @@ self: {
mtl pandoc pandoc-types shakespeare text typed-process yaml
];
executableHaskellDepends = [
- base directory filepath githash optparse-applicative pandoc
- pandoc-types template-haskell text typed-process
+ base containers directory filepath githash optparse-applicative
+ pandoc pandoc-types template-haskell text typed-process
];
testHaskellDepends = [
base containers directory filepath hspec hspec-expectations
@@ -187859,6 +188590,8 @@ self: {
];
description = "ParDual class for Parallel <-> Sequential";
license = stdenv.lib.licenses.asl20;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"par-traverse" = callPackage
@@ -189316,11 +190049,11 @@ self: {
({ mkDerivation, base, exceptions, path }:
mkDerivation {
pname = "path-extensions";
- version = "0.1.0.1";
- sha256 = "1ywirszpmhbq45gbwfvzssy5z06lmlxdhxck7gbjaffyjbkil5va";
+ version = "0.1.1.0";
+ sha256 = "0pvjb26arsj892addi9x26v8naislh87x6av70k8fjnsish3pnj5";
libraryHaskellDepends = [ base exceptions path ];
description = "Enumeration of common filetype extensions for use with the path library";
- license = stdenv.lib.licenses.bsd3;
+ license = stdenv.lib.licenses.mit;
}) {};
"path-extra" = callPackage
@@ -189348,8 +190081,8 @@ self: {
pname = "path-io";
version = "1.6.0";
sha256 = "0hcdxxwkhdhm59p6x74k1fsgsrqfa100c83cslm1h9ln0anj1r3k";
- revision = "2";
- editedCabalFile = "1x52j77g075k79c7fma0khhbcpja88wylgllnky6q7nccwazm2c2";
+ revision = "3";
+ editedCabalFile = "0rd7svl3jxzqnf8l2h4f7xwlv8av67y85bwmr40954disq714l74";
libraryHaskellDepends = [
base containers directory dlist exceptions filepath path temporary
time transformers unix-compat
@@ -189362,6 +190095,17 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "path-like" = callPackage
+ ({ mkDerivation, base, path }:
+ mkDerivation {
+ pname = "path-like";
+ version = "0.2.0.1";
+ sha256 = "03d5kqs6xr22dl7gjydi1nlzy13wsc0dkmd93pwf37yp85y4bxrp";
+ libraryHaskellDepends = [ base path ];
+ description = "PathLike, FileLike and DirLike type classes for the Path library";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
"path-pieces" = callPackage
({ mkDerivation, base, hspec, HUnit, QuickCheck, text, time }:
mkDerivation {
@@ -190607,6 +191351,25 @@ self: {
broken = true;
}) {};
+ "percent-encoder" = callPackage
+ ({ mkDerivation, array, base, bytestring, criterion, network-uri
+ , QuickCheck, quickcheck-instances
+ }:
+ mkDerivation {
+ pname = "percent-encoder";
+ version = "0.0.0.0";
+ sha256 = "1aqa25kydhvf9jiqk5a928fmgi9g94d2b44gkq8vqlzbq0azi126";
+ libraryHaskellDepends = [ array base bytestring ];
+ testHaskellDepends = [
+ base bytestring QuickCheck quickcheck-instances
+ ];
+ benchmarkHaskellDepends = [
+ base bytestring criterion network-uri
+ ];
+ description = "Percent encode/decode ByteStrings";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"percent-format" = callPackage
({ mkDerivation, base, leancheck }:
mkDerivation {
@@ -190641,6 +191404,8 @@ self: {
pname = "perceptual-hash";
version = "0.1.3.5";
sha256 = "0f36sy9ixwbx55m3634lr0hrhllj68wv5jilzq0xik2171g3rx2p";
+ revision = "1";
+ editedCabalFile = "0s67w3sc480vrmdjr67y6gjyhfik6v2lrh99abcgj6ikgiwx2lbf";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -190711,12 +191476,12 @@ self: {
}:
mkDerivation {
pname = "perf";
- version = "0.6.0";
- sha256 = "1cn2f3hisw5r99m459zalcgfgdr54f8wsp1wlg48jjvgvsx5dj0k";
+ version = "0.7.0";
+ sha256 = "140fy74sq3b1k6px008yz2pr9ikikd68llzc411qs3nclwzasxgx";
libraryHaskellDepends = [
base containers deepseq foldl rdtsc text time transformers
];
- testHaskellDepends = [ base doctest ];
+ testHaskellDepends = [ base deepseq doctest rdtsc ];
description = "Low-level run time measurement";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
@@ -191724,7 +192489,7 @@ self: {
maintainers = with stdenv.lib.maintainers; [ psibi ];
}) {};
- "persistent-template_2_8_3_0" = callPackage
+ "persistent-template_2_8_3_1" = callPackage
({ mkDerivation, aeson, base, bytestring, containers, criterion
, deepseq, deepseq-generics, file-embed, hspec, http-api-data
, monad-control, monad-logger, path-pieces, persistent, QuickCheck
@@ -191733,8 +192498,8 @@ self: {
}:
mkDerivation {
pname = "persistent-template";
- version = "2.8.3.0";
- sha256 = "0ss6xa8lg6fg7ch9b2ps2s0nn87dp070xwm23z33mj2m5jd6n7kr";
+ version = "2.8.3.1";
+ sha256 = "1g42j4pqf40wj6b9zzyvimrfvrpvjfzigydsx2wkr5dld909izb0";
libraryHaskellDepends = [
aeson base bytestring containers http-api-data monad-control
monad-logger path-pieces persistent template-haskell text
@@ -195821,6 +196586,17 @@ self: {
broken = true;
}) {};
+ "poly-rec" = callPackage
+ ({ mkDerivation, base, requirements }:
+ mkDerivation {
+ pname = "poly-rec";
+ version = "0.6.0.0";
+ sha256 = "1csi81i0j3hk2gsc3c0rx939i67b0mj2pi064giw20yspqqjrp27";
+ libraryHaskellDepends = [ base requirements ];
+ description = "Polykinded extensible records";
+ license = stdenv.lib.licenses.gpl3;
+ }) {};
+
"polyToMonoid" = callPackage
({ mkDerivation, base }:
mkDerivation {
@@ -197369,6 +198145,8 @@ self: {
pname = "postgresql-placeholder-converter";
version = "0.1.0.0";
sha256 = "1dprqv0r00nrx6m0byqfzpb91h5kz3nxd0w0m21150l68sj2d8ys";
+ revision = "1";
+ editedCabalFile = "0mla1cibyc13bz7gvv5b31il8nyp0vjfi8xqgpynbjfq7d4fjnnc";
libraryHaskellDepends = [
attoparsec base bytestring mtl utf8-string
];
@@ -197382,42 +198160,46 @@ self: {
({ mkDerivation, attoparsec, base, base16-bytestring, bytestring
, Cabal, cassava, clock, containers, convertible, cryptohash-md5
, data-default-class, deepseq, directory, doctest
- , double-conversion, HDBC, HDBC-postgresql, HDBC-session, homotuple
- , hourglass, hspec, hspec-core, HUnit, list-tuple, memory, mtl
- , network, old-time, Only, optparse-applicative, persistable-record
- , postgresql-binary, postgresql-libpq, postgresql-simple
- , pretty-hex, QuickCheck, random-shuffle, relational-query
- , relational-query-HDBC, relational-record, safe-exceptions
- , scientific, single-tuple, text, time, utf8-string, vector
+ , double-conversion, filepath, HDBC, HDBC-postgresql, HDBC-session
+ , homotuple, hourglass, hspec, hspec-core, HUnit, list-tuple
+ , memory, mtl, network, old-time, OneTuple, Only
+ , optparse-applicative, persistable-record, postgresql-binary
+ , postgresql-libpq, postgresql-placeholder-converter
+ , postgresql-simple, pretty-hex, QuickCheck, random-shuffle
+ , relational-query, relational-query-HDBC, relational-record
+ , safe-exceptions, scientific, single-tuple, text, time
+ , utf8-string, vector
}:
mkDerivation {
pname = "postgresql-pure";
- version = "0.1.3.0";
- sha256 = "1p6v7imz61svz03nh114qxl5fks6aibs78sgmi3my8zjdfb34ddk";
- setupHaskellDepends = [ base Cabal directory ];
+ version = "0.2.2.0";
+ sha256 = "16k03m1yy8ca5rik4av76p883nvmk0w4ak9pva2i5l57vv8d8hc6";
+ setupHaskellDepends = [ base Cabal directory filepath ];
libraryHaskellDepends = [
attoparsec base base16-bytestring bytestring containers convertible
cryptohash-md5 data-default-class double-conversion HDBC homotuple
- list-tuple memory mtl network Only postgresql-binary pretty-hex
- safe-exceptions scientific single-tuple text time utf8-string
+ list-tuple memory mtl network OneTuple Only postgresql-binary
+ postgresql-placeholder-converter pretty-hex safe-exceptions
+ scientific single-tuple text time utf8-string
];
testHaskellDepends = [
attoparsec base base16-bytestring bytestring containers convertible
cryptohash-md5 data-default-class doctest double-conversion HDBC
HDBC-postgresql HDBC-session homotuple hspec hspec-core HUnit
- list-tuple memory mtl network old-time Only persistable-record
- postgresql-binary pretty-hex QuickCheck relational-query
- relational-query-HDBC relational-record safe-exceptions scientific
- single-tuple text time utf8-string
+ list-tuple memory mtl network old-time OneTuple Only
+ persistable-record postgresql-binary
+ postgresql-placeholder-converter pretty-hex QuickCheck
+ relational-query relational-query-HDBC relational-record
+ safe-exceptions scientific single-tuple text time utf8-string
];
benchmarkHaskellDepends = [
attoparsec base base16-bytestring bytestring cassava clock
containers convertible cryptohash-md5 data-default-class deepseq
double-conversion HDBC homotuple hourglass list-tuple memory mtl
- network Only optparse-applicative postgresql-binary
- postgresql-libpq postgresql-simple pretty-hex random-shuffle
- safe-exceptions scientific single-tuple text time utf8-string
- vector
+ network OneTuple Only optparse-applicative postgresql-binary
+ postgresql-libpq postgresql-placeholder-converter postgresql-simple
+ pretty-hex random-shuffle safe-exceptions scientific single-tuple
+ text time utf8-string vector
];
description = "pure Haskell PostgreSQL driver";
license = stdenv.lib.licenses.bsd3;
@@ -197598,8 +198380,8 @@ self: {
}:
mkDerivation {
pname = "postgresql-simple-opts";
- version = "0.6.0.0";
- sha256 = "0zsr0zgn5y1bpj98aq00v7xd0p3kmfk692djw0rp6ikw1390bbdb";
+ version = "0.6.0.1";
+ sha256 = "09b213lz0405c5x82g9vwpa7blrbi86m77r1wyd8m4hlviid3s7q";
libraryHaskellDepends = [
base bytestring data-default either envy generic-deriving
optparse-applicative optparse-generic postgres-options
@@ -198540,24 +199322,23 @@ self: {
"predicate-typed" = callPackage
({ mkDerivation, aeson, base, binary, bytestring, comonad
- , containers, deepseq, directory, doctest, ghc-prim, hashable, lens
- , mtl, pcre-heavy, pcre-light, pretty, pretty-terminal, QuickCheck
- , safe, stm, tasty, tasty-hunit, tasty-quickcheck, template-haskell
- , text, th-lift, these, time, tree-view
+ , containers, deepseq, directory, doctest, hashable, lens, mtl
+ , pcre-heavy, pcre-light, pretty, pretty-terminal, QuickCheck, safe
+ , stm, tasty, tasty-hunit, tasty-quickcheck, template-haskell, text
+ , th-lift, these, time, tree-view
}:
mkDerivation {
pname = "predicate-typed";
- version = "0.6.2.1";
- sha256 = "11gby9bjkh6bqznxxiz3ggdr0z13qihgh6pry014rap2iqzj71za";
+ version = "0.7.1.0";
+ sha256 = "16wc74wb6q890x1nm2d33al2vr3wc7vmpm1c5f83wfbx4w6qqmkc";
libraryHaskellDepends = [
aeson base binary bytestring comonad containers deepseq directory
- ghc-prim hashable lens mtl pcre-heavy pcre-light pretty
- pretty-terminal QuickCheck safe template-haskell text th-lift these
- time tree-view
+ hashable lens mtl pcre-heavy pcre-light pretty pretty-terminal
+ QuickCheck safe template-haskell text th-lift these time tree-view
];
testHaskellDepends = [
aeson base binary bytestring comonad containers deepseq directory
- doctest ghc-prim hashable lens mtl pcre-heavy pcre-light pretty
+ doctest hashable lens mtl pcre-heavy pcre-light pretty
pretty-terminal QuickCheck safe stm tasty tasty-hunit
tasty-quickcheck template-haskell text th-lift these time tree-view
];
@@ -200946,10 +201727,8 @@ self: {
}:
mkDerivation {
pname = "project-template";
- version = "0.2.0.1";
- sha256 = "1p69ww4rhah2qxragl615wl4a6mk4x9w09am8knmz3s4lxpljlpb";
- revision = "1";
- editedCabalFile = "0lq3sqnq0nr0gbvgzp0lqdl3j3mqdmdlf8xsw0j3pjh581xj3k0a";
+ version = "0.2.1.0";
+ sha256 = "0ac43x36i6b595jhflif1qqhri1rrqw90ama5n7rsh0ffnzyb69d";
libraryHaskellDepends = [
base base64-bytestring bytestring conduit conduit-extra containers
directory filepath mtl resourcet text transformers
@@ -201724,14 +202503,13 @@ self: {
, insert-ordered-containers, lens, mtl, neat-interpolation
, optparse-applicative, optparse-generic, parsec, parsers, pretty
, pretty-show, proto3-wire, QuickCheck, quickcheck-instances
- , range-set-list, safe, semigroups, swagger2, system-filepath
- , tasty, tasty-hunit, tasty-quickcheck, text, transformers, turtle
- , vector
+ , range-set-list, safe, swagger2, system-filepath, tasty
+ , tasty-hunit, tasty-quickcheck, text, transformers, turtle, vector
}:
mkDerivation {
pname = "proto3-suite";
- version = "0.4.0.0";
- sha256 = "0pmd7fhw4y90h1qffmgxkqijdscqw0qj7nhj0pvrvz1av6svhvr1";
+ version = "0.4.0.2";
+ sha256 = "0mk1yhpq2q6jv7z3ipdq5dw5sij39y7lv5gaslzxkbvs2kan7d4m";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -201740,8 +202518,8 @@ self: {
bytestring cereal containers contravariant deepseq filepath foldl
hashable haskell-src insert-ordered-containers lens mtl
neat-interpolation parsec parsers pretty pretty-show proto3-wire
- QuickCheck quickcheck-instances safe semigroups swagger2
- system-filepath text transformers turtle vector
+ QuickCheck quickcheck-instances safe swagger2 system-filepath text
+ transformers turtle vector
];
executableHaskellDepends = [
base containers mtl optparse-applicative optparse-generic
@@ -201750,8 +202528,8 @@ self: {
testHaskellDepends = [
aeson attoparsec base base64-bytestring bytestring cereal
containers deepseq doctest generic-arbitrary mtl pretty-show
- proto3-wire QuickCheck semigroups swagger2 tasty tasty-hunit
- tasty-quickcheck text transformers turtle vector
+ proto3-wire QuickCheck swagger2 tasty tasty-hunit tasty-quickcheck
+ text transformers turtle vector
];
description = "A low level library for writing out data in the Protocol Buffers wire format";
license = stdenv.lib.licenses.asl20;
@@ -201853,6 +202631,17 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "protocol" = callPackage
+ ({ mkDerivation, base, freer-indexed, singletons }:
+ mkDerivation {
+ pname = "protocol";
+ version = "0.1.0.1";
+ sha256 = "16pbhfggw46jdjyljqr6dr0mlzmfhvwmw3lg1s5rp90zg4jgvha0";
+ libraryHaskellDepends = [ base freer-indexed singletons ];
+ description = "Model distributed system as type-level multi-party protocol";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"protocol-buffers" = callPackage
({ mkDerivation, aeson, array, base, base16-bytestring, binary
, bytestring, containers, directory, filepath, mtl, parsec, syb
@@ -202299,8 +203088,8 @@ self: {
}:
mkDerivation {
pname = "ptr";
- version = "0.16.7";
- sha256 = "1mnwx657mcg0c0hg71z6kglxckjxc7xsypy00m7lsj37l6bpfnjr";
+ version = "0.16.7.2";
+ sha256 = "0d00albfv3zbbq54x9i8riwbpi61mpz7ymr8y1whag2lrw4diyna";
libraryHaskellDepends = [
base bytestring contravariant profunctors text time vector
];
@@ -202393,8 +203182,8 @@ self: {
}:
mkDerivation {
pname = "publish";
- version = "2.1.0";
- sha256 = "03fwk0ami5xxqacqb8gikqzxdp7cavvni5bmxd5bi1lvavk49sh7";
+ version = "2.1.3";
+ sha256 = "1d16pz8nlqdvlp4d1129k71vzdyql1szhk158b446k988akmgaq8";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -202829,8 +203618,8 @@ self: {
}:
mkDerivation {
pname = "purebred-email";
- version = "0.4.1";
- sha256 = "0fkdmd0glp8p2dyzfpm3ah6nbfw4jqfzx7ai6yl2f9yrssb0ckp9";
+ version = "0.4.2";
+ sha256 = "18cjifncnxi4c3xxkgvvvay56h2a0zs83505xf1a9fkz5n8iwqby";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -202891,6 +203680,8 @@ self: {
pname = "purescript";
version = "0.13.8";
sha256 = "0sh9z3ir3jiwmi5h95v9p7j746xxidg1hrxha89c0zl6vr4sq7vh";
+ revision = "1";
+ editedCabalFile = "1ilnqfxscwkr0jl09y1dwi2aabwnghd0l22lm32jgfyq04njpc2a";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -203048,6 +203839,8 @@ self: {
executableHaskellDepends = [ base text ];
description = "A cli client for pursuit";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"push-notifications" = callPackage
@@ -203817,8 +204610,8 @@ self: {
}:
mkDerivation {
pname = "qrcode-core";
- version = "0.9.3";
- sha256 = "08kp0qp7kvld99kk2iwr6cxpxji2w9vjydivqc3nwxbk5ay2mpjg";
+ version = "0.9.4";
+ sha256 = "1drjx73qslga81bhby0h000icrvnhhlv36n6i37j8524x9ir2gn0";
libraryHaskellDepends = [
base binary bytestring case-insensitive containers dlist primitive
text vector
@@ -204110,6 +204903,8 @@ self: {
];
description = "Coronavirus quarantine timer web app for your things";
license = stdenv.lib.licenses.bsd2;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"qudb" = callPackage
@@ -204928,10 +205723,8 @@ self: {
}:
mkDerivation {
pname = "quickspec";
- version = "2.1.2";
- sha256 = "0igqwa195qgps5vla2a4f83rq4vdq739i94kbzzmbnniylx9wgdw";
- revision = "1";
- editedCabalFile = "0r1jmxcm08mhfxz6gggnnpgcwm4zd3zm76p5lj37h04cvq6kyaa5";
+ version = "2.1.4";
+ sha256 = "0h07s2dk4kjqv3hspazjwqbr8p78g2n5ah75h0a6ywdfgdy2z621";
libraryHaskellDepends = [
base constraints containers data-lens-light dlist QuickCheck
quickcheck-instances random spoon template-haskell transformers
@@ -206214,6 +207007,8 @@ self: {
];
description = "Additional functions for random values";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"random-fu" = callPackage
@@ -206231,6 +207026,8 @@ self: {
];
description = "Random number generation";
license = stdenv.lib.licenses.publicDomain;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"random-fu-multivariate" = callPackage
@@ -206243,6 +207040,8 @@ self: {
testHaskellDepends = [ base ];
description = "Multivariate distributions for random-fu";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"random-hypergeometric" = callPackage
@@ -206301,6 +207100,8 @@ self: {
];
description = "Generic basis for random number generators";
license = stdenv.lib.licenses.publicDomain;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"random-stream" = callPackage
@@ -206522,6 +207323,8 @@ self: {
];
description = "Find the rank product of a data set";
license = stdenv.lib.licenses.gpl3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"rank1dynamic" = callPackage
@@ -207374,22 +208177,22 @@ self: {
"rdf4h" = callPackage
({ mkDerivation, algebraic-graphs, attoparsec, base, binary
, bytestring, containers, criterion, deepseq, directory, exceptions
- , filepath, hashable, hgal, html-entities, http-conduit, HUnit
+ , filepath, hashable, html-entities, http-conduit, HUnit
, lifted-base, mmorph, mtl, network-uri, parsec, parsers
, QuickCheck, safe, selective, tasty, tasty-hunit, tasty-quickcheck
, text, unordered-containers, xeno
}:
mkDerivation {
pname = "rdf4h";
- version = "4.0.1";
- sha256 = "1nnkgl8xsh7xp6wsfd295qxh3yay6v7isxkh0xx18sdpm7lwdydq";
+ version = "4.0.2";
+ sha256 = "1gkz1i1v2509aa5c9jp2lgmsnnsr7d1314gq3xmcs21dfgf7xibw";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
algebraic-graphs attoparsec base binary bytestring containers
- deepseq exceptions filepath hashable hgal html-entities
- http-conduit lifted-base mmorph mtl network-uri parsec parsers
- selective text unordered-containers xeno
+ deepseq exceptions filepath hashable html-entities http-conduit
+ lifted-base mmorph mtl network-uri parsec parsers selective text
+ unordered-containers xeno
];
executableHaskellDepends = [ base containers text ];
testHaskellDepends = [
@@ -207666,8 +208469,8 @@ self: {
}:
mkDerivation {
pname = "reactive-banana-gi-gtk";
- version = "0.4.0.2";
- sha256 = "136wzp6v9g6k5aa6w5wh0n96qcq9lm7h0lc87pk170ypymadp6ak";
+ version = "0.4.1.0";
+ sha256 = "021fkmwgymmlf1ha03y9rdimbck7sglmg4cjpdf76z01r6hpzbrb";
libraryHaskellDepends = [
base gi-gtk haskell-gi-base reactive-banana text transformers
];
@@ -207976,20 +208779,20 @@ self: {
}) {};
"readability" = callPackage
- ({ mkDerivation, base, bytestring, containers, html-conduit
+ ({ mkDerivation, aeson, base, bytestring, containers, html-conduit
, http-conduit, optparse-applicative, text, xml-conduit
}:
mkDerivation {
pname = "readability";
- version = "0.0.1.0";
- sha256 = "1g96fa6h2zayc3icys900sfhvk943gp991667miiv4lk0bdlpkrr";
+ version = "0.1.0.0";
+ sha256 = "1px8fjwglcrh6vp2j8jcbslc6izgaj8cnl0w7g997gps62jbqn34";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
base bytestring containers html-conduit text xml-conduit
];
executableHaskellDepends = [
- base http-conduit optparse-applicative text xml-conduit
+ aeson base http-conduit optparse-applicative text xml-conduit
];
description = "Extracts text of main article from HTML document";
license = stdenv.lib.licenses.bsd3;
@@ -208065,19 +208868,20 @@ self: {
"readme-lhs" = callPackage
({ mkDerivation, attoparsec, base, blaze-html, containers, doctest
- , foldl, pandoc, pandoc-types, protolude, text, transformers
+ , foldl, numhask, pandoc, pandoc-types, scientific, tdigest, text
+ , transformers
}:
mkDerivation {
pname = "readme-lhs";
- version = "0.6.0";
- sha256 = "0q47r8dbmvmpk8fa6s4lwv5i9g4fhbyhd6c350h9ic55nqg04svv";
+ version = "0.7.0";
+ sha256 = "0sgfqx34yzlvn2999wh2681gk6dan9nrlkzd3indybkmal9mc80b";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
- attoparsec base blaze-html containers foldl pandoc pandoc-types
- protolude text transformers
+ attoparsec base blaze-html containers foldl numhask pandoc
+ pandoc-types scientific tdigest text transformers
];
- executableHaskellDepends = [ base protolude text ];
+ executableHaskellDepends = [ base numhask text ];
testHaskellDepends = [ base containers doctest ];
description = "See readme.md";
license = stdenv.lib.licenses.bsd3;
@@ -208263,6 +209067,28 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "rebase_1_7" = callPackage
+ ({ mkDerivation, base, bifunctors, bytestring, comonad, containers
+ , contravariant, contravariant-extras, deepseq, dlist, either
+ , hashable, mtl, profunctors, scientific, selective, semigroupoids
+ , semigroups, stm, text, time, transformers, unordered-containers
+ , uuid, vector, void
+ }:
+ mkDerivation {
+ pname = "rebase";
+ version = "1.7";
+ sha256 = "1gqdqx2sbm7hn6pyqqi65g8mwz2igsq1lz7y3qdplv2aic6myla7";
+ libraryHaskellDepends = [
+ base bifunctors bytestring comonad containers contravariant
+ contravariant-extras deepseq dlist either hashable mtl profunctors
+ scientific selective semigroupoids semigroups stm text time
+ transformers unordered-containers uuid vector void
+ ];
+ description = "A more progressive alternative to the \"base\" package";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"rebindable" = callPackage
({ mkDerivation, base, data-default-class, indexed }:
mkDerivation {
@@ -208285,6 +209111,21 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "recommender-als" = callPackage
+ ({ mkDerivation, base, containers, data-default-class, hmatrix
+ , parallel, random, vector
+ }:
+ mkDerivation {
+ pname = "recommender-als";
+ version = "0.2.0.0";
+ sha256 = "14nw3ns52da4jlbwblbavchxzv1pjhc1zkjzcwfrqznxgsd5525p";
+ libraryHaskellDepends = [
+ base containers data-default-class hmatrix parallel random vector
+ ];
+ description = "Recommendations using alternating least squares algorithm";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"record" = callPackage
({ mkDerivation, base, base-prelude, basic-lens, template-haskell
, transformers
@@ -208531,6 +209372,24 @@ self: {
license = stdenv.lib.licenses.bsd2;
}) {};
+ "recursion-schemes_5_2" = callPackage
+ ({ mkDerivation, base, base-orphans, comonad, containers, data-fix
+ , free, HUnit, template-haskell, th-abstraction, transformers
+ }:
+ mkDerivation {
+ pname = "recursion-schemes";
+ version = "5.2";
+ sha256 = "093fndxfnl2x8d7pyg0749w5hk1bhsrgzwl8qgaxvih49xqjc35z";
+ libraryHaskellDepends = [
+ base base-orphans comonad containers data-fix free template-haskell
+ th-abstraction transformers
+ ];
+ testHaskellDepends = [ base HUnit template-haskell transformers ];
+ description = "Representing common recursion patterns as higher-order functions";
+ license = stdenv.lib.licenses.bsd2;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"recursion-schemes-ext" = callPackage
({ mkDerivation, base, composition-prelude, criterion, deepseq
, hspec, lens, recursion-schemes
@@ -209056,18 +209915,16 @@ self: {
}) {};
"refined" = callPackage
- ({ mkDerivation, aeson, base, deepseq, doctest, exceptions, mtl
- , prettyprinter, QuickCheck, template-haskell, transformers
+ ({ mkDerivation, aeson, base, bytestring, deepseq, doctest
+ , exceptions, mtl, QuickCheck, template-haskell, text, these-skinny
}:
mkDerivation {
pname = "refined";
- version = "0.4.4";
- sha256 = "1xld5fc3nzsr43agvdlv0hbdbnrrsgy0n2a7mfrcc0n3s6rjbdcw";
- revision = "1";
- editedCabalFile = "184w9aj60hxm2bq9n29zakqzhi0kf4dqj7cwib31vilpwd0vgfvx";
+ version = "0.6";
+ sha256 = "0clfkdj7lj33yryan50a37b6h434in8rwa6n9cnv8lwzvk0mayy6";
libraryHaskellDepends = [
- aeson base deepseq exceptions mtl prettyprinter QuickCheck
- template-haskell transformers
+ aeson base bytestring deepseq exceptions mtl QuickCheck
+ template-haskell text these-skinny
];
testHaskellDepends = [ base doctest QuickCheck ];
description = "Refinement types with static and runtime checking";
@@ -209083,6 +209940,8 @@ self: {
libraryHaskellDepends = [ base http-api-data refined text ];
description = "http-api-data instances for refined types";
license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"refinery" = callPackage
@@ -209403,6 +210262,25 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "reflex-dom-pandoc" = callPackage
+ ({ mkDerivation, aeson, base, binary, bytestring, clay, constraints
+ , containers, data-default, lens, lens-aeson, modern-uri, mtl
+ , pandoc-types, ref-tf, reflex, reflex-dom-core, safe, skylighting
+ , text, time
+ }:
+ mkDerivation {
+ pname = "reflex-dom-pandoc";
+ version = "0.2.0.0";
+ sha256 = "0kf46l2pf0n7p59nm57541pnjr86dzjwzp4cbxqdr6a757zcfyny";
+ libraryHaskellDepends = [
+ aeson base binary bytestring clay constraints containers
+ data-default lens lens-aeson modern-uri mtl pandoc-types ref-tf
+ reflex reflex-dom-core safe skylighting text time
+ ];
+ description = "Render Pandoc documents to HTML using reflex-dom";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"reflex-dom-retractable" = callPackage
({ mkDerivation, base, containers, jsaddle, mtl, ref-tf, reflex
, reflex-dom
@@ -209979,6 +210857,30 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "regex-applicative_0_3_4" = callPackage
+ ({ mkDerivation, attoparsec, base, bytestring, containers
+ , criterion, deepseq, filtrable, megaparsec, parsec, parsers
+ , parsers-megaparsec, smallcheck, tasty, tasty-hunit
+ , tasty-smallcheck, transformers
+ }:
+ mkDerivation {
+ pname = "regex-applicative";
+ version = "0.3.4";
+ sha256 = "0di66pi2kq5rrsn0k6pwakzwa0bgi9jfb2csm72kp5gzqdws8s8p";
+ libraryHaskellDepends = [ base containers filtrable transformers ];
+ testHaskellDepends = [
+ base containers filtrable smallcheck tasty tasty-hunit
+ tasty-smallcheck transformers
+ ];
+ benchmarkHaskellDepends = [
+ attoparsec base bytestring criterion deepseq megaparsec parsec
+ parsers parsers-megaparsec
+ ];
+ description = "Regex-based parsing with applicative interface";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"regex-applicative-text" = callPackage
({ mkDerivation, base, regex-applicative, text }:
mkDerivation {
@@ -210695,35 +211597,6 @@ self: {
}) {};
"registry" = callPackage
- ({ mkDerivation, async, base, bytestring, containers, directory
- , exceptions, generic-lens, hashable, hedgehog, io-memoize, mmorph
- , MonadRandom, mtl, multimap, protolude, random, resourcet
- , semigroupoids, semigroups, tasty, tasty-discover, tasty-hedgehog
- , tasty-th, template-haskell, text, transformers-base, universum
- }:
- mkDerivation {
- pname = "registry";
- version = "0.1.9.0";
- sha256 = "0vblhmqjgx8h3jkqq1ch3iy2dg8xgqxj1jhnhsln3l0kzyh1d5wj";
- libraryHaskellDepends = [
- base containers exceptions hashable mmorph mtl protolude resourcet
- semigroupoids semigroups template-haskell text transformers-base
- ];
- testHaskellDepends = [
- async base bytestring containers directory exceptions generic-lens
- hashable hedgehog io-memoize mmorph MonadRandom mtl multimap
- protolude random resourcet semigroupoids semigroups tasty
- tasty-discover tasty-hedgehog tasty-th template-haskell text
- transformers-base universum
- ];
- testToolDepends = [ tasty-discover ];
- description = "data structure for assembling components";
- license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
- }) {};
-
- "registry_0_1_9_1" = callPackage
({ mkDerivation, async, base, bytestring, containers, directory
, exceptions, generic-lens, hashable, hedgehog, io-memoize, mmorph
, MonadRandom, mtl, multimap, protolude, random, resourcet
@@ -211078,6 +211951,34 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "relational-query-postgresql-pure" = callPackage
+ ({ mkDerivation, base, containers, data-default-class, dlist
+ , HDBC-postgresql, HDBC-session, homotuple, hspec, list-tuple
+ , names-th, persistable-record, postgresql-placeholder-converter
+ , postgresql-pure, product-isomorphic, relational-query
+ , relational-query-HDBC, relational-schemas, sql-words
+ , template-haskell, transformers, utf8-string
+ }:
+ mkDerivation {
+ pname = "relational-query-postgresql-pure";
+ version = "0.1.1.0";
+ sha256 = "1fxr9sfmva9b24z2pxbg72wa1j682cdk63lilmsk4i0343skrnr7";
+ libraryHaskellDepends = [
+ base containers dlist homotuple list-tuple names-th
+ persistable-record postgresql-placeholder-converter postgresql-pure
+ product-isomorphic relational-query relational-schemas sql-words
+ template-haskell transformers utf8-string
+ ];
+ testHaskellDepends = [
+ base data-default-class HDBC-postgresql HDBC-session hspec
+ postgresql-pure relational-query relational-query-HDBC
+ ];
+ description = "The connector of relational-record and postgresql-pure";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"relational-record" = callPackage
({ mkDerivation, base, persistable-record
, persistable-types-HDBC-pg, product-isomorphic, relational-query
@@ -211182,6 +212083,19 @@ self: {
broken = true;
}) {};
+ "reliable-io" = callPackage
+ ({ mkDerivation, base, bindings-DSL }:
+ mkDerivation {
+ pname = "reliable-io";
+ version = "0.0.1";
+ sha256 = "0dbp5s8acn6fzcvlplkn4dbcn06l6jsvwilcz45kchss7p4j3gvx";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [ base bindings-DSL ];
+ description = "Bindings to the low-level reliable.io library.";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"relit" = callPackage
({ mkDerivation, base, regex-base, template-haskell }:
mkDerivation {
@@ -212163,24 +213077,22 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "req_3_3_0" = callPackage
+ "req_3_4_0" = callPackage
({ mkDerivation, aeson, authenticate-oauth, base, blaze-builder
- , bytestring, case-insensitive, connection, hspec, hspec-core
- , hspec-discover, http-api-data, http-client, http-client-tls
- , http-types, modern-uri, monad-control, mtl, QuickCheck, retry
- , template-haskell, text, time, transformers, transformers-base
- , unordered-containers
+ , bytestring, case-insensitive, connection, exceptions, hspec
+ , hspec-core, hspec-discover, http-api-data, http-client
+ , http-client-tls, http-types, modern-uri, monad-control, mtl
+ , QuickCheck, retry, template-haskell, text, time, transformers
+ , transformers-base, unordered-containers
}:
mkDerivation {
pname = "req";
- version = "3.3.0";
- sha256 = "1y6zw6j3sk2p3ch636w787zs36i8v3p94gdvbfqgjd16k3hlnaxc";
- revision = "1";
- editedCabalFile = "1lr6s11iyzxfz4ahdnlk54jzqx7z4bw4gf7d2asqkrlqzqr91fjk";
+ version = "3.4.0";
+ sha256 = "1ffgrk45fa3knrl9cp01n7yl9gakd27mvyy1zq2j67h82bqz9qqa";
enableSeparateDataOutput = true;
libraryHaskellDepends = [
aeson authenticate-oauth base blaze-builder bytestring
- case-insensitive connection http-api-data http-client
+ case-insensitive connection exceptions http-api-data http-client
http-client-tls http-types modern-uri monad-control mtl retry
template-haskell text time transformers transformers-base
];
@@ -212325,6 +213237,17 @@ self: {
broken = true;
}) {};
+ "requirements" = callPackage
+ ({ mkDerivation, base }:
+ mkDerivation {
+ pname = "requirements";
+ version = "0.6.0.0";
+ sha256 = "1s0s3p0dy07222ks83w3spfw9df33q5lggqv3dw4m9hd5x16a6zi";
+ libraryHaskellDepends = [ base ];
+ description = "Abstraction to manage user defined Type Errors";
+ license = stdenv.lib.licenses.gpl3;
+ }) {};
+
"rere" = callPackage
({ mkDerivation, aeson, attoparsec, base, bytestring, clock
, containers, criterion, derp, fin, parsec, QuickCheck
@@ -212362,6 +213285,18 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "rerebase_1_7" = callPackage
+ ({ mkDerivation, rebase }:
+ mkDerivation {
+ pname = "rerebase";
+ version = "1.7";
+ sha256 = "0primlvckzkz72pdm3c1y32wjbz5wmxkdwfzvxs3yg08v01hrwb7";
+ libraryHaskellDepends = [ rebase ];
+ description = "Reexports from \"base\" with a bunch of other standard libraries";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"reroute" = callPackage
({ mkDerivation, base, criterion, deepseq, graph-core, hashable
, hspec, http-api-data, hvect, mtl, random, regex-compat, text
@@ -212414,6 +213349,8 @@ self: {
];
description = "More understandable exceptions";
license = stdenv.lib.licenses.asl20;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"reserve" = callPackage
@@ -213755,28 +214692,28 @@ self: {
"rib" = callPackage
({ mkDerivation, aeson, async, base-noprelude, binary, clay
, cmdargs, containers, dhall, directory, exceptions, filepath
- , foldl, fsnotify, hspec, lucid, megaparsec, mmark, mmark-ext
- , modern-uri, mtl, optparse-applicative, pandoc
- , pandoc-include-code, pandoc-types, QuickCheck, relude
- , safe-exceptions, shake, text, time, wai, wai-app-static, warp
+ , foldl, fsnotify, hspec, iso8601-time, lucid, megaparsec, mmark
+ , mmark-ext, modern-uri, mtl, optparse-applicative, pandoc
+ , pandoc-types, QuickCheck, relude, safe-exceptions, shake, text
+ , time, wai, wai-app-static, warp
}:
mkDerivation {
pname = "rib";
- version = "0.10.0.0";
- sha256 = "129riz7843x9h2c9iz9wdcngj74x3rrvlbmd9y7ymmrh5d2kq1qv";
+ version = "0.12.0.0";
+ sha256 = "1fx8jxghzhs5knpvvj6gzm8pv36g4xa928pgsbwkbnmw9j406myn";
libraryHaskellDepends = [
aeson async base-noprelude binary clay cmdargs containers dhall
- directory exceptions filepath foldl fsnotify lucid megaparsec mmark
- mmark-ext modern-uri mtl optparse-applicative pandoc
- pandoc-include-code pandoc-types relude safe-exceptions shake text
- time wai wai-app-static warp
+ directory exceptions filepath foldl fsnotify iso8601-time lucid
+ megaparsec mmark mmark-ext modern-uri mtl optparse-applicative
+ pandoc pandoc-types relude safe-exceptions shake text time wai
+ wai-app-static warp
];
testHaskellDepends = [
aeson async base-noprelude binary clay cmdargs containers dhall
- directory exceptions filepath foldl fsnotify hspec lucid megaparsec
- mmark mmark-ext modern-uri mtl optparse-applicative pandoc
- pandoc-include-code pandoc-types QuickCheck relude safe-exceptions
- shake text time wai wai-app-static warp
+ directory exceptions filepath foldl fsnotify hspec iso8601-time
+ lucid megaparsec mmark mmark-ext modern-uri mtl
+ optparse-applicative pandoc pandoc-types QuickCheck relude
+ safe-exceptions shake text time wai wai-app-static warp
];
description = "Static site generator based on Shake";
license = stdenv.lib.licenses.bsd3;
@@ -214027,12 +214964,17 @@ self: {
}) {};
"ring-buffers" = callPackage
- ({ mkDerivation, base, contiguous, primitive, semirings }:
+ ({ mkDerivation, base, contiguous, HUnit, primitive
+ , primitive-unlifted, QuickCheck, semirings
+ }:
mkDerivation {
pname = "ring-buffers";
- version = "0.1.0.1";
- sha256 = "1k67nsphmk6x3lvym5n6i1vbv1rfzwgrcxszivjjsy6nxsl00m52";
- libraryHaskellDepends = [ base contiguous primitive semirings ];
+ version = "0.1.1";
+ sha256 = "1xzvbygwp4zqz1nsbmb70062grzqw3jdwgbaaxn7hgirinims64h";
+ libraryHaskellDepends = [
+ base contiguous primitive primitive-unlifted semirings
+ ];
+ testHaskellDepends = [ base HUnit primitive QuickCheck ];
description = "mutable ring buffers with atomic updates in GHC Haskell";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
@@ -214679,6 +215621,26 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {inherit (pkgs) rocksdb;};
+ "rocksdb-haskell-jprupp" = callPackage
+ ({ mkDerivation, base, bytestring, data-default, directory, hspec
+ , QuickCheck, rocksdb, string-conversions, unliftio
+ }:
+ mkDerivation {
+ pname = "rocksdb-haskell-jprupp";
+ version = "2.1.3";
+ sha256 = "01hn77v6qjj6dx2g3ddff5q1b3wj0yqplhmxs1c8hndbn5alk0pv";
+ libraryHaskellDepends = [
+ base bytestring data-default directory unliftio
+ ];
+ librarySystemDepends = [ rocksdb ];
+ testHaskellDepends = [
+ base bytestring data-default directory hspec QuickCheck
+ string-conversions unliftio
+ ];
+ description = "Haskell bindings for RocksDB";
+ license = stdenv.lib.licenses.bsd3;
+ }) {inherit (pkgs) rocksdb;};
+
"rocksdb-query" = callPackage
({ mkDerivation, base, bytestring, cereal, conduit, data-default
, hspec, resourcet, rocksdb-haskell, unliftio
@@ -214699,6 +215661,27 @@ self: {
broken = true;
}) {};
+ "rocksdb-query_0_4_2" = callPackage
+ ({ mkDerivation, base, bytestring, cereal, conduit, data-default
+ , hspec, resourcet, rocksdb-haskell-jprupp, unliftio
+ }:
+ mkDerivation {
+ pname = "rocksdb-query";
+ version = "0.4.2";
+ sha256 = "1sh88q0vq0b13ig6vmwi8wa73d45qxdkbbc29zphch6p2z4n81wq";
+ libraryHaskellDepends = [
+ base bytestring cereal conduit resourcet rocksdb-haskell-jprupp
+ unliftio
+ ];
+ testHaskellDepends = [
+ base cereal data-default hspec rocksdb-haskell-jprupp unliftio
+ ];
+ description = "RocksDB database querying library for Haskell";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"roguestar" = callPackage
({ mkDerivation, base, bytestring, directory, filepath, old-time
, process
@@ -215572,8 +216555,8 @@ self: {
}:
mkDerivation {
pname = "rpmbuild-order";
- version = "0.3";
- sha256 = "1w5c1nd1w75bk39payczbh4kwn5rizpv9dzgdwssa8d9f0na10lr";
+ version = "0.3.1";
+ sha256 = "1xa4crcqm4avkpdcksj610gpzk7crfkwa2pk2nn1qsmjsrixfc2b";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -216162,6 +217145,8 @@ self: {
];
description = "Random Variables";
license = stdenv.lib.licenses.publicDomain;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"rwlock" = callPackage
@@ -216635,6 +217620,21 @@ self: {
broken = true;
}) {};
+ "safe-tensor" = callPackage
+ ({ mkDerivation, base, constraints, containers, hmatrix, mtl
+ , singletons
+ }:
+ mkDerivation {
+ pname = "safe-tensor";
+ version = "0.2.0.0";
+ sha256 = "04fafmypwcw88qqb9v9lalfyyqna68b3brx2rmry7i4898gwasp8";
+ libraryHaskellDepends = [
+ base constraints containers hmatrix mtl singletons
+ ];
+ description = "Dependently typed tensor algebra";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
"safecopy" = callPackage
({ mkDerivation, array, base, bytestring, cereal, containers
, generic-data, HUnit, lens, lens-action, old-time, QuickCheck
@@ -216917,8 +217917,8 @@ self: {
pname = "salak";
version = "0.3.6";
sha256 = "00qyd09az0ldfidfgcki8z3r9gcpxmss3iyr99as5bky29rlz9n3";
- revision = "1";
- editedCabalFile = "1ra0bbk3xkfsy5p78q57abjwmn95kmfjpvsldm4s1455bg2yhi26";
+ revision = "2";
+ editedCabalFile = "0azqzfw8ynbj1fzgwksx30m88zsz71vwhdlxw8fkcwbgz49vc7zb";
libraryHaskellDepends = [
base bytestring containers data-default directory dlist exceptions
filepath hashable heaps megaparsec mtl scientific text time
@@ -218153,8 +219153,6 @@ self: {
];
description = "Work stealing scheduler";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"schedyield" = callPackage
@@ -219766,23 +220764,24 @@ self: {
license = stdenv.lib.licenses.mit;
}) {inherit (pkgs) secp256k1;};
- "secp256k1-haskell_0_3_1" = callPackage
+ "secp256k1-haskell_0_4_0" = callPackage
({ mkDerivation, base, base16-bytestring, bytestring, cereal
, deepseq, entropy, hashable, hspec, hspec-discover, HUnit
, monad-par, mtl, QuickCheck, secp256k1, string-conversions
+ , unliftio
}:
mkDerivation {
pname = "secp256k1-haskell";
- version = "0.3.1";
- sha256 = "0bhp1d4wzvmznm41fbv8zzx7sw1407v21k83zfjjv2z8apk99w4n";
+ version = "0.4.0";
+ sha256 = "07hgfrr98g42sia5bssch7lrajx7y6fz98f13ly5rjkm5brw0zba";
libraryHaskellDepends = [
base base16-bytestring bytestring cereal deepseq entropy hashable
- QuickCheck string-conversions
+ QuickCheck string-conversions unliftio
];
libraryPkgconfigDepends = [ secp256k1 ];
testHaskellDepends = [
base base16-bytestring bytestring cereal deepseq entropy hashable
- hspec HUnit monad-par mtl QuickCheck string-conversions
+ hspec HUnit monad-par mtl QuickCheck string-conversions unliftio
];
testToolDepends = [ hspec-discover ];
description = "Bindings for secp256k1";
@@ -219942,6 +220941,8 @@ self: {
pname = "selda";
version = "0.5.1.0";
sha256 = "1gd7fdgqw6q507wn7h1pln9wb7kh65vd7iv0s1ydg54r36qdlrgl";
+ revision = "1";
+ editedCabalFile = "0sdzfgsmgw20idxnvvf4sbp8bkl3n7qa7qkphv63pfmqvzyplkwg";
libraryHaskellDepends = [
base bytestring containers exceptions mtl random text time
uuid-types
@@ -219971,6 +220972,8 @@ self: {
pname = "selda-postgresql";
version = "0.1.8.1";
sha256 = "0dxycilvxjbi1cy9c0rzq9ywh48i2lh37j77a5i1x6v1625h51mk";
+ revision = "1";
+ editedCabalFile = "10qlb9yswjsvpj1f7dmm0amkq52g00f1kc2xqh1d7vfkvkb2bhk6";
libraryHaskellDepends = [
base bytestring exceptions postgresql-binary postgresql-libpq selda
selda-json text time uuid-types
@@ -219987,6 +220990,8 @@ self: {
pname = "selda-sqlite";
version = "0.1.7.1";
sha256 = "1a1rik32h8ijd98v98db1il10ap76rqdwmjwhj0hc0h77mm6qdfb";
+ revision = "1";
+ editedCabalFile = "05zdf07fizf97yby0ld4qkd5padxg9fhmpfiiii4jl7xklccnl6p";
libraryHaskellDepends = [
base bytestring direct-sqlite directory exceptions selda text time
uuid-types
@@ -220023,8 +221028,8 @@ self: {
}:
mkDerivation {
pname = "selective";
- version = "0.4.1";
- sha256 = "1pwbfayh4s6afhkgyvyq187m4vcnyvy3frb1zxjs7xjb2sxp9r80";
+ version = "0.4.1.1";
+ sha256 = "1ix9080g4qcs3w89bmilr6f84kg6vw9hyx5cs5hiw9xnp7dh4sdc";
libraryHaskellDepends = [ base containers transformers ];
testHaskellDepends = [
base containers mtl QuickCheck tasty tasty-expected-failure
@@ -220218,19 +221223,16 @@ self: {
}) {};
"semialign" = callPackage
- ({ mkDerivation, base, base-compat, containers, hashable
- , semigroupoids, tagged, these, transformers, unordered-containers
- , vector
+ ({ mkDerivation, base, containers, hashable, semigroupoids, tagged
+ , these, transformers, unordered-containers, vector
}:
mkDerivation {
pname = "semialign";
- version = "1.1";
- sha256 = "1n47w9c6i6azb4w65rzhci00v6p9c0s1w1givd2q3smkgyziiqpk";
- revision = "2";
- editedCabalFile = "1s0gja9kig4j550kjgrknf6kyw8qns9fksrdm0rvv7bmf30dwh8n";
+ version = "1.1.0.1";
+ sha256 = "11qs4imy3cq4cx9mm6g30r6qk3rngqrmz7lkl5379gs1yvgvs44q";
libraryHaskellDepends = [
- base base-compat containers hashable semigroupoids tagged these
- transformers unordered-containers vector
+ base containers hashable semigroupoids tagged these transformers
+ unordered-containers vector
];
description = "Align and Zip type-classes from the common Semialign ancestor";
license = stdenv.lib.licenses.bsd3;
@@ -220458,15 +221460,16 @@ self: {
}) {};
"semirings" = callPackage
- ({ mkDerivation, base, containers, hashable, integer-gmp
- , unordered-containers
+ ({ mkDerivation, base, base-compat-batteries, containers, hashable
+ , integer-gmp, unordered-containers
}:
mkDerivation {
pname = "semirings";
- version = "0.5.3";
- sha256 = "16qdh0d5mazxkzpa0xsiv635771zspzbiqmy5qy2rcsxb79p36lc";
+ version = "0.5.4";
+ sha256 = "16lsxg0nzi7d4kr5xibgy9q46fxrga10yzh0jy4jzpyy5axwwysw";
libraryHaskellDepends = [
- base containers hashable integer-gmp unordered-containers
+ base base-compat-batteries containers hashable integer-gmp
+ unordered-containers
];
description = "two monoids as one, in holy haskimony";
license = stdenv.lib.licenses.bsd3;
@@ -220922,6 +221925,30 @@ self: {
license = stdenv.lib.licenses.gpl3;
}) {};
+ "sequence-formats_1_5_1" = callPackage
+ ({ mkDerivation, attoparsec, base, bytestring, containers, errors
+ , exceptions, foldl, hspec, lens-family, pipes, pipes-attoparsec
+ , pipes-bytestring, pipes-safe, tasty, tasty-hunit, transformers
+ , vector
+ }:
+ mkDerivation {
+ pname = "sequence-formats";
+ version = "1.5.1";
+ sha256 = "0nm6g02cn6fzhzhydmw0kwl41r9r9bqnwpk2cynlmvylghmnkmmj";
+ libraryHaskellDepends = [
+ attoparsec base bytestring containers errors exceptions foldl
+ lens-family pipes pipes-attoparsec pipes-bytestring pipes-safe
+ transformers vector
+ ];
+ testHaskellDepends = [
+ base bytestring containers foldl hspec pipes pipes-safe tasty
+ tasty-hunit transformers vector
+ ];
+ description = "A package with basic parsing utilities for several Bioinformatic data formats";
+ license = stdenv.lib.licenses.gpl3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"sequenceTools" = callPackage
({ mkDerivation, ansi-wl-pprint, base, bytestring, foldl, hspec
, lens-family, optparse-applicative, pipes, pipes-group
@@ -222542,29 +223569,6 @@ self: {
}) {};
"servant-js" = callPackage
- ({ mkDerivation, base, base-compat, charset, hspec, hspec-discover
- , hspec-expectations, language-ecmascript, lens, QuickCheck
- , servant, servant-foreign, text
- }:
- mkDerivation {
- pname = "servant-js";
- version = "0.9.4.1";
- sha256 = "004snd07q29g08smvrwmpypg75g9rxdvk5bfyfyxxmj47wh4734d";
- isLibrary = true;
- isExecutable = true;
- libraryHaskellDepends = [
- base base-compat charset lens servant servant-foreign text
- ];
- testHaskellDepends = [
- base base-compat hspec hspec-expectations language-ecmascript lens
- QuickCheck servant text
- ];
- testToolDepends = [ hspec-discover ];
- description = "Automatically derive javascript functions to query servant webservices";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "servant-js_0_9_4_2" = callPackage
({ mkDerivation, base, base-compat, charset, hspec, hspec-discover
, hspec-expectations, language-ecmascript, lens, QuickCheck
, servant, servant-foreign, text
@@ -222585,7 +223589,6 @@ self: {
testToolDepends = [ hspec-discover ];
description = "Automatically derive javascript functions to query servant webservices";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"servant-jsonrpc" = callPackage
@@ -223168,11 +224171,13 @@ self: {
({ mkDerivation, base, servant-client-core, servant-rawm }:
mkDerivation {
pname = "servant-rawm-client";
- version = "1.0.0.0";
- sha256 = "1ivl8pvk3rfi3bm5nhmx334r5rwi7vdkl3pbg90fzwj7brd2vsyz";
+ version = "1.0.0.1";
+ sha256 = "0ldjhmmfdh0jpfaz4sg1b9n5l23wza3w0m8bvvf80gvl7p6fk0fj";
libraryHaskellDepends = [ base servant-client-core servant-rawm ];
description = "The client implementation of servant-rawm";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"servant-rawm-docs" = callPackage
@@ -223181,13 +224186,15 @@ self: {
}:
mkDerivation {
pname = "servant-rawm-docs";
- version = "1.0.0.0";
- sha256 = "05h6j7vylir41mbhhbwvmj5n2cpwbjr9km4xm9bc5phl9m3qxsn3";
+ version = "1.0.0.1";
+ sha256 = "1s11qzgl4lgc1xg2znski1d20a4hdnm1b2wxswm140fxm82p6gad";
libraryHaskellDepends = [
base http-media http-types lens servant-docs servant-rawm
];
description = "Documentation generator for 'RawM' endpoints";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"servant-rawm-server" = callPackage
@@ -223196,14 +224203,16 @@ self: {
}:
mkDerivation {
pname = "servant-rawm-server";
- version = "1.0.0.0";
- sha256 = "0ipi5k5zc077146c48rysaqjn37jikmgb10qz11v6728xrvxvrzi";
+ version = "1.0.0.1";
+ sha256 = "06ivhd132cp98s2kcwg2mcmh6gj01hpw2kyp5azywrzhcr1nspq9";
libraryHaskellDepends = [
base bytestring filepath resourcet servant-rawm servant-server wai
wai-app-static
];
description = "The server implementation of servant-rawm";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"servant-reason" = callPackage
@@ -223320,6 +224329,28 @@ self: {
broken = true;
}) {};
+ "servant-seo" = callPackage
+ ({ mkDerivation, aeson, base, binary, blaze-markup, bytestring
+ , Cabal, cabal-doctest, containers, directory, doctest, filepath
+ , http-media, lens, QuickCheck, servant, servant-blaze
+ , servant-server, text, warp, xml-conduit
+ }:
+ mkDerivation {
+ pname = "servant-seo";
+ version = "0.1.2";
+ sha256 = "0jia9wmwj3lyxygl1vj082bqgmk8bpccmaza5hr2qh4yq9rhrm1f";
+ setupHaskellDepends = [ base Cabal cabal-doctest ];
+ libraryHaskellDepends = [
+ aeson base binary blaze-markup bytestring containers http-media
+ lens servant servant-blaze servant-server text warp xml-conduit
+ ];
+ testHaskellDepends = [
+ base directory doctest filepath QuickCheck
+ ];
+ description = "Generate Robots.txt and Sitemap.xml specification for your servant API.";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"servant-server" = callPackage
({ mkDerivation, aeson, base, base-compat, base64-bytestring
, bytestring, Cabal, cabal-doctest, containers, directory, doctest
@@ -223812,6 +224843,8 @@ self: {
];
description = "Automatically generate Elm clients for Servant APIs";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"servant-tracing" = callPackage
@@ -225120,8 +226153,8 @@ self: {
}:
mkDerivation {
pname = "shake-ats";
- version = "1.10.4.1";
- sha256 = "14b1yiw0bhj81pj1dhax7pdf9c68iwlndqg5c3n3c2p6qlcbbd8f";
+ version = "1.10.4.2";
+ sha256 = "0j230aijhnz1r07yx7ya452jz72926m93pdhfdrq5613mgy7l22n";
libraryHaskellDepends = [
base binary cdeps dependency directory hs2ats language-ats
microlens shake shake-c shake-cabal shake-ext text
@@ -225382,21 +226415,6 @@ self: {
}) {};
"shake-plus" = callPackage
- ({ mkDerivation, base, comonad, extra, hashable, path, rio, shake
- , within
- }:
- mkDerivation {
- pname = "shake-plus";
- version = "0.1.7.0";
- sha256 = "0gmvmzi9mnbrd3xblqimx6rpdrv45cd80yglrj8f84rb6c61aiiq";
- libraryHaskellDepends = [
- base comonad extra hashable path rio shake within
- ];
- description = "Re-export of Shake using well-typed paths and ReaderT";
- license = stdenv.lib.licenses.mit;
- }) {};
-
- "shake-plus_0_1_10_0" = callPackage
({ mkDerivation, aeson, base, comonad, extra, path, rio, shake
, within
}:
@@ -225409,31 +226427,62 @@ self: {
];
description = "Re-export of Shake using well-typed paths and ReaderT";
license = stdenv.lib.licenses.mit;
+ }) {};
+
+ "shake-plus_0_3_1_0" = callPackage
+ ({ mkDerivation, base, extra, path, rio, shake }:
+ mkDerivation {
+ pname = "shake-plus";
+ version = "0.3.1.0";
+ sha256 = "1a1dj61sl0acil3bfw84nlvsi64f6bmlxbb4vb6q5rqarnhvk5qj";
+ libraryHaskellDepends = [ base extra path rio shake ];
+ description = "Re-export of Shake using well-typed paths and ReaderT";
+ license = stdenv.lib.licenses.mit;
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "shake-plus-extended" = callPackage
+ ({ mkDerivation, base, comonad, extra, ixset-typed, path, rio
+ , shake, shake-plus, within
+ }:
+ mkDerivation {
+ pname = "shake-plus-extended";
+ version = "0.1.0.0";
+ sha256 = "1c91h4hfc20b9153mysq0fflgjqiq6b0q8hhp9iyp9j2dmlq7nw4";
+ libraryHaskellDepends = [
+ base comonad extra ixset-typed path rio shake shake-plus within
+ ];
+ description = "Experimental extensions to shake-plus";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"shakebook" = callPackage
({ mkDerivation, aeson, aeson-with, base, binary-instances, comonad
- , comonad-extras, doctemplates, feed, free, http-conduit
- , ixset-typed, lens, lens-aeson, mustache, pandoc, pandoc-types
- , path-extensions, rio, shake-plus, sitemap-gen, slick, split
- , tasty, tasty-golden, text-time, zipper-extra
+ , comonad-extras, doctemplates, feed, free, hashable-time
+ , http-conduit, ixset-typed, ixset-typed-conversions, lens
+ , lens-aeson, mustache, pandoc, pandoc-types, path-extensions, rio
+ , shake-plus, sitemap-gen, slick, split, tasty, tasty-golden
+ , text-time, within, zipper-extra
}:
mkDerivation {
pname = "shakebook";
- version = "0.8.1.0";
- sha256 = "0cwd920svd7927f7im3qbkqg08ms7yy08wrvvlbzcidv6kh2554m";
+ version = "0.9.1.0";
+ sha256 = "14b94gmy95whypmgqwbqr0kp5nrnk8s87dih35s85zsbmi2q1pzm";
libraryHaskellDepends = [
aeson aeson-with base binary-instances comonad comonad-extras
- doctemplates feed free http-conduit ixset-typed lens lens-aeson
- mustache pandoc pandoc-types path-extensions rio shake-plus
- sitemap-gen slick split text-time zipper-extra
+ doctemplates feed free hashable-time http-conduit ixset-typed
+ ixset-typed-conversions lens lens-aeson mustache pandoc
+ pandoc-types path-extensions rio shake-plus sitemap-gen slick split
+ text-time within zipper-extra
];
testHaskellDepends = [
aeson aeson-with base binary-instances comonad comonad-extras
- doctemplates feed free http-conduit ixset-typed lens lens-aeson
- mustache pandoc pandoc-types path-extensions rio shake-plus
- sitemap-gen slick split tasty tasty-golden text-time zipper-extra
+ doctemplates feed free hashable-time http-conduit ixset-typed
+ ixset-typed-conversions lens lens-aeson mustache pandoc
+ pandoc-types path-extensions rio shake-plus sitemap-gen slick split
+ tasty tasty-golden text-time within zipper-extra
];
description = "Shake-based technical documentation generator; HTML & PDF";
license = stdenv.lib.licenses.mit;
@@ -226176,8 +227225,8 @@ self: {
}:
mkDerivation {
pname = "shift";
- version = "0.2.1.2";
- sha256 = "1g3qvk3b6qiawrjvzxv6nbr71zxb8c5rsi4agjhq8d1d6g9m9f42";
+ version = "0.2.1.3";
+ sha256 = "1b0587db6qk3hrr9sfxxcwi86wqzwr2qy035q9vvcxfr8sh0i3xg";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -227572,10 +228621,8 @@ self: {
({ mkDerivation, base, process }:
mkDerivation {
pname = "simple-smt";
- version = "0.9.4";
- sha256 = "0sbwgyw2a5p85yddvmvzk85709qjqny3xgps7zg9k17m9d5bwdm0";
- revision = "1";
- editedCabalFile = "13y564gh7qndkdxnrdx5zbqnkcb5bgg074al92c9rqxd9c66wx4k";
+ version = "0.9.5";
+ sha256 = "0bwb3r2gqm81nmf0hc0mgj8vp2a48kmzx0h7h42lprp4d4irwmy2";
libraryHaskellDepends = [ base process ];
description = "A simple way to interact with an SMT solver process";
license = stdenv.lib.licenses.bsd3;
@@ -228455,15 +229502,15 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "sized_0_5_0_0" = callPackage
+ "sized_0_6_0_0" = callPackage
({ mkDerivation, base, constraints, containers, deepseq
, equational-reasoning, ghc-typelits-presburger, hashable, lens
, ListLike, mono-traversable, singletons, type-natural, vector
}:
mkDerivation {
pname = "sized";
- version = "0.5.0.0";
- sha256 = "0g47mn1j4a0p7w01pjr2fxcass6lwl460a0rs4rq001kj38zxrcx";
+ version = "0.6.0.0";
+ sha256 = "0441ip04gmnyd6wxs1kkmwgz0v936bw95gxc9x00c7z0byd3q6hg";
libraryHaskellDepends = [
base constraints containers deepseq equational-reasoning
ghc-typelits-presburger hashable lens ListLike mono-traversable
@@ -228977,8 +230024,8 @@ self: {
}:
mkDerivation {
pname = "slack-progressbar";
- version = "0.1.0.0";
- sha256 = "0jdjl8cs29jlk7likvvci4l435rgngj2a4fnj258rq2ws3c5zxgn";
+ version = "0.1.0.1";
+ sha256 = "12iy8d0mvk0gcs65pb797qm9kx7d9wpa5gdkg4mvb4r13vqb5x9d";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -229733,6 +230780,21 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "smash-optics" = callPackage
+ ({ mkDerivation, base, optics-core, smash }:
+ mkDerivation {
+ pname = "smash-optics";
+ version = "0.1.0.0";
+ sha256 = "0h8khdm2lgklmf73bshfrjqfmkmhrbr6cq2r11vsm0lqfkzlyndh";
+ revision = "1";
+ editedCabalFile = "1kzkznb0167krv5pcia2vsj0gy9zgykjhqg5d3pfnwz3152197ql";
+ libraryHaskellDepends = [ base optics-core smash ];
+ description = "Optics for the `smash` library";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"smcdel" = callPackage
({ mkDerivation, ansi-terminal, array, base, containers, criterion
, cudd, directory, file-embed, filepath, graphviz, HasCacBDD, hspec
@@ -230033,8 +231095,8 @@ self: {
}:
mkDerivation {
pname = "smtp-mail";
- version = "0.2.0.1";
- sha256 = "16qwcwzgzlmfx1f5h6977nkka7x6jlm6kxpkbdsacizh0z96v1kw";
+ version = "0.3.0.0";
+ sha256 = "0q81m4mi43cd0f1azm6984xw3qw2s6ygszdn86j5z3g5sjj5dax4";
libraryHaskellDepends = [
array base base16-bytestring base64-bytestring bytestring
connection cryptonite filepath memory mime-mail network network-bsd
@@ -230311,10 +231373,8 @@ self: {
}:
mkDerivation {
pname = "snap-core";
- version = "1.0.4.1";
- sha256 = "19dmfqbsfyk1rkjnnrnajpjfam2xjxgmpfmx10yr5qffgza7gcf0";
- revision = "1";
- editedCabalFile = "0m8vsgrj96a0y9h09szg7gxv9f26yizh4k181ri2sp7ki8p5p7lg";
+ version = "1.0.4.2";
+ sha256 = "0zxdhx4wk70bkn71574lyz3zhq79yy98rv05r4564rd100xw3fqs";
libraryHaskellDepends = [
attoparsec base bytestring bytestring-builder case-insensitive
containers directory filepath hashable HUnit io-streams lifted-base
@@ -232422,18 +233482,24 @@ self: {
}) {};
"souffle-haskell" = callPackage
- ({ mkDerivation, base, deepseq, directory, filepath, hspec, mtl
- , process, template-haskell, temporary, text, type-errors-pretty
- , vector
+ ({ mkDerivation, base, containers, deepseq, directory, extra
+ , filepath, hspec, megaparsec, mtl, process, template-haskell
+ , temporary, text, type-errors-pretty, vector
}:
mkDerivation {
pname = "souffle-haskell";
- version = "0.2.3";
- sha256 = "10yl690vbznsa2z9lk2ix6jd8xkx5kriqqblbdr8mlkdzxxv5z6q";
+ version = "1.0.0";
+ sha256 = "1n2xxdmzsxdkn28j2wrrphhsg1y0v9s5xcq114g72785lr25n48r";
+ isLibrary = true;
+ isExecutable = true;
libraryHaskellDepends = [
base deepseq directory filepath mtl process template-haskell
temporary text type-errors-pretty vector
];
+ executableHaskellDepends = [
+ base containers deepseq directory extra filepath megaparsec mtl
+ process template-haskell temporary text type-errors-pretty vector
+ ];
testHaskellDepends = [
base deepseq directory filepath hspec mtl process template-haskell
temporary text type-errors-pretty vector
@@ -233739,8 +234805,6 @@ self: {
];
description = "A tool for visualizing the lifecycle of many concurrent multi-staged processes";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"spool" = callPackage
@@ -234350,6 +235414,8 @@ self: {
];
description = "A file-packing application";
license = "GPL";
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"sr-extra" = callPackage
@@ -234699,9 +235765,10 @@ self: {
({ mkDerivation, base, ghc-prim }:
mkDerivation {
pname = "stable-marriage";
- version = "0.1.3.0";
- sha256 = "04nd7c34gsx6njiwqzzx14ff745naam1cxc0cr4s7yyr9h7ikdai";
+ version = "0.2.0.0";
+ sha256 = "1qxns33mmr1nxw6gabi5s1i70ksp0ls54q7cf95fy7vs1nwngz0n";
libraryHaskellDepends = [ base ghc-prim ];
+ testHaskellDepends = [ base ghc-prim ];
description = "algorithms around stable marriage";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
@@ -235588,10 +236655,8 @@ self: {
}:
mkDerivation {
pname = "stackcollapse-ghc";
- version = "0.0.1.1";
- sha256 = "18glq0hkfr02iw8p842hmk4rv5d8sb565lyccklxdmfn708ick23";
- revision = "2";
- editedCabalFile = "0d6in3107pgblh5g1shnmw3dsb6vg10h3kdic56n7zf14gsqqjqy";
+ version = "0.0.1.2";
+ sha256 = "17ypxfscz9y7w6jh06133j779837dhdiq2a378mc73ji2m5fia1s";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -235664,22 +236729,22 @@ self: {
({ mkDerivation, array, base, base64, blaze-html, bytestring, clay
, colourista, containers, cryptohash-sha1, dir-traverse, directory
, extensions, filepath, ghc, ghc-boot-th, gitrev, hedgehog, hspec
- , hspec-hedgehog, optparse-applicative, pretty-simple, relude
- , slist, text, tomland, trial, trial-optparse-applicative
- , trial-tomland, unordered-containers
+ , hspec-hedgehog, microaeson, optparse-applicative, pretty-simple
+ , process, relude, slist, text, tomland, trial
+ , trial-optparse-applicative, trial-tomland, unordered-containers
}:
mkDerivation {
pname = "stan";
- version = "0.0.0.0";
- sha256 = "0x4avzclyx41kncwzaky70ky3mz4pcfcgzg17jnza8gpm7bfacxg";
+ version = "0.0.1.0";
+ sha256 = "13q0pf0vjh19w9sshxa45gbfmhv707sizx6mf5s35003654a0bxm";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
array base base64 blaze-html bytestring clay colourista containers
cryptohash-sha1 dir-traverse directory extensions filepath ghc
- ghc-boot-th gitrev optparse-applicative pretty-simple relude slist
- text tomland trial trial-optparse-applicative trial-tomland
- unordered-containers
+ ghc-boot-th gitrev microaeson optparse-applicative pretty-simple
+ process relude slist text tomland trial trial-optparse-applicative
+ trial-tomland unordered-containers
];
executableHaskellDepends = [ base ];
testHaskellDepends = [
@@ -235689,6 +236754,8 @@ self: {
doHaddock = false;
description = "Haskell STatic ANalyser";
license = stdenv.lib.licenses.mpl20;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"standalone-derive-topdown" = callPackage
@@ -237860,8 +238927,8 @@ self: {
}:
mkDerivation {
pname = "streaming-commons";
- version = "0.2.1.2";
- sha256 = "05pwziz8cybp6zh70jsmsdchy5qlkgdjj2jf7ggqrgps5m5nsapa";
+ version = "0.2.2.0";
+ sha256 = "0641z37cvd3sx5vn6irg7haa1mmyac7s1jw4bgd3f5kagmqlwrcs";
libraryHaskellDepends = [
array async base bytestring directory network process random stm
text transformers unix zlib
@@ -237875,6 +238942,29 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "streaming-commons_0_2_2_1" = callPackage
+ ({ mkDerivation, array, async, base, bytestring, deepseq, directory
+ , gauge, hspec, network, process, QuickCheck, random, stm, text
+ , transformers, unix, zlib
+ }:
+ mkDerivation {
+ pname = "streaming-commons";
+ version = "0.2.2.1";
+ sha256 = "1pc13vz4n0a8lrvc2ck3r3ph10819n9pysklwqabg83q92zl0s9h";
+ libraryHaskellDepends = [
+ array async base bytestring directory network process random stm
+ text transformers unix zlib
+ ];
+ testHaskellDepends = [
+ array async base bytestring deepseq hspec network QuickCheck text
+ unix zlib
+ ];
+ benchmarkHaskellDepends = [ base bytestring deepseq gauge text ];
+ description = "Common lower-level functions needed by various streaming data libraries";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"streaming-concurrency" = callPackage
({ mkDerivation, base, exceptions, hspec, HUnit, lifted-async
, monad-control, QuickCheck, quickcheck-instances, stm, streaming
@@ -238015,8 +239105,8 @@ self: {
}:
mkDerivation {
pname = "streaming-osm";
- version = "1.0.1";
- sha256 = "0rsyp7lzsj254i7r6gak48fwlpkbq9i7aw4mjdmym4y55mhj1d64";
+ version = "1.0.2";
+ sha256 = "0szw191ixqdm1cbmz0i987mm3ipr0aydjw3vq4q0yky4q7wkimc6";
libraryHaskellDepends = [
attoparsec base bytestring containers resourcet streaming
streaming-attoparsec streaming-bytestring text transformers vector
@@ -238218,6 +239308,43 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "streamly-archive" = callPackage
+ ({ mkDerivation, archive, base, bytestring, cryptonite, directory
+ , filepath, QuickCheck, streamly, tar, tasty, tasty-hunit
+ , tasty-quickcheck, temporary, zlib
+ }:
+ mkDerivation {
+ pname = "streamly-archive";
+ version = "0.0.1";
+ sha256 = "055jcqndkzg14c2fvkncn9034bw60n8s8yjkkjx7kqrj9p0kp01a";
+ enableSeparateDataOutput = true;
+ libraryHaskellDepends = [ base bytestring streamly ];
+ librarySystemDepends = [ archive ];
+ testHaskellDepends = [
+ base bytestring cryptonite directory filepath QuickCheck streamly
+ tar tasty tasty-hunit tasty-quickcheck temporary zlib
+ ];
+ testSystemDepends = [ archive ];
+ description = "Stream data from archives using the streamly library";
+ license = stdenv.lib.licenses.bsd3;
+ }) {archive = null;};
+
+ "streamly-binary" = callPackage
+ ({ mkDerivation, base, binary, bytestring, hspec, QuickCheck
+ , streamly
+ }:
+ mkDerivation {
+ pname = "streamly-binary";
+ version = "1.0.0.1";
+ sha256 = "16pl68dhhknda7ag1mjhwa14d3rdns70rzwvm947p8n3bv8yxsar";
+ libraryHaskellDepends = [ base binary bytestring streamly ];
+ testHaskellDepends = [
+ base binary bytestring hspec QuickCheck streamly
+ ];
+ description = "Integration of streamly and binary";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"streamly-bytestring" = callPackage
({ mkDerivation, base, bytestring, deepseq, directory, filepath
, gauge, hspec, hspec-discover, quickcheck-instances, random
@@ -238281,6 +239408,27 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "streamly-lmdb" = callPackage
+ ({ mkDerivation, async, base, bytestring, directory, lmdb
+ , QuickCheck, streamly, tasty, tasty-quickcheck, temporary
+ }:
+ mkDerivation {
+ pname = "streamly-lmdb";
+ version = "0.0.1";
+ sha256 = "0ddzvhjwar2sj69b851avcsf7g5bph2kcc0m77inxj0jbnvmhd2g";
+ libraryHaskellDepends = [ async base bytestring streamly ];
+ librarySystemDepends = [ lmdb ];
+ testHaskellDepends = [
+ async base bytestring directory QuickCheck streamly tasty
+ tasty-quickcheck temporary
+ ];
+ testSystemDepends = [ lmdb ];
+ description = "Stream data to or from LMDB databases using the streamly library";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {inherit (pkgs) lmdb;};
+
"streamly-posix" = callPackage
({ mkDerivation, base, bytestring, filepath, hpath-posix, hspec
, hspec-discover, safe-exceptions, streamly, streamly-bytestring
@@ -240943,8 +242091,8 @@ self: {
}:
mkDerivation {
pname = "sweet-egison";
- version = "0.1.0.1";
- sha256 = "08lllk4z0mkcvchnkmi6f9kcxfh3srb48kxxha2kvx4p9aj7f623";
+ version = "0.1.0.2";
+ sha256 = "1arvkf3l24yvssdsnidb5jv9h11wxbxzfcjxl2z9b9djpv0qkvy1";
libraryHaskellDepends = [
backtracking base egison-pattern-src egison-pattern-src-th-mode
haskell-src-exts haskell-src-meta logict template-haskell
@@ -241546,6 +242694,24 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "symmetry-operations-symbols" = callPackage
+ ({ mkDerivation, base, doctest, hspec, matrix, matrix-as-xyz
+ , parsec, QuickCheck
+ }:
+ mkDerivation {
+ pname = "symmetry-operations-symbols";
+ version = "0.0.1.4";
+ sha256 = "0ki9cmxpwds48chdb2mp4ysn6wh8qmmh5srspmjf4s0knaapzk2j";
+ libraryHaskellDepends = [ base matrix matrix-as-xyz parsec ];
+ testHaskellDepends = [
+ base doctest hspec matrix matrix-as-xyz parsec QuickCheck
+ ];
+ description = "Derivation of symbols and coordinate triplets Library";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"symon" = callPackage
({ mkDerivation, ansi-terminal, base, monad-loops, random }:
mkDerivation {
@@ -243580,6 +244746,8 @@ self: {
pname = "tar-bytestring";
version = "0.6.3.2";
sha256 = "10jmxjs808n3vcp997d42dy6256j67rk729awiviv2i76r7anzlv";
+ revision = "1";
+ editedCabalFile = "04m7im7k9f0qqs5bin9zdgvn1cv45m08cffbli1wb25navnrpwl8";
libraryHaskellDepends = [
array base bytestring containers deepseq hpath-directory
hpath-filepath hpath-posix safe-exceptions these time unix word8
@@ -243909,17 +245077,6 @@ self: {
}) {};
"tasty-dejafu" = callPackage
- ({ mkDerivation, base, dejafu, random, tagged, tasty }:
- mkDerivation {
- pname = "tasty-dejafu";
- version = "2.0.0.5";
- sha256 = "0yw4dsy6vcichr76da5rlw6y6g62kiagr9rqxlsxndgckb6bmyzf";
- libraryHaskellDepends = [ base dejafu random tagged tasty ];
- description = "Deja Fu support for the Tasty test framework";
- license = stdenv.lib.licenses.mit;
- }) {};
-
- "tasty-dejafu_2_0_0_6" = callPackage
({ mkDerivation, base, dejafu, random, tagged, tasty }:
mkDerivation {
pname = "tasty-dejafu";
@@ -243928,7 +245085,6 @@ self: {
libraryHaskellDepends = [ base dejafu random tagged tasty ];
description = "Deja Fu support for the Tasty test framework";
license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"tasty-discover" = callPackage
@@ -243970,6 +245126,23 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "tasty-expected-failure_0_12" = callPackage
+ ({ mkDerivation, base, hedgehog, tagged, tasty, tasty-golden
+ , tasty-hedgehog, tasty-hunit, unbounded-delays
+ }:
+ mkDerivation {
+ pname = "tasty-expected-failure";
+ version = "0.12";
+ sha256 = "1yhbgrbsghr3cxy4rxb7wfl9xbasm00xky3hrw4zyyl87r7gs6v6";
+ libraryHaskellDepends = [ base tagged tasty unbounded-delays ];
+ testHaskellDepends = [
+ base hedgehog tasty tasty-golden tasty-hedgehog tasty-hunit
+ ];
+ description = "Mark tasty tests as failure expected";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"tasty-fail-fast" = callPackage
({ mkDerivation, base, containers, directory, stm, tagged, tasty
, tasty-golden, tasty-hunit, tasty-tap
@@ -245086,22 +246259,23 @@ self: {
"telegram-bot-simple" = callPackage
({ mkDerivation, aeson, aeson-pretty, base, bytestring, cron
- , hashable, http-api-data, http-client, http-client-tls
+ , filepath, hashable, http-api-data, http-client, http-client-tls
, monad-control, mtl, pretty-show, profunctors, servant
- , servant-client, split, stm, template-haskell, text, time
- , transformers, unordered-containers
+ , servant-client, servant-multipart, split, stm, template-haskell
+ , text, time, transformers, unordered-containers
}:
mkDerivation {
pname = "telegram-bot-simple";
- version = "0.3.0";
- sha256 = "196zb03nj37qfmxgn5lagjdl759bgmnr1vsh26dbbv1zsmlp0pva";
+ version = "0.3.1";
+ sha256 = "09r64kgvgc5xx4wa5mxlc6fi4cf5qa81j7334wr7niv88fs659yb";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
- aeson aeson-pretty base bytestring cron hashable http-api-data
- http-client http-client-tls monad-control mtl pretty-show
- profunctors servant servant-client split stm template-haskell text
- time transformers unordered-containers
+ aeson aeson-pretty base bytestring cron filepath hashable
+ http-api-data http-client http-client-tls monad-control mtl
+ pretty-show profunctors servant servant-client servant-multipart
+ split stm template-haskell text time transformers
+ unordered-containers
];
executableHaskellDepends = [
aeson aeson-pretty base bytestring cron hashable http-api-data
@@ -246126,14 +247300,13 @@ self: {
, focuslist, genvalidity-containers, genvalidity-hspec, gi-gdk
, gi-gio, gi-glib, gi-gtk, gi-pango, gi-vte, gtk3, haskell-gi-base
, hedgehog, inline-c, lens, mono-traversable, pcre2, pretty-simple
- , QuickCheck, singletons, tasty, tasty-hedgehog, tasty-hspec
- , template-haskell, text, transformers, vte_291, xml-conduit
- , xml-html-qq, yaml
+ , QuickCheck, tasty, tasty-hedgehog, tasty-hspec, template-haskell
+ , text, transformers, vte_291, xml-conduit, xml-html-qq, yaml
}:
mkDerivation {
pname = "termonad";
- version = "3.1.0.1";
- sha256 = "0arh308hyv6jxj6sjscfdi5n35n4mcxc8kqrjlk6054lm4b9yhxx";
+ version = "4.0.0.0";
+ sha256 = "1rdr7ha0mmi0xd1dmiyxirmh789v8sbkr1c3gg43a98lh3kqgcq9";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -246143,8 +247316,7 @@ self: {
data-default directory distributive dyre file-embed filepath
focuslist gi-gdk gi-gio gi-glib gi-gtk gi-pango gi-vte
haskell-gi-base inline-c lens mono-traversable pretty-simple
- QuickCheck singletons text transformers xml-conduit xml-html-qq
- yaml
+ QuickCheck text transformers xml-conduit xml-html-qq yaml
];
libraryPkgconfigDepends = [ gtk3 pcre2 vte_291 ];
executableHaskellDepends = [ base ];
@@ -246154,7 +247326,8 @@ self: {
];
description = "Terminal emulator configurable in Haskell";
license = stdenv.lib.licenses.bsd3;
- maintainers = with stdenv.lib.maintainers; [ cdepillabout ];
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {inherit (pkgs) gtk3; inherit (pkgs) pcre2;
vte_291 = pkgs.vte;};
@@ -248801,29 +249974,23 @@ self: {
}) {};
"these" = callPackage
- ({ mkDerivation, assoc, base, base-compat, binary, deepseq
- , hashable
- }:
+ ({ mkDerivation, assoc, base, binary, deepseq, hashable }:
mkDerivation {
pname = "these";
- version = "1.1";
- sha256 = "0dxi9jwahibn2sgnqsr5kgm91i2nqibzc4r4s04jwwpjwhcyn2xv";
- libraryHaskellDepends = [
- assoc base base-compat binary deepseq hashable
- ];
+ version = "1.1.1.1";
+ sha256 = "027m1gd7i6jf2ppfkld9qrv3xnxg276587pmx10z9phpdvswk66p";
+ libraryHaskellDepends = [ assoc base binary deepseq hashable ];
description = "An either-or-both data type";
license = stdenv.lib.licenses.bsd3;
}) {};
"these-lens" = callPackage
- ({ mkDerivation, base, base-compat, lens, these }:
+ ({ mkDerivation, base, lens, these }:
mkDerivation {
pname = "these-lens";
- version = "1";
- sha256 = "144ly13qng95mwnfis8dm7n3843z3w2vp4212qawbpw8hw921c7y";
- revision = "3";
- editedCabalFile = "0nb0irhnj9xvhnyl13bmp86my0idhhqslmszi3jvggr5sk3jzi8a";
- libraryHaskellDepends = [ base base-compat lens these ];
+ version = "1.0.0.1";
+ sha256 = "15c05lgmlfm1pijsa3gfvmrsgmbfl5f7mpzzqasm72ip7y8la696";
+ libraryHaskellDepends = [ base lens these ];
description = "Lenses for These";
license = stdenv.lib.licenses.bsd3;
}) {};
@@ -250628,6 +251795,22 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "tini" = callPackage
+ ({ mkDerivation, base, QuickCheck }:
+ mkDerivation {
+ pname = "tini";
+ version = "0.1.0.0";
+ sha256 = "0y0z2jqgkvfp1sk9ba5v46acdfa7q8kyhlwavknmjpmx3h82yjv6";
+ revision = "1";
+ editedCabalFile = "1s9drf14xkvrjdm7bd8k9swy0bvxxwfirmjzdwj96qmmrfjsrm83";
+ libraryHaskellDepends = [ base ];
+ testHaskellDepends = [ base QuickCheck ];
+ description = "Tiny INI file and configuration library with a minimal dependency footprint";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"tintin" = callPackage
({ mkDerivation, base, clay, containers, data-has, directory
, frontmatter, inflections, inliterate, lucid, optparse-generic
@@ -252485,6 +253668,29 @@ self: {
broken = true;
}) {};
+ "tracing-control" = callPackage
+ ({ mkDerivation, aeson, base, base16-bytestring, bytestring
+ , case-insensitive, containers, hspec, http-client, lifted-base
+ , monad-control, mtl, network, random, stm, stm-lifted, text, time
+ , transformers, transformers-base
+ }:
+ mkDerivation {
+ pname = "tracing-control";
+ version = "0.0.6";
+ sha256 = "06hw4199yggvqlg3f1qhf67x8ij3v4kj5l79rhnngsqkpgl1yaww";
+ libraryHaskellDepends = [
+ aeson base base16-bytestring bytestring case-insensitive containers
+ http-client lifted-base monad-control mtl network random stm
+ stm-lifted text time transformers transformers-base
+ ];
+ testHaskellDepends = [
+ base containers hspec lifted-base monad-control mtl stm stm-lifted
+ text
+ ];
+ description = "Distributed tracing";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"tracked-files" = callPackage
({ mkDerivation, base, directory, hspec, process, text }:
mkDerivation {
@@ -252992,20 +254198,20 @@ self: {
}) {};
"transient" = callPackage
- ({ mkDerivation, atomic-primops, base, bytestring, containers
- , directory, mtl, primitive, random, stm, time, transformers
+ ({ mkDerivation, base, bytestring, containers, directory, mtl
+ , random, stm, time, transformers
}:
mkDerivation {
pname = "transient";
- version = "0.6.3";
- sha256 = "02zy60hilgagxa08j7bvd35wkpap5dzffc5af258hxiy0gdpdw0a";
+ version = "0.7.0.0";
+ sha256 = "11hiywgfv73bf128dd7h48790d356hl39fx3s54x3cri3gymwkkd";
libraryHaskellDepends = [
- atomic-primops base bytestring containers directory mtl primitive
- random stm time transformers
+ base bytestring containers directory mtl random stm time
+ transformers
];
testHaskellDepends = [
- atomic-primops base bytestring containers directory mtl random stm
- time transformers
+ base bytestring containers directory mtl random stm time
+ transformers
];
description = "composing programs with multithreading, events and distributed computing";
license = stdenv.lib.licenses.mit;
@@ -253453,17 +254659,16 @@ self: {
}) {};
"tree-sitter" = callPackage
- ({ mkDerivation, aeson, base, bytestring, containers, directory
- , filepath, fused-effects, hedgehog, split, template-haskell, text
- , unordered-containers
+ ({ mkDerivation, base, bytestring, containers, directory, filepath
+ , hedgehog, split, template-haskell, unordered-containers
}:
mkDerivation {
pname = "tree-sitter";
- version = "0.9.0.1";
- sha256 = "1khkc2v87i9vgbakc3gh1rmrakz43n4lglx50vvckp192in4svzm";
+ version = "0.9.0.2";
+ sha256 = "1jw70m7z7yj4d2ivgynh8z7n5ndd978r21012hxj93sy87axz7mf";
libraryHaskellDepends = [
- aeson base bytestring containers directory filepath fused-effects
- split template-haskell text unordered-containers
+ base bytestring containers directory filepath split
+ template-haskell unordered-containers
];
testHaskellDepends = [ base hedgehog ];
description = "Unstable bindings for the tree-sitter parsing library";
@@ -253474,8 +254679,8 @@ self: {
({ mkDerivation, base, tree-sitter }:
mkDerivation {
pname = "tree-sitter-go";
- version = "0.5.0.1";
- sha256 = "0v6vk0nqalk01xl0nmjmy4m14wmdij1cd1gs93is3gc3wvj0ljin";
+ version = "0.5.0.2";
+ sha256 = "0zl8q96xffi4cqd3yl44x64q9440qragg8735lzwwfl8nayx78bj";
enableSeparateDataOutput = true;
libraryHaskellDepends = [ base tree-sitter ];
description = "Tree-sitter grammar/parser for Go";
@@ -253486,8 +254691,8 @@ self: {
({ mkDerivation, base, tree-sitter }:
mkDerivation {
pname = "tree-sitter-haskell";
- version = "0.3.0.0";
- sha256 = "1hkxlhx3bm78p133cvimqjr8gl0arxdch0j33pz4dfg6fs8wbx1z";
+ version = "0.3.0.1";
+ sha256 = "194rws181v8pv3w9zxx9h8fqnilivwrdw27hwlps30kmmk26rraq";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [ base tree-sitter ];
@@ -253499,8 +254704,8 @@ self: {
({ mkDerivation, base, tree-sitter }:
mkDerivation {
pname = "tree-sitter-java";
- version = "0.7.0.1";
- sha256 = "1z2x6nyl57xrnyf2jbkypg5zf8cw3rv9788piil6c30cyimbay4r";
+ version = "0.7.0.2";
+ sha256 = "1im1cwf20f02i244ggb5xl1cblkxr4rjk5h1c91vhzfv1hja37sn";
enableSeparateDataOutput = true;
libraryHaskellDepends = [ base tree-sitter ];
description = "Tree-sitter grammar/parser for Java";
@@ -253511,8 +254716,8 @@ self: {
({ mkDerivation, base, tree-sitter }:
mkDerivation {
pname = "tree-sitter-json";
- version = "0.7.0.1";
- sha256 = "1rb5g43z318pkwj4g4zqknxad3gwjpadr20vr3x6pif8zn5fc5ib";
+ version = "0.7.0.2";
+ sha256 = "02ly1dj4l8l1cvi5ymwqv85l0jdq9dixcpgqgyy1d744d214gg4g";
enableSeparateDataOutput = true;
libraryHaskellDepends = [ base tree-sitter ];
description = "Tree-sitter grammar/parser for JSON";
@@ -253523,8 +254728,8 @@ self: {
({ mkDerivation, base, tree-sitter }:
mkDerivation {
pname = "tree-sitter-php";
- version = "0.5.0.0";
- sha256 = "18qjr4hm8v3kg9933y7g96cj76qfw38ca825j90bg8yfiya5186p";
+ version = "0.5.0.1";
+ sha256 = "05nfsw1mk27xiqr9ca8bky437xqin4zqb1mammcjpyi9qif9zzbh";
enableSeparateDataOutput = true;
libraryHaskellDepends = [ base tree-sitter ];
description = "Tree-sitter grammar/parser for PHP";
@@ -253535,8 +254740,8 @@ self: {
({ mkDerivation, base, tree-sitter }:
mkDerivation {
pname = "tree-sitter-python";
- version = "0.9.0.2";
- sha256 = "08k54r62hgdb2gpn8gv4nnr8sflcrkpfd1hmmzb552wzkaca9b1n";
+ version = "0.9.0.3";
+ sha256 = "1bjiddhm0zj01s7785xr7yldsbd1agbj4nc9cyxvkadxmf7cha7h";
enableSeparateDataOutput = true;
libraryHaskellDepends = [ base tree-sitter ];
description = "Tree-sitter grammar/parser for Python";
@@ -253547,8 +254752,8 @@ self: {
({ mkDerivation, base, tree-sitter }:
mkDerivation {
pname = "tree-sitter-ql";
- version = "0.1.0.3";
- sha256 = "0sxfjkdbajk3q5qpy0y51q1srvp3lnch1jvypppcz3ria59svhzx";
+ version = "0.1.0.4";
+ sha256 = "0pawzp1q160h6ccl2dkngrgkyxjs1szsyxjn55clbv4jla3zypni";
enableSeparateDataOutput = true;
libraryHaskellDepends = [ base tree-sitter ];
description = "Tree-sitter grammar/parser for QL";
@@ -253559,8 +254764,8 @@ self: {
({ mkDerivation, base, tree-sitter }:
mkDerivation {
pname = "tree-sitter-ruby";
- version = "0.5.0.2";
- sha256 = "143nh0c34gdhs9jz9vwmh6alds5n1771jzqaa2zf6pkvsc3cpsfp";
+ version = "0.5.0.3";
+ sha256 = "097wrscdjlr5nqyx2d3076gppfv3xm299b6iya5g50z24g5izfxn";
enableSeparateDataOutput = true;
libraryHaskellDepends = [ base tree-sitter ];
description = "Tree-sitter grammar/parser for Ruby";
@@ -253571,8 +254776,8 @@ self: {
({ mkDerivation, base, tree-sitter }:
mkDerivation {
pname = "tree-sitter-rust";
- version = "0.1.0.0";
- sha256 = "1ba8b19nq48fvfn5gcc15mbr65n9fxz4hx1b04h9fbmd4bx6haaj";
+ version = "0.1.0.1";
+ sha256 = "0h8dbr4pn1qnqlg0fs1f6jxasjpfjs4j6x4h86dhz6sw3fih9g00";
enableSeparateDataOutput = true;
libraryHaskellDepends = [ base tree-sitter ];
description = "Tree-sitter grammar/parser for Rust";
@@ -253583,8 +254788,8 @@ self: {
({ mkDerivation, base, tree-sitter }:
mkDerivation {
pname = "tree-sitter-tsx";
- version = "0.5.0.1";
- sha256 = "1pihhq3m8fhkrbqv8fl6l09hlzmwp10w119irhc05nmc2a6hq1jn";
+ version = "0.5.0.2";
+ sha256 = "0ir4n732wd5i6m8jkkrwah7091i147pxbaa2mpl56zg8nya52490";
enableSeparateDataOutput = true;
libraryHaskellDepends = [ base tree-sitter ];
description = "Tree-sitter grammar/parser for TSX";
@@ -253595,8 +254800,8 @@ self: {
({ mkDerivation, base, tree-sitter }:
mkDerivation {
pname = "tree-sitter-typescript";
- version = "0.5.0.1";
- sha256 = "069xal3kgbsw8swsw0q697c7h0n32fj2cf7wx1nsd79w87nkd80r";
+ version = "0.5.0.2";
+ sha256 = "0qlwiks80861f9prps4x5ag6ivi9ihp8rq416jmmgmc3bj72bkfi";
enableSeparateDataOutput = true;
libraryHaskellDepends = [ base tree-sitter ];
description = "Tree-sitter grammar/parser for TypeScript";
@@ -253750,6 +254955,66 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "trek-app" = callPackage
+ ({ mkDerivation, aeson, aeson-pretty, async, base
+ , base64-bytestring, bytestring, cryptohash-sha256, directory
+ , filepath, hspec, hspec-discover, optparse-applicative
+ , optparse-generic, pg-transact, postgres-options
+ , postgresql-simple, postgresql-simple-opts, process, resource-pool
+ , semigroups, split, temporary, time, time-qq, tmp-postgres
+ , trek-db
+ }:
+ mkDerivation {
+ pname = "trek-app";
+ version = "0.1.0.0";
+ sha256 = "0ilnzmxxjaza1nbvp51j17s29a70m5n92vnbrz3ys1k41hw5qpby";
+ isLibrary = true;
+ isExecutable = true;
+ enableSeparateDataOutput = true;
+ libraryHaskellDepends = [
+ aeson aeson-pretty base base64-bytestring bytestring
+ cryptohash-sha256 directory filepath optparse-applicative
+ optparse-generic pg-transact postgres-options postgresql-simple
+ postgresql-simple-opts process semigroups split time trek-db
+ ];
+ executableHaskellDepends = [ base optparse-generic ];
+ testHaskellDepends = [
+ async base directory filepath hspec hspec-discover optparse-generic
+ postgres-options postgresql-simple postgresql-simple-opts
+ resource-pool split temporary time time-qq tmp-postgres trek-db
+ ];
+ testToolDepends = [ hspec-discover ];
+ description = "A PostgreSQL Database Migrator";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
+ "trek-db" = callPackage
+ ({ mkDerivation, async, base, bytestring, containers
+ , cryptohash-sha1, hspec, hspec-discover, hspec-expectations-lifted
+ , pg-transact, postgresql-simple, resource-pool, semigroups, text
+ , time, time-qq, tmp-postgres
+ }:
+ mkDerivation {
+ pname = "trek-db";
+ version = "0.1.0.0";
+ sha256 = "13yc7d3a641nhfam9r05qqbfcmh61z27gsj3v3ldhli6ar3i1p92";
+ libraryHaskellDepends = [
+ base bytestring containers cryptohash-sha1 pg-transact
+ postgresql-simple semigroups text time
+ ];
+ testHaskellDepends = [
+ async base hspec hspec-discover hspec-expectations-lifted
+ pg-transact postgresql-simple resource-pool time-qq tmp-postgres
+ ];
+ testToolDepends = [ hspec-discover ];
+ description = "A PostgreSQL Database Migrator";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"trek-lens" = callPackage
({ mkDerivation, base, lens, logict, mtl, trek }:
mkDerivation {
@@ -254082,8 +255347,8 @@ self: {
pname = "true-name";
version = "0.1.0.3";
sha256 = "0s74fi3zfzk3apvwjz1c0k0ij24kdvlrn8lply9c04kyd20fyc66";
- revision = "1";
- editedCabalFile = "0x56r3wyrrsckx6kdvr4v9janrby5qa21fjqwg9k211765c9ddj6";
+ revision = "2";
+ editedCabalFile = "0rb9wbkbz6hsm9cz0j954a9hdyyw80r55vr99pp70ljf0ysgk9w2";
libraryHaskellDepends = [ base template-haskell ];
testHaskellDepends = [ base containers template-haskell time ];
description = "Template Haskell hack to violate module abstractions";
@@ -257170,14 +258435,14 @@ self: {
}:
mkDerivation {
pname = "ucd";
- version = "0.0.1.3";
- sha256 = "1za494jgm3zml4ik203863kwni6pz5dsw6ssn06bjbyk7l7pbg33";
+ version = "0.0.1.4";
+ sha256 = "0a4zzfz4dz8zxn8idnbd4zbhia5b8qf7pgdc9vrffwrx57nlin4a";
setupHaskellDepends = [
base Cabal containers directory regex-applicative util
];
- libraryHaskellDepends = [ base util ];
- testHaskellDepends = [ base util ];
- benchmarkHaskellDepends = [ base gauge util ];
+ libraryHaskellDepends = [ base ];
+ testHaskellDepends = [ base ];
+ benchmarkHaskellDepends = [ base gauge ];
description = "Unicode Character Database — Predicates on characters specified by Unicode";
license = stdenv.lib.licenses.bsd3;
}) {};
@@ -258777,6 +260042,32 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "universum_1_7_0" = callPackage
+ ({ mkDerivation, base, bytestring, containers, deepseq, doctest
+ , gauge, ghc-prim, Glob, hashable, hedgehog, microlens
+ , microlens-mtl, mtl, safe-exceptions, stm, tasty, tasty-hedgehog
+ , text, transformers, unordered-containers, utf8-string, vector
+ }:
+ mkDerivation {
+ pname = "universum";
+ version = "1.7.0";
+ sha256 = "079sck4cfhvx4zda5qiz7vs3050l87ik9hx8yjc6bihrzlqvmgfb";
+ libraryHaskellDepends = [
+ base bytestring containers deepseq ghc-prim hashable microlens
+ microlens-mtl mtl safe-exceptions stm text transformers
+ unordered-containers utf8-string vector
+ ];
+ testHaskellDepends = [
+ base bytestring doctest Glob hedgehog tasty tasty-hedgehog text
+ ];
+ benchmarkHaskellDepends = [
+ base containers gauge text unordered-containers
+ ];
+ description = "Custom prelude used in Serokell";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"unix_2_7_2_2" = callPackage
({ mkDerivation, base, bytestring, time }:
mkDerivation {
@@ -259795,8 +261086,8 @@ self: {
}:
mkDerivation {
pname = "uri-encode";
- version = "1.5.0.5";
- sha256 = "11miwb5vvnn17m92ykz1pzg9x6s8fbpz3mmsyqs2s4b3mn55haz8";
+ version = "1.5.0.6";
+ sha256 = "1w74dqvcl0s26p1s7rszmfj3zphv4bcflpp54iq1kxsrqpd1bbv8";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -259806,6 +261097,27 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "uri-encoder" = callPackage
+ ({ mkDerivation, base, bytestring, criterion, network-uri
+ , QuickCheck, quickcheck-instances, vector
+ }:
+ mkDerivation {
+ pname = "uri-encoder";
+ version = "0.0.0.0";
+ sha256 = "0nrvk039k0pr79nbp78rhav46q2hsns23zzlfgzn878w6shzhyxs";
+ libraryHaskellDepends = [ base bytestring vector ];
+ testHaskellDepends = [
+ base bytestring QuickCheck quickcheck-instances vector
+ ];
+ benchmarkHaskellDepends = [
+ base bytestring criterion network-uri
+ ];
+ description = "A uri encoder to make your strings less readable";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"uri-enumerator" = callPackage
({ mkDerivation, base, bytestring, containers, enumerator, failure
, network, text, transformers
@@ -260219,6 +261531,8 @@ self: {
executableHaskellDepends = [ base random-fu text ];
description = "A collection of user agents";
license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"userid" = callPackage
@@ -260895,8 +262209,8 @@ self: {
pname = "uuid-types";
version = "1.0.3";
sha256 = "1zdka5jnm1h6k36w3nr647yf3b5lqb336g3fkprhd6san9x52xlj";
- revision = "2";
- editedCabalFile = "1lmlmng4lph57cljga3r9jy2axdls5mllsb2xzcwy2a34wgidarc";
+ revision = "3";
+ editedCabalFile = "0znx08r25sgs5j7ix8i9aikhgad0kc9i6vgkg0g3jzxk5haal9sf";
libraryHaskellDepends = [
base binary bytestring deepseq hashable random text
];
@@ -261132,8 +262446,8 @@ self: {
}:
mkDerivation {
pname = "vado";
- version = "0.0.12";
- sha256 = "0qirhdzbcx5mqlbgh24ckcmivi38hqr53im9g6cydzslnk7ys41w";
+ version = "0.0.13";
+ sha256 = "04cdzlbcx95r7x3nz0r676c376j0lfiidp0160maw651in2a3b5f";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -261439,6 +262753,18 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "validity-time_0_4_0_0" = callPackage
+ ({ mkDerivation, base, time, validity }:
+ mkDerivation {
+ pname = "validity-time";
+ version = "0.4.0.0";
+ sha256 = "02lwa2w84m4mm2lpg5dhg5p0ndba5r152bjm4iy76y2qsfkva0ap";
+ libraryHaskellDepends = [ base time validity ];
+ description = "Validity instances for time";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"validity-unordered-containers" = callPackage
({ mkDerivation, base, hashable, unordered-containers, validity }:
mkDerivation {
@@ -263785,6 +265111,42 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "vty_5_30" = callPackage
+ ({ mkDerivation, ansi-terminal, base, binary, blaze-builder
+ , bytestring, Cabal, containers, deepseq, directory, filepath
+ , hashable, HUnit, microlens, microlens-mtl, microlens-th, mtl
+ , parallel, parsec, QuickCheck, quickcheck-assertions, random
+ , smallcheck, stm, string-qq, terminfo, test-framework
+ , test-framework-hunit, test-framework-smallcheck, text
+ , transformers, unix, utf8-string, vector
+ }:
+ mkDerivation {
+ pname = "vty";
+ version = "5.30";
+ sha256 = "1c2azy8pp39hn098dbssl6z8xf63hf52drdqgw7wl856ka2dsakj";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ ansi-terminal base binary blaze-builder bytestring containers
+ deepseq directory filepath hashable microlens microlens-mtl
+ microlens-th mtl parallel parsec stm terminfo text transformers
+ unix utf8-string vector
+ ];
+ executableHaskellDepends = [
+ base containers directory filepath microlens microlens-mtl mtl
+ ];
+ testHaskellDepends = [
+ base blaze-builder bytestring Cabal containers deepseq HUnit
+ microlens microlens-mtl mtl QuickCheck quickcheck-assertions random
+ smallcheck stm string-qq terminfo test-framework
+ test-framework-hunit test-framework-smallcheck text unix
+ utf8-string vector
+ ];
+ description = "A simple terminal UI library";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"vty-examples" = callPackage
({ mkDerivation, array, base, bytestring, Cabal, containers
, data-default, deepseq, lens, mtl, parallel, parsec, QuickCheck
@@ -263862,8 +265224,8 @@ self: {
({ mkDerivation, base, bytestring, transformers, vector, vulkan }:
mkDerivation {
pname = "vulkan";
- version = "3.5";
- sha256 = "1jly8hwfr11aczyrrx2yf64dlq2xgyp51jxrms2kz8izgbdh0h1h";
+ version = "3.6.2";
+ sha256 = "05lp2jwc4m432k1k9x8305a5a4m92lnxab4341lpmqc3vy30hz7a";
libraryHaskellDepends = [ base bytestring transformers vector ];
librarySystemDepends = [ vulkan ];
description = "Bindings to the Vulkan graphics API";
@@ -264128,6 +265490,22 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "wai-control" = callPackage
+ ({ mkDerivation, base, monad-control-identity, transformers-base
+ , wai, wai-websockets, websockets
+ }:
+ mkDerivation {
+ pname = "wai-control";
+ version = "0.1.0.1";
+ sha256 = "110zv6q5ya997sn21sd5mwgj9vx73afnwxzvi0xvv198gh6wc7iq";
+ libraryHaskellDepends = [
+ base monad-control-identity transformers-base wai wai-websockets
+ websockets
+ ];
+ description = "Give wai Applications an IO-based inner monad";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"wai-cors" = callPackage
({ mkDerivation, attoparsec, base, base-unicode-symbols, bytestring
, case-insensitive, directory, filepath, http-types, mtl, network
@@ -265474,8 +266852,8 @@ self: {
}:
mkDerivation {
pname = "wai-secure-cookies";
- version = "0.1.0.4";
- sha256 = "0m77h2xnm3h3axchvmbylrhm4s7d31zxsv0bgqvmh9zhydr90d2v";
+ version = "0.1.0.5";
+ sha256 = "0v3gz70z968yk563g9n72v8l7mhqhkbjb9gy15s5zpf3apv1cf00";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -266008,8 +267386,8 @@ self: {
({ mkDerivation, base, network, systemd, unix, wai, warp }:
mkDerivation {
pname = "warp-systemd";
- version = "0.1.0.0";
- sha256 = "1cfm70dapcxd7ddxs7x0qqlv5w5kr3hasspvg292ik5f5bn40m91";
+ version = "0.1.1.0";
+ sha256 = "1gi9xkaa3wi5n2vhmlc7s4zm48l2fakwnd7bw007hzfqi17zz13x";
libraryHaskellDepends = [ base network systemd unix wai warp ];
description = "Socket activation and other systemd integration for the Warp web server (WAI)";
license = stdenv.lib.licenses.bsd3;
@@ -266511,31 +267889,28 @@ self: {
}) {};
"web-rep" = callPackage
- ({ mkDerivation, aeson, attoparsec, base, bifunctors, box, clay
- , doctest, foldl, generic-lens, interpolatedstring-perl6
- , javascript-bridge, language-javascript, lens, lucid, lucid-svg
- , mmorph, mtl, optparse-generic, scotty, streaming, tasty
- , tasty-hspec, text, text-format, transformers
- , unordered-containers, wai, wai-extra, wai-middleware-static
+ ({ mkDerivation, attoparsec, base, box, box-socket, clay
+ , concurrency, doctest, foldl, generic-lens
+ , interpolatedstring-perl6, language-javascript, lens, lucid, mtl
+ , numhask, optparse-generic, scotty, tasty, tasty-hspec, text
+ , transformers, unordered-containers, wai-middleware-static
+ , wai-websockets, websockets
}:
mkDerivation {
pname = "web-rep";
- version = "0.5.0";
- sha256 = "0av64gnh4gq8vxqclzn91776g5xpkvlix1v61wbk065lwc5znv26";
+ version = "0.6.0";
+ sha256 = "1ljlmfcjhiiqmsw2zfvxifr13g35c0mj33rkdxih6yz948czz17m";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
- aeson attoparsec base bifunctors box clay foldl generic-lens
- interpolatedstring-perl6 javascript-bridge language-javascript lens
- lucid lucid-svg mmorph mtl scotty streaming text text-format
- transformers unordered-containers wai-middleware-static
- ];
- executableHaskellDepends = [
- attoparsec base box lens lucid optparse-generic scotty text wai
- wai-extra wai-middleware-static
+ attoparsec base box box-socket clay concurrency foldl generic-lens
+ interpolatedstring-perl6 language-javascript lens lucid mtl numhask
+ scotty text transformers unordered-containers wai-middleware-static
+ wai-websockets websockets
];
+ executableHaskellDepends = [ base numhask optparse-generic ];
testHaskellDepends = [
- base doctest lens lucid tasty tasty-hspec text
+ base doctest lens lucid numhask tasty tasty-hspec text
];
description = "representations of a web page";
license = stdenv.lib.licenses.mit;
@@ -267203,8 +268578,8 @@ self: {
({ mkDerivation, base, Cabal, gtk2hs-buildtools, webkitgtk }:
mkDerivation {
pname = "webkit2gtk3-javascriptcore";
- version = "0.14.4.0";
- sha256 = "0njp5m8m9qz7ra9z8ni103bnicfshiixxy44na8m3mzjqrchczww";
+ version = "0.14.4.1";
+ sha256 = "0bi42gpw0cf5ymnwlffnfdq68jfvk0j4qcnqv8lvwz2vp1ngs23j";
setupHaskellDepends = [ base Cabal gtk2hs-buildtools ];
libraryHaskellDepends = [ base ];
libraryPkgconfigDepends = [ webkitgtk ];
@@ -267544,6 +268919,8 @@ self: {
];
description = "A school-timetable problem-solver";
license = "GPL";
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"weigh" = callPackage
@@ -267686,6 +269063,42 @@ self: {
broken = true;
}) {};
+ "what4" = callPackage
+ ({ mkDerivation, ansi-wl-pprint, attoparsec, base, bifunctors
+ , bimap, bv-sized, bytestring, containers, data-binary-ieee754
+ , deepseq, deriving-compat, directory, exceptions, extra, filepath
+ , fingertree, ghc-prim, hashable, hashtables, hedgehog, io-streams
+ , lens, mtl, panic, parameterized-utils, process, QuickCheck
+ , scientific, tasty, tasty-hedgehog, tasty-hunit, tasty-quickcheck
+ , template-haskell, temporary, text, th-abstraction, transformers
+ , unordered-containers, utf8-string, vector, versions, zenc
+ }:
+ mkDerivation {
+ pname = "what4";
+ version = "1.0";
+ sha256 = "0yyyq2gzl7srjq6inj1dqdhpxd58r1rhjajwxi0gr5pmxfzv7k8w";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ ansi-wl-pprint attoparsec base bifunctors bimap bv-sized bytestring
+ containers data-binary-ieee754 deepseq deriving-compat directory
+ exceptions extra filepath fingertree ghc-prim hashable hashtables
+ io-streams lens mtl panic parameterized-utils process scientific
+ template-haskell temporary text th-abstraction transformers
+ unordered-containers utf8-string vector versions zenc
+ ];
+ executableHaskellDepends = [ base parameterized-utils ];
+ testHaskellDepends = [
+ base bv-sized bytestring containers data-binary-ieee754 hedgehog
+ parameterized-utils QuickCheck tasty tasty-hedgehog tasty-hunit
+ tasty-quickcheck text transformers versions
+ ];
+ description = "Solver-agnostic symbolic values support for issuing queries";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"wheb-mongo" = callPackage
({ mkDerivation, base, bson, mongoDB, mtl, text, Wheb }:
mkDerivation {
@@ -267827,6 +269240,8 @@ self: {
random-fu random-shuffle random-source relude temporary time
];
license = stdenv.lib.licenses.asl20;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"why3" = callPackage
@@ -268323,6 +269738,22 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "within_0_2_0_0" = callPackage
+ ({ mkDerivation, base, comonad, exceptions, free, hashable, path
+ , path-like
+ }:
+ mkDerivation {
+ pname = "within";
+ version = "0.2.0.0";
+ sha256 = "1jvfxcxyavadcbslb50a6ad7bmnwz45d6zaxyc38y61kh0r82242";
+ libraryHaskellDepends = [
+ base comonad exceptions free hashable path path-like
+ ];
+ description = "A value within another path";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"witness" = callPackage
({ mkDerivation, base, constraints, semigroupoids, transformers }:
mkDerivation {
@@ -270304,8 +271735,8 @@ self: {
}:
mkDerivation {
pname = "xcffib";
- version = "0.9.0";
- sha256 = "0nxy4dfwz1wgj6dvg1jp3k4zblwpgiydmv7p20s5scyzgii8jsfk";
+ version = "0.10.0";
+ sha256 = "163fiyppb40xd4wibvjkya86630hlhn1ij0i5xlc547gazawhz4a";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -271511,8 +272942,8 @@ self: {
({ mkDerivation, base, deepseq, text }:
mkDerivation {
pname = "xml-types";
- version = "0.3.7";
- sha256 = "0x0fdwx6gyhwbx4wfah6ssnpfq5bkybrh0f75wr0gvw4hrnx81k3";
+ version = "0.3.8";
+ sha256 = "102cm0nvfmf9gn8hvn5z8qvmg931laczs33wwd5iyz9bc37f9mfs";
libraryHaskellDepends = [ base deepseq text ];
description = "Basic types for representing XML";
license = stdenv.lib.licenses.mit;
@@ -272294,8 +273725,6 @@ self: {
];
testToolDepends = [ hspec-discover ];
license = stdenv.lib.licenses.mpl20;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"xsact" = callPackage
@@ -274292,33 +275721,6 @@ self: {
}) {};
"yesod-bin" = callPackage
- ({ mkDerivation, base, bytestring, Cabal, conduit, conduit-extra
- , containers, data-default-class, directory, file-embed, filepath
- , fsnotify, http-client, http-client-tls, http-reverse-proxy
- , http-types, network, optparse-applicative, process
- , project-template, say, split, stm, streaming-commons, tar, text
- , time, transformers, transformers-compat, unliftio
- , unordered-containers, wai, wai-extra, warp, warp-tls, yaml, zlib
- }:
- mkDerivation {
- pname = "yesod-bin";
- version = "1.6.0.4";
- sha256 = "0wz44w4c86513ss81a18rknkrkalxyj2g4rlq324ykqwwkihlr1a";
- isLibrary = false;
- isExecutable = true;
- executableHaskellDepends = [
- base bytestring Cabal conduit conduit-extra containers
- data-default-class directory file-embed filepath fsnotify
- http-client http-client-tls http-reverse-proxy http-types network
- optparse-applicative process project-template say split stm
- streaming-commons tar text time transformers transformers-compat
- unliftio unordered-containers wai wai-extra warp warp-tls yaml zlib
- ];
- description = "The yesod helper executable";
- license = stdenv.lib.licenses.mit;
- }) {};
-
- "yesod-bin_1_6_0_5" = callPackage
({ mkDerivation, base, bytestring, Cabal, conduit, conduit-extra
, containers, data-default-class, directory, file-embed, filepath
, fsnotify, http-client, http-client-tls, http-reverse-proxy
@@ -274343,7 +275745,6 @@ self: {
];
description = "The yesod helper executable";
license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"yesod-bootstrap" = callPackage
@@ -275669,14 +277070,14 @@ self: {
, blaze-builder, bytestring, conduit, containers, cryptonite
, cryptonite-conduit, css-text, data-default, directory, file-embed
, filepath, hashable, hjsmin, hspec, http-types, HUnit, memory
- , mime-types, process, template-haskell, text, transformers
+ , mime-types, process, rio, template-haskell, text, transformers
, unix-compat, unordered-containers, wai, wai-app-static, wai-extra
, yesod-core, yesod-test
}:
mkDerivation {
pname = "yesod-static";
- version = "1.6.0.1";
- sha256 = "1jd0ryfr2vyrwasyvbqmc6j4ngv1lgz78w427f169l7gyl1firxb";
+ version = "1.6.1.0";
+ sha256 = "18f5hm9ncvkzl8bkn39cg841z0k5iqs5w45afsyk9y6k98pjd54p";
libraryHaskellDepends = [
async attoparsec base base64-bytestring blaze-builder bytestring
conduit containers cryptonite cryptonite-conduit css-text
@@ -275689,8 +277090,9 @@ self: {
async base base64-bytestring bytestring conduit containers
cryptonite cryptonite-conduit data-default directory file-embed
filepath hjsmin hspec http-types HUnit memory mime-types process
- template-haskell text transformers unix-compat unordered-containers
- wai wai-app-static wai-extra yesod-core yesod-test
+ rio template-haskell text transformers unix-compat
+ unordered-containers wai wai-app-static wai-extra yesod-core
+ yesod-test
];
description = "Static file serving subsite for Yesod Web Framework";
license = stdenv.lib.licenses.mit;
@@ -277161,8 +278563,8 @@ self: {
}:
mkDerivation {
pname = "zeolite-lang";
- version = "0.7.0.2";
- sha256 = "0n51sbivvzjnspwp2j4mxsm552b0ay7hgmlvj16xy5w17z8r9pg2";
+ version = "0.7.1.0";
+ sha256 = "1sdnnixy3n54nhr4kq3xa066nplgz19c03iwjvaahj2a0iir07m4";
isLibrary = false;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -277666,6 +279068,8 @@ self: {
pname = "zip";
version = "1.5.0";
sha256 = "00lqf0bw6abxdj9rs658blbhabzr1fd1w9dh0qflyxqkd8fqj7h5";
+ revision = "1";
+ editedCabalFile = "08r12h84zp55lfqh53srmivf4xzyq2yyyiw12ja73ipnb0y2ag7i";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -277813,8 +279217,8 @@ self: {
}:
mkDerivation {
pname = "zipper-extra";
- version = "0.1.3.0";
- sha256 = "069mbsqcb1z238awj934xiqcz2s0pf58mfq1cjr8wg1k7b2wvy0k";
+ version = "0.1.3.1";
+ sha256 = "1n6amxaydfannxhgnbj5g315m96h5wvgrdw89n6761vii76csky4";
libraryHaskellDepends = [
base comonad comonad-extras exceptions split
];
@@ -278206,8 +279610,8 @@ self: {
}:
mkDerivation {
pname = "zre";
- version = "0.1.1.0";
- sha256 = "0xq37fiqy82xvk4bz3ia4gykhm1vr3jlv9p8b1bdmsqsmn8kxd2x";
+ version = "0.1.3.0";
+ sha256 = "09wsfghrba6akhxwl19khln0w64p919glz14f6sdijiagmkd87zw";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
diff --git a/pkgs/development/haskell-modules/with-packages-wrapper.nix b/pkgs/development/haskell-modules/with-packages-wrapper.nix
index 3b8d906cecef..a34af634e147 100644
--- a/pkgs/development/haskell-modules/with-packages-wrapper.nix
+++ b/pkgs/development/haskell-modules/with-packages-wrapper.nix
@@ -105,14 +105,16 @@ symlinkJoin {
--set "NIX_${ghcCommandCaps}_LIBDIR" "${libDir}"
fi
- # ghcide does package discovery without calling our ghc wrapper.
- if [[ -x "$out/bin/ghcide" ]]; then
- wrapProgram $out/bin/ghcide \
+ # ghcide and haskell-language-server do package discovery without calling our ghc wrapper.
+ for prg in ghcide haskell-language-server; do
+ if [[ -x "$out/bin/$prg" ]]; then
+ wrapProgram $out/bin/$prg \
--set "NIX_${ghcCommandCaps}" "$out/bin/${ghcCommand}" \
--set "NIX_${ghcCommandCaps}PKG" "$out/bin/${ghcCommand}-pkg" \
--set "NIX_${ghcCommandCaps}_DOCDIR" "${docDir}" \
--set "NIX_${ghcCommandCaps}_LIBDIR" "${libDir}"
- fi
+ fi
+ done
'' + (lib.optionalString (stdenv.targetPlatform.isDarwin && !isGhcjs && !stdenv.targetPlatform.isiOS) ''
# Work around a linker limit in macOS Sierra (see generic-builder.nix):
diff --git a/pkgs/development/interpreters/clojure/default.nix b/pkgs/development/interpreters/clojure/default.nix
index 814af36811c7..7d0857f4e789 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/erlang/R23.nix b/pkgs/development/interpreters/erlang/R23.nix
index 6928c978fec7..d42508c2ef96 100644
--- a/pkgs/development/interpreters/erlang/R23.nix
+++ b/pkgs/development/interpreters/erlang/R23.nix
@@ -3,8 +3,8 @@
# How to obtain `sha256`:
# nix-prefetch-url --unpack https://github.com/erlang/otp/archive/OTP-${version}.tar.gz
mkDerivation {
- version = "23.0.2";
- sha256 = "19ly2m0rjay6071r75s9870cm3sph25zd1mvy67l5v4jg7mxdjzy";
+ version = "23.0.3";
+ sha256 = "133aw1ffkxdf38na3smmvn5qwwlalh4r4a51793h1wkhdzkyl6mv";
prePatch = ''
substituteInPlace make/configure.in --replace '`sw_vers -productVersion`' "''${MACOSX_DEPLOYMENT_TARGET:-10.12}"
diff --git a/pkgs/development/interpreters/evcxr/default.nix b/pkgs/development/interpreters/evcxr/default.nix
index 5d3d3de85dd3..5e67103b1bdc 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 a3aca532b0f3..a8890b048fbe 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/amdvlk/default.nix b/pkgs/development/libraries/amdvlk/default.nix
index ab5d77072b94..506e3e2535f3 100644
--- a/pkgs/development/libraries/amdvlk/default.nix
+++ b/pkgs/development/libraries/amdvlk/default.nix
@@ -1,6 +1,5 @@
{ stdenv
, lib
-, fetchpatch
, fetchRepoProject
, cmake
, ninja
@@ -19,13 +18,13 @@
stdenv.mkDerivation rec {
pname = "amdvlk";
- version = "2020.Q3.1";
+ version = "2020.Q3.2";
src = fetchRepoProject {
name = "${pname}-src";
manifest = "https://github.com/GPUOpen-Drivers/AMDVLK.git";
rev = "refs/tags/v-${version}";
- sha256 = "0azbl5750q3ivpz5q8nlsf5p4qv94hcm4nbmwgxbvxybbk682k0i";
+ sha256 = "1mki4lxy981g1rz9d6w18dv1hf3ldch5gld2vb7injn5ipp6z2y3";
};
buildInputs = [
@@ -54,6 +53,7 @@ stdenv.mkDerivation rec {
rpath = lib.makeLibraryPath [
libdrm
+ openssl
stdenv.cc.cc.lib
xorg.libX11
xorg.libxcb
diff --git a/pkgs/development/libraries/aml/default.nix b/pkgs/development/libraries/aml/default.nix
new file mode 100644
index 000000000000..0b753618ba6a
--- /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 605df2381016..74ca27f2e3c0 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 ceca7e24fb6e..40cea4f730e7 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 8ea2f0159a31..dcba66681858 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/igraph/default.nix b/pkgs/development/libraries/igraph/default.nix
index 7f494e8bddc1..6a55359e168b 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 5bc0f15b205d..000000000000
--- 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 fcb599e00f57..604fd3ee4465 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 76f01f9a5037..71667460e239 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/lime/default.nix b/pkgs/development/libraries/lime/default.nix
index 3ebcc7ad78a6..aa34ff2e927c 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 cd91760bff59..ef42650e249d 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
+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 f574ab196930..3371bd45e712 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 af1fa6b41387..c69f987c70e8 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/nanomsg/default.nix b/pkgs/development/libraries/nanomsg/default.nix
index 7e96d60840d1..5772581d5ec1 100644
--- a/pkgs/development/libraries/nanomsg/default.nix
+++ b/pkgs/development/libraries/nanomsg/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "01ddfzjlkf2dgijrmm3j3j8irccsnbgfvjcnwslsfaxnrmrq5s64";
};
- buildInputs = [ cmake ];
+ nativeBuildInputs = [ cmake ];
meta = with stdenv.lib; {
description= "Socket library that provides several common communication patterns";
diff --git a/pkgs/development/libraries/neatvnc/default.nix b/pkgs/development/libraries/neatvnc/default.nix
index 127f25a50bea..2c4357e1e936 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 97b77c02df48..000000000000
--- 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/oneDNN/default.nix b/pkgs/development/libraries/oneDNN/default.nix
index af00b757b139..80daf83de83d 100644
--- a/pkgs/development/libraries/oneDNN/default.nix
+++ b/pkgs/development/libraries/oneDNN/default.nix
@@ -20,10 +20,19 @@ stdenv.mkDerivation rec {
doCheck = true;
+ cmakeFlags = [
+ # oneDNN compiles with -msse4.1 by default, but not all x86_64
+ # CPUs support SSE 4.1.
+ "-DDNNL_ARCH_OPT_FLAGS="
+ ];
+
# The test driver doesn't add an RPath to the build libdir
preCheck = ''
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}$PWD/src
export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH''${DYLD_LIBRARY_PATH:+:}$PWD/src
+ '' + lib.optionalString stdenv.isx86_64 ''
+ # Use baseline SIMD in case CPU features get misdetected.
+ export DNNL_MAX_CPU_ISA=SSE41
'';
# The cmake install gets tripped up and installs a nix tree into $out, in
diff --git a/pkgs/development/libraries/opendmarc/default.nix b/pkgs/development/libraries/opendmarc/default.nix
new file mode 100644
index 000000000000..9b45cc244f26
--- /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 db644287d2e1..f652c5ee7b7c 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 8d4e91265f5e..7d412f86596d 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/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix
index 420cf7314543..cd39e61a0cb7 100644
--- a/pkgs/development/libraries/poppler/default.nix
+++ b/pkgs/development/libraries/poppler/default.nix
@@ -12,11 +12,11 @@ let
in
stdenv.mkDerivation rec {
name = "poppler-${suffix}-${version}";
- version = "0.90.0"; # beware: updates often break cups-filters build, check texlive and scribusUnstable too!
+ version = "0.90.1"; # beware: updates often break cups-filters build, check texlive and scribusUnstable too!
src = fetchurl {
url = "${meta.homepage}/poppler-${version}.tar.xz";
- sha256 = "11cnk18qnhkhari1102syk5n3k7906jpm05cr8i4vdrh6fnv1vcl";
+ sha256 = "mE2C5y6RQY0oCIUpjIvchVov2SZl/VKhNFsnI14MccQ=";
};
outputs = [ "out" "dev" ];
diff --git a/pkgs/development/libraries/protobuf/3.12.nix b/pkgs/development/libraries/protobuf/3.12.nix
index 6f9add8adc2a..6ea64a023800 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/xxHash/default.nix b/pkgs/development/libraries/xxHash/default.nix
index 58bf562b0809..e572e8bb31ff 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 29981f358a57..000000000000
--- 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 4c9603307c70..e84c9322f0c5 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 3083a2081501..52a7474ad45a 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,15 +3163,6 @@ let
sha512 = "jmZyxVHqzYU1GfdnWCGdd68WY/lAzpPVyqalHazPj4tFJehrSfEFc82RMTYAMgXEJuvFRFIwhsvXh3sWUhIQmg==";
};
};
- "@snyk/cli-interface-2.5.0" = {
- name = "_at_snyk_slash_cli-interface";
- packageName = "@snyk/cli-interface";
- version = "2.5.0";
- src = fetchurl {
- url = "https://registry.npmjs.org/@snyk/cli-interface/-/cli-interface-2.5.0.tgz";
- sha512 = "XMc2SCFH4RBSncZgoPb+BBlNq0NYpEpCzptKi69qyMpBy0VsRqIQqddedaazMCU1xEpXTytq6KMYpzUafZzp5Q==";
- };
- };
"@snyk/cli-interface-2.8.0" = {
name = "_at_snyk_slash_cli-interface";
packageName = "@snyk/cli-interface";
@@ -3154,6 +3172,15 @@ let
sha512 = "St/G39iJG1zQK15L24kcVYM2gmFc/ylBCcBqU2DMZKJKwOPccKLUO6s+dWIUXMccQ+DFS6TuHPvuAKQNi9C4Yg==";
};
};
+ "@snyk/cli-interface-2.8.1" = {
+ name = "_at_snyk_slash_cli-interface";
+ packageName = "@snyk/cli-interface";
+ version = "2.8.1";
+ src = fetchurl {
+ 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" = {
name = "_at_snyk_slash_cocoapods-lockfile-parser";
packageName = "@snyk/cocoapods-lockfile-parser";
@@ -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/markup/default.nix b/pkgs/development/ocaml-modules/markup/default.nix
index 92daea1a4b64..8b3525d26345 100644
--- a/pkgs/development/ocaml-modules/markup/default.nix
+++ b/pkgs/development/ocaml-modules/markup/default.nix
@@ -1,28 +1,20 @@
-{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, uutf, lwt }:
+{ lib, buildDunePackage, fetchzip, uutf }:
-stdenv.mkDerivation rec {
+buildDunePackage rec {
pname = "markup";
- version = "0.7.5";
- name = "ocaml${ocaml.version}-${pname}-${version}";
+ version = "0.8.2";
src = fetchzip {
url = "https://github.com/aantron/markup.ml/archive/${version}.tar.gz";
- sha256 = "09qm73m6c6wjh51w61vnfsnis37m28cf1r6hnkr3bbg903ahwbp5";
+ sha256 = "13zcrwzjmifniv3bvjbkd2ah8wwa3ld75bxh1d8hrzdvfxzh9szn";
};
- buildInputs = [ ocaml findlib ocamlbuild lwt ];
-
- installPhase = "make ocamlfind-install";
-
propagatedBuildInputs = [ uutf ];
- createFindlibDestdir = true;
-
- meta = with stdenv.lib; {
+ meta = with lib; {
homepage = "https://github.com/aantron/markup.ml/";
description = "A pair of best-effort parsers implementing the HTML5 and XML specifications";
- license = licenses.bsd2;
- platforms = ocaml.meta.platforms or [];
+ license = licenses.mit;
maintainers = with maintainers; [
gal_bolle
];
diff --git a/pkgs/development/ocaml-modules/ocsigen-server/default.nix b/pkgs/development/ocaml-modules/ocsigen-server/default.nix
index 0d56f2c783fb..30ddd005b79b 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 000000000000..70dc0826276b
--- /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/ansible/default.nix b/pkgs/development/python-modules/ansible/default.nix
index 03bb1fcc3899..79723c866d87 100644
--- a/pkgs/development/python-modules/ansible/default.nix
+++ b/pkgs/development/python-modules/ansible/default.nix
@@ -18,13 +18,13 @@
buildPythonPackage rec {
pname = "ansible";
- version = "2.9.10";
+ version = "2.9.11";
src = fetchFromGitHub {
owner = "ansible";
repo = "ansible";
rev = "v${version}";
- sha256 = "1979522k57gafvq9vx3lbc3zah7jq3kiy98ji9x5bmxyddmgr9ch";
+ sha256 = "0a9wgd1ri1av6rcwld36sa48v42003pdf1fx9hhkmhz4icyij0kx";
};
prePatch = ''
diff --git a/pkgs/development/python-modules/ase/default.nix b/pkgs/development/python-modules/ase/default.nix
index 870f0598e5e7..dfac62813967 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 c6620de3d0c3..e82dca3e9553 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-mgmt-loganalytics/default.nix b/pkgs/development/python-modules/azure-mgmt-loganalytics/default.nix
index 69c1aaffada3..247e1ef3fed0 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 8050f886db5a..00d554ef14b1 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/cheetah3/default.nix b/pkgs/development/python-modules/cheetah3/default.nix
new file mode 100644
index 000000000000..1c133917cb20
--- /dev/null
+++ b/pkgs/development/python-modules/cheetah3/default.nix
@@ -0,0 +1,20 @@
+{ lib, buildPythonPackage, fetchPypi, stdenv }:
+
+buildPythonPackage rec {
+ pname = "Cheetah3";
+ version = "3.2.5";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "ececc9ca7c58b9a86ce71eb95594c4619949e2a058d2a1af74c7ae8222515eb1";
+ };
+
+ doCheck = false; # Circular dependency
+
+ meta = {
+ homepage = "http://www.cheetahtemplate.org/";
+ description = "A template engine and code generation tool";
+ license = lib.licenses.mit;
+ maintainers = with stdenv.lib.maintainers; [ pjjw ];
+ };
+}
diff --git a/pkgs/development/python-modules/clikit/default.nix b/pkgs/development/python-modules/clikit/default.nix
index da2958067238..7b07b0945919 100644
--- a/pkgs/development/python-modules/clikit/default.nix
+++ b/pkgs/development/python-modules/clikit/default.nix
@@ -1,5 +1,5 @@
{ lib, buildPythonPackage, fetchPypi
-, isPy27
+, isPy27, pythonAtLeast
, pylev, pastel, typing, enum34, crashtest }:
buildPythonPackage rec {
@@ -12,8 +12,10 @@ buildPythonPackage rec {
};
propagatedBuildInputs = [
- crashtest pylev pastel
- ] ++ lib.optionals isPy27 [ typing enum34 ];
+ pylev pastel
+ ]
+ ++ lib.optionals (pythonAtLeast "3.6") [ crashtest ]
+ ++ lib.optionals isPy27 [ typing enum34 ];
# The Pypi tarball doesn't include tests, and the GitHub source isn't
# buildable until we bootstrap poetry, see
diff --git a/pkgs/development/python-modules/colorful/default.nix b/pkgs/development/python-modules/colorful/default.nix
new file mode 100644
index 000000000000..c9378e329a32
--- /dev/null
+++ b/pkgs/development/python-modules/colorful/default.nix
@@ -0,0 +1,27 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, pytestCheckHook
+}:
+
+buildPythonPackage rec {
+ pname = "colorful";
+ version = "0.5.4";
+
+ # No tests in the Pypi package.
+ src = fetchFromGitHub {
+ owner = "timofurrer";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "1fcz5v8b318a3dsdha4c874jsf3wmcw3f25bv2csixclyzacli98";
+ };
+
+ checkInputs = [ pytestCheckHook ];
+
+ meta = with lib; {
+ description = "Terminal string styling done right, in Python.";
+ homepage = "http://github.com/timofurrer/colorful";
+ license = licenses.mit;
+ maintainers = with maintainers; [ kalbasit ];
+ };
+}
diff --git a/pkgs/development/python-modules/crashtest/default.nix b/pkgs/development/python-modules/crashtest/default.nix
index e4c7fb839f91..9e6ff1f3d83d 100644
--- a/pkgs/development/python-modules/crashtest/default.nix
+++ b/pkgs/development/python-modules/crashtest/default.nix
@@ -1,9 +1,9 @@
-{ lib, buildPythonPackage, fetchFromGitHub, fetchPypi, isPy27, pytest }:
+{ lib, buildPythonPackage, fetchFromGitHub, fetchPypi, pythonAtLeast, pytest }:
buildPythonPackage rec {
pname = "crashtest";
version = "0.3.0";
- disabled = isPy27;
+ disabled = !(pythonAtLeast "3.6");
src = fetchPypi {
inherit pname version;
diff --git a/pkgs/development/python-modules/crc32c/default.nix b/pkgs/development/python-modules/crc32c/default.nix
index 6fd31d007f6c..dd2c9059ed5f 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 49e6c3b3c475..80fa1c35d632 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 000000000000..76de351d05c4
--- /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 95a991f34178..8efd62d7d181 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 567cd85fa943..0238cf4706f7 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 401437ceec4c..f271411a285c 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 7c991c528cdd..0f224bd8ab0b 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/h5netcdf/default.nix b/pkgs/development/python-modules/h5netcdf/default.nix
index b80a91037179..3d66291aed89 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 38d762ec3607..02cb44354fbc 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 = ''
diff --git a/pkgs/development/python-modules/mautrix/default.nix b/pkgs/development/python-modules/mautrix/default.nix
index 01cabdd9b32d..50b81cef945d 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 27c959cee0fb..993e5e413e4c 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 bfb15bbc6d60..909be251386b 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/openrazer/common.nix b/pkgs/development/python-modules/openrazer/common.nix
index 501b3fa54a45..8dddf105d1c0 100644
--- a/pkgs/development/python-modules/openrazer/common.nix
+++ b/pkgs/development/python-modules/openrazer/common.nix
@@ -1,12 +1,12 @@
{ stdenv
, fetchFromGitHub
}: rec {
- version = "2.7.0";
+ version = "2.8.0";
src = fetchFromGitHub {
owner = "openrazer";
repo = "openrazer";
rev = "v${version}";
- sha256 = "013r9q4xg2xjmyxybx07zsl2b5lm9vw843anx22ygpvxz1qgz9hp";
+ sha256 = "0mwg6b2y3wfpvgxb9lznwblb3bnrayn858nc4fbbg76zdp5bk5ky";
};
meta = with stdenv.lib; {
homepage = "https://openrazer.github.io/";
diff --git a/pkgs/development/python-modules/ordered-set/default.nix b/pkgs/development/python-modules/ordered-set/default.nix
index 4a9e6fefe066..7546566cb3aa 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 a2d16f603f5d..eddf3f74e0f3 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 2fefbde74485..6c490cb344b1 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 c8967fa5eabf..6250b5a2202d 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 e0be5f5ed0aa..a81e1e52aeaa 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/pymysql/default.nix b/pkgs/development/python-modules/pymysql/default.nix
index a43dcfb26fcd..c0419d025b0b 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/pysingleton/default.nix b/pkgs/development/python-modules/pysingleton/default.nix
new file mode 100644
index 000000000000..22e4ade4a882
--- /dev/null
+++ b/pkgs/development/python-modules/pysingleton/default.nix
@@ -0,0 +1,26 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+}:
+
+buildPythonPackage rec {
+ pname = "pysingleton";
+ version = "0.2.1";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "5776e7a4ba0bab26709da604f4e648c5814385fef34010723db3da0d41b0dbcc";
+ };
+
+ pythonImportsCheck = [ "singleton" ];
+
+ # No tests in the Pypi package.
+ doCheck = false;
+
+ meta = with lib; {
+ description = "Provides a decorator to create thread-safe singleton classes";
+ homepage = "https://github.com/timofurrer/pysingleton";
+ license = licenses.mit;
+ maintainers = with maintainers; [ kalbasit ];
+ };
+}
diff --git a/pkgs/development/python-modules/python-jsonrpc-server/default.nix b/pkgs/development/python-modules/python-jsonrpc-server/default.nix
index 586c6edfa829..12ad5170a7c5 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 24d86289bf2a..3538db60793d 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/radish-bdd/default.nix b/pkgs/development/python-modules/radish-bdd/default.nix
new file mode 100644
index 000000000000..b2d22346dd74
--- /dev/null
+++ b/pkgs/development/python-modules/radish-bdd/default.nix
@@ -0,0 +1,52 @@
+{ lib
+, buildPythonPackage
+, click
+, colorful
+, docopt
+, fetchFromGitHub
+, freezegun
+, humanize
+, lark-parser
+, parse-type
+, pysingleton
+, pytestCheckHook
+, pyyaml
+, tag-expressions
+, lxml
+, pytest-mock
+}:
+
+buildPythonPackage rec {
+ pname = "radish-bdd";
+ version = "0.13.2";
+
+ # Pypi package does not have necessary test fixtures.
+ src = fetchFromGitHub {
+ owner = pname;
+ repo = "radish";
+ rev = "v${version}";
+ sha256 = "1k7l0j8w221pa6k990x4rfm7km4asx5zy4zpzvh029lb9nw2pp8b";
+ };
+
+ propagatedBuildInputs = [
+ lark-parser
+ click
+ colorful
+ tag-expressions
+ parse-type
+ humanize
+ pyyaml
+ docopt
+ pysingleton
+ ];
+
+ checkInputs = [ freezegun lxml pytestCheckHook pytest-mock ];
+ disabledTests = [ "test_main_cli_calls" ];
+
+ meta = with lib; {
+ description = "Behaviour-Driven-Development tool for python";
+ homepage = "http://radish-bdd.io";
+ license = licenses.mit;
+ maintainers = with maintainers; [ kalbasit ];
+ };
+}
diff --git a/pkgs/development/python-modules/recommonmark/default.nix b/pkgs/development/python-modules/recommonmark/default.nix
index 26ba8a68d87a..472f873e30a0 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 9d2a533ecb6e..3018cabd0259 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 842622e56f86..130a098a23f8 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 d675a1fd350d..ea48474045ad 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/tag-expressions/default.nix b/pkgs/development/python-modules/tag-expressions/default.nix
new file mode 100644
index 000000000000..7082ca54154b
--- /dev/null
+++ b/pkgs/development/python-modules/tag-expressions/default.nix
@@ -0,0 +1,24 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, pytestCheckHook
+}:
+
+buildPythonPackage rec {
+ pname = "tag-expressions";
+ version = "1.1.0";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "1c0a49c3c0357976822b03c43db8d4a1c5548e16fb07ac939c10bbd5183f529d";
+ };
+
+ checkInputs = [ pytestCheckHook ];
+
+ meta = with lib; {
+ description = "Package to parse logical tag expressions";
+ homepage = "http://github.com/timofurrer/tag-expressions";
+ license = licenses.gpl3Plus;
+ maintainers = with maintainers; [ kalbasit ];
+ };
+}
diff --git a/pkgs/development/python-modules/tiledb/default.nix b/pkgs/development/python-modules/tiledb/default.nix
index cf688d75f01e..808a6c54825c 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/trezor/default.nix b/pkgs/development/python-modules/trezor/default.nix
index e7bec00863ae..e16f4027ce54 100644
--- a/pkgs/development/python-modules/trezor/default.nix
+++ b/pkgs/development/python-modules/trezor/default.nix
@@ -12,6 +12,7 @@
, rlp
, shamir-mnemonic
, trezor-udev-rules
+, installShellFiles
}:
buildPythonPackage rec {
@@ -25,6 +26,8 @@ buildPythonPackage rec {
sha256 = "0ycmpwjv5xp25993divjhaq5j766zgcy22xx39xfc1pcvldq5g7n";
};
+ nativeBuildInputs = [ installShellFiles ];
+
propagatedBuildInputs = [ typing-extensions protobuf hidapi ecdsa mnemonic requests pyblake2 click construct libusb1 rlp shamir-mnemonic trezor-udev-rules ];
checkInputs = [
@@ -38,6 +41,16 @@ buildPythonPackage rec {
runHook postCheck
'';
+ postFixup = ''
+ mkdir completions
+ _TREZORCTL_COMPLETE=source_bash $out/bin/trezorctl > completions/trezorctl || true
+ _TREZORCTL_COMPLETE=source_zsh $out/bin/trezorctl > completions/_trezorctl || true
+ _TREZORCTL_COMPLETE=source_fish $out/bin/trezorctl > completions/trezorctl.fish || true
+ installShellCompletion --bash completions/trezorctl
+ installShellCompletion --zsh completions/_trezorctl
+ installShellCompletion --fish completions/trezorctl.fish
+ '';
+
meta = with lib; {
description = "Python library for communicating with TREZOR Bitcoin Hardware Wallet";
homepage = "https://github.com/trezor/trezor-firmware/tree/master/python";
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 000000000000..849b56d2d0c2
--- /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 3e71cae26e39..6a6cc44d66dc 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 000000000000..eb13cd6b9bbf
--- /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/xarray/default.nix b/pkgs/development/python-modules/xarray/default.nix
index e04fa770e450..344615c90146 100644
--- a/pkgs/development/python-modules/xarray/default.nix
+++ b/pkgs/development/python-modules/xarray/default.nix
@@ -11,11 +11,11 @@
buildPythonPackage rec {
pname = "xarray";
- version = "0.15.1";
+ version = "0.16.0";
src = fetchPypi {
inherit pname version;
- sha256 = "64e3138d87b641e22fe7a003c94abc685896b247b63e434505c1e6b38c91a8fb";
+ sha256 = "1js3xr3fl9bwid8hl3w2pnigqzjd2rvkncald5x1x5fg7wjy8pb6";
};
checkInputs = [ pytest ];
diff --git a/pkgs/development/python-modules/yamllint/default.nix b/pkgs/development/python-modules/yamllint/default.nix
index b6e23f9e8e74..892a9840a341 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 7291d25cf34f..2d2839c0e007 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/codeql/default.nix b/pkgs/development/tools/analysis/codeql/default.nix
index 40294e3f4c75..cc73e1469092 100644
--- a/pkgs/development/tools/analysis/codeql/default.nix
+++ b/pkgs/development/tools/analysis/codeql/default.nix
@@ -12,7 +12,7 @@
stdenv.mkDerivation rec {
pname = "codeql";
- version = "2.2.3";
+ version = "2.2.4";
dontConfigure = true;
dontBuild = true;
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
src = fetchzip {
url = "https://github.com/github/codeql-cli-binaries/releases/download/v${version}/codeql.zip";
- sha256 = "029l4f7d6c6kj2arc2zij4r04y36p537c6qaa6v87dd9piz85k0j";
+ sha256 = "0vrl9q7rm8bjxbb5076qx2cbva1wp1gp6z0pjwpg70z90gp49n2p";
};
nativeBuildInputs = [
diff --git a/pkgs/development/tools/analysis/eresi/default.nix b/pkgs/development/tools/analysis/eresi/default.nix
index c8c0d0c69601..b8abad44f241 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/bazel-gazelle/default.nix b/pkgs/development/tools/bazel-gazelle/default.nix
index ff019e785100..d8bc24f88a2c 100644
--- a/pkgs/development/tools/bazel-gazelle/default.nix
+++ b/pkgs/development/tools/bazel-gazelle/default.nix
@@ -5,13 +5,13 @@
buildGoModule rec {
pname = "bazel-gazelle";
- version = "0.20.0";
+ version = "0.21.1";
src = fetchFromGitHub {
owner = "bazelbuild";
repo = pname;
rev = "v${version}";
- sha256 = "1rw9zq8rmc0zr91kk70xl67dl6jx4dswwisv3bd1f16yncqgv2a1";
+ sha256 = "12ffrildgx4lah7bdnhr7i8z5jp05lll6gmmpzshmzz8dsgf39y4";
};
vendorSha256 = null;
@@ -28,4 +28,4 @@ buildGoModule rec {
license = licenses.asl20;
maintainers = with maintainers; [ kalbasit ];
};
-}
\ No newline at end of file
+}
diff --git a/pkgs/development/tools/build-managers/bloop/default.nix b/pkgs/development/tools/build-managers/bloop/default.nix
index 51ca62d05202..dd1342a37de0 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 }:
+{ stdenv
+, fetchurl
+, coursier
+, autoPatchelfHook
+, installShellFiles
+, jre
+, lib
+, zlib
+}:
-let
- baseName = "bloop";
- version = "1.3.4";
- nailgunCommit = "d7ed5db"; # Fetched from https://github.com/scalacenter/bloop/releases/download/v${version}/install.py
+stdenv.mkDerivation rec {
+ pname = "bloop";
+ version = "1.4.3";
- client = stdenv.mkDerivation {
- name = "${baseName}-client-${version}";
-
- src = fetchurl {
- url = "https://raw.githubusercontent.com/scalacenter/nailgun/${nailgunCommit}/pynailgun/ng.py";
- sha256 = "0lrj25m0nvphz2i5mqjwccpyrd7gn8a5k22k5khrpdh6ldxqis8a";
- };
-
- phases = [ "installPhase" ];
-
- installPhase = ''cp $src $out'';
+ bloop-coursier-channel = fetchurl {
+ url = "https://github.com/scalacenter/bloop/releases/download/v${version}/bloop-coursier.json";
+ sha256 = "0abl91l2sb08pwr98mw910zibzwk6lss9r62h2s3g7qnnxp3z59r";
};
- server = stdenv.mkDerivation {
- name = "${baseName}-server-${version}";
- buildCommand = ''
- mkdir -p $out/bin
+ bloop-bash = fetchurl {
+ url = "https://github.com/scalacenter/bloop/releases/download/v${version}/bash-completions";
+ sha256 = "1ldxlqv353gvhdn4yq7z506ywvnjv6fjsi8wigwhzg89876pwsys";
+ };
+ bloop-fish = fetchurl {
+ url = "https://github.com/scalacenter/bloop/releases/download/v${version}/fish-completions";
+ sha256 = "1pa8h81l2498q8dbd83fzipr99myjwxpy8xdgzhvqzdmfv6aa4m0";
+ };
+
+ bloop-zsh = fetchurl {
+ url = "https://github.com/scalacenter/bloop/releases/download/v${version}/zsh-completions";
+ sha256 = "1xzg0qfkjdmzm3mvg82mc4iia8cl7b6vbl8ng4ir2xsz00zjrlsq";
+ };
+
+ bloop-coursier = stdenv.mkDerivation rec {
+ name = "${pname}-coursier-${version}";
+
+ 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)
- ${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
- '';
+ export COURSIER_JVM_CACHE=$(pwd)
+
+ 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
+ '';
+
outputHashMode = "recursive";
outputHashAlgo = "sha256";
- outputHash = "1z33ip6hgfwiixm2gimz819p5cnxn1fmxb3ryyf77jzwsx7py718";
+ outputHash = if stdenv.isLinux && stdenv.isx86_64 then "1ncl34f39mvk0zb5jl1l77cwjdg3xfnhjxbzz11pdfqw0d7wqywj"
+ else if stdenv.isDarwin && stdenv.isx86_64 then "06c885w088yvh8l1r1jbrz0549gx2xvc8xr6rlxy6y27jk5655p2"
+ else throw "unsupported platform";
};
- zsh = stdenv.mkDerivation {
- name = "${baseName}-zshcompletion-${version}";
-
- src = fetchurl {
- url = "https://raw.githubusercontent.com/scalacenter/bloop/v${version}/etc/zsh/_bloop";
- sha256 = "09qq5888vaqlqan2jbs2qajz2c3ff13zj8r0x2pcxsqmvlqr02hp";
- };
-
- phases = [ "installPhase" ];
-
- installPhase = ''cp $src $out'';
- };
-in
-stdenv.mkDerivation {
- name = "${baseName}-${version}";
-
- buildInputs = [ makeWrapper ];
-
- 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 2626ae719420..d4c143b0bd02 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 394dc7b2f514..b0e97de5500f 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/drone/default.nix b/pkgs/development/tools/continuous-integration/drone/default.nix
index 54b801da0756..0b31cc381a8b 100644
--- a/pkgs/development/tools/continuous-integration/drone/default.nix
+++ b/pkgs/development/tools/continuous-integration/drone/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
name = "drone.io-${version}";
- version = "1.6.5";
+ version = "1.9.0";
goPackagePath = "github.com/drone/drone";
- vendorSha256 = "1dvf8vz3jr9smki3jql0kvd8z8rwdq93y7blbr2yjjfsdvx6lxl1";
+ vendorSha256 = "0idf11sr417lxcjryplgb87affr6lgzxazzlyvk0y40hp8zbhwsx";
src = fetchFromGitHub {
owner = "drone";
repo = "drone";
rev = "v${version}";
- sha256 = "05cgd72qyss836fby0adhrm5p8g7639psk2yslhg6pmz0cqfbq9m";
+ sha256 = "1lsyd245fr1f74rpccvvw41h5g75b79afrb8g589bj13ggjav0xy";
};
meta = with stdenv.lib; {
diff --git a/pkgs/development/tools/continuous-integration/jenkins/default.nix b/pkgs/development/tools/continuous-integration/jenkins/default.nix
index 6086d204b333..5f0807cad876 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/doctl/default.nix b/pkgs/development/tools/doctl/default.nix
index e65fb4a64b73..cfb3395f9ecd 100644
--- a/pkgs/development/tools/doctl/default.nix
+++ b/pkgs/development/tools/doctl/default.nix
@@ -2,7 +2,7 @@
buildGoModule rec {
pname = "doctl";
- version = "1.45.1";
+ version = "1.46.0";
vendorSha256 = null;
@@ -30,7 +30,7 @@ buildGoModule rec {
owner = "digitalocean";
repo = "doctl";
rev = "v${version}";
- sha256 = "1zzdjpbag23kr6j3c7zkgqaavlna1q792qhs6s234vxm85zmwh4j";
+ sha256 = "1f9gw1qjannswx1vy64a5a2cfr8azsci241pk0xhrhk6aqpjzx1n";
};
meta = with lib; {
diff --git a/pkgs/development/tools/go-task/default.nix b/pkgs/development/tools/go-task/default.nix
new file mode 100644
index 000000000000..eb20ec726e33
--- /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/haskell/haskell-language-server/default.nix b/pkgs/development/tools/haskell/haskell-language-server/default.nix
index 171e87530d2a..15f944e7133a 100644
--- a/pkgs/development/tools/haskell/haskell-language-server/default.nix
+++ b/pkgs/development/tools/haskell/haskell-language-server/default.nix
@@ -1,46 +1,44 @@
-{ mkDerivation, aeson, async, base, base16-bytestring, binary
-, blaze-markup, brittany, bytestring, Cabal, cabal-helper
-, containers, cryptohash-sha1, data-default, deepseq, Diff
-, directory, extra, fetchgit, filepath, floskell, ghc, ghc-check
-, ghc-paths, ghcide, gitrev, hashable, haskell-lsp
-, haskell-lsp-types, hie-bios, hslogger, hspec, hspec-core
-, hspec-expectations, lens, lsp-test, optparse-applicative
-, optparse-simple, ormolu, process, regex-tdfa, safe-exceptions
-, shake, stdenv, stm, stylish-haskell, tasty, tasty-ant-xml
-, tasty-expected-failure, tasty-golden, tasty-hunit, tasty-rerun
-, text, time, transformers, unix, unordered-containers, yaml
+{ mkDerivation, aeson, base, binary, blaze-markup, brittany
+, bytestring, containers, data-default, deepseq, Diff, directory
+, extra, fetchgit, filepath, floskell, ghc, ghc-paths, ghcide
+, gitrev, hashable, haskell-lsp, haskell-lsp-types, hie-bios
+, hslogger, hspec, hspec-core, hspec-expectations, lens, lsp-test
+, optparse-applicative, optparse-simple, ormolu, process
+, regex-tdfa, safe-exceptions, shake, stdenv, stm, stylish-haskell
+, tasty, tasty-ant-xml, tasty-expected-failure, tasty-golden
+, tasty-hunit, tasty-rerun, temporary, text, time, transformers
+, unix, unordered-containers, yaml
}:
mkDerivation {
pname = "haskell-language-server";
- version = "0.1.0.0";
+ version = "0.2.2.0";
src = fetchgit {
url = "https://github.com/haskell/haskell-language-server.git";
- sha256 = "092i32kc9dakl6cg1dpckrb87g4k8s4w1nvrs5x85n9ncgkpqk25";
- rev = "2a192db290bfe8640dafb6c1d650a0815e70d966";
+ sha256 = "0g9g2gyb0fidx16l741ky12djxh4cid9akvxa48105iq1gdihd8l";
+ rev = "12c0e4423263140e3d16e76681927ec69fe4929f";
fetchSubmodules = true;
};
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
- aeson base binary brittany bytestring Cabal cabal-helper containers
- data-default deepseq Diff directory extra filepath floskell ghc
- ghcide gitrev hashable haskell-lsp hie-bios hslogger lens
- optparse-simple ormolu process regex-tdfa shake stylish-haskell
- text transformers unix unordered-containers
+ aeson base binary brittany bytestring containers data-default
+ deepseq Diff directory extra filepath floskell ghc ghcide gitrev
+ hashable haskell-lsp hie-bios hslogger lens optparse-simple ormolu
+ process regex-tdfa shake stylish-haskell temporary text time
+ transformers unix unordered-containers
];
executableHaskellDepends = [
- aeson async base base16-bytestring binary bytestring containers
- cryptohash-sha1 data-default deepseq directory extra filepath ghc
- ghc-check ghc-paths ghcide gitrev hashable haskell-lsp hie-bios
- hslogger optparse-applicative process safe-exceptions shake text
- time unordered-containers
+ base binary containers data-default directory extra filepath ghc
+ ghc-paths ghcide gitrev hashable haskell-lsp hie-bios hslogger
+ optparse-applicative process safe-exceptions shake text time
+ unordered-containers
];
testHaskellDepends = [
aeson base blaze-markup bytestring containers data-default
directory filepath haskell-lsp haskell-lsp-types hie-bios hslogger
- hspec hspec-core hspec-expectations lens lsp-test stm tasty
+ hspec hspec-core hspec-expectations lens lsp-test process stm tasty
tasty-ant-xml tasty-expected-failure tasty-golden tasty-hunit
- tasty-rerun text unordered-containers yaml
+ tasty-rerun temporary text transformers unordered-containers yaml
];
testToolDepends = [ ghcide ];
homepage = "https://github.com/haskell/haskell-language-server#readme";
diff --git a/pkgs/development/tools/haskell/haskell-language-server/hls-ghcide.nix b/pkgs/development/tools/haskell/haskell-language-server/hls-ghcide.nix
index 8c68c8872951..cafe01946a64 100644
--- a/pkgs/development/tools/haskell/haskell-language-server/hls-ghcide.nix
+++ b/pkgs/development/tools/haskell/haskell-language-server/hls-ghcide.nix
@@ -5,8 +5,8 @@
, ghc-boot-th, ghc-check, ghc-paths, ghc-typelits-knownnat, gitrev
, haddock-library, hashable, haskell-lsp, haskell-lsp-types
, hie-bios, hslogger, lens, lsp-test, mtl, network-uri
-, opentelemetry, optparse-applicative, parser-combinators
-, prettyprinter, prettyprinter-ansi-terminal, process, QuickCheck
+, opentelemetry, optparse-applicative, prettyprinter
+, prettyprinter-ansi-terminal, process, QuickCheck
, quickcheck-instances, regex-tdfa, rope-utf16-splay
, safe-exceptions, shake, sorted-list, stdenv, stm, syb, tasty
, tasty-expected-failure, tasty-hunit, tasty-quickcheck
@@ -17,40 +17,40 @@ mkDerivation {
pname = "ghcide";
version = "0.2.0";
src = fetchgit {
- url = "https://github.com/wz1000/ghcide";
- sha256 = "0rifbrfvbgv7szgwc5apzb0i5fbkr2spzqvwg5kzng5b4zrf9a9d";
- rev = "cc09b6d4cf03efa645c682347c62850c2291be25";
+ url = "https://github.com/bubba/ghcide";
+ sha256 = "1kj2i86mkaxgxlrbmv2d24mch7hywgcy2n61z8paj21chncs1j5w";
+ rev = "7e895cfa53260b41996df707baec496a8f2c75dc";
fetchSubmodules = true;
};
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
- aeson array async base binary bytestring containers data-default
- deepseq directory extra filepath fuzzy ghc ghc-boot ghc-boot-th
- haddock-library hashable haskell-lsp haskell-lsp-types hslogger mtl
- network-uri opentelemetry prettyprinter prettyprinter-ansi-terminal
- regex-tdfa rope-utf16-splay safe-exceptions shake sorted-list stm
- syb text time transformers unix unordered-containers utf8-string
+ aeson array async base base16-bytestring binary bytestring
+ containers cryptohash-sha1 data-default deepseq directory extra
+ filepath fuzzy ghc ghc-boot ghc-boot-th ghc-check ghc-paths
+ haddock-library hashable haskell-lsp haskell-lsp-types hie-bios
+ hslogger mtl network-uri opentelemetry prettyprinter
+ prettyprinter-ansi-terminal regex-tdfa rope-utf16-splay
+ safe-exceptions shake sorted-list stm syb text time transformers
+ unix unordered-containers utf8-string
];
executableHaskellDepends = [
- aeson async base base16-bytestring binary bytestring containers
- cryptohash-sha1 data-default deepseq directory extra filepath ghc
- ghc-check ghc-paths gitrev hashable haskell-lsp haskell-lsp-types
- hie-bios hslogger optparse-applicative safe-exceptions shake text
- time unordered-containers
+ aeson base bytestring containers data-default directory extra
+ filepath gitrev hashable haskell-lsp haskell-lsp-types hie-bios
+ lsp-test optparse-applicative process safe-exceptions text
+ unordered-containers
];
testHaskellDepends = [
aeson base bytestring containers directory extra filepath ghc
ghc-typelits-knownnat haddock-library haskell-lsp haskell-lsp-types
- lens lsp-test network-uri optparse-applicative parser-combinators
- process QuickCheck quickcheck-instances rope-utf16-splay
- safe-exceptions shake tasty tasty-expected-failure tasty-hunit
- tasty-quickcheck tasty-rerun text
+ lens lsp-test network-uri optparse-applicative process QuickCheck
+ quickcheck-instances rope-utf16-splay safe-exceptions shake tasty
+ tasty-expected-failure tasty-hunit tasty-quickcheck tasty-rerun
+ text
];
benchmarkHaskellDepends = [
- aeson base bytestring Chart Chart-diagrams containers diagrams
- diagrams-svg directory extra filepath lsp-test optparse-applicative
- parser-combinators process safe-exceptions shake text yaml
+ aeson base Chart Chart-diagrams diagrams diagrams-svg directory
+ extra filepath shake text yaml
];
homepage = "https://github.com/digital-asset/ghcide#readme";
description = "The core of an IDE";
diff --git a/pkgs/development/tools/haskell/haskell-language-server/update.sh b/pkgs/development/tools/haskell/haskell-language-server/update.sh
index 498859843c4d..6cf299683387 100755
--- a/pkgs/development/tools/haskell/haskell-language-server/update.sh
+++ b/pkgs/development/tools/haskell/haskell-language-server/update.sh
@@ -29,7 +29,7 @@ ghcide_new_version=$(curl --silent "https://api.github.com/repos/haskell/haskell
echo "Updating haskell-language-server from old version $ghcide_old_version to new version $ghcide_new_version."
echo "Running cabal2nix and outputting to ${ghcide_derivation_file}..."
-cabal2nix --revision "$ghcide_new_version" "https://github.com/wz1000/ghcide" > "$ghcide_derivation_file"
+cabal2nix --revision "$ghcide_new_version" "https://github.com/bubba/ghcide" > "$ghcide_derivation_file"
# ===========================
diff --git a/pkgs/development/tools/just/default.nix b/pkgs/development/tools/just/default.nix
index 42ee4041f205..ce621f147d15 100644
--- a/pkgs/development/tools/just/default.nix
+++ b/pkgs/development/tools/just/default.nix
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "just";
- version = "0.6.0";
+ version = "0.7.1";
src = fetchFromGitHub {
owner = "casey";
repo = pname;
rev = "v${version}";
- sha256 = "1sl235wr4fdsw0f0x7jynv6ljhvgis4d87xzpvjzajhdaappdp8d";
+ sha256 = "07fjixz8y5rxfwpyr1kiimnn27jhc20gacd17i0yvfcpy5qf8z5p";
};
- cargoSha256 = "0k3aqwvdm95403s279gkksklnikgyjpf5qvngsvsrm5xqda438jk";
+ cargoSha256 = "1zn0kiqi8p25lscjd661gczay631nwzadl36cfzqnbww6blayy1j";
nativeBuildInputs = [ installShellFiles ];
@@ -40,16 +40,7 @@ rustPlatform.buildRustPackage rec {
# Skip "edit" when running "cargo test",
# since this test case needs "cat".
- checkPhase = ''
- runHook preCheck
- echo "Running cargo test --
- --skip edit
- ''${checkFlags} ''${checkFlagsArray+''${checkFlagsArray[@]}}"
- cargo test -- \
- --skip edit \
- ''${checkFlags} ''${checkFlagsArray+"''${checkFlagsArray[@]}"}
- runHook postCheck
- '';
+ checkFlagsArray = [ "--skip=edit" ];
meta = with stdenv.lib; {
description = "A handy way to save and run project-specific commands";
diff --git a/pkgs/development/tools/kafkacat/default.nix b/pkgs/development/tools/kafkacat/default.nix
index 5b67d4ddbc57..6e7db6b35c6b 100644
--- a/pkgs/development/tools/kafkacat/default.nix
+++ b/pkgs/development/tools/kafkacat/default.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
pname = "kafkacat";
- version = "1.5.0";
+ version = "1.6.0";
src = fetchFromGitHub {
owner = "edenhill";
repo = "kafkacat";
rev = version;
- sha256 = "0lf2pf3zqncd4a44h0mjm66qnw02k9kvz1hjkah6p6gp7mx3ksjv";
+ sha256 = "0z3bw00s269myfd1xqksjyznmgp74xfs09xqlq347adsgby3cmfs";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/development/tools/kustomize/default.nix b/pkgs/development/tools/kustomize/default.nix
index e35cc1c8fbd5..c7a1ba35fec3 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 bd8a9fecee67..3778793b71cd 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 4fe7740cadf4..eeb2102bdf0c 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/nix-build-uncached/default.nix b/pkgs/development/tools/misc/nix-build-uncached/default.nix
index 11833816ec82..317b8dc60ef5 100644
--- a/pkgs/development/tools/misc/nix-build-uncached/default.nix
+++ b/pkgs/development/tools/misc/nix-build-uncached/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "nix-build-uncached";
- version = "0.1.1";
+ version = "1.0.0";
src = fetchFromGitHub {
owner = "Mic92";
repo = "nix-build-uncached";
rev = "v${version}";
- sha256 = "0jkpg3ab56lg2kdms9w9ka9ba89py3ajksjsi1rd3iqi74zz2mmh";
+ sha256 = "106k4234gpi8mr0n0rfsgwk4z7v0b2gim0r5bhjvg2v566j67g02";
};
goPackagePath = "github.com/Mic92/nix-build-uncached";
diff --git a/pkgs/development/tools/misc/pwndbg/default.nix b/pkgs/development/tools/misc/pwndbg/default.nix
index 0c1a3dfc9326..f9d792d185f8 100644
--- a/pkgs/development/tools/misc/pwndbg/default.nix
+++ b/pkgs/development/tools/misc/pwndbg/default.nix
@@ -21,14 +21,14 @@ let
in stdenv.mkDerivation rec {
pname = "pwndbg";
- version = "2019.12.09";
+ version = "2020.07.23";
format = "other";
src = fetchFromGitHub {
owner = "pwndbg";
repo = "pwndbg";
rev = version;
- sha256 = "0kn28mjdq91zf7d6vqzbm74f0ligp829m9jzjxfn4zlx6wrmkd0s";
+ sha256 = "0w1dmjy8ii12367wza8c35a9q9x204fppf6x328q75bhb3gd845c";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/development/tools/misc/tockloader/default.nix b/pkgs/development/tools/misc/tockloader/default.nix
index 18c5393a6b7b..298e6f7c9d59 100644
--- a/pkgs/development/tools/misc/tockloader/default.nix
+++ b/pkgs/development/tools/misc/tockloader/default.nix
@@ -2,11 +2,11 @@
python3Packages.buildPythonApplication rec {
pname = "tockloader";
- version = "1.4.0";
+ version = "1.5.0";
src = python3Packages.fetchPypi {
inherit pname version;
- sha256 = "0l8mvlqzyq2bfb6g5zhgv2ndgyyrmpww2l7f2snbli73g6x5j2g2";
+ sha256 = "11k4ppwq845lnj265ydfr0cn1rrym5amx2i19x1h3ccbxc3gsy3x";
};
propagatedBuildInputs = with python3Packages; [
diff --git a/pkgs/development/tools/mockgen/default.nix b/pkgs/development/tools/mockgen/default.nix
new file mode 100644
index 000000000000..13a66422a46e
--- /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 d1ecdd1efd96..48a3bf8e0a6d 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 f74e757184e0..da7fe98aafe2 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/web/deno/default.nix b/pkgs/development/web/deno/default.nix
index e5e76628ecf3..33d93650605d 100644
--- a/pkgs/development/web/deno/default.nix
+++ b/pkgs/development/web/deno/default.nix
@@ -18,16 +18,16 @@ let
in
rustPlatform.buildRustPackage rec {
pname = "deno";
- version = "1.2.0";
+ version = "1.2.1";
src = fetchFromGitHub {
owner = "denoland";
repo = pname;
rev = "v${version}";
- sha256 = "0wxwsp8g5i8jsjn3fsry81xj4lyp1ik6ngcypwvb5v8x30jci6ng";
+ sha256 = "0dxagp4gyn7057zcp78bhhr9qfbblvsynds2b0f4b3di8kg65m7f";
fetchSubmodules = true;
};
- cargoSha256 = "0sss85v9k3f5narnmdv428sblqzkyb47xvvavz1m6x03qw11h8zh";
+ cargoSha256 = "1fgi6hbziky7szw18wma87bx8i74ax9dc90yyldvjikn4hjc8ipc";
# Install completions post-install
nativeBuildInputs = [ installShellFiles ];
diff --git a/pkgs/development/web/deno/deps.nix b/pkgs/development/web/deno/deps.nix
index 61cb967a36b5..a64296c27fa1 100644
--- a/pkgs/development/web/deno/deps.nix
+++ b/pkgs/development/web/deno/deps.nix
@@ -2,11 +2,11 @@
{}:
rec {
rustyV8Lib = {
- version = "0.6.0";
+ version = "0.7.0";
sha256s = {
- x86_64-linux = "1mpgddlcsfc5jpkqpwpbld9d2pr3dflkbd1w9ryai0aymv8r2rmb";
- aarch64-linux = "0qqr0i6z39fb298azp2rm0ns0bw3il3xj5zy58cn96h624rxkn67";
- x86_64-darwin = "0pj7127cvz01kq6vs91sdxkwkbjx7j3cv7lwvyilifbl01j3vwip";
+ x86_64-linux = "0ggbbppb65pdj92qbqw8sy8w84ir42fnhyk599pihyx1mqqih606";
+ aarch64-linux = "1n30xi4fac77cvd5qfr3mkgvipp9pq0mw24jbxbhlcl0n8mvpxjv";
+ x86_64-darwin = "1kdcapzj9my3ippqlkgdgp2dnj4klyl1wz1jwwps3b00l593nmfh";
};
};
}
diff --git a/pkgs/games/minecraft/default.nix b/pkgs/games/minecraft/default.nix
index ac09b5078afd..9d23515c0394 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 93c04e8852fe..9ed7061b196d 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 53703652cc18..3e7174d8ad43 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 80aa410017da..2e587cbd0449 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 6560024b19e0..f33af245f710 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/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json
index 1bb124538921..ee9fdd79b951 100644
--- a/pkgs/os-specific/linux/kernel/hardened/patches.json
+++ b/pkgs/os-specific/linux/kernel/hardened/patches.json
@@ -1,18 +1,18 @@
{
"4.14": {
- "name": "linux-hardened-4.14.188.a.patch",
- "sha256": "1fqd51ns2hbph57bhpcilcbjbaif55ya3h4cfzbfqwq71jlyij0c",
- "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.188.a/linux-hardened-4.14.188.a.patch"
+ "name": "linux-hardened-4.14.189.a.patch",
+ "sha256": "1i6lhw1mb2hqqg5b7cpsc6i2nffh0hgfv16i2d6lgjhgw8h6w26v",
+ "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.189.a/linux-hardened-4.14.189.a.patch"
},
"4.19": {
- "name": "linux-hardened-4.19.133.a.patch",
- "sha256": "0zlns3k60fxbilvfyqay8v5vd5gx9cyvr6dw8b4mg3zccnprqz0n",
- "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.133.a/linux-hardened-4.19.133.a.patch"
+ "name": "linux-hardened-4.19.134.a.patch",
+ "sha256": "0yq7s0lf79ijdsa64yr2869fwlij8jy167mbqh6mj356wyybxcg2",
+ "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.134.a/linux-hardened-4.19.134.a.patch"
},
"5.4": {
- "name": "linux-hardened-5.4.52.a.patch",
- "sha256": "17lgwhwxafzkjwr47dj2vwy3wzbsacdw8rrg6qlwn49ixayx26m4",
- "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.52.a/linux-hardened-5.4.52.a.patch"
+ "name": "linux-hardened-5.4.53.a.patch",
+ "sha256": "0fmcym3r280a8adyqicix6ri622k02sqf16ic3myldfic2qs4syv",
+ "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.53.a/linux-hardened-5.4.53.a.patch"
},
"5.6": {
"name": "linux-hardened-5.6.19.a.patch",
@@ -20,8 +20,8 @@
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.6.19.a/linux-hardened-5.6.19.a.patch"
},
"5.7": {
- "name": "linux-hardened-5.7.9.a.patch",
- "sha256": "0r5qcy09h8fklmkkfsm2i69rqz36qppfbcfx0hg0knf5dmcjpl89",
- "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.7.9.a/linux-hardened-5.7.9.a.patch"
+ "name": "linux-hardened-5.7.10.a.patch",
+ "sha256": "04a1sxdmh7r22vk5xkfj70rd4qjshvyx6w9zjryl9h4ffd338340",
+ "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.7.10.a/linux-hardened-5.7.10.a.patch"
}
}
diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix
index d559b69fcf67..e623a9c56f82 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 5cf6cd26cab1..68733f185c47 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 6f0a0eb785e5..3bef7aac9ccd 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 c32f4a2352f9..43b05c8925d9 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 4f84d0092a8a..9fd107661c04 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 feb62f371fff..a2163ba323a9 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 1c00ed9887df..02853f6497fc 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 43859dc9af3a..01bbd9a9cc16 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/pam_p11/default.nix b/pkgs/os-specific/linux/pam_p11/default.nix
new file mode 100644
index 000000000000..d5336cc9f4ce
--- /dev/null
+++ b/pkgs/os-specific/linux/pam_p11/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchFromGitHub, autoreconfHook, pkg-config, openssl, libp11, pam }:
+
+stdenv.mkDerivation rec {
+ pname = "pam_p11";
+ version = "0.3.1";
+
+ src = fetchFromGitHub {
+ owner = "OpenSC";
+ repo = "pam_p11";
+ rev = "pam_p11-${version}";
+ sha256 = "1caidy18rq5zk82d51x8vwidmkhwmanf3qm25x1yrdlbhxv6m7lk";
+ };
+
+ nativeBuildInputs = [ autoreconfHook pkg-config ];
+ buildInputs = [ pam openssl libp11 ];
+
+ meta = with stdenv.lib; {
+ homepage = "https://github.com/OpenSC/pam_p11";
+ description = "Authentication with PKCS#11 modules";
+ license = licenses.lgpl21Plus;
+ platforms = platforms.unix;
+ maintainers = with maintainers; [ sb0 ];
+ };
+}
diff --git a/pkgs/os-specific/linux/pcm/default.nix b/pkgs/os-specific/linux/pcm/default.nix
index f8f0d165d74b..06126a929582 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 df929278e924..7cbad8d6df3b 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 d55dd14601e8..b8ae0bc4e852 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 fbffecbafafe..5e4d625c187b 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 15e400ebad5f..de28c01474cb 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
similarity index 100%
rename from pkgs/servers/dns/ncdns/fix-tpl-path.nix
rename to pkgs/servers/dns/ncdns/fix-tpl-path.patch
diff --git a/pkgs/servers/gemini/molly-brown/default.nix b/pkgs/servers/gemini/molly-brown/default.nix
new file mode 100644
index 000000000000..216a4015ef95
--- /dev/null
+++ b/pkgs/servers/gemini/molly-brown/default.nix
@@ -0,0 +1,26 @@
+{ lib, buildGoPackage, fetchgit, nixosTests }:
+
+buildGoPackage rec {
+ pname = "molly-brown";
+ version = "unstable-2020-07-06";
+ rev = "2e510328ef1737c67641c588095e4628e3dfa8d3";
+
+ goPackagePath = "tildegit.org/solderpunk/molly-brown";
+
+ src = fetchgit {
+ inherit rev;
+ url = "https://tildegit.org/solderpunk/molly-brown.git";
+ sha256 = "0c2pmkcs5a04h2vwzbhj6rg47mb9wcmkh22i56kx7clh51wbbvc4";
+ };
+
+ goDeps = ./deps.nix;
+
+ passthru.tests.basic = nixosTests.molly-brown;
+
+ meta = with lib; {
+ description = "Full-featured Gemini server";
+ homepage = "https://tildegit.org/solderpunk/molly-brown";
+ maintainers = with maintainers; [ ehmry ];
+ license = licenses.bsd2;
+ };
+}
diff --git a/pkgs/servers/gemini/molly-brown/deps.nix b/pkgs/servers/gemini/molly-brown/deps.nix
new file mode 100644
index 000000000000..95427e8f7907
--- /dev/null
+++ b/pkgs/servers/gemini/molly-brown/deps.nix
@@ -0,0 +1,12 @@
+# This file was generated by https://github.com/kamilchm/go2nix v1.3.0
+[
+ {
+ goPackagePath = "github.com/BurntSushi/toml";
+ fetch = {
+ type = "git";
+ url = "https://github.com/BurntSushi/toml";
+ rev = "3012a1dbe2e4bd1391d42b32f0577cb7bbc7f005";
+ sha256 = "1fjdwwfzyzllgiwydknf1pwjvy49qxfsczqx5gz3y0izs7as99j6";
+ };
+ }
+]
diff --git a/pkgs/servers/gobetween/default.nix b/pkgs/servers/gobetween/default.nix
index 2b474d818ad2..e8e03a3779fa 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 98181e3fe794..2f0fb408061f 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/gotify/source-sha.nix b/pkgs/servers/gotify/source-sha.nix
index ddac1b246142..2d7375fc9b57 100644
--- a/pkgs/servers/gotify/source-sha.nix
+++ b/pkgs/servers/gotify/source-sha.nix
@@ -1 +1 @@
-"18y2kaf0v7275a0b8ab5y3qk7qwh19aqxyy0gmlflzgr2nimpmrn"
\ No newline at end of file
+"0agnbpqzz751643c4s0fs10b3zw98pp8r9kys9p1vxbb3d6r2anb"
\ No newline at end of file
diff --git a/pkgs/servers/gotify/vendor-sha.nix b/pkgs/servers/gotify/vendor-sha.nix
index 0705f436316d..e8f403723390 100644
--- a/pkgs/servers/gotify/vendor-sha.nix
+++ b/pkgs/servers/gotify/vendor-sha.nix
@@ -1 +1 @@
-"1ha0zgz1n07sd3if6823fi83j7yajysjdzfbwqk9rpsi6zv3cfh3"
\ No newline at end of file
+"0cczw8h1mibxmfgy2z6xnqq11x31ai17gnq2z4j5751b5finhqng"
\ No newline at end of file
diff --git a/pkgs/servers/gotify/version.nix b/pkgs/servers/gotify/version.nix
index fdfe425152c3..7473811783eb 100644
--- a/pkgs/servers/gotify/version.nix
+++ b/pkgs/servers/gotify/version.nix
@@ -1 +1 @@
-"2.0.16"
+"2.0.17"
diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index 44aba8299a52..a3a14af16af9 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -2,7 +2,7 @@
# Do not edit!
{
- version = "0.112.3";
+ version = "0.113.0";
components = {
"abode" = ps: with ps; [ ]; # missing inputs: abodepy
"acer_projector" = ps: with ps; [ pyserial];
@@ -28,7 +28,7 @@
"amcrest" = ps: with ps; [ ha-ffmpeg]; # missing inputs: amcrest
"ampio" = ps: with ps; [ ]; # missing inputs: asmog
"android_ip_webcam" = ps: with ps; [ ]; # missing inputs: pydroid-ipcam
- "androidtv" = ps: with ps; [ ]; # missing inputs: adb-shell androidtv pure-python-adb
+ "androidtv" = ps: with ps; [ ]; # missing inputs: adb-shell[async] androidtv[async] pure-python-adb
"anel_pwrctrl" = ps: with ps; [ ]; # missing inputs: anel_pwrctrl-homeassistant
"anthemav" = ps: with ps; [ ]; # missing inputs: anthemav
"apache_kafka" = ps: with ps; [ aiokafka];
@@ -90,6 +90,7 @@
"bmp280" = ps: with ps; [ ]; # missing inputs: RPi.GPIO adafruit-circuitpython-bmp280
"bmw_connected_drive" = ps: with ps; [ ]; # missing inputs: bimmer_connected
"bom" = ps: with ps; [ ]; # missing inputs: bomradarloop
+ "bond" = ps: with ps; [ ]; # missing inputs: bond-home
"braviatv" = ps: with ps; [ bravia-tv];
"broadlink" = ps: with ps; [ broadlink];
"brother" = ps: with ps; [ ]; # missing inputs: brother
@@ -160,6 +161,7 @@
"device_sun_light_trigger" = ps: with ps; [ ];
"device_tracker" = ps: with ps; [ ];
"devolo_home_control" = ps: with ps; [ ]; # missing inputs: devolo-home-control-api
+ "dexcom" = ps: with ps; [ ]; # missing inputs: pydexcom
"dht" = ps: with ps; [ ]; # missing inputs: Adafruit-DHT
"dialogflow" = ps: with ps; [ aiohttp-cors];
"digital_ocean" = ps: with ps; [ digital-ocean];
@@ -175,7 +177,7 @@
"dnsip" = ps: with ps; [ aiodns];
"dominos" = ps: with ps; [ aiohttp-cors]; # missing inputs: pizzapi
"doods" = ps: with ps; [ pillow]; # missing inputs: pydoods
- "doorbird" = ps: with ps; [ aiohttp-cors sqlalchemy]; # missing inputs: doorbirdpy home-assistant-frontend
+ "doorbird" = ps: with ps; [ aiohttp-cors]; # missing inputs: doorbirdpy
"dovado" = ps: with ps; [ ]; # missing inputs: dovado
"downloader" = ps: with ps; [ ];
"dsmr" = ps: with ps; [ ]; # missing inputs: dsmr_parser
@@ -338,7 +340,7 @@
"home_connect" = ps: with ps; [ aiohttp-cors]; # missing inputs: homeconnect
"homeassistant" = ps: with ps; [ ];
"homekit" = ps: with ps; [ HAP-python pyqrcode aiohttp-cors ha-ffmpeg zeroconf]; # missing inputs: PyTurboJPEG base36 fnvhash
- "homekit_controller" = ps: with ps; [ ]; # missing inputs: aiohomekit[IP]
+ "homekit_controller" = ps: with ps; [ aiohttp-cors zeroconf]; # missing inputs: aiohomekit[IP]
"homematic" = ps: with ps; [ pyhomematic];
"homematicip_cloud" = ps: with ps; [ ]; # missing inputs: homematicip
"homeworks" = ps: with ps; [ ]; # missing inputs: pyhomeworks
@@ -606,6 +608,7 @@
"plum_lightpad" = ps: with ps; [ ]; # missing inputs: plumlightpad
"pocketcasts" = ps: with ps; [ ]; # missing inputs: pocketcasts
"point" = ps: with ps; [ aiohttp-cors]; # missing inputs: pypoint
+ "poolsense" = ps: with ps; [ ]; # missing inputs: poolsense
"powerwall" = ps: with ps; [ ]; # missing inputs: tesla-powerwall
"prezzibenzina" = ps: with ps; [ ]; # missing inputs: prezzibenzina-py
"proliphix" = ps: with ps; [ ]; # missing inputs: proliphix
@@ -773,7 +776,7 @@
"switchbot" = ps: with ps; [ ]; # missing inputs: PySwitchbot
"switcher_kis" = ps: with ps; [ ]; # missing inputs: aioswitcher
"switchmate" = ps: with ps; [ ]; # missing inputs: pySwitchmate
- "syncthru" = ps: with ps; [ ]; # missing inputs: pysyncthru
+ "syncthru" = ps: with ps; [ ]; # missing inputs: pysyncthru url-normalize
"synology" = ps: with ps; [ ]; # missing inputs: py-synology
"synology_chat" = ps: with ps; [ ];
"synology_dsm" = ps: with ps; [ ]; # missing inputs: python-synology
diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix
index f2a75459b46d..8c2a39485767 100644
--- a/pkgs/servers/home-assistant/default.nix
+++ b/pkgs/servers/home-assistant/default.nix
@@ -27,11 +27,6 @@ let
(mkOverride "astral" "1.10.1"
"d2a67243c4503131c856cafb1b1276de52a86e5b8a1d507b7e08bee51cb67bf1")
- # Required by cast component. Can probably be removed in 0.113.x
- # https://github.com/home-assistant/core/commit/86c27b50f1282658b75fe71f9f6fd2fcabc2eaa2
- (mkOverride "PyChromecast" "6.0.0"
- "05f8r3b2pdqbl76hwi5sv2xdi1r7g9lgm69x8ja5g22mn7ysmghm")
-
# We have 3.x in nixpkgs which is incompatible with home-assistant atm:
# https://github.com/home-assistant/core/blob/dev/requirements_all.txt
(mkOverride "pyowm" "2.10.0"
@@ -77,7 +72,7 @@ let
extraBuildInputs = extraPackages py.pkgs;
# Don't forget to run parse-requirements.py after updating
- hassVersion = "0.112.3";
+ hassVersion = "0.113.0";
in with py.pkgs; buildPythonApplication rec {
pname = "homeassistant";
@@ -86,7 +81,7 @@ in with py.pkgs; buildPythonApplication rec {
disabled = pythonOlder "3.5";
patches = [
- ./0001-setup.py-relax-dependencies.patch
+ ./relax-dependencies.patch
];
inherit availableComponents;
@@ -96,7 +91,7 @@ in with py.pkgs; buildPythonApplication rec {
owner = "home-assistant";
repo = "core";
rev = version;
- sha256 = "1azfbjnyaamdnl2f3cllh6pd3kinl1wjqb4hlb569gb8zqs5bsx2";
+ sha256 = "1yb943wkiawh5p4mj5089qcsjfnwb91ga666qriz32bzpfgrzrna";
};
propagatedBuildInputs = [
diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix
index 54ef4d04e199..9f03633d62ab 100644
--- a/pkgs/servers/home-assistant/frontend.nix
+++ b/pkgs/servers/home-assistant/frontend.nix
@@ -4,11 +4,11 @@ buildPythonPackage rec {
# the frontend version corresponding to a specific home-assistant version can be found here
# https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json
pname = "home-assistant-frontend";
- version = "20200702.1";
+ version = "20200716.0";
src = fetchPypi {
inherit pname version;
- sha256 = "0ikzqwwm4m15x2m5byy7r005cfdxk7ajfyz9ljv4nsa3y3g2riw4";
+ sha256 = "07h8llin0rx06c5v2skkij5756gqdq079ysxzmrm6xnzk9mcvfsk";
};
# no Python tests implemented
diff --git a/pkgs/servers/home-assistant/0001-setup.py-relax-dependencies.patch b/pkgs/servers/home-assistant/relax-dependencies.patch
similarity index 83%
rename from pkgs/servers/home-assistant/0001-setup.py-relax-dependencies.patch
rename to pkgs/servers/home-assistant/relax-dependencies.patch
index 7009a0361375..081e3fafc17f 100644
--- a/pkgs/servers/home-assistant/0001-setup.py-relax-dependencies.patch
+++ b/pkgs/servers/home-assistant/relax-dependencies.patch
@@ -1,5 +1,5 @@
diff --git a/setup.py b/setup.py
-index 4e46f63217..b1aafee59d 100755
+index c2042ab245..98f348510f 100755
--- a/setup.py
+++ b/setup.py
@@ -32,7 +32,7 @@ PROJECT_URLS = {
@@ -20,6 +20,5 @@ index 4e46f63217..b1aafee59d 100755
+ "requests>=2.23.0",
+ "ruamel.yaml>=0.15.100",
"voluptuous==0.11.7",
-- "voluptuous-serialize==2.3.0",
-+ "voluptuous-serialize>=2.3.0",
+ "voluptuous-serialize==2.4.0",
]
diff --git a/pkgs/servers/irc/ngircd/default.nix b/pkgs/servers/irc/ngircd/default.nix
index b564a9b5c961..ff754a5390c1 100644
--- a/pkgs/servers/irc/ngircd/default.nix
+++ b/pkgs/servers/irc/ngircd/default.nix
@@ -1,11 +1,12 @@
{ stdenv, fetchurl, zlib, openssl, pam, libiconv }:
stdenv.mkDerivation rec {
- name = "ngircd-25";
+ pname = "ngircd";
+ version = "26";
src = fetchurl {
- url = "https://ngircd.barton.de/pub/ngircd/${name}.tar.xz";
- sha256 = "0kpf5qi98m9f833r4rx9n6h9p31biwk798jwc1mgzmix7sp7r6f4";
+ url = "https://ngircd.barton.de/pub/ngircd/${pname}-${version}.tar.xz";
+ sha256 = "1ijmv18fa648y7apxb9vp4j9iq6fxq850kz5v36rysaq614cdp2n";
};
configureFlags = [
diff --git a/pkgs/servers/mail/exim/default.nix b/pkgs/servers/mail/exim/default.nix
index 4d63a7b39c70..210863aa0078 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 da4f77e3394c..8d5349dbf366 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 a85e6bbf71ea..f7d96fb52139 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 1d6bb7198e5b..8c851715e07c 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 6f2e51fffd61..0a15daf71c61 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/servers/nosql/mongodb/asio-no-experimental-string-view-4-2.patch b/pkgs/servers/nosql/mongodb/asio-no-experimental-string-view-4-2.patch
new file mode 100644
index 000000000000..3720dd9ba319
--- /dev/null
+++ b/pkgs/servers/nosql/mongodb/asio-no-experimental-string-view-4-2.patch
@@ -0,0 +1,22 @@
+--- a/src/third_party/asio-master/asio/include/asio/detail/config.hpp
++++ b/src/third_party/asio-master/asio/include/asio/detail/config.hpp
+@@ -831,20 +831,8 @@
+ # endif // (__cplusplus >= 201402)
+ # endif // (_LIBCPP_VERSION < 7000)
+ # else // defined(ASIO_HAS_CLANG_LIBCXX)
+-# if (__cplusplus >= 201402)
+-# if __has_include()
+-# define ASIO_HAS_STD_EXPERIMENTAL_STRING_VIEW 1
+-# endif // __has_include()
+-# endif // (__cplusplus >= 201402)
+ # endif // // defined(ASIO_HAS_CLANG_LIBCXX)
+ # endif // defined(__clang__)
+-# if defined(__GNUC__)
+-# if ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 9)) || (__GNUC__ > 4)
+-# if (__cplusplus >= 201402)
+-# define ASIO_HAS_STD_EXPERIMENTAL_STRING_VIEW 1
+-# endif // (__cplusplus >= 201402)
+-# endif // ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 9)) || (__GNUC__ > 4)
+-# endif // defined(__GNUC__)
+ # endif // !defined(ASIO_DISABLE_STD_EXPERIMENTAL_STRING_VIEW)
+ #endif // !defined(ASIO_HAS_STD_EXPERIMENTAL_STRING_VIEW)
\ No newline at end of file
diff --git a/pkgs/servers/nosql/mongodb/forget-build-dependencies-4-2.patch b/pkgs/servers/nosql/mongodb/forget-build-dependencies-4-2.patch
new file mode 100644
index 000000000000..6d65238f22ab
--- /dev/null
+++ b/pkgs/servers/nosql/mongodb/forget-build-dependencies-4-2.patch
@@ -0,0 +1,36 @@
+# MongoDB keeps track of its build parameters, which tricks nix into
+# keeping dependencies to build inputs in the final output.
+# We remove the build flags from buildInfo data.
+--- a/site_scons/mongo/generators.py
++++ b/site_scons/mongo/generators.py
+@@ -33,30 +33,12 @@ def default_buildinfo_environment_data():
+ True,
+ False,
+ ),
+- (
+- 'ccflags',
+- '$CCFLAGS',
+- True,
+- False,
+- ),
+ (
+ 'cxx',
+ '$CXX_VERSION',
+ True,
+ False,
+ ),
+- (
+- 'cxxflags',
+- '$CXXFLAGS',
+- True,
+- False,
+- ),
+- (
+- 'linkflags',
+- '$LINKFLAGS',
+- True,
+- False,
+- ),
+ (
+ 'target_arch',
+ '$TARGET_ARCH',
\ No newline at end of file
diff --git a/pkgs/servers/nosql/mongodb/forget-build-dependencies.patch b/pkgs/servers/nosql/mongodb/forget-build-dependencies.patch
index 897618cceb12..37b4c259f2ac 100644
--- a/pkgs/servers/nosql/mongodb/forget-build-dependencies.patch
+++ b/pkgs/servers/nosql/mongodb/forget-build-dependencies.patch
@@ -1,3 +1,6 @@
+# MongoDB keeps track of its build parameters, which tricks nix into
+# keeping dependencies to build inputs in the final output.
+# We remove the build flags from buildInfo data.
--- a/site_scons/mongo/generators.py
+++ b/site_scons/mongo/generators.py
@@ -18,10 +18,7 @@ def default_buildinfo_environment_data():
diff --git a/pkgs/servers/nosql/mongodb/mongodb.nix b/pkgs/servers/nosql/mongodb/mongodb.nix
index 46aa22291845..f57ff7461989 100644
--- a/pkgs/servers/nosql/mongodb/mongodb.nix
+++ b/pkgs/servers/nosql/mongodb/mongodb.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, sconsPackages, boost, gperftools, pcre-cpp, snappy, zlib, libyamlcpp
-, sasl, openssl, libpcap, python27, curl, Security, CoreFoundation, cctools }:
+, sasl, openssl, libpcap, python27, python38, curl, Security, CoreFoundation, cctools }:
# Note:
# The command line tools are written in Go as part of a different package (mongodb-tools)
@@ -11,6 +11,17 @@ with stdenv.lib;
}@args:
let
+ variants = if versionAtLeast version "4.2"
+ then { python = python38.withPackages (ps: with ps; [ pyyaml cheetah3 psutil setuptools ]);
+ scons = sconsPackages.scons_latest;
+ mozjsVersion = "60";
+ mozjsReplace = "defined(HAVE___SINCOS)";
+ }
+ else { python = python27.withPackages (ps: with ps; [ pyyaml typing cheetah ]);
+ scons = sconsPackages.scons_3_1_2;
+ mozjsVersion = "45";
+ mozjsReplace = "defined(HAVE_SINCOS)";
+ };
python = python27.withPackages (ps: with ps; [ pyyaml typing cheetah ]);
system-libraries = [
"boost"
@@ -34,7 +45,7 @@ in stdenv.mkDerivation rec {
inherit sha256;
};
- nativeBuildInputs = [ sconsPackages.scons_3_1_2 ];
+ nativeBuildInputs = [ variants.scons ];
buildInputs = [
boost
curl
@@ -43,7 +54,7 @@ in stdenv.mkDerivation rec {
libyamlcpp
openssl
pcre-cpp
- python
+ variants.python
sasl
snappy
zlib
@@ -59,7 +70,7 @@ in stdenv.mkDerivation rec {
substituteInPlace SConstruct \
--replace "env = Environment(" "env = Environment(ENV = os.environ,"
'' + stdenv.lib.optionalString stdenv.isDarwin ''
- substituteInPlace src/third_party/mozjs-45/extract/js/src/jsmath.cpp --replace 'defined(HAVE_SINCOS)' 0
+ substituteInPlace src/third_party/mozjs-${variants.mozjsVersion}/extract/js/src/jsmath.cpp --replace '${variants.mozjsReplace}' 0
substituteInPlace src/third_party/s2/s1angle.cc --replace drem remainder
substituteInPlace src/third_party/s2/s1interval.cc --replace drem remainder
diff --git a/pkgs/servers/nosql/mongodb/v4_2.nix b/pkgs/servers/nosql/mongodb/v4_2.nix
new file mode 100644
index 000000000000..3ebe69daca1b
--- /dev/null
+++ b/pkgs/servers/nosql/mongodb/v4_2.nix
@@ -0,0 +1,17 @@
+{ stdenv, callPackage, lib, sasl, boost, Security, CoreFoundation, cctools }:
+
+let
+ buildMongoDB = callPackage ./mongodb.nix {
+ inherit sasl;
+ inherit boost;
+ inherit Security;
+ inherit CoreFoundation;
+ inherit cctools;
+ };
+in buildMongoDB {
+ version = "4.2.8";
+ sha256 = "13yvhi1258skdni00bh6ph609whqsmhiimhyqy1gs2liwdvh5278";
+ patches =
+ [ ./forget-build-dependencies-4-2.patch ]
+ ++ stdenv.lib.optionals stdenv.isDarwin [ ./asio-no-experimental-string-view-4-2.patch ];
+}
diff --git a/pkgs/servers/nosql/redis/default.nix b/pkgs/servers/nosql/redis/default.nix
index ef7740f6ca6c..2ca829b62b12 100644
--- a/pkgs/servers/nosql/redis/default.nix
+++ b/pkgs/servers/nosql/redis/default.nix
@@ -1,12 +1,12 @@
{ stdenv, fetchurl, lua, pkgconfig, systemd, jemalloc, nixosTests }:
stdenv.mkDerivation rec {
- version = "6.0.5";
+ version = "6.0.6";
pname = "redis";
src = fetchurl {
url = "http://download.redis.io/releases/${pname}-${version}.tar.gz";
- sha256 = "15pmk3w3cjhnv40jibdavfkn446hsjn9dnpwk2w5396j2jhqdks2";
+ sha256 = "151x6qicmrmlxkmiwi2vdq8p50d52b9gglp8csag6pmgcfqlkb8j";
};
# Cross-compiling fixes
diff --git a/pkgs/servers/plex/raw.nix b/pkgs/servers/plex/raw.nix
index c916a0949d93..bc429e395016 100644
--- a/pkgs/servers/plex/raw.nix
+++ b/pkgs/servers/plex/raw.nix
@@ -8,13 +8,13 @@
# server, and the FHS userenv and corresponding NixOS module should
# automatically pick up the changes.
stdenv.mkDerivation rec {
- version = "1.19.4.2935-79e214ead";
+ version = "1.19.5.3112-b23ab3896";
pname = "plexmediaserver";
# Fetch the source
src = fetchurl {
url = "https://downloads.plex.tv/plex-media-server-new/${version}/redhat/plexmediaserver-${version}.x86_64.rpm";
- sha256 = "0wzbdr89janyrbilvxrxfvhy02c1j5dsrcyjxnj4ryab0qc4sv04";
+ sha256 = "0lh0yqpp1xyhb3bkc8wqg1afdyvaqhv3bmbyjqalpj2ikkk5lxwk";
};
outputs = [ "out" "basedb" ];
diff --git a/pkgs/servers/roon-server/default.nix b/pkgs/servers/roon-server/default.nix
index a5924e37331d..9c08f392042d 100644
--- a/pkgs/servers/roon-server/default.nix
+++ b/pkgs/servers/roon-server/default.nix
@@ -1,65 +1,68 @@
-{ alsaLib, alsaUtils, cifs-utils, fetchurl, ffmpeg_3, libav, mono, stdenv }:
-
-with stdenv.lib;
-stdenv.mkDerivation rec {
+{ alsaLib
+, alsaUtils
+, autoPatchelfHook
+, cifs-utils
+, fetchurl
+, ffmpeg
+, freetype
+, lib
+, makeWrapper
+, stdenv
+, zlib
+}: stdenv.mkDerivation rec {
name = "roon-server";
- version = "100600401";
+ version = "100700571";
src = fetchurl {
url = "http://download.roonlabs.com/updates/stable/RoonServer_linuxx64_${version}.tar.bz2";
- sha256 = "121mmdh35q4bpgsqhcps6a6q1f4ld9v4hq9gp181bf2n779pk8sh";
+ sha256 = "191vlzf10ypkk1prp6x2rszlmsihdwpd3wvgf2jg6ckwyxy2hc6k";
};
+ buildInputs = [
+ alsaLib
+ alsaUtils
+ cifs-utils
+ ffmpeg
+ freetype
+ zlib
+ ];
+
+ nativeBuildInputs = [ autoPatchelfHook makeWrapper ];
+
installPhase = ''
runHook preInstall
-
- # Check script
- sed -i '3i PATH=$PATH:${makeBinPath [ cifs-utils ffmpeg_3 libav ]}' check.sh
- sed -i '/check_ulimit$/d' check.sh
-
- # Start script
- sed -i '3i PATH=$PATH:${makeBinPath [ alsaUtils cifs-utils ffmpeg_3 libav ]}' start.sh
-
- # Debug logging
- sed -i '/--debug--gc=sgen --server/exec "$HARDLINK" --debug --gc=sgen --server "$SCRIPT.exe" "$@" -storagetrace -watchertrace' Appliance/RoonAppliance
-
- # Binaries
- sed -i '/# boost ulimit/,+2 d' Appliance/RAATServer
- sed -i '/# boost ulimit/,+2 d' Appliance/RoonAppliance
- sed -i '/# boost ulimit/,+2 d' Server/RoonServer
- sed -i '/ln -sf/ d' Appliance/RAATServer
- sed -i '/ln -sf/ d' Appliance/RoonAppliance
- sed -i '/ln -sf/ d' Server/RoonServer
- mkdir -p $out/opt
- mv * $out/opt
- ln -sf $out/opt/RoonMono/bin/mono-sgen $out/opt/RoonMono/bin/RoonServer
- ln -sf $out/opt/RoonMono/bin/mono-sgen $out/opt/RoonMono/bin/RoonAppliance
- ln -sf $out/opt/RoonMono/bin/mono-sgen $out/opt/RoonMono/bin/RAATServer
-
+ mkdir -p $out
+ mv * $out
runHook postInstall
'';
- preFixup = ''
- patchelf \
- --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
- --set-rpath "${alsaLib}/lib" \
- $out/opt/RoonMono/bin/mono-sgen
+ postFixup =
+ let
+ linkFix = bin: ''
+ sed -i '/ulimit/d' ${bin}
+ sed -i '/ln -sf/d' ${bin}
+ ln -sf $out/RoonMono/bin/mono-sgen $out/RoonMono/bin/${builtins.baseNameOf bin}
+ '';
+ wrapFix = bin: ''
+ wrapProgram ${bin} --prefix PATH : ${lib.makeBinPath [ alsaUtils cifs-utils ffmpeg ]}
+ '';
+ in
+ ''
+ ${linkFix "$out/Appliance/RAATServer"}
+ ${linkFix "$out/Appliance/RoonAppliance"}
+ ${linkFix "$out/Server/RoonServer"}
- # Checkers
- patchelf \
- --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
- --set-rpath "${alsaLib}/lib" \
- $out/opt/Appliance/check_alsa
- patchelf \
- --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
- $out/opt/Appliance/check_bincompat
- '';
+ sed -i '/which avconv/c\ WHICH_AVCONV=1' $out/check.sh
+ sed -i '/^check_ulimit/d' $out/check.sh
+ ${wrapFix "$out/check.sh"}
+ ${wrapFix "$out/start.sh"}
+ '';
- meta = {
+ meta = with lib; {
description = "The music player for music lovers.";
- homepage = "https://roonlabs.com";
- license = licenses.unfree;
- maintainers = with maintainers; [ steell ];
- platforms = platforms.linux;
+ homepage = "https://roonlabs.com";
+ license = licenses.unfree;
+ maintainers = with maintainers; [ lovesegfault steell ];
+ platforms = platforms.linux;
};
}
diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix
index 8950a5dd2f60..7ed1a72de0e4 100644
--- a/pkgs/servers/samba/4.x.nix
+++ b/pkgs/servers/samba/4.x.nix
@@ -31,7 +31,6 @@
, enableProfiling ? true
, enableMDNS ? false, avahi
, enableDomainController ? false, gpgme, lmdb
-, enableKerberos ? true, krb5Full
, enableRegedit ? true, ncurses
, enableCephFS ? false, libceph
, enableGlusterFS ? false, glusterfs, libuuid
@@ -92,7 +91,6 @@ stdenv.mkDerivation rec {
++ optional (enablePrinting && stdenv.isLinux) cups
++ optional enableMDNS avahi
++ optionals enableDomainController [ gpgme lmdb ]
- ++ optional enableKerberos krb5Full
++ optional enableRegedit ncurses
++ optional (enableCephFS && stdenv.isLinux) libceph
++ optionals (enableGlusterFS && stdenv.isLinux) [ glusterfs libuuid ]
@@ -116,13 +114,9 @@ stdenv.mkDerivation rec {
"--sysconfdir=/etc"
"--localstatedir=/var"
"--disable-rpath"
- ] ++ singleton (if enableDomainController
- then "--with-experimental-mit-ad-dc"
- else "--without-ad-dc")
- ++ optionals enableKerberos [
- "--with-system-mitkrb5"
- "--with-system-mitkdc=${krb5Full}"
- ] ++ optionals (!enableLDAP) [
+ ] ++ optional (!enableDomainController)
+ "--without-ad-dc"
+ ++ optionals (!enableLDAP) [
"--without-ldap"
"--without-ads"
] ++ optional enableProfiling "--with-profiling-data"
diff --git a/pkgs/servers/udpt/default.nix b/pkgs/servers/udpt/default.nix
index 2849f8c7e743..b807d1f0d267 100644
--- a/pkgs/servers/udpt/default.nix
+++ b/pkgs/servers/udpt/default.nix
@@ -1,45 +1,21 @@
-{ stdenv, fetchFromGitHub, boost, sqlite, cmake, gtest }:
+{ stdenv, rustPlatform, fetchFromGitHub }:
-stdenv.mkDerivation {
+rustPlatform.buildRustPackage rec {
pname = "udpt";
- version = "2017-09-27";
-
- enableParallelBuilding = true;
-
- # Suitable for a network facing daemon.
- hardeningEnable = [ "pie" ];
+ version = "3.1.0";
src = fetchFromGitHub {
owner = "naim94a";
repo = "udpt";
- rev = "e0dffc83c8ce76b08a41a4abbd5f8065535d534f";
- sha256 = "187dw96mzgcmh4k9pvfpb7ckbb8d4vlikamr2x8vkpwzgjs3xd6g";
+ rev = "${pname}-${version}";
+ sha256 = "1g6l0y5x9pdra3i1npkm474glysicm4hf2m01700ack2rp43vldr";
};
- doCheck = true;
+ cargoSha256 = "1cmd80ndjxdmyfjpm1f04rwf64501nyi6wdsj7lxidgd1v92wy2c";
+ verifyCargoDeps = true;
- checkPhase = ''
- runHook preCheck
-
- make test
-
- runHook postCheck
- '';
-
- buildInputs = [ boost sqlite cmake gtest ];
-
- postPatch = ''
- # Enabling optimization (implied by fortify hardening) causes htons
- # to be re-defined as a macro, turning this use of :: into a syntax error.
- sed -i '104a#undef htons' src/udpTracker.cpp
- '';
-
- installPhase = ''
- mkdir -p $out/bin $out/etc/
- cp udpt $out/bin
- cp ../udpt.conf $out/etc/
- # without this, the resulting binary is unstripped.
- runHook postInstall
+ postInstall = ''
+ install -D udpt.toml $out/share/udpt/udpt.toml
'';
meta = {
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 000000000000..f2e0802f7981
--- /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
+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 ])
++
+ 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 c76191cfd377..f9dd578ad98b 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/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix
index 1c0e06638752..79aaa1855007 100644
--- a/pkgs/shells/zsh/oh-my-zsh/default.nix
+++ b/pkgs/shells/zsh/oh-my-zsh/default.nix
@@ -4,13 +4,13 @@
{ stdenv, fetchgit }:
stdenv.mkDerivation rec {
- version = "2020-07-18";
+ version = "2020-07-23";
pname = "oh-my-zsh";
- rev = "db3d05fe7184a523fe4aba120bea962114424573";
+ rev = "95218372402afc9aeafc89c0984310387ce79599";
src = fetchgit { inherit rev;
url = "https://github.com/ohmyzsh/ohmyzsh";
- sha256 = "1yicc8vwcp15p1g9rg9d6isnx4vv0w0wb8vw8hh6wpn20xf3rpji";
+ sha256 = "0fgxq2d6lajk5fjbr9vwhhnw58gbk6yhbc49pcj563lwk2kc4d9f";
};
pathsToLink = [ "/share/oh-my-zsh" ];
diff --git a/pkgs/tools/X11/alttab/default.nix b/pkgs/tools/X11/alttab/default.nix
index d77f2f1c71b9..7917ad5215eb 100644
--- a/pkgs/tools/X11/alttab/default.nix
+++ b/pkgs/tools/X11/alttab/default.nix
@@ -2,7 +2,7 @@
, xorg }:
stdenv.mkDerivation rec {
- version = "1.4.0";
+ version = "1.5.0";
pname = "alttab";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
owner = "sagb";
repo = pname;
rev = "v${version}";
- sha256 = "028ifp54yl3xq5mj2ww9baga8p56nmrx4ypvj8k35akcaxdpyga9";
+ sha256 = "026xd1bkg10fj2q1n6xx797xk1grpby25qj1pnw2lp4f3vc19qn6";
};
nativeBuildInputs = [
diff --git a/pkgs/tools/admin/ansible/default.nix b/pkgs/tools/admin/ansible/default.nix
index 174aef7c4bab..2faecef69cfd 100644
--- a/pkgs/tools/admin/ansible/default.nix
+++ b/pkgs/tools/admin/ansible/default.nix
@@ -7,11 +7,11 @@ rec {
ansible_2_8 = python3Packages.toPythonApplication (python3Packages.ansible.overridePythonAttrs (old: rec {
pname = "ansible";
- version = "2.8.12";
+ version = "2.8.13";
src = fetchurl {
url = "https://releases.ansible.com/ansible/${pname}-${version}.tar.gz";
- sha256 = "091id1da3hlnmf0hwvrhv2r0mnyna3mc6s7rwdg5kll7yfiy4k1a";
+ sha256 = "09a0wa5l2vyy8n2hwvq9ikc77a9xm9k19rnkvcnnkbqwv1fl36zb";
};
}));
diff --git a/pkgs/tools/admin/docker-credential-gcr/default.nix b/pkgs/tools/admin/docker-credential-gcr/default.nix
index 741d65259694..d45a57c32211 100644
--- a/pkgs/tools/admin/docker-credential-gcr/default.nix
+++ b/pkgs/tools/admin/docker-credential-gcr/default.nix
@@ -2,7 +2,7 @@
buildGoPackage rec {
pname = "docker-credential-gcr";
- version = "2.0.1";
+ version = "2.0.2";
goPackagePath = "github.com/GoogleCloudPlatform/docker-credential-gcr";
@@ -10,7 +10,7 @@ buildGoPackage rec {
owner = "GoogleCloudPlatform";
repo = "docker-credential-gcr";
rev = "v${version}";
- sha256 = "0zazbfjbwclkz848vsyb6zhn95gngwrdhivaiw0m9f8a9xm4bp9r";
+ sha256 = "0m7jx669yf27z2g9gw9vwncpwldrcb3ldlf1xhvbwbijnc2jk866";
};
meta = with stdenv.lib; {
diff --git a/pkgs/tools/admin/mycli/default.nix b/pkgs/tools/admin/mycli/default.nix
index 7a7022c91764..07106a72585f 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 4dcb5b0448dd..7d0beaed587a 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/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix
index 81a21c9618b2..97035258633e 100644
--- a/pkgs/tools/misc/diffoscope/default.nix
+++ b/pkgs/tools/misc/diffoscope/default.nix
@@ -16,11 +16,11 @@ let
in
python3Packages.buildPythonApplication rec {
pname = "diffoscope";
- version = "152";
+ version = "153";
src = fetchurl {
url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2";
- sha256 = "0q4xhxlrhvh10advyd2kgjkvhira2jkw59aq62g8s33h6n1sxyf2";
+ sha256 = "1wdmm7qdw15wxj26kxapnkyaa32yf3ywngak0smfb4nbzcy45dzm";
};
outputs = [ "out" "man" ];
diff --git a/pkgs/tools/misc/kepubify/default.nix b/pkgs/tools/misc/kepubify/default.nix
index 6f8dbb21e1c2..7a653cb846dd 100644
--- a/pkgs/tools/misc/kepubify/default.nix
+++ b/pkgs/tools/misc/kepubify/default.nix
@@ -17,6 +17,8 @@ buildGoModule rec {
excludedPackages = [ "kobotest" ];
+ doCheck = true;
+
meta = with lib; {
description = "EPUB to KEPUB converter";
homepage = "https://pgaskin.net/kepubify";
diff --git a/pkgs/tools/misc/lf/default.nix b/pkgs/tools/misc/lf/default.nix
index 8627003db5f9..e32bdd71b5ed 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 002a6e2eaec9..c0f5aec1e4db 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 07c5f9b35174..fb279f313b4d 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 503131898c8f..5da2a366cf88 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 363e90ab5f23..3189e41de8d4 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 6ed9cf69384d..000000000000
--- 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/ostree/default.nix b/pkgs/tools/misc/ostree/default.nix
index 24a104dc9743..568afb50403a 100644
--- a/pkgs/tools/misc/ostree/default.nix
+++ b/pkgs/tools/misc/ostree/default.nix
@@ -2,7 +2,7 @@
, fetchurl
, fetchpatch
, substituteAll
-, pkgconfig
+, pkg-config
, gtk-doc
, gobject-introspection
, gjs
@@ -21,13 +21,15 @@
, fuse
, utillinuxMinimal
, libselinux
+, libsodium
, libarchive
, libcap
, bzip2
, yacc
, libxslt
-, docbook_xsl
+, docbook-xsl-nons
, docbook_xml_dtd_42
+, openssl
, python3
}:
@@ -37,13 +39,13 @@ let
]));
in stdenv.mkDerivation rec {
pname = "ostree";
- version = "2020.3";
+ version = "2020.4";
outputs = [ "out" "dev" "man" "installedTests" ];
src = fetchurl {
url = "https://github.com/ostreedev/ostree/releases/download/v${version}/libostree-${version}.tar.xz";
- sha256 = "01cch4as23xspq6pck59al7x5jj60wl21g8p3iqbdxcjl1p3jxsq";
+ sha256 = "0s13cjrpx5r1dc9j9c9924zak45wl9nlbg9hiwgpsal80l92c39n";
};
patches = [
@@ -59,6 +61,7 @@ in stdenv.mkDerivation rec {
(substituteAll {
src = ./fix-test-paths.patch;
python3 = testPython.interpreter;
+ openssl = "${openssl}/bin/openssl";
})
];
@@ -66,14 +69,14 @@ in stdenv.mkDerivation rec {
autoconf
automake
libtool
- pkgconfig
+ pkg-config
gtk-doc
gobject-introspection
which
makeWrapper
yacc
libxslt
- docbook_xsl
+ docbook-xsl-nons
docbook_xml_dtd_42
];
@@ -85,6 +88,7 @@ in stdenv.mkDerivation rec {
gpgme
fuse
libselinux
+ libsodium
libcap
libarchive
bzip2
@@ -96,16 +100,13 @@ in stdenv.mkDerivation rec {
gjs
];
- preConfigure = ''
- env NOCONFIGURE=1 ./autogen.sh
- '';
-
enableParallelBuilding = true;
configureFlags = [
"--with-systemdsystemunitdir=${placeholder "out"}/lib/systemd/system"
"--with-systemdsystemgeneratordir=${placeholder "out"}/lib/systemd/system-generators"
"--enable-installed-tests"
+ "--with-ed25519-libsodium"
];
makeFlags = [
@@ -113,6 +114,10 @@ in stdenv.mkDerivation rec {
"installed_test_metadir=${placeholder "installedTests"}/share/installed-tests/libostree"
];
+ preConfigure = ''
+ env NOCONFIGURE=1 ./autogen.sh
+ '';
+
postFixup = let
typelibPath = stdenv.lib.makeSearchPath "/lib/girepository-1.0" [
(placeholder "out")
diff --git a/pkgs/tools/misc/ostree/fix-test-paths.patch b/pkgs/tools/misc/ostree/fix-test-paths.patch
index cf94b33f31c9..3e5b7e06999e 100644
--- a/pkgs/tools/misc/ostree/fix-test-paths.patch
+++ b/pkgs/tools/misc/ostree/fix-test-paths.patch
@@ -1,3 +1,32 @@
+diff --git a/tests/libtest.sh b/tests/libtest.sh
+index ca457fa2..c0a529ff 100755
+--- a/tests/libtest.sh
++++ b/tests/libtest.sh
+@@ -709,12 +709,12 @@ gen_ed25519_keys ()
+ {
+ # Generate private key in PEM format
+ pemfile="$(mktemp -p ${test_tmpdir} ed25519_XXXXXX.pem)"
+- openssl genpkey -algorithm ed25519 -outform PEM -out "${pemfile}"
++ @openssl@ genpkey -algorithm ed25519 -outform PEM -out "${pemfile}"
+
+ # Based on: http://openssl.6102.n7.nabble.com/ed25519-key-generation-td73907.html
+ # Extract the private and public parts from generated key.
+- ED25519PUBLIC="$(openssl pkey -outform DER -pubout -in ${pemfile} | tail -c 32 | base64)"
+- ED25519SEED="$(openssl pkey -outform DER -in ${pemfile} | tail -c 32 | base64)"
++ ED25519PUBLIC="$(@openssl@ pkey -outform DER -pubout -in ${pemfile} | tail -c 32 | base64)"
++ ED25519SEED="$(@openssl@ pkey -outform DER -in ${pemfile} | tail -c 32 | base64)"
+ # Secret key is concantination of SEED and PUBLIC
+ ED25519SECRET="$(echo ${ED25519SEED}${ED25519PUBLIC} | base64 -d | base64 -w 0)"
+
+@@ -725,7 +725,7 @@ gen_ed25519_keys ()
+
+ gen_ed25519_random_public()
+ {
+- openssl genpkey -algorithm ED25519 | openssl pkey -outform DER | tail -c 32 | base64
++ @openssl@ genpkey -algorithm ED25519 | @openssl@ pkey -outform DER | tail -c 32 | base64
+ }
+
+ is_bare_user_only_repo () {
diff --git a/tests/test-basic-user-only.sh b/tests/test-basic-user-only.sh
index f65094fd..105be893 100755
--- a/tests/test-basic-user-only.sh
diff --git a/pkgs/tools/misc/tealdeer/default.nix b/pkgs/tools/misc/tealdeer/default.nix
index aa8f9be38b6d..311f43fdb2ae 100644
--- a/pkgs/tools/misc/tealdeer/default.nix
+++ b/pkgs/tools/misc/tealdeer/default.nix
@@ -4,7 +4,6 @@
, pkg-config
, installShellFiles
, openssl
-, cacert
, Security
}:
@@ -21,8 +20,7 @@ rustPlatform.buildRustPackage rec {
cargoSha256 = "0jvgcf493rmkrh85j0fkf8ffanva80syyxclzkvkrzvvwwj78b5l";
- buildInputs = [ openssl cacert ]
- ++ (stdenv.lib.optional stdenv.isDarwin Security);
+ buildInputs = if stdenv.isDarwin then [ Security ] else [ openssl ];
nativeBuildInputs = [ installShellFiles pkg-config ];
@@ -32,8 +30,6 @@ rustPlatform.buildRustPackage rec {
installShellCompletion --zsh --name _tealdeer zsh_tealdeer
'';
- NIX_SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt";
-
# disable tests for now since one needs network
# what is unavailable in sandbox build
# and i can't disable just this one
@@ -44,6 +40,5 @@ rustPlatform.buildRustPackage rec {
homepage = "https://github.com/dbrgn/tealdeer";
maintainers = with maintainers; [ davidak ];
license = with licenses; [ asl20 mit ];
- platforms = platforms.all;
};
}
diff --git a/pkgs/tools/misc/wlr-randr/default.nix b/pkgs/tools/misc/wlr-randr/default.nix
index c9f439646961..7bdffb6f7221 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 74599dc7d1e5..8314dc2c9a35 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 94f4de6e364f..07dae0b9600a 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/findomain/default.nix b/pkgs/tools/networking/findomain/default.nix
index 69e09b60d02a..763bcac5a29c 100644
--- a/pkgs/tools/networking/findomain/default.nix
+++ b/pkgs/tools/networking/findomain/default.nix
@@ -9,16 +9,16 @@
rustPlatform.buildRustPackage rec {
pname = "findomain";
- version = "1.7.0";
+ version = "2.1.1";
src = fetchFromGitHub {
owner = "Edu4rdSHL";
repo = pname;
rev = version;
- sha256 = "1q8yxl4y8f787a0q87gxgj1p9lgzhhfk3fgysq9xj8yfvwm8abji";
+ sha256 = "0v6m0c329wmba2fihnqvrmfnrb5b1l4nm6xr0dsjiwsjpclrmy86";
};
- cargoSha256 = "02d538j13v3f1dc99vpzhby42ps7lig000idwdsxa1mwkjxrf2z2";
+ cargoSha256 = "130kjjig5jsv3kdywj6ag2s55d5hwsslpcnaanrqyl70a6pvgpb2";
nativeBuildInputs = [ installShellFiles perl ];
buildInputs = lib.optional stdenv.isDarwin Security;
diff --git a/pkgs/tools/networking/mu/default.nix b/pkgs/tools/networking/mu/default.nix
index fc693bae212d..250e7a2f7ddb 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/shadowsocks-rust/default.nix b/pkgs/tools/networking/shadowsocks-rust/default.nix
index 875ba7c988a6..b71cc39f0b5e 100644
--- a/pkgs/tools/networking/shadowsocks-rust/default.nix
+++ b/pkgs/tools/networking/shadowsocks-rust/default.nix
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "shadowsocks-rust";
- version = "1.8.12";
+ version = "1.8.13";
src = fetchFromGitHub {
rev = "v${version}";
owner = "shadowsocks";
repo = pname;
- sha256 = "0c9mdy22pjnjq5l2ji2whrfz64azx6yi6m76j17pbhnjf6f4jx9b";
+ sha256 = "1whhn689glw7ips3c7fxx868ib6kyrqsjxmqv7pi95wdjwgzjj40";
};
- cargoSha256 = "03gf26d7rz4v2v5fypcp5icsqqnb4m5dwil9ad5a98q3ssx80iwq";
+ cargoSha256 = "02n9sw7954vv6m1rggdlw5mzf4cyg5zi7hc2jkd7pz64p67fnm1d";
SODIUM_USE_PKG_CONFIG = 1;
diff --git a/pkgs/tools/networking/urlwatch/default.nix b/pkgs/tools/networking/urlwatch/default.nix
index 639bea38f0ac..f23aed3707be 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 000000000000..607884b8ac90
--- /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/package-management/clib/default.nix b/pkgs/tools/package-management/clib/default.nix
index c7e3c0fb6653..315589120271 100644
--- a/pkgs/tools/package-management/clib/default.nix
+++ b/pkgs/tools/package-management/clib/default.nix
@@ -1,14 +1,14 @@
{ stdenv, fetchFromGitHub, curl }:
stdenv.mkDerivation rec {
- version = "1.11.3";
+ version = "1.11.4";
pname = "clib";
src = fetchFromGitHub {
rev = version;
owner = "clibs";
repo = "clib";
- sha256 = "0qwds9w9y2dy39bwh2523wra5dj820cjl11ynkshh7k94fk7qgpm";
+ sha256 = "0cxldyx5bsld8gdasqpqlnzyap294hlkgcjyw3vlzlxcb0izjy8i";
};
hardeningDisable = [ "fortify" ];
diff --git a/pkgs/tools/package-management/licensee/Gemfile b/pkgs/tools/package-management/licensee/Gemfile
new file mode 100644
index 000000000000..a5d0dacfcfae
--- /dev/null
+++ b/pkgs/tools/package-management/licensee/Gemfile
@@ -0,0 +1,2 @@
+source 'https://rubygems.org'
+gem 'licensee'
diff --git a/pkgs/tools/package-management/licensee/Gemfile.lock b/pkgs/tools/package-management/licensee/Gemfile.lock
new file mode 100644
index 000000000000..00d62361e697
--- /dev/null
+++ b/pkgs/tools/package-management/licensee/Gemfile.lock
@@ -0,0 +1,38 @@
+GEM
+ remote: https://rubygems.org/
+ specs:
+ addressable (2.7.0)
+ public_suffix (>= 2.0.2, < 5.0)
+ dotenv (2.7.6)
+ faraday (1.0.1)
+ multipart-post (>= 1.2, < 3)
+ licensee (9.14.0)
+ dotenv (~> 2.0)
+ octokit (~> 4.17)
+ reverse_markdown (~> 1.0)
+ rugged (~> 0.24)
+ thor (>= 0.19, < 2.0)
+ mini_portile2 (2.4.0)
+ multipart-post (2.1.1)
+ nokogiri (1.10.10)
+ mini_portile2 (~> 2.4.0)
+ octokit (4.18.0)
+ faraday (>= 0.9)
+ sawyer (~> 0.8.0, >= 0.5.3)
+ public_suffix (4.0.5)
+ reverse_markdown (1.4.0)
+ nokogiri
+ rugged (0.99.0)
+ sawyer (0.8.2)
+ addressable (>= 2.3.5)
+ faraday (> 0.8, < 2.0)
+ thor (1.0.1)
+
+PLATFORMS
+ ruby
+
+DEPENDENCIES
+ licensee
+
+BUNDLED WITH
+ 2.1.4
diff --git a/pkgs/tools/package-management/licensee/default.nix b/pkgs/tools/package-management/licensee/default.nix
new file mode 100644
index 000000000000..fb33f498bbc3
--- /dev/null
+++ b/pkgs/tools/package-management/licensee/default.nix
@@ -0,0 +1,17 @@
+{ lib, bundlerApp, bundlerUpdateScript }:
+
+bundlerApp {
+ pname = "licensee";
+ gemdir = ./.;
+ exes = [ "licensee" ];
+
+ passthru.updateScript = bundlerUpdateScript "licensee";
+
+ meta = with lib; {
+ description = "A Ruby Gem to detect under what license a project is distributed";
+ homepage = "https://licensee.github.io/licensee/";
+ license = licenses.mit;
+ maintainers = [ maintainers.sternenseemann ];
+ platforms = platforms.unix;
+ };
+}
diff --git a/pkgs/tools/package-management/licensee/gemset.nix b/pkgs/tools/package-management/licensee/gemset.nix
new file mode 100644
index 000000000000..b3b326f6b317
--- /dev/null
+++ b/pkgs/tools/package-management/licensee/gemset.nix
@@ -0,0 +1,139 @@
+{
+ addressable = {
+ dependencies = ["public_suffix"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1fvchp2rhp2rmigx7qglf69xvjqvzq7x0g49naliw29r2bz656sy";
+ type = "gem";
+ };
+ version = "2.7.0";
+ };
+ dotenv = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0iym172c5337sm1x2ykc2i3f961vj3wdclbyg1x6sxs3irgfsl94";
+ type = "gem";
+ };
+ version = "2.7.6";
+ };
+ faraday = {
+ dependencies = ["multipart-post"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0wwks9652xwgjm7yszcq5xr960pjypc07ivwzbjzpvy9zh2fw6iq";
+ type = "gem";
+ };
+ version = "1.0.1";
+ };
+ licensee = {
+ dependencies = ["dotenv" "octokit" "reverse_markdown" "rugged" "thor"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1mv7khv080p81x6indb5akr2a1x84l2xy96a6bziw207291lxx7p";
+ type = "gem";
+ };
+ version = "9.14.0";
+ };
+ mini_portile2 = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "15zplpfw3knqifj9bpf604rb3wc1vhq6363pd6lvhayng8wql5vy";
+ type = "gem";
+ };
+ version = "2.4.0";
+ };
+ multipart-post = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1zgw9zlwh2a6i1yvhhc4a84ry1hv824d6g2iw2chs3k5aylpmpfj";
+ type = "gem";
+ };
+ version = "2.1.1";
+ };
+ nokogiri = {
+ dependencies = ["mini_portile2"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0xmf60nj5kg9vaj5bysy308687sgmkasgx06vbbnf94p52ih7si2";
+ type = "gem";
+ };
+ version = "1.10.10";
+ };
+ octokit = {
+ dependencies = ["faraday" "sawyer"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0zvfr9njmj5svi39fcsi2b0g7pcxb0vamw9dlyas8bg814jlzhi6";
+ type = "gem";
+ };
+ version = "4.18.0";
+ };
+ public_suffix = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0vywld400fzi17cszwrchrzcqys4qm6sshbv73wy5mwcixmrgg7g";
+ type = "gem";
+ };
+ version = "4.0.5";
+ };
+ reverse_markdown = {
+ dependencies = ["nokogiri"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0w786j869fjhjf72waj0hc9i4ghi45b78a2am27kij4sa2hmsc53";
+ type = "gem";
+ };
+ version = "1.4.0";
+ };
+ rugged = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "04rkxwzaa6897da3mnm70g720gpxwyh71krfn6ag1dkk80x8a8yz";
+ type = "gem";
+ };
+ version = "0.99.0";
+ };
+ sawyer = {
+ dependencies = ["addressable" "faraday"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0yrdchs3psh583rjapkv33mljdivggqn99wkydkjdckcjn43j3cz";
+ type = "gem";
+ };
+ version = "0.8.2";
+ };
+ thor = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1xbhkmyhlxwzshaqa7swy2bx6vd64mm0wrr8g3jywvxy7hg0cwkm";
+ type = "gem";
+ };
+ version = "1.0.1";
+ };
+}
\ No newline at end of file
diff --git a/pkgs/tools/security/bitwarden_rs/default.nix b/pkgs/tools/security/bitwarden_rs/default.nix
index f2d0eb9b7d3a..78e0bb7a87d4 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/eid-mw/default.nix b/pkgs/tools/security/eid-mw/default.nix
index 46dcec1a48ae..1fdd5b9a7228 100644
--- a/pkgs/tools/security/eid-mw/default.nix
+++ b/pkgs/tools/security/eid-mw/default.nix
@@ -66,13 +66,6 @@ stdenv.mkDerivation rec {
eid-viewer is also installed.
- **TO FIX:**
- The procedure below did not work for me, I had to install the .so directly in firefox as instructed at
- https://eid.belgium.be/en/log-eid#7507
- and specify
- /run/current-system/sw/lib/libbeidpkcs11.so
- as the path to the module.
-
This package only installs the libraries. To use eIDs in Firefox or
Chromium, the eID Belgium add-on must be installed.
This package only installs the libraries. To use eIDs in NSS-compatible
@@ -83,6 +76,11 @@ stdenv.mkDerivation rec {
Before uninstalling this package, it is a very good idea to run
~$ eid-nssdb [--system] remove
and remove all ~/.pki and/or /etc/pki directories no longer needed.
+
+ The above procedure doesn't seem to work in Firefox. You can override the
+ firefox wrapper to add this derivation to the PKCS#11 modules, like so:
+
+ firefox.override { pkcs11Modules = [ pkgs.eid-mw ]; }
'';
platforms = platforms.linux;
maintainers = with maintainers; [ bfortz ];
diff --git a/pkgs/tools/security/nsjail/default.nix b/pkgs/tools/security/nsjail/default.nix
index 27712e4d42f5..4522d0e897af 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 1e033fa31cee..c535bf706708 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/yubikey-agent/default.nix b/pkgs/tools/security/yubikey-agent/default.nix
new file mode 100644
index 000000000000..6b6ed8e02854
--- /dev/null
+++ b/pkgs/tools/security/yubikey-agent/default.nix
@@ -0,0 +1,54 @@
+{ stdenv, lib, fetchFromGitHub, buildGoModule, libnotify, makeWrapper, pcsclite, pinentry_mac, pkgconfig, darwin }:
+
+buildGoModule rec {
+ pname = "yubikey-agent";
+ version = "0.1.3";
+
+ src = fetchFromGitHub {
+ owner = "FiloSottile";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "07gix5wrakn4z846zhvl66lzwx58djrfnn6m8v7vc69l9jr3kihr";
+ };
+
+ buildInputs =
+ lib.optional stdenv.isLinux (lib.getDev pcsclite)
+ ++ lib.optional stdenv.isDarwin (darwin.apple_sdk.frameworks.PCSC);
+
+ nativeBuildInputs = [ makeWrapper pkgconfig ];
+
+ # pull in go-piv/piv-go#75
+ # once go-piv/piv-go#75 is merged and released, we should
+ # use the released version (and push upstream to do the same)
+ patches = [ ./use-piv-go-75.patch ];
+ postPatch = lib.optionalString stdenv.isLinux ''
+ substituteInPlace main.go --replace 'notify-send' ${libnotify}/bin/notify-send
+ '';
+
+ vendorSha256 = "128mlsagj3im6h0p0ndhzk29ya47g19im9dldx3nmddf2jlccj2h";
+
+ subPackages = [ "." ];
+
+ # On macOS, there isn't a choice of pinentry program, so let's
+ # ensure the nixpkgs-provided one is available
+ postInstall = lib.optionalString stdenv.isDarwin ''
+ wrapProgram $out/bin/yubikey-agent --suffix PATH : $(dirname ${pinentry_mac}/${pinentry_mac.binaryPath})
+ ''
+ # Note: in the next release, upstream provides
+ # contrib/systemd/user/yubikey-agent.service, which we should use
+ # instead
+ # See https://github.com/FiloSottile/yubikey-agent/pull/43
+ + lib.optionalString stdenv.isLinux ''
+ mkdir -p $out/lib/systemd/user
+ substitute ${./yubikey-agent.service} $out/lib/systemd/user/yubikey-agent.service \
+ --replace 'ExecStart=yubikey-agent' "ExecStart=$out/bin/yubikey-agent"
+ '';
+
+ meta = with lib; {
+ description = "A seamless ssh-agent for YubiKeys";
+ license = licenses.bsd3;
+ homepage = "https://filippo.io/yubikey-agent";
+ maintainers = with lib.maintainers; [ philandstuff rawkode ];
+ platforms = platforms.darwin ++ platforms.linux;
+ };
+}
diff --git a/pkgs/tools/security/yubikey-agent/use-piv-go-75.patch b/pkgs/tools/security/yubikey-agent/use-piv-go-75.patch
new file mode 100644
index 000000000000..73967d817d96
--- /dev/null
+++ b/pkgs/tools/security/yubikey-agent/use-piv-go-75.patch
@@ -0,0 +1,22 @@
+From 547695fff9cbfc4037168cdeb07cfe16bd89b6db Mon Sep 17 00:00:00 2001
+From: Philip Potter
+Date: Sat, 25 Jul 2020 21:59:50 +0100
+Subject: [PATCH] Pull in piv-go#75
+
+---
+ go.mod | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/go.mod b/go.mod
+index d4d13c8..f75be2d 100644
+--- a/go.mod
++++ b/go.mod
+@@ -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/security/yubikey-agent/yubikey-agent.service b/pkgs/tools/security/yubikey-agent/yubikey-agent.service
new file mode 100644
index 000000000000..7a91f902544e
--- /dev/null
+++ b/pkgs/tools/security/yubikey-agent/yubikey-agent.service
@@ -0,0 +1,35 @@
+[Unit]
+Description=Seamless ssh-agent for YubiKeys
+Documentation=https://filippo.io/yubikey-agent
+
+[Service]
+ExecStart=yubikey-agent -l %t/yubikey-agent/yubikey-agent.sock
+ExecReload=/bin/kill -HUP $MAINPID
+ProtectSystem=strict
+ProtectKernelLogs=yes
+ProtectKernelModules=yes
+ProtectKernelTunables=yes
+ProtectControlGroups=yes
+ProtectClock=yes
+ProtectHostname=yes
+PrivateTmp=yes
+PrivateDevices=yes
+PrivateUsers=yes
+IPAddressDeny=any
+RestrictAddressFamilies=AF_UNIX
+RestrictNamespaces=yes
+RestrictRealtime=yes
+RestrictSUIDSGID=yes
+LockPersonality=yes
+CapabilityBoundingSet=
+SystemCallFilter=@system-service
+SystemCallFilter=~@privileged @resources
+SystemCallErrorNumber=EPERM
+SystemCallArchitectures=native
+NoNewPrivileges=yes
+KeyringMode=private
+UMask=0177
+RuntimeDirectory=yubikey-agent
+
+[Install]
+WantedBy=default.target
diff --git a/pkgs/tools/system/cm-rgb/default.nix b/pkgs/tools/system/cm-rgb/default.nix
new file mode 100644
index 000000000000..acfe440b5d5c
--- /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 services.udev.packages
+ in configuration.nix.
+ '';
+ 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 fd0cc5f582a2..819071f3f068 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 074b06aa4e66..7bcf592012a4 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/fio/default.nix b/pkgs/tools/system/fio/default.nix
index 8b9f1085a9e0..80789681fc47 100644
--- a/pkgs/tools/system/fio/default.nix
+++ b/pkgs/tools/system/fio/default.nix
@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "fio";
- version = "3.20";
+ version = "3.21";
src = fetchFromGitHub {
owner = "axboe";
repo = "fio";
rev = "fio-${version}";
- sha256 = "1ahdcyrj7jgm4qx5s0q7gvbpqr2w57psazsf0wswp1v3mb9w4zg4";
+ sha256 = "0v8bq79n2nfnrs8pw2f3a93f8k691dnfzd5qxb5srwak4y2za7hn";
};
buildInputs = [ python zlib ]
diff --git a/pkgs/tools/system/inxi/default.nix b/pkgs/tools/system/inxi/default.nix
index 8842c97902e9..a513a68c5f0e 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/kmon/default.nix b/pkgs/tools/system/kmon/default.nix
index afb59b25059e..2a60283f122a 100644
--- a/pkgs/tools/system/kmon/default.nix
+++ b/pkgs/tools/system/kmon/default.nix
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "kmon";
- version = "1.2.0";
+ version = "1.3.0";
src = fetchFromGitHub {
owner = "orhun";
repo = pname;
rev = "v${version}";
- sha256 = "1l2zdp5f9spkfx1dhxyj32791kgvc8hqjr1kk75vds4c1wgwq8gk";
+ sha256 = "0487blp5l82jscpf9m76cq5prvclg5ngvdgi500jh7vrrxxawnh4";
};
- cargoSha256 = "08a7gr70a3rh7a52gglck16qlwngb6ap723lg3b3mxmkyigdf6i6";
+ cargoSha256 = "1dfvkn1sw22csg635kl4mmcxb6c5bvc5aw370iicy9hwlkk7cqpd";
nativeBuildInputs = [ python3 ];
diff --git a/pkgs/tools/system/plan9port/builder.sh b/pkgs/tools/system/plan9port/builder.sh
index 7750de700617..b5196e512f41 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 54e88f5d0699..8164dfa9136d 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/ocrmypdf/0001-Make-compatible-with-pdfminer.six-version-20200720.patch b/pkgs/tools/text/ocrmypdf/0001-Make-compatible-with-pdfminer.six-version-20200720.patch
new file mode 100644
index 000000000000..967bcd3948c2
--- /dev/null
+++ b/pkgs/tools/text/ocrmypdf/0001-Make-compatible-with-pdfminer.six-version-20200720.patch
@@ -0,0 +1,52 @@
+From 4315b58e0bffedd145cec61f96062292cd98278e Mon Sep 17 00:00:00 2001
+From: Pascal Bach
+Date: Thu, 23 Jul 2020 21:37:33 +0200
+Subject: [PATCH] Make compatible with pdfminer.six version 20200720
+
+---
+ setup.py | 2 +-
+ src/ocrmypdf/pdfinfo/layout.py | 8 ++++++--
+ 2 files changed, 7 insertions(+), 3 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index bd95ed9..d1f4ab1 100644
+--- a/setup.py
++++ b/setup.py
+@@ -83,7 +83,7 @@ setup(
+ 'cffi >= 1.9.1', # must be a setup and install requirement
+ 'coloredlogs >= 14.0', # strictly optional
+ 'img2pdf >= 0.3.0, < 0.4', # pure Python, so track HEAD closely
+- 'pdfminer.six >= 20191110, <= 20200517',
++ 'pdfminer.six >= 20191110, <= 20200720',
+ 'pikepdf >= 1.14.0, < 2',
+ 'Pillow >= 7.0.0',
+ 'pluggy >= 0.13.0',
+diff --git a/src/ocrmypdf/pdfinfo/layout.py b/src/ocrmypdf/pdfinfo/layout.py
+index 98bd82e..8b41e14 100644
+--- a/src/ocrmypdf/pdfinfo/layout.py
++++ b/src/ocrmypdf/pdfinfo/layout.py
+@@ -26,7 +26,11 @@ import pdfminer.pdfdevice
+ import pdfminer.pdfinterp
+ from pdfminer.converter import PDFLayoutAnalyzer
+ from pdfminer.layout import LAParams, LTChar, LTPage, LTTextBox
+-from pdfminer.pdfdocument import PDFTextExtractionNotAllowed
++try:
++ from pdfminer.pdfdocument import PDFTextExtractionNotAllowedError
++except ImportError:
++ # Fallback for pdfminer < 20200720
++ from pdfminer.pdfdocument import PDFTextExtractionNotAllowed as PDFTextExtractionNotAllowedError
+ from pdfminer.pdffont import PDFSimpleFont, PDFUnicodeNotDefined
+ from pdfminer.pdfpage import PDFPage
+ from pdfminer.utils import bbox2str, matrix2str
+@@ -239,7 +243,7 @@ def get_page_analysis(infile, pageno, pscript5_mode):
+ with Path(infile).open('rb') as f:
+ page = PDFPage.get_pages(f, pagenos=[pageno], maxpages=0)
+ interp.process_page(next(page))
+- except PDFTextExtractionNotAllowed:
++ except PDFTextExtractionNotAllowedError:
+ raise EncryptedPdfError()
+ finally:
+ if pscript5_mode:
+--
+2.27.0
+
diff --git a/pkgs/tools/text/ocrmypdf/default.nix b/pkgs/tools/text/ocrmypdf/default.nix
index 84e0bfb78d17..b7864b05b6e1 100644
--- a/pkgs/tools/text/ocrmypdf/default.nix
+++ b/pkgs/tools/text/ocrmypdf/default.nix
@@ -29,14 +29,14 @@ let
in
buildPythonApplication rec {
pname = "ocrmypdf";
- version = "10.2.0";
+ version = "10.3.0";
disabled = ! python3Packages.isPy3k;
src = fetchFromGitHub {
owner = "jbarlow83";
repo = "OCRmyPDF";
rev = "v${version}";
- sha256 = "1dkxhy3bjl48948jj2k6d684sd76xw1q427qc4hmxncr0wxj0ljp";
+ sha256 = "0c6v7846lmkmbyfla07s35mpba4h09h0fx6pxqf0yvdjxmj46q8c";
};
nativeBuildInputs = with python3Packages; [
@@ -76,6 +76,8 @@ buildPythonApplication rec {
src = ./liblept.patch;
liblept = "${stdenv.lib.getLib leptonica}/lib/liblept${stdenv.hostPlatform.extensions.sharedLibrary}";
})
+ # https://github.com/jbarlow83/OCRmyPDF/pull/596
+ ./0001-Make-compatible-with-pdfminer.six-version-20200720.patch
];
makeWrapperArgs = [ "--prefix PATH : ${stdenv.lib.makeBinPath [ ghostscript jbig2enc pngquant qpdf tesseract4 unpaper ]}" ];
diff --git a/pkgs/tools/text/shfmt/default.nix b/pkgs/tools/text/shfmt/default.nix
index 43c945ac7697..22ac9369bf27 100644
--- a/pkgs/tools/text/shfmt/default.nix
+++ b/pkgs/tools/text/shfmt/default.nix
@@ -17,6 +17,8 @@ buildGoModule rec {
buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ];
+ doCheck = true;
+
meta = with lib; {
homepage = "https://github.com/mvdan/sh";
description = "A shell parser and formatter";
diff --git a/pkgs/tools/text/ugrep/default.nix b/pkgs/tools/text/ugrep/default.nix
new file mode 100644
index 000000000000..9702cc928359
--- /dev/null
+++ b/pkgs/tools/text/ugrep/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchFromGitHub, boost, bzip2, lz4, pcre2, xz, zlib }:
+
+stdenv.mkDerivation rec {
+ pname = "ugrep";
+ version = "2.4.1";
+
+ src = fetchFromGitHub {
+ owner = "Genivia";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "16nr7zq4l2si9pfckfinbqnv94hw51z2qcbygc9x81jbjlvg3003";
+ };
+
+ buildInputs = [ boost bzip2 lz4 pcre2 xz zlib ];
+
+ meta = with stdenv.lib; {
+ description = "Ultra fast grep with interactive query UI";
+ homepage = "https://github.com/Genivia/ugrep";
+ maintainers = with maintainers; [ numkem ];
+ license = licenses.bsd3;
+ platforms = platforms.all;
+ };
+}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 42fc91f375f8..5bc4021ea087 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 0cc177b64665..f490366a7811 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2119,6 +2119,8 @@ in
mlarchive2maildir = callPackage ../applications/networking/mailreaders/mlarchive2maildir { };
+ molly-brown = callPackage ../servers/gemini/molly-brown { };
+
monetdb = callPackage ../servers/sql/monetdb { };
mons = callPackage ../tools/misc/mons {};
@@ -5074,6 +5076,8 @@ in
libwebsockets_4_0;
libwebsockets = libwebsockets_3_2;
+ licensee = callPackage ../tools/package-management/licensee { };
+
lidarr = callPackage ../servers/lidarr { };
limesuite = callPackage ../applications/radio/limesuite { };
@@ -5529,6 +5533,8 @@ in
ngrep = callPackage ../tools/networking/ngrep { };
+ neuron-notes = haskell.lib.justStaticExecutables (haskell.lib.generateOptparseApplicativeCompletion "neuron" haskellPackages.neuron);
+
ngrok = ngrok-2;
ngrok-2 = callPackage ../tools/networking/ngrok-2 { };
@@ -5543,6 +5549,8 @@ in
notable = callPackage ../applications/misc/notable { };
+ nvchecker = with python3Packages; toPythonApplication nvchecker;
+
miller = callPackage ../tools/text/miller { };
milu = callPackage ../applications/misc/milu { };
@@ -6111,7 +6119,10 @@ in
podiff = callPackage ../tools/text/podiff { };
- podman = callPackage ../applications/virtualization/podman/wrapper.nix { };
+ podman = if stdenv.isDarwin then
+ callPackage ../applications/virtualization/podman { }
+ else
+ callPackage ../applications/virtualization/podman/wrapper.nix { };
podman-unwrapped = callPackage ../applications/virtualization/podman { };
podman-compose = python3Packages.callPackage ../applications/virtualization/podman-compose {};
@@ -6383,6 +6394,8 @@ in
recoll = callPackage ../applications/search/recoll { };
+ redoc-cli = nodePackages.redoc-cli;
+
reflex = callPackage ../development/tools/reflex { };
reiser4progs = callPackage ../tools/filesystems/reiser4progs { };
@@ -6866,6 +6879,8 @@ in
speech-denoiser = callPackage ../applications/audio/speech-denoiser {};
+ splot = haskell.lib.justStaticExecutables haskellPackages.splot;
+
squashfsTools = callPackage ../tools/filesystems/squashfs { };
squashfs-tools-ng = callPackage ../tools/filesystems/squashfs-tools-ng { };
@@ -7176,12 +7191,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 { };
@@ -7332,6 +7342,8 @@ in
uget = callPackage ../tools/networking/uget { };
uget-integrator = callPackage ../tools/networking/uget-integrator { };
+
+ ugrep = callPackage ../tools/text/ugrep { };
uif2iso = callPackage ../tools/cd-dvd/uif2iso { };
@@ -8358,7 +8370,7 @@ in
else ../development/compilers/gcc/9);
gcc = if (with stdenv.targetPlatform; isVc4 || libc == "relibc")
then gcc6 else gcc9;
-
+
gcc-unwrapped = gcc.cc;
gccStdenv = if stdenv.cc.isGNU then stdenv else stdenv.override {
@@ -8721,7 +8733,7 @@ in
# Please update doc/languages-frameworks/haskell.section.md, “Our
# current default compiler is”, if you bump this:
- haskellPackages = dontRecurseIntoAttrs haskell.packages.ghc883;
+ haskellPackages = dontRecurseIntoAttrs haskell.packages.ghc884;
inherit (haskellPackages) ghc;
@@ -9283,7 +9295,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;
};
@@ -10886,6 +10897,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 { };
@@ -11409,6 +11422,8 @@ in
amdvlk = callPackage ../development/libraries/amdvlk {};
+ aml = callPackage ../development/libraries/aml { };
+
amrnb = callPackage ../development/libraries/amrnb { };
amrwb = callPackage ../development/libraries/amrwb { };
@@ -14241,6 +14256,8 @@ in
opencolorio = callPackage ../development/libraries/opencolorio { };
+ opendmarc = callPackage ../development/libraries/opendmarc { };
+
ois = callPackage ../development/libraries/ois {};
openh264 = callPackage ../development/libraries/openh264 { };
@@ -14752,7 +14769,13 @@ in
rubberband = callPackage ../development/libraries/rubberband { };
+ /* This package references ghc844, which we no longer have. Unfortunately, I
+ have been unable to mark it as "broken" in a way that the ofBorg bot
+ recognizes. Since I don't want to merge code into master that generates
+ evaluation errors, I have no other idea but to comment it out entirely.
+
sad = callPackage ../applications/science/logic/sad { };
+ */
safefile = callPackage ../development/libraries/safefile {};
@@ -15497,6 +15520,8 @@ in
yubikey-personalization-gui = libsForQt5.callPackage ../tools/misc/yubikey-personalization-gui { };
+ yubikey-agent = callPackage ../tools/security/yubikey-agent { };
+
zchunk = callPackage ../development/libraries/zchunk { };
zeitgeist = callPackage ../development/libraries/zeitgeist { };
@@ -15507,7 +15532,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;
@@ -15587,8 +15611,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 { };
@@ -16286,6 +16308,13 @@ in
inherit (darwin.apple_sdk.frameworks) CoreFoundation Security;
};
+ mongodb-4_2 = callPackage ../servers/nosql/mongodb/v4_2.nix {
+ sasl = cyrus_sasl;
+ boost = boost169;
+ inherit (darwin) cctools;
+ inherit (darwin.apple_sdk.frameworks) CoreFoundation Security;
+ };
+
nginx-sso = callPackage ../servers/nginx-sso { };
percona-server56 = callPackage ../servers/sql/percona/5.6.x.nix { };
@@ -16847,6 +16876,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 { };
@@ -17694,6 +17725,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 { };
@@ -17766,6 +17799,8 @@ in
pam_mount = callPackage ../os-specific/linux/pam_mount { };
+ pam_p11 = callPackage ../os-specific/linux/pam_p11 { };
+
pam_pgsql = callPackage ../os-specific/linux/pam_pgsql { };
pam_ssh_agent_auth = callPackage ../os-specific/linux/pam_ssh_agent_auth { };
@@ -19329,6 +19364,8 @@ in
cloud-print-connector = callPackage ../servers/cloud-print-connector { };
+ cloud-hypervisor = callPackage ../applications/virtualization/cloud-hypervisor { };
+
clp = callPackage ../applications/science/math/clp { };
cmatrix = callPackage ../applications/misc/cmatrix { };
@@ -19796,6 +19833,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 { };
@@ -22597,6 +22638,8 @@ in
pythonBindings = true;
});
+ sublime-music = callPackage ../applications/audio/sublime-music { };
+
subunit = callPackage ../development/libraries/subunit { };
surf = callPackage ../applications/networking/browsers/surf { gtk = gtk2; };
@@ -22616,7 +22659,8 @@ in
symlinks = callPackage ../tools/system/symlinks { };
- syncplay = python3.pkgs.callPackage ../applications/networking/syncplay { };
+ # this can be changed to python3 once pyside2 is updated to support the latest python version
+ syncplay = python37.pkgs.callPackage ../applications/networking/syncplay { };
inherit (callPackages ../applications/networking/syncthing { })
syncthing
@@ -26334,6 +26378,8 @@ in
nix-top = callPackage ../tools/package-management/nix-top { };
+ nix-tree = haskell.lib.justStaticExecutables (haskellPackages.nix-tree);
+
nix-universal-prefetch = callPackage ../tools/package-management/nix-universal-prefetch { };
nix-repl = throw (
@@ -26354,6 +26400,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 { };
@@ -26638,6 +26686,8 @@ in
callPackage ../applications/networking/cluster/terraform-providers {}
);
+ terraform-compliance = python3Packages.callPackage ../applications/networking/cluster/terraform-compliance {};
+
terraform-docs = callPackage ../applications/networking/cluster/terraform-docs {};
terraform-inventory = callPackage ../applications/networking/cluster/terraform-inventory {};
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 13c5b7213013..662ba91514dd 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -5,7 +5,6 @@ let
integerSimpleExcludes = [
"ghc822Binary"
"ghc865Binary"
- "ghc844"
"ghcjs"
"ghcjs86"
"integer-simple"
@@ -44,12 +43,6 @@ in {
ghc865Binary = callPackage ../development/compilers/ghc/8.6.5-binary.nix { };
- ghc844 = callPackage ../development/compilers/ghc/8.4.4.nix {
- bootPkgs = packages.ghc822Binary;
- sphinx = buildPackages.python3Packages.sphinx_1_7_9;
- buildLlvmPackages = buildPackages.llvmPackages_5;
- llvmPackages = pkgs.llvmPackages_5;
- };
ghc865 = callPackage ../development/compilers/ghc/8.6.5.nix {
bootPkgs = packages.ghc822Binary;
inherit (buildPackages.python3Packages) sphinx;
@@ -68,6 +61,12 @@ in {
buildLlvmPackages = buildPackages.llvmPackages_7;
llvmPackages = pkgs.llvmPackages_7;
};
+ ghc884 = callPackage ../development/compilers/ghc/8.8.4.nix {
+ bootPkgs = packages.ghc865Binary;
+ inherit (buildPackages.python3Packages) sphinx;
+ buildLlvmPackages = buildPackages.llvmPackages_7;
+ llvmPackages = pkgs.llvmPackages_7;
+ };
ghc8101 = callPackage ../development/compilers/ghc/8.10.1.nix {
bootPkgs = packages.ghc865Binary;
inherit (buildPackages.python3Packages) sphinx;
@@ -118,11 +117,6 @@ in {
compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.6.x.nix { };
packageSetConfig = bootstrapPackageSet;
};
- ghc844 = callPackage ../development/haskell-modules {
- buildHaskellPackages = bh.packages.ghc844;
- ghc = bh.compiler.ghc844;
- compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.4.x.nix { };
- };
ghc865 = callPackage ../development/haskell-modules {
buildHaskellPackages = bh.packages.ghc865;
ghc = bh.compiler.ghc865;
@@ -138,6 +132,11 @@ in {
ghc = bh.compiler.ghc883;
compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.8.x.nix { };
};
+ ghc884 = callPackage ../development/haskell-modules {
+ buildHaskellPackages = bh.packages.ghc884;
+ ghc = bh.compiler.ghc884;
+ compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.8.x.nix { };
+ };
ghc8101 = callPackage ../development/haskell-modules {
buildHaskellPackages = bh.packages.ghc8101;
ghc = bh.compiler.ghc8101;
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 43e2eda774a9..597d5c6acdaf 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 5982742b5f03..1ec0a80c6449 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1504,6 +1504,8 @@ in {
pyvoro = callPackage ../development/python-modules/pyvoro { };
+ radish-bdd = callPackage ../development/python-modules/radish-bdd { };
+
relatorio = callPackage ../development/python-modules/relatorio { };
reproject = callPackage ../development/python-modules/reproject { };
@@ -1643,6 +1645,8 @@ in {
hdf5 = pkgs.hdf5.override { zlib = pkgs.zlib; };
};
+ tag-expressions = callPackage ../development/python-modules/tag-expressions { };
+
tableaudocumentapi = callPackage ../development/python-modules/tableaudocumentapi { };
tesserocr = callPackage ../development/python-modules/tesserocr { };
@@ -1709,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 { };
@@ -2090,6 +2096,8 @@ in {
colorclass = callPackage ../development/python-modules/colorclass {};
+ colorful = callPackage ../development/python-modules/colorful {};
+
colorlog = callPackage ../development/python-modules/colorlog { };
colorspacious = callPackage ../development/python-modules/colorspacious { };
@@ -2150,6 +2158,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 {};
@@ -2309,6 +2319,8 @@ in {
cheetah = callPackage ../development/python-modules/cheetah { };
+ cheetah3 = callPackage ../development/python-modules/cheetah3 { };
+
cherrypy = if isPy3k then
callPackage ../development/python-modules/cherrypy { }
else
@@ -2540,6 +2552,8 @@ in {
PyLD = callPackage ../development/python-modules/PyLD { };
+ pysingleton = callPackage ../development/python-modules/pysingleton { };
+
python-jose = callPackage ../development/python-modules/python-jose {};
python-json-logger = callPackage ../development/python-modules/python-json-logger { };
@@ -5897,6 +5911,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 { };