From f37fc7adaea6434b12a7179ab644c95b0f562d63 Mon Sep 17 00:00:00 2001 From: Lite Ye Date: Sat, 22 Apr 2023 22:18:45 -0400 Subject: [PATCH 001/165] Add libappindicator to the build inputs of tauon --- pkgs/applications/audio/tauon/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/audio/tauon/default.nix b/pkgs/applications/audio/tauon/default.nix index 427c1e9e5dca..e5f32291f4e0 100644 --- a/pkgs/applications/audio/tauon/default.nix +++ b/pkgs/applications/audio/tauon/default.nix @@ -10,6 +10,7 @@ , gobject-introspection , gtk3 , kissfft +, libappindicator , libnotify , libsamplerate , libvorbis @@ -73,6 +74,7 @@ stdenv.mkDerivation rec { flac gobject-introspection gtk3 + libappindicator libnotify libopenmpt librsvg From 233af5c42afd03fc3710dcdea05cdcd5aa9c913d Mon Sep 17 00:00:00 2001 From: Aidan Gauland Date: Mon, 29 May 2023 12:42:27 +1200 Subject: [PATCH 002/165] libsForQt5.mlt: Fix build when config.cudaSupport is enabled --- pkgs/development/libraries/mlt/qt-5.nix | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/mlt/qt-5.nix b/pkgs/development/libraries/mlt/qt-5.nix index b7a881548d38..ee06a14280d0 100644 --- a/pkgs/development/libraries/mlt/qt-5.nix +++ b/pkgs/development/libraries/mlt/qt-5.nix @@ -1,4 +1,5 @@ -{ lib +{ config +, lib , fetchFromGitHub , cmake , SDL @@ -23,6 +24,8 @@ , rubberband , mkDerivation , which +, cudaSupport ? config.cudaSupport or false +, cudaPackages ? {} }: mkDerivation rec { @@ -55,9 +58,17 @@ mkDerivation rec { ladspa-sdk ladspaPlugins rubberband - ]; + ] ++ lib.optionals cudaSupport (with cudaPackages; [ + cuda_cudart + ]); - nativeBuildInputs = [ cmake which pkg-config ]; + nativeBuildInputs = [ + cmake + which + pkg-config + ] ++ lib.optionals cudaSupport (with cudaPackages; [ + cuda_nvcc + ]); outputs = [ "out" "dev" ]; From 4d2df72e6a080b5f2e5c89a4f51a9af66291083f Mon Sep 17 00:00:00 2001 From: Kiskae Date: Tue, 30 May 2023 18:35:21 +0200 Subject: [PATCH 003/165] linuxPackages_5_4_hardened.kernel: option removed in 5.4.208 change removing config option: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=d0d583484d2ed9f5903edbbfa7e2a68f78b950b0 First release after: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=77ba2b9b46f8acead2606759e8196b7076eaeeea Fixes #233268 --- pkgs/os-specific/linux/kernel/hardened/config.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/config.nix b/pkgs/os-specific/linux/kernel/hardened/config.nix index 5a1a710ba3b7..3f23b8c1344d 100644 --- a/pkgs/os-specific/linux/kernel/hardened/config.nix +++ b/pkgs/os-specific/linux/kernel/hardened/config.nix @@ -41,7 +41,7 @@ assert (versionAtLeast version "4.9"); DEBUG_SG = yes; SCHED_STACK_END_CHECK = yes; - REFCOUNT_FULL = whenOlder "5.5" yes; + REFCOUNT_FULL = whenOlder "5.4.208" yes; # Randomize page allocator when page_alloc.shuffle=1 SHUFFLE_PAGE_ALLOCATOR = whenAtLeast "5.2" yes; From a65a9e313181d325bec9abf20149bcf1bfd07de4 Mon Sep 17 00:00:00 2001 From: Kiskae Date: Tue, 30 May 2023 18:35:58 +0200 Subject: [PATCH 004/165] linuxPackages_5_4_hardened.kernel: unbreak --- pkgs/top-level/linux-kernels.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index a602c2447fb3..7a45fc7eff68 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -49,7 +49,7 @@ let broken = kernel.meta.broken || lib.versions.majorMinor version == "4.14" || - (stdenv.isx86_64 && lib.versionAtLeast version "4.19" && lib.versionOlder version "5.5"); + (stdenv.isx86_64 && lib.versions.majorMinor version == "4.19"); }; }; kernelPatches = kernel.kernelPatches ++ [ From 7f330db6cc5d0074e8a7adaa62ba874f782eb9c6 Mon Sep 17 00:00:00 2001 From: Kiskae Date: Wed, 31 May 2023 12:46:35 +0200 Subject: [PATCH 005/165] linuxKernel.packages.linux_(4_14,4_19}_hardened: unbreak --- pkgs/top-level/linux-kernels.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index 7a45fc7eff68..928c21b6b5e1 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -46,10 +46,7 @@ let inherit sha256; }; extraMeta = { - broken = - kernel.meta.broken || - lib.versions.majorMinor version == "4.14" || - (stdenv.isx86_64 && lib.versions.majorMinor version == "4.19"); + broken = kernel.meta.broken; }; }; kernelPatches = kernel.kernelPatches ++ [ From 89c480cdc0a61513128aa2424ec9545f7dcf4b6c Mon Sep 17 00:00:00 2001 From: Kiskae Date: Wed, 31 May 2023 12:45:25 +0200 Subject: [PATCH 006/165] linuxKernel.kernels.linux_*_hardened: move overrides to kernels derive `packages` from `kernels`, unify definitions --- pkgs/top-level/linux-kernels.nix | 38 ++++++++++++++++---------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index 928c21b6b5e1..2d68b6fde554 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -258,9 +258,18 @@ in { linux_hardened = hardenedKernelFor packageAliases.linux_default.kernel { }; - linux_4_14_hardened = hardenedKernelFor kernels.linux_4_14 { }; - linux_4_19_hardened = hardenedKernelFor kernels.linux_4_19 { }; - linux_5_4_hardened = hardenedKernelFor kernels.linux_5_4 { }; + linux_4_14_hardened = hardenedKernelFor kernels.linux_4_14 { + stdenv = gcc10Stdenv; + buildPackages = buildPackages // { stdenv = buildPackages.gcc10Stdenv; }; + }; + linux_4_19_hardened = hardenedKernelFor kernels.linux_4_19 { + stdenv = gcc10Stdenv; + buildPackages = buildPackages // { stdenv = buildPackages.gcc10Stdenv; }; + }; + linux_5_4_hardened = hardenedKernelFor kernels.linux_5_4 { + stdenv = gcc10Stdenv; + buildPackages = buildPackages // { stdenv = buildPackages.gcc10Stdenv; }; + }; linux_5_10_hardened = hardenedKernelFor kernels.linux_5_10 { }; linux_5_15_hardened = hardenedKernelFor kernels.linux_5_15 { }; linux_6_1_hardened = hardenedKernelFor kernels.linux_6_1 { }; @@ -600,23 +609,14 @@ in { linux_testing = packagesFor kernels.linux_testing; linux_testing_bcachefs = recurseIntoAttrs (packagesFor kernels.linux_testing_bcachefs); - linux_hardened = recurseIntoAttrs (hardenedPackagesFor packageAliases.linux_default.kernel { }); + linux_hardened = recurseIntoAttrs (packagesFor kernels.linux_hardened); - linux_4_14_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_4_14 { - stdenv = gcc10Stdenv; - buildPackages = buildPackages // { stdenv = buildPackages.gcc10Stdenv; }; - }); - linux_4_19_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_4_19 { - stdenv = gcc10Stdenv; - buildPackages = buildPackages // { stdenv = buildPackages.gcc10Stdenv; }; - }); - linux_5_4_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_5_4 { - stdenv = gcc10Stdenv; - buildPackages = buildPackages // { stdenv = buildPackages.gcc10Stdenv; }; - }); - linux_5_10_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_5_10 { }); - linux_5_15_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_5_15 { }); - linux_6_1_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_6_1 { }); + linux_4_14_hardened = recurseIntoAttrs (packagesFor kernels.linux_4_14_hardened); + linux_4_19_hardened = recurseIntoAttrs (packagesFor kernels.linux_4_19_hardened); + linux_5_4_hardened = recurseIntoAttrs (packagesFor kernels.linux_5_4_hardened); + linux_5_10_hardened = recurseIntoAttrs (packagesFor kernels.linux_5_10_hardened); + linux_5_15_hardened = recurseIntoAttrs (packagesFor kernels.linux_5_15_hardened); + linux_6_1_hardened = recurseIntoAttrs (packagesFor kernels.linux_6_1_hardened); linux_zen = recurseIntoAttrs (packagesFor kernels.linux_zen); linux_lqx = recurseIntoAttrs (packagesFor kernels.linux_lqx); From f0fb24611876f48151defbe1df51401ae926a150 Mon Sep 17 00:00:00 2001 From: misuzu Date: Fri, 19 May 2023 20:14:24 +0300 Subject: [PATCH 007/165] gotosocial: init at 0.9.0 Co-authored-by: Peder Bergebakken Sundt --- pkgs/servers/gotosocial/default.nix | 61 +++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 63 insertions(+) create mode 100644 pkgs/servers/gotosocial/default.nix diff --git a/pkgs/servers/gotosocial/default.nix b/pkgs/servers/gotosocial/default.nix new file mode 100644 index 000000000000..057fbbfb08ea --- /dev/null +++ b/pkgs/servers/gotosocial/default.nix @@ -0,0 +1,61 @@ +{ stdenv +, lib +, fetchurl +, fetchFromGitHub +, buildGoModule +}: +let + owner = "superseriousbusiness"; + repo = "gotosocial"; + + version = "0.9.0"; + source-hash = "sha256-UZRIQTdVESCYv2KW7HUS2c4bS5qnB7wdwiYAgEJ60fU="; + web-assets-hash = "sha256-OvgAr3obsK1JndLKmnjNY06dEbQKyP4xG/viBjCivvs="; + + web-assets = fetchurl { + url = "https://github.com/${owner}/${repo}/releases/download/v${version}/${repo}_${version}_web-assets.tar.gz"; + hash = web-assets-hash; + }; +in +buildGoModule rec { + inherit version; + pname = repo; + + src = fetchFromGitHub { + inherit owner repo; + rev = "refs/tags/v${version}"; + hash = source-hash; + }; + + vendorHash = null; + + ldflags = [ + "-s" + "-w" + "-X main.Version=${version}" + ]; + + postInstall = '' + tar xf ${web-assets} + mkdir -p $out/share/gotosocial + mv web $out/share/gotosocial/ + ''; + + # tests are working only on x86_64-linux + doCheck = stdenv.isLinux && stdenv.isx86_64; + + meta = with lib; { + homepage = "https://gotosocial.org"; + changelog = "https://github.com/superseriousbusiness/gotosocial/releases/tag/v${version}"; + description = "Fast, fun, ActivityPub server, powered by Go"; + longDescription = '' + ActivityPub social network server, written in Golang. + You can keep in touch with your friends, post, read, and + share images and articles. All without being tracked or + advertised to! A light-weight alternative to Mastodon + and Pleroma, with support for clients! + ''; + maintainers = with maintainers; [ misuzu ]; + license = licenses.agpl3Only; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e1b530a640a1..baf634e2f92e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25685,6 +25685,8 @@ with pkgs; mastodon = callPackage ../servers/mastodon { }; + gotosocial = callPackage ../servers/gotosocial { }; + materialize = callPackage ../servers/sql/materialize { inherit (buildPackages.darwin) bootstrap_cmds; inherit (darwin.apple_sdk.frameworks) DiskArbitration Foundation; From 45ffb33514488fd27b9355081a687db8312d97f4 Mon Sep 17 00:00:00 2001 From: misuzu Date: Fri, 19 May 2023 21:18:17 +0300 Subject: [PATCH 008/165] nixos/gotosocial: init Co-authored-by: Peder Bergebakken Sundt --- .../manual/release-notes/rl-2311.section.md | 2 + nixos/modules/module-list.nix | 1 + nixos/modules/services/web-apps/gotosocial.md | 64 +++++++ .../modules/services/web-apps/gotosocial.nix | 173 ++++++++++++++++++ nixos/tests/all-tests.nix | 1 + nixos/tests/web-apps/gotosocial.nix | 28 +++ pkgs/servers/gotosocial/default.nix | 3 + 7 files changed, 272 insertions(+) create mode 100644 nixos/modules/services/web-apps/gotosocial.md create mode 100644 nixos/modules/services/web-apps/gotosocial.nix create mode 100644 nixos/tests/web-apps/gotosocial.nix diff --git a/nixos/doc/manual/release-notes/rl-2311.section.md b/nixos/doc/manual/release-notes/rl-2311.section.md index 6f770757edba..8f67999433f0 100644 --- a/nixos/doc/manual/release-notes/rl-2311.section.md +++ b/nixos/doc/manual/release-notes/rl-2311.section.md @@ -14,6 +14,8 @@ - [river](https://github.com/riverwm/river), A dynamic tiling wayland compositor. Available as [programs.river](#opt-programs.river.enable). +- [GoToSocial](https://gotosocial.org/), an ActivityPub social network server, written in Golang. Available as [services.gotosocial](#opt-services.gotosocial.enable). + - [sitespeed-io](https://sitespeed.io), a tool that can generate metrics (timings, diagnostics) for websites. Available as [services.sitespeed-io](#opt-services.sitespeed-io.enable). ## Backward Incompatibilities {#sec-release-23.11-incompatibilities} diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 83b2a45dbd3b..42230f4524c5 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -1188,6 +1188,7 @@ ./services/web-apps/galene.nix ./services/web-apps/gerrit.nix ./services/web-apps/gotify-server.nix + ./services/web-apps/gotosocial.nix ./services/web-apps/grocy.nix ./services/web-apps/pixelfed.nix ./services/web-apps/healthchecks.nix diff --git a/nixos/modules/services/web-apps/gotosocial.md b/nixos/modules/services/web-apps/gotosocial.md new file mode 100644 index 000000000000..a290d7d1893a --- /dev/null +++ b/nixos/modules/services/web-apps/gotosocial.md @@ -0,0 +1,64 @@ +# GoToSocial {#module-services-gotosocial} + +[GoToSocial](https://gotosocial.org/) is an ActivityPub social network server, written in Golang. + +## Service configuration {#modules-services-gotosocial-service-configuration} + +The following configuration sets up the PostgreSQL as database backend and binds +GoToSocial to `127.0.0.1:8080`, expecting to be run behind a HTTP proxy on `gotosocial.example.com`. + +```nix +services.gotosocial = { + enable = true; + setupPostgresqlDB = true; + settings = { + application-name = "My GoToSocial"; + host = "gotosocial.example.com"; + protocol = "https"; + bind-address = "127.0.0.1"; + port = 8080; + }; +}; +``` + +Please refer to the [GoToSocial Documentation](https://docs.gotosocial.org/en/latest/configuration/general/) +for additional configuration options. + +## Proxy configuration {#modules-services-gotosocial-proxy-configuration} + +Although it is possible to expose GoToSocial directly, it is common practice to operate it behind an +HTTP reverse proxy such as nginx. + +```nix +networking.firewall.allowedTCPPorts = [ 80 443 ]; +services.nginx = { + enable = true; + clientMaxBodySize = "40M"; + virtualHosts = with config.services.gotosocial.settings; { + "${host}" = { + enableACME = true; + forceSSL = true; + locations = { + "/" = { + recommendedProxySettings = true; + proxyWebsockets = true; + proxyPass = "http://${bind-address}:${toString port}"; + }; + }; + }; + }; +}; +``` + +Please refer to [](#module-security-acme) for details on how to provision an SSL/TLS certificate. + +## User management {#modules-services-gotosocial-user-management} + +After the GoToSocial service is running, the `gotosocial-admin` utility can be used to manage users. In particular an +administrative user can be created with + +```ShellSession +$ sudo gotosocial-admin account create --username --email --password +$ sudo gotosocial-admin account confirm --username +$ sudo gotosocial-admin account promote --username +``` diff --git a/nixos/modules/services/web-apps/gotosocial.nix b/nixos/modules/services/web-apps/gotosocial.nix new file mode 100644 index 000000000000..f7ae018d5b7c --- /dev/null +++ b/nixos/modules/services/web-apps/gotosocial.nix @@ -0,0 +1,173 @@ +{ config, lib, pkgs, ... }: +let + cfg = config.services.gotosocial; + settingsFormat = pkgs.formats.yaml { }; + configFile = settingsFormat.generate "config.yml" cfg.settings; + defaultSettings = { + application-name = "gotosocial"; + + protocol = "https"; + + bind-address = "127.0.0.1"; + port = 8080; + + storage-local-base-path = "/var/lib/gotosocial/storage"; + + db-type = "sqlite"; + db-address = "/var/lib/gotosocial/database.sqlite"; + }; + gotosocial-admin = pkgs.writeShellScriptBin "gotosocial-admin" '' + exec systemd-run \ + -u gotosocial-admin.service \ + -p Group=gotosocial \ + -p User=gotosocial \ + -q -t -G --wait --service-type=exec \ + ${cfg.package}/bin/gotosocial --config-path ${configFile} admin "$@" + ''; +in +{ + meta.doc = ./gotosocial.md; + meta.maintainers = with lib.maintainers; [ misuzu ]; + + options.services.gotosocial = { + enable = lib.mkEnableOption (lib.mdDoc "ActivityPub social network server"); + + package = lib.mkPackageOptionMD pkgs "gotosocial" { }; + + openFirewall = lib.mkOption { + type = lib.types.bool; + default = false; + description = lib.mdDoc '' + Open the configured port in the firewall. + Using a reverse proxy instead is highly recommended. + ''; + }; + + setupPostgresqlDB = lib.mkOption { + type = lib.types.bool; + default = false; + description = lib.mdDoc '' + Whether to setup a local postgres database and populate the + `db-type` fields in `services.gotosocial.settings`. + ''; + }; + + settings = lib.mkOption { + type = settingsFormat.type; + default = defaultSettings; + example = { + application-name = "My GoToSocial"; + host = "gotosocial.example.com"; + }; + description = lib.mdDoc '' + Contents of the GoToSocial YAML config. + + Please refer to the + [documentation](https://docs.gotosocial.org/en/latest/configuration/) + and + [example config](https://github.com/superseriousbusiness/gotosocial/blob/main/example/config.yaml). + + Please note that the `host` option cannot be changed later so it is important to configure this correctly before you start GoToSocial. + ''; + }; + + environmentFile = lib.mkOption { + type = lib.types.nullOr lib.types.path; + description = lib.mdDoc '' + File path containing environment variables for configuring the GoToSocial service + in the format of an EnvironmentFile as described by systemd.exec(5). + + This option could be used to pass sensitive configuration to the GoToSocial daemon. + + Please refer to the Environment Variables section in the + [documentation](https://docs.gotosocial.org/en/latest/configuration/). + ''; + default = null; + example = "/root/nixos/secrets/gotosocial.env"; + }; + + }; + + config = lib.mkIf cfg.enable { + assertions = [ + { + assertion = cfg.settings.host or null != null; + message = '' + You have to define a hostname for GoToSocial (`services.gotosocial.settings.host`), it cannot be changed later without starting over! + ''; + } + ]; + + services.gotosocial.settings = (lib.mapAttrs (name: lib.mkDefault) ( + defaultSettings // { + web-asset-base-dir = "${cfg.package}/share/gotosocial/web/assets/"; + web-template-base-dir = "${cfg.package}/share/gotosocial/web/template/"; + } + )) // (lib.optionalAttrs cfg.setupPostgresqlDB { + db-type = "postgres"; + db-address = "/run/postgresql"; + db-database = "gotosocial"; + db-user = "gotosocial"; + }); + + environment.systemPackages = [ gotosocial-admin ]; + + users.groups.gotosocial = { }; + users.users.gotosocial = { + group = "gotosocial"; + isSystemUser = true; + }; + + networking.firewall = lib.mkIf cfg.openFirewall { + allowedTCPPorts = [ cfg.settings.port ]; + }; + + services.postgresql = lib.mkIf cfg.setupPostgresqlDB { + enable = true; + ensureDatabases = [ "gotosocial" ]; + ensureUsers = [ + { + name = "gotosocial"; + ensurePermissions = { + "DATABASE gotosocial" = "ALL PRIVILEGES"; + }; + } + ]; + }; + + systemd.services.gotosocial = { + description = "ActivityPub social network server"; + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ] + ++ lib.optional cfg.setupPostgresqlDB "postgresql.service"; + requires = lib.optional cfg.setupPostgresqlDB "postgresql.service"; + restartTriggers = [ configFile ]; + + serviceConfig = { + EnvironmentFile = lib.mkIf (cfg.environmentFile != null) cfg.environmentFile; + ExecStart = "${cfg.package}/bin/gotosocial --config-path ${configFile} server start"; + Restart = "on-failure"; + Group = "gotosocial"; + User = "gotosocial"; + StateDirectory = "gotosocial"; + WorkingDirectory = "/var/lib/gotosocial"; + + # Security options: + # Based on https://github.com/superseriousbusiness/gotosocial/blob/v0.8.1/example/gotosocial.service + AmbientCapabilities = lib.optional (cfg.settings.port < 1024) "CAP_NET_BIND_SERVICE"; + NoNewPrivileges = true; + PrivateTmp = true; + PrivateDevices = true; + RestrictAddressFamilies = "AF_UNIX AF_INET AF_INET6"; + RestrictNamespaces = true; + RestrictRealtime = true; + DevicePolicy = "closed"; + ProtectSystem = "full"; + ProtectControlGroups = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + LockPersonality = true; + }; + }; + }; +} diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index e597a26f31bb..7937e1e15b20 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -306,6 +306,7 @@ in { gonic = handleTest ./gonic.nix {}; google-oslogin = handleTest ./google-oslogin {}; gotify-server = handleTest ./gotify-server.nix {}; + gotosocial = runTest ./web-apps/gotosocial.nix; grafana = handleTest ./grafana {}; grafana-agent = handleTest ./grafana-agent.nix {}; graphite = handleTest ./graphite.nix {}; diff --git a/nixos/tests/web-apps/gotosocial.nix b/nixos/tests/web-apps/gotosocial.nix new file mode 100644 index 000000000000..6d279ab63a79 --- /dev/null +++ b/nixos/tests/web-apps/gotosocial.nix @@ -0,0 +1,28 @@ +{ lib, ... }: +{ + name = "gotosocial"; + meta.maintainers = with lib.maintainers; [ misuzu ]; + + nodes.machine = { pkgs, ... }: { + environment.systemPackages = [ pkgs.jq ]; + services.gotosocial = { + enable = true; + setupPostgresqlDB = true; + settings = { + host = "localhost:8081"; + port = 8081; + }; + }; + }; + + testScript = '' + machine.wait_for_unit("gotosocial.service") + machine.wait_for_unit("postgresql.service") + machine.wait_for_open_port(8081) + + # check user registration via cli + machine.succeed("curl -sS -f http://localhost:8081/nodeinfo/2.0 | jq '.usage.users.total' | grep -q '^0$'") + machine.succeed("gotosocial-admin account create --username nickname --email email@example.com --password kurtz575VPeBgjVm") + machine.succeed("curl -sS -f http://localhost:8081/nodeinfo/2.0 | jq '.usage.users.total' | grep -q '^1$'") + ''; +} diff --git a/pkgs/servers/gotosocial/default.nix b/pkgs/servers/gotosocial/default.nix index 057fbbfb08ea..f0c104f619ab 100644 --- a/pkgs/servers/gotosocial/default.nix +++ b/pkgs/servers/gotosocial/default.nix @@ -3,6 +3,7 @@ , fetchurl , fetchFromGitHub , buildGoModule +, nixosTests }: let owner = "superseriousbusiness"; @@ -44,6 +45,8 @@ buildGoModule rec { # tests are working only on x86_64-linux doCheck = stdenv.isLinux && stdenv.isx86_64; + passthru.tests.gotosocial = nixosTests.gotosocial; + meta = with lib; { homepage = "https://gotosocial.org"; changelog = "https://github.com/superseriousbusiness/gotosocial/releases/tag/v${version}"; From fe12b14ffdad455de14ca3c696aa510fd10cad7c Mon Sep 17 00:00:00 2001 From: Aidan Gauland Date: Mon, 29 May 2023 15:19:14 +1200 Subject: [PATCH 009/165] digikam: Fix build when config.cudaSupport is enabled --- .../applications/graphics/digikam/default.nix | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/graphics/digikam/default.nix b/pkgs/applications/graphics/digikam/default.nix index 263bfe490ba7..72e6376c6f72 100644 --- a/pkgs/applications/graphics/digikam/default.nix +++ b/pkgs/applications/graphics/digikam/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, fetchurl, cmake, doxygen, extra-cmake-modules, wrapGAppsHook +{ mkDerivation, config, lib, fetchurl, cmake, doxygen, extra-cmake-modules, wrapGAppsHook # For `digitaglinktree` , perl, sqlite @@ -52,6 +52,9 @@ , breeze-icons , oxygen + +, cudaSupport ? config.cudaSupport or false +, cudaPackages ? {} }: mkDerivation rec { @@ -63,7 +66,15 @@ mkDerivation rec { sha256 = "sha256-o/MPAbfRttWFgivNXr+N9p4P8CRWOnJGLr+AadvaIuE="; }; - nativeBuildInputs = [ cmake doxygen extra-cmake-modules kdoctools wrapGAppsHook ]; + nativeBuildInputs = [ + cmake + doxygen + extra-cmake-modules + kdoctools + wrapGAppsHook + ] ++ lib.optionals cudaSupport (with cudaPackages; [ + cuda_nvcc + ]); buildInputs = [ bison @@ -109,7 +120,9 @@ mkDerivation rec { marble oxygen threadweaver - ]; + ] ++ lib.optionals cudaSupport (with cudaPackages; [ + cuda_cudart + ]); cmakeFlags = [ "-DENABLE_MYSQLSUPPORT=1" From ed3b102d1e51fe69d73dac210719e3a75f69fa85 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Sun, 4 Jun 2023 14:20:51 +0200 Subject: [PATCH 010/165] treewide: use use lib.optionalAttrs instead of 'then {}' --- .../services/continuous-integration/buildkite-agents.nix | 2 +- nixos/modules/services/mail/rspamd.nix | 2 +- nixos/modules/services/web-apps/mattermost.nix | 3 +-- pkgs/development/coq-modules/tlc/default.nix | 4 +--- .../lisp-modules-obsolete/quicklisp-to-nix-overrides.nix | 3 +-- 5 files changed, 5 insertions(+), 9 deletions(-) diff --git a/nixos/modules/services/continuous-integration/buildkite-agents.nix b/nixos/modules/services/continuous-integration/buildkite-agents.nix index 7c8f77580ff6..a40b939a16c7 100644 --- a/nixos/modules/services/continuous-integration/buildkite-agents.nix +++ b/nixos/modules/services/continuous-integration/buildkite-agents.nix @@ -11,7 +11,7 @@ let default = null; description = lib.mdDoc description; type = types.nullOr types.lines; - } // (if example == null then {} else { inherit example; }); + } // (lib.optionalAttrs (example != null) { inherit example; }); }; mkHookOptions = hooks: listToAttrs (map mkHookOption hooks); diff --git a/nixos/modules/services/mail/rspamd.nix b/nixos/modules/services/mail/rspamd.nix index f9be9024dd4f..ca88d8122179 100644 --- a/nixos/modules/services/mail/rspamd.nix +++ b/nixos/modules/services/mail/rspamd.nix @@ -215,7 +215,7 @@ let text = v.extraConfig; }) (filterAttrs (n: v: v.extraConfig != "") cfg.workers)) - // (if cfg.extraConfig == "" then {} else { + // (lib.optionalAttrs (cfg.extraConfig != "") { "extra-config.inc".text = cfg.extraConfig; }); in diff --git a/nixos/modules/services/web-apps/mattermost.nix b/nixos/modules/services/web-apps/mattermost.nix index db5122e79f00..66e5f1695a15 100644 --- a/nixos/modules/services/web-apps/mattermost.nix +++ b/nixos/modules/services/web-apps/mattermost.nix @@ -86,8 +86,7 @@ let mattermostConf = recursiveUpdate mattermostConfWithoutPlugins ( - if mattermostPlugins == null then {} - else { + lib.optionalAttrs (mattermostPlugins != null) { PluginSettings = { Enable = true; }; diff --git a/pkgs/development/coq-modules/tlc/default.nix b/pkgs/development/coq-modules/tlc/default.nix index 8ded1abeb146..4fb67bede237 100644 --- a/pkgs/development/coq-modules/tlc/default.nix +++ b/pkgs/development/coq-modules/tlc/default.nix @@ -23,9 +23,7 @@ maintainers = [ maintainers.vbgl ]; }; }).overrideAttrs (x: - if lib.versionAtLeast x.version "20210316" - then {} - else { + lib.optionalAttrs (lib.versionOlder x.version "20210316") { installFlags = [ "CONTRIB=$(out)/lib/coq/${coq.coq-version}/user-contrib" ]; } ) diff --git a/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-overrides.nix b/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-overrides.nix index 6b0e72032126..50bf5bcc461b 100644 --- a/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-overrides.nix +++ b/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-overrides.nix @@ -4,8 +4,7 @@ let skipBuildPhase = x: { overrides = y: ((x.overrides y) // { buildPhase = "true"; }); }; - multiOverride = l: x: if l == [] then {} else - ((builtins.head l) x) // (multiOverride (builtins.tail l) x); + multiOverride = l: x: pkgs.lib.optionalAttrs (l != []) ((builtins.head l) x) // (multiOverride (builtins.tail l) x); lispName = (clwrapper.lisp.pname or (builtins.parseDrvName clwrapper.lisp.name).name); ifLispIn = l: f: if (pkgs.lib.elem lispName l) then f else (x: {}); ifLispNotIn = l: f: if ! (pkgs.lib.elem lispName l) then f else (x: {}); From d4c5f8f3943622038209660bd8fdb2fe5b3f9c5b Mon Sep 17 00:00:00 2001 From: Malo Bourgon Date: Tue, 6 Jun 2023 18:22:11 -0700 Subject: [PATCH 011/165] python3Packages.openai: 0.27.7 -> 0.27.8 Diff: https://github.com/openai/openai-python/compare/refs/tags/v0.27.7...v0.27.8 Changelog: https://github.com/openai/openai-python/releases/tag/v0.27.8 --- pkgs/development/python-modules/openai/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/openai/default.nix b/pkgs/development/python-modules/openai/default.nix index 4ccdbd94c128..2865da5cd7aa 100644 --- a/pkgs/development/python-modules/openai/default.nix +++ b/pkgs/development/python-modules/openai/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "openai"; - version = "0.27.7"; + version = "0.27.8"; format = "setuptools"; disabled = pythonOlder "3.7.1"; @@ -32,7 +32,7 @@ buildPythonPackage rec { owner = "openai"; repo = "openai-python"; rev = "refs/tags/v${version}"; - hash = "sha256-C952ZBp458kPge9ZTUBY6EoPh6Vrq9D2y1WQpCG1rEQ="; + hash = "sha256-7D7oi3NCqq0QSW66MqYMmc9ga02T5G4xFVic4PjgFRA="; }; propagatedBuildInputs = [ From e7be5d2733e467a0a07a657c126b753db3564c30 Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Tue, 6 Jun 2023 22:20:27 -0700 Subject: [PATCH 012/165] python310Packages.keepalive: remove use_2to3 --- .../python-modules/keepalive/default.nix | 20 ++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/keepalive/default.nix b/pkgs/development/python-modules/keepalive/default.nix index 6a4fcdb265f4..94a9b413c4fd 100644 --- a/pkgs/development/python-modules/keepalive/default.nix +++ b/pkgs/development/python-modules/keepalive/default.nix @@ -1,25 +1,35 @@ { lib , buildPythonPackage , fetchPypi +, fetchpatch }: buildPythonPackage rec { pname = "keepalive"; version = "0.5"; + format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "3c6b96f9062a5a76022f0c9d41e9ef5552d80b1cadd4fccc1bf8f183ba1d1ec1"; + hash = "sha256-PGuW+QYqWnYCLwydQenvVVLYCxyt1PzMG/jxg7odHsE="; }; + patches = [ + # https://github.com/wikier/keepalive/pull/11 + (fetchpatch { + name = "remove-use_2to3.patch"; + url = "https://github.com/wikier/keepalive/commit/64393f6c5bf9c69d946b584fd664dd4df72604e6.patch"; + hash = "sha256-/G1eEt8a4Qz7x5oQnDZZD/PIQwo9+oPZoy9OrXGHvR4="; + excludes = ["README.md"]; + }) + ]; + # No tests included doCheck = false; meta = with lib; { - description = "An HTTP handler for `urllib2` that supports HTTP 1.1 and keepalive"; + description = "An HTTP handler for `urllib` that supports HTTP 1.1 and keepalive"; homepage = "https://github.com/wikier/keepalive"; - license = licenses.asl20; - broken = true; # uses use_2to3, which is no longer supported for setuptools>=58 + license = licenses.lgpl21Plus; }; - } From 206d984884d21ae2d15ea23ab7ff499c68ed5521 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Sun, 23 Apr 2023 13:19:08 +0200 Subject: [PATCH 013/165] wine: tweak update script to allow gecko versions to diverge The versions for gecko should be updated to a new version for unstable/staging only --- pkgs/applications/emulators/wine/sources.nix | 22 +++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/emulators/wine/sources.nix b/pkgs/applications/emulators/wine/sources.nix index fcaa29360124..3b959dc73f47 100644 --- a/pkgs/applications/emulators/wine/sources.nix +++ b/pkgs/applications/emulators/wine/sources.nix @@ -56,7 +56,6 @@ in rec { ${updateScriptPreamble} major=''${UPDATE_NIX_OLD_VERSION%%.*} latest_stable=$(get_latest_wine_version "$major.0") - latest_gecko=$(get_latest_lib_version wine-gecko) # Can't use autobump on stable because we don't want the path # to become . @@ -64,9 +63,6 @@ in rec { set_version_and_hash stable "$latest_stable" "$(nix-prefetch-url "$wine_url_base/source/$major.0/wine-$latest_stable.tar.xz")" fi - autobump stable.gecko32 "$latest_gecko" - autobump stable.gecko64 "$latest_gecko" - do_update ''); }; @@ -76,8 +72,21 @@ in rec { version = "8.5"; url = "https://dl.winehq.org/wine/source/8.x/wine-${version}.tar.xz"; hash = "sha256-wJdmQBswu0JeEy4RSyba+kJ2SX5AzL4V+3fnUfsJvhc="; - inherit (stable) gecko32 gecko64 patches; + inherit (stable) patches; + ## see http://wiki.winehq.org/Gecko + gecko32 = fetchurl rec { + version = "2.47.3"; + url = "https://dl.winehq.org/wine/wine-gecko/${version}/wine-gecko-${version}-x86.msi"; + hash = "sha256-5bmwbTzjVWRqjS5y4ETjfh4MjRhGTrGYWtzRh6f0jgE="; + }; + gecko64 = fetchurl rec { + version = "2.47.3"; + url = "https://dl.winehq.org/wine/wine-gecko/${version}/wine-gecko-${version}-x86_64.msi"; + hash = "sha256-pT7pVDkrbR/j1oVF9uTiqXr7yNyLA6i0QzSVRc4TlnU="; + }; + + ## see http://wiki.winehq.org/Mono mono = fetchurl rec { version = "7.4.0"; url = "https://dl.winehq.org/wine/wine-mono/${version}/wine-mono-${version}-x86.msi"; @@ -88,6 +97,7 @@ in rec { ${updateScriptPreamble} major=''${UPDATE_NIX_OLD_VERSION%%.*} latest_unstable=$(get_latest_wine_version "$major.x") + latest_gecko=$(get_latest_lib_version wine-gecko) latest_mono=$(get_latest_lib_version wine-mono) update_staging() { @@ -96,6 +106,8 @@ in rec { } autobump unstable "$latest_unstable" "" update_staging + autobump unstable.gecko32 "$latest_gecko" + autobump unstable.gecko64 "$latest_gecko" autobump unstable.mono "$latest_mono" do_update From a9428cb1d996e5c6ea033a0d84499555747d5381 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Sun, 23 Apr 2023 13:21:03 +0200 Subject: [PATCH 014/165] winePackages.stable: 8.0 -> 8.0.1 https://www.winehq.org/announce/8.0.1 --- pkgs/applications/emulators/wine/sources.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/emulators/wine/sources.nix b/pkgs/applications/emulators/wine/sources.nix index 3b959dc73f47..78bc98cb20f5 100644 --- a/pkgs/applications/emulators/wine/sources.nix +++ b/pkgs/applications/emulators/wine/sources.nix @@ -24,9 +24,9 @@ let fetchurl = args@{url, hash, ...}: in rec { stable = fetchurl rec { - version = "8.0"; + version = "8.0.1"; url = "https://dl.winehq.org/wine/source/8.0/wine-${version}.tar.xz"; - hash = "sha256-AnLCCTj4chrkUQr6qLNgN0V91XZh5NZkIxB5uekceS4="; + hash = "sha256-IgNfODa0+cOxlArZD5uePBvgkjQjbSqA2JMYBTXHW30="; ## see http://wiki.winehq.org/Gecko gecko32 = fetchurl rec { From bb317093e86714c78a21f57f2480da513544eb8f Mon Sep 17 00:00:00 2001 From: natsukium Date: Thu, 8 Jun 2023 12:15:17 +0900 Subject: [PATCH 015/165] aragorn: 1.2.38 -> 1.2.41 - change the source and homepage - change the license --- .../science/biology/aragorn/default.nix | 28 +++++++++++++------ 1 file changed, 20 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/science/biology/aragorn/default.nix b/pkgs/applications/science/biology/aragorn/default.nix index fa0c10b00c20..4d5b3a4d017a 100644 --- a/pkgs/applications/science/biology/aragorn/default.nix +++ b/pkgs/applications/science/biology/aragorn/default.nix @@ -1,27 +1,39 @@ -{ lib, stdenv, fetchurl }: +{ lib, stdenv, fetchurl, installShellFiles }: +let + man = fetchurl { + url = "https://web.archive.org/web/20230608093053if_/http://www.ansikte.se/ARAGORN/Downloads/aragorn.1"; + hash = "sha256-bjD22dpkQZcGR0TwMxdpaed4VZZO2NUOoAw4o66iyS4="; + }; +in stdenv.mkDerivation rec { - version = "1.2.38"; + version = "1.2.41"; pname = "aragorn"; src = fetchurl { - url = "http://mbio-serv2.mbioekol.lu.se/ARAGORN/Downloads/${pname}${version}.tgz"; - sha256 = "09i1rg716smlbnixfm7q1ml2mfpaa2fpn3hwjg625ysmfwwy712b"; + url = "http://www.ansikte.se/ARAGORN/Downloads/aragorn${version}.c"; + hash = "sha256-kqMcxcCwrRbU17AZkZibd18H0oFd8TX+bj6riPXpf0o="; }; + dontUnpack = true; + + nativeBuildInputs = [ + installShellFiles + ]; + buildPhase = '' - $CC -O3 -ffast-math -finline-functions -o aragorn aragorn${version}.c + $CC -O3 -ffast-math -finline-functions -o aragorn $src ''; installPhase = '' mkdir -p $out/bin && cp aragorn $out/bin - mkdir -p $out/man/1 && cp aragorn.1 $out/man/1 + installManPage ${man} ''; meta = with lib; { description = "Detects tRNA, mtRNA, and tmRNA genes in nucleotide sequences"; - homepage = "http://mbio-serv2.mbioekol.lu.se/ARAGORN/"; - license = licenses.gpl2; + homepage = "http://www.ansikte.se/ARAGORN/"; + license = licenses.gpl3Plus; maintainers = [ maintainers.bzizou ]; platforms = platforms.unix; }; From 597e4e8652452df886c863c4ccc671ddb491ecae Mon Sep 17 00:00:00 2001 From: natsukium Date: Thu, 8 Jun 2023 12:20:21 +0900 Subject: [PATCH 016/165] aragorn: fix format - use finalAttrs instead of rec - add runHook --- .../science/biology/aragorn/default.nix | 20 +++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/science/biology/aragorn/default.nix b/pkgs/applications/science/biology/aragorn/default.nix index 4d5b3a4d017a..4ee8501e8e13 100644 --- a/pkgs/applications/science/biology/aragorn/default.nix +++ b/pkgs/applications/science/biology/aragorn/default.nix @@ -1,4 +1,8 @@ -{ lib, stdenv, fetchurl, installShellFiles }: +{ lib +, stdenv +, fetchurl +, installShellFiles +}: let man = fetchurl { url = "https://web.archive.org/web/20230608093053if_/http://www.ansikte.se/ARAGORN/Downloads/aragorn.1"; @@ -6,12 +10,12 @@ let }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "1.2.41"; pname = "aragorn"; src = fetchurl { - url = "http://www.ansikte.se/ARAGORN/Downloads/aragorn${version}.c"; + url = "http://www.ansikte.se/ARAGORN/Downloads/aragorn${finalAttrs.version}.c"; hash = "sha256-kqMcxcCwrRbU17AZkZibd18H0oFd8TX+bj6riPXpf0o="; }; @@ -22,12 +26,20 @@ stdenv.mkDerivation rec { ]; buildPhase = '' + runHook preBuild + $CC -O3 -ffast-math -finline-functions -o aragorn $src + + runHook postBuild ''; installPhase = '' + runHook preInstall + mkdir -p $out/bin && cp aragorn $out/bin installManPage ${man} + + runHook postInstall ''; meta = with lib; { @@ -37,4 +49,4 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.bzizou ]; platforms = platforms.unix; }; -} +}) From 996cc009c64bb5039308efc0656e55eb9bafa25b Mon Sep 17 00:00:00 2001 From: Marian Hammer Date: Thu, 8 Jun 2023 15:49:41 +0200 Subject: [PATCH 017/165] mesa: fix build without valgrind Since the update to mesa v23.1.1 the build without valgrind was broken. This is a result of a change in mesa meson_options.txt which made the valgrind support a feature in mesa: https://gitlab.freedesktop.org/mesa/mesa/-/commit/3f10a89180b5638d2c1870e91e06aeae67925717#0cc1139e3347f573ae1feee5b73dbc8a8a21fcfa_1844_1829 So it must be explicitly turned off as it is now on by default. --- pkgs/development/libraries/mesa/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 38afcd174db3..d56b34432d70 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -210,6 +210,8 @@ self = stdenv.mkDerivation { # Rusticl, new OpenCL frontend "-Dgallium-rusticl=true" "-Drust_std=2021" "-Dclang-libdir=${llvmPackages.clang-unwrapped.lib}/lib" + ] ++ lib.optionals (!withValgrind) [ + "-Dvalgrind=disabled" ] ++ lib.optional enablePatentEncumberedCodecs "-Dvideo-codecs=h264dec,h264enc,h265dec,h265enc,vc1dec" ++ lib.optional (vulkanLayers != []) "-D vulkan-layers=${builtins.concatStringsSep "," vulkanLayers}"; From 830f5b33ddfbfa8d8864a6724fcac87f893ec88a Mon Sep 17 00:00:00 2001 From: pennae Date: Sat, 10 Jun 2023 17:47:58 +0200 Subject: [PATCH 018/165] doc: add missing section IDs --- doc/builders/special/darwin-builder.section.md | 4 ++-- doc/builders/special/vm-tools.section.md | 18 +++++++++--------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/doc/builders/special/darwin-builder.section.md b/doc/builders/special/darwin-builder.section.md index 30bf2d095102..b5b6ab8971e9 100644 --- a/doc/builders/special/darwin-builder.section.md +++ b/doc/builders/special/darwin-builder.section.md @@ -62,7 +62,7 @@ builders-use-substitutes = true $ sudo launchctl kickstart -k system/org.nixos.nix-daemon ``` -## Example flake usage +## Example flake usage {#sec-darwin-builder-example-flake} ``` { @@ -120,7 +120,7 @@ $ sudo launchctl kickstart -k system/org.nixos.nix-daemon } ``` -## Reconfiguring the builder +## Reconfiguring the builder {#sec-darwin-builder-reconfiguring} Initially you should not change the builder configuration else you will not be able to use the binary cache. However, after you have the builder running locally diff --git a/doc/builders/special/vm-tools.section.md b/doc/builders/special/vm-tools.section.md index 3b6fb0d2556b..8feab04902d8 100644 --- a/doc/builders/special/vm-tools.section.md +++ b/doc/builders/special/vm-tools.section.md @@ -6,7 +6,7 @@ A set of VM related utilities, that help in building some packages in more advan A bash script fragment that produces a disk image at `destination`. -### Attributes +### Attributes {#vm-tools-createEmptyImage-attributes} * `size`. The disk size, in MiB. * `fullName`. Name that will be written to `${destination}/nix-support/full-name`. @@ -20,14 +20,14 @@ Thus, any pure Nix derivation should run unmodified. If the build fails and Nix is run with the `-K/--keep-failed` option, a script `run-vm` will be left behind in the temporary build directory that allows you to boot into the VM and debug it interactively. -### Attributes +### Attributes {#vm-tools-runInLinuxVM-attributes} * `preVM` (optional). Shell command to be evaluated *before* the VM is started (i.e., on the host). * `memSize` (optional, default `512`). The memory size of the VM in MiB. * `diskImage` (optional). A file system image to be attached to `/dev/sda`. Note that currently we expect the image to contain a filesystem, not a full disk image with a partition table etc. -### Examples +### Examples {#vm-tools-runInLinuxVM-examples} Build the derivation hello inside a VM: ```nix @@ -56,13 +56,13 @@ runInLinuxVM (hello.overrideAttrs (_: { Takes a file, such as an ISO, and extracts its contents into the store. -### Attributes +### Attributes {#vm-tools-extractFs-attributes} * `file`. Path to the file to be extracted. Note that currently we expect the image to contain a filesystem, not a full disk image with a partition table etc. * `fs` (optional). Filesystem of the contents of the file. -### Examples +### Examples {#vm-tools-extractFs-examples} Extract the contents of an ISO file: ```nix @@ -82,7 +82,7 @@ Like [](#vm-tools-runInLinuxVM), but instead of using `stdenv` from the Nix stor Generate a script that can be used to run an interactive session in the given image. -### Examples +### Examples {#vm-tools-makeImageTestScript-examples} Create a script for running a Fedora 27 VM: ```nix @@ -100,7 +100,7 @@ makeImageTestScript diskImages.ubuntu2004x86_64 A set of functions that build a predefined set of minimal Linux distributions images. -### Images +### Images {#vm-tools-diskImageFuns-images} * Fedora * `fedora26x86_64` @@ -126,12 +126,12 @@ A set of functions that build a predefined set of minimal Linux distributions im * `debian11i386` * `debian11x86_64` -### Attributes +### Attributes {#vm-tools-diskImageFuns-attributes} * `size` (optional, defaults to `4096`). The size of the image, in MiB. * `extraPackages` (optional). A list names of additional packages from the distribution that should be included in the image. -### Examples +### Examples {#vm-tools-diskImageFuns-examples} 8GiB image containing Firefox in addition to the default packages: ```nix From e42a5c78e75aba56b546cbcb8efdf46587fea276 Mon Sep 17 00:00:00 2001 From: pennae Date: Sat, 10 Jun 2023 17:54:02 +0200 Subject: [PATCH 019/165] doc: make sure section depths are consecutive skipping heading levels (eg from # to ###, or starting at ###) is legal in pandoc, but not in nixos-render-docs. pandoc acts as though section levels *were* consecutive, nixos-render-docs prefers to tell people not to do that kind of thing because it can make documents more fragile. --- doc/builders/special/makesetuphook.section.md | 2 +- doc/hooks/autoconf.section.md | 3 +-- doc/hooks/automake.section.md | 3 +-- doc/hooks/autopatchelf.section.md | 3 +-- doc/hooks/breakpoint.section.md | 3 +-- doc/hooks/cmake.section.md | 3 +-- doc/hooks/gdk-pixbuf.section.md | 3 +-- doc/hooks/ghc.section.md | 3 +-- doc/hooks/gnome.section.md | 3 +-- doc/hooks/installShellFiles.section.md | 3 +-- doc/hooks/libiconv.section.md | 3 +-- doc/hooks/libxml2.section.md | 3 +-- doc/hooks/meson.section.md | 15 +++++++-------- doc/hooks/ninja.section.md | 3 +-- doc/hooks/perl.section.md | 3 +-- doc/hooks/pkg-config.section.md | 3 +-- doc/hooks/python.section.md | 3 +-- doc/hooks/qt-4.section.md | 3 +-- doc/hooks/scons.section.md | 3 +-- doc/hooks/tetex-tex-live.section.md | 3 +-- doc/hooks/unzip.section.md | 3 +-- doc/hooks/validatePkgConfig.section.md | 3 +-- doc/hooks/waf.section.md | 3 +-- doc/hooks/xcbuild.section.md | 3 +-- doc/languages-frameworks/gnome.section.md | 10 +++++----- 25 files changed, 35 insertions(+), 58 deletions(-) diff --git a/doc/builders/special/makesetuphook.section.md b/doc/builders/special/makesetuphook.section.md index fee508dc29c2..eb042412137b 100644 --- a/doc/builders/special/makesetuphook.section.md +++ b/doc/builders/special/makesetuphook.section.md @@ -12,7 +12,7 @@ pkgs.makeSetupHook { } ./script.sh ``` -#### setup hook that depends on the hello package and runs hello and @shell@ is substituted with path to bash {#sec-pkgs.makeSetupHook-usage-example} +### setup hook that depends on the hello package and runs hello and @shell@ is substituted with path to bash {#sec-pkgs.makeSetupHook-usage-example} ```nix pkgs.makeSetupHook { diff --git a/doc/hooks/autoconf.section.md b/doc/hooks/autoconf.section.md index 13d75910f192..90e4681ef93f 100644 --- a/doc/hooks/autoconf.section.md +++ b/doc/hooks/autoconf.section.md @@ -1,4 +1,3 @@ - -### Autoconf {#setup-hook-autoconf} +# Autoconf {#setup-hook-autoconf} The `autoreconfHook` derivation adds `autoreconfPhase`, which runs autoreconf, libtoolize and automake, essentially preparing the configure script in autotools-based builds. Most autotools-based packages come with the configure script pre-generated, but this hook is necessary for a few packages and when you need to patch the package’s configure scripts. diff --git a/doc/hooks/automake.section.md b/doc/hooks/automake.section.md index 562ac18fcd93..dd0ff9c0cc09 100644 --- a/doc/hooks/automake.section.md +++ b/doc/hooks/automake.section.md @@ -1,4 +1,3 @@ - -### Automake {#setup-hook-automake} +# Automake {#setup-hook-automake} Adds the `share/aclocal` subdirectory of each build input to the `ACLOCAL_PATH` environment variable. diff --git a/doc/hooks/autopatchelf.section.md b/doc/hooks/autopatchelf.section.md index 9c2852ccf279..008a90d46140 100644 --- a/doc/hooks/autopatchelf.section.md +++ b/doc/hooks/autopatchelf.section.md @@ -1,5 +1,4 @@ - -### autoPatchelfHook {#setup-hook-autopatchelfhook} +# autoPatchelfHook {#setup-hook-autopatchelfhook} This is a special setup hook which helps in packaging proprietary software in that it automatically tries to find missing shared library dependencies of ELF files based on the given `buildInputs` and `nativeBuildInputs`. diff --git a/doc/hooks/breakpoint.section.md b/doc/hooks/breakpoint.section.md index 9600e06b7934..424a9424b55e 100644 --- a/doc/hooks/breakpoint.section.md +++ b/doc/hooks/breakpoint.section.md @@ -1,5 +1,4 @@ - -### breakpointHook {#breakpointhook} +# breakpointHook {#breakpointhook} This hook will make a build pause instead of stopping when a failure happens. It prevents nix from cleaning up the build environment immediately and allows the user to attach to a build environment using the `cntr` command. Upon build error it will print instructions on how to use `cntr`, which can be used to enter the environment for debugging. Installing cntr and running the command will provide shell access to the build sandbox of failed build. At `/var/lib/cntr` the sandboxed filesystem is mounted. All commands and files of the system are still accessible within the shell. To execute commands from the sandbox use the cntr exec subcommand. `cntr` is only supported on Linux-based platforms. To use it first add `cntr` to your `environment.systemPackages` on NixOS or alternatively to the root user on non-NixOS systems. Then in the package that is supposed to be inspected, add `breakpointHook` to `nativeBuildInputs`. diff --git a/doc/hooks/cmake.section.md b/doc/hooks/cmake.section.md index 58fbfa45a2e0..b5dc5a914434 100644 --- a/doc/hooks/cmake.section.md +++ b/doc/hooks/cmake.section.md @@ -1,4 +1,3 @@ - -### cmake {#cmake} +# cmake {#cmake} Overrides the default configure phase to run the CMake command. By default, we use the Make generator of CMake. In addition, dependencies are added automatically to `CMAKE_PREFIX_PATH` so that packages are correctly detected by CMake. Some additional flags are passed in to give similar behavior to configure-based packages. You can disable this hook’s behavior by setting `configurePhase` to a custom value, or by setting `dontUseCmakeConfigure`. `cmakeFlags` controls flags passed only to CMake. By default, parallel building is enabled as CMake supports parallel building almost everywhere. When Ninja is also in use, CMake will detect that and use the ninja generator. diff --git a/doc/hooks/gdk-pixbuf.section.md b/doc/hooks/gdk-pixbuf.section.md index 565216560abc..cf7203dfc66f 100644 --- a/doc/hooks/gdk-pixbuf.section.md +++ b/doc/hooks/gdk-pixbuf.section.md @@ -1,4 +1,3 @@ - -### gdk-pixbuf {#setup-hook-gdk-pixbuf} +# gdk-pixbuf {#setup-hook-gdk-pixbuf} Exports `GDK_PIXBUF_MODULE_FILE` environment variable to the builder. Add librsvg package to `buildInputs` to get svg support. See also the [setup hook description in GNOME platform docs](#ssec-gnome-hooks-gdk-pixbuf). diff --git a/doc/hooks/ghc.section.md b/doc/hooks/ghc.section.md index a4b0841ea486..ac054b954a92 100644 --- a/doc/hooks/ghc.section.md +++ b/doc/hooks/ghc.section.md @@ -1,4 +1,3 @@ - -### GHC {#ghc} +# GHC {#ghc} Creates a temporary package database and registers every Haskell build input in it (TODO: how?). diff --git a/doc/hooks/gnome.section.md b/doc/hooks/gnome.section.md index 8c209d9b472c..b10e80802027 100644 --- a/doc/hooks/gnome.section.md +++ b/doc/hooks/gnome.section.md @@ -1,4 +1,3 @@ - -### GNOME platform {#gnome-platform} +# GNOME platform {#gnome-platform} Hooks related to GNOME platform and related libraries like GLib, GTK and GStreamer are described in [](#sec-language-gnome). diff --git a/doc/hooks/installShellFiles.section.md b/doc/hooks/installShellFiles.section.md index d27527503fed..84adea2fa30c 100644 --- a/doc/hooks/installShellFiles.section.md +++ b/doc/hooks/installShellFiles.section.md @@ -1,5 +1,4 @@ - -### `installShellFiles` {#installshellfiles} +# `installShellFiles` {#installshellfiles} This hook helps with installing manpages and shell completion files. It exposes 2 shell functions `installManPage` and `installShellCompletion` that can be used from your `postInstall` hook. diff --git a/doc/hooks/libiconv.section.md b/doc/hooks/libiconv.section.md index c228fe339e14..0ffa6d09b0a8 100644 --- a/doc/hooks/libiconv.section.md +++ b/doc/hooks/libiconv.section.md @@ -1,4 +1,3 @@ - -### libiconv, libintl {#libiconv-libintl} +# libiconv, libintl {#libiconv-libintl} A few libraries automatically add to `NIX_LDFLAGS` their library, making their symbols automatically available to the linker. This includes libiconv and libintl (gettext). This is done to provide compatibility between GNU Linux, where libiconv and libintl are bundled in, and other systems where that might not be the case. Sometimes, this behavior is not desired. To disable this behavior, set `dontAddExtraLibs`. diff --git a/doc/hooks/libxml2.section.md b/doc/hooks/libxml2.section.md index 770ef9ff3ffe..df387fb5e222 100644 --- a/doc/hooks/libxml2.section.md +++ b/doc/hooks/libxml2.section.md @@ -1,4 +1,3 @@ - -### libxml2 {#setup-hook-libxml2} +# libxml2 {#setup-hook-libxml2} Adds every file named `catalog.xml` found under the `xml/dtd` and `xml/xsl` subdirectories of each build input to the `XML_CATALOG_FILES` environment variable. diff --git a/doc/hooks/meson.section.md b/doc/hooks/meson.section.md index 32804b5e32f2..fd7779e6468f 100644 --- a/doc/hooks/meson.section.md +++ b/doc/hooks/meson.section.md @@ -1,26 +1,25 @@ - -### Meson {#meson} +# Meson {#meson} Overrides the configure phase to run meson to generate Ninja files. To run these files, you should accompany Meson with ninja. By default, `enableParallelBuilding` is enabled as Meson supports parallel building almost everywhere. -#### Variables controlling Meson {#variables-controlling-meson} +## Variables controlling Meson {#variables-controlling-meson} -##### `mesonFlags` {#mesonflags} +### `mesonFlags` {#mesonflags} Controls the flags passed to meson. -##### `mesonBuildType` {#mesonbuildtype} +### `mesonBuildType` {#mesonbuildtype} Which [`--buildtype`](https://mesonbuild.com/Builtin-options.html#core-options) to pass to Meson. We default to `plain`. -##### `mesonAutoFeatures` {#mesonautofeatures} +### `mesonAutoFeatures` {#mesonautofeatures} What value to set [`-Dauto_features=`](https://mesonbuild.com/Builtin-options.html#core-options) to. We default to `enabled`. -##### `mesonWrapMode` {#mesonwrapmode} +### `mesonWrapMode` {#mesonwrapmode} What value to set [`-Dwrap_mode=`](https://mesonbuild.com/Builtin-options.html#core-options) to. We default to `nodownload` as we disallow network access. -##### `dontUseMesonConfigure` {#dontusemesonconfigure} +### `dontUseMesonConfigure` {#dontusemesonconfigure} Disables using Meson’s `configurePhase`. diff --git a/doc/hooks/ninja.section.md b/doc/hooks/ninja.section.md index 5ea1ee87070a..4b0e33feb5c3 100644 --- a/doc/hooks/ninja.section.md +++ b/doc/hooks/ninja.section.md @@ -1,4 +1,3 @@ - -### ninja {#ninja} +# ninja {#ninja} Overrides the build, install, and check phase to run ninja instead of make. You can disable this behavior with the `dontUseNinjaBuild`, `dontUseNinjaInstall`, and `dontUseNinjaCheck`, respectively. Parallel building is enabled by default in Ninja. diff --git a/doc/hooks/perl.section.md b/doc/hooks/perl.section.md index 403227a9bf18..06942bd3c0e1 100644 --- a/doc/hooks/perl.section.md +++ b/doc/hooks/perl.section.md @@ -1,4 +1,3 @@ - -### Perl {#setup-hook-perl} +# Perl {#setup-hook-perl} Adds the `lib/site_perl` subdirectory of each build input to the `PERL5LIB` environment variable. For instance, if `buildInputs` contains Perl, then the `lib/site_perl` subdirectory of each input is added to the `PERL5LIB` environment variable. diff --git a/doc/hooks/pkg-config.section.md b/doc/hooks/pkg-config.section.md index 969c81f6d18a..c98701cf9c9d 100644 --- a/doc/hooks/pkg-config.section.md +++ b/doc/hooks/pkg-config.section.md @@ -1,4 +1,3 @@ - -### pkg-config {#setup-hook-pkg-config} +# pkg-config {#setup-hook-pkg-config} Adds the `lib/pkgconfig` and `share/pkgconfig` subdirectories of each build input to the `PKG_CONFIG_PATH` environment variable. diff --git a/doc/hooks/python.section.md b/doc/hooks/python.section.md index a46a727e95b1..ecaae491e994 100644 --- a/doc/hooks/python.section.md +++ b/doc/hooks/python.section.md @@ -1,4 +1,3 @@ - -### Python {#setup-hook-python} +# Python {#setup-hook-python} Adds the `lib/${python.libPrefix}/site-packages` subdirectory of each build input to the `PYTHONPATH` environment variable. diff --git a/doc/hooks/qt-4.section.md b/doc/hooks/qt-4.section.md index f15d858e2377..4b704df49597 100644 --- a/doc/hooks/qt-4.section.md +++ b/doc/hooks/qt-4.section.md @@ -1,4 +1,3 @@ - -### Qt 4 {#qt-4} +# Qt 4 {#qt-4} Sets the `QTDIR` environment variable to Qt’s path. diff --git a/doc/hooks/scons.section.md b/doc/hooks/scons.section.md index 1392269e5d55..0a7a7aa023b6 100644 --- a/doc/hooks/scons.section.md +++ b/doc/hooks/scons.section.md @@ -1,4 +1,3 @@ - -### scons {#scons} +# scons {#scons} Overrides the build, install, and check phases. This uses the scons build system as a replacement for make. scons does not provide a configure phase, so everything is managed at build and install time. diff --git a/doc/hooks/tetex-tex-live.section.md b/doc/hooks/tetex-tex-live.section.md index 0ecdcc12e45a..b702971d727c 100644 --- a/doc/hooks/tetex-tex-live.section.md +++ b/doc/hooks/tetex-tex-live.section.md @@ -1,4 +1,3 @@ - -### teTeX / TeX Live {#tetex-tex-live} +# teTeX / TeX Live {#tetex-tex-live} Adds the `share/texmf-nix` subdirectory of each build input to the `TEXINPUTS` environment variable. diff --git a/doc/hooks/unzip.section.md b/doc/hooks/unzip.section.md index 91dc072de662..5ec67e576a33 100644 --- a/doc/hooks/unzip.section.md +++ b/doc/hooks/unzip.section.md @@ -1,4 +1,3 @@ - -### unzip {#unzip} +# unzip {#unzip} This setup hook will allow you to unzip .zip files specified in `$src`. There are many similar packages like `unrar`, `undmg`, etc. diff --git a/doc/hooks/validatePkgConfig.section.md b/doc/hooks/validatePkgConfig.section.md index 8719ae930fcb..aa6e0c06c223 100644 --- a/doc/hooks/validatePkgConfig.section.md +++ b/doc/hooks/validatePkgConfig.section.md @@ -1,4 +1,3 @@ - -### validatePkgConfig {#validatepkgconfig} +# validatePkgConfig {#validatepkgconfig} The `validatePkgConfig` hook validates all pkg-config (`.pc`) files in a package. This helps catching some common errors in pkg-config files, such as undefined variables. diff --git a/doc/hooks/waf.section.md b/doc/hooks/waf.section.md index de65abde4502..ee1bccff1d0a 100644 --- a/doc/hooks/waf.section.md +++ b/doc/hooks/waf.section.md @@ -1,4 +1,3 @@ - -### wafHook {#wafhook} +# wafHook {#wafhook} Overrides the configure, build, and install phases. This will run the “waf” script used by many projects. If `wafPath` (default `./waf`) doesn’t exist, it will copy the version of waf available in Nixpkgs. `wafFlags` can be used to pass flags to the waf script. diff --git a/doc/hooks/xcbuild.section.md b/doc/hooks/xcbuild.section.md index 1426431f6dce..bf404b64c3f9 100644 --- a/doc/hooks/xcbuild.section.md +++ b/doc/hooks/xcbuild.section.md @@ -1,4 +1,3 @@ - -### xcbuildHook {#xcbuildhook} +# xcbuildHook {#xcbuildhook} Overrides the build and install phases to run the "xcbuild" command. This hook is needed when a project only comes with build files for the XCode build system. You can disable this behavior by setting buildPhase and configurePhase to a custom value. xcbuildFlags controls flags passed only to xcbuild. diff --git a/doc/languages-frameworks/gnome.section.md b/doc/languages-frameworks/gnome.section.md index 3c8539ac4244..de402cdac0cf 100644 --- a/doc/languages-frameworks/gnome.section.md +++ b/doc/languages-frameworks/gnome.section.md @@ -137,15 +137,15 @@ Most GNOME package offer [`updateScript`](#var-passthru-updateScript), it is the ## Frequently encountered issues {#ssec-gnome-common-issues} -#### `GLib-GIO-ERROR **: 06:04:50.903: No GSettings schemas are installed on the system` {#ssec-gnome-common-issues-no-schemas} +### `GLib-GIO-ERROR **: 06:04:50.903: No GSettings schemas are installed on the system` {#ssec-gnome-common-issues-no-schemas} There are no schemas available in `XDG_DATA_DIRS`. Temporarily add a random package containing schemas like `gsettings-desktop-schemas` to `buildInputs`. [`glib`](#ssec-gnome-hooks-glib) and [`wrapGAppsHook`](#ssec-gnome-hooks-wrapgappshook) setup hooks will take care of making the schemas available to application and you will see the actual missing schemas with the [next error](#ssec-gnome-common-issues-missing-schema). Or you can try looking through the source code for the actual schemas used. -#### `GLib-GIO-ERROR **: 06:04:50.903: Settings schema ‘org.gnome.foo’ is not installed` {#ssec-gnome-common-issues-missing-schema} +### `GLib-GIO-ERROR **: 06:04:50.903: Settings schema ‘org.gnome.foo’ is not installed` {#ssec-gnome-common-issues-missing-schema} Package is missing some GSettings schemas. You can find out the package containing the schema with `nix-locate org.gnome.foo.gschema.xml` and let the hooks handle the wrapping as [above](#ssec-gnome-common-issues-no-schemas). -#### When using `wrapGAppsHook` with special derivers you can end up with double wrapped binaries. {#ssec-gnome-common-issues-double-wrapped} +### When using `wrapGAppsHook` with special derivers you can end up with double wrapped binaries. {#ssec-gnome-common-issues-double-wrapped} This is because derivers like `python.pkgs.buildPythonApplication` or `qt5.mkDerivation` have setup-hooks automatically added that produce wrappers with makeWrapper. The simplest way to workaround that is to disable the `wrapGAppsHook` automatic wrapping with `dontWrapGApps = true;` and pass the arguments it intended to pass to makeWrapper to another. @@ -193,7 +193,7 @@ mkDerivation { } ``` -#### I am packaging a project that cannot be wrapped, like a library or GNOME Shell extension. {#ssec-gnome-common-issues-unwrappable-package} +### I am packaging a project that cannot be wrapped, like a library or GNOME Shell extension. {#ssec-gnome-common-issues-unwrappable-package} You can rely on applications depending on the library setting the necessary environment variables but that is often easy to miss. Instead we recommend to patch the paths in the source code whenever possible. Here are some examples: @@ -209,6 +209,6 @@ You can rely on applications depending on the library setting the necessary envi []{#ssec-gnome-common-issues-unwrappable-package-gsettings-c} [Hard-coding GSettings schema path in C library](https://github.com/NixOS/nixpkgs/blob/29c120c065d03b000224872251bed93932d42412/pkgs/development/libraries/glib-networking/default.nix#L31-L34) – nothing special other than using [Coccinelle patch](https://github.com/NixOS/nixpkgs/pull/67957#issuecomment-527717467) to generate the patch itself. -#### I need to wrap a binary outside `bin` and `libexec` directories. {#ssec-gnome-common-issues-weird-location} +### I need to wrap a binary outside `bin` and `libexec` directories. {#ssec-gnome-common-issues-weird-location} You can manually trigger the wrapping with `wrapGApp` in `preFixup` phase. It takes a path to a program as a first argument; the remaining arguments are passed directly to [`wrapProgram`](#fun-wrapProgram) function. From f9ba30270ef6121e3923338d21fd63291c9baf28 Mon Sep 17 00:00:00 2001 From: pennae Date: Sat, 10 Jun 2023 17:57:37 +0200 Subject: [PATCH 020/165] pkgs/config: add missing mdDoc --- pkgs/top-level/config.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/config.nix b/pkgs/top-level/config.nix index 1de93a9f3fde..42053ce95de7 100644 --- a/pkgs/top-level/config.nix +++ b/pkgs/top-level/config.nix @@ -135,7 +135,7 @@ let checkMeta = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to check that the `meta` attribute of derivations are correct during evaluation time. ''; }; From 2ecc93d6fe1be154da6ef9e268b46ec242998511 Mon Sep 17 00:00:00 2001 From: pennae Date: Sat, 10 Jun 2023 18:06:27 +0200 Subject: [PATCH 021/165] doc: normalize markdown for nixos-render-docs pandoc recognizes `::: note` admonitions, nixos-render-docs only recognizes `::: {.note}`. surprisingly pandoc also emits the correct docbook tags for `[](#xref)`s, so we can use that too. --- doc/builders/testers.chapter.md | 2 +- doc/stdenv/meta.chapter.md | 2 +- doc/stdenv/stdenv.chapter.md | 7 ++++--- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/doc/builders/testers.chapter.md b/doc/builders/testers.chapter.md index 928a57673e77..fb6a28b7ee4b 100644 --- a/doc/builders/testers.chapter.md +++ b/doc/builders/testers.chapter.md @@ -1,5 +1,5 @@ # Testers {#chap-testers} -This chapter describes several testing builders which are available in the testers namespace. +This chapter describes several testing builders which are available in the `testers` namespace. ## `hasPkgConfigModule` {#tester-hasPkgConfigModule} diff --git a/doc/stdenv/meta.chapter.md b/doc/stdenv/meta.chapter.md index a21dfd0821af..1c34fc76d035 100644 --- a/doc/stdenv/meta.chapter.md +++ b/doc/stdenv/meta.chapter.md @@ -128,7 +128,7 @@ Prefer `passthru.tests` for tests that are introduced in nixpkgs because: * we can run `passthru.tests` independently * `installCheckPhase` adds overhead to each build -For more on how to write and run package tests, see . +For more on how to write and run package tests, see [](#sec-package-tests). #### NixOS tests {#var-meta-tests-nixos} diff --git a/doc/stdenv/stdenv.chapter.md b/doc/stdenv/stdenv.chapter.md index a923da935ced..bb98d9ad7bb2 100644 --- a/doc/stdenv/stdenv.chapter.md +++ b/doc/stdenv/stdenv.chapter.md @@ -971,7 +971,8 @@ to `~/.gdbinit`. GDB will then be able to find debug information installed via ` The installCheck phase checks whether the package was installed correctly by running its test suite against the installed directories. The default `installCheck` calls `make installcheck`. -It is often better to add tests that are not part of the source distribution to `passthru.tests` (see ). This avoids adding overhead to every build and enables us to run them independently. +It is often better to add tests that are not part of the source distribution to `passthru.tests` (see +[](#var-meta-tests)). This avoids adding overhead to every build and enables us to run them independently. #### Variables controlling the installCheck phase {#variables-controlling-the-installcheck-phase} @@ -1234,7 +1235,7 @@ This runs the strip command on installed binaries and libraries. This removes un This setup hook patches installed scripts to add Nix store paths to their shebang interpreter as found in the build environment. The [shebang](https://en.wikipedia.org/wiki/Shebang_(Unix)) line tells a Unix-like operating system which interpreter to use to execute the script's contents. -::: note +::: {.note} The [generic builder][generic-builder] populates `PATH` from inputs of the derivation. ::: @@ -1272,7 +1273,7 @@ patchShebangs --build configure Interpreter paths that point to a valid Nix store location are not changed. -::: note +::: {.note} A script file must be marked as executable, otherwise it will not be considered. ::: From 2f76a3df6405df203b7392edca0e5000d4787057 Mon Sep 17 00:00:00 2001 From: pennae Date: Sat, 10 Jun 2023 18:13:33 +0200 Subject: [PATCH 022/165] doc: don't use docbook program listings/callouts nixos-render-docs does not support this, and since the examples are small there isn't that much value in callouts here. change them to simple MD code blocks and lists instead. --- doc/languages-frameworks/bower.section.md | 67 ++++++----------------- doc/languages-frameworks/qt.section.md | 29 +++------- 2 files changed, 23 insertions(+), 73 deletions(-) diff --git a/doc/languages-frameworks/bower.section.md b/doc/languages-frameworks/bower.section.md index 6226dc0702d7..c1e5ca4deb7d 100644 --- a/doc/languages-frameworks/bower.section.md +++ b/doc/languages-frameworks/bower.section.md @@ -41,32 +41,18 @@ The function is implemented in [pkgs/development/bower-modules/generic/default.n ### Example buildBowerComponents {#ex-buildBowerComponents} -```{=docbook} - +```nix bowerComponents = buildBowerComponents { name = "my-web-app"; - generated = ./bower-packages.nix; - src = myWebApp; + generated = ./bower-packages.nix; # note 1 + src = myWebApp; # note 2 }; - ``` In ["buildBowerComponents" example](#ex-buildBowerComponents) the following arguments are of special significance to the function: -```{=docbook} - - - - generated specifies the file which was created by bower2nix. - - - - - src is your project's sources. It needs to contain a bower.json file. - - - -``` +1. `generated` specifies the file which was created by {command}`bower2nix`. +2. `src` is your project's sources. It needs to contain a {file}`bower.json` file. `buildBowerComponents` will run Bower to link together the output of `bower2nix`, resulting in a `bower_components` directory which can be used. @@ -91,10 +77,9 @@ gulp.task('build', [], function () { ### Example Full example — default.nix {#ex-buildBowerComponentsDefaultNix} -```{=docbook} - +```nix { myWebApp ? { outPath = ./.; name = "myWebApp"; } -, pkgs ? import <nixpkgs> {} +, pkgs ? import {} }: pkgs.stdenv.mkDerivation { @@ -103,49 +88,29 @@ pkgs.stdenv.mkDerivation { buildInputs = [ pkgs.nodePackages.gulp ]; - bowerComponents = pkgs.buildBowerComponents { + bowerComponents = pkgs.buildBowerComponents { # note 1 name = "my-web-app"; generated = ./bower-packages.nix; src = myWebApp; }; buildPhase = '' - cp --reflink=auto --no-preserve=mode -R $bowerComponents/bower_components . - export HOME=$PWD - ${pkgs.nodePackages.gulp}/bin/gulp build + cp --reflink=auto --no-preserve=mode -R $bowerComponents/bower_components . # note 2 + export HOME=$PWD # note 3 + ${pkgs.nodePackages.gulp}/bin/gulp build # note 4 ''; installPhase = "mv gulpdist $out"; } - ``` A few notes about [Full example — `default.nix`](#ex-buildBowerComponentsDefaultNix): -```{=docbook} - - - - The result of buildBowerComponents is an input to the frontend build. - - - - - Whether to symlink or copy the bower_components directory depends on the build tool in use. In this case a copy is used to avoid gulp silliness with permissions. - - - - - gulp requires HOME to refer to a writeable directory. - - - - - The actual build command. Other tools could be used. - - - -``` +1. The result of `buildBowerComponents` is an input to the frontend build. +2. Whether to symlink or copy the {file}`bower_components` directory depends on the build tool in use. + In this case a copy is used to avoid {command}`gulp` silliness with permissions. +3. {command}`gulp` requires `HOME` to refer to a writeable directory. +4. The actual build command in this example is {command}`gulp`. Other tools could be used instead. ## Troubleshooting {#ssec-bower2nix-troubleshooting} diff --git a/doc/languages-frameworks/qt.section.md b/doc/languages-frameworks/qt.section.md index e09194e391e1..2300c5f60ede 100644 --- a/doc/languages-frameworks/qt.section.md +++ b/doc/languages-frameworks/qt.section.md @@ -10,37 +10,22 @@ pure and explicit at build-time, at the cost of introducing an extra indirection ## Nix expression for a Qt package (default.nix) {#qt-default-nix} -```{=docbook} - -{ stdenv, lib, qtbase, wrapQtAppsHook }: +```nix +{ stdenv, lib, qtbase, wrapQtAppsHook }: stdenv.mkDerivation { pname = "myapp"; version = "1.0"; buildInputs = [ qtbase ]; - nativeBuildInputs = [ wrapQtAppsHook ]; + nativeBuildInputs = [ wrapQtAppsHook ]; } - - - - - - Import Qt modules directly, that is: qtbase, qtdeclarative, etc. - Do not import Qt package sets such as qt5 - because the Qt versions of dependencies may not be coherent, causing build and runtime failures. - - - - - All Qt packages must include wrapQtAppsHook in - nativeBuildInputs, or you must explicitly set - dontWrapQtApps. - - - ``` +It is important to import Qt modules directly, that is: `qtbase`, `qtdeclarative`, etc. *Do not* import Qt package sets such as `qt5` because the Qt versions of dependencies may not be coherent, causing build and runtime failures. + +Additionally all Qt packages must include `wrapQtAppsHook` in `nativeBuildInputs`, or you must explicitly set `dontWrapQtApps`. + ## Locating runtime dependencies {#qt-runtime-dependencies} Qt applications must be wrapped to find runtime dependencies. From a8fc5424ad2299c59ca8b1de1f662872c343acc0 Mon Sep 17 00:00:00 2001 From: squalus Date: Sat, 10 Jun 2023 09:29:00 -0700 Subject: [PATCH 023/165] librewolf: 113.0.2-1 -> 114.0.1-2 --- .../networking/browsers/librewolf/src.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/browsers/librewolf/src.json b/pkgs/applications/networking/browsers/librewolf/src.json index f3d52071fe4f..4cf598d49f3e 100644 --- a/pkgs/applications/networking/browsers/librewolf/src.json +++ b/pkgs/applications/networking/browsers/librewolf/src.json @@ -1,11 +1,11 @@ { - "packageVersion": "113.0.2-1", + "packageVersion": "114.0.1-2", "source": { - "rev": "113.0.2-1", - "sha256": "0wbs6bgcjrxjnh0wk6qz329zy0dlma0wdwb3law877y9dphilh47" + "rev": "114.0.1-2", + "sha256": "1di8kfzc27wz89cfq8xgs17lyayikpmqwn5npdzllzppp0dx0894" }, "firefox": { - "version": "113.0.2", - "sha512": "7b1ff7d547fda02901f54a2593e03598a830698192003d833e27b85db0e00571ff66e03ebd4089e76fa65b09df000cbb2542450beeabb0b310875910603e6743" + "version": "114.0.1", + "sha512": "d422982e0271a68aa8064977b3a6b6f9412a30e7261ba06385c416e00e8ba0eb488d81a8929355fc92d35469d3308ec928f00e4de7248ed6390d5d900d7bce8f" } } From 28df5f4a30defa92aff2e68dce638d94e7d544de Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 10 Jun 2023 18:33:24 +0000 Subject: [PATCH 024/165] gitlab-runner: 16.0.1 -> 16.0.2 --- .../tools/continuous-integration/gitlab-runner/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix index 38079cfb3a7f..7f6dd71c14c7 100644 --- a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix @@ -1,7 +1,7 @@ { lib, buildGoModule, fetchFromGitLab, fetchurl, bash }: let - version = "16.0.1"; + version = "16.0.2"; in buildGoModule rec { inherit version; @@ -17,13 +17,13 @@ buildGoModule rec { # For patchShebangs buildInputs = [ bash ]; - vendorHash = "sha256-2z9mB/Dd5sLB2OgwfxUJ5Jfk6cWPc7TfS4WLaUeYDUg="; + vendorHash = "sha256-BgT+anRMkF00LLi+7Em0pXElwBnPz3QTs0G5+yoEj/k="; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-runner"; rev = "v${version}"; - sha256 = "sha256-IGMZKrGtDyXj6SIiuoM7NE5MHfRUeVHI4YUNGVNIXw0="; + sha256 = "sha256-t1DI7AhxnnBoP5h54dUCKtJcIffxmv0c7OczVhEy3rI="; }; patches = [ From c83276f1e62ed919cbd01def21fa36eb05163bdb Mon Sep 17 00:00:00 2001 From: Sumner Evans Date: Sat, 10 Jun 2023 13:20:45 -0600 Subject: [PATCH 025/165] sublime-music: 0.11.16 -> 0.12.0 Signed-off-by: Sumner Evans --- .../audio/sublime-music/default.nix | 30 +++++-------------- 1 file changed, 8 insertions(+), 22 deletions(-) diff --git a/pkgs/applications/audio/sublime-music/default.nix b/pkgs/applications/audio/sublime-music/default.nix index e6dcb86eb948..7004842f5dff 100644 --- a/pkgs/applications/audio/sublime-music/default.nix +++ b/pkgs/applications/audio/sublime-music/default.nix @@ -1,5 +1,4 @@ { lib -, fetchFromGitLab , fetchFromGitHub , python3 , gobject-introspection @@ -33,37 +32,24 @@ let in python.pkgs.buildPythonApplication rec { pname = "sublime-music"; - version = "0.11.16"; - format = "pyproject"; + version = "0.12.0"; + format = "flit"; - src = fetchFromGitLab { + src = fetchFromGitHub { owner = "sublime-music"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-n77mTgElwwFaX3WQL8tZzbkPwnsyQ08OW9imSOjpBlg="; + hash = "sha256-FPzeFqDOcaiariz7qJwz6P3Wd+ZDxNP57uj+ptMtEyM="; }; nativeBuildInputs = [ gobject-introspection wrapGAppsHook - ] ++ (with python.pkgs; [ - poetry-core - pythonRelaxDepsHook - ]); - - # Can be removed in later versions (probably > 0.11.16) - pythonRelaxDeps = [ - "deepdiff" - "python-mpv" ]; postPatch = '' sed -i "/--cov/d" setup.cfg sed -i "/--no-cov-on-fail/d" setup.cfg - # https://github.com/sublime-music/sublime-music/pull/370 - # Can be removed in later versions (probably > 0.11.16) - substituteInPlace pyproject.toml \ - --replace 'python-Levenshtein = "^0.12.0"' 'Levenshtein = ">0.12.0"' ''; buildInputs = [ @@ -76,20 +62,20 @@ python.pkgs.buildPythonApplication rec { propagatedBuildInputs = with python.pkgs; [ bleach + bottle dataclasses-json deepdiff - fuzzywuzzy + levenshtein mpv peewee + pychromecast pygobject3 - levenshtein python-dateutil requests semver + thefuzz ] - ++ lib.optional chromecastSupport pychromecast ++ lib.optional keyringSupport keyring - ++ lib.optional serverSupport bottle ; nativeCheckInputs = with python.pkgs; [ From 4cccbcd7688f0d002a344739a257cef0ec6b3bc6 Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Sat, 10 Jun 2023 12:39:27 -0700 Subject: [PATCH 026/165] dtc: fix cross Cross compilation of dtc was broken by the build system change in 280160bd1d911ff4ccc7acfa493aff0362544700. Currently dtc's configury fails for cross builds unless you disable the tests at configurePhase-time. Simply not running the test target is insufficient. --- pkgs/development/compilers/dtc/default.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/dtc/default.nix b/pkgs/development/compilers/dtc/default.nix index 44d98d8e36bd..66186d79b018 100644 --- a/pkgs/development/compilers/dtc/default.nix +++ b/pkgs/development/compilers/dtc/default.nix @@ -86,9 +86,15 @@ stdenv.mkDerivation rec { (lib.mesonBool "tests" doCheck) ]; - # Checks are broken on aarch64 darwin - # https://github.com/NixOS/nixpkgs/pull/118700#issuecomment-885892436 - doCheck = !stdenv.isDarwin; + doCheck = + # Checks are broken on aarch64 darwin + # https://github.com/NixOS/nixpkgs/pull/118700#issuecomment-885892436 + !stdenv.isDarwin && + + # we must explicitly disable this here so that mesonFlags receives + # `-Dtests=disabled`; without it meson will attempt to run + # hostPlatform binaries during the configurePhase. + (with stdenv; buildPlatform.canExecute hostPlatform); meta = with lib; { description = "Device Tree Compiler"; From 52b1193e3814dacc52d120c79750d44e8238f11a Mon Sep 17 00:00:00 2001 From: Weathercold Date: Sat, 10 Jun 2023 19:28:04 -0400 Subject: [PATCH 027/165] kdeconnect-kde: add kirigami-addons to buildInputs This fixes blank settings window. --- pkgs/applications/kde/kdeconnect-kde.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/kde/kdeconnect-kde.nix b/pkgs/applications/kde/kdeconnect-kde.nix index f67a338b3495..e07d46da9686 100644 --- a/pkgs/applications/kde/kdeconnect-kde.nix +++ b/pkgs/applications/kde/kdeconnect-kde.nix @@ -8,6 +8,7 @@ , kiconthemes , kio , kirigami2 +, kirigami-addons , knotifications , kpeople , kpeoplevcard @@ -43,6 +44,7 @@ mkDerivation { kiconthemes kio kirigami2 + kirigami-addons knotifications kpeople kpeoplevcard From bfa774756cf466859f9f75b2ca176de93057df56 Mon Sep 17 00:00:00 2001 From: Weathercold Date: Sat, 10 Jun 2023 19:29:49 -0400 Subject: [PATCH 028/165] kdeconnect-kde: set mainProgram to kdeconnect-app --- pkgs/applications/kde/kdeconnect-kde.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/kde/kdeconnect-kde.nix b/pkgs/applications/kde/kdeconnect-kde.nix index e07d46da9686..eec6615967f2 100644 --- a/pkgs/applications/kde/kdeconnect-kde.nix +++ b/pkgs/applications/kde/kdeconnect-kde.nix @@ -78,5 +78,6 @@ mkDerivation { homepage = "https://community.kde.org/KDEConnect"; license = with licenses; [ gpl2 ]; maintainers = with maintainers; [ fridh ]; + mainProgram = "kdeconnect-app"; }; } From 06611403c5aad7424ebe161bd9a6661020c9468d Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 11 Jun 2023 04:20:00 +0000 Subject: [PATCH 029/165] jruby: 9.3.9.0 -> 9.4.3.0 JRuby 9.4.x targets Ruby 3.1 compatibility. https://github.com/jruby/jruby/releases/tag/9.4.3.0 --- .../interpreters/jruby/default.nix | 22 ++++++++++--------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/pkgs/development/interpreters/jruby/default.nix b/pkgs/development/interpreters/jruby/default.nix index e421f40824c0..a36b474e9f0d 100644 --- a/pkgs/development/interpreters/jruby/default.nix +++ b/pkgs/development/interpreters/jruby/default.nix @@ -1,27 +1,28 @@ -{ lib, stdenv, callPackage, fetchurl, makeWrapper, jre }: +{ lib, stdenv, callPackage, fetchurl, makeBinaryWrapper, jre }: let # The version number here is whatever is reported by the RUBY_VERSION string -rubyVersion = callPackage ../ruby/ruby-version.nix {} "2" "5" "7" ""; +rubyVersion = callPackage ../ruby/ruby-version.nix {} "3" "1" "4" ""; jruby = stdenv.mkDerivation rec { pname = "jruby"; - version = "9.3.9.0"; + version = "9.4.3.0"; src = fetchurl { url = "https://s3.amazonaws.com/jruby.org/downloads/${version}/jruby-bin-${version}.tar.gz"; - sha256 = "sha256-JR5t2NHS+CkiyMd414V+G++C/lyiz3e8CTVkIdCwWrg="; + hash = "sha256-sJfgjFZp6KGIKI4RORHRK0rSvWeiwgnW36hEXWOk2Mk="; }; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeBinaryWrapper ]; installPhase = '' - mkdir -pv $out/docs + mkdir -pv $out/share/jruby/docs mv * $out rm $out/bin/*.{bat,dll,exe,sh} - mv $out/COPYING $out/LICENSE* $out/docs + mv $out/samples $out/share/jruby/ + mv $out/BSDL $out/COPYING $out/LEGAL $out/LICENSE* $out/share/jruby/docs/ - for i in $out/bin/jruby{,.bash}; do + for i in $out/bin/jruby; do wrapProgram $i \ --set JAVA_HOME ${jre.home} done @@ -52,9 +53,10 @@ jruby = stdenv.mkDerivation rec { meta = with lib; { description = "Ruby interpreter written in Java"; - homepage = "http://jruby.org/"; + homepage = "https://www.jruby.org/"; + changelog = "https://github.com/jruby/jruby/releases/tag/${version}"; license = with licenses; [ cpl10 gpl2 lgpl21 ]; - platforms = platforms.unix; + platforms = jre.meta.platforms; maintainers = [ maintainers.fzakaria ]; sourceProvenance = with sourceTypes; [ binaryBytecode ]; }; From 76a2ed5ef537fc94aac1145a9c62d978376e6671 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 11 Jun 2023 04:20:00 +0000 Subject: [PATCH 030/165] buildRubyGem: only set NIX_CFLAGS_COMPILE on Ruby MRI It's not needed on other implementations like JRuby --- pkgs/development/ruby-modules/gem/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/ruby-modules/gem/default.nix b/pkgs/development/ruby-modules/gem/default.nix index b8d4df1128a0..7105663413a2 100644 --- a/pkgs/development/ruby-modules/gem/default.nix +++ b/pkgs/development/ruby-modules/gem/default.nix @@ -136,7 +136,7 @@ stdenv.mkDerivation ((builtins.removeAttrs attrs ["source"]) // { # As of ruby 3.0, ruby headers require -fdeclspec when building with clang # Introduced in https://github.com/ruby/ruby/commit/0958e19ffb047781fe1506760c7cbd8d7fe74e57 - env.NIX_CFLAGS_COMPILE = toString (lib.optionals (stdenv.cc.isClang && lib.versionAtLeast ruby.version.major "3") [ + env.NIX_CFLAGS_COMPILE = toString (lib.optionals (ruby.rubyEngine == "ruby" && stdenv.cc.isClang && lib.versionAtLeast ruby.version.major "3") [ "-fdeclspec" ]); From 671243193cf629a2472f881776db3429d16c536f Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 11 Jun 2023 04:20:00 +0000 Subject: [PATCH 031/165] jruby: Use finalAttrs pattern --- .../interpreters/jruby/default.nix | 60 +++++++++---------- 1 file changed, 28 insertions(+), 32 deletions(-) diff --git a/pkgs/development/interpreters/jruby/default.nix b/pkgs/development/interpreters/jruby/default.nix index a36b474e9f0d..7c329f56fedc 100644 --- a/pkgs/development/interpreters/jruby/default.nix +++ b/pkgs/development/interpreters/jruby/default.nix @@ -1,44 +1,44 @@ -{ lib, stdenv, callPackage, fetchurl, makeBinaryWrapper, jre }: +{ lib, stdenv, callPackage, fetchurl, mkRubyVersion, makeBinaryWrapper, jre }: let -# The version number here is whatever is reported by the RUBY_VERSION string -rubyVersion = callPackage ../ruby/ruby-version.nix {} "3" "1" "4" ""; -jruby = stdenv.mkDerivation rec { + # The version number here is whatever is reported by the RUBY_VERSION string + rubyVersion = mkRubyVersion "3" "1" "4" ""; +in +stdenv.mkDerivation (finalAttrs: { pname = "jruby"; - version = "9.4.3.0"; src = fetchurl { - url = "https://s3.amazonaws.com/jruby.org/downloads/${version}/jruby-bin-${version}.tar.gz"; + url = "https://s3.amazonaws.com/jruby.org/downloads/${finalAttrs.version}/jruby-bin-${finalAttrs.version}.tar.gz"; hash = "sha256-sJfgjFZp6KGIKI4RORHRK0rSvWeiwgnW36hEXWOk2Mk="; }; nativeBuildInputs = [ makeBinaryWrapper ]; installPhase = '' - mkdir -pv $out/share/jruby/docs - mv * $out - rm $out/bin/*.{bat,dll,exe,sh} - mv $out/samples $out/share/jruby/ - mv $out/BSDL $out/COPYING $out/LEGAL $out/LICENSE* $out/share/jruby/docs/ + mkdir -pv $out/share/jruby/docs + mv * $out + rm $out/bin/*.{bat,dll,exe,sh} + mv $out/samples $out/share/jruby/ + mv $out/BSDL $out/COPYING $out/LEGAL $out/LICENSE* $out/share/jruby/docs/ - for i in $out/bin/jruby; do - wrapProgram $i \ - --set JAVA_HOME ${jre.home} - done + for i in $out/bin/jruby; do + wrapProgram $i \ + --set JAVA_HOME ${jre.home} + done - ln -s $out/bin/jruby $out/bin/ruby + ln -s $out/bin/jruby $out/bin/ruby - # Bundler tries to create this directory - mkdir -pv $out/${passthru.gemPath} - mkdir -p $out/nix-support - cat > $out/nix-support/setup-hook < $out/nix-support/setup-hook < Date: Sun, 11 Jun 2023 09:37:47 +0000 Subject: [PATCH 032/165] iwd: 2.4 -> 2.5 --- pkgs/os-specific/linux/iwd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/iwd/default.nix b/pkgs/os-specific/linux/iwd/default.nix index 358cfb1c67ba..36d2d5daf004 100644 --- a/pkgs/os-specific/linux/iwd/default.nix +++ b/pkgs/os-specific/linux/iwd/default.nix @@ -12,12 +12,12 @@ stdenv.mkDerivation rec { pname = "iwd"; - version = "2.4"; + version = "2.5"; src = fetchgit { url = "https://git.kernel.org/pub/scm/network/wireless/iwd.git"; rev = version; - sha256 = "sha256-X7jPheVePOaLY2kaAdpBwi5b/YrRZVqswOBu2RzsuHc="; + sha256 = "sha256-QGrZid1MVAofFcsnZ20f8RJdyNrVsRkUg2yPGC/iGVU="; }; outputs = [ "out" "man" "doc" ] From 413d8a4f82e252a9bbbab3c4fd8bdde5d1db9e63 Mon Sep 17 00:00:00 2001 From: Ionut Nechita Date: Sat, 10 Jun 2023 18:15:01 +0300 Subject: [PATCH 033/165] yandex-browser: 23.3.1.906-1 -> 23.5.1.754-1 Description: - yandex-browser-beta is updated to: 23.5.1.754-1 Change-Id: Ib04f630aede75ba3834b2632a1b166a25a53a5c3 Signed-off-by: Ionut Nechita --- .../networking/browsers/yandex-browser/default.nix | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/networking/browsers/yandex-browser/default.nix b/pkgs/applications/networking/browsers/yandex-browser/default.nix index 828fbd5949bd..6708cf630158 100644 --- a/pkgs/applications/networking/browsers/yandex-browser/default.nix +++ b/pkgs/applications/networking/browsers/yandex-browser/default.nix @@ -51,11 +51,11 @@ stdenv.mkDerivation rec { pname = "yandex-browser"; - version = "23.3.1.906-1"; + version = "23.5.1.754-1"; src = fetchurl { url = "http://repo.yandex.ru/yandex-browser/deb/pool/main/y/${pname}-beta/${pname}-beta_${version}_amd64.deb"; - sha256 = "sha256-hQwAHtPUcGSDKD7SmWa8H1f/T4Imu9061tIvenw0KWQ="; + sha256 = "sha256-ngtwrq8vDEt39Zd5jpBadouN1V8ly03la69M0AUyhGM="; }; nativeBuildInputs = [ @@ -136,12 +136,5 @@ stdenv.mkDerivation rec { sourceProvenance = with sourceTypes; [ binaryNativeCode ]; maintainers = with maintainers; [ dan4ik605743 ionutnechita ]; platforms = [ "x86_64-linux" ]; - - knownVulnerabilities = [ - '' - Trusts a Russian government issued CA certificate for some websites. - See https://habr.com/en/company/yandex/blog/655185/ (Russian) for details. - '' - ]; }; } From 7c37217a76ffc97c7dc5535d919f22dcc71f0d9b Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Mon, 1 May 2023 15:17:18 +0200 Subject: [PATCH 034/165] winePackages.{unstable,staging}: 8.5 -> 8.10 --- pkgs/applications/emulators/wine/sources.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/emulators/wine/sources.nix b/pkgs/applications/emulators/wine/sources.nix index 78bc98cb20f5..e35428a5a0d8 100644 --- a/pkgs/applications/emulators/wine/sources.nix +++ b/pkgs/applications/emulators/wine/sources.nix @@ -69,28 +69,28 @@ in rec { unstable = fetchurl rec { # NOTE: Don't forget to change the hash for staging as well. - version = "8.5"; + version = "8.10"; url = "https://dl.winehq.org/wine/source/8.x/wine-${version}.tar.xz"; - hash = "sha256-wJdmQBswu0JeEy4RSyba+kJ2SX5AzL4V+3fnUfsJvhc="; + hash = "sha256-xPNt1zwXbO+OcBbKQTnudvW0mKSv1+21F+FMDVOUc28="; inherit (stable) patches; ## see http://wiki.winehq.org/Gecko gecko32 = fetchurl rec { - version = "2.47.3"; + version = "2.47.4"; url = "https://dl.winehq.org/wine/wine-gecko/${version}/wine-gecko-${version}-x86.msi"; - hash = "sha256-5bmwbTzjVWRqjS5y4ETjfh4MjRhGTrGYWtzRh6f0jgE="; + hash = "sha256-Js7MR3BrCRkI9/gUvdsHTGG+uAYzGOnvxaf3iYV3k9Y="; }; gecko64 = fetchurl rec { - version = "2.47.3"; + version = "2.47.4"; url = "https://dl.winehq.org/wine/wine-gecko/${version}/wine-gecko-${version}-x86_64.msi"; - hash = "sha256-pT7pVDkrbR/j1oVF9uTiqXr7yNyLA6i0QzSVRc4TlnU="; + hash = "sha256-5ZC32YijLWqkzx2Ko6o9M3Zv3Uz0yJwtzCCV7LKNBm8="; }; ## see http://wiki.winehq.org/Mono mono = fetchurl rec { - version = "7.4.0"; + version = "8.0.0"; url = "https://dl.winehq.org/wine/wine-mono/${version}/wine-mono-${version}-x86.msi"; - hash = "sha256-ZBP/Mo679+x2icZI/rNUbYEC3thlB50fvwMxsUs6sOw="; + hash = "sha256-dbP0XcodyJhX/p6TLaeHEPZMxtSe8asMcjoXcIW0cRs="; }; updateScript = writeShellScript "update-wine-unstable" '' @@ -117,7 +117,7 @@ in rec { staging = fetchFromGitHub rec { # https://github.com/wine-staging/wine-staging/releases inherit (unstable) version; - hash = "sha256-vHV7x2U9B4P0E4tcQuMXHSS4NqN7rlnhC6v/t+0Qlh0="; + hash = "sha256-4EHzverfPu4PoRvbeH/iaGqNoXk6XgneDpKOuMf9P1g="; owner = "wine-staging"; repo = "wine-staging"; rev = "v${version}"; From d17050ed8705203d23401dc877084a2158bc2890 Mon Sep 17 00:00:00 2001 From: meppu Date: Sun, 11 Jun 2023 22:26:49 +0300 Subject: [PATCH 035/165] osu-lazer-bin: 2023.511.0 -> 2023.610.0 --- pkgs/games/osu-lazer/bin.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/games/osu-lazer/bin.nix b/pkgs/games/osu-lazer/bin.nix index 81129ba1d695..516e8d4e4653 100644 --- a/pkgs/games/osu-lazer/bin.nix +++ b/pkgs/games/osu-lazer/bin.nix @@ -7,21 +7,21 @@ let pname = "osu-lazer-bin"; - version = "2023.511.0"; + version = "2023.610.0"; name = "${pname}-${version}"; osu-lazer-bin-src = { aarch64-darwin = { url = "https://github.com/ppy/osu/releases/download/${version}/osu.app.Apple.Silicon.zip"; - sha256 = "sha256-oy+MDLwi1hEb4NSYxdDE1rxBLHfio9t+n+/GE6FcLYc="; + sha256 = "sha256-MCQYtdTigE6Dyrst2KLoFthbrJjNXm3TQRiaTzp32Os="; }; x86_64-darwin = { url = "https://github.com/ppy/osu/releases/download/${version}/osu.app.Intel.zip"; - sha256 = "sha256-i4y2ySo0XEEZSBYQI17G8SdGXyunT2g1XECrlud7hIc="; + sha256 = "sha256-jA7fr9nntV5/J4/AUOH6HS6ZoYQ1ZZxY/ic6KeAch/c="; }; x86_64-linux = { url = "https://github.com/ppy/osu/releases/download/${version}/osu.AppImage"; - sha256 = "sha256-GUT0wlBUMJR/M2Ovwda0uMeDG1O8cqmrRoDlV2bGybU="; + sha256 = "sha256-QAFbTn30lSOjEC1ZT9caUR2WQmz+bNDhpd3RL7OJWWI="; }; }.${stdenv.system} or (throw "${pname}-${version}: ${stdenv.system} is unsupported."); From 46a696bfc1557bf22e4c94694be53bc1e391b2fe Mon Sep 17 00:00:00 2001 From: meppu Date: Sun, 11 Jun 2023 23:33:25 +0300 Subject: [PATCH 036/165] osu-lazer: 2023.511.0 -> 2023.610.0 --- pkgs/games/osu-lazer/default.nix | 4 ++-- pkgs/games/osu-lazer/deps.nix | 14 +++++++------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/games/osu-lazer/default.nix b/pkgs/games/osu-lazer/default.nix index 304c40b3fbea..8a7045db1d5a 100644 --- a/pkgs/games/osu-lazer/default.nix +++ b/pkgs/games/osu-lazer/default.nix @@ -17,13 +17,13 @@ buildDotnetModule rec { pname = "osu-lazer"; - version = "2023.511.0"; + version = "2023.610.0"; src = fetchFromGitHub { owner = "ppy"; repo = "osu"; rev = version; - sha256 = "sha256-bwbryisUiRCv/N4RTHUecsJ5/JVM3XF3f9mKb1M6jow="; + sha256 = "sha256-2oCv+6cxhz1PU4Jh9Ux8RAcksqWiq2VVE6aKi6bJDIw="; }; projectFile = "osu.Desktop/osu.Desktop.csproj"; diff --git a/pkgs/games/osu-lazer/deps.nix b/pkgs/games/osu-lazer/deps.nix index 2bf41c8028d1..e853ff5b25e8 100644 --- a/pkgs/games/osu-lazer/deps.nix +++ b/pkgs/games/osu-lazer/deps.nix @@ -61,7 +61,7 @@ (fetchNuGet { pname = "Humanizer.Core.zh-CN"; version = "2.14.1"; sha256 = "1k6nnawd016xpwgzdzy84z1lcv2vc1cygcksw19wbgd8dharyyk7"; }) (fetchNuGet { pname = "Humanizer.Core.zh-Hans"; version = "2.14.1"; sha256 = "0zn99311zfn602phxyskfjq9vly0w5712z6fly8r4q0h94qa8c85"; }) (fetchNuGet { pname = "Humanizer.Core.zh-Hant"; version = "2.14.1"; sha256 = "0qxjnbdj645l5sd6y3100yyrq1jy5misswg6xcch06x8jv7zaw1p"; }) - (fetchNuGet { pname = "JetBrains.Annotations"; version = "2021.3.0"; sha256 = "01ssylllbwpana2w3iybi533zlvcsbhzjc8kr0g4kg307kjbfn8v"; }) + (fetchNuGet { pname = "JetBrains.Annotations"; version = "2022.3.1"; sha256 = "0lkhyyz25q82ygnxy26lwy5cl8fvkdc13pcn433xpjj8akzbmgd6"; }) (fetchNuGet { pname = "JetBrains.ReSharper.GlobalTools"; version = "2022.2.3"; sha256 = "0ck4nkk8wlj2gcgs7j4j6z4yqrnf2f5rs2pgwa8kar026sc29xsl"; }) (fetchNuGet { pname = "managed-midi"; version = "1.10.0"; sha256 = "1rih8iq8k4j6n3206d2j7z4vygp725kzs95c6yc7p1mlhfiiimvq"; }) (fetchNuGet { pname = "Markdig"; version = "0.23.0"; sha256 = "1bwn885w7balwncmr764vidyyp9bixqlq6r3lhsapj8ykrpxxa70"; }) @@ -112,7 +112,7 @@ (fetchNuGet { pname = "NETStandard.Library"; version = "1.6.1"; sha256 = "1z70wvsx2d847a2cjfii7b83pjfs34q05gb037fdjikv5kbagml8"; }) (fetchNuGet { pname = "NETStandard.Library"; version = "2.0.0"; sha256 = "1bc4ba8ahgk15m8k4nd7x406nhi0kwqzbgjk2dmw52ss553xz7iy"; }) (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.1"; sha256 = "0fijg0w6iwap8gvzyjnndds0q4b8anwxxvik7y8vgq97dram4srb"; }) - (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.2"; sha256 = "1p9splg1min274dpz7xdfgzrwkyfd3xlkygwpr1xgjvvyjvs6b0i"; }) + (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.3"; sha256 = "0xrwysmrn4midrjal8g2hr1bbg38iyisl0svamb11arqws4w2bw7"; }) (fetchNuGet { pname = "NuGet.Common"; version = "5.11.0"; sha256 = "1amf6scr5mcjdvd1fflag6i4qjwmydq5qwp6g3f099n901zq0dr3"; }) (fetchNuGet { pname = "NuGet.Configuration"; version = "5.11.0"; sha256 = "1s9pbrh7xy9jz7npz0sahdsj1cw8gfx1fwf3knv0ms1n0c9bk53l"; }) (fetchNuGet { pname = "NuGet.DependencyResolver.Core"; version = "5.11.0"; sha256 = "0yllxfv8lx1b7zj114mpxw03186q5ynsdvza6llp3wypxp367inr"; }) @@ -134,15 +134,15 @@ (fetchNuGet { pname = "ppy.ManagedBass"; version = "2022.1216.0"; sha256 = "19nnj1hq2v21mrplnivjr9c4y3wg4hhfnc062sjgzkmiv1cchvf8"; }) (fetchNuGet { pname = "ppy.ManagedBass.Fx"; version = "2022.1216.0"; sha256 = "1vw573mkligpx9qiqasw1683cqaa1kgnxhlnbdcj9c4320b1pwjm"; }) (fetchNuGet { pname = "ppy.ManagedBass.Mix"; version = "2022.1216.0"; sha256 = "185bpvgbnd8y20r7vxb1an4pd1aal9b7b5wvmv3knz0qg8j0chd9"; }) - (fetchNuGet { pname = "ppy.osu.Framework"; version = "2023.510.0"; sha256 = "0dkhw65rgclhg26hanmjvr72b12yg3snz7vjyxgqh38yvgd18z0b"; }) + (fetchNuGet { pname = "ppy.osu.Framework"; version = "2023.608.0"; sha256 = "0qf9z0307sh1skixql23v4vjkz1jwz6qhjdzqhhyb708hx9p7a03"; }) (fetchNuGet { pname = "ppy.osu.Framework.NativeLibs"; version = "2022.525.0"; sha256 = "1zsqj3xng06bb46vg79xx35n2dsh3crqg951r1ga2gxqzgzy4nk0"; }) (fetchNuGet { pname = "ppy.osu.Framework.SourceGeneration"; version = "2022.1222.1"; sha256 = "1pwwsp4rfzl6166mhrn5lsnyazpckhfh1m6ggf9d1lw2wb58vxfr"; }) (fetchNuGet { pname = "ppy.osu.Game.Resources"; version = "2023.510.0"; sha256 = "155rjpr0vv4a2ar1xmh2zvg9rw07xii72gg11g5jkk5qxm9lkgk0"; }) (fetchNuGet { pname = "ppy.osuTK.NS20"; version = "1.0.211"; sha256 = "0j4a9n39pqm0cgdcps47p5n2mqph3h94r7hmf0bs59imif4jxvjy"; }) - (fetchNuGet { pname = "ppy.SDL2-CS"; version = "1.0.652-alpha"; sha256 = "104amh94xlnp13qfjkwwvi74qanx52k52dd7h7j2anaa0g350rrh"; }) - (fetchNuGet { pname = "ppy.Veldrid"; version = "4.9.3-gf1f8dc0432"; sha256 = "01xnb43gkbrn3wnb79k9k5cg2xhq4vf94i7c648003i0pdvm0rbz"; }) - (fetchNuGet { pname = "ppy.Veldrid.MetalBindings"; version = "4.9.3-gf1f8dc0432"; sha256 = "0w15rfshjrkblk91gl7mqdvbfrqi19bpgx60zm42znx5r4ryjix8"; }) - (fetchNuGet { pname = "ppy.Veldrid.OpenGLBindings"; version = "4.9.3-gf1f8dc0432"; sha256 = "1mr7mcpjb4fz3lbxi1qv9vwjsbm8sgh20gb8xbvpjkzj9hk5xbp3"; }) + (fetchNuGet { pname = "ppy.SDL2-CS"; version = "1.0.669-alpha"; sha256 = "0frazc37k9nqzk3sqcy3jzibg9v6dp0ga95yx0rkmjm8jfbw3l9r"; }) + (fetchNuGet { pname = "ppy.Veldrid"; version = "4.9.3-g31346ea477"; sha256 = "0wrb1skyj58p23ryjkmlk8f1sdhplr5c43w31sw8bhv0yqmhjd80"; }) + (fetchNuGet { pname = "ppy.Veldrid.MetalBindings"; version = "4.9.3-g31346ea477"; sha256 = "0x4i7v7z9n4yryi68h973f5kxiszjdy3hvkgbk4wa9g2skxyknhx"; }) + (fetchNuGet { pname = "ppy.Veldrid.OpenGLBindings"; version = "4.9.3-g31346ea477"; sha256 = "1k5by3zn4ih6d82l7rif25305js885qic44al47msidrq09rnacz"; }) (fetchNuGet { pname = "ppy.Veldrid.SPIRV"; version = "1.0.15-g3e4b9f196a"; sha256 = "0ijainvin0v01pk282985v0mwwa1s2b683wxg23jzk69pbvpyq6g"; }) (fetchNuGet { pname = "Realm"; version = "10.20.0"; sha256 = "0gy0l2r7726wb6i599n55dn9035h0g7k0binfiy2dy9bjwz60jqk"; }) (fetchNuGet { pname = "Realm.Fody"; version = "10.20.0"; sha256 = "0rwcbbzr41iww3k59rjgy5xy7bna1x906h5blbllpywgpc2l5afw"; }) From 6b1052e4e327fdc5b3357e10b0c5111ed5d1f81e Mon Sep 17 00:00:00 2001 From: piegames Date: Sun, 11 Jun 2023 13:36:48 +0200 Subject: [PATCH 037/165] CONTRIBUTING.md: Add section for mass-ping handling --- CONTRIBUTING.md | 37 +++++++++++++++++++++++++++++++++++-- 1 file changed, 35 insertions(+), 2 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 1ba2ae48da4e..88e53b0075a7 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -66,9 +66,12 @@ Useful git commands that can help a lot with this are `git commit --patch --amen From time to time, changes between branches must be rebased, for example, if the number of new rebuilds they would cause is too large for the target branch. When rebasing, care must be taken to include only the intended changes, otherwise -many CODEOWNERS will be inadvertently requested for review. To achieve this, +many CODEOWNERS will be inadvertently requested for review. To achieve this, rebasing should not be performed directly on the target branch, but on the merge -base between the current and target branch. +base between the current and target branch. As an additional precautionary measure, +you should temporarily mark the PR as draft for the duration of the operation. +This reduces the probability of mass-pinging people. (OfBorg might still +request a couple of persons for reviews though.) In the following example, we assume that the current branch, called `feature`, is based on `master`, and we rebase it onto the merge base between @@ -102,6 +105,36 @@ git status git push origin feature --force-with-lease ``` +### Something went wrong and a lot of people were pinged + +It happens. Remember to be kind, especially to new contributors. +There is no way back, so the pull request should be closed and locked +(if possible). The changes should be re-submitted in a new PR, in which the people +originally involved in the conversation need to manually be pinged again. +No further discussion should happen on the original PR, as a lot of people +are now subscribed to it. + +The following message (or a version thereof) might be left when closing to +describe the situation, since closing and locking without any explanation +is kind of rude: + +```markdown +It looks like you accidentally mass-pinged a bunch of people, which are now subscribed +and getting notifications for everything in this pull request. Unfortunately, they +cannot be automatically unsubscribed from the issue (removing review request does not +unsubscribe), therefore development cannot continue in this pull request anymore. + +Please open a new pull request with your changes, link back to this one and ping the +people actually involved in here over there. + +In order to avoid this in the future, there are instructions for how to properly +rebase between branches in our [contribution guidelines](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md#rebasing-between-branches-ie-from-master-to-staging). +Setting your pull request to draft prior to rebasing is strongly recommended. +In draft status, you can preview the list of people that are about to be requested +for review, which allows you to sidestep this issue. +This is not a bulletproof method though, as OfBorg still does review requests even on draft PRs. +``` + ## Backporting changes Follow these steps to backport a change into a release branch in compliance with the [commit policy](https://nixos.org/nixpkgs/manual/#submitting-changes-stable-release-branches). From b594eeaeb3a50340c075318cee66927d9849a09a Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Mon, 12 Jun 2023 04:20:00 +0000 Subject: [PATCH 038/165] rage: 0.9.1 -> 0.9.2 Diff: https://github.com/str4d/rage/compare/v0.9.1...v0.9.2 Changelog: https://github.com/str4d/rage/raw/v0.9.2/rage/CHANGELOG.md --- pkgs/tools/security/rage/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/rage/default.nix b/pkgs/tools/security/rage/default.nix index 95ffb1c23388..bf17556b03a6 100644 --- a/pkgs/tools/security/rage/default.nix +++ b/pkgs/tools/security/rage/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "rage"; - version = "0.9.1"; + version = "0.9.2"; src = fetchFromGitHub { owner = "str4d"; repo = pname; rev = "v${version}"; - hash = "sha256-df+ch0JfPgmf/qKMV3sBSmfCvRTazVnAa1SRRvhrteQ="; + hash = "sha256-JLtP3zimNL1UIFsbvtV2JO3PVV6w9VnfjpROs2UoFcU="; }; - cargoHash = "sha256-GW3u3LyUJqu4AMnb/2M7mYa45qbRtG2IDuCJoEVOfn0="; + cargoHash = "sha256-1gtLWU6uiWzUfYy9y3pb2vcnUC3H+Mf9rglmqNd989M="; nativeBuildInputs = [ installShellFiles From 1caf98c3a73313707d64150cfe5f81a64112f534 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Mon, 12 Jun 2023 04:20:00 +0000 Subject: [PATCH 039/165] readability-cli: repackage using buildNpmPackage --- pkgs/development/node-packages/aliases.nix | 1 + .../node-packages/node-packages.json | 1 - .../node-packages/node-packages.nix | 181 ------------------ pkgs/development/node-packages/overrides.nix | 20 -- pkgs/tools/text/readability-cli/default.nix | 40 ++++ pkgs/top-level/all-packages.nix | 2 + 6 files changed, 43 insertions(+), 202 deletions(-) create mode 100644 pkgs/tools/text/readability-cli/default.nix diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index 7e13ee15364e..830fc2d956cc 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -44,6 +44,7 @@ mapAliases { "@nestjs/cli" = pkgs.nest-cli; # Added 2023-05-06 eslint_d = pkgs.eslint_d; # Added 2023-05-26 manta = pkgs.node-manta; # Added 2023-05-06 + readability-cli = pkgs.readability-cli; # Added 2023-06-12 thelounge = pkgs.thelounge; # Added 2023-05-22 triton = pkgs.triton; # Added 2023-05-06 } diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index 635677feb6a1..8270ebf8665b 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -271,7 +271,6 @@ , "react-native-cli" , "react-static" , "react-tools" -, "readability-cli" , "redoc-cli" , "remod-cli" , "reveal.js" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index a4110da48ed1..e784b8159fb6 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -131037,187 +131037,6 @@ in bypassCache = true; reconstructLock = true; }; - readability-cli = nodeEnv.buildNodePackage { - name = "readability-cli"; - packageName = "readability-cli"; - version = "2.4.4"; - src = fetchurl { - url = "https://registry.npmjs.org/readability-cli/-/readability-cli-2.4.4.tgz"; - sha512 = "KNVRUT4JKrnNCkD4IuMm9zU5bkFc699lue7xT66lIhjXTARwKlBRwiSZYgx7mCKC/Zj40dw89UULFAyihnXLXQ=="; - }; - dependencies = [ - sources."@mapbox/node-pre-gyp-1.0.10" - sources."@mozilla/readability-0.4.4" - sources."@tootallnate/once-2.0.0" - sources."abab-2.0.6" - sources."abbrev-1.1.1" - sources."acorn-8.8.2" - (sources."acorn-globals-6.0.0" // { - dependencies = [ - sources."acorn-7.4.1" - ]; - }) - sources."acorn-walk-7.2.0" - sources."agent-base-6.0.2" - sources."ansi-regex-5.0.1" - sources."ansi-styles-4.3.0" - sources."aproba-2.0.0" - sources."are-we-there-yet-2.0.0" - sources."asynckit-0.4.0" - sources."balanced-match-1.0.2" - sources."brace-expansion-1.1.11" - sources."browser-process-hrtime-1.0.0" - sources."bufferutil-4.0.7" - sources."canvas-2.11.2" - sources."chownr-2.0.0" - sources."cliui-8.0.1" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."color-support-1.1.3" - sources."combined-stream-1.0.8" - sources."concat-map-0.0.1" - sources."console-control-strings-1.1.0" - sources."cssom-0.5.0" - (sources."cssstyle-2.3.0" // { - dependencies = [ - sources."cssom-0.3.8" - ]; - }) - (sources."data-urls-3.0.2" // { - dependencies = [ - sources."whatwg-url-11.0.0" - ]; - }) - sources."debug-4.3.4" - sources."decimal.js-10.4.3" - sources."decompress-response-4.2.1" - sources."deep-is-0.1.4" - sources."delayed-stream-1.0.0" - sources."delegates-1.0.0" - sources."detect-libc-2.0.1" - sources."domexception-4.0.0" - sources."dompurify-2.4.5" - sources."emoji-regex-8.0.0" - sources."encoding-0.1.13" - sources."escalade-3.1.1" - sources."escodegen-2.0.0" - sources."esprima-4.0.1" - sources."estraverse-5.3.0" - sources."esutils-2.0.3" - sources."fast-levenshtein-2.0.6" - sources."form-data-4.0.0" - (sources."fs-minipass-2.1.0" // { - dependencies = [ - sources."minipass-3.3.6" - ]; - }) - sources."fs.realpath-1.0.0" - sources."gauge-3.0.2" - sources."get-caller-file-2.0.5" - sources."glob-7.2.3" - sources."has-unicode-2.0.1" - sources."html-encoding-sniffer-3.0.0" - sources."http-proxy-agent-5.0.0" - sources."https-proxy-agent-5.0.1" - sources."iconv-lite-0.6.3" - sources."inflight-1.0.6" - sources."inherits-2.0.4" - sources."is-fullwidth-code-point-3.0.0" - sources."is-potential-custom-element-name-1.0.1" - sources."jsdom-19.0.0" - sources."levn-0.3.0" - sources."lru-cache-6.0.0" - (sources."make-dir-3.1.0" // { - dependencies = [ - sources."semver-6.3.0" - ]; - }) - sources."mime-db-1.52.0" - sources."mime-types-2.1.35" - sources."mimic-response-2.1.0" - sources."minimatch-3.1.2" - sources."minipass-5.0.0" - (sources."minizlib-2.1.2" // { - dependencies = [ - sources."minipass-3.3.6" - ]; - }) - sources."mkdirp-1.0.4" - sources."ms-2.1.2" - sources."nan-2.17.0" - (sources."node-fetch-2.6.11" // { - dependencies = [ - sources."tr46-0.0.3" - sources."webidl-conversions-3.0.1" - sources."whatwg-url-5.0.0" - ]; - }) - sources."node-gyp-build-4.6.0" - sources."nopt-5.0.0" - sources."npmlog-5.0.1" - sources."nwsapi-2.2.5" - sources."object-assign-4.1.1" - sources."once-1.4.0" - sources."optionator-0.8.3" - sources."parse5-6.0.1" - sources."path-is-absolute-1.0.1" - sources."prelude-ls-1.1.2" - sources."psl-1.9.0" - sources."punycode-2.3.0" - sources."querystringify-2.2.0" - sources."readable-stream-3.6.2" - sources."require-directory-2.1.1" - sources."requires-port-1.0.0" - sources."rimraf-3.0.2" - sources."safe-buffer-5.2.1" - sources."safer-buffer-2.1.2" - sources."saxes-5.0.1" - sources."semver-7.5.1" - sources."set-blocking-2.0.0" - sources."signal-exit-3.0.7" - sources."simple-concat-1.0.1" - sources."simple-get-3.1.1" - sources."source-map-0.6.1" - sources."string-width-4.2.3" - sources."string_decoder-1.3.0" - sources."strip-ansi-6.0.1" - sources."symbol-tree-3.2.4" - sources."tar-6.1.15" - sources."tough-cookie-4.1.3" - sources."tr46-3.0.0" - sources."type-check-0.3.2" - sources."universalify-0.2.0" - sources."url-parse-1.5.10" - sources."utf-8-validate-6.0.3" - sources."util-deprecate-1.0.2" - sources."w3c-hr-time-1.0.2" - sources."w3c-xmlserializer-3.0.0" - sources."webidl-conversions-7.0.0" - sources."whatwg-encoding-2.0.0" - sources."whatwg-mimetype-3.0.0" - sources."whatwg-url-10.0.0" - sources."wide-align-1.1.5" - sources."word-wrap-1.2.3" - sources."wrap-ansi-7.0.0" - sources."wrappy-1.0.2" - sources."ws-8.13.0" - sources."xml-name-validator-4.0.0" - sources."xmlchars-2.2.0" - sources."y18n-5.0.8" - sources."yallist-4.0.0" - sources."yargs-17.7.2" - sources."yargs-parser-21.1.1" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "Firefox Reader Mode in your terminal - get useful text from a web page using Mozilla's Readability library"; - homepage = "https://gitlab.com/gardenappl/readability-cli#readme"; - license = "GPL-3.0-only"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; redoc-cli = nodeEnv.buildNodePackage { name = "redoc-cli"; packageName = "redoc-cli"; diff --git a/pkgs/development/node-packages/overrides.nix b/pkgs/development/node-packages/overrides.nix index 27665af01e4c..11bb7a0da599 100644 --- a/pkgs/development/node-packages/overrides.nix +++ b/pkgs/development/node-packages/overrides.nix @@ -433,26 +433,6 @@ final: prev: { ''; }; - readability-cli = prev.readability-cli.override (oldAttrs: { - # Wrap src to fix this build error: - # > readability-cli/readable.ts: unsupported interpreter directive "#!/usr/bin/env -S deno..." - # - # Need to wrap the source, instead of patching in patchPhase, because - # buildNodePackage only unpacks sources in the installPhase. - src = pkgs.srcOnly { - src = oldAttrs.src; - name = oldAttrs.name; - patchPhase = "chmod a-x readable.ts"; - }; - - nativeBuildInputs = [ pkgs.pkg-config ]; - buildInputs = with pkgs; [ - pixman - cairo - pango - ]; - }); - reveal-md = prev.reveal-md.override ( lib.optionalAttrs (!stdenv.isDarwin) { nativeBuildInputs = [ pkgs.buildPackages.makeWrapper ]; diff --git a/pkgs/tools/text/readability-cli/default.nix b/pkgs/tools/text/readability-cli/default.nix new file mode 100644 index 000000000000..5c0fedd752c3 --- /dev/null +++ b/pkgs/tools/text/readability-cli/default.nix @@ -0,0 +1,40 @@ +{ lib, buildNpmPackage, fetchFromGitLab, installShellFiles }: + +buildNpmPackage rec { + pname = "readability-cli"; + version = "2.4.4"; + + src = fetchFromGitLab { + owner = "gardenappl"; + repo = pname; + rev = "v${version}"; + hash = "sha256-pvAp3ZJ8/FPhrSMC8B4U1m5zuBNRP/HcsXkrW6QYgSQ="; + }; + + postPatch = '' + # Set a script name to avoid yargs using index.js as $0 + substituteInPlace common.mjs \ + --replace '.version(false)' '.version(false).scriptName("readable")' + ''; + + npmDepsHash = "sha256-X1pcgDm8C4G+hIsgx3sAVFQPadWsULvXrdLAIHnpjmE="; + + nativeBuildInputs = [ installShellFiles ]; + + dontNpmBuild = true; + + postInstall = '' + installManPage readability-cli.1 + installShellCompletion --cmd readable \ + --bash <(SHELL=bash $out/bin/readable --completion) \ + --zsh <(SHELL=zsh $out/bin/readable --completion) + ''; + + meta = with lib; { + description = "Firefox Reader Mode in your terminal - get useful text from a web page using Mozilla's Readability library"; + homepage = "https://gitlab.com/gardenappl/readability-cli"; + license = licenses.gpl3Only; + maintainers = [ maintainers.marsam ]; + mainProgram = "readable"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e26435ed865e..d70cb8570a47 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11940,6 +11940,8 @@ with pkgs; qt-box-editor = libsForQt5.callPackage ../applications/misc/qt-box-editor { }; + readability-cli = callPackage ../tools/text/readability-cli { }; + recutils = callPackage ../tools/misc/recutils { }; recoll = libsForQt5.callPackage ../applications/search/recoll { }; From 75b5f4b106e04e47611d7309d0e7531d5c07840a Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 12 Jun 2023 08:48:11 +0200 Subject: [PATCH 040/165] ocamlPackages.mariadb: fix for OCaml 5.0 --- .../development/ocaml-modules/mariadb/default.nix | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/mariadb/default.nix b/pkgs/development/ocaml-modules/mariadb/default.nix index 4aaaf11450bb..397402481839 100644 --- a/pkgs/development/ocaml-modules/mariadb/default.nix +++ b/pkgs/development/ocaml-modules/mariadb/default.nix @@ -1,5 +1,6 @@ { lib, fetchurl, stdenv -, ocaml, findlib, ocamlbuild +, fetchpatch +, ocaml, findlib, ocamlbuild, camlp-streams , ctypes, mariadb, libmysqlclient }: lib.throwIfNot (lib.versionAtLeast ocaml.version "4.07") @@ -14,8 +15,18 @@ stdenv.mkDerivation rec { sha256 = "sha256-3/C1Gz6luUzS7oaudLlDHMT6JB2v5OdbLVzJhtayHGM="; }; + patches = fetchpatch { + url = "https://github.com/andrenth/ocaml-mariadb/commit/9db2e4d8dec7c584213d0e0f03d079a36a35d9d5.patch"; + hash = "sha256-heROtU02cYBJ5edIHMdYP1xNXcLv8h79GYGBuudJhgE="; + }; + + postPatch = '' + substituteInPlace setup.ml --replace '#use "topfind"' \ + '#directory "${findlib}/lib/ocaml/${ocaml.version}/site-lib/";; #use "topfind"' + ''; + nativeBuildInputs = [ ocaml findlib ocamlbuild ]; - buildInputs = [ mariadb libmysqlclient ]; + buildInputs = [ mariadb libmysqlclient camlp-streams ocamlbuild ]; propagatedBuildInputs = [ ctypes ]; strictDeps = true; From a70967020f7a6d0584aa8058526d8a5cbf91cf87 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 12 Jun 2023 08:48:16 +0200 Subject: [PATCH 041/165] =?UTF-8?q?ocamlPackages.bz2:=20disable=20for=20OC?= =?UTF-8?q?aml=20=E2=89=A5=205.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/ocaml-modules/bz2/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/ocaml-modules/bz2/default.nix b/pkgs/development/ocaml-modules/bz2/default.nix index 835570dc9ab6..7e5f256a1a74 100644 --- a/pkgs/development/ocaml-modules/bz2/default.nix +++ b/pkgs/development/ocaml-modules/bz2/default.nix @@ -1,6 +1,7 @@ { lib, stdenv, fetchFromGitLab, ocaml, findlib, bzip2, autoreconfHook }: if lib.versionOlder ocaml.version "4.02" +|| lib.versionAtLeast ocaml.version "5.0" then throw "bz2 is not available for OCaml ${ocaml.version}" else From 03dc92bce19848f26edf53c662845a60a129b811 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 12 Jun 2023 08:48:20 +0200 Subject: [PATCH 042/165] ocamlPackages.ansiterminal: fix for OCaml 5.0 --- pkgs/development/ocaml-modules/ansiterminal/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/ocaml-modules/ansiterminal/default.nix b/pkgs/development/ocaml-modules/ansiterminal/default.nix index f421e59ce7da..8b8833b14eb6 100644 --- a/pkgs/development/ocaml-modules/ansiterminal/default.nix +++ b/pkgs/development/ocaml-modules/ansiterminal/default.nix @@ -9,6 +9,10 @@ buildDunePackage rec { hash = "sha256-q3OyGLajAmfSu8QzEtzzE5gbiwvsVV2SsGuHZkst0w4="; }; + postPatch = '' + substituteInPlace src/dune --replace 'libraries unix bytes' 'libraries unix' + ''; + doCheck = true; meta = with lib; { From 1605374b3ece6dc7b9e4e13b06eead10ad0b2a34 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 12 Jun 2023 11:09:15 +0000 Subject: [PATCH 043/165] libmwaw: 0.3.21 -> 0.3.22 --- pkgs/development/libraries/libmwaw/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libmwaw/default.nix b/pkgs/development/libraries/libmwaw/default.nix index 8f83c2055c62..cc2a292a0493 100644 --- a/pkgs/development/libraries/libmwaw/default.nix +++ b/pkgs/development/libraries/libmwaw/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libmwaw"; - version = "0.3.21"; + version = "0.3.22"; src = fetchurl { url = "mirror://sourceforge/libmwaw/libmwaw/libmwaw-${version}/libmwaw-${version}.tar.xz"; - sha256 = "sha256-6HUBI6eNYblDzveLdzbIp/ILsKZJqhEkAhJPunlPwhw="; + sha256 = "sha256-oaOf/Oo/8qenquDCOHfd9JGLVUv4Kw3l186Of2HqjjI="; }; nativeBuildInputs = [ pkg-config ]; From 025cb1e9b0ed6a09f4f7cacbb2ffe9ccb1ad5287 Mon Sep 17 00:00:00 2001 From: Joshua Chapman Date: Mon, 12 Jun 2023 15:57:46 +0200 Subject: [PATCH 044/165] timewarrior: install bash completion The completions files are not installed by default, so we need to install them manually. This is done by adding the installShellFiles build input and calling installShellCompletion in postInstall. --- pkgs/applications/misc/timewarrior/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/timewarrior/default.nix b/pkgs/applications/misc/timewarrior/default.nix index 0918b91f48c5..026f5ae5014e 100644 --- a/pkgs/applications/misc/timewarrior/default.nix +++ b/pkgs/applications/misc/timewarrior/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, asciidoctor }: +{ lib, stdenv, fetchFromGitHub, cmake, asciidoctor, installShellFiles }: stdenv.mkDerivation rec { pname = "timewarrior"; @@ -12,10 +12,15 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; - nativeBuildInputs = [ cmake asciidoctor ]; + nativeBuildInputs = [ cmake asciidoctor installShellFiles ]; dontUseCmakeBuildDir = true; + postInstall = '' + installShellCompletion --cmd timew \ + --bash completion/timew-completion.bash + ''; + meta = with lib; { description = "A command-line time tracker"; homepage = "https://timewarrior.net"; From 51aa21dc1992b9ab19bdcce7b3f808088e976d6d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 12 Jun 2023 15:27:50 +0000 Subject: [PATCH 045/165] texlab: 5.6.0 -> 5.7.0 --- pkgs/development/tools/misc/texlab/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/texlab/default.nix b/pkgs/development/tools/misc/texlab/default.nix index 9fd676d6fdb5..879e37cfdb4a 100644 --- a/pkgs/development/tools/misc/texlab/default.nix +++ b/pkgs/development/tools/misc/texlab/default.nix @@ -15,16 +15,16 @@ let in rustPlatform.buildRustPackage rec { pname = "texlab"; - version = "5.6.0"; + version = "5.7.0"; src = fetchFromGitHub { owner = "latex-lsp"; repo = "texlab"; rev = "refs/tags/v${version}"; - hash = "sha256-3s8Nn3jLj39LWRb3jPbNAx0IcNUxGlvzybm+7+M5FRU="; + hash = "sha256-GvORAPbQOdVpz4yY66b3OObewU98V26cZ6nrJ35nlkg="; }; - cargoHash = "sha256-fHw8ulW7VsgxexY+hbZ+2MXwrzz77Ku7vQtsFRAO/JA="; + cargoHash = "sha256-b7v3ODOjY5BQCzVqlLCNUOaZS95AvIvyjOeas2XfRjM="; outputs = [ "out" ] ++ lib.optional (!isCross) "man"; From 6f747a9f14c300b2c381afce86b8e4104826c662 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Mon, 12 Jun 2023 23:47:19 +0800 Subject: [PATCH 046/165] pantheon.granite7: 7.2.0 -> 7.3.0 https://github.com/elementary/granite/releases/tag/7.3.0 --- pkgs/desktops/pantheon/granite/7/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/pantheon/granite/7/default.nix b/pkgs/desktops/pantheon/granite/7/default.nix index 0903dc697096..0904fbe2579f 100644 --- a/pkgs/desktops/pantheon/granite/7/default.nix +++ b/pkgs/desktops/pantheon/granite/7/default.nix @@ -5,6 +5,7 @@ , python3 , meson , ninja +, sassc , vala , pkg-config , libgee @@ -18,7 +19,7 @@ stdenv.mkDerivation rec { pname = "granite"; - version = "7.2.0"; + version = "7.3.0"; outputs = [ "out" "dev" ]; @@ -26,7 +27,7 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = pname; rev = version; - sha256 = "sha256-LU2eIeaNqO4/6dPUuzOQ/w4tx0dEm26JwZ87yQ16c4o="; + sha256 = "sha256-siFS8BiHVlDtM5odL0Lf1aRMoG6qqQOnbsXGKVyc218="; }; nativeBuildInputs = [ @@ -36,6 +37,7 @@ stdenv.mkDerivation rec { ninja pkg-config python3 + sassc vala wrapGAppsHook4 ]; From 6e4d5da32df626c2478a9bcc9e32632586976bf5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 12 Jun 2023 18:21:11 +0000 Subject: [PATCH 047/165] libwps: 0.4.13 -> 0.4.14 --- pkgs/development/libraries/libwps/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libwps/default.nix b/pkgs/development/libraries/libwps/default.nix index fd62b9813435..f5af2e8284c8 100644 --- a/pkgs/development/libraries/libwps/default.nix +++ b/pkgs/development/libraries/libwps/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libwps"; - version = "0.4.13"; + version = "0.4.14"; src = fetchurl { url = "mirror://sourceforge/libwps/${pname}-${version}.tar.bz2"; - sha256 = "sha256-eVwva90EwLZgrMpRTcc2cAc9PG5wbXbV2GtK2BMpLrk="; + sha256 = "sha256-xVEdlAngO446F50EZcHMKW7aBvyDcTVu9Egs2oaIadE="; }; nativeBuildInputs = [ pkg-config ]; From 11ab69a41c5064fdc71d2befa3fbdc38ca687221 Mon Sep 17 00:00:00 2001 From: "\"Matthieu Coudron\"" <"mcoudron@hotmail.com"> Date: Mon, 12 Jun 2023 13:33:04 +0200 Subject: [PATCH 048/165] vimPlugins.iron-nvim: init at 2023-06-04 --- pkgs/applications/editors/vim/plugins/vim-plugin-names | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 7e0126433b33..337ad3ad422f 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -357,6 +357,7 @@ https://github.com/parsonsmatt/intero-neovim/,, https://github.com/keith/investigate.vim/,, https://github.com/neutaaaaan/iosvkem/,, https://github.com/twerth/ir_black/,, +https://github.com/Vigemus/iron.nvim/,HEAD, https://github.com/haya14busa/is.vim/,, https://github.com/vim-scripts/jdaddy.vim/,, https://github.com/davidhalter/jedi-vim/,, From 6a546b4aacd6ef203b765a2d8e49512a87f2328c Mon Sep 17 00:00:00 2001 From: "\"Matthieu Coudron\"" <"mcoudron@hotmail.com"> Date: Mon, 12 Jun 2023 22:35:25 +0200 Subject: [PATCH 049/165] vimPlugins: update --- .../editors/vim/plugins/generated.nix | 362 +++++++++--------- 1 file changed, 187 insertions(+), 175 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index d4516c25eb87..cf83a056a970 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -29,12 +29,12 @@ final: prev: ChatGPT-nvim = buildVimPluginFrom2Nix { pname = "ChatGPT.nvim"; - version = "2023-05-26"; + version = "2023-06-12"; src = fetchFromGitHub { owner = "jackMort"; repo = "ChatGPT.nvim"; - rev = "af509fceb70cab1867a611f3d8fad6d3e7760fb0"; - sha256 = "0h34m91fm1bpy7zi643y6i0l0zlkbq6r1w6b3xqvnbjjny2zh6md"; + rev = "b32003f351e330b9985078989b60e70406d63973"; + sha256 = "0g499ksfyim6blw878h6gcb3v893ipn2sadafygryb17z97g7b3r"; }; meta.homepage = "https://github.com/jackMort/ChatGPT.nvim/"; }; @@ -173,12 +173,12 @@ final: prev: LazyVim = buildVimPluginFrom2Nix { pname = "LazyVim"; - version = "2023-06-09"; + version = "2023-06-12"; src = fetchFromGitHub { owner = "LazyVim"; repo = "LazyVim"; - rev = "986a6374f4fd3f9b176105f4a3a4392b24e1953a"; - sha256 = "1gr3f779phdxaq6m2dbd2swkvwd702s2gnkhbj3vrcs38a9jrbnz"; + rev = "2e7ad2b8257b7d25df0264a5b193da7af35f5a53"; + sha256 = "057wak6dx112jzyqfk5lv31z8yl3xcy5rsqxci60zz1sgbpfsq29"; }; meta.homepage = "https://github.com/LazyVim/LazyVim/"; }; @@ -365,12 +365,12 @@ final: prev: SpaceVim = buildVimPluginFrom2Nix { pname = "SpaceVim"; - version = "2023-06-10"; + version = "2023-06-11"; src = fetchFromGitHub { owner = "SpaceVim"; repo = "SpaceVim"; - rev = "f4b746a617323610d9a069bae6808ec6ca448bd9"; - sha256 = "1lp8j3bsz52mzhpjq8lmbf8ws857n71n0kcgvzx6adn74gh3sfl6"; + rev = "c2e4697ed7cf2b8617ebf65a5cb521544ca1f14f"; + sha256 = "1p780cxkd6rlkjdd7yhr7783hkjv52swdxw639x4zzzn7bzmaphn"; }; meta.homepage = "https://github.com/SpaceVim/SpaceVim/"; }; @@ -437,12 +437,12 @@ final: prev: YouCompleteMe = buildVimPluginFrom2Nix { pname = "YouCompleteMe"; - version = "2023-04-19"; + version = "2023-06-12"; src = fetchFromGitHub { owner = "ycm-core"; repo = "YouCompleteMe"; - rev = "78ba06ef21bfab9835ced9f4ba8ffdac1b975c40"; - sha256 = "0wr3d5ziwnb2v3fwh5asl1jq9js159qz8q1l8p0y4wx1jbfvryll"; + rev = "49ced5a30ad7778178fd44703665a8ef3329e592"; + sha256 = "0grfvb5vl9si7lldvjrlpc648649lwqn41xnb09bmhh8z0g11vx3"; fetchSubmodules = true; }; meta.homepage = "https://github.com/ycm-core/YouCompleteMe/"; @@ -1195,12 +1195,12 @@ final: prev: ccc-nvim = buildVimPluginFrom2Nix { pname = "ccc.nvim"; - version = "2023-06-08"; + version = "2023-06-12"; src = fetchFromGitHub { owner = "uga-rosa"; repo = "ccc.nvim"; - rev = "5e85133b895b10f7dc7ce46bdad852c990a3f4b9"; - sha256 = "13c8b6qrc03zblb7pq8ndy76mdb5b5pscbih6gqsx2qb6y9hxz39"; + rev = "4a0ddaf787cc82796e84ab8a7f70d086f250aeb6"; + sha256 = "1qm3dp7w2rqnyvgsrn0j7s14nw2a1z7dfhyawkvzslsv6z4z4njg"; }; meta.homepage = "https://github.com/uga-rosa/ccc.nvim/"; }; @@ -1579,12 +1579,12 @@ final: prev: cmp-npm = buildVimPluginFrom2Nix { pname = "cmp-npm"; - version = "2023-06-09"; + version = "2023-06-12"; src = fetchFromGitHub { owner = "David-Kunz"; repo = "cmp-npm"; - rev = "713f08c0492efbbe81eebcddc3162e6822bb610b"; - sha256 = "1s4191aql9b3xjidz2m559s1hsy5cf7hhn3xzb16d365nzin4rwk"; + rev = "2337f109f51a09297596dd6b538b70ccba92b4e4"; + sha256 = "1i1kg888wlz7jzmqcsfqr9vv3qwmdl25lsmalddx075ficxix3ga"; }; meta.homepage = "https://github.com/David-Kunz/cmp-npm/"; }; @@ -1963,12 +1963,12 @@ final: prev: codeium-vim = buildVimPluginFrom2Nix { pname = "codeium.vim"; - version = "2023-06-09"; + version = "2023-06-12"; src = fetchFromGitHub { owner = "Exafunction"; repo = "codeium.vim"; - rev = "b748ff19c7c3fbd0b9e263d04ea58e10954027ff"; - sha256 = "09qrry6y9k1c20z3q9d1m15a3n1bx1kzf11237fhhc41y2rk3g15"; + rev = "c045bfe52288b21cff3690bc9c4d5e2dc8a8af2c"; + sha256 = "07rlz9p709jprsnr11g8gb93y7znjsfa06p7irx6wb3s8p34mi4p"; }; meta.homepage = "https://github.com/Exafunction/codeium.vim/"; }; @@ -2035,12 +2035,12 @@ final: prev: comment-nvim = buildVimPluginFrom2Nix { pname = "comment.nvim"; - version = "2023-06-01"; + version = "2023-06-12"; src = fetchFromGitHub { owner = "numtostr"; repo = "comment.nvim"; - rev = "c8043290f2d77f61025494d839d88e414608c460"; - sha256 = "126bbdlbsl0byxihwzj5j1lbkk1dcqrki4qh5wqa8i71d0dy7vva"; + rev = "176e85eeb63f1a5970d6b88f1725039d85ca0055"; + sha256 = "0y3zhv82hi8avxhmp1c9h0r17kfclwxphzyk7701f6wjky375ksw"; }; meta.homepage = "https://github.com/numtostr/comment.nvim/"; }; @@ -2191,12 +2191,12 @@ final: prev: conjure = buildVimPluginFrom2Nix { pname = "conjure"; - version = "2023-05-05"; + version = "2023-06-11"; src = fetchFromGitHub { owner = "Olical"; repo = "conjure"; - rev = "1dd96d90f53122225f698e58b50dee9ed760cf2e"; - sha256 = "11x6nlr8ii2kfvkywx5p3lj33xrdpvz5j49s2dvggls6syn1akza"; + rev = "31a1626273e2bab479b6b8416a137f9edaba7daa"; + sha256 = "1dcwp8sziahrgks2fdczvvfvnb7v9md2izpjw8r9cwvlx030g5lr"; }; meta.homepage = "https://github.com/Olical/conjure/"; }; @@ -2263,24 +2263,24 @@ final: prev: coq-artifacts = buildVimPluginFrom2Nix { pname = "coq.artifacts"; - version = "2023-06-04"; + version = "2023-06-11"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq.artifacts"; - rev = "c5f5546a89acc9c423d883199f641db99ba28b5b"; - sha256 = "0gz9nfq2ssv081hx84c4ydh9ijyx99dh39zw2g4jf6vvz41c1sxs"; + rev = "963512076adfac6f3010ec33e1ed6be6dbadccce"; + sha256 = "1g5fymcrnqj32j4z1l85lkpjq9njlqqbir09rpvkdx4x8yfjg0ik"; }; meta.homepage = "https://github.com/ms-jpq/coq.artifacts/"; }; coq-thirdparty = buildVimPluginFrom2Nix { pname = "coq.thirdparty"; - version = "2023-06-04"; + version = "2023-06-11"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq.thirdparty"; - rev = "ba47209b2c029dd4b6eb42e267dc7e716b12eb5d"; - sha256 = "0m4r4k32y5dwg4z6p8xbjrq05vap9kmhrdbifapfdyn1icapna05"; + rev = "53f3fdee2140c349e036fd5447e9462cf5c42d80"; + sha256 = "1qj74m853ivjpb5ighy18b53r6vah6vgh4c91vq9wcfgk86xjvfw"; }; meta.homepage = "https://github.com/ms-jpq/coq.thirdparty/"; }; @@ -2299,12 +2299,12 @@ final: prev: coq_nvim = buildVimPluginFrom2Nix { pname = "coq_nvim"; - version = "2023-06-04"; + version = "2023-06-11"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq_nvim"; - rev = "55ca08083cab18bb5cd1b08f2d5c295b87fce0ef"; - sha256 = "00kw18965gyxpc1i58fbgpzr10j7yvcd9hwphml8jc07y4xk11w2"; + rev = "4ab181e67533705b7cbb8b0b109308fce0d954f8"; + sha256 = "06y4ysmvbyy287wcrmyd97snrmaxaz5zbpmka9dq3x4bc7qd9w47"; }; meta.homepage = "https://github.com/ms-jpq/coq_nvim/"; }; @@ -2841,24 +2841,24 @@ final: prev: dial-nvim = buildVimPluginFrom2Nix { pname = "dial.nvim"; - version = "2023-04-10"; + version = "2023-06-12"; src = fetchFromGitHub { owner = "monaqa"; repo = "dial.nvim"; - rev = "747d6fd009dbc1904627868125e16cfa7c524b0d"; - sha256 = "19xn6bjhj6w1c8jaf65f0qrypmpx938dib8ig2md8xxz69hfyc44"; + rev = "b3916370c24c498117a4c790b2752c437dab661a"; + sha256 = "141ppws4f4gz90w07hpgs1h93d8v1fsi5kh032kgf65g9bawlri8"; }; meta.homepage = "https://github.com/monaqa/dial.nvim/"; }; diffview-nvim = buildVimPluginFrom2Nix { pname = "diffview.nvim"; - version = "2023-06-10"; + version = "2023-06-12"; src = fetchFromGitHub { owner = "sindrets"; repo = "diffview.nvim"; - rev = "6780a8a27f5cd326f502653cecef701611641fdf"; - sha256 = "1qy7mh1j8npqhc6r1zd21g0ihswvgawbc7grc204hhca1g1qzgpx"; + rev = "0ad3e4f834093412ebbf317b7eaa9c59568824b9"; + sha256 = "0hhxbs1vdypyacpgrv0b2111ardkgb7akfp86z5d2rwmf3v46qwp"; }; meta.homepage = "https://github.com/sindrets/diffview.nvim/"; }; @@ -2901,12 +2901,12 @@ final: prev: dracula-nvim = buildVimPluginFrom2Nix { pname = "dracula.nvim"; - version = "2023-06-02"; + version = "2023-06-11"; src = fetchFromGitHub { owner = "Mofiqul"; repo = "dracula.nvim"; - rev = "52f6d1c48589479d519c1aaea93dba1dd550a7a4"; - sha256 = "16z6rzay9sn011pl1ljjqs2f2k7igzzyqg9k6dyzzxjb3k1037rl"; + rev = "5716b1395b32a5865476dd3314bd8888e5f91532"; + sha256 = "1z011hnbmr0r99r0v920ywfdn2v1dqair2py0h19v6xxgw50cd0n"; }; meta.homepage = "https://github.com/Mofiqul/dracula.nvim/"; }; @@ -2961,12 +2961,12 @@ final: prev: edgy-nvim = buildVimPluginFrom2Nix { pname = "edgy.nvim"; - version = "2023-06-09"; + version = "2023-06-12"; src = fetchFromGitHub { owner = "folke"; repo = "edgy.nvim"; - rev = "7bf62a057284233381c8fc4848e10d8335942495"; - sha256 = "0zcvjy6sdqahg7wfyc20zxsdima6zz0hfc4r7zhsw77x5z0jm6cm"; + rev = "ab09d4f52b53d1db0b576f4b12ff506cdde94f1b"; + sha256 = "1rzx3qgs4jp6m14jfsx3q43mg9qiva3ph60s933wfdbj5smb1x9i"; }; meta.homepage = "https://github.com/folke/edgy.nvim/"; }; @@ -2998,12 +2998,12 @@ final: prev: elixir-tools-nvim = buildVimPluginFrom2Nix { pname = "elixir-tools.nvim"; - version = "2023-06-08"; + version = "2023-06-11"; src = fetchFromGitHub { owner = "elixir-tools"; repo = "elixir-tools.nvim"; - rev = "27c488da1548e62d3e0d09afa1be00f1ba7d73bd"; - sha256 = "02gln7mzgx7357mvzg4xkvm7wi7k82zj2fj1gd7b5qr3liipr631"; + rev = "b81fc13648a1944a55a5dddeef4f98632aae24bd"; + sha256 = "1ld2pcabxla0bakg4hzs5nk8axi86fhs7sc17qyryawdiw1al6pd"; }; meta.homepage = "https://github.com/elixir-tools/elixir-tools.nvim/"; }; @@ -3324,12 +3324,12 @@ final: prev: friendly-snippets = buildVimPluginFrom2Nix { pname = "friendly-snippets"; - version = "2023-06-09"; + version = "2023-06-11"; src = fetchFromGitHub { owner = "rafamadriz"; repo = "friendly-snippets"; - rev = "b71d1ddc30a10ce0474156f7ee93bc9006d0cd74"; - sha256 = "0jxj57996c4ab54p0zd4h5ldkz9yad1jy0ylzikfq8ylvw7z4p31"; + rev = "49ca2a0e0e26427b550b1f64272d7fe7e4d7d51b"; + sha256 = "1bdavn7sw4kxyad8667am7vsam4p4aq88ii618sp1xy6r7n5qf4w"; }; meta.homepage = "https://github.com/rafamadriz/friendly-snippets/"; }; @@ -3432,12 +3432,12 @@ final: prev: fzf-lua = buildVimPluginFrom2Nix { pname = "fzf-lua"; - version = "2023-06-05"; + version = "2023-06-11"; src = fetchFromGitHub { owner = "ibhagwan"; repo = "fzf-lua"; - rev = "8d6b6388f40a5c5ddadb32601238944f0b0fc233"; - sha256 = "1lcj8kq72is82dd49jrnk7gpily2jjjslxfl1rc3q9p9p8zvlknv"; + rev = "267098387dd7a3c53f8a4cfb17285ba05d841353"; + sha256 = "1y069942yxzxv7m6l9nrfnpfci0q2rq2m5478sqpgkq9nj6pdycp"; }; meta.homepage = "https://github.com/ibhagwan/fzf-lua/"; }; @@ -3624,12 +3624,12 @@ final: prev: glance-nvim = buildVimPluginFrom2Nix { pname = "glance.nvim"; - version = "2023-06-04"; + version = "2023-06-12"; src = fetchFromGitHub { owner = "DNLHC"; repo = "glance.nvim"; - rev = "6da4999e261829daebbee0c91efb5cb562408755"; - sha256 = "1s61sc5pz3jhrh5dsq9a8s0ba9mvlpq7i3pkyyicr8ssnjwry1v7"; + rev = "3e7158ffaaa0fa1f7268df30ae40f24c07b840d1"; + sha256 = "14xnn7yj3949kj0q7a5dr18snjrhdpwlw6ka47j5xlq3wv28sfma"; }; meta.homepage = "https://github.com/DNLHC/glance.nvim/"; }; @@ -3863,12 +3863,12 @@ final: prev: haskell-tools-nvim = buildNeovimPlugin { pname = "haskell-tools.nvim"; - version = "2023-06-05"; + version = "2023-06-11"; src = fetchFromGitHub { owner = "MrcJkb"; repo = "haskell-tools.nvim"; - rev = "c8084560f5d449053b8d13d0a21ef0c7619fd886"; - sha256 = "05w403gc8p3c4c7n1485dn9zqzz12jx3c00g07pc0j5623a3idip"; + rev = "5abb0ddb37feb5757509cfe117c9b888e1ea94f5"; + sha256 = "063nrqmqsd8v5gm8mxcmsaccdx426aa87359vdcfs4afjwxf95mz"; }; meta.homepage = "https://github.com/MrcJkb/haskell-tools.nvim/"; }; @@ -4256,6 +4256,18 @@ final: prev: meta.homepage = "https://github.com/twerth/ir_black/"; }; + iron-nvim = buildVimPluginFrom2Nix { + pname = "iron.nvim"; + version = "2023-06-04"; + src = fetchFromGitHub { + owner = "Vigemus"; + repo = "iron.nvim"; + rev = "9017061849e543d8e94b79d2a94b95e856ab6a10"; + sha256 = "1yaiywgm4p15c4n6zmp7b4x9ray30vfwn9wvfy1ib97h5vgf55aw"; + }; + meta.homepage = "https://github.com/Vigemus/iron.nvim/"; + }; + is-vim = buildVimPluginFrom2Nix { pname = "is.vim"; version = "2020-10-27"; @@ -4463,12 +4475,12 @@ final: prev: lazy-nvim = buildVimPluginFrom2Nix { pname = "lazy.nvim"; - version = "2023-06-09"; + version = "2023-06-12"; src = fetchFromGitHub { owner = "folke"; repo = "lazy.nvim"; - rev = "678179543e0d27650c328d8659f2c2cab4d854ef"; - sha256 = "01s2c09kw071lvfgn8bfw2aw978n50xdln6aapn4m2iw4fwhsg5s"; + rev = "10d4371745f88837c78c8daab00c5be6e48abea4"; + sha256 = "0xnm2lwpvmwg3b87aj5k5lnqld8gywm887mlg84bikkz03spfg91"; }; meta.homepage = "https://github.com/folke/lazy.nvim/"; }; @@ -5039,12 +5051,12 @@ final: prev: magma-nvim-goose = buildVimPluginFrom2Nix { pname = "magma-nvim-goose"; - version = "2023-03-13"; + version = "2023-06-11"; src = fetchFromGitHub { owner = "WhiteBlackGoose"; repo = "magma-nvim-goose"; - rev = "5d916c39c1852e09fcd39eab174b8e5bbdb25f8f"; - sha256 = "10d6dh0czdpgfpzqs5vzxfffkm0460qjzi2mfkacgghqf3iwkbja"; + rev = "d7931d773efcedc9c92337b8d500e32a3725fe26"; + sha256 = "06yfff5yipda1frabria28kby9q1hf485gzij0cgn7s7b035dp4x"; }; meta.homepage = "https://github.com/WhiteBlackGoose/magma-nvim-goose/"; }; @@ -5087,36 +5099,36 @@ final: prev: mason-lspconfig-nvim = buildVimPluginFrom2Nix { pname = "mason-lspconfig.nvim"; - version = "2023-06-05"; + version = "2023-06-12"; src = fetchFromGitHub { owner = "williamboman"; repo = "mason-lspconfig.nvim"; - rev = "5230617372e656d4a2e1e236e03bf7e7b4b97273"; - sha256 = "1wfdb1cbqkyh24f3y7hswl2b41s7r2cz0s6ms5az5jfa2a56m1wl"; + rev = "8f9af9bd7dc8599c8ec5826bb175dc871e4b582d"; + sha256 = "11pxzmz4j65xzw8ny5nbinbdn9lsx531fa0pzfzfn40b2ilv3cjb"; }; meta.homepage = "https://github.com/williamboman/mason-lspconfig.nvim/"; }; mason-tool-installer-nvim = buildVimPluginFrom2Nix { pname = "mason-tool-installer.nvim"; - version = "2023-03-23"; + version = "2023-06-12"; src = fetchFromGitHub { owner = "WhoIsSethDaniel"; repo = "mason-tool-installer.nvim"; - rev = "a6c4d7df448a78b0a05fd2065bef11ed52bee51c"; - sha256 = "187xhyda6jqayg547vl4n5j1jrz5m8h367wnbh66vnhfcrm51rvd"; + rev = "49e3efe743d846d80da5a4757d4f7e563a96cb84"; + sha256 = "1g5aha7jjw36wl2ji1i4gwa623x8v6agyxdqv68k7dsbid6kqj3r"; }; meta.homepage = "https://github.com/WhoIsSethDaniel/mason-tool-installer.nvim/"; }; mason-nvim = buildVimPluginFrom2Nix { pname = "mason.nvim"; - version = "2023-05-29"; + version = "2023-06-12"; src = fetchFromGitHub { owner = "williamboman"; repo = "mason.nvim"; - rev = "7d7efc738e08fc5bee822857db45cb6103f0b0c1"; - sha256 = "1m8irg61mzw2pcgc9r6nf0v9ch5pgmwq0n1qx8lclwwzxfbwgzdl"; + rev = "ec8fc11f8ad036c672f6b4a83799d3bcc19b0eb0"; + sha256 = "06mmbn1l6mcf3hpf4p5n3kv15zp9lla8dzwqzgxpm619p9jv94i5"; }; meta.homepage = "https://github.com/williamboman/mason.nvim/"; }; @@ -5231,24 +5243,24 @@ final: prev: mkdx = buildVimPluginFrom2Nix { pname = "mkdx"; - version = "2023-06-09"; + version = "2023-06-11"; src = fetchFromGitHub { owner = "SidOfc"; repo = "mkdx"; - rev = "b2c059e15b4998f98faa1d3c9dc6c2cddb2f8208"; - sha256 = "1flvk7hfdlg95qds8sipqi8zqpi8gzbczybclf0qgyis3r8wc8jl"; + rev = "518ef7fcbdb3b73b315828622ccd3b026bb3a9c1"; + sha256 = "0w03jdqfcc3016wxvcm8n890rmgzfkm72fmbd9jy6g8yi2ign0zi"; }; meta.homepage = "https://github.com/SidOfc/mkdx/"; }; modicator-nvim = buildVimPluginFrom2Nix { pname = "modicator.nvim"; - version = "2023-06-09"; + version = "2023-06-12"; src = fetchFromGitHub { owner = "mawkler"; repo = "modicator.nvim"; - rev = "51d7005913f99bf80c207731e052818edf178a3f"; - sha256 = "0h0fm1j5m470rcf2bkq1dxq4lxirln6ad2giisi3vh9jibgdizbn"; + rev = "b7a5184c6aac341726de2c0d226e7ad1200687f3"; + sha256 = "0i9qhq1hcpk60lz9ynd78z0ihccg0gs00h13mbqp0gfp0lq1mhp9"; }; meta.homepage = "https://github.com/mawkler/modicator.nvim/"; }; @@ -5267,12 +5279,12 @@ final: prev: monokai-pro-nvim = buildVimPluginFrom2Nix { pname = "monokai-pro.nvim"; - version = "2023-06-04"; + version = "2023-06-12"; src = fetchFromGitHub { owner = "loctvl842"; repo = "monokai-pro.nvim"; - rev = "9f9d9d253983a9360e16bc1dd2b8d6cea5842006"; - sha256 = "1riylymbxk5150za0h0jq9w1rs3g67hswgbhfpig89p3m2v49ksv"; + rev = "5abc7cde23a05ff116f4d64d1d1519f25713dfce"; + sha256 = "0amhqpi6g8xgqk1qd6jr49nmnagc8kn74m1lwwlqsfbsr7cq4n9h"; }; meta.homepage = "https://github.com/loctvl842/monokai-pro.nvim/"; }; @@ -5591,24 +5603,24 @@ final: prev: neodev-nvim = buildVimPluginFrom2Nix { pname = "neodev.nvim"; - version = "2023-06-10"; + version = "2023-06-12"; src = fetchFromGitHub { owner = "folke"; repo = "neodev.nvim"; - rev = "d69254e1fbdc4a04c56719dde19e5eafb7b04b58"; - sha256 = "0l9jfbyhx41ydj5r2jd09gm9j72zzzj1zwjc65d8xda30w3bgl5y"; + rev = "c120c96225f878e096f124321c14c45aa07968b7"; + sha256 = "0rh9a6519cjqc1zn5j8l7jz0nsjddn76pa1q913r5h3myrkr10fz"; }; meta.homepage = "https://github.com/folke/neodev.nvim/"; }; neoformat = buildVimPluginFrom2Nix { pname = "neoformat"; - version = "2023-05-12"; + version = "2023-06-11"; src = fetchFromGitHub { owner = "sbdchd"; repo = "neoformat"; - rev = "2d5d071d5957681ae677ee06f6eb879a61b7b618"; - sha256 = "17rs8k6xzy4c8nkiap84h5n7m0wcam06r6mv2z207di0cck2f4pk"; + rev = "2adfcbede6cf76e03e600a0e76283d10c4d686fa"; + sha256 = "1pr8b13bfm3m9gb3as92rf9lcdflk29rax3vgfyihvqp5kr5drcg"; }; meta.homepage = "https://github.com/sbdchd/neoformat/"; }; @@ -5819,12 +5831,12 @@ final: prev: neotest-haskell = buildVimPluginFrom2Nix { pname = "neotest-haskell"; - version = "2023-06-08"; + version = "2023-06-11"; src = fetchFromGitHub { owner = "MrcJkb"; repo = "neotest-haskell"; - rev = "1d11827a3af27a0828279ec65e5a65ae7a30afa5"; - sha256 = "1r230i39ac6na7b9j3gqs06w89h46dyjw249pj28252n10n6w28f"; + rev = "5cded2eee7c170933206d7521bb310af25886843"; + sha256 = "1msf06lszl7fxadyv5ny8hlk5srirkaxlq4bjn0n6xazxyvm1p4b"; }; meta.homepage = "https://github.com/MrcJkb/neotest-haskell/"; }; @@ -6119,12 +6131,12 @@ final: prev: nlsp-settings-nvim = buildVimPluginFrom2Nix { pname = "nlsp-settings.nvim"; - version = "2023-06-08"; + version = "2023-06-12"; src = fetchFromGitHub { owner = "tamago324"; repo = "nlsp-settings.nvim"; - rev = "c3480a10179ad17f0241d8c6534e5751d9049c11"; - sha256 = "1rp7wczxay5hb67gf52cx0wgpgsd6r4bh7q1qz0dh4016crrzxpj"; + rev = "72a6a37a263d71fbdee8b76a8546e5a2a837c106"; + sha256 = "0sqa0l7wr35h2n8b024dz4547cxgibn05d2smwc1am9hz8njavpv"; }; meta.homepage = "https://github.com/tamago324/nlsp-settings.nvim/"; }; @@ -6167,12 +6179,12 @@ final: prev: noice-nvim = buildVimPluginFrom2Nix { pname = "noice.nvim"; - version = "2023-06-10"; + version = "2023-06-12"; src = fetchFromGitHub { owner = "folke"; repo = "noice.nvim"; - rev = "a070cb87a180fd7e2c4387accff0be90268fb736"; - sha256 = "0838s3vqp2f6g8q7dwd4ga0m4qr8kj02snbrxd6xz4zzzaz1hlbq"; + rev = "a3318600bc1eba2cca84e879048c1ab8d4a0262d"; + sha256 = "1hba8idla910jwwpm9dgsa200nb0jw3054rnan7dyawg694d67bv"; }; meta.homepage = "https://github.com/folke/noice.nvim/"; }; @@ -6215,12 +6227,12 @@ final: prev: nui-nvim = buildVimPluginFrom2Nix { pname = "nui.nvim"; - version = "2023-06-10"; + version = "2023-06-11"; src = fetchFromGitHub { owner = "MunifTanjim"; repo = "nui.nvim"; - rev = "64bdc579873fa5bd303f6951ead2b419493c88e8"; - sha256 = "1hffqk9vz6lw6jrixqy9sxj1wv2z7cbj08ykccyfym2zpij40gx6"; + rev = "f008972ac7d24f7188521a7f8d158aac2fb0b07e"; + sha256 = "09icbz63wwl0riv8cy0av1ssjhwgcwla2jpcnra0207h7yx0z0rr"; }; meta.homepage = "https://github.com/MunifTanjim/nui.nvim/"; }; @@ -6251,12 +6263,12 @@ final: prev: nvchad = buildVimPluginFrom2Nix { pname = "nvchad"; - version = "2023-06-10"; + version = "2023-06-11"; src = fetchFromGitHub { owner = "nvchad"; repo = "nvchad"; - rev = "27992efc1cee6ac6c0ba002a8df8635464073fa4"; - sha256 = "01j1zwb6r1zrfjaiy13n2salk9y9k6ivqg8dxjx9j8jqx7xqds2y"; + rev = "d73d155287ad34c3baf8cdbb89733f45fa80bb2e"; + sha256 = "0wp6916bm1a8crsikyrgayiqqny1qjm519fk21ih69v5fzq67474"; }; meta.homepage = "https://github.com/nvchad/nvchad/"; }; @@ -6371,12 +6383,12 @@ final: prev: nvim-cmp = buildNeovimPlugin { pname = "nvim-cmp"; - version = "2023-06-10"; + version = "2023-06-11"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "nvim-cmp"; - rev = "69e7d280cbe17e318b549a10ae3cae5810946be6"; - sha256 = "119cfn70bb5bbfaq9rfc51dms64qfzzkn6aknj4lnd2dx1r56k00"; + rev = "b8c2a62b3bd3827aa059b43be3dd4b5c45037d65"; + sha256 = "1xh3pzcdbz2hqa3vl14gwn77pqjv939q9jfq1y4ln676jz5ljr4q"; }; meta.homepage = "https://github.com/hrsh7th/nvim-cmp/"; }; @@ -6611,12 +6623,12 @@ final: prev: nvim-highlite = buildVimPluginFrom2Nix { pname = "nvim-highlite"; - version = "2023-06-09"; + version = "2023-06-11"; src = fetchFromGitHub { owner = "Iron-E"; repo = "nvim-highlite"; - rev = "5ff71ee26591bacdf3387f150759262427d56c13"; - sha256 = "0nwlfw9ic7jjcaxlghy43scasf846258b75a3v4n71kxvs6w0xkd"; + rev = "a52da23ca02cfc225c6ecec2b6fa1efbadd609d5"; + sha256 = "14jgm3i2kiqainqq3w164czybhi1bsanrbvxfpwr31hgigg2pkn6"; }; meta.homepage = "https://github.com/Iron-E/nvim-highlite/"; }; @@ -6707,12 +6719,12 @@ final: prev: nvim-lint = buildVimPluginFrom2Nix { pname = "nvim-lint"; - version = "2023-05-29"; + version = "2023-06-11"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-lint"; - rev = "58a4fee3d61a6fb3166163c55fe0b2eb29464f9c"; - sha256 = "1rh5hhgr3lzq144a7bm2wn25fcdd29y1sanw2y5i82ks159ivdk5"; + rev = "ed93c624e91b575f00d0834f2fecbdc6d3918096"; + sha256 = "17n8k151cf570fjxjivkkakb0ganb8iz56bj2088ifjrj50phsjf"; }; meta.homepage = "https://github.com/mfussenegger/nvim-lint/"; }; @@ -6731,12 +6743,12 @@ final: prev: nvim-lspconfig = buildVimPluginFrom2Nix { pname = "nvim-lspconfig"; - version = "2023-06-10"; + version = "2023-06-12"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "08f1f347c718e945c3b1712ebb68c6834182cf3a"; - sha256 = "0kqxbyb5hg6r4rv79bxjj8dvm3440137xxppp2a5idxi8sisdqad"; + rev = "fefba589c56a5568a089299e36a4c8242502faaa"; + sha256 = "128q0l2br61q2gn09ra99g67dp2bfc7czpdpfv2k58dmas0y0wmb"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -6935,12 +6947,12 @@ final: prev: nvim-scrollview = buildVimPluginFrom2Nix { pname = "nvim-scrollview"; - version = "2023-06-10"; + version = "2023-06-12"; src = fetchFromGitHub { owner = "dstein64"; repo = "nvim-scrollview"; - rev = "5508b210504249943a397948b89865728bf314b2"; - sha256 = "07g4389kjcjp3vi9mcn3jay1zg7w3bv5kxs77619mrrcb8579j57"; + rev = "cb5e6a7692453624beb122f3d154c266a24d9195"; + sha256 = "047ra6mqhvlgj6af90sf0jywdvwk9smnr9mdxwc6knwf2cqjmprj"; }; meta.homepage = "https://github.com/dstein64/nvim-scrollview/"; }; @@ -6983,12 +6995,12 @@ final: prev: nvim-spider = buildVimPluginFrom2Nix { pname = "nvim-spider"; - version = "2023-05-25"; + version = "2023-06-11"; src = fetchFromGitHub { owner = "chrisgrieser"; repo = "nvim-spider"; - rev = "ef0c75f9292bcd604418af0a860c86b1c26fdfe7"; - sha256 = "0xi0mnkajz0phbv5xhpxzgarmbpb6f86qyg09a6m5dnyxjr142r3"; + rev = "04c6fc14d09823002dae486100745011fc3201ca"; + sha256 = "14310nzyjw7z83m7lqgbw2g0924ikwqi4h6cg9xcmh9ydflvn4dd"; }; meta.homepage = "https://github.com/chrisgrieser/nvim-spider/"; }; @@ -7031,36 +7043,36 @@ final: prev: nvim-tree-lua = buildVimPluginFrom2Nix { pname = "nvim-tree.lua"; - version = "2023-06-10"; + version = "2023-06-12"; src = fetchFromGitHub { owner = "nvim-tree"; repo = "nvim-tree.lua"; - rev = "034511714bacfadc5008e49f73fcef67e5613840"; - sha256 = "1zgrcbcqxnjnkli235lm9jhds8irxwgh26djfmw1kzz2ry18srsi"; + rev = "f873625d0636889af4cd47a01e486beb865db205"; + sha256 = "1744rhzjwwhqvn6wwsm498v4i69wq7hsgqfcym6fq5nga7x3cc0i"; }; meta.homepage = "https://github.com/nvim-tree/nvim-tree.lua/"; }; nvim-treesitter = buildVimPluginFrom2Nix { pname = "nvim-treesitter"; - version = "2023-06-10"; + version = "2023-06-12"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "f9d701176cb9a3e206a4c690920a8993630c3ec8"; - sha256 = "08zc1irs12clw8fy140j4lk9m4wfjmmmm64dw915gyl0l6r9g0rb"; + rev = "0ae494269acd469fbd896cf5d5a430dbbf4d4e95"; + sha256 = "19cf2rrh67amvy5r0ryz3flx2qr7nlqqlq1ypycl519j319raxj2"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; nvim-treesitter-context = buildVimPluginFrom2Nix { pname = "nvim-treesitter-context"; - version = "2023-06-02"; + version = "2023-06-12"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-context"; - rev = "e2ea37627c0681421ccf4a3cf19d68bb958e1817"; - sha256 = "01y9h86zvf4rj6zy0hlw59y9ynijj1ljpxhaz5kg689fyhq277cc"; + rev = "66531e825ab6c790ccf8837cfad2b9fab1b39d0b"; + sha256 = "15r6jhav1ndsxp9dqs969qw24nqfxihvvw8q5qr3ndd9di668w56"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-context/"; }; @@ -7151,11 +7163,11 @@ final: prev: nvim-ts-rainbow2 = buildVimPluginFrom2Nix { pname = "nvim-ts-rainbow2"; - version = "2023-06-04"; + version = "2023-06-11"; src = fetchgit { url = "https://gitlab.com/HiPhish/nvim-ts-rainbow2"; - rev = "e1783c843fd0a604d071cb9f0c6919ac93bcd96e"; - sha256 = "0jh0rjg8swya2647nm5csmmv0b706s2piiiw5ngw8avm77z2f2dc"; + rev = "60e34278a87b1a9f2ae59a67b4a062c5f6b9b8e7"; + sha256 = "05a45pw8kv5w71qfcs7zsczyx9ladlz7h03wbbid4xkkm7ibybzl"; }; meta.homepage = "https://gitlab.com/HiPhish/nvim-ts-rainbow2"; }; @@ -7319,12 +7331,12 @@ final: prev: onedark-nvim = buildVimPluginFrom2Nix { pname = "onedark.nvim"; - version = "2023-06-03"; + version = "2023-06-12"; src = fetchFromGitHub { owner = "navarasu"; repo = "onedark.nvim"; - rev = "8ef51924724d506e515f2d3ac9f959a9eaf38f3d"; - sha256 = "1716cigy6zni71ipa2yqpqkpqiig92hdzpf9fcrzfmcqwyjddm0s"; + rev = "462b45758ea94ff30ad48979268094590a6b7b7e"; + sha256 = "0m7alckgwnqzv9zycrvpisnx8bg2n8057j8lvqjmx4fagfnr8nmh"; }; meta.homepage = "https://github.com/navarasu/onedark.nvim/"; }; @@ -7343,12 +7355,12 @@ final: prev: onedarkpro-nvim = buildVimPluginFrom2Nix { pname = "onedarkpro.nvim"; - version = "2023-06-08"; + version = "2023-06-12"; src = fetchFromGitHub { owner = "olimorris"; repo = "onedarkpro.nvim"; - rev = "266eea8c4dc931c6ef863b8cffcf43b9df88353c"; - sha256 = "0pargiy0mkwmr695pmj7i191ymlxnsd35sz2r0yga7gnbwjv8hib"; + rev = "9ae2c7f67aad788bb8217ce1cf978affe0d3d4ef"; + sha256 = "1d6vqw07gsc3x3xsq6h7m1bwm9ad37bxfp7drjhsrmqz1b8rpc66"; }; meta.homepage = "https://github.com/olimorris/onedarkpro.nvim/"; }; @@ -7909,12 +7921,12 @@ final: prev: refactoring-nvim = buildVimPluginFrom2Nix { pname = "refactoring.nvim"; - version = "2023-05-31"; + version = "2023-06-11"; src = fetchFromGitHub { owner = "theprimeagen"; repo = "refactoring.nvim"; - rev = "a85dfff2602b739627b9f8a831de8c3e7b2993ae"; - sha256 = "1x6i6bwsk4vvbbvgn25vxvbwqy83w1dfkn5fwpnn2lfw88yflchf"; + rev = "08bcc40638cd4debd5184f934971858e1c5acff4"; + sha256 = "17isx8rsxzm5lbq9dfh7c0i0lrnqgp1di4vhfajjgam5nnplgp2i"; }; meta.homepage = "https://github.com/theprimeagen/refactoring.nvim/"; }; @@ -7969,12 +7981,12 @@ final: prev: rnvimr = buildVimPluginFrom2Nix { pname = "rnvimr"; - version = "2023-06-01"; + version = "2023-06-12"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "rnvimr"; - rev = "50a36ff2e7cda1f727cb8607f8e791cebd4fa7b1"; - sha256 = "06cvmmpb8kn7iffnkhh1c6bzyh8kn4w29ab5gv0bx3hk8qylk55q"; + rev = "a89e373330649326a80c2fcafe7b92b5814792f6"; + sha256 = "0qcq33hlbh016x76wpn956wkpc9dy89w2x7gngzr7frx084skjwg"; }; meta.homepage = "https://github.com/kevinhwang91/rnvimr/"; }; @@ -8130,7 +8142,7 @@ final: prev: owner = "VonHeikemen"; repo = "searchbox.nvim"; rev = "110949af8963185b4e732b45ae57beb731bfcede"; - sha256 = "1dahiggnc8hqfgd9akxlsyck7gxz05w0phrvahc5g1kskyr0q7h7"; + sha256 = "sha256-Bx4Msp96hlcYVDvDC3gBv78zmde0T5XacxgiZt+LULU="; }; meta.homepage = "https://github.com/VonHeikemen/searchbox.nvim/"; }; @@ -8270,12 +8282,12 @@ final: prev: smart-splits-nvim = buildVimPluginFrom2Nix { pname = "smart-splits.nvim"; - version = "2023-05-11"; + version = "2023-06-12"; src = fetchFromGitHub { owner = "mrjones2014"; repo = "smart-splits.nvim"; - rev = "e9a8f08b9db566ebc2b942b4776567f981b2986c"; - sha256 = "00snlj1139mx3apdmkb7iimb3dl04711jhdk3q3jx83xp7lg0fgy"; + rev = "87b0f3374b5c4dd0ff601558a247a2dc78dc7b4e"; + sha256 = "1svng27iqmly5rwq4jbvx38havzp3pqw70jq587lrg1pylila994"; }; meta.homepage = "https://github.com/mrjones2014/smart-splits.nvim/"; }; @@ -8801,12 +8813,12 @@ final: prev: tagalong-vim = buildVimPluginFrom2Nix { pname = "tagalong.vim"; - version = "2022-05-31"; + version = "2023-06-11"; src = fetchFromGitHub { owner = "AndrewRadev"; repo = "tagalong.vim"; - rev = "7b8cf57d8b5cbf5ece29e8198e72e8db39d9fe26"; - sha256 = "0qs9vrqc84v62g1qmlf5h07g4s97gg83mvl9jskcz2v3m7wxa6x3"; + rev = "d12622b866c9eea5204a792517d11586c51715a2"; + sha256 = "0qys780fh1p7q1my17kq700csg06qfdbn0k210bai9qmd5hhccii"; }; meta.homepage = "https://github.com/AndrewRadev/tagalong.vim/"; }; @@ -8921,12 +8933,12 @@ final: prev: telescope-file-browser-nvim = buildVimPluginFrom2Nix { pname = "telescope-file-browser.nvim"; - version = "2023-06-06"; + version = "2023-06-12"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-file-browser.nvim"; - rev = "fc70589a93d7bb42f4671ad75c8628a29995bcbe"; - sha256 = "00advlsr3rbmqrk5cpj8jli29sdi5i2bka2dz0fzsqz5zx3aqvk8"; + rev = "87dfaa9a9c251388cf4f01b9d4078c29d1fc8803"; + sha256 = "1w00iklckrsqz9ggimbmbxjzysw596a30j8h249wbkczhym8bphp"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-file-browser.nvim/"; }; @@ -9151,12 +9163,12 @@ final: prev: telescope-nvim = buildNeovimPlugin { pname = "telescope.nvim"; - version = "2023-06-10"; + version = "2023-06-11"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "89ca7265726cb07ca316562b13fd0c406588af65"; - sha256 = "17684bndaiw8gxi95lydc6xk2gyl5h62wfcmc07l687lpsy6c5l7"; + rev = "37c526857807e9550bdc8649700d4ceb47750ef2"; + sha256 = "18xlpim2d5vzf5ls1c0blnal8384cdmk1f2xry22kl4w6qall5mq"; }; meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; }; @@ -9572,12 +9584,12 @@ final: prev: typst-vim = buildVimPluginFrom2Nix { pname = "typst.vim"; - version = "2023-05-22"; + version = "2023-06-12"; src = fetchFromGitHub { owner = "kaarmu"; repo = "typst.vim"; - rev = "6750b01970045affed30efe063d7e21b399f1efc"; - sha256 = "1zmk96ipzsaqfmm6qzvazg2hwyqgm1sbxxapmw1yk9kvz2jc2q8p"; + rev = "420d8f815b49d869a9ec57f156440bc85dd38bfd"; + sha256 = "05lhc8vk1s9sxkrbhx32n175vmgnp2vkarrmzav4pdk67pvh5bb2"; }; meta.homepage = "https://github.com/kaarmu/typst.vim/"; }; @@ -14641,12 +14653,12 @@ final: prev: vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2023-06-08"; + version = "2023-06-12"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "127c0a2ec8c6ca5f4c33902f004d302bd88a7c3e"; - sha256 = "0pmjazhskmdczj1azdyry8pcaxb9d23ap6imn5dg9z9ymximhk33"; + rev = "b7690c2d669fcb71d67bcdae5393004dad50948f"; + sha256 = "1l2xnypl9p2y82hnk9gkf8jhpdc9i591irqvd9b95a1m04d3lm6a"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; @@ -15098,12 +15110,12 @@ final: prev: chad = buildVimPluginFrom2Nix { pname = "chad"; - version = "2023-06-09"; + version = "2023-06-11"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "chadtree"; - rev = "b0c4766b27d9ea2a6b958a247721da8c593f4ff3"; - sha256 = "0pz2q12bgg8jyyjnhcs2sn68qilm2z8w9h14gryy5klx94mdf8i6"; + rev = "a184a9cc6de11167c64f449b386dfe0b77a31a91"; + sha256 = "0862drqfv2qwi2di2kry1fc8xc9zcddyiw0r1lgjy7skjvjlyhid"; }; meta.homepage = "https://github.com/ms-jpq/chadtree/"; }; @@ -15182,12 +15194,12 @@ final: prev: nvchad-extensions = buildVimPluginFrom2Nix { pname = "nvchad-extensions"; - version = "2023-05-31"; + version = "2023-06-11"; src = fetchFromGitHub { owner = "nvchad"; repo = "extensions"; - rev = "6c01bde163f2c73911df046a2a4883f45a04b611"; - sha256 = "11zcl9k2mqg58658x68q5msd3fiyw4zn8karpd20vwkk881s28nx"; + rev = "fda140ca8362f4ec38516701ed94561aa720f2b6"; + sha256 = "004yqdw1wjbpjk4hib13nky5q1hhcbw5dabccrifjka91av9riwl"; }; meta.homepage = "https://github.com/nvchad/extensions/"; }; From d1a7087498d83c4d87242ada38a8ea7a1d82184b Mon Sep 17 00:00:00 2001 From: "\"Matthieu Coudron\"" <"mcoudron@hotmail.com"> Date: Mon, 12 Jun 2023 22:40:03 +0200 Subject: [PATCH 050/165] vimPlugins.nvim-treesitter: update grammars --- .../vim/plugins/nvim-treesitter/generated.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix index 74b280a36119..fdcfe7fbe5aa 100644 --- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix +++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix @@ -997,12 +997,12 @@ }; latex = buildGrammar { language = "latex"; - version = "0.0.0+rev=dfe8919"; + version = "0.0.0+rev=2ae2021"; src = fetchFromGitHub { owner = "latex-lsp"; repo = "tree-sitter-latex"; - rev = "dfe891922ccd2e7cef52eccb2775e1b576727165"; - hash = "sha256-xZUrAikgYoSCwFB6vWvV4K5S3sk0RAEUdDhOqLV9PVw="; + rev = "2ae2021d7b224fb6aa57b760e0d146059f943bb8"; + hash = "sha256-790DbJ/nOQvH8WH6MDZZcAKANQTg1fQPGXS4BI2UbmE="; }; meta.homepage = "https://github.com/latex-lsp/tree-sitter-latex"; }; @@ -1509,12 +1509,12 @@ }; racket = buildGrammar { language = "racket"; - version = "0.0.0+rev=b726123"; + version = "0.0.0+rev=0c8791f"; src = fetchFromGitHub { owner = "6cdh"; repo = "tree-sitter-racket"; - rev = "b7261231aeaa8157240427716287fb5cbbcf44a2"; - hash = "sha256-q6/n7vjozuyoKZSupDRTlHX7vCFR5z69sr+PttQUnXI="; + rev = "0c8791fdfed9412ea44177f1108da618d8a0470f"; + hash = "sha256-rpDSlgRtBoQf2iOetyi8meqz0HfddCZalVHxnplR3iE="; }; meta.homepage = "https://github.com/6cdh/tree-sitter-racket"; }; @@ -1608,12 +1608,12 @@ }; scala = buildGrammar { language = "scala"; - version = "0.0.0+rev=d42d40c"; + version = "0.0.0+rev=199cf06"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-scala"; - rev = "d42d40c7adbc638cf9fb571a5bc984715bf083c2"; - hash = "sha256-fxvAe//NL/yPAmeHH8J3IOATNYzF9DS1NG8kBsfG+1g="; + rev = "199cf060eec9e0d427ae3c6fe46de2c830d0c1e9"; + hash = "sha256-s18lg8/ARxal2k3fSdVAPwso3uxTb5fy1L2LEnRsztY="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-scala"; }; From 9394bae3a30b91b2d0b58a846340baad7b4601ce Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 12 Jun 2023 20:46:23 +0000 Subject: [PATCH 051/165] python310Packages.gidgethub: 5.2.1 -> 5.3.0 --- pkgs/development/python-modules/gidgethub/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/gidgethub/default.nix b/pkgs/development/python-modules/gidgethub/default.nix index f0d7e35179df..2e2380361c6b 100644 --- a/pkgs/development/python-modules/gidgethub/default.nix +++ b/pkgs/development/python-modules/gidgethub/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "gidgethub"; - version = "5.2.1"; + version = "5.3.0"; format = "flit"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-pTP4WleVUmFDPCUHAUdjBMw3QDfAq2aw5TcrSEZ0nVw="; + hash = "sha256-ns59N/vOuBm4BWDn7Vj5NuSKZdN+xfVtt5FFFWtCaiU="; }; propagatedBuildInputs = [ From ec238a4f39678fe86a17cafbc3472317466d34ff Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Mon, 12 Jun 2023 23:27:15 +0200 Subject: [PATCH 052/165] cassandra_4: 4.1.0 -> 4.1.2 Fixes CVE-2023-30601. https://lists.apache.org/thread/f74p9jdhmmp7vtrqd8lgm8bq3dhxl8vn Changelog: https://github.com/apache/cassandra/blob/cassandra-4.1.2/CHANGES.txt --- pkgs/servers/nosql/cassandra/4.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nosql/cassandra/4.json b/pkgs/servers/nosql/cassandra/4.json index cf13954ad863..c200c867bfe2 100644 --- a/pkgs/servers/nosql/cassandra/4.json +++ b/pkgs/servers/nosql/cassandra/4.json @@ -1,4 +1,4 @@ { - "version": "4.1.0", - "sha256": "1bh7srvdah5jvs9wrs0z9s341ix8895z0jvci2bv4bp3m7s6xzg4" + "version": "4.1.2", + "sha256": "003p0985fr3l09qpw44rhys3dp9zl2bl46vasix18p2cxq0j8sw5" } From a8c0d5583c8a5d6baf968d8311082b5960b153f7 Mon Sep 17 00:00:00 2001 From: lunik1 Date: Mon, 12 Jun 2023 22:39:31 +0100 Subject: [PATCH 053/165] iosevka: 24.1.1 -> 24.1.3 Diff: https://github.com/be5invis/iosevka/compare/v24.1.1...v24.1.3 --- pkgs/data/fonts/iosevka/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/data/fonts/iosevka/default.nix b/pkgs/data/fonts/iosevka/default.nix index 0c24c1e5c30e..61f072a5c4fa 100644 --- a/pkgs/data/fonts/iosevka/default.nix +++ b/pkgs/data/fonts/iosevka/default.nix @@ -55,16 +55,16 @@ assert (extraParameters != null) -> set != null; buildNpmPackage rec { pname = if set != null then "iosevka-${set}" else "iosevka"; - version = "24.1.1"; + version = "24.1.3"; src = fetchFromGitHub { owner = "be5invis"; repo = "iosevka"; rev = "v${version}"; - hash = "sha256-kzf/DFks/Ovhl6uMw5Bqhq+j+alrUd4E49jgSmp2E2k="; + hash = "sha256-LM47tiFZ5rDGgRqvGZEoCSpij4ZEoulnsAiM2ZlP7fY="; }; - npmDepsHash = "sha256-FKA3D05E5A0Z3wdCYLzoTyYKLay25sc3O61rOzkIN2E="; + npmDepsHash = "sha256-jW1g4n66AFP6fjp0vXKZiBQzDkWamSWQprIE+VkZ6rk="; nativeBuildInputs = [ remarshal From bf600011a079a3653c621ed8b90c73fc222d333e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 12 Jun 2023 21:41:58 +0000 Subject: [PATCH 054/165] consul: 1.15.2 -> 1.15.3 --- pkgs/servers/consul/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/consul/default.nix b/pkgs/servers/consul/default.nix index ee8145dca40c..171724598d44 100644 --- a/pkgs/servers/consul/default.nix +++ b/pkgs/servers/consul/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "consul"; - version = "1.15.2"; + version = "1.15.3"; rev = "v${version}"; # Note: Currently only release tags are supported, because they have the Consul UI @@ -17,7 +17,7 @@ buildGoModule rec { owner = "hashicorp"; repo = pname; inherit rev; - sha256 = "sha256-8C06arK7QnrT5qQZWBjamOOlejy69pxRHXKoncfMKAc="; + sha256 = "sha256-Xe+baALN8Ow6vjneWAvC65cBSsrMAsdxjEQRBcvWxCw="; }; passthru.tests.consul = nixosTests.consul; @@ -26,7 +26,7 @@ buildGoModule rec { # has a split module structure in one repo subPackages = ["." "connect/certgen"]; - vendorHash = "sha256-Vcl23cWErAycmza1CS9rl+xJ7CBuocMAdSG9AA88SrQ="; + vendorHash = "sha256-tbwX/uF9+yIhd+KSGF2v7HjxGtfaZYSm+1GIspQmC9A="; doCheck = false; From e640c091d62b26b8b30828bc5931f474b3d0a92c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 12 Jun 2023 22:00:44 +0000 Subject: [PATCH 055/165] oxigraph: 0.3.16 -> 0.3.17 --- pkgs/servers/oxigraph/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/oxigraph/default.nix b/pkgs/servers/oxigraph/default.nix index f43a9576b5cc..4756ae22ab7d 100644 --- a/pkgs/servers/oxigraph/default.nix +++ b/pkgs/servers/oxigraph/default.nix @@ -8,17 +8,17 @@ rustPlatform.buildRustPackage rec { pname = "oxigraph"; - version = "0.3.16"; + version = "0.3.17"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-sE+HeXg6JovLXhFFJhgsASfObvzgeYX+MjwI5b7G0gI="; + sha256 = "sha256-UsoNsGS2JWiI1EotUXjKwtR0WIk+z/5/a0AJySw4xnQ="; fetchSubmodules = true; }; - cargoHash = "sha256-7ykVKPjCFwpLqdPiWlxO/rBofgbfv+U3aM50RhzjGVY="; + cargoHash = "sha256-lQVWpIhWTUQTcMaPJ1z8wJI7/EBU+YoFkC92JhLCxe8="; nativeBuildInputs = [ rustPlatform.bindgenHook From 35f0f6aca1e418619e28aae00e3b5908ba8b389b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 12 Jun 2023 22:25:57 +0000 Subject: [PATCH 056/165] pachyderm: 2.6.1 -> 2.6.3 --- pkgs/applications/networking/cluster/pachyderm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/pachyderm/default.nix b/pkgs/applications/networking/cluster/pachyderm/default.nix index b21b50397e9e..9fd167f6ebe8 100644 --- a/pkgs/applications/networking/cluster/pachyderm/default.nix +++ b/pkgs/applications/networking/cluster/pachyderm/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "pachyderm"; - version = "2.6.1"; + version = "2.6.3"; src = fetchFromGitHub { owner = "pachyderm"; repo = "pachyderm"; rev = "v${version}"; - hash = "sha256-C3qzf/+A1pYTYR3FMtUuqZNU+j8oOHSBLDfyuWYCh5I="; + hash = "sha256-e/pdNS3GOTKknh4Qbfc9Uf5uK2Zjsev8RkSg4QIxM8Y="; }; vendorHash = "sha256-3EG9d4ERaWuHaKFt0KFCOKIgTdrL7HZTO+GSi2RROKY="; From 6f3ea67cff553268fe0b562b97c54bac94ac2e70 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Tue, 13 Jun 2023 08:47:06 +1000 Subject: [PATCH 057/165] telegraf: 1.26.3 -> 1.27.0 Diff: https://github.com/influxdata/telegraf/compare/v1.26.3...v1.27.0 Changelog: https://github.com/influxdata/telegraf/blob/v1.27.0/CHANGELOG.md --- pkgs/servers/monitoring/telegraf/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/monitoring/telegraf/default.nix b/pkgs/servers/monitoring/telegraf/default.nix index 4f8108472dc5..45a793ee2abf 100644 --- a/pkgs/servers/monitoring/telegraf/default.nix +++ b/pkgs/servers/monitoring/telegraf/default.nix @@ -8,7 +8,7 @@ buildGoModule rec { pname = "telegraf"; - version = "1.26.3"; + version = "1.27.0"; excludedPackages = "test"; @@ -18,10 +18,10 @@ buildGoModule rec { owner = "influxdata"; repo = "telegraf"; rev = "v${version}"; - sha256 = "sha256-B1jYtJFj9hQT2ub9KaeoiWJZN9CHyZzA7juk0JZ0ZAo="; + sha256 = "sha256-uA3vmFVYTr0iUDFpYPHSzpsCXzGE0qdIw+5LoVzfkug="; }; - vendorHash = "sha256-dwUVmUzQn66Pz4vY9JIHVImiM4FwbAPZctSach/jH4c="; + vendorHash = "sha256-CHYJOnPfE7En9PXnpt+nWFPRDMh8RPDcgOS/gJu9l3w="; proxyVendor = true; ldflags = [ From 4daf4a4add82882bcf812b8ff60a5b193e6b44e6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 12 Jun 2023 23:43:15 +0000 Subject: [PATCH 058/165] algolia-cli: 1.3.6 -> 1.3.7 --- pkgs/development/tools/algolia-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/algolia-cli/default.nix b/pkgs/development/tools/algolia-cli/default.nix index 95f6e85f1b4a..5e7f69d42604 100644 --- a/pkgs/development/tools/algolia-cli/default.nix +++ b/pkgs/development/tools/algolia-cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "algolia-cli"; - version = "1.3.6"; + version = "1.3.7"; src = fetchFromGitHub { owner = "algolia"; repo = "cli"; rev = "v${version}"; - hash = "sha256-SNQhDmiRz0J3MlJbYUAQgiXeLv3oZVAMnavkAeRrnEA="; + hash = "sha256-Mg8GSomBP0jt+16S18tOq2f7HkVpCZbNz/A/g9Afk/I="; }; - vendorHash = "sha256-QgNL7pp0KH1RUV69BFVtHpaLHrPp4UQhEtOEiRmfAi0="; + vendorHash = "sha256-cNuBTH7L2K4TgD0H9FZ9CjhE5AGXADaniGLD9Lhrtrk="; nativeBuildInputs = [ installShellFiles ]; From b992b7502b9aa6a0f4b13663b10a40cd34cc0d00 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 13 Jun 2023 00:18:24 +0000 Subject: [PATCH 059/165] ytt: 0.45.1 -> 0.45.2 --- pkgs/development/tools/ytt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/ytt/default.nix b/pkgs/development/tools/ytt/default.nix index eda1f39751d1..33a583bab9dc 100644 --- a/pkgs/development/tools/ytt/default.nix +++ b/pkgs/development/tools/ytt/default.nix @@ -1,13 +1,13 @@ { lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "ytt"; - version = "0.45.1"; + version = "0.45.2"; src = fetchFromGitHub { owner = "vmware-tanzu"; repo = "carvel-ytt"; rev = "v${version}"; - sha256 = "sha256-YfRr3oQUuDGVrQvfUzqld4SNWOsmGP4jmo5gf8tG6Vo="; + sha256 = "sha256-D2m+o1rGi2CPLqaLJWHOcVeA7F0GeUu4jFneTOsP+Ak="; }; vendorHash = null; From 3c34f79bf7aa618104d3f47724c457e7bf3584a9 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Tue, 13 Jun 2023 00:19:00 +0000 Subject: [PATCH 060/165] ytt: 0.45.2 -> 0.45.3 Diff: https://github.com/vmware-tanzu/carvel-ytt/compare/v0.45.2...v0.45.3 --- pkgs/development/tools/ytt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/ytt/default.nix b/pkgs/development/tools/ytt/default.nix index 33a583bab9dc..b75a78e57b59 100644 --- a/pkgs/development/tools/ytt/default.nix +++ b/pkgs/development/tools/ytt/default.nix @@ -1,13 +1,13 @@ { lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "ytt"; - version = "0.45.2"; + version = "0.45.3"; src = fetchFromGitHub { owner = "vmware-tanzu"; repo = "carvel-ytt"; rev = "v${version}"; - sha256 = "sha256-D2m+o1rGi2CPLqaLJWHOcVeA7F0GeUu4jFneTOsP+Ak="; + sha256 = "sha256-2Q/a5GXHLh8RO6SLSqh6tiq5D8rPu9ftCQ1FaELwcv0="; }; vendorHash = null; From 17a36446ae44becb0abe2a54f404d6b6f7814409 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Tue, 13 Jun 2023 00:19:00 +0000 Subject: [PATCH 061/165] ytt: install completions --- pkgs/development/tools/ytt/default.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/ytt/default.nix b/pkgs/development/tools/ytt/default.nix index b75a78e57b59..8adf3a9d4e79 100644 --- a/pkgs/development/tools/ytt/default.nix +++ b/pkgs/development/tools/ytt/default.nix @@ -1,4 +1,5 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: + buildGoModule rec { pname = "ytt"; version = "0.45.3"; @@ -12,12 +13,21 @@ buildGoModule rec { vendorHash = null; + nativeBuildInputs = [ installShellFiles ]; + ldflags = [ "-X github.com/vmware-tanzu/carvel-ytt/pkg/version.Version=${version}" ]; subPackages = [ "cmd/ytt" ]; + postInstall = '' + installShellCompletion --cmd ytt \ + --bash <($out/bin/ytt completion bash) \ + --fish <($out/bin/ytt completion fish) \ + --zsh <($out/bin/ytt completion zsh) + ''; + meta = with lib; { description = "YAML templating tool that allows configuration of complex software via reusable templates with user-provided values"; homepage = "https://get-ytt.io"; From 4a73c642d160bc619fe1d6afe12bb892dca1e5e7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 13 Jun 2023 00:28:48 +0000 Subject: [PATCH 062/165] murex: 4.1.6140 -> 4.1.7300 --- pkgs/shells/murex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/shells/murex/default.nix b/pkgs/shells/murex/default.nix index 636253b2d6bd..5968b26e0c13 100644 --- a/pkgs/shells/murex/default.nix +++ b/pkgs/shells/murex/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "murex"; - version = "4.1.6140"; + version = "4.1.7300"; src = fetchFromGitHub { owner = "lmorg"; repo = pname; rev = "v${version}"; - sha256 = "sha256-1MFFAdmFtLZ0QlplgBHUb4g9bGmYX9445q9UFMh4OPE="; + sha256 = "sha256-wJfkYNoi4pyf8aY/sYuSTcAZm/ck303DmIeMYdnZ2zE="; }; vendorHash = "sha256-eQfffqNxt6es/3/H59FC5mLn1IU3oMpY/quzgNOgOaU="; From 6ebe3fdc4fb11896c9881d2f2d263391aa9cc6a9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 13 Jun 2023 00:48:57 +0000 Subject: [PATCH 063/165] adguardian: 1.5.0 -> 1.6.0 --- pkgs/applications/networking/adguardian/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/adguardian/default.nix b/pkgs/applications/networking/adguardian/default.nix index a770d4605075..7b85ee2c000c 100644 --- a/pkgs/applications/networking/adguardian/default.nix +++ b/pkgs/applications/networking/adguardian/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "adguardian"; - version = "1.5.0"; + version = "1.6.0"; src = fetchFromGitHub { owner = "Lissy93"; repo = "AdGuardian-Term"; rev = version; - hash = "sha256-r7dh31fZgcUBffzwoBqIoV9XhZOjJRb9aWZUuuiz7y8="; + hash = "sha256-WxrSmCwLnXXs5g/hN3xWE66P5n0RD/L9MJpf5N2iNtY="; }; - cargoHash = "sha256-/fBLLqmKsoV9Kdsj6JFQwdkidc1TgYfvJP0Wx1po1ao="; + cargoHash = "sha256-IPkKiXuFN0KFlcrrSjLmML+O5zCrVRKEqdyV2xBsCsg="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security From fc5724e33a4a51c3d6c80959360714a227e03d72 Mon Sep 17 00:00:00 2001 From: Kamal Al Marhubi Date: Mon, 12 Jun 2023 14:51:19 -0400 Subject: [PATCH 064/165] pythonPackages.polars: Fix build on darwin The build had been failing with an error like Compiling py-polars v0.17.11 (/private/tmp/nix-build-python3.10-polars-0.17.11.drv-0/source/py-polars) error: linking with `/nix/store/0a46pjq0isnpbzf4wi6v1pdcvaj6i43m-clang-wrapper-11.1.0/bin/cc` failed: exit status: 1 | = note: LC_ALL="C" PATH="/nix/store/9zglgb7pvcvv7lxwdxzvjqs1w4kfyfgv-rustc-1.69.0/lib/rustlib/aarch64-apple-darwin/bin:/nix/store/x1nk3q6shnsfqphmq2l27gf585wnpf1x-python3-3.10.11/bin:/nix/store/g9kv74wk0xyikshim0drwbgf67zcc3qh-python3.10-p> = note: ld: framework not found Security clang-11: error: linker command failed with exit code 1 (use -v to see invocation) Adding the Security framework to buildInputs appears to have solved that. Demonstration: $ read -r -d '' PYSRC < Date: Tue, 13 Jun 2023 01:11:41 +0000 Subject: [PATCH 065/165] gocryptfs: 2.3.2 -> 2.4.0 --- pkgs/tools/filesystems/gocryptfs/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/filesystems/gocryptfs/default.nix b/pkgs/tools/filesystems/gocryptfs/default.nix index ef9fe7b781b2..23446ce998d9 100644 --- a/pkgs/tools/filesystems/gocryptfs/default.nix +++ b/pkgs/tools/filesystems/gocryptfs/default.nix @@ -12,16 +12,16 @@ buildGoModule rec { pname = "gocryptfs"; - version = "2.3.2"; + version = "2.4.0"; src = fetchFromGitHub { owner = "rfjakob"; repo = pname; rev = "v${version}"; - sha256 = "sha256-1+g8n6n2i7UKr4C5ZLNF5ceqdu3EYx4R6rQALVoGwTs="; + sha256 = "sha256-lStaMj2f8lQZx2E42o4ikPmFQzydlN3PFKwFvUx37SI="; }; - vendorHash = "sha256-7eAyuyqAvFQjkvsrkJEvop0veX7sGGX6xXAdUNuOXWU="; + vendorHash = "sha256-ir7FR7ndbPhzUOCVPrYO0SEe03wDFIP74I4X6HJxtE8="; nativeBuildInputs = [ makeWrapper From 9136cdd591a2e2c68a38acf703af6c5fc4e2bed9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 13 Jun 2023 01:22:38 +0000 Subject: [PATCH 066/165] chezmoi: 2.34.0 -> 2.34.1 --- pkgs/tools/misc/chezmoi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/chezmoi/default.nix b/pkgs/tools/misc/chezmoi/default.nix index 044ffeaf51dd..a57b815af485 100644 --- a/pkgs/tools/misc/chezmoi/default.nix +++ b/pkgs/tools/misc/chezmoi/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "chezmoi"; - version = "2.34.0"; + version = "2.34.1"; src = fetchFromGitHub { owner = "twpayne"; repo = "chezmoi"; rev = "v${version}"; - hash = "sha256-0T/oSt4EJ0doARuoAuFP8TEsgJxxDdh6A4aEEbYkyP4="; + hash = "sha256-VRzONsVBPtIpFJUTEnKp53uOyOkWXG2eRXuXVv1hfXM="; }; vendorHash = "sha256-hIR2vI+wvT5pN87sDMCHinTqj3lBvJUPddgQ3+j3Ja0="; From 4476d19942290a863ad712d989b964e1d4f73e4a Mon Sep 17 00:00:00 2001 From: happysalada Date: Mon, 12 Jun 2023 21:07:25 -0400 Subject: [PATCH 067/165] rustus: 0.7.2 -> 0.7.3 --- pkgs/servers/networking/rustus/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/networking/rustus/default.nix b/pkgs/servers/networking/rustus/default.nix index a656a80958f5..6506143c592e 100644 --- a/pkgs/servers/networking/rustus/default.nix +++ b/pkgs/servers/networking/rustus/default.nix @@ -10,7 +10,7 @@ let pname = "rustus"; - version = "0.7.2"; + version = "0.7.3"; in rustPlatform.buildRustPackage { inherit pname version; @@ -19,10 +19,10 @@ rustPlatform.buildRustPackage { owner = "s3rius"; repo = pname; rev = version; - hash = "sha256-In/GKtQbp52Zg1cePMJds9aagS3Ga/CKIM+k2efFnKs="; + hash = "sha256-lVNbUCU+D8Q4qDj1xBab6ka4T1ainp/GSgUgdDkprEk="; }; - cargoHash = "sha256-6pOXiTRquxumoS8fD/yjZI4fh8mGeF2XT4rvkjx0AuU="; + cargoHash = "sha256-ueZIKFnXuhQ4MHZX2e5yJXOyKuzhWOIBJbTbvoeV3m8="; env.OPENSSL_NO_VENDOR = 1; From eb201eedd39ed626ee1e2187a856777ce3673320 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 13 Jun 2023 01:32:27 +0000 Subject: [PATCH 068/165] subfinder: 2.5.9 -> 2.6.0 --- pkgs/tools/networking/subfinder/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/subfinder/default.nix b/pkgs/tools/networking/subfinder/default.nix index aebf6d63fa58..6259e12ab780 100644 --- a/pkgs/tools/networking/subfinder/default.nix +++ b/pkgs/tools/networking/subfinder/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "subfinder"; - version = "2.5.9"; + version = "2.6.0"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = pname; rev = "v${version}"; - sha256 = "sha256-d2xVK7KdmSUeOVBtTysKX5cB7E59tXt9d/uORA31Wd4="; + sha256 = "sha256-oNRQ+71j+i2ED3JJ+7iMh0jTpbxDD+b/P1rTT47YSmc="; }; - vendorHash = "sha256-WZrwvKEznv2LFuOVW4kRzS9bmKuGbanMiV7TpvnxTIo="; + vendorHash = "sha256-KEmTbMt8gPTEvoLDLpFWO/8JS0So+g9oh0wc8kfeqhw="; modRoot = "./v2"; From 9a2263c0519b652554f97abc0d0ad4fceeb7e1b5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 13 Jun 2023 01:34:12 +0000 Subject: [PATCH 069/165] kubefirst: 2.0.8 -> 2.1.0 --- pkgs/applications/networking/cluster/kubefirst/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/kubefirst/default.nix b/pkgs/applications/networking/cluster/kubefirst/default.nix index c90460d1692b..87aeb15141ab 100644 --- a/pkgs/applications/networking/cluster/kubefirst/default.nix +++ b/pkgs/applications/networking/cluster/kubefirst/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kubefirst"; - version = "2.0.8"; + version = "2.1.0"; src = fetchFromGitHub { owner = "kubefirst"; repo = pname; rev = "v${version}"; - hash = "sha256-JGseXRUehRuH1kuTfmkAJcfRN3vM0zN7K8pnOfJ0LAs="; + hash = "sha256-t5tbgLXpJX2yWUdEW7zKb4A7B7budAOitOkL5I2CWpk="; }; - vendorHash = "sha256-Sc6HXJXkZ9vW6sxEKCTo6LDHeOGLTz0oN9JH11iUA/k="; + vendorHash = "sha256-D2Gi90seLPTM0ttlz7V6FW1ZMiVN22YLWKeTquXvagY="; ldflags = [ "-s" "-w" "-X github.com/kubefirst/runtime/configs.K1Version=v${version}"]; From e84b8cc15f7ebec61a158ac2328b1622b057bae7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 13 Jun 2023 00:35:51 +0000 Subject: [PATCH 070/165] ockam: 0.88.0 -> 0.89.0 --- pkgs/tools/networking/ockam/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/ockam/default.nix b/pkgs/tools/networking/ockam/default.nix index edd14b0c6a9c..d2275df840de 100644 --- a/pkgs/tools/networking/ockam/default.nix +++ b/pkgs/tools/networking/ockam/default.nix @@ -12,7 +12,7 @@ let pname = "ockam"; - version = "0.88.0"; + version = "0.89.0"; in rustPlatform.buildRustPackage { inherit pname version; @@ -21,10 +21,10 @@ rustPlatform.buildRustPackage { owner = "build-trust"; repo = pname; rev = "ockam_v${version}"; - sha256 = "sha256-M7lDXgQ1ofzg6LwI9ZcvtzjWyKuon+hdtxKmLqyOQpc="; + sha256 = "sha256-KyhOPcE23nvCVGLnQSxL88WeQVWeTx+70CTvH2KfqK8="; }; - cargoHash = "sha256-ZTTfxndoTOgtg6rWVEPv5vmdNxdn7wPXXwTDVJoTc+c="; + cargoHash = "sha256-LMGm+/fjyHMj8fZjw8uhVHTbG4PuxJjzq8kKP+DPVWE="; nativeBuildInputs = [ git pkg-config ]; buildInputs = [ openssl dbus ] ++ lib.optionals stdenv.isDarwin [ Security ]; From 9b4701455d57f9aa1ab466d8ed4323598592cb10 Mon Sep 17 00:00:00 2001 From: rewine Date: Mon, 12 Jun 2023 21:36:39 +0800 Subject: [PATCH 071/165] python3Packages.pyqt6: 6.5.0 -> 6.5.1 --- pkgs/development/python-modules/pyqt/6.x.nix | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/pyqt/6.x.nix b/pkgs/development/python-modules/pyqt/6.x.nix index d24d3f362eb3..3edf1adf0284 100644 --- a/pkgs/development/python-modules/pyqt/6.x.nix +++ b/pkgs/development/python-modules/pyqt/6.x.nix @@ -1,7 +1,6 @@ { lib , stdenv , buildPythonPackage -, isPy27 , fetchPypi , pkg-config , dbus @@ -15,9 +14,7 @@ , pythonOlder , withMultimedia ? true , withWebSockets ? true -# FIXME: Once QtLocation is available for Qt6 enable this -# https://bugreports.qt.io/browse/QTBUG-96795 -#, withLocation ? true +, withLocation ? true # Not currently part of PyQt6 #, withConnectivity ? true , withPrintSupport ? true @@ -26,14 +23,14 @@ buildPythonPackage rec { pname = "PyQt6"; - version = "6.5.0"; + version = "6.5.1"; format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-uXy0vpssiZeQTqZozzsKSuWCIZb3eSWQ0F7N5iFqn7w="; + hash = "sha256-4WagVownvMjbACcaUEOTYiZpC2pKdM4KXK60CAQKl8M="; }; patches = [ @@ -83,7 +80,7 @@ buildPythonPackage rec { # ++ lib.optional withConnectivity qtconnectivity ++ lib.optional withMultimedia qtmultimedia ++ lib.optional withWebSockets qtwebsockets - # ++ lib.optional withLocation qtlocation + ++ lib.optional withLocation qtlocation ; buildInputs = with qt6Packages; [ @@ -97,7 +94,7 @@ buildPythonPackage rec { ] # ++ lib.optional withConnectivity qtconnectivity ++ lib.optional withWebSockets qtwebsockets - # ++ lib.optional withLocation qtlocation + ++ lib.optional withLocation qtlocation ; propagatedBuildInputs = [ @@ -132,7 +129,7 @@ buildPythonPackage rec { ++ lib.optional withWebSockets "PyQt6.QtWebSockets" ++ lib.optional withMultimedia "PyQt6.QtMultimedia" # ++ lib.optional withConnectivity "PyQt6.QtConnectivity" - # ++ lib.optional withLocation "PyQt6.QtPositioning" + ++ lib.optional withLocation "PyQt6.QtPositioning" ; meta = with lib; { From a01eaa1096e9e175ab4185b6fc4066ec51c3a078 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 13 Jun 2023 01:48:50 +0000 Subject: [PATCH 072/165] python311Packages.grequests: 0.6.0 -> 0.7.0 --- pkgs/development/python-modules/grequests/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/grequests/default.nix b/pkgs/development/python-modules/grequests/default.nix index 50c95df7dc91..e1dfe77d577e 100644 --- a/pkgs/development/python-modules/grequests/default.nix +++ b/pkgs/development/python-modules/grequests/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "grequests"; - version = "0.6.0"; + version = "0.7.0"; src = fetchPypi { inherit pname version; - sha256 = "0rpnim3ppxjdsaa869h1jdimcyc66mamcs593rd7brk8cq68kv3x"; + sha256 = "sha256-XDPxQmjfW4+hEH2FN4Fb5v67rW7FYFJNakBLd3jPa6Y="; }; # No tests in archive From 033f7b623a4c6f45fa7ea8e4b20a09501c65e8fa Mon Sep 17 00:00:00 2001 From: Emily Trau Date: Sun, 11 Jun 2023 13:23:41 +1000 Subject: [PATCH 073/165] ccache: disable failing test `test.fileclone` on aarch64-darwin --- pkgs/development/tools/misc/ccache/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/tools/misc/ccache/default.nix b/pkgs/development/tools/misc/ccache/default.nix index c5b78e6e4829..4323a6ab5231 100644 --- a/pkgs/development/tools/misc/ccache/default.nix +++ b/pkgs/development/tools/misc/ccache/default.nix @@ -59,6 +59,7 @@ stdenv.mkDerivation (finalAttrs: { "test.trim_dir" # flaky on hydra (possibly filesystem-specific?) ] ++ lib.optionals stdenv.isDarwin [ "test.basedir" + "test.fileclone" # flaky on hydra (possibly filesystem-specific?) "test.multi_arch" "test.nocpp2" ]; From bbb54b288728076fdaaf842fc1cddfeab062d32d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 13 Jun 2023 02:16:28 +0000 Subject: [PATCH 074/165] python310Packages.steamship: 2.16.9 -> 2.17.7 --- pkgs/development/python-modules/steamship/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/steamship/default.nix b/pkgs/development/python-modules/steamship/default.nix index 59c3b8ae8eef..a8807bb9f175 100644 --- a/pkgs/development/python-modules/steamship/default.nix +++ b/pkgs/development/python-modules/steamship/default.nix @@ -16,12 +16,12 @@ buildPythonPackage rec { pname = "steamship"; - version = "2.16.9"; + version = "2.17.7"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-NHMrReRw8x7N7vy8BqmKx9fDfQYjlOWY7ChdLz+qGxQ="; + hash = "sha256-NkSyX+ajNFwkgO0Lq4UfrvjADgHXiT2oLp2RCQDJv0w="; }; pythonRelaxDeps = [ From 1ef5dad4a30e05841406d6220ade55fb7674d220 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 13 Jun 2023 03:32:31 +0000 Subject: [PATCH 075/165] postgresql11JitPackages.pgroonga: 3.0.5 -> 3.0.6 --- pkgs/servers/sql/postgresql/ext/pgroonga.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/pgroonga.nix b/pkgs/servers/sql/postgresql/ext/pgroonga.nix index 4d9b0fce6f2e..20ef33ea3216 100644 --- a/pkgs/servers/sql/postgresql/ext/pgroonga.nix +++ b/pkgs/servers/sql/postgresql/ext/pgroonga.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "pgroonga"; - version = "3.0.5"; + version = "3.0.6"; src = fetchurl { url = "https://packages.groonga.org/source/${pname}/${pname}-${version}.tar.gz"; - hash = "sha256-5cVfZk2bFop/EQjvfObiN/AF/iv3DqDIKb/BkbEyKbE="; + hash = "sha256-01d5pH7QK72orttbelTzqwpDBS9+qYYgn7cc9qGZ/RI="; }; nativeBuildInputs = [ pkg-config ]; From 3bee849a371f35ee3ce6169096dd5736e438c2f8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 13 Jun 2023 03:58:15 +0000 Subject: [PATCH 076/165] python310Packages.pyreadstat: 1.2.1 -> 1.2.2 --- pkgs/development/python-modules/pyreadstat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyreadstat/default.nix b/pkgs/development/python-modules/pyreadstat/default.nix index 33e1e8dc015c..808b0e5428e9 100644 --- a/pkgs/development/python-modules/pyreadstat/default.nix +++ b/pkgs/development/python-modules/pyreadstat/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pyreadstat"; - version = "1.2.1"; + version = "1.2.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "Roche"; repo = "pyreadstat"; rev = "refs/tags/v${version}"; - hash = "sha256-7DpmWIRzhB32YZCDpR+rEIAzn5OuZqt7wvS0GnxnT/g="; + hash = "sha256-CvovylOTTyXm0ucTwNSFZzkcA0H8H76BSg4vjB2Pe4M="; }; nativeBuildInputs = [ From 28eaa7ebc151292f24b32d17016ad3aa950ecfc5 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Tue, 13 Jun 2023 04:20:00 +0000 Subject: [PATCH 077/165] rage: fix hash Upstream retagged v0.9.2 --- pkgs/tools/security/rage/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/security/rage/default.nix b/pkgs/tools/security/rage/default.nix index bf17556b03a6..ea8e304099c0 100644 --- a/pkgs/tools/security/rage/default.nix +++ b/pkgs/tools/security/rage/default.nix @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec { owner = "str4d"; repo = pname; rev = "v${version}"; - hash = "sha256-JLtP3zimNL1UIFsbvtV2JO3PVV6w9VnfjpROs2UoFcU="; + hash = "sha256-hFuuwmwe0ti4Y8mSJyNqUIhZjFC6qtv6W5cwtNjPUFQ="; }; cargoHash = "sha256-1gtLWU6uiWzUfYy9y3pb2vcnUC3H+Mf9rglmqNd989M="; From 7fd1f842a0be6c1f40c70eb440610784f9215248 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 13 Jun 2023 03:06:35 +0000 Subject: [PATCH 078/165] terraform-providers.cloudamqp: 1.26.2 -> 1.27.0 --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 49279d7595b9..6c149a416b15 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -209,11 +209,11 @@ "vendorHash": null }, "cloudamqp": { - "hash": "sha256-1INYBqZcv7IRqhbt5Q/aZ2MYMwH7A0h1UzF4KZ9AK3U=", + "hash": "sha256-35pcXFmVCO2naCeDDcNtgzUeMdkGfGBxZvYSSGtH824=", "homepage": "https://registry.terraform.io/providers/cloudamqp/cloudamqp", "owner": "cloudamqp", "repo": "terraform-provider-cloudamqp", - "rev": "v1.26.2", + "rev": "v1.27.0", "spdx": "MPL-2.0", "vendorHash": "sha256-qIgr+ynaNSfNx1iW5RJrNHvEnlr46dBzIi+5IXYn+3Q=" }, From 7fdbd9403702fc1f6ec1ca14d266f41df3b596fb Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 13 Jun 2023 03:12:08 +0000 Subject: [PATCH 079/165] terraform-providers.google: 4.68.0 -> 4.69.1 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 6c149a416b15..466380b15177 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -437,14 +437,14 @@ "vendorHash": "sha256-KD9X7EOH1btgLtssuz1FFOGtmfNao8HBcKJDty1wtpY=" }, "google": { - "hash": "sha256-emfKbO9RGX+DiBik3Hz84IqZGrCV8JBAPt2fHAu8yxc=", + "hash": "sha256-ShfbbVo53EughhmflIJgiLkW2J6VJHqUJ4tgoCIcJ0w=", "homepage": "https://registry.terraform.io/providers/hashicorp/google", "owner": "hashicorp", "proxyVendor": true, "repo": "terraform-provider-google", - "rev": "v4.68.0", + "rev": "v4.69.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-O7lg3O54PedUEwWL34H49SvSBXuGH1l5joqEXgkew5Q=" + "vendorHash": "sha256-xMnkZYZikJX0aCvRc07ONMsXTv9DUgGArge+6evTyCE=" }, "google-beta": { "hash": "sha256-yhaEGLdRzfSaWfdqKdeRYHj0neaBZ4WS+o8wB+Vsb7g=", From 439a3b0fee9e4ea6e317f750c27b0f71c55cec5c Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 13 Jun 2023 03:12:52 +0000 Subject: [PATCH 080/165] terraform-providers.google-beta: 4.68.0 -> 4.69.1 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 466380b15177..dba0b40b0cb5 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -447,14 +447,14 @@ "vendorHash": "sha256-xMnkZYZikJX0aCvRc07ONMsXTv9DUgGArge+6evTyCE=" }, "google-beta": { - "hash": "sha256-yhaEGLdRzfSaWfdqKdeRYHj0neaBZ4WS+o8wB+Vsb7g=", + "hash": "sha256-QvW1BRZn0d0uzPw385w7FTrlVkRIQ0Qz3ImlF7L+sE4=", "homepage": "https://registry.terraform.io/providers/hashicorp/google-beta", "owner": "hashicorp", "proxyVendor": true, "repo": "terraform-provider-google-beta", - "rev": "v4.68.0", + "rev": "v4.69.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-O7lg3O54PedUEwWL34H49SvSBXuGH1l5joqEXgkew5Q=" + "vendorHash": "sha256-xMnkZYZikJX0aCvRc07ONMsXTv9DUgGArge+6evTyCE=" }, "googleworkspace": { "hash": "sha256-dedYnsKHizxJZibuvJOMbJoux0W6zgKaK5fxIofKqCY=", From 4c50b8d5323a61cc6772a8bf5ad22d10d35ac5d3 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 13 Jun 2023 03:14:27 +0000 Subject: [PATCH 081/165] terraform-providers.lxd: 1.9.1 -> 1.10.0 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index dba0b40b0cb5..88e83b8cc523 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -692,13 +692,13 @@ "vendorHash": "sha256-ZjS40Xc8y2UBPn4rX3EgRoSapRvMEeVMGZE6z9tpsAQ=" }, "lxd": { - "hash": "sha256-4BDpVWfdSYTKPTCgKIHOqgNaxgdIGjW5yRh9Ezs/0zY=", + "hash": "sha256-qJp/RekJBsXx5Ic6J6CKs/oBcyqHB/sSjpzjAZUf2iE=", "homepage": "https://registry.terraform.io/providers/terraform-lxd/lxd", "owner": "terraform-lxd", "repo": "terraform-provider-lxd", - "rev": "v1.9.1", + "rev": "v1.10.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-RVELewqJtH4tuHJWfcLcMH7cM0dr7Yse+UnqrLaNyCc=" + "vendorHash": "sha256-zGVatrMqYsbGahEGJ/Gt9ub76R49m7RbLLs2XeKwQJw=" }, "mailgun": { "hash": "sha256-r1E2Y5JRu77T29ebUNTXUEypnrsfYYbBhvpKZGt5T9w=", From 763b7038453d4758ca12c6c312f0b5d9edaa8754 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 13 Jun 2023 03:14:59 +0000 Subject: [PATCH 082/165] terraform-providers.newrelic: 3.24.1 -> 3.24.2 --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 88e83b8cc523..1d2732060ae0 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -764,11 +764,11 @@ "vendorHash": null }, "newrelic": { - "hash": "sha256-Qm5rMgJ4SN3gmhoMaDDcXg75r7mYHavQzoiscsUk6Vk=", + "hash": "sha256-gjqU2DCHpM65ASF8dW/X/00m1vYY0MVlz/cW6LXQVig=", "homepage": "https://registry.terraform.io/providers/newrelic/newrelic", "owner": "newrelic", "repo": "terraform-provider-newrelic", - "rev": "v3.24.1", + "rev": "v3.24.2", "spdx": "MPL-2.0", "vendorHash": "sha256-WjiTfHs+MEc06aNstblGKvd3cTj49JF1fvm+tuR2WH8=" }, From fc102de2711d5659ad18b46f0265b9959d5071a9 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 13 Jun 2023 03:16:16 +0000 Subject: [PATCH 083/165] terraform-providers.opsgenie: 0.6.23 -> 0.6.24 --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 1d2732060ae0..cf791c46d6c7 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -864,11 +864,11 @@ "vendorHash": "sha256-ubEoh4GUkyNAvyHCowURhvucOyFpMidxoFeqE1w2GQY=" }, "opsgenie": { - "hash": "sha256-fcQChRIwxAeAdYPTYC9rPSdbrmXaBIOotF7vQhO9Sl0=", + "hash": "sha256-us4UaCLvWWoS+N7eXPs2/xSk9wl1zULaiG93LX45bks=", "homepage": "https://registry.terraform.io/providers/opsgenie/opsgenie", "owner": "opsgenie", "repo": "terraform-provider-opsgenie", - "rev": "v0.6.23", + "rev": "v0.6.24", "spdx": "MPL-2.0", "vendorHash": null }, From 5a4d1a6897e116e7e3d5bc4117679dcf8fbce39d Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 13 Jun 2023 03:16:40 +0000 Subject: [PATCH 084/165] terraform-providers.okta: 4.0.0 -> 4.0.1 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index cf791c46d6c7..2f6b083227e6 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -819,13 +819,13 @@ "vendorHash": null }, "okta": { - "hash": "sha256-NUczAdOYpqpHGpE2OaJtziggA5o+CUYSq2F/RkTL7YU=", + "hash": "sha256-vjTv27oRFQ4sMON4v0BOajAkZwawpNBJchnrPa1ienA=", "homepage": "https://registry.terraform.io/providers/okta/okta", "owner": "okta", "repo": "terraform-provider-okta", - "rev": "v4.0.0", + "rev": "v4.0.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-LjYPZaF8vy1WUNeI/TFIDjVh08sxf6nKLpvmQsCQFFo=" + "vendorHash": "sha256-Sws5X2Vsyn0qJr8zfK8Ti1q2nSVyvU4PtsFimJE32VQ=" }, "oktaasa": { "hash": "sha256-2LhxgowqKvDDDOwdznusL52p2DKP+UiXALHcs9ZQd0U=", From eb464f2771a3796dd54c27d58fe58e9ee6a493e8 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 13 Jun 2023 06:25:04 +0200 Subject: [PATCH 085/165] =?UTF-8?q?ocamlPackages.parmap:=201.2.4=20?= =?UTF-8?q?=E2=86=92=201.2.5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/ocaml-modules/parmap/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/development/ocaml-modules/parmap/default.nix b/pkgs/development/ocaml-modules/parmap/default.nix index 18e1975b698d..a8885aa27f27 100644 --- a/pkgs/development/ocaml-modules/parmap/default.nix +++ b/pkgs/development/ocaml-modules/parmap/default.nix @@ -1,12 +1,14 @@ -{ lib, fetchurl, buildDunePackage, dune-configurator }: +{ lib, fetchFromGitHub, buildDunePackage, dune-configurator }: buildDunePackage rec { pname = "parmap"; - version = "1.2.4"; + version = "1.2.5"; - src = fetchurl { - url = "https://github.com/rdicosmo/${pname}/releases/download/${version}/${pname}-${version}.tbz"; - sha256 = "sha256-BTkSEjIK3CVNloJACFo6eQ6Ob9o/cdrA9xuv87NKas4="; + src = fetchFromGitHub { + owner = "rdicosmo"; + repo = pname; + rev = version; + hash = "sha256-tBu7TGtDOe5FbxLZuz6nl+65aN9FHIngq/O4dJWzr3Q="; }; minimalOCamlVersion = "4.03"; From 635e71f62c734dc1f2a9d8f61b43bb032a183c83 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 13 Jun 2023 06:25:28 +0200 Subject: [PATCH 086/165] =?UTF-8?q?ocamlPackages.cudf:=200.9=20=E2=86=92?= =?UTF-8?q?=200.10?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ocaml-modules/cudf/default.nix | 43 ++++++------------- 1 file changed, 12 insertions(+), 31 deletions(-) diff --git a/pkgs/development/ocaml-modules/cudf/default.nix b/pkgs/development/ocaml-modules/cudf/default.nix index 6cef074498d6..18ea3defa193 100644 --- a/pkgs/development/ocaml-modules/cudf/default.nix +++ b/pkgs/development/ocaml-modules/cudf/default.nix @@ -1,46 +1,27 @@ -{ lib, fetchurl, stdenv, ocaml, ocamlbuild, findlib, extlib, glib, perl, pkg-config, stdlib-shims, ounit }: +{ lib, buildDunePackage, ocaml, fetchFromGitLab, extlib, ounit2 }: -stdenv.mkDerivation rec { - pname = "ocaml${ocaml.version}-cudf"; - version = "0.9"; +buildDunePackage rec { + pname = "cudf"; + version = "0.10"; - src = fetchurl { - url = "https://gforge.inria.fr/frs/download.php/36602/cudf-0.9.tar.gz"; - sha256 = "sha256-mTLk2V3OI1sUNIYv84nM3reiirf0AuozG5ZzLCmn4Rw="; + minimalOCamlVersion = "4.07"; + + src = fetchFromGitLab { + owner = "irill"; + repo = pname; + rev = "v${version}"; + hash = "sha256-E4KXKnso/Q3ZwcYpKPgvswNR9qd/lafKljPMxfStedM="; }; - buildFlags = [ - "all" - "opt" - ]; - - nativeBuildInputs = [ - findlib - ocaml - ocamlbuild - pkg-config - perl - ]; - buildInputs = [ - glib - stdlib-shims - ]; propagatedBuildInputs = [ extlib ]; - checkTarget = [ - "all" - "test" - ]; checkInputs = [ - ounit + ounit2 ]; doCheck = lib.versionAtLeast ocaml.version "4.08"; - preInstall = "mkdir -p $OCAMLFIND_DESTDIR"; - installFlags = [ "BINDIR=$(out)/bin" ]; - meta = with lib; { description = "A library for CUDF format"; homepage = "https://www.mancoosi.org/cudf/"; From b4e057c88d3a97d2c11a0ba61775d222dbc459a9 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 13 Jun 2023 06:25:34 +0200 Subject: [PATCH 087/165] ocamlPackages.dose3: cleanup --- .../ocaml-modules/dose3/default.nix | 20 +++++-------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/pkgs/development/ocaml-modules/dose3/default.nix b/pkgs/development/ocaml-modules/dose3/default.nix index 1146da5d3067..4210dde025c0 100644 --- a/pkgs/development/ocaml-modules/dose3/default.nix +++ b/pkgs/development/ocaml-modules/dose3/default.nix @@ -1,7 +1,7 @@ { lib, buildDunePackage, fetchFromGitLab -, camlzip, ocamlgraph, parmap, re, stdlib-shims -, base64, bz2, extlib, cudf -, dpkg, git, ocaml, ounit, python39, python39Packages +, ocamlgraph, parmap, re, stdlib-shims +, base64, extlib, cudf +, ocaml, ounit }: buildDunePackage rec { @@ -15,8 +15,7 @@ buildDunePackage rec { sha256 = "sha256-K0fYSAWV48Rers/foDrEIqieyJ0PvpXkuYrFrZGBkkE="; }; - minimalOCamlVersion = "4.03"; - useDune2 = true; + minimalOCamlVersion = "4.07"; buildInputs = [ parmap @@ -24,8 +23,6 @@ buildDunePackage rec { propagatedBuildInputs = [ base64 - bz2 - camlzip cudf extlib ocamlgraph @@ -33,17 +30,10 @@ buildDunePackage rec { stdlib-shims ]; - nativeCheckInputs = [ - python39 # Replaces: conf-python-3 - python39Packages.pyyaml # Replaces: conf-python3-yaml - git - ]; checkInputs = [ - dpkg # Replaces: conf-dpkg ounit ]; - doCheck = false; # Tests are failing. - # To enable tests use: lib.versionAtLeast ocaml.version "4.04"; + doCheck = lib.versionAtLeast ocaml.version "4.08"; meta = with lib; { description = "Dose library (part of Mancoosi tools)"; From c146c4407229ed949b5538104b10a7c5c98489a5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 13 Jun 2023 05:15:35 +0000 Subject: [PATCH 088/165] prometheus-graphite-exporter: 0.13.3 -> 0.14.0 --- pkgs/servers/monitoring/prometheus/graphite-exporter.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/monitoring/prometheus/graphite-exporter.nix b/pkgs/servers/monitoring/prometheus/graphite-exporter.nix index 54ad80228191..fa0998b31772 100644 --- a/pkgs/servers/monitoring/prometheus/graphite-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/graphite-exporter.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "graphite-exporter"; - version = "0.13.3"; + version = "0.14.0"; src = fetchFromGitHub { owner = "prometheus"; repo = "graphite_exporter"; rev = "v${version}"; - hash = "sha256-ZsRN/h96Lt0znXmtMGjR6TXKa1ka0rbk/XXNVolBNk8="; + hash = "sha256-UaflfU27GR8VK6AduPDBcQyO3u1uX6YlGP9O4LFwn9A="; }; - vendorHash = "sha256-vW/iODlOWD8JmoDO6Ty+Eajoj0IAHak/abWW2OSp34M="; + vendorHash = "sha256-cIl35wbdPCQJLudXphMbjO2Ztd/H1clI43xaMU6T0D4="; preCheck = let skippedTests = [ From 781052862d6c7c8153e373541fba504369254c3d Mon Sep 17 00:00:00 2001 From: emilylange Date: Tue, 13 Jun 2023 07:51:49 +0200 Subject: [PATCH 089/165] grafana-agent: 0.34.0 -> 0.34.1 https://github.com/grafana/agent/blob/v0.34.1/CHANGELOG.md https://github.com/grafana/agent/releases/tag/v0.34.1 diff: https://github.com/grafana/agent/compare/v0.34.0...v0.34.1 --- pkgs/servers/monitoring/grafana-agent/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/monitoring/grafana-agent/default.nix b/pkgs/servers/monitoring/grafana-agent/default.nix index 8055990c1a23..c095c86108d7 100644 --- a/pkgs/servers/monitoring/grafana-agent/default.nix +++ b/pkgs/servers/monitoring/grafana-agent/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "grafana-agent"; - version = "0.34.0"; + version = "0.34.1"; src = fetchFromGitHub { rev = "v${version}"; owner = "grafana"; repo = "agent"; - hash = "sha256-OIvLgI853qQ4Nc8xBKfwWKohyW/b53UBxpNauAgOS48="; + hash = "sha256-xgmh5oFI6Pd0q31zJluLtbhF0ZfuXy2cEPk06sW9SH8="; }; - vendorHash = "sha256-BfEnMGP3IMtJwOjZRFpNc58PaQ116U/p9jRsiGdIpCQ="; + vendorHash = "sha256-LKHs6KHdXtCMImYiUmi2pfMbfpt9alpvWS4rlo5kuCI="; proxyVendor = true; # darwin/linux hash mismatch ldflags = let From 6e43312a048faebcadb0138a6f9caf2aaf47aef5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 13 Jun 2023 05:58:44 +0000 Subject: [PATCH 090/165] frugal: 3.16.21 -> 3.16.23 --- pkgs/development/tools/frugal/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/frugal/default.nix b/pkgs/development/tools/frugal/default.nix index 91d90044b5a0..5ec86e703127 100644 --- a/pkgs/development/tools/frugal/default.nix +++ b/pkgs/development/tools/frugal/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "frugal"; - version = "3.16.21"; + version = "3.16.23"; src = fetchFromGitHub { owner = "Workiva"; repo = pname; rev = "v${version}"; - sha256 = "sha256-iNj3E5JtvOHAiEC+81KnAb32TWi+Zq8Av24oLm01ty4="; + sha256 = "sha256-Ofem3oSwas5X3D8zSzS5HpJANR6TNVSJ8hWb13hr0W4="; }; subPackages = [ "." ]; - vendorHash = "sha256-29LwvekhevOn/1zrtQEZWqeQMEAN2xPxSRzas/5EhVM="; + vendorHash = "sha256-wuT58Weyc8AB9i5bVe0696BGRWsl814Fz9bmnuJwgPM="; meta = with lib; { description = "Thrift improved"; From 126fd86c3eefcc49bb894225cc5c4a870ce1a84a Mon Sep 17 00:00:00 2001 From: toastal Date: Sat, 6 May 2023 13:39:27 +0700 Subject: [PATCH 091/165] =?UTF-8?q?ocamlPackages.mtime:=201.2.0=20?= =?UTF-8?q?=E2=86=92=202.0.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/ocaml-modules/mtime/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/mtime/default.nix b/pkgs/development/ocaml-modules/mtime/default.nix index 3ca6e4ac973b..ff53efb9d9a4 100644 --- a/pkgs/development/ocaml-modules/mtime/default.nix +++ b/pkgs/development/ocaml-modules/mtime/default.nix @@ -5,11 +5,11 @@ lib.throwIfNot (lib.versionAtLeast ocaml.version "4.08") stdenv.mkDerivation rec { pname = "ocaml${ocaml.version}-mtime"; - version = "1.4.0"; + version = "2.0.0"; src = fetchurl { url = "https://erratique.ch/software/mtime/releases/mtime-${version}.tbz"; - sha256 = "sha256-VQyYEk8+57Yq8SUuYossaQUHZKqemHDJtf4LK8qjxvc="; + sha256 = "Pz2g6gBts0RlsDCE3npYqxWg8W9HgoxQC+U63fHgROs="; }; nativeBuildInputs = [ ocaml findlib ocamlbuild topkg ]; From 8201afb77f65bf56ca52fe79d510fa9ad4e66515 Mon Sep 17 00:00:00 2001 From: toastal Date: Sat, 6 May 2023 13:56:22 +0700 Subject: [PATCH 092/165] ocamlPackages.mtime: create 1.x fork for compat Slapped mtime_1 affected ocamlPackages --- .../science/logic/acgtk/default.nix | 2 +- pkgs/development/compilers/ligo/default.nix | 2 +- pkgs/development/ocaml-modules/mtime/1_x.nix | 22 +++++++++++ pkgs/top-level/ocaml-packages.nix | 37 ++++++++++--------- 4 files changed, 44 insertions(+), 19 deletions(-) create mode 100644 pkgs/development/ocaml-modules/mtime/1_x.nix diff --git a/pkgs/applications/science/logic/acgtk/default.nix b/pkgs/applications/science/logic/acgtk/default.nix index 693bc306f21e..c876f77e12f4 100644 --- a/pkgs/applications/science/logic/acgtk/default.nix +++ b/pkgs/applications/science/logic/acgtk/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { nativeBuildInputs = with ocamlPackages; [ menhir ocaml findlib dune_3 ]; buildInputs = with ocamlPackages; [ - ansiterminal cairo2 cmdliner fmt logs menhirLib mtime sedlex yojson + ansiterminal cairo2 cmdliner fmt logs menhirLib mtime_1 sedlex yojson ]; buildPhase = '' diff --git a/pkgs/development/compilers/ligo/default.nix b/pkgs/development/compilers/ligo/default.nix index 3240dcb31980..af29757299d8 100644 --- a/pkgs/development/compilers/ligo/default.nix +++ b/pkgs/development/compilers/ligo/default.nix @@ -116,7 +116,7 @@ ocamlPackages.buildDunePackage rec { bls12-381 bls12-381-signature ptime - mtime + mtime_1 lwt_log secp256k1-internal resto diff --git a/pkgs/development/ocaml-modules/mtime/1_x.nix b/pkgs/development/ocaml-modules/mtime/1_x.nix new file mode 100644 index 000000000000..e10f2b7d7a3b --- /dev/null +++ b/pkgs/development/ocaml-modules/mtime/1_x.nix @@ -0,0 +1,22 @@ +{ stdenv, lib, fetchurl, ocaml, findlib, ocamlbuild, topkg, mtime }: + +lib.throwIfNot (lib.versionAtLeast ocaml.version "4.08") + "mtime is not available for OCaml ${ocaml.version}" + +stdenv.mkDerivation rec { + pname = "ocaml${ocaml.version}-mtime"; + version = "1.4.0"; + + src = fetchurl { + url = "https://erratique.ch/software/mtime/releases/mtime-${version}.tbz"; + sha256 = "VQyYEk8+57Yq8SUuYossaQUHZKqemHDJtf4LK8qjxvc="; + }; + + nativeBuildInputs = [ ocaml findlib ocamlbuild topkg ]; + buildInputs = [ topkg ]; + + strictDeps = true; + + inherit (topkg) buildPhase installPhase; + inherit (mtime) meta; +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index d8c4a51505fc..05be94f39eaf 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -54,11 +54,11 @@ let atdgen-runtime = callPackage ../development/ocaml-modules/atdgen/runtime.nix { }; - awa = callPackage ../development/ocaml-modules/awa { }; + awa = callPackage ../development/ocaml-modules/awa { mtime = mtime_1; }; - awa-lwt = callPackage ../development/ocaml-modules/awa/lwt.nix { }; + awa-lwt = callPackage ../development/ocaml-modules/awa/lwt.nix { mtime = mtime_1; }; - awa-mirage = callPackage ../development/ocaml-modules/awa/mirage.nix { }; + awa-mirage = callPackage ../development/ocaml-modules/awa/mirage.nix { mtime = mtime_1; }; ### B ### @@ -321,11 +321,11 @@ let dns-certify = callPackage ../development/ocaml-modules/dns/certify.nix { }; - dns-cli = callPackage ../development/ocaml-modules/dns/cli.nix { }; + dns-cli = callPackage ../development/ocaml-modules/dns/cli.nix { mtime = mtime_1; }; - dns-client = callPackage ../development/ocaml-modules/dns/client.nix { }; + dns-client = callPackage ../development/ocaml-modules/dns/client.nix { mtime = mtime_1; }; - dns-client-lwt = callPackage ../development/ocaml-modules/dns/client-lwt.nix { }; + dns-client-lwt = callPackage ../development/ocaml-modules/dns/client-lwt.nix { mtime = mtime_1; }; dns-client-mirage = callPackage ../development/ocaml-modules/dns/client-mirage.nix { }; @@ -571,6 +571,7 @@ let git-unix = callPackage ../development/ocaml-modules/git/unix.nix { git-binary = pkgs.git; + mtime = mtime_1; }; github = callPackage ../development/ocaml-modules/github { }; @@ -622,7 +623,7 @@ let happy-eyeballs = callPackage ../development/ocaml-modules/happy-eyeballs { }; - happy-eyeballs-lwt = callPackage ../development/ocaml-modules/happy-eyeballs/lwt.nix { }; + happy-eyeballs-lwt = callPackage ../development/ocaml-modules/happy-eyeballs/lwt.nix { mtime = mtime_1; }; happy-eyeballs-mirage = callPackage ../development/ocaml-modules/happy-eyeballs/mirage.nix { }; @@ -652,7 +653,7 @@ let imagelib = callPackage ../development/ocaml-modules/imagelib { }; - index = callPackage ../development/ocaml-modules/index { }; + index = callPackage ../development/ocaml-modules/index { mtime = mtime_1; }; inifiles = callPackage ../development/ocaml-modules/inifiles { }; @@ -672,15 +673,15 @@ let iri = callPackage ../development/ocaml-modules/iri { }; - irmin = callPackage ../development/ocaml-modules/irmin { }; + irmin = callPackage ../development/ocaml-modules/irmin { mtime = mtime_1; }; irmin-chunk = callPackage ../development/ocaml-modules/irmin/chunk.nix { }; - irmin-containers = callPackage ../development/ocaml-modules/irmin/containers.nix { }; + irmin-containers = callPackage ../development/ocaml-modules/irmin/containers.nix { mtime = mtime_1; }; irmin-fs = callPackage ../development/ocaml-modules/irmin/fs.nix { }; - irmin-git = callPackage ../development/ocaml-modules/irmin/git.nix { }; + irmin-git = callPackage ../development/ocaml-modules/irmin/git.nix { mtime = mtime_1; }; irmin-graphql = callPackage ../development/ocaml-modules/irmin/graphql.nix { }; @@ -692,9 +693,9 @@ let irmin-mirage-graphql = callPackage ../development/ocaml-modules/irmin/mirage-graphql.nix { }; - irmin-pack = callPackage ../development/ocaml-modules/irmin/pack.nix { }; + irmin-pack = callPackage ../development/ocaml-modules/irmin/pack.nix { mtime = mtime_1; }; - irmin-test = callPackage ../development/ocaml-modules/irmin/test.nix { }; + irmin-test = callPackage ../development/ocaml-modules/irmin/test.nix { mtime = mtime_1; }; irmin-tezos = callPackage ../development/ocaml-modules/irmin/tezos.nix { }; @@ -961,6 +962,7 @@ let metrics-unix = callPackage ../development/ocaml-modules/metrics/unix.nix { inherit (pkgs) gnuplot; + mtime = mtime_1; }; mew = callPackage ../development/ocaml-modules/mew { }; @@ -1007,11 +1009,11 @@ let mirage-crypto-pk = callPackage ../development/ocaml-modules/mirage-crypto/pk.nix { }; - mirage-crypto-rng = callPackage ../development/ocaml-modules/mirage-crypto/rng.nix { }; + mirage-crypto-rng = callPackage ../development/ocaml-modules/mirage-crypto/rng.nix { mtime = mtime_1; }; mirage-crypto-rng-async = callPackage ../development/ocaml-modules/mirage-crypto/rng-async.nix { }; - mirage-crypto-rng-lwt = callPackage ../development/ocaml-modules/mirage-crypto/rng-lwt.nix { }; + mirage-crypto-rng-lwt = callPackage ../development/ocaml-modules/mirage-crypto/rng-lwt.nix { mtime = mtime_1; }; mirage-crypto-rng-mirage = callPackage ../development/ocaml-modules/mirage-crypto/rng-mirage.nix { }; @@ -1073,6 +1075,7 @@ let mrmime = callPackage ../development/ocaml-modules/mrmime { }; + mtime_1 = callPackage ../development/ocaml-modules/mtime/1_x.nix { }; mtime = callPackage ../development/ocaml-modules/mtime { }; multipart-form-data = callPackage ../development/ocaml-modules/multipart-form-data { }; @@ -1249,7 +1252,7 @@ let inherit (pkgs) unzip; }; - opium = callPackage ../development/ocaml-modules/opium { }; + opium = callPackage ../development/ocaml-modules/opium { mtime = mtime_1; }; opti = callPackage ../development/ocaml-modules/opti { }; @@ -1400,7 +1403,7 @@ let prometheus = callPackage ../development/ocaml-modules/prometheus { }; - progress = callPackage ../development/ocaml-modules/progress { }; + progress = callPackage ../development/ocaml-modules/progress { mtime = mtime_1; }; promise_jsoo = callPackage ../development/ocaml-modules/promise_jsoo { }; From e6eac639d9ecceab4a32a3514b2d03aa3affe0da Mon Sep 17 00:00:00 2001 From: QJoly Date: Tue, 13 Jun 2023 08:15:40 +0200 Subject: [PATCH 093/165] kaniko: 1.10.0 -> 1.11.0 --- pkgs/applications/networking/cluster/kaniko/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/kaniko/default.nix b/pkgs/applications/networking/cluster/kaniko/default.nix index 1dd2e9649fae..ed111341e6f2 100644 --- a/pkgs/applications/networking/cluster/kaniko/default.nix +++ b/pkgs/applications/networking/cluster/kaniko/default.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "kaniko"; - version = "1.10.0"; + version = "1.11.0"; src = fetchFromGitHub { owner = "GoogleContainerTools"; repo = "kaniko"; rev = "v${version}"; - hash = "sha256-SPHayFfYFpg1AOoe003xh7NGQLpvhd1C2k4IilgMqSw="; + hash = "sha256-p/mGobQyn5e7TpqjarVT7qBgYDWtX1VgXq814O8mTmI="; }; vendorHash = null; @@ -47,7 +47,7 @@ buildGoModule rec { homepage = "https://github.com/GoogleContainerTools/kaniko"; license = lib.licenses.asl20; platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ jk ]; + maintainers = with lib.maintainers; [ jk qjoly ]; mainProgram = "executor"; }; } From bf7e951996bc9d6ad734e5670e2a517dfdbaa7b1 Mon Sep 17 00:00:00 2001 From: toastal Date: Sat, 6 May 2023 20:20:02 +0700 Subject: [PATCH 094/165] ocamlPackages.iomux: init at 0.3 --- .../ocaml-modules/iomux/default.nix | 34 +++++++++++++++++++ pkgs/top-level/ocaml-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/development/ocaml-modules/iomux/default.nix diff --git a/pkgs/development/ocaml-modules/iomux/default.nix b/pkgs/development/ocaml-modules/iomux/default.nix new file mode 100644 index 000000000000..f1dc827a32d0 --- /dev/null +++ b/pkgs/development/ocaml-modules/iomux/default.nix @@ -0,0 +1,34 @@ +{ lib +, fetchurl +, buildDunePackage +, dune-configurator +, alcotest +}: + +buildDunePackage rec { + pname = "iomux"; + version = "0.3"; + + minimalOCamlVersion = "4.08"; + duneVersion = "3"; + + src = fetchurl { + url = "https://github.com/haesbaert/ocaml-${pname}/releases/download/v${version}/${pname}-${version}.tbz"; + sha256 = "zNJ3vVOv0BEpHLiC8Y610F87uiMlfYNo28ej0H+EU+c="; + }; + + buildInputs = [ + dune-configurator + ]; + + checkInputs = [ + alcotest + ]; + + meta = { + homepage = "https://github.com/haesbaert/ocaml-${pname}"; + description = "IO Multiplexers for OCaml"; + license = with lib.licenses; [ isc ]; + maintainers = with lib.maintainers; [ toastal ]; + }; +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 05be94f39eaf..bf1d3eb65887 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -663,6 +663,8 @@ let integers_stubs_js = callPackage ../development/ocaml-modules/integers_stubs_js { }; + iomux = callPackage ../development/ocaml-modules/iomux { }; + io-page = callPackage ../development/ocaml-modules/io-page { }; ipaddr = callPackage ../development/ocaml-modules/ipaddr { }; From b81b9b0df913cee1ffffd99d09ea19258813518e Mon Sep 17 00:00:00 2001 From: toastal Date: Sun, 4 Jun 2023 13:37:00 +0700 Subject: [PATCH 095/165] ocamlPacakges.domain-local-await: init at 0.2.0 --- .../domain-local-await/default.nix | 34 +++++++++++++++++++ pkgs/top-level/ocaml-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/development/ocaml-modules/domain-local-await/default.nix diff --git a/pkgs/development/ocaml-modules/domain-local-await/default.nix b/pkgs/development/ocaml-modules/domain-local-await/default.nix new file mode 100644 index 000000000000..b5c4c980f063 --- /dev/null +++ b/pkgs/development/ocaml-modules/domain-local-await/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildDunePackage +, fetchurl +, mdx +}: + +buildDunePackage rec { + pname = "domain-local-await"; + version = "0.2.0"; + + minimalOCamlVersion = "5.0"; + duneVersion = "3"; + + src = fetchurl { + url = "https://github.com/ocaml-multicore/${pname}/releases/download/${version}/${pname}-${version}.tbz"; + sha256 = "2DCJsI3nGPtbXnU8jRvzR1iNAkNuekVy4Lid1qnHXDo="; + }; + + checkInputs = [ + mdx + ]; + + nativeCheckInputs = [ + mdx.bin + ]; + + meta = { + homepage = "https://github.com/ocaml-multicore/ocaml-${pname}"; + changelog = "https://github.com/ocaml-multicore/ocaml-${pname}/raw/v${version}/CHANGES.md"; + description = "A scheduler independent blocking mechanism"; + license = with lib.licenses; [ bsd0 ]; + maintainers = with lib.maintainers; [ toastal ]; + }; +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index bf1d3eb65887..c29f7b187bb5 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -345,6 +345,8 @@ let dolog = callPackage ../development/ocaml-modules/dolog { }; + domain-local-await = callPackage ../development/ocaml-modules/domain-local-await { }; + domain-name = callPackage ../development/ocaml-modules/domain-name { }; domainslib = callPackage ../development/ocaml-modules/domainslib { }; From a748ffdb6edbfc19eac10c522cb2e45af86c8e08 Mon Sep 17 00:00:00 2001 From: toastal Date: Sat, 6 May 2023 13:40:06 +0700 Subject: [PATCH 096/165] ocamlPackages.eio: init at 0.10 --- .../development/ocaml-modules/eio/default.nix | 60 +++++++++++++++++++ pkgs/development/ocaml-modules/eio/linux.nix | 23 +++++++ pkgs/development/ocaml-modules/eio/main.nix | 23 +++++++ pkgs/development/ocaml-modules/eio/posix.nix | 28 +++++++++ pkgs/top-level/ocaml-packages.nix | 5 ++ 5 files changed, 139 insertions(+) create mode 100644 pkgs/development/ocaml-modules/eio/default.nix create mode 100644 pkgs/development/ocaml-modules/eio/linux.nix create mode 100644 pkgs/development/ocaml-modules/eio/main.nix create mode 100644 pkgs/development/ocaml-modules/eio/posix.nix diff --git a/pkgs/development/ocaml-modules/eio/default.nix b/pkgs/development/ocaml-modules/eio/default.nix new file mode 100644 index 000000000000..c925928433a0 --- /dev/null +++ b/pkgs/development/ocaml-modules/eio/default.nix @@ -0,0 +1,60 @@ +{ lib +, buildDunePackage +, bigstringaf +, cstruct +, domain-local-await +, dune-configurator +, fetchurl +, fmt +, hmap +, lwt-dllist +, mtime +, optint +, psq +, alcotest +, crowbar +, mdx +}: + +buildDunePackage rec { + pname = "eio"; + version = "0.10"; + + minimalOCamlVersion = "5.0"; + duneVersion = "3"; + + src = fetchurl { + url = "https://github.com/ocaml-multicore/${pname}/releases/download/v${version}/${pname}-${version}.tbz"; + sha256 = "OQ94FFB7gTPWwl46Z6dC1zHHymYlKyh7H7DjrU0Q7sw="; + }; + + propagatedBuildInputs = [ + bigstringaf + cstruct + domain-local-await + fmt + hmap + lwt-dllist + mtime + optint + psq + ]; + + checkInputs = [ + alcotest + crowbar + mdx + ]; + + nativeCheckInputs = [ + mdx.bin + ]; + + meta = { + homepage = "https://github.com/ocaml-multicore/ocaml-${pname}"; + changelog = "https://github.com/ocaml-multicore/ocaml-${pname}/raw/v${version}/CHANGES.md"; + description = "Effects-Based Parallel IO for OCaml"; + license = with lib.licenses; [ isc ]; + maintainers = with lib.maintainers; [ toastal ]; + }; +} diff --git a/pkgs/development/ocaml-modules/eio/linux.nix b/pkgs/development/ocaml-modules/eio/linux.nix new file mode 100644 index 000000000000..62f9800790b5 --- /dev/null +++ b/pkgs/development/ocaml-modules/eio/linux.nix @@ -0,0 +1,23 @@ +{ buildDunePackage +, eio +, fmt +, logs +, uring +}: + +buildDunePackage { + pname = "eio_linux"; + inherit (eio) meta src version; + + minimalOCamlVersion = "5.0"; + duneVersion = "3"; + + dontStrip = true; + + propagatedBuildInputs = [ + eio + fmt + logs + uring + ]; +} diff --git a/pkgs/development/ocaml-modules/eio/main.nix b/pkgs/development/ocaml-modules/eio/main.nix new file mode 100644 index 000000000000..32a6affef0e0 --- /dev/null +++ b/pkgs/development/ocaml-modules/eio/main.nix @@ -0,0 +1,23 @@ +{ lib +, stdenv +, buildDunePackage +, eio +, eio_posix +, uring +}: + +buildDunePackage { + pname = "eio_main"; + inherit (eio) meta src version; + + minimalOCamlVersion = "5.0"; + duneVersion = "3"; + + dontStrip = true; + + propagatedBuildInputs = [ + eio_posix + ] ++ lib.optionals stdenv.isLinux [ + uring + ]; +} diff --git a/pkgs/development/ocaml-modules/eio/posix.nix b/pkgs/development/ocaml-modules/eio/posix.nix new file mode 100644 index 000000000000..6c3042e65fae --- /dev/null +++ b/pkgs/development/ocaml-modules/eio/posix.nix @@ -0,0 +1,28 @@ +{ buildDunePackage +, dune-configurator +, eio +, fmt +, logs +, iomux +}: + +buildDunePackage { + pname = "eio_posix"; + inherit (eio) meta src version; + + minimalOCamlVersion = "5.0"; + duneVersion = "3"; + + dontStrip = true; + + buildInputs = [ + dune-configurator + ]; + + propagatedBuildInputs = [ + eio + fmt + logs + iomux + ]; +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index c29f7b187bb5..64fabf5d1b32 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -419,6 +419,11 @@ let eigen = callPackage ../development/ocaml-modules/eigen { }; + eio = callPackage ../development/ocaml-modules/eio { }; + eio_linux = callPackage ../development/ocaml-modules/eio/linux.nix { }; + eio_main = callPackage ../development/ocaml-modules/eio/main.nix { }; + eio_posix = callPackage ../development/ocaml-modules/eio/posix.nix { }; + either = callPackage ../development/ocaml-modules/either { }; elina = callPackage ../development/ocaml-modules/elina { }; From ea7ec527b7a758b433d9d10275608ab5f755447e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 13 Jun 2023 06:21:40 +0000 Subject: [PATCH 097/165] fluidd: 1.24.0 -> 1.24.1 --- pkgs/applications/misc/fluidd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/fluidd/default.nix b/pkgs/applications/misc/fluidd/default.nix index 3599785b736c..00e53d3a82e3 100644 --- a/pkgs/applications/misc/fluidd/default.nix +++ b/pkgs/applications/misc/fluidd/default.nix @@ -2,12 +2,12 @@ stdenvNoCC.mkDerivation rec { pname = "fluidd"; - version = "1.24.0"; + version = "1.24.1"; src = fetchurl { name = "fluidd-v${version}.zip"; url = "https://github.com/cadriel/fluidd/releases/download/v${version}/fluidd.zip"; - sha256 = "sha256-2J5SVEtlLhZhDzqakOh/gt8XTkSaM9KBa0zCYM4UZAQ="; + sha256 = "sha256-iTh8vU6NrJZLyUdeY1wegUue0NIHQtpCEr9pJnC2Wx4="; }; nativeBuildInputs = [ unzip ]; From 6e7a9f522dfbf6d8d7d24a3de435138f45e790bd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 13 Jun 2023 06:34:53 +0000 Subject: [PATCH 098/165] orbiton: 2.62.1 -> 2.62.3 --- pkgs/applications/editors/orbiton/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/orbiton/default.nix b/pkgs/applications/editors/orbiton/default.nix index 878c587e5abd..5c08af915d97 100644 --- a/pkgs/applications/editors/orbiton/default.nix +++ b/pkgs/applications/editors/orbiton/default.nix @@ -4,13 +4,13 @@ buildGoModule rec { pname = "orbiton"; - version = "2.62.1"; + version = "2.62.3"; src = fetchFromGitHub { owner = "xyproto"; repo = "orbiton"; rev = "v${version}"; - hash = "sha256-viJlbBzV6zA/RbdF6kTNbER3ECayqS9hIns60kOa47c="; + hash = "sha256-/zIAF3LqOeIN91o33vntkBtQnESJhEDBljGPbMZvelc="; }; vendorHash = null; From cd587988357f3db3af8e8b66d6b3995cc39c849f Mon Sep 17 00:00:00 2001 From: Icy-Thought Date: Tue, 13 Jun 2023 08:18:21 +0200 Subject: [PATCH 099/165] upscayl: init at 2.5.5 --- .../applications/graphics/upscayl/default.nix | 42 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 44 insertions(+) create mode 100644 pkgs/applications/graphics/upscayl/default.nix diff --git a/pkgs/applications/graphics/upscayl/default.nix b/pkgs/applications/graphics/upscayl/default.nix new file mode 100644 index 000000000000..f4ec256aecb8 --- /dev/null +++ b/pkgs/applications/graphics/upscayl/default.nix @@ -0,0 +1,42 @@ +{ + appimageTools, + fetchurl, + lib, +}: let + pname = "upscayl"; + version = "2.5.5"; + + src = fetchurl { + url = "https://github.com/upscayl/upscayl/releases/download/v${version}/upscayl-${version}-linux.AppImage"; + hash = "sha256-qpLxOGphR9iHvtb8AZZaMict/g8wLkL7Dhr4mt3LZdk="; + }; + + appimageContents = appimageTools.extractType2 { + inherit pname version src; + }; +in + appimageTools.wrapType2 { + inherit pname version src; + + extraPkgs = pkgs: with pkgs; [vulkan-headers vulkan-loader]; + + extraInstallCommands = '' + mkdir -p $out/share/{applications,pixmaps} + + cp ${appimageContents}/${pname}.desktop $out/share/applications/${pname}.desktop + cp ${appimageContents}/${pname}.png $out/share/pixmaps/${pname}.png + + mv $out/bin/${pname}-${version} $out/bin/${pname} + + substituteInPlace $out/share/applications/${pname}.desktop \ + --replace 'Exec=AppRun --no-sandbox %U' 'Exec=${pname}' + ''; + + meta = with lib; { + description = "Free and Open Source AI Image Upscaler"; + homepage = "https://upscayl.github.io/"; + maintainers = with maintainers; [icy-thought]; + license = licenses.agpl3Only; + platforms = platforms.linux; + }; + } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e26435ed865e..7d6c1f6b99c0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27984,6 +27984,8 @@ with pkgs; upower = callPackage ../os-specific/linux/upower { }; + upscayl = callPackage ../applications/graphics/upscayl { }; + usbguard = callPackage ../os-specific/linux/usbguard { }; usbguard-notifier = callPackage ../os-specific/linux/usbguard-notifier { }; From 2ad18c3c7cccc04f7f8180184f0ed7031fe5a2d0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 13 Jun 2023 09:32:56 +0200 Subject: [PATCH 100/165] python311Packages.aiobiketrax: 0.5.0 -> 1.0.0 Diff: https://github.com/basilfx/aiobiketrax/compare/refs/tags/v0.5.0...v1.0.0 Changelog: https://github.com/basilfx/aiobiketrax/blob/v1.0.0/CHANGELOG.md --- pkgs/development/python-modules/aiobiketrax/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiobiketrax/default.nix b/pkgs/development/python-modules/aiobiketrax/default.nix index 399f499b380c..ab357dc61856 100644 --- a/pkgs/development/python-modules/aiobiketrax/default.nix +++ b/pkgs/development/python-modules/aiobiketrax/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "aiobiketrax"; - version = "0.5.0"; + version = "1.0.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "basilfx"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-exxpJJA+JnVuehCnWs/ihk/SSPUqV7ODXZxvbmuHe8U="; + hash = "sha256-lMgD315movmr+u+8BMaqhb1L46Wf0Ak56VAT2jpg1kM="; }; postPatch = '' From d154f62fc7e8406c6fa9a6c849de89b8042930a7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 13 Jun 2023 09:33:44 +0200 Subject: [PATCH 101/165] python311Packages.aiooss2: 0.2.5 -> 0.2.6 Diff: https://github.com/karajan1001/aiooss2/compare/refs/tags/0.2.5...0.2.6 Changelog: https://github.com/karajan1001/aiooss2/blob/0.2.6/CHANGES.txt --- pkgs/development/python-modules/aiooss2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiooss2/default.nix b/pkgs/development/python-modules/aiooss2/default.nix index e1f5758377e1..03aa8543ffbe 100644 --- a/pkgs/development/python-modules/aiooss2/default.nix +++ b/pkgs/development/python-modules/aiooss2/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "aiooss2"; - version = "0.2.5"; + version = "0.2.6"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "karajan1001"; repo = "aiooss2"; rev = "refs/tags/${version}"; - hash = "sha256-NYr8i5OAYRaRnDkNmnw1IWXnSp7HAovNaSV79xcwyHo="; + hash = "sha256-VVfDH9QWF9gBhd2pOjKH5+VdNSvl1q0iauAbo88wNaM="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From c56085fc3e9c05848c454d0b4fd98b642a071c40 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 13 Jun 2023 10:00:08 +0200 Subject: [PATCH 102/165] checkov: 2.3.285 -> 2.3.288 Diff: https://github.com/bridgecrewio/checkov/compare/refs/tags/2.3.285...2.3.288 Changelog: https://github.com/bridgecrewio/checkov/releases/tag/2.3.288 --- pkgs/development/tools/analysis/checkov/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index a10b051952aa..ca7e0ff61ca8 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -22,14 +22,14 @@ with py.pkgs; buildPythonApplication rec { pname = "checkov"; - version = "2.3.285"; + version = "2.3.288"; format = "setuptools"; src = fetchFromGitHub { owner = "bridgecrewio"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-e451r8md6HOOhEIsjFitQ0IGacQ6bhA/jBFmaz/zVv8="; + hash = "sha256-m/AZfHT9ZW4K82WHxlj1iddh+Na4+Rvwgl46fdHRVhA="; }; patches = [ From 48b45dbfda3ce446b9a28ad06e855166f92b344f Mon Sep 17 00:00:00 2001 From: kilianar Date: Tue, 13 Jun 2023 10:06:20 +0200 Subject: [PATCH 103/165] calibre: 6.20.0 -> 6.21.0 https://github.com/kovidgoyal/calibre/releases/tag/v6.21.0 --- pkgs/applications/misc/calibre/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index 39f5ac401c6d..f24c4432dd5b 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -32,11 +32,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "calibre"; - version = "6.20.0"; + version = "6.21.0"; src = fetchurl { url = "https://download.calibre-ebook.com/${finalAttrs.version}/calibre-${finalAttrs.version}.tar.xz"; - hash = "sha256-1X7folCrXzNwSCWnepD9MFW9Ujx+PwoK0ih+zgEtA7o="; + hash = "sha256-gGgXnJbGbp6uK9tFK6wqHBKf+zWidF5u5wI2lclrJGk="; }; # https://sources.debian.org/patches/calibre/${finalAttrs.version}+dfsg-1 From d0ef16f091a3af95dc0dccb20b8bc44919df0bcf Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Tue, 13 Jun 2023 08:09:05 +0000 Subject: [PATCH 104/165] d2: 0.4.2 -> 0.5.1 --- pkgs/tools/text/d2/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/text/d2/default.nix b/pkgs/tools/text/d2/default.nix index efddd0ab6c79..839e36bba8f4 100644 --- a/pkgs/tools/text/d2/default.nix +++ b/pkgs/tools/text/d2/default.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "d2"; - version = "0.4.2"; + version = "0.5.1"; src = fetchFromGitHub { owner = "terrastruct"; repo = pname; rev = "v${version}"; - hash = "sha256-kfpCu79lJUxPvxSKplRziVnDyohY8xnxnO3ZoG2WgEs="; + hash = "sha256-Oq6bJ/cX+kDyVUVP/RpCIcNeWpT3HESUMmR6mEi9X4Q="; }; - vendorHash = "sha256-oPI6FPfBIPKZDLoyGblcG5UcmoFWufZ2NIEClpSIJzU="; + vendorHash = "sha256-SocBC/1LrdSQNfcNVa9nnPaq/UvLVIghHlUSJB7ImBk="; excludedPackages = [ "./e2etests" ]; From 3a86958c974bc3a03c32ab33ecfc0ec9498c7869 Mon Sep 17 00:00:00 2001 From: Jenny Date: Tue, 13 Jun 2023 10:15:05 +0200 Subject: [PATCH 105/165] prometheus-junos-czerwonk-exporter: init at 0.10.1 + module (#235433) --- .../monitoring/prometheus/exporters.nix | 1 + .../prometheus/exporters/junos-czerwonk.nix | 72 +++++++++++++++++++ .../prometheus/junos-czerwonk-exporter.nix | 22 ++++++ pkgs/top-level/all-packages.nix | 1 + 4 files changed, 96 insertions(+) create mode 100644 nixos/modules/services/monitoring/prometheus/exporters/junos-czerwonk.nix create mode 100644 pkgs/servers/monitoring/prometheus/junos-czerwonk-exporter.nix diff --git a/nixos/modules/services/monitoring/prometheus/exporters.nix b/nixos/modules/services/monitoring/prometheus/exporters.nix index 235296168934..501f126e1a30 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters.nix @@ -40,6 +40,7 @@ let "ipmi" "json" "jitsi" + "junos-czerwonk" "kea" "keylight" "knot" diff --git a/nixos/modules/services/monitoring/prometheus/exporters/junos-czerwonk.nix b/nixos/modules/services/monitoring/prometheus/exporters/junos-czerwonk.nix new file mode 100644 index 000000000000..15e0c9ecb177 --- /dev/null +++ b/nixos/modules/services/monitoring/prometheus/exporters/junos-czerwonk.nix @@ -0,0 +1,72 @@ +{ config, lib, pkgs, options }: + +with lib; + +let + cfg = config.services.prometheus.exporters.junos-czerwonk; + + configFile = if cfg.configuration != null then configurationFile else (escapeShellArg cfg.configurationFile); + + configurationFile = pkgs.writeText "prometheus-junos-czerwonk-exporter.conf" (builtins.toJSON (cfg.configuration)); +in +{ + port = 9326; + extraOpts = { + environmentFile = mkOption { + type = types.nullOr types.str; + default = null; + description = lib.mdDoc '' + File containing env-vars to be substituted into the exporter's config. + ''; + }; + configurationFile = mkOption { + type = types.nullOr types.path; + default = null; + description = lib.mdDoc '' + Specify the JunOS exporter configuration file to use. + ''; + }; + configuration = mkOption { + type = types.nullOr types.attrs; + default = null; + description = lib.mdDoc '' + JunOS exporter configuration as nix attribute set. Mutually exclusive with the `configurationFile` option. + ''; + example = { + devices = [ + { + host = "router1"; + key_file = "/path/to/key"; + } + ]; + }; + }; + telemetryPath = mkOption { + type = types.str; + default = "/metrics"; + description = lib.mdDoc '' + Path under which to expose metrics. + ''; + }; + }; + serviceOpts = { + serviceConfig = { + DynamicUser = false; + EnvironmentFile = mkIf (cfg.environmentFile != null) [ cfg.environmentFile ]; + RuntimeDirectory = "prometheus-junos-czerwonk-exporter"; + ExecStartPre = [ + "${pkgs.writeShellScript "subst-secrets-junos-czerwonk-exporter" '' + umask 0077 + ${pkgs.envsubst}/bin/envsubst -i ${configFile} -o ''${RUNTIME_DIRECTORY}/junos-exporter.json + ''}" + ]; + ExecStart = '' + ${pkgs.prometheus-junos-czerwonk-exporter}/bin/junos_exporter \ + -web.listen-address ${cfg.listenAddress}:${toString cfg.port} \ + -web.telemetry-path ${cfg.telemetryPath} \ + -config.file ''${RUNTIME_DIRECTORY}/junos-exporter.json \ + ${concatStringsSep " \\\n " cfg.extraFlags} + ''; + }; + }; +} diff --git a/pkgs/servers/monitoring/prometheus/junos-czerwonk-exporter.nix b/pkgs/servers/monitoring/prometheus/junos-czerwonk-exporter.nix new file mode 100644 index 000000000000..2abf5ace252a --- /dev/null +++ b/pkgs/servers/monitoring/prometheus/junos-czerwonk-exporter.nix @@ -0,0 +1,22 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "junos-czerwonk-exporter"; + version = "0.10.1"; + + src = fetchFromGitHub { + owner = "czerwonk"; + repo = "junos_exporter"; + rev = "${version}"; + sha256 = "sha256-XYISwq6xcVKhXUK6j22pQ5eOfuKNH0uXOEK1MUzSq90="; + }; + + vendorSha256 = "sha256-IV0FZb1rjOMLf+vkzz/ZxUBMFD8VRDS51Wdud/yz32E="; + + meta = with lib; { + description = "Exporter for metrics from devices running JunOS"; + homepage = "https://github.com/czerwonk/junos_exporter"; + license = licenses.mit; + maintainers = with maintainers; [ netali ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index feaa33a9a89e..8a8235dfb668 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26247,6 +26247,7 @@ with pkgs; prometheus-jitsi-exporter = callPackage ../servers/monitoring/prometheus/jitsi-exporter.nix { }; prometheus-jmx-httpserver = callPackage ../servers/monitoring/prometheus/jmx-httpserver.nix { }; prometheus-json-exporter = callPackage ../servers/monitoring/prometheus/json-exporter.nix { }; + prometheus-junos-czerwonk-exporter = callPackage ../servers/monitoring/prometheus/junos-czerwonk-exporter.nix { }; prometheus-kea-exporter = callPackage ../servers/monitoring/prometheus/kea-exporter.nix { }; prometheus-keylight-exporter = callPackage ../servers/monitoring/prometheus/keylight-exporter.nix { }; prometheus-knot-exporter = callPackage ../servers/monitoring/prometheus/knot-exporter.nix { }; From 390f3e17e0982f78e0cb6a7a3d59aeffc719ee68 Mon Sep 17 00:00:00 2001 From: Jacob Moody Date: Fri, 26 May 2023 20:40:45 -0600 Subject: [PATCH 106/165] maintainers: add moody --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 283f289a1389..b7f8fa9425e7 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -10811,6 +10811,12 @@ fingerprint = "6460 4147 C434 F65E C306 A21F 135E EDD0 F719 34F3"; }]; }; + moody = { + email = "moody@posixcafe.org"; + github = "majiru"; + githubId = 3579600; + name = "Jacob Moody"; + }; moosingin3space = { email = "moosingin3space@gmail.com"; github = "moosingin3space"; From 7005cdfa529ce62445a2229632e0d101f7578bf3 Mon Sep 17 00:00:00 2001 From: Jacob Moody Date: Fri, 26 May 2023 20:46:32 -0600 Subject: [PATCH 107/165] grafanaPlugins.grafana-clickhouse-datasource: init at 3.1.0 --- .../grafana-clickhouse-datasource/default.nix | 19 ++++++++++++++++ .../grafana/plugins/grafana-plugin.nix | 22 ++++++++++++------- .../monitoring/grafana/plugins/plugins.nix | 1 + 3 files changed, 34 insertions(+), 8 deletions(-) create mode 100644 pkgs/servers/monitoring/grafana/plugins/grafana-clickhouse-datasource/default.nix diff --git a/pkgs/servers/monitoring/grafana/plugins/grafana-clickhouse-datasource/default.nix b/pkgs/servers/monitoring/grafana/plugins/grafana-clickhouse-datasource/default.nix new file mode 100644 index 000000000000..4d4f0516e304 --- /dev/null +++ b/pkgs/servers/monitoring/grafana/plugins/grafana-clickhouse-datasource/default.nix @@ -0,0 +1,19 @@ +{ grafanaPlugin, lib }: + +grafanaPlugin rec { + pname = "grafana-clickhouse-datasource"; + version = "3.1.0"; + zipHash = { + x86_64-linux = "sha256-x/Uruhk7mhPbsfAcST6tLnxJDd4vlqIkOUI4nAOZN50="; + aarch64-linux = "sha256-nNAIKoXYyhT1fwSB/a+uD1XUe5RxE9MYrbtHHx6T1fI="; + x86_64-darwin = "sha256-u9KRR7k/ktMu1KO5tpN/A+x48yDyXXPEnSNEx0hkT8Y="; + aarch64-darwin = "sha256-ME/LkVXoN1Sp4L3e9qFXgBfa7mCLRyKfEGHiBbaN8iY="; + }; + meta = with lib; { + description = "Connects Grafana to ClickHouse"; + license = licenses.asl20; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + maintainers = with maintainers; [ moody yuka ]; + platforms = attrNames zipHash; + }; +} diff --git a/pkgs/servers/monitoring/grafana/plugins/grafana-plugin.nix b/pkgs/servers/monitoring/grafana/plugins/grafana-plugin.nix index 3b3cee88fd7a..25a381e2a8fa 100644 --- a/pkgs/servers/monitoring/grafana/plugins/grafana-plugin.nix +++ b/pkgs/servers/monitoring/grafana/plugins/grafana-plugin.nix @@ -1,14 +1,20 @@ -{ stdenvNoCC, fetchurl, unzip }: +{ stdenvNoCC, fetchurl, unzip, lib }: { pname, version, zipHash, meta ? {}, passthru ? {}, ... }@args: -stdenvNoCC.mkDerivation ({ +let plat = stdenvNoCC.targetPlatform.system; in stdenvNoCC.mkDerivation ({ inherit pname version; - src = fetchurl { - name = "${pname}-${version}.zip"; - url = "https://grafana.com/api/plugins/${pname}/versions/${version}/download"; - hash = zipHash; - }; + src = (fetchurl { + name = "${pname}-${version}-${plat}.zip"; + hash = if lib.isAttrs zipHash then zipHash.${plat} or (throw "unsupported system") else zipHash; + url = "https://grafana.com/api/plugins/${pname}/versions/${version}/download" + + { + x86_64-linux = "?os=linux&arch=amd64"; + aarch64-linux = "?os=linux&arch=arm64"; + x86_64-darwin = "?os=darwin&arch=amd64"; + aarch64-darwin = "?os=darwin&arch=arm64"; + }.${plat} or (throw "unknown system"); + }); nativeBuildInputs = [ unzip ]; @@ -25,4 +31,4 @@ stdenvNoCC.mkDerivation ({ meta = { homepage = "https://grafana.com/grafana/plugins/${pname}"; } // meta; -} // (builtins.removeAttrs args [ "pname" "version" "sha256" "meta" ])) +} // (builtins.removeAttrs args [ "zipHash" "pname" "version" "sha256" "meta" ])) diff --git a/pkgs/servers/monitoring/grafana/plugins/plugins.nix b/pkgs/servers/monitoring/grafana/plugins/plugins.nix index 163de4c96025..8bbd738f7ab9 100644 --- a/pkgs/servers/monitoring/grafana/plugins/plugins.nix +++ b/pkgs/servers/monitoring/grafana/plugins/plugins.nix @@ -6,6 +6,7 @@ doitintl-bigquery-datasource = callPackage ./doitintl-bigquery-datasource { }; grafadruid-druid-datasource = callPackage ./grafadruid-druid-datasource { }; + grafana-clickhouse-datasource = callPackage ./grafana-clickhouse-datasource { }; grafana-clock-panel = callPackage ./grafana-clock-panel { }; grafana-piechart-panel = callPackage ./grafana-piechart-panel { }; grafana-polystat-panel = callPackage ./grafana-polystat-panel { }; From 313b938d21ad04e882dfdd4ed920518d243d922e Mon Sep 17 00:00:00 2001 From: DarkOnion0 Date: Tue, 13 Jun 2023 08:44:12 +0200 Subject: [PATCH 108/165] drawio: 21.2.8 -> 21.3.7 --- pkgs/applications/graphics/drawio/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/graphics/drawio/default.nix b/pkgs/applications/graphics/drawio/default.nix index a46706a74721..4379fc1cf8ea 100644 --- a/pkgs/applications/graphics/drawio/default.nix +++ b/pkgs/applications/graphics/drawio/default.nix @@ -14,19 +14,19 @@ stdenv.mkDerivation rec { pname = "drawio"; - version = "21.2.8"; + version = "21.3.7"; src = fetchFromGitHub { owner = "jgraph"; repo = "drawio-desktop"; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-XXtAd29r161rcamZM8QnkJ9mhQeJvqTL4Escdu95me8="; + hash = "sha256-f8QQA8qehB7wYJRoKizPxewBTVV64kxaBg2oTTNelBU="; }; offlineCache = fetchYarnDeps { yarnLock = src + "/yarn.lock"; - hash = "sha256-H77BfiH3Nqi1a2Uek8N8BgODzMBGgXrBvrcahrKisNo="; + hash = "sha256-gLt6a2Kq1LIzFiSnqLKKFTg8sd3Wrqsdys23SCFcrQ0="; }; nativeBuildInputs = [ From 3aada931469e7656f6287c2b081455a967c6b659 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 13 Jun 2023 08:57:32 +0000 Subject: [PATCH 109/165] nsd: 4.6.1 -> 4.7.0 --- pkgs/servers/dns/nsd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/dns/nsd/default.nix b/pkgs/servers/dns/nsd/default.nix index 228fc367bef9..7420aa339946 100644 --- a/pkgs/servers/dns/nsd/default.nix +++ b/pkgs/servers/dns/nsd/default.nix @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { pname = "nsd"; - version = "4.6.1"; + version = "4.7.0"; src = fetchurl { url = "https://www.nlnetlabs.nl/downloads/${pname}/${pname}-${version}.tar.gz"; - sha256 = "sha256-P2CjoT7D9o6Ev6fhna/2Y8grzx3pbk9T8iRlJedzono="; + sha256 = "sha256-j6ykTima0pFfoACIerFjJjHqaHCcYs418RC/5yHs8hQ="; }; prePatch = '' From cf3969fe0f87d6dbb3cb55df267d8b8a0bfccca1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 13 Jun 2023 09:08:51 +0000 Subject: [PATCH 110/165] json2tsv: 1.0 -> 1.1 --- pkgs/development/tools/json2tsv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/json2tsv/default.nix b/pkgs/development/tools/json2tsv/default.nix index 9f074fd8b2e5..49d0812eba44 100644 --- a/pkgs/development/tools/json2tsv/default.nix +++ b/pkgs/development/tools/json2tsv/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "json2tsv"; - version = "1.0"; + version = "1.1"; src = fetchurl { url = "https://codemadness.org/releases/json2tsv/json2tsv-${version}.tar.gz"; - hash = "sha256-BOamDWszYDqKGdKOlAOLY7F9ScZaBJXNdhz38iYW3ps="; + hash = "sha256-7r5+YoZVivCqDbfFUqTB/x41DrZi7GZRVcJhGZCpw0o="; }; postPatch = '' From 96ce8d59649f20c21b01f146bcd6b37aa14cd59e Mon Sep 17 00:00:00 2001 From: Yureka Date: Tue, 13 Jun 2023 11:10:28 +0200 Subject: [PATCH 111/165] grafanaPlugins.grafanaPlugin: add platform only when multiple zipHash are specified (#237513) --- .../grafana/plugins/grafana-plugin.nix | 29 ++++++++++++------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/pkgs/servers/monitoring/grafana/plugins/grafana-plugin.nix b/pkgs/servers/monitoring/grafana/plugins/grafana-plugin.nix index 25a381e2a8fa..7894e759b168 100644 --- a/pkgs/servers/monitoring/grafana/plugins/grafana-plugin.nix +++ b/pkgs/servers/monitoring/grafana/plugins/grafana-plugin.nix @@ -4,17 +4,24 @@ let plat = stdenvNoCC.targetPlatform.system; in stdenvNoCC.mkDerivation ({ inherit pname version; - src = (fetchurl { - name = "${pname}-${version}-${plat}.zip"; - hash = if lib.isAttrs zipHash then zipHash.${plat} or (throw "unsupported system") else zipHash; - url = "https://grafana.com/api/plugins/${pname}/versions/${version}/download" + - { - x86_64-linux = "?os=linux&arch=amd64"; - aarch64-linux = "?os=linux&arch=arm64"; - x86_64-darwin = "?os=darwin&arch=amd64"; - aarch64-darwin = "?os=darwin&arch=arm64"; - }.${plat} or (throw "unknown system"); - }); + src = if lib.isAttrs zipHash then + fetchurl { + name = "${pname}-${version}-${plat}.zip"; + hash = zipHash.${plat} or (throw "unsupported system"); + url = "https://grafana.com/api/plugins/${pname}/versions/${version}/download" + { + x86_64-linux = "?os=linux&arch=amd64"; + aarch64-linux = "?os=linux&arch=arm64"; + x86_64-darwin = "?os=darwin&arch=amd64"; + aarch64-darwin = "?os=darwin&arch=arm64"; + }.${plat} or (throw "unknown system"); + } + else + fetchurl { + name = "${pname}-${version}.zip"; + hash = zipHash; + url = "https://grafana.com/api/plugins/${pname}/versions/${version}/download"; + } + ; nativeBuildInputs = [ unzip ]; From 315f2062961332d914e82c990e5741df7f3eac90 Mon Sep 17 00:00:00 2001 From: Icy-Thought Date: Tue, 13 Jun 2023 11:10:55 +0200 Subject: [PATCH 112/165] upscayl: license updated to agpl3Plus --- pkgs/applications/graphics/upscayl/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/graphics/upscayl/default.nix b/pkgs/applications/graphics/upscayl/default.nix index f4ec256aecb8..84d33fa741ae 100644 --- a/pkgs/applications/graphics/upscayl/default.nix +++ b/pkgs/applications/graphics/upscayl/default.nix @@ -36,7 +36,7 @@ in description = "Free and Open Source AI Image Upscaler"; homepage = "https://upscayl.github.io/"; maintainers = with maintainers; [icy-thought]; - license = licenses.agpl3Only; + license = licenses.agpl3Plus; platforms = platforms.linux; }; } From 21cae119c6315fa60f9af5327f035aa0fbff013c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 13 Jun 2023 09:42:01 +0000 Subject: [PATCH 113/165] phpunit: 10.2.1 -> 10.2.2 --- pkgs/development/tools/misc/phpunit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/phpunit/default.nix b/pkgs/development/tools/misc/phpunit/default.nix index f15c8cc43bb6..1944b3d73adc 100644 --- a/pkgs/development/tools/misc/phpunit/default.nix +++ b/pkgs/development/tools/misc/phpunit/default.nix @@ -2,14 +2,14 @@ let pname = "phpunit"; - version = "10.2.1"; + version = "10.2.2"; in stdenv.mkDerivation { inherit pname version; src = fetchurl { url = "https://phar.phpunit.de/phpunit-${version}.phar"; - hash = "sha256-gmxcr+WIQw/SeEvJpSFLKOuTb36qUe6WdlVWIq5tClo="; + hash = "sha256-UAxqywIMrP42Nul0GV6mkKkXtnS7ah9rl4y1ykpJsxM="; }; dontUnpack = true; From 01ca892c98118145a3c88e4131cb82dbfd19be7b Mon Sep 17 00:00:00 2001 From: Kirill Radzikhovskyy Date: Tue, 13 Jun 2023 14:20:42 +1000 Subject: [PATCH 114/165] python3Packages.polars: 0.17.11 -> 0.18.0 --- .../python-modules/polars/Cargo.lock | 398 +++++++----------- .../python-modules/polars/default.nix | 11 +- 2 files changed, 158 insertions(+), 251 deletions(-) diff --git a/pkgs/development/python-modules/polars/Cargo.lock b/pkgs/development/python-modules/polars/Cargo.lock index ee02705f3555..cb2615304449 100644 --- a/pkgs/development/python-modules/polars/Cargo.lock +++ b/pkgs/development/python-modules/polars/Cargo.lock @@ -86,8 +86,9 @@ dependencies = [ [[package]] name = "arrow2" -version = "0.17.0" -source = "git+https://github.com/ritchie46/arrow2?branch=polars_2023-04-29#0a711a1a371edba0fa0f18c61e16bbf8096a3dcc" +version = "0.17.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "15ae0428d69ab31d7b2adad22a752d6f11fef2e901d2262d0cad4f5cb08b7093" dependencies = [ "ahash", "arrow-format", @@ -104,8 +105,6 @@ dependencies = [ "futures", "getrandom", "hash_hasher", - "indexmap", - "json-deserializer", "lexical-core", "lz4", "multiversion", @@ -139,7 +138,7 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ "proc-macro2", "quote", - "syn 2.0.15", + "syn 2.0.16", ] [[package]] @@ -150,7 +149,7 @@ checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842" dependencies = [ "proc-macro2", "quote", - "syn 2.0.15", + "syn 2.0.16", ] [[package]] @@ -184,9 +183,9 @@ dependencies = [ [[package]] name = "base64" -version = "0.21.0" +version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a4ddaa51a5bc52a6948f74c06d20aaaddb71924eab79b8c97a8c556e942d6a" +checksum = "3f1e31e207a6b8fb791a38ea3105e6cb541f55e4d029902d3039a4ad07cc4105" [[package]] name = "bitflags" @@ -228,9 +227,9 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.12.0" +version = "3.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535" +checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1" [[package]] name = "bytemuck" @@ -249,15 +248,9 @@ checksum = "fdde5c9cd29ebd706ce1b35600920a33550e402fc998a2e53ad3b42c3c47a192" dependencies = [ "proc-macro2", "quote", - "syn 2.0.15", + "syn 2.0.16", ] -[[package]] -name = "byteorder" -version = "1.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" - [[package]] name = "bytes" version = "1.4.0" @@ -331,9 +324,9 @@ dependencies = [ [[package]] name = "ciborium" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0c137568cc60b904a7724001b35ce2630fd00d5d84805fbb608ab89509d788f" +checksum = "effd91f6c78e5a4ace8a5d3c0b6bfaec9e2baaef55f3efc00e45fb2e477ee926" dependencies = [ "ciborium-io", "ciborium-ll", @@ -342,30 +335,20 @@ dependencies = [ [[package]] name = "ciborium-io" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "346de753af073cc87b52b2083a506b38ac176a44cfb05497b622e27be899b369" +checksum = "cdf919175532b369853f5d5e20b26b43112613fd6fe7aee757e35f7a44642656" [[package]] name = "ciborium-ll" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "213030a2b5a4e0c0892b6652260cf6ccac84827b83a85a534e178e3906c4cf1b" +checksum = "defaa24ecc093c77630e6c15e17c51f5e187bf35ee514f4e2d67baaa96dae22b" dependencies = [ "ciborium-io", "half", ] -[[package]] -name = "codespan-reporting" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e" -dependencies = [ - "termcolor", - "unicode-width", -] - [[package]] name = "comfy-table" version = "6.1.4" @@ -486,60 +469,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "ctor" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd4056f63fce3b82d852c3da92b08ea59959890813a7f4ce9c0ff85b10cf301b" -dependencies = [ - "quote", - "syn 2.0.15", -] - -[[package]] -name = "cxx" -version = "1.0.94" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f61f1b6389c3fe1c316bf8a4dccc90a38208354b330925bce1f74a6c4756eb93" -dependencies = [ - "cc", - "cxxbridge-flags", - "cxxbridge-macro", - "link-cplusplus", -] - -[[package]] -name = "cxx-build" -version = "1.0.94" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12cee708e8962df2aeb38f594aae5d827c022b6460ac71a7a3e2c3c2aae5a07b" -dependencies = [ - "cc", - "codespan-reporting", - "once_cell", - "proc-macro2", - "quote", - "scratch", - "syn 2.0.15", -] - -[[package]] -name = "cxxbridge-flags" -version = "1.0.94" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7944172ae7e4068c533afbb984114a56c46e9ccddda550499caa222902c7f7bb" - -[[package]] -name = "cxxbridge-macro" -version = "1.0.94" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2345488264226bf682893e25de0769f3360aac9957980ec49361b083ddaa5bc5" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.15", -] - [[package]] name = "dyn-clone" version = "1.0.11" @@ -584,9 +513,9 @@ checksum = "95765f67b4b18863968b4a1bd5bb576f732b29a4a28c7cd84c09fa3e2875f33c" [[package]] name = "flate2" -version = "1.0.25" +version = "1.0.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8a2db397cb1c8772f31494cb8917e48cd1e64f0fa7efac59fbd741a0a8ce841" +checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743" dependencies = [ "crc32fast", "miniz_oxide", @@ -672,7 +601,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn 2.0.15", + "syn 2.0.16", ] [[package]] @@ -705,15 +634,6 @@ dependencies = [ "slab", ] -[[package]] -name = "fxhash" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c" -dependencies = [ - "byteorder", -] - [[package]] name = "getrandom" version = "0.2.9" @@ -735,7 +655,7 @@ checksum = "e77ac7b51b8e6313251737fcef4b1c01a2ea102bde68415b62c0ee9268fec357" dependencies = [ "proc-macro2", "quote", - "syn 2.0.15", + "syn 2.0.16", ] [[package]] @@ -765,11 +685,10 @@ checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7" [[package]] name = "halfbrown" -version = "0.1.18" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e2a3c70a9c00cc1ee87b54e89f9505f73bb17d63f1b25c9a462ba8ef885444f" +checksum = "f985624e90f861184145c13b736873a0f83cdb998a292dbb0653598ab03aecbf" dependencies = [ - "fxhash", "hashbrown 0.13.2", "serde", ] @@ -819,11 +738,11 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" [[package]] name = "home" -version = "0.5.4" +version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "747309b4b440c06d57b0b25f2aee03ee9b5e5397d288c60e21fc709bb98a7408" +checksum = "5444c27eef6923071f7ebcc33e3444508466a76f7a2b93da00ed6e19f30c1ddb" dependencies = [ - "winapi", + "windows-sys 0.48.0", ] [[package]] @@ -842,12 +761,11 @@ dependencies = [ [[package]] name = "iana-time-zone-haiku" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0703ae284fc167426161c2e3f1da3ea71d94b21bedbcc9494e92b28e334e3dca" +checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" dependencies = [ - "cxx", - "cxx-build", + "cc", ] [[package]] @@ -888,11 +806,10 @@ dependencies = [ [[package]] name = "inventory" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7741301a6d6a9b28ce77c0fb77a4eb116b6bc8f3bef09923f7743d059c4157d3" +checksum = "e0539b5de9241582ce6bd6b0ba7399313560151e58c9aaf8b74b711b1bdce644" dependencies = [ - "ctor", "ghost", ] @@ -939,22 +856,13 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.61" +version = "0.3.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "445dde2150c55e483f3d8416706b97ec8e8237c307e5b7b4b8dd15e6af2a0730" +checksum = "2f37a4a5928311ac501dee68b3c7613a1037d0edb30c8e5427bd832d55d1b790" dependencies = [ "wasm-bindgen", ] -[[package]] -name = "json-deserializer" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f63b421e16eb4100beb677af56f0b4f3a4f08bab74ef2af079ce5bb92c2683f" -dependencies = [ - "indexmap", -] - [[package]] name = "jsonpath_lib" version = "0.3.0" @@ -1040,15 +948,15 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.142" +version = "0.2.144" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a987beff54b60ffa6d51982e1aa1146bc42f19bd26be28b0586f252fccf5317" +checksum = "2b00cc1c228a6782d0f076e7b232802e0c5689d41bb5df366f2a6b6621cfdfe1" [[package]] name = "libflate" -version = "1.3.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97822bf791bd4d5b403713886a5fbe8bf49520fe78e323b0dc480ca1a03e50b0" +checksum = "5ff4ae71b685bbad2f2f391fe74f6b7659a34871c08b210fdc039e43bee07d18" dependencies = [ "adler32", "crc32fast", @@ -1078,15 +986,15 @@ dependencies = [ [[package]] name = "libm" -version = "0.2.6" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "348108ab3fba42ec82ff6e9564fc4ca0247bdccdc68dd8af9764bbc79c3c8ffb" +checksum = "f7012b1bbb0719e1097c47611d3898568c546d597c2e74d66f6087edd5233ff4" [[package]] name = "libmimalloc-sys" -version = "0.1.32" +version = "0.1.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43a558e3d911bc3c7bfc8c78bc580b404d6e51c1cefbf656e176a94b49b0df40" +checksum = "f4ac0e912c8ef1b735e92369695618dc5b1819f5a7bf3f167301a3ba1cea515e" dependencies = [ "cc", "libc", @@ -1094,9 +1002,9 @@ dependencies = [ [[package]] name = "libz-sys" -version = "1.1.8" +version = "1.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9702761c3935f8cc2f101793272e202c72b99da8f4224a19ddcf1279a6450bbf" +checksum = "56ee889ecc9568871456d42f603d6a0ce59ff328d291063a45cbdf0036baf6db" dependencies = [ "cc", "libc", @@ -1104,15 +1012,6 @@ dependencies = [ "vcpkg", ] -[[package]] -name = "link-cplusplus" -version = "1.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecd207c9c713c34f95a097a5b029ac2ce6010530c7b49d7fea24d977dede04f5" -dependencies = [ - "cc", -] - [[package]] name = "lock_api" version = "0.4.9" @@ -1154,10 +1053,11 @@ dependencies = [ [[package]] name = "matrixmultiply" -version = "0.3.3" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb99c395ae250e1bf9133673f03ca9f97b7e71b705436bf8f089453445d1e9fe" +checksum = "090126dc04f95dc0d1c1c91f61bdd474b3930ca064c1edc8a849da2c6cbe1e77" dependencies = [ + "autocfg", "rawpointer", ] @@ -1187,18 +1087,18 @@ dependencies = [ [[package]] name = "mimalloc" -version = "0.1.36" +version = "0.1.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d88dad3f985ec267a3fcb7a1726f5cb1a7e8cad8b646e70a84f967210df23da" +checksum = "4e2894987a3459f3ffb755608bd82188f8ed00d0ae077f1edea29c068d639d98" dependencies = [ "libmimalloc-sys", ] [[package]] name = "miniz_oxide" -version = "0.6.2" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa" +checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" dependencies = [ "adler", ] @@ -1212,14 +1112,14 @@ dependencies = [ "libc", "log", "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys", + "windows-sys 0.45.0", ] [[package]] name = "multiversion" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6a87eede2251ca235e5573086d01d2ab6b59dfaea54c2be10f9320980f7e8f7" +checksum = "8cda45dade5144c2c929bf2ed6c24bebbba784e9198df049ec87d722b9462bd1" dependencies = [ "multiversion-macros", "target-features", @@ -1227,9 +1127,9 @@ dependencies = [ [[package]] name = "multiversion-macros" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1af1abf82261d780d114014eff4b555e47d823f3b84f893c4388572b40e089fb" +checksum = "04bffdccbd4798b61dce08c97ce8c66a68976f95541aaf284a6e90c1d1c306e1" dependencies = [ "proc-macro2", "quote", @@ -1373,7 +1273,7 @@ dependencies = [ "libc", "redox_syscall", "smallvec", - "windows-sys", + "windows-sys 0.45.0", ] [[package]] @@ -1471,9 +1371,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "pkg-config" -version = "0.3.26" +version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160" +checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" [[package]] name = "planus" @@ -1486,7 +1386,7 @@ dependencies = [ [[package]] name = "polars" -version = "0.28.0" +version = "0.30.0" dependencies = [ "getrandom", "polars-core", @@ -1500,7 +1400,7 @@ dependencies = [ [[package]] name = "polars-algo" -version = "0.28.0" +version = "0.30.0" dependencies = [ "polars-core", "polars-lazy", @@ -1509,9 +1409,10 @@ dependencies = [ [[package]] name = "polars-arrow" -version = "0.28.0" +version = "0.30.0" dependencies = [ "arrow2", + "atoi", "chrono", "chrono-tz", "hashbrown 0.13.2", @@ -1524,7 +1425,7 @@ dependencies = [ [[package]] name = "polars-core" -version = "0.28.0" +version = "0.30.0" dependencies = [ "ahash", "arrow2", @@ -1557,7 +1458,7 @@ dependencies = [ [[package]] name = "polars-error" -version = "0.28.0" +version = "0.30.0" dependencies = [ "arrow2", "regex", @@ -1566,7 +1467,7 @@ dependencies = [ [[package]] name = "polars-io" -version = "0.28.0" +version = "0.30.0" dependencies = [ "ahash", "arrow2", @@ -1587,6 +1488,7 @@ dependencies = [ "polars-arrow", "polars-core", "polars-error", + "polars-json", "polars-time", "polars-utils", "rayon", @@ -1598,9 +1500,25 @@ dependencies = [ "tokio", ] +[[package]] +name = "polars-json" +version = "0.30.0" +dependencies = [ + "ahash", + "arrow2", + "fallible-streaming-iterator", + "hashbrown 0.13.2", + "indexmap", + "num-traits", + "polars-arrow", + "polars-error", + "polars-utils", + "simd-json", +] + [[package]] name = "polars-lazy" -version = "0.28.0" +version = "0.30.0" dependencies = [ "ahash", "bitflags", @@ -1609,6 +1527,7 @@ dependencies = [ "polars-arrow", "polars-core", "polars-io", + "polars-json", "polars-ops", "polars-pipe", "polars-plan", @@ -1621,7 +1540,7 @@ dependencies = [ [[package]] name = "polars-ops" -version = "0.28.0" +version = "0.30.0" dependencies = [ "argminmax", "arrow2", @@ -1632,6 +1551,7 @@ dependencies = [ "memchr", "polars-arrow", "polars-core", + "polars-json", "polars-utils", "serde", "serde_json", @@ -1640,7 +1560,7 @@ dependencies = [ [[package]] name = "polars-pipe" -version = "0.28.0" +version = "0.30.0" dependencies = [ "crossbeam-channel", "crossbeam-queue", @@ -1660,7 +1580,7 @@ dependencies = [ [[package]] name = "polars-plan" -version = "0.28.0" +version = "0.30.0" dependencies = [ "ahash", "arrow2", @@ -1682,7 +1602,7 @@ dependencies = [ [[package]] name = "polars-row" -version = "0.28.0" +version = "0.30.0" dependencies = [ "arrow2", "polars-error", @@ -1691,7 +1611,7 @@ dependencies = [ [[package]] name = "polars-sql" -version = "0.28.0" +version = "0.30.0" dependencies = [ "polars-arrow", "polars-core", @@ -1704,7 +1624,7 @@ dependencies = [ [[package]] name = "polars-time" -version = "0.28.0" +version = "0.30.0" dependencies = [ "arrow2", "atoi", @@ -1723,8 +1643,10 @@ dependencies = [ [[package]] name = "polars-utils" -version = "0.28.0" +version = "0.30.0" dependencies = [ + "ahash", + "hashbrown 0.13.2", "once_cell", "rayon", "smartstring", @@ -1739,16 +1661,16 @@ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] name = "proc-macro2" -version = "1.0.56" +version = "1.0.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b63bdb0cd06f1f4dedf69b254734f9b45af66e4a031e42a7480257d9898b435" +checksum = "fa1fb82fc0c281dd9671101b66b771ebbe1eaf967b96ac8740dcba4b70005ca8" dependencies = [ "unicode-ident", ] [[package]] name = "py-polars" -version = "0.17.11" +version = "0.18.0" dependencies = [ "ahash", "built", @@ -1840,9 +1762,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.26" +version = "1.0.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc" +checksum = "8f4f29d145265ec1c483c7c654450edde0bfe043d3938d6972630663356d9500" dependencies = [ "proc-macro2", ] @@ -1926,13 +1848,13 @@ dependencies = [ [[package]] name = "regex" -version = "1.8.0" +version = "1.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac6cf59af1067a3fb53fbe5c88c053764e930f932be1d71d3ffe032cbe147f59" +checksum = "d1a59b5d8e97dee33696bf13c5ba8ab85341c002922fba050069326b9c498974" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.7.0", + "regex-syntax 0.7.2", ] [[package]] @@ -1943,9 +1865,9 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "regex-syntax" -version = "0.7.0" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6868896879ba532248f33598de5181522d8b3d9d724dfd230911e1a7d4822f5" +checksum = "436b050e76ed2903236f032a59761c1eb99e1b0aead2c257922771dab1fc8c78" [[package]] name = "rle-decode-fast" @@ -1986,12 +1908,6 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" -[[package]] -name = "scratch" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1792db035ce95be60c3f8853017b3999209281c24e2ba5bc8e59bf97a0c590c1" - [[package]] name = "semver" version = "1.0.17" @@ -2009,22 +1925,22 @@ checksum = "e6b44e8fc93a14e66336d230954dda83d18b4605ccace8fe09bc7514a71ad0bc" [[package]] name = "serde" -version = "1.0.160" +version = "1.0.163" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb2f3770c8bce3bcda7e149193a069a0f4365bda1fa5cd88e03bca26afc1216c" +checksum = "2113ab51b87a539ae008b5c6c02dc020ffa39afd2d83cffcb3f4eb2722cebec2" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.160" +version = "1.0.163" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "291a097c63d8497e00160b166a967a4a79c64f3facdd01cbd7502231688d77df" +checksum = "8c805777e3930c8883389c602315a24224bcc738b63905ef87cd1420353ea93e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.15", + "syn 2.0.16", ] [[package]] @@ -2071,11 +1987,14 @@ dependencies = [ [[package]] name = "simd-json" -version = "0.7.0" -source = "git+https://github.com/ritchie46/simd-json?branch=alignment#cbd37361769d900620944618a39123f37edf3d83" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b001e6c10fcba79ac15990241d37c3f8c6ba4f9a14ee35fcebc0c067514b83a" dependencies = [ + "ahash", "halfbrown", "lexical-core", + "once_cell", "serde", "serde_json", "simdutf8", @@ -2139,9 +2058,9 @@ dependencies = [ [[package]] name = "sqlparser" -version = "0.30.0" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db67dc6ef36edb658196c3fef0464a80b53dbbc194a904e81f9bd4190f9ecc5b" +checksum = "37d3706eefb17039056234df6b566b0014f303f867f2656108334a55b8096f59" dependencies = [ "log", ] @@ -2205,9 +2124,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.15" +version = "2.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a34fcf3e8b60f57e6a14301a2e916d323af98b0ea63c599441eec8558660c822" +checksum = "a6f671d4b5ffdb8eadec19c0ae67fe2639df8684bd7bc4b83d986b8db549cf01" dependencies = [ "proc-macro2", "quote", @@ -2216,9 +2135,9 @@ dependencies = [ [[package]] name = "sysinfo" -version = "0.28.4" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4c2f3ca6693feb29a89724516f016488e9aafc7f37264f898593ee4b942f31b" +checksum = "02f1dc6930a439cc5d154221b5387d153f8183529b07c19aca24ea31e0a167e1" dependencies = [ "cfg-if", "core-foundation-sys", @@ -2230,24 +2149,15 @@ dependencies = [ [[package]] name = "target-features" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24840de800c1707d75c800893dbd727a5e1501ce921944e602f0698167491e36" +checksum = "06f6b473c37f9add4cf1df5b4d66a8ef58ab6c895f1a3b3f949cf3e21230140e" [[package]] name = "target-lexicon" -version = "0.12.6" +version = "0.12.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ae9980cab1db3fceee2f6c6f643d5d8de2997c58ee8d25fb0cc8a9e9e7348e5" - -[[package]] -name = "termcolor" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" -dependencies = [ - "winapi-util", -] +checksum = "fd1ba337640d60c3e96bc6f0638a939b9c9a7f2c316a1598c279828b3d1dc8c5" [[package]] name = "thiserror" @@ -2266,7 +2176,7 @@ checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.15", + "syn 2.0.16", ] [[package]] @@ -2297,16 +2207,16 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.27.0" +version = "1.28.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0de47a4eecbe11f498978a9b29d792f0d2692d1dd003650c24c76510e3bc001" +checksum = "0aa32867d44e6f2ce3385e89dceb990188b8bb0fb25b0cf576647a6f98ac5105" dependencies = [ "autocfg", "libc", "mio", "pin-project-lite", "socket2", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] @@ -2364,9 +2274,9 @@ dependencies = [ [[package]] name = "value-trait" -version = "0.5.1" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "995de1aa349a0dc50f4aa40870dce12961a30229027230bad09acd2843edbe9e" +checksum = "09a5b6c8ceb01263b969cac48d4a6705134d490ded13d889e52c0cfc80c6945e" dependencies = [ "float-cmp", "halfbrown", @@ -2400,9 +2310,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.84" +version = "0.2.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31f8dcbc21f30d9b8f2ea926ecb58f6b91192c17e9d33594b3df58b2007ca53b" +checksum = "5bba0e8cb82ba49ff4e229459ff22a191bbe9a1cb3a341610c9c33efc27ddf73" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -2410,24 +2320,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.84" +version = "0.2.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95ce90fd5bcc06af55a641a86428ee4229e44e07033963a2290a8e241607ccb9" +checksum = "19b04bc93f9d6bdee709f6bd2118f57dd6679cf1176a1af464fca3ab0d66d8fb" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.16", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.34" +version = "0.4.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f219e0d211ba40266969f6dbdd90636da12f75bee4fc9d6c23d1260dadb51454" +checksum = "2d1985d03709c53167ce907ff394f5316aa22cb4e12761295c5dc57dacb6297e" dependencies = [ "cfg-if", "js-sys", @@ -2437,9 +2347,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.84" +version = "0.2.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c21f77c0bedc37fd5dc21f897894a5ca01e7bb159884559461862ae90c0b4c5" +checksum = "14d6b024f1a526bb0234f52840389927257beb670610081360e5a03c5df9c258" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -2447,22 +2357,22 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.84" +version = "0.2.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6" +checksum = "e128beba882dd1eb6200e1dc92ae6c5dbaa4311aa7bb211ca035779e5efc39f8" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.16", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.84" +version = "0.2.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d" +checksum = "ed9d5b4305409d1fc9482fee2d7f9bcbf24b3972bf59817ef757e23982242a93" [[package]] name = "wasm-timer" @@ -2481,9 +2391,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.61" +version = "0.3.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e33b99f4b23ba3eec1a53ac264e35a755f00e966e0065077d6027c0f575b0b97" +checksum = "3bdd9ef4e984da1187bf8110c5cf5b845fbc87a23602cdf912386a76fcd3a7c2" dependencies = [ "js-sys", "wasm-bindgen", @@ -2505,15 +2415,6 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" -[[package]] -name = "winapi-util" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" -dependencies = [ - "winapi", -] - [[package]] name = "winapi-x86_64-pc-windows-gnu" version = "0.4.0" @@ -2538,6 +2439,15 @@ dependencies = [ "windows-targets 0.42.2", ] +[[package]] +name = "windows-sys" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +dependencies = [ + "windows-targets 0.48.0", +] + [[package]] name = "windows-targets" version = "0.42.2" diff --git a/pkgs/development/python-modules/polars/default.nix b/pkgs/development/python-modules/polars/default.nix index 264b7a28b4da..49d23e2d07e0 100644 --- a/pkgs/development/python-modules/polars/default.nix +++ b/pkgs/development/python-modules/polars/default.nix @@ -10,12 +10,12 @@ }: let pname = "polars"; - version = "0.17.11"; + version = "0.18.0"; # Can't update to >0.18.0 until we get rust 1.71 rootSource = fetchFromGitHub { owner = "pola-rs"; repo = "polars"; rev = "refs/tags/py-${version}"; - hash = "sha256-zNp/77an9daUfHQ+HCaHtZzaq0TT9F+8aH3abrF7+YA="; + hash = "sha256-uzo8KPEegaVuzrfKUmsHheQfmm9hVMgkNJMWdfqDrw8="; }; in buildPythonPackage { @@ -28,16 +28,14 @@ buildPythonPackage { # thus the `sed` command # Make sure to check that the right substitutions are made when updating the package preBuild = '' - cd py-polars - #sed -i 's/version = "0.17.11"/version = "${version}"/g' Cargo.lock + cd py-polars + #sed -i 's/version = "0.18.0"/version = "${version}"/g' Cargo.lock ''; cargoDeps = rustPlatform.importCargoLock { lockFile = ./Cargo.lock; outputHashes = { - "arrow2-0.17.0" = "sha256-jjrwTP+ZKem9lyrmAWJ+t9cZBkGqAR1VlgNFXDtx1LA="; "jsonpath_lib-0.3.0" = "sha256-NKszYpDGG8VxfZSMbsTlzcMGFHBOUeFojNw4P2wM3qk="; - "simd-json-0.7.0" = "sha256-tlz6my4vhUQIArPonJml8zIyk1sbbDSORKp3cmPUUSI="; }; }; cargoRoot = "py-polars"; @@ -66,7 +64,6 @@ buildPythonPackage { # ]; meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64); description = "Fast multi-threaded DataFrame library in Rust | Python | Node.js "; homepage = "https://github.com/pola-rs/polars"; license = licenses.asl20; From 3fc89747ed3abb658cef013c3345b22f4ed99b2e Mon Sep 17 00:00:00 2001 From: gruve-p Date: Tue, 13 Jun 2023 11:52:14 +0200 Subject: [PATCH 115/165] groestlcoin: 24.0.1 -> 25.0 (#236499) --- pkgs/applications/blockchains/groestlcoin/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/blockchains/groestlcoin/default.nix b/pkgs/applications/blockchains/groestlcoin/default.nix index bcc25cf2460a..6e7cb1d58cd3 100644 --- a/pkgs/applications/blockchains/groestlcoin/default.nix +++ b/pkgs/applications/blockchains/groestlcoin/default.nix @@ -32,13 +32,13 @@ let in stdenv.mkDerivation rec { pname = if withGui then "groestlcoin" else "groestlcoind"; - version = "24.0.1"; + version = "25.0"; src = fetchFromGitHub { owner = "Groestlcoin"; repo = "groestlcoin"; rev = "v${version}"; - sha256 = "0k14y3iv5l26r820wzkwqxi67kwh26i0yq20ffd72shicjs1d3qc"; + sha256 = "03w5n3qjha63mgj7zk8q17x5j63la3i4li7bf5i1yw59ijqpmnqg"; }; nativeBuildInputs = [ autoreconfHook pkg-config ] diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 560c4dc74ebe..9bb2c80d05f2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -36031,6 +36031,7 @@ with pkgs; go-exploitdb = callPackage ../tools/security/go-exploitdb { }; groestlcoin = libsForQt5.callPackage ../applications/blockchains/groestlcoin { + stdenv = darwin.apple_sdk_11_0.stdenv; boost = boost17x; withGui = true; inherit (darwin) autoSignDarwinBinariesHook; From 765f4885a490cf5831c01aab05322c52e35e3dc7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 13 Jun 2023 09:58:30 +0000 Subject: [PATCH 116/165] scala-cli: 1.0.0 -> 1.0.1 --- .../tools/build-managers/scala-cli/sources.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/build-managers/scala-cli/sources.json b/pkgs/development/tools/build-managers/scala-cli/sources.json index 5db0e341f35c..031d71a7babd 100644 --- a/pkgs/development/tools/build-managers/scala-cli/sources.json +++ b/pkgs/development/tools/build-managers/scala-cli/sources.json @@ -1,21 +1,21 @@ { - "version": "1.0.0", + "version": "1.0.1", "assets": { "aarch64-darwin": { "asset": "scala-cli-aarch64-apple-darwin.gz", - "sha256": "0lkgfcbwmrrxvdyi76zgj2mbz6nyzc0raq4sd1lcyiyavnr3mxgq" + "sha256": "0n6jlxbfw21ck1qg2xzkrp0p4hlvr21cxfp3p27svp01104n6ig8" }, "aarch64-linux": { "asset": "scala-cli-aarch64-pc-linux.gz", - "sha256": "1z7i2jq8lrrnw4wj78xb5c49nrbilr3yi1mda9vanssdy8x27ybh" + "sha256": "05rmxi7nwxkvx6as6sbfvrsyll2lp06iq77z22glkkv8y1dd6334" }, "x86_64-darwin": { "asset": "scala-cli-x86_64-apple-darwin.gz", - "sha256": "1qgqp0cybijbz4nryrsb1x48kf0sja35rvmv1skg8m6ld7hwkn9s" + "sha256": "1vsjp3sdnclx5w4bv1kzkk23q848374phlx3ix0qln04ih821q0l" }, "x86_64-linux": { "asset": "scala-cli-x86_64-pc-linux.gz", - "sha256": "0z94spyx8x9p0jzaq90vm6yrycyvfi11w1lpv9fzlwldpzk50lq8" + "sha256": "1904f2z3hvkl2rmj0czk5qkw9327zqf5m8i4ad0bzyrri5q7q4ki" } } } From 0d910a46f163bbf71042854d0990951139870e10 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 13 Jun 2023 10:07:04 +0000 Subject: [PATCH 117/165] slint-lsp: 1.0.0 -> 1.0.2 --- pkgs/development/tools/misc/slint-lsp/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/slint-lsp/default.nix b/pkgs/development/tools/misc/slint-lsp/default.nix index fcbe98003151..7ece35e9c94e 100644 --- a/pkgs/development/tools/misc/slint-lsp/default.nix +++ b/pkgs/development/tools/misc/slint-lsp/default.nix @@ -25,14 +25,14 @@ let in rustPlatform.buildRustPackage rec { pname = "slint-lsp"; - version = "1.0.0"; + version = "1.0.2"; src = fetchCrate { inherit pname version; - sha256 = "sha256-Ua8ENLxmfYv6zF/uihT49ZpphFaC3zS882cttJ/rvc4="; + sha256 = "sha256-KSpfi8hXMz5A5ra+oxOmKieKpjCTB565JDNrRwtIwxU="; }; - cargoHash = "sha256-IzjOAy9zTtsD4jHjI1oVXBg7Si1AeDNH8ATK4yO8WVw="; + cargoHash = "sha256-tmbJBxQoXpHmBJI1z42Kg1XrZ+9+DE5nLmkIp5cWCF4="; nativeBuildInputs = [ cmake pkg-config fontconfig ]; buildInputs = rpathLibs ++ [ xorg.libxcb.dev ] From dcd514dd239615af6fa20e4fe235a2d3e77c785e Mon Sep 17 00:00:00 2001 From: Kirill Radzikhovskyy Date: Tue, 13 Jun 2023 20:19:10 +1000 Subject: [PATCH 118/165] python3Packages.dask-image: unmark broken on aarch64-linux --- pkgs/development/python-modules/dask-image/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/python-modules/dask-image/default.nix b/pkgs/development/python-modules/dask-image/default.nix index 16a496ad2c3b..e73d33004447 100644 --- a/pkgs/development/python-modules/dask-image/default.nix +++ b/pkgs/development/python-modules/dask-image/default.nix @@ -45,7 +45,6 @@ buildPythonPackage rec { ]; meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64); description = "Distributed image processing"; homepage = "https://github.com/dask/dask-image"; license = licenses.bsdOriginal; From 1f48cb45e88af957e05d2b0a50c5a6460e6899c7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 13 Jun 2023 10:49:10 +0000 Subject: [PATCH 119/165] gpxsee: 13.3 -> 13.4 --- pkgs/applications/misc/gpxsee/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/gpxsee/default.nix b/pkgs/applications/misc/gpxsee/default.nix index 85b83674edb9..694323df82d9 100644 --- a/pkgs/applications/misc/gpxsee/default.nix +++ b/pkgs/applications/misc/gpxsee/default.nix @@ -22,13 +22,13 @@ let in stdenv.mkDerivation rec { pname = "gpxsee"; - version = "13.3"; + version = "13.4"; src = fetchFromGitHub { owner = "tumic0"; repo = "GPXSee"; rev = version; - hash = "sha256-eJ5jW81GQr/MvOrxinZdalZ4cvGYlVGv7JbePwHGEDY="; + hash = "sha256-Zf2eyDx5QK69W6HNz/IGGHkX2qCDnxYsU8KLCgU9teY="; }; patches = (substituteAll { From 30dbe2195975b933e7f54dc11bb91567184e92b7 Mon Sep 17 00:00:00 2001 From: oluceps Date: Tue, 13 Jun 2023 15:36:09 +0800 Subject: [PATCH 120/165] intel-one-mono: 1.2.0 -> 1.2.1 Co-authored-by: drupol --- pkgs/data/fonts/intel-one-mono/default.nix | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/pkgs/data/fonts/intel-one-mono/default.nix b/pkgs/data/fonts/intel-one-mono/default.nix index c7e5ab5ae29a..1708534c6377 100644 --- a/pkgs/data/fonts/intel-one-mono/default.nix +++ b/pkgs/data/fonts/intel-one-mono/default.nix @@ -1,17 +1,17 @@ -{ lib, stdenvNoCC, fetchurl, unzip}: +{ lib, stdenvNoCC, fetchurl, unzip }: -stdenvNoCC.mkDerivation rec { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "intel-one-mono"; - version = "1.2.0"; + version = "1.2.1"; srcs = [ (fetchurl { - url = "https://github.com/intel/intel-one-mono/releases/download/V${version}/otf.zip"; - sha256 = "sha256-VnXIaW77dRXvXB1Vr01xRQDMECltwzF/RMqGgAWnu5M="; - }) + url = "https://github.com/intel/intel-one-mono/releases/download/V${finalAttrs.version}/otf.zip"; + hash = "sha256-RBJwIUkmAZIRaIEWUxFZlRMfFTUFdLbHCMRkagU0gU0="; + }) (fetchurl { - url = "https://github.com/intel/intel-one-mono/releases/download/V${version}/ttf.zip"; - sha256 = "sha256-kaz0DePeO8nvKVonYJhs5f2+ps/5Xo5psjg1hoxzaiU="; + url = "https://github.com/intel/intel-one-mono/releases/download/V${finalAttrs.version}/ttf.zip"; + hash = "sha256-DV/PT+P+GGq/ejS5cx5ENuCy+iiE32AMOirwuTCP3vY="; }) ]; @@ -31,9 +31,9 @@ stdenvNoCC.mkDerivation rec { meta = with lib; { description = "Intel One Mono, an expressive monospaced font family that’s built with clarity, legibility, and the needs of developers in mind"; homepage = "https://github.com/intel/intel-one-mono"; - changelog = "https://github.com/intel/intel-one-mono/releases/tag/V${version}"; + changelog = "https://github.com/intel/intel-one-mono/releases/tag/V${finalAttrs.version}"; license = licenses.ofl; - maintainers = [ maintainers.simoneruffini]; + maintainers = [ maintainers.simoneruffini ]; platforms = platforms.all; }; -} +}) From 5e79209f108bccf7e9615fe7cd0773ebbc55d7f7 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 13 Jun 2023 03:53:41 -0700 Subject: [PATCH 121/165] bgpq4: 1.9 -> 1.10 (#237532) --- pkgs/tools/networking/bgpq4/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/bgpq4/default.nix b/pkgs/tools/networking/bgpq4/default.nix index aa7d9727fb89..8c9d1513b285 100644 --- a/pkgs/tools/networking/bgpq4/default.nix +++ b/pkgs/tools/networking/bgpq4/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "bgpq4"; - version = "1.9"; + version = "1.10"; src = fetchFromGitHub { owner = "bgp"; repo = pname; rev = version; - sha256 = "sha256-9uFfE3rUQCYbWhtJuRQT9FHf9YeD4THkj/OCp9f1MwI="; + sha256 = "sha256-h67c8c6CI1lJRu9Eiz3/Ax/MrgU/TPIAdLrLcSDF6zY="; }; nativeBuildInputs = [ From e715b1e7780b5bbc4ab669ca01735332a693bf12 Mon Sep 17 00:00:00 2001 From: Yaya Date: Tue, 13 Jun 2023 09:48:01 +0000 Subject: [PATCH 122/165] gitlab: 16.0.2 -> 16.0.4 https://gitlab.com/gitlab-org/gitlab/-/blob/v16.0.4-ee/CHANGELOG.md --- .../applications/version-management/gitlab/data.json | 12 ++++++------ .../version-management/gitlab/gitaly/default.nix | 4 ++-- .../gitlab/gitlab-pages/default.nix | 4 ++-- .../gitlab/gitlab-workhorse/default.nix | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json index 82996fe58857..3a84e60d8fa5 100644 --- a/pkgs/applications/version-management/gitlab/data.json +++ b/pkgs/applications/version-management/gitlab/data.json @@ -1,14 +1,14 @@ { - "version": "16.0.2", - "repo_hash": "sha256-qAwO/5eyyYdpwSUg3lC8jOFoBc8H6yhgiHUbx+Ww6Uc=", + "version": "16.0.4", + "repo_hash": "sha256-xJWu0Ybrde+/hdOAvnOXIgzjzI++y3cZj85Ay3jLweI=", "yarn_hash": "0yy04jnfvn5dgciqd105xiwg7chjwp3w6iqbjpylak9h82ci6wlh", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v16.0.2-ee", + "rev": "v16.0.4-ee", "passthru": { - "GITALY_SERVER_VERSION": "16.0.2", - "GITLAB_PAGES_VERSION": "16.0.2", + "GITALY_SERVER_VERSION": "16.0.4", + "GITLAB_PAGES_VERSION": "16.0.4", "GITLAB_SHELL_VERSION": "14.20.0", - "GITLAB_WORKHORSE_VERSION": "16.0.2" + "GITLAB_WORKHORSE_VERSION": "16.0.4" } } diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix index e6dc566d4e10..1d33244f7b66 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -13,7 +13,7 @@ }: let - version = "16.0.2"; + version = "16.0.4"; package_version = "v${lib.versions.major version}"; gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}"; @@ -24,7 +24,7 @@ let owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - sha256 = "sha256-dtGtWV+lfTp9pKipAHx3FUIPaUobiRLsKYbULpuIgRY="; + sha256 = "sha256-173jbi+zJ4Tqgsv14An8gk+HisayCkoIBQW5MdpFZp4="; }; vendorSha256 = "sha256-KBhTI70eReZGSd7RxwGXcUGa0wDo7q5tU9fUhrLeFO0="; diff --git a/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix b/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix index 3be7ff6f2ce2..93f07edcdafa 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "gitlab-pages"; - version = "16.0.2"; + version = "16.0.4"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-pages"; rev = "v${version}"; - sha256 = "sha256-AUX6JIkElYZHjy/RFBVXRb3ZnbWkaNyApZNMT6zsBAU="; + sha256 = "sha256-nBhMwo5fSTaiJm6S1hyJ2KqjWRjtsvf1jhBQcJpDNQw="; }; vendorHash = "sha256-s3HHoz9URACuVVhePQQFviTqlQU7vCLOjTJPBlus1Vo="; diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix index b79b88137ddb..700bb609ff9f 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix @@ -5,7 +5,7 @@ in buildGoModule rec { pname = "gitlab-workhorse"; - version = "16.0.2"; + version = "16.0.4"; src = fetchFromGitLab { owner = data.owner; From 74b0ccd338ef5d361929841a1121b29c043e59d9 Mon Sep 17 00:00:00 2001 From: Yaya Date: Tue, 13 Jun 2023 09:59:21 +0000 Subject: [PATCH 123/165] gitlab: Add link to changelog in update.py --- pkgs/applications/version-management/gitlab/update.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/version-management/gitlab/update.py b/pkgs/applications/version-management/gitlab/update.py index acad2da3dc5b..1abdd9bde0df 100755 --- a/pkgs/applications/version-management/gitlab/update.py +++ b/pkgs/applications/version-management/gitlab/update.py @@ -364,7 +364,7 @@ def commit_container_registry(old_version: str, new_version: str) -> None: "git", "commit", "--message", - f"gitlab-container-registry: {old_version} -> {new_version}", + f"gitlab-container-registry: {old_version} -> {new_version}\n\nhttps://gitlab.com/gitlab-org/container-registry/-/blob/v{new_version}-gitlab/CHANGELOG.md", ], cwd=GITLAB_DIR, ) From 40b63ec92d649effaca76bf0e2b3773f0136f91a Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Tue, 13 Jun 2023 13:04:42 +0200 Subject: [PATCH 124/165] openvscode-server: 1.78.2 -> 1.79.0 --- pkgs/servers/openvscode-server/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/openvscode-server/default.nix b/pkgs/servers/openvscode-server/default.nix index a1c7bcb75553..b49394ab5291 100644 --- a/pkgs/servers/openvscode-server/default.nix +++ b/pkgs/servers/openvscode-server/default.nix @@ -39,13 +39,13 @@ let in stdenv.mkDerivation rec { pname = "openvscode-server"; - version = "1.78.2"; + version = "1.79.0"; src = fetchFromGitHub { owner = "gitpod-io"; repo = "openvscode-server"; rev = "openvscode-server-v${version}"; - sha256 = "sha256-+Q/j3h7ZvNDxrjEk01QUOrVwcwGW4OBBpmfjEtHQj2o="; + hash = "sha256-dVzGyK1ybZywCm602zWJroSCQ2wx5IzV+HqwZUsEgKU="; }; yarnCache = stdenv.mkDerivation { @@ -68,7 +68,7 @@ in stdenv.mkDerivation rec { outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "sha256-XOFBXYP3c4vbvl0/uXsmo8FdO/2PudzJhm9L+9VArdI="; + outputHash = "sha256-P6mzeE3HnS/KoP7kCXJlDkFWkTKiGjJkOUXfGOru/xE="; }; nativeBuildInputs = [ From 90d11579d7cf1fb5fa478b5d0673b263814bc237 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Tue, 13 Jun 2023 13:23:46 +0200 Subject: [PATCH 125/165] doc/release-notes: fix typo --- nixos/doc/manual/release-notes/rl-2305.section.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/doc/manual/release-notes/rl-2305.section.md b/nixos/doc/manual/release-notes/rl-2305.section.md index 259b835a810a..8837b225414c 100644 --- a/nixos/doc/manual/release-notes/rl-2305.section.md +++ b/nixos/doc/manual/release-notes/rl-2305.section.md @@ -201,7 +201,7 @@ In addition to numerous new and updated packages, this release has the following - `graylog` has been updated to version 5, which can not be updated directly from the previously packaged version 3.3. If you had installed the previously packaged version 3.3, please follow the [upgrade path](https://go2docs.graylog.org/5-0/upgrading_graylog/upgrade_path.htm) from 3.3 to 4.0 to 4.3 to 5.0. -- `buildFHSUserEnv` is now called `buildFHSEnv` and uses FlatPak's Bubblewrap sandboxing tool rather than Nixpkgs' own chrootenv. The old chrootenv-based implemenation is still available via `buildFHSEnvChrootenv` but is considered deprecated and will be removed when the remaining uses inside Nixpkgs have been migrated. If your FHSEnv-wrapped application misbehaves when using the new bubblewrap implementation, please create an issue in Nixpkgs. +- `buildFHSUserEnv` is now called `buildFHSEnv` and uses FlatPak's Bubblewrap sandboxing tool rather than Nixpkgs' own chrootenv. The old chrootenv-based implemenation is still available via `buildFHSEnvChroot` but is considered deprecated and will be removed when the remaining uses inside Nixpkgs have been migrated. If your FHSEnv-wrapped application misbehaves when using the new bubblewrap implementation, please create an issue in Nixpkgs. - `nushell` has been updated to at least version 0.77.0, which includes potential breaking changes in aliases. The old aliases are now available as `old-alias` but it is recommended you migrate to the new format. See [Reworked aliases](https://www.nushell.sh/blog/2023-03-14-nushell_0_77.html#reworked-aliases-breaking-changes-kubouch). From 5567e38aed9cc0ff2f63ebbe891a3e374300958f Mon Sep 17 00:00:00 2001 From: wahjava Date: Tue, 13 Jun 2023 13:25:57 +0200 Subject: [PATCH 126/165] goawk: 1.23.2 -> 1.23.3 (#237220) Co-authored-by: Sandro --- pkgs/tools/text/goawk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/goawk/default.nix b/pkgs/tools/text/goawk/default.nix index acbc2eb44dbd..c3b6288ecea3 100644 --- a/pkgs/tools/text/goawk/default.nix +++ b/pkgs/tools/text/goawk/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "goawk"; - version = "1.23.2"; + version = "1.23.3"; src = fetchFromGitHub { owner = "benhoyt"; repo = "goawk"; rev = "v${version}"; - sha256 = "sha256-mrByeZt/EkTbcqcp3eUquKkrz4tReEms1VEla511uQc="; + hash = "sha256-E7oxi0rwVCzA/pBJ9SS6t+zR+J+dF7SW+oP+vXXN2FQ="; }; vendorHash = null; From 8f448271dfe3b0560673bb4667e738fde59488b4 Mon Sep 17 00:00:00 2001 From: Yaya Date: Tue, 13 Jun 2023 13:34:16 +0200 Subject: [PATCH 127/165] gitlab-container-registry: 3.74.0 -> 3.76.0 (#237535) https://gitlab.com/gitlab-org/container-registry/-/blob/v3.76.0-gitlab/CHANGELOG.md --- .../gitlab/gitlab-container-registry/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/gitlab/gitlab-container-registry/default.nix b/pkgs/applications/version-management/gitlab/gitlab-container-registry/default.nix index edd2b0660912..a863726c02ce 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-container-registry/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-container-registry/default.nix @@ -2,14 +2,14 @@ buildGoModule rec { pname = "gitlab-container-registry"; - version = "3.74.0"; + version = "3.76.0"; rev = "v${version}-gitlab"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "container-registry"; inherit rev; - sha256 = "sha256-fwMu45OFfNgFgMyQFWfvmM3Qv+co1ofsZLL44OoW9Wo="; + sha256 = "sha256-A9c7c/CXRs5mYSvDOdHkYOYkl+Qm6M330TBUeTnegBs="; }; vendorHash = "sha256-9rO2GmoFZrNA3Udaktn8Ek9uM8EEoc0I3uv4UEq1c1k="; From d1aab88879f8f723ad9392fc4785906715911521 Mon Sep 17 00:00:00 2001 From: boozedog Date: Sat, 10 Jun 2023 08:46:41 -0400 Subject: [PATCH 128/165] matomo: 4.10.1 -> 4.14.2 --- maintainers/maintainer-list.nix | 7 +++++++ nixos/tests/matomo.nix | 4 ++-- .../web-apps/matomo/change-path-geoip2.patch | 3 ++- pkgs/servers/web-apps/matomo/default.nix | 17 ++++++++--------- 4 files changed, 19 insertions(+), 12 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index b0395c42dcd9..b2399444751a 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2222,6 +2222,13 @@ githubId = 68566724; name = "bootstrap-prime"; }; + boozedog = { + email = "code@booze.dog"; + github = "boozedog"; + githubId = 1410808; + matrix = "@boozedog:matrix.org"; + name = "David A. Buser"; + }; borisbabic = { email = "boris.ivan.babic@gmail.com"; github = "borisbabic"; diff --git a/nixos/tests/matomo.nix b/nixos/tests/matomo.nix index 0e09ad295f95..7dbef63136aa 100644 --- a/nixos/tests/matomo.nix +++ b/nixos/tests/matomo.nix @@ -41,10 +41,10 @@ let in { matomo = matomoTest pkgs.matomo // { name = "matomo"; - meta.maintainers = with maintainers; [ florianjacob kiwi mmilata ]; + meta.maintainers = with maintainers; [ florianjacob kiwi mmilata twey boozedog ]; }; matomo-beta = matomoTest pkgs.matomo-beta // { name = "matomo-beta"; - meta.maintainers = with maintainers; [ florianjacob kiwi mmilata ]; + meta.maintainers = with maintainers; [ florianjacob kiwi mmilata twey boozedog ]; }; } diff --git a/pkgs/servers/web-apps/matomo/change-path-geoip2.patch b/pkgs/servers/web-apps/matomo/change-path-geoip2.patch index c8840db42e7b..0731e64fefd0 100644 --- a/pkgs/servers/web-apps/matomo/change-path-geoip2.patch +++ b/pkgs/servers/web-apps/matomo/change-path-geoip2.patch @@ -1,10 +1,11 @@ --- a/plugins/GeoIp2/config/config.php +++ b/plugins/GeoIp2/config/config.php -@@ -1,5 +1,5 @@ +@@ -1,6 +1,6 @@ DI\string('{path.root}/misc/'), + 'path.geoip2' => PIWIK_USER_PATH . '/misc/', + 'geopip2.ispEnabled' => true ]; \ Pas de fin de ligne à la fin du fichier diff --git a/pkgs/servers/web-apps/matomo/default.nix b/pkgs/servers/web-apps/matomo/default.nix index 57b70abe4669..fbf16151ef10 100644 --- a/pkgs/servers/web-apps/matomo/default.nix +++ b/pkgs/servers/web-apps/matomo/default.nix @@ -3,19 +3,18 @@ let versions = { matomo = { - version = "4.10.1"; - sha256 = "sha256-TN2xy3YHhtuewmi7h9vtMKElRI8uWOvnYzG1RlIGT3U="; + version = "4.14.2"; + hash = "sha256-jPs/4bgt7VqeSoeLnwHr+FI426hAhwiP8RciQDNwCpo="; }; - matomo-beta = { - version = "4.11.0"; + version = "4.14.3"; # `beta` examples: "b1", "rc1", null # when updating: use null if stable version is >= latest beta or release candidate - beta = "rc2"; - sha256 = "sha256-PYzv4OJYI4Zf7LMXQvX7fhvXryS6XPbmA0pTesF1vQ8="; + beta = "b6"; + hash = "sha256-WGyGoTugxHgB2by1F57PQhyqQRjoKBCvwFBZvpsHwZg="; }; }; - common = pname: { version, sha256, beta ? null }: + common = pname: { version, hash, beta ? null }: let fullVersion = version + lib.optionalString (beta != null) "-${toString beta}"; name = "${pname}-${fullVersion}"; @@ -27,7 +26,7 @@ let src = fetchurl { url = "https://builds.matomo.org/matomo-${version}.tar.gz"; - inherit sha256; + inherit hash; }; nativeBuildInputs = [ makeWrapper ]; @@ -109,7 +108,7 @@ let license = licenses.gpl3Plus; homepage = "https://matomo.org/"; platforms = platforms.all; - maintainers = with maintainers; [ florianjacob kiwi sebbel ]; + maintainers = with maintainers; [ florianjacob kiwi sebbel twey boozedog ]; }; }; in From 29e4ed6b2f118e12c20a650e725d2e49c30ed2cc Mon Sep 17 00:00:00 2001 From: Kirill Radzikhovskyy Date: Tue, 13 Jun 2023 20:20:07 +1000 Subject: [PATCH 129/165] python3Packages.wrf-python: unmark broken on aarch64-linux --- pkgs/development/python-modules/wrf-python/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/wrf-python/default.nix b/pkgs/development/python-modules/wrf-python/default.nix index 78b3486c72e6..77d5ea8a4eba 100644 --- a/pkgs/development/python-modules/wrf-python/default.nix +++ b/pkgs/development/python-modules/wrf-python/default.nix @@ -59,6 +59,6 @@ buildPythonPackage rec { homepage = "http://wrf-python.rtfd.org"; license = licenses.asl20; maintainers = with maintainers; [ mhaselsteiner ]; - broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin; + broken = stdenv.isDarwin; }; } From b98c731d4c6bfa848c7011ec4ec6928db61d94b1 Mon Sep 17 00:00:00 2001 From: Yureka Date: Tue, 13 Jun 2023 10:47:02 +0200 Subject: [PATCH 130/165] clickhouse: 23.3.2.37 -> 23.3.3.52 --- pkgs/servers/clickhouse/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/clickhouse/default.nix b/pkgs/servers/clickhouse/default.nix index 758acecc93ec..92955d9d8e91 100644 --- a/pkgs/servers/clickhouse/default.nix +++ b/pkgs/servers/clickhouse/default.nix @@ -19,14 +19,14 @@ stdenv.mkDerivation rec { pname = "clickhouse"; - version = "23.3.2.37"; + version = "23.3.3.52"; src = fetchFromGitHub rec { owner = "ClickHouse"; repo = "ClickHouse"; rev = "v${version}-lts"; fetchSubmodules = true; - hash = "sha256-G/5KZ4vd9w5g0yB6bzyM8VX3l32Di+a6Ll87NK3GOrg="; + hash = "sha256-yeoL3HA1wRDg2+t3FtrM4wBtuu94Lpe4xxGxc09duQI="; name = "clickhouse-${rev}.tar.gz"; postFetch = '' # compress to not exceed the 4GB output limit From a62a74d545e3ebf2d4b84cff2537138ba994fdf9 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Tue, 13 Jun 2023 15:03:21 +0300 Subject: [PATCH 131/165] python310Packages.pulumi: fix hash --- pkgs/tools/admin/pulumi/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/admin/pulumi/default.nix b/pkgs/tools/admin/pulumi/default.nix index 0fea9e35bd29..393fc0d3df20 100644 --- a/pkgs/tools/admin/pulumi/default.nix +++ b/pkgs/tools/admin/pulumi/default.nix @@ -17,7 +17,7 @@ buildGoModule rec { version = "3.69.0"; # Used in pulumi-language packages, which inherit this prop - sdkVendorHash = "sha256-oXsU4h4CwukJHttYLT7JiW2He8Yq5qAwnxL8+G5FIpc="; + sdkVendorHash = "sha256-S8eb2V7ZHhQ0xas+88lwxjL50+22dbyJ0aM60dAtb5k="; src = fetchFromGitHub { owner = pname; From 81fc11e2edc320cfac0d4d2a6cd1cb3a547857ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafael=20Fern=C3=A1ndez=20L=C3=B3pez?= Date: Tue, 13 Jun 2023 14:31:54 +0200 Subject: [PATCH 132/165] unison: use finalAttrs pattern --- pkgs/development/compilers/unison/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/compilers/unison/default.nix b/pkgs/development/compilers/unison/default.nix index 0fd99ac0c375..cd0b7620a607 100644 --- a/pkgs/development/compilers/unison/default.nix +++ b/pkgs/development/compilers/unison/default.nix @@ -4,19 +4,19 @@ , less }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "unison-code-manager"; milestone_id = "M4i"; - version = "1.0.${milestone_id}-alpha"; + version = "1.0.${finalAttrs.milestone_id}-alpha"; src = if (stdenv.isDarwin) then fetchurl { - url = "https://github.com/unisonweb/unison/releases/download/release/${milestone_id}/ucm-macos.tar.gz"; + url = "https://github.com/unisonweb/unison/releases/download/release/${finalAttrs.milestone_id}/ucm-macos.tar.gz"; hash = "sha256-1Qp1SB5rCsVimZzRo1NOX8HBoMEGlIycJPm3zGTUuOw="; } else fetchurl { - url = "https://github.com/unisonweb/unison/releases/download/release/${milestone_id}/ucm-linux.tar.gz"; + url = "https://github.com/unisonweb/unison/releases/download/release/${finalAttrs.milestone_id}/ucm-linux.tar.gz"; hash = "sha256-Qx8vO/Vaz0VdCGXwIwRQIuMlp44hxCroQ7m7Y+m7aXk="; }; @@ -45,4 +45,4 @@ stdenv.mkDerivation rec { platforms = [ "x86_64-darwin" "x86_64-linux" "aarch64-darwin" ]; mainProgram = "ucm"; }; -} +}) From f5c313f2fcd6b5b0695db18d758a010a144fcf51 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Thu, 1 Jun 2023 19:55:40 +0800 Subject: [PATCH 133/165] timeshift: 22.11.2 -> 23.06.2 https://github.com/linuxmint/timeshift/compare/22.11.2...23.06.2 --- .../backup/timeshift/unwrapped.nix | 24 +++++++++---------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/pkgs/applications/backup/timeshift/unwrapped.nix b/pkgs/applications/backup/timeshift/unwrapped.nix index 8e86b35cf7cc..6c2a42923908 100644 --- a/pkgs/applications/backup/timeshift/unwrapped.nix +++ b/pkgs/applications/backup/timeshift/unwrapped.nix @@ -2,9 +2,11 @@ , stdenv , fetchFromGitHub , gettext +, help2man +, meson +, ninja , pkg-config , vala -, which , gtk3 , json-glib , libgee @@ -15,13 +17,13 @@ stdenv.mkDerivation rec { pname = "timeshift"; - version = "22.11.2"; + version = "23.06.2"; src = fetchFromGitHub { owner = "linuxmint"; repo = "timeshift"; rev = version; - sha256 = "yZNERRoNZ1K7BRiAu7sqVQyhghsS/AeZSODMVSm46oY="; + sha256 = "epj0oaV+4lebRxcj6MQ2+lJ3juv9JZ+2UPLRc6UisX4="; }; patches = [ @@ -29,6 +31,8 @@ stdenv.mkDerivation rec { ]; postPatch = '' + substituteInPlace ./files/meson.build \ + --replace "/etc/timeshift" "$out/etc/timeshift" while IFS="" read -r -d $'\0' FILE; do substituteInPlace "$FILE" \ --replace "/sbin/blkid" "${util-linux}/bin/blkid" @@ -42,9 +46,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ gettext + help2man + meson + ninja pkg-config vala - which ]; buildInputs = [ @@ -55,14 +61,6 @@ stdenv.mkDerivation rec { xapp ]; - preBuild = '' - makeFlagsArray+=( \ - "-C" "src" \ - "prefix=$out" \ - "sysconfdir=$out/etc" \ - ) - ''; - meta = with lib; { description = "A system restore tool for Linux"; longDescription = '' @@ -70,7 +68,7 @@ stdenv.mkDerivation rec { Snapshots can be restored using TimeShift installed on the system or from Live CD or USB. ''; homepage = "https://github.com/linuxmint/timeshift"; - license = licenses.gpl3; + license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = with maintainers; [ ShamrockLee bobby285271 ]; }; From 4f73991ab98ec266291996a71ded1081a1ee6e59 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Tue, 13 Jun 2023 15:07:58 +0200 Subject: [PATCH 134/165] openvscode-server: use `finalAttrs` pattern --- pkgs/servers/openvscode-server/default.nix | 79 ++++++++++++++++------ 1 file changed, 60 insertions(+), 19 deletions(-) diff --git a/pkgs/servers/openvscode-server/default.nix b/pkgs/servers/openvscode-server/default.nix index b49394ab5291..17c53a2de8ff 100644 --- a/pkgs/servers/openvscode-server/default.nix +++ b/pkgs/servers/openvscode-server/default.nix @@ -1,13 +1,32 @@ -{ lib, stdenv, fetchFromGitHub, buildGoModule, makeWrapper -, cacert, moreutils, jq, git, pkg-config, yarn, python3 -, esbuild, nodejs, libsecret, xorg, ripgrep -, AppKit, Cocoa, Security, cctools, nixosTests }: +{ lib +, stdenv +, fetchFromGitHub +, buildGoModule +, makeWrapper +, cacert +, moreutils +, jq +, git +, pkg-config +, yarn +, python3 +, esbuild +, nodejs +, libsecret +, xorg +, ripgrep +, AppKit +, Cocoa +, Security +, cctools +, nixosTests +}: let system = stdenv.hostPlatform.system; yarn' = yarn.override { inherit nodejs; }; - defaultYarnOpts = [ "frozen-lockfile" "non-interactive" "no-progress"]; + defaultYarnOpts = [ "frozen-lockfile" "non-interactive" "no-progress" ]; vsBuildTarget = { x86_64-linux = "linux-x64"; @@ -30,27 +49,27 @@ let }; # replaces esbuild's download script with a binary from nixpkgs - patchEsbuild = path : version : '' + patchEsbuild = path: version: '' mkdir -p ${path}/node_modules/esbuild/bin jq "del(.scripts.postinstall)" ${path}/node_modules/esbuild/package.json | sponge ${path}/node_modules/esbuild/package.json sed -i 's/${version}/${esbuild'.version}/g' ${path}/node_modules/esbuild/lib/main.js ln -s -f ${esbuild'}/bin/esbuild ${path}/node_modules/esbuild/bin/esbuild ''; - -in stdenv.mkDerivation rec { +in +stdenv.mkDerivation (finalAttrs: { pname = "openvscode-server"; version = "1.79.0"; src = fetchFromGitHub { owner = "gitpod-io"; repo = "openvscode-server"; - rev = "openvscode-server-v${version}"; + rev = "openvscode-server-v${finalAttrs.version}"; hash = "sha256-dVzGyK1ybZywCm602zWJroSCQ2wx5IzV+HqwZUsEgKU="; }; yarnCache = stdenv.mkDerivation { - name = "${pname}-${version}-${system}-yarn-cache"; - inherit src; + name = "${finalAttrs.pname}-${finalAttrs.version}-${system}-yarn-cache"; + inherit (finalAttrs) src; nativeBuildInputs = [ cacert yarn' git ]; buildPhase = '' export HOME=$PWD @@ -72,13 +91,23 @@ in stdenv.mkDerivation rec { }; nativeBuildInputs = [ - nodejs yarn' python3 pkg-config makeWrapper git jq moreutils + nodejs + yarn' + python3 + pkg-config + makeWrapper + git + jq + moreutils ]; buildInputs = lib.optionals (!stdenv.isDarwin) [ libsecret ] ++ (with xorg; [ libX11 libxkbfile ]) ++ lib.optionals stdenv.isDarwin [ - AppKit Cocoa Security cctools - ]; + AppKit + Cocoa + Security + cctools + ]; patches = [ # Patch out remote download of nodejs from build script @@ -100,19 +129,25 @@ in stdenv.mkDerivation rec { ''; configurePhase = '' + runHook preConfigure + # set default yarn opts ${lib.concatMapStrings (option: '' yarn --offline config set ${option} '') defaultYarnOpts} # set offline mirror to yarn cache we created in previous steps - yarn --offline config set yarn-offline-mirror "${yarnCache}" + yarn --offline config set yarn-offline-mirror "${finalAttrs.yarnCache}" # set nodedir, so we can build binaries later npm config set nodedir "${nodejs}" + + runHook postConfigure ''; buildPhase = '' + runHook preBuild + # install dependencies yarn --offline --ignore-scripts @@ -155,27 +190,33 @@ in stdenv.mkDerivation rec { # build and minify yarn --offline gulp vscode-reh-web-${vsBuildTarget}-min + + runHook postBuild ''; installPhase = '' + runHook preInstall + mkdir -p $out cp -R -T ../vscode-reh-web-${vsBuildTarget} $out ln -s ${nodejs}/bin/node $out + + runHook postInstall ''; passthru.tests = { inherit (nixosTests) openvscode-server; }; - meta = with lib; { + meta = { description = "Run VS Code on a remote machine"; longDescription = '' Run upstream VS Code on a remote machine with access through a modern web browser from any device, anywhere. ''; homepage = "https://github.com/gitpod-io/openvscode-server"; - license = licenses.mit; - maintainers = with maintainers; [ dguenther ghuntley emilytrau ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ dguenther ghuntley emilytrau ]; platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ]; }; -} +}) From e53ae8c894ba6f7f2b68fba3098bcc176f0574f6 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Tue, 13 Jun 2023 16:08:11 +0300 Subject: [PATCH 135/165] scala-cli: set platforms --- pkgs/development/tools/build-managers/scala-cli/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/tools/build-managers/scala-cli/default.nix b/pkgs/development/tools/build-managers/scala-cli/default.nix index 3b509f03c5ff..1ea575013bb0 100644 --- a/pkgs/development/tools/build-managers/scala-cli/default.nix +++ b/pkgs/development/tools/build-managers/scala-cli/default.nix @@ -73,6 +73,7 @@ stdenv.mkDerivation { license = licenses.asl20; description = "Command-line tool to interact with the Scala language"; maintainers = [ maintainers.kubukoz ]; + inherit platforms; }; passthru.updateScript = callPackage ./update.nix { } { inherit platforms pname version; }; From 9ce1accb88516a426a52853bfb6756ba86c835f7 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Tue, 13 Jun 2023 15:08:56 +0200 Subject: [PATCH 136/165] nixos/modules/openvscode-server: fix options --- .../services/web-apps/openvscode-server.nix | 41 ++++++++++--------- 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/nixos/modules/services/web-apps/openvscode-server.nix b/nixos/modules/services/web-apps/openvscode-server.nix index d0db614d8d72..3daf238c57e1 100644 --- a/nixos/modules/services/web-apps/openvscode-server.nix +++ b/nixos/modules/services/web-apps/openvscode-server.nix @@ -4,7 +4,8 @@ let cfg = config.services.openvscode-server; defaultUser = "openvscode-server"; defaultGroup = defaultUser; -in { +in +{ options = { services.openvscode-server = { enable = lib.mkEnableOption (lib.mdDoc "openvscode-server"); @@ -126,12 +127,12 @@ in { }; telemetryLevel = lib.mkOption { - default = "off"; + default = null; example = "crash"; description = lib.mdDoc '' Sets the initial telemetry level. Valid levels are: 'off', 'crash', 'error' and 'all'. ''; - type = lib.types.str; + type = lib.types.nullOr (lib.types.enum [ "off" "crash" "error" "all" ]); }; connectionToken = lib.mkOption { @@ -167,23 +168,23 @@ in { --accept-server-license-terms \ --host=${cfg.host} \ --port=${toString cfg.port} \ - '' + lib.optionalString (cfg.telemetryLevel == true) '' - --telemetry-level=${cfg.telemetryLevel} \ - '' + lib.optionalString (cfg.withoutConnectionToken == true) '' - --without-connection-token \ - '' + lib.optionalString (cfg.socketPath != null) '' - --socket-path=${cfg.socketPath} \ - '' + lib.optionalString (cfg.userDataDir != null) '' - --user-data-dir=${cfg.userDataDir} \ - '' + lib.optionalString (cfg.serverDataDir != null) '' - --server-data-dir=${cfg.serverDataDir} \ - '' + lib.optionalString (cfg.extensionsDir != null) '' - --extensions-dir=${cfg.extensionsDir} \ - '' + lib.optionalString (cfg.connectionToken != null) '' - --connection-token=${cfg.connectionToken} \ - '' + lib.optionalString (cfg.connectionTokenFile != null) '' - --connection-token-file=${cfg.connectionTokenFile} \ - '' + lib.escapeShellArgs cfg.extraArguments; + '' + lib.optionalString (cfg.telemetryLevel != null) '' + --telemetry-level=${cfg.telemetryLevel} \ + '' + lib.optionalString (cfg.withoutConnectionToken) '' + --without-connection-token \ + '' + lib.optionalString (cfg.socketPath != null) '' + --socket-path=${cfg.socketPath} \ + '' + lib.optionalString (cfg.userDataDir != null) '' + --user-data-dir=${cfg.userDataDir} \ + '' + lib.optionalString (cfg.serverDataDir != null) '' + --server-data-dir=${cfg.serverDataDir} \ + '' + lib.optionalString (cfg.extensionsDir != null) '' + --extensions-dir=${cfg.extensionsDir} \ + '' + lib.optionalString (cfg.connectionToken != null) '' + --connection-token=${cfg.connectionToken} \ + '' + lib.optionalString (cfg.connectionTokenFile != null) '' + --connection-token-file=${cfg.connectionTokenFile} \ + '' + lib.escapeShellArgs cfg.extraArguments; ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; RuntimeDirectory = cfg.user; User = cfg.user; From de5750a8236044871f9a3c4567eb42dd9252b5c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Tue, 13 Jun 2023 10:31:52 -0300 Subject: [PATCH 137/165] CODEOWNERS: remove romildo from OCaml --- .github/CODEOWNERS | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index d831893b9018..2aec0fbc6759 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -298,9 +298,9 @@ pkgs/development/python-modules/buildcatrust/ @ajs124 @lukegb @mweinelt /doc/languages-frameworks/javascript.section.md @winterqt # OCaml -/pkgs/build-support/ocaml @romildo @ulrikstrid -/pkgs/development/compilers/ocaml @romildo @ulrikstrid -/pkgs/development/ocaml-modules @romildo @ulrikstrid +/pkgs/build-support/ocaml @ulrikstrid +/pkgs/development/compilers/ocaml @ulrikstrid +/pkgs/development/ocaml-modules @ulrikstrid # ZFS pkgs/os-specific/linux/zfs @raitobezarius From d6843dc8c3cd9f22fdde1c896a889f3e23de7d71 Mon Sep 17 00:00:00 2001 From: necrophcodr Date: Tue, 13 Jun 2023 09:18:02 +0200 Subject: [PATCH 138/165] ironwail: init at 0.7.0 --- pkgs/games/ironwail/default.nix | 91 +++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 93 insertions(+) create mode 100644 pkgs/games/ironwail/default.nix diff --git a/pkgs/games/ironwail/default.nix b/pkgs/games/ironwail/default.nix new file mode 100644 index 000000000000..f55d72c4a40b --- /dev/null +++ b/pkgs/games/ironwail/default.nix @@ -0,0 +1,91 @@ +{ lib +, stdenv +, SDL2 +, fetchurl +, gzip +, libvorbis +, libmad +, flac +, libopus +, opusfile +, libogg +, curl +, libxmp +, vulkan-headers +, vulkan-loader +, copyDesktopItems +, makeDesktopItem +, pkg-config +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "ironwail"; + version = "0.7.0"; + + src = fetchurl { + url = "https://github.com/andrei-drexler/ironwail/archive/refs/tags/v${finalAttrs.version}.tar.gz"; + hash = "sha256-NBG0wwQWqyGWQYJmiLKfxGxpDJLw7Kwf4EnYd33dOpU="; + }; + + sourceRoot = "${finalAttrs.pname}-${finalAttrs.version}/Quake"; + + nativeBuildInputs = [ + copyDesktopItems pkg-config vulkan-headers + gzip libvorbis libmad flac curl libopus + opusfile libogg libxmp vulkan-loader SDL2 + ]; + + buildFlags = [ + "DO_USERDIRS=1" + # Makefile defaults, set here to enforce consistency on Darwin build + "USE_CODEC_WAVE=1" + "USE_CODEC_MP3=1" + "USE_CODEC_VORBIS=1" + "USE_CODEC_FLAC=1" + "USE_CODEC_OPUS=1" + "USE_CODEC_MIKMOD=0" + "USE_CODEC_UMX=0" + "USE_CODEC_XMP=1" + "MP3LIB=mad" + "VORBISLIB=vorbis" + "SDL_CONFIG=sdl2-config" + "USE_SDL2=1" + ]; + + preInstall = '' + mkdir -p "$out/bin" + mkdir -p "$out/share/quake" + substituteInPlace Makefile --replace "cp ironwail.pak /usr/local/games/quake" "cp ironwail.pak $out/share/quake/ironwail.pak" + substituteInPlace Makefile --replace "/usr/local/games" "$out/bin" + ''; + + enableParallelBuilding = true; + + desktopItems = [ + (makeDesktopItem { + name = "ironwail"; + exec = "quake"; + desktopName = "Ironwail"; + categories = [ "Game" ]; + }) + ]; + + meta = { + description = "A fork of the QuakeSpasm engine for iD software's Quake"; + homepage = "https://github.com/andrei-drexler/ironwail"; + longDescription = '' + Ironwail is a fork of QuakeSpasm with focus on high performance instead of + compatibility. + It features the ability to play the 2021 re-release content with no setup + required, a mods menu for quick access to installation of mods, and ease of + switching to installed mods. + It also include various visual features as well as improved limits for playing + larger levels with less performance impacts. + ''; + + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.necrophcodr ]; + mainProgram = "quake"; + }; +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d70cb8570a47..d73bc5cd0dd9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -36795,6 +36795,8 @@ with pkgs; # used as base package for iortcw forks iortcw_sp = callPackage ../games/iortcw/sp.nix { }; + ironwail = callPackage ../games/ironwail { }; + ivan = callPackage ../games/ivan { }; ja2-stracciatella = callPackage ../games/ja2-stracciatella { From e39994d2b9799aa773916f4329fca59a8e66342d Mon Sep 17 00:00:00 2001 From: Dee Anzorge Date: Tue, 13 Jun 2023 00:49:12 +0200 Subject: [PATCH 139/165] qtkeychain: 0.12.0 -> 0.14.1 Changes: https://github.com/frankosterfeld/qtkeychain/blob/0.14.1/ChangeLog --- .../qtkeychain/0002-Fix-install-name-Darwin.patch | 10 ---------- pkgs/development/libraries/qtkeychain/default.nix | 8 +++----- 2 files changed, 3 insertions(+), 15 deletions(-) delete mode 100644 pkgs/development/libraries/qtkeychain/0002-Fix-install-name-Darwin.patch diff --git a/pkgs/development/libraries/qtkeychain/0002-Fix-install-name-Darwin.patch b/pkgs/development/libraries/qtkeychain/0002-Fix-install-name-Darwin.patch deleted file mode 100644 index 30d93cd7bf8b..000000000000 --- a/pkgs/development/libraries/qtkeychain/0002-Fix-install-name-Darwin.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -215,7 +215,6 @@ - VERSION ${QTKEYCHAIN_VERSION} - SOVERSION ${QTKEYCHAIN_SOVERSION} - MACOSX_RPATH 1 -- INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}" - INSTALL_RPATH_USE_LINK_PATH TRUE - ) - diff --git a/pkgs/development/libraries/qtkeychain/default.nix b/pkgs/development/libraries/qtkeychain/default.nix index e06667540719..d87d98090966 100644 --- a/pkgs/development/libraries/qtkeychain/default.nix +++ b/pkgs/development/libraries/qtkeychain/default.nix @@ -12,19 +12,17 @@ stdenv.mkDerivation rec { pname = "qtkeychain"; - version = "0.12.0"; + version = "0.14.1"; src = fetchFromGitHub { owner = "frankosterfeld"; repo = "qtkeychain"; - rev = "v${version}"; - sha256 = "0gi1nx4bcc1vwfw41cif3xi2i59229vy0kc2r5959d8n6yv31kfr"; # v0.9.1 + rev = "${version}"; + sha256 = "sha256-LclYOuIYn+jYCvg69uHFlV3VcZ2KWdr8lFyCSBIB7Kw="; }; dontWrapQtApps = true; - patches = [ ./0002-Fix-install-name-Darwin.patch ]; - cmakeFlags = [ "-DBUILD_WITH_QT6=${if lib.versions.major qtbase.version == "6" then "ON" else "OFF"}" "-DQT_TRANSLATIONS_DIR=share/qt/translations" From 2120f22bafa0e317983bd9cb93ea5c30521cf2ee Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Tue, 13 Jun 2023 17:32:50 +0300 Subject: [PATCH 140/165] chickenPackages: various fixes --- .../compilers/chicken/5/overrides.nix | 64 +++++++++++++------ 1 file changed, 43 insertions(+), 21 deletions(-) diff --git a/pkgs/development/compilers/chicken/5/overrides.nix b/pkgs/development/compilers/chicken/5/overrides.nix index b471dab135bd..e707190adc05 100644 --- a/pkgs/development/compilers/chicken/5/overrides.nix +++ b/pkgs/development/compilers/chicken/5/overrides.nix @@ -17,7 +17,11 @@ let (addPkgConfig old) // (addToPropagatedBuildInputs pkg old); broken = addMetaAttrs { broken = true; }; brokenOnDarwin = addMetaAttrs { broken = stdenv.isDarwin; }; -in { + addToCscOptions = opt: old: { + CSC_OPTIONS = lib.concatStringsSep " " ([ old.CSC_OPTIONS or "" ] ++ lib.toList opt); + }; +in +{ allegro = addToBuildInputsWithPkgConfig ([ pkgs.allegro5 pkgs.libglvnd ] ++ lib.optionals stdenv.isDarwin [ pkgs.darwin.apple_sdk.frameworks.OpenGL ]); breadline = addToBuildInputs pkgs.readline; @@ -35,17 +39,15 @@ in { ezxdisp = addToBuildInputsWithPkgConfig pkgs.xorg.libX11; freetype = addToBuildInputsWithPkgConfig pkgs.freetype; fuse = addToBuildInputsWithPkgConfig pkgs.fuse; - # git = addToBuildInputsWithPkgConfig pkgs.libgit2; gl-utils = addPkgConfig; glfw3 = addToBuildInputsWithPkgConfig pkgs.glfw3; glls = addPkgConfig; iconv = addToBuildInputs (lib.optional stdenv.isDarwin pkgs.libiconv); icu = addToBuildInputsWithPkgConfig pkgs.icu; imlib2 = addToBuildInputsWithPkgConfig pkgs.imlib2; - lazy-ffi = old: - # fatal error: 'ffi/ffi.h' file not found - (brokenOnDarwin old) - // (addToBuildInputs pkgs.libffi old); + inotify = old: + (addToBuildInputs (lib.optional stdenv.isDarwin pkgs.libinotify-kqueue) old) + // lib.optionalAttrs stdenv.isDarwin (addToCscOptions "-L -linotify" old); leveldb = addToBuildInputs pkgs.leveldb; magic = addToBuildInputs pkgs.file; mdh = addToBuildInputs pkgs.pcre; @@ -53,10 +55,6 @@ in { ncurses = addToBuildInputsWithPkgConfig [ pkgs.ncurses ]; opencl = addToBuildInputs ([ pkgs.opencl-headers pkgs.ocl-icd ] ++ lib.optionals stdenv.isDarwin [ pkgs.darwin.apple_sdk.frameworks.OpenCL ]); - opengl = old: - # csc: invalid option `-framework OpenGL' - (brokenOnDarwin old) - // (addToBuildInputsWithPkgConfig [ pkgs.libGL pkgs.libGLU ] old); openssl = addToBuildInputs pkgs.openssl; plot = addToBuildInputs pkgs.plotutils; postgresql = addToBuildInputsWithPkgConfig pkgs.postgresql; @@ -69,13 +67,11 @@ in { soil = addToPropagatedBuildInputsWithPkgConfig pkgs.libepoxy; sqlite3 = addToBuildInputs pkgs.sqlite; stemmer = old: - # Undefined symbols for architecture arm64: "_sb_stemmer_delete" - (brokenOnDarwin old) - // (addToBuildInputs pkgs.libstemmer old); + (addToBuildInputs pkgs.libstemmer old) + // (addToCscOptions "-L -lstemmer" old); stfl = old: - # Undefined symbols for architecture arm64: "_clearok" - (brokenOnDarwin old) - // (addToBuildInputs [ pkgs.ncurses pkgs.stfl ] old); + (addToBuildInputs [ pkgs.ncurses pkgs.stfl ] old) + // (addToCscOptions "-L -lncurses" old); taglib = addToBuildInputs [ pkgs.zlib pkgs.taglib ]; uuid-lib = addToBuildInputs pkgs.libuuid; ws-client = addToBuildInputs pkgs.zlib; @@ -85,6 +81,37 @@ in { zmq = addToBuildInputs pkgs.zeromq; zstd = addToBuildInputs pkgs.zstd; + # less trivial fixes, should be upstreamed + git = old: (addToBuildInputsWithPkgConfig pkgs.libgit2 old) // { + postPatch = '' + substituteInPlace libgit2.scm \ + --replace "asize" "reserved" + ''; + }; + lazy-ffi = old: (addToBuildInputs pkgs.libffi old) // { + postPatch = '' + substituteInPlace lazy-ffi.scm \ + --replace "ffi/ffi.h" "ffi.h" + ''; + }; + opengl = old: + (addToBuildInputsWithPkgConfig + (lib.optionals (!stdenv.isDarwin) [ pkgs.libGL pkgs.libGLU ] + ++ lib.optionals stdenv.isDarwin [ pkgs.darwin.apple_sdk.frameworks.Foundation pkgs.darwin.apple_sdk.frameworks.OpenGL ]) + old) + // { + postPatch = '' + substituteInPlace opengl.egg \ + --replace 'framework ' 'framework" "' + ''; + }; + posix-shm = old: { + postPatch = lib.optionalString stdenv.isDarwin '' + substituteInPlace build.scm \ + --replace "-lrt" "" + ''; + }; + # platform changes pledge = addMetaAttrs { platforms = lib.platforms.openbsd; }; unveil = addMetaAttrs { platforms = lib.platforms.openbsd; }; @@ -99,7 +126,6 @@ in { comparse = broken; coops-utils = broken; crypt = broken; - git = broken; hypergiant = broken; iup = broken; kiwi = broken; @@ -118,12 +144,8 @@ in { # mark broken darwin - # fatal error: 'sys/inotify.h' file not found - inotify = brokenOnDarwin; # fatal error: 'mqueue.h' file not found posix-mq = brokenOnDarwin; - # ld: library not found for -lrt - posix-shm = brokenOnDarwin; # Undefined symbols for architecture arm64: "_pthread_setschedprio" pthreads = brokenOnDarwin; # error: use of undeclared identifier 'B4000000' From 9c9b62368e6378a4484747251a4ca8c2e0fcb2e0 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Tue, 13 Jun 2023 17:42:05 +0300 Subject: [PATCH 141/165] mariadb.client: fix build --- pkgs/servers/sql/mariadb/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index ee118b89b4ab..104f48407fe6 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -149,6 +149,9 @@ let ./patch/cmake-plugin-includedir.patch ]; + buildInputs = common.buildInputs + ++ lib.optionals (lib.versionAtLeast common.version "10.7") [ fmt_8 ]; + cmakeFlags = common.cmakeFlags ++ [ "-DPLUGIN_AUTH_PAM=NO" "-DWITHOUT_SERVER=ON" From b365e5c1a6c2f558ff5c0032ebe5b060a178d093 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 13 Jun 2023 14:52:37 +0000 Subject: [PATCH 142/165] httplib: 0.12.5 -> 0.12.6 --- pkgs/development/libraries/httplib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/httplib/default.nix b/pkgs/development/libraries/httplib/default.nix index dca86affa633..71fafad0c3ba 100644 --- a/pkgs/development/libraries/httplib/default.nix +++ b/pkgs/development/libraries/httplib/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "httplib"; - version = "0.12.5"; + version = "0.12.6"; src = fetchFromGitHub { owner = "yhirose"; repo = "cpp-httplib"; rev = "v${version}"; - hash = "sha256-9qCquF6DXpgtrfXVd/hc8n1Eu1nOxf/Lm+R13QI0N9Q="; + hash = "sha256-7bH7bq6lsobf5ZEyxPXPqPopZyn9NKInlqmuNzmHkkM="; }; nativeBuildInputs = [ cmake ]; From 3ad7d71afe3ab501f9da5424b9a8b73be230fc58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sun, 9 Apr 2023 03:03:41 +0200 Subject: [PATCH 143/165] treewide: don't set platforms.unix for buildGoModule --- pkgs/applications/blockchains/lndhub-go/default.nix | 1 - pkgs/applications/file-managers/lf/default.nix | 1 - pkgs/applications/misc/autospotting/default.nix | 1 - pkgs/applications/misc/dasel/default.nix | 1 - pkgs/applications/misc/madonctl/default.nix | 1 - pkgs/applications/misc/sampler/default.nix | 1 - pkgs/applications/misc/todoist/default.nix | 1 - pkgs/applications/misc/tut/default.nix | 1 - pkgs/applications/networking/cluster/helmfile/default.nix | 1 - pkgs/applications/networking/cluster/helmsman/default.nix | 1 - pkgs/applications/networking/cluster/hetzner-kube/default.nix | 1 - pkgs/applications/networking/cluster/istioctl/default.nix | 1 - pkgs/applications/networking/cluster/kompose/default.nix | 1 - pkgs/applications/networking/cluster/kops/default.nix | 1 - pkgs/applications/networking/cluster/kubecfg/default.nix | 1 - pkgs/applications/networking/cluster/kubespy/default.nix | 1 - pkgs/applications/networking/cluster/levant/default.nix | 1 - pkgs/applications/networking/cluster/minikube/default.nix | 1 - pkgs/applications/networking/cluster/nomad/default.nix | 1 - pkgs/applications/networking/cluster/odo/default.nix | 1 - pkgs/applications/networking/cluster/stern/default.nix | 1 - pkgs/applications/networking/cluster/tanka/default.nix | 1 - pkgs/applications/networking/drive/default.nix | 1 - pkgs/applications/networking/gdrive/default.nix | 1 - pkgs/applications/networking/hydroxide/default.nix | 1 - .../networking/instant-messengers/cordless/default.nix | 1 - .../networking/instant-messengers/gomuks/default.nix | 1 - .../networking/instant-messengers/signaldctl/default.nix | 1 - pkgs/applications/networking/ipfs-cluster/default.nix | 1 - pkgs/applications/networking/ipget/default.nix | 1 - pkgs/applications/networking/sync/desync/default.nix | 1 - pkgs/applications/networking/wgcf/default.nix | 1 - pkgs/applications/version-management/gitty/default.nix | 1 - pkgs/applications/virtualization/umoci/default.nix | 1 - .../tools/analysis/tflint-plugins/tflint-ruleset-aws.nix | 1 - pkgs/development/tools/build-managers/bob/default.nix | 1 - pkgs/development/tools/butane/default.nix | 1 - pkgs/development/tools/database/dbmate/default.nix | 1 - pkgs/development/tools/gauge/default.nix | 1 - pkgs/development/tools/github-commenter/default.nix | 1 - pkgs/development/tools/go-protobuf/default.nix | 1 - pkgs/development/tools/gron/default.nix | 1 - pkgs/development/tools/kafkactl/default.nix | 1 - pkgs/development/tools/kind/default.nix | 1 - pkgs/development/tools/krew/default.nix | 1 - pkgs/development/tools/leaps/default.nix | 1 - pkgs/development/tools/misc/go-md2man/default.nix | 1 - pkgs/development/tools/misc/hound/default.nix | 1 - pkgs/development/tools/misc/linuxkit/default.nix | 1 - pkgs/development/tools/misc/nix-build-uncached/default.nix | 1 - pkgs/development/tools/misc/scc/default.nix | 1 - pkgs/development/tools/packer/default.nix | 1 - pkgs/development/tools/packet-sd/default.nix | 1 - pkgs/development/tools/prototool/default.nix | 1 - pkgs/development/tools/rain/default.nix | 1 - pkgs/development/tools/reflex/default.nix | 1 - pkgs/development/tools/run/default.nix | 1 - pkgs/games/harmonist/default.nix | 1 - pkgs/servers/dex/default.nix | 1 - pkgs/servers/dgraph/default.nix | 1 - pkgs/servers/geospatial/mbtileserver/default.nix | 1 - pkgs/servers/geospatial/pg_featureserv/default.nix | 1 - pkgs/servers/geospatial/pg_tileserv/default.nix | 1 - pkgs/servers/geospatial/tegola/default.nix | 1 - pkgs/servers/matterbridge/default.nix | 1 - pkgs/servers/mattermost/matterircd.nix | 1 - pkgs/servers/minio/default.nix | 1 - pkgs/servers/minio/legacy_fs.nix | 1 - pkgs/servers/mirrorbits/default.nix | 1 - pkgs/servers/misc/navidrome/default.nix | 1 - pkgs/servers/monitoring/bosun/default.nix | 1 - pkgs/servers/monitoring/grafana-dash-n-grab/default.nix | 1 - pkgs/servers/monitoring/mimir/default.nix | 1 - pkgs/servers/monitoring/prometheus/alertmanager.nix | 1 - pkgs/servers/monitoring/prometheus/bind-exporter.nix | 1 - pkgs/servers/monitoring/prometheus/blackbox-exporter.nix | 1 - pkgs/servers/monitoring/prometheus/collectd-exporter.nix | 1 - pkgs/servers/monitoring/prometheus/consul-exporter.nix | 1 - pkgs/servers/monitoring/prometheus/fritzbox-exporter.nix | 1 - pkgs/servers/monitoring/prometheus/haproxy-exporter.nix | 1 - pkgs/servers/monitoring/prometheus/mysqld-exporter.nix | 1 - pkgs/servers/monitoring/prometheus/nextcloud-exporter.nix | 1 - pkgs/servers/monitoring/prometheus/nginx-exporter.nix | 1 - pkgs/servers/monitoring/prometheus/prom2json.nix | 1 - pkgs/servers/monitoring/prometheus/promscale/default.nix | 1 - pkgs/servers/monitoring/prometheus/pushgateway.nix | 1 - pkgs/servers/monitoring/prometheus/rabbitmq-exporter.nix | 1 - pkgs/servers/monitoring/prometheus/redis-exporter.nix | 1 - pkgs/servers/monitoring/prometheus/smokeping-prober.nix | 1 - pkgs/servers/monitoring/prometheus/snmp-exporter.nix | 1 - pkgs/servers/monitoring/prometheus/sql-exporter.nix | 1 - pkgs/servers/monitoring/prometheus/statsd-exporter.nix | 1 - pkgs/servers/monitoring/prometheus/systemd-exporter.nix | 1 - pkgs/servers/monitoring/prometheus/zfs-exporter.nix | 1 - pkgs/servers/monitoring/thanos/default.nix | 1 - pkgs/servers/nginx-sso/default.nix | 1 - pkgs/servers/trezord/default.nix | 1 - pkgs/shells/carapace/default.nix | 1 - pkgs/tools/admin/aws-rotate-key/default.nix | 1 - pkgs/tools/admin/berglas/default.nix | 1 - pkgs/tools/admin/scalr-cli/default.nix | 1 - pkgs/tools/audio/mpd-mpris/default.nix | 1 - pkgs/tools/backup/gamerbackup/default.nix | 1 - pkgs/tools/backup/restic/rest-server.nix | 1 - pkgs/tools/filesystems/gcsfuse/default.nix | 1 - pkgs/tools/misc/adrgen/default.nix | 1 - pkgs/tools/misc/aptly/default.nix | 1 - pkgs/tools/misc/claws/default.nix | 1 - pkgs/tools/misc/duf/default.nix | 1 - pkgs/tools/misc/dwarf2json/default.nix | 1 - pkgs/tools/misc/fsql/default.nix | 1 - pkgs/tools/misc/grit/default.nix | 1 - pkgs/tools/misc/lokalise2-cli/default.nix | 1 - pkgs/tools/misc/powerline-go/default.nix | 1 - pkgs/tools/networking/brook/default.nix | 1 - pkgs/tools/networking/cassowary/default.nix | 1 - pkgs/tools/networking/doggo/default.nix | 1 - pkgs/tools/networking/goreplay/default.nix | 1 - pkgs/tools/networking/ligolo-ng/default.nix | 1 - pkgs/tools/networking/minio-client/default.nix | 1 - pkgs/tools/networking/pixiecore/default.nix | 1 - pkgs/tools/package-management/morph/default.nix | 1 - pkgs/tools/package-management/mynewt-newt/default.nix | 1 - pkgs/tools/security/keybase/kbfs.nix | 1 - pkgs/tools/security/saml2aws/default.nix | 1 - pkgs/tools/security/ssh-to-age/default.nix | 1 - pkgs/tools/system/gohai/default.nix | 2 -- pkgs/tools/system/systemd-journal2gelf/default.nix | 1 - pkgs/tools/text/gucci/default.nix | 1 - pkgs/tools/typesetting/mmark/default.nix | 1 - 130 files changed, 131 deletions(-) diff --git a/pkgs/applications/blockchains/lndhub-go/default.nix b/pkgs/applications/blockchains/lndhub-go/default.nix index 7b969f0e27d0..4f292d44d6e1 100644 --- a/pkgs/applications/blockchains/lndhub-go/default.nix +++ b/pkgs/applications/blockchains/lndhub-go/default.nix @@ -25,6 +25,5 @@ buildGoModule rec { homepage = "https://github.com/getAlby/lndhub.go"; license = licenses.gpl3; maintainers = with maintainers; [ prusnak ]; - platforms = platforms.unix; }; } diff --git a/pkgs/applications/file-managers/lf/default.nix b/pkgs/applications/file-managers/lf/default.nix index d84e3dc6afdd..0ef56e8a2bd1 100644 --- a/pkgs/applications/file-managers/lf/default.nix +++ b/pkgs/applications/file-managers/lf/default.nix @@ -43,7 +43,6 @@ buildGoModule rec { homepage = "https://godoc.org/github.com/gokcehan/lf"; changelog = "https://github.com/gokcehan/lf/releases/tag/r${version}"; license = licenses.mit; - platforms = platforms.unix; maintainers = with maintainers; [ dotlambda ]; }; } diff --git a/pkgs/applications/misc/autospotting/default.nix b/pkgs/applications/misc/autospotting/default.nix index a0bc7ba01a90..985b8136a0a6 100644 --- a/pkgs/applications/misc/autospotting/default.nix +++ b/pkgs/applications/misc/autospotting/default.nix @@ -23,6 +23,5 @@ buildGoModule rec { license = licenses.osl3; maintainers = with maintainers; [ costrouc ]; mainProgram = "AutoSpotting"; - platforms = platforms.unix; }; } diff --git a/pkgs/applications/misc/dasel/default.nix b/pkgs/applications/misc/dasel/default.nix index 7dfe56f54483..d3b72568cbd5 100644 --- a/pkgs/applications/misc/dasel/default.nix +++ b/pkgs/applications/misc/dasel/default.nix @@ -42,7 +42,6 @@ buildGoModule rec { homepage = "https://github.com/TomWright/dasel"; changelog = "https://github.com/TomWright/dasel/blob/v${version}/CHANGELOG.md"; license = licenses.mit; - platforms = platforms.unix; maintainers = with maintainers; [ _0x4A6F ]; }; } diff --git a/pkgs/applications/misc/madonctl/default.nix b/pkgs/applications/misc/madonctl/default.nix index b9a1c0fd5371..df783aa36a9c 100644 --- a/pkgs/applications/misc/madonctl/default.nix +++ b/pkgs/applications/misc/madonctl/default.nix @@ -32,7 +32,6 @@ buildGoModule rec { description = "CLI for the Mastodon social network API"; homepage = "https://github.com/McKael/madonctl"; license = licenses.mit; - platforms = platforms.unix; maintainers = with maintainers; [ aaronjheng ]; }; } diff --git a/pkgs/applications/misc/sampler/default.nix b/pkgs/applications/misc/sampler/default.nix index c668edc9a17b..bea22977097a 100644 --- a/pkgs/applications/misc/sampler/default.nix +++ b/pkgs/applications/misc/sampler/default.nix @@ -35,6 +35,5 @@ buildGoModule rec { homepage = "https://sampler.dev"; license = licenses.gpl3; maintainers = with maintainers; [ uvnikita ]; - platforms = platforms.unix; }; } diff --git a/pkgs/applications/misc/todoist/default.nix b/pkgs/applications/misc/todoist/default.nix index 2a8d925f7800..fc600ab7710c 100644 --- a/pkgs/applications/misc/todoist/default.nix +++ b/pkgs/applications/misc/todoist/default.nix @@ -19,6 +19,5 @@ buildGoModule rec { homepage = "https://github.com/sachaos/todoist"; description = "Todoist CLI Client"; license = lib.licenses.mit; - platforms = lib.platforms.unix; }; } diff --git a/pkgs/applications/misc/tut/default.nix b/pkgs/applications/misc/tut/default.nix index 16d091aa7b1a..8033cbfa865d 100644 --- a/pkgs/applications/misc/tut/default.nix +++ b/pkgs/applications/misc/tut/default.nix @@ -18,6 +18,5 @@ buildGoModule rec { homepage = "https://github.com/RasmusLindroth/tut"; license = licenses.mit; maintainers = with maintainers; [ equirosa ]; - platforms = platforms.unix; }; } diff --git a/pkgs/applications/networking/cluster/helmfile/default.nix b/pkgs/applications/networking/cluster/helmfile/default.nix index ccbc414e4294..06612be06299 100644 --- a/pkgs/applications/networking/cluster/helmfile/default.nix +++ b/pkgs/applications/networking/cluster/helmfile/default.nix @@ -37,6 +37,5 @@ buildGoModule rec { homepage = "https://helmfile.readthedocs.io/"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ pneumaticat yurrriq ]; - platforms = lib.platforms.unix; }; } diff --git a/pkgs/applications/networking/cluster/helmsman/default.nix b/pkgs/applications/networking/cluster/helmsman/default.nix index b09d167c24af..9e7b1fc236a5 100644 --- a/pkgs/applications/networking/cluster/helmsman/default.nix +++ b/pkgs/applications/networking/cluster/helmsman/default.nix @@ -20,6 +20,5 @@ buildGoModule rec { homepage = "https://github.com/Praqma/helmsman"; license = licenses.mit; maintainers = with maintainers; [ lynty ]; - platforms = platforms.unix; }; } diff --git a/pkgs/applications/networking/cluster/hetzner-kube/default.nix b/pkgs/applications/networking/cluster/hetzner-kube/default.nix index bf4183268e53..828194c8e9b2 100644 --- a/pkgs/applications/networking/cluster/hetzner-kube/default.nix +++ b/pkgs/applications/networking/cluster/hetzner-kube/default.nix @@ -44,6 +44,5 @@ buildGoModule rec { homepage = "https://github.com/xetys/hetzner-kube"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ eliasp ]; - platforms = lib.platforms.unix; }; } diff --git a/pkgs/applications/networking/cluster/istioctl/default.nix b/pkgs/applications/networking/cluster/istioctl/default.nix index b51664064885..be498c5c2d17 100644 --- a/pkgs/applications/networking/cluster/istioctl/default.nix +++ b/pkgs/applications/networking/cluster/istioctl/default.nix @@ -43,6 +43,5 @@ buildGoModule rec { homepage = "https://istio.io/latest/docs/reference/commands/istioctl"; license = licenses.asl20; maintainers = with maintainers; [ bryanasdev000 veehaitch ]; - platforms = platforms.unix; }; } diff --git a/pkgs/applications/networking/cluster/kompose/default.nix b/pkgs/applications/networking/cluster/kompose/default.nix index 13684d441492..c1df35b75dc6 100644 --- a/pkgs/applications/networking/cluster/kompose/default.nix +++ b/pkgs/applications/networking/cluster/kompose/default.nix @@ -43,6 +43,5 @@ buildGoModule rec { homepage = "https://kompose.io"; license = licenses.asl20; maintainers = with maintainers; [ thpham vdemeester ]; - platforms = platforms.unix; }; } diff --git a/pkgs/applications/networking/cluster/kops/default.nix b/pkgs/applications/networking/cluster/kops/default.nix index 490b924ad9cb..7431b5474b33 100644 --- a/pkgs/applications/networking/cluster/kops/default.nix +++ b/pkgs/applications/networking/cluster/kops/default.nix @@ -42,7 +42,6 @@ let changelog = "https://github.com/kubernetes/kops/tree/master/docs/releases"; license = licenses.asl20; maintainers = with maintainers; [ offline zimbatm diegolelis yurrriq ]; - platforms = platforms.unix; }; } // attrs'; in diff --git a/pkgs/applications/networking/cluster/kubecfg/default.nix b/pkgs/applications/networking/cluster/kubecfg/default.nix index 9fd3fc41ce51..fb555545c047 100644 --- a/pkgs/applications/networking/cluster/kubecfg/default.nix +++ b/pkgs/applications/networking/cluster/kubecfg/default.nix @@ -37,6 +37,5 @@ buildGoModule rec { changelog = "https://github.com/kubecfg/kubecfg/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ benley ]; - platforms = platforms.unix; }; } diff --git a/pkgs/applications/networking/cluster/kubespy/default.nix b/pkgs/applications/networking/cluster/kubespy/default.nix index 43c4adc555c9..88a56e3c72e3 100644 --- a/pkgs/applications/networking/cluster/kubespy/default.nix +++ b/pkgs/applications/networking/cluster/kubespy/default.nix @@ -31,6 +31,5 @@ buildGoModule rec { homepage = "https://github.com/pulumi/kubespy"; license = licenses.asl20; maintainers = with maintainers; [ blaggacao ]; - platforms = platforms.unix; }; } diff --git a/pkgs/applications/networking/cluster/levant/default.nix b/pkgs/applications/networking/cluster/levant/default.nix index 07d9c360de7e..be25739db2cb 100644 --- a/pkgs/applications/networking/cluster/levant/default.nix +++ b/pkgs/applications/networking/cluster/levant/default.nix @@ -21,6 +21,5 @@ buildGoModule rec { homepage = "https://github.com/hashicorp/levant"; license = licenses.mpl20; maintainers = with maintainers; [ max-niederman ]; - platforms = platforms.unix; }; } diff --git a/pkgs/applications/networking/cluster/minikube/default.nix b/pkgs/applications/networking/cluster/minikube/default.nix index 99b9b942196e..fc53e14a41f5 100644 --- a/pkgs/applications/networking/cluster/minikube/default.nix +++ b/pkgs/applications/networking/cluster/minikube/default.nix @@ -50,6 +50,5 @@ buildGoModule rec { description = "A tool that makes it easy to run Kubernetes locally"; license = licenses.asl20; maintainers = with maintainers; [ ebzzry copumpkin vdemeester atkinschang Chili-Man ]; - platforms = platforms.unix; }; } diff --git a/pkgs/applications/networking/cluster/nomad/default.nix b/pkgs/applications/networking/cluster/nomad/default.nix index 998f7f6069a0..3bb12d740b98 100644 --- a/pkgs/applications/networking/cluster/nomad/default.nix +++ b/pkgs/applications/networking/cluster/nomad/default.nix @@ -39,7 +39,6 @@ let meta = with lib; { homepage = "https://www.nomadproject.io/"; description = "A Distributed, Highly Available, Datacenter-Aware Scheduler"; - platforms = platforms.unix; license = licenses.mpl20; maintainers = with maintainers; [ rushmorem pradeepchhetri endocrimes maxeaubrey techknowlogick ]; }; diff --git a/pkgs/applications/networking/cluster/odo/default.nix b/pkgs/applications/networking/cluster/odo/default.nix index 1099c1b08195..fc9ab61d3733 100644 --- a/pkgs/applications/networking/cluster/odo/default.nix +++ b/pkgs/applications/networking/cluster/odo/default.nix @@ -34,6 +34,5 @@ buildGoModule rec { homepage = "https://odo.dev"; changelog = "https://github.com/redhat-developer/odo/releases/v${version}"; maintainers = with maintainers; [ stehessel ]; - platforms = platforms.unix; }; } diff --git a/pkgs/applications/networking/cluster/stern/default.nix b/pkgs/applications/networking/cluster/stern/default.nix index 473377c22eef..0631dd1788b7 100644 --- a/pkgs/applications/networking/cluster/stern/default.nix +++ b/pkgs/applications/networking/cluster/stern/default.nix @@ -34,6 +34,5 @@ buildGoModule rec { homepage = "https://github.com/stern/stern"; license = licenses.asl20; maintainers = with maintainers; [ mbode preisschild ]; - platforms = platforms.unix; }; } diff --git a/pkgs/applications/networking/cluster/tanka/default.nix b/pkgs/applications/networking/cluster/tanka/default.nix index 470a4bdf7ef3..62d89e78c757 100644 --- a/pkgs/applications/networking/cluster/tanka/default.nix +++ b/pkgs/applications/networking/cluster/tanka/default.nix @@ -32,6 +32,5 @@ buildGoModule rec { license = licenses.asl20; maintainers = with maintainers; [ mikefaille ]; mainProgram = "tk"; - platforms = platforms.unix; }; } diff --git a/pkgs/applications/networking/drive/default.nix b/pkgs/applications/networking/drive/default.nix index 576133e650c8..b90be9e2a55d 100644 --- a/pkgs/applications/networking/drive/default.nix +++ b/pkgs/applications/networking/drive/default.nix @@ -30,6 +30,5 @@ buildGoModule rec { description = "Google Drive client for the commandline"; license = licenses.asl20; maintainers = with maintainers; [ aaronjheng ]; - platforms = platforms.unix; }; } diff --git a/pkgs/applications/networking/gdrive/default.nix b/pkgs/applications/networking/gdrive/default.nix index 20ef4e682c7e..c442303e6758 100644 --- a/pkgs/applications/networking/gdrive/default.nix +++ b/pkgs/applications/networking/gdrive/default.nix @@ -28,7 +28,6 @@ buildGoModule rec { homepage = "https://github.com/prasmussen/gdrive"; description = "A command line utility for interacting with Google Drive"; license = licenses.mit; - platforms = platforms.unix; maintainers = [ maintainers.rzetterberg ]; }; } diff --git a/pkgs/applications/networking/hydroxide/default.nix b/pkgs/applications/networking/hydroxide/default.nix index df6f1e2d793f..73b4da770809 100644 --- a/pkgs/applications/networking/hydroxide/default.nix +++ b/pkgs/applications/networking/hydroxide/default.nix @@ -22,6 +22,5 @@ buildGoModule rec { homepage = "https://github.com/emersion/hydroxide"; license = licenses.mit; maintainers = with maintainers; [ Br1ght0ne ]; - platforms = platforms.unix; }; } diff --git a/pkgs/applications/networking/instant-messengers/cordless/default.nix b/pkgs/applications/networking/instant-messengers/cordless/default.nix index a906c46c4aef..3f388f958c87 100644 --- a/pkgs/applications/networking/instant-messengers/cordless/default.nix +++ b/pkgs/applications/networking/instant-messengers/cordless/default.nix @@ -20,6 +20,5 @@ buildGoModule rec { description = "Discord terminal client"; license = licenses.bsd3; maintainers = with maintainers; [ colemickens ]; - platforms = platforms.unix; }; } diff --git a/pkgs/applications/networking/instant-messengers/gomuks/default.nix b/pkgs/applications/networking/instant-messengers/gomuks/default.nix index 55b3ef6899f7..cc0a654ad2a0 100644 --- a/pkgs/applications/networking/instant-messengers/gomuks/default.nix +++ b/pkgs/applications/networking/instant-messengers/gomuks/default.nix @@ -53,6 +53,5 @@ buildGoModule rec { description = "A terminal based Matrix client written in Go"; license = licenses.agpl3Plus; maintainers = with maintainers; [ chvp emily ]; - platforms = platforms.unix; }; } diff --git a/pkgs/applications/networking/instant-messengers/signaldctl/default.nix b/pkgs/applications/networking/instant-messengers/signaldctl/default.nix index cb241bac8fc2..82637dbbb0c9 100644 --- a/pkgs/applications/networking/instant-messengers/signaldctl/default.nix +++ b/pkgs/applications/networking/instant-messengers/signaldctl/default.nix @@ -36,6 +36,5 @@ buildGoModule rec { homepage = "https://signald.org/signaldctl/"; license = licenses.gpl3; maintainers = with maintainers; [ colinsane ]; - platforms = platforms.unix; }; } diff --git a/pkgs/applications/networking/ipfs-cluster/default.nix b/pkgs/applications/networking/ipfs-cluster/default.nix index 689cef0db0b3..e23fa2f6c6fb 100644 --- a/pkgs/applications/networking/ipfs-cluster/default.nix +++ b/pkgs/applications/networking/ipfs-cluster/default.nix @@ -17,7 +17,6 @@ buildGoModule rec { description = "Allocate, replicate, and track Pins across a cluster of IPFS daemons"; homepage = "https://ipfscluster.io"; license = licenses.mit; - platforms = platforms.unix; maintainers = with maintainers; [ Luflosi jglukasik ]; }; } diff --git a/pkgs/applications/networking/ipget/default.nix b/pkgs/applications/networking/ipget/default.nix index fa93ad14a741..8ff8811381b4 100644 --- a/pkgs/applications/networking/ipget/default.nix +++ b/pkgs/applications/networking/ipget/default.nix @@ -25,6 +25,5 @@ buildGoModule rec { homepage = "https://ipfs.io/"; license = licenses.mit; maintainers = with maintainers; [ Luflosi ]; - platforms = platforms.unix; }; } diff --git a/pkgs/applications/networking/sync/desync/default.nix b/pkgs/applications/networking/sync/desync/default.nix index 8af7c3bca40e..487b3e2fc878 100644 --- a/pkgs/applications/networking/sync/desync/default.nix +++ b/pkgs/applications/networking/sync/desync/default.nix @@ -21,7 +21,6 @@ buildGoModule rec { longDescription = "An alternate implementation of the casync protocol and storage mechanism with a focus on production-readiness"; homepage = "https://github.com/folbricht/desync"; license = licenses.bsd3; - platforms = platforms.unix; # *may* work on Windows, but varies between releases. maintainers = [ maintainers.chaduffy ]; }; } diff --git a/pkgs/applications/networking/wgcf/default.nix b/pkgs/applications/networking/wgcf/default.nix index 3487ad6395cf..5a9f4b43ce67 100644 --- a/pkgs/applications/networking/wgcf/default.nix +++ b/pkgs/applications/networking/wgcf/default.nix @@ -19,7 +19,6 @@ buildGoModule rec { description = "Cross-platform, unofficial CLI for Cloudflare Warp"; homepage = "https://github.com/ViRb3/wgcf"; license = licenses.mit; - platforms = platforms.unix; maintainers = with maintainers; [ yureien ]; }; } diff --git a/pkgs/applications/version-management/gitty/default.nix b/pkgs/applications/version-management/gitty/default.nix index 12a82143c35b..da24cb2988eb 100644 --- a/pkgs/applications/version-management/gitty/default.nix +++ b/pkgs/applications/version-management/gitty/default.nix @@ -19,7 +19,6 @@ buildGoModule rec { homepage = "https://github.com/muesli/gitty/"; description = "Contextual information about your git projects, right on the command-line"; license = licenses.mit; - platforms = platforms.unix; maintainers = with maintainers; [ izorkin ]; }; } diff --git a/pkgs/applications/virtualization/umoci/default.nix b/pkgs/applications/virtualization/umoci/default.nix index 99e8ddf34a51..6af9382d2b7d 100644 --- a/pkgs/applications/virtualization/umoci/default.nix +++ b/pkgs/applications/virtualization/umoci/default.nix @@ -35,6 +35,5 @@ buildGoModule rec { homepage = "https://umo.ci"; license = licenses.asl20; maintainers = with maintainers; [ zokrezyl ]; - platforms = platforms.unix; }; } diff --git a/pkgs/development/tools/analysis/tflint-plugins/tflint-ruleset-aws.nix b/pkgs/development/tools/analysis/tflint-plugins/tflint-ruleset-aws.nix index 61efa78eaef4..720c3fa05aa9 100644 --- a/pkgs/development/tools/analysis/tflint-plugins/tflint-ruleset-aws.nix +++ b/pkgs/development/tools/analysis/tflint-plugins/tflint-ruleset-aws.nix @@ -31,7 +31,6 @@ buildGoModule rec { meta = with lib; { homepage = "https://github.com/terraform-linters/tflint-ruleset-aws"; description = "TFLint ruleset plugin for Terraform AWS Provider"; - platforms = platforms.unix; maintainers = with maintainers; [ flokli ]; license = with licenses; [ mpl20 ]; }; diff --git a/pkgs/development/tools/build-managers/bob/default.nix b/pkgs/development/tools/build-managers/bob/default.nix index a7a7b0622b6e..2a8a1eda465a 100644 --- a/pkgs/development/tools/build-managers/bob/default.nix +++ b/pkgs/development/tools/build-managers/bob/default.nix @@ -24,7 +24,6 @@ buildGoModule rec { description = "A build system for microservices"; homepage = "https://bob.build"; license = licenses.asl20; - platforms = platforms.unix; maintainers = with maintainers; [ zuzuleinen ]; }; } diff --git a/pkgs/development/tools/butane/default.nix b/pkgs/development/tools/butane/default.nix index 5285637d77e9..71344ea3ca32 100644 --- a/pkgs/development/tools/butane/default.nix +++ b/pkgs/development/tools/butane/default.nix @@ -30,6 +30,5 @@ buildGoModule rec { license = licenses.asl20; homepage = "https://github.com/coreos/butane"; maintainers = with maintainers; [ elijahcaine ruuda ]; - platforms = platforms.unix; }; } diff --git a/pkgs/development/tools/database/dbmate/default.nix b/pkgs/development/tools/database/dbmate/default.nix index fcca97ff9e1a..6e5c98dae0ef 100644 --- a/pkgs/development/tools/database/dbmate/default.nix +++ b/pkgs/development/tools/database/dbmate/default.nix @@ -24,6 +24,5 @@ buildGoModule rec { changelog = "https://github.com/amacneil/dbmate/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ manveru ]; - platforms = platforms.unix; }; } diff --git a/pkgs/development/tools/gauge/default.nix b/pkgs/development/tools/gauge/default.nix index 4a300df0577c..c7ae1b885639 100644 --- a/pkgs/development/tools/gauge/default.nix +++ b/pkgs/development/tools/gauge/default.nix @@ -20,6 +20,5 @@ buildGoModule rec { homepage = "https://gauge.org"; license = licenses.asl20; maintainers = [ maintainers.vdemeester ]; - platforms = platforms.unix; }; } diff --git a/pkgs/development/tools/github-commenter/default.nix b/pkgs/development/tools/github-commenter/default.nix index b1c247c70f97..196d078c3027 100644 --- a/pkgs/development/tools/github-commenter/default.nix +++ b/pkgs/development/tools/github-commenter/default.nix @@ -18,6 +18,5 @@ buildGoModule rec { license = licenses.asl20; homepage = "https://github.com/cloudposse/github-commenter"; maintainers = [ maintainers.mmahut ]; - platforms = platforms.unix; }; } diff --git a/pkgs/development/tools/go-protobuf/default.nix b/pkgs/development/tools/go-protobuf/default.nix index 42b4fbe1d3cd..0f2e302aad05 100644 --- a/pkgs/development/tools/go-protobuf/default.nix +++ b/pkgs/development/tools/go-protobuf/default.nix @@ -18,6 +18,5 @@ buildGoModule rec { description = " Go bindings for protocol buffer"; maintainers = with maintainers; [ lewo ]; license = licenses.bsd3; - platforms = platforms.unix; }; } diff --git a/pkgs/development/tools/gron/default.nix b/pkgs/development/tools/gron/default.nix index 3dbcf0fdc20e..b89ab9e98fce 100644 --- a/pkgs/development/tools/gron/default.nix +++ b/pkgs/development/tools/gron/default.nix @@ -24,6 +24,5 @@ buildGoModule rec { homepage = "https://github.com/tomnomnom/gron"; license = licenses.mit; maintainers = with maintainers; [ fgaz SuperSandro2000 ]; - platforms = platforms.unix; }; } diff --git a/pkgs/development/tools/kafkactl/default.nix b/pkgs/development/tools/kafkactl/default.nix index e52eda11bb3a..3528777f787a 100644 --- a/pkgs/development/tools/kafkactl/default.nix +++ b/pkgs/development/tools/kafkactl/default.nix @@ -32,6 +32,5 @@ buildGoModule rec { ''; license = licenses.asl20; maintainers = with maintainers; [ grburst ]; - platforms = platforms.unix; }; } diff --git a/pkgs/development/tools/kind/default.nix b/pkgs/development/tools/kind/default.nix index 2b37e756be79..f06b575f5377 100644 --- a/pkgs/development/tools/kind/default.nix +++ b/pkgs/development/tools/kind/default.nix @@ -39,6 +39,5 @@ buildGoModule rec { homepage = "https://github.com/kubernetes-sigs/kind"; maintainers = with maintainers; [ offline rawkode ]; license = licenses.asl20; - platforms = platforms.unix; }; } diff --git a/pkgs/development/tools/krew/default.nix b/pkgs/development/tools/krew/default.nix index 78e9f91b3af8..2bfcf2ca9f67 100644 --- a/pkgs/development/tools/krew/default.nix +++ b/pkgs/development/tools/krew/default.nix @@ -20,6 +20,5 @@ buildGoModule rec { homepage = "https://github.com/kubernetes-sigs/krew"; maintainers = with maintainers; [ vdemeester ]; license = lib.licenses.asl20; - platforms = platforms.unix; }; } diff --git a/pkgs/development/tools/leaps/default.nix b/pkgs/development/tools/leaps/default.nix index ce948edd5aa3..a6e41844508c 100644 --- a/pkgs/development/tools/leaps/default.nix +++ b/pkgs/development/tools/leaps/default.nix @@ -23,6 +23,5 @@ buildGoModule rec { homepage = "https://github.com/jeffail/leaps/"; license = licenses.mit; maintainers = with lib.maintainers; [ qknight ]; - platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/tools/misc/go-md2man/default.nix b/pkgs/development/tools/misc/go-md2man/default.nix index 55087a502100..a1481fe2d385 100644 --- a/pkgs/development/tools/misc/go-md2man/default.nix +++ b/pkgs/development/tools/misc/go-md2man/default.nix @@ -18,6 +18,5 @@ buildGoModule rec { license = licenses.mit; homepage = "https://github.com/cpuguy83/go-md2man"; maintainers = with maintainers; [offline]; - platforms = platforms.unix; }; } diff --git a/pkgs/development/tools/misc/hound/default.nix b/pkgs/development/tools/misc/hound/default.nix index 90947dc850ea..b906456116c5 100644 --- a/pkgs/development/tools/misc/hound/default.nix +++ b/pkgs/development/tools/misc/hound/default.nix @@ -37,6 +37,5 @@ buildGoModule rec { homepage = "https://github.com/hound-search/hound"; license = licenses.mit; maintainers = with maintainers; [ grahamc SuperSandro2000 ]; - platforms = platforms.unix; }; } diff --git a/pkgs/development/tools/misc/linuxkit/default.nix b/pkgs/development/tools/misc/linuxkit/default.nix index 68a908483d13..3a7a7836df98 100644 --- a/pkgs/development/tools/misc/linuxkit/default.nix +++ b/pkgs/development/tools/misc/linuxkit/default.nix @@ -56,6 +56,5 @@ buildGoModule rec { license = licenses.asl20; homepage = "https://github.com/linuxkit/linuxkit"; maintainers = with maintainers; [ nicknovitski ]; - platforms = platforms.unix; }; } diff --git a/pkgs/development/tools/misc/nix-build-uncached/default.nix b/pkgs/development/tools/misc/nix-build-uncached/default.nix index 2d9313a566cf..840bea3eb3e9 100644 --- a/pkgs/development/tools/misc/nix-build-uncached/default.nix +++ b/pkgs/development/tools/misc/nix-build-uncached/default.nix @@ -22,6 +22,5 @@ buildGoModule rec { license = licenses.mit; homepage = "https://github.com/Mic92/nix-build-uncached"; maintainers = [ maintainers.mic92 ]; - platforms = platforms.unix; }; } diff --git a/pkgs/development/tools/misc/scc/default.nix b/pkgs/development/tools/misc/scc/default.nix index 3a5eeeb9c8b6..40b41d8df9ed 100644 --- a/pkgs/development/tools/misc/scc/default.nix +++ b/pkgs/development/tools/misc/scc/default.nix @@ -21,6 +21,5 @@ buildGoModule rec { description = "A very fast accurate code counter with complexity calculations and COCOMO estimates written in pure Go"; maintainers = with maintainers; [ sigma Br1ght0ne ]; license = with licenses; [ unlicense /* or */ mit ]; - platforms = platforms.unix; }; } diff --git a/pkgs/development/tools/packer/default.nix b/pkgs/development/tools/packer/default.nix index e0a176a15bac..68a606edcd6a 100644 --- a/pkgs/development/tools/packer/default.nix +++ b/pkgs/development/tools/packer/default.nix @@ -34,6 +34,5 @@ buildGoModule rec { license = licenses.mpl20; maintainers = with maintainers; [ cstrahan zimbatm ma27 techknowlogick ]; changelog = "https://github.com/hashicorp/packer/blob/v${version}/CHANGELOG.md"; - platforms = platforms.unix; }; } diff --git a/pkgs/development/tools/packet-sd/default.nix b/pkgs/development/tools/packet-sd/default.nix index f8caeb7f684d..fb2cc85ec5d2 100644 --- a/pkgs/development/tools/packet-sd/default.nix +++ b/pkgs/development/tools/packet-sd/default.nix @@ -18,7 +18,6 @@ buildGoModule rec { description = "Prometheus service discovery for Equinix Metal"; homepage = "https://github.com/packethost/prometheus-packet-sd"; license = licenses.asl20; - platforms = platforms.unix; maintainers = [ ]; mainProgram = "prometheus-packet-sd"; }; diff --git a/pkgs/development/tools/prototool/default.nix b/pkgs/development/tools/prototool/default.nix index e58b89a27363..d0f141f52404 100644 --- a/pkgs/development/tools/prototool/default.nix +++ b/pkgs/development/tools/prototool/default.nix @@ -30,6 +30,5 @@ buildGoModule rec { description = "Your Swiss Army Knife for Protocol Buffers"; maintainers = [ maintainers.marsam ]; license = licenses.mit; - platforms = platforms.unix; }; } diff --git a/pkgs/development/tools/rain/default.nix b/pkgs/development/tools/rain/default.nix index 533d4171fd24..11af71b96a8c 100644 --- a/pkgs/development/tools/rain/default.nix +++ b/pkgs/development/tools/rain/default.nix @@ -33,6 +33,5 @@ buildGoModule rec { homepage = "https://github.com/aws-cloudformation/rain"; license = licenses.asl20; maintainers = with maintainers; [ jiegec ]; - platforms = platforms.unix; }; } diff --git a/pkgs/development/tools/reflex/default.nix b/pkgs/development/tools/reflex/default.nix index c437d93f1013..879131213a03 100644 --- a/pkgs/development/tools/reflex/default.nix +++ b/pkgs/development/tools/reflex/default.nix @@ -19,7 +19,6 @@ buildGoModule rec { description = "A small tool to watch a directory and rerun a command when certain files change"; homepage = "https://github.com/cespare/reflex"; license = licenses.mit; - platforms = platforms.unix; maintainers = with maintainers; [ nicknovitski ]; }; } diff --git a/pkgs/development/tools/run/default.nix b/pkgs/development/tools/run/default.nix index 585da934955c..ea7b8880636e 100644 --- a/pkgs/development/tools/run/default.nix +++ b/pkgs/development/tools/run/default.nix @@ -19,6 +19,5 @@ buildGoModule rec { homepage = "https://github.com/TekWizely/run"; license = licenses.mit; maintainers = with maintainers; [ rawkode Br1ght0ne ]; - platforms = platforms.unix; }; } diff --git a/pkgs/games/harmonist/default.nix b/pkgs/games/harmonist/default.nix index 9b132d4a862b..658de97af29c 100644 --- a/pkgs/games/harmonist/default.nix +++ b/pkgs/games/harmonist/default.nix @@ -25,7 +25,6 @@ buildGoModule rec { ''; homepage = "https://harmonist.tuxfamily.org/"; license = licenses.isc; - platforms = platforms.unix; maintainers = with maintainers; [ aaronjheng ]; }; } diff --git a/pkgs/servers/dex/default.nix b/pkgs/servers/dex/default.nix index 01d71f73a6c9..f85c9aa483c3 100644 --- a/pkgs/servers/dex/default.nix +++ b/pkgs/servers/dex/default.nix @@ -33,6 +33,5 @@ buildGoModule rec { homepage = "https://github.com/dexidp/dex"; license = licenses.asl20; maintainers = with maintainers; [ benley techknowlogick ]; - platforms = platforms.unix; }; } diff --git a/pkgs/servers/dgraph/default.nix b/pkgs/servers/dgraph/default.nix index a324f64abfb4..00b85ddb859f 100644 --- a/pkgs/servers/dgraph/default.nix +++ b/pkgs/servers/dgraph/default.nix @@ -44,6 +44,5 @@ buildGoModule rec { maintainers = with maintainers; [ sigma ]; # Apache 2.0 because we use only build "oss" license = licenses.asl20; - platforms = platforms.unix; }; } diff --git a/pkgs/servers/geospatial/mbtileserver/default.nix b/pkgs/servers/geospatial/mbtileserver/default.nix index 6d53b602b9f6..03c7d33aefad 100644 --- a/pkgs/servers/geospatial/mbtileserver/default.nix +++ b/pkgs/servers/geospatial/mbtileserver/default.nix @@ -19,6 +19,5 @@ buildGoModule rec { changelog = "https://github.com/consbio/mbtileserver/blob/v${version}/CHANGELOG.md"; license = licenses.isc; maintainers = with maintainers; [ sikmir ]; - platforms = platforms.unix; }; } diff --git a/pkgs/servers/geospatial/pg_featureserv/default.nix b/pkgs/servers/geospatial/pg_featureserv/default.nix index d3be7cd4a4fc..5da5d16e90d9 100644 --- a/pkgs/servers/geospatial/pg_featureserv/default.nix +++ b/pkgs/servers/geospatial/pg_featureserv/default.nix @@ -20,7 +20,6 @@ buildGoModule rec { homepage = "https://github.com/CrunchyData/pg_featureserv"; license = licenses.asl20; maintainers = with maintainers; [ sikmir ]; - platforms = platforms.unix; broken = true; # vendor isn't reproducible with go > 1.17: nix-build -A $name.go-modules --check }; } diff --git a/pkgs/servers/geospatial/pg_tileserv/default.nix b/pkgs/servers/geospatial/pg_tileserv/default.nix index 59d58a6a61c8..5cd8466f97fc 100644 --- a/pkgs/servers/geospatial/pg_tileserv/default.nix +++ b/pkgs/servers/geospatial/pg_tileserv/default.nix @@ -22,6 +22,5 @@ buildGoModule rec { homepage = "https://github.com/CrunchyData/pg_tileserv"; license = licenses.asl20; maintainers = with maintainers; [ sikmir ]; - platforms = platforms.unix; }; } diff --git a/pkgs/servers/geospatial/tegola/default.nix b/pkgs/servers/geospatial/tegola/default.nix index df2ee4330d7c..6cdfe22a7a5a 100644 --- a/pkgs/servers/geospatial/tegola/default.nix +++ b/pkgs/servers/geospatial/tegola/default.nix @@ -21,7 +21,6 @@ buildGoModule rec { homepage = "https://www.tegola.io/"; description = "Mapbox Vector Tile server"; maintainers = with maintainers; [ ingenieroariel ]; - platforms = platforms.unix; license = licenses.mit; }; } diff --git a/pkgs/servers/matterbridge/default.nix b/pkgs/servers/matterbridge/default.nix index 1810a74d0bea..0d175f026c29 100644 --- a/pkgs/servers/matterbridge/default.nix +++ b/pkgs/servers/matterbridge/default.nix @@ -20,6 +20,5 @@ buildGoModule rec { homepage = "https://github.com/42wim/matterbridge"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ ryantm ]; - platforms = platforms.unix; }; } diff --git a/pkgs/servers/mattermost/matterircd.nix b/pkgs/servers/mattermost/matterircd.nix index 6cd944470338..8f3f6d1ac61e 100644 --- a/pkgs/servers/mattermost/matterircd.nix +++ b/pkgs/servers/mattermost/matterircd.nix @@ -20,6 +20,5 @@ buildGoModule rec { homepage = "https://github.com/42wim/matterircd"; license = licenses.mit; maintainers = with maintainers; [ ]; - platforms = platforms.unix; }; } diff --git a/pkgs/servers/minio/default.nix b/pkgs/servers/minio/default.nix index 775b4353ab61..18630690cce2 100644 --- a/pkgs/servers/minio/default.nix +++ b/pkgs/servers/minio/default.nix @@ -45,7 +45,6 @@ buildGoModule rec { description = "An S3-compatible object storage server"; changelog = "https://github.com/minio/minio/releases/tag/RELEASE.${version}"; maintainers = with maintainers; [ eelco bachp ]; - platforms = platforms.unix; license = licenses.agpl3Plus; }; } diff --git a/pkgs/servers/minio/legacy_fs.nix b/pkgs/servers/minio/legacy_fs.nix index 13c29ac6e399..b1a1499767d1 100644 --- a/pkgs/servers/minio/legacy_fs.nix +++ b/pkgs/servers/minio/legacy_fs.nix @@ -45,7 +45,6 @@ buildGoModule rec { description = "An S3-compatible object storage server"; changelog = "https://github.com/minio/minio/releases/tag/RELEASE.${version}"; maintainers = with maintainers; [ eelco bachp ]; - platforms = platforms.unix; license = licenses.agpl3Plus; }; } diff --git a/pkgs/servers/mirrorbits/default.nix b/pkgs/servers/mirrorbits/default.nix index b85be770e791..c7b29036a416 100644 --- a/pkgs/servers/mirrorbits/default.nix +++ b/pkgs/servers/mirrorbits/default.nix @@ -48,6 +48,5 @@ buildGoModule rec { ''; license = licenses.mit; maintainers = with maintainers; [ fpletz ]; - platforms = platforms.unix; }; } diff --git a/pkgs/servers/misc/navidrome/default.nix b/pkgs/servers/misc/navidrome/default.nix index 6acfe0dc9f23..412f76aaec73 100644 --- a/pkgs/servers/misc/navidrome/default.nix +++ b/pkgs/servers/misc/navidrome/default.nix @@ -79,7 +79,6 @@ buildGoModule rec { homepage = "https://www.navidrome.org/"; license = lib.licenses.gpl3Only; sourceProvenance = with lib.sourceTypes; [ fromSource ]; - platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ aciceri squalus ]; # Broken on Darwin: sandbox-exec: pattern serialization length exceeds maximum (NixOS/nix#4119) broken = stdenv.isDarwin; diff --git a/pkgs/servers/monitoring/bosun/default.nix b/pkgs/servers/monitoring/bosun/default.nix index aaea36532158..d001d245d4c0 100644 --- a/pkgs/servers/monitoring/bosun/default.nix +++ b/pkgs/servers/monitoring/bosun/default.nix @@ -22,7 +22,6 @@ buildGoModule { license = licenses.mit; homepage = "https://bosun.org"; maintainers = with maintainers; [ offline ]; - platforms = platforms.unix; broken = stdenv.isDarwin; }; } diff --git a/pkgs/servers/monitoring/grafana-dash-n-grab/default.nix b/pkgs/servers/monitoring/grafana-dash-n-grab/default.nix index 238f497776ed..3f6b33b6c1e7 100644 --- a/pkgs/servers/monitoring/grafana-dash-n-grab/default.nix +++ b/pkgs/servers/monitoring/grafana-dash-n-grab/default.nix @@ -29,7 +29,6 @@ buildGoModule rec { license = licenses.bsd3; homepage = "https://github.com/esnet/gdg"; maintainers = with maintainers; teams.bitnomial.members; - platforms = platforms.unix; mainProgram = "gdg"; changelog = "https://github.com/esnet/gdg/releases/tag/v${version}"; diff --git a/pkgs/servers/monitoring/mimir/default.nix b/pkgs/servers/monitoring/mimir/default.nix index a8d83d151eab..a32ff40ef03c 100644 --- a/pkgs/servers/monitoring/mimir/default.nix +++ b/pkgs/servers/monitoring/mimir/default.nix @@ -42,6 +42,5 @@ buildGoModule rec { homepage = "https://github.com/grafana/mimir"; license = licenses.agpl3Only; maintainers = with maintainers; [ happysalada bryanhonof ]; - platforms = platforms.unix; }; } diff --git a/pkgs/servers/monitoring/prometheus/alertmanager.nix b/pkgs/servers/monitoring/prometheus/alertmanager.nix index d7e6c01fe022..ab543143eaa2 100644 --- a/pkgs/servers/monitoring/prometheus/alertmanager.nix +++ b/pkgs/servers/monitoring/prometheus/alertmanager.nix @@ -45,6 +45,5 @@ buildGoModule rec { changelog = "https://github.com/prometheus/alertmanager/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ benley fpletz globin Frostman ]; - platforms = platforms.unix; }; } diff --git a/pkgs/servers/monitoring/prometheus/bind-exporter.nix b/pkgs/servers/monitoring/prometheus/bind-exporter.nix index 20da4e64c1e4..8610a888c48a 100644 --- a/pkgs/servers/monitoring/prometheus/bind-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/bind-exporter.nix @@ -20,6 +20,5 @@ buildGoModule rec { homepage = "https://github.com/digitalocean/bind_exporter"; license = licenses.asl20; maintainers = with maintainers; [ rtreffer ]; - platforms = platforms.unix; }; } diff --git a/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix b/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix index fe1cdc817ac4..39f37ae58e1d 100644 --- a/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix @@ -34,6 +34,5 @@ buildGoModule rec { homepage = "https://github.com/prometheus/blackbox_exporter"; license = licenses.asl20; maintainers = with maintainers; [ globin fpletz willibutz Frostman ma27 ]; - platforms = platforms.unix; }; } diff --git a/pkgs/servers/monitoring/prometheus/collectd-exporter.nix b/pkgs/servers/monitoring/prometheus/collectd-exporter.nix index b4db3ee5679f..3c34ca8b56fa 100644 --- a/pkgs/servers/monitoring/prometheus/collectd-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/collectd-exporter.nix @@ -22,6 +22,5 @@ buildGoModule rec { homepage = "https://github.com/prometheus/collectd_exporter"; license = licenses.asl20; maintainers = with maintainers; [ benley ]; - platforms = platforms.unix; }; } diff --git a/pkgs/servers/monitoring/prometheus/consul-exporter.nix b/pkgs/servers/monitoring/prometheus/consul-exporter.nix index cab01f1eb75f..ef6cd07e9f0e 100644 --- a/pkgs/servers/monitoring/prometheus/consul-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/consul-exporter.nix @@ -27,6 +27,5 @@ buildGoModule rec { changelog = "https://github.com/prometheus/consul_exporter/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ hectorj ]; - platforms = platforms.unix; }; } diff --git a/pkgs/servers/monitoring/prometheus/fritzbox-exporter.nix b/pkgs/servers/monitoring/prometheus/fritzbox-exporter.nix index bd8f667b11c2..0a852b35ecb4 100644 --- a/pkgs/servers/monitoring/prometheus/fritzbox-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/fritzbox-exporter.nix @@ -22,6 +22,5 @@ buildGoModule rec { homepage = "https://github.com/mxschmitt/fritzbox_exporter"; license = licenses.asl20; maintainers = with maintainers; [ bachp flokli sbruder ]; - platforms = platforms.unix; }; } diff --git a/pkgs/servers/monitoring/prometheus/haproxy-exporter.nix b/pkgs/servers/monitoring/prometheus/haproxy-exporter.nix index 24784e23585e..aa558bc8c9fd 100644 --- a/pkgs/servers/monitoring/prometheus/haproxy-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/haproxy-exporter.nix @@ -20,6 +20,5 @@ buildGoModule rec { homepage = "https://github.com/prometheus/haproxy_exporter"; license = licenses.asl20; maintainers = with maintainers; [ benley ]; - platforms = platforms.unix; }; } diff --git a/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix b/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix index 25fd4552daed..2a546672ec7b 100644 --- a/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix @@ -32,6 +32,5 @@ buildGoModule rec { homepage = "https://github.com/prometheus/mysqld_exporter"; license = licenses.asl20; maintainers = with maintainers; [ benley globin ]; - platforms = platforms.unix; }; } diff --git a/pkgs/servers/monitoring/prometheus/nextcloud-exporter.nix b/pkgs/servers/monitoring/prometheus/nextcloud-exporter.nix index cbe5c6ebbace..a0984b510260 100644 --- a/pkgs/servers/monitoring/prometheus/nextcloud-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/nextcloud-exporter.nix @@ -21,6 +21,5 @@ buildGoModule rec { license = licenses.mit; maintainers = with maintainers; [ willibutz ]; mainProgram = "nextcloud-exporter"; - platforms = platforms.unix; }; } diff --git a/pkgs/servers/monitoring/prometheus/nginx-exporter.nix b/pkgs/servers/monitoring/prometheus/nginx-exporter.nix index 903ae7aa2cae..1b5d81e03623 100644 --- a/pkgs/servers/monitoring/prometheus/nginx-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/nginx-exporter.nix @@ -22,6 +22,5 @@ buildGoModule rec { homepage = "https://github.com/nginxinc/nginx-prometheus-exporter"; license = licenses.asl20; maintainers = with maintainers; [ benley fpletz willibutz globin ]; - platforms = platforms.unix; }; } diff --git a/pkgs/servers/monitoring/prometheus/prom2json.nix b/pkgs/servers/monitoring/prometheus/prom2json.nix index 5778bdd589da..c197bf6366c3 100644 --- a/pkgs/servers/monitoring/prometheus/prom2json.nix +++ b/pkgs/servers/monitoring/prometheus/prom2json.nix @@ -18,6 +18,5 @@ buildGoModule rec { homepage = "https://github.com/prometheus/prom2json"; license = licenses.asl20; maintainers = with maintainers; [ benley ]; - platforms = platforms.unix; }; } diff --git a/pkgs/servers/monitoring/prometheus/promscale/default.nix b/pkgs/servers/monitoring/prometheus/promscale/default.nix index 7dcc5f01e47c..42c624c30010 100644 --- a/pkgs/servers/monitoring/prometheus/promscale/default.nix +++ b/pkgs/servers/monitoring/prometheus/promscale/default.nix @@ -50,7 +50,6 @@ buildGoModule rec { homepage = "https://github.com/timescale/promscale"; changelog = "https://github.com/timescale/promscale/blob/${version}/CHANGELOG.md"; license = licenses.asl20; - platforms = platforms.unix; maintainers = with maintainers; [ _0x4A6F anpin ]; }; } diff --git a/pkgs/servers/monitoring/prometheus/pushgateway.nix b/pkgs/servers/monitoring/prometheus/pushgateway.nix index 5c7aef8dd059..b32c5a89c6f7 100644 --- a/pkgs/servers/monitoring/prometheus/pushgateway.nix +++ b/pkgs/servers/monitoring/prometheus/pushgateway.nix @@ -32,6 +32,5 @@ buildGoModule rec { homepage = "https://github.com/prometheus/pushgateway"; license = licenses.asl20; maintainers = with maintainers; [ benley ]; - platforms = platforms.unix; }; } diff --git a/pkgs/servers/monitoring/prometheus/rabbitmq-exporter.nix b/pkgs/servers/monitoring/prometheus/rabbitmq-exporter.nix index ff89469c2ead..dca320ccd403 100644 --- a/pkgs/servers/monitoring/prometheus/rabbitmq-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/rabbitmq-exporter.nix @@ -18,6 +18,5 @@ buildGoModule rec { homepage = "https://github.com/kbudde/rabbitmq_exporter"; license = licenses.mit; maintainers = with maintainers; [ ]; - platforms = platforms.unix; }; } diff --git a/pkgs/servers/monitoring/prometheus/redis-exporter.nix b/pkgs/servers/monitoring/prometheus/redis-exporter.nix index f0090b97032b..c744aaee92a8 100644 --- a/pkgs/servers/monitoring/prometheus/redis-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/redis-exporter.nix @@ -29,6 +29,5 @@ buildGoModule rec { homepage = "https://github.com/oliver006/redis_exporter"; license = licenses.mit; maintainers = with maintainers; [ eskytthe srhb ma27 ]; - platforms = platforms.unix; }; } diff --git a/pkgs/servers/monitoring/prometheus/smokeping-prober.nix b/pkgs/servers/monitoring/prometheus/smokeping-prober.nix index 8515bcdd59a4..bb1b8db62e9d 100644 --- a/pkgs/servers/monitoring/prometheus/smokeping-prober.nix +++ b/pkgs/servers/monitoring/prometheus/smokeping-prober.nix @@ -33,6 +33,5 @@ buildGoModule rec { homepage = "https://github.com/SuperQ/smokeping_prober"; license = licenses.asl20; maintainers = with maintainers; [ lukegb ]; - platforms = platforms.unix; }; } diff --git a/pkgs/servers/monitoring/prometheus/snmp-exporter.nix b/pkgs/servers/monitoring/prometheus/snmp-exporter.nix index 7c880509d779..90ba57bd841c 100644 --- a/pkgs/servers/monitoring/prometheus/snmp-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/snmp-exporter.nix @@ -24,6 +24,5 @@ buildGoModule rec { homepage = "https://github.com/prometheus/snmp_exporter"; license = licenses.asl20; maintainers = with maintainers; [ oida willibutz Frostman ]; - platforms = platforms.unix; }; } diff --git a/pkgs/servers/monitoring/prometheus/sql-exporter.nix b/pkgs/servers/monitoring/prometheus/sql-exporter.nix index cc9fd7d484f5..861ffbaa9796 100644 --- a/pkgs/servers/monitoring/prometheus/sql-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/sql-exporter.nix @@ -33,6 +33,5 @@ buildGoModule rec { homepage = "https://github.com/justwatchcom/sql_exporter"; license = licenses.mit; maintainers = with maintainers; [ justinas ]; - platforms = platforms.unix; }; } diff --git a/pkgs/servers/monitoring/prometheus/statsd-exporter.nix b/pkgs/servers/monitoring/prometheus/statsd-exporter.nix index 922f4330902e..a08a5b41cc8d 100644 --- a/pkgs/servers/monitoring/prometheus/statsd-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/statsd-exporter.nix @@ -22,6 +22,5 @@ buildGoModule rec { changelog = "https://github.com/prometheus/statsd_exporter/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ benley ivan ]; - platforms = platforms.unix; }; } diff --git a/pkgs/servers/monitoring/prometheus/systemd-exporter.nix b/pkgs/servers/monitoring/prometheus/systemd-exporter.nix index 4d5d97da7683..e9aff3c75757 100644 --- a/pkgs/servers/monitoring/prometheus/systemd-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/systemd-exporter.nix @@ -20,6 +20,5 @@ buildGoModule rec { homepage = "https://github.com/povilasv/systemd_exporter"; license = licenses.asl20; maintainers = with maintainers; [ chkno ]; - platforms = platforms.unix; }; } diff --git a/pkgs/servers/monitoring/prometheus/zfs-exporter.nix b/pkgs/servers/monitoring/prometheus/zfs-exporter.nix index 9112a1c51c53..079a4c53a384 100644 --- a/pkgs/servers/monitoring/prometheus/zfs-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/zfs-exporter.nix @@ -25,6 +25,5 @@ buildGoModule rec { homepage = "https://github.com/pdf/zfs_exporter"; license = licenses.mit; maintainers = with maintainers; [ peterhoeg ]; - platforms = platforms.unix; }; } diff --git a/pkgs/servers/monitoring/thanos/default.nix b/pkgs/servers/monitoring/thanos/default.nix index 09c35def8801..37814a417491 100644 --- a/pkgs/servers/monitoring/thanos/default.nix +++ b/pkgs/servers/monitoring/thanos/default.nix @@ -37,6 +37,5 @@ buildGoModule rec { homepage = "https://github.com/thanos-io/thanos"; license = licenses.asl20; maintainers = with maintainers; [ basvandijk ]; - platforms = platforms.unix; }; } diff --git a/pkgs/servers/nginx-sso/default.nix b/pkgs/servers/nginx-sso/default.nix index 1043ee519bc8..8928234f9672 100644 --- a/pkgs/servers/nginx-sso/default.nix +++ b/pkgs/servers/nginx-sso/default.nix @@ -31,6 +31,5 @@ buildGoModule rec { homepage = "https://github.com/Luzifer/nginx-sso"; license = licenses.asl20; maintainers = with maintainers; [ delroth ]; - platforms = platforms.unix; }; } diff --git a/pkgs/servers/trezord/default.nix b/pkgs/servers/trezord/default.nix index f01a060c528e..db4aa9dbcea6 100644 --- a/pkgs/servers/trezord/default.nix +++ b/pkgs/servers/trezord/default.nix @@ -35,6 +35,5 @@ buildGoModule rec { license = licenses.lgpl3Only; maintainers = with maintainers; [ canndrew jb55 prusnak mmahut _1000101 ]; mainProgram = "trezord-go"; - platforms = platforms.unix; }; } diff --git a/pkgs/shells/carapace/default.nix b/pkgs/shells/carapace/default.nix index bf4ed7feb7dd..edbc3a624337 100644 --- a/pkgs/shells/carapace/default.nix +++ b/pkgs/shells/carapace/default.nix @@ -34,6 +34,5 @@ buildGoModule rec { homepage = "https://rsteube.github.io/carapace-bin/"; maintainers = with maintainers; [ star-szr ]; license = licenses.mit; - platforms = platforms.unix; }; } diff --git a/pkgs/tools/admin/aws-rotate-key/default.nix b/pkgs/tools/admin/aws-rotate-key/default.nix index 5d228e93f118..965c6807803e 100644 --- a/pkgs/tools/admin/aws-rotate-key/default.nix +++ b/pkgs/tools/admin/aws-rotate-key/default.nix @@ -24,6 +24,5 @@ buildGoModule rec { homepage = "https://github.com/Fullscreen/aws-rotate-key"; license = licenses.mit; maintainers = [ maintainers.mbode ]; - platforms = platforms.unix; }; } diff --git a/pkgs/tools/admin/berglas/default.nix b/pkgs/tools/admin/berglas/default.nix index f9af2e94c015..75a4bc591e7b 100644 --- a/pkgs/tools/admin/berglas/default.nix +++ b/pkgs/tools/admin/berglas/default.nix @@ -56,6 +56,5 @@ buildGoModule rec { description = "A tool for managing secrets on Google Cloud"; homepage = "https://github.com/GoogleCloudPlatform/berglas"; license = licenses.asl20; - platforms = platforms.unix; }; } diff --git a/pkgs/tools/admin/scalr-cli/default.nix b/pkgs/tools/admin/scalr-cli/default.nix index eaccb70f0f7d..125d20351464 100644 --- a/pkgs/tools/admin/scalr-cli/default.nix +++ b/pkgs/tools/admin/scalr-cli/default.nix @@ -38,6 +38,5 @@ buildGoModule rec { license = licenses.asl20; maintainers = with maintainers; [ dylanmtaylor ]; mainProgram = "scalr"; - platforms = platforms.unix; }; } diff --git a/pkgs/tools/audio/mpd-mpris/default.nix b/pkgs/tools/audio/mpd-mpris/default.nix index d7548bf9abf5..39dbcb952329 100644 --- a/pkgs/tools/audio/mpd-mpris/default.nix +++ b/pkgs/tools/audio/mpd-mpris/default.nix @@ -29,6 +29,5 @@ buildGoModule rec { homepage = "https://github.com/natsukagami/mpd-mpris"; license = licenses.mit; maintainers = with maintainers; [ doronbehar ]; - platforms = platforms.unix; }; } diff --git a/pkgs/tools/backup/gamerbackup/default.nix b/pkgs/tools/backup/gamerbackup/default.nix index a6e6246bb339..3ed1df9058cf 100644 --- a/pkgs/tools/backup/gamerbackup/default.nix +++ b/pkgs/tools/backup/gamerbackup/default.nix @@ -26,6 +26,5 @@ buildGoModule { homepage = "https://github.com/leijurv/gb"; license = licenses.agpl3Only; maintainers = with maintainers; [ babbaj ]; - platforms = platforms.unix; }; } diff --git a/pkgs/tools/backup/restic/rest-server.nix b/pkgs/tools/backup/restic/rest-server.nix index 4eb50aa9de10..ded6bbaa533b 100644 --- a/pkgs/tools/backup/restic/rest-server.nix +++ b/pkgs/tools/backup/restic/rest-server.nix @@ -17,7 +17,6 @@ buildGoModule rec { changelog = "https://github.com/restic/rest-server/blob/${src.rev}/CHANGELOG.md"; description = "A high performance HTTP server that implements restic's REST backend API"; homepage = "https://github.com/restic/rest-server"; - platforms = platforms.unix; license = licenses.bsd2; maintainers = with maintainers; [ dotlambda ]; }; diff --git a/pkgs/tools/filesystems/gcsfuse/default.nix b/pkgs/tools/filesystems/gcsfuse/default.nix index 795e653087b1..b04497b1104c 100644 --- a/pkgs/tools/filesystems/gcsfuse/default.nix +++ b/pkgs/tools/filesystems/gcsfuse/default.nix @@ -42,7 +42,6 @@ buildGoModule rec { homepage = "https://cloud.google.com/storage/docs/gcs-fuse"; changelog = "https://github.com/GoogleCloudPlatform/gcsfuse/releases/tag/v${version}"; license = licenses.asl20; - platforms = platforms.unix; maintainers = with maintainers; [ aaronjheng ]; }; } diff --git a/pkgs/tools/misc/adrgen/default.nix b/pkgs/tools/misc/adrgen/default.nix index 777994d83edd..6f8c50bd19d0 100644 --- a/pkgs/tools/misc/adrgen/default.nix +++ b/pkgs/tools/misc/adrgen/default.nix @@ -38,7 +38,6 @@ buildGoModule rec { homepage = "https://github.com/asiermarques/adrgen"; description = "A command-line tool for generating and managing Architecture Decision Records"; license = licenses.mit; - platforms = platforms.unix; maintainers = [ maintainers.ivar ]; }; } diff --git a/pkgs/tools/misc/aptly/default.nix b/pkgs/tools/misc/aptly/default.nix index e42d4871e117..7af1612acdd3 100644 --- a/pkgs/tools/misc/aptly/default.nix +++ b/pkgs/tools/misc/aptly/default.nix @@ -35,7 +35,6 @@ buildGoModule rec { homepage = "https://www.aptly.info"; description = "Debian repository management tool"; license = licenses.mit; - platforms = platforms.unix; maintainers = with maintainers; [ montag451 ] ++ teams.bitnomial.members; changelog = "https://github.com/aptly-dev/aptly/releases/tag/v${version}"; diff --git a/pkgs/tools/misc/claws/default.nix b/pkgs/tools/misc/claws/default.nix index 7c9a35f1ebce..9d360e40c2a8 100644 --- a/pkgs/tools/misc/claws/default.nix +++ b/pkgs/tools/misc/claws/default.nix @@ -19,7 +19,6 @@ buildGoModule rec { homepage = "https://github.com/thehowl/claws"; description = "Interactive command line client for testing websocket servers"; license = licenses.mit; - platforms = platforms.unix; maintainers = with maintainers; [ aaronjheng ]; }; } diff --git a/pkgs/tools/misc/duf/default.nix b/pkgs/tools/misc/duf/default.nix index 5359c37e01bc..5416f0c87cf1 100644 --- a/pkgs/tools/misc/duf/default.nix +++ b/pkgs/tools/misc/duf/default.nix @@ -25,7 +25,6 @@ buildGoModule rec { homepage = "https://github.com/muesli/duf/"; description = "Disk Usage/Free Utility"; license = licenses.mit; - platforms = platforms.unix; maintainers = with maintainers; [ penguwin SuperSandro2000 ]; }; } diff --git a/pkgs/tools/misc/dwarf2json/default.nix b/pkgs/tools/misc/dwarf2json/default.nix index acad4c64bfee..57aaf861186d 100644 --- a/pkgs/tools/misc/dwarf2json/default.nix +++ b/pkgs/tools/misc/dwarf2json/default.nix @@ -17,7 +17,6 @@ buildGoModule rec { homepage = "https://github.com/volatilityfoundation/dwarf2json"; description = "Convert ELF/DWARF symbol and type information into vol3's intermediate JSON"; license = licenses.vol-sl; - platforms = platforms.unix; maintainers = with maintainers; [ arkivm ]; }; } diff --git a/pkgs/tools/misc/fsql/default.nix b/pkgs/tools/misc/fsql/default.nix index 0f2300a74805..7111d7c82306 100644 --- a/pkgs/tools/misc/fsql/default.nix +++ b/pkgs/tools/misc/fsql/default.nix @@ -20,6 +20,5 @@ buildGoModule rec { homepage = "https://github.com/kshvmdn/fsql"; license = licenses.mit; maintainers = with maintainers; [ pSub ]; - platforms = platforms.unix; }; } diff --git a/pkgs/tools/misc/grit/default.nix b/pkgs/tools/misc/grit/default.nix index 04f88360fed7..5b3aca5e25ce 100644 --- a/pkgs/tools/misc/grit/default.nix +++ b/pkgs/tools/misc/grit/default.nix @@ -18,7 +18,6 @@ buildGoModule rec { description = "A multitree-based personal task manager"; homepage = "https://github.com/climech/grit"; license = licenses.mit; - platforms = platforms.unix; maintainers = [ maintainers.ivar ]; }; } diff --git a/pkgs/tools/misc/lokalise2-cli/default.nix b/pkgs/tools/misc/lokalise2-cli/default.nix index cd569b8cc624..e5e7d4bcdb41 100644 --- a/pkgs/tools/misc/lokalise2-cli/default.nix +++ b/pkgs/tools/misc/lokalise2-cli/default.nix @@ -25,6 +25,5 @@ buildGoModule rec { license = licenses.bsd3; maintainers = with maintainers; [ timstott ]; mainProgram = "lokalise2"; - platforms = platforms.unix; }; } diff --git a/pkgs/tools/misc/powerline-go/default.nix b/pkgs/tools/misc/powerline-go/default.nix index 970d7a0c3952..2b328e474bb9 100644 --- a/pkgs/tools/misc/powerline-go/default.nix +++ b/pkgs/tools/misc/powerline-go/default.nix @@ -21,7 +21,6 @@ buildGoModule rec { homepage = "https://github.com/justjanne/powerline-go"; changelog = "https://github.com/justjanne/powerline-go/releases/tag/v${version}"; license = licenses.gpl3Plus; - platforms = platforms.unix; maintainers = with maintainers; [ sifmelcara ]; mainProgram = "powerline-go"; }; diff --git a/pkgs/tools/networking/brook/default.nix b/pkgs/tools/networking/brook/default.nix index b507aecb2867..ed01beeb7838 100644 --- a/pkgs/tools/networking/brook/default.nix +++ b/pkgs/tools/networking/brook/default.nix @@ -17,7 +17,6 @@ buildGoModule rec { homepage = "https://github.com/txthinking/brook"; description = "A cross-platform Proxy/VPN software"; license = with licenses; [ gpl3Only ]; - platforms = platforms.unix; maintainers = with maintainers; [ xrelkd ]; }; } diff --git a/pkgs/tools/networking/cassowary/default.nix b/pkgs/tools/networking/cassowary/default.nix index b79df12bfb49..f56e4cc7f201 100644 --- a/pkgs/tools/networking/cassowary/default.nix +++ b/pkgs/tools/networking/cassowary/default.nix @@ -20,6 +20,5 @@ buildGoModule rec { description = "Modern cross-platform HTTP load-testing tool written in Go"; license = licenses.mit; maintainers = with maintainers; [ hugoreeves ]; - platforms = platforms.unix; }; } diff --git a/pkgs/tools/networking/doggo/default.nix b/pkgs/tools/networking/doggo/default.nix index d267cf276c49..10d2fef2ef3a 100644 --- a/pkgs/tools/networking/doggo/default.nix +++ b/pkgs/tools/networking/doggo/default.nix @@ -38,7 +38,6 @@ buildGoModule rec { It outputs information in a neat concise manner and supports protocols like DoH, DoT, DoQ, and DNSCrypt as well ''; license = licenses.gpl3Only; - platforms = platforms.unix; maintainers = with maintainers; [ georgesalkhouri ]; }; } diff --git a/pkgs/tools/networking/goreplay/default.nix b/pkgs/tools/networking/goreplay/default.nix index 5d65e110d9c6..404ed07460ac 100644 --- a/pkgs/tools/networking/goreplay/default.nix +++ b/pkgs/tools/networking/goreplay/default.nix @@ -31,7 +31,6 @@ buildGoModule rec { homepage = "https://github.com/buger/goreplay"; license = lib.licenses.lgpl3Only; description = "Open-source tool for capturing and replaying live HTTP traffic"; - platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ lovek323 ]; }; } diff --git a/pkgs/tools/networking/ligolo-ng/default.nix b/pkgs/tools/networking/ligolo-ng/default.nix index c2a9cf425245..fabd4de1f49f 100644 --- a/pkgs/tools/networking/ligolo-ng/default.nix +++ b/pkgs/tools/networking/ligolo-ng/default.nix @@ -24,7 +24,6 @@ buildGoModule rec { meta = with lib; { homepage = "https://github.com/tnpitsecurity/ligolo-ng"; description = "A tunneling/pivoting tool that uses a TUN interface"; - platforms = platforms.unix; license = licenses.gpl3Only; maintainers = with maintainers; [ elohmeier ]; }; diff --git a/pkgs/tools/networking/minio-client/default.nix b/pkgs/tools/networking/minio-client/default.nix index 39ef3ae81cb6..f8c4175e8a3c 100644 --- a/pkgs/tools/networking/minio-client/default.nix +++ b/pkgs/tools/networking/minio-client/default.nix @@ -33,7 +33,6 @@ buildGoModule rec { description = "A replacement for ls, cp, mkdir, diff and rsync commands for filesystems and object storage"; maintainers = with maintainers; [ bachp eelco ]; mainProgram = "mc"; - platforms = platforms.unix; license = licenses.asl20; }; } diff --git a/pkgs/tools/networking/pixiecore/default.nix b/pkgs/tools/networking/pixiecore/default.nix index c8c5ca118dd4..371d39193f36 100644 --- a/pkgs/tools/networking/pixiecore/default.nix +++ b/pkgs/tools/networking/pixiecore/default.nix @@ -23,6 +23,5 @@ buildGoModule rec { homepage = "https://github.com/danderson/netboot/tree/master/pixiecore"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ bbigras danderson ]; - platforms = lib.platforms.unix; }; } diff --git a/pkgs/tools/package-management/morph/default.nix b/pkgs/tools/package-management/morph/default.nix index b8810ad36dfc..ec2e63fe3972 100644 --- a/pkgs/tools/package-management/morph/default.nix +++ b/pkgs/tools/package-management/morph/default.nix @@ -33,6 +33,5 @@ buildGoModule rec { license = licenses.mit; homepage = "https://github.com/dbcdk/morph"; maintainers = with maintainers; [adamt johanot]; - platforms = platforms.unix; }; } diff --git a/pkgs/tools/package-management/mynewt-newt/default.nix b/pkgs/tools/package-management/mynewt-newt/default.nix index 9d97a472a160..ea0c1d06073f 100644 --- a/pkgs/tools/package-management/mynewt-newt/default.nix +++ b/pkgs/tools/package-management/mynewt-newt/default.nix @@ -33,6 +33,5 @@ buildGoModule rec { ''; license = licenses.asl20; maintainers = with maintainers; [ pjones ]; - platforms = platforms.unix; }; } diff --git a/pkgs/tools/security/keybase/kbfs.nix b/pkgs/tools/security/keybase/kbfs.nix index 52fedf3feef4..71368e35d5e1 100644 --- a/pkgs/tools/security/keybase/kbfs.nix +++ b/pkgs/tools/security/keybase/kbfs.nix @@ -14,7 +14,6 @@ buildGoModule { meta = with lib; { homepage = "https://keybase.io/docs/kbfs"; description = "The Keybase filesystem"; - platforms = platforms.unix; maintainers = with maintainers; [ avaq rvolosatovs bennofs np shofius ]; license = licenses.bsd3; }; diff --git a/pkgs/tools/security/saml2aws/default.nix b/pkgs/tools/security/saml2aws/default.nix index 57655b32dc6a..cddb284e80c3 100644 --- a/pkgs/tools/security/saml2aws/default.nix +++ b/pkgs/tools/security/saml2aws/default.nix @@ -25,7 +25,6 @@ buildGoModule rec { description = "CLI tool which enables you to login and retrieve AWS temporary credentials using a SAML IDP"; homepage = "https://github.com/Versent/saml2aws"; license = licenses.mit; - platforms = lib.platforms.unix; maintainers = [ lib.maintainers.pmyjavec ]; }; } diff --git a/pkgs/tools/security/ssh-to-age/default.nix b/pkgs/tools/security/ssh-to-age/default.nix index ec69085db959..2d0b7330e3ee 100644 --- a/pkgs/tools/security/ssh-to-age/default.nix +++ b/pkgs/tools/security/ssh-to-age/default.nix @@ -26,6 +26,5 @@ buildGoModule rec { homepage = "https://github.com/Mic92/ssh-to-age"; license = licenses.mit; maintainers = with maintainers; [ mic92 ]; - platforms = platforms.unix; }; } diff --git a/pkgs/tools/system/gohai/default.nix b/pkgs/tools/system/gohai/default.nix index 40fc48b8ffa6..1de0fa7c4e3c 100644 --- a/pkgs/tools/system/gohai/default.nix +++ b/pkgs/tools/system/gohai/default.nix @@ -22,8 +22,6 @@ buildGoModule rec { homepage = "https://github.com/DataDog/gohai"; license = licenses.mit; maintainers = with maintainers; [ tazjin ]; - platforms = platforms.unix; - longDescription = '' Gohai is a tool which collects an inventory of system information. It is used by the Datadog agent to provide detailed diff --git a/pkgs/tools/system/systemd-journal2gelf/default.nix b/pkgs/tools/system/systemd-journal2gelf/default.nix index db8d1003cd3c..21db5f5c72ff 100644 --- a/pkgs/tools/system/systemd-journal2gelf/default.nix +++ b/pkgs/tools/system/systemd-journal2gelf/default.nix @@ -22,6 +22,5 @@ buildGoModule rec { homepage = "https://github.com/parse-nl/SystemdJournal2Gelf"; license = licenses.bsd2; maintainers = with maintainers; [ fadenb fpletz ]; - platforms = platforms.unix; }; } diff --git a/pkgs/tools/text/gucci/default.nix b/pkgs/tools/text/gucci/default.nix index b30a21a6f49c..855a61186a87 100644 --- a/pkgs/tools/text/gucci/default.nix +++ b/pkgs/tools/text/gucci/default.nix @@ -34,6 +34,5 @@ buildGoModule rec { homepage = "https://github.com/noqcks/gucci"; license = licenses.mit; maintainers = with maintainers; [ braydenjw ]; - platforms = platforms.unix; }; } diff --git a/pkgs/tools/typesetting/mmark/default.nix b/pkgs/tools/typesetting/mmark/default.nix index 55de563c538b..0cb100dde5e3 100644 --- a/pkgs/tools/typesetting/mmark/default.nix +++ b/pkgs/tools/typesetting/mmark/default.nix @@ -27,6 +27,5 @@ buildGoModule rec { homepage = "https://github.com/mmarkdown/mmark"; license = with lib.licenses; bsd2; maintainers = with lib.maintainers; [ yrashk ]; - platforms = lib.platforms.unix; }; } From 3faabf59810756eb4b0883338afc99a53c154f74 Mon Sep 17 00:00:00 2001 From: Ilan Joselevich Date: Tue, 13 Jun 2023 18:10:10 +0300 Subject: [PATCH 144/165] pam_rssh: init at unstable-2023-03-18 --- pkgs/os-specific/linux/pam_rssh/default.nix | 71 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 73 insertions(+) create mode 100644 pkgs/os-specific/linux/pam_rssh/default.nix diff --git a/pkgs/os-specific/linux/pam_rssh/default.nix b/pkgs/os-specific/linux/pam_rssh/default.nix new file mode 100644 index 000000000000..51cba4d84200 --- /dev/null +++ b/pkgs/os-specific/linux/pam_rssh/default.nix @@ -0,0 +1,71 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, pkg-config +, openssl +, pam +, openssh +}: + +rustPlatform.buildRustPackage { + pname = "pam_rssh"; + version = "unstable-2023-03-18"; + + src = fetchFromGitHub { + owner = "z4yx"; + repo = "pam_rssh"; + rev = "92c240bd079e9711c7afa8bacfcf01de48f42577"; + hash = "sha256-mIQeItPh6RrF3cFbAth2Kmb2E/Xj+lOgatvjcLE4Yag="; + fetchSubmodules = true; + }; + + cargoHash = "sha256-/AQqjmAGgvnpVWyoK3ymZ1gNAhTSN30KQEiqv4G+zx8="; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + openssl + pam + ]; + + checkFlags = [ + # Fails because it tries finding authorized_keys in /home/$USER. + "--skip=tests::parse_user_authorized_keys" + ]; + + nativeCheckInputs = [ + openssh + ]; + + env.USER = "nixbld"; + + # Copied from https://github.com/z4yx/pam_rssh/blob/main/.github/workflows/rust.yml. + preCheck = '' + export HOME=$(mktemp -d) + mkdir $HOME/.ssh + ssh-keygen -q -N "" -t ecdsa -b 521 -f $HOME/.ssh/id_ecdsa521 + ssh-keygen -q -N "" -t ecdsa -b 384 -f $HOME/.ssh/id_ecdsa384 + ssh-keygen -q -N "" -t ecdsa -b 256 -f $HOME/.ssh/id_ecdsa256 + ssh-keygen -q -N "" -t ed25519 -f $HOME/.ssh/id_ed25519 + ssh-keygen -q -N "" -t rsa -f $HOME/.ssh/id_rsa + ssh-keygen -q -N "" -t dsa -f $HOME/.ssh/id_dsa + export SSH_AUTH_SOCK=$HOME/ssh-agent.sock + eval $(ssh-agent -a $SSH_AUTH_SOCK) + ssh-add $HOME/.ssh/id_ecdsa521 + ssh-add $HOME/.ssh/id_ecdsa384 + ssh-add $HOME/.ssh/id_ecdsa256 + ssh-add $HOME/.ssh/id_ed25519 + ssh-add $HOME/.ssh/id_rsa + ssh-add $HOME/.ssh/id_dsa + ''; + + meta = with lib; { + description = "PAM module for authenticating via ssh-agent, written in Rust"; + homepage = "https://github.com/z4yx/pam_rssh"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ kranzes ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9bb2c80d05f2..bf435120b11e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27608,6 +27608,8 @@ with pkgs; pam_pgsql = callPackage ../os-specific/linux/pam_pgsql { }; + pam_rssh = callPackage ../os-specific/linux/pam_rssh { }; + pam_ssh_agent_auth = callPackage ../os-specific/linux/pam_ssh_agent_auth { }; pam_tmpdir = callPackage ../os-specific/linux/pam_tmpdir { }; From 90df9066a12a20283abcbfe2ad5731a7bc184e7c Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Tue, 13 Jun 2023 18:11:56 +0300 Subject: [PATCH 145/165] libmilter: fix build on darwin --- pkgs/development/libraries/libmilter/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libmilter/default.nix b/pkgs/development/libraries/libmilter/default.nix index 679408c89828..3ff3a4ffa9fb 100644 --- a/pkgs/development/libraries/libmilter/default.nix +++ b/pkgs/development/libraries/libmilter/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ m4 ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; postInstall = lib.optionalString stdenv.isDarwin '' - fixDarwinDylibNames $out/lib/libmilter.dylib.1 + fixDarwinDylibNames $out/lib/libmilter.*.1 ''; meta = with lib; { From f66349950fd7d7ac5bffc086005fbac3b18b79dc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 13 Jun 2023 16:14:15 +0000 Subject: [PATCH 146/165] go-swagger: 0.30.4 -> 0.30.5 --- pkgs/development/tools/go-swagger/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/go-swagger/default.nix b/pkgs/development/tools/go-swagger/default.nix index bd4411ad768c..5a536db51c22 100644 --- a/pkgs/development/tools/go-swagger/default.nix +++ b/pkgs/development/tools/go-swagger/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "go-swagger"; - version = "0.30.4"; + version = "0.30.5"; src = fetchFromGitHub { owner = "go-swagger"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-5jnSuJqy5oaRxmZh2rr1hoBJPS4S9s0FhMZ4AY61w1I="; + hash = "sha256-38Ytv/mQVi0xTydFTPNizJIjYPL+lOws6jHsRjxSC4o="; }; - vendorHash = "sha256-EVsJP04yBiquux5LRR23bGRzrLiXBO9VA8UGlZEpgi8="; + vendorHash = "sha256-TqoTzxPGF0BBUfLtYWkljRcmr08m4zo5iroWMklxL7U="; doCheck = false; From 5a93954d8c8d55fb3362d3d3b32a2ea7bcfaf176 Mon Sep 17 00:00:00 2001 From: novenary Date: Tue, 13 Jun 2023 19:18:05 +0300 Subject: [PATCH 147/165] shotgun: remove build script workaround No longer necessary as of 2.4.0. See: https://github.com/neXromancers/shotgun/commit/ba5c70bb20ea1d56c4a5df43d467d107f2c7c418 --- pkgs/tools/graphics/shotgun/default.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkgs/tools/graphics/shotgun/default.nix b/pkgs/tools/graphics/shotgun/default.nix index 8805da7ebe71..d2b030594150 100644 --- a/pkgs/tools/graphics/shotgun/default.nix +++ b/pkgs/tools/graphics/shotgun/default.nix @@ -17,11 +17,6 @@ rustPlatform.buildRustPackage rec { buildInputs = [ libXrandr libX11 ]; - # build script tries to run git to get the current tag - postPatch = '' - echo "fn main() {}" > build.rs - ''; - meta = with lib; { description = "Minimal X screenshot utility"; homepage = "https://github.com/neXromancers/shotgun"; From 5ace6ef7debec3b712a9063ba3863a91e4331178 Mon Sep 17 00:00:00 2001 From: novenary Date: Tue, 13 Jun 2023 19:26:04 +0300 Subject: [PATCH 148/165] shotgun: 2.4.0 -> 2.5.0 --- pkgs/tools/graphics/shotgun/default.nix | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/graphics/shotgun/default.nix b/pkgs/tools/graphics/shotgun/default.nix index d2b030594150..eab31c3bfda5 100644 --- a/pkgs/tools/graphics/shotgun/default.nix +++ b/pkgs/tools/graphics/shotgun/default.nix @@ -1,21 +1,17 @@ -{ lib, rustPlatform, fetchFromGitHub, pkg-config, libXrandr, libX11 }: +{ lib, rustPlatform, fetchFromGitHub }: rustPlatform.buildRustPackage rec { pname = "shotgun"; - version = "2.4.0"; + version = "2.5.0"; src = fetchFromGitHub { owner = "neXromancers"; repo = pname; rev = "v${version}"; - sha256 = "sha256-fcb+eZXzpuEPFSZexbgDpoBX85gsiIqPlcPXruNGenk="; + sha256 = "sha256-ovqPBZznDQnQa9YW1xXA02Jl0AQ7sJNpzovA1SVR8Zc="; }; - cargoSha256 = "sha256-n5HPl2h0fr0MyGBivNVrrs23HAllIYtwaw1aaKWHCe4="; - - nativeBuildInputs = [ pkg-config ]; - - buildInputs = [ libXrandr libX11 ]; + cargoSha256 = "sha256-mWifSN9Hpsivq0RdZ9l9+8CWaZMHfzzhT2r27FAuesU="; meta = with lib; { description = "Minimal X screenshot utility"; From dc8eaddb93d8baec870f2c3735e6112e180517ec Mon Sep 17 00:00:00 2001 From: novenary Date: Tue, 13 Jun 2023 19:30:44 +0300 Subject: [PATCH 149/165] shotgun: add novenary to maintainers I am upstream, so I think it's appropriate for me to be listed here too. --- pkgs/tools/graphics/shotgun/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/graphics/shotgun/default.nix b/pkgs/tools/graphics/shotgun/default.nix index eab31c3bfda5..fd774726285b 100644 --- a/pkgs/tools/graphics/shotgun/default.nix +++ b/pkgs/tools/graphics/shotgun/default.nix @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec { description = "Minimal X screenshot utility"; homepage = "https://github.com/neXromancers/shotgun"; license = with licenses; [ mpl20 ]; - maintainers = with maintainers; [ figsoda lumi ]; + maintainers = with maintainers; [ figsoda lumi novenary ]; platforms = platforms.linux; }; } From 1f2bba0f531bcf6b3b74fd69e557d4b60c4f1f4a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 13 Jun 2023 16:32:34 +0000 Subject: [PATCH 150/165] jfrog-cli: 2.38.5 -> 2.40.0 --- pkgs/tools/misc/jfrog-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/jfrog-cli/default.nix b/pkgs/tools/misc/jfrog-cli/default.nix index edc2490702e4..59646ef72df3 100644 --- a/pkgs/tools/misc/jfrog-cli/default.nix +++ b/pkgs/tools/misc/jfrog-cli/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "jfrog-cli"; - version = "2.38.5"; + version = "2.40.0"; src = fetchFromGitHub { owner = "jfrog"; repo = "jfrog-cli"; rev = "refs/tags/v${version}"; - hash = "sha256-fd5YJCaqT78TjhC3CkX7+iPTxW278U7GTiXLH46L2m4="; + hash = "sha256-Fhpg78IV+NEkKXWk0Xw58uE6G2qfaYhgKfhmTVAGvEo="; }; - vendorHash = "sha256-6sUifqqryPrlwOFYPKp1VrgGE+xF/ELz8s7eLrMJnr4="; + vendorHash = "sha256-zzqXl6i1ZrxIU9ePzTd+drOtPU76DcfLY8RDu/rVNzE="; postInstall = '' # Name the output the same way as the original build script does From 97cc99c5afb7ab2c57cfb855efdacc6c401d6a1d Mon Sep 17 00:00:00 2001 From: Ryan Horiguchi Date: Tue, 13 Jun 2023 19:14:29 +0200 Subject: [PATCH 151/165] plex: 1.32.3.7162-b0a36929b -> 1.32.3.7192-7aa441827 --- pkgs/servers/plex/raw.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/plex/raw.nix b/pkgs/servers/plex/raw.nix index 6714d1d35b45..259e7f5b3140 100644 --- a/pkgs/servers/plex/raw.nix +++ b/pkgs/servers/plex/raw.nix @@ -12,16 +12,16 @@ # server, and the FHS userenv and corresponding NixOS module should # automatically pick up the changes. stdenv.mkDerivation rec { - version = "1.32.3.7162-b0a36929b"; + version = "1.32.3.7192-7aa441827"; pname = "plexmediaserver"; # Fetch the source src = if stdenv.hostPlatform.system == "aarch64-linux" then fetchurl { url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_arm64.deb"; - sha256 = "sha256-y1H1DmgMCYEzmhN01LgFHPzN/as2z457tZMdEJ0lgxk="; + sha256 = "sha256-sqlvJIMlyrRfvtQB+IpbmWwdQBA2lEGNPEc3zTfwr4s="; } else fetchurl { url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_amd64.deb"; - sha256 = "sha256-q95xyp+XJbDuT+SRP+EbcFDqqdcvRP4P1rnX8RO1egQ="; + sha256 = "sha256-F3djGd03yD64TtjnB/S8HWDNmY1kA3OgctpamGNxPZ0="; }; outputs = [ "out" "basedb" ]; From b753a7498bfadcbdea21f1f26a7574c3441cbed4 Mon Sep 17 00:00:00 2001 From: Moritz Date: Tue, 13 Jun 2023 20:27:12 +0200 Subject: [PATCH 152/165] bird-lg: 1.2.0 -> 1.3.0 (#232158) > - Fix BGPMAP showing wrong preferred protocol name (#75) > - Treat empty environment variables as valid settings (#77) > - Support setting port for WHOIS server on frontend > - Fix lgproxy handling of very long lines from BIRD daemon > - Make lgproxy parse allow IP list at startup https://github.com/xddxdd/bird-lg-go/releases/tag/v1.3.0 --- pkgs/servers/bird-lg/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/bird-lg/default.nix b/pkgs/servers/bird-lg/default.nix index 3bd0df7072b3..a7df747f6f66 100644 --- a/pkgs/servers/bird-lg/default.nix +++ b/pkgs/servers/bird-lg/default.nix @@ -3,13 +3,13 @@ let generic = { modRoot, vendorSha256 }: buildGoModule rec { pname = "bird-lg-${modRoot}"; - version = "1.2.0"; + version = "1.3.0"; src = fetchFromGitHub { owner = "xddxdd"; repo = "bird-lg-go"; rev = "v${version}"; - sha256 = "sha256-Ldp/c1UU5EFnKjlUqQ+Hh6rVEOYEX7kaDL36edr9pNA="; + hash = "sha256-VQJHrC9ag697QfCEre1KvwbotfMm8f1otJ6SPg5zRYM="; }; doDist = false; @@ -32,12 +32,12 @@ let bird-lg-frontend = generic { modRoot = "frontend"; - vendorSha256 = "sha256-lYOi3tfXYhsFaWgikDUoJYRm8sxFNFKiFQMlVx/8AkA="; + vendorSha256 = "sha256-4ajQp425SFciTi2DV3ITW4iQkq6kUJFK2BabTTb87Zo="; }; bird-lg-proxy = generic { modRoot = "proxy"; - vendorSha256 = "sha256-QHLq4RuQaCMjefs7Vl7zSVgjLMDXvIZcM8d6/B5ECZc="; + vendorSha256 = "sha256-o8F3uNGpz1fZr15HCY2PC7xRx9NakmvYrVQKe42ElOA="; }; in symlinkJoin { From e65a30f825fdf5eb59270dd16ae8c6905035150c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 13 Jun 2023 19:00:52 +0000 Subject: [PATCH 153/165] cariddi: 1.3.1 -> 1.3.2 --- pkgs/tools/security/cariddi/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/cariddi/default.nix b/pkgs/tools/security/cariddi/default.nix index 8498cb01c57f..6a41ce214d1d 100644 --- a/pkgs/tools/security/cariddi/default.nix +++ b/pkgs/tools/security/cariddi/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "cariddi"; - version = "1.3.1"; + version = "1.3.2"; src = fetchFromGitHub { owner = "edoardottt"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-zz9p35Wk5jwp5Cn4+FgJCwG2KKgBuOQsH4lJeAVhpCM="; + hash = "sha256-oM4A4chSBTiCMr3bW0AvjAFlyuqvKKKY2Ji4PYRsUqA="; }; - vendorHash = "sha256-s6aEq3LzCj9xzieLD1aC69KV3aeav+bQ5VUZ3TbFetw="; + vendorHash = "sha256-EeoJssX/OkIJKltANfvMirvDVmVVIe9hDj+rThKpd10="; meta = with lib; { description = "Crawler for URLs and endpoints"; From de847f9917c0cab84a86e5e1e86ba0cfb7135ad9 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Tue, 13 Jun 2023 21:17:59 +0200 Subject: [PATCH 154/165] openttd: 13.1 -> 13.3 --- pkgs/games/openttd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/openttd/default.nix b/pkgs/games/openttd/default.nix index e476f42380cd..3071142fc924 100644 --- a/pkgs/games/openttd/default.nix +++ b/pkgs/games/openttd/default.nix @@ -29,11 +29,11 @@ let in stdenv.mkDerivation rec { pname = "openttd"; - version = "13.1"; + version = "13.3"; src = fetchurl { url = "https://cdn.openttd.org/openttd-releases/${version}/${pname}-${version}-source.tar.xz"; - hash = "sha256-Xt8i03A1I4KF72cql9WeZCgL66sj5YR4CDTM1r4KWLs="; + hash = "sha256-qvoW0vtnFlE0xzqIj3n3pe19oXoEz26ez2csnLiecZI="; }; nativeBuildInputs = [ cmake makeWrapper ]; From 84b442b179d62d16ad26f467327beb852aa67efb Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Tue, 13 Jun 2023 21:18:12 +0200 Subject: [PATCH 155/165] openttd-jgrpp: 0.53.1 -> 0.54.1 --- pkgs/games/openttd/jgrpp.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/openttd/jgrpp.nix b/pkgs/games/openttd/jgrpp.nix index 5ceb318a67a0..46fe0ab60ac4 100644 --- a/pkgs/games/openttd/jgrpp.nix +++ b/pkgs/games/openttd/jgrpp.nix @@ -2,13 +2,13 @@ openttd.overrideAttrs (oldAttrs: rec { pname = "openttd-jgrpp"; - version = "0.53.1"; + version = "0.54.1"; src = fetchFromGitHub rec { owner = "JGRennison"; repo = "OpenTTD-patches"; rev = "jgrpp-${version}"; - hash = "sha256-+5AOsop3x1fkX5UfxMFLhrTLeSnt+E0PYoU5n31N3f4="; + hash = "sha256-MfYh2a3wjWB/5zgTE8AAIREI2OEhykqF0Rad7I+912U="; }; buildInputs = oldAttrs.buildInputs ++ [ zstd ]; From d1556ade024422dc546e7fa2f20c8a7a202adf9b Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Tue, 13 Jun 2023 21:23:16 +0200 Subject: [PATCH 156/165] code-server: use `finalAttrs` pattern - refactor code-style - add missing phases - remove cloud-agent --- pkgs/servers/code-server/default.nix | 125 ++++++++++++++++----------- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 77 insertions(+), 49 deletions(-) diff --git a/pkgs/servers/code-server/default.nix b/pkgs/servers/code-server/default.nix index 234542f7f7c6..8a07218ece48 100644 --- a/pkgs/servers/code-server/default.nix +++ b/pkgs/servers/code-server/default.nix @@ -1,12 +1,35 @@ -{ lib, stdenv, fetchFromGitHub, buildGoModule, makeWrapper -, cacert, moreutils, jq, git, rsync, pkg-config, yarn, python3 -, esbuild, nodejs_16, node-gyp, libsecret, xorg, ripgrep -, AppKit, Cocoa, CoreServices, Security, cctools, xcbuild, quilt, nixosTests }: +{ lib +, stdenv +, fetchFromGitHub +, buildGoModule +, makeWrapper +, cacert +, moreutils +, jq +, git +, rsync +, pkg-config +, yarn +, python3 +, esbuild +, nodejs +, node-gyp +, libsecret +, xorg +, ripgrep +, AppKit +, Cocoa +, CoreServices +, Security +, cctools +, xcbuild +, quilt +, nixosTests +}: let system = stdenv.hostPlatform.system; - nodejs = nodejs_16; python = python3; yarn' = yarn.override { inherit nodejs; }; defaultYarnOpts = [ ]; @@ -25,49 +48,31 @@ let }; # replaces esbuild's download script with a binary from nixpkgs - patchEsbuild = path : version : '' + patchEsbuild = path: version: '' mkdir -p ${path}/node_modules/esbuild/bin jq "del(.scripts.postinstall)" ${path}/node_modules/esbuild/package.json | sponge ${path}/node_modules/esbuild/package.json sed -i 's/${version}/${esbuild'.version}/g' ${path}/node_modules/esbuild/lib/main.js ln -s -f ${esbuild'}/bin/esbuild ${path}/node_modules/esbuild/bin/esbuild ''; - -in stdenv.mkDerivation rec { +in +stdenv.mkDerivation (finalAttrs: { pname = "code-server"; version = "4.12.0"; src = fetchFromGitHub { owner = "coder"; repo = "code-server"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; fetchSubmodules = true; hash = "sha256-PQp5dji2Ynp+LJRWBka41umwe1/IR76C+at/wyOWGcI="; }; - cloudAgent = buildGoModule rec { - pname = "cloud-agent"; - version = "0.2.6"; - - src = fetchFromGitHub { - owner = "coder"; - repo = "cloud-agent"; - rev = "v${version}"; - sha256 = "1s3jpgvzizc9skc27c3x35sya2p4ywhvdi3l73927z3j47wszy7f"; - }; - - vendorSha256 = "14xzlbmki8fk8mbcci62q8sklyd0nyga07ww1ap0vdrv7d1g31hn"; - - postPatch = '' - # the cloud-agent release tag has an empty version string, so add it back in - substituteInPlace internal/version/version.go \ - --replace 'var Version string' 'var Version string = "v${version}"' - ''; - }; - yarnCache = stdenv.mkDerivation { - name = "${pname}-${version}-${system}-yarn-cache"; - inherit src; + name = "${finalAttrs.pname}-${finalAttrs.version}-${system}-yarn-cache"; + inherit (finalAttrs) src; + nativeBuildInputs = [ yarn' git cacert ]; + buildPhase = '' export HOME=$PWD export GIT_SSL_CAINFO="${cacert}/etc/ssl/certs/ca-bundle.crt" @@ -84,21 +89,35 @@ in stdenv.mkDerivation rec { xargs -I {} yarn --cwd {} \ --ignore-scripts --ignore-engines ''; + outputHashMode = "recursive"; outputHashAlgo = "sha256"; - - # to get hash values use nix-build -A code-server.prefetchYarnCache outputHash = "sha256-4Vr9u3+W/IhbbTc39jyDyDNQODlmdF+M/N8oJn0Z4+w="; }; nativeBuildInputs = [ - nodejs yarn' python pkg-config makeWrapper git rsync jq moreutils quilt + nodejs + yarn' + python + pkg-config + makeWrapper + git + rsync + jq + moreutils + quilt ]; + buildInputs = lib.optionals (!stdenv.isDarwin) [ libsecret ] ++ (with xorg; [ libX11 libxkbfile ]) ++ lib.optionals stdenv.isDarwin [ - AppKit Cocoa CoreServices Security cctools xcbuild - ]; + AppKit + Cocoa + CoreServices + Security + cctools + xcbuild + ]; patches = [ # remove git calls from vscode build script @@ -116,6 +135,8 @@ in stdenv.mkDerivation rec { ''; configurePhase = '' + runHook preConfigure + # run yarn offline by default echo '--install.offline true' >> .yarnrc @@ -125,7 +146,7 @@ in stdenv.mkDerivation rec { '') defaultYarnOpts} # set offline mirror to yarn cache we created in previous steps - yarn --offline config set yarn-offline-mirror "${yarnCache}" + yarn --offline config set yarn-offline-mirror "${finalAttrs.yarnCache}" # skip unnecessary electron download export ELECTRON_SKIP_BINARY_DOWNLOAD=1 @@ -140,9 +161,13 @@ in stdenv.mkDerivation rec { # use updated node-gyp. fixes the following error on Darwin: # PermissionError: [Errno 1] Operation not permitted: '/usr/sbin/pkgutil' export npm_config_node_gyp=${node-gyp}/lib/node_modules/node-gyp/bin/node-gyp.js + + runHook postConfigure ''; buildPhase = '' + runHook preBuild + # install code-server dependencies yarn --offline --ignore-scripts @@ -191,7 +216,7 @@ in stdenv.mkDerivation rec { ${patchEsbuild "./lib/vscode/build" "0.12.6"} ${patchEsbuild "./lib/vscode/extensions" "0.11.23"} - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.isDarwin '' # use prebuilt binary for @parcel/watcher, which requires macOS SDK 10.13+ # (see issue #101229) pushd ./lib/vscode/remote/node_modules/@parcel/watcher @@ -215,13 +240,17 @@ in stdenv.mkDerivation rec { yarn build # build vscode - VERSION=${version} yarn build:vscode + VERSION=${finalAttrs.version} yarn build:vscode # create release yarn release + + runHook postBuild ''; installPhase = '' + runHook preInstall + mkdir -p $out/libexec/code-server $out/bin # copy release to libexec path @@ -230,17 +259,15 @@ in stdenv.mkDerivation rec { # install only production dependencies yarn --offline --cwd "$out/libexec/code-server" --production - # link coder-cloud agent from nix store - mkdir -p $out/libexec/code-server/lib - ln -s "${cloudAgent}/bin/cloud-agent" $out/libexec/code-server/lib/coder-cloud-agent - # create wrapper - makeWrapper "${nodejs_16}/bin/node" "$out/bin/code-server" \ + makeWrapper "${nodejs}/bin/node" "$out/bin/code-server" \ --add-flags "$out/libexec/code-server/out/node/entry.js" + + runHook postInstall ''; passthru = { - prefetchYarnCache = lib.overrideDerivation yarnCache (d: { + prefetchYarnCache = lib.overrideDerivation finalAttrs.yarnCache (d: { outputHash = lib.fakeSha256; }); tests = { @@ -248,15 +275,15 @@ in stdenv.mkDerivation rec { }; }; - meta = with lib; { + meta = { description = "Run VS Code on a remote server"; longDescription = '' code-server is VS Code running on a remote server, accessible through the browser. ''; homepage = "https://github.com/coder/code-server"; - license = licenses.mit; - maintainers = with maintainers; [ offline henkery ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ offline henkery ]; platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" ]; }; -} +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1e6233ca454b..0d243d151e3b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -35270,6 +35270,7 @@ with pkgs; }; code-server = callPackage ../servers/code-server { + nodejs = nodejs_16; inherit (darwin.apple_sdk.frameworks) AppKit Cocoa CoreServices Security; inherit (darwin) cctools; inherit (nodePackages) node-gyp; From 123283d1ad3bd9b8d13cf5dcaaefa632975030f7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 13 Jun 2023 19:48:58 +0000 Subject: [PATCH 157/165] codespelunker: 1.0.0 -> 1.2.0 --- pkgs/development/tools/codespelunker/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/codespelunker/default.nix b/pkgs/development/tools/codespelunker/default.nix index 13258987eb36..2515fc7931a2 100644 --- a/pkgs/development/tools/codespelunker/default.nix +++ b/pkgs/development/tools/codespelunker/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "codespelunker"; - version = "1.0.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "boyter"; repo = "cs"; rev = "v${version}"; - hash = "sha256-NN/78paePdvYHQ4J2aQu56PvEciOXY8DxHd4ajfVCFU="; + hash = "sha256-kWKDr8KKD3M5MyRuEMMZXvTqflDidkMsu2fN9N0s50w="; }; vendorHash = null; From 20926278783ccacf3f3b84eed9af349b6004829c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 13 Jun 2023 20:04:11 +0000 Subject: [PATCH 158/165] numix-icon-theme-circle: 23.05.15 -> 23.06.11 --- pkgs/data/icons/numix-icon-theme-circle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/icons/numix-icon-theme-circle/default.nix b/pkgs/data/icons/numix-icon-theme-circle/default.nix index 8434937a395a..a63f28e92642 100644 --- a/pkgs/data/icons/numix-icon-theme-circle/default.nix +++ b/pkgs/data/icons/numix-icon-theme-circle/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "numix-icon-theme-circle"; - version = "23.05.15"; + version = "23.06.11"; src = fetchFromGitHub { owner = "numixproject"; repo = pname; rev = version; - sha256 = "sha256-jZ++x2xtwmCYqv1jdJuNM2sHpmvkv6gj8Xo4PN2Vjsk="; + sha256 = "sha256-bEUT6hBAKyilbUWSbyvGRuIwatooJ3k/mvVJg1PncjA="; }; nativeBuildInputs = [ gtk3 ]; From ae3504632697eb76852a623f44678b5e11118df3 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Tue, 13 Jun 2023 23:06:37 +0200 Subject: [PATCH 159/165] treewide: treewide: use lib.optionalAttrs instead of 'then {}' add missing parentheses. --- .../lisp-modules-obsolete/quicklisp-to-nix-overrides.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-overrides.nix b/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-overrides.nix index 50bf5bcc461b..00b094dc9fd9 100644 --- a/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-overrides.nix +++ b/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-overrides.nix @@ -4,7 +4,7 @@ let skipBuildPhase = x: { overrides = y: ((x.overrides y) // { buildPhase = "true"; }); }; - multiOverride = l: x: pkgs.lib.optionalAttrs (l != []) ((builtins.head l) x) // (multiOverride (builtins.tail l) x); + multiOverride = l: x: pkgs.lib.optionalAttrs (l != []) (((builtins.head l) x) // (multiOverride (builtins.tail l) x)); lispName = (clwrapper.lisp.pname or (builtins.parseDrvName clwrapper.lisp.name).name); ifLispIn = l: f: if (pkgs.lib.elem lispName l) then f else (x: {}); ifLispNotIn = l: f: if ! (pkgs.lib.elem lispName l) then f else (x: {}); From 28af3205bc11efef07a84e708729db1fa259c923 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Wed, 14 Jun 2023 00:18:09 +0300 Subject: [PATCH 160/165] gplates: drop python39 --- .../misc/gplates/boost-placeholders.patch | 75 +++++++++++++++++++ .../science/misc/gplates/default.nix | 4 + pkgs/top-level/all-packages.nix | 7 +- 3 files changed, 80 insertions(+), 6 deletions(-) create mode 100644 pkgs/applications/science/misc/gplates/boost-placeholders.patch diff --git a/pkgs/applications/science/misc/gplates/boost-placeholders.patch b/pkgs/applications/science/misc/gplates/boost-placeholders.patch new file mode 100644 index 000000000000..7166b92f646a --- /dev/null +++ b/pkgs/applications/science/misc/gplates/boost-placeholders.patch @@ -0,0 +1,75 @@ +diff --unified --recursive a/src/gui/TopologyTools.cc b/src/gui/TopologyTools.cc +--- a/src/gui/TopologyTools.cc 2021-07-05 05:11:47.000000000 +0200 ++++ b/src/gui/TopologyTools.cc 2022-12-07 22:35:20.444054124 +0100 +@@ -3448,7 +3448,7 @@ + std::find_if( + d_visible_boundary_section_seq.begin(), + d_visible_boundary_section_seq.end(), +- boost::bind(&VisibleSection::d_section_info_index, _1) == ++ boost::bind(&VisibleSection::d_section_info_index, boost::placeholders::_1) == + boost::cref(section_index)); + + if (visible_section_iter == d_visible_boundary_section_seq.end()) +@@ -3467,7 +3467,7 @@ + std::find_if( + d_visible_interior_section_seq.begin(), + d_visible_interior_section_seq.end(), +- boost::bind(&VisibleSection::d_section_info_index, _1) == ++ boost::bind(&VisibleSection::d_section_info_index, boost::placeholders::_1) == + boost::cref(section_index)); + + if (visible_section_iter == d_visible_interior_section_seq.end()) +diff --unified --recursive a/src/presentation/ReconstructionGeometryRenderer.cc b/src/presentation/ReconstructionGeometryRenderer.cc +--- a/src/presentation/ReconstructionGeometryRenderer.cc 2021-07-05 05:11:50.000000000 +0200 ++++ b/src/presentation/ReconstructionGeometryRenderer.cc 2022-12-07 22:36:11.117884262 +0100 +@@ -274,7 +274,7 @@ + GPlatesPresentation::ReconstructionGeometryRenderer::RenderParamsPopulator::visit_reconstruct_visual_layer_params( + const ReconstructVisualLayerParams ¶ms) + { +- d_render_params.show_vgp = boost::bind(&ReconstructVisualLayerParams::show_vgp, ¶ms, _1, _2); ++ d_render_params.show_vgp = boost::bind(&ReconstructVisualLayerParams::show_vgp, ¶ms, boost::placeholders::_1, boost::placeholders::_2); + d_render_params.vgp_draw_circular_error = params.get_vgp_draw_circular_error(); + d_render_params.fill_polygons = params.get_fill_polygons(); + d_render_params.fill_polylines = params.get_fill_polylines(); +diff --unified --recursive a/src/presentation/VisualLayerRegistry.cc b/src/presentation/VisualLayerRegistry.cc +--- a/src/presentation/VisualLayerRegistry.cc 2021-07-05 05:11:50.000000000 +0200 ++++ b/src/presentation/VisualLayerRegistry.cc 2022-12-07 22:38:12.950877614 +0100 +@@ -448,7 +448,7 @@ + &GPlatesQtWidgets::ReconstructScalarCoverageLayerOptionsWidget::create, + boost::bind( + &ReconstructScalarCoverageVisualLayerParams::create, +- _1), ++ boost::placeholders::_1), + true); + + registry.register_visual_layer_type( +@@ -498,7 +498,7 @@ + // NOTE: We pass in ViewState and not the GlobeAndMapWidget, obtained from + // ViewportWindow, because ViewportWindow is not yet available (a reference to + // it not yet been initialised inside ViewState) so accessing it would crash... +- _1, boost::ref(view_state)), ++ boost::placeholders::_1, boost::ref(view_state)), + true); + + // DERIVED_DATA group. +@@ -549,7 +549,7 @@ + &GPlatesQtWidgets::VelocityFieldCalculatorLayerOptionsWidget::create, + boost::bind( + &VelocityFieldCalculatorVisualLayerParams::create, +- _1, boost::cref(view_state.get_rendered_geometry_parameters())), ++ boost::placeholders::_1, boost::cref(view_state.get_rendered_geometry_parameters())), + true); + + using namespace GPlatesUtils; +diff --unified --recursive a/src/qt-widgets/ViewportWindow.cc b/src/qt-widgets/ViewportWindow.cc +--- a/src/qt-widgets/ViewportWindow.cc 2021-08-05 05:44:01.000000000 +0200 ++++ b/src/qt-widgets/ViewportWindow.cc 2022-12-07 22:39:20.487981302 +0100 +@@ -326,7 +326,7 @@ + *d_geometry_operation_state_ptr, + *d_modify_geometry_state, + *d_measure_distance_state_ptr, +- boost::bind(&canvas_tool_status_message, boost::ref(*this), _1), ++ boost::bind(&canvas_tool_status_message, boost::ref(*this), boost::placeholders::_1), + get_view_state(), + *this); + diff --git a/pkgs/applications/science/misc/gplates/default.nix b/pkgs/applications/science/misc/gplates/default.nix index 7cbf37fcaf8a..e6cebbc53b73 100644 --- a/pkgs/applications/science/misc/gplates/default.nix +++ b/pkgs/applications/science/misc/gplates/default.nix @@ -40,6 +40,10 @@ in mkDerivation rec { sha256 = "0lrcmcxc924ixddii8cyglqlwwxvk7f00g4yzbss5i3fgcbh8n96"; }; + patches = [ + ./boost-placeholders.patch + ]; + nativeBuildInputs = [ cmake doxygen diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9bb2c80d05f2..4a7680411ccb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -38793,12 +38793,7 @@ with pkgs; gildas = callPackage ../applications/science/astronomy/gildas { }; - gplates = libsForQt5.callPackage ../applications/science/misc/gplates { - boost = boost175; - # build with Python 3.10 fails, because boost <= 1.78 can't find - # pythons with double digits in minor versions, like X.YZ - python3 = python39; - }; + gplates = libsForQt5.callPackage ../applications/science/misc/gplates { }; grap = callPackage ../tools/security/grap { }; From 904d6a0b6252b834927d9c82018d8f43f1e2e06a Mon Sep 17 00:00:00 2001 From: Ilan Joselevich Date: Wed, 14 Jun 2023 00:23:33 +0300 Subject: [PATCH 161/165] nextcloud-client: 3.8.2 -> 3.9.0 Diff: https://github.com/nextcloud/desktop/compare/v3.8.2...v3.9.0 --- pkgs/applications/networking/nextcloud-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/nextcloud-client/default.nix b/pkgs/applications/networking/nextcloud-client/default.nix index 7a935a0876d1..322f97f48031 100644 --- a/pkgs/applications/networking/nextcloud-client/default.nix +++ b/pkgs/applications/networking/nextcloud-client/default.nix @@ -26,7 +26,7 @@ mkDerivation rec { pname = "nextcloud-client"; - version = "3.8.2"; + version = "3.9.0"; outputs = [ "out" "dev" ]; @@ -34,7 +34,7 @@ mkDerivation rec { owner = "nextcloud"; repo = "desktop"; rev = "v${version}"; - sha256 = "sha256-V5g6+Ci2MjBKnitY6IIaMY4gpoeMK+sd7HGZ1U87xL4="; + sha256 = "sha256-XcQYttd5dl2TCbBxOlRBg8/mEiHekoxayPi81ot7N7o="; }; patches = [ From 945e82bfb72a6f462dfb30a96ba249a55c5cae41 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 13 Jun 2023 21:36:48 +0000 Subject: [PATCH 162/165] numix-icon-theme-square: 23.05.15 -> 23.06.11 --- pkgs/data/icons/numix-icon-theme-square/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/icons/numix-icon-theme-square/default.nix b/pkgs/data/icons/numix-icon-theme-square/default.nix index c767d6b42240..04d907d4707a 100644 --- a/pkgs/data/icons/numix-icon-theme-square/default.nix +++ b/pkgs/data/icons/numix-icon-theme-square/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "numix-icon-theme-square"; - version = "23.05.15"; + version = "23.06.11"; src = fetchFromGitHub { owner = "numixproject"; repo = pname; rev = version; - sha256 = "sha256-tcEVwc3Ez0h9JwiHyYfMvdTfUaivy4sH3QJR9tP1LSk="; + sha256 = "sha256-pm3sEx3OJkS4sz+sg09HeTSdQZTdjyxJCsjYWCA4mN0="; }; nativeBuildInputs = [ gtk3 ]; From 12cab182ae8f8aceca060de7a56d51ebe8c86898 Mon Sep 17 00:00:00 2001 From: natsukium Date: Fri, 9 Jun 2023 23:05:27 +0900 Subject: [PATCH 163/165] MACS2: 2.2.7.1 -> 2.2.8 Diff: https://github.com/macs3-project/MACS/compare/v2.2.7.1...v2.2.8 changelog: https://github.com/macs3-project/MACS/releases/tag/v2.2.8 --- .../science/biology/MACS2/default.nix | 31 +++++++++++++------ 1 file changed, 21 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/science/biology/MACS2/default.nix b/pkgs/applications/science/biology/MACS2/default.nix index 5663ffaf4486..45de439c9737 100644 --- a/pkgs/applications/science/biology/MACS2/default.nix +++ b/pkgs/applications/science/biology/MACS2/default.nix @@ -2,32 +2,43 @@ python3.pkgs.buildPythonPackage rec { pname = "MACS2"; - version = "2.2.7.1"; + version = "2.2.8"; + format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "1rcxj943kgzs746f5jrb72x1cp4v50rk3qmad0m99a02vndscb5d"; + hash = "sha256-KgpDasidj4yUoeQQaQA3dg5eN5Ka1xnFRpbnTvhKmOA="; }; postPatch = '' - # remove version check which breaks on 3.10 + # prevent setup.py from installing numpy substituteInPlace setup.py \ - --replace 'if float(sys.version[:3])<3.6:' 'if False:' + --replace "subprocess.call([sys.executable, \"-m\", 'pip', 'install', f'numpy{numpy_requires}'],cwd=cwd)" "0" ''; + nativeBuildInputs = with python3.pkgs; [ + cython + setuptools + ]; + propagatedBuildInputs = with python3.pkgs; [ numpy ]; - # To prevent ERROR: diffpeak_cmd (unittest.loader._FailedTest) for obsolete - # function (ImportError: Failed to import test module: diffpeak_cmd) - doCheck = false; + nativeCheckInputs = [ + python3.pkgs.unittestCheckHook + ]; + + unittestFlagsArray = [ + "-s" + "test" + ]; + pythonImportsCheck = [ "MACS2" ]; meta = with lib; { description = "Model-based Analysis for ChIP-Seq"; + homepage = "https://github.com/macs3-project/MACS/"; + changelog = "https://github.com/macs3-project/MACS/releases/tag/v${version}"; license = licenses.bsd3; maintainers = with maintainers; [ gschwartz ]; - platforms = platforms.linux; - # error: ‘PyThreadState’ {aka ‘struct _ts’} has no member named ‘use_tracing’; did you mean ‘tracing’? - broken = true; }; } From 3d1b9f0819990ed51ddde2a7f81755913935351d Mon Sep 17 00:00:00 2001 From: natsukium Date: Mon, 12 Jun 2023 23:19:17 +0900 Subject: [PATCH 164/165] macs2: rename from MACS2 --- .../science/biology/{MACS2 => macs2}/default.nix | 5 +++-- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) rename pkgs/applications/science/biology/{MACS2 => macs2}/default.nix (93%) diff --git a/pkgs/applications/science/biology/MACS2/default.nix b/pkgs/applications/science/biology/macs2/default.nix similarity index 93% rename from pkgs/applications/science/biology/MACS2/default.nix rename to pkgs/applications/science/biology/macs2/default.nix index 45de439c9737..934da2e8ab61 100644 --- a/pkgs/applications/science/biology/MACS2/default.nix +++ b/pkgs/applications/science/biology/macs2/default.nix @@ -1,12 +1,13 @@ { lib, python3, fetchPypi }: python3.pkgs.buildPythonPackage rec { - pname = "MACS2"; + pname = "macs2"; version = "2.2.8"; format = "pyproject"; src = fetchPypi { - inherit pname version; + pname = lib.toUpper pname; + inherit version; hash = "sha256-KgpDasidj4yUoeQQaQA3dg5eN5Ka1xnFRpbnTvhKmOA="; }; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 196d493c7c34..0464d56cb351 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1023,6 +1023,7 @@ mapAliases ({ ### M ### m3d-linux = throw "'m3d-linux' has been renamed to/replaced by 'm33-linux'"; # Converted to throw 2022-02-22 + MACS2 = macs2; # Added 2023-06-12 mail-notification = throw "mail-notification has been removed from nixpkgs, as it's unmaintained and has dependencies on old gnome libraries we want to remove"; # Added 2021-08-21 mailpile = throw "mailpile was removed from nixpkgs, as it is stuck on python2"; # Added 2022-01-12 man_db = throw "'man_db' has been renamed to/replaced by 'man-db'"; # Converted to throw 2022-02-22 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0d243d151e3b..4f70fc70d9ae 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -37858,7 +37858,7 @@ with pkgs; macse = callPackage ../applications/science/biology/macse { }; - MACS2 = callPackage ../applications/science/biology/MACS2 { }; + macs2 = callPackage ../applications/science/biology/macs2 { }; mafft = callPackage ../applications/science/biology/mafft { }; From d40add3bc57e399983d0f9c3cbab64668c005129 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Tue, 13 Jun 2023 22:25:02 +0000 Subject: [PATCH 165/165] sway: remove unused build inputs (#237625) None of these have been used since before Sway 1.0. --- pkgs/applications/window-managers/sway/default.nix | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/window-managers/sway/default.nix b/pkgs/applications/window-managers/sway/default.nix index 01506b391dfa..d1192e700c50 100644 --- a/pkgs/applications/window-managers/sway/default.nix +++ b/pkgs/applications/window-managers/sway/default.nix @@ -1,23 +1,21 @@ { lib, stdenv, fetchFromGitHub, fetchpatch, substituteAll, swaybg , meson, ninja, pkg-config, wayland-scanner, scdoc , wayland, libxkbcommon, pcre2, json_c, libevdev -, pango, cairo, libinput, libcap, pam, gdk-pixbuf, librsvg +, pango, cairo, libinput, gdk-pixbuf, librsvg , wlroots_0_16, wayland-protocols, libdrm , nixosTests # Used by the NixOS module: , isNixOS ? false , enableXWayland ? true, xorg , systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd, systemd -, dbusSupport ? true -, dbus -, trayEnabled ? systemdSupport && dbusSupport +, trayEnabled ? systemdSupport }: # The "sd-bus-provider" meson option does not include a "none" option, # but it is silently ignored iff "-Dtray=disabled". We use "basu" # (which is not in nixpkgs) instead of "none" to alert us if this # changes: https://github.com/swaywm/sway/issues/6843#issuecomment-1047288761 -assert trayEnabled -> systemdSupport && dbusSupport; +assert trayEnabled -> systemdSupport; let sd-bus-provider = if systemdSupport then "libsystemd" else "basu"; in stdenv.mkDerivation rec { @@ -65,11 +63,9 @@ stdenv.mkDerivation rec { buildInputs = [ wayland libxkbcommon pcre2 json_c libevdev - pango cairo libinput libcap pam gdk-pixbuf librsvg + pango cairo libinput gdk-pixbuf librsvg wayland-protocols libdrm (wlroots_0_16.override { inherit enableXWayland; }) - ] ++ lib.optionals dbusSupport [ - dbus ] ++ lib.optionals enableXWayland [ xorg.xcbutilwm ];