diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index b708d1a294fa..f70ea32e02c2 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -13164,7 +13164,7 @@ name = "Wayne Scott"; }; wucke13 = { - email = "info@wucke13.de"; + email = "wucke13@gmail.com"; github = "wucke13"; githubId = 20400405; name = "Wucke"; diff --git a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml index 4242b27093cf..4acdcd7d60f9 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml @@ -444,6 +444,13 @@ support due to python2 deprecation in nixpkgs + + + services.miniflux.adminCredentialFiles is + now required, instead of defaulting to + admin and password. + + The autorestic package has been upgraded @@ -558,6 +565,15 @@ ~/.local/share/polymc/polymc.cfg. + + + systemd-nspawn@.service settings have been + reverted to the default systemd behaviour. User namespaces are + now activated by default. If you want to keep running nspawn + containers without user namespaces you need to set + systemd.nspawn.<name>.execConfig.PrivateUsers = false + + The terraform 0.12 compatibility has been removed and the diff --git a/nixos/doc/manual/release-notes/rl-2205.section.md b/nixos/doc/manual/release-notes/rl-2205.section.md index b8e83591cc69..e81bdd884d06 100644 --- a/nixos/doc/manual/release-notes/rl-2205.section.md +++ b/nixos/doc/manual/release-notes/rl-2205.section.md @@ -147,6 +147,8 @@ In addition to numerous new and upgraded packages, this release has the followin - opensmtpd-extras is no longer build with python2 scripting support due to python2 deprecation in nixpkgs +- `services.miniflux.adminCredentialFiles` is now required, instead of defaulting to `admin` and `password`. + - The `autorestic` package has been upgraded from 1.3.0 to 1.5.0 which introduces breaking changes in config file, check [their migration guide](https://autorestic.vercel.app/migration/1.4_1.5) for more details. - For `pkgs.python3.pkgs.ipython`, its direct dependency `pkgs.python3.pkgs.matplotlib-inline` @@ -178,6 +180,7 @@ In addition to numerous new and upgraded packages, this release has the followin - MultiMC has been replaced with the fork PolyMC due to upstream developers being hostile to 3rd party package maintainers. PolyMC removes all MultiMC branding and is aimed at providing proper 3rd party packages like the one contained in Nixpkgs. This change affects the data folder where game instances and other save and configuration files are stored. Users with existing installations should rename `~/.local/share/multimc` to `~/.local/share/polymc`. The main config file's path has also moved from `~/.local/share/multimc/multimc.cfg` to `~/.local/share/polymc/polymc.cfg`. +- `systemd-nspawn@.service` settings have been reverted to the default systemd behaviour. User namespaces are now activated by default. If you want to keep running nspawn containers without user namespaces you need to set `systemd.nspawn..execConfig.PrivateUsers = false` - The terraform 0.12 compatibility has been removed and the `terraform.withPlugins` and `terraform-providers.mkProvider` implementations simplified. Providers now need to be stored under `$out/libexec/terraform-providers/////_/terraform-provider-_v` (which mkProvider does). diff --git a/nixos/modules/services/web-apps/miniflux.nix b/nixos/modules/services/web-apps/miniflux.nix index 14cbfb395402..641c9be85d8c 100644 --- a/nixos/modules/services/web-apps/miniflux.nix +++ b/nixos/modules/services/web-apps/miniflux.nix @@ -7,26 +7,12 @@ let defaultAddress = "localhost:8080"; dbUser = "miniflux"; - dbPassword = "miniflux"; - dbHost = "localhost"; dbName = "miniflux"; - defaultCredentials = pkgs.writeText "miniflux-admin-credentials" '' - ADMIN_USERNAME=admin - ADMIN_PASSWORD=password - ''; - pgbin = "${config.services.postgresql.package}/bin"; preStart = pkgs.writeScript "miniflux-pre-start" '' #!${pkgs.runtimeShell} - db_exists() { - [ "$(${pgbin}/psql -Atc "select 1 from pg_database where datname='$1'")" == "1" ] - } - if ! db_exists "${dbName}"; then - ${pgbin}/psql postgres -c "CREATE ROLE ${dbUser} WITH LOGIN NOCREATEDB NOCREATEROLE ENCRYPTED PASSWORD '${dbPassword}'" - ${pgbin}/createdb --owner "${dbUser}" "${dbName}" - ${pgbin}/psql "${dbName}" -c "CREATE EXTENSION IF NOT EXISTS hstore" - fi + ${pgbin}/psql "${dbName}" -c "CREATE EXTENSION IF NOT EXISTS hstore" ''; in @@ -54,11 +40,10 @@ in }; adminCredentialsFile = mkOption { - type = types.nullOr types.path; - default = null; + type = types.path; description = '' - File containing the ADMIN_USERNAME, default is "admin", and - ADMIN_PASSWORD (length >= 6), default is "password"; in the format of + File containing the ADMIN_USERNAME and + ADMIN_PASSWORD (length >= 6) in the format of an EnvironmentFile=, as described by systemd.exec(5). ''; example = "/etc/nixos/miniflux-admin-credentials"; @@ -70,16 +55,24 @@ in services.miniflux.config = { LISTEN_ADDR = mkDefault defaultAddress; - DATABASE_URL = "postgresql://${dbUser}:${dbPassword}@${dbHost}/${dbName}?sslmode=disable"; + DATABASE_URL = "user=${dbUser} host=/run/postgresql dbname=${dbName}"; RUN_MIGRATIONS = "1"; CREATE_ADMIN = "1"; }; - services.postgresql.enable = true; + services.postgresql = { + enable = true; + ensureUsers = [ { + name = dbUser; + ensurePermissions = { + "DATABASE ${dbName}" = "ALL PRIVILEGES"; + }; + } ]; + ensureDatabases = [ dbName ]; + }; systemd.services.miniflux-dbsetup = { description = "Miniflux database setup"; - wantedBy = [ "multi-user.target" ]; requires = [ "postgresql.service" ]; after = [ "network.target" "postgresql.service" ]; serviceConfig = { @@ -92,17 +85,16 @@ in systemd.services.miniflux = { description = "Miniflux service"; wantedBy = [ "multi-user.target" ]; - requires = [ "postgresql.service" ]; + requires = [ "miniflux-dbsetup.service" ]; after = [ "network.target" "postgresql.service" "miniflux-dbsetup.service" ]; serviceConfig = { ExecStart = "${pkgs.miniflux}/bin/miniflux"; + User = dbUser; DynamicUser = true; RuntimeDirectory = "miniflux"; RuntimeDirectoryMode = "0700"; - EnvironmentFile = if cfg.adminCredentialsFile == null - then defaultCredentials - else cfg.adminCredentialsFile; + EnvironmentFile = cfg.adminCredentialsFile; # Hardening CapabilityBoundingSet = [ "" ]; DeviceAllow = [ "" ]; @@ -119,7 +111,7 @@ in ProtectKernelModules = true; ProtectKernelTunables = true; ProtectProc = "invisible"; - RestrictAddressFamilies = [ "AF_INET" "AF_INET6" ]; + RestrictAddressFamilies = [ "AF_INET" "AF_INET6" "AF_UNIX" ]; RestrictNamespaces = true; RestrictRealtime = true; RestrictSUIDSGID = true; diff --git a/nixos/modules/system/boot/systemd-nspawn.nix b/nixos/modules/system/boot/systemd-nspawn.nix index 02d2660add89..0c6822319a5b 100644 --- a/nixos/modules/system/boot/systemd-nspawn.nix +++ b/nixos/modules/system/boot/systemd-nspawn.nix @@ -120,14 +120,6 @@ in { }) { systemd.targets.multi-user.wants = [ "machines.target" ]; - - # Workaround for https://github.com/NixOS/nixpkgs/pull/67232#issuecomment-531315437 and https://github.com/systemd/systemd/issues/13622 - # Once systemd fixes this upstream, we can re-enable -U - systemd.services."systemd-nspawn@".serviceConfig.ExecStart = [ - "" # deliberately empty. signals systemd to override the ExecStart - # Only difference between upstream is that we do not pass the -U flag - "${config.systemd.package}/bin/systemd-nspawn --quiet --keep-unit --boot --link-journal=try-guest --network-veth --settings=override --machine=%i" - ]; } ]; } diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index a0beaf98de5c..515a3c7208ce 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -499,6 +499,7 @@ in systemd-confinement = handleTest ./systemd-confinement.nix {}; systemd-cryptenroll = handleTest ./systemd-cryptenroll.nix {}; systemd-journal = handleTest ./systemd-journal.nix {}; + systemd-machinectl = handleTest ./systemd-machinectl.nix {}; systemd-networkd = handleTest ./systemd-networkd.nix {}; systemd-networkd-dhcpserver = handleTest ./systemd-networkd-dhcpserver.nix {}; systemd-networkd-dhcpserver-static-leases = handleTest ./systemd-networkd-dhcpserver-static-leases.nix {}; diff --git a/nixos/tests/miniflux.nix b/nixos/tests/miniflux.nix index 1015550fa8c7..d905aea048a3 100644 --- a/nixos/tests/miniflux.nix +++ b/nixos/tests/miniflux.nix @@ -7,6 +7,15 @@ let defaultPort = 8080; defaultUsername = "admin"; defaultPassword = "password"; + adminCredentialsFile = pkgs.writeText "admin-credentials" '' + ADMIN_USERNAME=${defaultUsername} + ADMIN_PASSWORD=${defaultPassword} + ''; + customAdminCredentialsFile = pkgs.writeText "admin-credentials" '' + ADMIN_USERNAME=${username} + ADMIN_PASSWORD=${password} + ''; + in with lib; { @@ -17,13 +26,19 @@ with lib; default = { ... }: { - services.miniflux.enable = true; + services.miniflux = { + enable = true; + inherit adminCredentialsFile; + }; }; withoutSudo = { ... }: { - services.miniflux.enable = true; + services.miniflux = { + enable = true; + inherit adminCredentialsFile; + }; security.sudo.enable = false; }; @@ -36,10 +51,7 @@ with lib; CLEANUP_FREQUENCY = "48"; LISTEN_ADDR = "localhost:${toString port}"; }; - adminCredentialsFile = pkgs.writeText "admin-credentials" '' - ADMIN_USERNAME=${username} - ADMIN_PASSWORD=${password} - ''; + adminCredentialsFile = customAdminCredentialsFile; }; }; }; diff --git a/nixos/tests/systemd-machinectl.nix b/nixos/tests/systemd-machinectl.nix new file mode 100644 index 000000000000..4fc5864357c0 --- /dev/null +++ b/nixos/tests/systemd-machinectl.nix @@ -0,0 +1,85 @@ +import ./make-test-python.nix ( + let + + container = { + # We re-use the NixOS container option ... + boot.isContainer = true; + # ... and revert unwanted defaults + networking.useHostResolvConf = false; + + # use networkd to obtain systemd network setup + networking.useNetworkd = true; + networking.useDHCP = false; + + # systemd-nspawn expects /sbin/init + boot.loader.initScript.enable = true; + + imports = [ ../modules/profiles/minimal.nix ]; + }; + + containerSystem = (import ../lib/eval-config.nix { + modules = [ container ]; + }).config.system.build.toplevel; + + containerName = "container"; + containerRoot = "/var/lib/machines/${containerName}"; + + in + { + name = "systemd-machinectl"; + + machine = { lib, ... }: { + # use networkd to obtain systemd network setup + networking.useNetworkd = true; + networking.useDHCP = false; + services.resolved.enable = false; + + # open DHCP server on interface to container + networking.firewall.trustedInterfaces = [ "ve-+" ]; + + # do not try to access cache.nixos.org + nix.settings.substituters = lib.mkForce [ ]; + + virtualisation.additionalPaths = [ containerSystem ]; + }; + + testScript = '' + start_all() + machine.wait_for_unit("default.target"); + + # Install container + machine.succeed("mkdir -p ${containerRoot}"); + # Workaround for nixos-install + machine.succeed("chmod o+rx /var/lib/machines"); + machine.succeed("nixos-install --root ${containerRoot} --system ${containerSystem} --no-channel-copy --no-root-passwd"); + + # Allow systemd-nspawn to apply user namespace on immutable files + machine.succeed("chattr -i ${containerRoot}/var/empty"); + + # Test machinectl start + machine.succeed("machinectl start ${containerName}"); + machine.wait_until_succeeds("systemctl -M ${containerName} is-active default.target"); + + # Test systemd-nspawn network configuration + machine.succeed("ping -n -c 1 ${containerName}"); + + # Test systemd-nspawn uses a user namespace + machine.succeed("test `stat ${containerRoot}/var/empty -c %u%g` != 00"); + + # Test systemd-nspawn reboot + machine.succeed("machinectl shell ${containerName} /run/current-system/sw/bin/reboot"); + machine.wait_until_succeeds("systemctl -M ${containerName} is-active default.target"); + + # Test machinectl reboot + machine.succeed("machinectl reboot ${containerName}"); + machine.wait_until_succeeds("systemctl -M ${containerName} is-active default.target"); + + # Test machinectl stop + machine.succeed("machinectl stop ${containerName}"); + + # Show to to delete the container + machine.succeed("chattr -i ${containerRoot}/var/empty"); + machine.succeed("rm -rf ${containerRoot}"); + ''; + } +) diff --git a/pkgs/applications/audio/termusic/default.nix b/pkgs/applications/audio/termusic/default.nix new file mode 100644 index 000000000000..4a0035aadf53 --- /dev/null +++ b/pkgs/applications/audio/termusic/default.nix @@ -0,0 +1,28 @@ +{ lib +, stdenv +, fetchCrate +, rustPlatform +, pkg-config +, alsa-lib }: + +rustPlatform.buildRustPackage rec { + pname = "termusic"; + version = "0.6.10"; + + src = fetchCrate { + inherit pname version; + sha256 = "sha256-i+XxEPkLZK+JKDl88P8Nd7XBhsGhEzvUGovJtSWvRtg="; + }; + + cargoHash = "sha256-7nQzU1VvRDrtltVAXTX268vl9AbQhMOilPG4nNAJ+Xk="; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ alsa-lib ]; + + meta = with lib; { + description = "Terminal Music Player TUI written in Rust"; + homepage = "https://github.com/tramhao/termusic"; + license = with licenses; [ gpl3Only ]; + maintainers = with maintainers; [ devhell ]; + }; +} diff --git a/pkgs/applications/blockchains/pivx/default.nix b/pkgs/applications/blockchains/pivx/default.nix index fd562edf93f1..75d0aa7ebfc2 100644 --- a/pkgs/applications/blockchains/pivx/default.nix +++ b/pkgs/applications/blockchains/pivx/default.nix @@ -72,7 +72,7 @@ stdenv.mkDerivation rec { ''; license = licenses.mit; homepage = "https://pivx.org"; - maintainers = with maintainers; [ wucke13 ]; + maintainers = with maintainers; [ ]; platforms = platforms.unix; }; } diff --git a/pkgs/applications/graphics/ImageMagick/7.0.nix b/pkgs/applications/graphics/ImageMagick/7.0.nix index 19a754d92eed..f7780e4fd607 100644 --- a/pkgs/applications/graphics/ImageMagick/7.0.nix +++ b/pkgs/applications/graphics/ImageMagick/7.0.nix @@ -18,13 +18,13 @@ in stdenv.mkDerivation rec { pname = "imagemagick"; - version = "7.1.0-25"; + version = "7.1.0-26"; src = fetchFromGitHub { owner = "ImageMagick"; repo = "ImageMagick"; rev = version; - hash = "sha256-zSbngA56YnJ1W+ZlA6Q850NTtZovjue51zEgbKI3iqc="; + hash = "sha256-q1CL64cfyb5fN9aVYJfls+v0XRFd4jH+B8n+UJqPE1I="; }; outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big diff --git a/pkgs/applications/misc/globe-cli/default.nix b/pkgs/applications/misc/globe-cli/default.nix new file mode 100644 index 000000000000..e7ec63f97844 --- /dev/null +++ b/pkgs/applications/misc/globe-cli/default.nix @@ -0,0 +1,20 @@ +{ lib, stdenv, rustPlatform, fetchCrate }: + +rustPlatform.buildRustPackage rec { + pname = "globe-cli"; + version = "0.2.0"; + + src = fetchCrate { + inherit pname version; + sha256 = "sha256-Np1f/mSMIMZU3hE0Fur8bOHhOH3rZyroGiVAqfiIs7g="; + }; + + cargoHash = "sha256-qoCOYk7hyjMx07l48IkxE6zsG58NkF72E3OvoZHz5d0="; + + meta = with lib; { + description = "Display an interactive ASCII globe in your terminal"; + homepage = "https://github.com/adamsky/globe"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ devhell ]; + }; +} diff --git a/pkgs/applications/misc/remarkable/rmview/default.nix b/pkgs/applications/misc/remarkable/rmview/default.nix index bc98a960bfb3..4147909892f7 100644 --- a/pkgs/applications/misc/remarkable/rmview/default.nix +++ b/pkgs/applications/misc/remarkable/rmview/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { pname = "rmview"; - version = "3.1"; + version = "3.1.1"; src = fetchFromGitHub { owner = "bordaigorl"; repo = pname; rev = "v${version}"; - sha256 = "11p62dglxnvml3x95mi2sfai1k0gmvzwixzijr3gls2ss73maffw"; + sha256 = "sha256-lUzmOayMHftvCukXSxXr6tBzrr2vaua1ey9gsuCKOBc="; }; nativeBuildInputs = with python3Packages; [ pyqt5 wrapQtAppsHook ]; @@ -18,10 +18,6 @@ python3Packages.buildPythonApplication rec { pyrcc5 -o src/rmview/resources.py resources.qrc ''; - preFixup = '' - wrapQtApp "$out/bin/rmview" - ''; - meta = with lib; { description = "Fast live viewer for reMarkable 1 and 2"; homepage = "https://github.com/bordaigorl/rmview"; diff --git a/pkgs/applications/networking/cluster/argo-rollouts/default.nix b/pkgs/applications/networking/cluster/argo-rollouts/default.nix new file mode 100644 index 000000000000..8127904023c9 --- /dev/null +++ b/pkgs/applications/networking/cluster/argo-rollouts/default.nix @@ -0,0 +1,27 @@ +{ buildGoModule, lib, fetchFromGitHub }: + +buildGoModule rec { + pname = "argo-rollouts"; + version = "1.1.1"; + + src = fetchFromGitHub { + owner = "argoproj"; + repo = "argo-rollouts"; + rev = "v${version}"; + sha256 = "0qb1wbv3razwhqsv972ywfazaq73y83iw6f6qdjcbwwfwsybig21"; + }; + + vendorSha256 = "00ic1nn3wgg495x2170ik1d1cha20b4w89j9jclq8p0b3nndv0c0"; + + # Disable tests since some test fail because of missing test data + doCheck = false; + + subPackages = [ "cmd/rollouts-controller" "cmd/kubectl-argo-rollouts" ]; + + meta = with lib; { + description = "Kubernetes Progressive Delivery Controller"; + homepage = "https://github.com/argoproj/argo-rollouts/"; + license = licenses.asl20; + maintainers = with maintainers; [ psibi ]; + }; +} diff --git a/pkgs/applications/science/math/getdp/default.nix b/pkgs/applications/science/math/getdp/default.nix index 7515d6d344fd..5713f84a866f 100644 --- a/pkgs/applications/science/math/getdp/default.nix +++ b/pkgs/applications/science/math/getdp/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ''; homepage = "http://getdp.info/"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ wucke13 ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/data/themes/orchis-theme/default.nix b/pkgs/data/themes/orchis-theme/default.nix index 666166e0a9d2..ccaee7f65522 100644 --- a/pkgs/data/themes/orchis-theme/default.nix +++ b/pkgs/data/themes/orchis-theme/default.nix @@ -21,13 +21,13 @@ assert lib.assertMsg (unknownTweaks == [ ]) '' stdenvNoCC.mkDerivation rec { pname = "orchis-theme"; - version = "2021-12-13"; + version = "2022-02-18"; src = fetchFromGitHub { repo = "Orchis-theme"; owner = "vinceliuice"; rev = version; - sha256 = "sha256-PN2ucGMDzRv4v86X1zVIs9+GkbMWuja2WaSQLFvJYd0="; + sha256 = "sha256-SqptW8DEDCB6LMHalRlf71TWK93gW+blbu6Q1Oommes="; }; nativeBuildInputs = [ gtk3 sassc ]; diff --git a/pkgs/development/interpreters/duktape/default.nix b/pkgs/development/interpreters/duktape/default.nix index ba533a172761..912fc691dd91 100644 --- a/pkgs/development/interpreters/duktape/default.nix +++ b/pkgs/development/interpreters/duktape/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "duktape"; - version = "2.6.0"; + version = "2.7.0"; src = fetchurl { url = "http://duktape.org/duktape-${version}.tar.xz"; - sha256 = "19szwxzvl2g65fw95ggvb8h0ma5bd9vvnnccn59hwnc4dida1x4n"; + sha256 = "sha256-kPjS+otVZ8aJmDDd7ywD88J5YLEayiIvoXqnrGE8KJA="; }; nativeBuildInputs = [ validatePkgConfig ]; diff --git a/pkgs/development/libraries/avro-c++/default.nix b/pkgs/development/libraries/avro-c++/default.nix index 7ff60b965953..743740fddb0d 100644 --- a/pkgs/development/libraries/avro-c++/default.nix +++ b/pkgs/development/libraries/avro-c++/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "avro-c++"; - version = "1.8.2"; + version = "1.10.2"; src = fetchurl { url = "mirror://apache/avro/avro-${version}/cpp/avro-cpp-${version}.tar.gz"; - sha256 = "1ars58bfw83s8f1iqbhnqp4n9wc9cxsph0gs2a8k7r9fi09vja2k"; + sha256 = "1qv2wxh5q2iq48m5g3xci9p05znzcl0v3314bhcsyr5bkpdjvzs1"; }; nativeBuildInputs = [ cmake python3 ]; diff --git a/pkgs/development/libraries/dqlite/default.nix b/pkgs/development/libraries/dqlite/default.nix index eb14a44e4fa5..748e1e756cb3 100644 --- a/pkgs/development/libraries/dqlite/default.nix +++ b/pkgs/development/libraries/dqlite/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://dqlite.io/"; license = licenses.asl20; - maintainers = with maintainers; [ joko wucke13 ]; + maintainers = with maintainers; [ joko ]; platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/libserdes/default.nix b/pkgs/development/libraries/libserdes/default.nix index 7b48f150c9a1..8b61669d1c6d 100644 --- a/pkgs/development/libraries/libserdes/default.nix +++ b/pkgs/development/libraries/libserdes/default.nix @@ -1,6 +1,7 @@ { stdenv , lib , fetchFromGitHub +, fetchpatch , perl , boost , rdkafka @@ -28,6 +29,14 @@ stdenv.mkDerivation rec { makeFlags = [ "GEN_PKG_CONFIG=y" ]; + patches = [ + # Fix compatibility with Avro master branch + (fetchpatch { + url = "https://github.com/confluentinc/libserdes/commit/d7a355e712ab63ec77f6722fb5a9e8056e7416a2.patch"; + sha256 = "14bdx075n4lxah63kp7phld9xqlz3pzs03yf3wbq4nmkgwac10dh"; + }) + ]; + postPatch = '' patchShebangs configure lds-gen.pl ''; diff --git a/pkgs/development/libraries/libspf2/default.nix b/pkgs/development/libraries/libspf2/default.nix index 6ec8f24b7132..c48c71e14485 100644 --- a/pkgs/development/libraries/libspf2/default.nix +++ b/pkgs/development/libraries/libspf2/default.nix @@ -28,8 +28,9 @@ stdenv.mkDerivation rec { doCheck = true; meta = { - description = "Implementation of the Sender Policy Framework for SMTP authorization"; - homepage = "https://www.libspf2.org"; + description = "Implementation of the Sender Policy Framework for SMTP " + + "authorization (Helsinki Systems fork)"; + homepage = "https://github.com/helsinki-systems/libspf2"; license = with licenses; [ lgpl21Plus bsd2 ]; maintainers = with maintainers; [ pacien ajs124 das_j ]; platforms = platforms.all; diff --git a/pkgs/development/libraries/science/math/libhomfly/default.nix b/pkgs/development/libraries/science/math/libhomfly/default.nix index cd9f06499de7..d0f09290c3c7 100644 --- a/pkgs/development/libraries/science/math/libhomfly/default.nix +++ b/pkgs/development/libraries/science/math/libhomfly/default.nix @@ -5,14 +5,14 @@ }: stdenv.mkDerivation rec { - version = "1.02r5"; + version = "1.02r6"; pname = "libhomfly"; src = fetchFromGitHub { owner = "miguelmarco"; repo = "libhomfly"; rev = version; - sha256 = "1szv8iwlhvmy3saigi15xz8vgch92p2lbsm6440v5s8vxj455bvd"; + sha256 = "sha256-s1Hgy6S9+uREKsgjOVQdQfnds6oSLo5UWTrt5DJnY2s="; }; buildInputs = [ diff --git a/pkgs/development/libraries/science/math/petsc/default.nix b/pkgs/development/libraries/science/math/petsc/default.nix index 31b1af5abedd..4a4208e1cbe4 100644 --- a/pkgs/development/libraries/science/math/petsc/default.nix +++ b/pkgs/development/libraries/science/math/petsc/default.nix @@ -74,6 +74,6 @@ stdenv.mkDerivation rec { description = "Portable Extensible Toolkit for Scientific computation"; homepage = "https://www.mcs.anl.gov/petsc/index.html"; license = licenses.bsd2; - maintainers = with maintainers; [ wucke13 cburstedde ]; + maintainers = with maintainers; [ cburstedde ]; }; } diff --git a/pkgs/development/node-packages/default.nix b/pkgs/development/node-packages/default.nix index a0f76135fd37..abc5bd2c5b7a 100644 --- a/pkgs/development/node-packages/default.nix +++ b/pkgs/development/node-packages/default.nix @@ -200,7 +200,7 @@ let }; manta = super.manta.override { - nativeBuildInputs = with pkgs; [ nodejs-12_x installShellFiles ]; + nativeBuildInputs = with pkgs; [ nodejs-14_x installShellFiles ]; postInstall = '' # create completions, following upstream procedure https://github.com/joyent/node-manta/blob/v5.2.3/Makefile#L85-L91 completion_cmds=$(find ./bin -type f -printf "%f\n") diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index cf0e9fc18324..dba80f28422a 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -164,7 +164,7 @@ , "insect" , "intelephense" , "ionic" -, {"iosevka": "https://github.com/be5invis/Iosevka/archive/v11.0.1.tar.gz"} +, {"iosevka": "https://github.com/be5invis/Iosevka/archive/v14.0.1.tar.gz"} , "jake" , "javascript-typescript-langserver" , "joplin" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index e2be2faab679..17004d2de714 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -8527,6 +8527,15 @@ let sha512 = "eKj4f/BsN/qcculZiRSujogjvp5O/k4lOW5m35NopjZM/QwLOR075a8pJW5hD+Rtdm2DaCVPENS6KtSQnUD6BA=="; }; }; + "@types/node-17.0.19" = { + name = "_at_types_slash_node"; + packageName = "@types/node"; + version = "17.0.19"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/node/-/node-17.0.19.tgz"; + sha512 = "PfeQhvcMR4cPFVuYfBN4ifG7p9c+Dlh3yUZR6k+5yQK7wX3gDgVxBly4/WkBRs9x4dmcy1TVl08SY67wwtEvmA=="; + }; + }; "@types/node-17.0.8" = { name = "_at_types_slash_node"; packageName = "@types/node"; @@ -9283,13 +9292,13 @@ let sha512 = "sL/cEvJWAnClXw0wHk85/2L0G6Sj8UB0Ctc1TEMbKSsmpRosqhwj9gWgFRZSrBr2f9tiXISwNhCPmlfqUqyb9Q=="; }; }; - "@unicode/unicode-13.0.0-1.2.1" = { - name = "_at_unicode_slash_unicode-13.0.0"; - packageName = "@unicode/unicode-13.0.0"; + "@unicode/unicode-14.0.0-1.2.1" = { + name = "_at_unicode_slash_unicode-14.0.0"; + packageName = "@unicode/unicode-14.0.0"; version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@unicode/unicode-13.0.0/-/unicode-13.0.0-1.2.1.tgz"; - sha512 = "8NDE4zZASktxJe+hV13K795wefyx+wRhu3Wl7TJ8fzsKx95CHsgTFmYRTscqna90zpUz6YBjGyqXHBI2ubiMaw=="; + url = "https://registry.npmjs.org/@unicode/unicode-14.0.0/-/unicode-14.0.0-1.2.1.tgz"; + sha512 = "M7NfPQP0PsCRFIUnmtFMgMiC5CCB26YwURCWIE48RQKbtN61sXrDhuXNq9w/tkBOtVeU84IAB1MMK9c+d2iR7A=="; }; }; "@uphold/request-logger-2.0.0" = { @@ -13171,13 +13180,13 @@ let sha512 = "4TVv2X7oNStT0vLaEfExmy3J4/CzfuXolEcQl/BRUmvGySqKStTG2O55/hUQ0kM7UJlZBLgniM0SBq4d/WkKow=="; }; }; - "azure-devops-node-api-11.1.0" = { + "azure-devops-node-api-11.1.1" = { name = "azure-devops-node-api"; packageName = "azure-devops-node-api"; - version = "11.1.0"; + version = "11.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/azure-devops-node-api/-/azure-devops-node-api-11.1.0.tgz"; - sha512 = "6/2YZuf+lJzJLrjXNYEA5RXAkMCb8j/4VcHD0qJQRsgG/KsRMYo0HgDh0by1FGHyZkQWY5LmQyJqCwRVUB3Y7Q=="; + url = "https://registry.npmjs.org/azure-devops-node-api/-/azure-devops-node-api-11.1.1.tgz"; + sha512 = "XDG91XzLZ15reP12s3jFkKS8oiagSICjnLwxEYieme4+4h3ZveFOFRA4iYIG40RyHXsiI0mefFYYMFIJbMpWcg=="; }; }; "b24.js-1.0.3" = { @@ -16916,22 +16925,22 @@ let sha512 = "eyrF0jiFpY+3drT6383f1qhkbGsLSifNAjA61IUjZjmLCWjItY6LB9ft9YhoDgwfmclB2zhu51Lc7+95b8NRAg=="; }; }; - "cdk8s-1.5.20" = { + "cdk8s-1.5.22" = { name = "cdk8s"; packageName = "cdk8s"; - version = "1.5.20"; + version = "1.5.22"; src = fetchurl { - url = "https://registry.npmjs.org/cdk8s/-/cdk8s-1.5.20.tgz"; - sha512 = "SBcX7mUsv9LbYr1zyrYcqJu+FoAELgQ1Jgi9dikNT21DVYyorIeZ/0uJYzfjzBmr6jSZOaswdzZ9keT8KFYnuA=="; + url = "https://registry.npmjs.org/cdk8s/-/cdk8s-1.5.22.tgz"; + sha512 = "MVvvrRQPhQYK6EJ2RiyGZvGNihuqf//K03ga7R+otyTl8jDwEEoaOOfIXeemhXXqLixfqKOSUO1VJIALAt6/iQ=="; }; }; - "cdk8s-plus-22-1.0.0-beta.121" = { + "cdk8s-plus-22-1.0.0-beta.123" = { name = "cdk8s-plus-22"; packageName = "cdk8s-plus-22"; - version = "1.0.0-beta.121"; + version = "1.0.0-beta.123"; src = fetchurl { - url = "https://registry.npmjs.org/cdk8s-plus-22/-/cdk8s-plus-22-1.0.0-beta.121.tgz"; - sha512 = "9Yda0m3MVrlPbANO4kvaJoDNCbV5PQj9/umK58qrfEuEDg1KONj/DvqeZ8dNr0Gk3Qp0h2z84T0YYHlBZDtEDA=="; + url = "https://registry.npmjs.org/cdk8s-plus-22/-/cdk8s-plus-22-1.0.0-beta.123.tgz"; + sha512 = "ZEtP1rIhgdHONpR3JyANQwoKT5TfcaFIo41C4SF/Cbd/TbRMQLPc2BT+/+oc+/i/6J1IYuqTiY6H7HLFci84IA=="; }; }; "cdktf-0.9.1" = { @@ -19571,22 +19580,22 @@ let sha1 = "c20b96d8c617748aaf1c16021760cd27fcb8cb75"; }; }; - "constructs-10.0.66" = { + "constructs-10.0.68" = { name = "constructs"; packageName = "constructs"; - version = "10.0.66"; + version = "10.0.68"; src = fetchurl { - url = "https://registry.npmjs.org/constructs/-/constructs-10.0.66.tgz"; - sha512 = "luFprSllFDm8iEt/irxsWnm8PHNKNNnZ3pV+5PRXDUOnLaWCv6Vwm+7E0IX6pfgiSphOSsWqhA4ReJA+xe0YHg=="; + url = "https://registry.npmjs.org/constructs/-/constructs-10.0.68.tgz"; + sha512 = "UoHYvlQDEXpSKHDJ5n5e2kcJwojswF0ASvuSyQDesziZN0QjSZBViylRknK1AJuWCelC9sad/ghk4E4a+D8axw=="; }; }; - "constructs-3.3.221" = { + "constructs-3.3.223" = { name = "constructs"; packageName = "constructs"; - version = "3.3.221"; + version = "3.3.223"; src = fetchurl { - url = "https://registry.npmjs.org/constructs/-/constructs-3.3.221.tgz"; - sha512 = "+mFPYjtEWakgB3Ao7s+FDzuSHkrIiF+aUP7O9flMa+jkxQVkoW7txl4TUrOSi94FbFJoh0fVT3P37xOa1P/8+Q=="; + url = "https://registry.npmjs.org/constructs/-/constructs-3.3.223.tgz"; + sha512 = "WCCR/my4MohLT/OQWioU+0fOzXnMZMD5PHsxT4tnB3iKluGVJynDFCuQ7uNAfLs3rwSx09BIeJHc5B7ZUTVbbQ=="; }; }; "consume-http-header-1.0.0" = { @@ -31194,13 +31203,13 @@ let sha512 = "sHkK9+lUm20/BGawNEWNtVAeJzhZeBg21VmvmLoT5NdGVeZWv5PdIhkcayQIAgjSyyQ17WMKmbDijIPG2On+Ag=="; }; }; - "graphql-ws-5.5.5" = { + "graphql-ws-5.6.0" = { name = "graphql-ws"; packageName = "graphql-ws"; - version = "5.5.5"; + version = "5.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/graphql-ws/-/graphql-ws-5.5.5.tgz"; - sha512 = "hvyIS71vs4Tu/yUYHPvGXsTgo0t3arU820+lT5VjZS2go0ewp2LqyCgxEN56CzOG7Iys52eRhHBiD1gGRdiQtw=="; + url = "https://registry.npmjs.org/graphql-ws/-/graphql-ws-5.6.0.tgz"; + sha512 = "Kz/4z1u9yGKWMtzlvia9wW8AJGjx68OyCCV40dabYq1OeyUxgU9t8Ll43vLAje7TYiLwZSwGbvtHviHaPyGYxw=="; }; }; "gray-matter-4.0.3" = { @@ -37081,13 +37090,13 @@ let sha512 = "fxgx9L5eWzyMC1IEkDitxgcraHUuZbQQVQztJtZHw/QlZ9n0DUjfbKrefJQ2HpobtI9ZV2fDEYjuwZDBAVBdsA=="; }; }; - "jsii-srcmak-0.1.480" = { + "jsii-srcmak-0.1.482" = { name = "jsii-srcmak"; packageName = "jsii-srcmak"; - version = "0.1.480"; + version = "0.1.482"; src = fetchurl { - url = "https://registry.npmjs.org/jsii-srcmak/-/jsii-srcmak-0.1.480.tgz"; - sha512 = "dfbPFhBAWAm+y7c1Sqwmzav8ZsSaxSt9bGAV5oeYztYBVY+4wlgpspY6mtVF6K6IWN4PKsK/6rcJvaMRe2cFtQ=="; + url = "https://registry.npmjs.org/jsii-srcmak/-/jsii-srcmak-0.1.482.tgz"; + sha512 = "Dr7eCmWXtYSPMODMxJxbzf6m5+iFH9WcKtmwWDFwcUke5bxTndovEKkK/GKHKD1sNZcF6FHX2Nak5Lib0bPUTw=="; }; }; "json-bigint-1.0.0" = { @@ -37378,13 +37387,13 @@ let sha512 = "0/4Lv6IenJV0qj2oBdgPIAmFiKKnh8qh7bmLFJ+/ZZHLjSeiL3fKKGX3UryvKPbxFbhV+JcYo9KUC19GJ/Z/4A=="; }; }; - "json2jsii-0.2.140" = { + "json2jsii-0.2.142" = { name = "json2jsii"; packageName = "json2jsii"; - version = "0.2.140"; + version = "0.2.142"; src = fetchurl { - url = "https://registry.npmjs.org/json2jsii/-/json2jsii-0.2.140.tgz"; - sha512 = "AM7hYuy6DQUZlrLVIGK2kOe2Xi8dBjd0QFzgUVCLOxeTngfXcR/SSwcbl7m/ChDn0iSj0gPpKzKu29CyZQq5Hw=="; + url = "https://registry.npmjs.org/json2jsii/-/json2jsii-0.2.142.tgz"; + sha512 = "voi+j4VtuhgI7aKq9WbGv8g4OiQd33JyCDyGHc+M/v+pp8mvzXja9sWvBa4F3zKRazwSERXvP1yS61CTztW8Xg=="; }; }; "json3-3.2.6" = { @@ -48082,13 +48091,13 @@ let sha512 = "5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ=="; }; }; - "ora-6.0.1" = { + "ora-6.1.0" = { name = "ora"; packageName = "ora"; - version = "6.0.1"; + version = "6.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/ora/-/ora-6.0.1.tgz"; - sha512 = "TDdKkKHdWE6jo/6pIa5U5AWcSVfpNRFJ8sdRJpioGNVPLAzZzHs/N+QhUfF7ZbyoC+rnDuNTKzeDJUbAza9g4g=="; + url = "https://registry.npmjs.org/ora/-/ora-6.1.0.tgz"; + sha512 = "CxEP6845hLK+NHFWZ+LplGO4zfw4QSfxTlqMfvlJ988GoiUeZDMzCvqsZkFHv69sPICmJH1MDxZoQFOKXerAVw=="; }; }; "ordered-read-streams-1.0.1" = { @@ -49630,13 +49639,13 @@ let sha512 = "nxl9nrnLQmh64iTzMfyylSlRozL7kAXIaxw1fVcLYdyhNkJCRUzirRZTikXGJsg+hc4fqpneTK6iU2H1Q8THSA=="; }; }; - "patel-0.35.1" = { + "patel-0.37.1" = { name = "patel"; packageName = "patel"; - version = "0.35.1"; + version = "0.37.1"; src = fetchurl { - url = "https://registry.npmjs.org/patel/-/patel-0.35.1.tgz"; - sha512 = "Em5Zh8t+oVnTNELwze1J9iQEeOBC+84B+UstU4hrmv16uvdunBzmMad6kY28nVxBxycqH6EYsDV2s1rO9IeZaw=="; + url = "https://registry.npmjs.org/patel/-/patel-0.37.1.tgz"; + sha512 = "7lIe3whu1gIJePlt8U+xmKCNXZgfBNNYdE4thvJTKfz8xZmmHC3+Oc7pI2qabtVLppXAjg5g3xnhDaLsD7dQ8w=="; }; }; "path-browserify-0.0.1" = { @@ -49882,13 +49891,13 @@ let sha512 = "Dp6zGqpTdETdR63lehJYPeIOqpiNBNtc7BpWSLrOje7UaIsE5aY92r/AunQA7rsXvet3lrJ3JnZX29UPTKXyKQ=="; }; }; - "patrisika-0.23.0" = { + "patrisika-0.24.0" = { name = "patrisika"; packageName = "patrisika"; - version = "0.23.0"; + version = "0.24.0"; src = fetchurl { - url = "https://registry.npmjs.org/patrisika/-/patrisika-0.23.0.tgz"; - sha512 = "bGxKK+XqO7Qfgv7WJSeytwZlbQsKXeuya+FD+6CB0iHat4tSbmN6eT0FEWGf0ulNguD0th/H3fa+VuXDDYQmLw=="; + url = "https://registry.npmjs.org/patrisika/-/patrisika-0.24.0.tgz"; + sha512 = "vIXRwNNZic/jMtMGCmWG0+b3vg2zKqeNgY4NHKHkevUc+eIY7iudIXMGwnDY45mavfHxmEhATxnpkMJvBwCCqA=="; }; }; "patrisika-scopes-0.12.0" = { @@ -53600,13 +53609,13 @@ let sha1 = "15931d3cd967ade52206f523aa7331aef7d43af7"; }; }; - "pyright-1.1.222" = { + "pyright-1.1.223" = { name = "pyright"; packageName = "pyright"; - version = "1.1.222"; + version = "1.1.223"; src = fetchurl { - url = "https://registry.npmjs.org/pyright/-/pyright-1.1.222.tgz"; - sha512 = "zEQyvkQa/hUmjg5A7COOzE/uL3W6D/Fp6qjhE+HDeLKwe+zm1KSMo74djIn0CTzhK53bmEDgEIR1hoMpA/Is/w=="; + url = "https://registry.npmjs.org/pyright/-/pyright-1.1.223.tgz"; + sha512 = "EGLKMQRmSkKNe/eDy6MEkqq5lF91C5MCMYxvmCgKGUjZHIa+HByJIiRY2cOTm7g2CAv0eE7Ift701VxLM5Q0iQ=="; }; }; "q-0.9.7" = { @@ -61133,13 +61142,13 @@ let sha512 = "zZ/Q1M+9ZWlrchgh4QauD/MEUFa6eC6H6FYq6T8Of/y82JqsQBLwN6YlzbO09evE7Rx6x0oliXDCnQSjwGwQRA=="; }; }; - "sscaff-1.2.206" = { + "sscaff-1.2.208" = { name = "sscaff"; packageName = "sscaff"; - version = "1.2.206"; + version = "1.2.208"; src = fetchurl { - url = "https://registry.npmjs.org/sscaff/-/sscaff-1.2.206.tgz"; - sha512 = "uhkbY110y2Cbe3ELcuDm5PR99cPzLDApVt0D9tL9yIzzMlGEXdY7bxhDTu31YssRotnFdOiMx3i2vtkVbTOFww=="; + url = "https://registry.npmjs.org/sscaff/-/sscaff-1.2.208.tgz"; + sha512 = "zZbWds7b7zh2x+TATQ4SM1Grqw9INsf4jB0pZ9CWtgGAFLM4aWGhSGscUMLqigCu2+MxCIAIwG2CRDOTVD4G+w=="; }; }; "ssh-config-1.1.6" = { @@ -62582,15 +62591,6 @@ let sha512 = "vr54Or4BZ7pJafo2mpf0ZcwA74rpuYCZbxrHBsH8kbcXOwSfvBFwsRfpGO5OD5fhG5HDCFW737PKaawI7OqEAg=="; }; }; - "stylus-0.55.0" = { - name = "stylus"; - packageName = "stylus"; - version = "0.55.0"; - src = fetchurl { - url = "https://registry.npmjs.org/stylus/-/stylus-0.55.0.tgz"; - sha512 = "MuzIIVRSbc8XxHH7FjkvWqkIcr1BvoMZoR/oFuAJDlh7VSaNJzrB4uJ38GRQa+mWjLXODAMzeDe0xi9GYbGwnw=="; - }; - }; "stylus-supremacy-2.15.0" = { name = "stylus-supremacy"; packageName = "stylus-supremacy"; @@ -63221,13 +63221,13 @@ let sha512 = "YPPlu67mdnHGTup2A8ff7BC2Pjq0e0Yp/IyTFN03zWO0RcK07uLcbi7C2KpGR2FvWbaB0+bfE27a+sBKebSo7w=="; }; }; - "systeminformation-5.11.3" = { + "systeminformation-5.11.4" = { name = "systeminformation"; packageName = "systeminformation"; - version = "5.11.3"; + version = "5.11.4"; src = fetchurl { - url = "https://registry.npmjs.org/systeminformation/-/systeminformation-5.11.3.tgz"; - sha512 = "sjvlk4SUefhwrONUeLijXt+NQyptAiqShd5v6bFJFNr9EVJUr3YSnNxDqCz0gp5EJBUj88pL1ssc8ZHPtngBOw=="; + url = "https://registry.npmjs.org/systeminformation/-/systeminformation-5.11.4.tgz"; + sha512 = "rh7bjpjP5whUaTknim5CiGdAiKZcgWhmbmxjzBRXDWqUc/k67bz2OP+03DdcX6/SN/CDSAi/NeUwM5o2gjHJoA=="; }; }; "sywac-1.3.0" = { @@ -65130,6 +65130,15 @@ let sha512 = "FnHq5sTMxC0sk957wHDzRnemFnNBvt/gSY99HzK8F7UP5WAbvP70yX5bd7CjEQkN+TjdxwI7g7lJ6podqrG2/w=="; }; }; + "trough-2.1.0" = { + name = "trough"; + packageName = "trough"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/trough/-/trough-2.1.0.tgz"; + sha512 = "AqTiAOLcj85xS7vQ8QkAV41hPDIJ71XJB4RCUrzo/1GM2CQwhkJGaf9Hgr7BOugMRpgGUrqRg/DrBDl4H40+8g=="; + }; + }; "truncate-2.1.0" = { name = "truncate"; packageName = "truncate"; @@ -67524,13 +67533,13 @@ let sha512 = "3BTV812+AVHHOJQO8O5MkWgZ5aosP7GnROJwvzLS9hWDj00lZ6Z0wNak423Lp9PBZN05N+Jk/N5Si8jRAlGyWA=="; }; }; - "url-parse-1.5.7" = { + "url-parse-1.5.9" = { name = "url-parse"; packageName = "url-parse"; - version = "1.5.7"; + version = "1.5.9"; src = fetchurl { - url = "https://registry.npmjs.org/url-parse/-/url-parse-1.5.7.tgz"; - sha512 = "HxWkieX+STA38EDk7CE9MEryFeHCKzgagxlGvsdS7WBImq9Mk+PGwiT56w82WI3aicwJA8REp42Cxo98c8FZMA=="; + url = "https://registry.npmjs.org/url-parse/-/url-parse-1.5.9.tgz"; + sha512 = "HpOvhKBvre8wYez+QhHcYiVvVmeF6DVnuSOOPhe3cTum3BnqHhvKaZm8FU5yTiOu/Jut2ZpB2rA/SbBA1JIGlQ=="; }; }; "url-parse-as-address-1.0.0" = { @@ -72644,10 +72653,10 @@ in "@antfu/ni" = nodeEnv.buildNodePackage { name = "_at_antfu_slash_ni"; packageName = "@antfu/ni"; - version = "0.13.0"; + version = "0.13.1"; src = fetchurl { - url = "https://registry.npmjs.org/@antfu/ni/-/ni-0.13.0.tgz"; - sha512 = "p4/11Pu+NwjVZ+XUdfD7p102xudpu9I3FnSaEA+2SCve166TXg5ivRVm1+sk383IIc1Ducxefkfad5EmUO6ujA=="; + url = "https://registry.npmjs.org/@antfu/ni/-/ni-0.13.1.tgz"; + sha512 = "n9frAWnm14iweBtISggohUVuU0bmE0i2wUgGWS1qUqqCNV9lUwYnhxU04OymrMeWpVTtKpk3MR6E+iQIi1i12w=="; }; buildInputs = globalBuildInputs; meta = { @@ -73830,7 +73839,7 @@ in sources."type-fest-0.21.3" sources."typescript-4.5.5" sources."universalify-2.0.0" - sources."url-parse-1.5.7" + sources."url-parse-1.5.9" sources."url-template-2.0.8" sources."util-deprecate-1.0.2" sources."uuid-8.3.2" @@ -76008,7 +76017,7 @@ in ]; }) sources."url-0.10.3" - sources."url-parse-1.5.7" + sources."url-parse-1.5.9" sources."url-value-parser-2.1.0" sources."utils-merge-1.0.1" sources."uuid-8.1.0" @@ -78958,10 +78967,10 @@ in balanceofsatoshis = nodeEnv.buildNodePackage { name = "balanceofsatoshis"; packageName = "balanceofsatoshis"; - version = "11.53.6"; + version = "11.53.7"; src = fetchurl { - url = "https://registry.npmjs.org/balanceofsatoshis/-/balanceofsatoshis-11.53.6.tgz"; - sha512 = "5ixQmBCFYSCjyW0dMPrCfBFygmlrHjHbcBWsmRQsHwnupe7smQUFP3T5PkzHAyO5VQyWTsFTJsJ9V6+REdGjzw=="; + url = "https://registry.npmjs.org/balanceofsatoshis/-/balanceofsatoshis-11.53.7.tgz"; + sha512 = "ZvKd1pri9FOVt59imBWNLoY8GfP4Mld1Ci9SHFZF6VesRnkxYDvmnj+bNfCw9KDj/7EvkwlDM4PluN6YoDc67w=="; }; dependencies = [ (sources."@alexbosworth/caporal-1.4.0" // { @@ -82088,10 +82097,10 @@ in cdk8s-cli = nodeEnv.buildNodePackage { name = "cdk8s-cli"; packageName = "cdk8s-cli"; - version = "1.0.102"; + version = "1.0.104"; src = fetchurl { - url = "https://registry.npmjs.org/cdk8s-cli/-/cdk8s-cli-1.0.102.tgz"; - sha512 = "rOtaUXYtiW143Cgh8knV0Xkd7yNTqwvu+jqrUTycXAT8vZYL2ytbCkeAT09Knn3WCtVHUbkwSAnzOli8zNZIcA=="; + url = "https://registry.npmjs.org/cdk8s-cli/-/cdk8s-cli-1.0.104.tgz"; + sha512 = "/JiR7ynoMTH8G3efHuzvdpWI2VX+3W2XRRWOILoSLquV97o4g2P9QD1ElpgLRysOarcxHHfb3hvbYSUAI6OYug=="; }; dependencies = [ sources."@jsii/check-node-1.54.0" @@ -82110,8 +82119,8 @@ in sources."call-bind-1.0.2" sources."camelcase-6.3.0" sources."case-1.6.3" - sources."cdk8s-1.5.20" - sources."cdk8s-plus-22-1.0.0-beta.121" + sources."cdk8s-1.5.22" + sources."cdk8s-plus-22-1.0.0-beta.123" sources."chalk-4.1.2" sources."cliui-7.0.4" sources."clone-2.1.2" @@ -82124,7 +82133,7 @@ in sources."color-name-1.1.4" sources."colors-1.4.0" sources."commonmark-0.30.0" - sources."constructs-3.3.221" + sources."constructs-3.3.223" sources."date-format-4.0.3" sources."debug-4.3.3" sources."decamelize-5.0.1" @@ -82211,14 +82220,14 @@ in sources."yargs-16.2.0" ]; }) - (sources."jsii-srcmak-0.1.480" // { + (sources."jsii-srcmak-0.1.482" // { dependencies = [ sources."fs-extra-9.1.0" ]; }) sources."json-schema-0.4.0" sources."json-schema-traverse-1.0.0" - sources."json2jsii-0.2.140" + sources."json2jsii-0.2.142" sources."jsonfile-6.1.0" sources."jsonschema-1.4.0" sources."locate-path-5.0.0" @@ -82262,7 +82271,7 @@ in sources."snake-case-3.0.4" sources."sort-json-2.0.1" sources."spdx-license-list-6.4.0" - sources."sscaff-1.2.206" + sources."sscaff-1.2.208" (sources."streamroller-3.0.2" // { dependencies = [ sources."fs-extra-10.0.0" @@ -82372,7 +82381,7 @@ in sources."combined-stream-1.0.8" sources."commonmark-0.30.0" sources."concat-map-0.0.1" - sources."constructs-10.0.66" + sources."constructs-10.0.68" sources."date-format-4.0.3" sources."debug-4.3.3" sources."decamelize-1.2.0" @@ -82509,7 +82518,7 @@ in sources."yargs-parser-20.2.9" ]; }) - (sources."jsii-srcmak-0.1.480" // { + (sources."jsii-srcmak-0.1.482" // { dependencies = [ sources."fs-extra-9.1.0" sources."jsonfile-6.1.0" @@ -82966,10 +82975,10 @@ in coc-explorer = nodeEnv.buildNodePackage { name = "coc-explorer"; packageName = "coc-explorer"; - version = "0.22.6"; + version = "0.22.7"; src = fetchurl { - url = "https://registry.npmjs.org/coc-explorer/-/coc-explorer-0.22.6.tgz"; - sha512 = "EHCWYn3aXttvkbfV1svUgbwoyC1t0LW/K05txNyoMygYtp1qGW2cl/Ro9h0qE7l2FZIgJ8vM1JW8d3az1dsgBw=="; + url = "https://registry.npmjs.org/coc-explorer/-/coc-explorer-0.22.7.tgz"; + sha512 = "GVDG9GbqbeZOXrU0gChJP5eFv29vbcV6QudUNq/fVSWLLV/wZPREoxYQCM4hWEreDPDfB/fkSddOEJHoF4F+Vg=="; }; dependencies = [ sources."@sindresorhus/df-3.1.1" @@ -83457,10 +83466,10 @@ in coc-prettier = nodeEnv.buildNodePackage { name = "coc-prettier"; packageName = "coc-prettier"; - version = "9.2.1"; + version = "9.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/coc-prettier/-/coc-prettier-9.2.1.tgz"; - sha512 = "SsPPkZf82fEkiISWC5JJbf5JvfBe7nBPPxAXPSXx8J9Wql8O9ZAx9oiLF7jmnwjGlRpaGkazf6LW2IEVYrXPZA=="; + url = "https://registry.npmjs.org/coc-prettier/-/coc-prettier-9.2.2.tgz"; + sha512 = "0GjqQhdKO/5auaoZVnnUbgf1eyxfBcTmHJ7jj0eApzVCYwMLcXk52HVMfDSUpeB1ySEzhwQrxBbGZZyStdISjQ=="; }; dependencies = [ sources."prettier-2.5.1" @@ -83484,7 +83493,7 @@ in sha512 = "M0GVuo8jgQxI/YqkExByeAkjwEvu8uqGicYD4zRctxU/THd1CQUvIWWFDKB1a7co8sCntZlMnhqqxAF4CLyYQw=="; }; dependencies = [ - sources."pyright-1.1.222" + sources."pyright-1.1.223" ]; buildInputs = globalBuildInputs; meta = { @@ -84402,10 +84411,10 @@ in coc-yaml = nodeEnv.buildNodePackage { name = "coc-yaml"; packageName = "coc-yaml"; - version = "1.7.2"; + version = "1.7.4"; src = fetchurl { - url = "https://registry.npmjs.org/coc-yaml/-/coc-yaml-1.7.2.tgz"; - sha512 = "cYW24Fis8CUw2m7YDoe+49f8vkUCxvKJ0HK6lruU40nIvW4HRSByZX55zNRppQmtgDEb9h7Pnp9/tZHa85N0pA=="; + url = "https://registry.npmjs.org/coc-yaml/-/coc-yaml-1.7.4.tgz"; + sha512 = "fmn+qsWUwVTIxoAv0gH4rNZJKXmUZoaOpxomMzJJrQo0PN31cMXZzD55IV0eudk5VLos4ARUBhtsdcxBUfQ15w=="; }; dependencies = [ sources."prettier-2.0.5" @@ -85526,7 +85535,7 @@ in sources."strip-json-comments-2.0.1" sources."supports-color-7.2.0" sources."supports-preserve-symlinks-flag-1.0.0" - sources."systeminformation-5.11.3" + sources."systeminformation-5.11.4" sources."tar-6.1.11" sources."through-2.3.8" sources."tmp-0.2.1" @@ -87778,7 +87787,7 @@ in }) sources."upath-1.2.0" sources."urix-0.1.0" - sources."url-parse-1.5.7" + sources."url-parse-1.5.9" sources."url-parse-lax-3.0.0" sources."use-3.1.1" sources."use-debounce-3.4.3" @@ -92921,7 +92930,7 @@ in }) sources."url-join-4.0.0" sources."url-loader-4.1.1" - sources."url-parse-1.5.7" + sources."url-parse-1.5.9" (sources."url-parse-lax-3.0.0" // { dependencies = [ sources."prepend-http-2.0.0" @@ -93186,7 +93195,7 @@ in sources."@jridgewell/sourcemap-codec-1.4.11" sources."@jridgewell/trace-mapping-0.3.4" sources."@types/minimist-1.2.2" - sources."@types/node-17.0.18" + sources."@types/node-17.0.19" sources."@types/normalize-package-data-2.4.1" sources."@types/yauzl-2.9.2" sources."@types/yoga-layout-1.9.2" @@ -93864,7 +93873,7 @@ in sources."@types/duplexify-3.6.1" sources."@types/json-schema-7.0.9" sources."@types/long-4.0.1" - sources."@types/node-17.0.18" + sources."@types/node-17.0.19" sources."abbrev-1.1.1" sources."abort-controller-3.0.0" sources."accepts-1.3.8" @@ -94946,7 +94955,7 @@ in sources."@types/atob-2.1.2" sources."@types/bn.js-5.1.0" sources."@types/inquirer-6.5.0" - sources."@types/node-17.0.18" + sources."@types/node-17.0.19" sources."@types/pbkdf2-3.1.0" sources."@types/secp256k1-4.0.3" sources."@types/through-0.0.30" @@ -95753,7 +95762,7 @@ in sources."@types/common-tags-1.8.1" sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.3" - sources."@types/node-17.0.18" + sources."@types/node-17.0.19" sources."@types/node-fetch-2.6.1" sources."@types/responselike-1.0.0" sources."@types/yoga-layout-1.9.2" @@ -96620,7 +96629,7 @@ in sources."@types/cacheable-request-6.0.2" sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.3" - sources."@types/node-17.0.18" + sources."@types/node-17.0.19" sources."@types/responselike-1.0.0" sources."ansi-regex-6.0.1" sources."ansi-styles-4.3.0" @@ -96683,7 +96692,11 @@ in sources."object-inspect-1.12.0" sources."once-1.4.0" sources."onetime-5.1.2" - sources."ora-6.0.1" + (sources."ora-6.1.0" // { + dependencies = [ + sources."chalk-5.0.0" + ]; + }) sources."p-cancelable-2.1.1" sources."pump-3.0.0" sources."qs-6.10.3" @@ -97376,7 +97389,7 @@ in sources."@nodelib/fs.walk-1.2.8" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" - sources."@types/node-17.0.18" + sources."@types/node-17.0.19" sources."@types/parse-json-4.0.0" sources."@types/websocket-1.0.2" sources."abort-controller-3.0.0" @@ -97917,7 +97930,7 @@ in }) sources."@oclif/screen-1.0.4" sources."@types/json-schema-7.0.9" - sources."@types/node-17.0.18" + sources."@types/node-17.0.19" sources."@types/parse-json-4.0.0" sources."@types/websocket-1.0.5" sources."@types/ws-8.2.3" @@ -98044,7 +98057,7 @@ in sources."graphql-language-service-types-1.8.7" sources."graphql-language-service-utils-2.5.1" sources."graphql-sse-1.0.6" - sources."graphql-ws-5.5.5" + sources."graphql-ws-5.6.0" sources."has-flag-4.0.0" sources."http-errors-1.6.3" sources."hyperlinker-1.0.0" @@ -98509,7 +98522,7 @@ in sources."supports-color-7.2.0" ]; }) - sources."systeminformation-5.11.3" + sources."systeminformation-5.11.4" sources."term-canvas-0.0.5" sources."type-fest-1.4.0" sources."wordwrap-0.0.3" @@ -100845,30 +100858,21 @@ in bypassCache = true; reconstructLock = true; }; - "iosevka-https://github.com/be5invis/Iosevka/archive/v11.0.1.tar.gz" = nodeEnv.buildNodePackage { + "iosevka-https://github.com/be5invis/Iosevka/archive/v14.0.1.tar.gz" = nodeEnv.buildNodePackage { name = "iosevka"; packageName = "iosevka"; - version = "11.0.1"; + version = "14.0.1"; src = fetchurl { - name = "iosevka-11.0.1.tar.gz"; - url = "https://codeload.github.com/be5invis/Iosevka/tar.gz/refs/tags/v11.0.1"; - sha256 = "5f19c33cf90a4d4b0e6b14aa5866a81fa724042e934811b618d5f4e74e310043"; + name = "iosevka-14.0.1.tar.gz"; + url = "https://codeload.github.com/be5invis/Iosevka/tar.gz/refs/tags/v14.0.1"; + sha256 = "f17c312d63df74a34f3a72b52f4ceff39e708a6ba674e5605bcadbf7e1e2c2f7"; }; dependencies = [ sources."@iarna/toml-2.2.5" sources."@msgpack/msgpack-2.7.2" sources."@ot-builder/bin-composite-types-1.3.3" sources."@ot-builder/bin-util-1.3.3" - (sources."@ot-builder/cli-help-shower-1.3.3" // { - dependencies = [ - sources."ansi-styles-4.3.0" - sources."chalk-4.1.2" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."has-flag-4.0.0" - sources."supports-color-7.2.0" - ]; - }) + sources."@ot-builder/cli-help-shower-1.3.3" sources."@ot-builder/cli-proc-1.3.3" sources."@ot-builder/cli-shared-1.3.3" sources."@ot-builder/common-impl-1.3.3" @@ -100902,34 +100906,24 @@ in sources."@ot-builder/trace-1.3.3" sources."@ot-builder/var-store-1.3.3" sources."@ot-builder/variance-1.3.3" - sources."@unicode/unicode-13.0.0-1.2.1" + sources."@unicode/unicode-14.0.0-1.2.1" sources."@xmldom/xmldom-0.7.5" sources."aglfn-1.0.2" sources."amdefine-1.0.1" sources."ansi-regex-5.0.1" - sources."ansi-styles-3.2.1" + sources."ansi-styles-4.3.0" sources."argparse-2.0.1" - sources."async-0.9.2" - sources."atob-2.1.2" - sources."balanced-match-1.0.2" - sources."brace-expansion-1.1.11" sources."chainsaw-0.0.9" - sources."chalk-2.4.2" + sources."chalk-4.1.2" sources."cldr-7.1.1" sources."cli-cursor-3.1.0" sources."clipper-lib-6.4.2" sources."cliui-7.0.4" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" - sources."concat-map-0.0.1" - sources."css-3.0.0" - sources."debug-3.1.0" - sources."decode-uri-component-0.2.0" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" sources."deep-is-0.1.4" - sources."ejs-3.1.6" sources."emoji-regex-8.0.0" sources."escalade-3.1.1" - sources."escape-string-regexp-1.0.5" sources."escodegen-2.0.0" (sources."escope-1.0.3" // { dependencies = [ @@ -100958,37 +100952,26 @@ in sources."esutils-2.0.3" sources."fast-deep-equal-3.1.3" sources."fast-levenshtein-2.0.6" - sources."filelist-1.0.2" sources."fs-extra-10.0.0" - sources."fs.realpath-1.0.0" sources."get-caller-file-2.0.5" - sources."glob-7.2.0" sources."graceful-fs-4.2.9" - sources."has-flag-3.0.0" + sources."has-flag-4.0.0" sources."hashish-0.0.4" sources."iconv-lite-0.6.3" - sources."inflight-1.0.6" - sources."inherits-2.0.4" sources."is-fullwidth-code-point-3.0.0" sources."isexe-2.0.0" - sources."jake-10.8.2" sources."jsonfile-6.1.0" sources."levn-0.3.0" sources."lru-cache-2.5.0" sources."memoizeasync-1.1.0" sources."mimic-fn-2.1.0" - sources."minimatch-3.1.2" - sources."mkdirp-1.0.4" - sources."ms-2.0.0" - sources."once-1.4.0" sources."onetime-5.1.2" sources."optionator-0.8.3" sources."ot-builder-1.3.3" sources."otb-ttc-bundle-1.3.3" sources."passerror-1.1.1" - sources."patel-0.35.1" - sources."path-is-absolute-1.0.1" - sources."patrisika-0.23.0" + sources."patel-0.37.1" + sources."patrisika-0.24.0" sources."patrisika-scopes-0.12.0" sources."pegjs-0.10.0" sources."prelude-ls-1.1.2" @@ -100996,7 +100979,6 @@ in sources."restore-cursor-3.1.0" sources."resumer-0.0.0" sources."safer-buffer-2.1.2" - sources."sax-1.2.4" sources."semaphore-async-await-1.5.1" (sources."semver-7.3.5" // { dependencies = [ @@ -101006,17 +100988,10 @@ in sources."seq-0.3.5" sources."signal-exit-3.0.7" sources."source-map-0.6.1" - sources."source-map-resolve-0.6.0" sources."spiro-3.0.0" sources."string-width-4.2.3" sources."strip-ansi-6.0.1" - (sources."stylus-0.55.0" // { - dependencies = [ - sources."semver-6.3.0" - sources."source-map-0.7.3" - ]; - }) - sources."supports-color-5.5.0" + sources."supports-color-7.2.0" sources."through-2.3.8" sources."toposort-2.0.2" sources."traverse-0.3.9" @@ -101027,12 +101002,6 @@ in sources."universalify-2.0.0" (sources."verda-1.5.0" // { dependencies = [ - sources."ansi-styles-4.3.0" - sources."chalk-4.1.2" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."has-flag-4.0.0" - sources."supports-color-7.2.0" sources."yargs-17.3.1" sources."yargs-parser-21.0.0" ]; @@ -101041,14 +101010,7 @@ in sources."which-2.0.2" sources."word-wrap-1.2.3" sources."wordwrap-0.0.3" - (sources."wrap-ansi-7.0.0" // { - dependencies = [ - sources."ansi-styles-4.3.0" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - ]; - }) - sources."wrappy-1.0.2" + sources."wrap-ansi-7.0.0" sources."xpath-0.0.32" sources."y18n-5.0.8" sources."yallist-4.0.0" @@ -102014,7 +101976,7 @@ in sources."punycode-1.3.2" ]; }) - sources."url-parse-1.5.7" + sources."url-parse-1.5.9" sources."uslug-git+https://github.com/laurent22/uslug.git#emoji-support" sources."util-deprecate-1.0.2" sources."uuid-3.4.0" @@ -103436,7 +103398,7 @@ in sources."@types/component-emitter-1.2.11" sources."@types/cookie-0.4.1" sources."@types/cors-2.8.12" - sources."@types/node-17.0.18" + sources."@types/node-17.0.19" sources."accepts-1.3.8" sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" @@ -106425,7 +106387,7 @@ in sources."@types/istanbul-lib-report-3.0.0" sources."@types/istanbul-reports-1.1.2" sources."@types/json-schema-7.0.9" - sources."@types/node-17.0.18" + sources."@types/node-17.0.19" sources."@types/normalize-package-data-2.4.1" sources."@types/resolve-0.0.8" sources."@types/yargs-15.0.14" @@ -107459,7 +107421,7 @@ in sources."@types/commander-2.12.2" sources."@types/diff-3.5.5" sources."@types/get-stdin-5.0.1" - sources."@types/node-17.0.18" + sources."@types/node-17.0.19" sources."commander-2.20.3" sources."diff-3.5.0" sources."get-stdin-5.0.1" @@ -108326,7 +108288,7 @@ in }; dependencies = [ sources."@braintree/sanitize-url-3.1.0" - sources."@types/node-17.0.18" + sources."@types/node-17.0.19" sources."@types/yauzl-2.9.2" sources."agent-base-6.0.2" sources."ansi-styles-4.3.0" @@ -108801,7 +108763,7 @@ in sources."@types/istanbul-lib-coverage-2.0.4" sources."@types/istanbul-lib-report-3.0.0" sources."@types/istanbul-reports-3.0.1" - sources."@types/node-17.0.18" + sources."@types/node-17.0.19" sources."@types/stack-utils-2.0.1" sources."@types/yargs-16.0.4" sources."@types/yargs-parser-20.2.1" @@ -109739,7 +109701,7 @@ in sources."@types/cacheable-request-6.0.2" sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.3" - sources."@types/node-17.0.18" + sources."@types/node-17.0.19" sources."@types/responselike-1.0.0" sources."abbrev-1.1.1" sources."accepts-1.3.8" @@ -110492,7 +110454,7 @@ in sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.3" sources."@types/minimist-1.2.2" - sources."@types/node-17.0.18" + sources."@types/node-17.0.19" sources."@types/normalize-package-data-2.4.1" sources."@types/parse-json-4.0.0" sources."@types/responselike-1.0.0" @@ -111004,10 +110966,10 @@ in npm-check-updates = nodeEnv.buildNodePackage { name = "npm-check-updates"; packageName = "npm-check-updates"; - version = "12.3.1"; + version = "12.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-12.3.1.tgz"; - sha512 = "rvXyiUnc9zw3WXakqv0LsdFDc1V4T8DHG8AdWEjJiqfOZdBI4q8ekTt/BFqLQAtcXo5Pu6WGqjA9oDnFi4UV3g=="; + url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-12.4.0.tgz"; + sha512 = "X14H74M8SVFkStmP1NDOMh0OjLB3mU2dwUeM71zyITJHkm08MASwwTcydW6YuGcNW1RUlVq1cQY2yWijv4zKUQ=="; }; dependencies = [ sources."@gar/promisify-1.1.3" @@ -114093,7 +114055,7 @@ in sources."string_decoder-0.10.31" sources."supports-color-7.2.0" sources."supports-preserve-symlinks-flag-1.0.0" - sources."systeminformation-5.11.3" + sources."systeminformation-5.11.4" sources."to-regex-range-5.0.1" sources."toidentifier-1.0.1" sources."tslib-2.3.1" @@ -114953,10 +114915,10 @@ in pyright = nodeEnv.buildNodePackage { name = "pyright"; packageName = "pyright"; - version = "1.1.222"; + version = "1.1.223"; src = fetchurl { - url = "https://registry.npmjs.org/pyright/-/pyright-1.1.222.tgz"; - sha512 = "zEQyvkQa/hUmjg5A7COOzE/uL3W6D/Fp6qjhE+HDeLKwe+zm1KSMo74djIn0CTzhK53bmEDgEIR1hoMpA/Is/w=="; + url = "https://registry.npmjs.org/pyright/-/pyright-1.1.223.tgz"; + sha512 = "EGLKMQRmSkKNe/eDy6MEkqq5lF91C5MCMYxvmCgKGUjZHIa+HByJIiRY2cOTm7g2CAv0eE7Ift701VxLM5Q0iQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -115454,7 +115416,7 @@ in sources."@types/glob-7.2.0" sources."@types/json-schema-7.0.9" sources."@types/minimatch-3.0.5" - sources."@types/node-17.0.18" + sources."@types/node-17.0.19" sources."@types/parse-json-4.0.0" sources."@types/q-1.5.5" sources."@webassemblyjs/ast-1.9.0" @@ -116936,7 +116898,7 @@ in ]; }) sources."url-loader-2.3.0" - sources."url-parse-1.5.7" + sources."url-parse-1.5.9" sources."url-parse-lax-3.0.0" sources."url-to-options-1.0.1" sources."use-3.1.1" @@ -118116,7 +118078,7 @@ in sources."array-union-2.1.0" sources."astral-regex-2.0.0" sources."asynckit-0.4.0" - sources."azure-devops-node-api-11.1.0" + sources."azure-devops-node-api-11.1.1" sources."balanced-match-1.0.2" sources."base64-js-1.5.1" sources."big-integer-1.6.51" @@ -118895,7 +118857,7 @@ in sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.3" sources."@types/lodash-4.14.178" - sources."@types/node-17.0.18" + sources."@types/node-17.0.19" sources."@types/responselike-1.0.0" sources."adm-zip-0.5.9" sources."agent-base-6.0.2" @@ -120015,7 +119977,7 @@ in sources."@types/component-emitter-1.2.11" sources."@types/cookie-0.4.1" sources."@types/cors-2.8.12" - sources."@types/node-17.0.18" + sources."@types/node-17.0.19" sources."accepts-1.3.8" sources."base64id-2.0.0" sources."component-emitter-1.3.0" @@ -120136,7 +120098,11 @@ in sources."ms-2.0.0" sources."normalize-package-data-3.0.3" sources."onetime-5.1.2" - sources."ora-6.0.1" + (sources."ora-6.1.0" // { + dependencies = [ + sources."chalk-5.0.0" + ]; + }) sources."p-limit-3.1.0" sources."p-locate-5.0.0" sources."parse-json-5.2.0" @@ -121128,7 +121094,7 @@ in }) sources."untildify-2.1.0" sources."urix-0.1.0" - sources."url-parse-1.5.7" + sources."url-parse-1.5.9" sources."use-3.1.1" sources."user-home-2.0.0" sources."utf8-byte-length-1.0.4" @@ -122388,7 +122354,7 @@ in sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@types/node-17.0.18" + sources."@types/node-17.0.19" sources."@types/pug-2.0.6" sources."@types/sass-1.43.1" sources."anymatch-3.1.2" @@ -122473,7 +122439,7 @@ in sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@types/node-17.0.18" + sources."@types/node-17.0.19" sources."@types/pug-2.0.6" sources."@types/sass-1.43.1" sources."anymatch-3.1.2" @@ -124689,7 +124655,7 @@ in sources."@types/cors-2.8.12" sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.3" - sources."@types/node-17.0.18" + sources."@types/node-17.0.19" sources."@types/responselike-1.0.0" sources."abbrev-1.1.1" sources."abstract-logging-2.0.1" @@ -125162,7 +125128,7 @@ in sources."@types/cors-2.8.12" sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.3" - sources."@types/node-17.0.18" + sources."@types/node-17.0.19" sources."@types/responselike-1.0.0" sources."abbrev-1.1.1" sources."abstract-logging-2.0.1" @@ -126304,7 +126270,7 @@ in sources."@types/cacheable-request-6.0.2" sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.3" - sources."@types/node-17.0.18" + sources."@types/node-17.0.19" sources."@types/responselike-1.0.0" sources."abbrev-1.1.1" sources."abstract-logging-2.0.1" @@ -126769,7 +126735,7 @@ in sources."@types/cacheable-request-6.0.2" sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.3" - sources."@types/node-17.0.18" + sources."@types/node-17.0.19" sources."@types/responselike-1.0.0" sources."abbrev-1.1.1" sources."abstract-logging-2.0.1" @@ -128503,7 +128469,7 @@ in sources."@types/is-empty-1.2.1" sources."@types/js-yaml-4.0.5" sources."@types/ms-0.7.31" - sources."@types/node-17.0.18" + sources."@types/node-17.0.19" sources."@types/supports-color-8.1.1" sources."@types/unist-2.0.6" sources."ansi-regex-6.0.1" @@ -128564,7 +128530,7 @@ in sources."strip-ansi-7.0.1" sources."supports-color-5.5.0" sources."to-vfile-7.2.3" - sources."trough-2.0.2" + sources."trough-2.1.0" sources."typedarray-0.0.6" sources."unified-engine-9.0.5" sources."unist-util-inspect-7.0.0" @@ -128813,7 +128779,7 @@ in dependencies = [ sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" - sources."@types/node-17.0.18" + sources."@types/node-17.0.19" sources."@vercel/build-utils-2.14.0" sources."@vercel/go-1.3.0" sources."@vercel/node-1.13.0" @@ -130015,7 +129981,7 @@ in sources."@starptech/rehype-webparser-0.10.0" sources."@starptech/webparser-0.10.0" sources."@szmarczak/http-timer-1.1.2" - sources."@types/node-17.0.18" + sources."@types/node-17.0.19" sources."@types/unist-2.0.6" sources."@types/vfile-3.0.2" sources."@types/vfile-message-2.0.0" @@ -131177,7 +131143,7 @@ in sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" sources."@types/minimatch-3.0.5" - sources."@types/node-17.0.18" + sources."@types/node-17.0.19" sources."@types/yauzl-2.9.2" sources."acorn-8.7.0" sources."acorn-jsx-5.3.2" @@ -131702,7 +131668,7 @@ in sources."@types/eslint-scope-3.7.3" sources."@types/estree-0.0.51" sources."@types/json-schema-7.0.9" - sources."@types/node-17.0.18" + sources."@types/node-17.0.19" sources."@webassemblyjs/ast-1.11.1" sources."@webassemblyjs/floating-point-hex-parser-1.11.1" sources."@webassemblyjs/helper-api-error-1.11.1" @@ -131875,7 +131841,7 @@ in sources."@types/http-proxy-1.17.8" sources."@types/json-schema-7.0.9" sources."@types/mime-1.3.2" - sources."@types/node-17.0.18" + sources."@types/node-17.0.19" sources."@types/qs-6.9.7" sources."@types/range-parser-1.2.4" sources."@types/retry-0.12.1" @@ -132232,7 +132198,7 @@ in sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" sources."@types/long-4.0.1" - sources."@types/node-17.0.18" + sources."@types/node-17.0.19" sources."@webtorrent/http-node-1.3.0" sources."addr-to-ip-port-1.5.4" sources."airplay-js-0.3.0" @@ -133685,7 +133651,7 @@ in sources."@nodelib/fs.walk-1.2.8" sources."@types/fs-extra-9.0.13" sources."@types/minimist-1.2.2" - sources."@types/node-17.0.18" + sources."@types/node-17.0.19" sources."braces-3.0.2" sources."chalk-5.0.0" sources."data-uri-to-buffer-4.0.0" diff --git a/pkgs/development/python-modules/augmax/default.nix b/pkgs/development/python-modules/augmax/default.nix new file mode 100644 index 000000000000..cda3ff5fbcd2 --- /dev/null +++ b/pkgs/development/python-modules/augmax/default.nix @@ -0,0 +1,36 @@ +{ buildPythonPackage +, einops +, fetchFromGitHub +, jax +, jaxlib +, lib +}: + +buildPythonPackage rec { + pname = "augmax"; + version = "unstable-2022-02-19"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "khdlr"; + repo = pname; + # augmax does not have releases tagged. See https://github.com/khdlr/augmax/issues/5. + rev = "3e5d85d6921a1e519987d33f226bc13f61e04d04"; + sha256 = "046n43v7161w7najzlbi0443q60436xv24nh1mv23yw6psqqhx5i"; + }; + + propagatedBuildInputs = [ einops jax ]; + + # augmax does not have any tests at the time of writing (2022-02-19), but + # jaxlib is necessary for the pythonImportsCheckPhase. + checkInputs = [ jaxlib ]; + + pythonImportsCheck = [ "augmax" ]; + + meta = with lib; { + description = "Efficiently Composable Data Augmentation on the GPU with Jax"; + homepage = "https://github.com/khdlr/augmax"; + license = licenses.asl20; + maintainers = with maintainers; [ samuela ]; + }; +} diff --git a/pkgs/development/python-modules/pywayland/default.nix b/pkgs/development/python-modules/pywayland/default.nix index c115174b6e45..5be704233909 100644 --- a/pkgs/development/python-modules/pywayland/default.nix +++ b/pkgs/development/python-modules/pywayland/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "pywayland"; - version = "0.4.10"; + version = "0.4.11"; src = fetchPypi { inherit pname version; - sha256 = "sha256-3fVAJXiIS6sFUj8riHg7LJ4VLLpjZEK8qTJNYSaXtOw="; + sha256 = "coUNrPcHLBDamgKiZ08ysg2maQ2wLRSijfNRblKMIZk="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/tools/cmake-language-server/default.nix b/pkgs/development/tools/cmake-language-server/default.nix index 663e0a5b66f1..f50afcd4669f 100644 --- a/pkgs/development/tools/cmake-language-server/default.nix +++ b/pkgs/development/tools/cmake-language-server/default.nix @@ -26,6 +26,11 @@ buildPythonApplication rec { ./disable-test-timeouts.patch ]; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'pyparsing = "^2.4"' 'pyparsing = "^3.0.6"' + ''; + nativeBuildInputs = [ poetry ]; propagatedBuildInputs = [ pygls pyparsing ]; diff --git a/pkgs/development/tools/rust/cargo-expand/default.nix b/pkgs/development/tools/rust/cargo-expand/default.nix index b2a0c3fad4df..860d53717098 100644 --- a/pkgs/development/tools/rust/cargo-expand/default.nix +++ b/pkgs/development/tools/rust/cargo-expand/default.nix @@ -1,17 +1,22 @@ -{ lib, rustPlatform, fetchFromGitHub, stdenv, libiconv }: +{ lib +, stdenv +, rustPlatform +, fetchFromGitHub +, libiconv +}: rustPlatform.buildRustPackage rec { pname = "cargo-expand"; - version = "1.0.14"; + version = "1.0.16"; src = fetchFromGitHub { owner = "dtolnay"; repo = pname; rev = version; - sha256 = "sha256-6Wm/qnrSUswWnXt6CPUJUvqNj06eSYuYOmGhbpO1hvo="; + sha256 = "sha256-NhBUN+pf+j/4IozFDEb+XZ1ijSk6dNvCANyez823a0c="; }; - cargoSha256 = "sha256-1+3NMfUhL5sPu92r+B0DRmJ03ZREkFZHjMjvabLyFgs="; + cargoSha256 = "sha256-7rqtxyoo1SQ7Rae04+b+B0JgCKeW0p1j7bZzPpJ8+ks="; buildInputs = lib.optional stdenv.isDarwin libiconv; diff --git a/pkgs/misc/drivers/xboxdrv/default.nix b/pkgs/misc/drivers/xboxdrv/default.nix index 72c342e7b6a9..f81e81ecbea0 100644 --- a/pkgs/misc/drivers/xboxdrv/default.nix +++ b/pkgs/misc/drivers/xboxdrv/default.nix @@ -1,7 +1,7 @@ { lib , stdenv , fetchFromGitHub -, sconsPackages +, scons , libX11 , pkg-config , libusb1 @@ -22,10 +22,18 @@ stdenv.mkDerivation rec { }; makeFlags = [ "PREFIX=$(out)" ]; - nativeBuildInputs = [ pkg-config sconsPackages.scons_3_1_2 ]; + nativeBuildInputs = [ pkg-config scons ]; buildInputs = [ libX11 libusb1 boost glib dbus-glib ]; + enableParallelBuilding = true; dontUseSconsInstall = true; + patches = [ + ./fix-60-sec-delay.patch + ./scons-py3.patch + ./scons-v4.2.0.patch + ./xboxdrvctl-py3.patch + ]; + meta = with lib; { homepage = "https://xboxdrv.gitlab.io/"; description = "Xbox/Xbox360 (and more) gamepad driver for Linux that works in userspace"; diff --git a/pkgs/misc/drivers/xboxdrv/fix-60-sec-delay.patch b/pkgs/misc/drivers/xboxdrv/fix-60-sec-delay.patch new file mode 100644 index 000000000000..da543d2cfa01 --- /dev/null +++ b/pkgs/misc/drivers/xboxdrv/fix-60-sec-delay.patch @@ -0,0 +1,27 @@ +From 7326421eeaadbc2aeb3828628c2e65bb7be323a9 Mon Sep 17 00:00:00 2001 +From: buxit +Date: Wed, 2 Nov 2016 16:25:14 +0100 +Subject: [PATCH] fix 60 seconds delay + +use `libusb_handle_events_timeout_completed()` instead of `libusb_handle_events()` +should fix #144 +--- + src/usb_gsource.cpp | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/src/usb_gsource.cpp b/src/usb_gsource.cpp +index 00bf1315..afb38f65 100644 +--- a/src/usb_gsource.cpp ++++ b/src/usb_gsource.cpp +@@ -174,7 +174,10 @@ USBGSource::on_source_dispatch(GSource* source, GSourceFunc callback, gpointer u + gboolean + USBGSource::on_source() + { +- libusb_handle_events(NULL); ++ struct timeval to; ++ to.tv_sec = 0; ++ to.tv_usec = 0; ++ libusb_handle_events_timeout_completed(NULL, &to, NULL); + return TRUE; + } + diff --git a/pkgs/misc/drivers/xboxdrv/scons-py3.patch b/pkgs/misc/drivers/xboxdrv/scons-py3.patch new file mode 100644 index 000000000000..4aa6fa619317 --- /dev/null +++ b/pkgs/misc/drivers/xboxdrv/scons-py3.patch @@ -0,0 +1,63 @@ +From 17bd43a7d3ef86216abc36b42b4e6a1f70aa9979 Mon Sep 17 00:00:00 2001 +From: xnick +Date: Thu, 12 Oct 2017 20:34:35 +0300 +Subject: [PATCH] Update SConstruct + +python3 compatible +--- + SConstruct | 16 ++++++++-------- + 1 file changed, 8 insertions(+), 8 deletions(-) + +diff --git a/SConstruct b/SConstruct +index 4cd79704..c0007054 100644 +--- a/SConstruct ++++ b/SConstruct +@@ -19,7 +19,7 @@ def build_dbus_glue(target, source, env): + xml = re.sub(r"callback = \(([A-Za-z_]+)\) \(marshal_data \? marshal_data : cc->callback\);", + r"union { \1 fn; void* obj; } conv;\n " + "conv.obj = (marshal_data ? marshal_data : cc->callback);\n " +- "callback = conv.fn;", xml) ++ "callback = conv.fn;", xml.decode('utf-8')) + + with open(target[0].get_path(), "w") as f: + f.write(xml) +@@ -29,10 +29,10 @@ def build_bin2h(target, source, env): + Takes a list of files and converts them into a C source that can be included + """ + def c_escape(str): +- return str.translate(string.maketrans("/.-", "___")) ++ return str.translate(bytes.maketrans(b"/.-", b"___")) + +- print target +- print source ++ print(target) ++ print(source) + with open(target[0].get_path(), "w") as fout: + fout.write("// autogenerated by scons Bin2H builder, do not edit by hand!\n\n") + +@@ -45,8 +45,8 @@ def build_bin2h(target, source, env): + data = fin.read() + fout.write("// \"%s\"\n" % src.get_path()) + fout.write("const char %s[] = {" % c_escape(src.get_path())) +- bytes_arr = ["0x%02x" % ord(c) for c in data] +- for i in xrange(len(bytes_arr)): ++ bytes_arr = ["0x%02x" % c for c in data] ++ for i in range(len(bytes_arr)): + if i % 13 == 0: + fout.write("\n ") + fout.write(bytes_arr[i]) +@@ -131,12 +131,12 @@ env.Append(CPPDEFINES = { 'PACKAGE_VERSION': "'\"%s\"'" % package_version }) + conf = Configure(env) + + if not conf.env['CXX']: +- print "g++ must be installed!" ++ print('g++ must be installed!') + Exit(1) + + # X11 checks + if not conf.CheckLibWithHeader('X11', 'X11/Xlib.h', 'C++'): +- print 'libx11-dev must be installed!' ++ print('libx11-dev must be installed!') + Exit(1) + + env = conf.Finish() diff --git a/pkgs/misc/drivers/xboxdrv/scons-v4.2.0.patch b/pkgs/misc/drivers/xboxdrv/scons-v4.2.0.patch new file mode 100644 index 000000000000..04b05e8d6ffc --- /dev/null +++ b/pkgs/misc/drivers/xboxdrv/scons-v4.2.0.patch @@ -0,0 +1,20 @@ +--- a/SConstruct 2021-10-31 20:42:44.232084185 -0400 ++++ b/SConstruct 2021-10-31 20:42:54.063024444 -0400 +@@ -36,7 +36,7 @@ + with open(target[0].get_path(), "w") as fout: + fout.write("// autogenerated by scons Bin2H builder, do not edit by hand!\n\n") + +- if env.has_key("BIN2H_NAMESPACE"): ++ if "BIN2H_NAMESPACE" in env: + fout.write("namespace %s {\n\n" % env["BIN2H_NAMESPACE"]) + + # write down data +@@ -62,7 +62,7 @@ + for src in source], ",\n")) + fout.write("\n}\n\n") + +- if env.has_key("BIN2H_NAMESPACE"): ++ if "BIN2H_NAMESPACE" in env: + fout.write("} // namespace %s\n\n" % env["BIN2H_NAMESPACE"]) + + fout.write("/* EOF */\n") diff --git a/pkgs/misc/drivers/xboxdrv/xboxdrvctl-py3.patch b/pkgs/misc/drivers/xboxdrv/xboxdrvctl-py3.patch new file mode 100644 index 000000000000..71d8762cb9ca --- /dev/null +++ b/pkgs/misc/drivers/xboxdrv/xboxdrvctl-py3.patch @@ -0,0 +1,73 @@ +--- a/xboxdrvctl 2021-06-21 19:39:51.000000000 -0400 ++++ b/xboxdrvctl 19:43:27.467984928 -0400 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python2 ++#!/usr/bin/env python3 + + ## Xbox360 USB Gamepad Userspace Driver + ## Copyright (C) 2011 Ingo Ruhnke +@@ -37,23 +37,23 @@ + help="print controller status") + + group.add_option("-s", "--slot", metavar="SLOT", type="int", +- dest="slot", ++ dest="slot", + help="use slot SLOT for actions") + + group.add_option("-l", "--led", metavar="NUM", type="int", +- dest="led", ++ dest="led", + help="set LED") + +-group.add_option("-r", "--rumble", metavar="L:R", +- dest="rumble", ++group.add_option("-r", "--rumble", metavar="L:R", ++ dest="rumble", + help="print controller status") + + group.add_option("-c", "--config", metavar="NUM", type="int", +- dest="config", ++ dest="config", + help="switches to controller configuration NUM") + + group.add_option("--shutdown", action="store_true", +- dest="shutdown", ++ dest="shutdown", + help="shuts down the daemon") + + parser.add_option_group(group) +@@ -69,9 +69,9 @@ + try: + bus.get_object("org.seul.Xboxdrv", '/org/seul/Xboxdrv/Daemon') + except dbus.exceptions.DBusException: +- bus = dbus.SystemBus() ++ bus = dbus.SystemBus() + else: +- print "Error: invalid argument to --bus. Must be 'auto', 'session, or 'system'" ++ print("Error: invalid argument to --bus. Must be 'auto', 'session, or 'system'") + exit() + + if options.status: +@@ -82,19 +82,19 @@ + daemon.Shutdown() + else: + if (options.led or options.rumble or options.config) and options.slot == None: +- print "Error: --slot argument required" ++ print("Error: --slot argument required") + exit() + else: + if options.slot != None: + slot = bus.get_object("org.seul.Xboxdrv", '/org/seul/Xboxdrv/ControllerSlots/%d' % options.slot) +- ++ + if options.led != None: + slot.SetLed(options.led) + + if options.rumble: + m = re.match('^(\d+):(\d+)$', options.rumble) + if not m: +- print "Error: invalid argument to --rumble" ++ print("Error: invalid argument to --rumble") + exit() + else: + left = int(m.group(1)) diff --git a/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix b/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix index 4002657ad690..3964538a4096 100644 --- a/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix +++ b/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, gnugrep, findutils }: +{ lib, stdenv, fetchurl }: let version = "28-1ubuntu4"; # impish 2021-06-24 @@ -26,8 +26,8 @@ in stdenv.mkDerivation { --replace /sbin/lsmod /run/booted-system/sw/bin/lsmod \ --replace /sbin/rmmod /run/booted-system/sw/bin/rmmod \ --replace /sbin/modprobe /run/booted-system/sw/bin/modprobe \ - --replace " grep " " ${gnugrep}/bin/grep " \ - --replace " xargs " " ${findutils}/bin/xargs " + --replace " grep " " /run/booted-system/sw/bin/grep " \ + --replace " xargs " " /run/booted-system/sw/bin/xargs " ''; meta = with lib; { diff --git a/pkgs/tools/admin/lxd/default.nix b/pkgs/tools/admin/lxd/default.nix index ff6fa1ffb088..f726e5669e3d 100644 --- a/pkgs/tools/admin/lxd/default.nix +++ b/pkgs/tools/admin/lxd/default.nix @@ -58,7 +58,7 @@ buildGoPackage rec { description = "Daemon based on liblxc offering a REST API to manage containers"; homepage = "https://linuxcontainers.org/lxd/"; license = licenses.asl20; - maintainers = with maintainers; [ fpletz wucke13 marsam ]; + maintainers = with maintainers; [ fpletz marsam ]; platforms = platforms.linux; }; } diff --git a/pkgs/tools/filesystems/lfs/default.nix b/pkgs/tools/filesystems/lfs/default.nix index 4cfd728b9699..d7cac06b5bd2 100644 --- a/pkgs/tools/filesystems/lfs/default.nix +++ b/pkgs/tools/filesystems/lfs/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "lfs"; - version = "1.4.0"; + version = "2.0.1"; src = fetchFromGitHub { owner = "Canop"; repo = pname; rev = "v${version}"; - sha256 = "sha256-mTgJ2DbSQprKKy7wTMXwmUAvHS9tacs9Nk1cmEJW9Sg="; + sha256 = "sha256-UGeIY/wms4QxIzt+ctclUStuNNV6Hm3A4Wu+LfaKgbw="; }; - cargoSha256 = "sha256-Oiiz7I2eCtNMauvr0K2NtB49NJ/6XWVsJ0mMyEgFb7U="; + cargoSha256 = "sha256-c4rT6Y7XsmNrCtASkt6KWGTwGXwTM2berfdmSC61Z7s="; meta = with lib; { description = "Get information on your mounted disks"; diff --git a/pkgs/tools/graphics/timg/default.nix b/pkgs/tools/graphics/timg/default.nix index 035bb33eebf1..136b5a241511 100644 --- a/pkgs/tools/graphics/timg/default.nix +++ b/pkgs/tools/graphics/timg/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "timg"; - version = "1.4.3"; + version = "1.4.4"; src = fetchFromGitHub { owner = "hzeller"; repo = "timg"; rev = "v${version}"; - sha256 = "1lanr2y9rchl0xmycsyl0bhnh9mrmr5dj46pglw4lykz4rxslzcx"; + sha256 = "1gdwg15fywya6k6pajkx86kv2d8k85pmisnq53b02br5i01y4k41"; }; buildInputs = [ graphicsmagick ffmpeg libexif libjpeg openslide zlib ]; diff --git a/pkgs/tools/misc/hdf5/default.nix b/pkgs/tools/misc/hdf5/default.nix index 5671e73c85f8..d34282259026 100644 --- a/pkgs/tools/misc/hdf5/default.nix +++ b/pkgs/tools/misc/hdf5/default.nix @@ -15,6 +15,7 @@ , javaSupport ? false , jdk , usev110Api ? false +, threadsafe ? false }: # cpp and mpi options are mutually exclusive @@ -25,9 +26,14 @@ let inherit (lib) optional optionals; in stdenv.mkDerivation rec { version = "1.12.1"; - pname = "hdf5"; + pname = "hdf5" + + lib.optionalString cppSupport "-cpp" + + lib.optionalString fortranSupport "-fortran" + + lib.optionalString mpiSupport "-mpi" + + lib.optionalString threadsafe "-threadsafe"; + src = fetchurl { - url = "https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-${lib.versions.majorMinor version}/${pname}-${version}/src/${pname}-${version}.tar.bz2"; + url = "https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-${lib.versions.majorMinor version}/hdf5-${version}/src/hdf5-${version}.tar.bz2"; sha256 = "sha256-qvn1MrPtqD09Otyfi0Cpt2MVIhj6RTScO8d1Asofjxw="; }; @@ -63,7 +69,9 @@ stdenv.mkDerivation rec { ++ optionals mpiSupport [ "--enable-parallel" "CC=${mpi}/bin/mpicc" ] ++ optional enableShared "--enable-shared" ++ optional javaSupport "--enable-java" - ++ optional usev110Api "--with-default-api-version=v110"; + ++ optional usev110Api "--with-default-api-version=v110" + # hdf5 hl (High Level) library is not considered stable with thread safety and should be disabled. + ++ optionals threadsafe [ "--enable-threadsafe" "--disable-hl" ]; patches = [ ./bin-mv.patch diff --git a/pkgs/tools/misc/vttest/default.nix b/pkgs/tools/misc/vttest/default.nix index a78b68569647..a1811629af89 100644 --- a/pkgs/tools/misc/vttest/default.nix +++ b/pkgs/tools/misc/vttest/default.nix @@ -2,18 +2,18 @@ stdenv.mkDerivation rec { pname = "vttest"; - version = "20210210"; + version = "20220215"; src = fetchurl { urls = [ "https://invisible-mirror.net/archives/${pname}/${pname}-${version}.tgz" "ftp://ftp.invisible-island.net/${pname}/${pname}-${version}.tgz" ]; - sha256 = "sha256-D5ii4wWYKRXxUgmEw+hpjjrNUI7iEHEVKMifWn6n8EY="; + sha256 = "sha256-SmWZjF4SzwjO0s/OEZrbRPqEKsFJXQ8VDyHIpnhZFaE="; }; meta = with lib; { - description = "Tests the compatibility so-called 'VT100-compatible' terminals"; + description = "Tests the compatibility of so-called 'VT100-compatible' terminals"; homepage = "https://invisible-island.net/vttest/"; license = licenses.mit; platforms = platforms.all; diff --git a/pkgs/tools/networking/p2p/amule/default.nix b/pkgs/tools/networking/p2p/amule/default.nix index c2e5f4568242..fc389f2c4dc4 100644 --- a/pkgs/tools/networking/p2p/amule/default.nix +++ b/pkgs/tools/networking/p2p/amule/default.nix @@ -20,8 +20,13 @@ , libX11 }: +# daemon and client are not build monolithic +assert monolithic || (!monolithic && (enableDaemon || client)); + stdenv.mkDerivation rec { - pname = "amule"; + pname = "amule" + + lib.optionalString enableDaemon "-daemon" + + lib.optionalString client "-gui"; version = "2.3.3"; src = fetchFromGitHub { @@ -34,9 +39,14 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake gettext makeWrapper pkg-config ]; buildInputs = [ - zlib wxGTK30-gtk3 perl cryptopp.dev libupnp boost + zlib + wxGTK30-gtk3 + perl + cryptopp.dev + libupnp + boost ] ++ lib.optional httpServer libpng - ++ lib.optional client libX11; + ++ lib.optional client libX11; cmakeFlags = [ "-DBUILD_MONOLITHIC=${if monolithic then "ON" else "OFF"}" diff --git a/pkgs/tools/nix/statix/default.nix b/pkgs/tools/nix/statix/default.nix index 3d9d34aa7cb5..0f3a1c10e355 100644 --- a/pkgs/tools/nix/statix/default.nix +++ b/pkgs/tools/nix/statix/default.nix @@ -4,16 +4,16 @@ rustPlatform.buildRustPackage rec { pname = "statix"; # also update version of the vim plugin in pkgs/misc/vim-plugins/overrides.nix # the version can be found in flake.nix of the source code - version = "0.5.3"; + version = "0.5.4"; src = fetchFromGitHub { owner = "nerdypepper"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ibz5b+amOTlLxDlCPrC7A6rSFac3JXwiq3HMyIJwdUw="; + sha256 = "sha256-9208bR3awxXR1MSh9HbsKeen5V4r4hPuJFkK/CMJRfg="; }; - cargoSha256 = "sha256-MKInDGBZcOp+90cus6X2GAgjZx6M1TbSJgpUQWx60sQ="; + cargoSha256 = "sha256-f1/PMbXUiqjFI8Y0mvgEyNqGGYqGq3nV094mg1aZIHM="; buildFeatures = lib.optional withJson "json"; diff --git a/pkgs/tools/typesetting/asciidoc/default.nix b/pkgs/tools/typesetting/asciidoc/default.nix index 0618a55df441..be7f978a42aa 100644 --- a/pkgs/tools/typesetting/asciidoc/default.nix +++ b/pkgs/tools/typesetting/asciidoc/default.nix @@ -147,7 +147,9 @@ let in stdenv.mkDerivation rec { - pname = "asciidoc"; + pname = "asciidoc" + + lib.optionalString enableStandardFeatures "-full" + + lib.optionalString enableExtraPlugins "-with-plugins"; version = "9.1.0"; # Note: a substitution to improve reproducibility should be updated once 10.0.0 is diff --git a/pkgs/tools/virtualization/awsebcli/default.nix b/pkgs/tools/virtualization/awsebcli/default.nix index eaaf7046fff9..734ba58e693c 100644 --- a/pkgs/tools/virtualization/awsebcli/default.nix +++ b/pkgs/tools/virtualization/awsebcli/default.nix @@ -1,65 +1,57 @@ -{ lib, python3, glibcLocales }: +{ lib, python3, glibcLocales, docker-compose }: let + docker_compose = changeVersion (with localPython.pkgs; docker-compose.override { + inherit colorama pyyaml six dockerpty docker jsonschema requests websocket-client paramiko; + }).overridePythonAttrs "1.25.5" "1ijhg93zs3lswkljnm0rhww7gdy0g94psvsya2741prz2zcbcbks"; - localPython = python3.override { - packageOverrides = self: super: { - cement = super.cement.overridePythonAttrs (oldAttrs: rec { - version = "2.8.2"; - src = oldAttrs.src.override { - inherit version; - sha256 = "1li2whjzfhbpg6fjb6r1r92fb3967p1xv6hqs3j787865h2ysrc7"; - }; - }); - - colorama = super.colorama.overridePythonAttrs (oldAttrs: rec { - version = "0.3.7"; - src = oldAttrs.src.override { - inherit version; - sha256 = "0avqkn6362v7k2kg3afb35g4sfdvixjgy890clip4q174p9whhz0"; - }; - }); - - pathspec = super.pathspec.overridePythonAttrs (oldAttrs: rec { - name = "${oldAttrs.pname}-${version}"; - version = "0.5.5"; - src = oldAttrs.src.override { - inherit version; - sha256 = "72c495d1bbe76674219e307f6d1c6062f2e1b0b483a5e4886435127d0df3d0d3"; - }; - }); - - requests = super.requests.overridePythonAttrs (oldAttrs: rec { - version = "2.9.1"; - src = oldAttrs.src.override { - inherit version; - sha256 = "0zsqrzlybf25xscgi7ja4s48y2abf9wvjkn47wh984qgs1fq2xy5"; - }; - }); - - semantic-version = super.semantic-version.overridePythonAttrs (oldAttrs: rec { - version = "2.5.0"; - src = oldAttrs.src.override { - inherit version; - sha256 = "0p5n3d6blgkncxdz00yxqav0cis87fisdkirjm0ljjh7rdfx7aiv"; - }; - }); - - tabulate = super.tabulate.overridePythonAttrs (oldAttrs: rec { - version = "0.7.5"; - src = oldAttrs.src.override { - inherit version; - sha256 = "03l1r7ddd1a0j2snv1yd0hlnghjad3fg1an1jr8936ksv75slwch"; - }; - }); + changeVersion = overrideFunc: version: sha256: overrideFunc (oldAttrs: rec { + inherit version; + src = oldAttrs.src.override { + inherit version sha256; }; - }; -in with localPython.pkgs; buildPythonApplication rec { + }); + + changeVersionHash = overrideFunc: version: hash: overrideFunc (oldAttrs: rec { + inherit version; + src = oldAttrs.src.override { + inherit version hash; + }; + }); + + localPython = python3.override + { + self = localPython; + packageOverrides = self: super: { + cement = changeVersion super.cement.overridePythonAttrs "2.8.2" "1li2whjzfhbpg6fjb6r1r92fb3967p1xv6hqs3j787865h2ysrc7"; + botocore = changeVersion super.botocore.overridePythonAttrs "1.23.54" "sha256-S7m6FszO5fWiYCBJvD4ttoZTRrJVBmfzATvfM7CgHOs="; + colorama = changeVersion super.colorama.overridePythonAttrs "0.4.3" "189n8hpijy14jfan4ha9f5n06mnl33cxz7ay92wjqgkr639s0vg9"; + future = changeVersion super.future.overridePythonAttrs "0.16.0" "1nzy1k4m9966sikp0qka7lirh8sqrsyainyf8rk97db7nwdfv773"; + requests = changeVersionHash super.requests.overridePythonAttrs "2.26.0" "sha256-uKpY+M95P/2HgtPYyxnmbvNverpDU+7IWedGeLAbB6c="; + six = changeVersion super.six.overridePythonAttrs "1.14.0" "02lw67hprv57hyg3cfy02y3ixjk3nzwc0dx3c4ynlvkfwkfdnsr3"; + wcwidth = changeVersion super.wcwidth.overridePythonAttrs "0.1.9" "1wf5ycjx8s066rdvr0fgz4xds9a8zhs91c4jzxvvymm1c8l8cwzf"; + pyyaml = super.pyyaml.overridePythonAttrs (oldAttrs: rec { + version = "5.4.1"; + checkPhase = '' + runHook preCheck + PYTHONPATH="tests/lib3:$PYTHONPATH" ${localPython.interpreter} -m test_all + runHook postCheck + ''; + src = localPython.pkgs.fetchPypi { + pname = "PyYAML"; + inherit version; + sha256 = "sha256-YHd0y7oocyv6gCtUuqdIQhX1MJkQVbtWLvvtWy8gpF4="; + }; + }); + }; + }; +in +with localPython.pkgs; buildPythonApplication rec { pname = "awsebcli"; - version = "3.12.4"; + version = "3.20.3"; src = fetchPypi { inherit pname version; - sha256 = "128dgxyz2bgl3r4jdkbmjs280004bm0dwzln7p6ly3yjs2x37jl6"; + sha256 = "sha256-W3nUXPAXoicDQNXigktR1+b/9W6qvi90fujrXAekxTU="; }; buildInputs = [ @@ -69,29 +61,38 @@ in with localPython.pkgs; buildPythonApplication rec { LC_ALL = "en_US.UTF-8"; checkInputs = [ - pytest mock nose pathspec colorama requests docutils + pytest + mock + nose + pathspec + colorama + requests + docutils ]; - doCheck = false; + doCheck = true; propagatedBuildInputs = [ - # FIXME: Add optional docker dependency, which requires requests >= 2.14.2. - # Otherwise, awsebcli will try to install it using pip when using some - # commands (like "eb local run"). - blessed botocore cement colorama dockerpty docopt pathspec pyyaml - requests semantic-version setuptools tabulate termcolor websocket-client + blessed + botocore + cement + colorama + pathspec + pyyaml + future + requests + semantic-version + setuptools + tabulate + termcolor + websocket-client + docker_compose ]; - postInstall = '' - mkdir -p $out/share/bash-completion/completions - mv $out/bin/eb_completion.bash $out/share/bash-completion/completions/ - ''; - meta = with lib; { homepage = "https://aws.amazon.com/elasticbeanstalk/"; description = "A command line interface for Elastic Beanstalk"; maintainers = with maintainers; [ eqyiel ]; license = licenses.asl20; - broken = true; }; } diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 5c077de50d23..af9e8c60fdda 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -63,6 +63,8 @@ mapAliases ({ amazon-glacier-cmd-interface = throw "amazon-glacier-cmd-interface has been removed due to it being unmaintained."; # Added 2020-10-30 aminal = throw "aminal was renamed to darktile."; # Added 2021-09-28 ammonite-repl = ammonite; # Added 2017-05-02 + amuleDaemon = throw "amuleDaemon was renamed to amule-daemon."; # Added 2022-02-11 + amuleGui = throw "amuleGui was renamed to amule-gui."; # Added 2022-02-11 amsn = throw "amsn has been removed due to being unmaintained."; # Added 2020-12-09 angelfish = libsForQt5.plasmaMobileGear.angelfish; # Added 2021-10-06 antimicro = throw "antimicro has been removed as it was broken, see antimicrox instead."; # Added 2020-08-06 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8f9cacb5025f..eba1ad1100d7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1075,6 +1075,8 @@ with pkgs; tauon = callPackage ../applications/audio/tauon { }; + termusic = callPackage ../applications/audio/termusic { }; + tfk8s = callPackage ../tools/misc/tfk8s { }; tnat64 = callPackage ../tools/networking/tnat64 { }; @@ -1539,15 +1541,15 @@ with pkgs; amule = callPackage ../tools/networking/p2p/amule { }; - amuleDaemon = appendToName "daemon" (amule.override { + amule-daemon = amule.override { monolithic = false; enableDaemon = true; - }); + }; - amuleGui = appendToName "gui" (amule.override { + amule-gui = amule.override { monolithic = false; client = true; - }); + }; antennas = nodePackages.antennas; @@ -3889,20 +3891,20 @@ with pkgs; enableStandardFeatures = false; }; - asciidoc-full = appendToName "full" (asciidoc.override { + asciidoc-full = asciidoc.override { inherit (python3.pkgs) pygments; texlive = texlive.combine { inherit (texlive) scheme-minimal dvipng; }; w3m = w3m-batch; enableStandardFeatures = true; - }); + }; - asciidoc-full-with-plugins = appendToName "full-with-plugins" (asciidoc.override { + asciidoc-full-with-plugins = asciidoc.override { inherit (python3.pkgs) pygments; texlive = texlive.combine { inherit (texlive) scheme-minimal dvipng; }; w3m = w3m-batch; enableStandardFeatures = true; enableExtraPlugins = true; - }); + }; asciidoctor = callPackage ../tools/typesetting/asciidoctor { }; @@ -6437,24 +6439,13 @@ with pkgs; hdf5_1_10 = callPackage ../tools/misc/hdf5/1.10.nix { }; - hdf5-mpi = appendToName "mpi" (hdf5.override { - mpiSupport = true; - }); + hdf5-mpi = hdf5.override { mpiSupport = true; }; - hdf5-cpp = appendToName "cpp" (hdf5.override { - cppSupport = true; - }); + hdf5-cpp = hdf5.override { cppSupport = true; }; - hdf5-fortran = appendToName "fortran" (hdf5.override { - fortranSupport = true; - }); + hdf5-fortran = hdf5.override { fortranSupport = true; }; - hdf5-threadsafe = appendToName "threadsafe" (hdf5.overrideAttrs (oldAttrs: { - # Threadsafe hdf5 - # However, hdf5 hl (High Level) library is not considered stable - # with thread safety and should be disabled. - configureFlags = oldAttrs.configureFlags ++ ["--enable-threadsafe" "--disable-hl" ]; - })); + hdf5-threadsafe = hdf5.override { threadsafe = true; }; hdf5-blosc = callPackage ../development/libraries/hdf5-blosc { }; @@ -24475,6 +24466,8 @@ with pkgs; argocd = callPackage ../applications/networking/cluster/argocd { }; + argo-rollouts = callPackage ../applications/networking/cluster/argo-rollouts { }; + ario = callPackage ../applications/audio/ario { }; arion = callPackage ../applications/virtualization/arion { }; @@ -25515,6 +25508,8 @@ with pkgs; gitweb = callPackage ../applications/version-management/git-and-tools/gitweb { }; + globe-cli = callPackage ../applications/misc/globe-cli { }; + gnss-sdr = callPackage ../applications/radio/gnss-sdr { }; gnuradio = callPackage ../applications/radio/gnuradio/wrapper.nix { @@ -27900,7 +27895,9 @@ with pkgs; oberon-risc-emu = callPackage ../applications/emulators/oberon-risc-emu { }; - obs-studio = libsForQt5.callPackage ../applications/video/obs-studio {}; + obs-studio = libsForQt5.callPackage ../applications/video/obs-studio { + ffmpeg_4 = ffmpeg-full; + }; obs-studio-plugins = recurseIntoAttrs (callPackage ../applications/video/obs-studio/plugins {}); wrapOBS = callPackage ../applications/video/obs-studio/wrapper.nix {}; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 774b0077dbf9..8a1c1a46c1a0 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -750,6 +750,8 @@ in { inherit (pkgs) augeas; }; + augmax = callPackage ../development/python-modules/augmax { }; + auroranoaa = callPackage ../development/python-modules/auroranoaa { }; aurorapy = callPackage ../development/python-modules/aurorapy { };