diff options
70 files changed, 785 insertions, 489 deletions
diff --git a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml index 5de7e79bb080e..e9f4f707f52fd 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml @@ -316,6 +316,13 @@ </listitem> <listitem> <para> + <link xlink:href="https://github.com/skeeto/endlessh">endlessh</link>, + an SSH tarpit. Available as + <link linkend="opt-services.endlessh.enable">services.endlessh</link>. + </para> + </listitem> + <listitem> + <para> <link xlink:href="https://github.com/shizunge/endlessh-go">endlessh-go</link>, an SSH tarpit that exposes Prometheus metrics. Available as <link linkend="opt-services.endlessh-go.enable">services.endlessh-go</link>. diff --git a/nixos/doc/manual/release-notes/rl-2211.section.md b/nixos/doc/manual/release-notes/rl-2211.section.md index 541deabc2057d..9b5257ca8e1e5 100644 --- a/nixos/doc/manual/release-notes/rl-2211.section.md +++ b/nixos/doc/manual/release-notes/rl-2211.section.md @@ -109,6 +109,8 @@ In addition to numerous new and upgraded packages, this release has the followin - [alps](https://git.sr.ht/~migadu/alps), a simple and extensible webmail. Available as [services.alps](#opt-services.alps.enable). +- [endlessh](https://github.com/skeeto/endlessh), an SSH tarpit. Available as [services.endlessh](#opt-services.endlessh.enable). + - [endlessh-go](https://github.com/shizunge/endlessh-go), an SSH tarpit that exposes Prometheus metrics. Available as [services.endlessh-go](#opt-services.endlessh-go.enable). - [Garage](https://garagehq.deuxfleurs.fr/), a simple object storage server for geodistributed deployments, alternative to MinIO. Available as [services.garage](#opt-services.garage.enable). diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index ba9f67f87fd62..1e9298a6571d8 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -1012,6 +1012,7 @@ ./services/security/certmgr.nix ./services/security/cfssl.nix ./services/security/clamav.nix + ./services/security/endlessh.nix ./services/security/endlessh-go.nix ./services/security/fail2ban.nix ./services/security/fprintd.nix diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix index c74f66d918295..dc145d8585154 100644 --- a/nixos/modules/security/pam.nix +++ b/nixos/modules/security/pam.nix @@ -615,12 +615,12 @@ let optionalString cfg.setLoginUid '' session ${if config.boot.isContainer then "optional" else "required"} pam_loginuid.so '' + - optionalString cfg.ttyAudit.enable '' - session required ${pkgs.pam}/lib/security/pam_tty_audit.so - open_only=${toString cfg.ttyAudit.openOnly} - ${optionalString (cfg.ttyAudit.enablePattern != null) "enable=${cfg.ttyAudit.enablePattern}"} - ${optionalString (cfg.ttyAudit.disablePattern != null) "disable=${cfg.ttyAudit.disablePattern}"} - '' + + optionalString cfg.ttyAudit.enable (concatStringsSep " \\\n " ([ + "session required ${pkgs.pam}/lib/security/pam_tty_audit.so" + ] ++ optional cfg.ttyAudit.openOnly "open_only" + ++ optional (cfg.ttyAudit.enablePattern != null) "enable=${cfg.ttyAudit.enablePattern}" + ++ optional (cfg.ttyAudit.disablePattern != null) "disable=${cfg.ttyAudit.disablePattern}" + )) + optionalString cfg.makeHomeDir '' session required ${pkgs.pam}/lib/security/pam_mkhomedir.so silent skel=${config.security.pam.makeHomeDir.skelDirectory} umask=0077 '' + diff --git a/nixos/modules/services/networking/syncthing.nix b/nixos/modules/services/networking/syncthing.nix index 0876007a6e732..ea87e5695f87a 100644 --- a/nixos/modules/services/networking/syncthing.nix +++ b/nixos/modules/services/networking/syncthing.nix @@ -55,8 +55,8 @@ let # generate the new config by merging with the NixOS config options new_cfg=$(printf '%s\n' "$old_cfg" | ${pkgs.jq}/bin/jq -c '. * { - "devices": (${builtins.toJSON devices}${optionalString (! cfg.overrideDevices) " + .devices"}), - "folders": (${builtins.toJSON folders}${optionalString (! cfg.overrideFolders) " + .folders"}) + "devices": (${builtins.toJSON devices}${optionalString (cfg.devices == {} || ! cfg.overrideDevices) " + .devices"}), + "folders": (${builtins.toJSON folders}${optionalString (cfg.folders == {} || ! cfg.overrideFolders) " + .folders"}) } * ${builtins.toJSON cfg.extraOptions}') # send the new config diff --git a/nixos/modules/services/security/endlessh.nix b/nixos/modules/services/security/endlessh.nix new file mode 100644 index 0000000000000..e99b4dadcd581 --- /dev/null +++ b/nixos/modules/services/security/endlessh.nix @@ -0,0 +1,99 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.endlessh; +in +{ + options.services.endlessh = { + enable = mkEnableOption (mdDoc "endlessh service"); + + port = mkOption { + type = types.port; + default = 2222; + example = 22; + description = mdDoc '' + Specifies on which port the endlessh daemon listens for SSH + connections. + + Setting this to `22` may conflict with {option}`services.openssh`. + ''; + }; + + extraOptions = mkOption { + type = with types; listOf str; + default = [ ]; + example = [ "-6" "-d 9000" "-v" ]; + description = mdDoc '' + Additional command line options to pass to the endlessh daemon. + ''; + }; + + openFirewall = mkOption { + type = types.bool; + default = false; + description = lib.mdDoc '' + Whether to open a firewall port for the SSH listener. + ''; + }; + }; + + config = mkIf cfg.enable { + systemd.services.endlessh = { + description = "SSH tarpit"; + requires = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + serviceConfig = + let + needsPrivileges = cfg.port < 1024; + capabilities = [ "" ] ++ optionals needsPrivileges [ "CAP_NET_BIND_SERVICE" ]; + rootDirectory = "/run/endlessh"; + in + { + Restart = "always"; + ExecStart = with cfg; concatStringsSep " " ([ + "${pkgs.endlessh}/bin/endlessh" + "-p ${toString port}" + ] ++ extraOptions); + DynamicUser = true; + RootDirectory = rootDirectory; + BindReadOnlyPaths = [ builtins.storeDir ]; + InaccessiblePaths = [ "-+${rootDirectory}" ]; + RuntimeDirectory = baseNameOf rootDirectory; + RuntimeDirectoryMode = "700"; + AmbientCapabilities = capabilities; + CapabilityBoundingSet = capabilities; + UMask = "0077"; + LockPersonality = true; + MemoryDenyWriteExecute = true; + NoNewPrivileges = true; + PrivateDevices = true; + PrivateTmp = true; + PrivateUsers = !needsPrivileges; + ProtectClock = true; + ProtectControlGroups = true; + ProtectHome = true; + ProtectHostname = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + ProtectSystem = "strict"; + ProtectProc = "noaccess"; + ProcSubset = "pid"; + RemoveIPC = true; + RestrictAddressFamilies = [ "AF_INET" "AF_INET6" ]; + RestrictNamespaces = true; + RestrictRealtime = true; + RestrictSUIDSGID = true; + SystemCallArchitectures = "native"; + SystemCallFilter = [ "@system-service" "~@resources" "~@privileged" ]; + }; + }; + + networking.firewall.allowedTCPPorts = with cfg; + optionals openFirewall [ port ]; + }; + + meta.maintainers = with maintainers; [ azahi ]; +} diff --git a/nixos/modules/services/web-apps/invoiceplane.nix b/nixos/modules/services/web-apps/invoiceplane.nix index 156cc238e89af..c54915b10a2db 100644 --- a/nixos/modules/services/web-apps/invoiceplane.nix +++ b/nixos/modules/services/web-apps/invoiceplane.nix @@ -36,10 +36,10 @@ let version = src.version; src = pkgs.invoiceplane; - patchPhase = '' + postPhase = '' # Patch index.php file to load additional config file substituteInPlace index.php \ - --replace "require('vendor/autoload.php');" "require('vendor/autoload.php'); \$dotenv = new \Dotenv\Dotenv(__DIR__, 'extraConfig.php'); \$dotenv->load();"; + --replace "require('vendor/autoload.php');" "require('vendor/autoload.php'); \$dotenv = Dotenv\Dotenv::createImmutable(__DIR__, 'extraConfig.php'); \$dotenv->load();"; ''; installPhase = '' diff --git a/nixos/modules/virtualisation/vmware-guest.nix b/nixos/modules/virtualisation/vmware-guest.nix index 3b4d484fc8b9f..b8f0a4cf668ef 100644 --- a/nixos/modules/virtualisation/vmware-guest.nix +++ b/nixos/modules/virtualisation/vmware-guest.nix @@ -16,7 +16,8 @@ in enable = mkEnableOption (lib.mdDoc "VMWare Guest Support"); headless = mkOption { type = types.bool; - default = false; + default = !config.services.xserver.enable; + defaultText = "!config.services.xserver.enable"; description = lib.mdDoc "Whether to disable X11-related features."; }; }; diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 06ee955668f29..a3253339c035e 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -183,6 +183,7 @@ in { ejabberd = handleTest ./xmpp/ejabberd.nix {}; elk = handleTestOn ["x86_64-linux"] ./elk.nix {}; emacs-daemon = handleTest ./emacs-daemon.nix {}; + endlessh = handleTest ./endlessh.nix {}; endlessh-go = handleTest ./endlessh-go.nix {}; engelsystem = handleTest ./engelsystem.nix {}; enlightenment = handleTest ./enlightenment.nix {}; diff --git a/nixos/tests/endlessh.nix b/nixos/tests/endlessh.nix new file mode 100644 index 0000000000000..be742a749fdd8 --- /dev/null +++ b/nixos/tests/endlessh.nix @@ -0,0 +1,43 @@ +import ./make-test-python.nix ({ lib, pkgs, ... }: +{ + name = "endlessh"; + meta.maintainers = with lib.maintainers; [ azahi ]; + + nodes = { + server = { ... }: { + services.endlessh = { + enable = true; + openFirewall = true; + }; + + specialisation = { + unprivileged.configuration.services.endlessh.port = 2222; + + privileged.configuration.services.endlessh.port = 22; + }; + }; + + client = { pkgs, ... }: { + environment.systemPackages = with pkgs; [ curl netcat ]; + }; + }; + + testScript = '' + def activate_specialisation(name: str): + server.succeed(f"/run/booted-system/specialisation/{name}/bin/switch-to-configuration test >&2") + + start_all() + + with subtest("Unprivileged"): + activate_specialisation("unprivileged") + server.wait_for_unit("endlessh.service") + server.wait_for_open_port(2222) + client.succeed("nc -dvW5 server 2222") + + with subtest("Privileged"): + activate_specialisation("privileged") + server.wait_for_unit("endlessh.service") + server.wait_for_open_port(22) + client.succeed("nc -dvW5 server 22") + ''; +}) diff --git a/nixos/tests/invoiceplane.nix b/nixos/tests/invoiceplane.nix index 4e63f8ac21c95..260e49db54d33 100644 --- a/nixos/tests/invoiceplane.nix +++ b/nixos/tests/invoiceplane.nix @@ -13,12 +13,12 @@ import ./make-test-python.nix ({ pkgs, ... }: services.invoiceplane.webserver = "caddy"; services.invoiceplane.sites = { "site1.local" = { - #database.name = "invoiceplane1"; + database.name = "invoiceplane1"; database.createLocally = true; enable = true; }; "site2.local" = { - #database.name = "invoiceplane2"; + database.name = "invoiceplane2"; database.createLocally = true; enable = true; }; diff --git a/pkgs/applications/audio/musikcube/default.nix b/pkgs/applications/audio/musikcube/default.nix index 6b47d1f3c846b..9389d2d5e68f2 100644 --- a/pkgs/applications/audio/musikcube/default.nix +++ b/pkgs/applications/audio/musikcube/default.nix @@ -27,26 +27,15 @@ stdenv.mkDerivation rec { pname = "musikcube"; - version = "0.98.0"; + version = "0.98.1"; src = fetchFromGitHub { owner = "clangen"; repo = pname; rev = version; - sha256 = "sha256-bnwOxEcvRXWPuqtkv8YlpclvH/6ZtQvyvHy4mqJCwik="; + sha256 = "sha256-pnAdlCCqWzR0W8dF9CE48K8yHMVIx3egZlXvibxU18A="; }; - patches = [] - ++ lib.optionals stdenv.isDarwin [ - # Fix pending upstream inclusion for Darwin nixpkgs builds: - # https://github.com/clangen/musikcube/pull/531 - (fetchpatch { - name = "darwin-build.patch"; - url = "https://github.com/clangen/musikcube/commit/9077bb9fa6ddfe93ebb14bb8feebc8a0ef9b7ee4.patch"; - sha256 = "sha256-Am9AGKDGMN5z+JJFJKdsBLrHf2neHFovgF/8I5EXLDA="; - }) - ]; - nativeBuildInputs = [ cmake pkg-config diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 2d3f24e5d5583..3282207ad797f 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -281,12 +281,12 @@ final: prev: SchemaStore-nvim = buildVimPluginFrom2Nix { pname = "SchemaStore.nvim"; - version = "2022-10-29"; + version = "2022-10-31"; src = fetchFromGitHub { owner = "b0o"; repo = "SchemaStore.nvim"; - rev = "7c53d1a9b5ad03cd9235a529f735a598149db363"; - sha256 = "0gi5xjjq9k2vy11nr5cjwrrhc9czmdakg80wpmwfdfgbxmb83mhq"; + rev = "bfcd9a05ded8ff6cf89b302bee548c35177d9158"; + sha256 = "1mwj6dhk7wpyk766bq504i87hyw3rgspc64ml0kc5xf8wq1mxx4m"; }; meta.homepage = "https://github.com/b0o/SchemaStore.nvim/"; }; @@ -341,12 +341,12 @@ final: prev: SpaceVim = buildVimPluginFrom2Nix { pname = "SpaceVim"; - version = "2022-10-29"; + version = "2022-11-01"; src = fetchFromGitHub { owner = "SpaceVim"; repo = "SpaceVim"; - rev = "a23f52bca0c2ae9ff50f8f033b13e8bd82372fc6"; - sha256 = "0ih3niscacqyk38dbpc19356fzxkfh6zz0rnj3pricbx22skp5nd"; + rev = "88489db9c24e6c8cbc0b39cc9b8de96d3899cb06"; + sha256 = "16hn8zpmm9qynzakj8dp3d42pczcqdb3xj5k1di7yw810r8gdycf"; }; meta.homepage = "https://github.com/SpaceVim/SpaceVim/"; }; @@ -437,12 +437,12 @@ final: prev: YouCompleteMe = buildVimPluginFrom2Nix { pname = "YouCompleteMe"; - version = "2022-10-06"; + version = "2022-11-01"; src = fetchFromGitHub { owner = "ycm-core"; repo = "YouCompleteMe"; - rev = "99ccab251fad7c8b235582b46752a0536d01b315"; - sha256 = "1whjbplgqik4pdp3z1ly7z1qii6z615drqc3i09p4sahdb7cw2n6"; + rev = "728b47728c31bcbc92fbc196c00230d601ca2a15"; + sha256 = "11g2gby9qffjs4197ajzk2hsmpsjgak33rxfbfijg82m9ypsf3gc"; fetchSubmodules = true; }; meta.homepage = "https://github.com/ycm-core/YouCompleteMe/"; @@ -486,12 +486,12 @@ final: prev: aerial-nvim = buildVimPluginFrom2Nix { pname = "aerial.nvim"; - version = "2022-10-29"; + version = "2022-10-31"; src = fetchFromGitHub { owner = "stevearc"; repo = "aerial.nvim"; - rev = "45de4de76f1bb90f956281b4699df9b058417784"; - sha256 = "0yscgsi38ir8g8sby65v54sj0nhwz5mh3g215rd1hpvb6jcapyqq"; + rev = "159041f5f6e0ba914221f097886f1d31ce419c04"; + sha256 = "06b5hjsbk4k9zw64zfz8pq540wd2q3i5z4sv78n3kh0cbcjj9gmw"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/aerial.nvim/"; @@ -535,12 +535,12 @@ final: prev: ale = buildVimPluginFrom2Nix { pname = "ale"; - version = "2022-10-29"; + version = "2022-10-31"; src = fetchFromGitHub { owner = "dense-analysis"; repo = "ale"; - rev = "06efbdd25a3a8cccf17692f7bd4eac71ae7d6e05"; - sha256 = "106qlm0h2rjj7w3zhcilic7jbb276nh5xwvpqgs645dxgd323f9m"; + rev = "483d056528543df3349299db1ecf4aecfd0d7f44"; + sha256 = "0h5cx4sn4p19mk12jdsb4msn30awwaj4wm2kpamaaar1gv8m17h5"; }; meta.homepage = "https://github.com/dense-analysis/ale/"; }; @@ -667,12 +667,12 @@ final: prev: asyncrun-vim = buildVimPluginFrom2Nix { pname = "asyncrun.vim"; - version = "2022-10-11"; + version = "2022-10-30"; src = fetchFromGitHub { owner = "skywind3000"; repo = "asyncrun.vim"; - rev = "eae766d218671754f3a48adc6b3ad7bf2bac0696"; - sha256 = "0nkqkkk8ahxfvc5f8da9zb1v258lik9514kfv50phz4vj4s76vbh"; + rev = "4794a74dae54633c586eecd67e31d771323a2f72"; + sha256 = "1d3xm00xhwdm5yc08mzkvn5897rb58cjrlq86dlbypfrni512sv7"; }; meta.homepage = "https://github.com/skywind3000/asyncrun.vim/"; }; @@ -739,12 +739,12 @@ final: prev: auto-save-nvim = buildVimPluginFrom2Nix { pname = "auto-save.nvim"; - version = "2022-08-06"; + version = "2022-11-01"; src = fetchFromGitHub { owner = "pocco81"; repo = "auto-save.nvim"; - rev = "2c7a2943340ee2a36c6a61db812418fca1f57866"; - sha256 = "0zfy1pw39c0zf4mfd8kgl1hj9h1hcbsql32rp0wk0kf714hbxqli"; + rev = "979b6c82f60cfa80f4cf437d77446d0ded0addf0"; + sha256 = "13kv2p0gj20fg79ch27a9vp10ki11vjj4fx626cj526qpnbs4qbd"; }; meta.homepage = "https://github.com/pocco81/auto-save.nvim/"; }; @@ -931,12 +931,12 @@ final: prev: bufferline-nvim = buildVimPluginFrom2Nix { pname = "bufferline.nvim"; - version = "2022-10-28"; + version = "2022-11-01"; src = fetchFromGitHub { owner = "akinsho"; repo = "bufferline.nvim"; - rev = "028a87933d99f8bb88f2f70a4def3ff9574f3594"; - sha256 = "04s1d44yq7hncvi3x3i2k47pak239shxfz8anv117h3zxcgdzg8r"; + rev = "d631817de1b52c7b1947e25ec8b7638492914768"; + sha256 = "0nnwq8cmwsy3jssrlvfghs8l6p6m7q5pmbbadp57sm153q4pjvpy"; }; meta.homepage = "https://github.com/akinsho/bufferline.nvim/"; }; @@ -1219,12 +1219,12 @@ final: prev: cmp-dictionary = buildVimPluginFrom2Nix { pname = "cmp-dictionary"; - version = "2022-08-29"; + version = "2022-11-01"; src = fetchFromGitHub { owner = "uga-rosa"; repo = "cmp-dictionary"; - rev = "93f3e2cb2e0b4d31cf3a97820daddc4e9933ef01"; - sha256 = "0bmmaxnf5inm7lgni4132vh01wkx7864690jv932wkpk0665y2hm"; + rev = "c942c48eaafe1d9c5a5cdc7f7299336bd60e24f5"; + sha256 = "13rrqcxhif7990575vsccadzz011zjhy1qbwspyhisffz13isbcv"; }; meta.homepage = "https://github.com/uga-rosa/cmp-dictionary/"; }; @@ -1279,12 +1279,12 @@ final: prev: cmp-fuzzy-path = buildVimPluginFrom2Nix { pname = "cmp-fuzzy-path"; - version = "2022-10-25"; + version = "2022-10-30"; src = fetchFromGitHub { owner = "tzachar"; repo = "cmp-fuzzy-path"; - rev = "13fdf779f833571ae72ca3a540531cfa9e67e714"; - sha256 = "1vcwgg9cvidgjwxgwma1lbcf070p9gr60ykalr26rzwd7mwm1xrj"; + rev = "18ee8f81ab704f3f6656cfe52180dec6f7b497a7"; + sha256 = "15yivkvjsx3yfgf5i485q4kxmfmqghfqsi869wifff7v0x6y9ghk"; }; meta.homepage = "https://github.com/tzachar/cmp-fuzzy-path/"; }; @@ -1723,12 +1723,12 @@ final: prev: coc-nvim = buildVimPluginFrom2Nix { pname = "coc.nvim"; - version = "2022-10-29"; + version = "2022-10-31"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc.nvim"; - rev = "d0d3d08d4e5ab7eab7139eef6a2377f2debfecf2"; - sha256 = "1bzf3rgn1m1b499ycqkq82b1bi9s0081mq144pvka71qcfb3xkwy"; + rev = "46571a51028dccca9c10c860a51ea3c8adc92de8"; + sha256 = "1agm4sban6sfg626hf78ayhr98hrvi263jv6i8hk0qhcgv26k32c"; }; meta.homepage = "https://github.com/neoclide/coc.nvim/"; }; @@ -1951,12 +1951,12 @@ final: prev: conflict-marker-vim = buildVimPluginFrom2Nix { pname = "conflict-marker.vim"; - version = "2021-10-18"; + version = "2022-11-01"; src = fetchFromGitHub { owner = "rhysd"; repo = "conflict-marker.vim"; - rev = "22b6133116795ea8fb6705ddca981aa8faecedda"; - sha256 = "0rh3c1sl145hwyh6idwgyqbrgnwvd91spxc5qs2hfr1xsh53ssx2"; + rev = "11a4d42244755505b66b15cd4496a150432eb5e3"; + sha256 = "00sdnhr7fnj27sdjj88cypbw5zp264z290a0xfyp9gbmdnz1nlgx"; }; meta.homepage = "https://github.com/rhysd/conflict-marker.vim/"; }; @@ -2011,24 +2011,24 @@ final: prev: coq-artifacts = buildVimPluginFrom2Nix { pname = "coq.artifacts"; - version = "2022-10-29"; + version = "2022-11-01"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq.artifacts"; - rev = "c4dd8b254ea8925d81db5666d5469cdef1e08bb9"; - sha256 = "07vwls1g4myigd4aypqsiqnd45bsm22jhp7vn1khg170axavp4ki"; + rev = "47e6f18e8583f9d48c7e71e632ceb4121dc1d6cc"; + sha256 = "1k425fr1fmq6k7j16m0ylj0z3g11lcdjflw873ivw0wc9kkh6z47"; }; meta.homepage = "https://github.com/ms-jpq/coq.artifacts/"; }; coq-thirdparty = buildVimPluginFrom2Nix { pname = "coq.thirdparty"; - version = "2022-10-29"; + version = "2022-11-01"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq.thirdparty"; - rev = "6124d83569e863ad10537172ef7988b1f0ed4455"; - sha256 = "0ricb4wfapwkkw4m1r9wmqgcm65nrxbx6f6nqq3x028zkfccaqmj"; + rev = "eb27fa28ab08dfaf8911d0ac7f1196d8bc0290cc"; + sha256 = "04ylxsg8xkc7ca4gj4j1r86wagjb8b8vhqwwjxan66igr6lhy2m0"; }; meta.homepage = "https://github.com/ms-jpq/coq.thirdparty/"; }; @@ -2047,12 +2047,12 @@ final: prev: coq_nvim = buildVimPluginFrom2Nix { pname = "coq_nvim"; - version = "2022-10-29"; + version = "2022-11-01"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq_nvim"; - rev = "2fd1e384ee57c2e5de86c3f9ad9ebb71e5249920"; - sha256 = "153mi9aqnci6z312l7fj0a7ndx29a8p5x9pw7n84wn93qhc3s59v"; + rev = "0fefc00e9082b9e80345dc7805b146a25773ac2f"; + sha256 = "1ffiyqz8yqq26v81sblgn1rf6f0nxsvlqcz3ag7bxlps24fdq48x"; }; meta.homepage = "https://github.com/ms-jpq/coq_nvim/"; }; @@ -2409,12 +2409,12 @@ final: prev: deoplete-lsp = buildVimPluginFrom2Nix { pname = "deoplete-lsp"; - version = "2022-08-02"; + version = "2022-10-31"; src = fetchFromGitHub { owner = "deoplete-plugins"; repo = "deoplete-lsp"; - rev = "44178ee1dd02baa0958677cd8ec4c6e431ec7d67"; - sha256 = "0bwdz4f8rwqh15wf8vfildchg2ny24c0p6zm8y069mz0m1n9c3l6"; + rev = "09a476e0301c7253e7cf459cea605878c51c370d"; + sha256 = "1px4wnnd3fg5ri5m57l57d296zks6xardyv6fwny22mnx6nfhngl"; }; meta.homepage = "https://github.com/deoplete-plugins/deoplete-lsp/"; }; @@ -2613,12 +2613,12 @@ final: prev: dracula-nvim = buildVimPluginFrom2Nix { pname = "dracula.nvim"; - version = "2022-10-26"; + version = "2022-10-31"; src = fetchFromGitHub { owner = "Mofiqul"; repo = "dracula.nvim"; - rev = "55f24e76a978c73c63d22951b0700823f21253b7"; - sha256 = "0lkc0589fpf32c13hmzpi04skw0jp2hsl022d385znxm7x51n1v3"; + rev = "09cbd3d9434c781674fafe4da03d616e35a49d51"; + sha256 = "06wan9q59bisd9sfdvh8rmw8vj1ahxa87r35gywlkask2jjzq83b"; }; meta.homepage = "https://github.com/Mofiqul/dracula.nvim/"; }; @@ -2661,12 +2661,12 @@ final: prev: editorconfig-vim = buildVimPluginFrom2Nix { pname = "editorconfig-vim"; - version = "2022-06-20"; + version = "2022-10-30"; src = fetchFromGitHub { owner = "editorconfig"; repo = "editorconfig-vim"; - rev = "d354117b72b3b43b75a29b8e816c0f91af10efe9"; - sha256 = "12qvximadgb9z2i0hgvj4p4nxaqk0aqbnaqpafpma73xyb23hx5v"; + rev = "6bba2596601086ddfc882488b1444bf1ea43aab9"; + sha256 = "02a8v3z8kla7fsirl6lqk9ijj51flhn3mwb4dsc47k4fnpxr4qcp"; fetchSubmodules = true; }; meta.homepage = "https://github.com/editorconfig/editorconfig-vim/"; @@ -2674,12 +2674,12 @@ final: prev: editorconfig-nvim = buildVimPluginFrom2Nix { pname = "editorconfig.nvim"; - version = "2022-09-18"; + version = "2022-11-01"; src = fetchFromGitHub { owner = "gpanders"; repo = "editorconfig.nvim"; - rev = "7d10fe6bc340fd783c0b61cf627dd235100284db"; - sha256 = "04rvlpxvjjj842xlmfz93ysmdzz8yv77hii0ngmcaxhrr4yyiqpr"; + rev = "e72d2331b43e3f08d0ecca44cecded4e20c01fab"; + sha256 = "037ag6b10frwxp5nj1yc35zq0xn02a2bq179v48pqp3ds8lkanb2"; }; meta.homepage = "https://github.com/gpanders/editorconfig.nvim/"; }; @@ -2819,12 +2819,12 @@ final: prev: fern-vim = buildVimPluginFrom2Nix { pname = "fern.vim"; - version = "2022-10-18"; + version = "2022-10-31"; src = fetchFromGitHub { owner = "lambdalisue"; repo = "fern.vim"; - rev = "d0ada5bb5981d154e8c63a6eac7cca58750280bb"; - sha256 = "06pli4rpalr5bgk33inj2dk278rjjsxyp2sc2j7sdcgy5qzcaf90"; + rev = "b5f4635683f9df3ce6a9a1399aec55ee1ec9b681"; + sha256 = "15sl6d975svs3qp1h1nb2kivqxgzw2f9g3yr6fbpjcqh6n7hxjhr"; }; meta.homepage = "https://github.com/lambdalisue/fern.vim/"; }; @@ -2872,7 +2872,7 @@ final: prev: owner = "andviro"; repo = "flake8-vim"; rev = "5bc93f7f26ceb18ccbe116830eaf8ff2baa63994"; - sha256 = "142pgasl0b64a0zxmspdsi636axrgvdx6rh3hwjrb1zlsck19y1a"; + sha256 = "1s7rb2ygky1jjjqpwhzp5lsf7js1g0yhnbf6x5lfwygz6646xpy3"; fetchSubmodules = true; }; meta.homepage = "https://github.com/andviro/flake8-vim/"; @@ -3072,12 +3072,12 @@ final: prev: fzf-lua = buildVimPluginFrom2Nix { pname = "fzf-lua"; - version = "2022-10-23"; + version = "2022-10-31"; src = fetchFromGitHub { owner = "ibhagwan"; repo = "fzf-lua"; - rev = "abc3aed243115dc18fc41acd49b9037655a561af"; - sha256 = "0s7p8blmlwzxy4lcb8rww6jfb3ws2y1b9pmf5czw867kd5r084b7"; + rev = "b1f1f76c13d6040b9b9b6ccdb59129c6c4885124"; + sha256 = "1gf6h1g9s09xb3mmck29ippcqkajzh5156j5g14zsf2v7gsqkyax"; }; meta.homepage = "https://github.com/ibhagwan/fzf-lua/"; }; @@ -3228,12 +3228,12 @@ final: prev: gitsigns-nvim = buildNeovimPluginFrom2Nix { pname = "gitsigns.nvim"; - version = "2022-10-29"; + version = "2022-10-31"; src = fetchFromGitHub { owner = "lewis6991"; repo = "gitsigns.nvim"; - rev = "9110ea15a134b421723cc45c3a8775a6491df39a"; - sha256 = "16mvlivkcfnvchlw9lqfxhs3bw4nbrv0jmkpqbm4adxz4wmplfna"; + rev = "d3a8ba0b0d34bbac482b963e52b346065169fa20"; + sha256 = "0v4gyzgl9k463i66xpj80h02gbxy96hawm0lqffvyzhqkgab143n"; }; meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/"; }; @@ -3384,12 +3384,12 @@ final: prev: gruvbox-nvim = buildVimPluginFrom2Nix { pname = "gruvbox.nvim"; - version = "2022-10-28"; + version = "2022-11-01"; src = fetchFromGitHub { owner = "ellisonleao"; repo = "gruvbox.nvim"; - rev = "e9992fe5193f0d8d3694cec9171b678f514d0aea"; - sha256 = "1syjwbpg5x4p1csvyg3qrb82v5zsfxnqmqzh0xqx1i7pa20fxhiq"; + rev = "9002dc7a717d38b7bbe212febe6370fd7d047308"; + sha256 = "0hk298ah362kshvpxi3cjmp06yl7jnsj32n05pfw7a1nfiflk6xq"; }; meta.homepage = "https://github.com/ellisonleao/gruvbox.nvim/"; }; @@ -3455,12 +3455,12 @@ final: prev: haskell-tools-nvim = buildVimPluginFrom2Nix { pname = "haskell-tools.nvim"; - version = "2022-10-26"; + version = "2022-11-01"; src = fetchFromGitHub { owner = "MrcJkb"; repo = "haskell-tools.nvim"; - rev = "f7f740901a667322bb0f70a50d405448afdf40c1"; - sha256 = "1ncfpw0fyvg6xbvac6j0cwz0258q1hkvf5ci4ygp7apppymj5h80"; + rev = "249bf253c58b9e70d24a02c5231a75f69d170abe"; + sha256 = "0qyfy5ll3rj1svp0ahbq1f3l3ywk02wm5b2d58ccgw6zfcwndm4y"; }; meta.homepage = "https://github.com/MrcJkb/haskell-tools.nvim/"; }; @@ -3551,12 +3551,12 @@ final: prev: hop-nvim = buildVimPluginFrom2Nix { pname = "hop.nvim"; - version = "2022-10-09"; + version = "2022-10-30"; src = fetchFromGitHub { owner = "phaazon"; repo = "hop.nvim"; - rev = "6591b3656b75ff313cc38dc662a7ee8f75f1c165"; - sha256 = "1y6jvl8q8j46zy1c18xi0hfdbma2cq7g3k0ymw05qghvvjyv65bq"; + rev = "90db1b2c61b820e230599a04fedcd2679e64bd07"; + sha256 = "18akjbplhp27di5l0bi9yd2haysgvw8yv3yk6cgwbizmk6inb5ji"; }; meta.homepage = "https://github.com/phaazon/hop.nvim/"; }; @@ -3852,12 +3852,12 @@ final: prev: jsonc-vim = buildVimPluginFrom2Nix { pname = "jsonc.vim"; - version = "2021-12-20"; + version = "2022-10-31"; src = fetchFromGitHub { owner = "neoclide"; repo = "jsonc.vim"; - rev = "b87595ba7f3fa4bdcc8803a2ec72574719fc9fd6"; - sha256 = "02bgqxi20lmq97s9nnsb1mmjp45fh5a9pbhbs6hl2zmb03spbvpi"; + rev = "6fb92460f9e50505c9b93181a00f27d10c9b383f"; + sha256 = "1z2zi951xgssq1d343b0rhcj1xn4qwvv1b2wzvy8jg7ak9pgrl1a"; }; meta.homepage = "https://github.com/neoclide/jsonc.vim/"; }; @@ -4020,24 +4020,24 @@ final: prev: leap-nvim = buildVimPluginFrom2Nix { pname = "leap.nvim"; - version = "2022-10-23"; + version = "2022-10-30"; src = fetchFromGitHub { owner = "ggandor"; repo = "leap.nvim"; - rev = "847a1dcfb1a3a576860151754d95fb3b0014663e"; - sha256 = "16dg98qs0531hfcvg6mfb643nivgsx6q4jz8yl2cqd89c0mkfgq4"; + rev = "ba4241754451e6bb4d8e9e4000caba0a35fba75b"; + sha256 = "17rcvzyga4azz5s28yaa26l40xcfrwks4mhjlxkw2wj2az3ss3sf"; }; meta.homepage = "https://github.com/ggandor/leap.nvim/"; }; legendary-nvim = buildVimPluginFrom2Nix { pname = "legendary.nvim"; - version = "2022-10-26"; + version = "2022-10-30"; src = fetchFromGitHub { owner = "mrjones2014"; repo = "legendary.nvim"; - rev = "32b6ffbebe88751ae07812a93d44b833fdf2d00e"; - sha256 = "0mkixp8sv85x7zfs3sm8k8xmnqvxhh0pz58kmfadkjw1vxs09aiy"; + rev = "cf388c44976ca8a9f950d98879b3e98d0f0f4b83"; + sha256 = "0y0zndgs43aa30pdqjpsf1kyc65vg3klwfqqkkz3dkk75417xi2x"; }; meta.homepage = "https://github.com/mrjones2014/legendary.nvim/"; }; @@ -4391,12 +4391,12 @@ final: prev: lsp_signature-nvim = buildVimPluginFrom2Nix { pname = "lsp_signature.nvim"; - version = "2022-10-29"; + version = "2022-10-30"; src = fetchFromGitHub { owner = "ray-x"; repo = "lsp_signature.nvim"; - rev = "137bfaa7c112cb058f8e999a8fb49363fae3a697"; - sha256 = "1vzz5indyx56jifcqrk8fhxyy3dbvw1p9w4sxcg9vxjv05a1jpqx"; + rev = "7a1845e8b5fc68dc5ea2a1a7d2d2b04395b6b190"; + sha256 = "1bw06dxd36k9ylwidv8yynrqg4w17lda4piajfc73h30w29z28cp"; }; meta.homepage = "https://github.com/ray-x/lsp_signature.nvim/"; }; @@ -4463,12 +4463,12 @@ final: prev: luasnip = buildVimPluginFrom2Nix { pname = "luasnip"; - version = "2022-10-14"; + version = "2022-11-01"; src = fetchFromGitHub { owner = "l3mon4d3"; repo = "luasnip"; - rev = "663d54482b11bca1ce94f56993b9f6ab485a13dc"; - sha256 = "11dca07m9msyqqdbjrb4136hi77m8vh0jqpf2w0kjs6d9m63g0ab"; + rev = "619796e2477f7233e5fdff456240676a08482684"; + sha256 = "1dy46rw1ba7px05h917hmc3mr11dp5q6jy9qs63f59jck24v0xqg"; fetchSubmodules = true; }; meta.homepage = "https://github.com/l3mon4d3/luasnip/"; @@ -4548,12 +4548,12 @@ final: prev: material-nvim = buildVimPluginFrom2Nix { pname = "material.nvim"; - version = "2022-10-27"; + version = "2022-11-01"; src = fetchFromGitHub { owner = "marko-cerovac"; repo = "material.nvim"; - rev = "7c79f4d9d22a42d35a093be3df215849bee68bd0"; - sha256 = "19fhzf0db23w5d250jbwghg7x70zjb4dck141x6kaaaq69x42jny"; + rev = "3a9c06c398370afec624121fd0ebf5089ad910c5"; + sha256 = "1v9vsphnp19p989rv0b4c8nix89kgc2w9kfqwn6an5103cl43yia"; }; meta.homepage = "https://github.com/marko-cerovac/material.nvim/"; }; @@ -4572,12 +4572,12 @@ final: prev: mini-nvim = buildVimPluginFrom2Nix { pname = "mini.nvim"; - version = "2022-10-25"; + version = "2022-10-30"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.nvim"; - rev = "dc0ccf1b0499d649a6177d2a406babcfe73b97de"; - sha256 = "1zxhxrac6y3pnsbcay8pxh3jiihhn2sdak0lhaj36dbj915lxrw8"; + rev = "3d6128b8f7c90ef8cdb0ebb7ea2f96544fa8d060"; + sha256 = "1y514ysh0jgx9bjh5mcnmiic4m9jzz0w2jmlsf9n42hpazbi6z22"; }; meta.homepage = "https://github.com/echasnovski/mini.nvim/"; }; @@ -4896,12 +4896,12 @@ final: prev: neco-vim = buildVimPluginFrom2Nix { pname = "neco-vim"; - version = "2022-05-22"; + version = "2022-10-31"; src = fetchFromGitHub { owner = "Shougo"; repo = "neco-vim"; - rev = "facc3db7c5836fe2424936e8dd06f227e20f96db"; - sha256 = "01rjirflkydx6awc7qwiiv9fln1ckfx2rnvcf1h1cz8ra8zk8qh4"; + rev = "d43fa219390094ce2a8f5c929331f0a9e2f666d1"; + sha256 = "15ri234c2hfgmbd00l3yx4a3wb8nbz2x4fnk0m0s6jaw0njsas0h"; }; meta.homepage = "https://github.com/Shougo/neco-vim/"; }; @@ -4944,12 +4944,12 @@ final: prev: neodev-nvim = buildVimPluginFrom2Nix { pname = "neodev.nvim"; - version = "2022-10-29"; + version = "2022-11-01"; src = fetchFromGitHub { owner = "folke"; repo = "neodev.nvim"; - rev = "1d5b7f0e335c81c5f2549d8d2b234ae7aa6b5a7c"; - sha256 = "01nc7yr5wpiw3fsk6829riys2n9w9dfd70wjan057j39xqgh2ibf"; + rev = "d9d2afc71ad32ed1edb2feecfa7c5b30ce78583a"; + sha256 = "0bgfq9lihw77x9xyfizi0p5ixf7nx0spn4v3y1469mkmgab9zfm1"; }; meta.homepage = "https://github.com/folke/neodev.nvim/"; }; @@ -5028,12 +5028,12 @@ final: prev: neorg = buildVimPluginFrom2Nix { pname = "neorg"; - version = "2022-10-25"; + version = "2022-10-30"; src = fetchFromGitHub { owner = "nvim-neorg"; repo = "neorg"; - rev = "10cd28e3bec3f6583f545ba0d504e65f63a64aae"; - sha256 = "15x4zk6661g5g80xj76k2yvq4dc2w9dkac9p5l88cbrkj6xwv0jm"; + rev = "a03ae3f388133d4838553eb1ce1ef65c3dee6751"; + sha256 = "04flwch8rv0h706k0bjdgkpnnw5v17z356b91lxq0k8q0hmd196r"; }; meta.homepage = "https://github.com/nvim-neorg/neorg/"; }; @@ -5064,12 +5064,12 @@ final: prev: neosnippet-vim = buildVimPluginFrom2Nix { pname = "neosnippet.vim"; - version = "2022-09-07"; + version = "2022-11-01"; src = fetchFromGitHub { owner = "Shougo"; repo = "neosnippet.vim"; - rev = "af18dc963b706568bf28f7dd2facea2ca2784299"; - sha256 = "130x7nfygwqgwmaly77zp37z3gh16jyjvrb7sk4pg19d5ax8ysbr"; + rev = "b7c241fb5737c50bf09cf1e26298492c3fc0457a"; + sha256 = "11gbxkmbiiklqa8gzjm7dhg3xsv9k2wl131q6g18nwyrc5gaw8vb"; }; meta.homepage = "https://github.com/Shougo/neosnippet.vim/"; }; @@ -5088,12 +5088,12 @@ final: prev: neotest-haskell = buildVimPluginFrom2Nix { pname = "neotest-haskell"; - version = "2022-10-15"; + version = "2022-10-29"; src = fetchFromGitHub { owner = "MrcJkb"; repo = "neotest-haskell"; - rev = "d89b5e3e676923e3a373965fd7b6bcd705e14e74"; - sha256 = "1j13q6wz2ci58mzyyq4p5apn86xplywal96bnsm1dqwmn1bb1707"; + rev = "550815b39a306dddffd133c29a9f8a4907ef4f1a"; + sha256 = "1zxlqqn490sahv3kp0hkxwqmy1a5wm4qixs4gn67vd5xl2d1jprh"; }; meta.homepage = "https://github.com/MrcJkb/neotest-haskell/"; }; @@ -5292,12 +5292,12 @@ final: prev: nord-nvim = buildVimPluginFrom2Nix { pname = "nord.nvim"; - version = "2022-10-23"; + version = "2022-11-01"; src = fetchFromGitHub { owner = "shaunsingh"; repo = "nord.nvim"; - rev = "c8d932b46f3583f072c87204dd6fb575972053db"; - sha256 = "191fhg7jffna513hvks7i9b2bs086dj4vmjf2nhdr6w32m4fh4vh"; + rev = "a6bb6a8b71fdd5329d0ae0fd637e700b12e4a5cb"; + sha256 = "0p1bdpi1h4nxrpkv90xqzhlbbgndy18xg64ws7izxqhkwjm5bv79"; }; meta.homepage = "https://github.com/shaunsingh/nord.nvim/"; }; @@ -5400,12 +5400,12 @@ final: prev: nvim-base16 = buildVimPluginFrom2Nix { pname = "nvim-base16"; - version = "2022-10-19"; + version = "2022-11-01"; src = fetchFromGitHub { owner = "RRethy"; repo = "nvim-base16"; - rev = "52e077ffadf3c03d2186515091fa9a88a1f950ac"; - sha256 = "198hfiksp29pdqwklkbc5zp63wnvwz7d39vxpklywyvy1wdf6l1b"; + rev = "a1010173d1cf2fa719618644c2373611ea379402"; + sha256 = "17pwi0haqj7f4d81i148y5p6k5fczj6898p828gjxjm5f0blk2pj"; }; meta.homepage = "https://github.com/RRethy/nvim-base16/"; }; @@ -5424,12 +5424,12 @@ final: prev: nvim-bqf = buildVimPluginFrom2Nix { pname = "nvim-bqf"; - version = "2022-10-29"; + version = "2022-11-01"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "nvim-bqf"; - rev = "6ed03197868e30a6c6e99b1e7ea8a2ef66e06ace"; - sha256 = "1ayjymqy8qj2lbkjggg2xamjrw4rzdqa005rbs6xy5m86q5rjj25"; + rev = "9ed5353e69a919bdcfb66f2708bc0974ecc79a23"; + sha256 = "1skkj6kp8llmln2v8g9kz77y6253nsbhr6zxs5ln3fpawk0s7ajs"; }; meta.homepage = "https://github.com/kevinhwang91/nvim-bqf/"; }; @@ -5580,12 +5580,12 @@ final: prev: nvim-dap-python = buildVimPluginFrom2Nix { pname = "nvim-dap-python"; - version = "2022-10-09"; + version = "2022-11-01"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-dap-python"; - rev = "408186a9d1e03e078e3603af912f9e264ceb2742"; - sha256 = "131a8m5ngxlpbx2b9syksmcci7fff03naw56z7djkvs1w6zh4ln4"; + rev = "27a0eff2bd3114269bb010d895b179e667e712bd"; + sha256 = "1pypxg18qj74yjlfrr9wdd0w0hlh2mvd5xv381rhnzvb4h8hnp2j"; }; meta.homepage = "https://github.com/mfussenegger/nvim-dap-python/"; }; @@ -5652,12 +5652,12 @@ final: prev: nvim-gdb = buildVimPluginFrom2Nix { pname = "nvim-gdb"; - version = "2022-10-29"; + version = "2022-10-30"; src = fetchFromGitHub { owner = "sakhnik"; repo = "nvim-gdb"; - rev = "044fc1ef23f485b4fde75b838f0fa27490377854"; - sha256 = "0qag2blr9zc3dl1gw1606gqrc1c03k0c5vg0dflkg31vpdgiqvv4"; + rev = "2ff5622755810e795b2ed33476ab7fbfab918d15"; + sha256 = "19qc0q70l7z3q3jgyk8z5y9j6jsh97x4gaxq940zqlhya5qs783g"; }; meta.homepage = "https://github.com/sakhnik/nvim-gdb/"; }; @@ -5724,12 +5724,12 @@ final: prev: nvim-jdtls = buildVimPluginFrom2Nix { pname = "nvim-jdtls"; - version = "2022-10-28"; + version = "2022-11-01"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-jdtls"; - rev = "f39efa0e823bcc876d18a7b44d3b61191c42e61c"; - sha256 = "1wzqvqg7dzs2150wdnagkw0yaf6k73f0bzzwm4lhz0pn927hlwn1"; + rev = "7bc572fc357d7dec8d3ca620b53e763776472582"; + sha256 = "10rm01cxc1xnw7m886ssnmb5ihlsfjhp6sqm9dhmrkg4ywkbhj9m"; }; meta.homepage = "https://github.com/mfussenegger/nvim-jdtls/"; }; @@ -5784,12 +5784,12 @@ final: prev: nvim-lint = buildVimPluginFrom2Nix { pname = "nvim-lint"; - version = "2022-10-26"; + version = "2022-10-31"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-lint"; - rev = "844bb7828557052da765b9b0fa5ab0574eb7187a"; - sha256 = "13aczdfdxx7r0sambfhh8awa2azskxlyaks6vsy2jhii8698vhw9"; + rev = "82f43b518460ff4e29f6b3b2b29018012cfd1a83"; + sha256 = "17ibqbpslzgccpv447dj7cjyysyhqr4nxysyi383k1rl4a46ksb4"; }; meta.homepage = "https://github.com/mfussenegger/nvim-lint/"; }; @@ -5808,12 +5808,12 @@ final: prev: nvim-lspconfig = buildVimPluginFrom2Nix { pname = "nvim-lspconfig"; - version = "2022-10-26"; + version = "2022-11-01"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "2315a397fd5057e3a74a09a240f606af28447ebf"; - sha256 = "1rqy3lcxy8lxi041g7s5j0nvmbch6s43r6agnwspqm1ag1i7pin0"; + rev = "5f4b1fa83c80f43e434c1fb227967dac9ad8f44c"; + sha256 = "1bvf67jdf1jg0ljcm62hyzy523ngnkzhkxzny5w3z8nf30b15cd8"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -5844,12 +5844,12 @@ final: prev: nvim-metals = buildVimPluginFrom2Nix { pname = "nvim-metals"; - version = "2022-10-24"; + version = "2022-11-01"; src = fetchFromGitHub { owner = "scalameta"; repo = "nvim-metals"; - rev = "2a60af7dfe2daf6b4635c81d3241304eaa7bb741"; - sha256 = "13vvb1xjyicsh36x81jn76brh4x5qpgiyl7b0159s8xrlv67a029"; + rev = "613556dfa4cbdfcba4d515ce781e1b5f284f373c"; + sha256 = "0k04hc9xsrj0b4lavsppni9q9g1r8zlyaq7ih7rrq2slli8zvdn3"; }; meta.homepage = "https://github.com/scalameta/nvim-metals/"; }; @@ -6024,24 +6024,24 @@ final: prev: nvim-tree-lua = buildVimPluginFrom2Nix { pname = "nvim-tree.lua"; - version = "2022-10-29"; + version = "2022-10-31"; src = fetchFromGitHub { owner = "nvim-tree"; repo = "nvim-tree.lua"; - rev = "3845039c1a47ad0759a1ec7deb6f2ffb4421d175"; - sha256 = "0gdjqax9pqic56q3hjm0nk2izc72c8f8njb27cd0jsj03nnpbm1f"; + rev = "6ca6f99e7689c68679e8f0a58b421545ff52931f"; + sha256 = "0mw2sdlbmnh9x51pn6ggifk0vgik3iim6c3j3mvz3hq33qx8y75h"; }; meta.homepage = "https://github.com/nvim-tree/nvim-tree.lua/"; }; nvim-treesitter = buildVimPluginFrom2Nix { pname = "nvim-treesitter"; - version = "2022-10-29"; + version = "2022-11-01"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "9ada5f70f98d51e9e3e76018e783b39fd1cd28f7"; - sha256 = "0rcd6ssh556mna72kak325k5bi6nl91lnbhckypssaycplxdcz4w"; + rev = "e7bdcee167ae41295a3e99ad460ae80d2bb961d7"; + sha256 = "1h2aab3zgw4q48pllx211kxqaa47ridfa8w610jb0594sqwhfynx"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; @@ -6228,12 +6228,12 @@ final: prev: omnisharp-extended-lsp-nvim = buildVimPluginFrom2Nix { pname = "omnisharp-extended-lsp.nvim"; - version = "2022-05-10"; + version = "2022-10-29"; src = fetchFromGitHub { owner = "Hoffs"; repo = "omnisharp-extended-lsp.nvim"; - rev = "e0dbe96194465f26e2cfff5d170ba8c88287e329"; - sha256 = "119pc3va1g76clvm6c09jldsybjqml8fycx23lyh85f00jrwr2y9"; + rev = "83be0f285afa360ca4a134820381e54b4b7aadd3"; + sha256 = "1hdsc68qzf4j83xah72yjan7mlsvdz7w310m1qw81yzd45z0scyd"; }; meta.homepage = "https://github.com/Hoffs/omnisharp-extended-lsp.nvim/"; }; @@ -6300,12 +6300,12 @@ final: prev: onenord-nvim = buildVimPluginFrom2Nix { pname = "onenord.nvim"; - version = "2022-10-19"; + version = "2022-10-30"; src = fetchFromGitHub { owner = "rmehri01"; repo = "onenord.nvim"; - rev = "1d4c13a7fb6480e4dd508cda8207732f18d419bf"; - sha256 = "0l65mnshc6hmsarbr002z06k7c88aqyl0d4s9qqwdchlbi7h11dj"; + rev = "9f797bee2853d94d8e8fdf05d277aa1ec21043eb"; + sha256 = "0d0vj1xf6v44kbkz0dgq51d4vfkn30v4gkmf7wln87v5ka1l63j6"; }; meta.homepage = "https://github.com/rmehri01/onenord.nvim/"; }; @@ -6565,12 +6565,12 @@ final: prev: project-nvim = buildVimPluginFrom2Nix { pname = "project.nvim"; - version = "2022-09-18"; + version = "2022-10-29"; src = fetchFromGitHub { owner = "ahmedkhalf"; repo = "project.nvim"; - rev = "628de7e433dd503e782831fe150bb750e56e55d6"; - sha256 = "0p7j5hh45rdricrryy87m7p26wdg6fs07gbyjhrvzxvbsmfbzn9s"; + rev = "685bc8e3890d2feb07ccf919522c97f7d33b94e4"; + sha256 = "0s734kpy3hslb7n6y94cv08clvxh5qp6br1ns3178y99ysv36vkx"; }; meta.homepage = "https://github.com/ahmedkhalf/project.nvim/"; }; @@ -6606,7 +6606,7 @@ final: prev: owner = "python-mode"; repo = "python-mode"; rev = "85d2cd1a196ac1def79d4599b5be69395ed5b603"; - sha256 = "0jk8pssliyar4qs42x9m1jgri446cr4yc7iv8l9wc9xn6r3qnm29"; + sha256 = "0gr4ag5qymdpx0mlfvx743y4s8bjd7v4a0yzd02jvmz3dyylvavw"; fetchSubmodules = true; }; meta.homepage = "https://github.com/python-mode/python-mode/"; @@ -6770,12 +6770,12 @@ final: prev: registers-nvim = buildVimPluginFrom2Nix { pname = "registers.nvim"; - version = "2022-10-29"; + version = "2022-11-01"; src = fetchFromGitHub { owner = "tversteeg"; repo = "registers.nvim"; - rev = "15261a88fbbe0081db0d25655c8514234dcace11"; - sha256 = "0hwkvw164wk32vw1xb6dsp0a2w2c1i2zddi5l622jb81xsl2sw6m"; + rev = "395e119782845fe8fa3b7d6d17c60745a2004515"; + sha256 = "0lxfs4rvnvgc7qmcyqspgza70m66khck57fx80v4d6whz9c5ncav"; }; meta.homepage = "https://github.com/tversteeg/registers.nvim/"; }; @@ -6926,12 +6926,12 @@ final: prev: satellite-nvim = buildVimPluginFrom2Nix { pname = "satellite.nvim"; - version = "2022-10-18"; + version = "2022-10-31"; src = fetchFromGitHub { owner = "lewis6991"; repo = "satellite.nvim"; - rev = "609623c88ef9a1e6869dd20443a2027c10502b92"; - sha256 = "15jkzdzfhlr7892k9g00qnrn6yffc6fjlx5xpn1jmh28mq7fix9n"; + rev = "3673bc04db3673e15be0e82b85c29f9c14052ffd"; + sha256 = "0nl9kwys0bkzfip5p49w0f3xpj0lmkq3x9a9c3qwnp594h5qcwam"; }; meta.homepage = "https://github.com/lewis6991/satellite.nvim/"; }; @@ -7510,7 +7510,7 @@ final: prev: owner = "codota"; repo = "tabnine-vim"; rev = "e27face391a4d9a3e43ff251010f77deddf0c88d"; - sha256 = "1y5haygvixnav9cck49yvvm14afyy5gyq8rwiybqvkd6vfxlv99f"; + sha256 = "1204ibnsdksihyvnql22sarn2xgqajwvr0d975bnp35n593chymq"; fetchSubmodules = true; }; meta.homepage = "https://github.com/codota/tabnine-vim/"; @@ -7867,12 +7867,12 @@ final: prev: telescope-nvim = buildVimPluginFrom2Nix { pname = "telescope.nvim"; - version = "2022-10-26"; + version = "2022-10-31"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "97847309cbffbb33e442f07b8877d20322a26922"; - sha256 = "16haarhd71n6p0ndkl67casbk3ysbxbnsm9dkqaa4cjizdqckbj0"; + rev = "4bd4205028d6588cf2e0a1346687a6039b0f0a7c"; + sha256 = "1vs8jgxam37qrxsxgda2fw4b1qb720wvzjwyq9d5c0hbzv7iqz2b"; }; meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; }; @@ -9104,12 +9104,12 @@ final: prev: vim-closer = buildVimPluginFrom2Nix { pname = "vim-closer"; - version = "2022-08-08"; + version = "2022-11-01"; src = fetchFromGitHub { owner = "rstacruz"; repo = "vim-closer"; - rev = "6d5d6f50501dd862b1616d370566e94b44be3008"; - sha256 = "06j0z8lqbrp22skhdg6cmvd42nnlhd7v9q7z9938i7zr6bigj0cr"; + rev = "6007d9db0a35e983af246b667282606612076b07"; + sha256 = "117g4a8rl2m6b83yjicq3ghiy568z5s1mlcwi4k6w45mm21lpd5v"; }; meta.homepage = "https://github.com/rstacruz/vim-closer/"; }; @@ -9212,12 +9212,12 @@ final: prev: vim-commentary = buildVimPluginFrom2Nix { pname = "vim-commentary"; - version = "2022-03-27"; + version = "2022-10-31"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-commentary"; - rev = "3654775824337f466109f00eaf6759760f65be34"; - sha256 = "09iv58r0z3dv5fd6g8zq542rc5hz81gd5h0ncnvhx9drrl6f86ip"; + rev = "e87cd90dc09c2a203e13af9704bd0ef79303d755"; + sha256 = "09kzc89iwkgsi4wvjxk56fis462kkz5chcl9sl4hdbmpa1f41wy0"; }; meta.homepage = "https://github.com/tpope/vim-commentary/"; }; @@ -9776,12 +9776,12 @@ final: prev: vim-floaterm = buildVimPluginFrom2Nix { pname = "vim-floaterm"; - version = "2022-10-21"; + version = "2022-10-30"; src = fetchFromGitHub { owner = "voldikss"; repo = "vim-floaterm"; - rev = "b91fcd9fd69cd6a76fe430622637870255fe7715"; - sha256 = "0qfdsjjq8xfnaskr8rai0nh7535zii4w44pn2lcz4szm8za3y1ks"; + rev = "20cbfc777b783fd93259c83c96eef4a35c6ddbcd"; + sha256 = "02zwq4hq7zpqhmkir16bms8agvydc6fy51sgw6ycqib0hvsb34cd"; }; meta.homepage = "https://github.com/voldikss/vim-floaterm/"; }; @@ -9848,12 +9848,12 @@ final: prev: vim-fugitive = buildVimPluginFrom2Nix { pname = "vim-fugitive"; - version = "2022-09-04"; + version = "2022-11-01"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "dd8107cabf5fe85df94d5eedcae52415e543f208"; - sha256 = "19xrmyrqfxsx7damlbl0dd5dsr75jinmssvpvnamixzjzq6jyfr3"; + rev = "01f3e0af928857128eec8d998948b80ed1678c18"; + sha256 = "1pc40k8r1ps6dhilyfb1zxxlw5y401jcy97nvi573c9011yy4y2a"; }; meta.homepage = "https://github.com/tpope/vim-fugitive/"; }; @@ -9992,12 +9992,12 @@ final: prev: vim-go = buildVimPluginFrom2Nix { pname = "vim-go"; - version = "2022-09-03"; + version = "2022-11-01"; src = fetchFromGitHub { owner = "fatih"; repo = "vim-go"; - rev = "22b2273cfe562ac1c1af976ce77f18a3b1776f3c"; - sha256 = "0vhyz67shgl8bpp07q4r808fas83xa86kl4jh5qkyfvxd95nrrm9"; + rev = "0550762a69a2ef13d9f723c9478155dbc6ad7ddb"; + sha256 = "185ysbbipqf6fivryi4pxjmdm4vfn319w1mgm3xpg2920scybwbq"; }; meta.homepage = "https://github.com/fatih/vim-go/"; }; @@ -10293,12 +10293,12 @@ final: prev: vim-illuminate = buildVimPluginFrom2Nix { pname = "vim-illuminate"; - version = "2022-10-04"; + version = "2022-11-01"; src = fetchFromGitHub { owner = "RRethy"; repo = "vim-illuminate"; - rev = "0603e75fc4ecde1ee5a1b2fc8106ed6704f34d14"; - sha256 = "01361ss6g7kcap7hjma9ij8xa75zlvy878s4p7r5sxxbdwwpqarg"; + rev = "7a4eccd0fffe8b5dd14ad0d0400d3eab6d80c4b3"; + sha256 = "0a0d16vjr23a3q6mmz653xn1hmnd7h8dbkldvmsr4dx0spqfydp8"; }; meta.homepage = "https://github.com/RRethy/vim-illuminate/"; }; @@ -10762,12 +10762,12 @@ final: prev: vim-maktaba = buildVimPluginFrom2Nix { pname = "vim-maktaba"; - version = "2022-06-17"; + version = "2022-10-31"; src = fetchFromGitHub { owner = "google"; repo = "vim-maktaba"; - rev = "80b47c5f636c0ed0915af378b47428a83346a699"; - sha256 = "1fmq4zcx8shrkw1p2sjhncy3g7j4zka4rvr97jplf8fv40yqql1i"; + rev = "88ad116a4b2b4777ce4d0ecf214963a0c9b4fd06"; + sha256 = "07mhpr326rjfh47izx4c9hdkb5zhpbl01k0h4bbi1lxbzvsxgs9k"; }; meta.homepage = "https://github.com/google/vim-maktaba/"; }; @@ -11951,12 +11951,12 @@ final: prev: vim-slime = buildVimPluginFrom2Nix { pname = "vim-slime"; - version = "2022-10-08"; + version = "2022-10-29"; src = fetchFromGitHub { owner = "jpalardy"; repo = "vim-slime"; - rev = "9cdd180a6056e8ae0c7d3581313344b9a3e8e7e8"; - sha256 = "02f8lmyrp60myj624aqgdqg91l19rfs32gds3d2y411w0p77kzbl"; + rev = "55e8604bda53f11cbce5d2b976bacb157de70297"; + sha256 = "19r7hx4xkw3b8fc81gp1sqc4xk3w2i55mpcbsrjr1mjyjwydjb84"; }; meta.homepage = "https://github.com/jpalardy/vim-slime/"; }; @@ -12107,12 +12107,12 @@ final: prev: vim-startuptime = buildVimPluginFrom2Nix { pname = "vim-startuptime"; - version = "2022-10-25"; + version = "2022-10-30"; src = fetchFromGitHub { owner = "dstein64"; repo = "vim-startuptime"; - rev = "fcfa65f98046248ba2ec88ebab756b6d4e42bbc2"; - sha256 = "0rhjyiqnmfmn7sm54wg5v6j3n227ixjik29a4rllscrb1s9x91n9"; + rev = "a1e294454128062236d758cdaefee66664051a6c"; + sha256 = "0n35b7v4j95nj1n1h1j6xnp785dqm4k9fm4cpb9lx9kaf3168a7q"; }; meta.homepage = "https://github.com/dstein64/vim-startuptime/"; }; @@ -12456,12 +12456,12 @@ final: prev: vim-tpipeline = buildVimPluginFrom2Nix { pname = "vim-tpipeline"; - version = "2022-10-23"; + version = "2022-10-30"; src = fetchFromGitHub { owner = "vimpostor"; repo = "vim-tpipeline"; - rev = "abd013d512e58b3770fab65a3230cd840a24475c"; - sha256 = "0h8xa2b9q7j91x0cvsscfyqkvfzf7rx3cqs59hxxvpcw96l4qwlx"; + rev = "b8bb357570b2d95bf893345d45fed722808571ef"; + sha256 = "145crqkr4b588k64y1rczhy5ygwada8rzsrfa3gvv6xrhkya6sgg"; }; meta.homepage = "https://github.com/vimpostor/vim-tpipeline/"; }; @@ -12478,6 +12478,18 @@ final: prev: meta.homepage = "https://github.com/bronson/vim-trailing-whitespace/"; }; + vim-tridactyl = buildVimPluginFrom2Nix { + pname = "vim-tridactyl"; + version = "2022-02-10"; + src = fetchFromGitHub { + owner = "tridactyl"; + repo = "vim-tridactyl"; + rev = "f2eaa5d32614f6c35dad268dd4ed7ff33cae5070"; + sha256 = "139kl89k5alh8bpa4wywsmvjnxlxzsdbhxn2w8rvclhwgrhkzvgd"; + }; + meta.homepage = "https://github.com/tridactyl/vim-tridactyl/"; + }; + vim-tsx = buildVimPluginFrom2Nix { pname = "vim-tsx"; version = "2017-03-16"; @@ -12624,24 +12636,24 @@ final: prev: vim-vsnip = buildVimPluginFrom2Nix { pname = "vim-vsnip"; - version = "2022-10-23"; + version = "2022-10-31"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "vim-vsnip"; - rev = "03010115eb8bdda00ce5f845cc2f7025700e33bb"; - sha256 = "1m6blqw8rii859gs7d17x50nbb4f50g2s4a56j3j2qyv1k05kafn"; + rev = "ceeee48145d27f0b3986ab6f75f52a2449974603"; + sha256 = "0zf9ki5lsn1zmnqsb31kl7x3pkd5bwrqvldp7bp00zwp2fj2z79i"; }; meta.homepage = "https://github.com/hrsh7th/vim-vsnip/"; }; vim-vsnip-integ = buildVimPluginFrom2Nix { pname = "vim-vsnip-integ"; - version = "2022-10-20"; + version = "2022-11-01"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "vim-vsnip-integ"; - rev = "4be94fb2a0d51b2fdf1a508d31cf62b3bff48e6d"; - sha256 = "0gza8nxzs6qc2w66fa1rjsgrhkmgllfflnf1jhrqn5rsdcq7fs0y"; + rev = "09fc81155166e07e4a24863894cc0108032a236f"; + sha256 = "1bkiif2i2vy28y8pr8kakzin01jfvh53lfkgpraccsi331ncrfcq"; }; meta.homepage = "https://github.com/hrsh7th/vim-vsnip-integ/"; }; @@ -12696,12 +12708,12 @@ final: prev: vim-which-key = buildVimPluginFrom2Nix { pname = "vim-which-key"; - version = "2022-10-25"; + version = "2022-10-30"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vim-which-key"; - rev = "9875baefb1d3e78abbf8f652a17e130744a37742"; - sha256 = "1xvb9xfp9ly210cxj00hp9403ny6r7cs0qhjd0kvcdgxamw1bh3a"; + rev = "398adc5bf2918ee84e78bd974a9f9d64ddfc0801"; + sha256 = "18kjcw8jdidihfscir5kihz22mvlwkbab1w5m8hc2w9qjljcza50"; }; meta.homepage = "https://github.com/liuchengxu/vim-which-key/"; }; @@ -12961,12 +12973,12 @@ final: prev: vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2022-10-29"; + version = "2022-10-31"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "151a59eff61a1f3ca11110dd7872a04c714038c6"; - sha256 = "1db5ldsai5szp011v8z65z4hbri807fpkb45g2f5gigw9js5xzly"; + rev = "e148cf1fdc817b6668263817634538d09bafd115"; + sha256 = "15iikf6w8x75g7wjdp469rsxraz883387cxlahc0zsl0bdbylv5q"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; @@ -12997,12 +13009,12 @@ final: prev: virtual-types-nvim = buildVimPluginFrom2Nix { pname = "virtual-types.nvim"; - version = "2022-03-17"; + version = "2022-11-01"; src = fetchFromGitHub { owner = "jubnzv"; repo = "virtual-types.nvim"; - rev = "31da847fa54b801f309a08123935626adda4aaad"; - sha256 = "0kqg29xld064fz1xly1kc7wcyck62q5hjkb5fc5vrj0zdnrdzz22"; + rev = "12d55d6dc7cebddf4ab276b5934e02e0d41416a1"; + sha256 = "14sk39py8kv9fsrw3sj6xg26mj11nf5aafqgiyc46isilmhizh4n"; }; meta.homepage = "https://github.com/jubnzv/virtual-types.nvim/"; }; @@ -13322,12 +13334,12 @@ final: prev: catppuccin-nvim = buildVimPluginFrom2Nix { pname = "catppuccin-nvim"; - version = "2022-10-27"; + version = "2022-10-31"; src = fetchFromGitHub { owner = "catppuccin"; repo = "nvim"; - rev = "e695645298320e9714d10897aadee3cb5951567a"; - sha256 = "0pbyq5z3l9sqfs412vfgg3s729smb04fvvgn673ib28i5kc5qk09"; + rev = "c4f0f1a88304378cb76ac0a0c00a99f6d58f972f"; + sha256 = "0mb3qhg5aaxvkc8h95sbwg5nm89w719l9apymc5rpmis4r0mr5zg"; }; meta.homepage = "https://github.com/catppuccin/nvim/"; }; @@ -13346,12 +13358,12 @@ final: prev: chad = buildVimPluginFrom2Nix { pname = "chad"; - version = "2022-10-29"; + version = "2022-11-01"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "chadtree"; - rev = "15f021a1284b7149f4051c598da27858ae0efe07"; - sha256 = "09f2dbvbqyvhlvxvrd5s0nljgxg47v9c4hh9864mm5k2wjfksagb"; + rev = "d7b2c15268ffbb4dedebbda34b702c89b2cd782a"; + sha256 = "1r53lz0vmfii82mchh0hlzs0zg7d7sjxiihv2bwlapwzwmdp2n4k"; }; meta.homepage = "https://github.com/ms-jpq/chadtree/"; }; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index c9146135928fe..a923677b7cfef 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -1047,6 +1047,7 @@ https://github.com/milkypostman/vim-togglelist/,, https://github.com/cespare/vim-toml/,, https://github.com/vimpostor/vim-tpipeline/,, https://github.com/bronson/vim-trailing-whitespace/,, +https://github.com/tridactyl/vim-tridactyl/,HEAD, https://github.com/ianks/vim-tsx/,, https://github.com/lumiliet/vim-twig/,, https://github.com/sodapopcan/vim-twiggy/,, diff --git a/pkgs/applications/networking/instant-messengers/feishu/default.nix b/pkgs/applications/networking/instant-messengers/feishu/default.nix index a13f161d41947..0102476954eca 100644 --- a/pkgs/applications/networking/instant-messengers/feishu/default.nix +++ b/pkgs/applications/networking/instant-messengers/feishu/default.nix @@ -84,6 +84,7 @@ stdenv.mkDerivation rec { cups libXdamage libdrm + libgcrypt libxshmfence mesa nspr diff --git a/pkgs/development/libraries/argparse/default.nix b/pkgs/development/libraries/argparse/default.nix index a903ba9b711b9..a52dc730f73ef 100644 --- a/pkgs/development/libraries/argparse/default.nix +++ b/pkgs/development/libraries/argparse/default.nix @@ -11,6 +11,13 @@ stdenv.mkDerivation rec { sha256 = "sha256-vbf4kePi5gfg9ub4aP1cCK1jtiA65bUS9+5Ghgvxt/E="; }; + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace '$'{CMAKE_INSTALL_LIBDIR_ARCHIND} '$'{CMAKE_INSTALL_LIBDIR} + substituteInPlace packaging/pkgconfig.pc.in \ + --replace '$'{prefix}/@CMAKE_INSTALL_INCLUDEDIR@ @CMAKE_INSTALL_FULL_INCLUDEDIR@ + ''; + nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/mobile/androidenv/ndk-bundle/default.nix b/pkgs/development/mobile/androidenv/ndk-bundle/default.nix index ad729e24fb8aa..f57a5c08422b1 100644 --- a/pkgs/development/mobile/androidenv/ndk-bundle/default.nix +++ b/pkgs/development/mobile/androidenv/ndk-bundle/default.nix @@ -13,7 +13,7 @@ deployAndroidPackage { ++ lib.optionals stdenv.isLinux [ autoPatchelfHook ]; autoPatchelfIgnoreMissingDeps = true; buildInputs = lib.optionals (os == "linux") [ pkgs.zlib ]; - patchInstructions = lib.optionalString (os == "linux") ('' + patchInstructions = '' patchShebangs . # TODO: allow this stuff @@ -37,9 +37,11 @@ deployAndroidPackage { addAutoPatchelfSearchPath $out/libexec/android-sdk/ndk-bundle/toolchains/llvm/prebuilt/linux-x86_64/lib64 fi - find toolchains -type d -name bin -or -name lib64 | while read dir; do - autoPatchelf "$dir" - done + if [ -d toolchains/llvm/prebuilt/linux-x86_64 ]; then + find toolchains/llvm/prebuilt/linux-x86_64 -type d -name bin -or -name lib64 | while read dir; do + autoPatchelf "$dir" + done + fi # fix ineffective PROGDIR / MYNDKDIR determination for progname in ndk-build; do @@ -47,7 +49,9 @@ deployAndroidPackage { done # Patch executables - autoPatchelf prebuilt/linux-x86_64 + if [ -d prebuild/linux-x86_64 ]; then + autoPatchelf prebuilt/linux-x86_64 + fi # wrap for progname in ndk-build; do @@ -59,6 +63,6 @@ deployAndroidPackage { for progname in ndk-build; do ln -sf ../libexec/android-sdk/ndk-bundle/$progname $out/bin/$progname done - ''); + ''; noAuditTmpdir = true; # Audit script gets invoked by the build/ component in the path for the make standalone script } diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index e3dc41ba58864..e4cc7e9e29f76 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -71,6 +71,7 @@ , "coc-jest" , "coc-json" , "coc-lists" +, "coc-ltex" , "coc-markdownlint" , "coc-metals" , "coc-pairs" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index edfa98c37478d..a62cf2315fd8a 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -92407,6 +92407,24 @@ in bypassCache = true; reconstructLock = true; }; + coc-ltex = nodeEnv.buildNodePackage { + name = "coc-ltex"; + packageName = "coc-ltex"; + version = "13.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/coc-ltex/-/coc-ltex-13.1.0.tgz"; + sha512 = "SnwfsF5dnU0T12bSe9sq2rdR/EoAqK4MxVljQM58YXpQKTps/HsCD6kiprk8oK/VMH8KaDwEEcxf2pVXq6yECQ=="; + }; + buildInputs = globalBuildInputs; + meta = { + description = "Ltex extension for coc.nvim"; + homepage = "https://valentjn.github.io/ltex/"; + license = "MPL-2.0"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; coc-markdownlint = nodeEnv.buildNodePackage { name = "coc-markdownlint"; packageName = "coc-markdownlint"; diff --git a/pkgs/development/python-modules/aeppl/default.nix b/pkgs/development/python-modules/aeppl/default.nix index 2edf88c4cf4a1..bbd13871f676d 100644 --- a/pkgs/development/python-modules/aeppl/default.nix +++ b/pkgs/development/python-modules/aeppl/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "aeppl"; - version = "0.0.35"; + version = "0.0.38"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "aesara-devs"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-HUcLa/9fTUBJYszo1SiG08t7DQiNSd8EsINkJpAeLsY="; + hash = "sha256-B9ZZEzGW4i0RRUaTAYiQ7+7pe4ArpSGcp/x4B6G7EYo="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/aesara/default.nix b/pkgs/development/python-modules/aesara/default.nix index d4f3c11605175..968652d9adf6e 100644 --- a/pkgs/development/python-modules/aesara/default.nix +++ b/pkgs/development/python-modules/aesara/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "aesara-devs"; repo = "aesara"; rev = "refs/tags/rel-${version}"; - hash = "sha256-Mt1IweQkPqxv+ynezdFHTJXU/oTOwhPkY49GzFJpPaM="; + hash = "sha256-xtnz+qKW2l8ze0EXdL9mkx0MzfAnmauC9042W2cVc5o="; }; nativeBuildInputs = [ @@ -74,14 +74,15 @@ buildPythonPackage rec { "tests/scan/" "tests/tensor/" "tests/sandbox/" + "tests/sparse/sandbox/" ]; meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64); description = "Python library to define, optimize, and efficiently evaluate mathematical expressions involving multi-dimensional arrays"; homepage = "https://github.com/aesara-devs/aesara"; changelog = "https://github.com/aesara-devs/aesara/releases"; license = licenses.bsd3; maintainers = with maintainers; [ Etjean ]; + broken = (stdenv.isLinux && stdenv.isAarch64); }; } diff --git a/pkgs/development/python-modules/ansible-compat/default.nix b/pkgs/development/python-modules/ansible-compat/default.nix index bd2e59d9b45ad..d2363d3e14a7a 100644 --- a/pkgs/development/python-modules/ansible-compat/default.nix +++ b/pkgs/development/python-modules/ansible-compat/default.nix @@ -61,6 +61,6 @@ buildPythonPackage rec { description = "A python package containing functions that help interacting with various versions of Ansible"; homepage = "https://github.com/ansible/ansible-compat"; license = licenses.mit; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/ansible-lint/default.nix b/pkgs/development/python-modules/ansible-lint/default.nix index 95d56af4e80d4..37948ff4ea66d 100644 --- a/pkgs/development/python-modules/ansible-lint/default.nix +++ b/pkgs/development/python-modules/ansible-lint/default.nix @@ -22,13 +22,13 @@ buildPythonPackage rec { pname = "ansible-lint"; - version = "6.8.2"; + version = "6.8.5"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - sha256 = "sha256-F9+ssNkTmkNczyCVI04gSR1Vb3rbl97diRtAVm4xZVM="; + sha256 = "sha256-r+lWJWLp5tGxehhltUDU9xZb8Bz+8q0DA9HK1q05f4g="; }; postPatch = '' diff --git a/pkgs/development/python-modules/arviz/default.nix b/pkgs/development/python-modules/arviz/default.nix index 8cd1ae1b83daf..eb5cbc90efa9f 100644 --- a/pkgs/development/python-modules/arviz/default.nix +++ b/pkgs/development/python-modules/arviz/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { pname = "arviz"; - version = "0.12.1"; + version = "0.13.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -40,7 +40,7 @@ buildPythonPackage rec { owner = "arviz-devs"; repo = pname; rev = "v${version}"; - hash = "sha256-5P6EXXAAS1Q2eNQuj/5JrDg0lPHfA5K4WaYfKaaXm9s="; + hash = "sha256-DGTGUMnkEQcwGR44WhmBpTBMcRcAtVIpM4YVnnlakE8="; }; propagatedBuildInputs = [ @@ -90,6 +90,10 @@ buildPythonPackage rec { "test_plot_separation" "test_plot_trace_legend" "test_cov" + # countourpy is not available at the moment + "test_plot_kde" + "test_plot_kde_2d" + "test_plot_pair" ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/asdf/default.nix b/pkgs/development/python-modules/asdf/default.nix index ed5fad93244b5..e12f3702a90af 100644 --- a/pkgs/development/python-modules/asdf/default.nix +++ b/pkgs/development/python-modules/asdf/default.nix @@ -3,7 +3,8 @@ , asdf-transform-schemas , astropy , buildPythonPackage -, fetchPypi +, fetchFromGitHub +, fetchpatch , importlib-resources , jmespath , jsonschema @@ -25,11 +26,33 @@ buildPythonPackage rec { disabled = pythonOlder "3.8"; - src = fetchPypi { - inherit pname version; - hash = "sha256-MuKmmlPRcB/EYW6AD7Pa/4G7rYAYMqe/Vj47Ycn+Pf4="; + src = fetchFromGitHub { + owner = "asdf-format/"; + repo = pname; + rev = "refs/tags/${version}"; + hash = "sha256-u8e7ot5NDRqQFH0eLVnGinBQmQD73BlR5K9HVjA7SIg="; }; + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + patches = [ + # Fix default validation, https://github.com/asdf-format/asdf/pull/1203 + (fetchpatch { + name = "default-validation.patch"; + url = "https://github.com/asdf-format/asdf/commit/6f79f620b4632e20178d9bd53528702605d3e976.patch"; + sha256 = "sha256-h/dYhXRCf5oIIC+u6+8C91mJnmEzuNmlEzqc0UEhLy0="; + excludes = [ + "CHANGES.rst" + ]; + }) + ]; + + postPatch = '' + # https://github.com/asdf-format/asdf/pull/1203 + substituteInPlace pyproject.toml \ + --replace "'jsonschema >=4.0.1, <4.10.0'," "'jsonschema >=4.0.1'," + ''; + nativeBuildInputs = [ setuptools-scm ]; @@ -62,6 +85,10 @@ buildPythonPackage rec { "asdf" ]; + disabledTests = [ + "config.rst" + ]; + meta = with lib; { description = "Python tools to handle ASDF files"; homepage = "https://github.com/asdf-format/asdf"; diff --git a/pkgs/development/python-modules/bleach/default.nix b/pkgs/development/python-modules/bleach/default.nix index 06cefc9bbb0d9..de3caef7b0d29 100644 --- a/pkgs/development/python-modules/bleach/default.nix +++ b/pkgs/development/python-modules/bleach/default.nix @@ -5,14 +5,16 @@ , six , html5lib , setuptools +, tinycss2 , packaging , pythonOlder +, webencodings }: buildPythonPackage rec { pname = "bleach"; version = "5.0.1"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; @@ -20,12 +22,19 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ - packaging - six html5lib + packaging setuptools + six + webencodings ]; + passthru.optional-dependencies = { + css = [ + tinycss2 + ]; + }; + checkInputs = [ pytestCheckHook ]; @@ -35,7 +44,9 @@ buildPythonPackage rec { "protocols" ]; - pythonImportsCheck = [ "bleach" ]; + pythonImportsCheck = [ + "bleach" + ]; meta = with lib; { description = "An easy, HTML5, whitelisting HTML sanitizer"; diff --git a/pkgs/development/python-modules/blis/default.nix b/pkgs/development/python-modules/blis/default.nix index c935c3728b014..68351bd829434 100644 --- a/pkgs/development/python-modules/blis/default.nix +++ b/pkgs/development/python-modules/blis/default.nix @@ -5,17 +5,27 @@ , hypothesis , numpy , pytest +, pythonOlder }: buildPythonPackage rec { pname = "blis"; version = "0.9.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-fOrEZoAfnZfss04Q3e2MJM9eCSfqfoNNocydLtP8Nm8="; + hash = "sha256-fOrEZoAfnZfss04Q3e2MJM9eCSfqfoNNocydLtP8Nm8="; }; + postPatch = '' + # See https://github.com/numpy/numpy/issues/21079 + substituteInPlace blis/benchmark.py \ + --replace "numpy.__config__.blas_ilp64_opt_info" "numpy.__config__.blas_opt_info" + ''; + nativeBuildInputs = [ cython ]; @@ -24,16 +34,20 @@ buildPythonPackage rec { numpy ]; - checkInputs = [ hypothesis pytest ]; + pythonImportsCheck = [ + "blis" + ]; + meta = with lib; { description = "BLAS-like linear algebra library"; homepage = "https://github.com/explosion/cython-blis"; license = licenses.bsd3; + maintainers = with maintainers; [ ]; platforms = platforms.x86_64; }; } diff --git a/pkgs/development/python-modules/cma/default.nix b/pkgs/development/python-modules/cma/default.nix index a6e3d442675f6..5f1121c8e914b 100644 --- a/pkgs/development/python-modules/cma/default.nix +++ b/pkgs/development/python-modules/cma/default.nix @@ -3,17 +3,21 @@ , fetchFromGitHub , numpy , python +, pythonOlder }: buildPythonPackage rec { pname = "cma"; version = "3.2.2"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "CMA-ES"; repo = "pycma"; rev = "refs/tags/r${version}"; - sha256 = "sha256-STF7jtLqI2KiWvvI9/reRjP1XyW8l4/qy9uAPpE9mTs="; + hash = "sha256-STF7jtLqI2KiWvvI9/reRjP1XyW8l4/qy9uAPpE9mTs="; }; propagatedBuildInputs = [ @@ -21,13 +25,18 @@ buildPythonPackage rec { ]; checkPhase = '' - ${python.executable} -m cma.test + # At least one doctest fails, thus only limited amount of files is tested + ${python.executable} -m cma.test interfaces.py purecma.py logger.py optimization_tools.py transformations.py ''; + pythonImportsCheck = [ + "cma" + ]; + meta = with lib; { - description = "CMA-ES, Covariance Matrix Adaptation Evolution Strategy for non-linear numerical optimization in Python"; + description = "Library for Covariance Matrix Adaptation Evolution Strategy for non-linear numerical optimization"; homepage = "https://github.com/CMA-ES/pycma"; license = licenses.bsd3; - maintainers = [ maintainers.costrouc ]; + maintainers = with maintainers; [ costrouc ]; }; } diff --git a/pkgs/development/python-modules/duo-client/default.nix b/pkgs/development/python-modules/duo-client/default.nix index 057881ccab1da..3a0cbd8a36fb7 100644 --- a/pkgs/development/python-modules/duo-client/default.nix +++ b/pkgs/development/python-modules/duo-client/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, freezegun , mock , nose2 , pytz @@ -10,13 +11,13 @@ buildPythonPackage rec { pname = "duo-client"; - version = "4.4.0"; + version = "4.5.0"; src = fetchFromGitHub { owner = "duosecurity"; repo = "duo_client_python"; rev = version; - sha256 = "sha256-2sodExb66+Y+aPvm+DkibPt0Bvwqjii+EoBWaopdq+E="; + sha256 = "sha256-9ADFtCrSJ4Y2QQY5YC/BMvoVZs2vaYHkhIM/rBlZm4I="; }; postPatch = '' @@ -31,6 +32,7 @@ buildPythonPackage rec { ]; checkInputs = [ + freezegun mock nose2 pytz diff --git a/pkgs/development/python-modules/hstspreload/default.nix b/pkgs/development/python-modules/hstspreload/default.nix index 386c0d5d89e04..0b97ee0174797 100644 --- a/pkgs/development/python-modules/hstspreload/default.nix +++ b/pkgs/development/python-modules/hstspreload/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { pname = "hstspreload"; - version = "2022.10.1"; + version = "2022.11.1"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -15,7 +15,7 @@ buildPythonPackage rec { owner = "sethmlarson"; repo = pname; rev = version; - sha256 = "sha256-P9aVJUkGUpghAHcJ3OQSbpx3TpkhJU7Lxp0n/RsJBYI="; + sha256 = "sha256-4GirKCe84sYV+28ODPipixV3cl7wIV/NOd+iM0Cec4I="; }; # Tests require network connection diff --git a/pkgs/development/python-modules/mezzanine/default.nix b/pkgs/development/python-modules/mezzanine/default.nix index d4087e12c88d6..2c5346e5763c3 100644 --- a/pkgs/development/python-modules/mezzanine/default.nix +++ b/pkgs/development/python-modules/mezzanine/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { version = "6.0.0"; format = "setuptools"; - disabled = pythonOlder "3.6" || isPyPy; + disabled = pythonOlder "3.7" || isPyPy; src = fetchPypi { pname = "Mezzanine"; @@ -50,10 +50,11 @@ buildPythonPackage rec { requests requests-oauthlib tzlocal - ]; + ] ++ bleach.optional-dependencies.css; # Tests Fail Due to Syntax Warning, Fixed for v3.1.11+ doCheck = false; + # sed calls will be unecessary in v3.1.11+ preConfigure = '' sed -i 's/==/>=/' setup.py diff --git a/pkgs/development/python-modules/nsz/default.nix b/pkgs/development/python-modules/nsz/default.nix new file mode 100644 index 0000000000000..c165e850de0c1 --- /dev/null +++ b/pkgs/development/python-modules/nsz/default.nix @@ -0,0 +1,30 @@ +{ lib, buildPythonPackage, fetchFromGitHub, pycryptodome, enlighten, zstandard +, withGUI ? true +, kivy +}: + +buildPythonPackage rec { + pname = "nsz"; + version = "4.1.0"; + + src = fetchFromGitHub { + owner = "nicoboss"; + repo = pname; + rev = version; + sha256 = "sha256-tdngXV+VUOAkg3lF2NOmw0mBeSEE+YpUfuKukTKcPnM="; + }; + + propagatedBuildInputs = [pycryptodome enlighten zstandard ] + ++ lib.optional withGUI kivy; + + # do not check, as nsz requires producation keys + # dumped from a Nintendo Switch. + doCheck = false; + + meta = with lib; { + homepage = "https://github.com/nicoboss/nsz"; + description = "NSZ - Homebrew compatible NSP/XCI compressor/decompressor"; + license = licenses.mit; + maintainers = with maintainers; [ eyjhb ]; + }; +} diff --git a/pkgs/development/python-modules/nvchecker/default.nix b/pkgs/development/python-modules/nvchecker/default.nix index e9bbda328fdb6..4938f2339ed39 100644 --- a/pkgs/development/python-modules/nvchecker/default.nix +++ b/pkgs/development/python-modules/nvchecker/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "nvchecker"; - version = "2.9"; + version = "2.10"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "lilydjwg"; repo = pname; rev = "v${version}"; - hash = "sha256-BlprjNfw/oas4mnnGWPpuHmdJihEGjDdKPiAWuE7m8k="; + hash = "sha256-NxHeHT56JCu8Gn/B4IcvPtgGcWH8V9CUQkJeKFcGk/Q="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pwntools/default.nix b/pkgs/development/python-modules/pwntools/default.nix index 6a20a5d4bf270..dad2c04b0d6f1 100644 --- a/pkgs/development/python-modules/pwntools/default.nix +++ b/pkgs/development/python-modules/pwntools/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , buildPythonPackage , debugger , fetchPypi @@ -77,7 +78,7 @@ buildPythonPackage rec { installShellCompletion --bash extra/bash_completion.d/shellcraft ''; - postFixup = '' + postFixup = lib.optionalString (!stdenv.isDarwin) '' mkdir -p "$out/bin" makeWrapper "${debugger}/bin/${debuggerName}" "$out/bin/pwntools-gdb" ''; diff --git a/pkgs/development/python-modules/pylsp-mypy/default.nix b/pkgs/development/python-modules/pylsp-mypy/default.nix index 718a64b28f0b0..a2504e4bbc9d4 100644 --- a/pkgs/development/python-modules/pylsp-mypy/default.nix +++ b/pkgs/development/python-modules/pylsp-mypy/default.nix @@ -1,39 +1,49 @@ { lib , buildPythonPackage , fetchFromGitHub -, mock , mypy , pytestCheckHook , python-lsp-server , pythonOlder +, toml }: buildPythonPackage rec { pname = "pylsp-mypy"; version = "0.6.3"; - disabled = pythonOlder "3.6"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "Richardk2n"; repo = "pylsp-mypy"; rev = "refs/tags/${version}"; - sha256 = "sha256-fZ2bPPjBK/H2jMI4S3EhvWJaNl4tK7HstxcHSAkoFW4="; + hash = "sha256-fZ2bPPjBK/H2jMI4S3EhvWJaNl4tK7HstxcHSAkoFW4="; }; - disabledTests = [ - "test_multiple_workspaces" - "test_option_overrides_dmypy" + propagatedBuildInputs = [ + mypy + python-lsp-server + toml ]; - checkInputs = [ pytestCheckHook mock ]; + checkInputs = [ + pytestCheckHook + ]; - propagatedBuildInputs = [ mypy python-lsp-server ]; + pythonImportsCheck = [ + "pylsp_mypy" + ]; - pythonImportsCheck = [ "pylsp_mypy" ]; + disabledTests = [ + # Tests wants to call dmypy + "test_option_overrides_dmypy" + ]; meta = with lib; { - homepage = "https://github.com/Richardk2n/pylsp-mypy"; description = "Mypy plugin for the Python LSP Server"; + homepage = "https://github.com/Richardk2n/pylsp-mypy"; license = licenses.mit; maintainers = with maintainers; [ cpcloud ]; }; diff --git a/pkgs/development/python-modules/pymc/default.nix b/pkgs/development/python-modules/pymc/default.nix index ba9b82b352970..4434312e26834 100644 --- a/pkgs/development/python-modules/pymc/default.nix +++ b/pkgs/development/python-modules/pymc/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "pymc"; - version = "4.1.3"; + version = "4.3.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "pymc-devs"; repo = "pymc"; rev = "refs/tags/v${version}"; - hash = "sha256-fqhtfMGopzVgonF5+qyFhm72KV0hX8QE95slI/HBZYU="; + hash = "sha256-pkeAcsdVBDc7eKC03+FDJCYT48PaVcXT8K8U8T4gGKo="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pytest-doctestplus/default.nix b/pkgs/development/python-modules/pytest-doctestplus/default.nix index 5752bca4f66ff..9f722ca92836f 100644 --- a/pkgs/development/python-modules/pytest-doctestplus/default.nix +++ b/pkgs/development/python-modules/pytest-doctestplus/default.nix @@ -1,6 +1,5 @@ { lib , buildPythonPackage -, fetchpatch , fetchPypi , packaging , pytest @@ -11,14 +10,14 @@ buildPythonPackage rec { pname = "pytest-doctestplus"; - version = "0.11.2"; + version = "0.12.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "f393adf659709a5f111d6ca190871c61808a6f3611bd0a132e27e93b24dd3448"; + hash = "sha256-epeeS+mdkRbgesBmxfANRfOHZ319d5877zDG/6jHkYE="; }; nativeBuildInputs = [ @@ -37,15 +36,6 @@ buildPythonPackage rec { pytestCheckHook ]; - patches = [ - # Removal of distutils, https://github.com/astropy/pytest-doctestplus/pull/172 - (fetchpatch { - name = "distutils-removal.patch"; - url = "https://github.com/astropy/pytest-doctestplus/commit/ae2ee14cca0cde0fab355936995fa083529b00ff.patch"; - sha256 = "sha256-uryKV7bWw2oz0glyh2lpGqtDPFvRTo8RmI1N1n15/d4="; - }) - ]; - disabledTests = [ # ERROR: usage: __main__.py [options] [file_or_dir] [file_or_dir] [...] # __main__.py: error: unrecognized arguments: --remote-data diff --git a/pkgs/development/python-modules/python-box/default.nix b/pkgs/development/python-modules/python-box/default.nix index 4b4737b3373cc..777c54a66e1c4 100644 --- a/pkgs/development/python-modules/python-box/default.nix +++ b/pkgs/development/python-modules/python-box/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "python-box"; - version = "6.0.2"; + version = "6.1.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,8 +21,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "cdgriffith"; repo = "Box"; - rev = version; - hash = "sha256-IE2qyRzvrOTymwga+hCwE785sAVTqQtcN1DL/uADpbQ="; + rev = "refs/tags/${version}"; + hash = "sha256-42VDZ4aASFFWhRY3ApBQ4dq76eD1flZtxUM9hpA9iiI="; }; passthru.optional-dependencies = { diff --git a/pkgs/development/python-modules/python-lsp-server/default.nix b/pkgs/development/python-modules/python-lsp-server/default.nix index eafad1a9ab096..72bfed33cdb33 100644 --- a/pkgs/development/python-modules/python-lsp-server/default.nix +++ b/pkgs/development/python-modules/python-lsp-server/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , autopep8 , buildPythonPackage , fetchFromGitHub @@ -21,19 +22,10 @@ , rope , setuptools , setuptools-scm -, stdenv , ujson +, websockets , whatthepatch , yapf -, withAutopep8 ? true -, withFlake8 ? true -, withMccabe ? true -, withPycodestyle ? true -, withPydocstyle ? true -, withPyflakes ? true -, withPylint ? true -, withRope ? true -, withYapf ? true }: buildPythonPackage rec { @@ -54,7 +46,11 @@ buildPythonPackage rec { substituteInPlace pyproject.toml \ --replace "--cov-report html --cov-report term --junitxml=pytest.xml" "" \ --replace "--cov pylsp --cov test" "" \ - --replace "mccabe>=0.6.0,<0.7.0" "mccabe" + --replace "autopep8>=1.6.0,<1.7.0" "autopep8" \ + --replace "flake8>=4.0.0,<4.1.0" "flake8" \ + --replace "mccabe>=0.6.0,<0.7.0" "mccabe" \ + --replace "pycodestyle>=2.8.0,<2.9.0" "pycodestyle" \ + --replace "pyflakes>=2.4.0,<2.5.0" "pyflakes" ''; preBuild = '' @@ -68,15 +64,53 @@ buildPythonPackage rec { setuptools setuptools-scm ujson - ] ++ lib.optional withAutopep8 autopep8 - ++ lib.optional withFlake8 flake8 - ++ lib.optional withMccabe mccabe - ++ lib.optional withPycodestyle pycodestyle - ++ lib.optional withPydocstyle pydocstyle - ++ lib.optional withPyflakes pyflakes - ++ lib.optional withPylint pylint - ++ lib.optional withRope rope - ++ lib.optionals withYapf [ whatthepatch yapf ]; + ]; + + passthru.optional-dependencies = { + all = [ + autopep8 + flake8 + mccabe + pycodestyle + pydocstyle + pyflakes + pylint + rope + whatthepatch + yapf + ]; + autopep8 = [ + autopep8 + ]; + flake8 = [ + flake8 + ]; + mccabe = [ + mccabe + ]; + pycodestyle = [ + pycodestyle + ]; + pydocstyle = [ + pydocstyle + ]; + pyflakes = [ + pyflakes + ]; + pylint = [ + pylint + ]; + rope = [ + rope + ]; + yapf = [ + whatthepatch + yapf + ]; + websockets = [ + websockets + ]; + }; checkInputs = [ flaky @@ -84,26 +118,20 @@ buildPythonPackage rec { numpy pandas pytestCheckHook - ] + ] ++ passthru.optional-dependencies.all # pyqt5 is broken on aarch64-darwin - ++ lib.optionals (!stdenv.isDarwin || !stdenv.isAarch64) [ pyqt5 ]; + ++ lib.optionals (!stdenv.isDarwin || !stdenv.isAarch64) [ + pyqt5 + ]; disabledTests = [ - "test_numpy_completions" # https://github.com/python-lsp/python-lsp-server/issues/243 - ] ++ lib.optional (!withPycodestyle) "test_workspace_loads_pycodestyle_config" - # pyqt5 is broken on aarch64-darwin - ++ lib.optional (stdenv.isDarwin && stdenv.isAarch64) "test_pyqt_completion"; - - disabledTestPaths = lib.optional (!withAutopep8) "test/plugins/test_autopep8_format.py" - ++ lib.optional (!withRope) "test/plugins/test_completion.py" - ++ lib.optional (!withFlake8) "test/plugins/test_flake8_lint.py" - ++ lib.optional (!withMccabe) "test/plugins/test_mccabe_lint.py" - ++ lib.optional (!withPycodestyle) "test/plugins/test_pycodestyle_lint.py" - ++ lib.optional (!withPydocstyle) "test/plugins/test_pydocstyle_lint.py" - ++ lib.optional (!withPyflakes) "test/plugins/test_pyflakes_lint.py" - ++ lib.optional (!withPylint) "test/plugins/test_pylint_lint.py" - ++ lib.optional (!withRope) "test/plugins/test_rope_rename.py" - ++ lib.optional (!withYapf) "test/plugins/test_yapf_format.py"; + # https://github.com/python-lsp/python-lsp-server/issues/243 + "test_numpy_completions" + "test_workspace_loads_pycodestyle_config" + ] ++ lib.optional (stdenv.isDarwin && stdenv.isAarch64) [ + # pyqt5 is broken on aarch64-darwin + "test_pyqt_completion" + ]; preCheck = '' export HOME=$(mktemp -d); diff --git a/pkgs/development/python-modules/qcelemental/default.nix b/pkgs/development/python-modules/qcelemental/default.nix index 6032a98f7065c..1665367711366 100644 --- a/pkgs/development/python-modules/qcelemental/default.nix +++ b/pkgs/development/python-modules/qcelemental/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "qcelemental"; - version = "0.25.0"; + version = "0.25.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-v1yu6yBEtgVsheku/8YaIaXrsVgMzcFlWAuySPhYgyQ="; + hash = "sha256-4+DlP+BH0UdWcYRBBApdc3E18L2zPvsdY6GTW5WCGnQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/regenmaschine/default.nix b/pkgs/development/python-modules/regenmaschine/default.nix index 81f979ab0f856..ce962e7636a34 100644 --- a/pkgs/development/python-modules/regenmaschine/default.nix +++ b/pkgs/development/python-modules/regenmaschine/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "regenmaschine"; - version = "2022.10.0"; + version = "2022.10.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "bachya"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-HJgAQnBhoGo7PDwDl0XNXpSVRM8L9SFHM90kycCK0rE="; + sha256 = "sha256-BOJ2dFZ4CFII6OXzQU3Q9Mah6kRZPC5+b6ekx8ueYc4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/rpyc/default.nix b/pkgs/development/python-modules/rpyc/default.nix index d9b81ddf58078..5d9c5958bd55e 100644 --- a/pkgs/development/python-modules/rpyc/default.nix +++ b/pkgs/development/python-modules/rpyc/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , buildPythonPackage , fetchFromGitHub , hatchling @@ -50,6 +51,8 @@ buildPythonPackage rec { "rpyc" ]; + doCheck = !stdenv.isDarwin; + meta = with lib; { description = "Remote Python Call (RPyC), a transparent and symmetric RPC library"; homepage = "https://rpyc.readthedocs.org"; diff --git a/pkgs/development/python-modules/siobrultech-protocols/default.nix b/pkgs/development/python-modules/siobrultech-protocols/default.nix index 3da681dd97c74..730ca8f5d68c2 100644 --- a/pkgs/development/python-modules/siobrultech-protocols/default.nix +++ b/pkgs/development/python-modules/siobrultech-protocols/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "siobrultech-protocols"; - version = "0.6.0"; + version = "0.7.0"; disabled = pythonOlder "3.8"; @@ -18,8 +18,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "sdwilsh"; repo = "siobrultech-protocols"; - rev = "v${version}"; - hash = "sha256-d4zAwcSCyC78dJZtxFkpdYurxDRon2cRgzInllP2qJQ="; + rev = "refs/tags/v${version}"; + hash = "sha256-t8is68WrvLj57tNeM5AKuuvpn7kWbhbvoRnCI3+q4uE="; }; checkInputs = [ diff --git a/pkgs/development/python-modules/spacy-transformers/default.nix b/pkgs/development/python-modules/spacy-transformers/default.nix index f6985a613380b..914e2cb5153e5 100644 --- a/pkgs/development/python-modules/spacy-transformers/default.nix +++ b/pkgs/development/python-modules/spacy-transformers/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { postPatch = '' substituteInPlace setup.cfg \ - --replace "transformers>=3.4.0,<4.18.0" "transformers>=3.4.0 # ,<4.18.0" + --replace "transformers>=3.4.0,<4.22.0" "transformers>=3.4.0 # ,<4.22.0" ''; # Test fails due to missing arguments for trfs2arrays(). diff --git a/pkgs/development/python-modules/spacy/default.nix b/pkgs/development/python-modules/spacy/default.nix index f197b1080fb3e..54c96a73cb823 100644 --- a/pkgs/development/python-modules/spacy/default.nix +++ b/pkgs/development/python-modules/spacy/default.nix @@ -69,7 +69,7 @@ buildPythonPackage rec { postPatch = '' substituteInPlace setup.cfg \ - --replace "pydantic>=1.7.4,!=1.8,!=1.8.1,<1.9.0" "pydantic~=1.2" + --replace "typer>=0.3.0,<0.5.0" "typer>=0.3.0" ''; checkInputs = [ diff --git a/pkgs/development/python-modules/spyder/default.nix b/pkgs/development/python-modules/spyder/default.nix index 85fe9ed37e722..a5e11ebc6f00a 100644 --- a/pkgs/development/python-modules/spyder/default.nix +++ b/pkgs/development/python-modules/spyder/default.nix @@ -41,21 +41,23 @@ , textdistance , three-merge , watchdog -, pytestCheckHook }: buildPythonPackage rec { pname = "spyder"; version = "5.3.3"; + format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-vWhwn07zgHX7/7uAz0ekNwnAiKLECCBzBq47TtTaHfE="; + hash = "sha256-vWhwn07zgHX7/7uAz0ekNwnAiKLECCBzBq47TtTaHfE="; }; - nativeBuildInputs = [ pyqtwebengine.wrapQtAppsHook ]; + nativeBuildInputs = [ + pyqtwebengine.wrapQtAppsHook + ]; propagatedBuildInputs = [ atomicwrites @@ -63,19 +65,16 @@ buildPythonPackage rec { cloudpickle cookiecutter diff-match-patch - flake8 intervaltree jedi jellyfish keyring matplotlib - mccabe nbconvert numpy numpydoc psutil pygments - pylint pyls-spyder pyopengl pyqtwebengine @@ -83,7 +82,6 @@ buildPythonPackage rec { python-lsp-server pyxdg pyzmq - pycodestyle qdarkstyle qstylizer qtawesome @@ -96,7 +94,7 @@ buildPythonPackage rec { textdistance three-merge watchdog - ]; + ] ++ python-lsp-server.optional-dependencies.all; # There is no test for spyder doCheck = false; @@ -112,15 +110,16 @@ buildPythonPackage rec { }; postPatch = '' - # remove dependency on pyqtwebengine - # this is still part of the pyqt 5.11 version we have in nixpkgs + # Remove dependency on pyqtwebengine + # This is still part of the pyqt 5.11 version we have in nixpkgs sed -i /pyqtwebengine/d setup.py substituteInPlace setup.py \ + --replace "qdarkstyle>=3.0.2,<3.1.0" "qdarkstyle" \ --replace "ipython>=7.31.1,<8.0.0" "ipython" ''; postInstall = '' - # add Python libs to env so Spyder subprocesses + # Add Python libs to env so Spyder subprocesses # created to run compute kernels don't fail with ImportErrors wrapProgram $out/bin/spyder --prefix PYTHONPATH : "$PYTHONPATH" @@ -147,7 +146,7 @@ buildPythonPackage rec { downloadPage = "https://github.com/spyder-ide/spyder/releases"; changelog = "https://github.com/spyder-ide/spyder/blob/master/CHANGELOG.md"; license = licenses.mit; - platforms = platforms.linux; maintainers = with maintainers; [ gebner ]; + platforms = platforms.linux; }; } diff --git a/pkgs/development/python-modules/thinc/default.nix b/pkgs/development/python-modules/thinc/default.nix index 6da1ae8944508..334411fe26c99 100644 --- a/pkgs/development/python-modules/thinc/default.nix +++ b/pkgs/development/python-modules/thinc/default.nix @@ -1,27 +1,28 @@ { lib , stdenv -, buildPythonPackage -, python -, fetchPypi -, pytestCheckHook +, Accelerate , blis +, buildPythonPackage , catalogue -, cymem -, cython +, confection , contextvars -, dataclasses -, Accelerate , CoreFoundation , CoreGraphics , CoreVideo +, cymem +, cython +, dataclasses +, fetchPypi , hypothesis , mock , murmurhash , numpy , plac -, pythonOlder , preshed , pydantic +, pytestCheckHook +, python +, pythonOlder , srsly , tqdm , typing-extensions @@ -37,14 +38,9 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-m5AoKYTzy6rJjgNn3xsa+eSDYjG8Bj361yQqnQ3VK80="; + hash = "sha256-m5AoKYTzy6rJjgNn3xsa+eSDYjG8Bj361yQqnQ3VK80="; }; - postPatch = '' - substituteInPlace setup.cfg \ - --replace "pydantic>=1.7.4,!=1.8,!=1.8.1,<1.9.0" "pydantic" - ''; - buildInputs = [ cython ] ++ lib.optionals stdenv.isDarwin [ @@ -57,14 +53,15 @@ buildPythonPackage rec { propagatedBuildInputs = [ blis catalogue + confection cymem murmurhash numpy plac preshed + pydantic srsly tqdm - pydantic wasabi ] ++ lib.optionals (pythonOlder "3.8") [ typing-extensions @@ -93,7 +90,7 @@ buildPythonPackage rec { ]; meta = with lib; { - description = "Practical Machine Learning for NLP in Python"; + description = "Library for NLP machine learning"; homepage = "https://github.com/explosion/thinc"; license = licenses.mit; maintainers = with maintainers; [ aborsu ]; diff --git a/pkgs/development/tools/analysis/actionlint/default.nix b/pkgs/development/tools/analysis/actionlint/default.nix index 4e958176fa74f..ac255df01d357 100644 --- a/pkgs/development/tools/analysis/actionlint/default.nix +++ b/pkgs/development/tools/analysis/actionlint/default.nix @@ -10,7 +10,7 @@ buildGoModule rec { pname = "actionlint"; - version = "1.6.21"; + version = "1.6.22"; subPackages = [ "cmd/actionlint" ]; @@ -18,7 +18,7 @@ buildGoModule rec { owner = "rhysd"; repo = "actionlint"; rev = "v${version}"; - sha256 = "sha256-EbiyWDcDin11pGNIJtIVI44avNdZZ/4EmV5w22yx/YI="; + sha256 = "sha256-Gkhk6lI10pUuZN09BDhNWfTjVdc7kN6KQjgc3gFrobk="; }; vendorSha256 = "sha256-vWU3tEC+ZlrrTnX3fbuEuZRoSg1KtfpgpXmK4+HWrNY="; diff --git a/pkgs/development/tools/cloud-nuke/default.nix b/pkgs/development/tools/cloud-nuke/default.nix index b6ba3ff583f93..45246f7dfea48 100644 --- a/pkgs/development/tools/cloud-nuke/default.nix +++ b/pkgs/development/tools/cloud-nuke/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "cloud-nuke"; - version = "0.20.0"; + version = "0.21.0"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = pname; rev = "v${version}"; - sha256 = "sha256-hVRmMEdLB+vQnUrzMgEDBzoHLiB4hFyRGKFMXsvYXE4="; + sha256 = "sha256-DcR5pofMcV2Y5qVA2h3I5h/1qS25+deVAUQWIMLu/KI="; }; vendorSha256 = "sha256-GRHyoKv05JRZiY0g3Xd11liDYPcA6rfE8vorZRCV1wI="; diff --git a/pkgs/development/tools/memray/default.nix b/pkgs/development/tools/memray/default.nix index 4dc94dcf5d5a4..e1d9fa8c48f65 100644 --- a/pkgs/development/tools/memray/default.nix +++ b/pkgs/development/tools/memray/default.nix @@ -8,17 +8,19 @@ python3.pkgs.buildPythonApplication rec { pname = "memray"; - version = "1.3.1"; + version = "1.4.0"; format = "setuptools"; src = fetchFromGitHub { owner = "bloomberg"; repo = pname; rev = "v${version}"; - hash = "sha256-zHdgVpe92OiwLC4jHVtT3oC+WnB30e5U3ZOHnmuo+Ao="; + hash = "sha256-NR6wziuER7Vm4Er0WSkQKGkDOrsFUT4gmHO36h9yRWw="; }; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ + pkg-config + ]; buildInputs = [ libunwind @@ -33,6 +35,7 @@ python3.pkgs.buildPythonApplication rec { ]; checkInputs = with python3.pkgs; [ + ipython pytestCheckHook ] ++ lib.optionals (pythonOlder "3.11") [ greenlet @@ -49,6 +52,7 @@ python3.pkgs.buildPythonApplication rec { disabledTests = [ # Import issue "test_header_allocator" + "test_hybrid_stack_of_allocations_inside_ceval" ]; disabledTestPaths = [ diff --git a/pkgs/development/tools/millet/default.nix b/pkgs/development/tools/millet/default.nix index f0620b36278c6..ba206a06a1bcb 100644 --- a/pkgs/development/tools/millet/default.nix +++ b/pkgs/development/tools/millet/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "millet"; - version = "0.5.10"; + version = "0.5.12"; src = fetchFromGitHub { owner = "azdavis"; repo = pname; rev = "v${version}"; - sha256 = "sha256-6TFXaVIbdHO6smM20I2olURdBPZfcPBQ4Pyk5hU9Mx8="; + sha256 = "sha256-COVWn8RTUQSCHkjUgD9I+lZ4u/M7wqAV6tnDW7HIytY="; }; - cargoSha256 = "sha256-fsguAk77XXMaGokqyGEumngBW2G4lmSU3Q2HMo5EtKY="; + cargoSha256 = "sha256-/7I1RdDo2o2uMUVEMjSCltmU8eW39cCgpzHztePE3Kw="; postPatch = '' rm .cargo/config.toml diff --git a/pkgs/development/tools/misc/hydra/unstable.nix b/pkgs/development/tools/misc/hydra/unstable.nix index e408e61d090fc..fdae764dc4581 100644 --- a/pkgs/development/tools/misc/hydra/unstable.nix +++ b/pkgs/development/tools/misc/hydra/unstable.nix @@ -127,13 +127,13 @@ let in stdenv.mkDerivation rec { pname = "hydra"; - version = "2022-09-08"; + version = "2022-10-22"; src = fetchFromGitHub { owner = "NixOS"; repo = "hydra"; - rev = "d6cbf227cba90cf281f72f464393d75a45f2f3a8"; - sha256 = "sha256-eMStY0/cS/blRGyyp1DUpP3N0SxYZrxah+hNJeKwDSw="; + rev = "312cb42275e593eea5c44d8430ab09375fdb2fdb"; + sha256 = "sha256-ablHzPwN2Pvju0kyo8N5Wavqkl60gKHCPLnruwqvwTg="; }; patches = [ diff --git a/pkgs/development/tools/rust/cargo-deny/default.nix b/pkgs/development/tools/rust/cargo-deny/default.nix index 333a75fde2576..6d32c8b311fe2 100644 --- a/pkgs/development/tools/rust/cargo-deny/default.nix +++ b/pkgs/development/tools/rust/cargo-deny/default.nix @@ -11,19 +11,19 @@ rustPlatform.buildRustPackage rec { pname = "cargo-deny"; - version = "0.13.1"; + version = "0.13.2"; src = fetchFromGitHub { owner = "EmbarkStudios"; repo = pname; rev = version; - sha256 = "sha256-5/8ydKsYRsst4pwZgt7ST6Kzt+IeWnp46QNmh9jKwMI="; + sha256 = "sha256-5JQ4G8wyKf//KU5NRr3fLLDUKsla+965wLj3nWeaEOo="; }; # enable pkg-config feature of zstd cargoPatches = [ ./zstd-pkg-config.patch ]; - cargoSha256 = "sha256-DTNKQICmt8MufHg/kN1uuWTfKi0/GPrwUWQWyZD5kPM="; + cargoSha256 = "sha256-dNFwPP/qCyL1JWeE8y8hJR+b30tj0AQFFa42s2XjSzg="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/tools/sentry-cli/default.nix b/pkgs/development/tools/sentry-cli/default.nix index f8533f14d3e1d..19d854722235a 100644 --- a/pkgs/development/tools/sentry-cli/default.nix +++ b/pkgs/development/tools/sentry-cli/default.nix @@ -9,13 +9,13 @@ }: rustPlatform.buildRustPackage rec { pname = "sentry-cli"; - version = "2.8.0"; + version = "2.8.1"; src = fetchFromGitHub { owner = "getsentry"; repo = "sentry-cli"; rev = version; - sha256 = "sha256-4LbIzH+pFTKZWKY0QCd20V1ppJe4EIiGP0KD9VGlCtE="; + sha256 = "sha256-91nrxCqX4BJVP9gKcrWrEgjVkTnwkVKxFA8KjcFjaOs="; }; doCheck = false; @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration ]; nativeBuildInputs = [ pkg-config ]; - cargoSha256 = "sha256-U4Rpfiw/4pq9G+V/XUews+7Dt/7kqq/vYZ2t2ZO8/tM="; + cargoSha256 = "sha256-nWhqYvji53KurLGECsgE13Bwxng8CZUfdkv3mhHSl7Y="; meta = with lib; { homepage = "https://docs.sentry.io/cli/"; diff --git a/pkgs/development/web/flyctl/default.nix b/pkgs/development/web/flyctl/default.nix index 4e8f31fcc2b73..f665f763ed562 100644 --- a/pkgs/development/web/flyctl/default.nix +++ b/pkgs/development/web/flyctl/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "flyctl"; - version = "0.0.425"; + version = "0.0.426"; src = fetchFromGitHub { owner = "superfly"; repo = "flyctl"; rev = "v${version}"; - sha256 = "sha256-SIvJQbPCQhZ9zPQI5QSCOrJNlCNL+S9U2v41ik3h4HU="; + sha256 = "sha256-yZWQu3+nLcBC3s8QrP0jNWjJRaiGovAbovtSGB5xNCg="; }; vendorSha256 = "sha256-wMVvDB/6ZDY3EwTWRJ1weCIlRZM+Ye24UnRl1YZzAcA="; diff --git a/pkgs/games/factorio/versions.json b/pkgs/games/factorio/versions.json index 5adf215357d3d..92cdd1b4bd463 100644 --- a/pkgs/games/factorio/versions.json +++ b/pkgs/games/factorio/versions.json @@ -2,20 +2,20 @@ "x86_64-linux": { "alpha": { "experimental": { - "name": "factorio_alpha_x64-1.1.69.tar.xz", + "name": "factorio_alpha_x64-1.1.70.tar.xz", "needsAuth": true, - "sha256": "0ckvcwnwv1hh946qavfgaywhspd3cyasf8v7w0qmbx359dsv6yb9", + "sha256": "1d0ahy34xmj9k79kd8imnzi576ivhcvf0qqvl6r9qdc8cmbmip18", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.69/alpha/linux64", - "version": "1.1.69" + "url": "https://factorio.com/get-download/1.1.70/alpha/linux64", + "version": "1.1.70" }, "stable": { - "name": "factorio_alpha_x64-1.1.69.tar.xz", + "name": "factorio_alpha_x64-1.1.70.tar.xz", "needsAuth": true, - "sha256": "0ckvcwnwv1hh946qavfgaywhspd3cyasf8v7w0qmbx359dsv6yb9", + "sha256": "1d0ahy34xmj9k79kd8imnzi576ivhcvf0qqvl6r9qdc8cmbmip18", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.69/alpha/linux64", - "version": "1.1.69" + "url": "https://factorio.com/get-download/1.1.70/alpha/linux64", + "version": "1.1.70" } }, "demo": { @@ -38,20 +38,20 @@ }, "headless": { "experimental": { - "name": "factorio_headless_x64-1.1.69.tar.xz", + "name": "factorio_headless_x64-1.1.70.tar.xz", "needsAuth": false, - "sha256": "1rgspyynz8b8s1kwh67dwnn2mc53jrmmhy7bp7qi0vgbwpb5vhw3", + "sha256": "05bkawn394jb5d9if8xbf2xff3gnmd591axy41h7x1yg8sz94zw4", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.69/headless/linux64", - "version": "1.1.69" + "url": "https://factorio.com/get-download/1.1.70/headless/linux64", + "version": "1.1.70" }, "stable": { - "name": "factorio_headless_x64-1.1.69.tar.xz", + "name": "factorio_headless_x64-1.1.70.tar.xz", "needsAuth": false, - "sha256": "1rgspyynz8b8s1kwh67dwnn2mc53jrmmhy7bp7qi0vgbwpb5vhw3", + "sha256": "05bkawn394jb5d9if8xbf2xff3gnmd591axy41h7x1yg8sz94zw4", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.69/headless/linux64", - "version": "1.1.69" + "url": "https://factorio.com/get-download/1.1.70/headless/linux64", + "version": "1.1.70" } } } diff --git a/pkgs/misc/autotiling/default.nix b/pkgs/misc/autotiling/default.nix index 0161790fcff8f..a24095759f025 100644 --- a/pkgs/misc/autotiling/default.nix +++ b/pkgs/misc/autotiling/default.nix @@ -2,13 +2,13 @@ buildPythonApplication rec { pname = "autotiling"; - version = "1.7"; + version = "1.8"; src = fetchFromGitHub { owner = "nwg-piotr"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-2zWuATgj92s3tPqvB4INPfucmJTWYmGBx12U10qXohw="; + sha256 = "sha256-4iiiiuXCHFXEeA99ikq/G3q2KXBZ7vwpfET7QtoDVds="; }; propagatedBuildInputs = [ i3ipc importlib-metadata ]; diff --git a/pkgs/servers/endlessh/default.nix b/pkgs/servers/endlessh/default.nix index fc05ec033d4b5..e408c764939f1 100644 --- a/pkgs/servers/endlessh/default.nix +++ b/pkgs/servers/endlessh/default.nix @@ -1,4 +1,10 @@ -{ lib, stdenv, fetchFromGitHub }: +{ lib +, stdenv +, fetchFromGitHub +, testers +, endlessh +, nixosTests +}: stdenv.mkDerivation rec { pname = "endlessh"; @@ -8,17 +14,25 @@ stdenv.mkDerivation rec { owner = "skeeto"; repo = pname; rev = version; - sha256 = "0ziwr8j1frsp3dajr8h5glkm1dn5cci404kazz5w1jfrp0736x68"; + hash = "sha256-yHQzDrjZycDL/2oSQCJjxbZQJ30FoixVG1dnFyTKPH4="; }; makeFlags = [ "PREFIX=$(out)" ]; + passthru.tests = { + inherit (nixosTests) endlessh; + version = testers.testVersion { + package = endlessh; + command = "endlessh -V"; + }; + }; + meta = with lib; { description = "SSH tarpit that slowly sends an endless banner"; homepage = "https://github.com/skeeto/endlessh"; changelog = "https://github.com/skeeto/endlessh/releases/tag/${version}"; license = licenses.unlicense; - maintainers = [ maintainers.marsam ]; + maintainers = with maintainers; [ azahi marsam ]; platforms = platforms.unix; }; } diff --git a/pkgs/servers/gemini/gmid/default.nix b/pkgs/servers/gemini/gmid/default.nix index 754ab57c1c2ca..4bfff20aa39aa 100644 --- a/pkgs/servers/gemini/gmid/default.nix +++ b/pkgs/servers/gemini/gmid/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "gmid"; - version = "1.8.4"; + version = "1.8.5"; src = fetchFromGitHub { owner = "omar-polo"; repo = pname; rev = version; - hash = "sha256-WI3EJEhhd0UwtbOhRpt+8XEHuG6YrKAcT4mO1caZ+hE="; + hash = "sha256-XZcBcbSKfhXGlwAVkoXkEwASIghJfJIOebWPROy16Uo="; }; nativeBuildInputs = [ bison ]; diff --git a/pkgs/servers/jellyfin/default.nix b/pkgs/servers/jellyfin/default.nix index efff1f7ac8bf8..7b7ebc9bee629 100644 --- a/pkgs/servers/jellyfin/default.nix +++ b/pkgs/servers/jellyfin/default.nix @@ -29,13 +29,13 @@ let in buildDotnetModule rec { pname = "jellyfin"; - version = "10.8.6"; # ensure that jellyfin-web has matching version + version = "10.8.7"; # ensure that jellyfin-web has matching version src = fetchFromGitHub { owner = "jellyfin"; repo = "jellyfin"; rev = "v${version}"; - sha256 = "nZt6/PdilKXK6Z/9NtoP3MnomduoRVkkJpbL70/MLTQ="; + sha256 = "GQPnQybDnWnqkA8mIBj3x69nfUkngJOJscjdZ/N08V4="; }; patches = [ diff --git a/pkgs/servers/jellyfin/node-deps.nix b/pkgs/servers/jellyfin/node-deps.nix index 8720f4e419e0a..5f8cd76c9d139 100644 --- a/pkgs/servers/jellyfin/node-deps.nix +++ b/pkgs/servers/jellyfin/node-deps.nix @@ -11817,8 +11817,8 @@ let args = { name = "jellyfin-web"; packageName = "jellyfin-web"; - version = "10.8.6"; - src = ../../../../../../../nix/store/zk40h20vcx9jpz7kcc8fdcn5b9rbxs5p-source; + version = "10.8.7"; + src = ../../../../../../../nix/store/krfjzr2qxxnvgafvq08if2lcf53asfxs-source; dependencies = [ sources."@ampproject/remapping-2.1.2" (sources."@apideck/better-ajv-errors-0.3.3" // { diff --git a/pkgs/servers/jellyfin/web.nix b/pkgs/servers/jellyfin/web.nix index 72470aa8de8e2..a3f32c029e677 100644 --- a/pkgs/servers/jellyfin/web.nix +++ b/pkgs/servers/jellyfin/web.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "jellyfin-web"; - version = "10.8.6"; + version = "10.8.7"; src = fetchFromGitHub { owner = "jellyfin"; repo = "jellyfin-web"; rev = "v${version}"; - sha256 = "6g00UjQyPaiimHNJBout/omyerqe2hCGChNkmojELOA="; + sha256 = "8WHXgNB7yay/LgKZWNKuPo30vbS7SEM9s+EPUMyhN/g="; }; nativeBuildInputs = [ diff --git a/pkgs/servers/web-apps/invoiceplane/default.nix b/pkgs/servers/web-apps/invoiceplane/default.nix index fa79997fbd01b..670d42102f518 100644 --- a/pkgs/servers/web-apps/invoiceplane/default.nix +++ b/pkgs/servers/web-apps/invoiceplane/default.nix @@ -2,51 +2,20 @@ stdenv.mkDerivation rec { pname = "invoiceplane"; - version = "1.5.11"; + version = "1.6-beta-1"; src = fetchurl { url = "https://github.com/InvoicePlane/InvoicePlane/releases/download/v${version}/v${version}.zip"; - sha256 = "137g0xps4kb3j7f5gz84ql18iggbya6d9dnrfp05g2qcbbp8kqad"; + sha256 = "sha256-hIbk9zzqbwv2kSFClgPfTObB1YHj7KR4swKjGoN2v2E="; }; - patches = [ - - # Fix CVE-2021-29024, unauthenticated directory listing - # Should be included in a later release > 1.5.11 - # https://github.com/NixOS/nixpkgs/issues/166655 - # https://github.com/InvoicePlane/InvoicePlane/pull/754 - (fetchpatch { - url = "https://patch-diff.githubusercontent.com/raw/InvoicePlane/InvoicePlane/pull/754.patch"; - sha256 = "sha256-EHXw7Zqli/nA3tPIrhxpt8ueXvDtshz0XRzZT78sdQk="; - }) - - # Fix CVE-2021-29023, password reset rate-limiting - # Should be included in a later release > 1.5.11 - # https://github.com/NixOS/nixpkgs/issues/166655 - # https://github.com/InvoicePlane/InvoicePlane/pull/739 - (fetchpatch { - url = "https://patch-diff.githubusercontent.com/raw/InvoicePlane/InvoicePlane/pull/739.patch"; - sha256 = "sha256-6ksJjW6awr3lZsDRxa22pCcRGBVBYyV8+TbhOp6HBq0="; - }) - - # Fix CVE-2021-29022, full path disclosure - # Should be included in a later release > 1.5.11 - # https://github.com/NixOS/nixpkgs/issues/166655 - # https://github.com/InvoicePlane/InvoicePlane/pull/767 - #(fetchpatch { - # url = "https://patch-diff.githubusercontent.com/raw/InvoicePlane/InvoicePlane/pull/767.patch"; - # sha256 = "sha256-rSWDH8KeHSRWLyQEa7RSwv+8+ja9etTz+6Q9XThuwUo="; - #}) - - ]; - nativeBuildInputs = [ unzip ]; sourceRoot = "."; installPhase = '' mkdir -p $out/ - cp -r . $out/ + cp -r ip/. $out/ ''; passthru.tests = { diff --git a/pkgs/tools/graphics/resvg/default.nix b/pkgs/tools/graphics/resvg/default.nix index 617891fdb93a1..3e8ebf114ffec 100644 --- a/pkgs/tools/graphics/resvg/default.nix +++ b/pkgs/tools/graphics/resvg/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "resvg"; - version = "0.24.0"; + version = "0.25.0"; src = fetchFromGitHub { owner = "RazrFalcon"; repo = pname; rev = "v${version}"; - sha256 = "sha256-cVrfyUtgPAyQvDEbQG88xrsjo0IoRtYZgJSjRWg/WCY="; + sha256 = "sha256-XD0FEvmTDrjRD72FY6fWdAKhYSBCYVThaI9O1ToSbrc="; }; - cargoSha256 = "sha256-JR3lenTRthJmVC+dcsiX8S3iKhDbowMt9Eka5Yw/Svw="; + cargoSha256 = "sha256-gprXkLz4lvxopKHqmMNkkS4z6NTOKMAHNR1zemRNUMg="; meta = with lib; { description = "An SVG rendering library"; diff --git a/pkgs/tools/misc/fd/default.nix b/pkgs/tools/misc/fd/default.nix index 554eb5aad3ce7..d6482b58aa350 100644 --- a/pkgs/tools/misc/fd/default.nix +++ b/pkgs/tools/misc/fd/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "fd"; - version = "8.4.0"; + version = "8.5.0"; src = fetchFromGitHub { owner = "sharkdp"; repo = "fd"; rev = "v${version}"; - sha256 = "sha256-Vy5ERc4GZVEjNP0z2zZJeNwfhoL0nnOeii+TjRszrFw="; + sha256 = "sha256-FWnuV55xWL59lbLfs2IUi4QPolFGgsJDQdZCXx4PaKE="; }; - cargoSha256 = "sha256-Iz8QP9NdjbBL8j/iUV6iS3U1ErPHuC5NYFHUMtR8MZg="; + cargoSha256 = "sha256-SD0olex4wDfdGHuuiNGQwjEV7AwmDIucLJbY+7E8hZg="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/misc/flexoptix-app/default.nix b/pkgs/tools/misc/flexoptix-app/default.nix index 3e61b15414f9f..b86a6a992e180 100644 --- a/pkgs/tools/misc/flexoptix-app/default.nix +++ b/pkgs/tools/misc/flexoptix-app/default.nix @@ -1,15 +1,15 @@ { lib, appimageTools, fetchurl, nodePackages }: let pname = "flexoptix-app"; - version = "5.12.2"; + version = "5.13.0"; src = fetchurl { name = "${pname}-${version}.AppImage"; url = "https://flexbox.reconfigure.me/download/electron/linux/x64/FLEXOPTIX%20App.${version}.AppImage"; - hash = "sha256-XVswjIXnuWLRiXFc38lDhSvxYTQtYjs4V/AGdiNLX0g="; + hash = "sha256-PUGxrGHjebCxtN7Q0N/crqOHTeunWqy3wmWTGqCFYTw="; }; udevRules = fetchurl { - url = "https://www.flexoptix.net/skin/udev_rules/99-tprogrammer.rules"; + url = "https://www.flexoptix.net/static/frontend/Flexoptix/default/en_US/files/99-tprogrammer.rules"; hash = "sha256-OZe5dV50xq99olImbo7JQxPjRd7hGyBIVwFvtR9cIVc="; }; diff --git a/pkgs/tools/networking/iperf/3.nix b/pkgs/tools/networking/iperf/3.nix index 7d7e53cef763d..e370d72d7c6bb 100644 --- a/pkgs/tools/networking/iperf/3.nix +++ b/pkgs/tools/networking/iperf/3.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "iperf"; - version = "3.11"; + version = "3.12"; src = fetchurl { url = "https://downloads.es.net/pub/iperf/iperf-${version}.tar.gz"; - sha256 = "0pvy1cj92phpbldw0bdc0ds70n8irqcyn1ybyis0a6nnz84v936y"; + sha256 = "sha256-cgNOz7an1tZ+OE4Z+27/8yNspPftTFGNfbZJxEfh/9Y="; }; buildInputs = [ openssl ] ++ lib.optionals stdenv.isLinux [ lksctp-tools ]; diff --git a/pkgs/tools/networking/stunnel/default.nix b/pkgs/tools/networking/stunnel/default.nix index e37aaf77f0d6f..c87db08e88a99 100644 --- a/pkgs/tools/networking/stunnel/default.nix +++ b/pkgs/tools/networking/stunnel/default.nix @@ -1,24 +1,15 @@ -{ lib, stdenv, fetchurl, fetchpatch, openssl, nixosTests }: +{ lib, stdenv, fetchurl, openssl, nixosTests }: stdenv.mkDerivation rec { pname = "stunnel"; - version = "5.65"; + version = "5.66"; src = fetchurl { url = "https://www.stunnel.org/downloads/${pname}-${version}.tar.gz"; - sha256 = "60c500063bd1feff2877f5726e38278c086f96c178f03f09d264a2012d6bf7fc"; + sha256 = "558178704d1aa5f6883aac6cc5d6bbf2a5714c8a0d2e91da0392468cee9f579c"; # please use the contents of "https://www.stunnel.org/downloads/stunnel-${version}.tar.gz.sha256", # not the output of `nix-prefetch-url` }; - patches = [ - # Fixes compilation on darwin, patch is from - # https://github.com/mtrojnar/stunnel/pull/15. - (fetchpatch { - name = "stunnel_darwin_environ.patch"; - url = "https://github.com/mtrojnar/stunnel/commit/d41932f6d55f639cc921007c2e180a55ef88bf00.patch"; - sha256 = "sha256-d2K/BHE6GxvDCBIbttCHEVwH9SCu0jggNvhVHkC/qto="; - }) - ]; buildInputs = [ openssl ]; configureFlags = [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cd4195ee6797b..986e9b4179c77 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4652,6 +4652,8 @@ with pkgs; nsync = callPackage ../development/libraries/nsync { }; + nsz = with python3.pkgs; toPythonApplication nsz; + nwipe = callPackage ../tools/security/nwipe { }; nx2elf = callPackage ../tools/compression/nx2elf { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5aebdbef0a94a..8043050ade6f6 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6287,6 +6287,8 @@ self: super: with self; { nvidia-ml-py = callPackage ../development/python-modules/nvidia-ml-py { }; + nsz = callPackage ../development/python-modules/nsz { }; + nxt-python = callPackage ../development/python-modules/nxt-python { }; python-nvd3 = callPackage ../development/python-modules/python-nvd3 { }; |