diff --git a/doc/using/configuration.xml b/doc/using/configuration.xml index f19eddb5868..690bb3d34a1 100644 --- a/doc/using/configuration.xml +++ b/doc/using/configuration.xml @@ -85,19 +85,19 @@ Installing packages on unsupported systems - There are also two ways to try compiling a package which has been marked as unsuported for the given system. + There are also two ways to try compiling a package which has been marked as unsupported for the given system. - For allowing the build of a broken package once, you can use an environment variable for a single invocation of the nix tools: + For allowing the build of an unsupported package once, you can use an environment variable for a single invocation of the nix tools: $ export NIXPKGS_ALLOW_UNSUPPORTED_SYSTEM=1 - For permanently allowing broken packages to be built, you may add allowUnsupportedSystem = true; to your user's configuration file, like this: + For permanently allowing unsupported packages to be built, you may add allowUnsupportedSystem = true; to your user's configuration file, like this: { allowUnsupportedSystem = true; diff --git a/lib/licenses.nix b/lib/licenses.nix index e24b7e8ec6f..ed4d80fffac 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -95,6 +95,11 @@ lib.mapAttrs (n: v: v // { shortName = n; }) { fullName = ''BSD 2-clause "Simplified" License''; }; + bsd2Patent = spdx { + spdxId = "BSD-2-Clause-Patent"; + fullName = ''BSD-2-Clause Plus Patent License''; + }; + bsd3 = spdx { spdxId = "BSD-3-Clause"; fullName = ''BSD 3-clause "New" or "Revised" License''; diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index ec34287442e..f6ef3b5443c 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -283,6 +283,12 @@ githubId = 273837; name = "Mateusz Czapliński"; }; + akamaus = { + email = "dmitryvyal@gmail.com"; + github = "akamaus"; + githubId = 58955; + name = "Dmitry Vyal"; + }; akaWolf = { email = "akawolf0@gmail.com"; github = "akaWolf"; @@ -3716,6 +3722,12 @@ githubId = 41977; name = "Joachim Fasting"; }; + joachimschmidt557 = { + email = "joachim.schmidt557@outlook.com"; + github = "joachimschmidt557"; + githubId = 28556218; + name = "Joachim Schmidt"; + }; joamaki = { email = "joamaki@gmail.com"; github = "joamaki"; @@ -6314,6 +6326,12 @@ fingerprint = "240B 57DE 4271 2480 7CE3 EAC8 4F74 D536 1C4C A31E"; }]; }; + priegger = { + email = "philipp@riegger.name"; + github = "priegger"; + githubId = 228931; + name = "Philipp Riegger"; + }; prikhi = { email = "pavan.rikhi@gmail.com"; github = "prikhi"; diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv index 8cc63963370..c1eeed4afd5 100644 --- a/maintainers/scripts/luarocks-packages.csv +++ b/maintainers/scripts/luarocks-packages.csv @@ -74,6 +74,7 @@ moonscript,,,,,arobyn nvim-client,,,,, penlight,,,,, rapidjson,,,,, +readline,,,,, say,,,,, std__debug,std._debug,,,, std_normalize,std.normalize,,,, diff --git a/nixos/doc/manual/development/writing-nixos-tests.xml b/nixos/doc/manual/development/writing-nixos-tests.xml index 150bea8c2d8..ff37b3b2f6f 100644 --- a/nixos/doc/manual/development/writing-nixos-tests.xml +++ b/nixos/doc/manual/development/writing-nixos-tests.xml @@ -360,6 +360,18 @@ start_all() + + + wait_for_console_text + + + + Wait until the supplied regular expressions match a line of the serial + console output. This method is useful when OCR is not possibile or + accurate enough. + + + wait_for_window diff --git a/nixos/doc/manual/installation/installing.xml b/nixos/doc/manual/installation/installing.xml index 673df8f2e4c..48307ca2469 100644 --- a/nixos/doc/manual/installation/installing.xml +++ b/nixos/doc/manual/installation/installing.xml @@ -146,7 +146,7 @@ partition. It uses the initially reserved 512MiB at the start of the disk. # parted /dev/sda -- mkpart ESP fat32 1MiB 512MiB -# parted /dev/sda -- set 3 boot on +# parted /dev/sda -- set 3 esp on @@ -513,7 +513,7 @@ Retype new UNIX password: *** # parted /dev/sda -- mkpart primary 512MiB -8GiB # parted /dev/sda -- mkpart primary linux-swap -8GiB 100% # parted /dev/sda -- mkpart ESP fat32 1MiB 512MiB -# parted /dev/sda -- set 3 boot on +# parted /dev/sda -- set 3 esp on diff --git a/nixos/lib/make-ext4-fs.nix b/nixos/lib/make-ext4-fs.nix index 516fe3fc673..74a6c134e64 100644 --- a/nixos/lib/make-ext4-fs.nix +++ b/nixos/lib/make-ext4-fs.nix @@ -17,7 +17,7 @@ , e2fsprogs , libfaketime , perl -, lkl +, fakeroot }: let @@ -26,7 +26,7 @@ in pkgs.stdenv.mkDerivation { name = "ext4-fs.img${lib.optionalString compressImage ".zst"}"; - nativeBuildInputs = [ e2fsprogs.bin libfaketime perl lkl ] + nativeBuildInputs = [ e2fsprogs.bin libfaketime perl fakeroot ] ++ lib.optional compressImage zstd; buildCommand = @@ -37,32 +37,31 @@ pkgs.stdenv.mkDerivation { ${populateImageCommands} ) - # Add the closures of the top-level store objects. - storePaths=$(cat ${sdClosureInfo}/store-paths) + echo "Preparing store paths for image..." + + # Create nix/store before copying path + mkdir -p ./rootImage/nix/store + + xargs -I % cp -a --reflink=auto % -t ./rootImage/nix/store/ < ${sdClosureInfo}/store-paths + ( + GLOBIGNORE=".:.." + shopt -u dotglob + cp -a --reflink=auto ./files/* -t ./rootImage/ + ) + + # Also include a manifest of the closures in a format suitable for nix-store --load-db + cp ${sdClosureInfo}/registration ./rootImage/nix-path-registration # Make a crude approximation of the size of the target image. # If the script starts failing, increase the fudge factors here. - numInodes=$(find $storePaths ./files | wc -l) - numDataBlocks=$(du -s -c -B 4096 --apparent-size $storePaths ./files | tail -1 | awk '{ print int($1 * 1.10) }') + numInodes=$(find ./rootImage | wc -l) + numDataBlocks=$(du -s -c -B 4096 --apparent-size ./rootImage | tail -1 | awk '{ print int($1 * 1.10) }') bytes=$((2 * 4096 * $numInodes + 4096 * $numDataBlocks)) echo "Creating an EXT4 image of $bytes bytes (numInodes=$numInodes, numDataBlocks=$numDataBlocks)" truncate -s $bytes $img - faketime -f "1970-01-01 00:00:01" mkfs.ext4 -L ${volumeLabel} -U ${uuid} $img - # Also include a manifest of the closures in a format suitable for nix-store --load-db. - cp ${sdClosureInfo}/registration nix-path-registration - cptofs -t ext4 -i $img nix-path-registration / - - # Create nix/store before copying paths - faketime -f "1970-01-01 00:00:01" mkdir -p nix/store - cptofs -t ext4 -i $img nix / - - echo "copying store paths to image..." - cptofs -t ext4 -i $img $storePaths /nix/store/ - - echo "copying files to image..." - cptofs -t ext4 -i $img ./files/* / + faketime -f "1970-01-01 00:00:01" fakeroot mkfs.ext4 -L ${volumeLabel} -U ${uuid} -d ./rootImage $img export EXT2FS_NO_MTAB_OK=yes # I have ended up with corrupted images sometimes, I suspect that happens when the build machine's disk gets full during the build. diff --git a/nixos/lib/test-driver/test-driver.py b/nixos/lib/test-driver/test-driver.py index f454b052dc3..4cb928538e7 100644 --- a/nixos/lib/test-driver/test-driver.py +++ b/nixos/lib/test-driver/test-driver.py @@ -3,6 +3,8 @@ from contextlib import contextmanager, _GeneratorContextManager from queue import Queue, Empty from typing import Tuple, Any, Callable, Dict, Iterator, Optional, List from xml.sax.saxutils import XMLGenerator +import queue +import io import _thread import argparse import atexit @@ -672,6 +674,22 @@ class Machine: with self.nested("waiting for {} to appear on screen".format(regex)): retry(screen_matches) + def wait_for_console_text(self, regex: str) -> None: + self.log("waiting for {} to appear on console".format(regex)) + # Buffer the console output, this is needed + # to match multiline regexes. + console = io.StringIO() + while True: + try: + console.write(self.last_lines.get()) + except queue.Empty: + self.sleep(1) + continue + console.seek(0) + matches = re.search(regex, console.read()) + if matches is not None: + return + def send_key(self, key: str) -> None: key = CHAR_TO_KEY.get(key, key) self.send_monitor_command("sendkey {}".format(key)) @@ -735,11 +753,16 @@ class Machine: self.monitor, _ = self.monitor_socket.accept() self.shell, _ = self.shell_socket.accept() + # Store last serial console lines for use + # of wait_for_console_text + self.last_lines: Queue = Queue() + def process_serial_output() -> None: assert self.process.stdout is not None for _line in self.process.stdout: # Ignore undecodable bytes that may occur in boot menus line = _line.decode(errors="ignore").replace("\r", "").rstrip() + self.last_lines.put(line) eprint("{} # {}".format(self.name, line)) self.logger.enqueue({"msg": line, "machine": self.name}) diff --git a/nixos/lib/testing-python.nix b/nixos/lib/testing-python.nix index 123323711a7..c6939c7d698 100644 --- a/nixos/lib/testing-python.nix +++ b/nixos/lib/testing-python.nix @@ -114,7 +114,7 @@ rec { imagemagick_tiff = imagemagick_light.override { inherit libtiff; }; - # Generate onvenience wrappers for running the test driver + # Generate convenience wrappers for running the test driver # interactively with the specified network, and for starting the # VMs from the command line. driver = let warn = if skipLint then lib.warn "Linting is disabled!" else lib.id; in warn (runCommand testDriverName diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index cf25ae3157e..cf1ee0f380c 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -686,6 +686,7 @@ ./services/networking/ocserv.nix ./services/networking/ofono.nix ./services/networking/oidentd.nix + ./services/networking/onedrive.nix ./services/networking/openfire.nix ./services/networking/openvpn.nix ./services/networking/ostinato.nix diff --git a/nixos/modules/programs/fish.nix b/nixos/modules/programs/fish.nix index 48b324a0fe8..39b92edf2ac 100644 --- a/nixos/modules/programs/fish.nix +++ b/nixos/modules/programs/fish.nix @@ -102,6 +102,9 @@ in programs.fish.shellAliases = mapAttrs (name: mkDefault) cfge.shellAliases; + # Required for man completions + documentation.man.generateCaches = true; + environment.etc."fish/foreign-env/shellInit".text = cfge.shellInit; environment.etc."fish/foreign-env/loginShellInit".text = cfge.loginShellInit; environment.etc."fish/foreign-env/interactiveShellInit".text = cfge.interactiveShellInit; diff --git a/nixos/modules/services/continuous-integration/gitlab-runner.nix b/nixos/modules/services/continuous-integration/gitlab-runner.nix index eacfed85ddf..4cff19839a2 100644 --- a/nixos/modules/services/continuous-integration/gitlab-runner.nix +++ b/nixos/modules/services/continuous-integration/gitlab-runner.nix @@ -1,14 +1,16 @@ { config, lib, pkgs, ... }: +with builtins; with lib; let cfg = config.services.gitlab-runner; hasDocker = config.virtualisation.docker.enable; - hashedServices = with builtins; (mapAttrs' (name: service: nameValuePair - "${name}_${config.networking.hostName}_${ + hashedServices = mapAttrs' + (name: service: nameValuePair + "${name}_${config.networking.hostName}_${ substring 0 12 (hashString "md5" (unsafeDiscardStringContext (toJSON service)))}" service) - cfg.services); + cfg.services; configPath = "$HOME/.gitlab-runner/config.toml"; configureScript = pkgs.writeShellScriptBin "gitlab-runner-configure" ( if (cfg.configFile != null) then '' @@ -76,7 +78,7 @@ let ++ map (v: "--docker-allowed-images ${escapeShellArg v}") service.dockerAllowedImages ++ map (v: "--docker-allowed-services ${escapeShellArg v}") service.dockerAllowedServices ) - ))} && sleep 1 + ))} && sleep 1 || exit 1 fi '') hashedServices)} @@ -89,8 +91,17 @@ let # update global options remarshal --if toml --of json ${configPath} \ - | jq -cM '.check_interval = ${toString cfg.checkInterval} | - .concurrent = ${toString cfg.concurrent}' \ + | jq -cM ${escapeShellArg (concatStringsSep " | " [ + ".check_interval = ${toJSON cfg.checkInterval}" + ".concurrent = ${toJSON cfg.concurrent}" + ".sentry_dsn = ${toJSON cfg.sentryDSN}" + ".listen_address = ${toJSON cfg.prometheusListenAddress}" + ".session_server.listen_address = ${toJSON cfg.sessionServer.listenAddress}" + ".session_server.advertise_address = ${toJSON cfg.sessionServer.advertiseAddress}" + ".session_server.session_timeout = ${toJSON cfg.sessionServer.sessionTimeout}" + "del(.[] | nulls)" + "del(.session_server[] | nulls)" + ])} \ | remarshal --if json --of toml \ | sponge ${configPath} @@ -141,6 +152,66 @@ in 0 does not mean unlimited. ''; }; + sentryDSN = mkOption { + type = types.nullOr types.str; + default = null; + example = "https://public:private@host:port/1"; + description = '' + Data Source Name for tracking of all system level errors to Sentry. + ''; + }; + prometheusListenAddress = mkOption { + type = types.nullOr types.str; + default = null; + example = "localhost:8080"; + description = '' + Address (<host>:<port>) on which the Prometheus metrics HTTP server + should be listening. + ''; + }; + sessionServer = mkOption { + type = types.submodule { + options = { + listenAddress = mkOption { + type = types.nullOr types.str; + default = null; + example = "0.0.0.0:8093"; + description = '' + An internal URL to be used for the session server. + ''; + }; + advertiseAddress = mkOption { + type = types.nullOr types.str; + default = null; + example = "runner-host-name.tld:8093"; + description = '' + The URL that the Runner will expose to GitLab to be used + to access the session server. + Fallbacks to if not defined. + ''; + }; + sessionTimeout = mkOption { + type = types.int; + default = 1800; + description = '' + How long in seconds the session can stay active after + the job completes (which will block the job from finishing). + ''; + }; + }; + }; + default = { }; + example = literalExample '' + { + listenAddress = "0.0.0.0:8093"; + } + ''; + description = '' + The session server allows the user to interact with jobs + that the Runner is responsible for. A good example of this is the + interactive web terminal. + ''; + }; gracefulTermination = mkOption { type = types.bool; default = false; diff --git a/nixos/modules/services/databases/openldap.nix b/nixos/modules/services/databases/openldap.nix index 9b4d9a98b74..7472538b887 100644 --- a/nixos/modules/services/databases/openldap.nix +++ b/nixos/modules/services/databases/openldap.nix @@ -5,14 +5,14 @@ with lib; let cfg = config.services.openldap; - openldap = pkgs.openldap; + openldap = cfg.package; dataFile = pkgs.writeText "ldap-contents.ldif" cfg.declarativeContents; configFile = pkgs.writeText "slapd.conf" ((optionalString cfg.defaultSchemas '' - include ${pkgs.openldap.out}/etc/schema/core.schema - include ${pkgs.openldap.out}/etc/schema/cosine.schema - include ${pkgs.openldap.out}/etc/schema/inetorgperson.schema - include ${pkgs.openldap.out}/etc/schema/nis.schema + include ${openldap.out}/etc/schema/core.schema + include ${openldap.out}/etc/schema/cosine.schema + include ${openldap.out}/etc/schema/inetorgperson.schema + include ${openldap.out}/etc/schema/nis.schema '') + '' ${cfg.extraConfig} database ${cfg.database} @@ -46,6 +46,18 @@ in "; }; + package = mkOption { + type = types.package; + default = pkgs.openldap; + description = '' + OpenLDAP package to use. + + This can be used to, for example, set an OpenLDAP package + with custom overrides to enable modules or other + functionality. + ''; + }; + user = mkOption { type = types.str; default = "openldap"; @@ -152,10 +164,10 @@ in "; example = literalExample '' ''' - include ${pkgs.openldap.out}/etc/schema/core.schema - include ${pkgs.openldap.out}/etc/schema/cosine.schema - include ${pkgs.openldap.out}/etc/schema/inetorgperson.schema - include ${pkgs.openldap.out}/etc/schema/nis.schema + include ${openldap.out}/etc/schema/core.schema + include ${openldap.out}/etc/schema/cosine.schema + include ${openldap.out}/etc/schema/inetorgperson.schema + include ${openldap.out}/etc/schema/nis.schema database bdb suffix dc=example,dc=org diff --git a/nixos/modules/services/networking/onedrive.nix b/nixos/modules/services/networking/onedrive.nix new file mode 100644 index 00000000000..a945250fa9e --- /dev/null +++ b/nixos/modules/services/networking/onedrive.nix @@ -0,0 +1,72 @@ +{ config, lib, pkgs, ... }: +let + cfg = config.services.onedrive; + + onedriveLauncher = pkgs.writeShellScriptBin + "onedrive-launcher" + '' + # XDG_CONFIG_HOME is not recognized in the environment here. + if [ -f $HOME/.config/onedrive-launcher ] + then + # Hopefully using underscore boundary helps locate variables + for _onedrive_config_dirname_ in $(cat $HOME/.config/onedrive-launcher | grep -v '[ \t]*#' ) + do + systemctl --user start onedrive@$_onedrive_config_dirname_ + done + else + systemctl --user start onedrive@onedrive + fi + '' + ; + +in { + ### Documentation + # meta.doc = ./onedrive.xml; + + ### Interface + + options.services.onedrive = { + enable = lib.mkOption { + type = lib.types.bool; + default = false; + description = "Enable OneDrive service"; + }; + + package = lib.mkOption { + type = lib.types.package; + default = pkgs.onedrive; + defaultText = "pkgs.onedrive"; + example = lib.literalExample "pkgs.onedrive"; + description = '' + OneDrive package to use. + ''; + }; + }; +### Implementation + + config = lib.mkIf cfg.enable { + environment.systemPackages = [ cfg.package ]; + + systemd.user.services."onedrive@" = { + description = "Onedrive sync service"; + + serviceConfig = { + Type = "simple"; + ExecStart = '' + ${cfg.package}/bin/onedrive --monitor --verbose --confdir=%h/.config/%i + ''; + Restart="on-failure"; + RestartSec=3; + RestartPreventExitStatus=3; + }; + }; + + systemd.user.services.onedrive-launcher = { + wantedBy = [ "default.target" ]; + serviceConfig = { + Type = "oneshot"; + ExecStart = "${onedriveLauncher}/bin/onedrive-launcher"; + }; + }; + }; +} diff --git a/nixos/modules/services/networking/onedrive.xml b/nixos/modules/services/networking/onedrive.xml new file mode 100644 index 00000000000..5a9dcf01aee --- /dev/null +++ b/nixos/modules/services/networking/onedrive.xml @@ -0,0 +1,34 @@ + + Microsoft OneDrive + + Microsoft Onedrive is a popular cloud file-hosting service, used by 85% of Fortune 500 companies. NixOS uses a popular OneDrive client for Linux maintained by github user abraunegg. The Linux client is excellent and allows customization of which files or paths to download, not much unlike the default Windows OneDrive client by Microsoft itself. The client allows syncing with multiple onedrive accounts at the same time, of any type- OneDrive personal, OneDrive business, Office365 and Sharepoint libraries, without any additional charge. + + + For more information, guides and documentation, see . + + + To enable OneDrive support, add the following to your configuration.nix: + + = true; + + This installs the onedrive package and a service onedriveLauncher which will instantiate a onedrive service for all your OneDrive accounts. Follow the steps in documentation of the onedrive client to setup your accounts. To use the service with multiple accounts, create a file named onedrive-launcher in ~/.config and add the filename of the config directory, relative to ~/.config. For example, if you have two OneDrive accounts with configs in ~/.config/onedrive_bob_work and ~/.config/onedrive_bob_personal, add the following lines: + +onedrive_bob_work +# Not in use: +# onedrive_bob_office365 +onedrive_bob_personal + + No such file needs to be created if you are using only a single OneDrive account with config in the default location ~/.config/onedrive, in the absence of ~/.config/onedrive-launcher, only a single service is instantiated, with default config path. + + + + If you wish to use a custom OneDrive package, say from another channel, add the following line: + + = pkgs.unstable.onedrive; + + + diff --git a/nixos/modules/system/boot/loader/grub/grub.nix b/nixos/modules/system/boot/loader/grub/grub.nix index 3975372e15e..b760c3f96dd 100644 --- a/nixos/modules/system/boot/loader/grub/grub.nix +++ b/nixos/modules/system/boot/loader/grub/grub.nix @@ -55,6 +55,7 @@ let storePath = config.boot.loader.grub.storePath; bootloaderId = if args.efiBootloaderId == null then "NixOS${efiSysMountPoint'}" else args.efiBootloaderId; timeout = if config.boot.loader.timeout == null then -1 else config.boot.loader.timeout; + users = if cfg.users == {} || cfg.version != 1 then cfg.users else throw "GRUB version 1 does not support user accounts."; inherit efiSysMountPoint; inherit (args) devices; inherit (efi) canTouchEfiVariables; @@ -137,6 +138,67 @@ in ''; }; + users = mkOption { + default = {}; + example = { + root = { hashedPasswordFile = "/path/to/file"; }; + }; + description = '' + User accounts for GRUB. When specified, the GRUB command line and + all boot options except the default are password-protected. + All passwords and hashes provided will be stored in /boot/grub/grub.cfg, + and will be visible to any local user who can read this file. Additionally, + any passwords and hashes provided directly in a Nix configuration + (as opposed to external files) will be copied into the Nix store, and + will be visible to all local users. + ''; + type = with types; attrsOf (submodule { + options = { + hashedPasswordFile = mkOption { + example = "/path/to/file"; + default = null; + type = with types; uniq (nullOr str); + description = '' + Specifies the path to a file containing the password hash + for the account, generated with grub-mkpasswd-pbkdf2. + This hash will be stored in /boot/grub/grub.cfg, and will + be visible to any local user who can read this file. + ''; + }; + hashedPassword = mkOption { + example = "grub.pbkdf2.sha512.10000.674DFFDEF76E13EA...2CC972B102CF4355"; + default = null; + type = with types; uniq (nullOr str); + description = '' + Specifies the password hash for the account, + generated with grub-mkpasswd-pbkdf2. + This hash will be copied to the Nix store, and will be visible to all local users. + ''; + }; + passwordFile = mkOption { + example = "/path/to/file"; + default = null; + type = with types; uniq (nullOr str); + description = '' + Specifies the path to a file containing the + clear text password for the account. + This password will be stored in /boot/grub/grub.cfg, and will + be visible to any local user who can read this file. + ''; + }; + password = mkOption { + example = "Pa$$w0rd!"; + default = null; + type = with types; uniq (nullOr str); + description = '' + Specifies the clear text password for the account. + This password will be copied to the Nix store, and will be visible to all local users. + ''; + }; + }; + }); + }; + mirroredBoots = mkOption { default = [ ]; example = [ diff --git a/nixos/modules/system/boot/loader/grub/install-grub.pl b/nixos/modules/system/boot/loader/grub/install-grub.pl index e469b18abd0..918a66866e9 100644 --- a/nixos/modules/system/boot/loader/grub/install-grub.pl +++ b/nixos/modules/system/boot/loader/grub/install-grub.pl @@ -247,6 +247,45 @@ if ($grubVersion == 1) { } else { + my @users = (); + foreach my $user ($dom->findnodes('/expr/attrs/attr[@name = "users"]/attrs/attr')) { + my $name = $user->findvalue('@name') or die; + my $hashedPassword = $user->findvalue('./attrs/attr[@name = "hashedPassword"]/string/@value'); + my $hashedPasswordFile = $user->findvalue('./attrs/attr[@name = "hashedPasswordFile"]/string/@value'); + my $password = $user->findvalue('./attrs/attr[@name = "password"]/string/@value'); + my $passwordFile = $user->findvalue('./attrs/attr[@name = "passwordFile"]/string/@value'); + + if ($hashedPasswordFile) { + open(my $f, '<', $hashedPasswordFile) or die "Can't read file '$hashedPasswordFile'!"; + $hashedPassword = <$f>; + chomp $hashedPassword; + } + if ($passwordFile) { + open(my $f, '<', $passwordFile) or die "Can't read file '$passwordFile'!"; + $password = <$f>; + chomp $password; + } + + if ($hashedPassword) { + if (index($hashedPassword, "grub.pbkdf2.") == 0) { + $conf .= "\npassword_pbkdf2 $name $hashedPassword"; + } + else { + die "Password hash for GRUB user '$name' is not valid!"; + } + } + elsif ($password) { + $conf .= "\npassword $name $password"; + } + else { + die "GRUB user '$name' has no password!"; + } + push(@users, $name); + } + if (@users) { + $conf .= "\nset superusers=\"" . join(' ',@users) . "\"\n"; + } + if ($copyKernels == 0) { $conf .= " " . $grubStore->search; @@ -350,7 +389,7 @@ sub copyToKernelsDir { } sub addEntry { - my ($name, $path) = @_; + my ($name, $path, $options) = @_; return unless -e "$path/kernel" && -e "$path/initrd"; my $kernel = copyToKernelsDir(Cwd::abs_path("$path/kernel")); @@ -396,7 +435,7 @@ sub addEntry { $conf .= " " . ($xen ? "module" : "kernel") . " $kernel $kernelParams\n"; $conf .= " " . ($xen ? "module" : "initrd") . " $initrd\n\n"; } else { - $conf .= "menuentry \"$name\" {\n"; + $conf .= "menuentry \"$name\" " . ($options||"") . " {\n"; $conf .= $grubBoot->search . "\n"; if ($copyKernels == 0) { $conf .= $grubStore->search . "\n"; @@ -413,7 +452,7 @@ sub addEntry { # Add default entries. $conf .= "$extraEntries\n" if $extraEntriesBeforeNixOS; -addEntry("NixOS - Default", $defaultConfig); +addEntry("NixOS - Default", $defaultConfig, "--unrestricted"); $conf .= "$extraEntries\n" unless $extraEntriesBeforeNixOS; diff --git a/nixos/modules/system/boot/plymouth.nix b/nixos/modules/system/boot/plymouth.nix index 23fce22366d..55e5b07ed61 100644 --- a/nixos/modules/system/boot/plymouth.nix +++ b/nixos/modules/system/boot/plymouth.nix @@ -102,6 +102,8 @@ in systemd.services.plymouth-poweroff.wantedBy = [ "poweroff.target" ]; systemd.services.plymouth-reboot.wantedBy = [ "reboot.target" ]; systemd.services.plymouth-read-write.wantedBy = [ "sysinit.target" ]; + systemd.services.systemd-ask-password-plymouth.wantedBy = ["multi-user.target"]; + systemd.paths.systemd-ask-password-plymouth.wantedBy = ["multi-user.target"]; boot.initrd.extraUtilsCommands = '' copy_bin_and_libs ${pkgs.plymouth}/bin/plymouthd @@ -146,6 +148,7 @@ in # We use `mkAfter` to ensure that LUKS password prompt would be shown earlier than the splash screen. boot.initrd.preLVMCommands = mkAfter '' mkdir -p /etc/plymouth + mkdir -p /run/plymouth ln -s ${configFile} /etc/plymouth/plymouthd.conf ln -s $extraUtils/share/plymouth/plymouthd.defaults /etc/plymouth/plymouthd.defaults ln -s $extraUtils/share/plymouth/logo.png /etc/plymouth/logo.png diff --git a/nixos/modules/tasks/filesystems/zfs.nix b/nixos/modules/tasks/filesystems/zfs.nix index 71eed4d6f1a..c9d9c6c1657 100644 --- a/nixos/modules/tasks/filesystems/zfs.nix +++ b/nixos/modules/tasks/filesystems/zfs.nix @@ -197,9 +197,7 @@ in Request encryption keys or passwords for all encrypted datasets on import. For root pools the encryption key can be supplied via both an interactive prompt (keylocation=prompt) and from a file - (keylocation=file://). Note that for data pools the encryption key can - be only loaded from a file and not via interactive prompt since the - import is processed in a background systemd service. + (keylocation=file://). ''; }; @@ -490,7 +488,11 @@ in description = "Import ZFS pool \"${pool}\""; # we need systemd-udev-settle until https://github.com/zfsonlinux/zfs/pull/4943 is merged requires = [ "systemd-udev-settle.service" ]; - after = [ "systemd-udev-settle.service" "systemd-modules-load.service" ]; + after = [ + "systemd-udev-settle.service" + "systemd-modules-load.service" + "systemd-ask-password-console.service" + ]; wantedBy = (getPoolMounts pool) ++ [ "local-fs.target" ]; before = (getPoolMounts pool) ++ [ "local-fs.target" ]; unitConfig = { @@ -515,7 +517,20 @@ in done poolImported "${pool}" || poolImport "${pool}" # Try one last time, e.g. to import a degraded pool. if poolImported "${pool}"; then - ${optionalString cfgZfs.requestEncryptionCredentials "\"${packages.zfsUser}/sbin/zfs\" load-key -r \"${pool}\""} + ${optionalString cfgZfs.requestEncryptionCredentials '' + ${packages.zfsUser}/sbin/zfs list -rHo name,keylocation ${pool} | while IFS=$'\t' read ds kl; do + (case "$kl" in + none ) + ;; + prompt ) + ${config.systemd.package}/bin/systemd-ask-password "Enter key for $ds:" | ${packages.zfsUser}/sbin/zfs load-key "$ds" + ;; + * ) + ${packages.zfsUser}/sbin/zfs load-key "$ds" + ;; + esac) < /dev/null # To protect while read ds kl in case anything reads stdin + done + ''} echo "Successfully imported ${pool}" else exit 1 diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index debc60a21d0..8f6e76b51c8 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -126,6 +126,7 @@ in grafana = handleTest ./grafana.nix {}; graphite = handleTest ./graphite.nix {}; graylog = handleTest ./graylog.nix {}; + grub = handleTest ./grub.nix {}; gvisor = handleTest ./gvisor.nix {}; hadoop.hdfs = handleTestOn [ "x86_64-linux" ] ./hadoop/hdfs.nix {}; hadoop.yarn = handleTestOn [ "x86_64-linux" ] ./hadoop/yarn.nix {}; diff --git a/nixos/tests/graphite.nix b/nixos/tests/graphite.nix index 71776a94cbd..137be2d89c8 100644 --- a/nixos/tests/graphite.nix +++ b/nixos/tests/graphite.nix @@ -1,11 +1,6 @@ import ./make-test-python.nix ({ pkgs, ... } : { name = "graphite"; - meta = { - # Fails on dependency `python-2.7-Twisted`'s test suite - # complaining `ImportError: No module named zope.interface`. - broken = true; - }; nodes = { one = { ... }: { @@ -21,7 +16,7 @@ import ./make-test-python.nix ({ pkgs, ... } : api = { enable = true; port = 8082; - finders = [ pkgs.python3Packages.influxgraph ]; + finders = [ ]; }; carbon.enableCache = true; seyren.enable = false; # Implicitely requires openssl-1.0.2u which is marked insecure @@ -41,10 +36,14 @@ import ./make-test-python.nix ({ pkgs, ... } : # even if they're still in preStart (which takes quite long for graphiteWeb). # Wait for ports to open so we're sure the services are up and listening. one.wait_for_open_port(8080) + one.wait_for_open_port(8082) one.wait_for_open_port(2003) one.succeed('echo "foo 1 `date +%s`" | nc -N localhost 2003') one.wait_until_succeeds( "curl 'http://localhost:8080/metrics/find/?query=foo&format=treejson' --silent | grep foo >&2" ) + one.wait_until_succeeds( + "curl 'http://localhost:8082/metrics/find/?query=foo&format=treejson' --silent | grep foo >&2" + ) ''; }) diff --git a/nixos/tests/grub.nix b/nixos/tests/grub.nix new file mode 100644 index 00000000000..84bfc90955b --- /dev/null +++ b/nixos/tests/grub.nix @@ -0,0 +1,60 @@ +import ./make-test-python.nix ({ lib, ... }: { + name = "grub"; + + meta = with lib.maintainers; { + maintainers = [ rnhmjoj ]; + }; + + machine = { ... }: { + virtualisation.useBootLoader = true; + + boot.loader.timeout = null; + boot.loader.grub = { + enable = true; + users.alice.password = "supersecret"; + + # OCR is not accurate enough + extraConfig = "serial; terminal_output serial"; + }; + }; + + testScript = '' + def grub_login_as(user, password): + """ + Enters user and password to log into GRUB + """ + machine.wait_for_console_text("Enter username:") + machine.send_chars(user + "\n") + machine.wait_for_console_text("Enter password:") + machine.send_chars(password + "\n") + + + def grub_select_all_configurations(): + """ + Selects "All configurations" from the GRUB menu + to trigger a login request. + """ + machine.send_monitor_command("sendkey down") + machine.send_monitor_command("sendkey ret") + + + machine.start() + + # wait for grub screen + machine.wait_for_console_text("GNU GRUB") + + grub_select_all_configurations() + with subtest("Invalid credentials are rejected"): + grub_login_as("wronguser", "wrongsecret") + machine.wait_for_console_text("error: access denied.") + + grub_select_all_configurations() + with subtest("Valid credentials are accepted"): + grub_login_as("alice", "supersecret") + machine.send_chars("\n") # press enter to boot + machine.wait_for_console_text("Linux version") + + with subtest("Machine boots correctly"): + machine.wait_for_unit("multi-user.target") + ''; +}) diff --git a/nixos/tests/lorri/default.nix b/nixos/tests/lorri/default.nix index 198171082d8..c33c7503993 100644 --- a/nixos/tests/lorri/default.nix +++ b/nixos/tests/lorri/default.nix @@ -18,7 +18,7 @@ import ../make-test-python.nix { machine.wait_until_succeeds("grep --fixed-strings 'ready' lorri.stdout") # Ping the daemon - machine.succeed("lorri internal__ping shell.nix") + machine.succeed("lorri internal ping shell.nix") # Wait for the daemon to finish the build machine.wait_until_succeeds("grep --fixed-strings 'Completed' lorri.stdout") diff --git a/pkgs/applications/audio/aeolus/default.nix b/pkgs/applications/audio/aeolus/default.nix index bfd75b4e75c..c4982025999 100644 --- a/pkgs/applications/audio/aeolus/default.nix +++ b/pkgs/applications/audio/aeolus/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "aeolus"; - version = "0.9.8"; + version = "0.9.9"; src = fetchurl { url = "https://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pname}-${version}.tar.bz2"; - sha256 = "1zfr3567mwbqsfybkhg03n5dvmhllk88c9ayb10qzz2nh6d7g2qn"; + sha256 = "04y1j36y7vc93bv299vfiawbww4ym6q7avfx8vw6rmxr817zrch3"; }; buildInputs = [ diff --git a/pkgs/applications/audio/flacon/default.nix b/pkgs/applications/audio/flacon/default.nix index df563bc3840..aaa0712c42f 100644 --- a/pkgs/applications/audio/flacon/default.nix +++ b/pkgs/applications/audio/flacon/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "flacon"; - version = "6.0.0"; + version = "6.1.0"; src = fetchFromGitHub { owner = "flacon"; repo = "flacon"; rev = "v${version}"; - sha256 = "0p5z6rwckda0lkljrrvx6i90fazj53cxg9pasfmi8154j1z72dj2"; + sha256 = "04yp3aym7h70xjni9ancqv5lc4zds5a8dgw3fzgqs8k5nmh074gv"; }; nativeBuildInputs = [ cmake pkgconfig wrapQtAppsHook ]; diff --git a/pkgs/applications/audio/ft2-clone/default.nix b/pkgs/applications/audio/ft2-clone/default.nix index acf373fc41a..60040119d64 100644 --- a/pkgs/applications/audio/ft2-clone/default.nix +++ b/pkgs/applications/audio/ft2-clone/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "ft2-clone"; - version = "1.25_fix"; + version = "1.26"; src = fetchFromGitHub { owner = "8bitbubsy"; repo = "ft2-clone"; rev = "v${version}"; - sha256 = "0q2mcp3xpgwilmiwzr9nnxlyg9c1kynh6cxzlyd95n520j00s6i7"; + sha256 = "0fqb4415qy2nwjz7ahi43nk795ifswb2b37sc7p5n9m4yc8h53wv"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/audio/giada/default.nix b/pkgs/applications/audio/giada/default.nix index fcf4d0b8652..5934b0746d1 100644 --- a/pkgs/applications/audio/giada/default.nix +++ b/pkgs/applications/audio/giada/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "giada"; - version = "0.16.2.2"; + version = "0.16.3"; src = fetchFromGitHub { owner = "monocasual"; repo = pname; rev = "v${version}"; - sha256 = "0rpg5qmw3b76xcra869shb8fwk5wfzpzw216n96hxa5s6k69cm0p"; + sha256 = "1sysv5d0wq6ib47bqsn3wdzkqzjpzjrgzg15bkllbm67hiz9abhh"; }; configureFlags = [ diff --git a/pkgs/applications/audio/ncspot/default.nix b/pkgs/applications/audio/ncspot/default.nix index bee1065328a..895e673d453 100644 --- a/pkgs/applications/audio/ncspot/default.nix +++ b/pkgs/applications/audio/ncspot/default.nix @@ -14,16 +14,16 @@ let in rustPlatform.buildRustPackage rec { pname = "ncspot"; - version = "0.1.3"; + version = "0.1.4"; src = fetchFromGitHub { owner = "hrkfdn"; repo = "ncspot"; - rev = "v${version}"; - sha256 = "144a7wn5l64fhvj8vgwl7z4bp8lbq0pb0dl38x9y4wkqmdh6wrli"; + rev = version; + sha256 = "02g2lamabkwayhm56498pfvl9g0xx2vsan2j48ssrwjx6rwmlh7n"; }; - cargoSha256 = "19gn0v7j1ly3ywgflfj27pnrwjiiy17m3g1z0kzagxpjy2xi2qxy"; + cargoSha256 = "07gw2az11lpldwpb792l64b7xlarvx77364rn4i8g6a5271zahz3"; cargoBuildFlags = [ "--no-default-features" "--features" "${lib.concatStringsSep "," features}" ]; diff --git a/pkgs/applications/audio/pt2-clone/default.nix b/pkgs/applications/audio/pt2-clone/default.nix index 8121c0caeec..12eb4a39d53 100644 --- a/pkgs/applications/audio/pt2-clone/default.nix +++ b/pkgs/applications/audio/pt2-clone/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "pt2-clone"; - version = "1.19"; + version = "1.20"; src = fetchFromGitHub { owner = "8bitbubsy"; repo = "pt2-clone"; rev = "v${version}"; - sha256 = "0lr8gq4immc5cx1wr5ng6ccxs9afbd2dk6i0n5np25z14dvbvk3k"; + sha256 = "0s4yk8w19qa58n5p558n6m7d5mslr9h9z5q3ayrgqcchdlm8cfky"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/blockchains/ergo/default.nix b/pkgs/applications/blockchains/ergo/default.nix index 29990dae404..e7a83d7496b 100644 --- a/pkgs/applications/blockchains/ergo/default.nix +++ b/pkgs/applications/blockchains/ergo/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ergo"; - version = "3.2.6"; + version = "3.2.7"; src = fetchurl { url = "https://github.com/ergoplatform/ergo/releases/download/v${version}/ergo-${version}.jar"; - sha256 = "1a38j7dy6ax9xvcjbdkiz0z33ln4rlmgrxznvqhdf11j70g1sr6x"; + sha256 = "1ng2q9yp03j8p2xh7rlqad5h4p82ks1l00401pq7m0y02q90szr8"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index a2bf2cbf1de..7d5a2f79585 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -268,12 +268,12 @@ in clion = buildClion rec { name = "clion-${version}"; - version = "2020.1.1"; /* updated by script */ + version = "2020.1.2"; /* updated by script */ description = "C/C++ IDE. New. Intelligent. Cross-platform"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/cpp/CLion-${version}.tar.gz"; - sha256 = "0136hmknkxrsgbygxqzrq1836kg02p14hmv5mzbpp79yglhv2xml"; /* updated by script */ + sha256 = "0q5bnb0rmsgks7brrdpgah83s2ixa4pyhw8jvg9p2g48b582rmf7"; /* updated by script */ }; wmClass = "jetbrains-clion"; update-channel = "CLion RELEASE"; # channel's id as in http://www.jetbrains.com/updates/updates.xml @@ -281,12 +281,12 @@ in datagrip = buildDataGrip rec { name = "datagrip-${version}"; - version = "2020.1.3"; /* updated by script */ + version = "2020.1.5"; /* updated by script */ description = "Your Swiss Army Knife for Databases and SQL"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/datagrip/${name}.tar.gz"; - sha256 = "0ivnicpn67mfyhmiwbx80pq5l2xa4g1cpp79mh7rgm2c5klmf201"; /* updated by script */ + sha256 = "0605d772156lzlz5904px2spdijc92yz6rjvmpyg6vk5zv5k2wm9"; /* updated by script */ }; wmClass = "jetbrains-datagrip"; update-channel = "DataGrip RELEASE"; @@ -294,12 +294,12 @@ in goland = buildGoland rec { name = "goland-${version}"; - version = "2020.1.2"; /* updated by script */ + version = "2020.1.3"; /* updated by script */ description = "Up and Coming Go IDE"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/go/${name}.tar.gz"; - sha256 = "0v6vi6m94fwzsg5s357ymh8604zkv6q0zhyqfh9sj4ynzi7l4fyv"; /* updated by script */ + sha256 = "0pqwj4gc23gf10xqciwndimb4ml7djmx8m5rh52c07m77y4aniyn"; /* updated by script */ }; wmClass = "jetbrains-goland"; update-channel = "GoLand RELEASE"; @@ -307,12 +307,12 @@ in idea-community = buildIdea rec { name = "idea-community-${version}"; - version = "2020.1.1"; /* updated by script */ + version = "2020.1.2"; /* updated by script */ description = "Integrated Development Environment (IDE) by Jetbrains, community edition"; license = stdenv.lib.licenses.asl20; src = fetchurl { url = "https://download.jetbrains.com/idea/ideaIC-${version}.tar.gz"; - sha256 = "0q848swfg9mjiini5bbjdj1f0qpd1n4glxdpncjj7mbpvp7s2h5k"; /* updated by script */ + sha256 = "07gfqyp6blbf7v8p106ngpq7c5p0llcjahi205yg2jgzkhshn7ld"; /* updated by script */ }; wmClass = "jetbrains-idea-ce"; update-channel = "IntelliJ IDEA RELEASE"; @@ -320,12 +320,12 @@ in idea-ultimate = buildIdea rec { name = "idea-ultimate-${version}"; - version = "2020.1.1"; /* updated by script */ + version = "2020.1.2"; /* updated by script */ description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/idea/ideaIU-${version}-no-jbr.tar.gz"; - sha256 = "13khjc7fp28mpcdn74msdw57nzhicg32xrrvj7s7na2qd9gqz0hf"; /* updated by script */ + sha256 = "13qj8n5daz0z0pjizyfsvbbr1gxp5479ar3a68ygi0vrpmbdbssd"; /* updated by script */ }; wmClass = "jetbrains-idea"; update-channel = "IntelliJ IDEA RELEASE"; @@ -346,12 +346,12 @@ in phpstorm = buildPhpStorm rec { name = "phpstorm-${version}"; - version = "2020.1.1"; /* updated by script */ + version = "2020.1.2"; /* updated by script */ description = "Professional IDE for Web and PHP developers"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/webide/PhpStorm-${version}.tar.gz"; - sha256 = "16gclbczd9czqhply0xb2ykv0bw4bgv85fihy1n2szc4rp643qdw"; /* updated by script */ + sha256 = "00c8vlp125j56v9g9d4rc5g4dhgvl1bhi6qrzvpaf6x77jbq4fv4"; /* updated by script */ }; wmClass = "jetbrains-phpstorm"; update-channel = "PhpStorm RELEASE"; @@ -359,12 +359,12 @@ in pycharm-community = buildPycharm rec { name = "pycharm-community-${version}"; - version = "2020.1.1"; /* updated by script */ + version = "2020.1.2"; /* updated by script */ description = "PyCharm Community Edition"; license = stdenv.lib.licenses.asl20; src = fetchurl { url = "https://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "0p2q01yragab7c15aicpmaby075y7mpf6iavdfipi033q4gnlnki"; /* updated by script */ + sha256 = "1s04b9w7sydix1sjqzmby63nwcvzs6iw28wz7441kxgryl9qg0qw"; /* updated by script */ }; wmClass = "jetbrains-pycharm-ce"; update-channel = "PyCharm RELEASE"; @@ -372,12 +372,12 @@ in pycharm-professional = buildPycharm rec { name = "pycharm-professional-${version}"; - version = "2020.1.1"; /* updated by script */ + version = "2020.1.2"; /* updated by script */ description = "PyCharm Professional Edition"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "1lq97aqnibvg483ww7wi8slh302gydd2kdkw6p2516rjcmm6n324"; /* updated by script */ + sha256 = "1ysj00qbn5ik6i5953b9mln4g456fmn3phdln9m5jmcb0126y235"; /* updated by script */ }; wmClass = "jetbrains-pycharm"; update-channel = "PyCharm RELEASE"; @@ -385,12 +385,12 @@ in rider = buildRider rec { name = "rider-${version}"; - version = "2020.1.2"; /* updated by script */ + version = "2020.1.3"; /* updated by script */ description = "A cross-platform .NET IDE based on the IntelliJ platform and ReSharper"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/rider/JetBrains.Rider-${version}.tar.gz"; - sha256 = "0flwq61p7827f8nmldqgfpxbfl422imclksw6w97mgzqqhcbgksd"; /* updated by script */ + sha256 = "1zzkd3b5j3q6jqrvibxz33a4fcm7pgqfx91bqjs615v3499ncng7"; /* updated by script */ }; wmClass = "jetbrains-rider"; update-channel = "Rider RELEASE"; @@ -398,12 +398,12 @@ in ruby-mine = buildRubyMine rec { name = "ruby-mine-${version}"; - version = "2020.1.1"; /* updated by script */ + version = "2020.1.2"; /* updated by script */ description = "The Most Intelligent Ruby and Rails IDE"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/ruby/RubyMine-${version}.tar.gz"; - sha256 = "0xhx3n2xdk0k0qx7hdiyfga16hjf2j95k219wh7mh0cys20hkrg8"; /* updated by script */ + sha256 = "1ycwml7fyhjajjfy1fhggmx0mcdcjidkxll7357rv2z51r0yhc9h"; /* updated by script */ }; wmClass = "jetbrains-rubymine"; update-channel = "RubyMine RELEASE"; @@ -411,12 +411,12 @@ in webstorm = buildWebStorm rec { name = "webstorm-${version}"; - version = "2020.1.1"; /* updated by script */ + version = "2020.1.2"; /* updated by script */ description = "Professional IDE for Web and JavaScript development"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/webstorm/WebStorm-${version}.tar.gz"; - sha256 = "0d543g06bxpw4q2p19vmvrxpbhqsvspjbs3sqnw6hxni7wcflhkg"; /* updated by script */ + sha256 = "1szgiccimfk99z9x1k99lgic6ix81fdahf1k3a88rddl8hhncjwv"; /* updated by script */ }; wmClass = "jetbrains-webstorm"; update-channel = "WebStorm RELEASE"; diff --git a/pkgs/applications/editors/quartus-prime/default.nix b/pkgs/applications/editors/quartus-prime/default.nix index 093635b10e4..7ad2a3247df 100644 --- a/pkgs/applications/editors/quartus-prime/default.nix +++ b/pkgs/applications/editors/quartus-prime/default.nix @@ -24,7 +24,7 @@ let ) deviceIds; quartus = stdenv.mkDerivation rec { - version = "19.1.0.670"; + version = "20.1.0.711"; pname = "quartus-prime-lite-unwrapped"; src = let @@ -34,12 +34,12 @@ let }; hashes = { - "arria_lite" = "1flj9w0vb2p9f9zll136izr6qvmxn0lg72bvaqxs3sxc9vj06wm1"; - "cyclonev" = "0bqxpvjgph0y6slk0jq75mcqzglmqkm0jsx10y9xz5llm6zxzqab"; - "cyclone" = "0pzs8y4s3snxg4g6lrb21qi88abm48g279xzd98qv17qxb2z82rr"; - "cyclone10lp" = "1ccxq8n20y40y47zddkijcv41w3cddvydddr3m4844q31in3nxha"; - "max" = "1cxzbqscxvlcy74dpqmvlnxjyyxfwcx3spygpvpwi6dfj3ipgm2z"; - "max10" = "14k83javivbk65mpb17wdwsyb8xk7x9gzj9x0wnd24mmijrvdy9s"; + "arria_lite" = "09g2knq23h3vj0s5y7hsdnqbbkr3pnv53dzpqcw2lq9mb5zfs9r0"; + "cyclonev" = "05hrpysasyfb7xhxg68spdffxyvxcx0iagibd5jz643b7n6aalpa"; + "cyclone" = "1x3rnwsvzrb5kwdz35sbcabxmcvj8xxpnjlpcjwfc69ybiyr6sgz"; + "cyclone10lp" = "1x6d4hm697mjgzaxixrw5va8anr6ihhx96x2524r6axpwqf6wcja"; + "max" = "060b7v0xh86kkjyiix7akfkzhx2kl1b3q117kp7xibnz6yrzwmy3"; + "max10" = "05840l9pmqa4i1b3ajfaxkqz1hppls556vbq16a42acz2qs2g578"; }; devicePackages = map (id: { @@ -48,10 +48,10 @@ let }) (lib.attrValues supportedDeviceIds); in map require ([{ name = "QuartusLiteSetup-${version}-linux.run"; - sha256 = "15vxvqxqdk29ahlw3lkm1nzxyhzy4626wb9s5f2h6sjgq64r8m7f"; + sha256 = "07ssrv8p8kacal6xd80n4h7l5xz13aw1m1gfqqaxig0ivsj971z5"; } { name = "ModelSimSetup-${version}-linux.run"; - sha256 = "0j1vfr91jclv88nam2plx68arxmz4g50sqb840i60wqd5b0l3y6r"; + sha256 = "0smxasrmr1c8k6hy378knskpjmz4cgpgb35v5jclns0kx68y3c42"; }] ++ devicePackages); nativeBuildInputs = [ unstick ]; @@ -81,9 +81,6 @@ let --disable-components ${lib.concatStringsSep "," disabledComponents} \ --mode unattended --installdir $out --accept_eula 1 - # This patch is from https://wiki.archlinux.org/index.php/Altera_Design_Software - patch --force --strip 0 --directory $out < ${./vsim.patch} - rm -r $out/uninstall $out/logs ''; diff --git a/pkgs/applications/editors/quartus-prime/vsim.patch b/pkgs/applications/editors/quartus-prime/vsim.patch deleted file mode 100644 index 36dc41b7ef1..00000000000 --- a/pkgs/applications/editors/quartus-prime/vsim.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- modelsim_ase/vco 1970-01-01 01:00:01.000000000 +0100 -+++ modelsim_ase/vco 1970-01-01 01:00:01.000000000 +0100 -@@ -207,7 +207,7 @@ - 2.[5-9]*) vco="linux" ;; - 2.[1-9][0-9]*) vco="linux" ;; - 3.[0-9]*) vco="linux" ;; -- *) vco="linux_rh60" ;; -+ *) vco="linux" ;; - esac - if [ ! -x "$dir/$vco/vsim" ]; then - if [ -x "$dir/linuxle/vsim" ]; then diff --git a/pkgs/applications/editors/tiled/default.nix b/pkgs/applications/editors/tiled/default.nix index 07a8e7619b1..20e1427ddef 100644 --- a/pkgs/applications/editors/tiled/default.nix +++ b/pkgs/applications/editors/tiled/default.nix @@ -3,13 +3,13 @@ mkDerivation rec { pname = "tiled"; - version = "1.3.5"; + version = "1.4.1"; src = fetchFromGitHub { owner = "bjorn"; repo = pname; rev = "v${version}"; - sha256 = "0d1bs909vga1k494xnggq1mcjfxjrwa4acc0mj5rv73xqkc9mb2s"; + sha256 = "1x8jymmc56di1c1wxalsp6qhcban2hahn70ndd097b8mx52gckjr"; }; nativeBuildInputs = [ pkgconfig qmake ]; diff --git a/pkgs/applications/graphics/akira/default.nix b/pkgs/applications/graphics/akira/default.nix index adbc1eac379..262c7b11f98 100644 --- a/pkgs/applications/graphics/akira/default.nix +++ b/pkgs/applications/graphics/akira/default.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation rec { pname = "akira"; - version = "2019-10-12"; + version = "2020-05-01"; src = fetchFromGitHub { owner = "akiraux"; repo = "Akira"; - rev = "cab952dee4591b6bde34d670c1f853f5a3ff6b19"; - sha256 = "1fp3a79hkh6xwwqqdrx4zqq2zhsm236c6fhhl5f2nmi108yxz04q"; + rev = "87c495fa0a686b1e9b84aff7d9c0a9553da2c466"; + sha256 = "0ikz6dyx0z2wqskas628hbrbhx3z5gy7i4acrvspfhhg6rk88aqd"; }; nativeBuildInputs = [ @@ -59,8 +59,6 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Dprofile=default" ]; - patches = [ ./fix-build-with-vala-0-44-or-later.patch ]; - postPatch = '' chmod +x build-aux/meson/post_install.py patchShebangs build-aux/meson/post_install.py diff --git a/pkgs/applications/graphics/akira/fix-build-with-vala-0-44-or-later.patch b/pkgs/applications/graphics/akira/fix-build-with-vala-0-44-or-later.patch deleted file mode 100644 index 3c35900c04f..00000000000 --- a/pkgs/applications/graphics/akira/fix-build-with-vala-0-44-or-later.patch +++ /dev/null @@ -1,88 +0,0 @@ -From bcda8fd53f6f232db0b6411269ba108af551629f Mon Sep 17 00:00:00 2001 -From: Alberto Fanjul -Date: Tue, 9 Apr 2019 09:45:36 +0200 -Subject: [PATCH] Build on vala >= 0.44.2 - ---- - src/FileFormat/JsonObject.vala | 2 +- - src/FileFormat/JsonObjectArray.vala | 2 +- - src/FileFormat/ZipArchiveHandler.vala | 18 +++++++++++++++++- - 3 files changed, 19 insertions(+), 3 deletions(-) - -diff --git a/src/FileFormat/JsonObject.vala b/src/FileFormat/JsonObject.vala -index 7bfe46f..805fbad 100644 ---- a/src/FileFormat/JsonObject.vala -+++ b/src/FileFormat/JsonObject.vala -@@ -31,7 +31,7 @@ public abstract class Akira.FileFormat.JsonObject : GLib.Object { - - private ObjectClass obj_class; - -- public JsonObject.from_object (Json.Object object) { -+ protected JsonObject.from_object (Json.Object object) { - Object (object: object); - } - -diff --git a/src/FileFormat/JsonObjectArray.vala b/src/FileFormat/JsonObjectArray.vala -index 4f6e573..d0a7dad 100644 ---- a/src/FileFormat/JsonObjectArray.vala -+++ b/src/FileFormat/JsonObjectArray.vala -@@ -31,7 +31,7 @@ public abstract class Akira.FileFormat.JsonObjectArray : Object { - * - * Your JsonObject implementation should have it's own list of items - */ -- public JsonObjectArray (Json.Object object, string property_name) { -+ protected JsonObjectArray (Json.Object object, string property_name) { - Object (object: object, property_name: property_name); - } - -diff --git a/src/FileFormat/ZipArchiveHandler.vala b/src/FileFormat/ZipArchiveHandler.vala -index ca60dd0..5d65aa2 100644 ---- a/src/FileFormat/ZipArchiveHandler.vala -+++ b/src/FileFormat/ZipArchiveHandler.vala -@@ -262,11 +262,17 @@ public class Akira.FileFormat.ZipArchiveHandler : GLib.Object { - continue; - } - -+ Posix.off_t offset; -+#if VALA_0_42 -+ uint8[] buffer; -+ while (archive.read_data_block (out buffer, out offset) == Archive.Result.OK) { -+ if (extractor.write_data_block (buffer, offset) != Archive.Result.OK) { -+#else - void* buffer = null; - size_t buffer_length; -- Posix.off_t offset; - while (archive.read_data_block (out buffer, out buffer_length, out offset) == Archive.Result.OK) { - if (extractor.write_data_block (buffer, buffer_length, offset) != Archive.Result.OK) { -+#endif - break; - } - } -@@ -316,9 +322,15 @@ public class Akira.FileFormat.ZipArchiveHandler : GLib.Object { - // Add an entry to the archive - Archive.Entry entry = new Archive.Entry (); - entry.set_pathname (initial_folder.get_relative_path (current_file)); -+#if VALA_0_42 -+ entry.set_size ((Archive.int64_t) file_info.get_size ()); -+ entry.set_filetype (Archive.FileType.IFREG); -+ entry.set_perm (Archive.FileType.IFREG); -+#else - entry.set_size (file_info.get_size ()); - entry.set_filetype ((uint) Posix.S_IFREG); - entry.set_perm (0644); -+#endif - - if (archive.write_header (entry) != Archive.Result.OK) { - critical ("Error writing '%s': %s (%d)", current_file.get_path (), archive.error_string (), archive.errno ()); -@@ -333,7 +345,11 @@ public class Akira.FileFormat.ZipArchiveHandler : GLib.Object { - break; - } - -+#if VALA_0_42 -+ archive.write_data (buffer[0:bytes_read]); -+#else - archive.write_data (buffer, bytes_read); -+#endif - } - } - } diff --git a/pkgs/applications/graphics/drawio/default.nix b/pkgs/applications/graphics/drawio/default.nix index 03ecbf3a432..b23c13f85b8 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.3.1"; + version = "13.3.5"; src = fetchurl { url = "https://github.com/jgraph/drawio-desktop/releases/download/v${version}/draw.io-x86_64-${version}.rpm"; - sha256 = "0zvxmqqbgfxad1n9pa4h99l8hys486wziw5yyndxbv1v80p55p0p"; + sha256 = "16pds6sip90davrlrk17a7ms5nh1bs8js5i0hbci1l8gsfyx22i7"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/graphics/pdfcpu/default.nix b/pkgs/applications/graphics/pdfcpu/default.nix index e667f7c0f1a..c03f5f8ed89 100644 --- a/pkgs/applications/graphics/pdfcpu/default.nix +++ b/pkgs/applications/graphics/pdfcpu/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "pdfcpu"; - version = "0.3.3"; + version = "0.3.4"; src = fetchFromGitHub { owner = "pdfcpu"; repo = pname; rev = "v${version}"; - sha256 = "09z4z2csp7ld47q36x2id5zadaihisbnk7bkdvci826hwm8km7sl"; + sha256 = "00c4psgfh4hia144zsdhrq83bw3fqda1ancv2gkn5ymxkbpnpyrn"; }; vendorSha256 = "09alkpfyxapycv6zsaz7prgbr0a1jzd78n7w2mh01mg4hhb2j3k7"; diff --git a/pkgs/applications/graphics/processing/default.nix b/pkgs/applications/graphics/processing/default.nix index cad6a35ce3f..de5ae4fcbfd 100644 --- a/pkgs/applications/graphics/processing/default.nix +++ b/pkgs/applications/graphics/processing/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "processing"; - version = "3.5.3"; + version = "3.5.4"; src = fetchFromGitHub { owner = "processing"; repo = "processing"; - rev = "processing-0269-${version}"; - sha256 = "0ajniy3a0i0rx7is46r85yh3ah4zm4ra1gbllmihw9pmnfjgfajn"; + rev = "processing-0270-${version}"; + sha256 = "0cvv8jda9y8qnfcsziasyv3w7h3w22q78ihr23cm4an63ghxci58"; }; nativeBuildInputs = [ ant rsync makeWrapper ]; @@ -22,8 +22,10 @@ stdenv.mkDerivation rec { # do not download a file during build ${xmlstarlet}/bin/xmlstarlet ed --inplace -P -d '//get[@src="http://download.processing.org/reference.zip"]' build/build.xml install -D -m0444 ${fetchurl { - url = "http://download.processing.org/reference.zip"; - sha256 = "198bpk8mzns6w5h0zdf50wr6iv7sgdi6v7jznj5rbsnpgyilxz35"; + # Use archive.org link for reproducibility until the following issue is fixed: + # https://github.com/processing/processing/issues/5711 + url = "https://web.archive.org/web/20200406132357/https://download.processing.org/reference.zip"; + sha256 = "093hc7kc9wfxqgf5dzfmfp68pbsy8x647cj0a25vgjm1swi61zbi"; } } ./java/reference.zip diff --git a/pkgs/applications/kde/kdenlive.nix b/pkgs/applications/kde/kdenlive.nix index 95496f90e04..e011a5652c5 100644 --- a/pkgs/applications/kde/kdenlive.nix +++ b/pkgs/applications/kde/kdenlive.nix @@ -31,6 +31,7 @@ , rttr , kpurpose , kdeclarative +, wrapGAppsHook }: mkDerivation { @@ -69,6 +70,7 @@ mkDerivation { rttr kpurpose kdeclarative + wrapGAppsHook ]; # Both MLT and FFMpeg paths must be set or Kdenlive will complain that it # doesn't find them. See: diff --git a/pkgs/applications/misc/ArchiSteamFarm/default.nix b/pkgs/applications/misc/ArchiSteamFarm/default.nix index 6201d881a88..71404e73547 100644 --- a/pkgs/applications/misc/ArchiSteamFarm/default.nix +++ b/pkgs/applications/misc/ArchiSteamFarm/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ArchiSteamFarm"; - version = "4.2.2.1"; + version = "4.2.3.3"; src = fetchurl { url = "https://github.com/JustArchiNET/ArchiSteamFarm/releases/download/${version}/ASF-generic.zip"; - sha256 = "0pr9rrhi44yl99c2i12rimmc4mhbh0ma9jn17cgsh8p0kbj8sq94"; + sha256 = "0v69rrs5fr1n5llfx42xkiish52al7kb36fjy3ng0j9qfp3g8pj7"; }; nativeBuildInputs = [ unzip makeWrapper jq ]; diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index bf2a89ade55..232ab1b2df0 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -17,11 +17,11 @@ let python = python3Packages.python; in stdenv.mkDerivation rec { pname = "blender"; - version = "2.83.0"; + version = "2.83.1"; src = fetchurl { url = "https://download.blender.org/source/${pname}-${version}.tar.xz"; - sha256 = "07rzm4xaj94pjxy2vlqfhi1adsqpshfkrzrq8kljmcbnw22vrqhl"; + sha256 = "1kd74nzqvpcpsb4lghnjj9z3ps93lzqbhkv3lp5p79rqs8y64i23"; }; patches = lib.optional stdenv.isDarwin ./darwin.patch; @@ -57,6 +57,10 @@ stdenv.mkDerivation rec { --replace '${"$"}{LIBDIR}/python' \ '${python}' substituteInPlace build_files/cmake/platform/platform_apple.cmake \ + --replace 'set(PYTHON_VERSION 3.7)' \ + 'set(PYTHON_VERSION ${python.pythonVersion})' \ + --replace '${"$"}{PYTHON_VERSION}m' \ + '${"$"}{PYTHON_VERSION}' \ --replace '${"$"}{LIBDIR}/python' \ '${python}' \ --replace '${"$"}{LIBDIR}/opencollada' \ diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index ff39eccf4f8..a6bfc04c308 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -30,11 +30,11 @@ let in mkDerivation rec { pname = "calibre"; - version = "4.17.0"; + version = "4.19.0"; src = fetchurl { url = "https://download.calibre-ebook.com/${version}/${pname}-${version}.tar.xz"; - sha256 = "1qgzx2q8a5g102z311ibz4aw1ipn2j1lbndgadig7xvy6zdhknma"; + sha256 = "1kpj65spwr9m88vshsljpdrw5jy7bbpqgqcrvqb17abh7fnnrb4x"; }; patches = [ diff --git a/pkgs/applications/misc/cherrytree/default.nix b/pkgs/applications/misc/cherrytree/default.nix index d2ade055d6f..c74ac5ffb30 100644 --- a/pkgs/applications/misc/cherrytree/default.nix +++ b/pkgs/applications/misc/cherrytree/default.nix @@ -2,13 +2,13 @@ pythonPackages.buildPythonApplication rec { pname = "cherrytree"; - version = "0.39.3"; + version = "0.39.4"; src = fetchFromGitHub { owner = "giuspen"; repo = "cherrytree"; rev = version; - sha256 = "1k9i7acpphx0if6ij2p9fkmj638ry6hcyr1rdr039a8zi8hq98gz"; + sha256 = "1wycgn1f3b858qb6kn2bsaabak8n52qkpd24w54xz6fjizlnw7x0"; }; diff --git a/pkgs/applications/misc/clight/clightd.nix b/pkgs/applications/misc/clight/clightd.nix index c5083f2379c..c06d00ebb52 100644 --- a/pkgs/applications/misc/clight/clightd.nix +++ b/pkgs/applications/misc/clight/clightd.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "clightd"; - version = "4.1"; + version = "4.2"; src = fetchFromGitHub { owner = "FedeDP"; repo = "Clightd"; rev = version; - sha256 = "0pqnn52nn22k49f5cw4jcr8vcbff28n56i8fizg1mmfshy8pn891"; + sha256 = "07z1m1x7nnczd51sg7m2lb6rb2c37c8glsnbrlq44hx176sj9cmj"; }; # dbus-1.pc has datadir=/etc diff --git a/pkgs/applications/misc/ddcui/default.nix b/pkgs/applications/misc/ddcui/default.nix index 35c94038efc..1ec288c678a 100644 --- a/pkgs/applications/misc/ddcui/default.nix +++ b/pkgs/applications/misc/ddcui/default.nix @@ -10,13 +10,13 @@ mkDerivation rec { pname = "ddcui"; - version = "0.1.1"; + version = "0.1.2"; src = fetchFromGitHub { owner = "rockowitz"; repo = "ddcui"; rev = "v${version}"; - sha256 = "02qr7i3pdq8p6lnhwihfgd9b7y9zwpdk6gwv626rz32ai6mfrfhl"; + sha256 = "0myma1zw6dlygv3xbin662d91zcnwss10syf12q2fppkrd8qdgqf"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/gpsbabel/default.nix b/pkgs/applications/misc/gpsbabel/default.nix index ef4c732ef52..1915b2dae17 100644 --- a/pkgs/applications/misc/gpsbabel/default.nix +++ b/pkgs/applications/misc/gpsbabel/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, zlib, which, IOKit, qtbase }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, zlib, which, IOKit, qtbase, libusb-compat-0_1 }: stdenv.mkDerivation rec { pname = "gpsbabel"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { }) ]; - buildInputs = [ zlib qtbase which ] + buildInputs = [ zlib qtbase which libusb-compat-0_1 ] ++ lib.optionals stdenv.isDarwin [ IOKit ]; /* FIXME: Building the documentation, with "make doc", requires this: diff --git a/pkgs/applications/misc/gpxsee/default.nix b/pkgs/applications/misc/gpxsee/default.nix index b3dbecb56b1..9ee3b96a5bb 100644 --- a/pkgs/applications/misc/gpxsee/default.nix +++ b/pkgs/applications/misc/gpxsee/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "gpxsee"; - version = "7.30"; + version = "7.31"; src = fetchFromGitHub { owner = "tumic0"; repo = "GPXSee"; rev = version; - sha256 = "09gajwqc30r9a2sn972qdx3gx0gki9n0zafq986hn6zsr3z43mfs"; + sha256 = "0y60h66p8ydkinxk9x4sp4cm6gq66nc9jcavy135vmycsiq9gphn"; }; patches = [ diff --git a/pkgs/applications/misc/heimer/default.nix b/pkgs/applications/misc/heimer/default.nix index 7709a42baee..1626fc440e9 100644 --- a/pkgs/applications/misc/heimer/default.nix +++ b/pkgs/applications/misc/heimer/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "heimer"; - version = "1.17.0"; + version = "1.18.0"; src = fetchFromGitHub { owner = "juzzlin"; repo = pname; rev = version; - sha256 = "1sxdi1an9x62q9vwv7r2761my4dva6nc63n9861swxjjk18hmmar"; + sha256 = "16p18svfcp201gd624wzmf0gpdvywybxp8539igin6s70k6rpc97"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/misc/minder/default.nix b/pkgs/applications/misc/minder/default.nix index 28157d61537..f391c3621a1 100644 --- a/pkgs/applications/misc/minder/default.nix +++ b/pkgs/applications/misc/minder/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "minder"; - version = "1.8.0"; + version = "1.9.0"; src = fetchFromGitHub { owner = "phase1geo"; repo = pname; rev = version; - sha256 = "13klasvrndwsmpcxkgy7kvsl2jqmp2cl52vb4i0hk18lr004scgy"; + sha256 = "1j3jk76rd0sc9sd9zrd24q3636559wd809yfnb9bv5jmvn9s1bkz"; }; nativeBuildInputs = [ pkgconfig meson ninja python3 wrapGAppsHook vala shared-mime-info ]; diff --git a/pkgs/applications/misc/nimmm/default.nix b/pkgs/applications/misc/nimmm/default.nix new file mode 100644 index 00000000000..16400d76f64 --- /dev/null +++ b/pkgs/applications/misc/nimmm/default.nix @@ -0,0 +1,57 @@ +{ stdenv, fetchFromGitHub, nim, termbox, pcre }: + +let + noise = fetchFromGitHub { + owner = "jangko"; + repo = "nim-noise"; + rev = "db1e86e312413e4348fa82c02340784316a89cc1"; + sha256 = "0n9l2dww5smrsl1xfqxjnxz3f1srb72lc1wl3pdvs6xfyf44qzlh"; + }; + + nimbox = fetchFromGitHub { + owner = "dom96"; + repo = "nimbox"; + rev = "6a56e76c01481176f16ae29b7d7c526bd83f229b"; + sha256 = "15x1sdfxa1xcqnr68705jfnlv83lm0xnp2z9iz3pgc4bz5vwn4x1"; + }; + + lscolors = fetchFromGitHub { + owner = "joachimschmidt557"; + repo = "nim-lscolors"; + rev = "v0.3.3"; + sha256 = "0526hqh46lcfsvymb67ldsc8xbfn24vicn3b8wrqnh6mag8wynf4"; + }; + +in stdenv.mkDerivation rec { + pname = "nimmm"; + version = "0.1.2"; + + src = fetchFromGitHub { + owner = "joachimschmidt557"; + repo = "nimmm"; + rev = "v${version}"; + sha256 = "1zpq181iz6g7yfi298gjwv33b89l4fpnkjprimykah7py5cpw67w"; + }; + + nativeBuildInputs = [ nim ]; + buildInputs = [ termbox pcre ]; + + NIX_LDFLAGS = "-lpcre"; + + buildPhase = '' + export HOME=$TMPDIR; + nim -p:${noise} -p:${nimbox} -p:${lscolors}/src c -d:release src/nimmm.nim + ''; + + installPhase = '' + install -Dt $out/bin src/nimmm + ''; + + meta = with stdenv.lib; { + description = "Terminal file manager written in nim"; + homepage = "https://github.com/joachimschmidt557/nimmm"; + license = licenses.gpl3; + platforms = platforms.unix; + maintainers = [ maintainers.joachimschmidt557 ]; + }; +} diff --git a/pkgs/applications/misc/pueue/default.nix b/pkgs/applications/misc/pueue/default.nix index db84f5fbb9b..1294ca6dcf4 100644 --- a/pkgs/applications/misc/pueue/default.nix +++ b/pkgs/applications/misc/pueue/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "pueue"; - version = "0.6.0"; + version = "0.6.1"; src = fetchFromGitHub { owner = "Nukesor"; repo = pname; rev = "v${version}"; - sha256 = "06jxj89ya91grrwxfs7l1ahy46y993kxsc8gpkxajc0j5ihax2al"; + sha256 = "0x8slqxpnk4pis834g11wzp8fqsxwhdf0xnssz1pkkww4dqzali0"; }; - cargoSha256 = "191j3lpd24ycissw0y2hv65i1cjzf24draamq3sxv7hv0sxcjw4d"; + cargoSha256 = "0r110zlzpzg0j5cq9zg0kk46qigp6bzd0kzmpx3ddvhblhxvq5m5"; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/misc/remarkable/rmapi/default.nix b/pkgs/applications/misc/remarkable/rmapi/default.nix index 0fe0e03060a..90e99b5adf8 100644 --- a/pkgs/applications/misc/remarkable/rmapi/default.nix +++ b/pkgs/applications/misc/remarkable/rmapi/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "rmapi"; - version = "0.0.11"; + version = "0.0.12"; src = fetchFromGitHub { owner = "juruen"; repo = "rmapi"; rev = "v${version}"; - sha256 = "0zks1pcj2s2pqkmw0hhm41vgdhfgj2r6dmvpsagbmf64578ww349"; + sha256 = "049m0p4wbsl822iym8xmc938d4k90iw7wjdzcxfyy8d27hv9mp45"; }; vendorSha256 = "077s13pcql5w2m6wzls1q06r7p501kazbwzxgfh6akwza15kb4is"; diff --git a/pkgs/applications/misc/sequeler/default.nix b/pkgs/applications/misc/sequeler/default.nix index 04ceed63543..6f43774a128 100644 --- a/pkgs/applications/misc/sequeler/default.nix +++ b/pkgs/applications/misc/sequeler/default.nix @@ -11,13 +11,13 @@ let in stdenv.mkDerivation rec { pname = "sequeler"; - version = "0.7.91"; + version = "0.8.0"; src = fetchFromGitHub { owner = "Alecaddd"; repo = pname; rev = "v${version}"; - sha256 = "071vfx7bdf7hfa4784xz97vrj9x5aipgjbp30r00kg2zhg8wa2ls"; + sha256 = "090plqnby2wxzr1waq5kz89w3269j363mgxwfz9g7qg55lddaahz"; }; nativeBuildInputs = [ meson ninja pkgconfig vala gettext wrapGAppsHook python3 desktop-file-utils ]; diff --git a/pkgs/applications/misc/simplenote/default.nix b/pkgs/applications/misc/simplenote/default.nix index 917e1965e2e..7cc5bc6eb7f 100644 --- a/pkgs/applications/misc/simplenote/default.nix +++ b/pkgs/applications/misc/simplenote/default.nix @@ -16,10 +16,10 @@ let pname = "simplenote"; - version = "1.17.0"; + version = "1.19.0"; sha256 = { - x86_64-linux = "14kjx4y3kvw7h8wk8mmkpx1288jscmd8bgl10bw6kcfigcwahpw3"; + x86_64-linux = "1bvg8xlf2y9nz7dzs5jkr5b48hwmvhvb6m4ia1fyvnqqq46nz9wb"; }.${system} or throwSystem; meta = with stdenv.lib; { diff --git a/pkgs/applications/misc/tint2/default.nix b/pkgs/applications/misc/tint2/default.nix index dc991402eec..326dd3c0d92 100644 --- a/pkgs/applications/misc/tint2/default.nix +++ b/pkgs/applications/misc/tint2/default.nix @@ -1,7 +1,25 @@ -{ stdenv, fetchFromGitLab, pkgconfig, cmake, gettext, cairo, pango, pcre -, glib, imlib2, gtk2, libXinerama, libXrender, libXcomposite, libXdamage -, libX11, libXrandr, librsvg, libpthreadstubs, libXdmcp -, libstartup_notification, wrapGAppsHook +{ stdenv +, fetchFromGitLab +, pkg-config +, cmake +, gettext +, cairo +, pango +, pcre +, glib +, imlib2 +, gtk2 +, libXinerama +, libXrender +, libXcomposite +, libXdamage +, libX11 +, libXrandr +, librsvg +, libpthreadstubs +, libXdmcp +, libstartup_notification +, wrapGAppsHook }: stdenv.mkDerivation rec { @@ -15,13 +33,35 @@ stdenv.mkDerivation rec { sha256 = "1937z0kixb6r82izj12jy4x8z4n96dfq1hx05vcsvsg1sx3wxgb0"; }; - enableParallelBuilding = true; + nativeBuildInputs = [ + pkg-config + cmake + gettext + wrapGAppsHook + ]; - nativeBuildInputs = [ pkgconfig cmake gettext wrapGAppsHook ]; + buildInputs = [ + cairo + pango + pcre + glib + imlib2 + gtk2 + libXinerama + libXrender + libXcomposite + libXdamage + libX11 + libXrandr + librsvg + libpthreadstubs + libXdmcp + libstartup_notification + ]; - buildInputs = [ cairo pango pcre glib imlib2 gtk2 libXinerama libXrender - libXcomposite libXdamage libX11 libXrandr librsvg libpthreadstubs - libXdmcp libstartup_notification ]; + cmakeFlags = [ + "-Ddocdir=share/doc/${pname}" + ]; postPatch = '' for f in ./src/launcher/apps-common.c \ diff --git a/pkgs/applications/misc/toot/default.nix b/pkgs/applications/misc/toot/default.nix index 5ce35f3292b..f46af56ed45 100644 --- a/pkgs/applications/misc/toot/default.nix +++ b/pkgs/applications/misc/toot/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, python3Packages }: python3Packages.buildPythonApplication rec { - version = "0.26.0"; + version = "0.27.0"; name = "toot-${version}"; src = fetchFromGitHub { owner = "ihabunek"; repo = "toot"; rev = version; - sha256 = "146jj83jixahgxwh12bbkfvci2wrz398h5x01kgppdy59m4pa4pl"; + sha256 = "197g9lvwg8qnsf18kifcqdj3cpfdnxz9vay766rn9bi4nfz0s6j2"; }; checkInputs = with python3Packages; [ pytest ]; @@ -23,7 +23,7 @@ python3Packages.buildPythonApplication rec { meta = with stdenv.lib; { description = "Mastodon CLI interface"; homepage = "https://github.com/ihabunek/toot"; - license = licenses.mit; + license = licenses.gpl3; maintainers = [ maintainers.matthiasbeyer ]; }; diff --git a/pkgs/applications/misc/tut/default.nix b/pkgs/applications/misc/tut/default.nix index 7b9efb6bbe5..4ff3a06e0b4 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.9"; + version = "0.0.10"; goPackagePath = "github.com/RasmusLindroth/tut"; goDeps = ./deps.nix; @@ -11,7 +11,7 @@ buildGoPackage rec { owner = "RasmusLindroth"; repo = pname; rev = version; - sha256 = "19y6brw1d6dlp2gnkdpbp261662h5j46rmiqg73cxhrlws0y0kfk"; + sha256 = "09l6dmzrvcpix3wg4djs6zk3ql6b6lfhd8z9aglbi6fix4pm8565"; }; meta = with stdenv.lib; { diff --git a/pkgs/applications/misc/ulauncher/default.nix b/pkgs/applications/misc/ulauncher/default.nix index 34ca82b8d04..a9713ffed38 100644 --- a/pkgs/applications/misc/ulauncher/default.nix +++ b/pkgs/applications/misc/ulauncher/default.nix @@ -19,13 +19,13 @@ python3Packages.buildPythonApplication rec { pname = "ulauncher"; - version = "5.7.3"; + version = "5.8.0"; disabled = python3Packages.isPy27; src = fetchurl { url = "https://github.com/Ulauncher/Ulauncher/releases/download/${version}/ulauncher_${version}.tar.gz"; - sha256 = "0wq2zsq3496fjfg89q01dsm7sb7kv92sycvqm6ad8z1z2kpisrbh"; + sha256 = "1czxzcxix9iwv1sir1q64j5aavc7lzjjwqpisgdc1kidkwnk05zp"; }; nativeBuildInputs = with python3Packages; [ diff --git a/pkgs/applications/networking/cluster/cni/default.nix b/pkgs/applications/networking/cluster/cni/default.nix index 49d3aaa298d..5bbd1014125 100644 --- a/pkgs/applications/networking/cluster/cni/default.nix +++ b/pkgs/applications/networking/cluster/cni/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "cni"; - version = "0.7.1"; + version = "0.8.0"; src = fetchFromGitHub { owner = "containernetworking"; repo = pname; rev = "v${version}"; - sha256 = "02qn1br8164d99978acalisy1sx294g1axnii4yh1wji0fc735xz"; + sha256 = "16i59dhiq7pc7qs32cdk4yv4w9rjx4vvlw7fb6a6jhq6hxxjrgiw"; }; goPackagePath = "github.com/containernetworking/cni"; diff --git a/pkgs/applications/networking/cluster/kube-router/default.nix b/pkgs/applications/networking/cluster/kube-router/default.nix index cd946284fa7..c51e62b30b9 100644 --- a/pkgs/applications/networking/cluster/kube-router/default.nix +++ b/pkgs/applications/networking/cluster/kube-router/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "kube-router"; - version = "0.4.0"; + version = "1.0.0"; goPackagePath = "github.com/cloudnativelabs/kube-router"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "cloudnativelabs"; repo = pname; rev = "v${version}"; - sha256 = "1g1y3l87a4il9g2yrl1ryx8xfd4x220azxhr3rxm5l9vhnnjwswa"; + sha256 = "0b6rsiq3pwp7wknmblgd8kszh9bd7nhvlsnyyamqnhlfjl97929x"; }; buildFlagsArray = '' diff --git a/pkgs/applications/networking/cluster/kubeless/default.nix b/pkgs/applications/networking/cluster/kubeless/default.nix index 5b1f1245246..6f6c8dc338b 100644 --- a/pkgs/applications/networking/cluster/kubeless/default.nix +++ b/pkgs/applications/networking/cluster/kubeless/default.nix @@ -1,22 +1,31 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub, installShellFiles }: buildGoPackage rec { pname = "kubeless"; - version = "1.0.6"; + version = "1.0.7"; src = fetchFromGitHub { owner = "kubeless"; repo = "kubeless"; rev = "v${version}"; - sha256 = "1fcdyd1jf0yibfx9jc16m0vmazm2jymps92llh3vh5zqd36bxbyd"; + sha256 = "0x2hydywnnlh6arzz71p7gg9yzq5z2y2lppn1jszvkbgh11kkqfr"; }; goPackagePath = "github.com/kubeless/kubeless"; + nativeBuildInputs = [ installShellFiles ]; + subPackages = [ "cmd/kubeless" ]; buildFlagsArray = '' - -ldflags=-X github.com/kubeless/kubeless/pkg/version.Version=${version} + -ldflags=-s -w -X github.com/kubeless/kubeless/pkg/version.Version=${version} + ''; + + postInstall = '' + for shell in bash; do + $out/bin/kubeless completion $shell > kubeless.$shell + installShellCompletion kubeless.$shell + done ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/networking/cluster/qbec/default.nix b/pkgs/applications/networking/cluster/qbec/default.nix index 4118d25d4f7..c75e48d97db 100644 --- a/pkgs/applications/networking/cluster/qbec/default.nix +++ b/pkgs/applications/networking/cluster/qbec/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "qbec"; - version = "0.12.0"; + version = "0.12.1"; src = fetchFromGitHub { owner = "splunk"; repo = "qbec"; rev = "v${version}"; - sha256 = "0vy1cqqyga68qjbvyhsgl281qkbsvhvmwbxc93hygsxzm9kczy4p"; + sha256 = "1g90z155nhcblr48qypw8qw3l8g4dz33iflv4cg4xrhwjp8dfbv9"; }; vendorSha256 = "15hbjghi2ifylg7nr85qlk0alsy97h9zj6hf5w84m76dla2bcjf3"; diff --git a/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix b/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix index 0a41c9666b6..74406f217a2 100644 --- a/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix @@ -43,18 +43,18 @@ let in stdenv.mkDerivation rec { pname = "mattermost-desktop"; - version = "4.3.1"; + version = "4.5.0"; src = if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { url = "https://releases.mattermost.com/desktop/${version}/${pname}-${version}-linux-x64.tar.gz"; - sha256 = "076nv5h6xscbw1987az00x493qhqgrli87gnn57zbvz0acgvlhfv"; + sha256 = "1p44vxs7i9f15h4xjyr99g8x73qygv909a32lfkqip1fh8lk7sf4"; } else if stdenv.hostPlatform.system == "i686-linux" then fetchurl { url = "https://releases.mattermost.com/desktop/${version}/${pname}-${version}-linux-ia32.tar.gz"; - sha256 = "19ps9g8j6kp4haj6r3yfy4ma2wm6isq5fa8zlcz6g042ajkqq0ij"; + sha256 = "03pn853z2famqxcsrwayqb94pzghlpfb0qs2nfi8mc5zzsgcic7z"; } else throw "Mattermost-Desktop is not currently supported on ${stdenv.hostPlatform.system}"; diff --git a/pkgs/applications/networking/instant-messengers/pidgin/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/default.nix index 369ae069324..a269eead708 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchurl, makeWrapper, pkgconfig, gtk2, gtkspell2, aspell +{ stdenv, fetchurl, makeWrapper, pkgconfig, gtk2, gtk2-x11 +, gtkspell2, aspell , gst_all_1, startupnotification, gettext , perlPackages, libxml2, nss, nspr, farstream , libXScrnSaver, ncurses, avahi, dbus, dbus-glib, intltool, libidn @@ -29,19 +30,24 @@ let unwrapped = stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-I${gst_all_1.gst-plugins-base.dev}/include/gstreamer-1.0"; buildInputs = [ - gtkspell2 aspell startupnotification + aspell startupnotification gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good - libxml2 nss nspr farstream + libxml2 nss nspr libXScrnSaver ncurses python avahi dbus dbus-glib intltool libidn libICE libXext libSM cyrus_sasl ] ++ (lib.optional (openssl != null) openssl) ++ (lib.optional (gnutls != null) gnutls) - ++ (lib.optional (libgcrypt != null) libgcrypt); + ++ (lib.optional (libgcrypt != null) libgcrypt) + ++ (lib.optionals (stdenv.isLinux) [gtk2 gtkspell2 farstream]) + ++ (lib.optional (stdenv.isDarwin) gtk2-x11); - propagatedBuildInputs = [ pkgconfig gtk2 gettext ] - ++ (with perlPackages; [ perl XMLParser ]); + + propagatedBuildInputs = [ pkgconfig gettext ] + ++ (with perlPackages; [ perl XMLParser ]) + ++ (lib.optional (stdenv.isLinux) gtk2) + ++ (lib.optional (stdenv.isDarwin) gtk2-x11); patches = [ ./pidgin-makefile.patch ./add-search-path.patch ]; @@ -56,7 +62,8 @@ let unwrapped = stdenv.mkDerivation rec { "--disable-tcl" ] ++ (lib.optionals (cyrus_sasl != null) [ "--enable-cyrus-sasl=yes" ]) - ++ (lib.optionals (gnutls != null) ["--enable-gnutls=yes" "--enable-nss=no"]); + ++ (lib.optionals (gnutls != null) ["--enable-gnutls=yes" "--enable-nss=no"]) + ++ (lib.optionals (stdenv.isDarwin) ["--disable-gtkspell" "--disable-vv"]); enableParallelBuilding = true; @@ -69,7 +76,7 @@ let unwrapped = stdenv.mkDerivation rec { description = "Multi-protocol instant messaging client"; homepage = "http://pidgin.im"; license = licenses.gpl2Plus; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = [ maintainers.vcunat ]; }; }; diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json b/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json index 6280bfdf4c7..f3e7732686f 100644 --- a/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json +++ b/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json @@ -2,7 +2,7 @@ "name": "riot-desktop", "productName": "Riot", "main": "src/electron-main.js", - "version": "1.6.6", + "version": "1.6.7", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": { diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix b/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix index 72ec6e83ca6..42f8ce60fd3 100644 --- a/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix +++ b/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix @@ -8,12 +8,12 @@ let executableName = "riot-desktop"; - version = "1.6.6"; + version = "1.6.7"; src = fetchFromGitHub { owner = "vector-im"; repo = "riot-desktop"; rev = "v${version}"; - sha256 = "0yrybi6cv3lj0fq4ab4rzjm9l4flfw97hkwzlp7zzixb3z9h09h8"; + sha256 = "0l1ih7rkb0nnc79607kkg0k69j9kwqrczhgkqzsmvqxjz7pk9kgn"; }; electron = electron_7; diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix index 86aa4c92766..23e17f96168 100644 --- a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix +++ b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix @@ -12,11 +12,11 @@ let in stdenv.mkDerivation rec { pname = "riot-web"; - version = "1.6.6"; + version = "1.6.7"; src = fetchurl { url = "https://github.com/vector-im/riot-web/releases/download/v${version}/riot-v${version}.tar.gz"; - sha256 = "0j88wcha5rr6qaxik4m90v9mgfcj3r9nb4gpd2dzi7m1zf7kivkw"; + sha256 = "14g5rbvcw6p0q50slbf0c7s39i54ggv2cjc5iv93yvfrwn3z0f8p"; }; installPhase = '' diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix index e82fbc7bebc..6b00ebc3444 100644 --- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix +++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix @@ -15,11 +15,11 @@ assert pulseaudioSupport -> libpulseaudio != null; let inherit (stdenv.lib) concatStringsSep makeBinPath optional; - version = "5.1.412382.0614"; + version = "5.1.418436.0628"; srcs = { x86_64-linux = fetchurl { url = "https://zoom.us/client/${version}/zoom_x86_64.tar.xz"; - sha256 = "07xb3v5i08wq0a3my9id91gizsxj5ppqvxmcbdy04j7yn4i1jm9x"; + sha256 = "0qgjsc6880i5zn4ck57haidcq40w37sjpdrix4gf09986qcc8gmm"; }; }; diff --git a/pkgs/applications/networking/owncloud-client/default.nix b/pkgs/applications/networking/owncloud-client/default.nix index 3fc9fedc413..a487da6f5ad 100644 --- a/pkgs/applications/networking/owncloud-client/default.nix +++ b/pkgs/applications/networking/owncloud-client/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, mkDerivation, cmake, pkgconfig, qtbase, qtkeychain, sqlite }: +{ lib, stdenv, fetchurl, mkDerivation, cmake, pkgconfig, qtbase, qtkeychain, sqlite, libsecret }: mkDerivation rec { pname = "owncloud-client"; @@ -12,6 +12,10 @@ mkDerivation rec { nativeBuildInputs = [ pkgconfig cmake ]; buildInputs = [ qtbase qtkeychain sqlite ]; + qtWrapperArgs = [ + "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libsecret ]}" + ]; + cmakeFlags = [ "-UCMAKE_INSTALL_LIBDIR" "-DNO_SHIBBOLETH=1" diff --git a/pkgs/applications/networking/protonvpn-cli-ng/default.nix b/pkgs/applications/networking/protonvpn-cli-ng/default.nix index e62bc21ab5b..e2870c58e97 100644 --- a/pkgs/applications/networking/protonvpn-cli-ng/default.nix +++ b/pkgs/applications/networking/protonvpn-cli-ng/default.nix @@ -2,19 +2,20 @@ python3Packages.buildPythonApplication rec { pname = "protonvpn-cli-ng"; - version = "2.2.2"; + version = "2.2.4"; src = fetchFromGitHub { owner = "protonvpn"; repo = "${pname}"; rev = "v${version}"; - sha256 = "0ixjb02kj4z79whm1izd8mrn2h0rp9cmw4im1qvp93rahqxdd4n8"; + sha256 = "08yca0a0prrnrc7ir7ajd56yxvxpcs4m1k8f5kf273f5whgr7wzw"; }; propagatedBuildInputs = (with python3Packages; [ requests docopt setuptools + jinja2 pythondialog ]) ++ [ dialog diff --git a/pkgs/applications/networking/sync/rclone/default.nix b/pkgs/applications/networking/sync/rclone/default.nix index b2ad47e9b4b..bfbe32fba48 100644 --- a/pkgs/applications/networking/sync/rclone/default.nix +++ b/pkgs/applications/networking/sync/rclone/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "rclone"; - version = "1.52.1"; + version = "1.52.2"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "1v91c3wydpixi0p0afclp4baxchigy3czlm1mq9hn6cw973z6spf"; + sha256 = "1da6azr4j5sbzb5xpy2xk4vqi6bdpmzlq3pxrmakaskicz64nnld"; }; goPackagePath = "github.com/rclone/rclone"; diff --git a/pkgs/applications/office/atlassian-cli/default.nix b/pkgs/applications/office/atlassian-cli/default.nix index 22eee857b20..3cc62aa9dc1 100644 --- a/pkgs/applications/office/atlassian-cli/default.nix +++ b/pkgs/applications/office/atlassian-cli/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "atlassian-cli"; - version = "9.2.0"; + version = "9.3.0"; src = fetchzip { url = "https://bobswift.atlassian.net/wiki/download/attachments/16285777/${pname}-${version}-distribution.zip"; - sha256 = "0rdnbx3zfz3lpgka7bb8jzapkr81l2yvgsbmn8hrhva5k61xwx3d"; + sha256 = "1gsyxkkx04vhp8ii0xbln5h8wa8x3dj6xhh2fyjs4z0bil4hlf06"; extraPostFetch = "chmod go-w $out"; }; diff --git a/pkgs/applications/office/espanso/default.nix b/pkgs/applications/office/espanso/default.nix new file mode 100644 index 00000000000..8fb9b3c7878 --- /dev/null +++ b/pkgs/applications/office/espanso/default.nix @@ -0,0 +1,56 @@ +{ stdenv +, fetchFromGitHub +, rustPlatform +, pkgconfig +, extra-cmake-modules +, libX11 +, libXi +, libXtst +, libnotify +, openssl +, xclip +, xdotool +}: + +rustPlatform.buildRustPackage rec { + pname = "espanso"; + version = "0.6.3"; + + src = fetchFromGitHub { + owner = "federico-terzi"; + repo = pname; + rev = "v${version}"; + sha256 = "1x5p7hniapggqd18rx26mjvdf33z7rm7zz5vsqm2siv3mcl19033"; + }; + + cargoSha256 = "0liwwdncymjql5dw7rwhhimcr7qdbyvfgmsd0bawvi0ym7m1v408"; + + nativeBuildInputs = [ + extra-cmake-modules + pkgconfig + ]; + + buildInputs = [ + libX11 + libXtst + libXi + libnotify + openssl + xdotool + ]; + + # Some tests require networking + doCheck = false; + + meta = with stdenv.lib; { + description = "Cross-platform Text Expander written in Rust"; + homepage = "https://espanso.org"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ kimat ]; + platforms = platforms.all; + + longDescription = '' + Espanso detects when you type a keyword and replaces it while you're typing. + ''; + }; +} diff --git a/pkgs/applications/office/todoman/default.nix b/pkgs/applications/office/todoman/default.nix index e18a11a7448..092a776ae60 100644 --- a/pkgs/applications/office/todoman/default.nix +++ b/pkgs/applications/office/todoman/default.nix @@ -5,11 +5,11 @@ let in buildPythonApplication rec { pname = "todoman"; - version = "3.7.0"; + version = "3.8.0"; src = fetchPypi { inherit pname version; - sha256 = "16brw2zhm5vamffin6qjb0lxjlj3ba40vaficl851nw2xh2mrdhy"; + sha256 = "1aq7f63bhs9dnwzp15nfr07f2ki6s3lnqfap3b09rhchn6lfznwb"; }; LOCALE_ARCHIVE = stdenv.lib.optionalString stdenv.isLinux diff --git a/pkgs/applications/science/biology/picard-tools/default.nix b/pkgs/applications/science/biology/picard-tools/default.nix index 85d92d3af84..e6bcb4470bb 100644 --- a/pkgs/applications/science/biology/picard-tools/default.nix +++ b/pkgs/applications/science/biology/picard-tools/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "picard-tools"; - version = "2.23.0"; + version = "2.23.1"; src = fetchurl { url = "https://github.com/broadinstitute/picard/releases/download/${version}/picard.jar"; - sha256 = "0yhgfz5jjw55ipgdb32wjdcb01xx2g9ikgvwinnfwswx50iscf5a"; + sha256 = "1g4539x2081jgrbn207nsimpq9q5izd4z6cx7s8lr8p8ab8spbmk"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/science/logic/lean/default.nix b/pkgs/applications/science/logic/lean/default.nix index 7fcc4cdd062..886ecdb76ce 100644 --- a/pkgs/applications/science/logic/lean/default.nix +++ b/pkgs/applications/science/logic/lean/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "lean"; - version = "3.16.2"; + version = "3.16.5"; src = fetchFromGitHub { owner = "leanprover-community"; repo = "lean"; rev = "v${version}"; - sha256 = "0fvm7gvbr5kn258sqpnxa7dvzz84iv1dx1n066vih5gz80plz4lh"; + sha256 = "0s1ay6qgpkxhygfbfrl1cw2pd8bpgw2dw71rzhza20ndqwk8nqs5"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/science/logic/workcraft/default.nix b/pkgs/applications/science/logic/workcraft/default.nix index 685d6ee4861..4038db17f93 100644 --- a/pkgs/applications/science/logic/workcraft/default.nix +++ b/pkgs/applications/science/logic/workcraft/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "workcraft"; - version = "3.2.6"; + version = "3.3.0"; src = fetchurl { url = "https://github.com/workcraft/workcraft/releases/download/v${version}/workcraft-v${version}-linux.tar.gz"; - sha256 = "1sfbxmk71gp7paw4l5azqr0lsgsyp4308gx2jz8w4k3nasfshz25"; + sha256 = "072i7kan2c9f4s9jxwqr4ccsi9979c12xhwr385sbq06rwyrna85"; }; buildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index f9ebbabd11b..b2511a7f2b3 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -26,7 +26,9 @@ let darcs-to-git = callPackage ./darcs-to-git { }; - delta = callPackage ./delta { }; + delta = callPackage ./delta { + inherit (darwin.apple_sdk.frameworks) Security; + }; diff-so-fancy = callPackage ./diff-so-fancy { }; diff --git a/pkgs/applications/version-management/git-and-tools/delta/default.nix b/pkgs/applications/version-management/git-and-tools/delta/default.nix index 60950dc0465..0cc184e2cfe 100644 --- a/pkgs/applications/version-management/git-and-tools/delta/default.nix +++ b/pkgs/applications/version-management/git-and-tools/delta/default.nix @@ -1,25 +1,32 @@ -{ lib, fetchFromGitHub, rustPlatform, llvmPackages, installShellFiles }: +{ stdenv +, lib +, fetchFromGitHub +, rustPlatform +, installShellFiles +, libiconv +, Security +}: rustPlatform.buildRustPackage rec { pname = "delta"; - version = "0.1.1"; + version = "0.2.0"; src = fetchFromGitHub { owner = "dandavison"; repo = pname; rev = version; - sha256 = "1b5ap468d0gvgwkx6wqxvayzda2xw95lymd0kl38nq1fc0ica6hk"; + sha256 = "15c7rsmiinnpxh12520jz3wr0j86vgzjq1ss5pf30fa7lcgicb32"; }; - LLVM_CONFIG_PATH = "${llvmPackages.llvm}/bin/llvm-config"; - LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib"; - - cargoSha256 = "07mjl751r9d88fnmnan0ip0m3vxqf51vq2y7k3g3yywcgasj9jgr"; + cargoSha256 = "0lzz32qh80s4dxr0d4pg0qagkn549lr4vbqknl2l0cmlq1bvvq6g"; nativeBuildInputs = [ installShellFiles ]; + buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ]; + postInstall = '' - installShellCompletion --bash --name delta.bash completion/bash/completion.sh + installShellCompletion --bash --name delta.bash completion/completion.bash + installShellCompletion --zsh --name _delta completion/completion.zsh ''; meta = with lib; { @@ -27,6 +34,6 @@ rustPlatform.buildRustPackage rec { description = "A syntax-highlighting pager for git"; changelog = "https://github.com/dandavison/delta/releases/tag/${version}"; license = licenses.mit; - maintainers = with maintainers; [ marsam ma27 ]; + maintainers = with maintainers; [ marsam ma27 zowoq ]; }; } diff --git a/pkgs/applications/version-management/git-and-tools/git-machete/default.nix b/pkgs/applications/version-management/git-and-tools/git-machete/default.nix index 1ca0ad27de7..9cdec7464a6 100644 --- a/pkgs/applications/version-management/git-and-tools/git-machete/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-machete/default.nix @@ -4,11 +4,11 @@ buildPythonApplication rec { pname = "git-machete"; - version = "2.14.0"; + version = "2.15.2"; src = fetchPypi { inherit pname version; - sha256 = "01ch4d0r3bi9nl5nknp3dyizc2rl9w46gm1ydnvqbrzhgw65lpp0"; + sha256 = "0qv08a6xsdmcm8l69m4103vn4crb0ilzx94334xjbdl0sykm55q0"; }; nativeBuildInputs = [ installShellFiles pbr ]; diff --git a/pkgs/applications/version-management/git-and-tools/gita/default.nix b/pkgs/applications/version-management/git-and-tools/gita/default.nix index c9d188e10e5..5fe6b34fd3b 100644 --- a/pkgs/applications/version-management/git-and-tools/gita/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gita/default.nix @@ -1,17 +1,22 @@ { lib , buildPythonApplication -, fetchPypi +, fetchFromGitHub +, git +, pytest , pyyaml , setuptools +, installShellFiles }: buildPythonApplication rec { - version = "0.10.5"; + version = "0.10.9"; pname = "gita"; - src = fetchPypi { - inherit pname version; - sha256 = "1xggslmrrfszpl190klkc97fnl88gml1bnkmkzp6aimdch66g4jg"; + src = fetchFromGitHub { + sha256 = "0wilyf4nnn2jyxrfqs8krya3zvhj6x36szsp9xhb6h08g1ihzp5i"; + rev = "v${version}"; + repo = "gita"; + owner = "nosarthur"; }; propagatedBuildInputs = [ @@ -19,6 +24,29 @@ buildPythonApplication rec { setuptools ]; + nativeBuildInputs = [ installShellFiles ]; + + postUnpack = '' + for case in "\n" ""; do + substituteInPlace source/tests/test_main.py \ + --replace "'gita$case'" "'source$case'" + done + ''; + + checkInputs = [ + git + pytest + ]; + + checkPhase = '' + git init + pytest tests + ''; + + postInstall = '' + installShellCompletion --bash --name gita ${src}/.gita-completion.bash + ''; + meta = with lib; { description = "A command-line tool to manage multiple git repos"; homepage = "https://github.com/nosarthur/gita"; diff --git a/pkgs/applications/video/clipgrab/default.nix b/pkgs/applications/video/clipgrab/default.nix index 2eda7fe1dab..0e39ab05685 100644 --- a/pkgs/applications/video/clipgrab/default.nix +++ b/pkgs/applications/video/clipgrab/default.nix @@ -5,10 +5,10 @@ mkDerivation rec { pname = "clipgrab"; - version = "3.8.12"; + version = "3.8.13"; src = fetchurl { - sha256 = "1nnph6sn4mpdj20hngwr57ripmdp60w3vrn89s8ssy7cjv500ngd"; + sha256 = "0ryaha33m41y0xjrspa838qqr4iy2c8vbvhbb334qimpqn1hj3q5"; # The .tar.bz2 "Download" link is a binary blob, the source is the .tar.gz! url = "https://download.clipgrab.org/${pname}-${version}.tar.gz"; }; diff --git a/pkgs/applications/virtualization/gvisor/default.nix b/pkgs/applications/virtualization/gvisor/default.nix index 7d3b8021229..576f2d9e6f2 100644 --- a/pkgs/applications/virtualization/gvisor/default.nix +++ b/pkgs/applications/virtualization/gvisor/default.nix @@ -76,7 +76,7 @@ in buildBazelPackage rec { rm -f "$bazelOut"/java.log "$bazelOut"/java.log.* ''; - sha256 = "0mkgbw08f6kgklvjmlfpyld35q7dvxm9pvrhaf7m7nx69sich6jq"; + sha256 = "0myffqywbvqhax995z55jymwnwyxmp13r27kpbc7wb5fk9s4skvr"; }; buildAttrs = { diff --git a/pkgs/applications/virtualization/umoci/default.nix b/pkgs/applications/virtualization/umoci/default.nix index d8a1f36dd5d..0b9668b701a 100644 --- a/pkgs/applications/virtualization/umoci/default.nix +++ b/pkgs/applications/virtualization/umoci/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "umoci"; - version = "0.4.5"; + version = "0.4.6"; src = fetchFromGitHub { - owner = "openSUSE"; + owner = "opencontainers"; repo = "umoci"; rev = "v${version}"; - sha256 = "1gzj4nnys73wajdwjn5jsskvnhzh8s2vmyl76ax8drpvw19bd5g3"; + sha256 = "0jaar26l940yh77cs31c3zndiycp85m3fz4zivcibzi68g6n6yzg"; }; vendorSha256 = null; @@ -24,7 +24,7 @@ buildGoModule rec { postInstall = '' sed -i '/SHELL =/d' Makefile - make local-doc + make docs installManPage doc/man/*.[1-9] ''; @@ -33,6 +33,6 @@ buildGoModule rec { homepage = "https://umo.ci"; license = licenses.asl20; maintainers = with maintainers; [ zokrezyl ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/build-support/ocaml/oasis.nix b/pkgs/build-support/ocaml/oasis.nix index 74977486f2f..c1d1d699765 100644 --- a/pkgs/build-support/ocaml/oasis.nix +++ b/pkgs/build-support/ocaml/oasis.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation (args // { buildPhase = '' runHook preBuild oasis setup - ocaml setup.ml -configure + ocaml setup.ml -configure --prefix $OCAMLFIND_DESTDIR --exec-prefix $out ocaml setup.ml -build runHook postBuild ''; @@ -37,9 +37,7 @@ stdenv.mkDerivation (args // { installPhase = '' runHook preInstall mkdir -p $out - sed -i s+/usr/local+$out+g setup.ml - sed -i s+/usr/local+$out+g setup.data - prefix=$OCAMLFIND_DESTDIR ocaml setup.ml -install + ocaml setup.ml -install runHook postInstall ''; diff --git a/pkgs/data/documentation/zeal/default.nix b/pkgs/data/documentation/zeal/default.nix index 7bfe918030e..4551dc21179 100644 --- a/pkgs/data/documentation/zeal/default.nix +++ b/pkgs/data/documentation/zeal/default.nix @@ -1,40 +1,44 @@ { stdenv, fetchFromGitHub, cmake, extra-cmake-modules, pkgconfig -, qtbase, qtimageformats, qtwebkit, qtx11extras, mkDerivation +, qtbase, qtimageformats, qtwebengine, qtx11extras, mkDerivation , libarchive, libXdmcp, libpthreadstubs, xcbutilkeysyms }: mkDerivation rec { pname = "zeal"; - version = "0.6.1"; + version = "0.6.999"; src = fetchFromGitHub { - owner = "zealdocs"; - repo = "zeal"; - rev = "v${version}"; - sha256 = "05qcjpibakv4ibhxgl5ajbkby3w7bkxsv3nfv2a0kppi1z0f8n8v"; + owner = "zealdocs"; + repo = "zeal"; + rev = "1ce0e2e446232e7647c5588c1f603f1dd88e0f67"; + sha256 = "0gj5qcm7ck8m5zfmiabay2f7wbxldmrkw8m3xi7v9i8y8hx0jkxr"; }; - # while ads can be disabled from the user settings, by default they are not so - # we patch it out completely instead - patches = [ ./remove_ads.patch ]; + # we only need this if we are using a version that hasn't been released. We + # could also match on the "VERSION x.y.z" bit but then it would have to be + # updated based on whatever is the latest release, so instead just rewrite the + # line. + postPatch = '' + sed -i CMakeLists.txt \ + -e 's@^project.*@project(Zeal VERSION ${version})@' + ''; nativeBuildInputs = [ cmake extra-cmake-modules pkgconfig ]; + buildInputs = [ - qtbase qtimageformats qtwebkit qtx11extras + qtbase qtimageformats qtwebengine qtx11extras libarchive libXdmcp libpthreadstubs xcbutilkeysyms ]; - enableParallelBuilding = true; - meta = with stdenv.lib; { description = "A simple offline API documentation browser"; longDescription = '' Zeal is a simple offline API documentation browser inspired by Dash (macOS app), available for Linux and Windows. ''; - homepage = "https://zealdocs.org/"; - license = licenses.gpl3; + homepage = "https://zealdocs.org/"; + license = licenses.gpl3; maintainers = with maintainers; [ skeidel peterhoeg ]; - platforms = platforms.linux; + platforms = platforms.linux; }; } diff --git a/pkgs/data/documentation/zeal/remove_ads.patch b/pkgs/data/documentation/zeal/remove_ads.patch deleted file mode 100644 index be0cab305eb..00000000000 --- a/pkgs/data/documentation/zeal/remove_ads.patch +++ /dev/null @@ -1,23 +0,0 @@ -commit 1b61397175b6e60f23224db463301c9057830859 -Author: Peter Hoeg -Date: Mon Feb 19 07:38:03 2018 +0800 - - strip container with ads - -diff --git a/src/app/resources/browser/welcome.html b/src/app/resources/browser/welcome.html -index bb3f511..67382b2 100644 ---- a/src/app/resources/browser/welcome.html -+++ b/src/app/resources/browser/welcome.html -@@ -20,12 +20,6 @@ - -

-

Docs for everyone

--
--
-- --
--
- -
-

Customize

diff --git a/pkgs/data/misc/dns-root-data/default.nix b/pkgs/data/misc/dns-root-data/default.nix index ee08c07f5a6..aad1fe61c4b 100644 --- a/pkgs/data/misc/dns-root-data/default.nix +++ b/pkgs/data/misc/dns-root-data/default.nix @@ -7,7 +7,7 @@ let # occasionally suffers from pointless hash changes, # and having stable sources for older versions has advantages, too. urls = map (prefix: prefix + "cc5e14a264912/etc/root.hints") [ - "https://gitlab.labs.nic.cz/knot/knot-resolver/raw/" + "https://gitlab.nic.cz/knot/knot-resolver/raw/" "https://raw.githubusercontent.com/CZ-NIC/knot-resolver/" ]; sha256 = "0vdrff4l8s8grif52dnh091s8qydhh88k25zqd9rj66sf1qwcwxl"; diff --git a/pkgs/desktops/gnome-3/core/baobab/default.nix b/pkgs/desktops/gnome-3/core/baobab/default.nix index af39d3a3c05..dce14d6d1de 100644 --- a/pkgs/desktops/gnome-3/core/baobab/default.nix +++ b/pkgs/desktops/gnome-3/core/baobab/default.nix @@ -4,13 +4,13 @@ let pname = "baobab"; - version = "3.34.0"; + version = "3.34.1"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "01w6m5ylyqs4wslpjn1hg6n6ynwh3rghksak0qs8r9m6dm3dkss6"; + sha256 = "1i90gc1cpw5507zn54k46hj4mjgdxsq8cvpnlgxq0ksy2d7iv63z"; }; nativeBuildInputs = [ meson ninja pkgconfig vala gettext itstool libxml2 desktop-file-utils wrapGAppsHook ]; diff --git a/pkgs/desktops/plasma-5/powerdevil.nix b/pkgs/desktops/plasma-5/powerdevil.nix index e53e986060f..e6b2c472bc8 100644 --- a/pkgs/desktops/plasma-5/powerdevil.nix +++ b/pkgs/desktops/plasma-5/powerdevil.nix @@ -1,5 +1,5 @@ { - mkDerivation, + mkDerivation, fetchpatch, extra-cmake-modules, kdoctools, bluez-qt, kactivities, kauth, kconfig, kdbusaddons, kdelibs4support, kglobalaccel, ki18n, kidletime, kio, knotifyconfig, kwayland, libkscreen, @@ -18,4 +18,14 @@ mkDerivation { cmakeFlags = [ "-DHAVE_DDCUTIL=On" ]; + patches = [ + # This fixes an issue where 'DDCA_Feature_List*' cannot be converted to + # 'DDCA_Feature_List'. + # This can be dropped with the next release. + # https://bugs.kde.org/show_bug.cgi?id=423605 + (fetchpatch { + url = "https://invent.kde.org/plasma/powerdevil/-/commit/fcb26be2fb279e6ad3b7b814d26a5921d16201eb.patch"; + sha256 = "0gdyaa0nd1c1d6x2h0m933lascm8zm5sikd99wxmkf7hhaby6k2s"; + }) + ]; } diff --git a/pkgs/development/compilers/closure/default.nix b/pkgs/development/compilers/closure/default.nix index b8b02cb9d68..2ee1223a53b 100644 --- a/pkgs/development/compilers/closure/default.nix +++ b/pkgs/development/compilers/closure/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "closure-compiler"; - version = "20200517"; + version = "20200614"; src = fetchurl { url = "https://dl.google.com/closure-compiler/compiler-${version}.tar.gz"; - sha256 = "05bbsrxw2nxjlcfc22w1ympi66jnmzymivg29cvidh5n28jgwba2"; + sha256 = "0a54y2d9nfg60knfv34kf6sdsh065dzam86l3wprf8gvqffxxcli"; }; sourceRoot = "."; diff --git a/pkgs/development/compilers/go-jsonnet/default.nix b/pkgs/development/compilers/go-jsonnet/default.nix index d85cf1adfe7..f528b9f1364 100644 --- a/pkgs/development/compilers/go-jsonnet/default.nix +++ b/pkgs/development/compilers/go-jsonnet/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { vendorSha256 = "0nsm4gsbbn8myz4yfi6m7qc3iizhdambsr18iks0clkdn3mi2jn1"; - subPackages = [ "cmd/jsonnet" ]; + subPackages = [ "cmd/jsonnet" "cmd/jsonnetfmt" ]; meta = with lib; { description = "An implementation of Jsonnet in pure Go"; @@ -21,4 +21,4 @@ buildGoModule rec { license = licenses.asl20; maintainers = with maintainers; [ nshalman ]; }; -} \ No newline at end of file +} diff --git a/pkgs/development/compilers/nim/default.nix b/pkgs/development/compilers/nim/default.nix index 86518b8db09..9fa2270b1dd 100644 --- a/pkgs/development/compilers/nim/default.nix +++ b/pkgs/development/compilers/nim/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "nim"; - version = "1.2.0"; + version = "1.2.4"; src = fetchurl { url = "https://nim-lang.org/download/${pname}-${version}.tar.xz"; - sha256 = "0xf56xb42hc92h4xnvk72q4n3ysjbyhf0rg60lc84r9r6wx5i52f"; + sha256 = "0dnn60slvp3ynlx3zhv3cjkanv8zglljxws0db8g0rdyz8r8zwgf"; }; enableParallelBuilding = true; diff --git a/pkgs/development/compilers/ocaml/4.11.nix b/pkgs/development/compilers/ocaml/4.11.nix index 388ee4dba8b..410e4ee713e 100644 --- a/pkgs/development/compilers/ocaml/4.11.nix +++ b/pkgs/development/compilers/ocaml/4.11.nix @@ -1,6 +1,6 @@ import ./generic.nix { major_version = "4"; minor_version = "11"; - patch_version = "0+alpha3"; - sha256 = "0c2g8ncq15nx9pdl14hnsc9342j80s7i1bsyiw98cvgic5miyw9b"; + patch_version = "0+beta1"; + sha256 = "1xhkwprbnd3wp6bi3k74f42l1mff1ngn7gl4rgad9dk4ly0yzfdr"; } diff --git a/pkgs/development/compilers/souffle/default.nix b/pkgs/development/compilers/souffle/default.nix index 00d1a2f7960..d7fc7b114ab 100644 --- a/pkgs/development/compilers/souffle/default.nix +++ b/pkgs/development/compilers/souffle/default.nix @@ -10,13 +10,13 @@ let in stdenv.mkDerivation rec { pname = "souffle"; - version = "1.7.1"; + version = "2.0.0"; src = fetchFromGitHub { owner = "souffle-lang"; repo = "souffle"; rev = version; - sha256 = "0px8kh5875q2iyza4ylpa6vxpy6qxg0qvn2idk1j6dcdf5pdryph"; + sha256 = "1azn32x0xbbk8gagipb34qk3y1srm927j5d34w20isgjxir4xsnz"; }; nativeBuildInputs = [ autoreconfHook bison flex mcpp doxygen graphviz makeWrapper perl ]; diff --git a/pkgs/development/coq-modules/equations/default.nix b/pkgs/development/coq-modules/equations/default.nix index 060fa3b4c81..47ab19048ee 100644 --- a/pkgs/development/coq-modules/equations/default.nix +++ b/pkgs/development/coq-modules/equations/default.nix @@ -33,9 +33,15 @@ let }; "8.11" = { - version = "1.2.1"; - rev = "v1.2.1-8.11"; - sha256 = "06k0h7lansxs479is3vj5ikg8s5k4c6svnqcwmxbni4wx8bhmg17"; + version = "1.2.2"; + rev = "v1.2.2-8.11"; + sha256 = "0g2y0s8kb2imbqyrx9hmvjzpwmicid7shv7ma10fnb8dgk2dqkf9"; + }; + + "8.12" = { + version = "1.2.2"; + rev = "v1.2.2-8.12"; + sha256 = "0fkz78i2gn9x9scfa7n8fl2sq7czppsicy7w5mq919qqfp0w1aj0"; }; }; param = params.${coq.coq-version}; diff --git a/pkgs/development/interpreters/janet/default.nix b/pkgs/development/interpreters/janet/default.nix index 32312401f96..52d0b371915 100644 --- a/pkgs/development/interpreters/janet/default.nix +++ b/pkgs/development/interpreters/janet/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "janet"; - version = "1.10.0"; + version = "1.10.1"; src = fetchFromGitHub { owner = "janet-lang"; repo = pname; rev = "v${version}"; - sha256 = "0kx3c4v0481b4xx239w10ajwp8ngq8smxzh3m77dazd89r997n1g"; + sha256 = "18k6dzxzr149p0bby4r0z6kybylig87rwj7gk3z6a98zf6k4xmsw"; }; nativeBuildInputs = [ meson ninja ]; diff --git a/pkgs/development/interpreters/rakudo/zef.nix b/pkgs/development/interpreters/rakudo/zef.nix index 5c8fe16408b..c8205344693 100644 --- a/pkgs/development/interpreters/rakudo/zef.nix +++ b/pkgs/development/interpreters/rakudo/zef.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "zef"; - version = "0.8.4"; + version = "0.8.5"; src = fetchFromGitHub { owner = "ugexe"; repo = "zef"; rev = "v${version}"; - sha256 = "02a3awnjr1mgb9275xvp3xms80vcxkq55ffi8sbjzxpwyadj5y5k"; + sha256 = "17a5ns0ph8626q3b4wv9v2n0zqmhqbqyzjzxa387kr19qs933yy6"; }; buildInputs = [ rakudo makeWrapper ]; diff --git a/pkgs/development/libraries/amdvlk/default.nix b/pkgs/development/libraries/amdvlk/default.nix index 84b4d53bc56..893f09809d8 100644 --- a/pkgs/development/libraries/amdvlk/default.nix +++ b/pkgs/development/libraries/amdvlk/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "amdvlk"; - version = "2020.Q2.5"; + version = "2020.Q2.6"; src = fetchRepoProject { name = "${pname}-src"; manifest = "https://github.com/GPUOpen-Drivers/AMDVLK.git"; rev = "refs/tags/v-${version}"; - sha256 = "008adby8vx12ma155x64n7aj9vp9ygqgij3mm3q20i187db7d1ab"; + sha256 = "1h5j4qaqm4kg5jybkkk6v1mdy0jx0k06mrb8n8jl415z08f0pjgj"; }; buildInputs = [ diff --git a/pkgs/development/libraries/apache-activemq/default.nix b/pkgs/development/libraries/apache-activemq/default.nix index c09fb8d91ee..8490541546b 100644 --- a/pkgs/development/libraries/apache-activemq/default.nix +++ b/pkgs/development/libraries/apache-activemq/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "apache-activemq"; - version = "5.15.13"; + version = "5.16.0"; src = fetchurl { - sha256 = "1hzapnd0lbiid243xiaz8kv67al8griccjj4dabml62hqhrk9k96"; + sha256 = "0x68l4n0v2jqmbawdgpghmhnchpg1jsvxzskj6s4hjll6hdgb6fk"; url = "mirror://apache/activemq/${version}/${pname}-${version}-bin.tar.gz"; }; diff --git a/pkgs/development/libraries/bctoolbox/default.nix b/pkgs/development/libraries/bctoolbox/default.nix index 22578dad38d..d99ee57ef9e 100644 --- a/pkgs/development/libraries/bctoolbox/default.nix +++ b/pkgs/development/libraries/bctoolbox/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { pname = "bctoolbox"; - version = "4.3.1"; + version = "4.4.0"; nativeBuildInputs = [ cmake bcunit ]; buildInputs = [ mbedtls ]; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { group = "BC"; repo = pname; rev = version; - sha256 = "1y91jcrma4kjqpm6w5ahlygjsyvx7l8zjrjvq7g2n39jmw175cvs"; + sha256 = "1r3ymwk10ry6mz4zd08q7l5msq7h15931l7f0clw2siqs8r81x7c"; }; # Do not build static libraries diff --git a/pkgs/development/libraries/doctest/default.nix b/pkgs/development/libraries/doctest/default.nix index f3ed36db31c..5a256105687 100644 --- a/pkgs/development/libraries/doctest/default.nix +++ b/pkgs/development/libraries/doctest/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "doctest"; - version = "2.3.8"; + version = "2.4.0"; src = fetchFromGitHub { owner = "onqtam"; repo = "doctest"; rev = version; - sha256 = "16w907750jnp98vdzkn72lzwy1zyryaqvfi80lbdp398pj23rq65"; + sha256 = "1yi95saqv8qb3ix6w8d7ffvs7qbwvqmq6wblckhxhicxxdxk85cd"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/gbenchmark/default.nix b/pkgs/development/libraries/gbenchmark/default.nix index cafbe116b1c..e2734c6b199 100644 --- a/pkgs/development/libraries/gbenchmark/default.nix +++ b/pkgs/development/libraries/gbenchmark/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "gbenchmark"; - version = "1.5.0"; + version = "1.5.1"; src = fetchFromGitHub { owner = "google"; repo = "benchmark"; rev = "v${version}"; - sha256 = "0r9dbg4cbk47gwmayys31a83m3y67k0kh1f6pl8i869rbd609ndh"; + sha256 = "16xlk8h4mfszl4rig22fgpj9kw312az22981ph6pmkf35xsvvv66"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/libvmaf/default.nix b/pkgs/development/libraries/libvmaf/default.nix index fb494909c83..6c2b61cf113 100644 --- a/pkgs/development/libraries/libvmaf/default.nix +++ b/pkgs/development/libraries/libvmaf/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libvmaf"; - version = "1.5.1"; + version = "1.5.2"; src = fetchFromGitHub { owner = "netflix"; repo = "vmaf"; rev = "v${version}"; - sha256 = "10fw53k9k4aq4p2qi5qkfjfnhldw4p5bbmxggf8220gfa95nvyl3"; + sha256 = "18w0z3w90fdbzsqaa4diwvq0xmvg0aiw4hi3aaa4pq0zgnb8g3mk"; }; sourceRoot = "source/libvmaf"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/Netflix/vmaf"; description = "Perceptual video quality assessment based on multi-method fusion (VMAF)"; platforms = platforms.unix; - license = licenses.asl20; + license = licenses.bsd2Patent; maintainers = [ maintainers.cfsmp3 maintainers.marsam ]; }; diff --git a/pkgs/development/libraries/nanopb/default.nix b/pkgs/development/libraries/nanopb/default.nix index a63d367b800..cafc5c85f21 100644 --- a/pkgs/development/libraries/nanopb/default.nix +++ b/pkgs/development/libraries/nanopb/default.nix @@ -50,6 +50,8 @@ in stdenv.mkDerivation rec { --subst-var-by python ${pythonRuntime}/bin/python \ --subst-var-by out $out chmod +x $out/bin/protoc-gen-nanopb + + cp ../pb_common.c ../pb_decode.c ../pb_encode.c $out/include/ ''; passthru.tests = { diff --git a/pkgs/development/libraries/nuspell/default.nix b/pkgs/development/libraries/nuspell/default.nix index 38f3a1134ee..7de16c7c119 100644 --- a/pkgs/development/libraries/nuspell/default.nix +++ b/pkgs/development/libraries/nuspell/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "nuspell"; - version = "3.1.1"; + version = "3.1.2"; src = fetchFromGitHub { owner = "nuspell"; repo = "nuspell"; rev = "v${version}"; - sha256 = "18zz3rdzlb3knzsd98vw8cfyb3iq0ilipnlz7rz10zgb5ail73s2"; + sha256 = "0wbb6dwmzlsyy224y0liis0azgzwbjdvcyzc31pw1aw6vbp36na6"; }; nativeBuildInputs = [ cmake pkgconfig ronn ]; diff --git a/pkgs/development/libraries/oneDNN/default.nix b/pkgs/development/libraries/oneDNN/default.nix index edc48d1d873..01ce51be18d 100644 --- a/pkgs/development/libraries/oneDNN/default.nix +++ b/pkgs/development/libraries/oneDNN/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { homepage = "https://01.org/dnnl"; changelog = "https://github.com/oneapi-src/oneDNN/releases/tag/v${version}"; license = licenses.asl20; - platforms = [ "x86_64-linux" ]; + platforms = [ "aarch64-linux" "x86_64-linux" ]; maintainers = with maintainers; [ alexarice bhipple ]; }; } diff --git a/pkgs/development/libraries/onnxruntime/default.nix b/pkgs/development/libraries/onnxruntime/default.nix index 7d0a9342aa7..1794d55daaa 100644 --- a/pkgs/development/libraries/onnxruntime/default.nix +++ b/pkgs/development/libraries/onnxruntime/default.nix @@ -4,17 +4,22 @@ stdenv.mkDerivation rec { pname = "onnxruntime"; - version = "1.2.0"; + version = "1.3.1"; src = fetchFromGitHub { owner = "microsoft"; repo = "onnxruntime"; rev = "v${version}"; - sha256 = "1alhb7nvlxrr9yf757gs4hkzksbk3mxyv5zcmmpl82ibl65vh55k"; + sha256 = "0rbk1jbfc447x2wybz2hsba6w1ij0fq21996l52cqv39898lvy9d"; # TODO: use nix-versions of grpc, onnx, eigen, googletest, etc. # submodules increase src size and compile times significantly # not currently feasible due to how integrated cmake build is with git fetchSubmodules = true; + # Remove unicode file names which leads to different checksums on HFS+ + # vs. other filesystems because of unicode normalisation. + postFetch = '' + rm -rf $out/winml/test/collateral/models/UnicodePath/ + ''; }; # TODO: build server, and move .so's to lib output diff --git a/pkgs/development/libraries/opendht/default.nix b/pkgs/development/libraries/opendht/default.nix index c8b1205bc91..f9b2e07fb42 100644 --- a/pkgs/development/libraries/opendht/default.nix +++ b/pkgs/development/libraries/opendht/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "opendht"; - version = "2.1.3"; + version = "2.1.4"; src = fetchFromGitHub { owner = "savoirfairelinux"; repo = "opendht"; rev = version; - sha256 = "0qz9mdkanz4vd38bdpwvcwvbpzf19i6019rmqw3k1vh5mh22ljhr"; + sha256 = "1ax26ri1ifb6s8ppd28jmanka9yf8mw3np65q2h4djhhik0phhal"; }; nativeBuildInputs = diff --git a/pkgs/development/libraries/physics/rivet/default.nix b/pkgs/development/libraries/physics/rivet/default.nix index bcf986346ac..abf37def8c3 100644 --- a/pkgs/development/libraries/physics/rivet/default.nix +++ b/pkgs/development/libraries/physics/rivet/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "rivet"; - version = "3.1.1"; + version = "3.1.2"; src = fetchurl { url = "https://www.hepforge.org/archive/rivet/Rivet-${version}.tar.bz2"; - sha256 = "1cgr9jyfd9r7dwbk8fr3rys5dc74cmbx368441jvqngqymmb563w"; + sha256 = "0yjpx7n6ry3pfgkf7d7v7mcc3yv7681kf8nq2b1fgspl8jbd0hf0"; }; patches = [ diff --git a/pkgs/development/libraries/physics/yoda/default.nix b/pkgs/development/libraries/physics/yoda/default.nix index 9d4d60949c1..1a8d5a6fd39 100644 --- a/pkgs/development/libraries/physics/yoda/default.nix +++ b/pkgs/development/libraries/physics/yoda/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "yoda"; - version = "1.8.2"; + version = "1.8.3"; src = fetchurl { url = "https://www.hepforge.org/archive/yoda/YODA-${version}.tar.bz2"; - sha256 = "1nqbv334iwdvbsc5bw8g936cxzc1hyzv9r8kjy4v124vrw8qqmc9"; + sha256 = "12msmjiajvy2xj2m64n2fxblai5xg06a829wi7scsc7nw2jhxpfr"; }; nativeBuildInputs = with python.pkgs; [ cython makeWrapper ]; diff --git a/pkgs/development/libraries/robin-map/default.nix b/pkgs/development/libraries/robin-map/default.nix index 10b7510468e..9c0774f925b 100644 --- a/pkgs/development/libraries/robin-map/default.nix +++ b/pkgs/development/libraries/robin-map/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "robin-map"; - version = "0.6.2"; + version = "0.6.3"; src = fetchFromGitHub { owner = "Tessil"; repo = pname; rev = "v${version}"; - sha256 = "0y532zg0aaqz3fpv785n2drwpnryaclr53drpqimnbf3cs0jw997"; + sha256 = "1li70vwsksva9c4yly90hjafgqfixi1g6d52qq9p6r60vqc4pkjj"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/science/math/suitesparse-graphblas/default.nix b/pkgs/development/libraries/science/math/suitesparse-graphblas/default.nix index 5a2c28d3c02..5244ccdb281 100644 --- a/pkgs/development/libraries/science/math/suitesparse-graphblas/default.nix +++ b/pkgs/development/libraries/science/math/suitesparse-graphblas/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { pname = "suitesparse-graphblas"; - version = "3.2.2"; + version = "3.3.0"; outputs = [ "out" "dev" ]; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { owner = "DrTimothyAldenDavis"; repo = "GraphBLAS"; rev = "v${version}"; - sha256 = "04hprrgj0f44ml2f0w4jfwgrvy8l2s6ya0c9xc8gwlbmkc7a4c62"; + sha256 = "1fin9741ild3dv7c9gk07kpizsnnx17ar9cv9lny8vl47pms940h"; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/simgear/default.nix b/pkgs/development/libraries/simgear/default.nix index ab4fd2c7bf2..3a7c0b3c410 100644 --- a/pkgs/development/libraries/simgear/default.nix +++ b/pkgs/development/libraries/simgear/default.nix @@ -4,7 +4,7 @@ , curl }: let - version = "2020.1.1"; + version = "2020.1.3"; shortVersion = builtins.substring 0 6 version; in stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://sourceforge/flightgear/release-${shortVersion}/${pname}-${version}.tar.bz2"; - sha256 = "1z52r28xg05q6hdlh4szzfjlpgkvbdyn2dpaji9b57y58ccrqsfh"; + sha256 = "1l8kiicm0klbx0b05994vqd8a8wj7k0djbbg41a6i3q5d17jrnk6"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/spdk/default.nix b/pkgs/development/libraries/spdk/default.nix index e8d4f3eb4e0..1b5abe16f37 100644 --- a/pkgs/development/libraries/spdk/default.nix +++ b/pkgs/development/libraries/spdk/default.nix @@ -1,24 +1,54 @@ -{ stdenv, fetchFromGitHub, python, cunit, dpdk, libaio, libbsd, libuuid, numactl, openssl }: +{ stdenv +, fetchurl +, fetchFromGitHub +, fetchpatch +, ncurses +, python3 +, cunit +, dpdk +, libaio +, libbsd +, libuuid +, numactl +, openssl +}: -stdenv.mkDerivation rec { +let + dpdk-compat-patch = fetchurl { + url = "https://review.spdk.io/gerrit/plugins/gitiles/spdk/spdk/+/6acb9a58755856fb9316baf9dbbb7239dc6b9446%5E%21/?format=TEXT"; + sha256 = "18q0956fkjw19r29hp16x4pygkfv01alj9cld2wlqqyfgp41nhn0"; + }; +in stdenv.mkDerivation rec { pname = "spdk"; - version = "20.01.1"; + version = "20.04.1"; src = fetchFromGitHub { owner = "spdk"; repo = "spdk"; rev = "v${version}"; - sha256 = "1ci0kj0bv5jp5yipa8g0q0ah71qv6pjvvban1ad0v24f7lq4xh0w"; + sha256 = "ApMyGamPrMalzZLbVkJlcwatiB8dOJmoxesdjkWZElk="; }; - patches = [ ./spdk-dpdk-meson.patch ]; + patches = [ + ./spdk-dpdk-meson.patch + # https://review.spdk.io/gerrit/c/spdk/spdk/+/3134 + (fetchpatch { + url = "https://github.com/spdk/spdk/commit/c954b5b722c5c163774d3598458ff726c48852ab.patch"; + sha256 = "1n149hva5qxmpr0nmav10nya7zklafxi136f809clv8pag84g698"; + }) + ]; - nativeBuildInputs = [ python ]; + nativeBuildInputs = [ + python3 + ]; - buildInputs = [ cunit dpdk libaio libbsd libuuid numactl openssl ]; + buildInputs = [ + cunit dpdk libaio libbsd libuuid numactl openssl ncurses + ]; postPatch = '' patchShebangs . + base64 -d ${dpdk-compat-patch} | patch -p1 ''; configureFlags = [ "--with-dpdk=${dpdk}" ]; diff --git a/pkgs/development/libraries/telepathy/qt/default.nix b/pkgs/development/libraries/telepathy/qt/default.nix index b8e438819db..2addb86246d 100644 --- a/pkgs/development/libraries/telepathy/qt/default.nix +++ b/pkgs/development/libraries/telepathy/qt/default.nix @@ -1,14 +1,14 @@ -{ stdenv, fetchurl, cmake, qtbase, pkgconfig, python2Packages, dbus-glib, dbus +{ stdenv, fetchurl, cmake, qtbase, pkgconfig, python3Packages, dbus-glib, dbus , telepathy-farstream, telepathy-glib, fetchpatch }: let - inherit (python2Packages) python dbus-python; + inherit (python3Packages) python dbus-python; in stdenv.mkDerivation rec { - name = "telepathy-qt-0.9.7"; + name = "telepathy-qt-0.9.8"; src = fetchurl { url = "https://telepathy.freedesktop.org/releases/telepathy-qt/${name}.tar.gz"; - sha256 = "0krxd4hhfx6r0ja19wh3848j7gn1rv8jrnakgmkbmi7bww5x7fi1"; + sha256 = "bf8e2a09060addb80475a4938105b9b41d9e6837999b7a00e5351783857e18ad"; }; nativeBuildInputs = [ cmake pkgconfig python ]; @@ -16,14 +16,6 @@ in stdenv.mkDerivation rec { buildInputs = [ dbus-glib ]; checkInputs = [ dbus.daemon dbus-python ]; - patches = [ - # https://github.com/TelepathyIM/telepathy-qt/issues/25 - (fetchpatch { - url = "https://github.com/TelepathyIM/telepathy-qt/commit/d654dc70dbec7097e96e6d96ca74ab1b5b00ef8c.patch"; - sha256 = "1jzd9b9rqh3c8xlq8dr7c0r8aabzf5ywv2gpkk6phh3xwngzrfbh"; - }) - ]; - # No point in building tests if they are not run # On 0.9.7, they do not even build with QT4 cmakeFlags = stdenv.lib.optional (!doCheck) "-DENABLE_TESTS=OFF"; diff --git a/pkgs/development/libraries/tremor/default.nix b/pkgs/development/libraries/tremor/default.nix index c2cb8a836bf..722094f859c 100644 --- a/pkgs/development/libraries/tremor/default.nix +++ b/pkgs/development/libraries/tremor/default.nix @@ -1,10 +1,12 @@ -{ stdenv, fetchgit, autoreconfHook, pkgconfig, libogg }: +{ stdenv, fetchFromGitLab, autoreconfHook, pkgconfig, libogg }: stdenv.mkDerivation { name = "tremor-unstable-2018-03-16"; - src = fetchgit { - url = "https://git.xiph.org/tremor.git"; + src = fetchFromGitLab { + owner = "xiph"; + repo = "tremor"; + domain = "gitlab.xiph.org"; rev = "562307a4a7082e24553f3d2c55dab397a17c4b4f"; sha256 = "0m07gq4zfgigsiz8b518xyb19v7qqp76qmp7lb262825vkqzl3zq"; }; diff --git a/pkgs/development/libraries/waylandpp/default.nix b/pkgs/development/libraries/waylandpp/default.nix index 5b02ce826ad..5fc466cec20 100644 --- a/pkgs/development/libraries/waylandpp/default.nix +++ b/pkgs/development/libraries/waylandpp/default.nix @@ -16,13 +16,13 @@ assert docSupport -> doxygen != null; with stdenv.lib; stdenv.mkDerivation rec { pname = "waylandpp"; - version = "0.2.7"; + version = "0.2.8"; src = fetchFromGitHub { owner = "NilsBrause"; repo = pname; rev = version; - sha256 = "1r4m0xhvwpcqxrqvp3hz1bzlkxqj2jiymd5r6hj8xjzz536hyprz"; + sha256 = "1kxiqab48p0n97pwg8c2zx56wqq32m3rcq7qd2pjj33ipcanb3qq"; }; cmakeFlags = [ diff --git a/pkgs/development/libraries/xxHash/default.nix b/pkgs/development/libraries/xxHash/default.nix index 9d2ed44cb4b..58bf562b080 100644 --- a/pkgs/development/libraries/xxHash/default.nix +++ b/pkgs/development/libraries/xxHash/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "xxHash"; - version = "0.7.3"; + version = "0.7.4"; src = fetchFromGitHub { owner = "Cyan4973"; repo = "xxHash"; rev = "v${version}"; - sha256 = "0bin0jch6lbzl4f8y052a7azfgq2n7iwqihzgqmcccv5vq4vcx5a"; + sha256 = "08j7wxshhzpyrnyilfnvhyv5ycm0yv5m7jf6q4kxcd7j4dcbhmpb"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/zlog/default.nix b/pkgs/development/libraries/zlog/default.nix index 4788613a3dc..f0ca99b7667 100644 --- a/pkgs/development/libraries/zlog/default.nix +++ b/pkgs/development/libraries/zlog/default.nix @@ -1,33 +1,23 @@ -{ stdenv, fetchzip }: +{ stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - version = "1.2.14"; + version = "1.2.15"; pname = "zlog"; - src = fetchzip { - name = "${pname}-${version}-src"; - url = "https://github.com/HardySimpson/zlog/archive/${version}.tar.gz"; - sha256 = "1qcrfmh2vbarkx7ij3gwk174qmgmhm2j336bfaakln1ixd9lkxa5"; + src = fetchFromGitHub { + owner = "HardySimpson"; + repo = pname; + rev = version; + sha256 = "10hzifgpml7jm43y6v8c8q0cr9ziyx9qxznafxyw6glhnlqnb7pb"; }; - configurePhase = '' - sed -i 's;-Werror;;' src/makefile - ''; - - buildPhase = '' - mkdir -p $out - make PREFIX=$out - ''; - - installPhase = '' - make PREFIX=$out install - ''; + makeFlags = [ "PREFIX=${placeholder "out"}" ]; meta = with stdenv.lib; { description= "Reliable, high-performance, thread safe, flexible, clear-model, pure C logging library"; - homepage = "http://hardysimpson.github.com/zlog"; + homepage = "https://hardysimpson.github.io/zlog/"; license = licenses.lgpl21; - platforms = platforms.linux; # cannot test on something else + platforms = platforms.unix; maintainers = [ maintainers.matthiasbeyer ]; }; diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index 7eae27d85c6..06d917b74c8 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -1407,6 +1407,23 @@ rapidjson = buildLuarocksPackage { license.fullName = "MIT"; }; }; +readline = buildLuarocksPackage { + pname = "readline"; + version = "2.6-0"; + + src = fetchurl { + url = mirror://luarocks/readline-2.6-0.src.rock; + sha256 = "1fvz7nqvkdazp30wn5n62n8i97qrfgznbykdpf8cnflqfpd1shms"; + }; + disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); + propagatedBuildInputs = [ lua luaposix ]; + + meta = with stdenv.lib; { + homepage = "http://www.pjb.com.au/comp/lua/readline.html"; + description = "Interface to the readline library"; + license.fullName = "MIT/X11"; + }; +}; say = buildLuarocksPackage { pname = "say"; version = "1.3-1"; diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix index 94edbd0737b..26260872e18 100644 --- a/pkgs/development/lua-modules/overrides.nix +++ b/pkgs/development/lua-modules/overrides.nix @@ -328,6 +328,23 @@ with super; ''; }); + readline = (super.readline.override ({ + unpackCmd = '' + unzip "$curSrc" + tar xf *.tar.gz + ''; + propagatedBuildInputs = super.readline.propagatedBuildInputs ++ [ pkgs.readline ]; + extraVariables = rec { + READLINE_INCDIR = "${pkgs.readline.dev}/include"; + HISTORY_INCDIR = READLINE_INCDIR; + }; + })).overrideAttrs (old: { + # Without this, source root is wrongly set to ./readline-2.6/doc + setSourceRoot = '' + sourceRoot=./readline-2.6 + ''; + }); + pulseaudio = super.pulseaudio.override({ buildInputs = [ pkgs.libpulseaudio diff --git a/pkgs/development/misc/h3/default.nix b/pkgs/development/misc/h3/default.nix index 2b82cc2c0ae..32f65c0925c 100644 --- a/pkgs/development/misc/h3/default.nix +++ b/pkgs/development/misc/h3/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "h3"; - version = "3.6.3"; + version = "3.6.4"; src = fetchFromGitHub { owner = "uber"; repo = "h3"; rev = "v${version}"; - sha256 = "1zgq496m2pk2c1l0r1di0p39nxwza00kxzqa971qd4xgbrvd4w55"; + sha256 = "1a4scs5n9srq6sjkz8d60ffzpc6aadkxmk1i3hdj081j0jzsrpf7"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/ocaml-modules/angstrom/default.nix b/pkgs/development/ocaml-modules/angstrom/default.nix index b05190ed491..3aecfde8a7d 100644 --- a/pkgs/development/ocaml-modules/angstrom/default.nix +++ b/pkgs/development/ocaml-modules/angstrom/default.nix @@ -2,7 +2,7 @@ buildDunePackage rec { pname = "angstrom"; - version = "0.13.0"; + version = "0.14.1"; minimumOCamlVersion = "4.04"; @@ -10,7 +10,7 @@ buildDunePackage rec { owner = "inhabitedtype"; repo = pname; rev = version; - sha256 = "0vzbwd8j34iv7n6gwqq2mf25q7rqpnpxnifb9ssxhq55p5dd1kp4"; + sha256 = "1l69y0qspgi7kgrphyh7718hjb2sml1a9lljkp65bkqmmmi6ybly"; }; checkInputs = [ alcotest ]; diff --git a/pkgs/development/ocaml-modules/bigarray-overlap/default.nix b/pkgs/development/ocaml-modules/bigarray-overlap/default.nix new file mode 100644 index 00000000000..e02b1159a9c --- /dev/null +++ b/pkgs/development/ocaml-modules/bigarray-overlap/default.nix @@ -0,0 +1,28 @@ +{ lib, buildDunePackage, fetchurl +, bigarray-compat, alcotest, astring, fpath, bos, findlib, pkg-config +}: + +buildDunePackage rec { + pname = "bigarray-overlap"; + version = "0.2.0"; + + src = fetchurl { + url = "https://github.com/dinosaure/overlap/releases/download/v${version}/bigarray-overlap-v${version}.tbz"; + sha256 = "1v86avafsbyxjccy0y9gny31s2jzb0kd42v3mhcalklx5f044lcy"; + }; + + minimumOCamlVersion = "4.07"; + useDune2 = true; + + propagatedBuildInputs = [ bigarray-compat ]; + + checkInputs = [ alcotest astring fpath bos findlib pkg-config ]; + doCheck = true; + + meta = with lib; { + homepage = "https://github.com/dinosaure/overlap"; + description = "A minimal library to know that 2 bigarray share physically the same memory or not"; + license = licenses.mit; + maintainers = [ maintainers.sternenseemann ]; + }; +} diff --git a/pkgs/development/ocaml-modules/encore/default.nix b/pkgs/development/ocaml-modules/encore/default.nix index ab91117ac08..dd05982c3ca 100644 --- a/pkgs/development/ocaml-modules/encore/default.nix +++ b/pkgs/development/ocaml-modules/encore/default.nix @@ -1,15 +1,21 @@ -{ lib, buildDunePackage, fetchurl, ocaml, alcotest, angstrom, ke }: +{ lib, buildDunePackage, fetchurl, ocaml +, fmt, bigstringaf, bigarray-compat +, bigarray-overlap, angstrom, ke, alcotest }: buildDunePackage rec { pname = "encore"; - version = "0.3"; + version = "0.5"; + src = fetchurl { url = "https://github.com/mirage/encore/releases/download/v${version}/encore-v${version}.tbz"; - sha256 = "05nv6yms5axsmq9cspr7884rz5kirj50izx3vdm89q4yl186qykl"; + sha256 = "15n0dla149k9h7migs76wap08z5402qcvxyqxzl887ha6isj3p9n"; }; - propagatedBuildInputs = [ angstrom ke ]; - checkInputs = lib.optional doCheck alcotest; - doCheck = lib.versions.majorMinor ocaml.version != "4.07"; + + useDune2 = true; + + propagatedBuildInputs = [ angstrom ke fmt bigstringaf bigarray-compat bigarray-overlap ]; + checkInputs = [ alcotest ]; + doCheck = true; meta = { homepage = "https://github.com/mirage/encore"; diff --git a/pkgs/development/ocaml-modules/git-http/default.nix b/pkgs/development/ocaml-modules/git-http/default.nix index 89a1803b520..3b127c65006 100644 --- a/pkgs/development/ocaml-modules/git-http/default.nix +++ b/pkgs/development/ocaml-modules/git-http/default.nix @@ -1,12 +1,12 @@ -{ buildDunePackage, git, cohttp-lwt, alcotest, mtime, nocrypto }: +{ buildDunePackage, git, cohttp, cohttp-lwt }: buildDunePackage { pname = "git-http"; - inherit (git) version src; + inherit (git) version src minimumOCamlVersion; - buildInputs = [ alcotest mtime nocrypto ]; - propagatedBuildInputs = [ git cohttp-lwt ]; - doCheck = true; + useDune2 = true; + + propagatedBuildInputs = [ git cohttp cohttp-lwt ]; meta = { description = "Client implementation of the “Smart” HTTP Git protocol in pure OCaml"; diff --git a/pkgs/development/ocaml-modules/git-unix/default.nix b/pkgs/development/ocaml-modules/git-unix/default.nix index 072d7fdb5cb..0633b8af8f0 100644 --- a/pkgs/development/ocaml-modules/git-unix/default.nix +++ b/pkgs/development/ocaml-modules/git-unix/default.nix @@ -1,13 +1,17 @@ -{ buildDunePackage, git-http, cohttp-lwt-unix, tls, cmdliner, mtime }: +{ stdenv, buildDunePackage, git-http, cohttp, cohttp-lwt-unix +, mmap, cmdliner, mtime, alcotest, mirage-crypto-rng, tls +, io-page, git-binary +}: buildDunePackage { pname = "git-unix"; - inherit (git-http) version src; + inherit (git-http) version src minimumOCamlVersion; useDune2 = true; - buildInputs = [ cmdliner mtime ]; - propagatedBuildInputs = [ cohttp-lwt-unix git-http tls ]; + propagatedBuildInputs = [ mmap cmdliner git-http cohttp cohttp-lwt-unix mtime ]; + checkInputs = [ alcotest mirage-crypto-rng tls io-page git-binary ]; + doCheck = !stdenv.isAarch64; meta = { description = "Unix backend for the Git protocol(s)"; diff --git a/pkgs/development/ocaml-modules/git/default.nix b/pkgs/development/ocaml-modules/git/default.nix index 741e004979c..d28e8ef2e7b 100644 --- a/pkgs/development/ocaml-modules/git/default.nix +++ b/pkgs/development/ocaml-modules/git/default.nix @@ -1,23 +1,30 @@ -{ lib, fetchurl, buildDunePackage -, alcotest, git, mtime, nocrypto -, angstrom, astring, cstruct, decompress, digestif, encore, duff, fmt +{ stdenv, fetchurl, buildDunePackage +, alcotest, mtime, mirage-crypto-rng, tls, git-binary +, angstrom, astring, cstruct, decompress, digestif, encore, duff, fmt, checkseum , fpath, hex, ke, logs, lru, ocaml_lwt, ocamlgraph, ocplib-endian, uri, rresult +, stdlib-shims }: buildDunePackage rec { - pname = "git"; - version = "2.1.2"; + pname = "git"; + version = "2.1.3"; + + minimumOCamlVersion = "4.07"; + useDune2 = true; src = fetchurl { url = "https://github.com/mirage/ocaml-git/releases/download/${version}/git-${version}.tbz"; - sha256 = "0yyclsh255k7pvc2fcsdi8k2fcrr0by2nz6g3sqnwlimjyp7mz5j"; + sha256 = "1ppllv65vrkfrmx46aiq5879isffcjmg92z9rv2kh92a83h4lqax"; }; - propagatedBuildInputs = [ angstrom astring cstruct decompress digestif encore duff fmt fpath hex ke logs lru ocaml_lwt ocamlgraph ocplib-endian uri rresult ]; - checkInputs = lib.optionals doCheck [ alcotest git mtime nocrypto ]; - doCheck = true; + propagatedBuildInputs = [ + angstrom astring checkseum cstruct decompress digestif encore duff fmt fpath + hex ke logs lru ocaml_lwt ocamlgraph ocplib-endian uri rresult stdlib-shims + ]; + checkInputs = [ alcotest mtime mirage-crypto-rng tls git-binary ]; + doCheck = !stdenv.isAarch64; - meta = { + meta = with stdenv; { description = "Git format and protocol in pure OCaml"; license = lib.licenses.isc; maintainers = [ lib.maintainers.vbgl ]; diff --git a/pkgs/development/ocaml-modules/index/default.nix b/pkgs/development/ocaml-modules/index/default.nix index d0857f7ef0a..f4b1844d684 100644 --- a/pkgs/development/ocaml-modules/index/default.nix +++ b/pkgs/development/ocaml-modules/index/default.nix @@ -1,18 +1,18 @@ -{ lib, fetchurl, buildDunePackage, fmt, logs, stdlib-shims }: +{ lib, fetchurl, buildDunePackage, fmt, logs, mtime, stdlib-shims }: buildDunePackage rec { pname = "index"; - version = "1.2.0"; + version = "1.2.1"; minimumOCamlVersion = "4.07"; src = fetchurl { url = "https://github.com/mirage/index/releases/download/${version}/index-${version}.tbz"; - sha256 = "0d44s1d2mpxvpg0zh57c928wf1w1wd33l1fw5r62al5zmi710ff6"; + sha256 = "1a9b6rsazrjy07syxl9ix5002i95mlvx5vk7nl2x9cs6s0zw906d"; }; buildInputs = [ stdlib-shims ]; - propagatedBuildInputs = [ fmt logs ]; + propagatedBuildInputs = [ fmt logs mtime ]; meta = { homepage = "https://github.com/mirage/index"; diff --git a/pkgs/development/ocaml-modules/irmin/default.nix b/pkgs/development/ocaml-modules/irmin/default.nix index cba67759167..2e3e27df7ff 100644 --- a/pkgs/development/ocaml-modules/irmin/default.nix +++ b/pkgs/development/ocaml-modules/irmin/default.nix @@ -1,31 +1,22 @@ { lib, fetchurl, buildDunePackage , astring, base64, digestif, fmt, jsonm, logs, ocaml_lwt, ocamlgraph, uri -, alcotest, hex +, alcotest, hex, ppx_irmin }: -buildDunePackage rec { - +buildDunePackage { pname = "irmin"; - version = "2.1.0"; + inherit (ppx_irmin) src version; + + useDune2 = true; minimumOCamlVersion = "4.07"; - src = fetchurl { - url = "https://github.com/mirage/irmin/releases/download/${version}/irmin-${version}.tbz"; - sha256 = "1ji8r7zbdmhbk8r8w2hskd9z7pnvirzbhincfxndxgdaxbfkff5g"; - }; - propagatedBuildInputs = [ astring base64 digestif fmt jsonm logs ocaml_lwt ocamlgraph uri ]; - checkInputs = lib.optionals doCheck [ alcotest hex ]; - + checkInputs = [ alcotest hex ppx_irmin ]; doCheck = true; - meta = { - homepage = "https://irmin.org/"; + meta = ppx_irmin.meta // { description = "A distributed database built on the same principles as Git"; - license = lib.licenses.isc; - maintainers = [ lib.maintainers.vbgl ]; }; - } diff --git a/pkgs/development/ocaml-modules/irmin/fs.nix b/pkgs/development/ocaml-modules/irmin/fs.nix index b1987aa7cbc..0e9596751b8 100644 --- a/pkgs/development/ocaml-modules/irmin/fs.nix +++ b/pkgs/development/ocaml-modules/irmin/fs.nix @@ -8,6 +8,8 @@ buildDunePackage rec { propagatedBuildInputs = [ irmin ]; + useDune2 = true; + checkInputs = lib.optional doCheck irmin-test; doCheck = true; diff --git a/pkgs/development/ocaml-modules/irmin/graphql.nix b/pkgs/development/ocaml-modules/irmin/graphql.nix index 41355fc3986..6e4598dd986 100644 --- a/pkgs/development/ocaml-modules/irmin/graphql.nix +++ b/pkgs/development/ocaml-modules/irmin/graphql.nix @@ -10,7 +10,8 @@ buildDunePackage rec { propagatedBuildInputs = [ cohttp-lwt graphql-cohttp graphql-lwt irmin ]; - doCheck = true; + # test requires network + doCheck = false; meta = irmin.meta // { description = "GraphQL server for Irmin"; diff --git a/pkgs/development/ocaml-modules/irmin/mem.nix b/pkgs/development/ocaml-modules/irmin/mem.nix index b7040b9db0d..1b8947849a9 100644 --- a/pkgs/development/ocaml-modules/irmin/mem.nix +++ b/pkgs/development/ocaml-modules/irmin/mem.nix @@ -6,6 +6,8 @@ buildDunePackage rec { inherit (irmin) version src; + useDune2 = true; + propagatedBuildInputs = [ irmin ]; checkInputs = lib.optional doCheck irmin-test; diff --git a/pkgs/development/ocaml-modules/irmin/pack.nix b/pkgs/development/ocaml-modules/irmin/pack.nix index c374b1a2275..b0081eb366e 100644 --- a/pkgs/development/ocaml-modules/irmin/pack.nix +++ b/pkgs/development/ocaml-modules/irmin/pack.nix @@ -7,6 +7,8 @@ buildDunePackage rec { inherit (irmin) version src; + useDune2 = true; + propagatedBuildInputs = [ index irmin ocaml_lwt ]; checkInputs = lib.optionals doCheck [ alcotest-lwt irmin-test ]; diff --git a/pkgs/development/ocaml-modules/irmin/ppx.nix b/pkgs/development/ocaml-modules/irmin/ppx.nix index 5366a04456d..35aa659fbc8 100644 --- a/pkgs/development/ocaml-modules/irmin/ppx.nix +++ b/pkgs/development/ocaml-modules/irmin/ppx.nix @@ -1,16 +1,29 @@ -{ lib, buildDunePackage, ppxlib, ocaml-syntax-shims, irmin }: +{ lib, fetchurl, buildDunePackage, ppxlib, ocaml-syntax-shims }: -buildDunePackage { +buildDunePackage rec { pname = "ppx_irmin"; + version = "2.2.0"; - inherit (irmin) version src minimumOCamlVersion; + src = fetchurl { + url = "https://github.com/mirage/irmin/releases/download/${version}/irmin-${version}.tbz"; + sha256 = "0gzw918b661qkvd140hilww9jsc49rxsxz1k4iihyvikjn202km4"; + }; + + minimumOCamlVersion = "4.06"; useDune2 = true; buildInputs = [ ocaml-syntax-shims ]; propagatedBuildInputs = [ ppxlib ]; - meta = irmin.meta // { + # tests depend on irmin, would create mutual dependency + # opt to test irmin instead of ppx_irmin + doCheck = false; + + meta = { + homepage = "https://irmin.org/"; description = "PPX deriver for Irmin generics"; + license = lib.licenses.isc; + maintainers = [ lib.maintainers.vbgl ]; }; } diff --git a/pkgs/development/ocaml-modules/irmin/test.nix b/pkgs/development/ocaml-modules/irmin/test.nix index 57e33e2db8a..b8a3f3ae245 100644 --- a/pkgs/development/ocaml-modules/irmin/test.nix +++ b/pkgs/development/ocaml-modules/irmin/test.nix @@ -6,6 +6,8 @@ buildDunePackage { inherit (irmin) version src; + useDune2 = true; + propagatedBuildInputs = [ alcotest cmdliner irmin metrics-unix mtime ]; meta = irmin.meta // { diff --git a/pkgs/development/ocaml-modules/janestreet/default.nix b/pkgs/development/ocaml-modules/janestreet/default.nix index ff93d65357a..69f4e6f61d8 100644 --- a/pkgs/development/ocaml-modules/janestreet/default.nix +++ b/pkgs/development/ocaml-modules/janestreet/default.nix @@ -533,6 +533,7 @@ rec { pname = "email_message"; hash = "131jd72k4s8cdbgg6gyg7w5v8mphdlvdx4fgvh8d9a1m7kkvbxfg"; propagatedBuildInputs = [ async angstrom core_extended cryptokit magic-mime ounit ]; + patches = [ ./email-message-angstrom-0.14.patch ]; meta.description = "E-mail message parser"; }; diff --git a/pkgs/development/ocaml-modules/janestreet/email-message-angstrom-0.14.patch b/pkgs/development/ocaml-modules/janestreet/email-message-angstrom-0.14.patch new file mode 100644 index 00000000000..624a3e5334b --- /dev/null +++ b/pkgs/development/ocaml-modules/janestreet/email-message-angstrom-0.14.patch @@ -0,0 +1,22 @@ +diff --git a/email_address/src/email_address.ml b/email_address/src/email_address.ml +index 7470273..d070465 100644 +--- a/email_address/src/email_address.ml ++++ b/email_address/src/email_address.ml +@@ -38,7 +38,7 @@ module Stable = struct + let of_string ?default_domain input_str = + let open Core_kernel in + let open! Int.Replace_polymorphic_compare in +- match Angstrom.parse_string Email_address_parser_stable_v1.email_only input_str with ++ match Angstrom.parse_string ~consume:Prefix Email_address_parser_stable_v1.email_only input_str with + | Error error -> + Or_error.error_s [%message + "Failed to parse email address" +@@ -104,7 +104,7 @@ module T = Stable.V1.With_comparator + include T + + let list_of_string ?default_domain input_str = +- match Angstrom.parse_string Email_address_parser_stable_v1.email_list_only input_str with ++ match Angstrom.parse_string ~consume:Prefix Email_address_parser_stable_v1.email_list_only input_str with + | Error error -> + Or_error.error_s [%message + "Failed to parse email address(es)" diff --git a/pkgs/development/ocaml-modules/ocaml-gettext/default.nix b/pkgs/development/ocaml-modules/ocaml-gettext/default.nix index 547fa77ae6e..ba571b32084 100644 --- a/pkgs/development/ocaml-modules/ocaml-gettext/default.nix +++ b/pkgs/development/ocaml-modules/ocaml-gettext/default.nix @@ -1,21 +1,23 @@ -{ lib, fetchurl, buildDunePackage, gettext, fileutils, ounit }: +{ lib, fetchurl, buildDunePackage, cppo, gettext, fileutils, ounit }: buildDunePackage rec { pname = "gettext"; - version = "0.4.1"; + version = "0.4.2"; minimumOCamlVersion = "4.03"; src = fetchurl { url = "https://github.com/gildor478/ocaml-gettext/releases/download/v${version}/gettext-v${version}.tbz"; - sha256 = "0pwy6ym5fd77mdbgyas8x86vbrri9cgk79g8wxdjplhyi7zhh158"; + sha256 = "19ynsldb21r539fiwz1f43apsdnx7hj2a2d9qr9wg2hva9y2qrwb"; }; + buildInputs = [ cppo ]; + propagatedBuildInputs = [ gettext fileutils ]; doCheck = true; - checkInputs = lib.optional doCheck ounit; + checkInputs = [ ounit ]; dontStrip = true; diff --git a/pkgs/development/ocaml-modules/webmachine/default.nix b/pkgs/development/ocaml-modules/webmachine/default.nix index 79e36b66d11..3bf163607cd 100644 --- a/pkgs/development/ocaml-modules/webmachine/default.nix +++ b/pkgs/development/ocaml-modules/webmachine/default.nix @@ -5,7 +5,7 @@ buildDunePackage rec { pname = "webmachine"; - version = "0.6.1"; + version = "0.6.2"; minimumOCamlVersion = "4.04"; @@ -13,7 +13,7 @@ buildDunePackage rec { owner = "inhabitedtype"; repo = "ocaml-webmachine"; rev = "${version}"; - sha256 = "0kpbxsvjzylbxmxag77k1c8m8mwn4f4xscqk2i7fc591llgq9fp3"; + sha256 = "1zi1vsm589y2njwzsqkmdbxvs9s4xlgbd62xqw2scp60mccp09nk"; }; propagatedBuildInputs = [ cohttp dispatch ptime ]; diff --git a/pkgs/development/perl-modules/Percona-Toolkit/default.nix b/pkgs/development/perl-modules/Percona-Toolkit/default.nix index 58ccd2bc8be..85feee36b50 100644 --- a/pkgs/development/perl-modules/Percona-Toolkit/default.nix +++ b/pkgs/development/perl-modules/Percona-Toolkit/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, buildPerlPackage, DBDmysql, DBI, IOSocketSSL, TermReadKey }: +{ lib, fetchFromGitHub, buildPerlPackage, DBDmysql, DBI, IOSocketSSL, TermReadKey, shortenPerlShebang }: buildPerlPackage { pname = "Percona-Toolkit"; @@ -10,7 +10,11 @@ buildPerlPackage { sha256 = "0xk4h4dzl80kf97lbx0nznx9ajrb6kkg7k3iwca3rj6f3rqggv9y"; }; outputs = [ "out" ]; + nativeBuildInputs = [ shortenPerlShebang ]; buildInputs = [ DBDmysql DBI IOSocketSSL TermReadKey ]; + postInstall = '' + shortenPerlShebang $(grep -l "/bin/env perl" $out/bin/*) + ''; meta = { description = ''Collection of advanced command-line tools to perform a variety of MySQL and system tasks.''; homepage = "http://www.percona.com/software/percona-toolkit"; diff --git a/pkgs/development/python-modules/apache-airflow/default.nix b/pkgs/development/python-modules/apache-airflow/default.nix index f8ef6b9492a..ca2cb03f967 100644 --- a/pkgs/development/python-modules/apache-airflow/default.nix +++ b/pkgs/development/python-modules/apache-airflow/default.nix @@ -46,7 +46,6 @@ , thrift , tzlocal , unicodecsv -, werkzeug , zope_deprecation , enum34 , typing @@ -127,7 +126,6 @@ buildPythonPackage rec { thrift tzlocal unicodecsv - werkzeug zope_deprecation ]; @@ -143,24 +141,25 @@ buildPythonPackage rec { --replace "pandas>=0.17.1, <1.0.0" "pandas" \ --replace "flask-caching>=1.3.3, <1.4.0" "flask-caching" \ --replace "flask-appbuilder>=1.12.5, <2.0.0" "flask-appbuilder" \ + --replace "flask-admin==1.5.3" "flask-admin" \ + --replace "flask-login>=0.3, <0.5" "flask-login" \ --replace "pendulum==1.4.4" "pendulum" \ --replace "cached_property~=1.5" "cached_property" \ --replace "dill>=0.2.2, <0.3" "dill" \ --replace "configparser>=3.5.0, <3.6.0" "configparser" \ - --replace "jinja2>=2.7.3, <=2.10.0" "jinja2" \ + --replace "jinja2>=2.10.1, <2.11.0" "jinja2" \ --replace "colorlog==4.0.2" "colorlog" \ --replace "funcsigs==1.0.0" "funcsigs" \ --replace "flask-swagger==0.2.13" "flask-swagger" \ --replace "python-daemon>=2.1.1, <2.2" "python-daemon" \ - --replace "alembic>=0.9, <1.0" "alembic" \ + --replace "alembic>=1.0, <2.0" "alembic" \ --replace "markdown>=2.5.2, <3.0" "markdown" \ --replace "future>=0.16.0, <0.17" "future" \ --replace "tenacity==4.12.0" "tenacity" \ --replace "text-unidecode==1.2" "text-unidecode" \ --replace "tzlocal>=1.4,<2.0.0" "tzlocal" \ --replace "sqlalchemy~=1.3" "sqlalchemy" \ - --replace "gunicorn>=19.5.0, <20.0" "gunicorn" \ - --replace "werkzeug>=0.14.1, <0.15.0" "werkzeug" + --replace "gunicorn>=19.5.0, <20.0" "gunicorn" # dumb-init is only needed for CI and Docker, not relevant for NixOS. substituteInPlace setup.py \ diff --git a/pkgs/development/python-modules/audio-metadata/default.nix b/pkgs/development/python-modules/audio-metadata/default.nix index f477cbfc0a8..1adee4403b9 100644 --- a/pkgs/development/python-modules/audio-metadata/default.nix +++ b/pkgs/development/python-modules/audio-metadata/default.nix @@ -19,7 +19,8 @@ buildPythonPackage rec { postPatch = '' substituteInPlace setup.py \ --replace "bidict>=0.17,<0.18" "bidict" \ - --replace "more-itertools>=4.0,<8.0" "more-itertools" + --replace "more-itertools>=4.0,<8.0" "more-itertools" \ + --replace "pendulum>=2.0,<=3.0,!=2.0.5,!=2.1.0" "pendulum>=2.0,<=3.0" ''; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/bidict/default.nix b/pkgs/development/python-modules/bidict/default.nix index e29263a6b4f..ec0440b9e44 100644 --- a/pkgs/development/python-modules/bidict/default.nix +++ b/pkgs/development/python-modules/bidict/default.nix @@ -23,6 +23,12 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools_scm ]; propagatedBuildInputs = [ sphinx ]; + # this can be removed >0.19.0 + postPatch = '' + substituteInPlace setup.py \ + --replace "setuptools_scm < 4" "setuptools_scm" + ''; + checkInputs = [ hypothesis py diff --git a/pkgs/development/python-modules/canmatrix/default.nix b/pkgs/development/python-modules/canmatrix/default.nix index b9a61af8b48..6e487b58cff 100644 --- a/pkgs/development/python-modules/canmatrix/default.nix +++ b/pkgs/development/python-modules/canmatrix/default.nix @@ -4,6 +4,7 @@ , pythonOlder , attrs , bitstruct +, click , future , pathlib2 , typing @@ -17,20 +18,21 @@ buildPythonPackage rec { pname = "canmatrix"; - version = "0.8"; + version = "0.9.1"; # uses fetchFromGitHub as PyPi release misses test/ dir src = fetchFromGitHub { owner = "ebroecker"; repo = pname; rev = version; - sha256 = "1wzflapyj2j4xsi7d7gfmznmxbgr658n092xyq9nac46rbhpcphg"; + sha256 = "129lcchq45h8wqjvvn0rwpbmih4m0igass2cx7a21z94li97hcia"; }; propagatedBuildInputs = [ # required attrs bitstruct + click future pathlib2 # optional @@ -41,12 +43,18 @@ buildPythonPackage rec { pyyaml ] ++ lib.optional (pythonOlder "3.5") typing; + postPatch = '' + substituteInPlace setup.py \ + --replace "version = versioneer.get_version()" "version = \"${version}\"" + ''; + checkInputs = [ pytest ]; + # long_envvar_name_imports requires stable key value pair ordering checkPhase = '' - pytest -s src/canmatrix + pytest -s src/canmatrix -k 'not long_envvar_name_imports' ''; meta = with lib; { diff --git a/pkgs/development/python-modules/canopen/default.nix b/pkgs/development/python-modules/canopen/default.nix index 83dd1f006fc..c064fd62fd9 100644 --- a/pkgs/development/python-modules/canopen/default.nix +++ b/pkgs/development/python-modules/canopen/default.nix @@ -1,33 +1,19 @@ { lib , buildPythonPackage -, fetchFromGitHub +, fetchPypi , nose , can , canmatrix }: -buildPythonPackage { +buildPythonPackage rec { pname = "canopen"; - version = "0.5.1"; + version = "1.1.0"; - # use fetchFromGitHub until version containing test/sample.eds - # is available on PyPi - # https://github.com/christiansandberg/canopen/pull/57 - - src = fetchFromGitHub { - owner = "christiansandberg"; - repo = "canopen"; - rev = "b20575d84c3aef790fe7c38c5fc77601bade0ea4"; - sha256 = "1qg47qrkyvyxiwi13sickrkk89jp9s91sly2y90bz0jhws2bxh64"; + src = fetchPypi { + inherit pname version; + sha256 = "0fqa4p3qg7800fykib1x264gizhhmb6dz2hajgwr0hxf5xa19wdl"; }; - #src = fetchPypi { - # inherit pname version; - # sha256 = "0806cykarpjb9ili3mf82hsd9gdydbks8532nxgz93qzg4zdbv2g"; - #}; - - # test_pdo failure https://github.com/christiansandberg/canopen/issues/58 - doCheck = false; - propagatedBuildInputs = [ can canmatrix diff --git a/pkgs/development/python-modules/cssselect2/default.nix b/pkgs/development/python-modules/cssselect2/default.nix index 3aa8ab62240..b1969022d96 100644 --- a/pkgs/development/python-modules/cssselect2/default.nix +++ b/pkgs/development/python-modules/cssselect2/default.nix @@ -1,8 +1,16 @@ -{ lib, buildPythonPackage, fetchPypi, tinycss2, pytest, pytestrunner }: +{ lib +, buildPythonPackage +, pythonOlder +, fetchPypi +, tinycss2 +, pytest +, pytestrunner +}: buildPythonPackage rec { pname = "cssselect2"; version = "0.3.0"; + disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; @@ -11,12 +19,10 @@ buildPythonPackage rec { # We're not interested in code quality tests postPatch = '' - substituteInPlace setup.py \ + substituteInPlace setup.cfg \ --replace "pytest-cov" "" \ --replace "pytest-flake8" "" \ - --replace "pytest-isort" "" - substituteInPlace setup.cfg \ - --replace "--cov=cssselect2" "" \ + --replace "pytest-isort" "" \ --replace "--flake8" "" \ --replace "--isort" "" ''; diff --git a/pkgs/development/python-modules/dm-sonnet/default.nix b/pkgs/development/python-modules/dm-sonnet/default.nix index 1f9c61e4ed4..627f8eedaeb 100644 --- a/pkgs/development/python-modules/dm-sonnet/default.nix +++ b/pkgs/development/python-modules/dm-sonnet/default.nix @@ -36,7 +36,7 @@ let bazelTarget = ":install"; fetchAttrs = { - sha256 = "1gag2xghik68zblhwbdd206hs8nxp2sclw182x2qi78jqgfnq5ci"; + sha256 = "1dka5nap3d28n18pn3wp5xsi4x3z02h1j8rcjdvi3y6dbqjwdw0v"; }; bazelFlags = [ diff --git a/pkgs/development/python-modules/flask-appbuilder/default.nix b/pkgs/development/python-modules/flask-appbuilder/default.nix index 01bd180a5ae..5119d3c39ac 100644 --- a/pkgs/development/python-modules/flask-appbuilder/default.nix +++ b/pkgs/development/python-modules/flask-appbuilder/default.nix @@ -66,7 +66,8 @@ buildPythonPackage rec { --replace "marshmallow>=2.18.0, <4.0.0" "marshmallow" \ --replace "PyJWT>=1.7.1" "PyJWT" \ --replace "Flask-SQLAlchemy>=2.4, <3" "Flask-SQLAlchemy" \ - --replace "Flask-JWT-Extended>=3.18, <4" "Flask-JWT-Extended" + --replace "Flask-JWT-Extended>=3.18, <4" "Flask-JWT-Extended" \ + --replace "Flask-Login>=0.3, <0.5" "Flask-Login" ''; # majority of tests require network access or mongo diff --git a/pkgs/development/python-modules/google-music-proto/default.nix b/pkgs/development/python-modules/google-music-proto/default.nix index af57e3209d1..16363192c81 100644 --- a/pkgs/development/python-modules/google-music-proto/default.nix +++ b/pkgs/development/python-modules/google-music-proto/default.nix @@ -19,6 +19,8 @@ buildPythonPackage rec { postPatch = '' sed -i -e "/audio-metadata/c\'audio-metadata'," -e "/marshmallow/c\'marshmallow'," setup.py + substituteInPlace setup.py \ + --replace "pendulum>=2.0,<=3.0,!=2.0.5,!=2.1.0" "pendulum>=2.0,<=3.0" ''; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/graphite-web/update-django-tagging.patch b/pkgs/development/python-modules/graphite-web/update-django-tagging.patch index 48d16d50f42..9774f7e70a7 100644 --- a/pkgs/development/python-modules/graphite-web/update-django-tagging.patch +++ b/pkgs/development/python-modules/graphite-web/update-django-tagging.patch @@ -1,12 +1,13 @@ -diff -Nur a/setup.py b/setup.py ---- a/setup.py 2020-03-12 18:45:34.654296302 +0100 -+++ b/setup.py 2020-03-12 18:46:17.476893828 +0100 -@@ -115,7 +115,7 @@ +diff --git a/setup.py b/setup.py +index a1a21f1..f0d1051 100644 +--- a/setup.py ++++ b/setup.py +@@ -117,7 +117,7 @@ try: ['templates/*', 'local_settings.py.example']}, scripts=glob('bin/*'), data_files=list(webapp_content.items()) + storage_dirs + conf_files + examples, -- install_requires=['Django>=1.8,<2.3', 'django-tagging==0.4.3', 'pytz', 'pyparsing', 'cairocffi', 'urllib3', 'scandir', 'six'], -+ install_requires=['Django>=1.8,<2.3', 'django-tagging==0.4.6', 'pytz', 'pyparsing', 'cairocffi', 'urllib3', 'scandir', 'six'], +- install_requires=['Django>=1.8,<3.1', 'django-tagging==0.4.3', 'pytz', ++ install_requires=['Django>=1.8,<3.1', 'django-tagging==0.5.0', 'pytz', + 'pyparsing', 'cairocffi', 'urllib3', 'scandir', 'six'], classifiers=[ 'Intended Audience :: Developers', - 'Natural Language :: English', diff --git a/pkgs/development/python-modules/html-sanitizer/default.nix b/pkgs/development/python-modules/html-sanitizer/default.nix new file mode 100644 index 00000000000..17783f38d1f --- /dev/null +++ b/pkgs/development/python-modules/html-sanitizer/default.nix @@ -0,0 +1,21 @@ +{ lib, buildPythonPackage, fetchFromGitHub, lxml, beautifulsoup4, pytest, pytestrunner }: + +buildPythonPackage rec { + pname = "html-sanitizer"; + version = "1.9.1"; + + src = fetchFromGitHub { + owner = "matthiask"; + repo = pname; + rev = version; + sha256 = "0nnv34924r0yn01rwlk749j5ijy7yxyj302s1i57yjrkqr3zlvas"; + }; + + propagatedBuildInputs = [ lxml beautifulsoup4 ]; + + meta = with lib; { + description = "An allowlist-based and very opinionated HTML sanitizer that can be used both for untrusted and trusted sources."; + homepage = "https://github.com/matthiask/html-sanitizer"; + license = licenses.bsd3; + }; +} diff --git a/pkgs/development/python-modules/i3ipc/default.nix b/pkgs/development/python-modules/i3ipc/default.nix index f5a8fc1e46c..4cc8574c842 100644 --- a/pkgs/development/python-modules/i3ipc/default.nix +++ b/pkgs/development/python-modules/i3ipc/default.nix @@ -1,20 +1,19 @@ { stdenv, buildPythonPackage, fetchFromGitHub -, enum-compat , xorgserver, pytest, pytest-xvfb, pytest-asyncio, i3, python, xlib, xdpyinfo , makeFontsConf, coreutils }: buildPythonPackage rec { pname = "i3ipc"; - version = "2.1.1"; + version = "2.2.1"; src = fetchFromGitHub { owner = "acrisci"; repo = "i3ipc-python"; rev = "v${version}"; - sha256 = "10zpbiw1gcndn439g1vxcdkxllwp02qcmaal4w7hi2rzgaw1xkdk"; + sha256 = "13bzs9dcv27czpnnbgz7a037lm8h991c8gk0qzzk5mq5yak24715"; }; - propagatedBuildInputs = [ enum-compat xlib ]; + propagatedBuildInputs = [ xlib ]; fontsConf = makeFontsConf { fontDirectories = [ ]; diff --git a/pkgs/development/python-modules/imageio/default.nix b/pkgs/development/python-modules/imageio/default.nix index 3497d748575..4868f3ae371 100644 --- a/pkgs/development/python-modules/imageio/default.nix +++ b/pkgs/development/python-modules/imageio/default.nix @@ -1,5 +1,6 @@ { stdenv , buildPythonPackage +, isPy27 , pathlib , fetchPypi , pillow @@ -16,6 +17,7 @@ buildPythonPackage rec { pname = "imageio"; version = "2.8.0"; + disabled = isPy27; src = fetchPypi { sha256 = "fb5fd6d3d17126bbaac9af29fe340e2c97a196eb9416d4f28c0e543744a152cf"; @@ -25,11 +27,7 @@ buildPythonPackage rec { checkInputs = [ pytest psutil ] ++ stdenv.lib.optionals isPy3k [ imageio-ffmpeg ffmpeg_3 ]; - propagatedBuildInputs = [ numpy pillow ] ++ stdenv.lib.optionals (!isPy3k) [ - futures - enum34 - pathlib - ]; + propagatedBuildInputs = [ numpy pillow ]; checkPhase = '' export IMAGEIO_USERDIR="$TMP" diff --git a/pkgs/development/python-modules/pydicom/default.nix b/pkgs/development/python-modules/pydicom/default.nix index de6f672e27c..b875674df61 100644 --- a/pkgs/development/python-modules/pydicom/default.nix +++ b/pkgs/development/python-modules/pydicom/default.nix @@ -1,6 +1,7 @@ { stdenv , buildPythonPackage , fetchPypi +, isPy27 , pytest , pytestrunner , numpy @@ -10,6 +11,7 @@ buildPythonPackage rec { version = "2.0.0"; pname = "pydicom"; + disabled = isPy27; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pymatgen/default.nix b/pkgs/development/python-modules/pymatgen/default.nix index 12d9daf5b3d..2cd0a0a020f 100644 --- a/pkgs/development/python-modules/pymatgen/default.nix +++ b/pkgs/development/python-modules/pymatgen/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, glibcLocales, numpy, pydispatcher, sympy, requests, monty, ruamel_yaml, six, scipy, tabulate, enum34, matplotlib, palettable, spglib, pandas, networkx }: +{ stdenv, buildPythonPackage, fetchPypi, glibcLocales, numpy, pydispatcher, sympy, requests, monty, ruamel_yaml, six, scipy, tabulate, enum34, matplotlib, palettable, spglib, pandas, plotly, networkx }: buildPythonPackage rec { pname = "pymatgen"; @@ -10,7 +10,26 @@ buildPythonPackage rec { }; nativeBuildInputs = [ glibcLocales ]; - propagatedBuildInputs = [ numpy pydispatcher sympy requests monty ruamel_yaml six scipy tabulate enum34 matplotlib palettable spglib pandas networkx ]; + + + propagatedBuildInputs = [ + enum34 + matplotlib + monty + networkx + numpy + palettable + pandas + plotly + pydispatcher + requests + ruamel_yaml + scipy + six + spglib + sympy + tabulate + ]; # No tests in pypi tarball. doCheck = false; diff --git a/pkgs/development/python-modules/pywebview/default.nix b/pkgs/development/python-modules/pywebview/default.nix index f12d943aad7..545fb236732 100644 --- a/pkgs/development/python-modules/pywebview/default.nix +++ b/pkgs/development/python-modules/pywebview/default.nix @@ -1,23 +1,32 @@ -{ lib, buildPythonPackage, fetchFromGitHub }: +{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder +, importlib-resources, pytest, xvfb_run }: buildPythonPackage rec { pname = "pywebview"; - version = "3.2"; + version = "3.3.1"; + disabled = pythonOlder "3.5"; src = fetchFromGitHub { owner = "r0x0r"; repo = "pywebview"; rev = version; - sha256 = "0anwm6s0pp7xmgylr4m52v7lw825sdby7fajcl929l099n757gq7"; + sha256 = "015z7n0hdgkzn0p7aw1xsv6lwc260p8q67jx0zyd1zghnwyj8k79"; }; - # disabled due to error in loading unittest - # don't know how to make test from: None - doCheck = false; + propagatedBuildInputs = lib.optionals (pythonOlder "3.7") [ importlib-resources ]; + + checkInputs = [ pytest xvfb_run ]; + + checkPhase = '' + pushd tests + patchShebangs run.sh + xvfb-run -s '-screen 0 800x600x24' ./run.sh + popd + ''; meta = with lib; { homepage = "https://github.com/r0x0r/pywebview"; - description = "Lightweight cross-platform wrapper around a webview."; + description = "Lightweight cross-platform wrapper around a webview"; license = licenses.bsd3; maintainers = with maintainers; [ jojosch ]; }; diff --git a/pkgs/development/python-modules/qasm2image/default.nix b/pkgs/development/python-modules/qasm2image/default.nix index 9748e3e4348..962ba62f509 100644 --- a/pkgs/development/python-modules/qasm2image/default.nix +++ b/pkgs/development/python-modules/qasm2image/default.nix @@ -48,5 +48,6 @@ buildPythonPackage { maintainers = with lib.maintainers; [ pandaman ]; + broken = true; # last update Oct 2018, failed tests don't error the build, and out-of-date with latest python3Packages.qiskit }; } diff --git a/pkgs/development/python-modules/qiskit-aer/default.nix b/pkgs/development/python-modules/qiskit-aer/default.nix index 7c74ddab2b1..3f0439efc7a 100644 --- a/pkgs/development/python-modules/qiskit-aer/default.nix +++ b/pkgs/development/python-modules/qiskit-aer/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "qiskit-aer"; - version = "0.5.1"; + version = "0.5.2"; disabled = pythonOlder "3.5"; @@ -28,7 +28,7 @@ buildPythonPackage rec { repo = "qiskit-aer"; rev = version; fetchSubmodules = true; # fetch muparserx and other required libraries - sha256 = "0pbi8ldz8f1zm7pf2n5229g6kccriq21f24q9cb7bd4j5gdky5sk"; + sha256 = "0vw6b69h8pvzxhaz3k8sg9ac792gz3kklfv0izs6ra83y1dfwhjz"; }; nativeBuildInputs = [ @@ -48,14 +48,6 @@ buildPythonPackage rec { pybind11 ]; - patches = [ - (fetchpatch{ - name = "qiskit-aer-pr-727-fix-random-unitary-test.patch"; - url = "https://github.com/Qiskit/qiskit-aer/commit/09afb3b6b0710042ab65d88e863363f2c843dcb0.patch"; - sha256 = "0521b7i4fpc5brqs08w381g3c655f9cbn6my1740jnk7dv5lhsv9"; - }) - ]; - postPatch = '' # remove dependency on PyPi cmake package, which isn't in Nixpkgs substituteInPlace setup.py --replace "'cmake!=3.17,!=3.17.0'" "" @@ -85,6 +77,11 @@ buildPythonPackage rec { pytestCheckHook ]; dontUseSetuptoolsCheck = true; # Otherwise runs tests twice + disabledTests = [ + # broken with cvxpy >= 1.1.0, see https://github.com/Qiskit/qiskit-aer/issues/779. + # TODO: Remove once resolved, probably next qiskit-aer version + "test_clifford" + ]; preCheck = '' # Tests include a compiled "circuit" which is auto-built in $HOME diff --git a/pkgs/development/python-modules/qiskit-aqua/default.nix b/pkgs/development/python-modules/qiskit-aqua/default.nix index 8037d28f82c..fe90ee63e00 100644 --- a/pkgs/development/python-modules/qiskit-aqua/default.nix +++ b/pkgs/development/python-modules/qiskit-aqua/default.nix @@ -3,7 +3,7 @@ , buildPythonPackage , fetchFromGitHub # , cplex -, cvxopt +, cvxpy , dlx , docplex , fastdtw @@ -24,7 +24,7 @@ buildPythonPackage rec { pname = "qiskit-aqua"; - version = "0.7.0"; + version = "0.7.3"; disabled = pythonOlder "3.5"; @@ -33,13 +33,13 @@ buildPythonPackage rec { owner = "Qiskit"; repo = "qiskit-aqua"; rev = version; - sha256 = "0yykw6k1rb3f2ihcp0y9pb0695mcmy29nyqlj89qs4da0503vxvh"; + sha256 = "04zcnrc0vi6dfjahp1019h2ngdgi7l7jvfs9aw0y306nd9g6qgjc"; }; # Optional packages: pyscf (see below NOTE) & pytorch. Can install via pip/nix if needed. propagatedBuildInputs = [ # cplex - cvxopt + cvxpy docplex dlx # Python Dancing Links package fastdtw @@ -81,7 +81,6 @@ buildPythonPackage rec { "You must install it yourself via pip or add it to your environment from the Nix User Repository." \ "', ImportWarning)\n" \ >> qiskit/optimization/__init__.py - ''; postInstall = "rm -rf $out/${python.sitePackages}/docs"; # Remove docs dir b/c it can cause conflicts. @@ -106,6 +105,9 @@ buildPythonPackage rec { # Disabled due to missing pyscf "test_validate" # test/chemistry/test_inputparser.py + "test_binary" # in SklearnSVM, seems to have trouble with eigenvectors converging + "test_pauli_expect_single" # fails for unknown reason, 3e-3 out of tolerance + # Disabling slow tests > 10 seconds "TestVQE" "TestVQC" @@ -127,9 +129,15 @@ buildPythonPackage rec { "test_shor_no_factors_1_5" "test_shor_no_factors_2_7" "test_evolve_2___suzuki___1__3_" - "test_delta_4" + "test_delta" "test_swaprz" "test_deprecated_algo_result" + "test_unsorted_grouping" + "test_ad_hoc_data" + "test_nft" + "test_oh" + "test_confidence_intervals_00001" + "test_eoh" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/qiskit-ibmq-provider/default.nix b/pkgs/development/python-modules/qiskit-ibmq-provider/default.nix index 5f8f0d94e4f..02cdb8397cb 100644 --- a/pkgs/development/python-modules/qiskit-ibmq-provider/default.nix +++ b/pkgs/development/python-modules/qiskit-ibmq-provider/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { pname = "qiskit-ibmq-provider"; - version = "0.7.0"; + version = "0.7.2"; disabled = pythonOlder "3.6"; @@ -34,7 +34,7 @@ buildPythonPackage rec { owner = "Qiskit"; repo = pname; rev = version; - sha256 = "1n13jjx1cx5gswwk8rpxfjqyk97cwx1n2hwsabkcbi7fksw3c5jk"; + sha256 = "11h1ca4v11pajzn1cxqhim1hfziqzj27xzakwln13g8zmiqx3csp"; }; propagatedBuildInputs = [ @@ -57,7 +57,7 @@ buildPythonPackage rec { ]; # websockets seems to be pinned b/c in v8+ it drops py3.5 support. Not an issue here (usually py3.7+, and disabled for older py3.6) - prePatch = '' + postPatch = '' substituteInPlace requirements.txt --replace "websockets>=7,<8" "websockets" substituteInPlace setup.py --replace "websockets>=7,<8" "websockets" ''; diff --git a/pkgs/development/python-modules/qiskit-ignis/default.nix b/pkgs/development/python-modules/qiskit-ignis/default.nix index 79998a84325..bfd2bffbf47 100644 --- a/pkgs/development/python-modules/qiskit-ignis/default.nix +++ b/pkgs/development/python-modules/qiskit-ignis/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "qiskit-ignis"; - version = "0.3.0"; + version = "0.3.3"; disabled = pythonOlder "3.6"; @@ -25,14 +25,9 @@ buildPythonPackage rec { owner = "Qiskit"; repo = "qiskit-ignis"; rev = version; - sha256 = "16h04n9hxw669nq2ii16l6h75x8afisvp3j062n4c62kcqci0x4x"; + sha256 = "0sy9qpw0jqirsk9y61j5kr18jrw1wa812n7y98fjj6w668rrv560"; }; - # Fixed qiskit-ignis PR #385, figured this is easier than fetchpatch - postPatch = '' - substituteInPlace qiskit/ignis/logging/ignis_logging.py --replace "self.configure_logger" "self._configure_logger" - ''; - propagatedBuildInputs = [ numpy qiskit-terra diff --git a/pkgs/development/python-modules/qiskit-terra/default.nix b/pkgs/development/python-modules/qiskit-terra/default.nix index 78c28a282cb..c1c0dd92837 100644 --- a/pkgs/development/python-modules/qiskit-terra/default.nix +++ b/pkgs/development/python-modules/qiskit-terra/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { pname = "qiskit-terra"; - version = "0.14.1"; + version = "0.14.2"; disabled = pythonOlder "3.5"; @@ -44,7 +44,7 @@ buildPythonPackage rec { owner = "Qiskit"; repo = pname; rev = version; - sha256 = "0pd7x2jrqy7q1s38ychqw9bayjn2rvi6rq7c2c0kd160rwj1l2sc"; + sha256 = "0p5wapjvy81pnks100xbb23kbs2wyys9ykyc8z4968wl487lq4g5"; }; nativeBuildInputs = [ cython ]; @@ -94,6 +94,9 @@ buildPythonPackage rec { "qiskit.transpiler.passes.routing.cython.stochastic_swap.swap_trial" ]; + disabledTests = [ + "test_random_clifford_valid" # random test, fails at least once when testing locally. + ]; pytestFlagsArray = [ "--ignore=test/randomized/test_transpiler_equivalence.py" # collection requires qiskit-aer, which would cause circular dependency ]; diff --git a/pkgs/development/python-modules/qiskit/default.nix b/pkgs/development/python-modules/qiskit/default.nix index ded9c68e6fe..81468da30fb 100644 --- a/pkgs/development/python-modules/qiskit/default.nix +++ b/pkgs/development/python-modules/qiskit/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "qiskit"; # NOTE: This version denotes a specific set of subpackages. See https://qiskit.org/documentation/release_notes.html#version-history - version = "0.19.1"; + version = "0.19.6"; disabled = pythonOlder "3.5"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "Qiskit"; repo = "qiskit"; rev = version; - sha256 = "0p1sahgf6qgbkvxb067mnyj6ya8nv7y57yyiiaadhjw242sjkjy5"; + sha256 = "0liby6ffgrla6wr4k742qkg8m80im372p6hmr4gkz47nmc76zy1i"; }; propagatedBuildInputs = [ @@ -37,7 +37,7 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook ]; dontUseSetuptoolsCheck = true; # following doesn't work b/c they are distributed across different nix sitePackages dirs. Tested with pytest though. - # pythonImportsCheck = [ "qiskit" "qiskit.terra" "qiskit.ignis" "qiskit.aer" "qiskit.aqua" ]; + pythonImportsCheck = [ "qiskit" "qiskit.circuit" "qiskit.ignis" "qiskit.providers.aer" "qiskit.aqua" ]; meta = { description = "Software for developing quantum computing programs"; diff --git a/pkgs/development/python-modules/retworkx/default.nix b/pkgs/development/python-modules/retworkx/default.nix index 531edab2746..309f3532cfc 100644 --- a/pkgs/development/python-modules/retworkx/default.nix +++ b/pkgs/development/python-modules/retworkx/default.nix @@ -2,27 +2,30 @@ , buildPythonPackage , pythonOlder , pythonAtLeast -, isPy37 -, isPy38 +, python , fetchFromGitHub , fetchPypi # Check inputs , pytestCheckHook }: - let - rx-version = "0.3.3"; - wheel-args = if isPy37 then - { python = "cp37"; sha256 = "1gbz7sh9i4h41xs9c40lixfdigmvfykkgxgzwsrs8v0smx20dczy"; } - else if isPy38 then - { python = "cp38"; sha256 = "09xxgp4ac4q6mfkj6lsqqfrzz1cb02vxy7wlv0bq3z2hd0jcanxk"; } - else throw "python version & hash not included. Override attribute `wheel-args` with version & hash at https://pypi.org/project/retworkx"; + rx-version = "0.3.4"; + + wheel-hashes = { + "3.7" = { python = "cp37"; sha256 = "1hfrdj8svkfdraa299gcj18a601l4zn646fkgq7m56brpagssf9l"; }; + "3.8" = { python = "cp38"; sha256 = "0jm10ywaqr0b456pcp01pb7035nawlndfi998jv8p1a2f5xwjgiq"; }; + }; + lookup = set: key: default: if (builtins.hasAttr key set) then (builtins.getAttr key set) else default; + wheel-args = lookup + wheel-hashes + python.pythonVersion + (throw "retworkx python version & hash not included. Override attribute `wheel-args` with version & hash at https://pypi.org/project/retworkx"); github-source = fetchFromGitHub { owner = "Qiskit"; repo = "retworkx"; rev = rx-version; - sha256 = "160w5vkzrl5rzcrdwhjq820i5lmc527m6hg0kxx0k6n2bz9qn26g"; + sha256 = "0cd3x64y49q9a3jrkiknlfkiccxkxgl624x5pqk7gm34s1lnzl8h"; }; in buildPythonPackage rec { diff --git a/pkgs/development/python-modules/selectors2/default.nix b/pkgs/development/python-modules/selectors2/default.nix index 159047eafd7..96917f45be0 100644 --- a/pkgs/development/python-modules/selectors2/default.nix +++ b/pkgs/development/python-modules/selectors2/default.nix @@ -17,7 +17,8 @@ buildPythonPackage rec { # Trick to disable certain tests that depend on timing which # will always fail on hydra export TRAVIS="" - nosetests tests/test_selectors2.py + nosetests tests/test_selectors2.py \ + --exclude=test_above_fd_setsize ''; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/semver/default.nix b/pkgs/development/python-modules/semver/default.nix index bc0262a89c9..5aca34b52f1 100644 --- a/pkgs/development/python-modules/semver/default.nix +++ b/pkgs/development/python-modules/semver/default.nix @@ -1,24 +1,27 @@ -{ stdenv, fetchFromGitHub, buildPythonPackage, pytest }: +{ stdenv +, fetchFromGitHub +, buildPythonPackage +, pytestCheckHook +, pytestcov +}: -buildPythonPackage { +buildPythonPackage rec { pname = "semver"; - version = "2.8.1"; + version = "2.10.2"; src = fetchFromGitHub { - owner = "k-bx"; + owner = "python-semver"; repo = "python-semver"; - rev = "41775dd5f143dfa6ca94885056c9ef5b3ed4e6e1"; # not tagged in repository - sha256 = "1rqaakha4sw06k9h0h4g1wmk66zkmhpq92y2rw0kyfpp6xk1zbk2"; + rev = version; + sha256 = "0yxjmcgk5iwp53l9z1cg0ajrj18i09ircs11ifpdrggzm8n1blf3"; }; - checkInputs = [ pytest ]; - checkPhase = '' - py.test - ''; + preCheck = "rm -rf dist"; # confuses source vs dist imports in pytest + checkInputs = [ pytestCheckHook pytestcov ]; meta = with stdenv.lib; { description = "Python package to work with Semantic Versioning (http://semver.org/)"; - homepage = "https://github.com/k-bx/python-semver"; + homepage = "https://python-semver.readthedocs.io/en/latest/"; license = licenses.bsd3; maintainers = with maintainers; [ np ]; }; diff --git a/pkgs/development/python-modules/sslyze/default.nix b/pkgs/development/python-modules/sslyze/default.nix index 78824515a45..c127f6ea2e5 100644 --- a/pkgs/development/python-modules/sslyze/default.nix +++ b/pkgs/development/python-modules/sslyze/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "sslyze"; - version = "3.0.7"; + version = "3.0.8"; src = fetchFromGitHub { owner = "nabla-c0d3"; repo = pname; rev = version; - sha256 = "1ahwldsh3xvagin09dy5q73bdw5k4siqy2qqgxwj4wdyd7pjb4p9"; + sha256 = "06mwzxw6xaqin2gwzcqb9r7qhbyx3k7zcxygxywi2bpxyjv9lq32"; }; patchPhase = '' diff --git a/pkgs/development/python-modules/tbm-utils/default.nix b/pkgs/development/python-modules/tbm-utils/default.nix index bb3cd946206..2d0efeceda0 100644 --- a/pkgs/development/python-modules/tbm-utils/default.nix +++ b/pkgs/development/python-modules/tbm-utils/default.nix @@ -20,6 +20,13 @@ buildPythonPackage rec { propagatedBuildInputs = [ attrs pendulum pprintpp wrapt ]; + # this versioning was done to prevent normal pip users from encountering + # issues with package failing to build from source, but nixpkgs is better + postPatch = '' + substituteInPlace setup.py \ + --replace "pendulum>=2.0,<=3.0,!=2.0.5,!=2.1.0" "pendulum>=2.0,<=3.0" + ''; + # No tests in archive. doCheck = false; diff --git a/pkgs/development/python-modules/tensorboardx/default.nix b/pkgs/development/python-modules/tensorboardx/default.nix new file mode 100644 index 00000000000..d2532777d00 --- /dev/null +++ b/pkgs/development/python-modules/tensorboardx/default.nix @@ -0,0 +1,31 @@ +{ boto3, buildPythonPackage, crc32c, fetchFromGitHub, lib, matplotlib, moto +, numpy, pillow, pytorch, protobuf, six, pytestCheckHook +, tensorflow-tensorboard, torchvision }: + +buildPythonPackage rec { + pname = "tensorboardx"; + version = "2.0"; + + src = fetchFromGitHub { + owner = "lanpa"; + repo = "tensorboardX"; + rev = "v${version}"; + sha256 = "0qqalq0fhbx0wnd8wdwhyhkkv2brvj9qbk3373vk3wjxbribf5c7"; + }; + + checkInputs = [ + pytestCheckHook boto3 crc32c matplotlib moto pillow pytorch tensorflow-tensorboard torchvision + ]; + + propagatedBuildInputs = [ numpy protobuf six ]; + + disabledTests = [ "test_TorchVis" "test_onnx_graph" ]; + + meta = with lib; { + description = "Library for writing tensorboard-compatible logs"; + homepage = "https://github.com/lanpa/tensorboardX"; + license = licenses.mit; + maintainers = with maintainers; [ lebastr akamaus ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/python-modules/tensorflow-probability/default.nix b/pkgs/development/python-modules/tensorflow-probability/default.nix index 9466b85a6a4..76367919059 100644 --- a/pkgs/development/python-modules/tensorflow-probability/default.nix +++ b/pkgs/development/python-modules/tensorflow-probability/default.nix @@ -61,7 +61,7 @@ let bazelTarget = ":pip_pkg"; fetchAttrs = { - sha256 = "1bh6lsi0732fzhrfs6p33qg2qfvq73r6qmijbpnv592aq8yiy1h5"; + sha256 = "1qw7vkwnxy45z4vm94isq5m96xiz35sigag7vjg1xb2sklbymxh8"; }; buildAttrs = { diff --git a/pkgs/development/python-modules/tinycss2/default.nix b/pkgs/development/python-modules/tinycss2/default.nix index 2d8581cfb90..7504df7a4de 100644 --- a/pkgs/development/python-modules/tinycss2/default.nix +++ b/pkgs/development/python-modules/tinycss2/default.nix @@ -1,6 +1,16 @@ -{ lib, buildPythonPackage, pythonOlder, fetchPypi +{ lib +, buildPythonPackage +, pythonOlder +, fetchPypi +, fetchpatch , webencodings -, pytest, pytestrunner, pytestcov, pytest-flake8, pytest-isort }: +# Check inputs +, pytest +, pytestrunner +, pytestcov +, pytest-flake8 +, pytest-isort +}: buildPythonPackage rec { pname = "tinycss2"; @@ -12,11 +22,23 @@ buildPythonPackage rec { sha256 = "1kw84y09lggji4krkc58jyhsfj31w8npwhznr7lf19d0zbix09v4"; }; - patches = [ ./remove-redundant-dependency.patch ]; + patches = [ + ( + fetchpatch { + name = "tinycss2-fix-pytest-flake8-fail.patch"; + url = "https://github.com/Kozea/tinycss2/commit/6556604fb98c2153412384d6f0f705db2da1aa60.patch"; + sha256 = "1srvdzg1bak65fawd611rlskcgn5abmwmyjnk8qrrrasr554bc59"; + } + ) + ]; propagatedBuildInputs = [ webencodings ]; checkInputs = [ pytest pytestrunner pytestcov pytest-flake8 pytest-isort ]; + preCheck = '' + # this fails a flake lint-type check, so just remove it + rm tinycss2/css-parsing-tests/make_color3_hsl.py + ''; meta = with lib; { description = "Low-level CSS parser for Python"; diff --git a/pkgs/development/python-modules/tinycss2/remove-redundant-dependency.patch b/pkgs/development/python-modules/tinycss2/remove-redundant-dependency.patch deleted file mode 100644 index 27ec511c55f..00000000000 --- a/pkgs/development/python-modules/tinycss2/remove-redundant-dependency.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/setup.cfg b/setup.cfg -index b3b3c2d..480f3e6 100644 ---- a/setup.cfg -+++ b/setup.cfg -@@ -33,7 +33,6 @@ project_urls = - - [options] - packages = find: --setup_requires = pytest-runner - install_requires = - setuptools >= 39.2.0 - webencodings >= 0.4 diff --git a/pkgs/development/python-modules/tokenizers/default.nix b/pkgs/development/python-modules/tokenizers/default.nix new file mode 100644 index 00000000000..348df4ae95e --- /dev/null +++ b/pkgs/development/python-modules/tokenizers/default.nix @@ -0,0 +1,121 @@ +{ stdenv +, rustPlatform +, fetchFromGitHub +, fetchurl +, maturin +, pipInstallHook +, pytest +, python +, requests +}: + +let + robertaVocab = fetchurl { + url = "https://s3.amazonaws.com/models.huggingface.co/bert/roberta-base-vocab.json"; + sha256 = "0m86wpkfb2gdh9x9i9ng2fvwk1rva4p0s98xw996nrjxs7166zwy"; + }; + robertaMerges = fetchurl { + url = "https://s3.amazonaws.com/models.huggingface.co/bert/roberta-base-merges.txt"; + sha256 = "1idd4rvkpqqbks51i2vjbd928inw7slij9l4r063w3y5fd3ndq8w"; + }; + bertVocab = fetchurl { + url = "https://s3.amazonaws.com/models.huggingface.co/bert/bert-base-uncased-vocab.txt"; + sha256 = "18rq42cmqa8zanydsbzrb34xwy4l6cz1y900r4kls57cbhvyvv07"; + }; + openaiVocab = fetchurl { + url = "https://s3.amazonaws.com/models.huggingface.co/bert/openai-gpt-vocab.json"; + sha256 = "0y40gc9bixj5rxv674br1rxmxkd3ly29p80x1596h8yywwcrpx7x"; + }; + openaiMerges = fetchurl { + url = "https://s3.amazonaws.com/models.huggingface.co/bert/openai-gpt-merges.txt"; + sha256 = "09a754pm4djjglv3x5pkgwd6f79i2rq8ydg0f7c3q1wmwqdbba8f"; + }; +in rustPlatform.buildRustPackage rec { + pname = "tokenizers"; + version = "0.8.0"; + + src = fetchFromGitHub { + owner = "huggingface"; + repo = pname; + rev = "python-v${version}"; + sha256 = "0f5r1wm5ybyk3jvihj1g98y7ihq0iklg0pwkaa11pk1gv0k869w3"; + }; + + cargoSha256 = "131bvf35q5n65mq6zws1rp5fn2qkfwfg9sbxi5y6if24n8fpdz4m"; + + sourceRoot = "source/bindings/python"; + + nativeBuildInputs = [ + maturin + pipInstallHook + ]; + + propagatedBuildInputs = [ + python + ]; + + # tokenizers uses pyo3, which requires Rust nightly. + RUSTC_BOOTSTRAP = 1; + + doCheck = false; + doInstallCheck = true; + + postUnpack = '' + # Add data files for tests, otherwise tests attempt network access. + mkdir $sourceRoot/tests/data + ( cd $sourceRoot/tests/data + ln -s ${robertaVocab} roberta-base-vocab.json + ln -s ${robertaMerges} roberta-base-merges.txt + ln -s ${bertVocab} bert-base-uncased-vocab.txt + ln -s ${openaiVocab} openai-gpt-vocab.json + ln -s ${openaiMerges} openai-gpt-merges.txt ) + ''; + + postPatch = '' + # pyo3's build check verifies that Rust is a nightly + # version. Disable this check. + substituteInPlace $NIX_BUILD_TOP/$cargoDepsCopy/pyo3/build.rs \ + --replace "check_rustc_version()?;" "" + + # Patching the vendored dependency invalidates the file + # checksums, so remove them. This should be safe, since + # this is just a copy of the vendored dependencies and + # the integrity of the vendored dependencies is validated + # by cargoSha256. + sed -r -i 's|"files":\{[^}]+\}|"files":{}|' \ + $NIX_BUILD_TOP/$cargoDepsCopy/pyo3/.cargo-checksum.json + + # Maturin uses the crate name as the wheel name. + substituteInPlace Cargo.toml \ + --replace "tokenizers-python" "tokenizers" + ''; + + buildPhase = '' + maturin build --release --manylinux off + ''; + + installPhase = '' + # Put the wheels where the pip install hook can find them. + install -Dm644 -t dist target/wheels/*.whl + pipInstallPhase + ''; + + installCheckInputs = [ + pytest + requests + ]; + + installCheckPhase = '' + # Append paths, or the binding's tokenizer module will be + # used, since the test directories have __init__.py + pytest --import-mode=append + ''; + + meta = with stdenv.lib; { + homepage = "https://github.com/huggingface/tokenizers"; + description = "Fast State-of-the-Art Tokenizers optimized for Research and Production"; + license = licenses.asl20; + platforms = platforms.unix; + maintainers = with maintainers; [ danieldk ]; + }; +} diff --git a/pkgs/development/python-modules/webcolors/default.nix b/pkgs/development/python-modules/webcolors/default.nix index 4acc5a369b0..273cd7ac5d1 100644 --- a/pkgs/development/python-modules/webcolors/default.nix +++ b/pkgs/development/python-modules/webcolors/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, isPy27 , python , six }: @@ -8,6 +9,7 @@ buildPythonPackage rec { pname = "webcolors"; version = "1.11.1"; + disabled = isPy27; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/zstandard/default.nix b/pkgs/development/python-modules/zstandard/default.nix index bcac246e8f6..760593904be 100755 --- a/pkgs/development/python-modules/zstandard/default.nix +++ b/pkgs/development/python-modules/zstandard/default.nix @@ -3,7 +3,6 @@ , fetchPypi , cffi , hypothesis -, zstd }: buildPythonPackage rec { @@ -15,7 +14,7 @@ buildPythonPackage rec { sha256 = "e5cbd8b751bd498f275b0582f449f92f14e64f4e03b5bf51c571240d40d43561"; }; - propagatedBuildInputs = [ cffi zstd ]; + propagatedBuildInputs = [ cffi ]; checkInputs = [ hypothesis ]; diff --git a/pkgs/development/tools/analysis/checkstyle/default.nix b/pkgs/development/tools/analysis/checkstyle/default.nix index 288482ab6f7..632d3005e7b 100644 --- a/pkgs/development/tools/analysis/checkstyle/default.nix +++ b/pkgs/development/tools/analysis/checkstyle/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, makeWrapper, jre }: stdenv.mkDerivation rec { - version = "8.33"; + version = "8.34"; pname = "checkstyle"; src = fetchurl { url = "https://github.com/checkstyle/checkstyle/releases/download/checkstyle-${version}/checkstyle-${version}-all.jar"; - sha256 = "03innxi9f44z2c785a94n3i0adm6mn3jjgqlvgx46nmigvw41mz6"; + sha256 = "0qgldd0rna5y50vflkjnhl4hb4nhh28d0zwsv32872g6hivl7fzb"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix index aed991dab30..ce60cf1392a 100644 --- a/pkgs/development/tools/analysis/flow/default.nix +++ b/pkgs/development/tools/analysis/flow/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "flow"; - version = "0.127.0"; + version = "0.128.0"; src = fetchFromGitHub { owner = "facebook"; repo = "flow"; rev = "refs/tags/v${version}"; - sha256 = "0daacbb4il3mm8fkbk5qlpvzp3pmrqagq2hr1gsjaf8vnmissvvm"; + sha256 = "1psplmqd1l6mxw0rbji2h73fvqhpp1zf9clzgc8khmkh0bbhc5ss"; }; installPhase = '' diff --git a/pkgs/development/tools/analysis/frama-c/default.nix b/pkgs/development/tools/analysis/frama-c/default.nix index c7ac2986fd6..179a74c56d5 100644 --- a/pkgs/development/tools/analysis/frama-c/default.nix +++ b/pkgs/development/tools/analysis/frama-c/default.nix @@ -23,12 +23,12 @@ in stdenv.mkDerivation rec { pname = "frama-c"; - version = "20.0"; - slang = "Calcium"; + version = "21.1"; + slang = "Scandium"; src = fetchurl { url = "http://frama-c.com/download/frama-c-${version}-${slang}.tar.gz"; - sha256 = "03dvn162djylj2skmk6vv75gh87mm4s5cspkzcrlm5x0rlla2yqn"; + sha256 = "0qq0d08dzr0dmdjysiimdqmwlzgnn932vp5kf8lfn3nl45ai09dy"; }; preConfigure = lib.optionalString stdenv.cc.isClang "configureFlagsArray=(\"--with-cpp=clang -E -C\")"; diff --git a/pkgs/development/tools/analysis/pmd/default.nix b/pkgs/development/tools/analysis/pmd/default.nix index 3f3731e2ac8..f80483e0e12 100644 --- a/pkgs/development/tools/analysis/pmd/default.nix +++ b/pkgs/development/tools/analysis/pmd/default.nix @@ -1,20 +1,21 @@ -{ stdenv, fetchurl, unzip }: +{ stdenv, fetchurl, unzip, makeWrapper, openjdk }: stdenv.mkDerivation rec { pname = "pmd"; - version = "6.17.0"; - - nativeBuildInputs = [ unzip ]; + version = "6.25.0"; src = fetchurl { url = "mirror://sourceforge/pmd/pmd-bin-${version}.zip"; - sha256 = "0000w28dg5z8gs7cxhx7d0fv10ry0yxamk5my28ncqqsg7a4qy8w"; + sha256 = "0ykg0wylyfiwjlhkbfjqfam34174paihrw7x1dwfq9anyn5bjf0k"; }; + nativeBuildInputs = [ unzip makeWrapper ]; + installPhase = '' runHook preInstall mkdir -p $out cp -R {bin,lib} $out + wrapProgram $out/bin/run.sh --prefix PATH : ${openjdk.jre}/bin runHook postInstall ''; diff --git a/pkgs/development/tools/bazel-watcher/default.nix b/pkgs/development/tools/bazel-watcher/default.nix index 1d86b80a50b..fae1310bd58 100644 --- a/pkgs/development/tools/bazel-watcher/default.nix +++ b/pkgs/development/tools/bazel-watcher/default.nix @@ -56,7 +56,7 @@ buildBazelPackage rec { sed -e '/^FILE:@bazel_gazelle_go_repository_tools.*/d' -i $bazelOut/external/\@*.marker ''; - sha256 = "17vdqs3dpaqc4llmzh4rd8mkm19q192w5gp90jlry3dpwj6b4kdf"; + sha256 = "0rfdwss8aahydiybwhi3j0qw12j1l91k9lbn1vaip0bmnq5qfwh9"; }; buildAttrs = { diff --git a/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix b/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix index 5a8094af48a..9910256afc0 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix @@ -64,7 +64,7 @@ buildBazelPackage rec { sed -e '/^FILE:@bazel_gazelle_go_repository_tools.*/d' -i $bazelOut/external/\@*.marker ''; - sha256 = "04wbimzjxxmm8kh57q11zvyardb6ilyffc4nkdp6mb87p1l8fmww"; + sha256 = "1m7fmb03lirffxx04ck73bn5zwaji7zdwhlqq8s1c6pgp755d3vi"; }; buildAttrs = { diff --git a/pkgs/development/tools/build-managers/bazel/bazel_3/default.nix b/pkgs/development/tools/build-managers/bazel/bazel_3/default.nix index 85492033e39..c867ed7a85d 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel_3/default.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel_3/default.nix @@ -25,11 +25,11 @@ }: let - version = "3.3.0"; + version = "3.3.1"; src = fetchurl { url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip"; - sha256 = "09p8xv8ni4g4wcyaapxsx8gjc3x3l3c6lxn575c7gm89vrh3k805"; + sha256 = "0ir796kl8r9hpr3li26qsdy1z2lx2bv82zmk4a2s7q64clyg9wg0"; }; # Update with `eval $(nix-build -A bazel.updater)`, @@ -53,7 +53,7 @@ let else srcs."java_tools_javac11_linux-v8.0.zip") srcs."coverage_output_generator-v2.1.zip" srcs.build_bazel_rules_nodejs - srcs."android_tools_pkg-0.17.0.tar.gz" + srcs."android_tools_pkg-0.19.0rc1.tar.gz" srcs."bazel-toolchains-3.1.0.tar.gz" srcs.rules_pkg srcs.rules_cc diff --git a/pkgs/development/tools/build-managers/bazel/bazel_3/src-deps.json b/pkgs/development/tools/build-managers/bazel/bazel_3/src-deps.json index 49269bbde5b..4007a77b065 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel_3/src-deps.json +++ b/pkgs/development/tools/build-managers/bazel/bazel_3/src-deps.json @@ -65,14 +65,14 @@ "patch_cmds_win": [ "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" ], - "sha256": "8d0bf8ab83c9e38ec6ed5ce7bf425dbdc6469cec9e078559d4e8da42b705410f", - "url": "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.17.0.tar.gz" + "sha256": "761e997a9055fe5e2b70aba8d64e78d4c2113feafaa8ac81909cb63e403f3087", + "url": "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.19.0rc1.tar.gz" }, - "android_tools_pkg-0.17.0.tar.gz": { - "name": "android_tools_pkg-0.17.0.tar.gz", - "sha256": "8d0bf8ab83c9e38ec6ed5ce7bf425dbdc6469cec9e078559d4e8da42b705410f", + "android_tools_pkg-0.19.0rc1.tar.gz": { + "name": "android_tools_pkg-0.19.0rc1.tar.gz", + "sha256": "761e997a9055fe5e2b70aba8d64e78d4c2113feafaa8ac81909cb63e403f3087", "urls": [ - "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.17.0.tar.gz" + "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.19.0rc1.tar.gz" ] }, "bazel-toolchains-3.1.0.tar.gz": { diff --git a/pkgs/development/tools/build-managers/bmake/default.nix b/pkgs/development/tools/build-managers/bmake/default.nix index b119b5a3810..45fb791f3a6 100644 --- a/pkgs/development/tools/build-managers/bmake/default.nix +++ b/pkgs/development/tools/build-managers/bmake/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "bmake"; - version = "20200606"; + version = "20200629"; src = fetchurl { url = "http://www.crufty.net/ftp/pub/sjg/${pname}-${version}.tar.gz"; - sha256 = "00kh1g8z6808ylbfcn9afpb0xmb99k302dfdsmyx1rsn65xs58v7"; + sha256 = "1cxmsz48ap6gpwx5qkkvvfsiqxc7zpn8gzmhvc1jsfha68195ms5"; }; nativeBuildInputs = [ getopt ]; diff --git a/pkgs/development/tools/build-managers/conan/default.nix b/pkgs/development/tools/build-managers/conan/default.nix index d7aec3527b3..e09277e498d 100644 --- a/pkgs/development/tools/build-managers/conan/default.nix +++ b/pkgs/development/tools/build-managers/conan/default.nix @@ -1,4 +1,4 @@ -{ lib, python3, git, pkgconfig }: +{ lib, python3, fetchFromGitHub, git, pkgconfig }: # Note: # Conan has specific dependency demands; check @@ -39,12 +39,14 @@ let newPython = python3.override { }; in newPython.pkgs.buildPythonApplication rec { - version = "1.25.0"; + version = "1.27.0"; pname = "conan"; - src = newPython.pkgs.fetchPypi { - inherit pname version; - sha256 = "1wgmx6s4h5m6zixb3wlaicy56rsqcy2srzmvii80xdx9g5wvi9pv"; + src = fetchFromGitHub { + owner = "conan-io"; + repo = "conan"; + rev = version; + sha256 = "0ncqs1p4g23fmzgdmwppgxr8w275h38hgjdzs456cgivz8xs9rjl"; }; propagatedBuildInputs = with newPython.pkgs; [ @@ -75,23 +77,20 @@ in newPython.pkgs.buildPythonApplication rec { ] ++ (with newPython.pkgs; [ codecov mock - pytest - node-semver nose parameterized webtest ]); - # Conan 1.14.0 has removed all tests from the Pypi source dist: - # https://github.com/conan-io/conan/pull/4713 - # We have recommended they be added back: - # https://github.com/conan-io/conan/issues/4563#issuecomment-602225083 + # TODO: reenable tests now that we fetch tests w/ the source from GitHub. + # Not enabled right now due to time constraints/failing tests that I didn't have time to track down doCheck = false; postPatch = '' substituteInPlace conans/requirements.txt \ --replace "PyYAML>=3.11, <3.14.0" "PyYAML" \ - --replace "deprecation>=2.0, <2.1" "deprecation" + --replace "deprecation>=2.0, <2.1" "deprecation" \ + --replace "six>=1.10.0,<=1.14.0" "six" ''; meta = with lib; { diff --git a/pkgs/development/tools/build-managers/sbt/default.nix b/pkgs/development/tools/build-managers/sbt/default.nix index ae9d47adddd..2eb36434406 100644 --- a/pkgs/development/tools/build-managers/sbt/default.nix +++ b/pkgs/development/tools/build-managers/sbt/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "sbt"; - version = "1.3.12"; + version = "1.3.13"; src = fetchurl { urls = [ "https://piccolo.link/sbt-${version}.tgz" "https://github.com/sbt/sbt/releases/download/v${version}/sbt-${version}.tgz" ]; - sha256 = "0mwdqn0vk90wdpfzrbbc8l28407z5d62bvsi6jlgds2vbywjprxl"; + sha256 = "08mx84kzpm750zjxm225nh9wqm7js5y2k6hgb8xw3n574zg58hc5"; }; patchPhase = '' diff --git a/pkgs/development/tools/conftest/default.nix b/pkgs/development/tools/conftest/default.nix index 6e14c8eb010..d7ee1c2a51f 100644 --- a/pkgs/development/tools/conftest/default.nix +++ b/pkgs/development/tools/conftest/default.nix @@ -5,7 +5,7 @@ buildGoModule rec { version = "0.19.0"; src = fetchFromGitHub { - owner = "instrumenta"; + owner = "open-policy-agent"; repo = "conftest"; rev = "v${version}"; sha256 = "0d6n51p4b8jwkfqympwxkqxssgy462m5pgv5qvm6jy5pm566qa08"; @@ -20,9 +20,9 @@ buildGoModule rec { meta = with lib; { description = "Write tests against structured configuration data"; - homepage = "https://github.com/instrumenta/conftest"; + inherit (src.meta) homepage; license = licenses.asl20; maintainers = with maintainers; [ yurrriq ]; platforms = platforms.all; }; -} \ No newline at end of file +} diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix index b788e70a4de..c75d71f3a11 100644 --- a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix @@ -17,6 +17,7 @@ buildGoPackage rec { inherit version; pname = "gitlab-runner"; goPackagePath = "gitlab.com/gitlab-org/gitlab-runner"; + subPackages = [ "." ]; commonPackagePath = "${goPackagePath}/common"; buildFlagsArray = '' -ldflags= @@ -35,7 +36,6 @@ buildGoPackage rec { patches = [ ./fix-shell-path.patch ]; postInstall = '' - touch $out/bin/hello install -d $out/bin/helper-images ln -sf ${docker_x86_64} $out/bin/helper-images/prebuilt-x86_64.tar.xz ln -sf ${docker_arm} $out/bin/helper-images/prebuilt-arm.tar.xz diff --git a/pkgs/development/tools/eclipse-mat/default.nix b/pkgs/development/tools/eclipse-mat/default.nix new file mode 100644 index 00000000000..44411d0db72 --- /dev/null +++ b/pkgs/development/tools/eclipse-mat/default.nix @@ -0,0 +1,119 @@ +{ buildEnv +, fetchurl +, fontconfig +, freetype +, glib +, gsettings-desktop-schemas +, gtk3 +, jdk11 +, lib +, libX11 +, libXrender +, libXtst +, makeDesktopItem +, makeWrapper +, shared-mime-info +, stdenv +, unzip +, webkitgtk +, zlib +}: + +with lib; +let + pVersion = "1.10.0.20200225"; + pVersionTriple = splitVersion pVersion; + majorVersion = elemAt pVersionTriple 0; + minorVersion = elemAt pVersionTriple 1; + patchVersion = elemAt pVersionTriple 2; + baseVersion = "${majorVersion}.${minorVersion}.${patchVersion}"; + jdk = jdk11; +in +stdenv.mkDerivation rec { + pname = "eclipse-mat"; + version = "${pVersion}"; + + src = fetchurl { + url = "http://ftp.halifax.rwth-aachen.de/eclipse//mat/${baseVersion}/rcp/MemoryAnalyzer-${version}-linux.gtk.x86_64.zip"; + sha256 = "11cg01gjjvlm6lr6z6rwqs1r31xx5pxddnz55ca0s33lrnywf9fx"; + }; + + desktopItem = makeDesktopItem { + name = "eclipse-mat"; + exec = "eclipse-mat"; + icon = "eclipse"; + comment = "Eclipse Memory Analyzer"; + desktopName = "Eclipse MAT"; + genericName = "Java Memory Analyzer"; + categories = "Development;"; + }; + + unpackPhase = '' + unzip $src + ''; + + buildCommand = '' + mkdir -p $out + unzip $src + mv mat $out + + # Patch binaries. + interpreter=$(echo ${stdenv.glibc.out}/lib/ld-linux*.so.2) + libCairo=$out/eclipse/libcairo-swt.so + patchelf --set-interpreter $interpreter $out/mat/MemoryAnalyzer + [ -f $libCairo ] && patchelf --set-rpath ${ + stdenv.lib.makeLibraryPath [ freetype fontconfig libX11 libXrender zlib ] + } $libCairo + + # Create wrapper script. Pass -configuration to store settings in ~/.eclipse-mat/ + makeWrapper $out/mat/MemoryAnalyzer $out/bin/eclipse-mat \ + --prefix PATH : ${jdk}/bin \ + --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath ([ glib gtk3 libXtst webkitgtk ])} \ + --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \ + --add-flags "-configuration \$HOME/.eclipse-mat/''${version}/configuration" + + # Create desktop item. + mkdir -p $out/share/applications + cp ${desktopItem}/share/applications/* $out/share/applications + mkdir -p $out/share/pixmaps + find $out/mat/plugins -name 'eclipse*.png' -type f -exec cp {} $out/share/pixmaps \; + mv $out/share/pixmaps/eclipse64.png $out/share/pixmaps/eclipse.png + ''; + + buildInputs = [ + fontconfig + freetype + glib + gsettings-desktop-schemas + gtk3 + jdk + libX11 + libXrender + libXtst + makeWrapper + zlib + unzip + shared-mime-info + webkitgtk + ]; + + dontBuild = true; + dontConfigure = true; + + meta = with stdenv.lib; { + description = "Fast and feature-rich Java heap analyzer"; + longDescription = '' + The Eclipse Memory Analyzer is a tool that helps you find memory + leaks and reduce memory consumption. Use the Memory Analyzer to + analyze productive heap dumps with hundreds of millions of + objects, quickly calculate the retained sizes of objects, see + who is preventing the Garbage Collector from collecting objects, + run a report to automatically extract leak suspects. + ''; + homepage = "https://www.eclipse.org/mat"; + license = licenses.epl20; + maintainers = [ maintainers.ktor ]; + platforms = [ "x86_64-linux" ]; + }; + +} diff --git a/pkgs/development/tools/git-quick-stats/default.nix b/pkgs/development/tools/git-quick-stats/default.nix index 1c5811f7b5a..587a23f6599 100644 --- a/pkgs/development/tools/git-quick-stats/default.nix +++ b/pkgs/development/tools/git-quick-stats/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "git-quick-stats"; - version = "2.1.1"; + version = "2.1.2"; src = fetchFromGitHub { repo = "git-quick-stats"; owner = "arzzen"; rev = version; - sha256 = "1mdja838jxhcasi251fsc3yig3s5vmfqab1wpm34xinr8blii90f"; + sha256 = "1q0iy732smad1v25da9vmlk8r5iscjrk678pq6mda9sbmiq693r3"; }; PREFIX = builtins.placeholder "out"; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/heroku/default.nix b/pkgs/development/tools/heroku/default.nix index 23e0f568457..5ef18409060 100644 --- a/pkgs/development/tools/heroku/default.nix +++ b/pkgs/development/tools/heroku/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "heroku"; - version = "7.41.1"; + version = "7.42.2"; src = fetchurl { url = "https://cli-assets.heroku.com/heroku-v${version}/heroku-v${version}.tar.xz"; - sha256 = "12ilk0rkpwx8n9b7dird2jfmwnkqndlwjf5wgdcbl014mkl1411b"; + sha256 = "1fddqqn2nwvniignkq8d5jvh0217zb960s402h57l4wg3djq7phr"; }; nativeBuildInputs = [ makeWrapper ]; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = "https://cli.heroku.com"; + homepage = "https://devcenter.heroku.com/articles/heroku-cli"; description = "Everything you need to get started using Heroku"; maintainers = with lib.maintainers; [ aflatter mirdhyn peterhoeg marsam ]; license = lib.licenses.mit; diff --git a/pkgs/development/tools/kubectx/default.nix b/pkgs/development/tools/kubectx/default.nix index b4cbb3cee63..c11c7fcbc97 100644 --- a/pkgs/development/tools/kubectx/default.nix +++ b/pkgs/development/tools/kubectx/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kubectx"; - version = "0.9.0"; + version = "0.9.1"; src = fetchFromGitHub { owner = "ahmetb"; repo = pname; rev = "v${version}"; - sha256 = "1b22jk8zl944w5zn3s7ybkkbmzp9519x32pfqwd1malfly7dzf55"; + sha256 = "1c7y5hj4w72bm6y3riw0acayn4w9x7bbf1vykqcprbyw3a3dvcsw"; }; vendorSha256 = "168hfdc2rfwpz2ls607bz5vsm1aw4brhwm8hmbiq1n1l2dn2dj0y"; diff --git a/pkgs/development/tools/micronaut/default.nix b/pkgs/development/tools/micronaut/default.nix index e781bb80ac8..6d9149d4107 100644 --- a/pkgs/development/tools/micronaut/default.nix +++ b/pkgs/development/tools/micronaut/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "micronaut"; - version = "1.3.5"; + version = "1.3.6"; src = fetchzip { url = "https://github.com/micronaut-projects/micronaut-core/releases/download/v${version}/${pname}-${version}.zip"; - sha256 = "16n1dk9jgy78mrkvr78m4x772kn09y5aa4d06wl4sdgn6apcq2mc"; + sha256 = "0jmj5xpj4invvpp289gh81vq7b4mmfhqb2h50yjn7wgdicyn295a"; }; nativeBuildInputs = [ makeWrapper installShellFiles ]; diff --git a/pkgs/development/tools/misc/ccache/default.nix b/pkgs/development/tools/misc/ccache/default.nix index 61ed3825bd9..ead30a56e27 100644 --- a/pkgs/development/tools/misc/ccache/default.nix +++ b/pkgs/development/tools/misc/ccache/default.nix @@ -1,30 +1,22 @@ -{ stdenv, fetchurl, perl, zlib, makeWrapper }: +{ stdenv, fetchFromGitHub, asciidoc-full, gperf, perl, autoreconfHook, zlib, makeWrapper }: let ccache = stdenv.mkDerivation rec { pname = "ccache"; - version = "3.4.1"; + version = "3.7.10"; - src = fetchurl { - sha256 = "1pppi4jbkkj641cdynmc35jaj40jjicw7gj75ran5qs5886jcblc"; - url = "mirror://samba/ccache/${pname}-${version}.tar.xz"; + src = fetchFromGitHub { + owner = "ccache"; + repo = "ccache"; + rev = "v${version}"; + sha256 = "0v6pvj50y18fxh2f6cx6xyg545xcpxfmrcg9bzbc6lc5acrvvjm7"; }; - nativeBuildInputs = [ perl ]; + nativeBuildInputs = [ asciidoc-full autoreconfHook gperf perl ]; buildInputs = [ zlib ]; outputs = [ "out" "man" ]; - # non to be fail on filesystems with unconventional blocksizes (zfs on Hydra?) - patches = [ - ./fix-debug-prefix-map-suite.patch - ./skip-fs-dependent-test.patch - ]; - - postPatch = '' - substituteInPlace Makefile.in --replace 'objs) $(extra_libs)' 'objs)' - ''; - doCheck = !stdenv.isDarwin; passthru = { @@ -71,8 +63,8 @@ let ccache = stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Compiler cache for fast recompilation of C/C++ code"; - homepage = "http://ccache.samba.org/"; - downloadPage = "https://ccache.samba.org/download.html"; + homepage = "https://ccache.dev/"; + downloadPage = "https://ccache.dev/download.html"; license = licenses.gpl3Plus; platforms = platforms.unix; }; diff --git a/pkgs/development/tools/misc/ccache/fix-debug-prefix-map-suite.patch b/pkgs/development/tools/misc/ccache/fix-debug-prefix-map-suite.patch deleted file mode 100644 index 98a6fbf10bf..00000000000 --- a/pkgs/development/tools/misc/ccache/fix-debug-prefix-map-suite.patch +++ /dev/null @@ -1,42 +0,0 @@ ---- a/test/suites/debug_prefix_map.bash -+++ b/test/suites/debug_prefix_map.bash -@@ -29,7 +29,7 @@ - expect_stat 'cache hit (preprocessed)' 0 - expect_stat 'cache miss' 1 - expect_stat 'files in cache' 2 -- if grep -E "[^=]`pwd`[^=]" test.o >/dev/null 2>&1; then -+ if objdump -g test.o | grep ": `pwd`$" >/dev/null 2>&1; then - test_failed "Source dir (`pwd`) found in test.o" - fi - -@@ -39,7 +39,7 @@ - expect_stat 'cache hit (preprocessed)' 0 - expect_stat 'cache miss' 1 - expect_stat 'files in cache' 2 -- if grep -E "[^=]`pwd`[^=]" test.o >/dev/null 2>&1; then -+ if objdump -g test.o | grep ": `pwd`$" >/dev/null 2>&1; then - test_failed "Source dir (`pwd`) found in test.o" - fi - -@@ -52,10 +52,10 @@ - expect_stat 'cache hit (preprocessed)' 0 - expect_stat 'cache miss' 1 - expect_stat 'files in cache' 2 -- if grep -E "[^=]`pwd`[^=]" test.o >/dev/null 2>&1; then -+ if objdump -g test.o | grep ": `pwd`$" >/dev/null 2>&1; then - test_failed "Source dir (`pwd`) found in test.o" - fi -- if ! grep "name" test.o >/dev/null 2>&1; then -+ if ! objdump -g test.o | grep ": name$" >/dev/null 2>&1; then - test_failed "Relocation (name) not found in test.o" - fi - -@@ -65,7 +65,7 @@ - expect_stat 'cache hit (preprocessed)' 0 - expect_stat 'cache miss' 1 - expect_stat 'files in cache' 2 -- if grep -E "[^=]`pwd`[^=]" test.o >/dev/null 2>&1; then -+ if objdump -g test.o | grep ": `pwd`$" >/dev/null 2>&1; then - test_failed "Source dir (`pwd`) found in test.o" - fi - } diff --git a/pkgs/development/tools/misc/ccache/skip-fs-dependent-test.patch b/pkgs/development/tools/misc/ccache/skip-fs-dependent-test.patch deleted file mode 100644 index 7b233df6531..00000000000 --- a/pkgs/development/tools/misc/ccache/skip-fs-dependent-test.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- a/test/suites/cleanup.bash -+++ b/test/suites/cleanup.bash -@@ -94,23 +94,6 @@ - - $CCACHE -F 0 -M 256K >/dev/null - CCACHE_LOGFILE=/tmp/foo $CCACHE -c >/dev/null -- expect_file_count 3 '*.o' $CCACHE_DIR -- expect_file_count 3 '*.d' $CCACHE_DIR -- expect_file_count 3 '*.stderr' $CCACHE_DIR -- expect_stat 'files in cache' 9 -- expect_stat 'cleanups performed' 1 -- for i in 3 4 5; do -- file=$CCACHE_DIR/a/result$i-4017.o -- if [ ! -f $file ]; then -- test_failed "File $file removed when it shouldn't" -- fi -- done -- for i in 0 1 2 6 7 8 9; do -- file=$CCACHE_DIR/a/result$i-4017.o -- if [ -f $file ]; then -- test_failed "File $file not removed when it should" -- fi -- done - - # ------------------------------------------------------------------------- - TEST "Automatic cache cleanup, limit_multiple 0.9" diff --git a/pkgs/development/tools/misc/circleci-cli/default.nix b/pkgs/development/tools/misc/circleci-cli/default.nix index 5b641a3ec5c..6dcf7ed46cf 100644 --- a/pkgs/development/tools/misc/circleci-cli/default.nix +++ b/pkgs/development/tools/misc/circleci-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "circleci-cli"; - version = "0.1.8302"; + version = "0.1.8599"; src = fetchFromGitHub { owner = "CircleCI-Public"; repo = pname; rev = "v${version}"; - sha256 = "1rq1x6893n4siljn2jizrnz8b8qlic1y087gikh5p5140zpcbhnx"; + sha256 = "1brv38mzc2i6mg4rk9ichjsv5w0gr6xrf6qmhnal12cll2krn9k3"; }; vendorSha256 = "0y35ps2pw9z7gi4z50byd1py87bf2jdvj7l7w2gxpppmhi83myc9"; diff --git a/pkgs/development/tools/misc/reviewdog/default.nix b/pkgs/development/tools/misc/reviewdog/default.nix index 9e4dbcac5b8..13386fb9e85 100644 --- a/pkgs/development/tools/misc/reviewdog/default.nix +++ b/pkgs/development/tools/misc/reviewdog/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "reviewdog"; - version = "0.10.0"; + version = "0.10.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "1ag55n3gfwcp6v8v3hha8bdqxw9r4bmz97p00vyqla9gjzn5ka9w"; + sha256 = "05y8683f0r8bf8gn5miiwqkfz550s2c9kmvz0a1g7y99r9n6kzjk"; }; - vendorSha256 = "0lann22hjdcrwyab76hinvbbmg3rf7y3knrxlfg0164gl3y5xb5g"; + vendorSha256 = "0cxi01jxg89lsk91dv782746i8g9ksanx8igmgafq9vq25lld7yg"; subPackages = [ "cmd/reviewdog" ]; diff --git a/pkgs/development/tools/misc/terracognita/default.nix b/pkgs/development/tools/misc/terracognita/default.nix index 70b07dd71cd..6141b0b9997 100644 --- a/pkgs/development/tools/misc/terracognita/default.nix +++ b/pkgs/development/tools/misc/terracognita/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "terracognita"; - version = "0.4.0"; + version = "0.5.0"; src = fetchFromGitHub { owner = "cycloidio"; repo = pname; rev = "v${version}"; - sha256 = "0ib0p361sxh2qzxccg32pcml4by4mk45abhljwmljwybs34wh5rh"; + sha256 = "0s6k78n94q13crdlgxb5c8qn708nbzn6nmhkil4s23f0qdskcah2"; }; - vendorSha256 = "0q772i49nyxzs51jrh45n14ljh7qj5wygkn2x32pxi6ykw6la4x8"; + vendorSha256 = "1dmv16v1c9sydbl1g69pgwvrhznd0a133giwrcbqi4cyg1fdb3sr"; subPackages = [ "." ]; diff --git a/pkgs/development/tools/misc/terraform-ls/default.nix b/pkgs/development/tools/misc/terraform-ls/default.nix index cbbdd416ff8..f2c8a6c4cdd 100644 --- a/pkgs/development/tools/misc/terraform-ls/default.nix +++ b/pkgs/development/tools/misc/terraform-ls/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "terraform-ls"; - version = "0.3.2"; + version = "0.4.0"; src = fetchFromGitHub { owner = "hashicorp"; repo = pname; rev = "v${version}"; - sha256 = "11776nq1ixrg791xlmryjxldsc8gn69j1fc0wd6cdywy8yp2lh4w"; + sha256 = "105wk7lzsjl5qa1qnb40msj3wh4awqykkynj5fs0a7nzbcbrpxsj"; }; goPackagePath = "github.com/hashicorp/terraform-ls"; diff --git a/pkgs/development/tools/misc/tokei/default.nix b/pkgs/development/tools/misc/tokei/default.nix index dee4c910fb8..fe54aff87c5 100644 --- a/pkgs/development/tools/misc/tokei/default.nix +++ b/pkgs/development/tools/misc/tokei/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "tokei"; - version = "11.2.1"; + version = "12.0.4"; src = fetchFromGitHub { owner = "XAMPPRocky"; repo = pname; rev = "v${version}"; - sha256 = "1bdq66si9vvvyf5nia8ww77imp0f8jas0yfcvq1rialwm9922dfl"; + sha256 = "0vj6xpp5ss82n1zxljy5893s8l1pdhar5xqay5vvglkp8bzblin6"; }; - cargoSha256 = "17666wh4sfzhgxngymd02892mqpkr8jm6a4w95wwsc9iinzbygrm"; + cargoSha256 = "02c2pdjzd49qznm1yj3rnli48267ajjdklrb1cpj0rhpirw4rh1j"; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security diff --git a/pkgs/development/tools/ocaml/camlp5/default.nix b/pkgs/development/tools/ocaml/camlp5/default.nix index 9a69f88c804..7e7c185fbc7 100644 --- a/pkgs/development/tools/ocaml/camlp5/default.nix +++ b/pkgs/development/tools/ocaml/camlp5/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation { - name = "camlp5-7.11"; + name = "camlp5-7.12"; src = fetchzip { - url = "https://github.com/camlp5/camlp5/archive/rel711.tar.gz"; - sha256 = "1s1f9i0r0czxlbnsaz4kvs2ahknmqxcm5ypl75g7scjcbl0an2x4"; + url = "https://github.com/camlp5/camlp5/archive/rel712.tar.gz"; + sha256 = "12ix5g15bys932hyf9gs637iz76m0ji9075d83jfdmx85q30llgf"; }; buildInputs = [ ocaml ]; diff --git a/pkgs/development/tools/rust/cbindgen/default.nix b/pkgs/development/tools/rust/cbindgen/default.nix index bc0ae5d33fe..655d726e66e 100644 --- a/pkgs/development/tools/rust/cbindgen/default.nix +++ b/pkgs/development/tools/rust/cbindgen/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "rust-cbindgen"; - version = "0.14.2"; + version = "0.14.3"; src = fetchFromGitHub { owner = "eqrion"; repo = "cbindgen"; rev = "v${version}"; - sha256 = "15mk7q89rs723c7i9wwq4rrvakwh834wvrsmsnayji5k1kwaj351"; + sha256 = "0pw55334i10k75qkig8bgcnlsy613zw2p5j4xyz8v71s4vh1a58j"; }; - cargoSha256 = "03irndd48ck62chm4vmlcnfm98gwd86xm1ssq9glw3b3y0n6x845"; + cargoSha256 = "0088ijnjhqfvdb1wxy9jc7hq8c0yxgj5brlg68n9vws1mz9rilpy"; buildInputs = stdenv.lib.optional stdenv.isDarwin Security; diff --git a/pkgs/development/tools/skaffold/default.nix b/pkgs/development/tools/skaffold/default.nix index e104784fbe8..b94217d20a4 100644 --- a/pkgs/development/tools/skaffold/default.nix +++ b/pkgs/development/tools/skaffold/default.nix @@ -2,17 +2,16 @@ buildGoPackage rec { pname = "skaffold"; - version = "1.11.0"; - # rev is the ${version} commit, mainly for skaffold version command output - rev = "931a70a6334436735bfc4ff7633232dd5fc73cc1"; + version = "1.12.0"; goPackagePath = "github.com/GoogleContainerTools/skaffold"; subPackages = ["cmd/skaffold"]; buildFlagsArray = let t = "${goPackagePath}/pkg/skaffold"; in '' -ldflags= + -s -w -X ${t}/version.version=v${version} - -X ${t}/version.gitCommit=${rev} + -X ${t}/version.gitCommit=${src.rev} -X ${t}/version.buildDate=unknown ''; @@ -20,7 +19,7 @@ buildGoPackage rec { owner = "GoogleContainerTools"; repo = "skaffold"; rev = "v${version}"; - sha256 = "035xp34m8kzb75mivgf3kw026n2h6g2a7j2mi32nxl1a794w36zi"; + sha256 = "12m2yqlngxvyyiqa58fmdwi752bz3mkk8fi312dvakr5kysnvn1l"; }; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/tools/wasm-bindgen-cli/0001-Add-cargo.lock.patch b/pkgs/development/tools/wasm-bindgen-cli/0001-Add-cargo.lock.patch index 86fbb81de05..12184c7d21e 100644 --- a/pkgs/development/tools/wasm-bindgen-cli/0001-Add-cargo.lock.patch +++ b/pkgs/development/tools/wasm-bindgen-cli/0001-Add-cargo.lock.patch @@ -1,19 +1,19 @@ -From a13aff157f899a6388b3c9e621680049f329a028 Mon Sep 17 00:00:00 2001 +From b1a7247a9b9bd327c01723cdc9334c0e7ec9a10e Mon Sep 17 00:00:00 2001 From: Maximilian Bosch -Date: Fri, 1 May 2020 23:44:08 +0200 +Date: Mon, 29 Jun 2020 17:33:55 +0200 Subject: [PATCH] Add cargo.lock --- - Cargo.lock | 2527 ++++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 2527 insertions(+) + Cargo.lock | 2541 ++++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 2541 insertions(+) create mode 100644 Cargo.lock diff --git a/Cargo.lock b/Cargo.lock new file mode 100644 -index 00000000..4822cea1 +index 00000000..04bdba9f --- /dev/null +++ b/Cargo.lock -@@ -0,0 +1,2527 @@ +@@ -0,0 +1,2541 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +[[package]] @@ -25,15 +25,15 @@ index 00000000..4822cea1 + +[[package]] +name = "adler32" -+version = "1.0.4" ++version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5d2e7343e7fc9de883d1b0341e0b13970f764c14101234857d2ddafa1cb1cac2" ++checksum = "567b077b825e468cc974f0020d4082ee6e03132512f207ef1a02fd5d00d1f32d" + +[[package]] +name = "aho-corasick" -+version = "0.7.10" ++version = "0.7.13" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8716408b8bc624ed7f65d223ddb9ac2d044c0547b6fa4b0d554f3a9540496ada" ++checksum = "043164d8ba5c4c3035fec9bbee8647c0261d788f3474306f93bb65901cae0e86" +dependencies = [ + "memchr", +] @@ -49,9 +49,9 @@ index 00000000..4822cea1 + +[[package]] +name = "anyhow" -+version = "1.0.28" ++version = "1.0.31" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d9a60d744a80c30fcb657dfe2c1b22bcb3e814c1a1e3674f32bf5820b570fbff" ++checksum = "85bb70cc08ec97ca5450e6eba421deeea5f172c0fc61f78b5357b2a8e8be195f" + +[[package]] +name = "arrayref" @@ -73,49 +73,58 @@ index 00000000..4822cea1 + +[[package]] +name = "askama" -+version = "0.7.2" ++version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "eed81479263c8753e06f4981f5a313b3fe6cbff30c3ff8d9ae15ef0c72d93fb5" ++checksum = "10a1fb9e41eb366cbcd267da2094be5b7e62fdbca9f82091e7503e80f885050d" +dependencies = [ + "askama_derive", ++ "askama_escape", + "askama_shared", +] + +[[package]] +name = "askama_derive" -+version = "0.7.2" ++version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "46580c08e5520afadc6e9064759e15fc743489a4db78f9c751113e3d32a1e083" ++checksum = "e1012c270085fa35ece6a48a569544fde85b6d9ee41074c7b706cc912a03f939" +dependencies = [ + "askama_shared", -+ "nom 4.2.3", -+ "proc-macro2 0.4.30", -+ "quote 0.6.13", -+ "syn 0.15.44", ++ "nom", ++ "proc-macro2", ++ "quote", ++ "syn", +] + +[[package]] -+name = "askama_shared" -+version = "0.7.2" ++name = "askama_escape" ++version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "64509fd5c2fa767fa7ea973b732c61f0b8d30d1adf084e5164523e51a5e35d71" ++checksum = "7a577aeba5fec1aafb9f195d98cfcc38a78b588e4ebf9b15f62ca1c7aa33795a" ++ ++[[package]] ++name = "askama_shared" ++version = "0.9.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8ee517f4e33c27b129928e71d8a044d54c513e72e0b72ec5c4f5f1823e9de353" +dependencies = [ -+ "num-traits 0.2.11", ++ "askama_escape", ++ "humansize", ++ "num-traits 0.2.12", + "serde", -+ "serde_derive", -+ "toml 0.4.10", ++ "toml", +] + +[[package]] +name = "assert_cmd" -+version = "0.11.1" ++version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "2dc477793bd82ec39799b6f6b3df64938532fdf2ab0d49ef817eac65856a5a1e" ++checksum = "c88b9ca26f9c16ec830350d309397e74ee9abdfd8eb1f71cb6ecc71a3fc818da" +dependencies = [ -+ "escargot", ++ "doc-comment", + "predicates", + "predicates-core", + "predicates-tree", ++ "wait-timeout", +] + +[[package]] @@ -192,9 +201,9 @@ index 00000000..4822cea1 + +[[package]] +name = "bumpalo" -+version = "3.2.1" ++version = "3.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "12ae9db68ad7fac5fe51304d20f016c911539251075a214f8e663babefa35187" ++checksum = "2e8c087f005730276d1096a652e92a8bacee2e2472bcc9715a74d2bec38b5820" + +[[package]] +name = "byteorder" @@ -213,9 +222,9 @@ index 00000000..4822cea1 + +[[package]] +name = "cc" -+version = "1.0.52" ++version = "1.0.56" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c3d87b23d6a92cd03af510a5ade527033f6aa6fa92161e2d5863a907d4c5e31d" ++checksum = "77c1f1d60091c1b73e2b1f4560ab419204b178e625fa945ded7b660becd2bd46" + +[[package]] +name = "cfg-if" @@ -237,7 +246,7 @@ index 00000000..4822cea1 +checksum = "80094f509cf8b5ae86a4966a39b3ff66cd7e2a3e594accec3743ff3fabeab5b2" +dependencies = [ + "num-integer", -+ "num-traits 0.2.11", ++ "num-traits 0.2.12", + "time", +] + @@ -249,9 +258,9 @@ index 00000000..4822cea1 + +[[package]] +name = "clap" -+version = "2.33.0" ++version = "2.33.1" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5067f5bb2d80ef5d68b4c87db81601f0b75bca627bc2ef76b141d7b846a3c6d9" ++checksum = "bdfa80d47f954d53a35a64987ca1422f495b8d6483c0fe9f7117b36c2a792129" +dependencies = [ + "ansi_term", + "atty", @@ -338,12 +347,13 @@ index 00000000..4822cea1 + +[[package]] +name = "crossbeam-queue" -+version = "0.2.1" ++version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c695eeca1e7173472a32221542ae469b3e9aac3a4fc81f7696bcad82029493db" ++checksum = "774ba60a54c213d409d5353bda12d49cd68d14e45036a285234c8d6f91f92570" +dependencies = [ + "cfg-if", + "crossbeam-utils", ++ "maybe-uninit", +] + +[[package]] @@ -359,9 +369,9 @@ index 00000000..4822cea1 + +[[package]] +name = "curl" -+version = "0.4.29" ++version = "0.4.30" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "762e34611d2d5233a506a79072be944fddd057db2f18e04c0d6fa79e3fd466fd" ++checksum = "b0447a642435be046540f042950d874a4907f9fee28c0513a0beb3ba89f91eb7" +dependencies = [ + "curl-sys", + "libc", @@ -374,9 +384,9 @@ index 00000000..4822cea1 + +[[package]] +name = "curl-sys" -+version = "0.4.31+curl-7.70.0" ++version = "0.4.32+curl-7.70.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "dcd62757cc4f5ab9404bc6ca9f0ae447e729a1403948ce5106bd588ceac6a3b0" ++checksum = "834425a2f22fdd621434196965bf99fbfd9eaed96348488e27b7ac40736c560b" +dependencies = [ + "cc", + "libc", @@ -398,6 +408,13 @@ index 00000000..4822cea1 +] + +[[package]] ++name = "deno" ++version = "0.1.0" ++dependencies = [ ++ "wasm-bindgen", ++] ++ ++[[package]] +name = "diff" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" @@ -421,6 +438,12 @@ index 00000000..4822cea1 +] + +[[package]] ++name = "doc-comment" ++version = "0.3.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10" ++ ++[[package]] +name = "docopt" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" @@ -462,25 +485,13 @@ index 00000000..4822cea1 +checksum = "44533bbbb3bb3c1fa17d9f2e4e38bbbaf8396ba82193c4cb1b6445d711445d36" +dependencies = [ + "atty", -+ "humantime", ++ "humantime 1.3.0", + "log 0.4.8", + "regex", + "termcolor", +] + +[[package]] -+name = "escargot" -+version = "0.4.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ceb9adbf9874d5d028b5e4c5739d22b71988252b25c9c98fe7cf9738bee84597" -+dependencies = [ -+ "lazy_static", -+ "log 0.4.8", -+ "serde", -+ "serde_json", -+] -+ -+[[package]] +name = "fetch" +version = "0.1.0" +dependencies = [ @@ -494,9 +505,9 @@ index 00000000..4822cea1 + +[[package]] +name = "filetime" -+version = "0.2.9" ++version = "0.2.10" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f59efc38004c988e4201d11d263b8171f49a2e7ec0bdbb71773433f271504a5e" ++checksum = "affc17579b132fc2461adf7c575cc6e8b134ebca52c51f5411388965227dc695" +dependencies = [ + "cfg-if", + "libc", @@ -510,7 +521,7 @@ index 00000000..4822cea1 +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da62c4f1b81918835a8c6a484a397775fff5953fe83529afd51b05f5c6a6617d" +dependencies = [ -+ "num-traits 0.2.11", ++ "num-traits 0.2.12", +] + +[[package]] @@ -536,9 +547,9 @@ index 00000000..4822cea1 + +[[package]] +name = "futures" -+version = "0.3.4" ++version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5c329ae8753502fb44ae4fc2b622fa2a94652c41e795143765ba0927f92ab780" ++checksum = "1e05b85ec287aac0dc34db7d4a569323df697f9c55b99b15d6b4ef8cde49f613" +dependencies = [ + "futures-channel", + "futures-core", @@ -551,9 +562,9 @@ index 00000000..4822cea1 + +[[package]] +name = "futures-channel" -+version = "0.3.4" ++version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f0c77d04ce8edd9cb903932b608268b3fffec4163dc053b3b402bf47eac1f1a8" ++checksum = "f366ad74c28cca6ba456d95e6422883cfb4b252a83bed929c83abfdbbf2967d5" +dependencies = [ + "futures-core", + "futures-sink", @@ -570,9 +581,9 @@ index 00000000..4822cea1 + +[[package]] +name = "futures-core" -+version = "0.3.4" ++version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f25592f769825e89b92358db00d26f965761e094951ac44d3663ef25b7ac464a" ++checksum = "59f5fff90fd5d971f936ad674802482ba441b6f09ba5e15fd8b39145582ca399" + +[[package]] +name = "futures-core-preview" @@ -582,9 +593,9 @@ index 00000000..4822cea1 + +[[package]] +name = "futures-executor" -+version = "0.3.4" ++version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f674f3e1bcb15b37284a90cedf55afdba482ab061c407a9c0ebbd0f3109741ba" ++checksum = "10d6bb888be1153d3abeb9006b11b02cf5e9b209fda28693c31ae1e4e012e314" +dependencies = [ + "futures-core", + "futures-task", @@ -593,39 +604,42 @@ index 00000000..4822cea1 + +[[package]] +name = "futures-io" -+version = "0.3.4" ++version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a638959aa96152c7a4cddf50fcb1e3fede0583b27157c26e67d6f99904090dc6" ++checksum = "de27142b013a8e869c14957e6d2edeef89e97c289e69d042ee3a49acd8b51789" + +[[package]] +name = "futures-macro" -+version = "0.3.4" ++version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9a5081aa3de1f7542a794a397cde100ed903b0630152d0973479018fd85423a7" ++checksum = "d0b5a30a4328ab5473878237c447333c093297bded83a4983d10f4deea240d39" +dependencies = [ + "proc-macro-hack", -+ "proc-macro2 1.0.10", -+ "quote 1.0.4", -+ "syn 1.0.18", ++ "proc-macro2", ++ "quote", ++ "syn", +] + +[[package]] +name = "futures-sink" -+version = "0.3.4" ++version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "3466821b4bc114d95b087b850a724c6f83115e929bc88f1fa98a3304a944c8a6" ++checksum = "3f2032893cb734c7a05d85ce0cc8b8c4075278e93b24b66f9de99d6eb0fa8acc" + +[[package]] +name = "futures-task" -+version = "0.3.4" ++version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7b0a34e53cf6cdcd0178aa573aed466b646eb3db769570841fda0c7ede375a27" ++checksum = "bdb66b5f09e22019b1ab0830f7785bcea8e7a42148683f99214f73f8ec21a626" ++dependencies = [ ++ "once_cell", ++] + +[[package]] +name = "futures-util" -+version = "0.3.4" ++version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "22766cf25d64306bedf0384da004d05c9974ab104fcc4528f1236181c18004c5" ++checksum = "8764574ff08b701a084482c3c7031349104b07ac897393010494beaa18ce32c6" +dependencies = [ + "futures-channel", + "futures-core", @@ -634,6 +648,7 @@ index 00000000..4822cea1 + "futures-sink", + "futures-task", + "memchr", ++ "pin-project", + "pin-utils", + "proc-macro-hack", + "proc-macro-nested", @@ -692,9 +707,9 @@ index 00000000..4822cea1 + +[[package]] +name = "hermit-abi" -+version = "0.1.12" ++version = "0.1.14" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "61565ff7aaace3525556587bd2dc31d4a07071957be715e63ce7b1eccf51a8f4" ++checksum = "b9586eedd4ce6b3c498bc3b4dd92fc9f11166aa908a914071953768066c67909" +dependencies = [ + "libc", +] @@ -706,6 +721,12 @@ index 00000000..4822cea1 +checksum = "cd179ae861f0c2e53da70d892f5f3029f9594be0c41dc5269cd371691b1dc2f9" + +[[package]] ++name = "humansize" ++version = "1.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b6cab2627acfc432780848602f3f558f7e9dd427352224b0d9324025796d2a5e" ++ ++[[package]] +name = "humantime" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" @@ -715,6 +736,12 @@ index 00000000..4822cea1 +] + +[[package]] ++name = "humantime" ++version = "2.0.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3c1ad908cc71012b7bea4d0c53ba96a8cba9962f048fa68d143376143d863b7a" ++ ++[[package]] +name = "id-arena" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" @@ -766,9 +793,9 @@ index 00000000..4822cea1 + +[[package]] +name = "itoa" -+version = "0.4.5" ++version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b8b7a7c0c47db5545ed3fef7468ee7bb5b74691498139e4b3f6a20685dc6dd8e" ++checksum = "dc6f3ad7b9d11a0c00842ff8de1b60ee58661048eb8049ed33c73594f359d7e6" + +[[package]] +name = "jpeg-decoder" @@ -782,7 +809,7 @@ index 00000000..4822cea1 + +[[package]] +name = "js-sys" -+version = "0.3.39" ++version = "0.3.41" +dependencies = [ + "wasm-bindgen", + "wasm-bindgen-futures", @@ -811,9 +838,9 @@ index 00000000..4822cea1 + +[[package]] +name = "libc" -+version = "0.2.69" ++version = "0.2.71" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "99e85c08494b21a9054e7fe1374a732aeadaff3980b6990b94bfd3a70f690005" ++checksum = "9457b06509d27052635f90d6466700c65095fdf75409b3fbdd903e988b886f49" + +[[package]] +name = "libz-sys" @@ -926,22 +953,12 @@ index 00000000..4822cea1 + +[[package]] +name = "nom" -+version = "4.2.3" ++version = "5.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "2ad2a91a8e869eeb30b9cb3119ae87773a8f4ae617f41b1eb9c154b2905f7bd6" ++checksum = "ffb4262d26ed83a1c0a33a38fe2bb15797329c85770da05e6b828ddb782627af" +dependencies = [ + "memchr", -+ "version_check 0.1.5", -+] -+ -+[[package]] -+name = "nom" -+version = "5.1.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "0b471253da97532da4b61552249c521e01e736071f71c1a4f7ebbfbf0a06aad6" -+dependencies = [ -+ "memchr", -+ "version_check 0.9.1", ++ "version_check 0.9.2", +] + +[[package]] @@ -952,23 +969,23 @@ index 00000000..4822cea1 + +[[package]] +name = "num-integer" -+version = "0.1.42" ++version = "0.1.43" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "3f6ea62e9d81a77cd3ee9a2a5b9b609447857f3d358704331e4ef39eb247fcba" ++checksum = "8d59457e662d541ba17869cf51cf177c0b5f0cbf476c66bdc90bf1edac4f875b" +dependencies = [ + "autocfg 1.0.0", -+ "num-traits 0.2.11", ++ "num-traits 0.2.12", +] + +[[package]] +name = "num-iter" -+version = "0.1.40" ++version = "0.1.41" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "dfb0800a0291891dd9f4fe7bd9c19384f98f7fbe0cd0f39a2c6b88b9868bbc00" ++checksum = "7a6e6b7c748f995c4c29c5f5ae0248536e04a5739927c74ec0fa564805094b9f" +dependencies = [ + "autocfg 1.0.0", + "num-integer", -+ "num-traits 0.2.11", ++ "num-traits 0.2.12", +] + +[[package]] @@ -978,7 +995,7 @@ index 00000000..4822cea1 +checksum = "ee314c74bd753fc86b4780aa9475da469155f3848473a261d2d18e35245a784e" +dependencies = [ + "num-integer", -+ "num-traits 0.2.11", ++ "num-traits 0.2.12", +] + +[[package]] @@ -987,14 +1004,14 @@ index 00000000..4822cea1 +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92e5113e9fd4cc14ded8e499429f396a20f98c772a47cc8622a736e1ec843c31" +dependencies = [ -+ "num-traits 0.2.11", ++ "num-traits 0.2.12", +] + +[[package]] +name = "num-traits" -+version = "0.2.11" ++version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c62be47e61d1842b9170f0fdeec8eba98e60e90e5446449a0545e5152acd7096" ++checksum = "ac267bcc07f48ee5f8935ab0d24f316fb722d7a1292e2913f0cc196b29ffd611" +dependencies = [ + "autocfg 1.0.0", +] @@ -1010,10 +1027,16 @@ index 00000000..4822cea1 +] + +[[package]] -+name = "openssl" -+version = "0.10.29" ++name = "once_cell" ++version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "cee6d85f4cb4c4f59a6a85d5b68a233d280c82e29e822913b9c8b129fbf20bdd" ++checksum = "0b631f7e854af39a1739f401cf34a8a013dfe09eac4fa4dba91e9768bd28168d" ++ ++[[package]] ++name = "openssl" ++version = "0.10.30" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8d575eff3665419f9b83678ff2815858ad9d11567e082f5ac1814baba4e2bcb4" +dependencies = [ + "bitflags 1.2.1", + "cfg-if", @@ -1031,18 +1054,18 @@ index 00000000..4822cea1 + +[[package]] +name = "openssl-src" -+version = "111.9.0+1.1.1g" ++version = "111.10.0+1.1.1g" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a2dbe10ddd1eb335aba3780eb2eaa13e1b7b441d2562fd962398740927f39ec4" ++checksum = "47cd4a96d49c3abf4cac8e8a80cba998a030c75608f158fb1c5f609772f265e6" +dependencies = [ + "cc", +] + +[[package]] +name = "openssl-sys" -+version = "0.9.55" ++version = "0.9.58" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7717097d810a0f2e2323f9e5d11e71608355e24828410b55b9d4f18aa5f9a5d8" ++checksum = "a842db4709b604f0fe5d1170ae3565899be2ad3d9cbc72dedc789ac0511f78de" +dependencies = [ + "autocfg 1.0.0", + "cc", @@ -1062,7 +1085,7 @@ index 00000000..4822cea1 +name = "performance" +version = "0.1.0" +dependencies = [ -+ "humantime", ++ "humantime 2.0.1", + "wasm-bindgen", + "web-sys", +] @@ -1107,6 +1130,26 @@ index 00000000..4822cea1 +] + +[[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-utils" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1132,9 +1175,9 @@ index 00000000..4822cea1 + +[[package]] +name = "ppv-lite86" -+version = "0.2.6" ++version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "74490b50b9fbe561ac330df47c08f3f33073d2d00c150f719147d7c54522fa1b" ++checksum = "237a5ed80e274dbc66f86bd59c1e25edc039660be53194b5fe0a482e0f2612ea" + +[[package]] +name = "predicates" @@ -1167,58 +1210,49 @@ index 00000000..4822cea1 + +[[package]] +name = "proc-macro-error" -+version = "1.0.2" ++version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "98e9e4b82e0ef281812565ea4751049f1bdcdfccda7d3f459f2e138a40c08678" ++checksum = "fc175e9777c3116627248584e8f8b3e2987405cabe1c0adf7d1dd28f09dc7880" +dependencies = [ + "proc-macro-error-attr", -+ "proc-macro2 1.0.10", -+ "quote 1.0.4", -+ "syn 1.0.18", -+ "version_check 0.9.1", ++ "proc-macro2", ++ "quote", ++ "syn", ++ "version_check 0.9.2", +] + +[[package]] +name = "proc-macro-error-attr" -+version = "1.0.2" ++version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4f5444ead4e9935abd7f27dc51f7e852a0569ac888096d5ec2499470794e2e53" ++checksum = "3cc9795ca17eb581285ec44936da7fc2335a3f34f2ddd13118b6f4d515435c50" +dependencies = [ -+ "proc-macro2 1.0.10", -+ "quote 1.0.4", -+ "syn 1.0.18", ++ "proc-macro2", ++ "quote", ++ "syn", + "syn-mid", -+ "version_check 0.9.1", ++ "version_check 0.9.2", +] + +[[package]] +name = "proc-macro-hack" -+version = "0.5.15" ++version = "0.5.16" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "0d659fe7c6d27f25e9d80a1a094c223f5246f6a6596453e09d7229bf42750b63" ++checksum = "7e0456befd48169b9f13ef0f0ad46d492cf9d2dbb918bcf38e01eed4ce3ec5e4" + +[[package]] +name = "proc-macro-nested" -+version = "0.1.4" ++version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8e946095f9d3ed29ec38de908c22f95d9ac008e424c7bcae54c75a79c527c694" ++checksum = "eba180dafb9038b050a4c280019bbedf9f2467b61e5d892dcad585bb57aadc5a" + +[[package]] +name = "proc-macro2" -+version = "0.4.30" ++version = "1.0.18" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759" ++checksum = "beae6331a816b1f65d04c45b078fd8e6c93e8071771f41b8163255bbd8d7c8fa" +dependencies = [ -+ "unicode-xid 0.1.0", -+] -+ -+[[package]] -+name = "proc-macro2" -+version = "1.0.10" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "df246d292ff63439fea9bc8c0a270bed0e390d5ebd4db4ba15aba81111b5abe3" -+dependencies = [ -+ "unicode-xid 0.2.0", ++ "unicode-xid", +] + +[[package]] @@ -1229,20 +1263,11 @@ index 00000000..4822cea1 + +[[package]] +name = "quote" -+version = "0.6.13" ++version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "6ce23b6b870e8f94f81fb0a363d65d86675884b34a09043c81e5562f11c1f8e1" ++checksum = "aa563d17ecb180e500da1cfd2b028310ac758de548efdd203e18f283af693f37" +dependencies = [ -+ "proc-macro2 0.4.30", -+] -+ -+[[package]] -+name = "quote" -+version = "1.0.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4c1f4b0efa5fc5e8ceb705136bfee52cfdb6a4e3509f770b478cd6ed434232a7" -+dependencies = [ -+ "proc-macro2 1.0.10", ++ "proc-macro2", +] + +[[package]] @@ -1420,10 +1445,11 @@ index 00000000..4822cea1 + +[[package]] +name = "rayon" -+version = "1.3.0" ++version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "db6ce3297f9c85e16621bb8cca38a06779ffc31bb8184e1be4bed2be4678a098" ++checksum = "62f02856753d04e03e26929f820d0a0a337ebe71f849801eea335d464b349080" +dependencies = [ ++ "autocfg 1.0.0", + "crossbeam-deque", + "either", + "rayon-core", @@ -1431,9 +1457,9 @@ index 00000000..4822cea1 + +[[package]] +name = "rayon-core" -+version = "1.7.0" ++version = "1.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "08a89b46efaf957e52b18062fb2f4660f8b8a4dde1807ca002690868ef2c85a9" ++checksum = "e92e15d89083484e11353891f1af602cc661426deb9564c298b270c726973280" +dependencies = [ + "crossbeam-deque", + "crossbeam-queue", @@ -1495,9 +1521,9 @@ index 00000000..4822cea1 + +[[package]] +name = "regex" -+version = "1.3.7" ++version = "1.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a6020f034922e3194c711b82a627453881bc4682166cabb07134a10c26ba7692" ++checksum = "9c3780fcf44b193bc4d09f36d2a3c87b251da4a046c87795a0d35f4f927ad8e6" +dependencies = [ + "aho-corasick", + "memchr", @@ -1507,15 +1533,15 @@ index 00000000..4822cea1 + +[[package]] +name = "regex-syntax" -+version = "0.6.17" ++version = "0.6.18" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7fe5bd57d1d7414c6b5ed48563a2c855d995ff777729dcd91c369ec7fea395ae" ++checksum = "26412eb97c6b088a6997e05f69403a802a92d520de2f8e63c2b65f9e0f47c4e8" + +[[package]] +name = "remove_dir_all" -+version = "0.5.2" ++version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4a83fa3702a688b9359eccba92d153ac33fd2e8462f9e0e3fdf155239ea7792e" ++checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7" +dependencies = [ + "winapi", +] @@ -1578,9 +1604,9 @@ index 00000000..4822cea1 + +[[package]] +name = "ryu" -+version = "1.0.4" ++version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ed3d612bc64430efeb3f7ee6ef26d590dce0c43249217bddc62112540c7941e1" ++checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e" + +[[package]] +name = "safemem" @@ -1600,9 +1626,9 @@ index 00000000..4822cea1 + +[[package]] +name = "schannel" -+version = "0.1.18" ++version = "0.1.19" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "039c25b130bd8c1321ee2d7de7fde2659fa9c2744e4bb29711cfc852ea53cd19" ++checksum = "8f05ba609c234e60bee0d547fe94a4c7e9da733d1c962cf6e59efa4cd9c8bc75" +dependencies = [ + "lazy_static", + "winapi", @@ -1628,29 +1654,29 @@ index 00000000..4822cea1 + +[[package]] +name = "serde" -+version = "1.0.106" ++version = "1.0.114" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "36df6ac6412072f67cf767ebbde4133a5b2e88e76dc6187fa7104cd16f783399" ++checksum = "5317f7588f0a5078ee60ef675ef96735a1442132dc645eb1d12c018620ed8cd3" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" -+version = "1.0.106" ++version = "1.0.114" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9e549e3abf4fb8621bd1609f11dfc9f5e50320802273b12f3811a67e6716ea6c" ++checksum = "2a0be94b04690fbaed37cddffc5c134bf537c8e3329d53e982fe04c374978f8e" +dependencies = [ -+ "proc-macro2 1.0.10", -+ "quote 1.0.4", -+ "syn 1.0.18", ++ "proc-macro2", ++ "quote", ++ "syn", +] + +[[package]] +name = "serde_json" -+version = "1.0.52" ++version = "1.0.55" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a7894c8ed05b7a3a279aeb79025fdec1d3158080b75b98a08faf2806bb799edd" ++checksum = "ec2c5d7e739bc07a3e73381a39d61fdb5f671c60c1df26a130690665803d8226" +dependencies = [ + "itoa", + "ryu", @@ -1676,12 +1702,6 @@ index 00000000..4822cea1 +checksum = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8" + +[[package]] -+name = "smallvec" -+version = "1.4.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c7cb5678e1615754284ec264d9bb5b4c27d2018577fd90ac0ceb578591ed5ee4" -+ -+[[package]] +name = "socket2" +version = "0.3.12" +source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1713,9 +1733,9 @@ index 00000000..4822cea1 + +[[package]] +name = "structopt" -+version = "0.3.14" ++version = "0.3.15" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "863246aaf5ddd0d6928dfeb1a9ca65f505599e4e1b399935ef7e75107516b4ef" ++checksum = "de2f5e239ee807089b62adce73e48c625e0ed80df02c7ab3f068f5db5281065c" +dependencies = [ + "clap", + "lazy_static", @@ -1724,37 +1744,26 @@ index 00000000..4822cea1 + +[[package]] +name = "structopt-derive" -+version = "0.4.7" ++version = "0.4.8" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d239ca4b13aee7a2142e6795cbd69e457665ff8037aed33b3effdc430d2f927a" ++checksum = "510413f9de616762a4fbeab62509bf15c729603b72d7cd71280fbca431b1c118" +dependencies = [ + "heck", + "proc-macro-error", -+ "proc-macro2 1.0.10", -+ "quote 1.0.4", -+ "syn 1.0.18", ++ "proc-macro2", ++ "quote", ++ "syn", +] + +[[package]] +name = "syn" -+version = "0.15.44" ++version = "1.0.33" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9ca4b3b69a77cbe1ffc9e198781b7acb0c7365a883670e8f1c1bc66fba79a5c5" ++checksum = "e8d5d96e8cbb005d6959f119f773bfaebb5684296108fb32600c00cde305b2cd" +dependencies = [ -+ "proc-macro2 0.4.30", -+ "quote 0.6.13", -+ "unicode-xid 0.1.0", -+] -+ -+[[package]] -+name = "syn" -+version = "1.0.18" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "410a7488c0a728c7ceb4ad59b9567eb4053d02e8cc7f5c0e0eeeb39518369213" -+dependencies = [ -+ "proc-macro2 1.0.10", -+ "quote 1.0.4", -+ "unicode-xid 0.2.0", ++ "proc-macro2", ++ "quote", ++ "unicode-xid", +] + +[[package]] @@ -1763,9 +1772,9 @@ index 00000000..4822cea1 +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7be3539f6c128a931cf19dcee741c1af532c7fd387baa739c03dd2e96479338a" +dependencies = [ -+ "proc-macro2 1.0.10", -+ "quote 1.0.4", -+ "syn 1.0.18", ++ "proc-macro2", ++ "quote", ++ "syn", +] + +[[package]] @@ -1832,9 +1841,9 @@ index 00000000..4822cea1 + +[[package]] +name = "threadpool" -+version = "1.8.0" ++version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e8dae184447c15d5a6916d973c642aec485105a13cd238192a6927ae3e077d66" ++checksum = "d050e60b33d41c19108b32cea32164033a9013fe3b46cbd4457559bfbf77afaa" +dependencies = [ + "num_cpus", +] @@ -1863,6 +1872,12 @@ index 00000000..4822cea1 +] + +[[package]] ++name = "tinyvec" ++version = "0.3.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "53953d2d3a5ad81d9f844a32f14ebb121f50b650cd59d0ee2a07cf13c617efed" ++ ++[[package]] +name = "todomvc" +version = "0.1.0" +dependencies = [ @@ -1875,15 +1890,6 @@ index 00000000..4822cea1 + +[[package]] +name = "toml" -+version = "0.4.10" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "758664fc71a3a69038656bee8b6be6477d2a6c315a6b81f7081f591bffa4111f" -+dependencies = [ -+ "serde", -+] -+ -+[[package]] -+name = "toml" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffc92d160b1eef40665be3a05630d003936a3bc7da7421277846c2613e92c71a" @@ -1899,16 +1905,16 @@ index 00000000..4822cea1 + +[[package]] +name = "trybuild" -+version = "1.0.26" ++version = "1.0.30" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4e5696e4fd793743fbcc29943fe965ea3993b6c3d2a6a3a35c6680d926fd3a49" ++checksum = "bbe777c4e2060f44d83892be1189f96200be8ed3d99569d5c2d5ee26e62c0ea9" +dependencies = [ + "glob", + "lazy_static", + "serde", + "serde_json", + "termcolor", -+ "toml 0.5.6", ++ "toml", +] + +[[package]] @@ -1949,11 +1955,11 @@ index 00000000..4822cea1 + +[[package]] +name = "unicode-normalization" -+version = "0.1.12" ++version = "0.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5479532badd04e128284890390c1e876ef7a993d0570b3597ae43dfa1d59afa4" ++checksum = "6fb19cf769fa8c6a80a162df694621ebeb4dafb606470b2b2fce0be40a98a977" +dependencies = [ -+ "smallvec", ++ "tinyvec", +] + +[[package]] @@ -1970,15 +1976,9 @@ index 00000000..4822cea1 + +[[package]] +name = "unicode-xid" -+version = "0.1.0" ++version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc" -+ -+[[package]] -+name = "unicode-xid" -+version = "0.2.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c" ++checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564" + +[[package]] +name = "url" @@ -1993,15 +1993,15 @@ index 00000000..4822cea1 + +[[package]] +name = "vcpkg" -+version = "0.2.8" ++version = "0.2.10" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "3fc439f2794e98976c88a2a2dafce96b930fe8010b0a256b3c2199a773933168" ++checksum = "6454029bf181f092ad1b853286f23e2c507d8e8194d01d92da4a55c274a5508c" + +[[package]] +name = "vec_map" -+version = "0.8.1" ++version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "05c78687fb1a80548ae3250346c3db86a80a7cdd77bda190189f2d0a0987c81a" ++checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" + +[[package]] +name = "version_check" @@ -2011,15 +2011,24 @@ index 00000000..4822cea1 + +[[package]] +name = "version_check" -+version = "0.9.1" ++version = "0.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "078775d0255232fb988e6fccf26ddc9d1ac274299aaedcedce21c6f72cc533ce" ++checksum = "b5a972e5669d67ba988ce3dc826706fb0a8b01471c088cb0b6110b805cc36aed" ++ ++[[package]] ++name = "wait-timeout" ++version = "0.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9f200f5b12eb75f8c1ed65abd4b2db8a6e1b138a20de009dacee265a2498f3f6" ++dependencies = [ ++ "libc", ++] + +[[package]] +name = "walrus" -+version = "0.14.0" ++version = "0.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4d96e9ec3f81fdb3210b12b2b1e9e39369c8050a3a28e692e5247e3ab5196410" ++checksum = "f970863270179a4e0ca2bfb470931f883f7535ae8b9dac4271761fa1b77e253d" +dependencies = [ + "anyhow", + "id-arena", @@ -2027,19 +2036,19 @@ index 00000000..4822cea1 + "log 0.4.8", + "rayon", + "walrus-macro", -+ "wasmparser 0.42.1", ++ "wasmparser", +] + +[[package]] +name = "walrus-macro" -+version = "0.14.0" ++version = "0.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "2bc16925d405153a91e01cdac2a5549aa25ca9148b5176e25e601f6536344d94" ++checksum = "80927fca8665132b48c7714bcec983d6e761c60b3a9877c6cd7df86417b13573" +dependencies = [ + "heck", -+ "proc-macro2 1.0.10", -+ "quote 1.0.4", -+ "syn 1.0.18", ++ "proc-macro2", ++ "quote", ++ "syn", +] + +[[package]] @@ -2050,7 +2059,7 @@ index 00000000..4822cea1 + +[[package]] +name = "wasm-bindgen" -+version = "0.2.62" ++version = "0.2.64" +dependencies = [ + "cfg-if", + "js-sys", @@ -2065,27 +2074,15 @@ index 00000000..4822cea1 +] + +[[package]] -+name = "wasm-bindgen-anyref-xform" -+version = "0.2.62" -+dependencies = [ -+ "anyhow", -+ "rayon", -+ "walrus", -+ "wasmprinter", -+ "wast 3.0.4", -+ "wat", -+] -+ -+[[package]] +name = "wasm-bindgen-backend" -+version = "0.2.62" ++version = "0.2.64" +dependencies = [ + "bumpalo", + "lazy_static", + "log 0.4.8", -+ "proc-macro2 1.0.10", -+ "quote 1.0.4", -+ "syn 1.0.18", ++ "proc-macro2", ++ "quote", ++ "syn", + "wasm-bindgen-shared", +] + @@ -2099,7 +2096,7 @@ index 00000000..4822cea1 + +[[package]] +name = "wasm-bindgen-cli" -+version = "0.2.62" ++version = "0.2.64" +dependencies = [ + "anyhow", + "assert_cmd", @@ -2127,7 +2124,7 @@ index 00000000..4822cea1 + +[[package]] +name = "wasm-bindgen-cli-support" -+version = "0.2.62" ++version = "0.2.64" +dependencies = [ + "anyhow", + "base64 0.9.3", @@ -2136,7 +2133,7 @@ index 00000000..4822cea1 + "serde_json", + "tempfile", + "walrus", -+ "wasm-bindgen-anyref-xform", ++ "wasm-bindgen-externref-xform", + "wasm-bindgen-multi-value-xform", + "wasm-bindgen-shared", + "wasm-bindgen-threads-xform", @@ -2148,8 +2145,20 @@ index 00000000..4822cea1 +] + +[[package]] ++name = "wasm-bindgen-externref-xform" ++version = "0.2.64" ++dependencies = [ ++ "anyhow", ++ "rayon", ++ "walrus", ++ "wasmprinter", ++ "wast 17.0.0", ++ "wat", ++] ++ ++[[package]] +name = "wasm-bindgen-futures" -+version = "0.4.12" ++version = "0.4.14" +dependencies = [ + "cfg-if", + "futures-channel-preview", @@ -2161,9 +2170,9 @@ index 00000000..4822cea1 + +[[package]] +name = "wasm-bindgen-macro" -+version = "0.2.62" ++version = "0.2.64" +dependencies = [ -+ "quote 1.0.4", ++ "quote", + "trybuild", + "wasm-bindgen", + "wasm-bindgen-futures", @@ -2172,24 +2181,24 @@ index 00000000..4822cea1 + +[[package]] +name = "wasm-bindgen-macro-support" -+version = "0.2.62" ++version = "0.2.64" +dependencies = [ -+ "proc-macro2 1.0.10", -+ "quote 1.0.4", -+ "syn 1.0.18", ++ "proc-macro2", ++ "quote", ++ "syn", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-multi-value-xform" -+version = "0.2.62" ++version = "0.2.64" +dependencies = [ + "anyhow", + "rayon", + "walrus", + "wasmprinter", -+ "wast 3.0.4", ++ "wast 17.0.0", + "wat", +] + @@ -2204,11 +2213,11 @@ index 00000000..4822cea1 + +[[package]] +name = "wasm-bindgen-shared" -+version = "0.2.62" ++version = "0.2.64" + +[[package]] +name = "wasm-bindgen-test" -+version = "0.3.12" ++version = "0.3.14" +dependencies = [ + "console_error_panic_hook", + "js-sys", @@ -2234,15 +2243,15 @@ index 00000000..4822cea1 + +[[package]] +name = "wasm-bindgen-test-macro" -+version = "0.3.12" ++version = "0.3.14" +dependencies = [ -+ "proc-macro2 1.0.10", -+ "quote 1.0.4", ++ "proc-macro2", ++ "quote", +] + +[[package]] +name = "wasm-bindgen-threads-xform" -+version = "0.2.62" ++version = "0.2.64" +dependencies = [ + "anyhow", + "walrus", @@ -2251,7 +2260,7 @@ index 00000000..4822cea1 + +[[package]] +name = "wasm-bindgen-wasm-conventions" -+version = "0.2.62" ++version = "0.2.64" +dependencies = [ + "anyhow", + "walrus", @@ -2259,29 +2268,30 @@ index 00000000..4822cea1 + +[[package]] +name = "wasm-bindgen-wasm-interpreter" -+version = "0.2.62" ++version = "0.2.64" +dependencies = [ + "anyhow", + "log 0.4.8", + "tempfile", + "walrus", ++ "wasm-bindgen-wasm-conventions", + "wat", +] + +[[package]] +name = "wasm-bindgen-webidl" -+version = "0.2.62" ++version = "0.2.64" +dependencies = [ + "anyhow", + "env_logger", + "heck", + "lazy_static", + "log 0.4.8", -+ "proc-macro2 1.0.10", -+ "quote 1.0.4", ++ "proc-macro2", ++ "quote", + "sourcefile", + "structopt", -+ "syn 1.0.18", ++ "syn", + "wasm-bindgen-backend", + "weedle", +] @@ -2304,56 +2314,50 @@ index 00000000..4822cea1 + +[[package]] +name = "wasmparser" -+version = "0.42.1" ++version = "0.55.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "1527c84a5bd585215f29c06b0e2a5274e478ad4dfc970d26ffad66fdc6cb311d" -+ -+[[package]] -+name = "wasmparser" -+version = "0.51.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "aeb1956b19469d1c5e63e459d29e7b5aa0f558d9f16fcef09736f8a265e6c10a" ++checksum = "af931e2e1960c53f4a28b063fec4cacd036f35acbec8ff3a4739125b17382a87" + +[[package]] +name = "wasmprinter" -+version = "0.2.3" ++version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8bd423d45b95fcee11775472bfdce66c63c45ada23c1b338e0a63d623a6c475b" ++checksum = "c93ba310101ec5ee980db66b47b3d276577c8310df1570e19994347137650454" +dependencies = [ + "anyhow", -+ "wasmparser 0.51.4", ++ "wasmparser", +] + +[[package]] +name = "wast" -+version = "3.0.4" ++version = "17.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "233648f540f07fce9b972436f2fbcae8a750c1121b6d32d949e1a44b4d9fc7b1" ++checksum = "5a0e1c36b928fca33dbaf96235188f5fad22ee87100e26cc606bd0fbabdf1932" +dependencies = [ + "leb128", +] + +[[package]] +name = "wast" -+version = "14.0.0" ++version = "21.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "47b11c94c63d5365a76ea287f8e6e5b6050233fae4b2423aea2a1e126a385e17" ++checksum = "0b1844f66a2bc8526d71690104c0e78a8e59ffa1597b7245769d174ebb91deb5" +dependencies = [ + "leb128", +] + +[[package]] +name = "wat" -+version = "1.0.15" ++version = "1.0.22" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "03db18bc33cff3859c296efbefdcc00763a644539feeadca3415a1cee8a2835d" ++checksum = "ce85d72b74242c340e9e3492cfb602652d7bb324c3172dd441b5577e39a2e18c" +dependencies = [ -+ "wast 14.0.0", ++ "wast 21.0.0", +] + +[[package]] +name = "web-sys" -+version = "0.3.39" ++version = "0.3.41" +dependencies = [ + "js-sys", + "wasm-bindgen", @@ -2389,6 +2393,16 @@ index 00000000..4822cea1 +] + +[[package]] ++name = "webrtc_datachannel" ++version = "0.1.0" ++dependencies = [ ++ "js-sys", ++ "wasm-bindgen", ++ "wasm-bindgen-futures", ++ "web-sys", ++] ++ ++[[package]] +name = "websockets" +version = "0.1.0" +dependencies = [ @@ -2416,14 +2430,14 @@ index 00000000..4822cea1 +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a7d4f9feb723a800d8f7b74edc9fa44ff35cb0b2ec64886714362f423427f37" +dependencies = [ -+ "nom 5.1.1", ++ "nom", +] + +[[package]] +name = "winapi" -+version = "0.3.8" ++version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8093091eeb260906a183e6ae1abdba2ef5ef2257a21801128899c3fc699229c6" ++checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", @@ -2452,9 +2466,9 @@ index 00000000..4822cea1 + +[[package]] +name = "wit-parser" -+version = "0.1.1" ++version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "29a378ab795034efe2c4a6c8a388a2d9b31d360ad441c0bc9859b3d4d37e62a3" ++checksum = "3f5fd97866f4b9c8e1ed57bcf9446f3d0d8ba37e2dd01c3c612c046c053b06f7" +dependencies = [ + "anyhow", + "leb128", @@ -2463,9 +2477,9 @@ index 00000000..4822cea1 + +[[package]] +name = "wit-printer" -+version = "0.1.0" ++version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8c76e17384f4feb766d109a42c309b78de75ea2b3745f663ac3f5f331633f77f" ++checksum = "93f19ca44555a3c14d69acee6447a6e4f52771b0c6e5d8db3e42db3b90f6fce9" +dependencies = [ + "anyhow", + "wasmprinter", @@ -2481,32 +2495,32 @@ index 00000000..4822cea1 + +[[package]] +name = "wit-text" -+version = "0.1.1" ++version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "2aa19a002c984e25356af8938a8f4b7f0c9fe3963498e7ae1f90d64da9e563f5" ++checksum = "e9ce51bfa02a5d206998191f63d4f3f3e80696a883dd29194ac4259bb1d57f52" +dependencies = [ + "anyhow", -+ "wast 3.0.4", ++ "wast 17.0.0", + "wit-writer", +] + +[[package]] +name = "wit-validator" -+version = "0.1.2" ++version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "2454229f760a433842db154c9bb54da896fdf2352b1d63261f617bcdf20be0bd" ++checksum = "e34e89c07a16b3ea0c3bec5a8b0f20d965796968eb5211d1e3522e8e4a385853" +dependencies = [ + "anyhow", -+ "wasmparser 0.51.4", ++ "wasmparser", + "wit-parser", + "wit-schema-version", +] + +[[package]] +name = "wit-walrus" -+version = "0.1.0" ++version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8e14fbb9453201558c582d227c2b75df5c050409f467e8c220fcd57dc369280a" ++checksum = "75b636bb9de044e181cfe8745256a24e37f482b4d31ea08b9ac330d4a948e702" +dependencies = [ + "anyhow", + "id-arena", @@ -2518,9 +2532,9 @@ index 00000000..4822cea1 + +[[package]] +name = "wit-writer" -+version = "0.1.0" ++version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ebeb128df9e103e61f8ddd8a190259f3c48b73fe86a5932f40f4de526ef357e8" ++checksum = "c2ad01ba5e9cbcff799a0689e56a153776ea694cec777f605938cb9880d41a09" +dependencies = [ + "leb128", + "wit-schema-version", diff --git a/pkgs/development/tools/wasm-bindgen-cli/default.nix b/pkgs/development/tools/wasm-bindgen-cli/default.nix index 9adabeb573f..cb4840df4d1 100644 --- a/pkgs/development/tools/wasm-bindgen-cli/default.nix +++ b/pkgs/development/tools/wasm-bindgen-cli/default.nix @@ -2,19 +2,19 @@ rustPlatform.buildRustPackage rec { pname = "wasm-bindgen-cli"; - version = "0.2.62"; + version = "0.2.64"; src = fetchFromGitHub { owner = "rustwasm"; repo = "wasm-bindgen"; rev = version; - sha256 = "0d3ph3g220nvzwxa71rch03j5c0w06v8z4lmlyp5kky6p86r37hz"; + sha256 = "1h8sxa15v4l6m4b82p0rlg7ilzfjdz2x7lipampapb9yzn9c5dcs"; }; buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security curl ]; nativeBuildInputs = [ pkgconfig ]; - cargoSha256 = "13lj2yx2bcwac1b4gpwcgiwqvy178zis6r1pidn4pgwqv7zxa7p2"; + cargoSha256 = "1pynk2yisv6ryj1rlwx8bv6akjm39i3d6sd8f42b5v1w5vsg0nqm"; cargoPatches = [ ./0001-Add-cargo.lock.patch ]; cargoBuildFlags = [ "-p" pname ]; diff --git a/pkgs/development/tools/wrangler/default.nix b/pkgs/development/tools/wrangler/default.nix index cdbba236922..6a6d6e39288 100644 --- a/pkgs/development/tools/wrangler/default.nix +++ b/pkgs/development/tools/wrangler/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "wrangler"; - version = "1.9.2"; + version = "1.10.3"; src = fetchFromGitHub { owner = "cloudflare"; repo = pname; rev = "v${version}"; - sha256 = "0i3fhdq8v9459mlnazkv9bpkcv01rdy5rk149lhpsan76zlyzzwr"; + sha256 = "0703zlrmv0if575rj1mrgfg1a5qbf98sqjhhj09hab69i96wbrk9"; }; - cargoSha256 = "0c2ss3j53vra1b4m3jsy2w2gdf6k1hw3qf6sd4qlg2ybk4k83g3b"; + cargoSha256 = "0znzyqzvbqcl4mmxpsvaf592xrs968x57czj45jibmafq033dbfa"; nativeBuildInputs = stdenv.lib.optionals stdenv.isLinux [ pkg-config ]; diff --git a/pkgs/development/tools/yq-go/default.nix b/pkgs/development/tools/yq-go/default.nix index fc6fcd23485..e830309381f 100644 --- a/pkgs/development/tools/yq-go/default.nix +++ b/pkgs/development/tools/yq-go/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "yq-go"; - version = "3.3.1"; + version = "3.3.2"; src = fetchFromGitHub { owner = "mikefarah"; rev = version; repo = "yq"; - sha256 = "0fr6zwnij3r53dqdw43qfmp4nw26gv6zmj066l44fazka4fl25i6"; + sha256 = "1rdpjxnq6cs6gwpp4bijp38b657yzjqcdzf98lhhpbpskjz8k8pp"; }; vendorSha256 = "1bjy3qr26zndr3dhh9gd33rhm5gy779525qgzjw4a4mla0p2q6kl"; diff --git a/pkgs/development/web/cypress/default.nix b/pkgs/development/web/cypress/default.nix index 3b38d86b45b..abc07fc3e9f 100644 --- a/pkgs/development/web/cypress/default.nix +++ b/pkgs/development/web/cypress/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "cypress"; - version = "4.8.0"; + version = "4.9.0"; src = fetchzip { url = "https://cdn.cypress.io/desktop/${version}/linux-x64/cypress.zip"; - sha256 = "0wivvh3fhyhxx9f6vp0kgqkjj4957hj0b15r2igbxnyqvahwxgx7"; + sha256 = "1lyhwy4rg6gdsj4590ya5v27lmyz6hnn4dhs51dq5i069rsw9qw4"; }; # don't remove runtime deps diff --git a/pkgs/development/web/flyctl/default.nix b/pkgs/development/web/flyctl/default.nix index 1a7a3d6607f..2437962191e 100644 --- a/pkgs/development/web/flyctl/default.nix +++ b/pkgs/development/web/flyctl/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "flyctl"; - version = "0.0.131"; + version = "0.0.135"; src = fetchFromGitHub { owner = "superfly"; repo = "flyctl"; rev = "v${version}"; - sha256 = "0b9qrraydihw4wglif3rjmjlqdsgxh873023z3rgrvf7dwrhc9y0"; + sha256 = "0gxd32pb901hlr493gp736rjd5fpwgqvmlir6b5r0fzyv22f8x2d"; }; preBuild = '' diff --git a/pkgs/development/web/nodejs/nodejs.nix b/pkgs/development/web/nodejs/nodejs.nix index 5eeed80007b..12754b6d441 100644 --- a/pkgs/development/web/nodejs/nodejs.nix +++ b/pkgs/development/web/nodejs/nodejs.nix @@ -141,7 +141,7 @@ in description = "Event-driven I/O framework for the V8 JavaScript engine"; homepage = "https://nodejs.org"; license = licenses.mit; - maintainers = with maintainers; [ goibhniu gilligan cko ]; + maintainers = with maintainers; [ goibhniu gilligan cko marsam ]; platforms = platforms.linux ++ platforms.darwin; }; diff --git a/pkgs/development/web/nodejs/v12.nix b/pkgs/development/web/nodejs/v12.nix index 214292afbbe..503461cc483 100644 --- a/pkgs/development/web/nodejs/v12.nix +++ b/pkgs/development/web/nodejs/v12.nix @@ -8,6 +8,6 @@ let in buildNodejs { inherit enableNpm; - version = "12.18.1"; - sha256 = "0yjwd8yilm85wkginvhhchcikjsl8g3l3qagbg0l2y1hg8f0anfa"; + version = "12.18.2"; + sha256 = "1wnxab2shqgs5in0h39qy2fc7f32pcz4gl9i2mj1001pfani1g9q"; } diff --git a/pkgs/development/web/nodejs/v14.nix b/pkgs/development/web/nodejs/v14.nix index 92cac53c783..37156b5a966 100644 --- a/pkgs/development/web/nodejs/v14.nix +++ b/pkgs/development/web/nodejs/v14.nix @@ -9,6 +9,6 @@ let in buildNodejs { inherit enableNpm; - version = "14.4.0"; - sha256 = "1fbx1r3fflpsy0s7zknca0xyv2gg0ff5fl8czzsb79imqjlgcy0x"; + version = "14.5.0"; + sha256 = "1d6w7ycdiqbkip7m6m8xly31qgx7ywakzvrnqdq8ini5sricjlgb"; } diff --git a/pkgs/games/anki/default.nix b/pkgs/games/anki/default.nix index 489e72768ea..0d713b1f71e 100644 --- a/pkgs/games/anki/default.nix +++ b/pkgs/games/anki/default.nix @@ -31,7 +31,7 @@ let # when updating, also update rev-manual to a recent version of - # https://github.com/dae/ankidocs + # https://github.com/ankitects/anki-docs # The manual is distributed independently of the software. version = "2.1.15"; sha256-pkg = "12dvyf3j9df4nrhhnqbzd9b21rpzkh4i6yhhangn2zf7ch0pclss"; @@ -42,8 +42,8 @@ let pname = "anki-manual"; inherit version; src = fetchFromGitHub { - owner = "dae"; - repo = "ankidocs"; + owner = "ankitects"; + repo = "anki-docs"; rev = rev-manual; sha256 = sha256-manual; }; @@ -112,16 +112,10 @@ buildPythonApplication rec { ./no-version-check.patch ]; - buildPhase = '' - # Dummy build phase - # Anki does not use setup.py - ''; + # Anki does not use setup.py + dontBuild = true; postPatch = '' - # Remove unused starter. We'll create our own, minimalistic, - # starter. - # rm anki/anki - # Remove QT translation files. We'll use the standard QT ones. rm "locale/"*.qm @@ -134,10 +128,10 @@ buildPythonApplication rec { # UTF-8 locale needed for testing LC_ALL = "en_US.UTF-8"; + # - Anki writes some files to $HOME during tests + # - Skip tests using network checkPhase = '' - # - Anki writes some files to $HOME during tests - # - Skip tests using network - env HOME=$TMP pytest --ignore tests/test_sync.py + HOME=$TMP pytest --ignore tests/test_sync.py ''; installPhase = '' @@ -170,6 +164,7 @@ buildPythonApplication rec { cp -r ${manual}/share/doc/anki/html $doc/share/doc/anki ''; + # now wrapPythonPrograms from postFixup will add both python and qt env variables dontWrapQtApps = true; preFixup = '' @@ -179,8 +174,6 @@ buildPythonApplication rec { ) ''; - # now wrapPythonPrograms from postFixup will add both python and qt env variables - passthru = { inherit manual; }; diff --git a/pkgs/games/factorio/default.nix b/pkgs/games/factorio/default.nix index 3b47cb40ad0..79e507e13a8 100644 --- a/pkgs/games/factorio/default.nix +++ b/pkgs/games/factorio/default.nix @@ -53,11 +53,11 @@ let x86_64-linux = let bdist = bdistForArch { inUrl = "linux64"; inTar = "x64"; }; in { alpha = { stable = bdist { sha256 = "1fg2wnia6anzya4m53jf2xqwwspvwskz3awdb3j0v3fzijps94wc"; version = "0.17.79"; withAuth = true; }; - experimental = bdist { sha256 = "1h0gv7cdn999hm2fl93kq6g98bzd1x3c8afq8v0a04dqjarjgr86"; version = "0.18.32"; withAuth = true; }; + experimental = bdist { sha256 = "1idhq836xk1qvhlval28rskqkw06x8hh0izfw9vsf06xym2knkyf"; version = "0.18.34"; withAuth = true; }; }; headless = { stable = bdist { sha256 = "1pr39nm23fj83jy272798gbl9003rgi4vgsi33f2iw3dk3x15kls"; version = "0.17.79"; }; - experimental = bdist { sha256 = "017ggrsnhwyfgx99q0wjagafjvk5pb6lcxl72y37gig72bfcapab"; version = "0.18.32"; }; + experimental = bdist { sha256 = "05kvb8al7x0as62q6bwk89lmvnjdvsmcm3ahgghl5zzz38rrzbwd"; version = "0.18.34"; }; }; demo = { stable = bdist { sha256 = "07qknasaqvzl9vy1fglm7xmdi7ynhmslrb0a209fhbfs0s7qqlgi"; version = "0.17.79"; }; @@ -166,7 +166,7 @@ let ''; homepage = "https://www.factorio.com/"; license = stdenv.lib.licenses.unfree; - maintainers = with stdenv.lib.maintainers; [ Baughn elitak erictapen ]; + maintainers = with stdenv.lib.maintainers; [ Baughn elitak erictapen priegger ]; platforms = [ "i686-linux" "x86_64-linux" ]; }; }; diff --git a/pkgs/games/flightgear/default.nix b/pkgs/games/flightgear/default.nix index c16c33666f3..e32f2e96d4f 100644 --- a/pkgs/games/flightgear/default.nix +++ b/pkgs/games/flightgear/default.nix @@ -6,15 +6,15 @@ }: let - version = "2019.1.1"; + version = "2020.1.2"; shortVersion = builtins.substring 0 6 version; data = stdenv.mkDerivation rec { - pname = "flightgear-base"; + pname = "flightgear-data"; inherit version; src = fetchurl { url = "mirror://sourceforge/flightgear/release-${shortVersion}/FlightGear-${version}-data.tar.bz2"; - sha256 = "14zm0hzshbca4ych72631hpc4pw2w24zib62ri3lwm8nz6j63qhf"; + sha256 = "0ldsjb54k8nb99h6n4f4x20nawd2pa0a8skkwkrgckdpmdv0zwyk"; }; phases = [ "installPhase" ]; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://sourceforge/flightgear/release-${shortVersion}/${pname}-${version}.tar.bz2"; - sha256 = "189wal08p9lrz757pmazxnf85sfymsqrm3nfvdad95pfp6bg7pyi"; + sha256 = "1770kgwa7z70sx6da9x1q9cszpd3ywz6nn8jrb6xv8ldjqcpqpvb"; }; # Of all the files in the source and data archives, there doesn't seem to be diff --git a/pkgs/games/minecraft/default.nix b/pkgs/games/minecraft/default.nix index f0c35d2a569..8770ec08b22 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.14947"; + version = "2.1.15166"; src = fetchurl { url = "https://launcher.mojang.com/download/linux/x86_64/minecraft-launcher_${version}.tar.gz"; - sha256 = "1lsc39n1kq08sssnpr6kf4lfpy01a7i7rgvi298mmxsprjmc7a9q"; + sha256 = "14q41zk370zvzz2jbynhfw11r98l9x49142lqf2izfl42fhv8yhw"; }; icon = fetchurl { @@ -134,6 +134,7 @@ stdenv.mkDerivation rec { makeWrapper $out/opt/minecraft-launcher/minecraft-launcher $out/bin/minecraft-launcher \ --prefix LD_LIBRARY_PATH : ${envLibPath} \ --prefix PATH : ${stdenv.lib.makeBinPath [ jre ]} \ + --set JAVA_HOME ${stdenv.lib.makeBinPath [ jre ]} \ --run "cd /tmp" \ "''${gappsWrapperArgs[@]}" ''; diff --git a/pkgs/games/shattered-pixel-dungeon/default.nix b/pkgs/games/shattered-pixel-dungeon/default.nix index b07402063ce..4f11665c9a0 100644 --- a/pkgs/games/shattered-pixel-dungeon/default.nix +++ b/pkgs/games/shattered-pixel-dungeon/default.nix @@ -9,13 +9,13 @@ let pname = "shattered-pixel-dungeon"; - version = "0.8.0b"; + version = "0.8.1"; src = fetchFromGitHub { owner = "00-Evan"; repo = "shattered-pixel-dungeon"; rev = "v${version}"; - sha256 = "1qi90qw2xp56wai4gn39rpwh3gs3kx2zcpbni861f7hl9hnf87bf"; + sha256 = "1n459xdvqf974hs91xfq5fdj29s4w5w83dg3m2vp7gqmrmm2jykf"; }; postPatch = '' diff --git a/pkgs/misc/drivers/epson-escpr2/default.nix b/pkgs/misc/drivers/epson-escpr2/default.nix index 94b84077620..80aa410017d 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.12"; + version = "1.1.13"; src = fetchurl { # To find new versions, visit @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { # some printer like for instance "WF-7210" to get to the most recent # version. # NOTE: Don't forget to update the webarchive link too! - urls = [ - "https://download3.ebz.epson.net/dsc/f/03/00/11/12/33/f7e44f924a4f479e4c74f8f587e07c57de3abd85/epson-inkjet-printer-escpr2-1.1.12-1lsb3.2.src.rpm" - "https://web.archive.org/web/20200523220202if_/https://download3.ebz.epson.net/dsc/f/03/00/11/12/33/f7e44f924a4f479e4c74f8f587e07c57de3abd85/epson-inkjet-printer-escpr2-1.1.12-1lsb3.2.src.rpm" + 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" ]; - sha256 = "07sq5xlmidqiycv0qwvpk2xf22vbkbk4fclnjlnx7s08d2jl75kv"; + sha256 = "07g62vndn2wh9bablvdl2cxn9wq3hzn16mqji27j20h33cwqmzj1"; }; patches = [ ./cups-filter-ppd-dirs.patch ]; diff --git a/pkgs/misc/emulators/openmsx/default.nix b/pkgs/misc/emulators/openmsx/default.nix index 68b464f4d35..f0ab48aa625 100644 --- a/pkgs/misc/emulators/openmsx/default.nix +++ b/pkgs/misc/emulators/openmsx/default.nix @@ -45,5 +45,6 @@ stdenv.mkDerivation rec { homepage = "https://openmsx.org"; maintainers = with maintainers; [ AndersonTorres ]; platforms = platforms.unix; + license = with licenses; [ bsd2 boost gpl2 ]; }; } diff --git a/pkgs/misc/emulators/resim/default.nix b/pkgs/misc/emulators/resim/default.nix index 81acdf81f2e..ba7ac621257 100644 --- a/pkgs/misc/emulators/resim/default.nix +++ b/pkgs/misc/emulators/resim/default.nix @@ -15,4 +15,6 @@ stdenv.mkDerivation { cp -v libresim/libarmsim.so $out/lib/libarmsim.so cp -v vc4emul/vc4emul $out/bin/vc4emul ''; + + meta.license = stdenv.lib.licenses.mit; } diff --git a/pkgs/misc/emulators/rpcs3/default.nix b/pkgs/misc/emulators/rpcs3/default.nix index 5e26624d6c7..f71420674e5 100644 --- a/pkgs/misc/emulators/rpcs3/default.nix +++ b/pkgs/misc/emulators/rpcs3/default.nix @@ -1,5 +1,6 @@ { mkDerivation, lib, fetchgit, cmake, pkgconfig, git -, qtbase, qtquickcontrols, openal, glew, vulkan-loader, libpng, ffmpeg_3, libevdev, python3 +, qtbase, qtquickcontrols, openal, glew, vulkan-headers, vulkan-loader, libpng +, ffmpeg, libevdev, python3 , pulseaudioSupport ? true, libpulseaudio , waylandSupport ? true, wayland , alsaSupport ? true, alsaLib @@ -15,7 +16,7 @@ mkDerivation { src = fetchgit { url = "https://github.com/RPCS3/rpcs3"; - rev = "341fdf7eb14763fd06e2eab9a4b2b8f1adf9fdbd"; + rev = "v${majorVersion}"; sha256 = "1qx97zkkjl6bmv5rhfyjqynbz0v8h40b2wxqnl59g287wj0yk3y1"; }; @@ -36,7 +37,8 @@ mkDerivation { nativeBuildInputs = [ cmake pkgconfig git ]; buildInputs = [ - qtbase qtquickcontrols openal glew vulkan-loader libpng ffmpeg_3 libevdev python3 + qtbase qtquickcontrols openal glew vulkan-headers vulkan-loader libpng ffmpeg + libevdev python3 ] ++ lib.optional pulseaudioSupport libpulseaudio ++ lib.optional alsaSupport alsaLib ++ lib.optional waylandSupport wayland; diff --git a/pkgs/misc/emulators/stella/default.nix b/pkgs/misc/emulators/stella/default.nix index 591b2daaf15..4c657fc30bb 100644 --- a/pkgs/misc/emulators/stella/default.nix +++ b/pkgs/misc/emulators/stella/default.nix @@ -4,13 +4,13 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "stella"; - version = "6.2"; + version = "6.2.1"; src = fetchFromGitHub { owner = "stella-emu"; repo = "stella"; rev = version; - sha256 = "1d97g4m686xsj6r5vy5x74ys9yk0hcpdppxh714n8hhcc9aglm19"; + sha256 = "1yhszswwg217x8d2qlcasi9l97y1z6w1pgliys4p27zv5b1ygy7p"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/os-specific/darwin/yabai/default.nix b/pkgs/os-specific/darwin/yabai/default.nix index 5d8c8f60aec..448e6865e18 100644 --- a/pkgs/os-specific/darwin/yabai/default.nix +++ b/pkgs/os-specific/darwin/yabai/default.nix @@ -1,17 +1,17 @@ -{ stdenv, fetchFromGitHub, Carbon, Cocoa, ScriptingBridge }: +{ stdenv, fetchFromGitHub, Carbon, Cocoa, ScriptingBridge, xxd }: stdenv.mkDerivation rec { pname = "yabai"; - version = "3.2.0"; + version = "3.2.1"; src = fetchFromGitHub { owner = "koekeishiya"; repo = pname; rev = "v${version}"; - sha256 = "1iq5p4k6klffglxfhmzc2jvlilwn0w97vb5v4b91spiyp39nqcfw"; + sha256 = "11rsi6z2z7ynfqs1xq3bvf187k5xnwm0d45a8ai9hrqdsf3f1j19"; }; - buildInputs = [ Carbon Cocoa ScriptingBridge ]; + buildInputs = [ Carbon Cocoa ScriptingBridge xxd ]; installPhase = '' mkdir -p $out/bin @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://github.com/koekeishiya/yabai"; platforms = platforms.darwin; - maintainers = [ maintainers.cmacrae maintainers.shardy ]; + maintainers = with maintainers; [ cmacrae shardy ]; license = licenses.mit; }; } diff --git a/pkgs/os-specific/linux/bcc/default.nix b/pkgs/os-specific/linux/bcc/default.nix index 7f95ef47ee9..98de3ed1b11 100644 --- a/pkgs/os-specific/linux/bcc/default.nix +++ b/pkgs/os-specific/linux/bcc/default.nix @@ -5,11 +5,11 @@ python.pkgs.buildPythonApplication rec { pname = "bcc"; - version = "0.14.0"; + version = "0.15.0"; src = fetchurl { url = "https://github.com/iovisor/bcc/releases/download/v${version}/bcc-src-with-submodule.tar.gz"; - sha256 = "1hw02bib06fjyw61as5pmhf0qxy0wv0nw8fff2i8a9d1zcd8xf3p"; + sha256 = "1k00xbhdzdvqp4hfxpgg34bbhnx597jjhpg1x6dz2w80r7xzsj28"; }; format = "other"; diff --git a/pkgs/os-specific/linux/device-tree/raspberrypi.nix b/pkgs/os-specific/linux/device-tree/raspberrypi.nix index b5886f6bd11..5a0d5710392 100644 --- a/pkgs/os-specific/linux/device-tree/raspberrypi.nix +++ b/pkgs/os-specific/linux/device-tree/raspberrypi.nix @@ -31,6 +31,7 @@ stdenvNoCC.mkDerivation { overlays = "${raspberrypifw}/share/raspberrypi/boot/overlays"; }; meta = with stdenvNoCC.lib; { - platforms = [ "armv6l-linux" "armv7l-linux" "aarch64-linux" ]; + inherit (raspberrypifw.meta) platforms homepage license; + description = "DTBs for the Raspberry Pi"; }; } diff --git a/pkgs/os-specific/linux/dpdk/default.nix b/pkgs/os-specific/linux/dpdk/default.nix index 8ad703bdd4b..aacbc3cdfbe 100644 --- a/pkgs/os-specific/linux/dpdk/default.nix +++ b/pkgs/os-specific/linux/dpdk/default.nix @@ -11,11 +11,11 @@ let in stdenv.mkDerivation rec { name = "dpdk-${version}" + lib.optionalString mod "-${kernel.version}"; - version = "19.11"; + version = "20.05"; src = fetchurl { url = "https://fast.dpdk.org/rel/dpdk-${version}.tar.xz"; - sha256 = "1aqjn6bm9miv3v2rbqi1rh1c19wa8nip9fvnqaqpnrs3i2b36wa6"; + sha256 = "0h0xv2zwb91b9n29afg5ihn06a8q28in64hag2f112kc19f79jj8"; }; nativeBuildInputs = [ @@ -38,7 +38,7 @@ in stdenv.mkDerivation rec { ] ++ lib.optionals mod kernel.moduleBuildDependencies; postPatch = '' - patchShebangs config/arm + patchShebangs config/arm buildtools ''; mesonFlags = [ diff --git a/pkgs/os-specific/linux/iptstate/default.nix b/pkgs/os-specific/linux/iptstate/default.nix index cd290113e00..529a82e9646 100644 --- a/pkgs/os-specific/linux/iptstate/default.nix +++ b/pkgs/os-specific/linux/iptstate/default.nix @@ -17,6 +17,7 @@ stdenv.mkDerivation rec { platforms = platforms.linux; maintainers = with maintainers; [ trevorj ]; downloadPage = "https://github.com/jaymzh/iptstate/releases"; + license = licenses.zlib; }; installPhase = '' diff --git a/pkgs/os-specific/linux/kernel/gpio-utils.nix b/pkgs/os-specific/linux/kernel/gpio-utils.nix index 447704eedc8..e28d838efb3 100644 --- a/pkgs/os-specific/linux/kernel/gpio-utils.nix +++ b/pkgs/os-specific/linux/kernel/gpio-utils.nix @@ -18,7 +18,8 @@ stdenv.mkDerivation { meta = { description = "Linux tools to inspect the gpiochip interface"; - maintainers = with stdenv.lib.maintainers; [ kwohlfahrt ]; - platforms = stdenv.lib.platforms.linux; + maintainers = with maintainers; [ kwohlfahrt ]; + platforms = platforms.linux; + license = licenses.gpl2; }; } diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index fccbd29777e..8970f51203a 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.186"; + version = "4.14.187"; # 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 = "0q52fmkiqa9hpdkf0wlpcqnc6wqssqz6cgfk1ix1anq0h5hl4ns4"; + sha256 = "1gal2kfyrq8c4dswlwnwmzc3ap6a7cjkyz8jgsm9d8gfx9sk88jv"; }; } // (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 ba2a293d1b5..fef01ec0868 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.130"; + version = "4.19.131"; # 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 = "03zhsizj53ngwxn7d4mzix9xbxxd5lhbzrvawvbb91f83pkc14m6"; + sha256 = "1fk4i7lkbblfbxyp8rmkihcax920hbbygk2xnq2038sbrkvbkpqr"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix index 59c86a5e141..ec60490c56b 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.4.228"; + version = "4.4.229"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0y1xc5lk8j3p5maarksmh18wy921rgcngzsih7q1a82rah1fsjxr"; + sha256 = "0crrawivri5i0ks7pg3snfjlxily4aimw5xzbzr5nlnsz0rjwhbq"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix index 9afd8686c19..f1e927f3cf0 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.9.228"; + version = "4.9.229"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0d7w2zzs79ywxzfrh4bmk5lw318qbkcb8mcsyyh3cc25qqlz9gwg"; + sha256 = "1p0g6zya8bdk2fds37x3fg7c5sk3sc18prq3jrrilnnrby1w4mij"; }; } // (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 a20f401b80d..2ce82c45c4f 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.49"; + version = "5.4.50"; # 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 = "0g2psjf2q10mfc3vv6brjn6s2nkg73ll1s04gpshw907d9irpn2m"; + sha256 = "1qm6m3ww7cxr0mqzma9swq6jax6anjy5vdh397my7x00x70z845d"; }; } // (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 e06a193be4c..82243169b7d 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.6"; + version = "5.7.7"; # 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 = "1rhhys2fvfrfsc6lk0qkq59p83qhwvns4jhk0jlyylyzqqywkm4z"; + sha256 = "0zzff78fjn0a87lr1j11hx97gcpbf0q5qn0nalb3qd43j9kvjh7q"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/klibc/shrunk.nix b/pkgs/os-specific/linux/klibc/shrunk.nix index b5b9783c6e7..8b79940ed78 100644 --- a/pkgs/os-specific/linux/klibc/shrunk.nix +++ b/pkgs/os-specific/linux/klibc/shrunk.nix @@ -22,7 +22,5 @@ stdenv.mkDerivation { ''; # */ allowedReferences = ["out"]; - meta = { - platforms = stdenv.lib.platforms.linux; - }; + inherit (klibc) meta; } diff --git a/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix b/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix index e14e190cd7c..17f34f9bbd7 100644 --- a/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix +++ b/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix @@ -34,5 +34,6 @@ in stdenv.mkDerivation { homepage = "https://packages.ubuntu.com/source/zesty/kmod"; description = "Linux kernel module blacklists from Ubuntu"; platforms = platforms.linux; + license = with licenses; [ gpl2Plus lgpl21Plus ]; }; } diff --git a/pkgs/os-specific/linux/kmod-debian-aliases/default.nix b/pkgs/os-specific/linux/kmod-debian-aliases/default.nix index f0f41331727..23d323f84b8 100644 --- a/pkgs/os-specific/linux/kmod-debian-aliases/default.nix +++ b/pkgs/os-specific/linux/kmod-debian-aliases/default.nix @@ -14,10 +14,11 @@ stdenv.mkDerivation rec { cp aliases.conf $out ''; - meta = { + meta = with lib; { homepage = "https://packages.debian.org/source/sid/kmod"; description = "Linux configuration file for modprobe"; - maintainers = with lib.maintainers; [ mathnerd314 ]; - platforms = with lib.platforms; linux; + maintainers = with maintainers; [ mathnerd314 ]; + platforms = with platforms; linux; + license = with licenses; [ gpl2Plus lgpl21Plus ]; }; } diff --git a/pkgs/os-specific/linux/libvolume_id/default.nix b/pkgs/os-specific/linux/libvolume_id/default.nix index e54dee10c1d..98ddc50e2e4 100644 --- a/pkgs/os-specific/linux/libvolume_id/default.nix +++ b/pkgs/os-specific/linux/libvolume_id/default.nix @@ -1,8 +1,8 @@ {stdenv, fetchurl}: - + stdenv.mkDerivation { name = "libvolume_id-0.81.1"; - + src = fetchurl { url = "https://www.marcuscom.com/downloads/libvolume_id-0.81.1.tar.bz2"; sha256 = "029z04vdxxsl8gycm9whcljhv6dy4b12ybsxdb99jr251gl1ifs5"; @@ -18,7 +18,8 @@ stdenv.mkDerivation { cp -f libvolume_id.so.0 $out/lib/ "; - meta = { - platforms = stdenv.lib.platforms.linux; + meta = with stdenv.lib; { + platforms = platforms.linux; + license = licenses.gpl2; }; } diff --git a/pkgs/os-specific/linux/rfkill/udev.nix b/pkgs/os-specific/linux/rfkill/udev.nix index 3ee112126ac..a24c947673d 100644 --- a/pkgs/os-specific/linux/rfkill/udev.nix +++ b/pkgs/os-specific/linux/rfkill/udev.nix @@ -47,9 +47,10 @@ in stdenv.mkDerivation { cp ${rfkillHook} "$out/bin/rfkill-hook.sh" ''; - meta = { + meta = with stdenv.lib; { homepage = "http://wireless.kernel.org/en/users/Documentation/rfkill"; description = "Rules+hook for udev to catch rfkill state changes"; - platforms = stdenv.lib.platforms.linux; + platforms = platforms.linux; + license = licenses.mit; }; } diff --git a/pkgs/os-specific/linux/sysklogd/default.nix b/pkgs/os-specific/linux/sysklogd/default.nix index c8378f2a0cb..f93e9012e05 100644 --- a/pkgs/os-specific/linux/sysklogd/default.nix +++ b/pkgs/os-specific/linux/sysklogd/default.nix @@ -21,8 +21,9 @@ stdenv.mkDerivation { preInstall = "mkdir -p $out/share/man/man5/ $out/share/man/man8/ $out/sbin"; - meta = { + meta = with stdenv.lib; { description = "A system logging daemon"; - platforms = stdenv.lib.platforms.linux; + platforms = platforms.linux; + license = licenses.gpl2; }; } diff --git a/pkgs/os-specific/linux/syslinux/default.nix b/pkgs/os-specific/linux/syslinux/default.nix index edb951dae3d..28681aed564 100644 --- a/pkgs/os-specific/linux/syslinux/default.nix +++ b/pkgs/os-specific/linux/syslinux/default.nix @@ -22,9 +22,15 @@ stdenv.mkDerivation { url = mkURL "fa1349f1" "0002-gfxboot-menu-label.patch"; sha256 = "06ifgzbpjj4picpj17zgprsfi501zf4pp85qjjgn29i5rs291zni"; }) - (fetchpatch { - url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/0005-gnu-efi-version-compatibility.patch?h=packages/syslinux"; - sha256 = "0fbqz56hj8az8ws26m39hyp3l5fvcbzvzdddqz3x6n56hzdpz1p6"; + (fetchurl { + url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/0005-gnu-efi-version-compatibility.patch?id=821c3da473d1399d930d5b4a086e46a4179eaa45"; + name = "0005-gnu-efi-version-compatibility.patch"; + sha256 = "1mz2idg8cwn0mvd3jixxynhkn7rhmi5fp8cc8zznh5f0ysfra446"; + }) + (fetchurl { + url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/0025-reproducible-build.patch?id=821c3da473d1399d930d5b4a086e46a4179eaa45"; + name = "0025-reproducible-build.patch"; + sha256 = "0qk6wc6z3648828y3961pn4pi7xhd20a6fqn6z1mnj22bbvzcxls"; }) (fetchurl { # mbr.bin: too big (452 > 440) @@ -70,6 +76,7 @@ stdenv.mkDerivation { "DATADIR=$(out)/share" "MANDIR=$(out)/share/man" "PERL=perl" + "HEXDATE=0x00000000" ] ++ stdenv.lib.optionals stdenv.hostPlatform.isi686 [ "bios" "efi32" ]; diff --git a/pkgs/os-specific/linux/targetcli/default.nix b/pkgs/os-specific/linux/targetcli/default.nix index 65d46ad34c1..854e06b98a4 100644 --- a/pkgs/os-specific/linux/targetcli/default.nix +++ b/pkgs/os-specific/linux/targetcli/default.nix @@ -2,13 +2,13 @@ python.pkgs.buildPythonApplication rec { pname = "targetcli"; - version = "2.1.51"; + version = "2.1.53"; src = fetchFromGitHub { owner = "open-iscsi"; repo = "${pname}-fb"; rev = "v${version}"; - sha256 = "07i9kyr525hlk32amzgycirwgwykdbjy5fmw6ji0nnhvk2jh4arn"; + sha256 = "1qrq7y5hnghzbxgrxgl153n8jlhw31kqjbr93jsvlvhz5b3ci750"; }; propagatedBuildInputs = with python.pkgs; [ configshell rtslib ]; diff --git a/pkgs/os-specific/linux/xf86-video-nested/default.nix b/pkgs/os-specific/linux/xf86-video-nested/default.nix index c117293d3ad..f86393cba84 100644 --- a/pkgs/os-specific/linux/xf86-video-nested/default.nix +++ b/pkgs/os-specific/linux/xf86-video-nested/default.nix @@ -20,10 +20,11 @@ stdenv.mkDerivation { CFLAGS = "-I${pixman}/include/pixman-1"; - meta = { + meta = with stdenv.lib; { homepage = "https://cgit.freedesktop.org/xorg/driver/xf86-video-nested"; description = "A driver to run Xorg on top of Xorg or something else"; - maintainers = [ stdenv.lib.maintainers.goibhniu ]; - platforms = stdenv.lib.platforms.linux; + maintainers = [ maintainers.goibhniu ]; + platforms = platforms.linux; + license = licenses.mit; }; } diff --git a/pkgs/servers/adguardhome/default.nix b/pkgs/servers/adguardhome/default.nix index 54000a81b67..3260ce4f053 100644 --- a/pkgs/servers/adguardhome/default.nix +++ b/pkgs/servers/adguardhome/default.nix @@ -18,5 +18,6 @@ stdenv.mkDerivation rec { description = "Network-wide ads & trackers blocking DNS server"; platforms = platforms.linux; maintainers = with maintainers; [ numkem ]; + license = licenses.gpl3; }; } diff --git a/pkgs/servers/amqp/rabbitmq-server/default.nix b/pkgs/servers/amqp/rabbitmq-server/default.nix index f81fef3cbe8..c4b3070e9f2 100644 --- a/pkgs/servers/amqp/rabbitmq-server/default.nix +++ b/pkgs/servers/amqp/rabbitmq-server/default.nix @@ -8,12 +8,12 @@ stdenv.mkDerivation rec { pname = "rabbitmq-server"; - version = "3.8.4"; + version = "3.8.5"; # when updating, consider bumping elixir version in all-packages.nix src = fetchurl { url = "https://github.com/rabbitmq/rabbitmq-server/releases/download/v${version}/${pname}-${version}.tar.xz"; - sha256 = "1sa9zfd8hv5mxgnxva9sydqnyzwssxjkbba028pwpml2im97z7j5"; + sha256 = "014pfgfj90scas40lf0yjx14vhx5l5zbi3by2nnb704lg8w2n456"; }; buildInputs = diff --git a/pkgs/servers/coturn/default.nix b/pkgs/servers/coturn/default.nix index f50a5afa81e..c32ddecc7a3 100644 --- a/pkgs/servers/coturn/default.nix +++ b/pkgs/servers/coturn/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "coturn"; - version = "4.5.1.2"; + version = "4.5.1.3"; src = fetchFromGitHub { owner = "coturn"; repo = "coturn"; rev = version; - sha256 = "01y65az8qyv2kjnb4fj7rgl4zq5pc2b286gfn727x3hfhksx9zp2"; + sha256 = "1801931k4qdvc7jvaqxvjyhbh1xsvjz0pjajf6xc222n4ggar1q5"; }; buildInputs = [ openssl libevent ]; diff --git a/pkgs/servers/dns/knot-resolver/default.nix b/pkgs/servers/dns/knot-resolver/default.nix index f596934a429..3466fb776f0 100644 --- a/pkgs/servers/dns/knot-resolver/default.nix +++ b/pkgs/servers/dns/knot-resolver/default.nix @@ -16,11 +16,11 @@ lua = luajitPackages; unwrapped = stdenv.mkDerivation rec { pname = "knot-resolver"; - version = "5.1.1"; + version = "5.1.2"; src = fetchurl { url = "https://secure.nic.cz/files/knot-resolver/${pname}-${version}.tar.xz"; - sha256 = "f72214046df8aae2b1a5c6d1ad0bc8b166aa060df5b008f6e88b4f6ba79cbf4e"; + sha256 = "caa4f941caf39080184554fb1310f383eba4b30d9c4c2215670d6b0a2de8f836"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/servers/fcgiwrap/default.nix b/pkgs/servers/fcgiwrap/default.nix index cd4d3116213..a15e1c15b15 100644 --- a/pkgs/servers/fcgiwrap/default.nix +++ b/pkgs/servers/fcgiwrap/default.nix @@ -25,5 +25,6 @@ stdenv.mkDerivation rec { description = "Simple server for running CGI applications over FastCGI"; maintainers = with maintainers; [ lethalman ]; platforms = with platforms; linux; + license = licenses.mit; }; } diff --git a/pkgs/servers/hashi-ui/default.nix b/pkgs/servers/hashi-ui/default.nix index 019a8dca3b6..70926e37739 100644 --- a/pkgs/servers/hashi-ui/default.nix +++ b/pkgs/servers/hashi-ui/default.nix @@ -21,5 +21,6 @@ stdenv.mkDerivation rec { description = "A modern user interface for hashicorp Consul & Nomad"; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ numkem ]; + license = licenses.mit; }; } diff --git a/pkgs/servers/keycloak/default.nix b/pkgs/servers/keycloak/default.nix index ce24cc7071f..10b74f6b791 100644 --- a/pkgs/servers/keycloak/default.nix +++ b/pkgs/servers/keycloak/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "keycloak"; - version = "9.0.3"; + version = "10.0.2"; src = fetchzip { url = "https://downloads.jboss.org/keycloak/${version}/keycloak-${version}.zip"; - sha256 = "0nlfa6wwgj04xgg4ps5gpjp4iq2lmas97y5qz61lhns1p42xr4ls"; + sha256 = "1fn8yd02m0bnvwkbrfxrdnxfab30s0wzm3zxpy63wf3vak7nacma"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index fbcec04e532..4af80e27711 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -9,11 +9,11 @@ let in buildPythonApplication rec { pname = "matrix-synapse"; - version = "1.15.1"; + version = "1.15.2"; src = fetchPypi { inherit pname version; - sha256 = "1hfyqp5bzsqp002synxp9jcm9fwzw9p0gcklmycmv616x3flylkf"; + sha256 = "1qsrpzq6i2zakpi9sa5sjnjd4bk92n7zgkpcmpaa4sd9ya1wqifb"; }; patches = [ diff --git a/pkgs/servers/misc/navidrome/default.nix b/pkgs/servers/misc/navidrome/default.nix index e5597451062..c07214ce3a5 100644 --- a/pkgs/servers/misc/navidrome/default.nix +++ b/pkgs/servers/misc/navidrome/default.nix @@ -4,11 +4,11 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "navidrome"; - version = "0.23.1"; + version = "0.24.0"; src = fetchurl { url = "https://github.com/deluan/navidrome/releases/download/v${version}/navidrome_${version}_Linux_x86_64.tar.gz"; - sha256 = "0hrnlpaq32f8slgmyl629v5b46ar2mq97q0cgrxy6ahfabfw2vih"; + sha256 = "1lk9fl2h1rsqirqnz4qmapv9hl2axz7j32p9a011h0n90frabski"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/servers/monitoring/mtail/default.nix b/pkgs/servers/monitoring/mtail/default.nix index d701a7ca001..5e51750a795 100644 --- a/pkgs/servers/monitoring/mtail/default.nix +++ b/pkgs/servers/monitoring/mtail/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "mtail"; - version = "3.0.0-rc35"; + version = "3.0.0-rc36"; src = fetchFromGitHub { owner = "google"; repo = "mtail"; rev = "v${version}"; - sha256 = "04hzr0cw0dq7hmqvp1lhm5wl239yrxmcpsl25sqk74wy06cgrrqd"; + sha256 = "1xdpjzcr143f7430wl9l6zzq9yhbkirr3fbfw60f10zpglrcx8a4"; }; - vendorSha256 = "1km3ldqz35lpkglp9n332vxr38xxfqyij1fi2qq0agyyydbvakj5"; + vendorSha256 = "02fnvy897cygmipc5snza556qihjwrp1lf9qi9f5dzarphd6d0pw"; subPackages = [ "cmd/mtail" ]; preBuild = '' diff --git a/pkgs/servers/monitoring/sensu-go/default.nix b/pkgs/servers/monitoring/sensu-go/default.nix index 5f9f3b80f80..c71a07c9e8e 100644 --- a/pkgs/servers/monitoring/sensu-go/default.nix +++ b/pkgs/servers/monitoring/sensu-go/default.nix @@ -4,7 +4,7 @@ let generic = { subPackages, pname, postInstall ? "" }: buildGoModule rec { inherit pname; - version = "5.20.1"; + version = "5.21.0"; shortRev = "3a1ac58"; # for internal version info goPackagePath = "github.com/sensu/sensu-go"; @@ -13,12 +13,12 @@ let owner = "sensu"; repo = "sensu-go"; rev = "v${version}"; - sha256 = "0wrcchz878sq7zhkb8p0s93k92xppihv5yyvkl363xs6519xzm7m"; + sha256 = "0zkwhr2z8yy8k2lal026i565hxxh51jrgplq83bbisc24xpcfg9s"; }; inherit subPackages postInstall; - vendorSha256 = "03lkra5vf07zicd2aipvmkrda56ys5swwj6lq5hnp324ndajfcya"; + vendorSha256 = "06yfaj9k5n3jw8a142sscaqrvdw2lq51v884lp65wjdwy5c3jbba"; buildFlagsArray = let versionPkg = "github.com/sensu/sensu-go/version"; diff --git a/pkgs/servers/monitoring/telegraf/default.nix b/pkgs/servers/monitoring/telegraf/default.nix index 388d7fe3790..7b284ac122a 100644 --- a/pkgs/servers/monitoring/telegraf/default.nix +++ b/pkgs/servers/monitoring/telegraf/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "telegraf"; - version = "1.14.4"; + version = "1.14.5"; goPackagePath = "github.com/influxdata/telegraf"; @@ -14,10 +14,10 @@ buildGoModule rec { owner = "influxdata"; repo = "telegraf"; rev = "v${version}"; - sha256 = "0kbf1r9b9xylq0akmklzy94pcljayhdjm539fwazp5c1364qmbjm"; + sha256 = "1rnrg1q0dylr62cfkzspp47w818cja3hs6bbarcksmp0s23rq6lz"; }; - vendorSha256 = "05nj99hl5f5l0a2aswy19wmbm94hd1h03r227gmn419dkzc5hpah"; + vendorSha256 = "1mjlakf88fa75qldkz62aja0wn0m6xqfr45vjy0lwpi0adc0fz70"; buildFlagsArray = [ ''-ldflags= -w -s -X main.version=${version} diff --git a/pkgs/servers/monitoring/thanos/default.nix b/pkgs/servers/monitoring/thanos/default.nix index 22708518429..9970fab8ed2 100644 --- a/pkgs/servers/monitoring/thanos/default.nix +++ b/pkgs/servers/monitoring/thanos/default.nix @@ -1,16 +1,16 @@ { stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "thanos"; - version = "0.12.2"; + version = "0.13.0"; src = fetchFromGitHub { rev = "v${version}"; owner = "thanos-io"; repo = "thanos"; - sha256 = "10xscm9h2krha66v96v2q85fynnxfizjcc47h7yz4xhjwvb5dgz2"; + sha256 = "03a964myry84ig8akim6vs6izl15hdpf5ggg4z5179ydbmvnq3lq"; }; - vendorSha256 = "126rghnyjpykvjg9sr4kwpskc13qqafxgfn9ffykwc4jjz8vc07q"; + vendorSha256 = "1jpw7k76li4dlfhhzy175198921zrdm09nnhqpmh7p80z252n936"; subPackages = "cmd/thanos"; diff --git a/pkgs/servers/openafs/1.8/module.nix b/pkgs/servers/openafs/1.8/module.nix index d998784b3fa..db44dbe2200 100644 --- a/pkgs/servers/openafs/1.8/module.nix +++ b/pkgs/servers/openafs/1.8/module.nix @@ -18,22 +18,6 @@ in stdenv.mkDerivation { buildInputs = [ kerberos ]; - patches = [ - # openafs 5.6 patches, included in the next release - (fetchpatch { - url = "https://github.com/openafs/openafs/commit/34f1689b7288688550119638ee9959e453fde414.patch"; - sha256 = "0rxjqzr8c5ajlk8wrhgjc1qp1934qiriqdi0qxsnk4gj5ibbk4d5"; - }) - (fetchpatch { - url = "https://github.com/openafs/openafs/commit/355ea43f0d1b7feae1b3af58bc33af12838db7c3.patch"; - sha256 = "1f9xn8ql6vnxglpj3dvi30sj8vkncazjab2rc13hbw48nvsvcnhm"; - }) - (fetchpatch { - url = "https://github.com/openafs/openafs/commit/17d38e31e6f2e237a7fb4dfb46841060296310b6.patch"; - sha256 = "14dydxfm0f5fvnj0kmvgm3bgh0ajhh04i3l7l0hr9cpmwl7vrlcg"; - }) - ]; - hardeningDisable = [ "pic" ]; configureFlags = [ diff --git a/pkgs/servers/openafs/1.8/srcs.nix b/pkgs/servers/openafs/1.8/srcs.nix index 4a5591ef464..4df5bdfc388 100644 --- a/pkgs/servers/openafs/1.8/srcs.nix +++ b/pkgs/servers/openafs/1.8/srcs.nix @@ -1,14 +1,14 @@ { fetchurl }: rec { - version = "1.8.5"; + version = "1.8.6"; src = fetchurl { - url = "http://www.openafs.org/dl/openafs/${version}/openafs-${version}-src.tar.bz2"; - sha256 = "08w5n803xm75j7daa3mr2ncfmcg0wpm7yasj6zyddqlb4f7xdppf"; + url = "https://www.openafs.org/dl/openafs/${version}/openafs-${version}-src.tar.bz2"; + sha256 = "0i99klrw00v4bwd942n90xqfn16z6337m89xfm9dgv7ih0qrsklb"; }; srcs = [ src (fetchurl { - url = "http://www.openafs.org/dl/openafs/${version}/openafs-${version}-doc.tar.bz2"; - sha256 = "08mg3n0q2igfas1khj18r9apyrkpbp1jick0ix5nfaal90jbifis"; + url = "https://www.openafs.org/dl/openafs/${version}/openafs-${version}-doc.tar.bz2"; + sha256 = "1s91kmxfimhdqrz7l6jgjz72j9pyalghrvg4h384fsz0ks6s4kz3"; })]; } diff --git a/pkgs/servers/sql/cockroachdb/default.nix b/pkgs/servers/sql/cockroachdb/default.nix index 2ce8e901e86..25e2b0ae127 100644 --- a/pkgs/servers/sql/cockroachdb/default.nix +++ b/pkgs/servers/sql/cockroachdb/default.nix @@ -14,13 +14,13 @@ let in buildGoPackage rec { pname = "cockroach"; - version = "19.1.5"; + version = "20.1.2"; goPackagePath = "github.com/cockroachdb/cockroach"; src = fetchurl { url = "https://binaries.cockroachdb.com/cockroach-v${version}.src.tgz"; - sha256 = "1pnzzmxxb7qxiiy8qpl2sifk4qrijjbhmzy47bnjj5ssdsjjjcqy"; + sha256 = "1xmb516xr0bhkzj6yigcrxbghvh0dis85dq7n5hi49mn951ad5yn"; }; NIX_CFLAGS_COMPILE = stdenv.lib.optionals stdenv.cc.isGNU [ "-Wno-error=deprecated-copy" "-Wno-error=redundant-move" "-Wno-error=pessimizing-move" ]; diff --git a/pkgs/servers/sql/dolt/default.nix b/pkgs/servers/sql/dolt/default.nix index 2af0f149e7d..265f78af895 100644 --- a/pkgs/servers/sql/dolt/default.nix +++ b/pkgs/servers/sql/dolt/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "dolt"; - version = "0.16.3"; + version = "0.18.0"; src = fetchFromGitHub { owner = "liquidata-inc"; repo = "dolt"; rev = "v${version}"; - sha256 = "141wv5av7hms4wa3s4md7mnb77bbyn3854d7gj7fy6f6jvzghdny"; + sha256 = "12kvjq3z9bggfmgci3wql4v8sh491dwp6qr768k8kwncqmp3jjvx"; }; modRoot = "./go"; subPackages = [ "cmd/dolt" "cmd/git-dolt" "cmd/git-dolt-smudge" ]; - vendorSha256 = "1kjh252p91yxq5mi0igamkwlsr50lij24wsp2ilgz6ksv3ijzfr1"; + vendorSha256 = "1lscjp4ih5kxrbqch9164bqrp7lbsir6vg4zcczhvhh0phbcbqjs"; meta = with lib; { description = "Relational database with version control and CLI a-la Git."; diff --git a/pkgs/servers/teleport/default.nix b/pkgs/servers/teleport/default.nix index bfd00a08e6f..b307f7861fa 100644 --- a/pkgs/servers/teleport/default.nix +++ b/pkgs/servers/teleport/default.nix @@ -3,14 +3,14 @@ buildGoPackage rec { pname = "teleport"; - version = "4.2.10"; + version = "4.2.11"; # This repo has a private submodule "e" which fetchgit cannot handle without failing. src = fetchFromGitHub { owner = "gravitational"; repo = "teleport"; rev = "v${version}"; - sha256 = "0y6qih4m8snzfj8ddbcfqx0cz4ric0i5vgz0rgqp6wpi2arwysnn"; + sha256 = "00mkh6rmdgwwhbk3jmxgwl0aisnnqw6q6i5zl1hn69hvdny9liii"; }; goPackagePath = "github.com/gravitational/teleport"; diff --git a/pkgs/servers/ttyd/default.nix b/pkgs/servers/ttyd/default.nix index b7fac5fc477..ef830710c1c 100644 --- a/pkgs/servers/ttyd/default.nix +++ b/pkgs/servers/ttyd/default.nix @@ -7,12 +7,12 @@ with builtins; stdenv.mkDerivation rec { pname = "ttyd"; - version = "1.6.0"; + version = "1.6.1"; src = fetchFromGitHub { owner = "tsl0922"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "08skw3h897jb71sbnglj571h35pcb1mikzlh71sx5imjgi4hfczr"; + sha256 = "1ifgw93g8jaaa6fgfqjnn83n5ccr6l72ynwwwa97hfwjk90r14fg"; }; nativeBuildInputs = [ pkgconfig cmake xxd ]; diff --git a/pkgs/shells/nushell/default.nix b/pkgs/shells/nushell/default.nix index a52cc4621cb..b56a10a189d 100644 --- a/pkgs/shells/nushell/default.nix +++ b/pkgs/shells/nushell/default.nix @@ -14,16 +14,16 @@ rustPlatform.buildRustPackage rec { pname = "nushell"; - version = "0.15.0"; + version = "0.16.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "1s08shhg826hbpcjzlhwj0r5qqckz8rv2xjg22rz1qvsjyhkmv7r"; + sha256 = "0d298v7rf8lxdavhfad68rq4sgmg6gw6vc7phh1lnhx5pbhkvv22"; }; - cargoSha256 = "0lz7119znpxyaj9ac1skfbx0s0dkh3hwk00g0zjn3r6k8fh9gj4d"; + cargoSha256 = "0xibrdbqfmmkncqpjsllzx1w79crm0v4liwf2aldnafji7jqclb4"; nativeBuildInputs = [ pkg-config ] ++ lib.optionals (withStableFeatures && stdenv.isLinux) [ python3 ]; diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix index 169dd1456f3..31e0275d96a 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-06-28"; + version = "2020-07-01"; pname = "oh-my-zsh"; - rev = "97cf0bf4bd7655767e9e5ea27ddb6fbe550a305d"; + rev = "62648d71bb05116287206d83181f9daa5a59ba67"; src = fetchgit { inherit rev; url = "https://github.com/ohmyzsh/ohmyzsh"; - sha256 = "1hynii1nvchnlgyiy0phyz5gd83xcbjdj82ddd2dyl1ci1yvpvqb"; + sha256 = "0pj73hvjzmp9x1b4b3zi9mlihzb9g04kfz230hmwz3kxpymw879q"; }; pathsToLink = [ "/share/oh-my-zsh" ]; diff --git a/pkgs/tools/X11/xsecurelock/default.nix b/pkgs/tools/X11/xsecurelock/default.nix index effdd76ce9d..99d695df267 100644 --- a/pkgs/tools/X11/xsecurelock/default.nix +++ b/pkgs/tools/X11/xsecurelock/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig , libX11, libXcomposite, libXft, libXmu, libXrandr, libXext, libXScrnSaver -, pam, apacheHttpd, imagemagick, pamtester, xscreensaver, xset }: +, pam, apacheHttpd, pamtester, xscreensaver }: stdenv.mkDerivation rec { pname = "xsecurelock"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ libX11 libXcomposite libXft libXmu libXrandr libXext libXScrnSaver - pam apacheHttpd imagemagick pamtester + pam apacheHttpd pamtester ]; configureFlags = [ diff --git a/pkgs/tools/admin/amazon-ecr-credential-helper/default.nix b/pkgs/tools/admin/amazon-ecr-credential-helper/default.nix index b36daefa16b..30d74c14ce5 100644 --- a/pkgs/tools/admin/amazon-ecr-credential-helper/default.nix +++ b/pkgs/tools/admin/amazon-ecr-credential-helper/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "amazon-ecr-credential-helper"; - version = "0.3.0"; + version = "0.4.0"; goPackagePath = "github.com/awslabs/amazon-ecr-credential-helper"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "awslabs"; repo = "amazon-ecr-credential-helper"; rev = "v${version}"; - sha256 = "06pcwgahcbi13ca5rs6giwdw3w364lbvmzcs4ka82igvcffxjvnd"; + sha256 = "1whwxjzlyzyvrf2mzbd7my2kdz5fdbr79g18g9h4xrg8xyzk1k5q"; }; meta = with lib; { diff --git a/pkgs/tools/admin/aws_shell/default.nix b/pkgs/tools/admin/aws_shell/default.nix deleted file mode 100644 index 104c2f1e44a..00000000000 --- a/pkgs/tools/admin/aws_shell/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ stdenv -, awscli -}: - -with awscli.python.pkgs; - -buildPythonPackage rec { - pname = "aws-shell"; - version = "0.2.1"; - - src = fetchPypi { - inherit pname version; - sha256 = "2044b0ef78c7542c392f2cee4b74a4439545c63dda0a3e28b712fff53e8e5823"; - }; - - # Why does it propagate packages that are used for testing? - propagatedBuildInputs = [ - awscli - prompt_toolkit - boto3 - configobj - pygments - pyyaml - ]; - - postPatch = '' - substituteInPlace setup.py \ - --replace "prompt-toolkit>=1.0.0,<1.1.0" "prompt-toolkit" - ''; - - #Checks are failing due to missing TTY, which won't exist. - doCheck = false; - preCheck = '' - mkdir -p check-phase - export HOME=$(pwd)/check-phase - ''; - - meta = with stdenv.lib; { - homepage = "https://github.com/awslabs/aws-shell"; - description = "An integrated shell for working with the AWS CLI"; - license = licenses.asl20; - maintainers = [ ]; - }; -} diff --git a/pkgs/tools/admin/mycli/default.nix b/pkgs/tools/admin/mycli/default.nix index 42c790d1ada..7a7022c9176 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.20.1"; + version = "1.21.1"; src = fetchPypi { inherit pname version; - sha256 = "0vhwaqkx4njarm0wy8zg2hvzr2yl92y8gnwipcn7p59sazw4whfl"; + sha256 = "1q9p0yik9cpvpxjs048anvhicfcna84mpl7axv9bwgr48w40lqwg"; }; propagatedBuildInputs = [ @@ -27,6 +27,12 @@ buildPythonApplication rec { py.test ''; + # TODO: remove with next release + postPatch = '' + substituteInPlace setup.py \ + --replace "prompt_toolkit>=2.0.6,<3.0.0" "prompt_toolkit" + ''; + meta = { inherit version; description = "Command-line interface for MySQL"; diff --git a/pkgs/tools/admin/pulumi/data.nix b/pkgs/tools/admin/pulumi/data.nix index cad7b97fd37..cfed777020a 100644 --- a/pkgs/tools/admin/pulumi/data.nix +++ b/pkgs/tools/admin/pulumi/data.nix @@ -1,50 +1,58 @@ # DO NOT EDIT! This file is generated automatically by update.sh { }: { - version = "2.1.0"; + version = "2.2.1"; pulumiPkgs = { x86_64-linux = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v2.1.0-linux-x64.tar.gz"; - sha256 = "0d9bmljgf62dhj1z8h71c2pj2cbvf4ghhlbbbh2jcg55i33ks8ih"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v2.2.1-linux-x64.tar.gz"; + sha256 = "0bvwkvsinnhlh1yhh5llffh89w07f412q6z03ypzl19p6fvik1k1"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v2.1.0-linux-amd64.tar.gz"; - sha256 = "1kf43j1b4wp39sny92dnsy1myn6wb2msli1ydds3yza81srgcfnh"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v2.1.1-linux-amd64.tar.gz"; + sha256 = "0bj9nlxsb77ycwvmba1vsh1vydyrszq3jxlf9d1qsv71h4s88a90"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v3.3.0-linux-amd64.tar.gz"; - sha256 = "17anj9pc90hhiknyf2yab7dzvcfbjn1803bl6ld26r701w3h1jqx"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v2.1.1-linux-amd64.tar.gz"; + sha256 = "0ggi1c4lg6pip6d4bh2cji25hcwv3ii870bjwd35ax668z0dc28d"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v2.0.0-linux-amd64.tar.gz"; - sha256 = "0526a4ll1q9v566i313223pnx2pa3qkcjp01l49h5jmgn8qpw1fn"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v3.6.0-linux-amd64.tar.gz"; + sha256 = "0l4vv7vkzsphvk9r28l253ds8ny0wh0fahqjjnz31jqzfbvzyxm8"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v2.2.0-linux-amd64.tar.gz"; - sha256 = "14ya2sax2yyza3zbxp5a638y81pcbi26hv8k9y8agnjn82bgx8dy"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v2.2.0-linux-amd64.tar.gz"; + sha256 = "1maiy1i43p0gl2w12hfk9zgfz418innzi7nkv68qlyxd4hi5v6mf"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v2.5.0-linux-amd64.tar.gz"; + sha256 = "02xjwx2rfh3k9zk8aw39n4k6jnp8chcfc5f1zac7x4xfkqyjlpcy"; } ]; x86_64-darwin = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v2.1.0-darwin-x64.tar.gz"; - sha256 = "1d7w32wac2sc0z5i893h66fgyivf4x3mqki649vxkxc3081kpzi9"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v2.2.1-darwin-x64.tar.gz"; + sha256 = "1fizddk1hxazn33xliankps3fv0casx4r8rvwkdzqx1piqq18xy4"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v2.1.0-darwin-amd64.tar.gz"; - sha256 = "1smy1y2pnxnvw8zcs31q9xs80hyqhzawfzcwkkfnyamdrgasxqsi"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v2.1.1-darwin-amd64.tar.gz"; + sha256 = "17iqzv06s4xhnway3j534lsj8gzxld67kfn7awn4ymwh2zn8l3z0"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v3.3.0-darwin-amd64.tar.gz"; - sha256 = "03idn1livy9w3izi7qrdgnigx3ayrp8qp2q3m5ik9ffvv2g11962"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v2.1.1-darwin-amd64.tar.gz"; + sha256 = "1mdchvibk989xq5zfjb7cdzgh9m769cvj2l5dfxmkava7zhmj2bj"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v2.0.0-darwin-amd64.tar.gz"; - sha256 = "06m6ldqa82w82kjz7pxi0pbk9x02pzsy4x0in8fcq9gsh1p0gka9"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v3.6.0-darwin-amd64.tar.gz"; + sha256 = "013c13ypvz75x9qppzmlvwg4bnjryw9q16j6v987ibrrfxblan5b"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v2.2.0-darwin-amd64.tar.gz"; - sha256 = "0mymvn2355bq9ykvnww0si0imikzxp7mp1yh2scn8kjn2gs4nhgk"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v2.2.0-darwin-amd64.tar.gz"; + sha256 = "0maca137agmig8njz0fd0yhxahdra7pqaw23mxfxa8m5j44p787a"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v2.5.0-darwin-amd64.tar.gz"; + sha256 = "0kc4il1ixh7ricl4n3vadvjy0rjj0bps7n8lbqgrq8lm5m419izv"; } ]; }; diff --git a/pkgs/tools/admin/pulumi/update.sh b/pkgs/tools/admin/pulumi/update.sh old mode 100644 new mode 100755 index 26a48469841..4aa8478da1f --- a/pkgs/tools/admin/pulumi/update.sh +++ b/pkgs/tools/admin/pulumi/update.sh @@ -1,13 +1,14 @@ #!/usr/bin/env bash -VERSION="2.1.0" +VERSION="2.2.1" declare -A plugins plugins=( - ["aws"]="2.2.0" - ["gcp"]="3.3.0" - ["random"]="2.1.0" - ["kubernetes"]="2.0.0" + ["aws"]="2.5.0" + ["gcp"]="3.6.0" + ["random"]="2.1.1" + ["kubernetes"]="2.2.0" + ["postgresql"]="2.1.1" ) function genMainSrc() { diff --git a/pkgs/tools/audio/abcm2ps/default.nix b/pkgs/tools/audio/abcm2ps/default.nix index 302654f7715..099ccc6f4cb 100644 --- a/pkgs/tools/audio/abcm2ps/default.nix +++ b/pkgs/tools/audio/abcm2ps/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "abcm2ps"; - version = "8.14.7"; + version = "8.14.9"; src = fetchFromGitHub { owner = "leesavide"; repo = "abcm2ps"; rev = "v${version}"; - sha256 = "0k12wf37vl31w2qpj3dsmv8c4ifrsg3qa30gqsx553jw7n0f3ma2"; + sha256 = "0h4qzj9k5ng09nbkfipvr82piq68c576akjwmhsqn05rvgirmhx7"; }; configureFlags = [ diff --git a/pkgs/tools/audio/abcmidi/default.nix b/pkgs/tools/audio/abcmidi/default.nix index 1987b0a87c2..63ca4dc5e7c 100644 --- a/pkgs/tools/audio/abcmidi/default.nix +++ b/pkgs/tools/audio/abcmidi/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "abcMIDI"; - version = "2020.06.07"; + version = "2020.06.30"; src = fetchzip { url = "https://ifdo.ca/~seymour/runabc/${pname}-${version}.zip"; - sha256 = "06jpawwm4zcss9mi2bjdbdkkfr8cw1q9cpzplq5r83z8pljqb12l"; + sha256 = "0pdaf9y4ag2cdpygypf11aqa52hhj1y5f7gc8lv3aa1lplxyhi9m"; }; # There is also a file called "makefile" which seems to be preferred by the standard build phase diff --git a/pkgs/tools/filesystems/bashmount/default.nix b/pkgs/tools/filesystems/bashmount/default.nix index 2d66dfcee9b..206e68ce1c2 100644 --- a/pkgs/tools/filesystems/bashmount/default.nix +++ b/pkgs/tools/filesystems/bashmount/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "bashmount"; - version = "4.2.5"; + version = "4.3.0"; src = fetchFromGitHub { owner = "jamielinux"; repo = "bashmount"; rev = version; - sha256 = "1gvi2562vng887ba33s774lhhkacl8yl7d8b0yaxylzx0ap2y7l0"; + sha256 = "1idjyl5dr8a72w3lg15qx03wgc5mj2ga2v2jkyb8v9gi5ahl03mn"; }; installPhase = '' diff --git a/pkgs/tools/filesystems/ceph/default.nix b/pkgs/tools/filesystems/ceph/default.nix index 65cd19df0fa..fc8ac971da7 100644 --- a/pkgs/tools/filesystems/ceph/default.nix +++ b/pkgs/tools/filesystems/ceph/default.nix @@ -11,6 +11,7 @@ , rocksdb, makeWrapper , leveldb, oathToolkit , libnl, libcap_ng +, rdkafka # Optional Dependencies , yasm ? null, fcgi ? null, expat ? null @@ -93,7 +94,7 @@ let ]); sitePackages = ceph-python-env.python.sitePackages; - version = "14.2.9"; + version = "14.2.10"; in rec { ceph = stdenv.mkDerivation { pname = "ceph"; @@ -101,17 +102,11 @@ in rec { src = fetchurl { url = "http://download.ceph.com/tarballs/ceph-${version}.tar.gz"; - sha256 = "0zkh1a23v8g1fa5flqa2d53lv08ancab3li57gybpqpnja90k7il"; + sha256 = "0bbs3ag8zav283qpxrrndhvh2z01ykm6126fmwrbc1c5f9jfjq39"; }; patches = [ ./0000-fix-SPDK-build-env.patch - (fetchurl { - # Remove for Ceph > v15.2.3; https://www.openwall.com/lists/oss-security/2020/06/25/5 - name = "CVE-2020-10753.patch"; - url = "https://github.com/ceph/ceph/pull/35773/commits/1524d3c0c5cb11775313ea1e2bb36a93257947f2.patch"; - sha256 = "1c04kirijp4c8a5pgwqx17dzdnzvd29nl2nr3qdvf4fkqwnlf48s"; - }) ]; nativeBuildInputs = [ @@ -124,7 +119,7 @@ in rec { buildInputs = cryptoLibsMap.${cryptoStr} ++ [ boost ceph-python-env libxml2 optYasm optLibatomic_ops optLibs3 malloc zlib openldap lttng-ust babeltrace gperf gtest cunit - snappy rocksdb lz4 oathToolkit leveldb libnl libcap_ng + snappy rocksdb lz4 oathToolkit leveldb libnl libcap_ng rdkafka ] ++ optionals stdenv.isLinux [ linuxHeaders utillinux libuuid udev keyutils optLibaio optLibxfs optZfs # ceph 14 @@ -182,7 +177,7 @@ in rec { homepage = "https://ceph.com/"; description = "Distributed storage system"; license = with licenses; [ lgpl21 gpl2 bsd3 mit publicDomain ]; - maintainers = with maintainers; [ adev ak krav johanot ]; + maintainers = with maintainers; [ adev ak krav johanot srhb ]; platforms = [ "x86_64-linux" ]; }; diff --git a/pkgs/tools/filesystems/fuse-overlayfs/default.nix b/pkgs/tools/filesystems/fuse-overlayfs/default.nix index c5b02e1bdb8..ba5f4a3dd7e 100644 --- a/pkgs/tools/filesystems/fuse-overlayfs/default.nix +++ b/pkgs/tools/filesystems/fuse-overlayfs/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "fuse-overlayfs"; - version = "1.1.1"; + version = "1.1.2"; src = fetchFromGitHub { owner = "containers"; repo = pname; rev = "v${version}"; - sha256 = "0zrxq0s3dlgjarn8l519czwffp2s5ibykc00vfrpayg547dgj342"; + sha256 = "1ivz65nnyisha3lkk6ywx175f2sdacjz3q5vy9xddr7dixwd2b18"; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/pkgs/tools/graphics/spirv-cross/default.nix b/pkgs/tools/graphics/spirv-cross/default.nix index 3ca698f1c54..76d554457d9 100644 --- a/pkgs/tools/graphics/spirv-cross/default.nix +++ b/pkgs/tools/graphics/spirv-cross/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "spirv-cross"; - version = "2020-05-19"; + version = "2020-06-29"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Cross"; rev = version; - sha256 = "0zyijp9zx9wbd4i5lwjap7n793iz6yjkf27la60dsffxl75yy9pd"; + sha256 = "0mnccmhlqmpdx92v495z39i07hbvjwdr5n4zbarlrr1d7rm99lx4"; }; nativeBuildInputs = [ cmake python3 ]; diff --git a/pkgs/tools/misc/chezmoi/default.nix b/pkgs/tools/misc/chezmoi/default.nix index eb372b6b567..6ff736167be 100644 --- a/pkgs/tools/misc/chezmoi/default.nix +++ b/pkgs/tools/misc/chezmoi/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "chezmoi"; - version = "1.8.2"; + version = "1.8.3"; src = fetchFromGitHub { owner = "twpayne"; repo = "chezmoi"; rev = "v${version}"; - sha256 = "0s2a0q3lgrdz7w69sacn23k4dybw6wrk63xxnylj88wss7mqnpj8"; + sha256 = "01px0nj2llas835g1hf8lvhigip4jm4innjacz18c7nf1ddwn7ss"; }; - vendorSha256 = "0hpjvpai2i9jn8hlxhx4pvvawjh6lfmlz7ffi320pp7vanzqhch1"; + vendorSha256 = "1gzg73lrx73rhb9yj6yakv95m8rz1rhjgqjl1a78c8nvaii27a9x"; buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version} -X main.builtBy=nixpkgs" diff --git a/pkgs/tools/misc/cloud-utils/default.nix b/pkgs/tools/misc/cloud-utils/default.nix index cdd1891fb40..d5c5b0ee783 100644 --- a/pkgs/tools/misc/cloud-utils/default.nix +++ b/pkgs/tools/misc/cloud-utils/default.nix @@ -8,10 +8,10 @@ stdenv.mkDerivation rec { # $ nix-build nixos/release-combined.nix -A nixos.tests.ec2-nixops # growpart is needed in initrd in nixos/system/boot/grow-partition.nix pname = "cloud-utils"; - version = "0.30"; + version = "0.31"; src = fetchurl { - url = "https://launchpad.net/cloud-utils/trunk/0.3/+download/cloud-utils-${version}.tar.gz"; - sha256 = "19ca9ckwwsvlqrjz19bc93rq4gv3y4ak7551li2qk95caqyxsq3k"; + url = "https://launchpad.net/cloud-utils/trunk/${version}/+download/cloud-utils-${version}.tar.gz"; + sha256 = "07fl3dlqwdzw4xx7mcxhpkks6dnmaxha80zgs9f6wmibgzni8z0r"; }; nativeBuildInputs = [ makeWrapper ]; buildInputs = [ python3 ]; diff --git a/pkgs/tools/misc/dua/default.nix b/pkgs/tools/misc/dua/default.nix index a79059dff07..91ab681b2a0 100644 --- a/pkgs/tools/misc/dua/default.nix +++ b/pkgs/tools/misc/dua/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "dua"; - version = "2.6.1"; + version = "2.8.1"; src = fetchFromGitHub { owner = "Byron"; repo = "dua-cli"; rev = "v${version}"; - sha256 = "0wq6cqznbpkiy9vz3slpcnxlsxff6gx5x7fsbd67q6jv5zhkn881"; + sha256 = "0z0aqasi42wv1np2a6b0qc14a64r2h8xh025411jdxfs6vjr15am"; # Remove unicode file names which leads to different checksums on HFS+ # vs. other filesystems because of unicode normalisation. extraPostFetch = '' @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { ''; }; - cargoSha256 = "096c6i1hqyygaifnm2kg53x22a8hhfxfz22qlssh1rw79bj82q0x"; + cargoSha256 = "1g9248kqwrc46abwx6fakzfxf745jfvkywi49z7mvd4p99ysh2ir"; doCheck = false; diff --git a/pkgs/tools/misc/lorri/default.nix b/pkgs/tools/misc/lorri/default.nix index 7829a677b43..002a6e2eaec 100644 --- a/pkgs/tools/misc/lorri/default.nix +++ b/pkgs/tools/misc/lorri/default.nix @@ -4,7 +4,7 @@ , rustPlatform # Updater script , runtimeShell -, writeScript +, writers # Tests , nixosTests # Apple dependencies @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec { pname = "lorri"; - version = "1.0"; + version = "1.1"; meta = with stdenv.lib; { description = "Your project's nix-env"; @@ -27,11 +27,12 @@ rustPlatform.buildRustPackage rec { owner = "target"; repo = pname; # Run `eval $(nix-build -A lorri.updater)` after updating the revision! - rev = "88c680c9abf0f04f2e294436d20073ccf26f0781"; - sha256 = "1415mhdr0pwvshs04clfz1ys76r5qf9jz8jchm63l6llaj6m7mrv"; + # ALSO don’t forget to update the cargoSha256! + rev = "93d93013217cd9aa09d2bd316d6c3abf827a6601"; + sha256 = "0wbkx8hmikngfp6fp0y65yla22f3k0jszq8a6pas80q0b33llwm5"; }; - cargoSha256 = "1iwd0cad8dp8q5xz2mm7zn1wphr5brkw937dfygc88afj6bv3d68"; + cargoSha256 = "1a3n1ylyp63x6v7b07nnqpfxjzmsgwmgraza23lx8z4gh167gv46"; doCheck = false; BUILD_REV_COUNT = src.revCount or 1; @@ -42,8 +43,7 @@ rustPlatform.buildRustPackage rec { stdenv.lib.optionals stdenv.isDarwin [ CoreServices Security ]; passthru = { - updater = with builtins; writeScript "copy-runtime-nix.sh" '' - #!${runtimeShell} + updater = writers.writeBash "copy-runtime-nix.sh" '' set -euo pipefail cp ${src}/nix/runtime.nix ${toString ./runtime.nix} cp ${src}/nix/runtime-closure.nix.template ${toString ./runtime-closure.nix.template} diff --git a/pkgs/tools/misc/mcfly/default.nix b/pkgs/tools/misc/mcfly/default.nix index f206c54a003..7feb2fce710 100644 --- a/pkgs/tools/misc/mcfly/default.nix +++ b/pkgs/tools/misc/mcfly/default.nix @@ -1,27 +1,26 @@ -{ stdenv, rustPlatform, fetchFromGitHub, Security }: +{ stdenv, rustPlatform, fetchFromGitHub }: rustPlatform.buildRustPackage rec { pname = "mcfly"; - version = "0.3.6"; + version = "0.4.0"; src = fetchFromGitHub { owner = "cantino"; repo = "mcfly"; rev = "v${version}"; - sha256 = "1g3n7ll0yg7w7hb3jgp25mlnqwsdzv0608f41z7q5gmsskdm3v1j"; + sha256 = "01rw7gdvpr2s3yj7wphsm5gfrgzf5jkrci4mpqiw7xp8d5k87nzl"; }; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - preInstall = '' install -Dm644 -t $out/share/mcfly mcfly.bash + install -Dm644 -t $out/share/mcfly mcfly.zsh ''; - cargoSha256 = "0r2zb59rpja9z7q0gsylqaq4vqm5rp57fy56ajjrm6k6z06nq7bv"; + cargoSha256 = "1q1mi69prn9q1nk4021c69vq160ls6md6gpqxk7zyf25r5ckdd98"; meta = with stdenv.lib; { homepage = "https://github.com/cantino/mcfly"; - description = "An upgraded ctrl-r for Bash whose history results make sense for what you're working on right now."; + description = "An upgraded ctrl-r for Bash whose history results make sense for what you're working on right now"; license = licenses.mit; maintainers = [ maintainers.melkor333 ]; }; diff --git a/pkgs/tools/misc/mdbtools/default.nix b/pkgs/tools/misc/mdbtools/default.nix index 0a887531fb8..aedaa364888 100644 --- a/pkgs/tools/misc/mdbtools/default.nix +++ b/pkgs/tools/misc/mdbtools/default.nix @@ -1,30 +1,40 @@ -{ stdenv, fetchFromGitHub, glib, readline -, bison, flex, pkgconfig, autoreconfHook -, txt2man, which }: +{ stdenv, lib, fetchFromGitHub, glib, readline +, bison, flex, pkgconfig, autoreconfHook, libxslt, makeWrapper +, txt2man, which +# withUi currently doesn't work. It compiles but fails to run. +, withUi ? false, gtk2, gnome2 +}: -let version = "0.7.1"; -in stdenv.mkDerivation { +let + uiDeps = [ gtk2 ] ++ (with gnome2; [ GConf libglade libgnomeui gnome-doc-utils ]); + +in +stdenv.mkDerivation rec { pname = "mdbtools"; - inherit version; + version = "0.8.2"; src = fetchFromGitHub { - owner = "brianb"; + owner = "cyberemissary"; repo = "mdbtools"; rev = version; - sha256 = "0gwcpp9y09xhs21g7my2fs8ncb8i6ahlyixcx8jd3q97jbzj441l"; + sha256 = "12rhf6rgnws6br5dn1l2j7i77q9p4l6ryga10jpax01vvzhr26qc"; }; - nativeBuildInputs = [ pkgconfig bison flex autoreconfHook txt2man which ]; - buildInputs = [ glib readline ]; + configureFlags = [ "--disable-scrollkeeper" ]; - preConfigure = '' - sed -e 's@static \(GHashTable [*]mdb_backends;\)@\1@' -i src/libmdb/backend.c - ''; + nativeBuildInputs = [ + pkgconfig bison flex autoreconfHook txt2man which + ] ++ lib.optional withUi libxslt; - meta = with stdenv.lib; { + buildInputs = [ glib readline ] ++ lib.optionals withUi uiDeps; + + enableParallelBuilding = true; + + meta = with lib; { description = ".mdb (MS Access) format tools"; - homepage = "http://mdbtools.sourceforge.net"; - platforms = platforms.unix; license = with licenses; [ gpl2 lgpl2 ]; + maintainers = with maintainers; [ ]; + platforms = platforms.unix; + inherit (src.meta) homepage; }; } diff --git a/pkgs/tools/misc/pgmetrics/default.nix b/pkgs/tools/misc/pgmetrics/default.nix index da2e1a9cbe3..9323ea0b9e4 100644 --- a/pkgs/tools/misc/pgmetrics/default.nix +++ b/pkgs/tools/misc/pgmetrics/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "pgmetrics"; - version = "1.9.1"; + version = "1.9.2"; src = fetchFromGitHub { owner = "rapidloop"; repo = pname; rev = "v${version}"; - sha256 = "03c4v24ql9p38m0hmgq5ya9cnvhmdhv2zjxxrxpb2338cxajs4mh"; + sha256 = "1prhzmxrvypqdbxjr9c3207w1c88z3kwsrr2rcbh1y7fx5rrspxv"; }; vendorSha256 = "16x33fmh4q993rw0jr65337yimska4fwgyyw3kmq84q0x28a3zg5"; diff --git a/pkgs/tools/misc/txt2man/default.nix b/pkgs/tools/misc/txt2man/default.nix index 6013dc1c26b..ded409754bc 100644 --- a/pkgs/tools/misc/txt2man/default.nix +++ b/pkgs/tools/misc/txt2man/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "txt2man"; - version = "1.7.0"; + version = "1.7.1"; src = fetchurl { url = "https://github.com/mvertes/txt2man/archive/${pname}-${version}.tar.gz"; - sha256 = "06jf8hqav095db1v3njavx0rphmpmi3mgki4va6qkxjnvmdx4742"; + sha256 = "0ka3krmblsprv0v6h6wnm8lv08w30z0ynfnbwns6alks5gx1p6sd"; }; preConfigure = '' diff --git a/pkgs/tools/misc/z-lua/default.nix b/pkgs/tools/misc/z-lua/default.nix index 7d8e760a8d9..59149506e6c 100644 --- a/pkgs/tools/misc/z-lua/default.nix +++ b/pkgs/tools/misc/z-lua/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "z-lua"; - version = "1.8.4"; + version = "1.8.7"; src = fetchFromGitHub { owner = "skywind3000"; repo = "z.lua"; rev = version; - sha256 = "1whh2gzxhx4c24mwh5yifnpah56bzb6v7barp727pjw4whpflg1s"; + sha256 = "14n1abv7gh4zajq471bgzpcv8l1159g00h9x83h719i9kxxsa2ba"; }; dontBuild = true; diff --git a/pkgs/tools/networking/amass/default.nix b/pkgs/tools/networking/amass/default.nix index e2bc592f7a8..99376cc58ac 100644 --- a/pkgs/tools/networking/amass/default.nix +++ b/pkgs/tools/networking/amass/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "amass"; - version = "3.7.2"; + version = "3.7.3"; src = fetchFromGitHub { owner = "OWASP"; repo = "Amass"; rev = "v${version}"; - sha256 = "1acjqpa9xg9ji2mzxag57yq589cdq3rh78a8vz8wnkkkp7b8why8"; + sha256 = "083c59yig9z0ksvcm9dvy0mv13k79rgnvqrr5qhbhzjz3bgzy1dq"; }; vendorSha256 = "1s8g0qqg3m6hdvc5v3s86l3ba5grmyhx0lf2ymi39k5dpcg8l19s"; diff --git a/pkgs/tools/networking/bully/default.nix b/pkgs/tools/networking/bully/default.nix index c9512392347..4117932550f 100644 --- a/pkgs/tools/networking/bully/default.nix +++ b/pkgs/tools/networking/bully/default.nix @@ -1,33 +1,32 @@ -{ stdenv, fetchFromGitHub, openssl, libpcap }: +{ stdenv, fetchFromGitHub, libpcap }: stdenv.mkDerivation rec { - pname = "bully"; - version = "1.1"; + version = "1.4-00"; src = fetchFromGitHub { - sha256 = "1qvbbf72ryd85bp4v62fk93ag2sn25rj7kipgagbv22hnq8yl3zd"; - rev = version; + owner = "kimocoder"; repo = "bully"; - owner = "aanarchyy"; + rev = version; + sha256 = "1n2754a5z44g414a0hj3cmi9q5lwnzyvmvzskrj2nci8c8m2kgnf"; }; - buildInputs = [ openssl libpcap ]; - buildPhase = '' - cd src - make - ''; + buildInputs = [ libpcap ]; + + enableParallelBuilding = true; + + sourceRoot = "./source/src"; installPhase = '' - mkdir -p $out/bin - mv bully $out/bin + install -Dm555 -t $out/bin bully + install -Dm444 -t $out/share/doc/${pname} ../*.md ''; meta = with stdenv.lib; { description = "Retrieve WPA/WPA2 passphrase from a WPS enabled access point"; - homepage = "https://github.com/aanarchyy/bully"; - maintainers = with maintainers; [ edwtjo ]; + homepage = "https://github.com/kimocoder/bully"; license = licenses.gpl3; + maintainers = with maintainers; [ edwtjo ]; platforms = platforms.linux; }; } diff --git a/pkgs/tools/networking/httpie/default.nix b/pkgs/tools/networking/httpie/default.nix index 01986bf9321..bf80cd48ffa 100644 --- a/pkgs/tools/networking/httpie/default.nix +++ b/pkgs/tools/networking/httpie/default.nix @@ -1,21 +1,30 @@ -{ stdenv, fetchFromGitHub, python3Packages, docutils, }: +{ stdenv, fetchFromGitHub, python3Packages, docutils, fetchpatch }: python3Packages.buildPythonApplication rec { pname = "httpie"; - version = "2.1.0"; + version = "2.2.0"; src = fetchFromGitHub { owner = "jakubroztocil"; repo = "httpie"; rev = version; - sha256 = "1vwjlzx830q4dcm3r7j9cl8yzka37dw42rl1r05m5ysb1081cbj2"; + sha256 = "0caazv24jr0844c4mdx77vzwwi5m869n10wa42cydb08ppx1xxj6"; }; outputs = [ "out" "doc" "man" ]; propagatedBuildInputs = with python3Packages; [ pygments requests setuptools ]; dontUseSetuptoolsCheck = true; - patches = [ ./strip-venv.patch ]; + patches = [ + ./strip-venv.patch + + # Fix `test_ciphers_none_can_be_selected` + # TODO: remove on next release + (fetchpatch { + url = "https://github.com/jakubroztocil/httpie/commit/49e71d252f54871a6bc49cb1cba103d385a543b8.patch"; + sha256 = "13b2faf50gimj7f17dlx4gmd8ph8ipgihpzfqbvmfjlbf1v95fsj"; + }) + ]; checkInputs = with python3Packages; [ mock diff --git a/pkgs/tools/networking/network-manager/applet/default.nix b/pkgs/tools/networking/network-manager/applet/default.nix index 109c4c8cce1..9f92fcfa1ab 100644 --- a/pkgs/tools/networking/network-manager/applet/default.nix +++ b/pkgs/tools/networking/network-manager/applet/default.nix @@ -26,11 +26,11 @@ stdenv.mkDerivation rec { pname = "network-manager-applet"; - version = "1.16.0"; + version = "1.18.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1rf3nm0hjcy9f8ajb4vmvwy503w8yj8d4daxkcb7w7i7b92qmyfn"; + sha256 = "12xiy8g8qk18jvxvn78mvq03zvzp06bww49na765jjw0rq541fyx"; }; mesonFlags = [ diff --git a/pkgs/tools/networking/persepolis/default.nix b/pkgs/tools/networking/persepolis/default.nix index a9bd2739a8a..ecceed21660 100644 --- a/pkgs/tools/networking/persepolis/default.nix +++ b/pkgs/tools/networking/persepolis/default.nix @@ -8,21 +8,22 @@ , setproctitle , setuptools , sound-theme-freedesktop +, wrapQtAppsHook , youtube-dl }: buildPythonApplication rec { pname = "persepolis"; - version = "3.1.0"; + version = "3.2.0"; src = fetchFromGitHub { owner = "persepolisdm"; repo = "persepolis"; rev = version; - sha256 = "0xngk8wgj5k27mh3bcrf2wwzqr8a3g0d4pc5i5vcavnnaj03j44m"; + sha256 = "1rh7q432ynbysapsd075nif975ync71icpb71x2mb4j8jx1vzs45"; }; - # see: https://github.com/persepolisdm/persepolis/blob/3.1.0/setup.py#L130 + # see: https://github.com/persepolisdm/persepolis/blob/3.2.0/setup.py#L130 doCheck = false; preBuild='' @@ -37,10 +38,17 @@ buildPythonApplication rec { postInstall = '' mkdir -p $out/share/applications cp $src/xdg/com.github.persepolisdm.persepolis.desktop $out/share/applications - wrapProgram $out/bin/persepolis --prefix PATH : "${lib.makeBinPath [aria libnotify ]}" ''; - buildInputs = [ makeWrapper ]; + # prevent double wrapping + dontWrapQtApps = true; + nativeBuildInputs = [ wrapQtAppsHook ]; + + # feed args to wrapPythonApp + makeWrapperArgs = [ + "--prefix PATH : ${lib.makeBinPath [aria libnotify ]}" + ''''${qtWrapperArgs[@]}'' + ]; propagatedBuildInputs = [ pulseaudio diff --git a/pkgs/tools/networking/slack-cli/default.nix b/pkgs/tools/networking/slack-cli/default.nix index bdd650494b1..25e426dc43e 100644 --- a/pkgs/tools/networking/slack-cli/default.nix +++ b/pkgs/tools/networking/slack-cli/default.nix @@ -5,7 +5,8 @@ # for token storage, except that it would make the Nix package inconsistent with # upstream and other distributions. -{ stdenv, lib, fetchFromGitHub, curl, jq, runtimeShell }: +{ stdenv, lib, fetchFromGitHub, curl, jq, coreutils, gnugrep, gnused +, runtimeShell }: stdenv.mkDerivation rec { pname = "slack-cli"; @@ -33,7 +34,7 @@ stdenv.mkDerivation rec { MESSAGE - export PATH=${lib.makeBinPath [ curl jq ]}:"\$PATH" + export PATH=${lib.makeBinPath [ curl jq coreutils gnugrep gnused ]}:"\$PATH" exec "$out/bin/.slack-wrapped" "\$@" WRAPPER diff --git a/pkgs/tools/networking/tcpreplay/default.nix b/pkgs/tools/networking/tcpreplay/default.nix index d6d7b45364a..b40df721c83 100644 --- a/pkgs/tools/networking/tcpreplay/default.nix +++ b/pkgs/tools/networking/tcpreplay/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "tcpreplay"; - version = "4.3.2"; + version = "4.3.3"; src = fetchurl { url = "https://github.com/appneta/tcpreplay/releases/download/v${version}/tcpreplay-${version}.tar.gz"; - sha256 = "0ld9v88g5xs2rykimksmhlkwbv2r97575c4aqmqdxbvc37crnisg"; + sha256 = "1plgjm3dr9rr5q71s7paqk2wgrvkihbk2yrf9g3zaks3m750497d"; }; buildInputs = [ libpcap ]; diff --git a/pkgs/tools/networking/tunnelto/default.nix b/pkgs/tools/networking/tunnelto/default.nix index c61da53c6ad..c774888d04c 100644 --- a/pkgs/tools/networking/tunnelto/default.nix +++ b/pkgs/tools/networking/tunnelto/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "tunnelto"; - version = "0.1.6"; + version = "0.1.9"; src = fetchFromGitHub { owner = "agrinman"; repo = pname; rev = version; - sha256 = "0yigjg8kjl8v0636hjr3sg33p4v963vzq7wbfi986ymxfx47jqp7"; + sha256 = "11v06w0mq9l6rcgbm0wx47a5x3n7js8f07g43xfjv0qf0ra4w2xj"; }; - cargoSha256 = "0603b0hn84shl9wdg7zg7kf9050gh33d8ghscwsby1vqanakms9j"; + cargoSha256 = "0pq0ril8lm6y8pz0jj49zwcbb1yw3hjbpk4m9vp1vfbj3hvjcbp3"; nativeBuildInputs = stdenv.lib.optionals stdenv.isLinux [ pkg-config ]; buildInputs = [ ] diff --git a/pkgs/tools/package-management/nfpm/default.nix b/pkgs/tools/package-management/nfpm/default.nix index 4c04f24b26c..17fa6fad83a 100644 --- a/pkgs/tools/package-management/nfpm/default.nix +++ b/pkgs/tools/package-management/nfpm/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "nfpm"; - version = "1.3.1"; + version = "1.3.2"; src = fetchFromGitHub { owner = "goreleaser"; repo = pname; rev = "v${version}"; - sha256 = "14083sxim17nwmq7w7wvq9sq9pai860v8a2q14vz16hd2i427aqp"; + sha256 = "1z6z4ad5id6bcxzd8p76akxwvf5jzr54w81798ri9lysf4hdi6sh"; }; - vendorSha256 = "0v86fwi1i6b8ngf60ag31mrbah45f0ncqhrjdk5494f139c26067"; + vendorSha256 = "0v14j4vsp7f29xajym2dd2zlfv0sqhb04qfs76bcnn0ys6j1xkny"; buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; diff --git a/pkgs/tools/security/bitwarden/default.nix b/pkgs/tools/security/bitwarden/default.nix index 2da8840eee1..ff55ad6691d 100644 --- a/pkgs/tools/security/bitwarden/default.nix +++ b/pkgs/tools/security/bitwarden/default.nix @@ -16,11 +16,11 @@ let pname = "bitwarden"; version = { - x86_64-linux = "1.18.0"; + x86_64-linux = "1.19.0"; }.${system} or ""; sha256 = { - x86_64-linux = "04rry33jccf65smzpjp1dhcirffdb7y36yn8whqaikhsavsawx3j"; + x86_64-linux = "16qlgnqyi0jwzlz8wg2628jhh83xsk46bl6p4dnwi0ay07lhab9w"; }.${system} or ""; meta = with stdenv.lib; { diff --git a/pkgs/tools/security/kbs2/default.nix b/pkgs/tools/security/kbs2/default.nix new file mode 100644 index 00000000000..354b28b9fa2 --- /dev/null +++ b/pkgs/tools/security/kbs2/default.nix @@ -0,0 +1,42 @@ +{ stdenv, rustPlatform, fetchFromGitHub, installShellFiles, python3, libxcb, AppKit }: + +rustPlatform.buildRustPackage rec { + pname = "kbs2"; + version = "0.1.1"; + + src = fetchFromGitHub { + owner = "woodruffw"; + repo = pname; + rev = "v${version}"; + sha256 = "0761g8cl9v7jj444vp83zq9f1shrddqq20pd41d5mbl6f8qpk4m5"; + }; + + cargoSha256 = "0vzjkw1g6saz4nwy823dpip02jg2f21rsd8kkpra206b8i6q0mfg"; + + nativeBuildInputs = [ installShellFiles ] + ++ stdenv.lib.optionals stdenv.isLinux [ python3 ]; + + buildInputs = [ ] + ++ stdenv.lib.optionals stdenv.isLinux [ libxcb ] + ++ stdenv.lib.optionals stdenv.isDarwin [ AppKit ]; + + preCheck = '' + export HOME=$TMPDIR + ''; + + checkFlagsArray = [ "--skip=kbs2::config::tests::test_find_config_dir" ]; + + postInstall = '' + for shell in bash fish zsh; do + $out/bin/kbs2 --completions $shell > kbs2.$shell + installShellCompletion kbs2.$shell + done + ''; + + meta = with stdenv.lib; { + description = "A secret manager backed by age"; + homepage = "https://github.com/woodruffw/kbs2"; + license = licenses.mit; + maintainers = [ maintainers.marsam ]; + }; +} diff --git a/pkgs/tools/security/saml2aws/default.nix b/pkgs/tools/security/saml2aws/default.nix index d3157529215..144ac3a95c8 100644 --- a/pkgs/tools/security/saml2aws/default.nix +++ b/pkgs/tools/security/saml2aws/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "saml2aws"; - version = "2.26.1"; + version = "2.26.2"; src = fetchFromGitHub { owner = "Versent"; repo = "saml2aws"; rev = "v${version}"; - sha256 = "09b217x10mn3y244rwym0fcqr4ly6n83wnykb77488kn960b0pqb"; + sha256 = "0y5gvdrdr6i9spdwsxvzs1bxs32icxpkqxnglp1bf4gglc580d87"; }; hid = fetchFromGitHub { @@ -18,7 +18,7 @@ buildGoModule rec { sha256 = "0xc7b8mwha64j7l2fr2g5zy8pz7cqi0vrxx60gii52b6ii31xncx"; }; - vendorSha256 = "0mns5clykvj33krf29yjh8lkf05nih42ka5ji7miq0iaikqyyc78"; + vendorSha256 = "0f81nrg8v3xh2hcx7g77p3ahr4gyj042bwr1knf2phpahgz9n9rn"; overrideModAttrs = (_: { postBuild = '' cp -r --reflink=auto ${hid}/libusb vendor/github.com/karalabe/hid diff --git a/pkgs/tools/system/inxi/default.nix b/pkgs/tools/system/inxi/default.nix index bb3ba6ec371..8842c97902e 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.03-1"; + version = "3.1.04-1"; src = fetchFromGitHub { owner = "smxi"; repo = "inxi"; rev = version; - sha256 = "0539hvlq021wxhbwzdp7qliiq1jgw60mxlwrwx0z2x8qi1zqdzg6"; + sha256 = "1mirnrrqfjyl2r7fwnpjlk37i5hf8f7lxv2yxcbdfjf2b3dfbpvl"; }; buildInputs = [ perl makeWrapper ]; diff --git a/pkgs/tools/text/ansifilter/default.nix b/pkgs/tools/text/ansifilter/default.nix index 8ebb5cfd059..00c8c075ed6 100644 --- a/pkgs/tools/text/ansifilter/default.nix +++ b/pkgs/tools/text/ansifilter/default.nix @@ -12,6 +12,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ boost lua ]; + postPatch = '' + substituteInPlace src/makefile --replace "CC=g++" "CC=c++" + ''; + makeFlags = [ "PREFIX=${placeholder "out"}" "conf_dir=/etc/ansifilter" @@ -26,6 +30,6 @@ stdenv.mkDerivation rec { homepage = "http://www.andre-simon.de/doku/ansifilter/en/ansifilter.php"; license = licenses.gpl3; maintainers = [ maintainers.Adjective-Object ]; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/pkgs/tools/text/languagetool/default.nix b/pkgs/tools/text/languagetool/default.nix index fccd2174a6d..0dd01d382ed 100644 --- a/pkgs/tools/text/languagetool/default.nix +++ b/pkgs/tools/text/languagetool/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "LanguageTool"; - version = "4.9.1"; + version = "5.0"; src = fetchzip { url = "https://www.languagetool.org/download/${pname}-${version}.zip"; - sha256 = "0hvzckb92yijzmp2vphjp1wgql3xqq0xd83v5x6pbhziq9yxc5yh"; + sha256 = "1jyd4z62ldwhqx9r7v4b9k4pl300wr4b7ggj4f0yjf0gpwg7l9p7"; }; nativeBuildInputs = [ makeWrapper ]; buildInputs = [ jre ]; diff --git a/pkgs/tools/typesetting/asciidoctorj/default.nix b/pkgs/tools/typesetting/asciidoctorj/default.nix index ba46d36814a..0d2e8004f55 100644 --- a/pkgs/tools/typesetting/asciidoctorj/default.nix +++ b/pkgs/tools/typesetting/asciidoctorj/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "asciidoctorj"; - version = "2.3.0"; + version = "2.3.1"; src = fetchzip { url = "http://dl.bintray.com/asciidoctor/maven/org/asciidoctor/${pname}/${version}/${pname}-${version}-bin.zip"; - sha256 = "1hmra1pg79hj9kqbj6702y5b03vyvfzqf6hq65jg1vxjqlq7h3xx"; + sha256 = "0gp45vwm0hl8590014qrxlpw2rycxm7ir819d242mh38v3hdjgkz"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/typesetting/tex/texlive/bin.nix b/pkgs/tools/typesetting/tex/texlive/bin.nix index c0ae6b8e187..1a71ae04d49 100644 --- a/pkgs/tools/typesetting/tex/texlive/bin.nix +++ b/pkgs/tools/typesetting/tex/texlive/bin.nix @@ -46,7 +46,7 @@ let }; in fetchurl { name = "pdftoepdf-poppler${popplerVersion}.cc"; - url = "https://www.tug.org/svn/texlive/trunk/Build/source/texk/web2c/pdftexdir/pdftoepdf-poppler${popplerVersion}.cc?revision=52959&view=co"; + url = "https://www.tug.org/svn/texlive/trunk/Build/source/texk/web2c/pdftexdir/pdftoepdf-poppler${popplerVersion}.cc?revision=52959&view=co&pathrev=52959"; sha256 = "0pngvw1jgnm4cqskrzf5a3z8rj4ssl10007n3wbblj50hvvzjph3"; postFetch = '' # The trunk added some extra arguments to certain functions so we need to revert that @@ -56,7 +56,7 @@ let }; pdftosrc = fetchurl { name = "pdftosrc-poppler${popplerVersion}.cc"; - url = "https://www.tug.org/svn/texlive/trunk/Build/source/texk/web2c/pdftexdir/pdftosrc-poppler${popplerVersion}.cc?revision=52959&view=co"; + url = "https://www.tug.org/svn/texlive/trunk/Build/source/texk/web2c/pdftexdir/pdftosrc-poppler${popplerVersion}.cc?revision=52959&view=co&pathrev=52959"; sha256 = "0iq2cmwvf2lxy32sygrafwqgcwvvbdnvxm5l3mrg9cb2a1g06380"; }; in '' diff --git a/pkgs/tools/virtualization/nixos-container/nixos-container.pl b/pkgs/tools/virtualization/nixos-container/nixos-container.pl index dc05c974bd0..02ad6af90da 100755 --- a/pkgs/tools/virtualization/nixos-container/nixos-container.pl +++ b/pkgs/tools/virtualization/nixos-container/nixos-container.pl @@ -5,7 +5,7 @@ use POSIX; use File::Path; use File::Slurp; use Fcntl ':flock'; -use Getopt::Long qw(:config gnu_getopt); +use Getopt::Long qw(:config gnu_getopt no_bundling); use Cwd 'abs_path'; use Time::HiRes; @@ -68,6 +68,22 @@ my $localAddress; my $flake; my $flakeAttr = "container"; +# Nix passthru flags. +my @nixFlags; +my @nixFlags2; + +sub copyNixFlags0 { push @nixFlags, "--$_[0]"; } +sub copyNixFlags1 { push @nixFlags, "--$_[0]", $_[1]; } + +# Ugly hack to handle flags that take two arguments, like --option. +sub copyNixFlags2 { + if (scalar(@nixFlags2) % 3 == 0) { + push @nixFlags2, "--$_[0]", $_[1]; + } else { + push @nixFlags2, $_[1]; + } +} + GetOptions( "help" => sub { showHelp() }, "ensure-unique-name" => \$ensureUniqueName, @@ -82,8 +98,22 @@ GetOptions( "host-address=s" => \$hostAddress, "local-address=s" => \$localAddress, "flake=s" => \$flake, + # Nix passthru options. + "log-format=s" => \©NixFlags1, + "option=s{2}" => \©NixFlags2, + "impure" => \©NixFlags0, + "update-input=s" => \©NixFlags1, + "override-input=s{2}" => \©NixFlags2, + "commit-lock-file" => \©NixFlags0, + "no-registries" => \©NixFlags0, + "no-update-lock-file" => \©NixFlags0, + "no-write-lock-file" => \©NixFlags0, + "no-allow-dirty" => \©NixFlags0, + "recreate-lock-file" => \©NixFlags0, ) or exit 1; +push @nixFlags, @nixFlags2; + if (defined $hostAddress and !defined $localAddress or defined $localAddress and !defined $hostAddress) { die "With --host-address set, --local-address is required as well!"; } @@ -144,7 +174,7 @@ EOF } sub buildFlake { - system("nix", "build", "-o", "$systemPath.tmp", "--", + system("nix", "build", "-o", "$systemPath.tmp", @nixFlags, "--", "$flake#nixosConfigurations.\"$flakeAttr\".config.system.build.toplevel") == 0 or die "$0: failed to build container from flake '$flake'\n"; $systemPath = readlink("$systemPath.tmp") or die; @@ -251,7 +281,7 @@ if ($action eq "create") { system("nix-env", "-p", "$profileDir/system", "-I", "nixos-config=$nixosConfigFile", "-f", "$nixenvF", - "--set", "-A", "system") == 0 + "--set", "-A", "system", @nixFlags) == 0 or do { clearContainerState($profileDir, "$profileDir/$containerName", $root, $confFile); die "$0: failed to build initial container configuration\n" @@ -400,7 +430,7 @@ elsif ($action eq "update") { my $nixenvF = $nixosPath // ""; system("nix-env", "-p", "$profileDir/system", "-I", "nixos-config=$nixosConfigFile", "-f", $nixenvF, - "--set", "-A", "system") == 0 + "--set", "-A", "system", @nixFlags) == 0 or die "$0: failed to build container configuration\n"; } diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index f9487820baf..a68232fef04 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -566,6 +566,7 @@ mapAliases ({ telepathy_idle = telepathy-idle; # added 2018-02-25 telepathy_logger = telepathy-logger; # added 2018-02-25 telepathy_mission_control = telepathy-mission-control; # added 2018-02-25 + telepathy-qt = throw "telepathy-qt no longer supports Qt 4. Please use libsForQt5.telepathy instead."; # added 2020-07-02 telepathy_qt = telepathy-qt; # added 2018-02-25 telepathy_qt5 = libsForQt5.telepathy; # added 2015-12-19 telepathy_salut = telepathy-salut; # added 2018-02-25 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6c6bcecc645..c02d26801d6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -183,6 +183,8 @@ in deadcode = callPackage ../development/tools/deadcode { }; + eclipse-mat = callPackage ../development/tools/eclipse-mat { }; + glade = callPackage ../development/tools/glade { }; hobbes = callPackage ../development/tools/hobbes { }; @@ -773,8 +775,6 @@ in aws-rotate-key = callPackage ../tools/admin/aws-rotate-key { }; - aws_shell = callPackage ../tools/admin/aws_shell { }; - aws-sam-cli = callPackage ../development/tools/aws-sam-cli { python = python3; }; aws-vault = callPackage ../tools/admin/aws-vault { }; @@ -1794,6 +1794,8 @@ in eschalot = callPackage ../tools/security/eschalot { }; + espanso = callPackage ../applications/office/espanso { }; + esphome = callPackage ../tools/misc/esphome { }; esptool = callPackage ../tools/misc/esptool { }; @@ -2152,7 +2154,9 @@ in pbzx = callPackage ../tools/compression/pbzx { }; - persepolis = python3Packages.callPackage ../tools/networking/persepolis { }; + persepolis = python3Packages.callPackage ../tools/networking/persepolis { + wrapQtAppsHook = qt5.wrapQtAppsHook; + }; pev = callPackage ../development/tools/analysis/pev { }; @@ -4539,6 +4543,10 @@ in kbdd = callPackage ../applications/window-managers/kbdd { }; + kbs2 = callPackage ../tools/security/kbs2 { + inherit (darwin.apple_sdk.frameworks) AppKit; + }; + kdbplus = pkgsi686Linux.callPackage ../applications/misc/kdbplus { }; keepalived = callPackage ../tools/networking/keepalived { }; @@ -4736,9 +4744,7 @@ in mautrix-whatsapp = callPackage ../servers/mautrix-whatsapp { }; - mcfly = callPackage ../tools/misc/mcfly { - inherit (darwin.apple_sdk.frameworks) Security; - }; + mcfly = callPackage ../tools/misc/mcfly { }; mdbook = callPackage ../tools/text/mdbook { inherit (darwin.apple_sdk.frameworks) CoreServices; @@ -5544,6 +5550,8 @@ in nilfs-utils = callPackage ../tools/filesystems/nilfs-utils {}; + nimmm = callPackage ../applications/misc/nimmm { }; + nitrogen = callPackage ../tools/X11/nitrogen {}; nms = callPackage ../tools/misc/nms { }; @@ -5956,9 +5964,7 @@ in brickd = callPackage ../servers/brickd { }; - bully = callPackage ../tools/networking/bully { - openssl = openssl_1_0_2; - }; + bully = callPackage ../tools/networking/bully { }; pcapc = callPackage ../tools/networking/pcapc { }; @@ -7818,9 +7824,7 @@ in libxml2 = libxml2Python; }; - xsecurelock = callPackage ../tools/X11/xsecurelock { - xset = xorg.xset; - }; + xsecurelock = callPackage ../tools/X11/xsecurelock { }; xsel = callPackage ../tools/misc/xsel { }; @@ -14983,8 +14987,6 @@ in telepathy-farstream = callPackage ../development/libraries/telepathy/farstream {}; - telepathy-qt = callPackage ../development/libraries/telepathy/qt { qtbase = qt4; }; - termbox = callPackage ../development/libraries/termbox { }; tevent = callPackage ../development/libraries/tevent { }; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index ab14c4876a6..bc7f1532f78 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -52,6 +52,8 @@ let bigarray-compat = callPackage ../development/ocaml-modules/bigarray-compat { }; + bigarray-overlap = callPackage ../development/ocaml-modules/bigarray-overlap { }; + bigstringaf = callPackage ../development/ocaml-modules/bigstringaf { }; bigstring = callPackage ../development/ocaml-modules/bigstring { }; @@ -348,11 +350,15 @@ let gg = callPackage ../development/ocaml-modules/gg { }; - git = callPackage ../development/ocaml-modules/git { inherit (pkgs) git; }; + git = callPackage ../development/ocaml-modules/git { + git-binary = pkgs.git; + }; git-http = callPackage ../development/ocaml-modules/git-http { }; - git-unix = callPackage ../development/ocaml-modules/git-unix { }; + git-unix = callPackage ../development/ocaml-modules/git-unix { + git-binary = pkgs.git; + }; gmetadom = callPackage ../development/ocaml-modules/gmetadom { }; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 102db43bc32..6520ee88a61 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -11302,6 +11302,22 @@ let }; }; + MathCalcParser = buildPerlPackage { + pname = "Math-Calc-Parser"; + version = "1.005"; + src = fetchurl { + url = "mirror://cpan/authors/id/D/DB/DBOOK/Math-Calc-Parser-1.005.tar.gz"; + sha256 = "afc3eb496ab3a3a301b3437af07e197eb743c06090f0101dacf820302f2b7f75"; + }; + buildInputs = [ TestNeeds ]; + meta = { + homepage = "https://github.com/Grinnz/Math-Calc-Parser"; + description = "Parse and evaluate mathematical expressions"; + license = stdenv.lib.licenses.artistic2; + maintainers = with maintainers; [ sgo ]; + }; + }; + MathCalcUnits = buildPerlPackage { pname = "Math-Calc-Units"; version = "1.07"; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 47e0317a3f9..b2b3f85e716 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1502,6 +1502,9 @@ in { inherit (pkgs) sentencepiece pkgconfig; }; + tokenizers = disabledIf (!isPy3k) + (toPythonModule (callPackage ../development/python-modules/tokenizers { })); + transformers = callPackage ../development/python-modules/transformers { }; transforms3d = callPackage ../development/python-modules/transforms3d { }; @@ -4153,6 +4156,8 @@ in { htmllaundry = callPackage ../development/python-modules/htmllaundry { }; + html-sanitizer = callPackage ../development/python-modules/html-sanitizer { }; + html5lib = callPackage ../development/python-modules/html5lib { }; httmock = callPackage ../development/python-modules/httmock { }; @@ -7238,6 +7243,8 @@ in { suseapi = callPackage ../development/python-modules/suseapi { }; + tensorboardx = callPackage ../development/python-modules/tensorboardx { }; + typed-ast = callPackage ../development/python-modules/typed-ast { }; stripe = callPackage ../development/python-modules/stripe { }; diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index fc317f51ab5..c11858f09c8 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -89,7 +89,6 @@ let meta.description = "Release-critical builds for the Nixpkgs unstable channel"; constituents = [ jobs.tarball - jobs.metrics jobs.manual jobs.lib-tests jobs.stdenv.x86_64-linux