diff options
238 files changed, 3234 insertions, 1780 deletions
diff --git a/doc/builders/images/appimagetools.xml b/doc/builders/images/appimagetools.xml index 37e4251cda2..0767a509a43 100644 --- a/doc/builders/images/appimagetools.xml +++ b/doc/builders/images/appimagetools.xml @@ -80,7 +80,7 @@ appimageTools.wrapType2 { # or wrapType1 <varname>src</varname> specifies the AppImage file to extract. </para> </callout> - <callout arearefs='ex-appimageTools-wrapping-2'> + <callout arearefs='ex-appimageTools-wrapping-3'> <para> <varname>extraPkgs</varname> allows you to pass a function to include additional packages inside the FHS environment your AppImage is going to run in. There are a few ways to learn which dependencies an application needs: <itemizedlist> diff --git a/doc/languages-frameworks/rust.section.md b/doc/languages-frameworks/rust.section.md index 0edf03ad26a..3332dff1eb0 100644 --- a/doc/languages-frameworks/rust.section.md +++ b/doc/languages-frameworks/rust.section.md @@ -16,12 +16,6 @@ cargo into the `environment.systemPackages` or bring them into scope with `nix-shell -p rustc cargo`. -> If you are using NixOS and you want to use rust without a nix expression you -> probably want to add the following in your `configuration.nix` to build -> crates with C dependencies. -> -> environment.systemPackages = [binutils gcc gnumake openssl pkgconfig] - For daily builds (beta and nightly) use either rustup from nixpkgs or use the [Rust nightlies overlay](#using-the-rust-nightlies-overlay). diff --git a/lib/default.nix b/lib/default.nix index 5abafe1b2ac..d2e9f0e8086 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -101,7 +101,7 @@ let inherit (sources) pathType pathIsDirectory cleanSourceFilter cleanSource sourceByRegex sourceFilesBySuffices commitIdFromGitRepo cleanSourceWith pathHasContext - canCleanSource pathIsRegularFile; + canCleanSource pathIsRegularFile pathIsGitRepo; inherit (modules) evalModules unifyModuleSyntax applyIfFunction mergeModules mergeModules' mergeOptionDecls evalOptionValue mergeDefinitions diff --git a/lib/licenses.nix b/lib/licenses.nix index 986b7fa1fdd..e2f94e565ce 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -536,11 +536,6 @@ lib.mapAttrs (n: v: v // { shortName = n; }) { fullName = "University of Illinois/NCSA Open Source License"; }; - notion_lgpl = { - url = "https://raw.githubusercontent.com/raboof/notion/master/LICENSE"; - fullName = "Notion modified LGPL"; - }; - nposl3 = spdx { spdxId = "NPOSL-3.0"; fullName = "Non-Profit Open Software License 3.0"; diff --git a/lib/sources.nix b/lib/sources.nix index a5765c0fda5..05519c3e392 100644 --- a/lib/sources.nix +++ b/lib/sources.nix @@ -105,6 +105,7 @@ rec { in type == "directory" || lib.any (ext: lib.hasSuffix ext base) exts; in cleanSourceWith { inherit filter; src = path; }; + pathIsGitRepo = path: (builtins.tryEval (commitIdFromGitRepo path)).success; # Get the commit id of a git repo # Example: commitIdFromGitRepo <nixpkgs/.git> diff --git a/lib/trivial.nix b/lib/trivial.nix index 940ec1a3d59..a281cd70fb0 100644 --- a/lib/trivial.nix +++ b/lib/trivial.nix @@ -191,7 +191,7 @@ rec { let revisionFile = "${toString ./..}/.git-revision"; gitRepo = "${toString ./..}/.git"; - in if builtins.pathExists gitRepo + in if lib.pathIsGitRepo gitRepo then lib.commitIdFromGitRepo gitRepo else if lib.pathExists revisionFile then lib.fileContents revisionFile else default; diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index fc9c724ad35..bcfc7007b6b 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -40,12 +40,6 @@ See `./scripts/check-maintainer-github-handles.sh` for an example on how to work with this data. */ { - "00-matt" = { - name = "Matt Smith"; - email = "matt@offtopica.uk"; - github = "00-matt"; - githubId = 48835712; - }; "0x4A6F" = { email = "0x4A6F@shackspace.de"; name = "Joachim Ernst"; @@ -517,6 +511,12 @@ githubId = 5327697; name = "Anatolii Prylutskyi"; }; + antoinerg = { + email = "roygobeil.antoine@gmail.com"; + github = "antoinerg"; + githubId = 301546; + name = "Antoine Roy-Gobeil"; + }; anton-dessiatov = { email = "anton.dessiatov@gmail.com"; github = "anton-dessiatov"; @@ -594,6 +594,12 @@ githubId = 1296771; name = "Anders Riutta"; }; + arnoldfarkas = { + email = "arnold.farkas@gmail.com"; + github = "arnoldfarkas"; + githubId = 59696216; + name = "Arnold Farkas"; + }; arobyn = { email = "shados@shados.net"; github = "shados"; diff --git a/nixos/doc/manual/man-nixos-install.xml b/nixos/doc/manual/man-nixos-install.xml index 0752c397182..9255ce763ef 100644 --- a/nixos/doc/manual/man-nixos-install.xml +++ b/nixos/doc/manual/man-nixos-install.xml @@ -210,7 +210,7 @@ The closure must be an appropriately configured NixOS system, with boot loader and partition configuration that fits the target host. Such a closure is typically obtained with a command such as <command>nix-build - -I nixos-config=./configuration.nix '<nixos>' -A system + -I nixos-config=./configuration.nix '<nixpkgs/nixos>' -A system --no-out-link</command> </para> </listitem> diff --git a/nixos/modules/misc/version.nix b/nixos/modules/misc/version.nix index ddbd3963cc5..8a85035ceb7 100644 --- a/nixos/modules/misc/version.nix +++ b/nixos/modules/misc/version.nix @@ -6,6 +6,7 @@ let cfg = config.system.nixos; gitRepo = "${toString pkgs.path}/.git"; + gitRepoValid = lib.pathIsGitRepo gitRepo; gitCommitId = lib.substring 0 7 (commitIdFromGitRepo gitRepo); in @@ -91,8 +92,8 @@ in # These defaults are set here rather than up there so that # changing them would not rebuild the manual version = mkDefault (cfg.release + cfg.versionSuffix); - revision = mkIf (pathExists gitRepo) (mkDefault gitCommitId); - versionSuffix = mkIf (pathExists gitRepo) (mkDefault (".git." + gitCommitId)); + revision = mkIf gitRepoValid (mkDefault gitCommitId); + versionSuffix = mkIf gitRepoValid (mkDefault (".git." + gitCommitId)); }; # Generate /etc/os-release. See diff --git a/nixos/modules/programs/gnupg.nix b/nixos/modules/programs/gnupg.nix index 2d262d90657..7a3cb588ee7 100644 --- a/nixos/modules/programs/gnupg.nix +++ b/nixos/modules/programs/gnupg.nix @@ -96,7 +96,7 @@ in # This overrides the systemd user unit shipped with the gnupg package systemd.user.services.gpg-agent = mkIf (cfg.agent.pinentryFlavor != null) { serviceConfig.ExecStart = [ "" '' - ${pkgs.gnupg}/bin/gpg-agent --supervised \ + ${cfg.package}/bin/gpg-agent --supervised \ --pinentry-program ${pkgs.pinentry.${cfg.agent.pinentryFlavor}}/bin/pinentry '' ]; }; diff --git a/nixos/modules/programs/sway.nix b/nixos/modules/programs/sway.nix index 33e252be45f..7e646f8737d 100644 --- a/nixos/modules/programs/sway.nix +++ b/nixos/modules/programs/sway.nix @@ -87,7 +87,8 @@ in { type = with types; listOf package; default = with pkgs; [ swaylock swayidle - xwayland rxvt_unicode dmenu + xwayland alacritty dmenu + rxvt_unicode # For backward compatibility (old default terminal) ]; defaultText = literalExample '' with pkgs; [ swaylock swayidle xwayland rxvt_unicode dmenu ]; diff --git a/nixos/modules/services/desktops/gnome3/at-spi2-core.nix b/nixos/modules/services/desktops/gnome3/at-spi2-core.nix index cca98c43dc7..8fa108c4f9d 100644 --- a/nixos/modules/services/desktops/gnome3/at-spi2-core.nix +++ b/nixos/modules/services/desktops/gnome3/at-spi2-core.nix @@ -18,6 +18,9 @@ with lib; description = '' Whether to enable at-spi2-core, a service for the Assistive Technologies available on the GNOME platform. + + Enable this if you get the error or warning + <literal>The name org.a11y.Bus was not provided by any .service files</literal>. ''; }; diff --git a/nixos/modules/services/mail/roundcube.nix b/nixos/modules/services/mail/roundcube.nix index 36dda619ad0..0bb0eaedad5 100644 --- a/nixos/modules/services/mail/roundcube.nix +++ b/nixos/modules/services/mail/roundcube.nix @@ -5,6 +5,8 @@ with lib; let cfg = config.services.roundcube; fpm = config.services.phpfpm.pools.roundcube; + localDB = cfg.database.host == "localhost"; + user = cfg.database.username; in { options.services.roundcube = { @@ -44,7 +46,10 @@ in username = mkOption { type = types.str; default = "roundcube"; - description = "Username for the postgresql connection"; + description = '' + Username for the postgresql connection. + If <literal>database.host</literal> is set to <literal>localhost</literal>, a unix user and group of the same name will be created as well. + ''; }; host = mkOption { type = types.str; @@ -58,7 +63,12 @@ in }; password = mkOption { type = types.str; - description = "Password for the postgresql connection"; + description = "Password for the postgresql connection. Do not use: the password will be stored world readable in the store; use <literal>passwordFile</literal> instead."; + default = ""; + }; + passwordFile = mkOption { + type = types.str; + description = "Password file for the postgresql connection. Must be readable by user <literal>nginx</literal>. Ignored if <literal>database.host</literal> is set to <literal>localhost</literal>, as peer authentication will be used."; }; dbname = mkOption { type = types.str; @@ -83,14 +93,22 @@ in }; config = mkIf cfg.enable { + # backward compatibility: if password is set but not passwordFile, make one. + services.roundcube.database.passwordFile = mkIf (!localDB && cfg.database.password != "") (mkDefault ("${pkgs.writeText "roundcube-password" cfg.database.password}")); + warnings = lib.optional (!localDB && cfg.database.password != "") "services.roundcube.database.password is deprecated and insecure; use services.roundcube.database.passwordFile instead"; + environment.etc."roundcube/config.inc.php".text = '' <?php + ${lib.optionalString (!localDB) "$password = file_get_contents('${cfg.database.passwordFile}');"} + $config = array(); - $config['db_dsnw'] = 'pgsql://${cfg.database.username}:${cfg.database.password}@${cfg.database.host}/${cfg.database.dbname}'; + $config['db_dsnw'] = 'pgsql://${cfg.database.username}${lib.optionalString (!localDB) ":' . $password . '"}@${if localDB then "unix(/run/postgresql)" else cfg.database.host}/${cfg.database.dbname}'; $config['log_driver'] = 'syslog'; $config['max_message_size'] = '25M'; $config['plugins'] = [${concatMapStringsSep "," (p: "'${p}'") cfg.plugins}]; + $config['des_key'] = file_get_contents('/var/lib/roundcube/des_key'); + $config['mime_types'] = '${pkgs.nginx}/conf/mime.types'; ${cfg.extraConfig} ''; @@ -116,12 +134,26 @@ in }; }; - services.postgresql = mkIf (cfg.database.host == "localhost") { + services.postgresql = mkIf localDB { enable = true; + ensureDatabases = [ cfg.database.dbname ]; + ensureUsers = [ { + name = cfg.database.username; + ensurePermissions = { + "DATABASE ${cfg.database.username}" = "ALL PRIVILEGES"; + }; + } ]; + }; + + users.users.${user} = mkIf localDB { + group = user; + isSystemUser = true; + createHome = false; }; + users.groups.${user} = mkIf localDB {}; services.phpfpm.pools.roundcube = { - user = "nginx"; + user = if localDB then user else "nginx"; phpOptions = '' error_log = 'stderr' log_errors = on @@ -143,9 +175,7 @@ in }; systemd.services.phpfpm-roundcube.after = [ "roundcube-setup.service" ]; - systemd.services.roundcube-setup = let - pgSuperUser = config.services.postgresql.superUser; - in mkMerge [ + systemd.services.roundcube-setup = mkMerge [ (mkIf (cfg.database.host == "localhost") { requires = [ "postgresql.service" ]; after = [ "postgresql.service" ]; @@ -153,22 +183,31 @@ in }) { wantedBy = [ "multi-user.target" ]; - script = '' - mkdir -p /var/lib/roundcube - if [ ! -f /var/lib/roundcube/db-created ]; then - if [ "${cfg.database.host}" = "localhost" ]; then - ${pkgs.sudo}/bin/sudo -u ${pgSuperUser} psql postgres -c "create role ${cfg.database.username} with login password '${cfg.database.password}'"; - ${pkgs.sudo}/bin/sudo -u ${pgSuperUser} psql postgres -c "create database ${cfg.database.dbname} with owner ${cfg.database.username}"; - fi - PGPASSWORD="${cfg.database.password}" ${pkgs.postgresql}/bin/psql -U ${cfg.database.username} \ - -f ${cfg.package}/SQL/postgres.initial.sql \ - -h ${cfg.database.host} ${cfg.database.dbname} - touch /var/lib/roundcube/db-created + script = let + psql = "${lib.optionalString (!localDB) "PGPASSFILE=${cfg.database.passwordFile}"} ${pkgs.postgresql}/bin/psql ${lib.optionalString (!localDB) "-h ${cfg.database.host} -U ${cfg.database.username} "} ${cfg.database.dbname}"; + in + '' + version="$(${psql} -t <<< "select value from system where name = 'roundcube-version';" || true)" + if ! (grep -E '[a-zA-Z0-9]' <<< "$version"); then + ${psql} -f ${cfg.package}/SQL/postgres.initial.sql + fi + + if [ ! -f /var/lib/roundcube/des_key ]; then + base64 /dev/urandom | head -c 24 > /var/lib/roundcube/des_key; + # we need to log out everyone in case change the des_key + # from the default when upgrading from nixos 19.09 + ${psql} <<< 'TRUNCATE TABLE session;' fi ${pkgs.php}/bin/php ${cfg.package}/bin/update.sh ''; - serviceConfig.Type = "oneshot"; + serviceConfig = { + Type = "oneshot"; + StateDirectory = "roundcube"; + User = if localDB then user else "nginx"; + # so that the des_key is not world readable + StateDirectoryMode = "0700"; + }; } ]; }; diff --git a/nixos/modules/services/networking/knot.nix b/nixos/modules/services/networking/knot.nix index 1cc1dd3f2f6..47364ecb846 100644 --- a/nixos/modules/services/networking/knot.nix +++ b/nixos/modules/services/networking/knot.nix @@ -56,6 +56,7 @@ in { package = mkOption { type = types.package; default = pkgs.knot-dns; + defaultText = "pkgs.knot-dns"; description = '' Which Knot DNS package to use ''; @@ -92,4 +93,3 @@ in { environment.systemPackages = [ knot-cli-wrappers ]; }; } - diff --git a/nixos/modules/services/networking/kresd.nix b/nixos/modules/services/networking/kresd.nix index 5eb50a13ca9..bb941e93e15 100644 --- a/nixos/modules/services/networking/kresd.nix +++ b/nixos/modules/services/networking/kresd.nix @@ -5,12 +5,15 @@ with lib; let cfg = config.services.kresd; - package = pkgs.knot-resolver; + configFile = pkgs.writeText "kresd.conf" '' + ${optionalString (cfg.listenDoH != []) "modules.load('http')"} + ${cfg.extraConfig}; + ''; - configFile = pkgs.writeText "kresd.conf" cfg.extraConfig; -in - -{ + package = pkgs.knot-resolver.override { + extraFeatures = cfg.listenDoH != []; + }; +in { meta.maintainers = [ maintainers.vcunat /* upstream developer */ ]; imports = [ @@ -67,6 +70,15 @@ in For detailed syntax see ListenStream in man systemd.socket. ''; }; + listenDoH = mkOption { + type = with types; listOf str; + default = []; + example = [ "198.51.100.1:443" "[2001:db8::1]:443" "443" ]; + description = '' + Addresses and ports on which kresd should provide DNS over HTTPS (see RFC 7858). + For detailed syntax see ListenStream in man systemd.socket. + ''; + }; # TODO: perhaps options for more common stuff like cache size or forwarding }; @@ -104,6 +116,18 @@ in }; }; + systemd.sockets.kresd-doh = mkIf (cfg.listenDoH != []) rec { + wantedBy = [ "sockets.target" ]; + before = wantedBy; + partOf = [ "kresd.socket" ]; + listenStreams = cfg.listenDoH; + socketConfig = { + FileDescriptorName = "doh"; + FreeBind = true; + Service = "kresd.service"; + }; + }; + systemd.sockets.kresd-control = rec { wantedBy = [ "sockets.target" ]; before = wantedBy; diff --git a/nixos/modules/services/networking/syncthing.nix b/nixos/modules/services/networking/syncthing.nix index 47b10e408c0..5b3eb6f04b4 100644 --- a/nixos/modules/services/networking/syncthing.nix +++ b/nixos/modules/services/networking/syncthing.nix @@ -484,6 +484,24 @@ in { -gui-address=${cfg.guiAddress} \ -home=${cfg.configDir} ''; + MemoryDenyWriteExecute = true; + NoNewPrivileges = true; + PrivateDevices = true; + PrivateMounts = true; + PrivateTmp = true; + PrivateUsers = true; + ProtectControlGroups = true; + ProtectHostname = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + RestrictNamespaces = true; + RestrictRealtime = true; + RestrictSUIDSGID = true; + CapabilityBoundingSet = [ + "~CAP_SYS_PTRACE" "~CAP_SYS_ADMIN" + "~CAP_SETGID" "~CAP_SETUID" "~CAP_SETPCAP" + "~CAP_SYS_TIME" "~CAP_KILL" + ]; }; }; syncthing-init = mkIf ( diff --git a/nixos/modules/services/web-servers/unit/default.nix b/nixos/modules/services/web-servers/unit/default.nix index b0b837cd192..f8a18954fc9 100644 --- a/nixos/modules/services/web-servers/unit/default.nix +++ b/nixos/modules/services/web-servers/unit/default.nix @@ -130,8 +130,10 @@ in { }; users.users = optionalAttrs (cfg.user == "unit") { - unit.group = cfg.group; - isSystemUser = true; + unit = { + group = cfg.group; + isSystemUser = true; + }; }; users.groups = optionalAttrs (cfg.group == "unit") { diff --git a/nixos/modules/system/boot/networkd.nix b/nixos/modules/system/boot/networkd.nix index 3e289a63139..56a9d6b1138 100644 --- a/nixos/modules/system/boot/networkd.nix +++ b/nixos/modules/system/boot/networkd.nix @@ -49,7 +49,7 @@ let (assertValueOneOf "Kind" [ "bond" "bridge" "dummy" "gre" "gretap" "ip6gre" "ip6tnl" "ip6gretap" "ipip" "ipvlan" "macvlan" "macvtap" "sit" "tap" "tun" "veth" "vlan" "vti" "vti6" - "vxlan" "geneve" "vrf" "vcan" "vxcan" "wireguard" "netdevsim" + "vxlan" "geneve" "vrf" "vcan" "vxcan" "wireguard" "netdevsim" "xfrm" ]) (assertByteFormat "MTUBytes") (assertMacAddress "MACAddress") @@ -172,6 +172,14 @@ let (assertValueOneOf "AllSlavesActive" boolValues) ]; + checkXfrm = checkUnitConfig "Xfrm" [ + (assertOnlyFields [ + "InterfaceId" "Independent" + ]) + (assertRange "InterfaceId" 1 4294967295) + (assertValueOneOf "Independent" boolValues) + ]; + checkNetwork = checkUnitConfig "Network" [ (assertOnlyFields [ "Description" "DHCP" "DHCPServer" "LinkLocalAddressing" "IPv4LLRoute" @@ -182,7 +190,7 @@ let "IPv6HopLimit" "IPv4ProxyARP" "IPv6ProxyNDP" "IPv6ProxyNDPAddress" "IPv6PrefixDelegation" "IPv6MTUBytes" "Bridge" "Bond" "VRF" "VLAN" "IPVLAN" "MACVLAN" "VXLAN" "Tunnel" "ActiveSlave" "PrimarySlave" - "ConfigureWithoutCarrier" + "ConfigureWithoutCarrier" "Xfrm" ]) # Note: For DHCP the values both, none, v4, v6 are deprecated (assertValueOneOf "DHCP" ["yes" "no" "ipv4" "ipv6" "both" "none" "v4" "v6"]) @@ -477,6 +485,18 @@ let ''; }; + xfrmConfig = mkOption { + default = {}; + example = { InterfaceId = 1; }; + type = types.addCheck (types.attrsOf unitOption) checkXfrm; + description = '' + Each attribute in this set specifies an option in the + <literal>[Xfrm]</literal> section of the unit. See + <citerefentry><refentrytitle>systemd.netdev</refentrytitle> + <manvolnum>5</manvolnum></citerefentry> for details. + ''; + }; + }; addressOptions = { @@ -712,6 +732,16 @@ let ''; }; + xfrm = mkOption { + default = [ ]; + type = types.listOf types.str; + description = '' + A list of xfrm interfaces to be added to the network section of the + unit. See <citerefentry><refentrytitle>systemd.network</refentrytitle> + <manvolnum>5</manvolnum></citerefentry> for details. + ''; + }; + addresses = mkOption { default = [ ]; type = with types; listOf (submodule addressOptions); @@ -810,6 +840,11 @@ let ${attrsToSection def.bondConfig} ''} + ${optionalString (def.xfrmConfig != { }) '' + [Xfrm] + ${attrsToSection def.xfrmConfig} + + ''} ${optionalString (def.wireguardConfig != { }) '' [WireGuard] ${attrsToSection def.wireguardConfig} @@ -847,6 +882,7 @@ let ${concatStringsSep "\n" (map (s: "MACVLAN=${s}") def.macvlan)} ${concatStringsSep "\n" (map (s: "VXLAN=${s}") def.vxlan)} ${concatStringsSep "\n" (map (s: "Tunnel=${s}") def.tunnel)} + ${concatStringsSep "\n" (map (s: "Xfrm=${s}") def.xfrm)} ${optionalString (def.dhcpConfig != { }) '' [DHCP] diff --git a/nixos/modules/virtualisation/amazon-init.nix b/nixos/modules/virtualisation/amazon-init.nix index 8032b2c6d7c..8c12e0e49bf 100644 --- a/nixos/modules/virtualisation/amazon-init.nix +++ b/nixos/modules/virtualisation/amazon-init.nix @@ -7,8 +7,8 @@ let echo "attempting to fetch configuration from EC2 user data..." export HOME=/root - export PATH=${pkgs.lib.makeBinPath [ config.nix.package pkgs.systemd pkgs.gnugrep pkgs.gnused config.system.build.nixos-rebuild]}:$PATH - export NIX_PATH=/nix/var/nix/profiles/per-user/root/channels/nixos:nixos-config=/etc/nixos/configuration.nix:/nix/var/nix/profiles/per-user/root/channels + export PATH=${pkgs.lib.makeBinPath [ config.nix.package pkgs.systemd pkgs.gnugrep pkgs.git pkgs.gnutar pkgs.gzip pkgs.gnused config.system.build.nixos-rebuild]}:$PATH + export NIX_PATH=nixpkgs=/nix/var/nix/profiles/per-user/root/channels/nixos:nixos-config=/etc/nixos/configuration.nix:/nix/var/nix/profiles/per-user/root/channels userData=/etc/ec2-metadata/user-data @@ -18,9 +18,9 @@ let # that as the channel. if sed '/^\(#\|SSH_HOST_.*\)/d' < "$userData" | grep -q '\S'; then channels="$(grep '^###' "$userData" | sed 's|###\s*||')" - printf "%s" "$channels" | while read channel; do + while IFS= read -r channel; do echo "writing channel: $channel" - done + done < <(printf "%s\n" "$channels") if [[ -n "$channels" ]]; then printf "%s" "$channels" > /root/.nix-channels @@ -48,7 +48,7 @@ in { wantedBy = [ "multi-user.target" ]; after = [ "multi-user.target" ]; requires = [ "network-online.target" ]; - + restartIfChanged = false; unitConfig.X-StopOnRemoval = false; @@ -58,4 +58,3 @@ in { }; }; } - diff --git a/nixos/release.nix b/nixos/release.nix index f40b5fa9bd7..9109f5751eb 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -209,7 +209,8 @@ in rec { hydraJob ((import lib/eval-config.nix { inherit system; modules = - [ versionModule + [ configuration + versionModule ./maintainers/scripts/ec2/amazon-image.nix ]; }).config.system.build.amazonImage) diff --git a/nixos/tests/corerad.nix b/nixos/tests/corerad.nix index 68b698857b4..950c9abc899 100644 --- a/nixos/tests/corerad.nix +++ b/nixos/tests/corerad.nix @@ -18,8 +18,7 @@ import ./make-test-python.nix ( [[interfaces]] name = "eth1" send_advertisements = true - [[interfaces.plugins]] - name = "prefix" + [[interfaces.prefix]] prefix = "::/64" ''; }; diff --git a/pkgs/applications/accessibility/dasher/default.nix b/pkgs/applications/accessibility/dasher/default.nix new file mode 100644 index 00000000000..9e8084e7a87 --- /dev/null +++ b/pkgs/applications/accessibility/dasher/default.nix @@ -0,0 +1,55 @@ +{ stdenv, lib, fetchFromGitHub +, autoreconfHook, pkgconfig, wrapGAppsHook +, glib, gtk3, expat, gnome-doc-utils, which +, at-spi2-core, dbus +, libxslt, libxml2 +, speechSupport ? true, speechd ? null +}: + +assert speechSupport -> speechd != null; + +stdenv.mkDerivation { + pname = "dasher"; + version = "2018-04-03"; + + src = fetchFromGitHub { + owner = "dasher-project"; + repo = "dasher"; + rev = "9ab12462e51d17a38c0ddc7f7ffe1cb5fe83b627"; + sha256 = "1r9xn966nx3pv2bidd6i3pxmprvlw6insnsb38zabmac609h9d9s"; + }; + + prePatch = '' + # tries to invoke git for something, probably fetching the ref + echo "true" > build-aux/mkversion + ''; + + configureFlags = lib.optional (!speechSupport) "--disable-speech"; + + nativeBuildInputs = [ + autoreconfHook + wrapGAppsHook + pkgconfig + # doc generation + gnome-doc-utils + which + libxslt libxml2 + ]; + + buildInputs = [ + glib + gtk3 + expat + # at-spi2 needs dbus to be recognized by pkg-config + at-spi2-core dbus + ] ++ lib.optional speechSupport speechd; + + meta = { + homepage = http://www.inference.org.uk/dasher/; + description = "Information-efficient text-entry interface, driven by natural continuous pointing gestures"; + license = lib.licenses.gpl2; + maintainers = [ lib.maintainers.Profpatsch ]; + platforms = lib.platforms.all; + }; + +} diff --git a/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix b/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix index 0cff19819c0..64ee40e038c 100644 --- a/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix +++ b/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix @@ -2,18 +2,16 @@ bitwig-studio1.overrideAttrs (oldAttrs: rec { name = "bitwig-studio-${version}"; - version = "3.1.1"; + version = "3.1.2"; src = fetchurl { url = "https://downloads.bitwig.com/stable/${version}/bitwig-studio-${version}.deb"; - sha256 = "1mgyyl1mr8hmzn3qdmg77km6sk58hyd0gsqr9jksh0a8p6hj24pk"; + sha256 = "07djn52lz43ls6fa4k1ncz3m1nc5zv2j93hwyavnr66r0hlqy7l9"; }; buildInputs = oldAttrs.buildInputs ++ [ xorg.libXtst ]; - runtimeDependencies = [ - pulseaudio - ]; + runtimeDependencies = [ pulseaudio ]; installPhase = '' ${oldAttrs.installPhase} diff --git a/pkgs/applications/audio/qmmp/default.nix b/pkgs/applications/audio/qmmp/default.nix index 801d32189bf..a941ea485b7 100644 --- a/pkgs/applications/audio/qmmp/default.nix +++ b/pkgs/applications/audio/qmmp/default.nix @@ -29,11 +29,11 @@ # handle that. mkDerivation rec { - name = "qmmp-1.3.5"; + name = "qmmp-1.3.6"; src = fetchurl { url = "http://qmmp.ylsoftware.com/files/${name}.tar.bz2"; - sha256 = "0h7kcqzhfvk610937pwrhizcdgd4n7ncl1vayv6sj3va1x7pv6xm"; + sha256 = "0dihy6v6j1cfx4qgwgajdn8rx6nf8x5srk8yjki9xh1mlcaanhp8"; }; nativeBuildInputs = [ cmake pkgconfig ]; diff --git a/pkgs/applications/audio/rosegarden/default.nix b/pkgs/applications/audio/rosegarden/default.nix index aaceab6dc08..8d8e3e1b6c0 100644 --- a/pkgs/applications/audio/rosegarden/default.nix +++ b/pkgs/applications/audio/rosegarden/default.nix @@ -3,12 +3,12 @@ , liblo, liblrdf, libsamplerate, libsndfile, lirc ? null, qtbase }: stdenv.mkDerivation (rec { - version = "19.06"; + version = "19.12"; pname = "rosegarden"; src = fetchurl { url = "mirror://sourceforge/rosegarden/${pname}-${version}.tar.bz2"; - sha256 = "169qb58v2s8va59hzkih8nqb2aipsqlrbfs8q39ywqa8w5d60gcc"; + sha256 = "1qcaxc6hdzva7kwxxhgl95437fagjbxzv4mihsgpr7y9qk08ppw1"; }; patchPhase = '' diff --git a/pkgs/applications/audio/spotify-tui/default.nix b/pkgs/applications/audio/spotify-tui/default.nix index 973062ecb75..6f8fc541ad7 100644 --- a/pkgs/applications/audio/spotify-tui/default.nix +++ b/pkgs/applications/audio/spotify-tui/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "spotify-tui"; - version = "0.11.0"; + version = "0.12.0"; src = fetchFromGitHub { owner = "Rigellute"; repo = "spotify-tui"; rev = "v${version}"; - sha256 = "1pshwn486msn418dilk57rl9471aas0dif765nx1p9xgkrjpb7wa"; + sha256 = "18ja0a7s6lhz6y8fmpmabv95zkcfazj0qc0dsd9dblfzzjhvmw39"; }; - cargoSha256 = "0020igycgikkbd649hv6xlpn13dij4g7yc43fic9z710p6nsxqaq"; + cargoSha256 = "1364z9jz3mnba3pii5h7imqlwlvbp146pcd5q8w61lsmdr2iyha2"; nativeBuildInputs = [ pkgconfig ] ++ stdenv.lib.optionals stdenv.isLinux [ python3 ]; buildInputs = [ openssl ] diff --git a/pkgs/applications/audio/string-machine/default.nix b/pkgs/applications/audio/string-machine/default.nix new file mode 100644 index 00000000000..67053baa35f --- /dev/null +++ b/pkgs/applications/audio/string-machine/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchFromGitHub, boost, cairo, lv2, pkg-config }: + +stdenv.mkDerivation rec { + pname = "string-machine"; + version = "unstable-2020-01-20"; + + src = fetchFromGitHub { + owner = "jpcima"; + repo = pname; + rev = "188082dd0beb9a3c341035604841c53675fe66c4"; + sha256 = "0l9xrzp3f0hk6h320qh250a0n1nbd6qhjmab21sjmrlb4ngy672v"; + fetchSubmodules = true; + }; + + postPatch = '' + patchShebangs ./dpf/utils/generate-ttl.sh + ''; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ + boost cairo lv2 + ]; + + makeFlags = [ + "PREFIX=$(out)" + ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/jpcima/string-machine"; + description = "Digital model of electronic string ensemble instrument"; + maintainers = [ maintainers.magnetophon ]; + platforms = intersectLists platforms.linux platforms.x86; + license = licenses.boost; + }; +} diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index 219c13f241c..4bea9188579 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -18,9 +18,9 @@ let sha256Hash = "0xpcihr5xxr9l1kv6aflywshs8fww3s7di0g98mz475whhxwzf3q"; }; latestVersion = { # canary & dev - version = "4.0.0.8"; # "Android Studio 4.0 Canary 8" - build = "193.6107147"; - sha256Hash = "0bdibjp52jjlyh0966p9657xxmz1z7vi262v6ss4ywpb7gpaj9qq"; + version = "4.0.0.9"; # "Android Studio 4.0 Canary 9" + build = "193.6137316"; + sha256Hash = "1cgxyqp85z5x2jnjh1qabn2cfiziiwvfr6iggzb531dlhllyfyqw"; }; in { # Attributes are named by their corresponding release channels diff --git a/pkgs/applications/editors/bviplus/default.nix b/pkgs/applications/editors/bviplus/default.nix index 7d70ad14b5d..5fab7fe9da6 100644 --- a/pkgs/applications/editors/bviplus/default.nix +++ b/pkgs/applications/editors/bviplus/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "bviplus"; - version = "0.9.4"; + version = "1.0"; src = fetchurl { url = "mirror://sourceforge/project/bviplus/bviplus/${version}/bviplus-${version}.tgz"; - sha256 = "10x6fbn8v6i0y0m40ja30pwpyqksnn8k2vqd290vxxlvlhzah4zb"; + sha256 = "08q2fdyiirabbsp5qpn3v8jxp4gd85l776w6gqvrbjwqa29a8arg"; }; buildInputs = [ diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index 3286e342744..83dff4a4f29 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -250,12 +250,12 @@ in clion = buildClion rec { name = "clion-${version}"; - version = "2019.3.2"; /* updated by script */ + version = "2019.3.3"; /* 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 = "0aksix22cbbxny68650qxjbbm1fmgbsnp97qix5kl5nx4y4yvlii"; /* updated by script */ + sha256 = "1dvnb6mb8xgrgqzqxm2zirwm77w4pci6ibwsdh6wqpnzpqksh4iw"; /* updated by script */ }; wmClass = "jetbrains-clion"; update-channel = "CLion RELEASE"; # channel's id as in http://www.jetbrains.com/updates/updates.xml @@ -263,12 +263,12 @@ in datagrip = buildDataGrip rec { name = "datagrip-${version}"; - version = "2019.3.1"; /* updated by script */ + version = "2019.3.2"; /* 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 = "1h7va6x625kxc2i22mnya64b1kb4vl5xgjxrv3lqwz725q5hkrxa"; /* updated by script */ + sha256 = "1aypzs5q9zgggxbpaxfd8r5ds0ck31lb00csn62npndqxa3bj7z5"; /* updated by script */ }; wmClass = "jetbrains-datagrip"; update-channel = "DataGrip RELEASE"; @@ -289,12 +289,12 @@ in idea-community = buildIdea rec { name = "idea-community-${version}"; - version = "2019.3.1"; /* updated by script */ + version = "2019.3.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 = "0285jdh350dalvk76ajy57mi1yg1g905cnfhcjlb465bsxaw0z5n"; /* updated by script */ + sha256 = "09vicd2czag07f2f7dy0mmcvz5kryv659m32zm9rlsr4nai1i3y3"; /* updated by script */ }; wmClass = "jetbrains-idea-ce"; update-channel = "IntelliJ IDEA RELEASE"; @@ -302,12 +302,12 @@ in idea-ultimate = buildIdea rec { name = "idea-ultimate-${version}"; - version = "2019.3.1"; /* updated by script */ + version = "2019.3.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 = "0rb726nh2c7zxnpjcf6fyrpl29y9wgr6qhpb6hjxia2gzxab9jz0"; /* updated by script */ + sha256 = "09lgdd7gkx94warjc7wah9w7s9lj81law8clavjjyjas8bhhf1hz"; /* updated by script */ }; wmClass = "jetbrains-idea"; update-channel = "IntelliJ IDEA RELEASE"; @@ -315,12 +315,12 @@ in phpstorm = buildPhpStorm rec { name = "phpstorm-${version}"; - version = "2019.3.1"; /* updated by script */ + version = "2019.3.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 = "170ppd0inn3s1yxd5ybspzgx2il78838z900fpg2pznq2hi0rn2h"; /* updated by script */ + sha256 = "02qnkcri49chbbpx2f338cfs5w2kg1l7zfn6fa7qrla82zpjsqlm"; /* updated by script */ }; wmClass = "jetbrains-phpstorm"; update-channel = "PhpStorm RELEASE"; @@ -328,12 +328,12 @@ in pycharm-community = buildPycharm rec { name = "pycharm-community-${version}"; - version = "2019.3.1"; /* updated by script */ + version = "2019.3.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 = "1cph2v7gaxikrvvdaz7ihk17qgdzrn86jamik9fijb8sjli3695v"; /* updated by script */ + sha256 = "06dzqjsq6jqgv8askzskm0bllzm9i8rzmhkjsv4na2phvdxf6qi2"; /* updated by script */ }; wmClass = "jetbrains-pycharm-ce"; update-channel = "PyCharm RELEASE"; @@ -341,12 +341,12 @@ in pycharm-professional = buildPycharm rec { name = "pycharm-professional-${version}"; - version = "2019.3.1"; /* updated by script */ + version = "2019.3.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 = "1bjijwc5f1is2920b497d395ckswhpxilmxaljb6pjwq4a2k8yzx"; /* updated by script */ + sha256 = "1zp64pnzz2jy232g8fgkqmn34afbhbkkhgyb9z1v1qfb533p39ig"; /* updated by script */ }; wmClass = "jetbrains-pycharm"; update-channel = "PyCharm RELEASE"; @@ -380,12 +380,12 @@ in webstorm = buildWebStorm rec { name = "webstorm-${version}"; - version = "2019.3.1"; /* updated by script */ + version = "2019.3.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 = "0qjqd1a44mdlpvv3l4sx2n5clirwxialzh6s2dlb0dibx8zvnckp"; /* updated by script */ + sha256 = "0mbfkwjqg2d1mkka0vajx41nv4f07y1w7chk6ii7sylaj7ypzi13"; /* updated by script */ }; wmClass = "jetbrains-webstorm"; update-channel = "WebStorm RELEASE"; diff --git a/pkgs/applications/graphics/imgp/default.nix b/pkgs/applications/graphics/imgp/default.nix new file mode 100644 index 00000000000..80420202c05 --- /dev/null +++ b/pkgs/applications/graphics/imgp/default.nix @@ -0,0 +1,38 @@ +{ lib, fetchFromGitHub, buildPythonApplication, pillow, imgp }: + +buildPythonApplication rec { + pname = "imgp"; + version = "2.7"; + + src = fetchFromGitHub { + owner = "jarun"; + repo = pname; + rev = "v${version}"; + sha256 = "13r4fn3dd0nyidfhrr7zzpls5ifbyqdwxhyvpkqr8ahchws7wfc6"; + }; + + propagatedBuildInputs = [ pillow ]; + + installFlags = [ + "DESTDIR=$(out)" + "PREFIX=" + ]; + + postInstall = '' + install -Dm555 auto-completion/bash/imgp-completion.bash $out/share/bash-completion/completions/imgp.bash + install -Dm555 auto-completion/fish/imgp.fish -t $out/share/fish/vendor_completions.d + install -Dm555 auto-completion/zsh/_imgp -t $out/share/zsh/site-functions + ''; + + checkPhase = '' + $out/bin/imgp --help + ''; + + meta = with lib; { + description = "High-performance CLI batch image resizer & rotator"; + homepage = "https://github.com/jarun/imgp"; + license = licenses.gpl3; + platforms = platforms.unix; + maintainers = with maintainers; [ sikmir ]; + }; +} diff --git a/pkgs/applications/graphics/qview/default.nix b/pkgs/applications/graphics/qview/default.nix index 0595ab2963c..8df6ce4f80b 100644 --- a/pkgs/applications/graphics/qview/default.nix +++ b/pkgs/applications/graphics/qview/default.nix @@ -1,12 +1,12 @@ {stdenv, fetchFromGitHub, qmake}: stdenv.mkDerivation rec { pname = "qview"; - version = "2.0"; + version = "3.0"; src = fetchFromGitHub { owner = "jurplel"; repo = "qView"; rev = version; - sha256 = "1s29hz44rb5dwzq8d4i4bfg77dr0v3ywpvidpa6xzg7hnnv3mhi5"; + sha256 = "15a91bs3wcqhgf76wzigbn10hayg628j84pq4j2vaxar94ak0vk7"; }; nativeBuildInputs = [ qmake ]; patchPhase = '' diff --git a/pkgs/applications/graphics/runwayml/default.nix b/pkgs/applications/graphics/runwayml/default.nix index 839a87214e6..c3f747837e0 100644 --- a/pkgs/applications/graphics/runwayml/default.nix +++ b/pkgs/applications/graphics/runwayml/default.nix @@ -6,12 +6,12 @@ let pname = "runwayml"; - version = "0.10.11"; + version = "0.10.20"; name = "${pname}-${version}"; src = fetchurl { url = "https://runway-releases.s3.amazonaws.com/Runway%20${version}.AppImage"; - sha256 = "0f3icgpwj1sk9bkycqw65c8bhrzzpw5yzacw52siv4j1gl4casnl"; + sha256 = "1wi94xi8nrwfc4v2j1crlmwr0nxg95ffp5h4hxd84crvya8ibxgz"; name="${pname}-${version}.AppImage"; }; diff --git a/pkgs/applications/misc/megacmd/default.nix b/pkgs/applications/misc/megacmd/default.nix new file mode 100644 index 00000000000..9fe810e4147 --- /dev/null +++ b/pkgs/applications/misc/megacmd/default.nix @@ -0,0 +1,88 @@ +{ stdenv +, autoconf +, automake +, c-ares +, cryptopp +, curl +, fetchFromGitHub +, ffmpeg +, freeimage +, gcc-unwrapped +, libmediainfo +, libraw +, libsodium +, libtool +, libuv +, libzen +, pcre-cpp +, pkgconfig +, readline +, sqlite +}: + +stdenv.mkDerivation rec { + pname = "megacmd"; + version = "1.1.0"; + + src = fetchFromGitHub { + owner = "meganz"; + repo = "MEGAcmd"; + rev = "${version}_Linux"; + sha256 = "004j8m3xs6slx03g2g6wzr97myl2v3zc09wxnfar5c62a625pd53"; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ + autoconf + automake + libtool + pkgconfig + ]; + + buildInputs = [ + c-ares + cryptopp + curl + ffmpeg + freeimage + gcc-unwrapped + libmediainfo + libraw + libsodium + libtool + libuv + libzen + pcre-cpp + readline + sqlite + ]; + + preConfigure = '' + ./autogen.sh + ''; + + configureFlags = [ + "--disable-curl-checks" + "--disable-examples" + "--with-cares" + "--with-cryptopp" + "--with-curl" + "--with-ffmpeg" + "--with-freeimage" + "--with-libmediainfo" + "--with-libuv" + "--with-libzen" + "--with-pcre" + "--with-readline" + "--with-sodium" + "--with-termcap" + ]; + + meta = with stdenv.lib; { + description = "MEGA Command Line Interactive and Scriptable Application"; + homepage = https://mega.nz/; + license = licenses.unfree; + platforms = [ "i686-linux" "x86_64-linux" ]; + maintainers = [ maintainers.wedens ]; + }; +} diff --git a/pkgs/applications/misc/teleprompter/default.nix b/pkgs/applications/misc/teleprompter/default.nix new file mode 100644 index 00000000000..7cca3afa764 --- /dev/null +++ b/pkgs/applications/misc/teleprompter/default.nix @@ -0,0 +1,42 @@ +{ lib, stdenv, fetchurl, electron, makeDesktopItem, makeWrapper, nodePackages, autoPatchelfHook}: + +stdenv.mkDerivation rec { + pname = "teleprompter"; + version = "2.3.4"; + + src = fetchurl { + url = "mirror://sourceforge/teleprompter-imaginary-films/imaginary-${pname}-${version}-64bit.tar.gz"; + sha256 = "084ml2l3qg46bsazaapyxdx4zavvxp0j4ycsdpdwk3f94g9xb120"; + }; + + dontBuild = true; + dontStrip = true; + + nativeBuildInputs = [ autoPatchelfHook makeWrapper nodePackages.asar ]; + installPhase = '' + mkdir -p $out/bin $out/opt/teleprompter $out/share/applications + asar e resources/app.asar $out/opt/teleprompter/resources/app.asar.unpacked + ln -s ${desktopItem}/share/applications/* $out/share/applications + ''; + + postFixup = '' + makeWrapper ${electron}/bin/electron $out/bin/teleprompter \ + --add-flags "$out/opt/teleprompter/resources/app.asar.unpacked --without-update" + ''; + + desktopItem = makeDesktopItem { + name = "teleprompter"; + exec = "teleprompter"; + type = "Application"; + desktopName = "Teleprompter"; + }; + + meta = with lib; { + description = "The most complete, free, teleprompter app on the web"; + license = [ licenses.gpl3 ]; + homepage = "https://github.com/ImaginarySense/Teleprompter-Core"; + platforms = platforms.linux; + maintainers = with maintainers; [ Scriptkiddi ]; + }; +} + diff --git a/pkgs/applications/networking/browsers/palemoon/default.nix b/pkgs/applications/networking/browsers/palemoon/default.nix index 21dd04610cd..76417d482b5 100644 --- a/pkgs/applications/networking/browsers/palemoon/default.nix +++ b/pkgs/applications/networking/browsers/palemoon/default.nix @@ -13,13 +13,13 @@ let in stdenv.mkDerivation rec { pname = "palemoon"; - version = "28.8.0"; + version = "28.8.1"; src = fetchFromGitHub { owner = "MoonchildProductions"; repo = "UXP"; rev = "PM${version}_Release"; - sha256 = "0swmwall8pyg905jnw6x1b6vcv92zb7ph3zqcymh4ay2liikh8c0"; + sha256 = "055bmfgasxf7azjqry06bbgwx6ryrdc1zrcq8b217b6zb1in037x"; }; desktopItem = makeDesktopItem { diff --git a/pkgs/applications/networking/cluster/kubeless/default.nix b/pkgs/applications/networking/cluster/kubeless/default.nix index aaf183ad666..48540bffb53 100644 --- a/pkgs/applications/networking/cluster/kubeless/default.nix +++ b/pkgs/applications/networking/cluster/kubeless/default.nix @@ -23,7 +23,7 @@ buildGoPackage rec { homepage = "https://kubeless.io"; description = "The Kubernetes Native Serverless Framework"; license = licenses.asl20; - maintainers = with maintainers; [ "00-matt" ]; + maintainers = with maintainers; []; platforms = platforms.unix; }; } diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix index f852c3ac0a3..a5e2b374326 100644 --- a/pkgs/applications/networking/cluster/kubernetes/default.nix +++ b/pkgs/applications/networking/cluster/kubernetes/default.nix @@ -15,13 +15,13 @@ with lib; stdenv.mkDerivation rec { pname = "kubernetes"; - version = "1.16.4"; + version = "1.16.5"; src = fetchFromGitHub { owner = "kubernetes"; repo = "kubernetes"; rev = "v${version}"; - sha256 = "05rpwmzkxhbvckcs7hspy6krdfskd8jnsn9g43fhidjvqhxyh6n3"; + sha256 = "12ks79sjgbd0c97pipid4j3l5fwiimaxa25rvmf2vccdrw4ngx4m"; }; buildInputs = [ removeReferencesTo makeWrapper which go rsync go-bindata ]; diff --git a/pkgs/applications/networking/cluster/terraform-providers/data.nix b/pkgs/applications/networking/cluster/terraform-providers/data.nix index cd37083d935..b78ab3f6dda 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/data.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/data.nix @@ -12,9 +12,9 @@ { owner = "terraform-providers"; repo = "terraform-provider-alicloud"; - rev = "v1.63.0"; - version = "1.63.0"; - sha256 = "0353zsga4ic7rsgnk243v202l4hpy0xlzp95fnbmrz7p5wy2k8js"; + rev = "v1.70.1"; + version = "1.70.1"; + sha256 = "19bhnnw5gh4pqap8y23v57lyk27z7fw1wb4p0faj860kdf2zpq4j"; }; archive = { @@ -44,9 +44,9 @@ { owner = "terraform-providers"; repo = "terraform-provider-aws"; - rev = "v2.41.0"; - version = "2.41.0"; - sha256 = "0i9bh78ihmxj7hjbqzkkj7k6lvr3xdakf8qv0bfckcinwpzwzbxa"; + rev = "v2.45.0"; + version = "2.45.0"; + sha256 = "0416f32wy88zyagnwcf2flh1rh7i118b9h5qn8fwrm3sv43p3blm"; }; azuread = { @@ -60,9 +60,9 @@ { owner = "terraform-providers"; repo = "terraform-provider-azurerm"; - rev = "v1.37.0"; - version = "1.37.0"; - sha256 = "0n0582v8g3np8glyxnpnayps014jxclzrglcxf35wszfz9mspryg"; + rev = "v1.41.0"; + version = "1.41.0"; + sha256 = "0ma291m9d452wavjr3lgyik01r8napmwz91bbnbfzp1j48hhqc4h"; }; azurestack = { @@ -76,9 +76,9 @@ { owner = "terraform-providers"; repo = "terraform-provider-bigip"; - rev = "v1.1.0"; - version = "1.1.0"; - sha256 = "15fmxr1c39xx6ix38nigf8izrqzlmjjr6hvlkf7yhb5z7485nvsg"; + rev = "v1.1.1"; + version = "1.1.1"; + sha256 = "15rx25fbvdmgvg5n0qnq1hyfnr7l4nx8igdb4107g41fp73bxg32"; }; bitbucket = { @@ -108,9 +108,9 @@ { owner = "terraform-providers"; repo = "terraform-provider-circonus"; - rev = "v0.4.0"; - version = "0.4.0"; - sha256 = "0iz7v7gfjgbca47vjnvcv9159kgladkad7cmjw2hpncrn2jjinwg"; + rev = "v0.5.0"; + version = "0.5.0"; + sha256 = "0m6xbmgbismsmxnh79xb9p3mvy9aqdwvmsvifpxsbd73lki232mc"; }; clc = { @@ -124,17 +124,17 @@ { owner = "terraform-providers"; repo = "terraform-provider-cloudflare"; - rev = "v2.1.0"; - version = "2.1.0"; - sha256 = "1ll06p4fz88mr4a51rqgvxykivx9xina6507mflyxaic59xlkdz4"; + rev = "v2.3.0"; + version = "2.3.0"; + sha256 = "031xb0g1g74gc44nadbgrfn59hzjr5q0s98lgxrglsdm5mfgzdfr"; }; cloudscale = { owner = "terraform-providers"; repo = "terraform-provider-cloudscale"; - rev = "v2.1.0"; - version = "2.1.0"; - sha256 = "12vxzhpsivvq343mqkmnwklvnv6dc9h2ah0ixla9svdwjp91xfcd"; + rev = "v2.1.1"; + version = "2.1.1"; + sha256 = "122yi2wbd8mqddkwp2la6vwqw0kw7c9ff5j6y4xqczjg2bwb9mph"; }; cloudstack = { @@ -156,25 +156,25 @@ { owner = "terraform-providers"; repo = "terraform-provider-consul"; - rev = "v2.6.0"; - version = "2.6.0"; - sha256 = "1c7qpgf2vh4crs69alzwwaicsz29b2y72x4xjmfb9dg5cy7gk1i5"; + rev = "v2.6.1"; + version = "2.6.1"; + sha256 = "17lgfanz3by7wfrgqbwbsbxs46mrr8a1iyqkj38qc8xg0m6pg97v"; }; datadog = { owner = "terraform-providers"; repo = "terraform-provider-datadog"; - rev = "v2.5.0"; - version = "2.5.0"; - sha256 = "0l5jix165ghfj72l3mr76d5b5lx5pgr45zimk8lr0fwn79f4bs74"; + rev = "v2.6.0"; + version = "2.6.0"; + sha256 = "05ijf01sxdxrxc3ii68ha8b6x8pz025kfa51i91q42ldhf3kqhsz"; }; digitalocean = { owner = "terraform-providers"; repo = "terraform-provider-digitalocean"; - rev = "v1.11.0"; - version = "1.11.0"; - sha256 = "0s8z0zsfibclx0431fcqbi9yqkhwj4w0rz780z1dwv50xpgnmzql"; + rev = "v1.12.0"; + version = "1.12.0"; + sha256 = "137p8q30pv28h5gfqag0i44dxbc1dbq239gnzbb4hkzgsqgrb9gp"; }; dme = { @@ -228,49 +228,49 @@ { owner = "terraform-providers"; repo = "terraform-provider-fastly"; - rev = "v0.11.0"; - version = "0.11.0"; - sha256 = "0wq8l1lkfpv5nfd04dsjaa9wv09373i6wwnapifx1wncjyhs4jd4"; + rev = "v0.12.1"; + version = "0.12.1"; + sha256 = "1bczp7rdbpmycbky9ijirfix2capw0hjai4c7w5hmm4wda5spwb1"; }; flexibleengine = { owner = "terraform-providers"; repo = "terraform-provider-flexibleengine"; - rev = "v1.9.0"; - version = "1.9.0"; - sha256 = "1y66xy5yqdjdrh3zkw1q7ml5b2rsyy4ayc4m026c4mmh0x1vfk9y"; + rev = "v1.10.0"; + version = "1.10.0"; + sha256 = "1ys1dd7knfk3hic6ph4gi7qsf75s2m5mxkil16p3f9ywvfxpzq8w"; }; github = { owner = "terraform-providers"; repo = "terraform-provider-github"; - rev = "v2.2.1"; - version = "2.2.1"; - sha256 = "1dg5jgd3cdz98wfd71l58wsp949mvs2lrcqh1amgql0s90pwjmvg"; + rev = "v2.3.0"; + version = "2.3.0"; + sha256 = "02fd6rq25ms9lpjqn4n1wy13i2mnl9lvczpgjqlz69yj2aiwyw34"; }; gitlab = { owner = "terraform-providers"; repo = "terraform-provider-gitlab"; - rev = "v2.4.0"; - version = "2.4.0"; - sha256 = "0409n8miva205wkx968ggzmz0y121s99iybsjlkx0gja20x68yxx"; + rev = "v2.5.0"; + version = "2.5.0"; + sha256 = "1g7girhjks6p7rcs82p2zd8clp6kdfn6d1synlmfwiw6d3496fvf"; }; google = { owner = "terraform-providers"; repo = "terraform-provider-google"; - rev = "v2.20.0"; - version = "2.20.0"; - sha256 = "1b19hql244lv74gxdwgqh9955d3zkwj7riaq6kj5ylbj44spcpjy"; + rev = "v3.5.0"; + version = "3.5.0"; + sha256 = "09mlic67940bnq5f8a7magn27k2jm8hvq3z0zh2cv6a9gdpg821i"; }; google-beta = { owner = "terraform-providers"; repo = "terraform-provider-google-beta"; - rev = "v2.20.0"; - version = "2.20.0"; - sha256 = "0zkhyn17kji6yyl5582g5vhqj3rcbin73ym6vn6f0m7sf5yaplky"; + rev = "v3.5.0"; + version = "3.5.0"; + sha256 = "1qkfvvidvb2j76x095vprj2vm272lig38a8rbxsir2kkvkmnzv5l"; }; grafana = { @@ -324,9 +324,9 @@ { owner = "terraform-providers"; repo = "terraform-provider-huaweicloud"; - rev = "v1.10.0"; - version = "1.10.0"; - sha256 = "0aa83y0bzfldijd4jbmhqppc13jdqaax83p75kffwaxw1rmxrana"; + rev = "v1.12.0"; + version = "1.12.0"; + sha256 = "1wcr1d9y6bnwjh6b0a49i566wyn0d8bjnxnpgmd4s6wmr9sc4l0b"; }; icinga2 = { @@ -340,9 +340,9 @@ { owner = "terraform-providers"; repo = "terraform-provider-ignition"; - rev = "v1.2.0"; - version = "1.2.0"; - sha256 = "0dg5xak02rv7h9z07kjqxf55al188ligzq3m6711rlh62zam2cjc"; + rev = "v1.2.1"; + version = "1.2.1"; + sha256 = "0wd29iw0a5w7ykgs9m1mmi0bw5z9dl4z640qyz64x8rlh5hl1wql"; }; influxdb = { @@ -428,9 +428,9 @@ { owner = "terraform-providers"; repo = "terraform-provider-newrelic"; - rev = "v1.8.0"; - version = "1.8.0"; - sha256 = "16fdif6hshdb1aswv22k590rcr3f6b3a9gmg8vc4lbyi6l2dfabd"; + rev = "v1.12.1"; + version = "1.12.1"; + sha256 = "17xdwhiyzfjxirvjwwl5jnan84i3zd930zch8l4jx04946vjzsc5"; }; nomad = { @@ -444,9 +444,9 @@ { owner = "terraform-providers"; repo = "terraform-provider-ns1"; - rev = "v1.6.1"; - version = "1.6.1"; - sha256 = "0zyn165h42p640k1q85x3n8fw1fs9j72z9lnfa8pas89jy2fmi8b"; + rev = "v1.6.4"; + version = "1.6.4"; + sha256 = "08wg5qlqj7id5gfwxckjyx1ypfkiq919vjzq8qsdayg9sr9dpf5i"; }; nsxt = { @@ -476,9 +476,9 @@ { owner = "terraform-providers"; repo = "terraform-provider-oci"; - rev = "v3.54.0-rc1"; - version = "3.54.0-rc1"; - sha256 = "14mfkjjpq4sfw0j4w1mnh37x9kwn76rs1y6cjqq9zb8fnhva6gax"; + rev = "v3.59.0-rc1"; + version = "3.59.0-rc1"; + sha256 = "1pgl95rmxk9h9whbkfgpzpbvvkhnm3223flqk73w673ylgrxss49"; }; oneandone = { @@ -500,25 +500,25 @@ { owner = "terraform-providers"; repo = "terraform-provider-openstack"; - rev = "v1.24.0"; - version = "1.24.0"; - sha256 = "1w82ix6l6ad7q0zl00hys8c4gm27nnk12wm2n8i3prwpjnrar70m"; + rev = "v1.25.0"; + version = "1.25.0"; + sha256 = "1yqc7nhmzlcq48csn23ma3fv6yb6cmkqqrxv63jjg6bxb7nyyqxd"; }; opentelekomcloud = { owner = "terraform-providers"; repo = "terraform-provider-opentelekomcloud"; - rev = "v1.14.0"; - version = "1.14.0"; - sha256 = "1mjb6br8iy76q417lmg04xnv4hkgi2fgdn3qnr3nvlwnnccp230k"; + rev = "v1.15.0"; + version = "1.15.0"; + sha256 = "080lzs40m3vny5bmg4vhsy7qz884c44ysmh325hi6s3v76dv4jxg"; }; opsgenie = { owner = "terraform-providers"; repo = "terraform-provider-opsgenie"; - rev = "v0.2.5"; - version = "0.2.5"; - sha256 = "0brjqnlnxqss285n2g1z006bibbdh5v47g75l5kyhyhhchavccma"; + rev = "v0.2.7"; + version = "0.2.7"; + sha256 = "0yylf5iv1dba9naqys65l5whym3q0bwpn98dwxr0lyj0skr8nz7r"; }; oraclepaas = { @@ -532,17 +532,17 @@ { owner = "terraform-providers"; repo = "terraform-provider-ovh"; - rev = "v0.5.0"; - version = "0.5.0"; - sha256 = "07n8ismxbv0gngh4kibqhr4ndqkrg6gxbpj3zl764rrwp54gwgbw"; + rev = "v0.6.0"; + version = "0.6.0"; + sha256 = "0hj029q9j2751hnay0rh0c8yxgmv2wd6xjwi12gkj6k6rmpgqfdh"; }; packet = { owner = "terraform-providers"; repo = "terraform-provider-packet"; - rev = "v2.7.1"; - version = "2.7.1"; - sha256 = "1hmja9c8ab66yr814psz1zsa4y0nbmd5rcnp3qxdgizp45yrvz3i"; + rev = "v2.7.3"; + version = "2.7.3"; + sha256 = "1dd9fa416crh5y61qyaj2l0jhn1kh0ndkzqdw3lsxjqdhcqppbns"; }; pagerduty = { @@ -556,25 +556,25 @@ { owner = "terraform-providers"; repo = "terraform-provider-panos"; - rev = "v1.6.1"; - version = "1.6.1"; - sha256 = "06hwi426x7ipmn4dbg5dyv9z84sxaa8q1jlcd2l264n9s2y3xhiq"; + rev = "v1.6.2"; + version = "1.6.2"; + sha256 = "1qy6jynv61zhvq16s8jkwjhxz7r65cmk9k37ahh07pbhdx707mz5"; }; postgresql = { owner = "terraform-providers"; repo = "terraform-provider-postgresql"; - rev = "v1.3.0"; - version = "1.3.0"; - sha256 = "14ma5lm6ng52dfl8bl4rmpy8ylnkbvnbskvkr6r5sn28x51p601y"; + rev = "v1.4.0"; + version = "1.4.0"; + sha256 = "162j6dyrbc9r4ipj6igj64wm6r65l4vb0dlwczfhlksix3qzr3kx"; }; powerdns = { owner = "terraform-providers"; repo = "terraform-provider-powerdns"; - rev = "v1.2.0"; - version = "1.2.0"; - sha256 = "1108hq4z4is305hnbkn95gv0f5lx5l27wvxvq0g03fcdqdimkrfn"; + rev = "v1.3.0"; + version = "1.3.0"; + sha256 = "0in8f9vfi9y71qac643lfgapbnxi40cwq9b3l82fl1r8ghg7kgri"; }; profitbricks = { @@ -588,17 +588,17 @@ { owner = "terraform-providers"; repo = "terraform-provider-rabbitmq"; - rev = "v1.1.0"; - version = "1.1.0"; - sha256 = "0xihc44923kx8c3v6wrvczzbhmbjkhy7dhgx3sy5sqhmm22y0gys"; + rev = "v1.2.0"; + version = "1.2.0"; + sha256 = "1lhra8dvfyi6gn4s8mjd3lkkj6bz8y7xjhw1ki2kl5vpfw79d4l9"; }; rancher = { owner = "terraform-providers"; repo = "terraform-provider-rancher"; - rev = "v1.4.0"; - version = "1.4.0"; - sha256 = "106arszmdjmgrz4iv01bbf72jarn7zjqvmc43b6n1s3lzd7jnfpc"; + rev = "v1.5.0"; + version = "1.5.0"; + sha256 = "0yhv9ahj6ajspgnl2f77gpyd6klq44dyl74lvl10bx6yy56abi2m"; }; random = { @@ -636,9 +636,9 @@ { owner = "terraform-providers"; repo = "terraform-provider-scaleway"; - rev = "v1.12.0"; - version = "1.12.0"; - sha256 = "0044fq5jkdx2ryc2bxqajkrngs6z81kd2narg4zxvfn0r1bfswvc"; + rev = "v1.13.0"; + version = "1.13.0"; + sha256 = "085wv59cfsaac2373gn783lknzp4qmgnrgi2yl1g27znm4b940i7"; }; selectel = { @@ -652,9 +652,9 @@ { owner = "terraform-providers"; repo = "terraform-provider-skytap"; - rev = "v0.11.1"; - version = "0.11.1"; - sha256 = "1mlv6jp6lp47chcnsmx8dzy01bxpb9jx1wl122lxd88app9nxq1k"; + rev = "v0.13.0"; + version = "0.13.0"; + sha256 = "1why3ipi5a7whf18z87f97lbzdj020hfp8gxpgzl0nwpzpwkhdz3"; }; softlayer = { @@ -700,9 +700,9 @@ { owner = "terraform-providers"; repo = "terraform-provider-tencentcloud"; - rev = "v1.25.2"; - version = "1.25.2"; - sha256 = "1pf4l9rvkarl4vhf51np4kdqcgs4jhsr5gw7vs6rn8gv97lb40kw"; + rev = "v1.30.1"; + version = "1.30.1"; + sha256 = "0gy7c3w217yzysv9hyrsw3q452g0iba9z72iijyfwcqm79gw3208"; }; terraform = { @@ -716,9 +716,9 @@ { owner = "terraform-providers"; repo = "terraform-provider-tfe"; - rev = "v0.11.1"; - version = "0.11.1"; - sha256 = "0iagddaivpd7cxgf8ha2pk0m66gi4a804s86fsxla0j1knmmyra0"; + rev = "v0.11.4"; + version = "0.11.4"; + sha256 = "0ls5736cwshj3z1wgpbcma6bml9p45k5g7hm530bmqdxsamxfj1m"; }; tls = { @@ -740,9 +740,9 @@ { owner = "terraform-providers"; repo = "terraform-provider-ucloud"; - rev = "v1.14.1"; - version = "1.14.1"; - sha256 = "04vi87q2fhy907l7rwsbq5p6l9vm6avm1hbf9qwddkbxx2kjjf64"; + rev = "v1.15.1"; + version = "1.15.1"; + sha256 = "1djlpjig8y6x149r6f21x7y3p49fjvrxx7pbs2fpsyv437zff9vj"; }; ultradns = { @@ -756,33 +756,33 @@ { owner = "terraform-providers"; repo = "terraform-provider-vault"; - rev = "v2.6.0"; - version = "2.6.0"; - sha256 = "0sw1swy2j9n3ji48sxmj093zzlq7sdmp8ixmz488ps3m4jjyfk6k"; + rev = "v2.7.1"; + version = "2.7.1"; + sha256 = "1lvpgdyi8qk1bvz9i1wml22mmm5ga8kf413xmpj966wvxqsgw6z5"; }; vcd = { owner = "terraform-providers"; repo = "terraform-provider-vcd"; - rev = "v2.5.0"; - version = "2.5.0"; - sha256 = "0h78ij9rkx43i9kdcfy7waa6xyn2j40zgm6im3zp0yswy6vjlcyq"; + rev = "v2.6.0"; + version = "2.6.0"; + sha256 = "0f7c5l05h0xcq51yaqpx1v3lg4wmysszayysvcspipiwzrhx5cmg"; }; vsphere = { owner = "terraform-providers"; repo = "terraform-provider-vsphere"; - rev = "v1.13.0"; - version = "1.13.0"; - sha256 = "10gl042l5mlmklhjjknwln1qcwl65xz8sbg1acyv8xkb6nsaxcf1"; + rev = "v1.15.0"; + version = "1.15.0"; + sha256 = "1hxzxkqphm00gp0d1s32xn0knxgf5vg05nq68ba3q27wpx4ipanl"; }; yandex = { owner = "terraform-providers"; repo = "terraform-provider-yandex"; - rev = "v0.24.0"; - version = "0.24.0"; - sha256 = "0a9isivn3ni0d1id8ww97xbcwrxc0c4pn1m1q21cipqs6mwksq9m"; + rev = "v0.28.0"; + version = "0.28.0"; + sha256 = "1ml96cqjvxzapb76fpblgl6ak15idv3jj5wcs9ix0dr6i2fdfwpc"; }; segment = { diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index b290f3b5f04..5c131948649 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -112,8 +112,8 @@ in rec { terraform_0_11-full = terraform_0_11.full; terraform_0_12 = pluggable (generic { - version = "0.12.19"; - sha256 = "067gzxysz8r2myj3rh0vwrs0pmbgb21jxlmawlf4v0lkjnhj6kwv"; + version = "0.12.20"; + sha256 = "1k94iwhdvp1ifg9w7y26cl89ihki2w9kxv8mz06pp9bnfwfw67x5"; patches = [ ./provider-path.patch ]; passthru = { inherit plugins; }; }); diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix index 73613778365..7879fe5d816 100644 --- a/pkgs/applications/networking/flexget/default.nix +++ b/pkgs/applications/networking/flexget/default.nix @@ -2,11 +2,11 @@ python3Packages.buildPythonApplication rec { pname = "FlexGet"; - version = "3.1.10"; + version = "3.1.11"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "d16c519630350dd1ca867529970b47438950f078e16f9f1d37bc3f027666bda4"; + sha256 = "0ff053e4f9e01334ffb2f4a45590fe0e3e49dd2c21ae19d433c63dcbfe618a01"; }; postPatch = '' diff --git a/pkgs/applications/networking/instant-messengers/chatterino2/default.nix b/pkgs/applications/networking/instant-messengers/chatterino2/default.nix index becf828a856..787d66826ef 100644 --- a/pkgs/applications/networking/instant-messengers/chatterino2/default.nix +++ b/pkgs/applications/networking/instant-messengers/chatterino2/default.nix @@ -1,6 +1,6 @@ -{ stdenv, pkgconfig, fetchFromGitHub, qtbase, qtsvg, qtmultimedia, qmake, boost, openssl }: +{ mkDerivation, lib, pkgconfig, fetchFromGitHub, qtbase, qtsvg, qtmultimedia, qmake, boost, openssl }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "chatterino2"; version = "unstable-2019-05-11"; src = fetchFromGitHub { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ qmake pkgconfig ]; buildInputs = [ qtbase qtsvg qtmultimedia boost openssl ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A chat client for Twitch chat"; longDescription = '' Chatterino is a chat client for Twitch chat. It aims to be an diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index bc41b023627..4358ed8f201 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -1,9 +1,8 @@ -{ stdenv, lib, fetchurl, dpkg, wrapGAppsHook +{ stdenv, lib, fetchurl, autoPatchelfHook, dpkg, wrapGAppsHook , gnome2, gtk3, atk, at-spi2-atk, cairo, pango, gdk-pixbuf, glib, freetype, fontconfig , dbus, libX11, xorg, libXi, libXcursor, libXdamage, libXrandr, libXcomposite , libXext, libXfixes, libXrender, libXtst, libXScrnSaver, nss, nspr, alsaLib , cups, expat, systemd, libnotify, libuuid, at-spi2-core, libappindicator-gtk3 -, autoPatchelfHook # Unfortunately this also overwrites the UI language (not just the spell # checking language!): , hunspellDicts, spellcheckerLanguage ? null # E.g. "de_DE" @@ -24,7 +23,7 @@ let else ""); in stdenv.mkDerivation rec { pname = "signal-desktop"; - version = "1.29.6"; # Please backport all updates to the stable channel. + version = "1.30.0"; # Please backport all updates to the stable channel. # All releases have a limited lifetime and "expire" 90 days after the release. # When releases "expire" the application becomes unusable until an update is # applied. The expiration date for the current release can be extracted with: @@ -34,7 +33,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - sha256 = "1s1rc4kyv0nxz5fy5ia7fflphf3izk80ks71q4wd67k1g9lvcw24"; + sha256 = "1gbvna40sc83s7mwip5281yn4bs0k19fj061y0xzwkvh0yk06x3i"; }; nativeBuildInputs = [ @@ -88,12 +87,20 @@ in stdenv.mkDerivation rec { dontBuild = true; dontConfigure = true; dontPatchELF = true; + # We need to run autoPatchelf manually with the "no-recurse" option, see + # https://github.com/NixOS/nixpkgs/pull/78413 for the reasons. + dontAutoPatchelf = true; installPhase = '' mkdir -p $out/lib mv usr/share $out/share - mv opt/Signal $out/lib + mv opt/Signal $out/lib/Signal + + # Note: The following path contains bundled libraries: + # $out/lib/Signal/resources/app.asar.unpacked/node_modules/sharp/vendor/lib/ + # We run autoPatchelf with the "no-recurse" option to avoid picking those + # up, but resources/app.asar still requires them. # Symlink to bin mkdir -p $out/bin @@ -109,6 +116,8 @@ in stdenv.mkDerivation rec { # Fix the desktop link substituteInPlace $out/share/applications/signal-desktop.desktop \ --replace /opt/Signal/signal-desktop $out/bin/signal-desktop + + autoPatchelf --no-recurse -- $out/lib/Signal/ ''; meta = { diff --git a/pkgs/applications/networking/instant-messengers/spectral/default.nix b/pkgs/applications/networking/instant-messengers/spectral/default.nix index 314a3bb6457..23659e8a6c9 100644 --- a/pkgs/applications/networking/instant-messengers/spectral/default.nix +++ b/pkgs/applications/networking/instant-messengers/spectral/default.nix @@ -7,34 +7,32 @@ , qtgraphicaleffects , qtdeclarative , qtmacextras -, olm, cmark +, olm, libsecret, cmark }: let qtkeychain-qt5 = qtkeychain.override { inherit qtbase qttools; withQt5 = true; }; -in stdenv.mkDerivation { +in stdenv.mkDerivation rec { pname = "spectral"; - version = "unstable-2019-08-30"; + version = "817"; src = fetchgit { - url = "https://gitlab.com/b0/spectral.git"; - rev = "ee86c948aec5fe72979fc6df97f4a6ef711bdf94"; - sha256 = "1mqabdkvzq48wki92wm2r79kj8g8m7ganpl47sh60qfsk4bxa8b2"; + url = "https://gitlab.com/spectral-im/spectral.git"; + rev = version; + sha256 = "0lg0bkz621cmqb67kz1zmn4xwbspcqalz68byll5iszqz9y4gnp1"; fetchSubmodules = true; }; - #qmakeFlags = [ "CONFIG+=qtquickcompiler" "BUNDLE_FONT=true" ]; - nativeBuildInputs = [ pkgconfig cmake wrapQtAppsHook ]; - buildInputs = [ qtbase qtkeychain-qt5 qtquickcontrols2 qtmultimedia qtgraphicaleffects qtdeclarative olm cmark ] + buildInputs = [ qtbase qtkeychain-qt5 qtquickcontrols2 qtmultimedia qtgraphicaleffects qtdeclarative olm libsecret cmark ] ++ stdenv.lib.optional stdenv.hostPlatform.isLinux libpulseaudio ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin qtmacextras; meta = with stdenv.lib; { description = "A glossy cross-platform Matrix client."; - homepage = "https://gitlab.com/b0/spectral"; + homepage = "https://spectral.im"; license = licenses.gpl3; platforms = with platforms; linux ++ darwin; maintainers = with maintainers; [ dtzWill ]; diff --git a/pkgs/applications/networking/instant-messengers/teams/default.nix b/pkgs/applications/networking/instant-messengers/teams/default.nix index 0921dcfccdd..ef7e3717f72 100644 --- a/pkgs/applications/networking/instant-messengers/teams/default.nix +++ b/pkgs/applications/networking/instant-messengers/teams/default.nix @@ -15,11 +15,11 @@ stdenv.mkDerivation rec { pname = "teams"; - version = "1.2.00.32451"; + version = "1.3.00.958"; src = fetchurl { url = "https://packages.microsoft.com/repos/ms-teams/pool/main/t/teams/teams_${version}_amd64.deb"; - sha256 = "1p053kg5qksr78v2h7cxia5mb9kzgfwm6n99x579vfx48kka1n18"; + sha256 = "015awxgbwk4j973jnxj7q3i8csx7wnwpwp5g4jlmn7z8fxwy83d5"; }; nativeBuildInputs = [ dpkg autoPatchelfHook wrapGAppsHook ]; diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index bec2f750526..66dab786b7c 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -18,39 +18,35 @@ with lib; mkDerivation rec { pname = "telegram-desktop"; - version = "1.9.3"; + version = "1.9.7"; # Note: Due to our strong dependency on the Arch patches it's probably best # to also wait for the Arch update (especially if the patches don't apply). # Telegram-Desktop with submodules src = fetchurl { url = "https://github.com/telegramdesktop/tdesktop/releases/download/v${version}/tdesktop-${version}-full.tar.gz"; - sha256 = "1fx7v7j7iw4iywdbl89c5f1y74via61a0k20zrgjv5a0j4v6g76a"; + sha256 = "1hj7bv11alc8cfffy0k3za4missdr44cdmia93xn77w012qjn8a4"; }; # Arch patches (svn export telegram-desktop/trunk) archPatches = fetchsvn { url = "svn://svn.archlinux.org/community/telegram-desktop/trunk"; # svn log svn://svn.archlinux.org/community/telegram-desktop/trunk - rev = "549803"; - sha256 = "1py2a25wgpvx0n4kz383fj0jav1qdm8wqx5bdaygg6296r294czj"; + rev = "554983"; + sha256 = "02gk5dlrmxvyl7w1yxmwclknk1k9drpx6rxqc6vmmw85l763m95j"; }; # Note: It would be best if someone could get as many patches upstream as # possible (we currently depend a lot on custom patches...). patches = [ - "${archPatches}/0001-Dynamic-linking-system-libs.patch" - "${archPatches}/0002-Dynamic-linking-system-qt.patch" - "${archPatches}/0004-gtk3.patch" "${archPatches}/0005-Use-system-wide-fonts.patch" - "${archPatches}/0006-Revert-Disable-DemiBold-fallback-for-Semibold.patch" ]; postPatch = '' substituteInPlace Telegram/SourceFiles/platform/linux/linux_libs.cpp \ --replace '"appindicator3"' '"${libappindicator-gtk3}/lib/libappindicator3.so"' - substituteInPlace cmake/external/ranges/CMakeLists.txt \ - --replace "/usr/include" "${range-v3}/include" + substituteInPlace Telegram/lib_spellcheck/spellcheck/platform/linux/linux_enchant.cpp \ + --replace '"libenchant-2.so.2"' '"${enchant2}/lib/libenchant-2.so.2"' ''; # We want to run wrapProgram manually (with additional parameters) @@ -83,20 +79,38 @@ mkDerivation rec { CPPFLAGS = NIX_CFLAGS_COMPILE; cmakeFlags = [ + "-Ddisable_autoupdate=ON" #"-DTDESKTOP_API_TEST=ON" # TODO: Officiall API credentials for Nixpkgs "-DTDESKTOP_API_ID=17349" # See: https://github.com/NixOS/nixpkgs/issues/55271 "-DTDESKTOP_API_HASH=344583e45741c457fe1862106095a5eb" "-DDESKTOP_APP_USE_GLIBC_WRAPS=OFF" - "-DDESKTOP_APP_USE_SYSTEM_LIBS=ON" + "-DDESKTOP_APP_USE_PACKAGED=ON" + "-DDESKTOP_APP_USE_PACKAGED_RLOTTIE=OFF" "-DDESKTOP_APP_DISABLE_CRASH_REPORTS=ON" - "-Ddisable_autoupdate=ON" "-DTDESKTOP_DISABLE_REGISTER_CUSTOM_SCHEME=ON" "-DTDESKTOP_DISABLE_DESKTOP_FILE_GENERATION=ON" + "-DTDESKTOP_USE_PACKAGED_TGVOIP=OFF" #"-DDESKTOP_APP_SPECIAL_TARGET=\"\"" # TODO: Error when set to "": Bad special target '""' + "-DTDESKTOP_LAUNCHER_BASENAME=telegramdesktop" # Note: This is the default ]; + # Note: The following packages could be packaged system-wide, but it's + # probably best to use the bundled ones from tdesktop (Arch does this too): + # rlottie: + # - CMake flag: "-DTDESKTOP_USE_PACKAGED_TGVOIP=ON" + # - Sources (problem: there are no stable releases!): + # - desktop-app (tdesktop): https://github.com/desktop-app/rlottie + # - upstream: https://github.com/Samsung/rlottie + # libtgvoip: + # - CMake flag: "-DDESKTOP_APP_USE_PACKAGED_RLOTTIE=ON" + # - Sources (problem: the stable releases might be too old!): + # - tdesktop: https://github.com/telegramdesktop/libtgvoip + # - upstream: https://github.com/grishka/libtgvoip + # Both of these packages are included in this PR (kotatogram-desktop): + # https://github.com/NixOS/nixpkgs/pull/75210 + installPhase = '' - install -Dm755 bin/Telegram $out/bin/telegram-desktop + install -Dm755 bin/telegram-desktop $out/bin/telegram-desktop mkdir -p $out/share/{kservices5,applications,metainfo} sed "s,/usr/bin,$out/bin,g" "../lib/xdg/tg.protocol" > "$out/share/kservices5/tg.protocol" @@ -115,7 +129,8 @@ mkDerivation rec { "''${gappsWrapperArgs[@]}" \ "''${qtWrapperArgs[@]}" \ --prefix PATH : ${xdg_utils}/bin \ - --set XDG_RUNTIME_DIR "XDG-RUNTIME-DIR" + --set XDG_RUNTIME_DIR "XDG-RUNTIME-DIR" \ + --unset QT_QPA_PLATFORMTHEME # From the Arch wrapper sed -i $out/bin/telegram-desktop \ -e "s,'XDG-RUNTIME-DIR',\"\''${XDG_RUNTIME_DIR:-/run/user/\$(id --user)}\"," ''; diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix index 972d7c13a28..cc19bbd7156 100644 --- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix +++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix @@ -14,11 +14,11 @@ assert pulseaudioSupport -> libpulseaudio != null; let inherit (stdenv.lib) concatStringsSep makeBinPath optional; - version = "3.5.336627.1216"; + version = "3.5.352596.0119"; srcs = { x86_64-linux = fetchurl { url = "https://zoom.us/client/${version}/zoom_x86_64.tar.xz"; - sha256 = "04r45z2rjjn9gr7bxhfwg49xkyhmpcn5y6pdbkdnrfwzaqzisavz"; + sha256 = "1h8wki0b920k0hcy812w91ara59z4rmfllxx04nbmzsxh0bvsx90"; }; }; diff --git a/pkgs/applications/networking/remote/remmina/default.nix b/pkgs/applications/networking/remote/remmina/default.nix index 6a75f600f1c..de221fce389 100644 --- a/pkgs/applications/networking/remote/remmina/default.nix +++ b/pkgs/applications/networking/remote/remmina/default.nix @@ -13,13 +13,13 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "remmina"; - version = "1.3.9"; + version = "1.3.10"; src = fetchFromGitLab { owner = "Remmina"; repo = "Remmina"; rev = "v${version}"; - sha256 = "1nkfxiajan43cf6yjn3blkv1pi5v7wkvh33gj84q4afvdbxvbcg4"; + sha256 = "0gc7b88129avl9sbax3ncvm7zf2qvq35ixvvpr2zj74g3qnphl08"; }; nativeBuildInputs = [ cmake ninja pkgconfig wrapGAppsHook ]; diff --git a/pkgs/applications/office/kmymoney/default.nix b/pkgs/applications/office/kmymoney/default.nix index c7b4377c3dc..275cd826a69 100644 --- a/pkgs/applications/office/kmymoney/default.nix +++ b/pkgs/applications/office/kmymoney/default.nix @@ -15,11 +15,11 @@ stdenv.mkDerivation rec { pname = "kmymoney"; - version = "5.0.7"; + version = "5.0.8"; src = fetchurl { url = "mirror://kde/stable/kmymoney/${version}/src/${pname}-${version}.tar.xz"; - sha256 = "1h5mzvgpfyl2j66b3nsw17yxvg0ja1qhjlcmfkz62221vcqsrp6m"; + sha256 = "1h6l01a08f1xgk4dfpndl7rmgbp9npm58qi760jwl2gggprwwsxc"; }; # Hidden dependency that wasn't included in CMakeLists.txt: diff --git a/pkgs/applications/radio/flrig/default.nix b/pkgs/applications/radio/flrig/default.nix index 242536a8965..17d579cb45e 100644 --- a/pkgs/applications/radio/flrig/default.nix +++ b/pkgs/applications/radio/flrig/default.nix @@ -6,12 +6,12 @@ }: stdenv.mkDerivation rec { - version = "1.3.48"; + version = "1.3.49"; pname = "flrig"; src = fetchurl { url = "mirror://sourceforge/fldigi/${pname}-${version}.tar.gz"; - sha256 = "0f46rmrr8aphj8fsbfa1bywihigzfzyxq9zg66d1laa7d3jsfs9q"; + sha256 = "0icfniiw2l7d7gyxrzy87n3ragzvf0ykvq7c10ppf111wl5in295"; }; buildInputs = [ diff --git a/pkgs/applications/science/biology/manta/default.nix b/pkgs/applications/science/biology/manta/default.nix new file mode 100644 index 00000000000..f0f0575e055 --- /dev/null +++ b/pkgs/applications/science/biology/manta/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchFromGitHub, cmake, zlib, python2 }: + +stdenv.mkDerivation rec { + pname = "manta"; + version = "1.6.0"; + + src = fetchFromGitHub { + owner = "Illumina"; + repo = "manta"; + rev = "v${version}"; + sha256 = "1711xkcw8rpw9xv3bbm7v1aryjz4r341rkq5255192dg38sgq7w2"; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ zlib python2 ]; + postFixup = '' + sed -i 's|/usr/bin/env python2|${python2.interpreter}|' $out/lib/python/makeRunScript.py + sed -i 's|/usr/bin/env python|${python2.interpreter}|' $out/lib/python/pyflow/pyflow.py + sed -i 's|/bin/bash|${stdenv.shell}|' $out/lib/python/pyflow/pyflowTaskWrapper.py + ''; + doInstallCheck = true; + installCheckPhase = '' + rm $out/lib/python/**/*.pyc + PYTHONPATH=$out/lib/python:$PYTHONPATH python -c 'import makeRunScript' + PYTHONPATH=$out/lib/python/pyflow:$PYTHONPATH python -c 'import pyflowTaskWrapper; import pyflow' + ''; + + meta = with stdenv.lib; { + description = "Structural variant caller"; + license = licenses.gpl3; + homepage = "https://github.com/Illumina/manta"; + maintainers = with maintainers; [ jbedo ]; + platforms = platforms.x86_64; + }; +} diff --git a/pkgs/applications/science/biology/picard-tools/default.nix b/pkgs/applications/science/biology/picard-tools/default.nix index a67653c8437..44247f294aa 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.21.3"; + version = "2.21.6"; src = fetchurl { url = "https://github.com/broadinstitute/picard/releases/download/${version}/picard.jar"; - sha256 = "0s1gn2bkya41866kd8zj0g8xjbivs763jqmlzdpjz4c25h6xkhns"; + sha256 = "1vpyzhrs3bbviwk2n7k5296rnsw7g9ksvjsibl0gm7dawip9jb5s"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index 2e99ca666dc..acfb30cd7c5 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -174,6 +174,8 @@ let svn-all-fast-export = libsForQt5.callPackage ./svn-all-fast-export { }; + thicket = callPackage ./thicket { }; + tig = callPackage ./tig { }; topGit = callPackage ./topgit { }; diff --git a/pkgs/applications/version-management/git-and-tools/thicket/default.nix b/pkgs/applications/version-management/git-and-tools/thicket/default.nix new file mode 100644 index 00000000000..42819043d58 --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/thicket/default.nix @@ -0,0 +1,26 @@ +{ lib +, fetchFromGitHub +, crystal +}: + +crystal.buildCrystalPackage rec { + pname = "thicket"; + version = "0.1.3"; + + src = fetchFromGitHub { + owner = "taylorthurlow"; + repo = pname; + rev = "v${version}"; + sha256 = "0hkmmssiwipx373d0zw9a2yn72gqzqzcvwkqbs522m5adz6qmkzw"; + }; + + shardsFile = ./shards.nix; + crystalBinaries.thicket.src = "src/thicket.cr"; + + meta = with lib; { + description = "A better one-line git log"; + homepage = "https://github.com/taylorthurlow/thicket"; + license = licenses.mit; + maintainers = with maintainers; [ filalex77 ]; + }; +} \ No newline at end of file diff --git a/pkgs/applications/version-management/git-and-tools/thicket/shards.nix b/pkgs/applications/version-management/git-and-tools/thicket/shards.nix new file mode 100644 index 00000000000..c8839651a26 --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/thicket/shards.nix @@ -0,0 +1,8 @@ +{ + ameba = { + owner = "veelenga"; + repo = "ameba"; + rev = "v0.10.0"; + sha256 = "1yjxzwdhigsyjn0qp362jkj85qvg4dsyzal00pgr1srnh2xry912"; + }; +} diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix index 0c103f997b2..380b3d49ca7 100644 --- a/pkgs/applications/video/obs-studio/default.nix +++ b/pkgs/applications/video/obs-studio/default.nix @@ -40,7 +40,7 @@ in mkDerivation rec { version = "24.0.6"; src = fetchFromGitHub { - owner = "jp9000"; + owner = "obsproject"; repo = "obs-studio"; rev = version; sha256 = "07grnab5v4fd4lw25adhnlifs5c5phc3rsz7h80m663nbszy7abh"; diff --git a/pkgs/applications/video/shotcut/0001-encodedock.cpp-connect-to-VAAPI-via-DRM-not-X11.patch b/pkgs/applications/video/shotcut/0001-encodedock.cpp-connect-to-VAAPI-via-DRM-not-X11.patch new file mode 100644 index 00000000000..475788ba3a4 --- /dev/null +++ b/pkgs/applications/video/shotcut/0001-encodedock.cpp-connect-to-VAAPI-via-DRM-not-X11.patch @@ -0,0 +1,33 @@ +From 247baa7e9210bbe5462b6155014c3dcd4a60e56a Mon Sep 17 00:00:00 2001 +From: Peter Simons <simons@cryp.to> +Date: Tue, 24 Sep 2019 10:27:17 +0200 +Subject: [PATCH] encodedock.cpp: connect to VAAPI via DRM, not X11 + +--- + src/docks/encodedock.cpp | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/src/docks/encodedock.cpp b/src/docks/encodedock.cpp +index f2d64fc8..63d20787 100644 +--- a/src/docks/encodedock.cpp ++++ b/src/docks/encodedock.cpp +@@ -766,7 +766,6 @@ Mlt::Properties* EncodeDock::collectProperties(int realtime) + setIfNotSet(p, "pix_fmt", "nv12"); + } else if (vcodec.endsWith("_vaapi")) { + setIfNotSet(p, "vprofile", "main"); +- setIfNotSet(p, "connection_type", "x11"); + } + } + setIfNotSet(p, "width", ui->widthSpinner->value()); +@@ -1890,7 +1889,7 @@ void EncodeDock::on_hwencodeCheckBox_clicked(bool checked) + QStringList args; + args << "-hide_banner" << "-f" << "lavfi" << "-i" << "color=s=640x360" << "-frames" << "1" << "-an"; + if (codec.endsWith("_vaapi")) +- args << "-init_hw_device" << "vaapi=vaapi0:,connection_type=x11" << "-filter_hw_device" << "vaapi0" << "-vf" << "format=nv12,hwupload"; ++ args << "-init_hw_device" << "vaapi=vaapi0" << "-filter_hw_device" << "vaapi0" << "-vf" << "format=nv12,hwupload"; + else if (codec == "hevc_qsv") + args << "-load_plugin" << "hevc_hw"; + args << "-c:v" << codec << "-f" << "rawvideo" << "pipe:"; +-- +2.24.1 + diff --git a/pkgs/applications/video/shotcut/default.nix b/pkgs/applications/video/shotcut/default.nix index 33ce5c18028..6926f7e8eae 100644 --- a/pkgs/applications/video/shotcut/default.nix +++ b/pkgs/applications/video/shotcut/default.nix @@ -17,6 +17,8 @@ mkDerivation rec { sha256 = "1vwgah8pp2kbd0iaz952d3bwxphk06yxqc0pi4hk1mklkh87qzm9"; }; + patches = [ ./0001-encodedock.cpp-connect-to-VAAPI-via-DRM-not-X11.patch ]; + enableParallelBuilding = true; nativeBuildInputs = [ pkgconfig qmake ]; buildInputs = [ diff --git a/pkgs/applications/virtualization/cri-o/default.nix b/pkgs/applications/virtualization/cri-o/default.nix index 483c6f8b337..f6e78f364c2 100644 --- a/pkgs/applications/virtualization/cri-o/default.nix +++ b/pkgs/applications/virtualization/cri-o/default.nix @@ -16,8 +16,7 @@ }: let - makeFlags = "BUILDTAGS=\"apparmor seccomp selinux - containers_image_ostree_stub\""; + buildTags = "apparmor seccomp selinux containers_image_ostree_stub"; in buildGoPackage rec { project = "cri-o"; version = "1.16.1"; @@ -47,7 +46,7 @@ in buildGoPackage rec { # Build the crio binaries function build() { go build \ - -tags ${makeFlags} \ + -tags "${buildTags}" \ -o bin/"$1" \ -buildmode=pie \ -ldflags '-s -w ${ldflags}' \ diff --git a/pkgs/applications/virtualization/crun/default.nix b/pkgs/applications/virtualization/crun/default.nix index 9376adf8d6a..6fc60780ba7 100644 --- a/pkgs/applications/virtualization/crun/default.nix +++ b/pkgs/applications/virtualization/crun/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "crun"; - version = "0.10.6"; + version = "0.11"; src = fetchFromGitHub { owner = "containers"; repo = pname; rev = version; - sha256 = "0v1hrlpnln0c976fb0k2ig4jv11qbyzf95z0wy92fd8r8in16rc1"; + sha256 = "0mn64hrgx4a7mhqjxn127i8yivhn1grp93wws1da1ffj4ap6ay76"; fetchSubmodules = true; }; @@ -19,6 +19,14 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + preBuild = '' + cat > git-version.h <<EOF + #ifndef GIT_VERSION + # define GIT_VERSION "nixpkgs-${version}" + #endif + EOF + ''; + # the tests require additional permissions doCheck = false; diff --git a/pkgs/applications/virtualization/podman/default.nix b/pkgs/applications/virtualization/podman/default.nix index 607d790247f..dbd05e38d3f 100644 --- a/pkgs/applications/virtualization/podman/default.nix +++ b/pkgs/applications/virtualization/podman/default.nix @@ -20,12 +20,14 @@ buildGoPackage rec { nativeBuildInputs = [ pkgconfig go-md2man installShellFiles ]; - buildInputs = [ btrfs-progs libseccomp gpgme lvm2 systemd ]; + buildInputs = stdenv.lib.optionals stdenv.isLinux [ btrfs-progs libseccomp gpgme lvm2 systemd ]; buildPhase = '' - pushd $NIX_BUILD_TOP/go/src/${goPackagePath} + pushd go/src/${goPackagePath} patchShebangs . - make binaries docs + ${if stdenv.isDarwin + then "make CGO_ENABLED=0 BUILDTAGS='remoteclient containers_image_openpgp exclude_graphdriver_devicemapper' varlink_generate all" + else "make binaries docs"} ''; installPhase = '' @@ -39,7 +41,7 @@ buildGoPackage rec { homepage = https://podman.io/; description = "A program for managing pods, containers and container images"; license = licenses.asl20; - maintainers = with maintainers; [ vdemeester saschagrunert ]; - platforms = platforms.linux; + maintainers = with maintainers; [ vdemeester saschagrunert marsam ]; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/virtualization/runc/default.nix b/pkgs/applications/virtualization/runc/default.nix index 48bd81f383a..e7713d45f2f 100644 --- a/pkgs/applications/virtualization/runc/default.nix +++ b/pkgs/applications/virtualization/runc/default.nix @@ -5,13 +5,13 @@ with lib; buildGoPackage rec { pname = "runc"; - version = "1.0.0-rc9"; + version = "1.0.0-rc10"; src = fetchFromGitHub { owner = "opencontainers"; repo = "runc"; rev = "v${version}"; - sha256 = "1ss5b46cbbckyqlwgj8dbd5l59c5y0kp679hcpc0ybaj53pmwxj7"; + sha256 = "0pi3rvj585997m4z9ljkxz2z9yxf9p2jr0pmqbqrc7bc95f5hagk"; }; goPackagePath = "github.com/opencontainers/runc"; diff --git a/pkgs/applications/window-managers/cage/default.nix b/pkgs/applications/window-managers/cage/default.nix index ce4031b92f5..fe5e9c4e2e3 100644 --- a/pkgs/applications/window-managers/cage/default.nix +++ b/pkgs/applications/window-managers/cage/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub +{ stdenv, fetchFromGitHub, fetchpatch , meson, ninja, pkgconfig, makeWrapper , wlroots, wayland, wayland-protocols, pixman, libxkbcommon , systemd, libGL, libX11 @@ -6,14 +6,20 @@ }: stdenv.mkDerivation rec { - pname = "cage"; - version = "0.1.1"; + pname = "cage-unstable"; + version = "2020-01-18"; + # The last stable release (0.1.1) would require at least the following 3 patches: + # - https://github.com/Hjdskes/cage/commit/33bb3c818c5971777b6f09d8821e7f078d38d262.patch + # - https://github.com/Hjdskes/cage/commit/51e6c760da51e2b885737d61a61cdc965bb9269d.patch + # - https://github.com/Hjdskes/cage/commit/84216ca2a417b237ad61c11e2f3ebbcb91681ece.patch + # Which need to be adapted due to other changes. At this point it seems + # better to use the current master version until the next stable release. src = fetchFromGitHub { owner = "Hjdskes"; - repo = pname; - rev = "v${version}"; - sha256 = "1vp4mfkflrjmlgyx5mkbzdi3iq58m76q7l9dfrsk85xn0642d6q1"; + repo = "cage"; + rev = "cc1f975c442ebd691b70196d76aa120ead717810"; + sha256 = "1gkqx26pvlw00b3fgx6sh87yyjfzyj51jwxvbf9k117npkrf4b2g"; }; nativeBuildInputs = [ meson ninja pkgconfig makeWrapper ]; diff --git a/pkgs/applications/window-managers/notion/default.nix b/pkgs/applications/window-managers/notion/default.nix index 60900bd2a3c..2b9e8237a04 100644 --- a/pkgs/applications/window-managers/notion/default.nix +++ b/pkgs/applications/window-managers/notion/default.nix @@ -1,45 +1,39 @@ -{ - enableXft ? true, libXft ? null, patches ? [], stdenv, lua, gettext, pkgconfig, xlibsWrapper, libXinerama, libXrandr, libX11, - xterm, xmessage, makeWrapper, fetchFromGitHub, mandoc, which +{ stdenv, fetchFromGitHub, pkgconfig +, lua, gettext, which, groff, xmessage, xterm +, readline, fontconfig, libX11, libXext, libSM +, libXinerama, libXrandr, libXft +, xlibsWrapper, makeWrapper }: -assert enableXft -> libXft != null; - -let +stdenv.mkDerivation rec{ pname = "notion"; - version = "3-2017050501"; - inherit patches; -in -stdenv.mkDerivation { - name = "${pname}-${version}"; - meta = with stdenv.lib; { - description = "Tiling tabbed window manager, follow-on to the ion window manager"; - homepage = http://notion.sourceforge.net; - platforms = platforms.linux; - license = licenses.notion_lgpl; - maintainers = with maintainers; [jfb]; - }; + version = "3-2019050101"; + src = fetchFromGitHub { owner = "raboof"; repo = pname; rev = version; - sha256 = "1wq5ylpsw5lkbm3c2bzmx2ajlngwib30adxlqbvq4bgkaf9zjh65"; + sha256 = "09kvgqyw0gnj3jhz9gmwq81ak8qy32vyanx1hw79r6m181aysspz"; }; - patches = patches; - postPatch = '' - substituteInPlace system-autodetect.mk --replace '#PRELOAD_MODULES=1' 'PRELOAD_MODULES=1' - substituteInPlace man/Makefile --replace "nroff -man -Tlatin1" "${mandoc}/bin/mandoc -T man" - ''; + nativeBuildInputs = [ pkgconfig makeWrapper groff ]; + buildInputs = [ lua gettext which readline fontconfig libX11 libXext libSM + libXinerama libXrandr libXft xlibsWrapper ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [makeWrapper xlibsWrapper lua gettext mandoc which libXinerama libXrandr libX11 ] ++ stdenv.lib.optional enableXft libXft; + buildFlags = [ "CC=cc" "LUA_DIR=${lua}" "X11_PREFIX=/no-such-path" ]; - buildFlags = [ "LUA_DIR=${lua}" "X11_PREFIX=/no-such-path" "PREFIX=\${out}" ]; - installFlags = [ "PREFIX=\${out}" ]; + makeFlags = [ "PREFIX=\${out}" ]; postInstall = '' wrapProgram $out/bin/notion \ --prefix PATH ":" "${xmessage}/bin:${xterm}/bin" \ ''; + + meta = with stdenv.lib; { + description = "Tiling tabbed window manager, follow-on to the Ion"; + homepage = "https://notionwm.net/"; + license = licenses.lgpl21; + maintainers = with maintainers; [ jfb AndersonTorres ]; + platforms = platforms.linux; + }; } diff --git a/pkgs/applications/window-managers/notion/notion-xft_nixos.diff b/pkgs/applications/window-managers/notion/notion-xft_nixos.diff deleted file mode 100644 index 542aa446c3f..00000000000 --- a/pkgs/applications/window-managers/notion/notion-xft_nixos.diff +++ /dev/null @@ -1,662 +0,0 @@ -diff -ur notion-3-2015061300/de/brush.c notion-3-2015061300-PATCHED/de/brush.c ---- notion-3-2015061300/de/brush.c 2015-06-13 10:37:26.000000000 -0400 -+++ notion-3-2015061300-PATCHED/de/brush.c 2015-07-13 10:37:23.093298917 -0400 -@@ -48,6 +48,9 @@ - - gr_stylespec_init(&brush->current_attr); - -+#ifdef XFT -+ brush->draw=NULL; -+#endif /* XFT */ - style->usecount++; - - if(!grbrush_init(&(brush->grbrush))){ -@@ -128,6 +131,10 @@ - { - destyle_unref(brush->d); - brush->d=NULL; -+#ifdef XFT -+ if(brush->draw!=NULL) -+ XftDrawDestroy(brush->draw); -+#endif /* XFT */ - gr_stylespec_unalloc(&brush->current_attr); - grbrush_deinit(&(brush->grbrush)); - } -@@ -139,6 +146,21 @@ - } - - -+#ifdef XFT -+XftDraw *debrush_get_draw(DEBrush *brush, Drawable d) -+{ -+ if(brush->draw==NULL) -+ brush->draw=XftDrawCreate(ioncore_g.dpy, d, -+ XftDEDefaultVisual(), -+ DefaultColormap(ioncore_g.dpy, -+ 0)); -+ else -+ XftDrawChange(brush->draw, d); -+ -+ return brush->draw; -+} -+#endif -+ - /*}}}*/ - - -diff -ur notion-3-2015061300/de/brush.h notion-3-2015061300-PATCHED/de/brush.h ---- notion-3-2015061300/de/brush.h 2015-06-13 10:37:26.000000000 -0400 -+++ notion-3-2015061300-PATCHED/de/brush.h 2015-07-13 10:37:23.096298747 -0400 -@@ -15,6 +15,10 @@ - #include <ioncore/gr.h> - #include <ioncore/rectangle.h> - -+#ifdef XFT -+#include <X11/Xft/Xft.h> -+#endif /* XFT */ -+ - INTRCLASS(DEBrush); - - #include "style.h" -@@ -33,6 +37,9 @@ - DECLCLASS(DEBrush){ - GrBrush grbrush; - DEStyle *d; -+#ifdef XFT -+ XftDraw *draw; -+#endif - DEBrushExtrasFn *extras_fn; - int indicator_w; - Window win; -@@ -108,5 +115,8 @@ - extern void debrush_fill_area(DEBrush *brush, const WRectangle *geom); - extern void debrush_clear_area(DEBrush *brush, const WRectangle *geom); - -+#ifdef XFT -+XftDraw *debrush_get_draw(DEBrush *brush, Drawable d); -+#endif - - #endif /* ION_DE_BRUSH_H */ -diff -ur notion-3-2015061300/de/colour.c notion-3-2015061300-PATCHED/de/colour.c ---- notion-3-2015061300/de/colour.c 2015-06-13 10:37:26.000000000 -0400 -+++ notion-3-2015061300-PATCHED/de/colour.c 2015-07-13 10:37:23.098298633 -0400 -@@ -12,9 +12,21 @@ - - bool de_alloc_colour(WRootWin *rootwin, DEColour *ret, const char *name) - { -+#ifndef XFT - XColor c; - bool ok=FALSE; -+#else /* XFT */ -+ if(name==NULL) -+ return FALSE; -+ return XftColorAllocName( -+ ioncore_g.dpy, -+ XftDEDefaultVisual(), -+ rootwin->default_cmap, -+ name, -+ ret); -+#endif /* XFT */ - -+#ifndef XFT - if(name==NULL) - return FALSE; - -@@ -25,11 +37,13 @@ - } - - return ok; -+#endif /* ! XFT */ - } - - - bool de_duplicate_colour(WRootWin *rootwin, DEColour in, DEColour *out) - { -+#ifndef XFT - XColor c; - c.pixel=in; - XQueryColor(ioncore_g.dpy, rootwin->default_cmap, &c); -@@ -38,11 +52,20 @@ - return TRUE; - } - return FALSE; -+#else /* XFT */ -+ return XftColorAllocName( -+ ioncore_g.dpy, -+ XftDEDefaultVisual(), -+ rootwin->default_cmap, -+ &(in.color), -+ out); -+#endif /* XFT */ - } - - - void de_free_colour_group(WRootWin *rootwin, DEColourGroup *cg) - { -+#ifndef XFT - DEColour pixels[5]; - - pixels[0]=cg->bg; -@@ -54,15 +77,26 @@ - XFreeColors(ioncore_g.dpy, rootwin->default_cmap, pixels, 5, 0); - - gr_stylespec_unalloc(&cg->spec); -+#else /* XFT */ -+ de_free_colour(rootwin, cg->bg); -+ de_free_colour(rootwin, cg->fg); -+ de_free_colour(rootwin, cg->hl); -+ de_free_colour(rootwin, cg->sh); -+ de_free_colour(rootwin, cg->pad); -+#endif /* XFT */ - } - - - void de_free_colour(WRootWin *rootwin, DEColour col) - { -+#ifndef XFT - DEColour pixels[1]; - - pixels[0]=col; - - XFreeColors(ioncore_g.dpy, rootwin->default_cmap, pixels, 1, 0); -+#else /* XFT */ -+ XftColorFree(ioncore_g.dpy, XftDEDefaultVisual(), rootwin->default_cmap, &col); -+#endif /* XFT */ - } - -diff -ur notion-3-2015061300/de/colour.h notion-3-2015061300-PATCHED/de/colour.h ---- notion-3-2015061300/de/colour.h 2015-06-13 10:37:26.000000000 -0400 -+++ notion-3-2015061300-PATCHED/de/colour.h 2015-07-13 10:37:23.099298576 -0400 -@@ -12,12 +12,19 @@ - #include <ioncore/common.h> - #include <ioncore/global.h> - #include <ioncore/rootwin.h> -+#ifdef XFT -+#include <X11/Xft/Xft.h> -+#endif /* XFT */ - - - INTRSTRUCT(DEColourGroup); - - -+#ifndef XFT - typedef unsigned long DEColour; -+#else /* XFT */ -+typedef XftColor DEColour; -+#endif /* XFT */ - - - DECLSTRUCT(DEColourGroup){ -@@ -34,5 +41,6 @@ - bool de_duplicate_colour(WRootWin *rootwin, DEColour in, DEColour *out); - void de_free_colour_group(WRootWin *rootwin, DEColourGroup *cg); - void de_free_colour(WRootWin *rootwin, DEColour col); -+#define XftDEDefaultVisual() DefaultVisual(ioncore_g.dpy, 0) - - #endif /* ION_DE_COLOUR_H */ -diff -ur notion-3-2015061300/de/draw.c notion-3-2015061300-PATCHED/de/draw.c ---- notion-3-2015061300/de/draw.c 2015-06-13 10:37:26.000000000 -0400 -+++ notion-3-2015061300-PATCHED/de/draw.c 2015-07-13 10:37:23.109298008 -0400 -@@ -20,6 +20,14 @@ - #include <X11/extensions/shape.h> - - -+#ifndef XFT -+#define PIXEL(x) x -+#else /* XFT */ -+#define PIXEL(x) x.pixel -+#endif /* XFT */ -+ -+ -+ - /*{{{ Colour group lookup */ - - -@@ -84,8 +92,7 @@ - w--; - h--; - -- XSetForeground(ioncore_g.dpy, gc, tlc); -- -+ XSetForeground(ioncore_g.dpy, gc, PIXEL(tlc)); - - a=(br!=0); - b=0; -@@ -104,7 +111,7 @@ - } - - -- XSetForeground(ioncore_g.dpy, gc, brc); -+ XSetForeground(ioncore_g.dpy, gc, PIXEL(brc)); - - a=(tl!=0); - b=0; -@@ -141,23 +148,23 @@ - GrBorderLine line) - { - if(line==GR_BORDERLINE_LEFT && geom->h>0 && tl>0){ -- XSetForeground(ioncore_g.dpy, gc, tlc); -- XSetBackground(ioncore_g.dpy, gc, tlc); -+ XSetForeground(ioncore_g.dpy, gc, PIXEL(tlc)); -+ XSetBackground(ioncore_g.dpy, gc, PIXEL(tlc)); - XFillRectangle(ioncore_g.dpy, win, gc, geom->x, geom->y, tl, geom->h); - geom->x+=tl; - }else if(line==GR_BORDERLINE_TOP && geom->w>0 && tl>0){ -- XSetForeground(ioncore_g.dpy, gc, tlc); -- XSetBackground(ioncore_g.dpy, gc, tlc); -+ XSetForeground(ioncore_g.dpy, gc, PIXEL(tlc)); -+ XSetBackground(ioncore_g.dpy, gc, PIXEL(tlc)); - XFillRectangle(ioncore_g.dpy, win, gc, geom->x, geom->y, geom->w, tl); - geom->y+=tl; - }else if(line==GR_BORDERLINE_RIGHT && geom->h>0 && br>0){ -- XSetForeground(ioncore_g.dpy, gc, brc); -- XSetBackground(ioncore_g.dpy, gc, brc); -+ XSetForeground(ioncore_g.dpy, gc, PIXEL(brc)); -+ XSetBackground(ioncore_g.dpy, gc, PIXEL(brc)); - XFillRectangle(ioncore_g.dpy, win, gc, geom->x+geom->w-br, geom->y, br, geom->h); - geom->w-=br; - }else if(line==GR_BORDERLINE_BOTTOM && geom->w>0 && br>0){ -- XSetForeground(ioncore_g.dpy, gc, brc); -- XSetBackground(ioncore_g.dpy, gc, brc); -+ XSetForeground(ioncore_g.dpy, gc, PIXEL(brc)); -+ XSetBackground(ioncore_g.dpy, gc, PIXEL(brc)); - XFillRectangle(ioncore_g.dpy, win, gc, geom->x, geom->y+geom->h-br, geom->w, br); - geom->h-=br; - } -@@ -388,7 +395,7 @@ - } - - if(ISSET(a2, GR_ATTR(tagged)) || ISSET(a1, GR_ATTR(tagged))){ -- XSetForeground(ioncore_g.dpy, d->copy_gc, cg->fg); -+ XSetForeground(ioncore_g.dpy, d->copy_gc, PIXEL(cg->fg)); - - copy_masked(brush, d->tag_pixmap, brush->win, 0, 0, - d->tag_pixmap_w, d->tag_pixmap_h, -@@ -437,7 +444,7 @@ - GC gc=brush->d->normal_gc; - - if(TRUE/*needfill*/){ -- XSetForeground(ioncore_g.dpy, gc, cg->bg); -+ XSetForeground(ioncore_g.dpy, gc, PIXEL(cg->bg)); - XFillRectangle(ioncore_g.dpy, brush->win, gc, geom->x, geom->y, - geom->w, geom->h); - } -@@ -605,7 +612,7 @@ - attr.background_pixmap=ParentRelative; - }else{ - attrflags=CWBackPixel; -- attr.background_pixel=brush->d->cgrp.bg; -+ attr.background_pixel=brush->d->PIXEL(cgrp.bg); - } - - XChangeWindowAttributes(ioncore_g.dpy, brush->win, attrflags, &attr); -@@ -621,7 +628,7 @@ - if(cg==NULL) - return; - -- XSetForeground(ioncore_g.dpy, gc, cg->bg); -+ XSetForeground(ioncore_g.dpy, gc, PIXEL(cg->bg)); - XFillRectangle(ioncore_g.dpy, brush->win, gc, - geom->x, geom->y, geom->w, geom->h); - } -diff -ur notion-3-2015061300/de/font.c notion-3-2015061300-PATCHED/de/font.c ---- notion-3-2015061300/de/font.c 2015-06-13 10:37:26.000000000 -0400 -+++ notion-3-2015061300-PATCHED/de/font.c 2015-07-13 10:37:23.118297497 -0400 -@@ -13,7 +13,9 @@ - #include <ioncore/common.h> - #include <ioncore/log.h> - #include "font.h" -+#ifndef XFT - #include "fontset.h" -+#endif /* ! XFT */ - #include "brush.h" - #include "precompose.h" - -@@ -106,6 +108,9 @@ - - DEFont *de_load_font(const char *fontname) - { -+#ifdef XFT -+ XftFont *font; -+#endif - DEFont *fnt; - XFontSet fontset=NULL; - XFontStruct *fontstruct=NULL; -@@ -120,7 +125,8 @@ - return fnt; - } - } -- -+ -+#ifndef XFT - if(ioncore_g.use_mb && !(ioncore_g.enc_utf8 && iso10646_font(fontname))){ - LOG(DEBUG, FONT, "Loading fontset %s", fontname); - fontset=de_create_font_set(fontname); -@@ -149,13 +155,34 @@ - return NULL; - } - -+#else /* XFT */ -+ if(strncmp(fontname, "xft:", 4)==0){ -+ font=XftFontOpenName(ioncore_g.dpy, DefaultScreen(ioncore_g.dpy), -+ fontname+4); -+ }else{ -+ font=XftFontOpenXlfd(ioncore_g.dpy, DefaultScreen(ioncore_g.dpy), fontname); -+ } -+ -+ if(font==NULL){ -+ if(strcmp(fontname, CF_FALLBACK_FONT_NAME)!=0){ -+ warn(TR("Could not load font \"%s\", trying \"%s\""), -+ fontname, CF_FALLBACK_FONT_NAME); -+ return de_load_font(CF_FALLBACK_FONT_NAME); -+ } -+ return NULL; -+ } -+#endif /* XFT */ - fnt=ALLOC(DEFont); - - if(fnt==NULL) - return NULL; - -+#ifndef XFT - fnt->fontset=fontset; - fnt->fontstruct=fontstruct; -+#else -+ fnt->font=font; -+#endif - fnt->pattern=scopy(fontname); - fnt->next=NULL; - fnt->prev=NULL; -@@ -175,11 +202,13 @@ - style->font=font; - font->refcount++; - -+#ifndef XFT - if(style->font->fontstruct!=NULL){ - XSetFont(ioncore_g.dpy, style->normal_gc, - style->font->fontstruct->fid); - } - -+#endif /* ! XFT */ - return TRUE; - } - -@@ -194,11 +223,13 @@ - if(style->font==NULL) - return FALSE; - -+#ifndef XFT - if(style->font->fontstruct!=NULL){ - XSetFont(ioncore_g.dpy, style->normal_gc, - style->font->fontstruct->fid); - } - -+#endif /* ! XFT */ - return TRUE; - } - -@@ -208,10 +239,15 @@ - if(--font->refcount!=0) - return; - -+#ifndef XFT - if(font->fontset!=NULL) - XFreeFontSet(ioncore_g.dpy, font->fontset); - if(font->fontstruct!=NULL) - XFreeFont(ioncore_g.dpy, font->fontstruct); -+#else /* XFT */ -+ if(font->font!=NULL) -+ XftFontClose(ioncore_g.dpy, font->font); -+#endif /* XFT */ - if(font->pattern!=NULL) - free(font->pattern); - -@@ -239,6 +275,7 @@ - - void defont_get_font_extents(DEFont *font, GrFontExtents *fnte) - { -+#ifndef XFT - if(font->fontset!=NULL){ - XFontSetExtents *ext=XExtentsOfFontSet(font->fontset); - if(ext==NULL) -@@ -254,7 +291,14 @@ - fnte->baseline=fnt->ascent; - return; - } -- -+#else /* XFT */ -+ if(font->font!=NULL){ -+ fnte->max_height=font->font->ascent+font->font->descent; -+ fnte->max_width=font->font->max_advance_width; -+ fnte->baseline=font->font->ascent; -+ return; -+ } -+#endif /* XFT */ - fail: - DE_RESET_FONT_EXTENTS(fnte); - } -@@ -271,6 +315,7 @@ - - uint defont_get_text_width(DEFont *font, const char *text, uint len) - { -+#ifndef XFT - if(font->fontset!=NULL){ - XRectangle lext; - #ifdef CF_DE_USE_XUTF8 -@@ -298,6 +343,18 @@ - }else{ - return 0; - } -+#else /* XFT */ -+ if(font->font!=NULL){ -+ XGlyphInfo extents; -+ if(ioncore_g.enc_utf8) -+ XftTextExtentsUtf8(ioncore_g.dpy, font->font, (XftChar8 *)text, len, &extents); -+ else -+ XftTextExtents8(ioncore_g.dpy, font->font, (XftChar8 *)text, len, &extents); -+ return extents.xOff; -+ }else{ -+ return 0; -+ } -+#endif /* XFT */ - } - - -@@ -307,6 +364,7 @@ - /*{{{ String drawing */ - - -+#ifndef XFT - void debrush_do_draw_string_default(DEBrush *brush, int x, int y, - const char *str, int len, bool needfill, - DEColourGroup *colours) -@@ -366,6 +424,43 @@ - } - } - -+#else /* XFT */ -+void debrush_do_draw_string_default(DEBrush *brush, -+ int x, int y, const char *str, -+ int len, bool needfill, -+ DEColourGroup *colours) -+{ -+ Window win = brush->win; -+ GC gc=brush->d->normal_gc; -+ XftDraw *draw; -+ XftFont *font; -+ -+ if(brush->d->font==NULL) -+ return; -+ -+ font=brush->d->font->font; -+ draw=debrush_get_draw(brush, win); -+ -+ if(needfill){ -+ XGlyphInfo extents; -+ if(ioncore_g.enc_utf8){ -+ XftTextExtentsUtf8(ioncore_g.dpy, font, (XftChar8 *)str, len, -+ &extents); -+ }else{ -+ XftTextExtents8(ioncore_g.dpy, font, (XftChar8 *)str, len, &extents); -+ XftDrawRect(draw, &(colours->bg), x-extents.x, y-extents.y, -+ extents.width+10, extents.height); -+ } -+ } -+ -+ if(ioncore_g.enc_utf8){ -+ XftDrawStringUtf8(draw, &(colours->fg), font, x, y, (XftChar8 *)str, -+ len); -+ }else{ -+ XftDrawString8(draw, &(colours->fg), font, x, y, (XftChar8 *)str, len); -+ } -+} -+#endif /* XFT */ - - void debrush_do_draw_string(DEBrush *brush, int x, int y, - const char *str, int len, bool needfill, -diff -ur notion-3-2015061300/de/font.h notion-3-2015061300-PATCHED/de/font.h ---- notion-3-2015061300/de/font.h 2015-06-13 10:37:26.000000000 -0400 -+++ notion-3-2015061300-PATCHED/de/font.h 2015-07-13 10:37:23.119297440 -0400 -@@ -12,6 +12,9 @@ - - #include <ioncore/common.h> - #include <ioncore/gr.h> -+#ifdef XFT -+#include <X11/Xft/Xft.h> -+#endif /* XFT */ - - INTRSTRUCT(DEFont); - -@@ -27,6 +30,9 @@ - int refcount; - XFontSet fontset; - XFontStruct *fontstruct; -+#ifdef XFT /* XFT */ -+ XftFont *font; -+#endif /* XFT */ - DEFont *next, *prev; - }; - -diff -ur notion-3-2015061300/de/init.c notion-3-2015061300-PATCHED/de/init.c ---- notion-3-2015061300/de/init.c 2015-06-13 10:37:26.000000000 -0400 -+++ notion-3-2015061300-PATCHED/de/init.c 2015-07-13 10:37:23.122297270 -0400 -@@ -165,17 +165,26 @@ - { - bool bgset; - DEColour padinh; -- -+ DEColour black, white; -+ -+#ifdef XFT -+ de_alloc_colour(rootwin, &black, "black"); -+ de_alloc_colour(rootwin, &white, "white"); -+#else -+ black=DE_BLACK(rootwin); -+ white=DE_WHITE(rootwin); -+#endif -+ - de_get_colour(rootwin, &(cg->hl), tab, "highlight_colour", -- (based_on ? based_on->cgrp.hl : DE_WHITE(rootwin))); -+ (based_on ? based_on->cgrp.hl : white)); - de_get_colour(rootwin, &(cg->sh), tab, "shadow_colour", -- (based_on ? based_on->cgrp.sh : DE_WHITE(rootwin))); -+ (based_on ? based_on->cgrp.sh : white)); - de_get_colour(rootwin, &(cg->fg), tab, "foreground_colour", -- (based_on ? based_on->cgrp.fg : DE_WHITE(rootwin))); -+ (based_on ? based_on->cgrp.fg : white)); - bgset=de_get_colour(rootwin, &(cg->bg), tab, "background_colour", -- (based_on ? based_on->cgrp.bg : DE_BLACK(rootwin))); -+ (based_on ? based_on->cgrp.bg : black)); - -- padinh=(based_on ? based_on->cgrp.pad : DE_WHITE(rootwin)); -+ padinh=(based_on ? based_on->cgrp.pad : white); - - de_get_colour_(rootwin, &(cg->pad), tab, "padding_colour", - (bgset ? cg->bg : padinh), padinh); -diff -ur notion-3-2015061300/de/style.c notion-3-2015061300-PATCHED/de/style.c ---- notion-3-2015061300/de/style.c 2015-06-13 10:37:26.000000000 -0400 -+++ notion-3-2015061300-PATCHED/de/style.c 2015-07-13 10:37:23.128296929 -0400 -@@ -70,10 +70,17 @@ - /*gcv.function=GXclear;*/ - gcv.stipple=stipple_pixmap; - gcvmask=GCFillStyle|GCStipple/*|GCFunction*/; -+#ifndef XFT - if(style->font!=NULL && style->font->fontstruct!=NULL){ - gcv.font=style->font->fontstruct->fid; - gcvmask|=GCFont; - } -+#else /* XFT */ -+// if(style->font!=NULL){ -+// gcv.font=style->font; -+// gcvmask|=GCFont; -+// } -+#endif /* XFT */ - - style->stipple_gc=XCreateGC(dpy, root, gcvmask, &gcv); - XCopyGC(dpy, style->normal_gc, -@@ -201,6 +208,14 @@ - - bool destyle_init(DEStyle *style, WRootWin *rootwin, const char *name) - { -+ DEColour black, white; -+#ifdef XFT -+ de_alloc_colour(rootwin, &black, "black"); -+ de_alloc_colour(rootwin, &white, "white"); -+#else -+ black=DE_BLACK(rootwin); -+ white=DE_WHITE(rootwin); -+#endif /* XFT */ - if(!gr_stylespec_load(&style->spec, name)) - return FALSE; - -@@ -223,11 +238,11 @@ - style->textalign=DEALIGN_CENTER; - - style->cgrp_alloced=FALSE; -- style->cgrp.bg=DE_BLACK(rootwin); -- style->cgrp.pad=DE_BLACK(rootwin); -- style->cgrp.fg=DE_WHITE(rootwin); -- style->cgrp.hl=DE_WHITE(rootwin); -- style->cgrp.sh=DE_WHITE(rootwin); -+ style->cgrp.bg=black; -+ style->cgrp.pad=black; -+ style->cgrp.fg=white; -+ style->cgrp.hl=white; -+ style->cgrp.sh=white; - gr_stylespec_init(&style->cgrp.spec); - - style->font=NULL; -diff -ur notion-3-2015061300/de/style.h notion-3-2015061300-PATCHED/de/style.h ---- notion-3-2015061300/de/style.h 2015-06-13 10:37:26.000000000 -0400 -+++ notion-3-2015061300-PATCHED/de/style.h 2015-07-13 10:37:23.130296815 -0400 -@@ -80,6 +80,7 @@ - Pixmap tag_pixmap; - int tag_pixmap_w; - int tag_pixmap_h; -+ int xft_style; - - DEStyle *next, *prev; - }; -diff -ur notion-3-2015061300/system-autodetect.mk notion-3-2015061300-PATCHED/system-autodetect.mk ---- notion-3-2015061300/system-autodetect.mk 2015-06-13 10:37:26.000000000 -0400 -+++ notion-3-2015061300-PATCHED/system-autodetect.mk 2015-07-13 10:38:14.921332013 -0400 -@@ -103,6 +103,19 @@ - - - ## -+## Xft support -+## -+ -+USE_XFT=1 -+ -+ifeq ($(USE_XFT),1) -+EXTRA_INCLUDES += `pkg-config xft --cflags` -+EXTRA_LIBS += `pkg-config xft --libs` -+DEFINES += -DXFT -DCF_FALLBACK_FONT_NAME=\"Sans\" -+endif -+ -+ -+## - ## Localisation - ## - diff --git a/pkgs/applications/window-managers/sway/default.nix b/pkgs/applications/window-managers/sway/default.nix index c9427fbf695..a020c10a348 100644 --- a/pkgs/applications/window-managers/sway/default.nix +++ b/pkgs/applications/window-managers/sway/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "sway-unwrapped"; - version = "1.2"; + version = "1.4"; src = fetchFromGitHub { owner = "swaywm"; repo = "sway"; rev = version; - sha256 = "0vch2zm5afc76ia78p3vg71zr2fyda67l9hd2h0x1jq3mnvfbxnd"; + sha256 = "11qf89y3q92g696a6f4d23qb44gqixg6qxq740vwv2jw59ms34ja"; }; patches = [ diff --git a/pkgs/applications/window-managers/sway/idle.nix b/pkgs/applications/window-managers/sway/idle.nix index bc917e76f97..486ab79598d 100644 --- a/pkgs/applications/window-managers/sway/idle.nix +++ b/pkgs/applications/window-managers/sway/idle.nix @@ -5,15 +5,20 @@ stdenv.mkDerivation rec { pname = "swayidle"; - version = "1.5"; + version = "1.6"; src = fetchFromGitHub { owner = "swaywm"; repo = "swayidle"; rev = version; - sha256 = "05qi96j58xqxjiighay1d39rfanxcpn6vlynj23mb5dymxvlaq9n"; + sha256 = "1nd3v8r9549lykdwh4krldfl59lzaspmmai5k1icy7dvi6kkr18r"; }; + postPatch = '' + substituteInPlace meson.build \ + --replace "version: '1.5'" "version: '${version}'" + ''; + nativeBuildInputs = [ meson ninja pkgconfig scdoc ]; buildInputs = [ wayland wayland-protocols systemd ]; diff --git a/pkgs/applications/window-managers/sway/lock.nix b/pkgs/applications/window-managers/sway/lock.nix index fe445a6b7ad..dcff3a5c47f 100644 --- a/pkgs/applications/window-managers/sway/lock.nix +++ b/pkgs/applications/window-managers/sway/lock.nix @@ -5,17 +5,18 @@ stdenv.mkDerivation rec { pname = "swaylock"; - version = "1.4"; + version = "1.5"; src = fetchFromGitHub { owner = "swaywm"; repo = "swaylock"; rev = version; - sha256 = "1ii9ql1mxkk2z69dv6bg1x22nl3a46iww764wqjiv78x08xpk982"; + sha256 = "0r95p4w11dwm5ra614vddz83r8j7z6gd120z2vcchy7m9b0f15kf"; }; postPatch = '' - sed -iE "s/version: '1\.3',/version: '${version}',/" meson.build + substituteInPlace meson.build \ + --replace "version: '1.4'" "version: '${version}'" ''; nativeBuildInputs = [ meson ninja pkgconfig scdoc ]; diff --git a/pkgs/build-support/libredirect/libredirect.c b/pkgs/build-support/libredirect/libredirect.c index d31b7551e94..e7f74c736ab 100644 --- a/pkgs/build-support/libredirect/libredirect.c +++ b/pkgs/build-support/libredirect/libredirect.c @@ -61,7 +61,11 @@ static const char * rewrite(const char * path, char * buf) static int open_needs_mode(int flags) { +#ifdef O_TMPFILE return (flags & O_CREAT) || (flags & O_TMPFILE) == O_TMPFILE; +#else + return flags & O_CREAT; +#endif } /* The following set of Glibc library functions is very incomplete - diff --git a/pkgs/data/fonts/jetbrains-mono/default.nix b/pkgs/data/fonts/jetbrains-mono/default.nix index 05eb554c6f4..ada7f23f421 100644 --- a/pkgs/data/fonts/jetbrains-mono/default.nix +++ b/pkgs/data/fonts/jetbrains-mono/default.nix @@ -1,18 +1,20 @@ { lib, fetchzip }: let - version = "1.0.0"; + version = "1.0.1"; in fetchzip rec { name = "JetBrainsMono-${version}"; - url = "https://download.jetbrains.com/fonts/JetBrainsMono-${version}.zip"; + url = "https://github.com/JetBrains/JetBrainsMono/releases/download/${version}/JetBrainsMono-${version}.zip"; - sha256 = "0mwqi66d56v4ml1w7wjsiidrh153jvh0czafyic47rkvmxhnrrhv"; + sha256 = "15a8fwyg8ns6krq6nsvgn41iaqbd3lgm3cmv7w370gr6brbn6lxq"; postFetch = '' unzip $downloadedFile - install -m444 -Dt $out/share/fonts/truetype *.ttf + install -m444 -Dt $out/share/fonts/truetype ttf/*.ttf + install -m444 -Dt $out/share/fonts/woff/ web/woff/*.woff + install -m444 -Dt $out/share/fonts/woff2/ web/woff2/*.woff2 ''; meta = with lib; { diff --git a/pkgs/data/icons/iconpack-obsidian/default.nix b/pkgs/data/icons/iconpack-obsidian/default.nix index 64a982f6037..96514b6a4cd 100644 --- a/pkgs/data/icons/iconpack-obsidian/default.nix +++ b/pkgs/data/icons/iconpack-obsidian/default.nix @@ -2,20 +2,18 @@ stdenv.mkDerivation rec { pname = "iconpack-obsidian"; - version = "4.9"; + version = "4.10"; src = fetchFromGitHub { owner = "madmaxms"; repo = pname; rev = "v${version}"; - sha256 = "1w0lnr08gd0cnzv3n5094jqb7dpbpwwizfhvifdir0xsls1sf129"; + sha256 = "1imnbfrmizs0yx2165qj423y3m5vw9z33pqxmvhvs0rcwwddgqix"; }; nativeBuildInputs = [ gtk3 ]; - propagatedBuildInputs = [ - hicolor-icon-theme - ]; + propagatedBuildInputs = [ hicolor-icon-theme ]; dontDropIconThemeCache = true; @@ -31,8 +29,8 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "Gnome Icon Pack based upon Faenza"; - homepage = https://github.com/madmaxms/iconpack-obsidian; + description = "Gnome icon pack based upon Faenza"; + homepage = "https://github.com/madmaxms/iconpack-obsidian"; license = licenses.lgpl3; # darwin cannot deal with file names differing only in case platforms = platforms.linux; diff --git a/pkgs/desktops/cinnamon/cinnamon-desktop/default.nix b/pkgs/desktops/cinnamon/cinnamon-desktop/default.nix index 094140cbf4e..a622e6abfd1 100644 --- a/pkgs/desktops/cinnamon/cinnamon-desktop/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-desktop/default.nix @@ -70,6 +70,7 @@ stdenv.mkDerivation rec { gtk-doc. ''; + license = [ licenses.gpl2 licenses.lgpl2 ]; platforms = platforms.linux; maintainers = [ maintainers.mkg20001 ]; }; diff --git a/pkgs/desktops/cinnamon/cinnamon-menus/default.nix b/pkgs/desktops/cinnamon/cinnamon-menus/default.nix index 562ecdbfa77..47242cdf38a 100644 --- a/pkgs/desktops/cinnamon/cinnamon-menus/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-menus/default.nix @@ -34,6 +34,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "https://github.com/linuxmint/cinnamon-menus"; description = "A menu system for the Cinnamon project"; + license = [ licenses.gpl2 licenses.lgpl2 ]; platforms = platforms.linux; maintainers = [ maintainers.mkg20001 ]; }; diff --git a/pkgs/desktops/cinnamon/cinnamon-settings-daemon/csd-backlight-helper-fix.patch b/pkgs/desktops/cinnamon/cinnamon-settings-daemon/csd-backlight-helper-fix.patch new file mode 100644 index 00000000000..967ba98eb48 --- /dev/null +++ b/pkgs/desktops/cinnamon/cinnamon-settings-daemon/csd-backlight-helper-fix.patch @@ -0,0 +1,48 @@ +From 6d71bf9764fb81d437678a603826167850bbf453 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= <mkg20001@gmail.com> +Date: Tue, 21 Jan 2020 03:19:28 +0100 +Subject: [PATCH] fix: use an impure path to csd-backlight-helper to fix + policy-reload bug + +--- + plugins/power/csd-power-manager.c | 4 ++-- + .../org.cinnamon.settings-daemon.plugins.power.policy.in.in | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/plugins/power/csd-power-manager.c b/plugins/power/csd-power-manager.c +index b24c456..212c47e 100755 +--- a/plugins/power/csd-power-manager.c ++++ b/plugins/power/csd-power-manager.c +@@ -2519,7 +2519,7 @@ backlight_helper_get_value (const gchar *argument, CsdPowerManager* manager, + #endif + + /* get the data */ +- command = g_strdup_printf (LIBEXECDIR "/csd-backlight-helper --%s %s", ++ command = g_strdup_printf ("/run/current-system/sw/bin/cinnamon-settings-daemon/csd-backlight-helper --%s %s", + argument, + manager->priv->backlight_helper_preference_args); + ret = g_spawn_command_line_sync (command, +@@ -2609,7 +2609,7 @@ backlight_helper_set_value (const gchar *argument, + #endif + + /* get the data */ +- command = g_strdup_printf ("pkexec " LIBEXECDIR "/csd-backlight-helper --%s %i %s", ++ command = g_strdup_printf ("pkexec " "/run/current-system/sw/bin/cinnamon-settings-daemon/csd-backlight-helper --%s %i %s", + argument, value, + manager->priv->backlight_helper_preference_args); + ret = g_spawn_command_line_sync (command, +diff --git a/plugins/power/org.cinnamon.settings-daemon.plugins.power.policy.in.in b/plugins/power/org.cinnamon.settings-daemon.plugins.power.policy.in.in +index 2c44e62..c0a2348 100755 +--- a/plugins/power/org.cinnamon.settings-daemon.plugins.power.policy.in.in ++++ b/plugins/power/org.cinnamon.settings-daemon.plugins.power.policy.in.in +@@ -25,7 +25,7 @@ + <allow_inactive>no</allow_inactive> + <allow_active>yes</allow_active> + </defaults> +- <annotate key="org.freedesktop.policykit.exec.path">@libexecdir@/csd-backlight-helper</annotate> ++ <annotate key="org.freedesktop.policykit.exec.path">/run/current-system/sw/bin/cinnamon-settings-daemon/csd-backlight-helper</annotate> + </action> + + </policyconfig> +-- +2.24.1 diff --git a/pkgs/desktops/cinnamon/cinnamon-settings-daemon/default.nix b/pkgs/desktops/cinnamon/cinnamon-settings-daemon/default.nix new file mode 100644 index 00000000000..1dc58e3c3b5 --- /dev/null +++ b/pkgs/desktops/cinnamon/cinnamon-settings-daemon/default.nix @@ -0,0 +1,111 @@ +{ fetchFromGitHub +, autoconf-archive +, autoreconfHook +, cinnamon-desktop +, colord +, glib +, gsettings-desktop-schemas +, gtk3 +, intltool +, lcms2 +, libcanberra-gtk3 +, libgnomekbd +, libnotify +, libxklavier +, wrapGAppsHook +, pkgconfig +, pulseaudio +, stdenv +, systemd +, upower +, dconf +, cups +, polkit +, librsvg +, libwacom +, xf86_input_wacom +, xorg +, fontconfig +, tzdata +}: + +stdenv.mkDerivation rec { + pname = "cinnamon-settings-daemon"; + version = "4.4.0"; + + /* csd-power-manager.c:50:10: fatal error: csd-power-proxy.h: No such file or directory + #include "csd-power-proxy.h" + ^~~~~~~~~~~~~~~~~~~ + compilation terminated. */ + + # but this occurs only sometimes, so disabling parallel building + # also see https://github.com/linuxmint/cinnamon-settings-daemon/issues/248 + enableParallelBuilding = false; + + src = fetchFromGitHub { + owner = "linuxmint"; + repo = pname; + rev = version; + sha256 = "1h74d68a7hx85vv6ak26b85jq0wr56ps9rzfvqsnxwk81zxw2n7q"; + }; + + patches = [ + ./csd-backlight-helper-fix.patch + ]; + + NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; # TODO: https://github.com/NixOS/nixpkgs/issues/36468 + + buildInputs = [ + cinnamon-desktop + colord + gtk3 + glib + gsettings-desktop-schemas + lcms2 + libcanberra-gtk3 + libgnomekbd + libnotify + libxklavier + pulseaudio + systemd + upower + dconf + cups + polkit + librsvg + libwacom + xf86_input_wacom + xorg.libXext + xorg.libX11 + xorg.libXi + xorg.libXtst + xorg.libXfixes + fontconfig + ]; + + nativeBuildInputs = [ + autoconf-archive + autoreconfHook + wrapGAppsHook + intltool + pkgconfig + ]; + + postPatch = '' + sed "s|/usr/share/zoneinfo|${tzdata}/share/zoneinfo|g" -i plugins/datetime/system-timezone.h + ''; + + # So the polkit policy can reference /run/current-system/sw/bin/cinnamon-settings-daemon/csd-backlight-helper + postFixup = '' + mkdir -p $out/bin/cinnamon-settings-daemon + ln -s $out/libexec/csd-backlight-helper $out/bin/cinnamon-settings-daemon/csd-backlight-helper + ''; + + meta = with stdenv.lib; { + homepage = "https://github.com/linuxmint/cinnamon-settings-daemon"; + description = "The settings daemon for the Cinnamon desktop"; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = [ maintainers.mkg20001 ]; + }; +} diff --git a/pkgs/desktops/cinnamon/cinnamon-translations/default.nix b/pkgs/desktops/cinnamon/cinnamon-translations/default.nix index 65df49a5a1c..b03678c5d7a 100644 --- a/pkgs/desktops/cinnamon/cinnamon-translations/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-translations/default.nix @@ -25,6 +25,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "https://github.com/linuxmint/cinnamon-translations"; description = "Translations files for the Cinnamon desktop"; + license = licenses.gpl2; platforms = platforms.linux; maintainers = [ maintainers.mkg20001 ]; }; diff --git a/pkgs/desktops/cinnamon/cjs/default.nix b/pkgs/desktops/cinnamon/cjs/default.nix index a240f670be0..9dbab8fd767 100644 --- a/pkgs/desktops/cinnamon/cjs/default.nix +++ b/pkgs/desktops/cinnamon/cjs/default.nix @@ -78,6 +78,12 @@ stdenv.mkDerivation rec { This module contains JavaScript bindings based on gobject-introspection. ''; + license = with licenses; [ + gpl2Plus + lgpl2Plus + mit + mpl11 + ]; platforms = platforms.linux; maintainers = [ maintainers.mkg20001 ]; }; diff --git a/pkgs/desktops/cinnamon/default.nix b/pkgs/desktops/cinnamon/default.nix index 456fb960c62..b077ad18476 100644 --- a/pkgs/desktops/cinnamon/default.nix +++ b/pkgs/desktops/cinnamon/default.nix @@ -4,6 +4,8 @@ lib.makeScope pkgs.newScope (self: with self; { cinnamon-desktop = callPackage ./cinnamon-desktop { }; cinnamon-menus = callPackage ./cinnamon-menus { }; cinnamon-translations = callPackage ./cinnamon-translations { }; + cinnamon-settings-daemon = callPackage ./cinnamon-settings-daemon { }; cjs = callPackage ./cjs { }; + nemo = callPackage ./nemo { }; xapps = callPackage ./xapps { }; }) diff --git a/pkgs/desktops/cinnamon/nemo/default.nix b/pkgs/desktops/cinnamon/nemo/default.nix new file mode 100644 index 00000000000..419aaf249f7 --- /dev/null +++ b/pkgs/desktops/cinnamon/nemo/default.nix @@ -0,0 +1,76 @@ +{ fetchFromGitHub +, fetchpatch +, glib +, gobject-introspection +, meson +, ninja +, pkgconfig +, stdenv +, wrapGAppsHook +, libxml2 +, gtk3 +, libnotify +, cinnamon-desktop +, xapps +, libexif +, exempi +, intltool +, shared-mime-info +}: + +stdenv.mkDerivation rec { + pname = "nemo"; + version = "4.4.1"; + + # TODO: add plugins support (see https://github.com/NixOS/nixpkgs/issues/78327) + + src = fetchFromGitHub { + owner = "linuxmint"; + repo = pname; + rev = version; + sha256 = "0sskq0rssxvna937md446x1489hkhxys1zq03hvl8asjqa259w2q"; + }; + + patches = [ + (fetchpatch { # details see https://github.com/linuxmint/nemo/pull/2303 + url = "https://github.com/linuxmint/nemo/pull/2303/commits/9c1ec7812abe712419317df07d6b64623e8f639d.patch"; + sha256 = "09dz7lq3i47rbvycawrxwgjmd9g1mhb76ibx2vq85wck6r08arml"; + }) + ]; + + outputs = [ "out" "dev" ]; + + buildInputs = [ + glib + gtk3 + libnotify + cinnamon-desktop + libxml2 + xapps + libexif + exempi + gobject-introspection + ]; + + nativeBuildInputs = [ + meson + pkgconfig + ninja + wrapGAppsHook + intltool + shared-mime-info + ]; + + mesonFlags = [ + # TODO: https://github.com/NixOS/nixpkgs/issues/36468 + "-Dc_args=-I${glib.dev}/include/gio-unix-2.0" + ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/linuxmint/nemo"; + description = "File browser for Cinnamon"; + license = [ licenses.gpl2 licenses.lgpl2 ]; + platforms = platforms.linux; + maintainers = [ maintainers.mkg20001 ]; + }; +} diff --git a/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix b/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix index d59746adc3d..1fecf80e9ae 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix @@ -51,11 +51,11 @@ stdenv.mkDerivation rec { pname = "gnome-boxes"; - version = "3.34.2"; + version = "3.34.3"; src = fetchurl { url = "mirror://gnome/sources/gnome-boxes/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1rqdjf61cbi3zcpzr6cfkj3lcfrdlhs20bl65lxw2xrwk4jn0ph5"; + sha256 = "1izhqgsb658lzrzj12dw06w47bjhqdpfl0j74aq7bzql7nqsb3wa"; }; doCheck = true; diff --git a/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix b/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix index 5858883accd..08011ab5c72 100644 --- a/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix +++ b/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix @@ -1,16 +1,16 @@ -{ stdenv, fetchFromGitHub, substituteAll, python3, openssl, folks, gsound +{ stdenv, fetchFromGitHub, substituteAll, python3, openssl, gsound , meson, ninja, libxml2, pkgconfig, gobject-introspection, wrapGAppsHook , glib, gtk3, at-spi2-core, upower, openssh, gnome3, gjs }: stdenv.mkDerivation rec { pname = "gnome-shell-gsconnect"; - version = "30"; + version = "31"; src = fetchFromGitHub { owner = "andyholmes"; repo = "gnome-shell-extension-gsconnect"; rev = "v${version}"; - sha256 = "17j96y72mj7vg2csn5c9rji7jy04x5qzl8knf5gky6wppxj9zjb4"; + sha256 = "0nricm31jh4akncs0rkkilmq9afg7kgbj5cy7w26pfqb3l4nhifg"; }; patches = [ @@ -29,11 +29,9 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - (python3.withPackages (pkgs: [ python3.pkgs.pygobject3 ])) # for folks.py glib # libgobject gtk3 at-spi2-core # atspi - folks # libfolks gnome3.nautilus # TODO: this contaminates the package with nautilus and gnome-autoar typelibs but it is only needed for the extension gnome3.nautilus-python gsound @@ -66,15 +64,9 @@ stdenv.mkDerivation rec { done ''; - preFixup = '' - # TODO: figure out why folks GIR does not contain shared-library attribute - # https://github.com/NixOS/nixpkgs/issues/47226 - gappsWrapperArgs+=(--prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ folks ]}") - ''; - postFixup = '' # Let’s wrap the daemons - for file in $out/share/gnome-shell/extensions/gsconnect@andyholmes.github.io/service/{{daemon,nativeMessagingHost}.js,components/folks.py}; do + for file in $out/share/gnome-shell/extensions/gsconnect@andyholmes.github.io/service/{daemon,nativeMessagingHost}.js; do echo "Wrapping program $file" wrapGApp "$file" done diff --git a/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix b/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix index 5f6cb92cde2..078b5051c84 100644 --- a/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix +++ b/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "four-in-a-row"; - version = "3.34.1"; + version = "3.34.3"; src = fetchurl { url = "mirror://gnome/sources/four-in-a-row/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "112pyrh2yvwy5b2a0b5crjpwp2vqqg4zgx6csll1bic6ccayv713"; + sha256 = "1agdjg9kcfcfaq3d2w4s4ksci6is1jzfnxanp3f84zqdq55s0k1y"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome-3/games/iagno/default.nix b/pkgs/desktops/gnome-3/games/iagno/default.nix index 33cd60f5272..9f1b52990ca 100644 --- a/pkgs/desktops/gnome-3/games/iagno/default.nix +++ b/pkgs/desktops/gnome-3/games/iagno/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "iagno"; - version = "3.34.3"; + version = "3.34.4"; src = fetchurl { url = "mirror://gnome/sources/iagno/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1m9654dbi4vrl59wvbyxz7jf81v4mn4n5lcq7abb42lba965d2z2"; + sha256 = "0v0x2dmgcgfcjmbx21arnrwdx9xwa5q05wrm8a9sgrjjzqx6ynwb"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/lxqt/screengrab/default.nix b/pkgs/desktops/lxqt/screengrab/default.nix index 380e50e827e..7eff539091f 100644 --- a/pkgs/desktops/lxqt/screengrab/default.nix +++ b/pkgs/desktops/lxqt/screengrab/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "screengrab"; - version = "1.101"; + version = "2.0.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "111gnkhp77qkch7xqr7k3h8zrg4871gapyd4vvlpaj0gjhirjg6h"; + sha256 = "1syvdqq45dr8hwigl9ax1wxr33m8z23nh6xzzlqbflyyd93xzjmn"; }; nativeBuildInputs = [ @@ -30,7 +30,7 @@ mkDerivation rec { meta = with lib; { description = "Crossplatform tool for fast making screenshots"; - homepage = https://github.com/lxqt/screengrab; + homepage = "https://github.com/lxqt/screengrab"; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ romildo ]; diff --git a/pkgs/desktops/pantheon/apps/elementary-screenshot-tool/default.nix b/pkgs/desktops/pantheon/apps/elementary-screenshot-tool/default.nix index 8485a1df9f3..befa2bbbb02 100644 --- a/pkgs/desktops/pantheon/apps/elementary-screenshot-tool/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-screenshot-tool/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { pname = "elementary-screenshot-tool"; # This will be renamed to "screenshot" soon. See -> https://github.com/elementary/screenshot/pull/93 - version = "1.7.0"; + version = "1.7.1"; repoName = "screenshot"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = repoName; rev = version; - sha256 = "09jcyy4drzpfxb1blln7hyjg5b7r8w5j5v7va2qhq31y7vzczh62"; + sha256 = "179ib2ldvhdx3hks5lqyx2cvlkk3j1qccvlfwh2yd2bl79zpk3ma"; }; passthru = { diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix index 260b340c223..5a4eaf79b38 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "switchboard-plug-mouse-touchpad"; - version = "2.3.1"; + version = "2.4.0"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "1974zdr5w3xd882gi95fp7axgilfni1sclsr750qm32yhl7d9bfn"; + sha256 = "1ls5jxzmd7cmbv8h67q6mcmfrfksgwjndqd6r9gxivsz2lcji3x7"; }; passthru = { diff --git a/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix b/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix index 4a42bc3d565..25c3f2201ef 100644 --- a/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix +++ b/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { pname = "elementary-gtk-theme"; - version = "5.4.0"; + version = "5.4.1"; repoName = "stylesheet"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = repoName; rev = version; - sha256 = "0dh7lqc9b4ciyzbphqw071xcg742fvlc7gz9l1q3nqjsa2k6xg80"; + sha256 = "0fnh08wqlhvigkxp69xkdha19ny9j0hg4ycwhhwvyr0d0z47kilw"; }; passthru = { diff --git a/pkgs/development/compilers/graalvm/enterprise-edition.nix b/pkgs/development/compilers/graalvm/enterprise-edition.nix index e180455cb7c..c34c4695a23 100644 --- a/pkgs/development/compilers/graalvm/enterprise-edition.nix +++ b/pkgs/development/compilers/graalvm/enterprise-edition.nix @@ -1,133 +1,167 @@ -{ stdenv, requireFile, perl, unzip, glibc, zlib, gdk-pixbuf, xorg, glib, fontconfig, freetype, cairo, pango, gtk3, gtk2, ffmpeg, libGL, atk, alsaLib, libav_0_8, setJavaClassPath }: +{ stdenv, requireFile, perl, unzip, glibc, zlib, bzip2, gdk-pixbuf, xorg, glib, fontconfig, freetype, cairo, pango, gtk3, gtk2, ffmpeg, libGL, atk, alsaLib, libav_0_8, setJavaClassPath }: let - graalvm8-ee = stdenv.mkDerivation rec { - pname = "graalvm8-ee"; - version = "19.2.0"; - srcs = [ - (requireFile { - name = "graalvm-ee-linux-amd64-${version}.tar.gz"; - sha256 = "1j56lyids48zyjhxk8xl4niy8hk6qzi1aj7c55yfh62id8v6cpbw"; - url = "https://www.oracle.com/technetwork/graalvm/downloads/index.html"; - }) - (requireFile { - name = "native-image-installable-svm-svmee-linux-amd64-${version}.jar"; - sha256 = "07c25l27msxccqrbz4bknz0sxsl0z2k8990cdfkbrgxvhxspfnnm"; - url = "https://www.oracle.com/technetwork/graalvm/downloads/index.html"; - }) - (requireFile { - name = "python-installable-svm-svmee-linux-amd64-${version}.jar"; - sha256 = "1c7kpz56w9p418li97ymixdwywscr85vhn7jkzxq71bj7ia7pxwz"; - url = "https://www.oracle.com/technetwork/graalvm/downloads/index.html"; - }) - (requireFile { - name = "ruby-installable-svm-svmee-linux-amd64-${version}.jar"; - sha256 = "13jfm5qpxqxz7f5n9yyvqrv1vwigifrjwk3hssp23maski2ssys1"; - url = "https://www.oracle.com/technetwork/graalvm/downloads/index.html"; - }) - ]; - nativeBuildInputs = [ unzip perl ]; - unpackPhase = '' - unpack_jar() { - jar=$1 - unzip $jar -d $out - perl -ne 'use File::Path qw(make_path); - use File::Basename qw(dirname); - if (/^(.+) = (.+)$/) { - make_path dirname("$ENV{out}/$1"); - system "ln -s $2 $ENV{out}/$1"; - }' $out/META-INF/symlinks - perl -ne 'if (/^(.+) = ([r-])([w-])([x-])([r-])([w-])([x-])([r-])([w-])([x-])$/) { - my $mode = ($2 eq 'r' ? 0400 : 0) + ($3 eq 'w' ? 0200 : 0) + ($4 eq 'x' ? 0100 : 0) + - ($5 eq 'r' ? 0040 : 0) + ($6 eq 'w' ? 0020 : 0) + ($7 eq 'x' ? 0010 : 0) + - ($8 eq 'r' ? 0004 : 0) + ($9 eq 'w' ? 0002 : 0) + ($10 eq 'x' ? 0001 : 0); - chmod $mode, "$ENV{out}/$1"; - }' $out/META-INF/permissions - rm -rf $out/META-INF - } - - mkdir -p $out - arr=($srcs) - tar xf ''${arr[0]} -C $out --strip-components=1 - unpack_jar ''${arr[1]} - unpack_jar ''${arr[2]} - unpack_jar ''${arr[3]} - ''; - - installPhase = '' - # BUG workaround http://mail.openjdk.java.net/pipermail/graal-dev/2017-December/005141.html - substituteInPlace $out/jre/lib/security/java.security \ - --replace file:/dev/random file:/dev/./urandom \ - --replace NativePRNGBlocking SHA1PRNG - - # provide libraries needed for static compilation - for f in ${glibc}/lib/* ${glibc.static}/lib/* ${zlib.static}/lib/*; do - ln -s $f $out/jre/lib/svm/clibraries/linux-amd64/$(basename $f) - done - ''; - - dontStrip = true; - - preFixup = '' - # Set JAVA_HOME automatically. - mkdir -p $out/nix-support - cat <<EOF > $out/nix-support/setup-hook - if [ -z "\''${JAVA_HOME-}" ]; then export JAVA_HOME=$out; fi - EOF - ''; - - postFixup = '' - rpath="$out/jre/lib/amd64/jli:$out/jre/lib/amd64/server:$out/jre/lib/amd64:${ - stdenv.lib.strings.makeLibraryPath [ glibc xorg.libXxf86vm xorg.libX11 xorg.libXext xorg.libXtst xorg.libXi xorg.libXrender - glib zlib alsaLib fontconfig freetype pango gtk3 gtk2 cairo gdk-pixbuf atk ffmpeg libGL ]}" - - for f in $(find $out -type f -perm -0100); do - patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$f" || true - patchelf --set-rpath "$rpath" "$f" || true - done - - for f in $(find $out -type f -perm -0100); do - if ldd "$f" | fgrep 'not found'; then echo "in file $f"; fi - done - ''; - - propagatedBuildInputs = [ setJavaClassPath zlib ]; # $out/bin/native-image needs zlib to build native executables - - doInstallCheck = true; - installCheckPhase = '' - echo ${stdenv.lib.escapeShellArg '' - public class HelloWorld { - public static void main(String[] args) { - System.out.println("Hello World"); - } - } - ''} > HelloWorld.java - $out/bin/javac HelloWorld.java - - # run on JVM with Graal Compiler - $out/bin/java -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI -XX:+UseJVMCICompiler HelloWorld - $out/bin/java -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI -XX:+UseJVMCICompiler HelloWorld | fgrep 'Hello World' - - # Ahead-Of-Time compilation - $out/bin/native-image --no-server HelloWorld - ./helloworld - ./helloworld | fgrep 'Hello World' - - # Ahead-Of-Time compilation with --static - $out/bin/native-image --no-server --static HelloWorld - ./helloworld - ./helloworld | fgrep 'Hello World' - ''; - - passthru.home = graalvm8-ee; - - meta = with stdenv.lib; { - homepage = https://www.graalvm.org/; - description = "High-Performance Polyglot VM"; - license = licenses.unfree; - maintainers = with maintainers; [ volth hlolli ]; - platforms = [ "x86_64-linux" ]; - }; - }; -in - graalvm8-ee + common = javaVersion: + let + graalvmXXX-ee = stdenv.mkDerivation rec { + pname = "graalvm${javaVersion}-ee"; + version = "19.3.1"; + srcs = [ + (requireFile { + name = "graalvm-ee-java${javaVersion}-linux-amd64-${version}.tar.gz"; + sha256 = { "8" = "b4833f1996e0e271d8abde1d0af3420e2bc6797624515a3720bdbedfa99b1e82"; + "11" = "a965abb093934712f31cd2183f3f0d68ed1410a50365489f665a30e5382908dc"; + }.${javaVersion}; + url = "https://www.oracle.com/technetwork/graalvm/downloads/index.html"; + }) + (requireFile { + name = "native-image-installable-svm-svmee-java${javaVersion}-linux-amd64-${version}.jar"; + sha256 = { "8" = "fe3447dd60fbe3da39c650654594796873cd6bc9995d1430a421363e71d41702"; + "11" = "53357b7facb36c7b38857a2369471d0e869c0ff45555aa8baf2ab84de0c4782c"; + }.${javaVersion}; + url = "https://www.oracle.com/technetwork/graalvm/downloads/index.html"; + }) + (requireFile { + name = "python-installable-svm-svmee-java${javaVersion}-linux-amd64-${version}.jar"; + sha256 = { "8" = "003e9574e18656a82626aa5d310fac31979abc04955587d68ff977808829a91d"; + "11" = "65558e14a25802001f3c79571a09170fa11564de34df6987724163416d3889bf"; + }.${javaVersion}; + url = "https://www.oracle.com/technetwork/graalvm/downloads/index.html"; + }) + (requireFile { + name = "ruby-installable-svm-svmee-java${javaVersion}-linux-amd64-${version}.jar"; + sha256 = { "8" = "45abe74d10e09680f1e40101f93def5615e65f29ced328054a40c8517e054290"; + "11" = "3d4de372b78b68dbd966b36489d1c6d84a326990e91a0314fb77404eed0741ad"; + }.${javaVersion}; + url = "https://www.oracle.com/technetwork/graalvm/downloads/index.html"; + }) + ]; + nativeBuildInputs = [ unzip perl ]; + unpackPhase = '' + unpack_jar() { + jar=$1 + unzip $jar -d $out + perl -ne 'use File::Path qw(make_path); + use File::Basename qw(dirname); + if (/^(.+) = (.+)$/) { + make_path dirname("$ENV{out}/$1"); + system "ln -s $2 $ENV{out}/$1"; + }' $out/META-INF/symlinks + perl -ne 'if (/^(.+) = ([r-])([w-])([x-])([r-])([w-])([x-])([r-])([w-])([x-])$/) { + my $mode = ($2 eq 'r' ? 0400 : 0) + ($3 eq 'w' ? 0200 : 0) + ($4 eq 'x' ? 0100 : 0) + + ($5 eq 'r' ? 0040 : 0) + ($6 eq 'w' ? 0020 : 0) + ($7 eq 'x' ? 0010 : 0) + + ($8 eq 'r' ? 0004 : 0) + ($9 eq 'w' ? 0002 : 0) + ($10 eq 'x' ? 0001 : 0); + chmod $mode, "$ENV{out}/$1"; + }' $out/META-INF/permissions + rm -rf $out/META-INF + } + + mkdir -p $out + arr=($srcs) + tar xf ''${arr[0]} -C $out --strip-components=1 + unpack_jar ''${arr[1]} + unpack_jar ''${arr[2]} + unpack_jar ''${arr[3]} + ''; + + installPhase = { + "8" = '' + # BUG workaround http://mail.openjdk.java.net/pipermail/graal-dev/2017-December/005141.html + substituteInPlace $out/jre/lib/security/java.security \ + --replace file:/dev/random file:/dev/./urandom \ + --replace NativePRNGBlocking SHA1PRNG + + # provide libraries needed for static compilation + for f in ${glibc}/lib/* ${glibc.static}/lib/* ${zlib.static}/lib/*; do + ln -s $f $out/jre/lib/svm/clibraries/linux-amd64/$(basename $f) + done + + # allow using external truffle-api.jar and languages not included in the distrubution + rm $out/jre/lib/jvmci/parentClassLoader.classpath + ''; + "11" = '' + # BUG workaround http://mail.openjdk.java.net/pipermail/graal-dev/2017-December/005141.html + substituteInPlace $out/conf/security/java.security \ + --replace file:/dev/random file:/dev/./urandom \ + --replace NativePRNGBlocking SHA1PRNG + + # provide libraries needed for static compilation + for f in ${glibc}/lib/* ${glibc.static}/lib/* ${zlib.static}/lib/*; do + ln -s $f $out/lib/svm/clibraries/linux-amd64/$(basename $f) + done + ''; + }.${javaVersion}; + + dontStrip = true; + + # copy-paste openjdk's preFixup + preFixup = '' + # Set JAVA_HOME automatically. + mkdir -p $out/nix-support + cat <<EOF > $out/nix-support/setup-hook + if [ -z "\''${JAVA_HOME-}" ]; then export JAVA_HOME=$out; fi + EOF + ''; + + postFixup = '' + rpath="${ { "8" = "$out/jre/lib/amd64/jli:$out/jre/lib/amd64/server:$out/jre/lib/amd64"; + "11" = "$out/lib/jli:$out/lib/server:$out/lib"; + }.${javaVersion} + }:${ + stdenv.lib.strings.makeLibraryPath [ glibc xorg.libXxf86vm xorg.libX11 xorg.libXext xorg.libXtst xorg.libXi xorg.libXrender + glib zlib bzip2 alsaLib fontconfig freetype pango gtk3 gtk2 cairo gdk-pixbuf atk ffmpeg libGL ]}" + + for f in $(find $out -type f -perm -0100); do + patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$f" || true + patchelf --set-rpath "$rpath" "$f" || true + done + + for f in $(find $out -type f -perm -0100); do + if ldd "$f" | fgrep 'not found'; then echo "in file $f"; fi + done + ''; + + propagatedBuildInputs = [ setJavaClassPath zlib ]; # $out/bin/native-image needs zlib to build native executables + + doInstallCheck = true; + installCheckPhase = '' + echo ${stdenv.lib.escapeShellArg '' + public class HelloWorld { + public static void main(String[] args) { + System.out.println("Hello World"); + } + } + ''} > HelloWorld.java + $out/bin/javac HelloWorld.java + + # run on JVM with Graal Compiler + $out/bin/java -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI -XX:+UseJVMCICompiler HelloWorld + $out/bin/java -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI -XX:+UseJVMCICompiler HelloWorld | fgrep 'Hello World' + + # Ahead-Of-Time compilation + $out/bin/native-image --no-server HelloWorld + ./helloworld + ./helloworld | fgrep 'Hello World' + + # Ahead-Of-Time compilation with --static + $out/bin/native-image --no-server --static HelloWorld + ./helloworld + ./helloworld | fgrep 'Hello World' + ''; + + passthru.home = graalvmXXX-ee; + + meta = with stdenv.lib; { + homepage = https://www.graalvm.org/; + description = "High-Performance Polyglot VM"; + license = licenses.unfree; + maintainers = with maintainers; [ volth hlolli ]; + platforms = [ "x86_64-linux" ]; + }; + }; + in + graalvmXXX-ee; +in { + graalvm8-ee = common "8"; + graalvm11-ee = common "11"; +} diff --git a/pkgs/development/compilers/jetbrains-jdk/default.nix b/pkgs/development/compilers/jetbrains-jdk/default.nix index 276b9ae150a..54d95fbd8a8 100644 --- a/pkgs/development/compilers/jetbrains-jdk/default.nix +++ b/pkgs/development/compilers/jetbrains-jdk/default.nix @@ -7,17 +7,17 @@ let drv = stdenv.mkDerivation rec { pname = "jetbrainsjdk"; - version = "485.1"; + version = "520.30"; src = if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { - url = "https://bintray.com/jetbrains/intellij-jbr/download_file?file_path=jbrsdk-11_0_4-linux-x64-b${version}.tar.gz"; - sha256 = "18jnn0dra9nsnyllwq0ljxzr58k2pg8d0kg10y39vnxwccic4f76"; + url = "https://bintray.com/jetbrains/intellij-jbr/download_file?file_path=jbrsdk-11_0_5-linux-x64-b${version}.tar.gz"; + sha256 = "0xmr5jjnr4af7byz5w01phyrrdyizfhqmwhs4k8ih566fkhyzj02"; } else if stdenv.hostPlatform.system == "x86_64-darwin" then fetchurl { - url = "https://bintray.com/jetbrains/intellij-jdk/download_file?file_path=jbrsdk-11_0_2-osx-x64-b${version}.tar.gz"; - sha256 = "1ly6kf59knvzbr2pjkc9fqyzfs28pdvnqg5pfffr8zp14xm44zmd"; + url = "https://bintray.com/jetbrains/intellij-jbr/download_file?file_path=jbrsdk-11_0_5-osx-x64-b${version}.tar.gz"; + sha256 = "0wfcw66wv5rkkjzyzi9j7zk7c2fgi33ny09drgihxi2kdzyfrpcb"; } else throw "unsupported system: ${stdenv.hostPlatform.system}"; diff --git a/pkgs/development/compilers/scala/2.11.nix b/pkgs/development/compilers/scala/2.11.nix index a1f803b6719..db1a8f4edca 100644 --- a/pkgs/development/compilers/scala/2.11.nix +++ b/pkgs/development/compilers/scala/2.11.nix @@ -16,6 +16,11 @@ stdenv.mkDerivation rec { rm "bin/"*.bat mv * $out + # put docs in correct subdirectory + mkdir -p $out/share/doc + mv $out/doc $out/share/doc/${name} + mv $out/man $out/share/man + for p in $(ls $out/bin/) ; do wrapProgram $out/bin/$p \ --prefix PATH ":" ${coreutils}/bin \ diff --git a/pkgs/development/compilers/scala/2.12.nix b/pkgs/development/compilers/scala/2.12.nix index 9e11daced4a..3f61669b938 100644 --- a/pkgs/development/compilers/scala/2.12.nix +++ b/pkgs/development/compilers/scala/2.12.nix @@ -19,6 +19,7 @@ stdenv.mkDerivation rec { # put docs in correct subdirectory mkdir -p $out/share/doc mv $out/doc $out/share/doc/scala + mv $out/{LICENSE,NOTICE} $out/share/doc/scala for p in $(ls $out/bin/) ; do wrapProgram $out/bin/$p \ diff --git a/pkgs/development/compilers/scala/2.13.nix b/pkgs/development/compilers/scala/2.13.nix index 6bba11af9d4..b140d4e2a2d 100644 --- a/pkgs/development/compilers/scala/2.13.nix +++ b/pkgs/development/compilers/scala/2.13.nix @@ -19,6 +19,7 @@ stdenv.mkDerivation rec { # put docs in correct subdirectory mkdir -p $out/share/doc mv $out/doc $out/share/doc/scala + mv $out/{LICENSE,NOTICE} $out/share/doc/scala for p in $(ls $out/bin/) ; do wrapProgram $out/bin/$p \ diff --git a/pkgs/development/compilers/unison/default.nix b/pkgs/development/compilers/unison/default.nix index 2a8c07fa0fe..c24786cd9a0 100644 --- a/pkgs/development/compilers/unison/default.nix +++ b/pkgs/development/compilers/unison/default.nix @@ -4,18 +4,18 @@ stdenv.mkDerivation rec { pname = "unison-code-manager"; - milestone_id = "M1g"; + milestone_id = "M1h"; version = "1.0.${milestone_id}-alpha"; src = if (stdenv.isDarwin) then fetchurl { url = "https://github.com/unisonweb/unison/releases/download/release/${milestone_id}/unison-osx.tar.gz"; - sha256 = "186y7y7ffg976w01cbb8am84ajbifb7lcnsc4g3x262mkswr7lry"; + sha256 = "0iivm5gmbk0fq0zr3lvck6p1c2i7i54l3rf70z677529w9irzchp"; } else fetchurl { url = "https://github.com/unisonweb/unison/releases/download/release/${milestone_id}/unison-linux64.tar.gz"; - sha256 = "1ki9car1clpaspnl5jb5qnr6nzv108q279n8m8bjm8azfcnl61ab"; + sha256 = "0fb84c1yn8pidflh7kq696j3v4blkvbk1fsqp36h30p7vv676yci"; }; # The tarball is just the prebuilt binary, in the archive root. diff --git a/pkgs/development/interpreters/evcxr/default.nix b/pkgs/development/interpreters/evcxr/default.nix index 1cc63788555..168b012efcc 100644 --- a/pkgs/development/interpreters/evcxr/default.nix +++ b/pkgs/development/interpreters/evcxr/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "evcxr"; - version = "0.4.6"; + version = "0.5.0"; src = fetchFromGitHub { owner = "google"; repo = "evcxr"; - rev = "v${version}"; - sha256 = "1yzvqf93zz3ncck4dyq2kayp408lm3h6fx0fb212j7h70mlzx984"; + rev = "239e431c58d04c641da22af791e4d3e1b894365e"; + sha256 = "0vkcis06gwsqfwvrl8xcf74mfcs6j77b9fhcz5rrh77mwl7ixsdc"; }; - cargoSha256 = "0g17g12isah4nkqp9i299qr1sz19k4czcc43rm1wbs0y9szaqvwc"; + cargoSha256 = "04wffj2y9pqyk0x3y6ghp06pggmxnk2h245iabqq0mpwx36fd8b6"; nativeBuildInputs = [ pkgconfig makeWrapper cmake ]; buildInputs = stdenv.lib.optional stdenv.isDarwin Security; diff --git a/pkgs/development/interpreters/perl/wrapper.nix b/pkgs/development/interpreters/perl/wrapper.nix index 95122aebf03..2e3d394f851 100644 --- a/pkgs/development/interpreters/perl/wrapper.nix +++ b/pkgs/development/interpreters/perl/wrapper.nix @@ -35,7 +35,7 @@ let if [ -f "$prg" ]; then rm -f "$out/bin/$prg" if [ -x "$prg" ]; then - makeWrapper "$path/bin/$prg" "$out/bin/$prg" --set PERL5LIB "$out/${perl.libPrefix}" + makeWrapper "$path/bin/$prg" "$out/bin/$prg" --suffix PERL5LIB ':' "$out/${perl.libPrefix}" fi fi done diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index caf2e13bdf6..4811c8ec48e 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -158,9 +158,11 @@ in { }; sha256 = "0yq6ln1ic476sasp8zs4mg5i9524l1p96qwanp486rr1yza1grlg"; pythonVersion = "2.7"; - db = db.override { dbmSupport = true; }; + db = db.override { dbmSupport = !stdenv.isDarwin; }; python = python27; inherit passthruFun; + inherit (darwin) libunwind; + inherit (darwin.apple_sdk.frameworks) Security; }; pypy36 = callPackage ./pypy { @@ -172,9 +174,11 @@ in { }; sha256 = "1hqvnran7d2dzj5555n7q680dyzhmbklz04pvkxgb5j604v7kkx1"; pythonVersion = "3.6"; - db = db.override { dbmSupport = true; }; + db = db.override { dbmSupport = !stdenv.isDarwin; }; python = python27; inherit passthruFun; + inherit (darwin) libunwind; + inherit (darwin.apple_sdk.frameworks) Security; }; pypy27_prebuilt = callPackage ./pypy/prebuilt.nix { diff --git a/pkgs/development/interpreters/python/pypy/default.nix b/pkgs/development/interpreters/python/pypy/default.nix index b220bfa0f93..0c4f3eda7b1 100644 --- a/pkgs/development/interpreters/python/pypy/default.nix +++ b/pkgs/development/interpreters/python/pypy/default.nix @@ -1,5 +1,5 @@ { stdenv, substituteAll, fetchurl -, zlib ? null, zlibSupport ? true, bzip2, pkgconfig, libffi +, zlib ? null, zlibSupport ? true, bzip2, pkgconfig, libffi, libunwind, Security , sqlite, openssl_1_0_2, ncurses, python, expat, tcl, tk, tix, xlibsWrapper, libX11 , self, gdbm, db, lzma , python-setup-hook @@ -47,6 +47,8 @@ in with passthru; stdenv.mkDerivation rec { stdenv.cc.libc ] ++ optionals zlibSupport [ zlib + ] ++ optionals stdenv.isDarwin [ + libunwind Security ]; hardeningDisable = optional stdenv.isi686 "pic"; @@ -127,13 +129,17 @@ in with passthru; stdenv.mkDerivation rec { mkdir -p $out/{bin,include,lib,${executable}-c} cp -R {include,lib_pypy,lib-python,${executable}-c} $out/${executable}-c - cp lib${executable}-c.so $out/lib/ + cp lib${executable}-c${stdenv.hostPlatform.extensions.sharedLibrary} $out/lib/ ln -s $out/${executable}-c/${executable}-c $out/bin/${executable} # other packages expect to find stuff according to libPrefix ln -s $out/${executable}/include $out/include/${libPrefix} ln -s $out/${executable}-c/lib-python/${if isPy3k then "3" else pythonVersion} $out/lib/${libPrefix} + ${stdenv.lib.optionalString stdenv.isDarwin '' + install_name_tool -change @rpath/libpypy${optionalString isPy3k "3"}-c.dylib $out/lib/libpypy${optionalString isPy3k "3"}-c.dylib $out/bin/${executable} + ''} + # verify cffi modules $out/bin/${executable} -c ${if isPy3k then "'import tkinter;import sqlite3;import curses;import lzma'" else "'import Tkinter;import sqlite3;import curses'"} diff --git a/pkgs/development/interpreters/python/pypy/tk_tcl_paths.patch b/pkgs/development/interpreters/python/pypy/tk_tcl_paths.patch index 92bbfc557b3..0b78caf7e07 100644 --- a/pkgs/development/interpreters/python/pypy/tk_tcl_paths.patch +++ b/pkgs/development/interpreters/python/pypy/tk_tcl_paths.patch @@ -1,6 +1,13 @@ --- pypy-pypy-84a2f3e6a7f8.org/lib_pypy/_tkinter/tklib_build.py 2017-10-03 11:49:20.000000000 +0100 +++ pypy-pypy-84a2f3e6a7f8/lib_pypy/_tkinter/tklib_build.py 2017-11-21 13:20:51.398607530 +0000 -@@ -24,11 +24,11 @@ +@@ -17,18 +17,14 @@ + incdirs = [] + linklibs = ['tcl85', 'tk85'] + libdirs = [] +-elif sys.platform == 'darwin': +- incdirs = ['/System/Library/Frameworks/Tk.framework/Versions/Current/Headers/'] +- linklibs = ['tcl', 'tk'] +- libdirs = [] else: # On some Linux distributions, the tcl and tk libraries are # stored in /usr/include, so we must check this case also diff --git a/pkgs/development/libraries/audio/sratom/default.nix b/pkgs/development/libraries/audio/sratom/default.nix index d7353af0d3d..840b50d788f 100644 --- a/pkgs/development/libraries/audio/sratom/default.nix +++ b/pkgs/development/libraries/audio/sratom/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "sratom"; - version = "0.6.2"; + version = "0.6.4"; src = fetchurl { url = "https://download.drobilla.net/${pname}-${version}.tar.bz2"; - sha256 = "0lz883ravxjf7r9wwbx2gx9m8vhyiavxrl9jdxfppjxnsralll8a"; + sha256 = "0vh0biy3ngpzzgdml309c2mqz8xq9q0hlblczb4c6alhp0a8yv0l"; }; nativeBuildInputs = [ pkgconfig wafHook python3 ]; diff --git a/pkgs/development/libraries/babl/default.nix b/pkgs/development/libraries/babl/default.nix index c4b1d36ce70..5a579a0505b 100644 --- a/pkgs/development/libraries/babl/default.nix +++ b/pkgs/development/libraries/babl/default.nix @@ -9,21 +9,15 @@ stdenv.mkDerivation rec { pname = "babl"; - version = "0.1.72"; + version = "0.1.74"; outputs = [ "out" "dev" ]; src = fetchurl { url = "https://download.gimp.org/pub/babl/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0hkagjrnza77aasa1kss5hvy37ndm50y6i7hkdn2z8hzgc4i3qb4"; + sha256 = "03nfcvy3453xkfvsfcnsfcjf2vg2pin09qnr9jlssdysa1lhnwcs"; }; - patches = [ - # Apple linker does not know --version-script flag - # https://gitlab.gnome.org/GNOME/babl/merge_requests/26 - ./fix-darwin.patch - ]; - nativeBuildInputs = [ meson ninja diff --git a/pkgs/development/libraries/babl/fix-darwin.patch b/pkgs/development/libraries/babl/fix-darwin.patch deleted file mode 100644 index eaeff63689f..00000000000 --- a/pkgs/development/libraries/babl/fix-darwin.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/babl/meson.build b/babl/meson.build -index b551c9a..f452435 100644 ---- a/babl/meson.build -+++ b/babl/meson.build -@@ -24,9 +24,9 @@ - ] - - # Linker arguments --babl_link_args = [ -+babl_link_args = cc.get_supported_link_arguments([ - '-Wl,--version-script,' + version_script, --] -+]) - if platform_win32 - babl_link_args += '-Wl,--no-undefined' - endif diff --git a/pkgs/development/libraries/cppzmq/default.nix b/pkgs/development/libraries/cppzmq/default.nix index ccf38fa09fb..78cefe89e3b 100644 --- a/pkgs/development/libraries/cppzmq/default.nix +++ b/pkgs/development/libraries/cppzmq/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "cppzmq"; - version = "4.5.0"; + version = "4.6.0"; src = fetchFromGitHub { owner = "zeromq"; repo = "cppzmq"; rev = "v${version}"; - sha256 = "1n34sj322ay8839q6cxivckkrhz9avy31615i5jdxfal06mgya43"; + sha256 = "19acx2bzi4n6fdnfgkja1nds7m1bwg8lw5vfcijrx9fv75pa7m8h"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/dnnl/bash-to-sh.patch b/pkgs/development/libraries/dnnl/bash-to-sh.patch new file mode 100644 index 00000000000..063d9ef952b --- /dev/null +++ b/pkgs/development/libraries/dnnl/bash-to-sh.patch @@ -0,0 +1,13 @@ +diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt +index f6810246..e1d2a1f1 100644 +--- a/tests/CMakeLists.txt ++++ b/tests/CMakeLists.txt +@@ -72,7 +72,7 @@ if(UNIX OR MINGW) + set(test_c_symbols "${CMAKE_CURRENT_BINARY_DIR}/test_c_symbols.c") + add_custom_command( + OUTPUT ${test_c_symbols} +- COMMAND /bin/bash ${CMAKE_CURRENT_SOURCE_DIR}/generate_c_symbols_refs.sh ++ COMMAND @bash@/bin/bash ${CMAKE_CURRENT_SOURCE_DIR}/generate_c_symbols_refs.sh + ${CMAKE_CURRENT_SOURCE_DIR}/.. ${test_c_symbols} ${include_dirs} + ) + register_exe(test_c_symbols-c ${test_c_symbols} "test") diff --git a/pkgs/development/libraries/dnnl/default.nix b/pkgs/development/libraries/dnnl/default.nix new file mode 100644 index 00000000000..8a02ea1598c --- /dev/null +++ b/pkgs/development/libraries/dnnl/default.nix @@ -0,0 +1,39 @@ +{ stdenv, lib, fetchFromGitHub, substituteAll, cmake, bash }: + +stdenv.mkDerivation rec { + pname = "dnnl"; + version = "1.1.2"; + + src = fetchFromGitHub { + owner = "intel"; + repo = "mkl-dnn"; + rev = "v${version}"; + sha256 = "150cdyfiw4izvzmbmdqidwadppb1qjmzhpaqjczm397ygi1m92l1"; + }; + + # Generic fix upstreamed in https://github.com/intel/mkl-dnn/pull/631 + # Delete patch when 1.2.0 is released + patches = [ (substituteAll { + src = ./bash-to-sh.patch; + inherit bash; + }) ]; + + outputs = [ "out" "dev" "doc" ]; + + nativeBuildInputs = [ cmake ]; + + # The test driver doesn't add an RPath to the build libdir + preCheck = '' + export LD_LIBRARY_PATH=$PWD/src + ''; + + doCheck = true; + + meta = with lib; { + description = "Deep Neural Network Library (DNNL)"; + homepage = "https://intel.github.io/mkl-dnn/dev_guide_transition_to_dnnl.html"; + license = licenses.asl20; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ alexarice bhipple ]; + }; +} diff --git a/pkgs/development/libraries/gcab/default.nix b/pkgs/development/libraries/gcab/default.nix index c05bb95913e..9946ebc05a5 100644 --- a/pkgs/development/libraries/gcab/default.nix +++ b/pkgs/development/libraries/gcab/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "gcab"; - version = "1.3"; + version = "1.4"; outputs = [ "bin" "out" "dev" "devdoc" "installedTests" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1rv81b37d5ya7xpfdxrfk173jjcwabxyng7vafgwyl5myv44qc0h"; + sha256 = "13q43iqld4l50yra45lhvkd376pn6qpk7rkx374zn8y9wsdzm9b7"; }; patches = [ diff --git a/pkgs/development/libraries/gegl/4.0.nix b/pkgs/development/libraries/gegl/4.0.nix index b3e8ec2e178..45f2c96dffe 100644 --- a/pkgs/development/libraries/gegl/4.0.nix +++ b/pkgs/development/libraries/gegl/4.0.nix @@ -33,37 +33,17 @@ stdenv.mkDerivation rec { pname = "gegl"; - version = "0.4.18"; + version = "0.4.20"; outputs = [ "out" "dev" "devdoc" ]; outputBin = "dev"; src = fetchurl { url = "https://download.gimp.org/pub/gegl/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0r6akqnrkvxizyhyi8sv40mxm7j4bcwjb6mqjpxy0zzbbfsdyin9"; + sha256 = "1zrxnxlhn0jmshg4n2m2xlgi886w059ynkiiihm7rpi05fs8pg93"; }; patches = [ - # Fix arch detection. - # https://gitlab.gnome.org/GNOME/gegl/merge_requests/53 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gegl/commit/6bcf95fd0f32cf5e8b1ddbe17b14d9ad049bded8.patch"; - sha256 = "0aqdr3y5mr47wq44jnhp97188bvpjlf56zrlmn8aazdf07r2apma"; - }) - - # Fix Darwin build. - # https://gitlab.gnome.org/GNOME/gegl/merge_requests/54 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gegl/commit/2bc06bfedee4fb25f6a966c8235b75292e24e55f.patch"; - sha256 = "1psls61wsrdq5pzpvj22mrm46lpzrw3wkx6li7dv6fyb65wz2n4d"; - }) - - # Fix test timeout. Downstream debian patch. - (fetchpatch { - url = "https://salsa.debian.org/gnome-team/gegl/raw/9b7520b38d87cd8ad4b39bf0b8c62d011da25169/debian/patches/increase_test_timeout.patch"; - sha256 = "1prc1h1aipjd9db0i1j7nzga4zvk3vl8qsjpz1jzv1wwvz02isly"; - }) - # Remove gegl:simple / backend-file test that times out frequently ./patches/no-simple-backend-file-test.patch ]; diff --git a/pkgs/development/libraries/gensio/default.nix b/pkgs/development/libraries/gensio/default.nix new file mode 100644 index 00000000000..20e2f6905ce --- /dev/null +++ b/pkgs/development/libraries/gensio/default.nix @@ -0,0 +1,27 @@ +{ stdenv, lib, fetchFromGitHub, autoreconfHook }: + +stdenv.mkDerivation rec { + pname = "gensio"; + version = "1.3.3"; + + src = fetchFromGitHub { + owner = "cminyard"; + repo = "${pname}"; + rev = "v${version}"; + sha256 = "04yrm3kg8m77kh6z0b9yw4h43fm0d54wnyrd8lp5ddn487kawm5g"; + }; + + configureFlags = [ + "--with-python=no" + ]; + + buildInputs = [ autoreconfHook ]; + + meta = with lib; { + description = "General Stream I/O"; + homepage = "https://sourceforge.net/projects/ser2net/"; + license = licenses.gpl2; + maintainers = with maintainers; [ emantor ]; + platforms = with platforms; linux; + }; +} diff --git a/pkgs/development/libraries/olm/default.nix b/pkgs/development/libraries/olm/default.nix index 8fbdf28965b..f63d1d30f55 100644 --- a/pkgs/development/libraries/olm/default.nix +++ b/pkgs/development/libraries/olm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, cmake }: stdenv.mkDerivation rec { pname = "olm"; @@ -9,17 +9,9 @@ stdenv.mkDerivation rec { sha256 = "0f7azjxc77n4ib9nj3cwyk3vhk8r2dsyf7id6nvqyxqxwxn95a8w"; }; - doCheck = true; - checkTarget = "test"; - - # requires optimisation but memory operations are compiled with -O0 - hardeningDisable = ["fortify"]; + nativeBuildInputs = [ cmake ]; - makeFlags = stdenv.lib.optional stdenv.cc.isClang "CC=cc"; - - installFlags = [ - "PREFIX=${placeholder ''out''}" - ]; + doCheck = true; meta = { description = "Implements double cryptographic ratchet and Megolm ratchet"; diff --git a/pkgs/development/libraries/physics/cernlib/default.nix b/pkgs/development/libraries/physics/cernlib/default.nix index 2a1846e40a6..bd43ae44204 100644 --- a/pkgs/development/libraries/physics/cernlib/default.nix +++ b/pkgs/development/libraries/physics/cernlib/default.nix @@ -5,7 +5,10 @@ stdenv.mkDerivation rec { pname = "cernlib"; src = fetchurl { - url = "https://cernlib.web.cern.ch/cernlib/download/${version}_source/tar/${version}_src.tar.gz"; + urls = [ + "https://ftp.riken.jp/cernlib/download/${version}_source/tar/${version}_src.tar.gz" + "https://cernlib.web.cern.ch/cernlib/download/${version}_source/tar/${version}_src.tar.gz" + ]; sha256 = "0awla1rl96z82br7slcmg8ks1d2a7slk6dj79ywb871j2ksi3fky"; }; diff --git a/pkgs/development/libraries/pyotherside/default.nix b/pkgs/development/libraries/pyotherside/default.nix index a7f5e03c738..002208dcc0b 100644 --- a/pkgs/development/libraries/pyotherside/default.nix +++ b/pkgs/development/libraries/pyotherside/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "pyotherside"; - version = "1.5.8"; + version = "1.5.9"; src = fetchFromGitHub { owner = "thp"; repo = "pyotherside"; rev = version; - sha256 = "0dnsvyg990ln3bdjdyc5b4lbb63wcjij0skq8pb4x4jglfy7vz4z"; + sha256 = "1k1fdsinysgx5gp6q62jiwcyiklakmjv6wbi1s2659am96vz3zj8"; }; nativeBuildInputs = [ qmake ]; diff --git a/pkgs/development/libraries/qtutilities/default.nix b/pkgs/development/libraries/qtutilities/default.nix index b6f424ee35c..94e83c883c4 100644 --- a/pkgs/development/libraries/qtutilities/default.nix +++ b/pkgs/development/libraries/qtutilities/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "qtutilities"; - version = "6.0.2"; + version = "6.0.3"; src = fetchFromGitHub { owner = "Martchus"; repo = pname; rev = "v${version}"; - sha256 = "1hsi6c1466m5lgh8ayhf3hj4ddy6ambraagzgvvy7g370z4mx2yw"; + sha256 = "184lcw56r0hq3d6msy5ccscs01zhvml7m4w56wbvy9lzcc4sk200"; }; buildInputs = [ qtbase cpp-utilities ]; diff --git a/pkgs/development/libraries/science/math/m4ri/default.nix b/pkgs/development/libraries/science/math/m4ri/default.nix index 764901adf7b..50e0c576e69 100644 --- a/pkgs/development/libraries/science/math/m4ri/default.nix +++ b/pkgs/development/libraries/science/math/m4ri/default.nix @@ -4,14 +4,14 @@ }: stdenv.mkDerivation rec { - version = "20140914"; + version = "20200115"; pname = "m4ri"; src = fetchFromBitbucket { owner = "malb"; repo = "m4ri"; rev = "release-${version}"; - sha256 = "0xfg6pffbn8r1s0y7bn9b8i55l00d41dkmhrpf7pwk53qa3achd3"; + sha256 = "1c17casrw6dvwj067kfcgyjjajfisz56s30wjv7fwaw55mqrny19"; }; doCheck = true; diff --git a/pkgs/development/libraries/science/math/m4rie/default.nix b/pkgs/development/libraries/science/math/m4rie/default.nix index 6a91230002a..6a7ecdf46fd 100644 --- a/pkgs/development/libraries/science/math/m4rie/default.nix +++ b/pkgs/development/libraries/science/math/m4rie/default.nix @@ -5,14 +5,14 @@ }: stdenv.mkDerivation rec { - version = "20150908"; + version = "20200115"; pname = "m4rie"; src = fetchFromBitbucket { owner = "malb"; repo = "m4rie"; rev = "release-${version}"; - sha256 = "0r8lv46qx5mkz5kp3ay2jnsp0mbhlqr5z2z220wdk73wdshcznss"; + sha256 = "0s8if80x5d6mikbcfsbbxg347136spahp9f3x8i1hflbwl8xj9k8"; }; doCheck = true; diff --git a/pkgs/development/libraries/serd/default.nix b/pkgs/development/libraries/serd/default.nix index c390603c51d..63af0d40781 100644 --- a/pkgs/development/libraries/serd/default.nix +++ b/pkgs/development/libraries/serd/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "serd"; - version = "0.30.0"; + version = "0.30.2"; src = fetchurl { url = "https://download.drobilla.net/${pname}-${version}.tar.bz2"; - sha256 = "1yyfyvc6kwagi5w43ljp1bbjdvdpmgpds74lmjxycm91bkx0xyvf"; + sha256 = "00kjjgs5a8r72khgpya14scvl3n58wqwl5927y14z03j25q04ccx"; }; nativeBuildInputs = [ pkgconfig python3 wafHook ]; diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix index d1e171566ee..8d1129c1168 100644 --- a/pkgs/development/libraries/webkitgtk/default.nix +++ b/pkgs/development/libraries/webkitgtk/default.nix @@ -61,13 +61,13 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "webkitgtk"; - version = "2.26.2"; + version = "2.26.3"; outputs = [ "out" "dev" ]; src = fetchurl { url = "https://webkitgtk.org/releases/${pname}-${version}.tar.xz"; - sha256 = "04k5h0sid9azsqz9pyq436v1rx4lnfrhvmcgmicqb0c0g9iz103b"; + sha256 = "04g6y0sv04d20bw401myq3k828ikysjhx383ly81vh9wji9i3mdd"; }; patches = optionals stdenv.isLinux [ diff --git a/pkgs/development/libraries/wlroots/default.nix b/pkgs/development/libraries/wlroots/default.nix index a567e66285c..9f9c4acb0d8 100644 --- a/pkgs/development/libraries/wlroots/default.nix +++ b/pkgs/development/libraries/wlroots/default.nix @@ -1,29 +1,20 @@ { stdenv, fetchFromGitHub, meson, ninja, pkgconfig, fetchpatch , wayland, libGL, wayland-protocols, libinput, libxkbcommon, pixman , xcbutilwm, libX11, libcap, xcbutilimage, xcbutilerrors, mesa -, libpng, ffmpeg_4, freerdp +, libpng, ffmpeg_4 }: stdenv.mkDerivation rec { pname = "wlroots"; - version = "0.8.1"; + version = "0.10.0"; src = fetchFromGitHub { owner = "swaywm"; repo = "wlroots"; rev = version; - sha256 = "1ak86kx617c81dy85wg9rldy1z3n8ch93cjc05a4j6sifv0nkyfm"; + sha256 = "0c0q1p9yss5kx4430ik3n89drqpmm2bvgl8fjlf6prac1a7xzqn8"; }; - patches = [ - # add missing header that changed in mesa-19.2.2 - # https://github.com/swaywm/wlroots/issues/1862 - (fetchpatch { - url = "https://github.com/swaywm/wlroots/commit/d113e48a2a32542fe6e12f1759f07888364609bf.diff"; - sha256 = "1h09j1gmnzlz4py92a92chgy8xzsd8h8xn5irq9s2hq4cla66h87"; - }) - ]; - # $out for the library and $examples for the example programs (in examples): outputs = [ "out" "examples" ]; @@ -32,7 +23,7 @@ stdenv.mkDerivation rec { buildInputs = [ wayland libGL wayland-protocols libinput libxkbcommon pixman xcbutilwm libX11 libcap xcbutilimage xcbutilerrors mesa - libpng ffmpeg_4 freerdp + libpng ffmpeg_4 ]; mesonFlags = [ diff --git a/pkgs/development/node-packages/node-packages-v12.json b/pkgs/development/node-packages/node-packages-v12.json index 3acee415864..01f36b015ca 100644 --- a/pkgs/development/node-packages/node-packages-v12.json +++ b/pkgs/development/node-packages/node-packages-v12.json @@ -1,6 +1,9 @@ [ - "nijs" -, "coffee-script" + "coffee-script" , "grunt-cli" +, "nijs" , "node2nix" +, "node-gyp" +, "node-gyp-build" +, "node-pre-gyp" ] diff --git a/pkgs/development/node-packages/node-packages-v12.nix b/pkgs/development/node-packages/node-packages-v12.nix index f4cba080a61..08122a11ee2 100644 --- a/pkgs/development/node-packages/node-packages-v12.nix +++ b/pkgs/development/node-packages/node-packages-v12.nix @@ -157,13 +157,13 @@ let sha1 = "b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"; }; }; - "aws4-1.9.0" = { + "aws4-1.9.1" = { name = "aws4"; packageName = "aws4"; - version = "1.9.0"; + version = "1.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/aws4/-/aws4-1.9.0.tgz"; - sha512 = "Uvq6hVe90D0B2WEnUqtdgY1bATGz3mw33nH9Y+dmA+w5DHvUmBgkr5rM/KCHpCsiFNRUfokW/szpPPgMK2hm4A=="; + url = "https://registry.npmjs.org/aws4/-/aws4-1.9.1.tgz"; + sha512 = "wMHVg2EOHaMRxbzgFJ9gtjOOCrI80OHLG14rxi28XwOW8ux6IiEbRCGGGqCtdAIg4FQCbW20k9RsT4y3gJlFug=="; }; }; "balanced-match-1.0.0" = { @@ -382,6 +382,15 @@ let sha512 = "bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA=="; }; }; + "debug-3.2.6" = { + name = "debug"; + packageName = "debug"; + version = "3.2.6"; + src = fetchurl { + url = "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz"; + sha512 = "mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ=="; + }; + }; "decode-uri-component-0.2.0" = { name = "decode-uri-component"; packageName = "decode-uri-component"; @@ -391,6 +400,15 @@ let sha1 = "eb3913333458775cb84cd1a1fae062106bb87545"; }; }; + "deep-extend-0.6.0" = { + name = "deep-extend"; + packageName = "deep-extend"; + version = "0.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz"; + sha512 = "LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA=="; + }; + }; "define-property-0.2.5" = { name = "define-property"; packageName = "define-property"; @@ -445,6 +463,15 @@ let sha1 = "f0d66d03672a825cb1b73bdb3fe62310c8e552b7"; }; }; + "detect-libc-1.0.3" = { + name = "detect-libc"; + packageName = "detect-libc"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz"; + sha1 = "fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"; + }; + }; "ecc-jsbn-0.1.2" = { name = "ecc-jsbn"; packageName = "ecc-jsbn"; @@ -454,6 +481,15 @@ let sha1 = "3a83a904e54353287874c564b7549386849a98c9"; }; }; + "env-paths-2.2.0" = { + name = "env-paths"; + packageName = "env-paths"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/env-paths/-/env-paths-2.2.0.tgz"; + sha512 = "6u0VYSCo/OW6IoD5WCLLy9JUGARbamfSavcNXry/eu8aHVFei6CD3Sw+VGX5alea1i9pgPHW0mbu6Xj0uBh7gA=="; + }; + }; "expand-brackets-2.1.4" = { name = "expand-brackets"; packageName = "expand-brackets"; @@ -832,6 +868,24 @@ let sha1 = "9aecd925114772f3d95b65a60abb8f7c18fbace1"; }; }; + "iconv-lite-0.4.24" = { + name = "iconv-lite"; + packageName = "iconv-lite"; + version = "0.4.24"; + src = fetchurl { + url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz"; + sha512 = "v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA=="; + }; + }; + "ignore-walk-3.0.3" = { + name = "ignore-walk"; + packageName = "ignore-walk"; + version = "3.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.3.tgz"; + sha512 = "m7o6xuOaT1aqheYHKf8W6J5pYH85ZI9w077erOzLje3JsB1gkafkAhHHY19dqjulgIZHFm32Cp5uNZgcQqdJKw=="; + }; + }; "inflight-1.0.6" = { name = "inflight"; packageName = "inflight"; @@ -1165,13 +1219,13 @@ let sha512 = "NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw=="; }; }; - "kind-of-6.0.2" = { + "kind-of-6.0.3" = { name = "kind-of"; packageName = "kind-of"; - version = "6.0.2"; + version = "6.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz"; - sha512 = "s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA=="; + url = "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz"; + sha512 = "dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw=="; }; }; "liftoff-2.5.0" = { @@ -1219,22 +1273,22 @@ let sha512 = "MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg=="; }; }; - "mime-db-1.42.0" = { + "mime-db-1.43.0" = { name = "mime-db"; packageName = "mime-db"; - version = "1.42.0"; + version = "1.43.0"; src = fetchurl { - url = "https://registry.npmjs.org/mime-db/-/mime-db-1.42.0.tgz"; - sha512 = "UbfJCR4UAVRNgMpfImz05smAXK7+c+ZntjaA26ANtkXLlOe947Aag5zdIcKQULAiF9Cq4WxBi9jUs5zkA84bYQ=="; + url = "https://registry.npmjs.org/mime-db/-/mime-db-1.43.0.tgz"; + sha512 = "+5dsGEEovYbT8UY9yD7eE4XTc4UwJ1jBYlgaQQF38ENsKR3wj/8q8RFZrF9WIZpB2V1ArTVFUva8sAul1NzRzQ=="; }; }; - "mime-types-2.1.25" = { + "mime-types-2.1.26" = { name = "mime-types"; packageName = "mime-types"; - version = "2.1.25"; + version = "2.1.26"; src = fetchurl { - url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.25.tgz"; - sha512 = "5KhStqB5xpTAeGqKBAMgwaYMnQik7teQN4IAzC7npDv6kzeU6prfkR67bc87J1kWMPGkoaZSq1npmexMgkmEVg=="; + url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.26.tgz"; + sha512 = "01paPWYgLrkqAyrlDorC1uDwl2p3qZT7yl806vW7DvDoxwXi46jsjFbg+WdwotBIk6/MbEhO/dh5aZ5sNj/dWQ=="; }; }; "minimatch-3.0.4" = { @@ -1255,6 +1309,15 @@ let sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d"; }; }; + "minimist-1.2.0" = { + name = "minimist"; + packageName = "minimist"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz"; + sha1 = "a35008b20f41383eec1fb914f4cd5df79a264284"; + }; + }; "minipass-2.9.0" = { name = "minipass"; packageName = "minipass"; @@ -1309,6 +1372,15 @@ let sha1 = "5608aeadfc00be6c2901df5f9861788de0d597c8"; }; }; + "ms-2.1.2" = { + name = "ms"; + packageName = "ms"; + version = "2.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz"; + sha512 = "sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="; + }; + }; "nanomatch-1.2.13" = { name = "nanomatch"; packageName = "nanomatch"; @@ -1327,6 +1399,15 @@ let sha1 = "abcc6cbd3ec2ed2a729ff6e7c1fa8f01784a8574"; }; }; + "needle-2.4.0" = { + name = "needle"; + packageName = "needle"; + version = "2.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/needle/-/needle-2.4.0.tgz"; + sha512 = "4Hnwzr3mi5L97hMYeNl8wRW/Onhy4nUKR/lVemJ8gJedxxUyBLm9kkrDColJvoSfwi0jCNhD+xCdOtiGDQiRZg=="; + }; + }; "nijs-0.0.25" = { name = "nijs"; packageName = "nijs"; @@ -1363,6 +1444,24 @@ let sha512 = "/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA=="; }; }; + "npm-bundled-1.1.1" = { + name = "npm-bundled"; + packageName = "npm-bundled"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.1.1.tgz"; + sha512 = "gqkfgGePhTpAEgUsGEgcq1rqPXA+tv/aVBlgEzfXwA1yiUJF7xtEt3CtVwOjNYQOVknDk0F20w58Fnm3EtG0fA=="; + }; + }; + "npm-normalize-package-bin-1.0.1" = { + name = "npm-normalize-package-bin"; + packageName = "npm-normalize-package-bin"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz"; + sha512 = "EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA=="; + }; + }; "npm-package-arg-6.1.1" = { name = "npm-package-arg"; packageName = "npm-package-arg"; @@ -1372,6 +1471,15 @@ let sha512 = "qBpssaL3IOZWi5vEKUKW0cO7kzLeT+EQO9W8RsLOZf76KF9E/K9+wH0C7t06HXPpaH8WH5xF1MExLuCwbTqRUg=="; }; }; + "npm-packlist-1.4.7" = { + name = "npm-packlist"; + packageName = "npm-packlist"; + version = "1.4.7"; + src = fetchurl { + url = "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.4.7.tgz"; + sha512 = "vAj7dIkp5NhieaGZxBJB8fF4R0078rqsmhJcAfXZ6O7JJhjhPK96n5Ry1oZcfLXgfun0GWTZPOxaEyqv8GBykQ=="; + }; + }; "npm-registry-client-8.6.0" = { name = "npm-registry-client"; packageName = "npm-registry-client"; @@ -1624,13 +1732,13 @@ let sha1 = "212d5bfe1318306a420f6402b8e26ff39647a849"; }; }; - "psl-1.6.0" = { + "psl-1.7.0" = { name = "psl"; packageName = "psl"; - version = "1.6.0"; + version = "1.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/psl/-/psl-1.6.0.tgz"; - sha512 = "SYKKmVel98NCOYXpkwUqZqh0ahZeeKfmisiLIcEZdsb+WbLv02g/dI5BUmZnIyOe7RzZtLax81nnb2HbvC2tzA=="; + url = "https://registry.npmjs.org/psl/-/psl-1.7.0.tgz"; + sha512 = "5NsSEDv8zY70ScRnOTn7bK7eanl2MvFrOrS/R6x+dBt5g1ghnj9Zv90kO8GwT8gxcu2ANyFprnFYB85IogIJOQ=="; }; }; "punycode-1.4.1" = { @@ -1660,13 +1768,22 @@ let sha512 = "N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA=="; }; }; - "readable-stream-2.3.6" = { + "rc-1.2.8" = { + name = "rc"; + packageName = "rc"; + version = "1.2.8"; + src = fetchurl { + url = "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz"; + sha512 = "y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw=="; + }; + }; + "readable-stream-2.3.7" = { name = "readable-stream"; packageName = "readable-stream"; - version = "2.3.6"; + version = "2.3.7"; src = fetchurl { - url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz"; - sha512 = "tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw=="; + url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz"; + sha512 = "Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw=="; }; }; "rechoir-0.6.2" = { @@ -1714,13 +1831,13 @@ let sha512 = "NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg=="; }; }; - "resolve-1.14.1" = { + "resolve-1.14.2" = { name = "resolve"; packageName = "resolve"; - version = "1.14.1"; + version = "1.14.2"; src = fetchurl { - url = "https://registry.npmjs.org/resolve/-/resolve-1.14.1.tgz"; - sha512 = "fn5Wobh4cxbLzuHaE+nphztHy43/b++4M6SsGFC2gB8uYwf0C8LcarfCz1un7UTW8OFQg9iNjZ4xpcFVGebDPg=="; + url = "https://registry.npmjs.org/resolve/-/resolve-1.14.2.tgz"; + sha512 = "EjlOBLBO1kxsUxsKjLt7TAECyKW6fOh1VRkykQkKGzcBbjjPIxBqGh0jf7GJ3k/f5mxMqW3htMD3WdTUVtW8HQ=="; }; }; "resolve-dir-1.0.1" = { @@ -1777,6 +1894,15 @@ let sha512 = "mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA=="; }; }; + "rimraf-2.7.1" = { + name = "rimraf"; + packageName = "rimraf"; + version = "2.7.1"; + src = fetchurl { + url = "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz"; + sha512 = "uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w=="; + }; + }; "safe-buffer-5.1.2" = { name = "safe-buffer"; packageName = "safe-buffer"; @@ -1813,6 +1939,15 @@ let sha512 = "YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="; }; }; + "sax-1.2.4" = { + name = "sax"; + packageName = "sax"; + version = "1.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz"; + sha512 = "NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw=="; + }; + }; "semver-4.3.6" = { name = "semver"; packageName = "semver"; @@ -1921,13 +2056,13 @@ let sha1 = "8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"; }; }; - "source-map-resolve-0.5.2" = { + "source-map-resolve-0.5.3" = { name = "source-map-resolve"; packageName = "source-map-resolve"; - version = "0.5.2"; + version = "0.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.2.tgz"; - sha512 = "MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA=="; + url = "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.3.tgz"; + sha512 = "Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw=="; }; }; "source-map-url-0.4.0" = { @@ -2038,6 +2173,15 @@ let sha1 = "6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"; }; }; + "strip-json-comments-2.0.1" = { + name = "strip-json-comments"; + packageName = "strip-json-comments"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz"; + sha1 = "3c531942e908c2697c0ec344858c286c7ca0a60a"; + }; + }; "tar-4.4.13" = { name = "tar"; packageName = "tar"; @@ -2191,13 +2335,13 @@ let sha1 = "450d4dc9fa70de732762fbd2d4a28981419a0ccf"; }; }; - "uuid-3.3.3" = { + "uuid-3.4.0" = { name = "uuid"; packageName = "uuid"; - version = "3.3.3"; + version = "3.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/uuid/-/uuid-3.3.3.tgz"; - sha512 = "pW0No1RGHgzlpHJO1nsVrHKpOEIxkGg1xB+v0ZmdNH5OAeAwzAVrCnI2/6Mtx+Uys6iaylxa+D3g4j63IKKjSQ=="; + url = "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz"; + sha512 = "HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A=="; }; }; "v8flags-3.1.3" = { @@ -2284,28 +2428,6 @@ let }; in { - nijs = nodeEnv.buildNodePackage { - name = "nijs"; - packageName = "nijs"; - version = "0.0.25"; - src = fetchurl { - url = "https://registry.npmjs.org/nijs/-/nijs-0.0.25.tgz"; - sha1 = "04b035cb530d46859d1018839a518c029133f676"; - }; - dependencies = [ - sources."optparse-1.0.5" - sources."slasp-0.0.4" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "An internal DSL for the Nix package manager in JavaScript"; - homepage = "https://github.com/svanderburg/nijs#readme"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; coffee-script = nodeEnv.buildNodePackage { name = "coffee-script"; packageName = "coffee-script"; @@ -2452,7 +2574,7 @@ in sources."isarray-1.0.0" sources."isexe-2.0.0" sources."isobject-3.0.1" - sources."kind-of-6.0.2" + sources."kind-of-6.0.3" sources."liftoff-2.5.0" sources."make-iterator-1.0.1" sources."map-cache-0.2.2" @@ -2497,7 +2619,7 @@ in sources."regex-not-1.0.2" sources."repeat-element-1.1.3" sources."repeat-string-1.6.1" - sources."resolve-1.14.1" + sources."resolve-1.14.2" sources."resolve-dir-1.0.1" sources."resolve-url-0.2.1" sources."ret-0.1.15" @@ -2536,7 +2658,7 @@ in ]; }) sources."source-map-0.5.7" - sources."source-map-resolve-0.5.2" + sources."source-map-resolve-0.5.3" sources."source-map-url-0.4.0" sources."split-string-3.1.0" (sources."static-extend-0.1.2" // { @@ -2590,6 +2712,28 @@ in bypassCache = true; reconstructLock = true; }; + nijs = nodeEnv.buildNodePackage { + name = "nijs"; + packageName = "nijs"; + version = "0.0.25"; + src = fetchurl { + url = "https://registry.npmjs.org/nijs/-/nijs-0.0.25.tgz"; + sha1 = "04b035cb530d46859d1018839a518c029133f676"; + }; + dependencies = [ + sources."optparse-1.0.5" + sources."slasp-0.0.4" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "An internal DSL for the Nix package manager in JavaScript"; + homepage = "https://github.com/svanderburg/nijs#readme"; + license = "MIT"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; node2nix = nodeEnv.buildNodePackage { name = "node2nix"; packageName = "node2nix"; @@ -2608,7 +2752,7 @@ in sources."assert-plus-1.0.0" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.9.0" + sources."aws4-1.9.1" sources."balanced-match-1.0.0" sources."base64-js-1.3.1" sources."bcrypt-pbkdf-1.0.2" @@ -2671,8 +2815,8 @@ in sources."json-stringify-safe-5.0.1" sources."jsonfile-1.0.1" sources."jsprim-1.4.1" - sources."mime-db-1.42.0" - sources."mime-types-2.1.25" + sources."mime-db-1.43.0" + sources."mime-types-2.1.26" sources."minimatch-3.0.4" sources."minimist-0.0.8" sources."minipass-2.9.0" @@ -2716,16 +2860,16 @@ in sources."performance-now-2.1.0" sources."process-nextick-args-2.0.1" sources."proto-list-1.2.4" - sources."psl-1.6.0" + sources."psl-1.7.0" sources."punycode-2.1.1" sources."qs-6.5.2" - (sources."readable-stream-2.3.6" // { + (sources."readable-stream-2.3.7" // { dependencies = [ sources."safe-buffer-5.1.2" ]; }) sources."request-2.88.0" - sources."resolve-1.14.1" + sources."resolve-1.14.2" sources."retry-0.10.1" sources."rimraf-2.6.3" sources."safe-buffer-5.2.0" @@ -2761,7 +2905,7 @@ in sources."uid-number-0.0.5" sources."uri-js-4.2.2" sources."util-deprecate-1.0.2" - sources."uuid-3.3.3" + sources."uuid-3.4.0" sources."validate-npm-package-license-3.0.4" sources."validate-npm-package-name-3.0.0" sources."verror-1.10.0" @@ -2780,4 +2924,234 @@ in bypassCache = true; reconstructLock = true; }; + node-gyp = nodeEnv.buildNodePackage { + name = "node-gyp"; + packageName = "node-gyp"; + version = "6.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/node-gyp/-/node-gyp-6.1.0.tgz"; + sha512 = "h4A2zDlOujeeaaTx06r4Vy+8MZ1679lU+wbCKDS4ZtvY2A37DESo37oejIw0mtmR3+rvNwts5B6Kpt1KrNYdNw=="; + }; + dependencies = [ + sources."abbrev-1.1.1" + sources."ajv-6.10.2" + sources."ansi-regex-2.1.1" + sources."aproba-1.2.0" + sources."are-we-there-yet-1.1.5" + sources."asn1-0.2.4" + sources."assert-plus-1.0.0" + sources."asynckit-0.4.0" + sources."aws-sign2-0.7.0" + sources."aws4-1.9.1" + sources."balanced-match-1.0.0" + sources."bcrypt-pbkdf-1.0.2" + sources."brace-expansion-1.1.11" + sources."caseless-0.12.0" + sources."chownr-1.1.3" + sources."code-point-at-1.1.0" + sources."combined-stream-1.0.8" + sources."concat-map-0.0.1" + sources."console-control-strings-1.1.0" + sources."core-util-is-1.0.2" + sources."dashdash-1.14.1" + sources."delayed-stream-1.0.0" + sources."delegates-1.0.0" + sources."ecc-jsbn-0.1.2" + sources."env-paths-2.2.0" + sources."extend-3.0.2" + sources."extsprintf-1.3.0" + sources."fast-deep-equal-2.0.1" + sources."fast-json-stable-stringify-2.1.0" + sources."forever-agent-0.6.1" + sources."form-data-2.3.3" + sources."fs-minipass-1.2.7" + sources."fs.realpath-1.0.0" + sources."gauge-2.7.4" + sources."getpass-0.1.7" + sources."glob-7.1.6" + sources."graceful-fs-4.2.3" + sources."har-schema-2.0.0" + sources."har-validator-5.1.3" + sources."has-unicode-2.0.1" + sources."http-signature-1.2.0" + sources."inflight-1.0.6" + sources."inherits-2.0.4" + sources."is-fullwidth-code-point-1.0.0" + sources."is-typedarray-1.0.0" + sources."isarray-1.0.0" + sources."isexe-2.0.0" + sources."isstream-0.1.2" + sources."jsbn-0.1.1" + sources."json-schema-0.2.3" + sources."json-schema-traverse-0.4.1" + sources."json-stringify-safe-5.0.1" + sources."jsprim-1.4.1" + sources."mime-db-1.43.0" + sources."mime-types-2.1.26" + sources."minimatch-3.0.4" + sources."minimist-0.0.8" + sources."minipass-2.9.0" + sources."minizlib-1.3.3" + sources."mkdirp-0.5.1" + sources."nopt-4.0.1" + sources."npmlog-4.1.2" + sources."number-is-nan-1.0.1" + sources."oauth-sign-0.9.0" + sources."object-assign-4.1.1" + sources."once-1.4.0" + sources."os-homedir-1.0.2" + sources."os-tmpdir-1.0.2" + sources."osenv-0.1.5" + sources."path-is-absolute-1.0.1" + sources."performance-now-2.1.0" + sources."process-nextick-args-2.0.1" + sources."psl-1.7.0" + sources."punycode-2.1.1" + sources."qs-6.5.2" + sources."readable-stream-2.3.7" + sources."request-2.88.0" + sources."rimraf-2.7.1" + sources."safe-buffer-5.1.2" + sources."safer-buffer-2.1.2" + sources."semver-5.7.1" + sources."set-blocking-2.0.0" + sources."signal-exit-3.0.2" + sources."sshpk-1.16.1" + sources."string-width-1.0.2" + sources."string_decoder-1.1.1" + sources."strip-ansi-3.0.1" + sources."tar-4.4.13" + (sources."tough-cookie-2.4.3" // { + dependencies = [ + sources."punycode-1.4.1" + ]; + }) + sources."tunnel-agent-0.6.0" + sources."tweetnacl-0.14.5" + sources."uri-js-4.2.2" + sources."util-deprecate-1.0.2" + sources."uuid-3.4.0" + sources."verror-1.10.0" + sources."which-1.3.1" + sources."wide-align-1.1.3" + sources."wrappy-1.0.2" + sources."yallist-3.1.1" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Node.js native addon build tool"; + homepage = "https://github.com/nodejs/node-gyp#readme"; + license = "MIT"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; + node-gyp-build = nodeEnv.buildNodePackage { + name = "node-gyp-build"; + packageName = "node-gyp-build"; + version = "4.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.2.0.tgz"; + sha512 = "4oiumOLhCDU9Rronz8PZ5S4IvT39H5+JEv/hps9V8s7RSLhsac0TCP78ulnHXOo8X1wdpPiTayGlM1jr4IbnaQ=="; + }; + buildInputs = globalBuildInputs; + meta = { + description = "Build tool and bindings loader for node-gyp that supports prebuilds"; + homepage = https://github.com/prebuild/node-gyp-build; + license = "MIT"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; + node-pre-gyp = nodeEnv.buildNodePackage { + name = "node-pre-gyp"; + packageName = "node-pre-gyp"; + version = "0.14.0"; + src = fetchurl { + url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.14.0.tgz"; + sha512 = "+CvDC7ZttU/sSt9rFjix/P05iS43qHCOOGzcr3Ry99bXG7VX953+vFyEuph/tfqoYu8dttBkE86JSKBO2OzcxA=="; + }; + dependencies = [ + sources."abbrev-1.1.1" + sources."ansi-regex-2.1.1" + sources."aproba-1.2.0" + sources."are-we-there-yet-1.1.5" + sources."balanced-match-1.0.0" + sources."brace-expansion-1.1.11" + sources."chownr-1.1.3" + sources."code-point-at-1.1.0" + sources."concat-map-0.0.1" + sources."console-control-strings-1.1.0" + sources."core-util-is-1.0.2" + sources."debug-3.2.6" + sources."deep-extend-0.6.0" + sources."delegates-1.0.0" + sources."detect-libc-1.0.3" + sources."fs-minipass-1.2.7" + sources."fs.realpath-1.0.0" + sources."gauge-2.7.4" + sources."glob-7.1.6" + sources."has-unicode-2.0.1" + sources."iconv-lite-0.4.24" + sources."ignore-walk-3.0.3" + sources."inflight-1.0.6" + sources."inherits-2.0.4" + sources."ini-1.3.5" + sources."is-fullwidth-code-point-1.0.0" + sources."isarray-1.0.0" + sources."minimatch-3.0.4" + sources."minimist-0.0.8" + sources."minipass-2.9.0" + sources."minizlib-1.3.3" + sources."mkdirp-0.5.1" + sources."ms-2.1.2" + sources."needle-2.4.0" + sources."nopt-4.0.1" + sources."npm-bundled-1.1.1" + sources."npm-normalize-package-bin-1.0.1" + sources."npm-packlist-1.4.7" + sources."npmlog-4.1.2" + sources."number-is-nan-1.0.1" + sources."object-assign-4.1.1" + sources."once-1.4.0" + sources."os-homedir-1.0.2" + sources."os-tmpdir-1.0.2" + sources."osenv-0.1.5" + sources."path-is-absolute-1.0.1" + sources."process-nextick-args-2.0.1" + (sources."rc-1.2.8" // { + dependencies = [ + sources."minimist-1.2.0" + ]; + }) + sources."readable-stream-2.3.7" + sources."rimraf-2.7.1" + sources."safe-buffer-5.1.2" + sources."safer-buffer-2.1.2" + sources."sax-1.2.4" + sources."semver-5.7.1" + sources."set-blocking-2.0.0" + sources."signal-exit-3.0.2" + sources."string-width-1.0.2" + sources."string_decoder-1.1.1" + sources."strip-ansi-3.0.1" + sources."strip-json-comments-2.0.1" + sources."tar-4.4.13" + sources."util-deprecate-1.0.2" + sources."wide-align-1.1.3" + sources."wrappy-1.0.2" + sources."yallist-3.1.1" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Node.js native addon binary install tool"; + homepage = "https://github.com/mapbox/node-pre-gyp#readme"; + license = "BSD-3-Clause"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; } \ No newline at end of file diff --git a/pkgs/development/ocaml-modules/batteries/default.nix b/pkgs/development/ocaml-modules/batteries/default.nix index b0ad12dad67..1b3bb9a7981 100644 --- a/pkgs/development/ocaml-modules/batteries/default.nix +++ b/pkgs/development/ocaml-modules/batteries/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, ocaml, findlib, ocamlbuild, qtest, num }: -let version = "2.10.0"; in +let version = "2.11.0"; in stdenv.mkDerivation { name = "ocaml${ocaml.version}-batteries-${version}"; src = fetchurl { url = "https://github.com/ocaml-batteries-team/batteries-included/releases/download/v${version}/batteries-${version}.tar.gz"; - sha256 = "08ghw87d56h1a6y1nnh3x2wy9xj25jqfk5sp6ma9nsyd37babb0h"; + sha256 = "0swdnm9c3sd3yzzyg7yh1lkqhfikmga4fzx2416ja1q62nv26j53"; }; buildInputs = [ ocaml findlib ocamlbuild qtest ]; diff --git a/pkgs/development/python-modules/aiohttp-socks/default.nix b/pkgs/development/python-modules/aiohttp-socks/default.nix index d6487c8157b..782238c3f83 100644 --- a/pkgs/development/python-modules/aiohttp-socks/default.nix +++ b/pkgs/development/python-modules/aiohttp-socks/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "aiohttp-socks"; - version = "0.3.3"; + version = "0.3.4"; src = fetchPypi { inherit version; pname = "aiohttp_socks"; - sha256 = "21974ce5d782c426ddbf7bdfc5e602a38783b1ee839a4a0ed0990240e2e123b5"; + sha256 = "1gc74a0i0slq3gn9kv3scn7c9x444z5nwjm3d14qilsgq6civsnd"; }; propagatedBuildInputs = [ aiohttp attrs ]; diff --git a/pkgs/development/python-modules/aiohttp/default.nix b/pkgs/development/python-modules/aiohttp/default.nix index 40dec3e1c1e..0cecdb0291e 100644 --- a/pkgs/development/python-modules/aiohttp/default.nix +++ b/pkgs/development/python-modules/aiohttp/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchPypi , pythonOlder +, pythonAtLeast , attrs , chardet , multidict @@ -25,14 +26,14 @@ buildPythonPackage rec { pname = "aiohttp"; version = "3.6.2"; + # https://github.com/aio-libs/aiohttp/issues/4525 python3.8 failures + disabled = pythonOlder "3.5" || pythonAtLeast "3.8"; src = fetchPypi { inherit pname version; sha256 = "09pkw6f1790prnrq0k8cqgnf1qy57ll8lpmc6kld09q7zw4vi6i5"; }; - disabled = pythonOlder "3.5"; - checkInputs = [ pytestrunner pytest gunicorn pytest-timeout async_generator pytest_xdist pytest-mock pytestcov trustme brotlipy freezegun diff --git a/pkgs/development/python-modules/aioresponses/default.nix b/pkgs/development/python-modules/aioresponses/default.nix index 13a9e4b546b..446bb9e6379 100644 --- a/pkgs/development/python-modules/aioresponses/default.nix +++ b/pkgs/development/python-modules/aioresponses/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "aioresponses"; - version = "0.6.1"; + version = "0.6.2"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "fab9607d11a2e05050ef766006b8fdd9424e7122c2bd6f34a5376be4c728e242"; + sha256 = "0srqbxxxffi3idqd161n5b90xyqy9gibigxxmvqag3nxab5vw1j6"; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/ansible/default.nix b/pkgs/development/python-modules/ansible/default.nix index 96be51e82f0..df9c5e82cd1 100644 --- a/pkgs/development/python-modules/ansible/default.nix +++ b/pkgs/development/python-modules/ansible/default.nix @@ -18,13 +18,13 @@ buildPythonPackage rec { pname = "ansible"; - version = "2.8.7"; + version = "2.9.2"; src = fetchFromGitHub { owner = "ansible"; repo = "ansible"; rev = "v${version}"; - sha256 = "08vqjk85j0g1x0iad03d7ysws433dikii8j2lr3a1mlx6d186vv8"; + sha256 = "06vxvn5q13rxzndwzq3g6yxiqm361ma9zcvwbrfn630xkmsg4pd8"; }; prePatch = '' diff --git a/pkgs/development/python-modules/apprise/default.nix b/pkgs/development/python-modules/apprise/default.nix index 6ac9acfac32..38157e13615 100644 --- a/pkgs/development/python-modules/apprise/default.nix +++ b/pkgs/development/python-modules/apprise/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "apprise"; - version = "0.8.2"; + version = "0.8.3"; src = fetchPypi { inherit pname version; - sha256 = "0m0pddqrpfm526f0fyzzjpcp7hi3d6pj0bgk2vl004lkas4li1hw"; + sha256 = "1j925g7x0j8fzns431360myr8844swb8mb78wacw2vlj6x1c558c"; }; nativeBuildInputs = [ Babel ]; diff --git a/pkgs/development/python-modules/avro-python3/default.nix b/pkgs/development/python-modules/avro-python3/default.nix index c9db39a325f..46272a5418d 100644 --- a/pkgs/development/python-modules/avro-python3/default.nix +++ b/pkgs/development/python-modules/avro-python3/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "avro-python3"; - version = "1.8.2"; + version = "1.9.1"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "f82cf0d66189600b1e6b442f650ad5aca6c189576723dcbf6f9ce096eab81bd6"; + sha256 = "daab2cea71b942a1eb57d700d4a729e9d6cd93284d4dd4d65a378b9f958aa0d2"; }; doCheck = false; # No such file or directory: './run_tests.py diff --git a/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix b/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix index 5d1e3e6e3a9..41124e44854 100644 --- a/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "azure-mgmt-containerservice"; - version = "8.1.0"; + version = "8.2.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "21fabdd393ba2ff1162a490cfa0d2b72a715da8462b1645bd986241137fc771f"; + sha256 = "0czn781ywbwi8px54nlccsvw5s13y4wqmxhcrxkkl0y7rblqi5pr"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-hdinsight/default.nix b/pkgs/development/python-modules/azure-mgmt-hdinsight/default.nix index 6cda959448c..4b8aef08f1c 100644 --- a/pkgs/development/python-modules/azure-mgmt-hdinsight/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-hdinsight/default.nix @@ -5,13 +5,13 @@ }: buildPythonPackage rec { - version = "1.3.0"; + version = "1.4.0"; pname = "azure-mgmt-hdinsight"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "55e129da3c3750cd5a26b91035990590a3f97aef4971de62d84de00f4fd6f1e4"; + sha256 = "0zmmfj7z1zrayjqwqybcn3bwm47d2ngyxm1g6fh2iw5c2f9czycv"; extension = "zip"; }; diff --git a/pkgs/development/python-modules/azure-mgmt-media/default.nix b/pkgs/development/python-modules/azure-mgmt-media/default.nix index 90b45d0e3f0..f3dfaba6d9c 100644 --- a/pkgs/development/python-modules/azure-mgmt-media/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-media/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "azure-mgmt-media"; - version = "2.0.0"; + version = "2.1.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "b144e66cb8b947b871354edbcee15b78e107fb8f3a337d46d04cd8b73300741b"; + sha256 = "1py0hch0wghzfxazdrrs7p0kln2zn9jh3fmkzwd2z8qggj38q6gm"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-netapp/default.nix b/pkgs/development/python-modules/azure-mgmt-netapp/default.nix index 8e18986bfcb..6bf207c6e4c 100644 --- a/pkgs/development/python-modules/azure-mgmt-netapp/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-netapp/default.nix @@ -5,13 +5,13 @@ }: buildPythonPackage rec { - version = "0.7.0"; + version = "0.8.0"; pname = "azure-mgmt-netapp"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "0cf4pknb5y2yz4jqwg7xm626zkfx8i8hqcr3dkvq21lrx7fz96r3"; + sha256 = "0vbg5mpahrnnnbj80flgzxxiffic94wsc9srm4ir85y2j5rprpv7"; extension = "zip"; }; diff --git a/pkgs/development/python-modules/azure-mgmt-recoveryservicesbackup/default.nix b/pkgs/development/python-modules/azure-mgmt-recoveryservicesbackup/default.nix index 1f3056b9098..990f494eced 100644 --- a/pkgs/development/python-modules/azure-mgmt-recoveryservicesbackup/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-recoveryservicesbackup/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "azure-mgmt-recoveryservicesbackup"; - version = "0.5.0"; + version = "0.6.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "0jhq8fi3dn2cncyv2rrgr4kldd254f30zgwf6p85rdgvg2p9k4hl"; + sha256 = "13s2k4jl8570bj6jkqzm0w29z29rl7h5i7czd3kr6vqar5wj9xjd"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-storage-file-share/default.nix b/pkgs/development/python-modules/azure-storage-file-share/default.nix new file mode 100644 index 00000000000..78950d2971e --- /dev/null +++ b/pkgs/development/python-modules/azure-storage-file-share/default.nix @@ -0,0 +1,45 @@ +{ buildPythonPackage +, fetchPypi +, isPy3k +, lib + +# pythonPackages +, azure-core +, cryptography +, msrest +, futures +}: + +buildPythonPackage rec { + pname = "azure-storage-file-share"; + version = "12.0.0"; + disabled = !isPy3k; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "15f5vk3vd2amggqqznx186raak9wgr57j0l1p9qa62kcl10bs9lg"; + }; + + propagatedBuildInputs = [ + azure-core + cryptography + msrest + ]; + + # requires checkout from monorepo + doCheck = false; + pythonImportsCheck = [ + "azure.core" + "azure.storage" + ]; + + meta = with lib; { + description = "Microsoft Azure File Share Storage Client Library for Python"; + homepage = "https://github.com/Azure/azure-sdk-for-python"; + license = licenses.mit; + maintainers = with maintainers; [ + kamadorueda + ]; + }; +} diff --git a/pkgs/development/python-modules/bitarray/default.nix b/pkgs/development/python-modules/bitarray/default.nix index f119aedc4b8..d89ab9c3107 100644 --- a/pkgs/development/python-modules/bitarray/default.nix +++ b/pkgs/development/python-modules/bitarray/default.nix @@ -1,12 +1,12 @@ { lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { - version = "1.2.0"; + version = "1.2.1"; pname = "bitarray"; src = fetchPypi { inherit pname version; - sha256 = "4f8706b651243c9faa981f075bcbdef2fab83e9b9bc9211ed2cb5849f9a68342"; + sha256 = "1kxrlxfj9nrx512sfwifwl9z4v6ky3qschl0zmk3s3dvc3s7bmif"; }; meta = with lib; { diff --git a/pkgs/development/python-modules/boltons/default.nix b/pkgs/development/python-modules/boltons/default.nix index 8b7139f5a62..6470b7da859 100644 --- a/pkgs/development/python-modules/boltons/default.nix +++ b/pkgs/development/python-modules/boltons/default.nix @@ -2,14 +2,14 @@ buildPythonPackage rec { pname = "boltons"; - version = "19.3.0"; + version = "20.0.0"; # No tests in PyPi Tarball src = fetchFromGitHub { owner = "mahmoud"; repo = "boltons"; rev = version; - sha256 = "0pgqr2hf7lxag8nc8wnh8hpp8fd2lxccq9h0bb8lb9x8npnzhnbn"; + sha256 = "0scdslqi28b899i42m4c9pvhwv3kkw4wpi3n9zm5n64ggn5ngfbz"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/buildbot/default.nix b/pkgs/development/python-modules/buildbot/default.nix index e627667f3ec..611cb5ad5ff 100644 --- a/pkgs/development/python-modules/buildbot/default.nix +++ b/pkgs/development/python-modules/buildbot/default.nix @@ -25,11 +25,11 @@ let package = buildPythonPackage rec { pname = "buildbot"; - version = "2.5.1"; + version = "2.6.0"; src = fetchPypi { inherit pname version; - sha256 = "13ddpcbndb22zlg9gjsf2pbgad45g1w5cg4a3z83085fkgnib7sr"; + sha256 = "1l3ajhy68jddbgbizaa5hq65lgqkll6389hss4p2j36cbxbn7hiv"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/buildbot/pkg.nix b/pkgs/development/python-modules/buildbot/pkg.nix index ff2be45bf32..4f3a0ea04b8 100644 --- a/pkgs/development/python-modules/buildbot/pkg.nix +++ b/pkgs/development/python-modules/buildbot/pkg.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "buildbot-pkg"; - version = "2.5.1"; + version = "2.6.0"; src = fetchPypi { inherit pname version; - sha256 = "1g87pddsyas1r0f6z29047cwnz7ds4925f6n9g7b0pkj3k73ci06"; + sha256 = "07ynk46c9h47ibbdm93h15xbrzflsl4llm0jr4c8pm6krs6byb4z"; }; postPatch = '' diff --git a/pkgs/development/python-modules/buildbot/plugins.nix b/pkgs/development/python-modules/buildbot/plugins.nix index 8722a6629e4..4bb82b59856 100644 --- a/pkgs/development/python-modules/buildbot/plugins.nix +++ b/pkgs/development/python-modules/buildbot/plugins.nix @@ -7,7 +7,7 @@ src = fetchPypi { inherit pname version; - sha256 = "00k5dbcwzqlyk4lcp5qh1q8xbrxmg9gzqs7vl2r6f3wxi4ydb5nw"; + sha256 = "0njix8g6g1dgfviick55p9calm82nnkhhgkikh7a5yvqk524cprg"; }; # Remove unneccessary circular dependency on buildbot @@ -36,7 +36,7 @@ src = fetchPypi { inherit pname version; - sha256 = "0ai334y779jwqabrn2yjma41pw0a9k1qy7v68qbjd22n4my227ma"; + sha256 = "1wmay9bbb1wwf0zh9rw95swmdc7bxabgvx2n6dyyzs4p8k92px10"; }; buildInputs = [ buildbot-pkg ]; @@ -58,7 +58,7 @@ src = fetchPypi { inherit pname version; - sha256 = "1j450hwvg729mivzijbrx8ngalx56qvrx8mwwgy8arfwpnyfkr9l"; + sha256 = "14b28vpkk68yk6zmdd64n7izb1r3barb7y711n4g37skqd13jygb"; }; buildInputs = [ buildbot-pkg ]; @@ -80,7 +80,7 @@ src = fetchPypi { inherit pname version; - sha256 = "19w8is5s7d7l60mlchh1zd9nidpkswi8fivfa36b97plibn0jgw1"; + sha256 = "1m8kbycjq7jsl72xbrzjj48hb65r53lfxx78yvlnhc2f9ian5vnh"; }; buildInputs = [ buildbot-pkg ]; @@ -102,7 +102,7 @@ src = fetchPypi { inherit pname version; - sha256 = "1zl7y08rkw7bya6cli44msvcdgirsyfg3kxpf2z82vwgc6bwi785"; + sha256 = "1sbp13qimv8kc7dp0xz1pmda1x1n4948zgrz2pc45rwlbbn5h69r"; }; buildInputs = [ buildbot-pkg ]; diff --git a/pkgs/development/python-modules/buildbot/worker.nix b/pkgs/development/python-modules/buildbot/worker.nix index 048fb44a93b..6352b22b55d 100644 --- a/pkgs/development/python-modules/buildbot/worker.nix +++ b/pkgs/development/python-modules/buildbot/worker.nix @@ -3,11 +3,11 @@ buildPythonPackage (rec { pname = "buildbot-worker"; - version = "2.5.1"; + version = "2.6.0"; src = fetchPypi { inherit pname version; - sha256 = "1kpj85x8xflrccvy840v9bl3q1j63rk9kahj1qirbai1fxwvzbik"; + sha256 = "0hr42fp3sw6c59qahihm9440618z7prwsy4z0ax553zvw47pc22l"; }; propagatedBuildInputs = [ twisted future ]; diff --git a/pkgs/development/python-modules/bumps/default.nix b/pkgs/development/python-modules/bumps/default.nix index 05506a12db0..c1e19eb8560 100644 --- a/pkgs/development/python-modules/bumps/default.nix +++ b/pkgs/development/python-modules/bumps/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "bumps"; - version = "0.7.13"; + version = "0.7.14"; propagatedBuildInputs = [six]; @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "fdcf335b800d892edfdbc87fdd539cb45166d8667edbec3dfbb1a3b5c3a35547"; + sha256 = "0l0ljm7n19522m6mb0jnbcwdyqya15vfj3li3mvfsyv4rkxvy18b"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/cmd2/default.nix b/pkgs/development/python-modules/cmd2/default.nix index 2dba7e43391..6cc91f4b74c 100644 --- a/pkgs/development/python-modules/cmd2/default.nix +++ b/pkgs/development/python-modules/cmd2/default.nix @@ -6,11 +6,11 @@ }: buildPythonPackage rec { pname = "cmd2"; - version = "0.9.22"; + version = "0.9.23"; src = fetchPypi { inherit pname version; - sha256 = "ba244b07c0b465ff54a6838dc61919599141dc92de1bf00bb0a70875189155e6"; + sha256 = "17ic6lxzz9yrwxh3l1skcqgr59c47w5fidj5qmrk1l26rkrjxlca"; }; LC_ALL="en_US.UTF-8"; diff --git a/pkgs/development/python-modules/dash-core-components/default.nix b/pkgs/development/python-modules/dash-core-components/default.nix new file mode 100644 index 00000000000..dfcbb9b6404 --- /dev/null +++ b/pkgs/development/python-modules/dash-core-components/default.nix @@ -0,0 +1,24 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "dash_core_components"; + version = "1.7.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "16jjanq4glj6c2cwyw94954hrqqv49fknisbxj03lfmflg61j32k"; + }; + + # No tests in archive + doCheck = false; + + meta = with lib; { + description = "A dash component starter pack"; + homepage = https://dash.plot.ly/dash-core-components; + license = licenses.mit; + maintainers = [ maintainers.antoinerg ]; + }; +} diff --git a/pkgs/development/python-modules/dash-html-components/default.nix b/pkgs/development/python-modules/dash-html-components/default.nix new file mode 100644 index 00000000000..4e9ef39b411 --- /dev/null +++ b/pkgs/development/python-modules/dash-html-components/default.nix @@ -0,0 +1,24 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "dash_html_components"; + version = "1.0.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "166agkrl52j5qin2npsdl2a96jccxz5f1jvcz0hxsnjg0ix0k4l9"; + }; + + # No tests in archive + doCheck = false; + + meta = with lib; { + description = "HTML components for Dash"; + homepage = https://dash.plot.ly/dash-html-components; + license = licenses.mit; + maintainers = [ maintainers.antoinerg ]; + }; +} diff --git a/pkgs/development/python-modules/dash-renderer/default.nix b/pkgs/development/python-modules/dash-renderer/default.nix new file mode 100644 index 00000000000..97942a13043 --- /dev/null +++ b/pkgs/development/python-modules/dash-renderer/default.nix @@ -0,0 +1,24 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "dash_renderer"; + version = "1.2.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "1ccsykv24dz9xj24106aaj7f0w7x7sv7mamjbx0m6k0wyhh58vw1"; + }; + + # No tests in archive + doCheck = false; + + meta = with lib; { + description = "Renderer for the Dash framework"; + homepage = https://dash.plot.ly/; + license = licenses.mit; + maintainers = [ maintainers.antoinerg ]; + }; +} diff --git a/pkgs/development/python-modules/dash-table/default.nix b/pkgs/development/python-modules/dash-table/default.nix new file mode 100644 index 00000000000..4a9a6c42ff4 --- /dev/null +++ b/pkgs/development/python-modules/dash-table/default.nix @@ -0,0 +1,24 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "dash_table"; + version = "4.6.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "01wzac09ac6nr27if1liaxafzdf67x00vw1iq5vaad1147rdh36k"; + }; + + # No tests in archive + doCheck = false; + + meta = with lib; { + description = "A First-Class Interactive DataTable for Dash"; + homepage = https://dash.plot.ly/datatable; + license = licenses.mit; + maintainers = [ maintainers.antoinerg ]; + }; +} diff --git a/pkgs/development/python-modules/dash/default.nix b/pkgs/development/python-modules/dash/default.nix new file mode 100644 index 00000000000..2106235230f --- /dev/null +++ b/pkgs/development/python-modules/dash/default.nix @@ -0,0 +1,63 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, plotly +, flask +, flask-compress +, future +, dash-core-components +, dash-renderer +, dash-html-components +, dash-table +, pytest +, pytest-mock +, mock +}: + +buildPythonPackage rec { + pname = "dash"; + version = "1.8.0"; + + src = fetchFromGitHub { + owner = "plotly"; + repo = pname; + rev = "v${version}"; + sha256 = "11skbvjlj93aw1pqx6j56h73sy9r06jwq7z5h64fd1a3d4z2gsvy"; + }; + + propagatedBuildInputs = [ + plotly + flask + flask-compress + future + dash-core-components + dash-renderer + dash-html-components + dash-table + ]; + + checkInputs = [ + pytest + pytest-mock + mock + ]; + + checkPhase = '' + pytest tests/unit/test_configs.py + pytest tests/unit/test_fingerprint.py + pytest tests/unit/test_import.py + pytest tests/unit/test_resources.py + pytest tests/unit/dash/ + ''; + + pythonImportsCheck = [ + "dash" + ]; + + meta = with lib; { + description = "Python framework for building analytical web applications"; + homepage = https://dash.plot.ly/; + license = licenses.mit; + maintainers = [ maintainers.antoinerg ]; + }; +} diff --git a/pkgs/development/python-modules/dask-ml/default.nix b/pkgs/development/python-modules/dask-ml/default.nix index 06c5f1753d4..c5fafa495aa 100644 --- a/pkgs/development/python-modules/dask-ml/default.nix +++ b/pkgs/development/python-modules/dask-ml/default.nix @@ -20,13 +20,13 @@ }: buildPythonPackage rec { - version = "1.1.1"; + version = "1.2.0"; pname = "dask-ml"; disabled = pythonOlder "3.6"; # >= 3.6 src = fetchPypi { inherit pname version; - sha256 = "1yad9b9hd02rbdf6m1gfj74cjgcbyp7lxdj22d5h5rhv7xa3127x"; + sha256 = "0ppg8licvkxz1af2q87cxms2p6ss2r5d4fdkbcivph56r0v0ci2k"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/denonavr/default.nix b/pkgs/development/python-modules/denonavr/default.nix new file mode 100644 index 00000000000..33c1570060e --- /dev/null +++ b/pkgs/development/python-modules/denonavr/default.nix @@ -0,0 +1,29 @@ +{ lib, buildPythonPackage, fetchFromGitHub, isPy27, requests +, pytest, testtools, requests-mock }: + +buildPythonPackage rec { + pname = "denonavr"; + version = "0.7.10"; + + src = fetchFromGitHub { + owner = "scarface-4711"; + repo = "denonavr"; + rev = version; + sha256 = "078nhr69f68nfazhmkf2sl7wiadqx96a5ry3ziggiy1xs04vflj7"; + }; + + propagatedBuildInputs = [ requests ]; + + doCheck = !isPy27; + checkInputs = [ pytest testtools requests-mock ]; + checkPhase = '' + pytest tests + ''; + + meta = with lib; { + homepage = "https://github.com/scarface-4711/denonavr"; + description = "Automation Library for Denon AVR receivers."; + license = licenses.mit; + maintainers = with maintainers; [ colemickens ]; + }; +} diff --git a/pkgs/development/python-modules/diff_cover/default.nix b/pkgs/development/python-modules/diff_cover/default.nix index ed16f7f95e5..7066a188c77 100644 --- a/pkgs/development/python-modules/diff_cover/default.nix +++ b/pkgs/development/python-modules/diff_cover/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "diff_cover"; - version = "2.5.0"; + version = "2.5.2"; preCheck = '' export LC_ALL=en_US.UTF-8; @@ -25,7 +25,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "2ba4e8dcd5439a245287fac056db02a9261432b1a44a5cffbe593032de86f1c7"; + sha256 = "09pgzx2m04hzpckwgz4iz9590ll5fk1mirlra89qps8ig1xmz5m5"; }; propagatedBuildInputs = [ jinja2 jinja2_pluralize pygments six inflect ]; diff --git a/pkgs/development/python-modules/django-auth-ldap/default.nix b/pkgs/development/python-modules/django-auth-ldap/default.nix index 3e95e7ff16b..f0de263f130 100644 --- a/pkgs/development/python-modules/django-auth-ldap/default.nix +++ b/pkgs/development/python-modules/django-auth-ldap/default.nix @@ -1,7 +1,7 @@ { stdenv , buildPythonPackage , fetchPypi, isPy27 -, ldap , django_2_2 +, ldap , django , mock }: @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "5f48232c85ddfa33e3573153e6080526ac2eef5e7ec9cf42b5c4ba3c62afb96d"; }; - propagatedBuildInputs = [ ldap django_2_2 ]; + propagatedBuildInputs = [ ldap django ]; checkInputs = [ mock ]; # django.core.exceptions.ImproperlyConfigured: Requested setting INSTALLED_APPS, but settings are not configured. You must either define the environment variable DJANGO_SETTINGS_MODULE or call settings.configure() before accessing settings diff --git a/pkgs/development/python-modules/flask-sockets/default.nix b/pkgs/development/python-modules/flask-sockets/default.nix new file mode 100644 index 00000000000..aa29fd4fbc9 --- /dev/null +++ b/pkgs/development/python-modules/flask-sockets/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, fetchPypi +, flask +, gevent +, gevent-websocket +}: + +buildPythonPackage rec { + pname = "Flask-Sockets"; + version = "0.2.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "072927da8edca0e81e024f5787e643c87d80b351b714de95d723becb30e0643b"; + }; + + propagatedBuildInputs = [ + flask + gevent + gevent-websocket + ]; + + # upstream doesn't have any tests, single file + doCheck = false; + + pythonImportsCheck = [ + "flask_sockets" + ]; + + meta = with lib; { + description = "Elegant WebSockets for your Flask apps"; + homepage = "https://github.com/heroku-python/flask-sockets"; + license = licenses.mit; + maintainers = [ maintainers.prusnak ]; + }; +} diff --git a/pkgs/development/python-modules/fluidasserts/default.nix b/pkgs/development/python-modules/fluidasserts/default.nix index da0d2d41407..78405ed8a66 100644 --- a/pkgs/development/python-modules/fluidasserts/default.nix +++ b/pkgs/development/python-modules/fluidasserts/default.nix @@ -12,9 +12,12 @@ , azure-mgmt-compute , azure-mgmt-keyvault , azure-mgmt-network +, azure-mgmt-resource +, azure-mgmt-security , azure-mgmt-storage , azure-mgmt-web , azure-storage-file +, azure-storage-file-share , bandit , bcrypt , beautifulsoup4 @@ -39,6 +42,7 @@ , psycopg2 , pycrypto , pygments +, pyhcl , pyjks , pynacl , pyopenssl @@ -57,31 +61,32 @@ buildPythonPackage rec { pname = "fluidasserts"; - version = "20.1.22554"; + version = "20.1.33141"; disabled = !isPy37; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "0j7zppwingi9m58z51phy40d69jlskx1vgyz1gj9miqhbjfdymhi"; + sha256 = "01l6yb3r19q8b4kwqkrzn7mpfsr65zsgzax2fbs43hb6pq6vavnx"; }; patchPhase = '' # Version mismatches between current FluidAsserts and Nixpkgs substituteInPlace ./setup.py \ - --replace 'tlslite-ng==0.8.0-alpha29' 'tlslite-ng==0.7.5' \ - --replace 'boto3==1.10.17' 'boto3==1.10.1' \ + --replace 'tlslite-ng==0.8.0-alpha36' 'tlslite-ng==0.7.5' \ + --replace 'boto3==1.11.7' 'boto3==1.10.1' \ --replace 'cfn-flip==1.2.2' 'cfn-flip==1.1.0.post1' \ - --replace 'azure-mgmt-storage==7.1.0' 'azure-mgmt-storage==7.0.0' \ + --replace 'typed-ast==1.4.1' 'typed-ast==1.4.0' \ + --replace 'pillow==7.0.0' 'pillow==6.2.1' \ # Functionality that will be not present for the momment # but that we'll work to add in the future # Just a minimal portion of fluidasserts use this substituteInPlace ./setup.py \ - --replace "'azure-storage-file-share==12.0.0'," "" \ --replace "'pymssql==2.1.4'," "" \ - --replace "'pytesseract==0.3.0'," "" \ + --replace "'pytesseract==0.3.1'," "" \ --replace "'pywinrm==0.4.1'," "" \ + --replace "'mitmproxy==5.0.1'," "" \ ''; @@ -95,9 +100,12 @@ buildPythonPackage rec { azure-mgmt-compute azure-mgmt-keyvault azure-mgmt-network + azure-mgmt-resource + azure-mgmt-security azure-mgmt-storage azure-mgmt-web azure-storage-file + azure-storage-file-share bandit bcrypt beautifulsoup4 @@ -122,6 +130,7 @@ buildPythonPackage rec { psycopg2 pycrypto pygments + pyhcl pyjks pynacl pyopenssl @@ -145,34 +154,14 @@ buildPythonPackage rec { rm test/conftest.py pytest \ - test/test_cloud_aws_cloudformation_cloudfront.py \ - test/test_cloud_aws_cloudformation_dynamodb.py \ - test/test_cloud_aws_cloudformation_ec2.py \ - test/test_cloud_aws_cloudformation_elb.py \ - test/test_cloud_aws_cloudformation_elb2.py \ - test/test_cloud_aws_cloudformation_fsx.py \ - test/test_cloud_aws_cloudformation_iam.py \ - test/test_cloud_aws_cloudformation_kms.py \ - test/test_cloud_aws_cloudformation_rds.py \ - test/test_cloud_aws_cloudformation_s3.py \ - test/test_cloud_aws_cloudformation_secretsmanager.py \ - test/test_format_apk.py \ - test/test_format_file.py \ - test/test_format_jks.py \ - test/test_format_jwt.py \ - test/test_format_pdf.py \ - test/test_format_pkcs12.py \ - test/test_format_string.py \ - test/test_helper_asynchronous.py \ - test/test_helper_crypto.py \ - test/test_lang_core.py \ - test/test_lang_csharp.py \ - test/test_lang_docker.py \ - test/test_lang_dotnetconfig.py \ - test/test_lang_html.py \ - test/test_lang_php.py \ - test/test_lang_python.py \ - test/test_lang_rpgle.py \ + test/test_cloud_aws_terraform_{ebs,ec2}.py \ + test/test_cloud_aws_cloudformation_{cloudfront,dynamodb,ec2,elb,elb2}.py \ + test/test_cloud_aws_cloudformation_{fsx,iam,kms,rds,s3,secretsmanager}.py \ + test/test_format_{apk,jks,jwt,pdf,pkcs12,string}.py \ + test/test_helper_{asynchronous,crypto}.py \ + test/test_lang_{javascript,java}.py \ + test/test_lang_{core,csharp,docker,dotnetconfig,html,php,python,rpgle}.py \ + test/test_utils_generic.py ''; diff --git a/pkgs/development/python-modules/hstspreload/default.nix b/pkgs/development/python-modules/hstspreload/default.nix index a276bd33b59..918ed268afa 100644 --- a/pkgs/development/python-modules/hstspreload/default.nix +++ b/pkgs/development/python-modules/hstspreload/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "hstspreload"; - version = "2019.12.25"; + version = "2020.1.17"; disabled = isPy27; src = fetchFromGitHub { owner = "sethmlarson"; repo = pname; rev = version; - sha256 = "1aa7jccwldxw3s0z668qqb0i0plsark1q3jvkmqkyp645w5bfilk"; + sha256 = "08qcisiscnx74pwavh3ai3lg92zfrikwzr06p700kwk1gp8xhf3v"; }; # tests require network connection diff --git a/pkgs/development/python-modules/html2text/default.nix b/pkgs/development/python-modules/html2text/default.nix index 9b289032514..a0462795d23 100644 --- a/pkgs/development/python-modules/html2text/default.nix +++ b/pkgs/development/python-modules/html2text/default.nix @@ -4,14 +4,14 @@ buildPythonPackage rec { pname = "html2text"; - version = "2019.9.26"; + version = "2020.1.16"; disabled = pythonOlder "3.5"; src = fetchFromGitHub { owner = "Alir3z4"; repo = pname; rev = version; - sha256 = "1gzcx4n6q71plq4zvb1z0fy3brrln0qqrd6jc89iiqn7r1ix8h87"; + sha256 = "1y924clp2hiqg3a9437z808p29mqcx537j5fmz71plx8qrcm5jf9"; }; # python setup.py test is broken, use pytest diff --git a/pkgs/development/python-modules/ipython/5.nix b/pkgs/development/python-modules/ipython/5.nix index 15e7d00bcec..dd0c97fc3c5 100644 --- a/pkgs/development/python-modules/ipython/5.nix +++ b/pkgs/development/python-modules/ipython/5.nix @@ -2,6 +2,7 @@ , stdenv , buildPythonPackage , fetchPypi +, fetchpatch # Build dependencies , glibcLocales # Test dependencies @@ -36,6 +37,15 @@ buildPythonPackage rec { substituteInPlace setup.py --replace "'gnureadline'" " " ''; + patches = [ + # Use the proper pygments lexer for python2 (https://github.com/ipython/ipython/pull/12095) + (fetchpatch { + name = "python2-lexer.patch"; + url = "https://github.com/ipython/ipython/pull/12095/commits/8805293b5e4bce9150cc2ad9c5d6d984849ae447.patch"; + sha256 = "16p4gl7a49v76w33j39ih7yspy6x2d14p9bh4wdpg9cafhw9nbc0"; + }) + ]; + buildInputs = [ glibcLocales ]; checkInputs = [ nose pygments testpath ] ++ lib.optional isPy27 mock; diff --git a/pkgs/development/python-modules/jupyter_console/default.nix b/pkgs/development/python-modules/jupyter_console/default.nix index 9200e004d0c..42f50c203e3 100644 --- a/pkgs/development/python-modules/jupyter_console/default.nix +++ b/pkgs/development/python-modules/jupyter_console/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "jupyter_console"; - version = "6.0.0"; + version = "6.1.0"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "308ce876354924fb6c540b41d5d6d08acfc946984bf0c97777c1ddcb42e0b2f5"; + sha256 = "06s3kr5vx0l1y1b7fxb04dmrppscl7q69sl9yyfr0d057d1ssvkg"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/jupyterlab/default.nix b/pkgs/development/python-modules/jupyterlab/default.nix index 32d3ad0bada..ece3b4e3ed5 100644 --- a/pkgs/development/python-modules/jupyterlab/default.nix +++ b/pkgs/development/python-modules/jupyterlab/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "jupyterlab"; - version = "1.2.4"; + version = "1.2.5"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "6adb88acd05b51512c37df477a18c36240823a591c2a51bf6556198414026d8f"; + sha256 = "086zl3pdsq2jwcxv7ppp3lpwh25mgnn0y0s6scmkrz158yj55kp3"; }; propagatedBuildInputs = [ jupyterlab_server notebook ]; diff --git a/pkgs/development/python-modules/jupytext/default.nix b/pkgs/development/python-modules/jupytext/default.nix index 961eb43f03b..41eb2b58ca8 100644 --- a/pkgs/development/python-modules/jupytext/default.nix +++ b/pkgs/development/python-modules/jupytext/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "jupytext"; - version = "1.3.1"; + version = "1.3.2"; src = fetchPypi { inherit pname version; - sha256 = "132bad60c63debfb371a691cb6668a19938ec268599e9c49f1531a3bf0be7b1c"; + sha256 = "081c8dbql93bpl72pzg0z8vg482r3f350490mhqn965s10bz8say"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/libnacl/default.nix b/pkgs/development/python-modules/libnacl/default.nix index 54b98cf2136..893789d961d 100644 --- a/pkgs/development/python-modules/libnacl/default.nix +++ b/pkgs/development/python-modules/libnacl/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "libnacl"; - version = "1.6.1"; + version = "1.7.1"; src = fetchFromGitHub { owner = "saltstack"; repo = pname; rev = "v${version}"; - sha256 = "05iamhbsqm8binqhc2zchfqdkajlx2icf8xl5vkd5fbrhw6yylad"; + sha256 = "10rpim9lf0qd861a3miq8iqg8w87slqwqni7nq66h72jdk130axg"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/nest-asyncio/default.nix b/pkgs/development/python-modules/nest-asyncio/default.nix index a88c07c9968..0016da922ff 100644 --- a/pkgs/development/python-modules/nest-asyncio/default.nix +++ b/pkgs/development/python-modules/nest-asyncio/default.nix @@ -14,6 +14,11 @@ buildPythonPackage rec { sha256 = "7d4d7c1ca2aad0e5c2706d0222c8ff006805abfd05caa97e6127c8811d0f6adc"; }; + # tests not packaged with source dist as of 1.2.1/1.2.2, and + # can't check tests out of GitHub easily without specific commit IDs (no tagged releases) + doCheck = false; + pythonImportsCheck = [ "nest_asyncio" ]; + meta = with stdenv.lib; { homepage = https://github.com/erdewit/nest_asyncio; description = "Patch asyncio to allow nested event loops"; diff --git a/pkgs/development/python-modules/phonenumbers/default.nix b/pkgs/development/python-modules/phonenumbers/default.nix index 461d70497bf..c0e86dd3751 100644 --- a/pkgs/development/python-modules/phonenumbers/default.nix +++ b/pkgs/development/python-modules/phonenumbers/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "phonenumbers"; - version = "8.11.1"; + version = "8.11.2"; src = fetchPypi { inherit pname version; - sha256 = "239507184ee5b1b83557005af1d5fcce70f83ae18f5dff45b94a67226db10d63"; + sha256 = "0j73mr3d3rf2r4nkaxbvl7323xima0l95pjagjzgk2piqwa3nbd2"; }; meta = { diff --git a/pkgs/development/python-modules/plexapi/default.nix b/pkgs/development/python-modules/plexapi/default.nix new file mode 100644 index 00000000000..ed95de9ffde --- /dev/null +++ b/pkgs/development/python-modules/plexapi/default.nix @@ -0,0 +1,26 @@ +{ lib, buildPythonPackage, fetchFromGitHub, requests +, tqdm, websocket_client, pytest, pillow, mock, isPy27 }: + +buildPythonPackage rec { + pname = "PlexAPI"; + version = "3.2.0"; + + src = fetchFromGitHub { + owner = "pkkid"; + repo = "python-plexapi"; + rev = version; + sha256 = "1rzy018zcsws56mcghnphhzwj650pwj7qg6nh9z1kjvgwwjfmghf"; + }; + + propagatedBuildInputs = [ requests tqdm websocket_client ]; + + checkInputs = [ pytest pillow ] + ++ lib.optionals isPy27 [ mock ]; + + meta = with lib; { + homepage = "https://github.com/pkkid/python-plexapi"; + description = "Python bindings for the Plex API"; + license = licenses.bsd3; + maintainers = with maintainers; [ colemickens ]; + }; +} diff --git a/pkgs/development/python-modules/plexauth/default.nix b/pkgs/development/python-modules/plexauth/default.nix new file mode 100644 index 00000000000..91407a907a4 --- /dev/null +++ b/pkgs/development/python-modules/plexauth/default.nix @@ -0,0 +1,31 @@ +{ lib, buildPythonPackage, fetchFromGitHub, aiohttp, isPy27 }: + +buildPythonPackage rec { + pname = "plexauth"; + version = "0.0.5"; + disabled = isPy27; + + src = fetchFromGitHub { + owner = "jjlawren"; + repo = "python-plexauth"; + rev = "v${version}"; + sha256 = "1wbrn22iywl4ccz64r3w3f17k0r7vi2cqkqd2mrdkx5xqhscn9hz"; + }; + + propagatedBuildInputs = [ aiohttp ]; + + # package does not include tests + doCheck = false; + + # at least guarantee the module can be imported + pythonImportsCheck = [ + "plexauth" + ]; + + meta = with lib; { + homepage = "https://github.com/jjlawren/python-plexauth/"; + description = "Handles the authorization flow to obtain tokens from Plex.tv via external redirection"; + license = licenses.mit; + maintainers = with maintainers; [ colemickens ]; + }; +} diff --git a/pkgs/development/python-modules/plexwebsocket/default.nix b/pkgs/development/python-modules/plexwebsocket/default.nix new file mode 100644 index 00000000000..383a37cee3f --- /dev/null +++ b/pkgs/development/python-modules/plexwebsocket/default.nix @@ -0,0 +1,31 @@ +{ lib, buildPythonPackage, fetchFromGitHub, aiohttp, isPy27 }: + +buildPythonPackage rec { + pname = "plexwebsocket"; + version = "0.0.6"; + disabled = isPy27; + + src = fetchFromGitHub { + owner = "jjlawren"; + repo = "python-plexwebsocket"; + rev = "v${version}"; + sha256 = "1sy9khxksimcmdvghg1ksk65mkiihjvhi7m7ms2kzmy7mrg3s3i7"; + }; + + propagatedBuildInputs = [ aiohttp ]; + + # package does not include tests + doCheck = false; + + # at least guarantee the module can be imported + pythonImportsCheck = [ + "plexwebsocket" + ]; + + meta = with lib; { + homepage = "https://github.com/jjlawren/python-plexwebsocket/"; + description = "Async library to react to events issued over Plex websockets"; + license = licenses.mit; + maintainers = with maintainers; [ colemickens ]; + }; +} diff --git a/pkgs/development/python-modules/ppft/default.nix b/pkgs/development/python-modules/ppft/default.nix index 101c10b1d12..8731c997aa7 100644 --- a/pkgs/development/python-modules/ppft/default.nix +++ b/pkgs/development/python-modules/ppft/default.nix @@ -1,6 +1,7 @@ { stdenv , buildPythonPackage , fetchPypi +, python , six }: @@ -15,8 +16,12 @@ buildPythonPackage rec { propagatedBuildInputs = [ six ]; - # tests no longer packages on pypi - doCheck = false; + # darwin seems to hang + doCheck = !stdenv.isDarwin; + checkPhase = '' + cd examples + ${python.interpreter} -m ppft.tests + ''; meta = with stdenv.lib; { description = "Distributed and parallel python"; diff --git a/pkgs/development/python-modules/praw/default.nix b/pkgs/development/python-modules/praw/default.nix index 14166b4f43c..47715b9e567 100644 --- a/pkgs/development/python-modules/praw/default.nix +++ b/pkgs/development/python-modules/praw/default.nix @@ -14,13 +14,13 @@ buildPythonPackage rec { pname = "praw"; - version = "6.4.0"; + version = "6.5.1"; src = fetchFromGitHub { owner = "praw-dev"; repo = "praw"; rev = "v${version}"; - sha256 = "0j92wqyppif2k80zhzq30b04r8ljwjviply400kn4rjn54hxd4hb"; + sha256 = "0d5whaw4731gllffhwrh2qqnlki4j8q83xaf3v4spkd40ps3q7b4"; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pyhcl/default.nix b/pkgs/development/python-modules/pyhcl/default.nix new file mode 100644 index 00000000000..e409282980d --- /dev/null +++ b/pkgs/development/python-modules/pyhcl/default.nix @@ -0,0 +1,46 @@ +{ buildPythonPackage +, fetchFromGitHub +, isPy3k +, lib + +# pythonPackages +, coverage +, pytest +}: + +buildPythonPackage rec { + pname = "pyhcl"; + version = "0.4.0"; + disabled = !isPy3k; + + src = fetchFromGitHub { + owner = "virtuald"; + repo = pname; + rev = version; + sha256 = "09kwm3digbwn3kmbk76jswxgwfcfchik6cfa2xbhjanh4xs893hs"; + }; + + # https://github.com/virtuald/pyhcl/blob/51a7524b68fe21e175e157b8af931016d7a357ad/setup.py#L64 + configurePhase = '' + echo '__version__ = "${version}"' > ./src/hcl/version.py + ''; + + checkInputs = [ + coverage + pytest + ]; + + # https://github.com/virtuald/pyhcl/blob/51a7524b68fe21e175e157b8af931016d7a357ad/tests/run_tests.sh#L4 + checkPhase = '' + coverage run --source hcl -m pytest tests + ''; + + meta = with lib; { + description = "HCL is a configuration language. pyhcl is a python parser for it"; + homepage = "https://github.com/virtuald/pyhcl"; + license = licenses.mpl20; + maintainers = with maintainers; [ + kamadorueda + ]; + }; +} diff --git a/pkgs/development/python-modules/python-dotenv/default.nix b/pkgs/development/python-modules/python-dotenv/default.nix index ba74817a63f..f43d8d0575b 100644 --- a/pkgs/development/python-modules/python-dotenv/default.nix +++ b/pkgs/development/python-modules/python-dotenv/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "python-dotenv"; - version = "0.10.3"; + version = "0.10.4"; src = fetchPypi { inherit pname version; - sha256 = "0i25gh8wi87l4g0iflp81rlgmps4cdmp90hwypalp7gcbwfxfmzi"; + sha256 = "16s2x5ghrhz9ljm6h3y0pbwh97558vbs7l0yiicag4s0xyn0nzq0"; }; propagatedBuildInputs = [ click ] ++ lib.optionals isPy27 [ typing ]; diff --git a/pkgs/development/python-modules/python-telegram-bot/default.nix b/pkgs/development/python-modules/python-telegram-bot/default.nix index 52fe5209ade..11342237479 100644 --- a/pkgs/development/python-modules/python-telegram-bot/default.nix +++ b/pkgs/development/python-modules/python-telegram-bot/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "python-telegram-bot"; - version = "12.2.0"; + version = "12.3.0"; src = fetchPypi { inherit pname version; - sha256 = "346d42771c2b23384c59f5f41e05bd7e801a0ce118d8dcb95209bb73d5f694c5"; + sha256 = "0yrg5342zz0hpf2pc85ffwx57msa6jpcmvvjfkzh8nh2lc98aq21"; }; prePatch = '' diff --git a/pkgs/development/python-modules/qtawesome/default.nix b/pkgs/development/python-modules/qtawesome/default.nix index a6c431764be..9392504ce26 100644 --- a/pkgs/development/python-modules/qtawesome/default.nix +++ b/pkgs/development/python-modules/qtawesome/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "QtAwesome"; - version = "0.6.0"; + version = "0.6.1"; src = fetchPypi { inherit pname version; - sha256 = "05qypwlzjkw31x7qgn01d4kcf40mbymg5c9h3i7cx2r8sw29akjy"; + sha256 = "1w4im0hzx497binyx6a6awbyszk1bsz34prm4j72gl5kszkiq7yq"; }; propagatedBuildInputs = [ qtpy six ]; diff --git a/pkgs/development/python-modules/runway-python/default.nix b/pkgs/development/python-modules/runway-python/default.nix index 5c60b6379e9..fca11c100cf 100644 --- a/pkgs/development/python-modules/runway-python/default.nix +++ b/pkgs/development/python-modules/runway-python/default.nix @@ -2,29 +2,38 @@ , buildPythonPackage , fetchPypi , flask +, flask-compress , flask-cors +, flask-sockets , numpy +, scipy , pillow , gevent , wget , six , colorcet +, unidecode +, urllib3 }: buildPythonPackage rec { pname = "runway-python"; - version = "0.5.7"; + version = "0.5.9"; src = fetchPypi { inherit pname version; - sha256 = "06e0138cc4cf2ddb7304502f5c7b53269ce73679c5784c8d6b423db04d179c18"; + sha256 = "1d75c44008275213034977c75bc2dc6f419e7f11d087984e3faea1e0cf6da69d"; }; - propagatedBuildInputs = [ flask flask-cors numpy pillow gevent wget six colorcet ]; + propagatedBuildInputs = [ flask flask-compress flask-cors flask-sockets numpy scipy pillow gevent wget six colorcet unidecode urllib3 ]; # tests are not packaged in the released tarball doCheck = false; + pythonImportsCheck = [ + "runway" + ]; + meta = { description = "Helper library for creating Runway models"; homepage = https://github.com/runwayml/model-sdk; diff --git a/pkgs/development/python-modules/shodan/default.nix b/pkgs/development/python-modules/shodan/default.nix index 52dc89e3a96..909c54788b2 100644 --- a/pkgs/development/python-modules/shodan/default.nix +++ b/pkgs/development/python-modules/shodan/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "shodan"; - version = "1.21.1"; + version = "1.21.2"; src = fetchPypi { inherit pname version; - sha256 = "834dfd084fed290b2b445545b0d1cac7822f3c0ed6ba09707efb1716bb485ede"; + sha256 = "1pbfmab3ixvaa845qp6ms2djcwp9c5vnlsr2bf9prmx5973khg7d"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/sphinx/2.nix b/pkgs/development/python-modules/sphinx/2.nix index b6374989690..541c292fe8f 100644 --- a/pkgs/development/python-modules/sphinx/2.nix +++ b/pkgs/development/python-modules/sphinx/2.nix @@ -60,6 +60,13 @@ buildPythonPackage rec { # Lots of tests. Needs network as well at some point. doCheck = false; + patches = [ + # Since pygments 2.5, PythonLexer refers to python3. If we want to use + # python2, we need to explicitly specify Python2Lexer. + # Not upstreamed since there doesn't seem to be any upstream maintenance + # branch for 1.8 (and this patch doesn't make any sense for 2.x). + ./python2-lexer.patch + ]; # https://github.com/NixOS/nixpkgs/issues/22501 # Do not run `python sphinx-build arguments` but `sphinx-build arguments`. postPatch = '' diff --git a/pkgs/development/python-modules/sphinx/python2-lexer.patch b/pkgs/development/python-modules/sphinx/python2-lexer.patch new file mode 100644 index 00000000000..cf4a243315a --- /dev/null +++ b/pkgs/development/python-modules/sphinx/python2-lexer.patch @@ -0,0 +1,22 @@ +diff --git a/sphinx/highlighting.py b/sphinx/highlighting.py +index ac2bd1b06..63ca52de2 100644 +--- a/sphinx/highlighting.py ++++ b/sphinx/highlighting.py +@@ -16,7 +16,7 @@ from pygments.filters import ErrorToken + from pygments.formatters import HtmlFormatter, LatexFormatter + from pygments.lexer import Lexer # NOQA + from pygments.lexers import get_lexer_by_name, guess_lexer +-from pygments.lexers import PythonLexer, Python3Lexer, PythonConsoleLexer, \ ++from pygments.lexers import Python2Lexer, Python3Lexer, PythonConsoleLexer, \ + CLexer, TextLexer, RstLexer + from pygments.styles import get_style_by_name + from pygments.util import ClassNotFound +@@ -40,7 +40,7 @@ logger = logging.getLogger(__name__) + + lexers = dict( + none = TextLexer(stripnl=False), +- python = PythonLexer(stripnl=False), ++ python = Python2Lexer(stripnl=False), + python3 = Python3Lexer(stripnl=False), + pycon = PythonConsoleLexer(stripnl=False), + pycon3 = PythonConsoleLexer(python3=True, stripnl=False), diff --git a/pkgs/development/python-modules/spotipy/default.nix b/pkgs/development/python-modules/spotipy/default.nix index 70471aedbd7..e728739c294 100644 --- a/pkgs/development/python-modules/spotipy/default.nix +++ b/pkgs/development/python-modules/spotipy/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "spotipy"; - version = "2.4.4"; + version = "2.6.1"; src = fetchPypi { inherit pname version; - sha256 = "1l8ya0cln936x0mx2j5ngl1xwpc0r89hs3wcvb8x8paw3d4dl1ab"; + sha256 = "1jpj9ljc5g89jbnzwnmgz5s6jdrsgd6g9s09igvbw3pppi9070h0"; }; propagatedBuildInputs = [ requests ]; diff --git a/pkgs/development/python-modules/stripe/default.nix b/pkgs/development/python-modules/stripe/default.nix index d564adbc6e2..3f1c1e53c7c 100644 --- a/pkgs/development/python-modules/stripe/default.nix +++ b/pkgs/development/python-modules/stripe/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "stripe"; - version = "2.41.0"; + version = "2.42.0"; # Tests require network connectivity and there's no easy way to disable # them. ~ C. @@ -10,7 +10,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "2f0ec677136985ece9cca232f106c2a87193261cac1fe58d4e959215310a0da8"; + sha256 = "1vrs0mydj2j789slzfv5413qxa067zi7p34h2p63612gm3vdrcl9"; }; propagatedBuildInputs = [ requests ]; diff --git a/pkgs/development/python-modules/uvloop/default.nix b/pkgs/development/python-modules/uvloop/default.nix index b1fbf26e43b..00e2c5e2a4b 100644 --- a/pkgs/development/python-modules/uvloop/default.nix +++ b/pkgs/development/python-modules/uvloop/default.nix @@ -6,6 +6,7 @@ , libuv , psutil , isPy27 +, pythonAtLeast , CoreServices , ApplicationServices }: @@ -13,7 +14,8 @@ buildPythonPackage rec { pname = "uvloop"; version = "0.14.0"; - disabled = isPy27; + # python 3.8 hangs on tests, assuming it's subtly broken with race condition + disabled = isPy27 || pythonAtLeast "3.8"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/vega/default.nix b/pkgs/development/python-modules/vega/default.nix index 2bfeccccc59..73485329ef7 100644 --- a/pkgs/development/python-modules/vega/default.nix +++ b/pkgs/development/python-modules/vega/default.nix @@ -1,5 +1,5 @@ { stdenv, buildPythonPackage , fetchPypi -, pytest, jupyter_core, pandas }: +, pytest, jupyter_core, pandas, ipywidgets }: buildPythonPackage rec { pname = "vega"; @@ -11,7 +11,7 @@ buildPythonPackage rec { }; buildInputs = [ pytest ]; - propagatedBuildInputs = [ jupyter_core pandas ]; + propagatedBuildInputs = [ jupyter_core pandas ipywidgets ]; meta = with stdenv.lib; { description = "An IPython/Jupyter widget for Vega and Vega-Lite"; diff --git a/pkgs/development/tools/aws-sam-cli/default.nix b/pkgs/development/tools/aws-sam-cli/default.nix index 43cb26a30d8..39a68622056 100644 --- a/pkgs/development/tools/aws-sam-cli/default.nix +++ b/pkgs/development/tools/aws-sam-cli/default.nix @@ -24,6 +24,29 @@ let doCheck = false; }); + cookiecutter = super.cookiecutter.overridePythonAttrs (oldAttrs: rec { + version = "1.6.0"; + src = oldAttrs.src.override { + inherit version; + sha256 = "0glsvaz8igi2wy1hsnhm9fkn6560vdvdixzvkq6dn20z3hpaa5hk"; + }; + }); + + boto3 = super.boto3.overridePythonAttrs (oldAttrs: rec { + version = "1.10.50"; + src = oldAttrs.src.override { + inherit version; + sha256 = "199nr61ivm4bychn3rxyzzyca5f8wlwags3s43rdv9yn048xa02w"; + }; + }); + + botocore = super.botocore.overridePythonAttrs (oldAttrs: rec { + version = "1.13.50"; + src = oldAttrs.src.override { + inherit version; + sha256 = "1m3lbi13d9gcp6wfhv0pkwg8akasxlhv49y34ybj74ppgximqnkn"; + }; + }); }; }; @@ -33,11 +56,11 @@ with py.pkgs; buildPythonApplication rec { pname = "aws-sam-cli"; - version = "0.34.0"; + version = "0.40.0"; src = fetchPypi { inherit pname version; - sha256 = "1ndgcbd6zr23lvmqn4wikgvnlwl0gj0wgyawaspwm3b0jlvxadik"; + sha256 = "1vlg5fdkq5xr4v3a86gyxbbrx4rzdspbv62ki7q8yq8xdja1qz05"; }; # Tests are not included in the PyPI package diff --git a/pkgs/development/tools/build-managers/icmake/default.nix b/pkgs/development/tools/build-managers/icmake/default.nix index 48a719c7c26..7135790c1bd 100644 --- a/pkgs/development/tools/build-managers/icmake/default.nix +++ b/pkgs/development/tools/build-managers/icmake/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "icmake"; - version = "9.02.09"; + version = "9.03.01"; src = fetchFromGitLab { - sha256 = "0f4vyqgjribwa60j3a1c2xv69zllc7rfhaafq0jj1mdy8hdzvxpd"; + sha256 = "05r0a69w0hv2qhjpb2bxd0lmp2vv5r2d4iggg6ly4miam0i318jy"; rev = version; repo = "icmake"; owner = "fbb-git"; diff --git a/pkgs/development/tools/renderizer/default.nix b/pkgs/development/tools/renderizer/default.nix new file mode 100644 index 00000000000..f33cad8da7a --- /dev/null +++ b/pkgs/development/tools/renderizer/default.nix @@ -0,0 +1,22 @@ +{ stdenv, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "renderizer"; + version = "2.0.5"; + + src = fetchFromGitHub { + owner = "gomatic"; + repo = pname; + rev = version; + sha256 = "186wcfzw60z6i59yl37rkppw8w88z5kikvsi65k4r9kwpll2z6z4"; + }; + + modSha256 = "1sxg9skd5hjpg2f4wyxh5hwjrplw3b3v32gn61a9yixfk3wvi05x"; + + meta = with stdenv.lib; { + description = "CLI to render Go template text files"; + inherit (src.meta) homepage; + license = licenses.gpl3; + maintainers = with maintainers; [ yurrriq ]; + }; +} diff --git a/pkgs/development/tools/rust/cargo-make/Cargo.lock b/pkgs/development/tools/rust/cargo-make/Cargo.lock index bcf708735f6..de4e6f080bc 100644 --- a/pkgs/development/tools/rust/cargo-make/Cargo.lock +++ b/pkgs/development/tools/rust/cargo-make/Cargo.lock @@ -1,6 +1,11 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. [[package]] +name = "adler32" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] name = "aho-corasick" version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -27,6 +32,19 @@ version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] +name = "attohttpc" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "flate2 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)", + "http 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", + "native-tls 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", + "openssl 0.10.26 (registry+https://github.com/rust-lang/crates.io-index)", + "url 2.1.1 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] name = "atty" version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -38,36 +56,18 @@ dependencies = [ [[package]] name = "autocfg" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" - -[[package]] -name = "backtrace" -version = "0.3.42" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "backtrace-sys 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)", - "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-demangle 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", -] [[package]] -name = "backtrace-sys" -version = "0.1.32" +name = "autocfg" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "cc 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -] [[package]] name = "base64" -version = "0.10.1" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", -] [[package]] name = "bitflags" @@ -85,8 +85,8 @@ dependencies = [ ] [[package]] -name = "byteorder" -version = "1.3.2" +name = "bytes" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -99,15 +99,15 @@ dependencies = [ [[package]] name = "cargo-make" -version = "0.26.1" +version = "0.26.2" dependencies = [ - "ci_info 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", + "ci_info 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)", "colored 1.9.2 (registry+https://github.com/rust-lang/crates.io-index)", "dirs 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)", - "duckscript 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", - "duckscriptsdk 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", - "envmnt 0.7.5 (registry+https://github.com/rust-lang/crates.io-index)", + "duckscript 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", + "duckscriptsdk 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", + "envmnt 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", "fern 0.5.9 (registry+https://github.com/rust-lang/crates.io-index)", "git_info 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "glob 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -115,7 +115,7 @@ dependencies = [ "indexmap 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", - "run_script 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", + "run_script 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", "rust_info 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", @@ -146,10 +146,10 @@ dependencies = [ [[package]] name = "ci_info" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "envmnt 0.7.5 (registry+https://github.com/rust-lang/crates.io-index)", + "envmnt 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -167,14 +167,6 @@ dependencies = [ ] [[package]] -name = "cloudabi" -version = "0.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] name = "colored" version = "1.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -190,10 +182,33 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] +name = "core-foundation" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "core-foundation-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "core-foundation-sys" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] +name = "crc32fast" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] name = "crossbeam-utils" -version = "0.6.6" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ + "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -214,21 +229,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", - "redox_users 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "redox_users 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "duckscript" -version = "0.1.6" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "duckscriptsdk" -version = "0.1.7" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "duckscript 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", + "attohttpc 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", + "duckscript 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", "fs_extra 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "home 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", "hostname 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -297,44 +313,48 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "envmnt" -version = "0.7.5" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "indexmap 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] -name = "failure" -version = "0.1.6" +name = "fern" +version = "0.5.9" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "backtrace 0.3.42 (registry+https://github.com/rust-lang/crates.io-index)", - "failure_derive 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", + "chrono 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] -name = "failure_derive" -version = "0.1.6" +name = "flate2" +version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "proc-macro2 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)", - "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", - "syn 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)", - "synstructure 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)", + "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", + "crc32fast 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", + "miniz_oxide 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] -name = "fern" -version = "0.5.9" +name = "fnv" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] +name = "foreign-types" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "chrono 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", + "foreign-types-shared 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] -name = "fnv" -version = "1.0.6" +name = "foreign-types-shared" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -343,11 +363,6 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] -name = "fuchsia-cprng" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" - -[[package]] name = "getrandom" version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -394,6 +409,26 @@ dependencies = [ ] [[package]] +name = "http" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "bytes 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)", + "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", + "itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "idna" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", + "unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", + "unicode-normalization 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] name = "indexmap" version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -403,6 +438,11 @@ dependencies = [ ] [[package]] +name = "itoa" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] name = "java-properties" version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -435,6 +475,11 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] +name = "matches" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] name = "memchr" version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -449,6 +494,31 @@ dependencies = [ ] [[package]] +name = "miniz_oxide" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "adler32 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "native-tls" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", + "openssl 0.10.26 (registry+https://github.com/rust-lang/crates.io-index)", + "openssl-probe 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "openssl-sys 0.9.53 (registry+https://github.com/rust-lang/crates.io-index)", + "schannel 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", + "security-framework 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", + "security-framework-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", + "tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] name = "nom" version = "1.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -471,6 +541,46 @@ dependencies = [ ] [[package]] +name = "openssl" +version = "0.10.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", + "foreign-types 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", + "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", + "openssl-sys 0.9.53 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "openssl-probe" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] +name = "openssl-sys" +version = "0.9.53" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", + "cc 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", + "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)", + "vcpkg 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "percent-encoding" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] +name = "pkg-config" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] name = "ppv-lite86" version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -514,19 +624,6 @@ dependencies = [ [[package]] name = "rand_core" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "rand_core" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" - -[[package]] -name = "rand_core" version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ @@ -542,40 +639,18 @@ dependencies = [ ] [[package]] -name = "rand_os" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)", - "fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", - "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", - "rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "rdrand" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] name = "redox_syscall" version = "0.1.56" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "redox_users" -version = "0.3.1" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", - "rand_os 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", + "getrandom 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)", "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)", - "rust-argon2 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", + "rust-argon2 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -595,8 +670,16 @@ version = "0.6.13" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] +name = "remove_dir_all" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] name = "run_script" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "rand 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", @@ -605,12 +688,13 @@ dependencies = [ [[package]] name = "rust-argon2" -version = "0.5.1" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", + "base64 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", "blake2b_simd 0.5.10 (registry+https://github.com/rust-lang/crates.io-index)", - "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", + "constant_time_eq 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", + "crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -619,16 +703,39 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] -name = "rustc-demangle" +name = "same-file" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "winapi-util 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "schannel" version = "0.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", +] [[package]] -name = "same-file" -version = "1.0.6" +name = "security-framework" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "winapi-util 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", + "core-foundation 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)", + "core-foundation-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", + "security-framework-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "security-framework-sys" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "core-foundation-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -656,7 +763,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "proc-macro2 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)", "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", - "syn 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 1.0.14 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -668,13 +775,18 @@ dependencies = [ ] [[package]] +name = "smallvec" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] name = "strsim" version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "syn" -version = "1.0.13" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "proc-macro2 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)", @@ -683,14 +795,16 @@ dependencies = [ ] [[package]] -name = "synstructure" -version = "0.12.3" +name = "tempfile" +version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "proc-macro2 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)", - "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", - "syn 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)", - "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", + "rand 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", + "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)", + "remove_dir_all 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -728,6 +842,22 @@ dependencies = [ ] [[package]] +name = "unicode-bidi" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "unicode-normalization" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "smallvec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] name = "unicode-width" version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -738,6 +868,16 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] +name = "url" +version = "2.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "idna 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", + "percent-encoding 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] name = "users" version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -746,6 +886,11 @@ dependencies = [ ] [[package]] +name = "vcpkg" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] name = "vec_map" version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -793,32 +938,35 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" [metadata] +"checksum adler32 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "5d2e7343e7fc9de883d1b0341e0b13970f764c14101234857d2ddafa1cb1cac2" "checksum aho-corasick 0.7.6 (registry+https://github.com/rust-lang/crates.io-index)" = "58fb5e95d83b38284460a5fda7d6470aa0b8844d283a0b614b8535e880800d2d" "checksum ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b" "checksum arrayref 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "0d382e583f07208808f6b1249e60848879ba3543f57c32277bf52d69c2f0f0ee" "checksum arrayvec 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cff77d8686867eceff3105329d4698d96c2391c176d5d03adc90c7389162b5b8" +"checksum attohttpc 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "baf13118df3e3dce4b5ac930641343b91b656e4e72c8f8325838b01a4b1c9d45" "checksum atty 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)" = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" +"checksum autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "1d49d90015b3c36167a20fe2810c5cd875ad504b39cff3d4eae7977e6b7c1cb2" "checksum autocfg 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f8aac770f1885fd7e387acedd76065302551364496e46b3dd00860b2f8359b9d" -"checksum backtrace 0.3.42 (registry+https://github.com/rust-lang/crates.io-index)" = "b4b1549d804b6c73f4817df2ba073709e96e426f12987127c48e6745568c350b" -"checksum backtrace-sys 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)" = "5d6575f128516de27e3ce99689419835fce9643a9b215a14d2b5b685be018491" -"checksum base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0b25d992356d2eb0ed82172f5248873db5560c4721f564b13cb5193bda5e668e" +"checksum base64 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b41b7ea54a0c9d92199de89e20e58d49f02f8e699814ef3fdf266f6f748d15c7" "checksum bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" "checksum blake2b_simd 0.5.10 (registry+https://github.com/rust-lang/crates.io-index)" = "d8fb2d74254a3a0b5cac33ac9f8ed0e44aa50378d9dbb2e5d83bd21ed1dc2c8a" -"checksum byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a7c3dd8985a7111efc5c80b44e23ecdd8c007de8ade3b96595387e812b957cf5" +"checksum bytes 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)" = "130aac562c0dd69c56b3b1cc8ffd2e17be31d0b6c25b61c96b76231aa23e39e1" "checksum c2-chacha 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "214238caa1bf3a496ec3392968969cab8549f96ff30652c9e56885329315f6bb" "checksum cc 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)" = "95e28fa049fda1c330bcf9d723be7663a899c4679724b34c81e9f5a326aab8cd" "checksum cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" "checksum chrono 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)" = "31850b4a4d6bae316f7a09e691c944c28299298837edc0a03f755618c23cbc01" -"checksum ci_info 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a4e9091c3d285e7046afdb70fc7413d1ac670288705e151443f868f71e66ed2a" +"checksum ci_info 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "e53a6853eb0aafd4be4d1c7c891982a91a58f84df98838992ce3eb774572bfd9" "checksum clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5067f5bb2d80ef5d68b4c87db81601f0b75bca627bc2ef76b141d7b846a3c6d9" -"checksum cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f" "checksum colored 1.9.2 (registry+https://github.com/rust-lang/crates.io-index)" = "8815e2ab78f3a59928fc32e141fbeece88320a240e43f47b2fd64ea3a88a5b3d" "checksum constant_time_eq 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" -"checksum crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)" = "04973fa96e96579258a5091af6003abde64af786b860f18622b82e026cca60e6" +"checksum core-foundation 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)" = "25b9e03f145fd4f2bf705e07b900cd41fc636598fe5dc452fd0db1441c3f496d" +"checksum core-foundation-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e7ca8a5221364ef15ce201e8ed2f609fc312682a8f4e0e3d4aa5879764e0fa3b" +"checksum crc32fast 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ba125de2af0df55319f41944744ad91c71113bf74a4646efff39afe1f6842db1" +"checksum crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ce446db02cdc3165b94ae73111e570793400d0794e46125cc4056c81cbb039f4" "checksum dirs 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "13aea89a5c93364a98e9b37b2fa237effbb694d5cfe01c5b70941f7eb087d5e3" "checksum dirs-sys 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "afa0b23de8fd801745c471deffa6e12d248f962c9fd4b4c33787b055599bde7b" -"checksum duckscript 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "b5394d82936cc15539317618b25d532c7fc36415eb8c1ca4c3fd263c104e6145" -"checksum duckscriptsdk 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "3053a419a5bf69b015c8a9d42d82f2fffdf106f9353384d9f5c1819b68dc6141" +"checksum duckscript 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "8ce2dedb6f752438ee1eaf67cb8f8b1008945ba59cba042325681bd97d683520" +"checksum duckscriptsdk 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "701d0a8d1e0c645d1ce5c959493e0166819d7afda998b8ec73659aa5afe127aa" "checksum encoding 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)" = "6b0d943856b990d12d3b55b359144ff341533e516d94098b1d3fc1ac666d36ec" "checksum encoding-index-japanese 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)" = "04e8b2ff42e9a05335dbf8b5c6f7567e5591d0d916ccef4e0b1710d32a0d0c91" "checksum encoding-index-korean 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)" = "4dc33fb8e6bcba213fe2f14275f0963fd16f0a02c878e3095ecfdf5bee529d81" @@ -826,65 +974,80 @@ source = "registry+https://github.com/rust-lang/crates.io-index" "checksum encoding-index-singlebyte 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)" = "3351d5acffb224af9ca265f435b859c7c01537c0849754d3db3fdf2bfe2ae84a" "checksum encoding-index-tradchinese 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)" = "fd0e20d5688ce3cab59eb3ef3a2083a5c77bf496cb798dc6fcdb75f323890c18" "checksum encoding_index_tests 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "a246d82be1c9d791c5dfde9a2bd045fc3cbba3fa2b11ad558f27d01712f00569" -"checksum envmnt 0.7.5 (registry+https://github.com/rust-lang/crates.io-index)" = "39cdd9fdbf10b8cfa59dd70ef823cbaa83e33b86f4ad291ae67b16f4bd37bc69" -"checksum failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "f8273f13c977665c5db7eb2b99ae520952fe5ac831ae4cd09d80c4c7042b5ed9" -"checksum failure_derive 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "0bc225b78e0391e4b8683440bf2e63c2deeeb2ce5189eab46e2b68c6d3725d08" +"checksum envmnt 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "db101f16134ca37f91a6e30c32d9df5bbfcbe8d926f0c1f03602baf2fc2f7352" "checksum fern 0.5.9 (registry+https://github.com/rust-lang/crates.io-index)" = "e69ab0d5aca163e388c3a49d284fed6c3d0810700e77c5ae2756a50ec1a4daaa" +"checksum flate2 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)" = "6bd6d6f4752952feb71363cffc9ebac9411b75b87c6ab6058c40c8900cf43c0f" "checksum fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "2fad85553e09a6f881f739c29f0b00b0f01357c743266d478b68951ce23285f3" +"checksum foreign-types 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" +"checksum foreign-types-shared 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" "checksum fs_extra 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5f2a4a2034423744d2cc7ca2068453168dcdb82c438419e639a26bd87839c674" -"checksum fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba" "checksum getrandom 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)" = "7abc8dd8451921606d809ba32e95b6111925cd2906060d2dcc29c070220503eb" "checksum git_info 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "add3a9c3c08c8905a2165ff06891dd1c3bb32d81b2a32d79528abc9793dfb06f" "checksum glob 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" "checksum hermit-abi 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "eff2656d88f158ce120947499e971d743c05dbcbed62e5bd2f38f1698bbc3772" "checksum home 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2456aef2e6b6a9784192ae780c0f15bc57df0e918585282325e8c8ac27737654" "checksum hostname 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "01b1af8d6d068ba9de1c39c6ff0d879aed20f74873d4d3929a4535000bb07886" +"checksum http 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b708cc7f06493459026f53b9a61a7a121a5d1ec6238dee58ea4941132b30156b" +"checksum idna 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "02e2673c30ee86b5b96a9cb52ad15718aa1f966f5ab9ad54a8b95d5ca33120a9" "checksum indexmap 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0b54058f0a6ff80b6803da8faf8997cde53872b38f4023728f6830b06cd3c0dc" +"checksum itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "501266b7edd0174f8530248f87f99c88fbe60ca4ef3dd486835b8d8d53136f7f" "checksum java-properties 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "caf4418ade5bde22a283a7f2fb537ea397ec102718f259f2630714e7a5b389fa" "checksum lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" "checksum libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)" = "d515b1f41455adea1313a4a2ac8a8a477634fbae63cc6100e3aebb207ce61558" "checksum log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)" = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7" "checksum match_cfg 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ffbee8634e0d45d258acb448e7eaab3fce7a0a467395d4d9f228e3c1f01fb2e4" +"checksum matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08" "checksum memchr 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3197e20c7edb283f87c071ddfc7a2cca8f8e0b888c242959846a6fce03c72223" "checksum meval 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f79496a5651c8d57cd033c5add8ca7ee4e3d5f7587a4777484640d9cb60392d9" +"checksum miniz_oxide 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "6f3f74f726ae935c3f514300cc6773a0c9492abc5e972d42ba0c0ebb88757625" +"checksum native-tls 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "4b2df1a4c22fd44a62147fd8f13dd0f95c9d8ca7b2610299b2a2f9cf8964274e" "checksum nom 1.2.4 (registry+https://github.com/rust-lang/crates.io-index)" = "a5b8c256fd9471521bcb84c3cdba98921497f1a331cbc15b8030fc63b82050ce" "checksum num-integer 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "3f6ea62e9d81a77cd3ee9a2a5b9b609447857f3d358704331e4ef39eb247fcba" "checksum num-traits 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "c62be47e61d1842b9170f0fdeec8eba98e60e90e5446449a0545e5152acd7096" +"checksum openssl 0.10.26 (registry+https://github.com/rust-lang/crates.io-index)" = "3a3cc5799d98e1088141b8e01ff760112bbd9f19d850c124500566ca6901a585" +"checksum openssl-probe 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de" +"checksum openssl-sys 0.9.53 (registry+https://github.com/rust-lang/crates.io-index)" = "465d16ae7fc0e313318f7de5cecf57b2fbe7511fd213978b457e1c96ff46736f" +"checksum percent-encoding 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" +"checksum pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)" = "05da548ad6865900e60eaba7f589cc0783590a92e940c26953ff81ddbab2d677" "checksum ppv-lite86 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "74490b50b9fbe561ac330df47c08f3f33073d2d00c150f719147d7c54522fa1b" "checksum proc-macro2 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)" = "3acb317c6ff86a4e579dfa00fc5e6cca91ecbb4e7eb2df0468805b674eb88548" "checksum quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "053a8c8bcc71fcce321828dc897a98ab9760bef03a4fc36693c231e5b3216cfe" "checksum rand 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)" = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" "checksum rand_chacha 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "03a2a90da8c7523f554344f921aa97283eadf6ac484a6d2a7d0212fa7f8d6853" -"checksum rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b" -"checksum rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc" "checksum rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" "checksum rand_hc 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" -"checksum rand_os 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "7b75f676a1e053fc562eafbb47838d67c84801e38fc1ba459e8f180deabd5071" -"checksum rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2" "checksum redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)" = "2439c63f3f6139d1b57529d16bc3b8bb855230c8efcc5d3a896c8bea7c3b1e84" -"checksum redox_users 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4ecedbca3bf205f8d8f5c2b44d83cd0690e39ee84b951ed649e9f1841132b66d" +"checksum redox_users 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "09b23093265f8d200fa7b4c2c76297f47e681c655f6f1285a8780d6a022f7431" "checksum regex 1.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "b5508c1941e4e7cb19965abef075d35a9a8b5cdf0846f30b4050e9b55dc55e87" "checksum regex-syntax 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)" = "e734e891f5b408a29efbf8309e656876276f49ab6a6ac208600b4419bd893d90" -"checksum run_script 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7c0159ae870920e692ef9226b56b831d50abca091e588e43972f3e099b40ca7f" -"checksum rust-argon2 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4ca4eaef519b494d1f2848fc602d18816fed808a981aedf4f1f00ceb7c9d32cf" +"checksum remove_dir_all 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "4a83fa3702a688b9359eccba92d153ac33fd2e8462f9e0e3fdf155239ea7792e" +"checksum run_script 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2dfbbb48b9c7ee71baadd968640f81ca4bc930c1a2029441eede96a6933275ac" +"checksum rust-argon2 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2bc8af4bda8e1ff4932523b94d3dd20ee30a87232323eda55903ffd71d2fb017" "checksum rust_info 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "be941f2b996df7ffaf093366039c9dc182b3ca2e00f3e81df44e08c3611e773d" -"checksum rustc-demangle 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)" = "4c691c0e608126e00913e33f0ccf3727d5fc84573623b8d65b2df340b5201783" "checksum same-file 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" +"checksum schannel 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)" = "87f550b06b6cba9c8b8be3ee73f391990116bf527450d2556e9b9ce263b9a021" +"checksum security-framework 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "8ef2429d7cefe5fd28bd1d2ed41c944547d4ff84776f5935b456da44593a16df" +"checksum security-framework-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "e31493fc37615debb8c5090a7aeb4a9730bc61e77ab10b9af59f1a202284f895" "checksum semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" "checksum semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" "checksum serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)" = "414115f25f818d7dfccec8ee535d76949ae78584fc4f79a6f45a904bf8ab4449" "checksum serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)" = "128f9e303a5a29922045a830221b8f78ec74a5f544944f3d5984f8ec3895ef64" "checksum shell2batch 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "185a52ee351c1001753c9e3b2eb48c525ff7f51803a4f2cef4365b5c3b743f65" +"checksum smallvec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "44e59e0c9fa00817912ae6e4e6e3c4fe04455e75699d06eedc7d85917ed8e8f4" "checksum strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" -"checksum syn 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)" = "1e4ff033220a41d1a57d8125eab57bf5263783dfdcc18688b1dacc6ce9651ef8" -"checksum synstructure 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)" = "67656ea1dc1b41b1451851562ea232ec2e5a80242139f7e679ceccfb5d61f545" +"checksum syn 1.0.14 (registry+https://github.com/rust-lang/crates.io-index)" = "af6f3550d8dff9ef7dc34d384ac6f107e5d31c8f57d9f28e0081503f547ac8f5" +"checksum tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9" "checksum textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" "checksum thread_local 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d40c6d1b69745a6ec6fb1ca717914848da4b44ae29d9b3080cbee91d72a69b14" "checksum time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "db8dcfca086c1143c9270ac42a2bbd8a7ee477b78ac8e45b19abfb0cbede4b6f" "checksum toml 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)" = "ffc92d160b1eef40665be3a05630d003936a3bc7da7421277846c2613e92c71a" +"checksum unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5" +"checksum unicode-normalization 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)" = "5479532badd04e128284890390c1e876ef7a993d0570b3597ae43dfa1d59afa4" "checksum unicode-width 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "caaa9d531767d1ff2150b9332433f32a24622147e5ebb1f26409d5da67afd479" "checksum unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c" +"checksum url 2.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "829d4a8476c35c9bf0bbce5a3b23f4106f79728039b726d292bb93bc106787cb" "checksum users 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c72f4267aea0c3ec6d07eaabea6ead7c5ddacfafc5e22bcf8d186706851fb4cf" +"checksum vcpkg 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "3fc439f2794e98976c88a2a2dafce96b930fe8010b0a256b3c2199a773933168" "checksum vec_map 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "05c78687fb1a80548ae3250346c3db86a80a7cdd77bda190189f2d0a0987c81a" "checksum walkdir 2.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "777182bc735b6424e1a57516d35ed72cb8019d85c8c9bf536dccb3445c1a2f7d" "checksum wasi 0.9.0+wasi-snapshot-preview1 (registry+https://github.com/rust-lang/crates.io-index)" = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" diff --git a/pkgs/development/tools/rust/cargo-make/default.nix b/pkgs/development/tools/rust/cargo-make/default.nix index bbad7ee731b..d596e51b275 100644 --- a/pkgs/development/tools/rust/cargo-make/default.nix +++ b/pkgs/development/tools/rust/cargo-make/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchurl, runCommand, fetchFromGitHub, rustPlatform, Security }: +{ stdenv, fetchurl, runCommand, fetchFromGitHub, rustPlatform, Security, openssl, pkg-config }: rustPlatform.buildRustPackage rec { pname = "cargo-make"; - version = "0.26.1"; + version = "0.26.2"; src = let @@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec { owner = "sagiegurari"; repo = pname; rev = version; - sha256 = "04h8vr8k790kkn09yrqv7py0sn2fmj4b51c4kjhplr0pcxkbdbdn"; + sha256 = "022krw38kyvv9wr8v7rnwp21d64pdiivwgvbmdix725dlypl43h4"; }; in runCommand "cargo-make-src" {} '' @@ -19,9 +19,12 @@ rustPlatform.buildRustPackage rec { cp ${./Cargo.lock} $out/Cargo.lock ''; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + nativeBuildInputs = [ pkg-config ]; - cargoSha256 = "05m966h58mgq1bm92yfzzpd4ivlv4jh5fy1kfazcfsfw2k0kqmka"; + buildInputs = [ openssl ] + ++ stdenv.lib.optionals stdenv.isDarwin [ Security ]; + + cargoSha256 = "10ij0k428ia9yy8j1dr9f6xf1cgc8778prry4bp8ribd3wymxs1j"; # Some tests fail because they need network access. # However, Travis ensures a proper build. diff --git a/pkgs/development/web/nodejs/v13.nix b/pkgs/development/web/nodejs/v13.nix index 1c32310a82d..db1705d481e 100644 --- a/pkgs/development/web/nodejs/v13.nix +++ b/pkgs/development/web/nodejs/v13.nix @@ -5,6 +5,6 @@ let in buildNodejs { inherit enableNpm; - version = "13.6.0"; - sha256 = "0jf9nn5i1bijmrcgjvkp37fyz63lwwmxjh7nxipn2vw2qdx6ngsm"; + version = "13.7.0"; + sha256 = "1fql5858aqny8krrqrgdp97kfia8xv0jlviwnm3akmv8i1i6xqkh"; } diff --git a/pkgs/development/web/postman/default.nix b/pkgs/development/web/postman/default.nix index 3a0a8f34356..5407f8408ea 100644 --- a/pkgs/development/web/postman/default.nix +++ b/pkgs/development/web/postman/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "postman"; - version = "7.14.0"; + version = "7.16.0"; src = fetchurl { url = "https://dl.pstmn.io/download/version/${version}/linux64"; - sha256 = "0565qvn5bnx1mc1ibxrqszzvls0gkg10js55439lwygfhkal0lvy"; + sha256 = "1f68z4n0n2jj5ymssii82cswz4kw3dd3zkz26ahsbpsc2hr7ijxp"; name = "${pname}.tar.gz"; }; diff --git a/pkgs/games/crispy-doom/default.nix b/pkgs/games/crispy-doom/default.nix index 4fb4f301cfb..e85cebde040 100644 --- a/pkgs/games/crispy-doom/default.nix +++ b/pkgs/games/crispy-doom/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "crispy-doom"; - version = "5.6.3"; + version = "5.6.4"; src = fetchFromGitHub { owner = "fabiangreffrath"; repo = pname; rev = "${pname}-${version}"; - sha256 = "0f319979wqfgm4pvsa6y5clg30p55l441kmrr8db0p5smyv3x2s4"; + sha256 = "1ls4v2kpb7vi7xji5yqbmyc5lfkz497h1vvj9w86wkrw8k59hlg2"; }; postPatch = '' diff --git a/pkgs/games/empty-epsilon/default.nix b/pkgs/games/empty-epsilon/default.nix index 17d503de1f7..6560db48cb3 100644 --- a/pkgs/games/empty-epsilon/default.nix +++ b/pkgs/games/empty-epsilon/default.nix @@ -2,9 +2,9 @@ let - major = "2019"; - minor = "11"; - patch = "01"; + major = "2020"; + minor = "01"; + patch = "15"; version = "${major}.${minor}.${patch}"; @@ -16,7 +16,7 @@ let owner = "daid"; repo = "SeriousProton"; rev = "EE-${version}"; - sha256 = "1sc1z9n99jspa8jnk0pwdzynnadvcmb3pxl5cndw3z90xjwpzivw"; + sha256 = "0isiy18dv22cpv7wdbvqss2afha719a7i76bvw4cs14vfsdx9s8w"; }; nativeBuildInputs = [ cmake ]; @@ -42,7 +42,7 @@ stdenv.mkDerivation { owner = "daid"; repo = "EmptyEpsilon"; rev = "EE-${version}"; - sha256 = "09jizc6h7jbsp8bzv05pvb5z24zadjzjx1slj5317axsb170v81p"; + sha256 = "0jklfap9jd9ynhvwzr9q4icvx5yb4sqm457vcar4jads4pwsd0xk"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/games/nudoku/default.nix b/pkgs/games/nudoku/default.nix new file mode 100644 index 00000000000..b9e521bce36 --- /dev/null +++ b/pkgs/games/nudoku/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, gettext, ncurses }: + +stdenv.mkDerivation rec { + pname = "nudoku"; + version = "2.0.0"; + + src = fetchFromGitHub { + owner = "jubalh"; + repo = pname; + rev = version; + sha256 = "0rj8ajni7gssj0qbf1jn51699sadxwsr6ca2718w74psv7acda8h"; + }; + + # Allow gettext 0.20 + postPatch = '' + substituteInPlace configure.ac --replace 0.19 0.20 + ''; + + nativeBuildInputs = [ autoreconfHook pkgconfig gettext ]; + buildInputs = [ ncurses ]; + + configureFlags = stdenv.lib.optional stdenv.hostPlatform.isMusl "--disable-nls"; + + meta = with stdenv.lib; { + description = "An ncurses based sudoku game"; + homepage = "http://jubalh.github.io/nudoku/"; + license = licenses.gpl3; + maintainers = with maintainers; [ dtzWill ]; + }; +} + diff --git a/pkgs/games/steam/chrootenv.nix b/pkgs/games/steam/chrootenv.nix index 9229f4fbc93..fd3219d479c 100644 --- a/pkgs/games/steam/chrootenv.nix +++ b/pkgs/games/steam/chrootenv.nix @@ -75,7 +75,7 @@ in buildFHSUserEnv rec { xorg.libX11 xorg.libXfixes libGL - pkgsi686Linux.libva + libva # Not formally in runtime but needed by some games at-spi2-atk diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix index a7e080ebce2..1514e8def97 100644 --- a/pkgs/misc/drivers/hplip/default.nix +++ b/pkgs/misc/drivers/hplip/default.nix @@ -20,8 +20,8 @@ let }; plugin = fetchurl { - url = "https://www.openprinting.org/download/printdriver/auxfiles/HP/plugins/${name}-plugin.run"; - sha256 = "1b5gys04kh41gg7r7rzlpdbc2f4jirl2ik22cd935mm85k7abfwq"; + url = "https://developers.hp.com/sites/default/files/${name}-plugin.run"; + sha256 = "1fn8h1a5znjqjh071ifjdywr0xswc14286gwy6h9vvlh8hzrz347"; }; hplipState = substituteAll { diff --git a/pkgs/misc/screensavers/xss-lock/default.nix b/pkgs/misc/screensavers/xss-lock/default.nix index 500f7a9c5a3..b7b0e27ad46 100644 --- a/pkgs/misc/screensavers/xss-lock/default.nix +++ b/pkgs/misc/screensavers/xss-lock/default.nix @@ -1,13 +1,14 @@ -{ stdenv, fetchgit, cmake, docutils, pkgconfig, glib, libpthreadstubs +{ stdenv, fetchFromGitHub, cmake, docutils, pkgconfig, glib, libpthreadstubs , libXau, libXdmcp, xcbutil }: stdenv.mkDerivation { - name = "xss-lock-git-2014-03-02"; + name = "xss-lock-git-2018-05-31"; - src = fetchgit { - url = https://bitbucket.org/raymonad/xss-lock.git; - rev = "1e158fb20108058dbd62bd51d8e8c003c0a48717"; - sha256 = "10hx7k7ga8g08akwz8qrsvj8iqr5nd4siiva6sjx789jvf0sak7r"; + src = fetchFromGitHub { + owner = "xdbob"; + repo = "xss-lock"; + rev = "cd0b89df9bac1880ea6ea830251c6b4492d505a5"; + sha256 = "040nqgfh564frvqkrkmak3x3h0yadz6kzk81jkfvd9vd20a9drh7"; }; nativeBuildInputs = [ pkgconfig ]; @@ -17,7 +18,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Use external locker (such as i3lock) as X screen saver"; license = licenses.mit; - maintainers = with maintainers; [ malyn ]; + maintainers = with maintainers; [ malyn offline ]; platforms = platforms.linux; }; } diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix index 5bd20c0765b..29dfb6558a9 100644 --- a/pkgs/misc/uboot/default.nix +++ b/pkgs/misc/uboot/default.nix @@ -6,10 +6,10 @@ }: let - defaultVersion = "2019.10"; + defaultVersion = "2020.01"; defaultSrc = fetchurl { url = "ftp://ftp.denx.de/pub/u-boot/u-boot-${defaultVersion}.tar.bz2"; - sha256 = "053hcrwwlacqh2niisn0zas95zkbffw5aw5sdhixs8lmfdq60vcd"; + sha256 = "1w9ml4jl15q6ixpdqzspxjnl7d3rgxd7f99ms1xv5c8869h3qida"; }; buildUBoot = { version ? null @@ -28,19 +28,7 @@ let src = if src == null then defaultSrc else src; - patches = [ - # Submitted upstream: https://patchwork.ozlabs.org/patch/1203693/ - (fetchpatch { - url = https://github.com/dezgeg/u-boot/commit/extlinux-path-length-2018-03.patch; - sha256 = "07jafdnxvqv8lz256qy29agjc2k1zj5ad4k28r1w5qkhwj4ixmf8"; - }) - # Submitted upstream: https://patchwork.ozlabs.org/patch/1203678/ - (fetchpatch { - name = "rockchip-allow-loading-larger-kernels.patch"; - url = "https://marc.info/?l=u-boot&m=157537843004298&q=raw"; - sha256 = "0l3l88cc9xkxkraql82pfgpx6nqn4dj7cvfaagh5pzfwkxyw0n3p"; - }) - ] ++ extraPatches; + patches = extraPatches; postPatch = '' patchShebangs tools @@ -53,7 +41,7 @@ let dtc flex openssl - (buildPackages.python2.withPackages (p: [ p.libfdt ])) + (buildPackages.python3.withPackages (p: [ p.libfdt ])) swig ]; depsBuildBuild = [ buildPackages.stdenv.cc ]; @@ -124,6 +112,12 @@ in { filesToInstall = ["u-boot-sunxi-with-spl.bin"]; }; + ubootAmx335xEVM = buildUBoot { + defconfig = "am335x_evm_defconfig"; + extraMeta.platforms = ["armv7l-linux"]; + filesToInstall = ["MLO" "u-boot.img"]; + }; + ubootBananaPi = buildUBoot { defconfig = "Bananapi_defconfig"; extraMeta.platforms = ["armv7l-linux"]; @@ -143,12 +137,6 @@ in { filesToInstall = ["u-boot-sunxi-with-spl.bin"]; }; - ubootBeagleboneBlack = buildUBoot { - defconfig = "am335x_boneblack_defconfig"; - extraMeta.platforms = ["armv7l-linux"]; - filesToInstall = ["MLO" "u-boot.img"]; - }; - # http://git.denx.de/?p=u-boot.git;a=blob;f=board/solidrun/clearfog/README;hb=refs/heads/master ubootClearfog = buildUBoot { defconfig = "clearfog_defconfig"; diff --git a/pkgs/misc/vscode-extensions/python/default.nix b/pkgs/misc/vscode-extensions/python/default.nix index 553dbc30645..376f52ec5ff 100644 --- a/pkgs/misc/vscode-extensions/python/default.nix +++ b/pkgs/misc/vscode-extensions/python/default.nix @@ -23,14 +23,14 @@ let else throw "Only x86_64 Linux and Darwin are supported."; languageServerSha256 = { - linux-x64 = "159xfhpvqw6k8s5bk5jw3aydn6v61fbanq2mvddxcrf5hwf8cj8h"; - osx-x64 = "0xjh1h77axbbyxikqkhq885n97srm0f15s4976pm1rka03zvd0bg"; + linux-x64 = "10qwi8lih5i6216d1vqsmviab73ha0d3zdvircrgrydkf0d4ancd"; + osx-x64 = "08gjxs0bjhz5a9l35vvgwnvzshsyyqiqvb5hxv6w0k2ajgv5z7av"; }.${arch}; # version is languageServerVersion in the package.json languageServer = extractNuGet rec { name = "Python-Language-Server"; - version = "0.4.71"; + version = "0.4.127"; src = fetchurl { url = "https://pvsc.azureedge.net/python-language-server-stable/${name}-${arch}.${version}.nupkg"; diff --git a/pkgs/os-specific/linux/health-check/default.nix b/pkgs/os-specific/linux/health-check/default.nix index d45f6c5f896..694d4565d96 100644 --- a/pkgs/os-specific/linux/health-check/default.nix +++ b/pkgs/os-specific/linux/health-check/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "health-check"; - version = "0.03.04"; + version = "0.03.05"; src = fetchurl { url = "https://kernel.ubuntu.com/~cking/tarballs/${pname}/${pname}-${version}.tar.gz"; - sha256 = "0p85ai31n9hh6d4b79zzlczf9arsy7vmkjak1x3g9f5qj8fy4avp"; + sha256 = "1qxmkdl4pa043yg4kq5ffapm0c2cmm64h3v2c3xhnx0ad5pbhy5z"; }; buildInputs = [ json_c libbsd ]; diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index 71b626479ba..ba2b1ddb61b 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.166"; + version = "4.14.167"; # 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 = "003wax7dsahlv1iv9yqhkjbxx20crmwyd9464cx974i03a0vzclb"; + sha256 = "0hzyb5k6adhg4vkhix21kg7z6gdzyk1dnzylvbsz9yh2m73qzdrb"; }; } // (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 fc0caad7406..9512729bc34 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.97"; + version = "4.19.98"; # 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 = "1nln2ksfm0ddkqdmhvxwzqq96av1myx89kr1wxs54m2yw0la7clg"; + sha256 = "0dr9vnaaycq77r49mj001zvkxhdyxkgh27dbjsaxcq1dq8xv3zli"; }; } // (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 0651232f91f..0e3d0db2b95 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.210"; + version = "4.4.211"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1pg754s3138d2lq5y2zd1z7dagdy8pl4ifmp0754sa1rkjd3h0ns"; + sha256 = "1f6qz4bvjn18cfcg3wwfsl75aw2kxwn28r228kdic9aibhy6rpvp"; }; } // (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 7c649bd9b57..6efc22e0d34 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.210"; + version = "4.9.211"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "04skcbbp1yv54hwipa1pjx04lb21013r0lh2swycq0kdhc1m54d0"; + sha256 = "1gmi27ih5ys1wxbrnc4a5dr9vw9ngccs9xpa2p0gsk4pbn6n15r5"; }; } // (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 9b1ebeeb489..ae14bc676fd 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.13"; + version = "5.4.14"; # 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 = "1mva73ywb2r5lrmzp5m7hyy0zpgxdg91nw42c1z1sz3ydpcjkys9"; + sha256 = "1w6pr0lcpkzjq4n0hnrj02ycdwzvz8lrgy23715zl5pmxsq1h7jk"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-libre.nix b/pkgs/os-specific/linux/kernel/linux-libre.nix index 5102a1c2086..fab4fd6aaed 100644 --- a/pkgs/os-specific/linux/kernel/linux-libre.nix +++ b/pkgs/os-specific/linux/kernel/linux-libre.nix @@ -1,8 +1,8 @@ { stdenv, lib, fetchsvn, linux , scripts ? fetchsvn { url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/"; - rev = "17198"; - sha256 = "0cr7jpag6kr3iili5zmv1iimi5a1c175dcj8qvhcspwkbv7f17mp"; + rev = "17262"; + sha256 = "0g1jwhzmbyf11jnbd6svb48b8ga4gd43lx1hx1jkqaa5ijvw1smr"; } , ... }: diff --git a/pkgs/os-specific/linux/light/default.nix b/pkgs/os-specific/linux/light/default.nix index 6a0dd34d021..e9ee69ca03e 100644 --- a/pkgs/os-specific/linux/light/default.nix +++ b/pkgs/os-specific/linux/light/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchFromGitHub, autoreconfHook, coreutils }: stdenv.mkDerivation rec { - version = "1.2"; + version = "1.2.1"; pname = "light"; src = fetchFromGitHub { owner = "haikarainen"; repo = "light"; rev = "v${version}"; - sha256 = "1h286va0r1xgxlnxfaaarrj3qhxmjjsivfn3khwm0wq1mhkfihra"; + sha256 = "0zrjipd392bzjvxx0rjrb0cgi0ix1d83fwgw1mcy8kc4d16cgyjg"; }; configureFlags = [ "--with-udev" ]; diff --git a/pkgs/os-specific/linux/powerstat/default.nix b/pkgs/os-specific/linux/powerstat/default.nix index 7f5b14ca72f..91e1bc0f53a 100644 --- a/pkgs/os-specific/linux/powerstat/default.nix +++ b/pkgs/os-specific/linux/powerstat/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "powerstat"; - version = "0.02.20"; + version = "0.02.21"; src = fetchurl { url = "https://kernel.ubuntu.com/~cking/tarballs/${pname}/${pname}-${version}.tar.gz"; - sha256 = "1qsxk055pfjqnd9w4nx6js7a8bzvq6nfjiwjs4h9ik6jlsrhb4v7"; + sha256 = "00396dyn3mw3virx9h2g9kzw9ai10x7wpn8zclnvvidn9g0jhf31"; }; installFlags = [ "DESTDIR=${placeholder "out"}" ]; diff --git a/pkgs/os-specific/linux/wireguard/default.nix b/pkgs/os-specific/linux/wireguard/default.nix index 56ab1751a91..e1de74a1855 100644 --- a/pkgs/os-specific/linux/wireguard/default.nix +++ b/pkgs/os-specific/linux/wireguard/default.nix @@ -7,11 +7,11 @@ assert stdenv.lib.versionOlder kernel.version "5.6"; stdenv.mkDerivation rec { pname = "wireguard"; - version = "0.0.20200105"; + version = "0.0.20200121"; src = fetchzip { url = "https://git.zx2c4.com/wireguard-linux-compat/snapshot/wireguard-linux-compat-${version}.tar.xz"; - sha256 = "1b0amq4xjnl0bfxy6g0awbgnfymx3knd4ldai25z53j8f7d9xri7"; + sha256 = "0h8jq8ki998jw4fynb7if4hcgnl0w6lbd5zwiy0xljj3mfqxdxvv"; }; preConfigure = '' diff --git a/pkgs/servers/http/jetty/default.nix b/pkgs/servers/http/jetty/default.nix index 8d2340647cb..4a3a3f2da01 100644 --- a/pkgs/servers/http/jetty/default.nix +++ b/pkgs/servers/http/jetty/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "jetty"; - version = "9.4.24.v20191120"; + version = "9.4.25.v20191220"; src = fetchurl { url = "https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-distribution/${version}/jetty-distribution-${version}.tar.gz"; name = "jetty-distribution-${version}.tar.gz"; - sha256 = "072vr8gfly2xdwxx1c771yymf145l8nv0j31liwqrih8zqvvhsd4"; + sha256 = "1jnx4hnvd2krsdisqwpws1qd1r0f8gm9a4sx4a8c7zqrmfd2zx1a"; }; phases = [ "unpackPhase" "installPhase" ]; diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index baff593c0e3..608ac6028f4 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -23,11 +23,11 @@ let in buildPythonApplication rec { pname = "matrix-synapse"; - version = "1.8.0"; + version = "1.9.0"; src = fetchPypi { inherit pname version; - sha256 = "0dkx53hxafqjs05g240zna2v3l3ndpa4y4z5x85v8dvv5zkibdxz"; + sha256 = "0ghmxzk2njid7d7ccggda8a9zx4dg1r59n5ymp8f2n9kxz7z2rj2"; }; patches = [ diff --git a/pkgs/servers/metabase/default.nix b/pkgs/servers/metabase/default.nix index e266ea71ee0..69a92942f5c 100644 --- a/pkgs/servers/metabase/default.nix +++ b/pkgs/servers/metabase/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "metabase"; - version = "0.33.7.1"; + version = "0.34.1"; src = fetchurl { url = "http://downloads.metabase.com/v${version}/metabase.jar"; - sha256 = "1rx9v0vcrpsjsclap4x9ic9jwhyd24v1n1v8si18blzn3iyr8c36"; + sha256 = "0fcggpv9ikx481ci7jw6phhmk3mqxbsn9pfs1kqmhwy1ka4ck6dg"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/servers/monitoring/loki/default.nix b/pkgs/servers/monitoring/loki/default.nix index 895621d4cba..b5e63a3aed4 100644 --- a/pkgs/servers/monitoring/loki/default.nix +++ b/pkgs/servers/monitoring/loki/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub, makeWrapper, systemd }: buildGoPackage rec { - version = "1.2.0"; + version = "1.3.0"; pname = "grafana-loki"; goPackagePath = "github.com/grafana/loki"; @@ -11,9 +11,15 @@ buildGoPackage rec { rev = "v${version}"; owner = "grafana"; repo = "loki"; - sha256 = "04ix58gb9yy5jf8fhn3k1pbwqs69k7m96cck38ymhwml1793b4k9"; + sha256 = "0b1dpb3vh5i18467qk8kpb5ic14p4p1dfyr8hjkznf6bs7g8ka1q"; }; + postPatch = '' + substituteInPlace pkg/distributor/distributor_test.go --replace \ + '"eth0", "en0", "lo0"' \ + '"lo"' + ''; + nativeBuildInputs = [ makeWrapper ]; buildInputs = stdenv.lib.optionals stdenv.isLinux [ systemd.dev ]; diff --git a/pkgs/servers/mqtt/mosquitto/default.nix b/pkgs/servers/mqtt/mosquitto/default.nix index 5b0f4eceaed..b52cfb09d4f 100644 --- a/pkgs/servers/mqtt/mosquitto/default.nix +++ b/pkgs/servers/mqtt/mosquitto/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "mosquitto"; - version = "1.6.7"; + version = "1.6.8"; src = fetchFromGitHub { owner = "eclipse"; repo = "mosquitto"; rev = "v${version}"; - sha256 = "1g9g9c95ypfa9dv53ga3hjqxrrlqmcf1lmpxgrifl2l34q4zzfln"; + sha256 = "1py13vg3vwwwg6jdnmq46z6rlzb84r4ggqsmsrn4yar5hrw9pa90"; }; postPatch = '' diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix index 0d0aec4fb2c..9fb7a2e3e0e 100644 --- a/pkgs/servers/nextcloud/default.nix +++ b/pkgs/servers/nextcloud/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "nextcloud"; - version = "17.0.2"; + version = "18.0.0"; src = fetchurl { url = "https://download.nextcloud.com/server/releases/${pname}-${version}.tar.bz2"; - sha256 = "1qrxalyyfjlv3myzkn5z33smfpv8r1ph2w9ax6jqivspq3zrc9gk"; + sha256 = "0yr6sh9nf15dpnpcj4ypdmm9l3y8ls57pxsmqh5h913db2jrah0r"; }; installPhase = '' diff --git a/pkgs/servers/search/groonga/default.nix b/pkgs/servers/search/groonga/default.nix index cfadeac5f07..d610a02ee91 100644 --- a/pkgs/servers/search/groonga/default.nix +++ b/pkgs/servers/search/groonga/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "groonga"; - version = "9.1.0"; + version = "9.1.1"; src = fetchurl { url = "https://packages.groonga.org/source/groonga/${pname}-${version}.tar.gz"; - sha256 = "11mlpnaldb6z438qdb7qjq9dxbh71l6v6lrv69fxka34izpgyhkk"; + sha256 = "16i5bmypawxjac6g808qgr0z3rvla6g6dr586rmwl7sbq0z2nr82"; }; buildInputs = with stdenv.lib; diff --git a/pkgs/servers/ser2net/default.nix b/pkgs/servers/ser2net/default.nix new file mode 100644 index 00000000000..e18d96013e4 --- /dev/null +++ b/pkgs/servers/ser2net/default.nix @@ -0,0 +1,23 @@ +{ stdenv, lib, fetchFromGitHub, gensio, libyaml, autoreconfHook }: + +stdenv.mkDerivation rec { + pname = "ser2net"; + version = "4.1.1"; + + src = fetchFromGitHub { + owner = "cminyard"; + repo = "${pname}"; + rev = "v${version}"; + sha256 = "1zl68mmd7pp10cjv1jk8rs2dlbwvzskyb58qvc7ph7vc6957lfhc"; + }; + + buildInputs = [ autoreconfHook gensio libyaml ]; + + meta = with lib; { + description = "Serial to network connection server"; + homepage = "https://sourceforge.net/projects/ser2net/"; + license = licenses.gpl2; + maintainers = with maintainers; [ emantor ]; + platforms = with platforms; linux; + }; +} diff --git a/pkgs/tools/admin/ansible/default.nix b/pkgs/tools/admin/ansible/default.nix index 5b724fb0bf9..7dde0e4764c 100644 --- a/pkgs/tools/admin/ansible/default.nix +++ b/pkgs/tools/admin/ansible/default.nix @@ -1,11 +1,21 @@ { python3Packages, fetchurl }: -{ - ansible = with python3Packages; toPythonApplication ansible; +rec { + ansible = ansible_2_8; - ansible_2_8 = with python3Packages; toPythonApplication ansible; + ansible_2_9 = python3Packages.toPythonApplication python3Packages.ansible; - ansible_2_7 = with python3Packages; toPythonApplication (ansible.overridePythonAttrs(old: rec { + ansible_2_8 = with python3Packages; toPythonApplication (python3Packages.ansible.overrideAttrs(old: rec { + pname = "ansible"; + version = "2.8.7"; + + src = fetchurl { + url = "https://releases.ansible.com/ansible/${pname}-${version}.tar.gz"; + sha256 = "0iy90kqxs52nspfkhj1y7z4zf017jfm5qhdb01d8d4jd5g53k0l2"; + }; + })); + + ansible_2_7 = with python3Packages; toPythonApplication (ansible.overrideAttrs(old: rec { pname = "ansible"; version = "2.7.15"; @@ -15,7 +25,7 @@ }; })); - ansible_2_6 = with python3Packages; toPythonApplication (ansible.overridePythonAttrs(old: rec { + ansible_2_6 = with python3Packages; toPythonApplication (ansible.overrideAttrs(old: rec { pname = "ansible"; version = "2.6.20"; diff --git a/pkgs/tools/admin/procs/default.nix b/pkgs/tools/admin/procs/default.nix index 20e9c8b3d47..46eec85b1bf 100644 --- a/pkgs/tools/admin/procs/default.nix +++ b/pkgs/tools/admin/procs/default.nix @@ -4,27 +4,19 @@ rustPlatform.buildRustPackage rec { pname = "procs"; - version = "0.8.16"; + version = "0.9.0"; src = fetchFromGitHub { owner = "dalance"; repo = pname; rev = "v${version}"; - sha256 = "0l4n3gr1sc7wfa21p8yh7idaii0mnfpyqp4cg7f9l4345isy94vq"; + sha256 = "1lprxfy733rs39fg8yif3p8vz9szk7d529ahn1kn70zm8i3mqpch"; }; - cargoSha256 = "03c63dlzvag341n6la1s61ccri1avlprd91m11z9zzjhi9b46kcr"; + cargoSha256 = "11l2dggvkk2vx4xap2q02qrr576i4mswf67plhg23azr43fpi0r5"; buildInputs = stdenv.lib.optional stdenv.isDarwin Security; - patches = [ - # Fix tests on darwin. Remove with the next release - (fetchpatch { - url = "https://github.com/dalance/procs/commit/bb554e247b5b339bc00fa5dd2e771b0d7cb09cd5.patch"; - sha256 = "1szvvifa4pdbgdsmdj5f0zq6qzf1lh6wwc6ipawblfzwmg7d9wvk"; - }) - ]; - meta = with stdenv.lib; { description = "A modern replacement for ps written in Rust"; homepage = "https://github.com/dalance/procs"; diff --git a/pkgs/tools/backup/luckybackup/default.nix b/pkgs/tools/backup/luckybackup/default.nix new file mode 100644 index 00000000000..3e89be15391 --- /dev/null +++ b/pkgs/tools/backup/luckybackup/default.nix @@ -0,0 +1,45 @@ +{ stdenv, fetchurl +, pkgconfig, libtool, qmake +, rsync, ssh +}: + +with stdenv.lib; +stdenv.mkDerivation rec { + pname = "luckybackup"; + version = "0.5.0"; + + src = fetchurl { + url = "mirror://sourceforge/project/luckybackup/${version}/source/${pname}-${version}.tar.gz"; + sha256 = "0nwjsk1j33pm8882jbj8h6nxn6n5ab9dxqpqkay65pfbhcjay0g8"; + }; + + buildInputs = [ rsync ssh ]; + + nativeBuildInputs = [ pkgconfig libtool qmake ]; + + prePatch = '' + for File in luckybackup.pro menu/luckybackup-pkexec \ + menu/luckybackup-su.desktop menu/luckybackup.desktop \ + menu/net.luckybackup.su.policy src/functions.cpp \ + src/global.cpp src/scheduleDialog.cpp; do + substituteInPlace $File --replace "/usr" "$out" + done + ''; + + meta = { + description = "A powerful, fast and reliable backup & sync tool"; + longDescription = '' + luckyBackup is an application for data back-up and synchronization + powered by the rsync tool. + + It is simple to use, fast (transfers over only changes made and not + all data), safe (keeps your data safe by checking all declared directories + before proceeding in any data manipulation), reliable and fully + customizable. + ''; + homepage = "http://luckybackup.sourceforge.net/"; + license = licenses.gpl3; + maintainers = with maintainers; [ AndersonTorres ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/filesystems/ceph/default.nix b/pkgs/tools/filesystems/ceph/default.nix index f3e985edbff..aa3622ed057 100644 --- a/pkgs/tools/filesystems/ceph/default.nix +++ b/pkgs/tools/filesystems/ceph/default.nix @@ -91,6 +91,7 @@ let ps.six ps.pyyaml ]); + sitePackages = ceph-python-env.python.sitePackages; version = "14.2.6"; in rec { @@ -135,7 +136,8 @@ in rec { # for pybind/rgw to find internal dep export LD_LIBRARY_PATH="$PWD/build/lib:$LD_LIBRARY_PATH" - # install target needs to be in PYTHONPATH for "*.pth support" check to succeed + # set PYTHONPATH, so the build system doesn't silently skip installing ceph-volume and others + export PYTHONPATH=${ceph-python-env}/${sitePackages}:$lib/${sitePackages}:$out/${sitePackages} patchShebangs src/script src/spdk src/test src/tools ''; @@ -159,6 +161,10 @@ in rec { postFixup = '' wrapPythonPrograms wrapProgram $out/bin/ceph-mgr --prefix PYTHONPATH ":" "$(toPythonPath ${placeholder "out"}):$(toPythonPath ${ceph-python-env})" + + # Test that ceph-volume exists since the build system has a tendency to + # silently drop it with misconfigurations. + test -f $out/bin/ceph-volume ''; enableParallelBuilding = true; @@ -187,11 +193,11 @@ in rec { platforms = [ "x86_64-linux" ]; }; } '' - mkdir -p $out/{bin,etc,lib/python3.7/site-packages} + mkdir -p $out/{bin,etc,${sitePackages}} cp -r ${ceph}/bin/{ceph,.ceph-wrapped,rados,rbd,rbdmap} $out/bin cp -r ${ceph}/bin/ceph-{authtool,conf,dencoder,rbdnamer,syn} $out/bin cp -r ${ceph}/bin/rbd-replay* $out/bin - cp -r ${ceph}/lib/python3.7/site-packages $out/lib/python3.7/ + cp -r ${ceph}/${sitePackages} $out/${sitePackages} cp -r ${ceph}/etc/bash_completion.d $out/etc # wrapPythonPrograms modifies .ceph-wrapped, so lets just update its paths substituteInPlace $out/bin/ceph --replace ${ceph} $out diff --git a/pkgs/tools/filesystems/glusterfs/default.nix b/pkgs/tools/filesystems/glusterfs/default.nix index b5fc12024b1..db5c469e63b 100644 --- a/pkgs/tools/filesystems/glusterfs/default.nix +++ b/pkgs/tools/filesystems/glusterfs/default.nix @@ -15,10 +15,10 @@ let # The command # find /nix/store/...-glusterfs-.../ -name '*.py' -executable # can help with finding new Python scripts. - version = "7.1"; + version = "7.2"; name="${baseName}-${version}"; url="https://github.com/gluster/glusterfs/archive/v${version}.tar.gz"; - sha256 = "11v5hwijbb08xq3dd4m6bkspa3v4vjzcnw6j1qyh0gjmc7yy4ml3"; + sha256 = "0v333q217rvgh6bnmq4bcafkjz2gq0p4xqmxd3carkyl1zyyp8q5"; }; buildInputs = [ diff --git a/pkgs/tools/graphics/argyllcms/default.nix b/pkgs/tools/graphics/argyllcms/default.nix index 1326d045459..3f8bdf3ac6b 100644 --- a/pkgs/tools/graphics/argyllcms/default.nix +++ b/pkgs/tools/graphics/argyllcms/default.nix @@ -2,7 +2,7 @@ , libXrender, libXext, libtiff, libjpeg, libpng, libXScrnSaver, writeText , libXdmcp, libXau, lib, openssl }: let - version = "2.1.1"; + version = "2.1.2"; in stdenv.mkDerivation rec { pname = "argyllcms"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { # Kind of flacky URL, it was reaturning 406 and inconsistent binaries for a # while on me. It might be good to find a mirror url = "https://www.argyllcms.com/Argyll_V${version}_src.zip"; - sha256 = "0zq3fipky44xg536kdhg9bchi6s9ka7n1q73fwf9ja766s8rj99m"; + sha256 = "1bsi795kphr1a8l2kvvm9qfkvgfpimds4ijalnmg23wnr8691md1"; # The argyllcms web server doesn't like curl ... curlOpts = "--user-agent 'Mozilla/5.0'"; diff --git a/pkgs/tools/misc/broot/default.nix b/pkgs/tools/misc/broot/default.nix index bca0f809909..7f8a9dbde57 100644 --- a/pkgs/tools/misc/broot/default.nix +++ b/pkgs/tools/misc/broot/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "broot"; - version = "0.11.9"; + version = "0.12.0"; src = fetchFromGitHub { owner = "Canop"; repo = pname; rev = "v${version}"; - sha256 = "1kif1113qdxg4hr1mfgg1fh10zgl9cl117cm1bfjaabw11k75cvj"; + sha256 = "0z31yizjczr59z6vxgjc3lqlcr3m21bi5ly8pxp3s3w7nbfr369q"; }; - cargoSha256 = "0636qkgkw027s5dz2mryhghlm6kn3s7cfy4i8rxywr8r3w8c40y0"; + cargoSha256 = "0cwj63907xwy1ali9p2wnzhlcb80c6nhf684fbbsg7awiyqgdak3"; verifyCargoDeps = true; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix index c9f61ee3459..97b4aa1db28 100644 --- a/pkgs/tools/misc/diffoscope/default.nix +++ b/pkgs/tools/misc/diffoscope/default.nix @@ -9,11 +9,11 @@ # Note: when upgrading this package, please run the list-missing-tools.sh script as described below! python3Packages.buildPythonApplication rec { pname = "diffoscope"; - version = "133"; + version = "135"; src = fetchurl { url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2"; - sha256 = "15hi2fwcx3sf189rmxpyah0amq1a49wgp1ynhvwij5qj13wib2q8"; + sha256 = "1grf28mb6lyxdqbmvws4h7inalda9z7qnjx7dc859mzkf54cn3yd"; }; patches = [ diff --git a/pkgs/tools/misc/h/default.nix b/pkgs/tools/misc/h/default.nix new file mode 100644 index 00000000000..f4897a54cb1 --- /dev/null +++ b/pkgs/tools/misc/h/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchFromGitHub, makeWrapper, ruby }: + +stdenv.mkDerivation rec { + pname = "h"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "zimbatm"; + repo = "h"; + rev = "v${version}"; + hash = "sha256-chGrMtvLyyNtlM7PO1olVdkzkvMOk6OibHw+mqwVxIM="; + }; + + buildInputs = [ ruby ]; + + installPhase = '' + mkdir -p $out/bin + cp h $out/bin/h + cp up $out/bin/up + ''; + + meta = with stdenv.lib; { + description = "faster shell navigation of projects"; + homepage = "https://github.com/zimbatm/h"; + license = licenses.mit; + maintainers = [ maintainers.zimbatm ]; + }; +} diff --git a/pkgs/tools/misc/ipxe/default.nix b/pkgs/tools/misc/ipxe/default.nix index 219c03f263c..1826bed216d 100644 --- a/pkgs/tools/misc/ipxe/default.nix +++ b/pkgs/tools/misc/ipxe/default.nix @@ -1,11 +1,9 @@ -{ stdenv, lib, fetchgit, perl, cdrkit, syslinux, xz, openssl, gnu-efi, mtools +{ stdenv, lib, fetchFromGitHub, perl, cdrkit, syslinux, xz, openssl, gnu-efi, mtools , embedScript ? null , additionalTargets ? {} }: let - date = "20190318"; - rev = "ebf2eaf515e46abd43bc798e7e4ba77bfe529218"; targets = additionalTargets // lib.optionalAttrs stdenv.isx86_64 { "bin-x86_64-efi/ipxe.efi" = null; "bin-x86_64-efi/ipxe.efirom" = null; @@ -19,15 +17,17 @@ let }; in -stdenv.mkDerivation { - name = "ipxe-${date}-${builtins.substring 0 7 rev}"; +stdenv.mkDerivation rec { + pname = "ipxe"; + version = "1.20.1"; nativeBuildInputs = [ perl cdrkit syslinux xz openssl gnu-efi mtools ]; - src = fetchgit { - url = https://git.ipxe.org/ipxe.git; - sha256 = "0if3m8h1nfxy4n37cwlfbc5kand52290v80m4zvjppc81im3nr5g"; - inherit rev; + src = fetchFromGitHub { + owner = "ipxe"; + repo = "ipxe"; + rev = "v${version}"; + sha256 = "0w7h7y97gj9nqvbmsg1zp6zj5mpbbpckqbbx7bpp6k3ahy5fk8zp"; }; # not possible due to assembler code diff --git a/pkgs/tools/misc/mcfly/default.nix b/pkgs/tools/misc/mcfly/default.nix index 4ea27ce092f..7d85e709f73 100644 --- a/pkgs/tools/misc/mcfly/default.nix +++ b/pkgs/tools/misc/mcfly/default.nix @@ -1,20 +1,20 @@ -{ stdenv, rustPlatform, fetchFromGitHub }: +{ stdenv, rustPlatform, fetchFromGitHub, Security }: rustPlatform.buildRustPackage rec { pname = "mcfly"; - version = "0.3.1"; + version = "0.3.6"; src = fetchFromGitHub { owner = "cantino"; repo = "mcfly"; rev = "v${version}"; - sha256 = "0pmyw21zns4zn7pffji4yvbj63fx3g15cx81pk4bs6lzyz5zbdc2"; + sha256 = "1g3n7ll0yg7w7hb3jgp25mlnqwsdzv0608f41z7q5gmsskdm3v1j"; }; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + preInstall = '' - mkdir -p $out/share/mcfly - cp mcfly.bash $out/share/mcfly/ - chmod +x $out/share/mcfly/mcfly.bash + install -Dm644 -t $out/share/mcfly mcfly.bash ''; cargoSha256 = "1bf65kagvhsi6lg8187ihi5j45hkq9d8v6j7rzmmfhngdzvcfr69"; @@ -23,7 +23,6 @@ rustPlatform.buildRustPackage rec { 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."; license = licenses.mit; - platforms = platforms.linux; maintainers = [ maintainers.melkor333 ]; }; } diff --git a/pkgs/tools/misc/mutagen/default.nix b/pkgs/tools/misc/mutagen/default.nix new file mode 100644 index 00000000000..3c355dbddf3 --- /dev/null +++ b/pkgs/tools/misc/mutagen/default.nix @@ -0,0 +1,24 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "mutagen"; + version = "0.10.3"; + + src = fetchFromGitHub { + owner = "mutagen-io"; + repo = pname; + rev = "v${version}"; + sha256 = "18wjzylxypvisfdmmwqc8g9vd9w7iyhs8irad1ksf7fhwz9w188m"; + }; + + modSha256 = "0zb6wqfgp5v0hpm8ad6s9lc1n3wayyqindv4vfkmp3980ikb8qwx"; + + subPackages = [ "cmd/mutagen" "cmd/mutagen-agent" ]; + + meta = with lib; { + description = "Make remote development work with your local tools"; + homepage = "https://mutagen.io/"; + maintainers = [ maintainers.marsam ]; + license = licenses.mit; + }; +} diff --git a/pkgs/tools/misc/pspg/default.nix b/pkgs/tools/misc/pspg/default.nix index c42ea76ca85..4cf98ef8b48 100644 --- a/pkgs/tools/misc/pspg/default.nix +++ b/pkgs/tools/misc/pspg/default.nix @@ -1,18 +1,18 @@ -{ stdenv, fetchFromGitHub, gnugrep, ncurses, pkgconfig, readline }: +{ stdenv, fetchFromGitHub, gnugrep, ncurses, pkgconfig, readline, postgresql }: stdenv.mkDerivation rec { pname = "pspg"; - version = "2.6.0"; + version = "2.6.6"; src = fetchFromGitHub { owner = "okbob"; repo = pname; rev = version; - sha256 = "0cs0hsrrknl2cv39zzq4wydx5p7095hz18yly572fnniyi4ljbdg"; + sha256 = "0l20ysr61y99zxvm8cqsgj7arv4m7h7gqq8lrq65bmh9fxncfpsd"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gnugrep ncurses readline ]; + buildInputs = [ gnugrep ncurses readline postgresql ]; makeFlags = [ "PREFIX=${placeholder "out"}" ]; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/okbob/pspg"; description = "Postgres Pager"; license = licenses.bsd2; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = [ maintainers.jlesquembre ]; }; } diff --git a/pkgs/tools/networking/amass/default.nix b/pkgs/tools/networking/amass/default.nix index 73f54f7dbff..06eabec0618 100644 --- a/pkgs/tools/networking/amass/default.nix +++ b/pkgs/tools/networking/amass/default.nix @@ -5,22 +5,22 @@ buildGoModule rec { pname = "amass"; - version = "3.0.25"; + version = "3.4.2"; src = fetchFromGitHub { owner = "OWASP"; repo = "Amass"; rev = "v${version}"; - sha256 = "04vsahqmbs9rysdwyjq0zgwcn6dgdvkyz8lsp1g1p9d3amrgbqjy"; + sha256 = "0mia01cqmaa17696m73qazpbyrcng7wldca79g46xgc4z96q1i7i"; }; - modSha256 = "0kwi4pys08kszrh5kz64gs68k20y00v2zqh5hyrgpy9nivqrlj62"; + modSha256 = "1zwm7skdhql6isffyhixqsgvcgxw2436iv8bj92cxs70ipk537v9"; outputs = [ "out" "wordlists" ]; postInstall = '' mkdir -p $wordlists - cp -R $src/wordlists/*.txt $wordlists + cp -R $src/examples/wordlists/*.txt $wordlists gzip $wordlists/*.txt ''; diff --git a/pkgs/tools/networking/corerad/default.nix b/pkgs/tools/networking/corerad/default.nix index c5cbd8c21f5..e8f17450688 100644 --- a/pkgs/tools/networking/corerad/default.nix +++ b/pkgs/tools/networking/corerad/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "corerad"; - version = "0.1.8"; + version = "0.1.9"; goPackagePath = "github.com/mdlayher/corerad"; @@ -10,10 +10,10 @@ buildGoModule rec { owner = "mdlayher"; repo = "corerad"; rev = "v${version}"; - sha256 = "13js6p3svx2xp20yjpb5w71rnyrhiiqbbvsck45i756j1lndaqxr"; + sha256 = "1m23f318qr6b8c7hxrhihrm09pmdwab988k3bn4ygfm49z5phy4s"; }; - modSha256 = "03x7r392bwchmd3jzwwykdfkr9lfdn77phfwh8xfk2avhzq7qs89"; + modSha256 = "0idlpkn6krs77akn3p6gxsbc8zpj1rnjkhhwmb8ns98x82g6bln0"; meta = with stdenv.lib; { homepage = "https://github.com/mdlayher/corerad"; diff --git a/pkgs/tools/networking/v2ray/default.nix b/pkgs/tools/networking/v2ray/default.nix index ee3ca416aa4..5d1cd4540d7 100644 --- a/pkgs/tools/networking/v2ray/default.nix +++ b/pkgs/tools/networking/v2ray/default.nix @@ -3,20 +3,20 @@ , ... } @ args: callPackage ./generic.nix (rec { - version = "4.22.0"; + version = "4.22.1"; src = fetchFromGitHub { owner = "v2ray"; repo = "v2ray-core"; rev = "v${version}"; - sha256 = "1gr4s96ii4dx5bcwpb82rn250pcnncxwzx147p9dbwbyiy0i9nz7"; + sha256 = "0l4rg9galjcm6dzv7sapnim9a02z7pv354mk5mwqndznii6nkr73"; }; assets = { # MIT licensed "geoip.dat" = let - geoipRev = "202001010102"; - geoipSha256 = "16i73c3852f7zmya0q3856cc4gvhqhpln9s98qvr2dr1mpp72c1w"; + geoipRev = "202001210102"; + geoipSha256 = "1wxhrhrigjqzpy5w8yj7yd9ib245xwhqys2pf9prdknq71piyziz"; in fetchurl { url = "https://github.com/v2ray/geoip/releases/download/${geoipRev}/geoip.dat"; sha256 = geoipSha256; @@ -24,8 +24,8 @@ callPackage ./generic.nix (rec { # MIT licensed "geosite.dat" = let - geositeRev = "20191226.1"; - geositeSha256 = "0b4ji5kj5jpkwri3libxm9yl49dcy91vkl7h1rkhrrhbl17s3qiy"; + geositeRev = "202001211332"; + geositeSha256 = "06qlbjxk21lhyh5l3pd8l4m9rdl7sjh2jriz51zihaqx4417f0m7"; in fetchurl { url = "https://github.com/v2ray/domain-list-community/releases/download/${geositeRev}/dlc.dat"; sha256 = geositeSha256; diff --git a/pkgs/tools/networking/wireguard-tools/default.nix b/pkgs/tools/networking/wireguard-tools/default.nix index a01b0ab2061..df2cdf6b590 100644 --- a/pkgs/tools/networking/wireguard-tools/default.nix +++ b/pkgs/tools/networking/wireguard-tools/default.nix @@ -14,11 +14,11 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "wireguard-tools"; - version = "1.0.20200102"; + version = "1.0.20200121"; src = fetchzip { url = "https://git.zx2c4.com/wireguard-tools/snapshot/wireguard-tools-${version}.tar.xz"; - sha256 = "0ry3vbckcbkx43bz0bqinrd1hkll67jbwb72ak0b41wkxjsc8fmv"; + sha256 = "0s82i8ibf0zj2wka625vh4rihdwmvlkv1v3bilrlcscwgfvzjfhf"; }; sourceRoot = "source/src"; diff --git a/pkgs/tools/security/munge/default.nix b/pkgs/tools/security/munge/default.nix index 2d758aa2aec..ee1858ad284 100644 --- a/pkgs/tools/security/munge/default.nix +++ b/pkgs/tools/security/munge/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchFromGitHub, autoreconfHook, gawk, gnused, libgcrypt, zlib, bzip2 }: stdenv.mkDerivation rec { - name = "munge-0.5.13"; + name = "munge-0.5.14"; src = fetchFromGitHub { owner = "dun"; repo = "munge"; rev = name; - sha256 = "1c4ff3d8ad3inbliszr4slym3b4cn19bn6mxm13mzy20jyi2rm70"; + sha256 = "15h805rwcb9f89dyrkxfclzs41n3ff8x7cc1dbvs8mb0ds682c4j"; }; nativeBuildInputs = [ autoreconfHook gawk gnused ]; diff --git a/pkgs/tools/security/vault/default.nix b/pkgs/tools/security/vault/default.nix index 11b0b067ccb..3b209d5c068 100644 --- a/pkgs/tools/security/vault/default.nix +++ b/pkgs/tools/security/vault/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "vault"; - version = "1.3.1"; + version = "1.3.2"; src = fetchFromGitHub { owner = "hashicorp"; repo = "vault"; rev = "v${version}"; - sha256 = "052aj79gwmydc7ph1g567cbssqf8dsmqxad47k5hc5sc58bx7c93"; + sha256 = "17zymmm1r4yxwazn2qx2l01i7g91rn40h7hzgwf0pr6pwmdxvkzg"; }; goPackagePath = "github.com/hashicorp/vault"; diff --git a/pkgs/tools/system/hwinfo/default.nix b/pkgs/tools/system/hwinfo/default.nix index d323f048ba0..048af14efb1 100644 --- a/pkgs/tools/system/hwinfo/default.nix +++ b/pkgs/tools/system/hwinfo/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "hwinfo"; - version = "21.67"; + version = "21.68"; src = fetchFromGitHub { owner = "opensuse"; repo = "hwinfo"; rev = version; - sha256 = "1fvlrqx1wgl79a9j3xhhhdihj4lkpbrchfsc27il0p52fynn4dji"; + sha256 = "0x63rkyl16918l8yf0azy2lyxaqy8nc6iafid89acvxn32j146rg"; }; patchPhase = '' diff --git a/pkgs/tools/system/rsyslog/default.nix b/pkgs/tools/system/rsyslog/default.nix index 7c5b9a18966..9d3cbbf79eb 100644 --- a/pkgs/tools/system/rsyslog/default.nix +++ b/pkgs/tools/system/rsyslog/default.nix @@ -4,6 +4,7 @@ , libgcrypt ? null, liblognorm ? null, openssl ? null, librelp ? null, libksi ? null , liblogging ? null, libnet ? null, hadoop ? null, rdkafka ? null , libmongo-client ? null, czmq ? null, rabbitmq-c ? null, hiredis ? null, mongoc ? null +, libmaxminddb ? null }: with stdenv.lib; @@ -26,7 +27,7 @@ stdenv.mkDerivation rec { fastJson libestr json_c zlib pythonPackages.docutils libkrb5 jemalloc postgresql libdbi net-snmp libuuid curl gnutls libgcrypt liblognorm openssl librelp libksi liblogging libnet hadoop rdkafka libmongo-client czmq - rabbitmq-c hiredis mongoc + rabbitmq-c hiredis mongoc libmaxminddb ] ++ stdenv.lib.optional (libmysqlclient != null) libmysqlclient ++ stdenv.lib.optional stdenv.isLinux systemd; @@ -61,6 +62,7 @@ stdenv.mkDerivation rec { (mkFlag true "rsyslogd") (mkFlag true "mail") (mkFlag (liblognorm != null) "mmnormalize") + (mkFlag (libmaxminddb != null) "mmdblookup") (mkFlag true "mmjsonparse") (mkFlag true "mmaudit") (mkFlag true "mmanon") diff --git a/pkgs/tools/system/s-tui/default.nix b/pkgs/tools/system/s-tui/default.nix index 063a338f6e8..924269b6637 100644 --- a/pkgs/tools/system/s-tui/default.nix +++ b/pkgs/tools/system/s-tui/default.nix @@ -2,11 +2,11 @@ pythonPackages.buildPythonPackage rec { pname = "s-tui"; - version = "0.8.3"; + version = "1.0.0"; src = pythonPackages.fetchPypi { inherit pname version; - sha256 = "00lsh2v4i8rwfyjyxx5lijd6rnk9smcfffhzg5sv94ijpcnh216m"; + sha256 = "0r5yhlsi5xiy7ii1w4kqkaxz9069v5bbfwi3x3xnxhk51yjfgr8n"; }; propagatedBuildInputs = with pythonPackages; [ diff --git a/pkgs/tools/text/mawk/default.nix b/pkgs/tools/text/mawk/default.nix index fbfc032445b..81d11e2aae7 100644 --- a/pkgs/tools/text/mawk/default.nix +++ b/pkgs/tools/text/mawk/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "mawk-1.3.4-20190203"; + name = "mawk-1.3.4-20200106"; src = fetchurl { urls = [ "ftp://ftp.invisible-island.net/mawk/${name}.tgz" "https://invisible-mirror.net/archives/mawk/${name}.tgz" ]; - sha256 = "0h5qlslaj5czz4v25hqg8a6kg4c5mlkmdpxhhvpvp1ci08ab7b6s"; + sha256 = "1dhmn0l1c122a4bb07a1lwzrzpjdhsbdbllb1a9gwvv2lw5j9qgi"; }; meta = with stdenv.lib; { diff --git a/pkgs/tools/text/ocrmypdf/default.nix b/pkgs/tools/text/ocrmypdf/default.nix index 13353daa171..cdc6878bb5a 100644 --- a/pkgs/tools/text/ocrmypdf/default.nix +++ b/pkgs/tools/text/ocrmypdf/default.nix @@ -10,6 +10,7 @@ , stdenv , tesseract4 , unpaper +, substituteAll }: let @@ -28,14 +29,14 @@ let in buildPythonApplication rec { pname = "ocrmypdf"; - version = "9.2.0"; + version = "9.5.0"; disabled = ! python3Packages.isPy3k; src = fetchFromGitHub { owner = "jbarlow83"; repo = "OCRmyPDF"; rev = "v${version}"; - sha256 = "1mvc6x5nn242z65pxv39ch71vaikgi89bb0sjbfy2jbw91vk41xa"; + sha256 = "0rvwxykyscpcvfgm8zzyvjgzl9x9ddi9cxmqyxrc031mxpc0lzyy"; }; nativeBuildInputs = with python3Packages; [ @@ -68,11 +69,12 @@ in buildPythonApplication rec { setuptools ] ++ runtimeDeps; - postPatch = '' - substituteInPlace src/ocrmypdf/leptonica.py \ - --replace "lept = ffi.dlopen(_libpath)" \ - 'lept = ffi.dlopen("${stdenv.lib.makeLibraryPath [leptonica]}/liblept${stdenv.hostPlatform.extensions.sharedLibrary}")' - ''; + patches = [ + (substituteAll { + src = ./liblept.patch; + liblept = "${stdenv.lib.getLib leptonica}/lib/liblept${stdenv.hostPlatform.extensions.sharedLibrary}"; + }) + ]; # The tests take potentially 20+ minutes, depending on machine doCheck = false; diff --git a/pkgs/tools/text/ocrmypdf/liblept.patch b/pkgs/tools/text/ocrmypdf/liblept.patch new file mode 100644 index 00000000000..ed413a8b37b --- /dev/null +++ b/pkgs/tools/text/ocrmypdf/liblept.patch @@ -0,0 +1,13 @@ +diff --git a/src/ocrmypdf/leptonica.py b/src/ocrmypdf/leptonica.py +index 328b063..b993cc9 100644 +--- a/src/ocrmypdf/leptonica.py ++++ b/src/ocrmypdf/leptonica.py +@@ -46,7 +46,7 @@ if os.name == 'nt': + os.environ['PATH'] = shim_paths_with_program_files() + else: + libname = 'lept' +-_libpath = find_library(libname) ++_libpath = '@liblept@' + if not _libpath: + raise MissingDependencyError( + """ diff --git a/pkgs/tools/typesetting/asciidoctorj/default.nix b/pkgs/tools/typesetting/asciidoctorj/default.nix index 8eaee977d28..39e7eab34ab 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.1.0"; + version = "2.2.0"; src = fetchzip { url = "http://dl.bintray.com/asciidoctor/maven/org/asciidoctor/${pname}/${version}/${pname}-${version}-bin.zip"; - sha256 = "19fl4y3xlkmmgf5vyyb3k9p6nyglck9l53r6x12zil01q49g0zba"; + sha256 = "0akxzfibfa8msnardvyy9hkj2z6sqn7pnwphz6avixdcclg6yxa5"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index c64b56dd5ce..3831db8d401 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -442,6 +442,7 @@ mapAliases ({ transmission_remote_gtk = transmission-remote-gtk; # added 2018-01-06 truecrypt = veracrypt; # added 2018-10-24 tshark = wireshark-cli; # added 2018-04-25 + ubootBeagleboneBlack = ubootAmx335xEVM; # added 2020-01-21 ucsFonts = ucs-fonts; # added 2016-07-15 ultrastardx-beta = ultrastardx; # added 2017-08-12 usb_modeswitch = usb-modeswitch; # added 2016-05-10 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2c765655c5a..4f670f28498 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1536,6 +1536,8 @@ in dante = callPackage ../servers/dante { }; + dasher = callPackage ../applications/accessibility/dasher { }; + datamash = callPackage ../tools/misc/datamash { }; datasette = with python3Packages; toPythonApplication datasette; @@ -1593,6 +1595,8 @@ in direnv = callPackage ../tools/misc/direnv { }; + h = callPackage ../tools/misc/h { }; + discount = callPackage ../tools/text/discount { }; diskscan = callPackage ../tools/misc/diskscan { }; @@ -1928,6 +1932,8 @@ in megasync = libsForQt5.callPackage ../applications/misc/megasync { }; + megacmd = callPackage ../applications/misc/megacmd { }; + meritous = callPackage ../games/meritous { }; opendune = callPackage ../games/opendune { }; @@ -2062,6 +2068,8 @@ in step-cli = callPackage ../tools/security/step-cli { }; + string-machine = callPackage ../applications/audio/string-machine { }; + bash-supergenpass = callPackage ../tools/security/bash-supergenpass { }; sweep-visualizer = callPackage ../tools/misc/sweep-visualizer { }; @@ -2125,6 +2133,7 @@ in czmq = null; rabbitmq-c = null; hiredis = null; + libmaxminddb = null; }; mar1d = callPackage ../games/mar1d { } ; @@ -2952,6 +2961,10 @@ in epubcheck = callPackage ../tools/text/epubcheck { }; + luckybackup = libsForQt5.callPackage ../tools/backup/luckybackup { + ssh = openssh; + }; + mcrcon = callPackage ../tools/networking/mcrcon {}; rage = callPackage ../tools/security/rage { @@ -4542,7 +4555,9 @@ in mautrix-whatsapp = callPackage ../servers/mautrix-whatsapp { }; - mcfly = callPackage ../tools/misc/mcfly { }; + mcfly = callPackage ../tools/misc/mcfly { + inherit (darwin.apple_sdk.frameworks) Security; + }; mdbook = callPackage ../tools/text/mdbook { inherit (darwin.apple_sdk.frameworks) CoreServices; @@ -5131,6 +5146,8 @@ in munt = libsForQt5.callPackage ../applications/audio/munt { }; + mutagen = callPackage ../tools/misc/mutagen { }; + mycli = callPackage ../tools/admin/mycli { }; mydumper = callPackage ../tools/backup/mydumper { }; @@ -7577,7 +7594,7 @@ in zpaqd = callPackage ../tools/archivers/zpaq/zpaqd.nix { }; zsh-autoenv = callPackage ../tools/misc/zsh-autoenv { }; - + zsh-bd = callPackage ../shells/zsh/zsh-bd { }; zsh-git-prompt = callPackage ../shells/zsh/zsh-git-prompt { }; @@ -8446,7 +8463,9 @@ in inherit (callPackages ../development/compilers/graalvm { }) mx jvmci8 graalvm8; - graalvm8-ee = callPackage ../development/compilers/graalvm/enterprise-edition.nix { }; + inherit (callPackages ../development/compilers/graalvm/enterprise-edition.nix { }) + graalvm8-ee + graalvm11-ee; openshot-qt = libsForQt5.callPackage ../applications/video/openshot-qt { }; @@ -9651,7 +9670,9 @@ in inherit (callPackage ../tools/admin/ansible { }) ansible ansible_2_6 - ansible_2_7; + ansible_2_7 + ansible_2_8 + ansible_2_9; ansible-lint = with python3.pkgs; toPythonApplication ansible-lint; @@ -11202,6 +11223,8 @@ in dhex = callPackage ../applications/editors/dhex { }; + dnnl = callPackage ../development/libraries/dnnl { }; + double-conversion = callPackage ../development/libraries/double-conversion { }; dclib = callPackage ../development/libraries/dclib { }; @@ -11465,6 +11488,8 @@ in inherit (darwin.apple_sdk.frameworks) OpenCL; }; + gensio = callPackage ../development/libraries/gensio {}; + geoclue2 = callPackage ../development/libraries/geoclue {}; geocode-glib = callPackage ../development/libraries/geocode-glib {}; @@ -17145,7 +17170,7 @@ in ubootBananaPi ubootBananaPim3 ubootBananaPim64 - ubootBeagleboneBlack + ubootAmx335xEVM ubootClearfog ubootGuruplug ubootJetsonTK1 @@ -19703,6 +19728,8 @@ in imgcat = callPackage ../applications/graphics/imgcat { }; + imgp = python3Packages.callPackage ../applications/graphics/imgp { }; + # Impressive, formerly known as "KeyJNote". impressive = callPackage ../applications/office/impressive { }; @@ -19894,7 +19921,7 @@ in kubeval = callPackage ../applications/networking/cluster/kubeval { }; kubernetes = callPackage ../applications/networking/cluster/kubernetes { - go = buildPackages.go_1_12; + go = buildPackages.go_1_13; }; kubeseal = callPackage ../applications/networking/cluster/kubeseal { }; @@ -20654,7 +20681,7 @@ in obs-linuxbrowser = callPackage ../applications/video/obs-studio/linuxbrowser.nix { }; - obs-studio = libsForQt5.callPackage ../applications/video/obs-studio { }; + obs-studio = libsForQt5.callPackage ../applications/video/obs-studio { ffmpeg = ffmpeg_4; }; obs-wlrobs = callPackage ../applications/video/obs-studio/wlrobs.nix { }; @@ -21652,6 +21679,8 @@ in telepathy-idle = callPackage ../applications/networking/instant-messengers/telepathy/idle {}; + teleprompter = callPackage ../applications/misc/teleprompter {}; + tendermint = callPackage ../tools/networking/tendermint { buildGoModule = buildGo112Module; }; @@ -23143,6 +23172,8 @@ in newtonwars = callPackage ../games/newtonwars { }; + nudoku = callPackage ../games/nudoku { }; + nxengine-evo = callPackage ../games/nxengine-evo { }; odamex = callPackage ../games/odamex { }; @@ -23879,6 +23910,8 @@ in niftyseg = callPackage ../applications/science/biology/niftyseg { }; + manta = callPackage ../applications/science/biology/manta { }; + octopus-caller = callPackage ../applications/science/biology/octopus { }; paml = callPackage ../applications/science/biology/paml { }; @@ -25213,6 +25246,8 @@ in redprl = callPackage ../applications/science/logic/redprl { }; + renderizer = pkgs.callPackage ../development/tools/renderizer {}; + retroarchBare = callPackage ../misc/emulators/retroarch { inherit (darwin) libobjc; inherit (darwin.apple_sdk.frameworks) AppKit Foundation; @@ -25318,6 +25353,8 @@ in seafile-shared = callPackage ../misc/seafile-shared { }; + ser2net = callPackage ../servers/ser2net {}; + serviio = callPackage ../servers/serviio {}; selinux-python = callPackage ../os-specific/linux/selinux-python { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8a5c4a18f36..c0f46503d69 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -312,6 +312,8 @@ in { azure-storage-file = callPackage ../development/python-modules/azure-storage-file { }; + azure-storage-file-share = callPackage ../development/python-modules/azure-storage-file-share { }; + azure-storage-queue = callPackage ../development/python-modules/azure-storage-queue { }; azure-mgmt-nspkg = callPackage ../development/python-modules/azure-mgmt-nspkg { }; @@ -562,6 +564,8 @@ in { dendropy = callPackage ../development/python-modules/dendropy { }; + denonavr = callPackage ../development/python-modules/denonavr { }; + dependency-injector = callPackage ../development/python-modules/dependency-injector { }; btchip = callPackage ../development/python-modules/btchip { }; @@ -2252,6 +2256,8 @@ in { python-ly = callPackage ../development/python-modules/python-ly {}; + pyhcl = callPackage ../development/python-modules/pyhcl { }; + pyhepmc = callPackage ../development/python-modules/pyhepmc { }; pytest = if isPy3k then self.pytest_5 else self.pytest_4; @@ -2446,6 +2452,16 @@ in { daphne = callPackage ../development/python-modules/daphne { }; + dash = callPackage ../development/python-modules/dash { }; + + dash-core-components = callPackage ../development/python-modules/dash-core-components { }; + + dash-html-components = callPackage ../development/python-modules/dash-html-components { }; + + dash-renderer = callPackage ../development/python-modules/dash-renderer { }; + + dash-table = callPackage ../development/python-modules/dash-table { }; + dateparser = callPackage ../development/python-modules/dateparser { }; # Actual name of package @@ -2948,6 +2964,12 @@ in { plaster-pastedeploy = callPackage ../development/python-modules/plaster-pastedeploy {}; + plexapi = callPackage ../development/python-modules/plexapi { }; + + plexauth = callPackage ../development/python-modules/plexauth { }; + + plexwebsocket = callPackage ../development/python-modules/plexwebsocket { }; + plotly = callPackage ../development/python-modules/plotly { }; plyfile = callPackage ../development/python-modules/plyfile { }; @@ -3472,6 +3494,8 @@ in { flask-socketio = callPackage ../development/python-modules/flask-socketio { }; + flask-sockets = callPackage ../development/python-modules/flask-sockets { }; + flask_sqlalchemy = callPackage ../development/python-modules/flask-sqlalchemy { }; flask-swagger = callPackage ../development/python-modules/flask-swagger { }; |