From 88fb6d37e393a8d7f4214953940a678541a80892 Mon Sep 17 00:00:00 2001 From: Julien Moutinho Date: Sat, 25 May 2024 02:23:48 +0200 Subject: [PATCH 01/77] nixos/radicle: init services --- .../manual/release-notes/rl-2411.section.md | 2 + nixos/modules/module-list.nix | 1 + nixos/modules/services/misc/radicle.nix | 347 ++++++++++++++++++ nixos/tests/all-tests.nix | 1 + nixos/tests/radicle.nix | 207 +++++++++++ pkgs/by-name/ra/radicle-node/package.nix | 15 + 6 files changed, 573 insertions(+) create mode 100644 nixos/modules/services/misc/radicle.nix create mode 100644 nixos/tests/radicle.nix diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md index e70483dbb2c4..583b78c4d2a2 100644 --- a/nixos/doc/manual/release-notes/rl-2411.section.md +++ b/nixos/doc/manual/release-notes/rl-2411.section.md @@ -22,6 +22,8 @@ - [Eintopf](https://eintopf.info), community event and calendar web application. Available as [services.eintopf](options.html#opt-services.eintopf). +- [Radicle](https://radicle.xyz), an open source, peer-to-peer code collaboration stack built on Git. Available as [services.radicle](#opt-services.radicle.enable). + - [Renovate](https://github.com/renovatebot/renovate), a dependency updating tool for various git forges and language ecosystems. Available as [services.renovate](#opt-services.renovate.enable). - [wg-access-server](https://github.com/freifunkMUC/wg-access-server/), an all-in-one WireGuard VPN solution with a web ui for connecting devices. Available at [services.wg-access-server](#opt-services.wg-access-server.enable). diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 2eb623bee36b..f9aa672dc418 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -797,6 +797,7 @@ ./services/misc/pufferpanel.nix ./services/misc/pykms.nix ./services/misc/radarr.nix + ./services/misc/radicle.nix ./services/misc/readarr.nix ./services/misc/redmine.nix ./services/misc/renovate.nix diff --git a/nixos/modules/services/misc/radicle.nix b/nixos/modules/services/misc/radicle.nix new file mode 100644 index 000000000000..69cac81ee65f --- /dev/null +++ b/nixos/modules/services/misc/radicle.nix @@ -0,0 +1,347 @@ +{ config, lib, pkgs, ... }: +with lib; +let + cfg = config.services.radicle; + + json = pkgs.formats.json { }; + + env = rec { + # rad fails if it cannot stat $HOME/.gitconfig + HOME = "/var/lib/radicle"; + RAD_HOME = HOME; + }; + + # Convenient wrapper to run `rad` in the namespaces of `radicle-node.service` + rad-system = pkgs.writeShellScriptBin "rad-system" '' + set -o allexport + ${toShellVars env} + # Note that --env is not used to preserve host's envvars like $TERM + exec ${getExe' pkgs.util-linux "nsenter"} -a \ + -t "$(${getExe' config.systemd.package "systemctl"} show -P MainPID radicle-node.service)" \ + -S "$(${getExe' config.systemd.package "systemctl"} show -P UID radicle-node.service)" \ + -G "$(${getExe' config.systemd.package "systemctl"} show -P GID radicle-node.service)" \ + ${getExe' cfg.package "rad"} "$@" + ''; + + commonServiceConfig = serviceName: { + environment = env // { + RUST_LOG = mkDefault "info"; + }; + path = [ + pkgs.gitMinimal + ]; + documentation = [ + "https://docs.radicle.xyz/guides/seeder" + ]; + after = [ + "network.target" + "network-online.target" + ]; + requires = [ + "network-online.target" + ]; + wantedBy = [ "multi-user.target" ]; + serviceConfig = mkMerge [ + { + BindReadOnlyPaths = [ + "${cfg.configFile}:${env.RAD_HOME}/config.json" + "${if isPath cfg.publicKeyFile then cfg.publicKeyFile else pkgs.writeText "radicle.pub" cfg.publicKeyFile}:${env.RAD_HOME}/keys/radicle.pub" + ]; + KillMode = "process"; + StateDirectory = [ "radicle" ]; + User = config.users.users.radicle.name; + Group = config.users.groups.radicle.name; + WorkingDirectory = env.HOME; + } + # The following options are only for optimizing: + # systemd-analyze security ${serviceName} + { + BindReadOnlyPaths = [ + "-/etc/resolv.conf" + "/etc/ssl/certs/ca-certificates.crt" + "/run/systemd" + ]; + AmbientCapabilities = ""; + CapabilityBoundingSet = ""; + DeviceAllow = ""; # ProtectClock= adds DeviceAllow=char-rtc r + LockPersonality = true; + MemoryDenyWriteExecute = true; + NoNewPrivileges = true; + PrivateTmp = true; + ProcSubset = "pid"; + ProtectClock = true; + ProtectHome = true; + ProtectHostname = true; + ProtectKernelLogs = true; + ProtectProc = "invisible"; + ProtectSystem = "strict"; + RemoveIPC = true; + RestrictAddressFamilies = [ "AF_UNIX" "AF_INET" "AF_INET6" ]; + RestrictNamespaces = true; + RestrictRealtime = true; + RestrictSUIDSGID = true; + RuntimeDirectoryMode = "700"; + SocketBindDeny = [ "any" ]; + StateDirectoryMode = "0750"; + SystemCallFilter = [ + "@system-service" + "~@aio" + "~@chown" + "~@keyring" + "~@memlock" + "~@privileged" + "~@resources" + "~@setuid" + "~@timer" + ]; + SystemCallArchitectures = "native"; + # This is for BindPaths= and BindReadOnlyPaths= + # to allow traversal of directories they create inside RootDirectory= + UMask = "0066"; + } + ]; + confinement = { + enable = true; + mode = "full-apivfs"; + packages = [ + pkgs.gitMinimal + cfg.package + pkgs.iana-etc + (getLib pkgs.nss) + pkgs.tzdata + ]; + }; + }; +in +{ + options = { + services.radicle = { + enable = mkEnableOption "Radicle Seed Node"; + package = mkPackageOption pkgs "radicle-node" { }; + privateKeyFile = mkOption { + type = with types; either path str; + description = '' + SSH private key generated by `rad auth`. + + If it contains a colon (`:`) the string before the colon + is taken as the credential name + and the string after as a path encrypted with `systemd-creds`. + ''; + }; + publicKeyFile = mkOption { + type = with types; either path str; + description = '' + SSH public key generated by `rad auth`. + ''; + }; + node = { + listenAddress = mkOption { + type = types.str; + default = "0.0.0.0"; + example = "127.0.0.1"; + description = "The IP address on which `radicle-node` listens."; + }; + listenPort = mkOption { + type = types.port; + default = 8776; + description = "The port on which `radicle-node` listens."; + }; + openFirewall = mkEnableOption "opening the firewall for `radicle-node`"; + extraArgs = mkOption { + type = with types; listOf str; + default = [ ]; + description = "Extra arguments for `radicle-node`"; + }; + }; + configFile = mkOption { + type = types.package; + internal = true; + default = (json.generate "config.json" cfg.settings).overrideAttrs (previousAttrs: { + preferLocalBuild = true; + # None of the usual phases are run here because runCommandWith uses buildCommand, + # so just append to buildCommand what would usually be a checkPhase. + buildCommand = previousAttrs.buildCommand + optionalString cfg.checkConfig '' + ln -s $out config.json + install -D -m 644 /dev/stdin keys/radicle.pub <<<"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBgFMhajUng+Rjj/sCFXI9PzG8BQjru2n7JgUVF1Kbv5 snakeoil" + export RAD_HOME=$PWD + ${getExe' pkgs.buildPackages.radicle-node "rad"} config >/dev/null || { + cat -n config.json + echo "Invalid config.json according to rad." + echo "Please double-check your services.radicle.settings (producing the config.json above)," + echo "some settings may be missing or have the wrong type." + exit 1 + } >&2 + ''; + }); + }; + checkConfig = mkEnableOption "checking the {file}`config.json` file resulting from {option}`services.radicle.settings`" // { default = true; }; + settings = mkOption { + description = '' + See https://app.radicle.xyz/nodes/seed.radicle.garden/rad:z3gqcJUoA1n9HaHKufZs5FCSGazv5/tree/radicle/src/node/config.rs#L275 + ''; + default = { }; + type = types.submodule { + freeformType = json.type; + }; + }; + httpd = { + enable = mkEnableOption "Radicle HTTP gateway to radicle-node"; + package = mkPackageOption pkgs "radicle-httpd" { }; + listenAddress = mkOption { + type = types.str; + default = "127.0.0.1"; + description = "The IP address on which `radicle-httpd` listens."; + }; + listenPort = mkOption { + type = types.port; + default = 8080; + description = "The port on which `radicle-httpd` listens."; + }; + nginx = mkOption { + # Type of a single virtual host, or null. + type = types.nullOr (types.submodule ( + recursiveUpdate (import ../web-servers/nginx/vhost-options.nix { inherit config lib; }) { + options.serverName = { + default = "radicle-${config.networking.hostName}.${config.networking.domain}"; + defaultText = "radicle-\${config.networking.hostName}.\${config.networking.domain}"; + }; + } + )); + default = null; + example = literalExpression '' + { + serverAliases = [ + "seed.''${config.networking.domain}" + ]; + enableACME = false; + useACMEHost = config.networking.domain; + } + ''; + description = '' + With this option, you can customize an nginx virtual host which already has sensible defaults for `radicle-httpd`. + Set to `{}` if you do not need any customization to the virtual host. + If enabled, then by default, the {option}`serverName` is + `radicle-''${config.networking.hostName}.''${config.networking.domain}`, + TLS is active, and certificates are acquired via ACME. + If this is set to null (the default), no nginx virtual host will be configured. + ''; + }; + extraArgs = mkOption { + type = with types; listOf str; + default = [ ]; + description = "Extra arguments for `radicle-httpd`"; + }; + }; + }; + }; + + config = mkIf cfg.enable (mkMerge [ + { + systemd.services.radicle-node = mkMerge [ + (commonServiceConfig "radicle-node") + { + description = "Radicle Node"; + documentation = [ "man:radicle-node(1)" ]; + serviceConfig = { + ExecStart = "${getExe' cfg.package "radicle-node"} --force --listen ${cfg.node.listenAddress}:${toString cfg.node.listenPort} ${escapeShellArgs cfg.node.extraArgs}"; + Restart = mkDefault "on-failure"; + RestartSec = "30"; + SocketBindAllow = [ "tcp:${toString cfg.node.listenPort}" ]; + SystemCallFilter = mkAfter [ + # Needed by git upload-pack which calls alarm() and setitimer() when providing a rad clone + "@timer" + ]; + }; + confinement.packages = [ + cfg.package + ]; + } + # Give only access to the private key to radicle-node. + { + serviceConfig = + let keyCred = builtins.split ":" "${cfg.privateKeyFile}"; in + if length keyCred > 1 + then { + LoadCredentialEncrypted = [ cfg.privateKeyFile ]; + # Note that neither %d nor ${CREDENTIALS_DIRECTORY} works in BindReadOnlyPaths= + BindReadOnlyPaths = [ "/run/credentials/radicle-node.service/${head keyCred}:${env.RAD_HOME}/keys/radicle" ]; + } + else { + LoadCredential = [ "radicle:${cfg.privateKeyFile}" ]; + BindReadOnlyPaths = [ "/run/credentials/radicle-node.service/radicle:${env.RAD_HOME}/keys/radicle" ]; + }; + } + ]; + + environment.systemPackages = [ + rad-system + ]; + + networking.firewall = mkIf cfg.node.openFirewall { + allowedTCPPorts = [ cfg.node.listenPort ]; + }; + + users = { + users.radicle = { + description = "Radicle"; + group = "radicle"; + home = env.HOME; + isSystemUser = true; + }; + groups.radicle = { + }; + }; + } + + (mkIf cfg.httpd.enable (mkMerge [ + { + systemd.services.radicle-httpd = mkMerge [ + (commonServiceConfig "radicle-httpd") + { + description = "Radicle HTTP gateway to radicle-node"; + documentation = [ "man:radicle-httpd(1)" ]; + serviceConfig = { + ExecStart = "${getExe' cfg.httpd.package "radicle-httpd"} --listen ${cfg.httpd.listenAddress}:${toString cfg.httpd.listenPort} ${escapeShellArgs cfg.httpd.extraArgs}"; + Restart = mkDefault "on-failure"; + RestartSec = "10"; + SocketBindAllow = [ "tcp:${toString cfg.httpd.listenPort}" ]; + SystemCallFilter = mkAfter [ + # Needed by git upload-pack which calls alarm() and setitimer() when providing a git clone + "@timer" + ]; + }; + confinement.packages = [ + cfg.httpd.package + ]; + } + ]; + } + + (mkIf (cfg.httpd.nginx != null) { + services.nginx.virtualHosts.${cfg.httpd.nginx.serverName} = lib.mkMerge [ + cfg.httpd.nginx + { + forceSSL = mkDefault true; + enableACME = mkDefault true; + locations."/" = { + proxyPass = "http://${cfg.httpd.listenAddress}:${toString cfg.httpd.listenPort}"; + recommendedProxySettings = true; + }; + } + ]; + + services.radicle.settings = { + node.alias = mkDefault cfg.httpd.nginx.serverName; + node.externalAddresses = mkDefault [ + "${cfg.httpd.nginx.serverName}:${toString cfg.node.listenPort}" + ]; + }; + }) + ])) + ]); + + meta.maintainers = with lib.maintainers; [ + julm + lorenzleutgeb + ]; +} diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 1f6826e13b5c..95be711d7b69 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -804,6 +804,7 @@ in { rabbitmq = handleTest ./rabbitmq.nix {}; radarr = handleTest ./radarr.nix {}; radicale = handleTest ./radicale.nix {}; + radicle = runTest ./radicle.nix; ragnarwm = handleTest ./ragnarwm.nix {}; rasdaemon = handleTest ./rasdaemon.nix {}; readarr = handleTest ./readarr.nix {}; diff --git a/nixos/tests/radicle.nix b/nixos/tests/radicle.nix new file mode 100644 index 000000000000..2deff7487d80 --- /dev/null +++ b/nixos/tests/radicle.nix @@ -0,0 +1,207 @@ +# This test runs the radicle-node and radicle-httpd services on a seed host, +# and verifies that an alice peer can host a repository on the seed, +# and that a bob peer can send alice a patch via the seed. + +{ pkgs, ... }: + +let + # The Node ID depends on nodes.seed.services.radicle.privateKeyFile + seed-nid = "z6Mkg52RcwDrPKRzzHaYgBkHH3Gi5p4694fvPstVE9HTyMB6"; + seed-ssh-keys = import ./ssh-keys.nix pkgs; + seed-tls-certs = import common/acme/server/snakeoil-certs.nix; + + commonHostConfig = { nodes, config, pkgs, ... }: { + environment.systemPackages = [ + config.services.radicle.package + pkgs.curl + pkgs.gitMinimal + pkgs.jq + ]; + environment.etc."gitconfig".text = '' + [init] + defaultBranch = main + [user] + email = root@${config.networking.hostName} + name = ${config.networking.hostName} + ''; + networking = { + extraHosts = '' + ${nodes.seed.networking.primaryIPAddress} ${nodes.seed.services.radicle.httpd.nginx.serverName} + ''; + }; + security.pki.certificateFiles = [ + seed-tls-certs.ca.cert + ]; + }; + + radicleConfig = { nodes, ... }: alias: + pkgs.writeText "config.json" (builtins.toJSON { + preferredSeeds = [ + "${seed-nid}@seed:${toString nodes.seed.services.radicle.node.listenPort}" + ]; + node = { + inherit alias; + relay = "never"; + seedingPolicy = { + default = "block"; + }; + }; + }); +in + +{ + name = "radicle"; + + meta = with pkgs.lib.maintainers; { + maintainers = [ + julm + lorenzleutgeb + ]; + }; + + nodes = { + seed = { pkgs, config, ... }: { + imports = [ commonHostConfig ]; + + services.radicle = { + enable = true; + privateKeyFile = seed-ssh-keys.snakeOilEd25519PrivateKey; + publicKeyFile = seed-ssh-keys.snakeOilEd25519PublicKey; + node = { + openFirewall = true; + }; + httpd = { + enable = true; + nginx = { + serverName = seed-tls-certs.domain; + addSSL = true; + sslCertificate = seed-tls-certs.${seed-tls-certs.domain}.cert; + sslCertificateKey = seed-tls-certs.${seed-tls-certs.domain}.key; + }; + }; + settings = { + preferredSeeds = []; + node = { + relay = "always"; + seedingPolicy = { + default = "allow"; + scope = "all"; + }; + }; + }; + }; + + services.nginx = { + enable = true; + }; + + networking.firewall.allowedTCPPorts = [ 443 ]; + }; + + alice = { + imports = [ commonHostConfig ]; + }; + + bob = { + imports = [ commonHostConfig ]; + }; + }; + + testScript = { nodes, ... }@args: '' + start_all() + + with subtest("seed can run radicle-node"): + # The threshold and/or hardening may have to be changed with new features/checks + print(seed.succeed("systemd-analyze security radicle-node.service --threshold=10 --no-pager")) + seed.wait_for_unit("radicle-node.service") + seed.wait_for_open_port(${toString nodes.seed.services.radicle.node.listenPort}) + + with subtest("seed can run radicle-httpd"): + # The threshold and/or hardening may have to be changed with new features/checks + print(seed.succeed("systemd-analyze security radicle-httpd.service --threshold=10 --no-pager")) + seed.wait_for_unit("radicle-httpd.service") + seed.wait_for_open_port(${toString nodes.seed.services.radicle.httpd.listenPort}) + seed.wait_for_open_port(443) + assert alice.succeed("curl -sS 'https://${nodes.seed.services.radicle.httpd.nginx.serverName}/api/v1' | jq -r .nid") == "${seed-nid}\n" + assert bob.succeed("curl -sS 'https://${nodes.seed.services.radicle.httpd.nginx.serverName}/api/v1' | jq -r .nid") == "${seed-nid}\n" + + with subtest("alice can create a Node ID"): + alice.succeed("rad auth --alias alice --stdin /tmp/repo/testfile", + "git -C /tmp/repo add .", + "git -C /tmp/repo commit -m init" + ) + with subtest("alice can create a Repository ID"): + alice.succeed( + "cd /tmp/repo && rad init --name repo --description descr --default-branch main --public" + ) + alice_repo_rid=alice.succeed("cd /tmp/repo && rad inspect --rid").rstrip("\n") + with subtest("alice can send a repository to the seed"): + alice.succeed(f"rad sync --seed ${seed-nid} {alice_repo_rid}") + + with subtest(f"seed can receive the repository {alice_repo_rid}"): + seed.wait_until_succeeds("test 1 = \"$(rad-system stats | jq .local.repos)\"") + + with subtest("bob can create a Node ID"): + bob.succeed("rad auth --alias bob --stdin /tmp/repo/testfile", + "git -C /tmp/repo add .", + "git -C /tmp/repo commit -m 'hello to bob'", + "git -C /tmp/repo push rad main" + ) + with subtest("bob can sync bob's repository from the seed"): + bob.succeed( + "cd /tmp/repo && rad sync --seed ${seed-nid}", + "cd /tmp/repo && git pull" + ) + assert bob.succeed("cat /tmp/repo/testfile") == "hello bob\n" + + with subtest("bob can push a patch"): + bob.succeed( + "echo hello alice > /tmp/repo/testfile", + "git -C /tmp/repo checkout -b for-alice", + "git -C /tmp/repo add .", + "git -C /tmp/repo commit -m 'hello to alice'", + "git -C /tmp/repo push -o patch.message='hello for alice' rad HEAD:refs/patches" + ) + + bob_repo_patch1_pid=bob.succeed("cd /tmp/repo && git branch --remotes | sed -ne 's:^ *rad/patches/::'p").rstrip("\n") + with subtest("alice can receive the patch"): + alice.wait_until_succeeds("test 1 = \"$(rad stats | jq .local.patches)\"") + alice.succeed( + f"cd /tmp/repo && rad patch show {bob_repo_patch1_pid} | grep 'opened by bob'", + f"cd /tmp/repo && rad patch checkout {bob_repo_patch1_pid}" + ) + assert alice.succeed("cat /tmp/repo/testfile") == "hello alice\n" + with subtest("alice can comment the patch"): + alice.succeed( + f"cd /tmp/repo && rad patch comment {bob_repo_patch1_pid} -m thank-you" + ) + with subtest("alice can merge the patch"): + alice.succeed( + "git -C /tmp/repo checkout main", + f"git -C /tmp/repo merge patch/{bob_repo_patch1_pid[:7]}", + "git -C /tmp/repo push rad main", + "cd /tmp/repo && rad patch list | grep -qxF 'Nothing to show.'" + ) + ''; +} diff --git a/pkgs/by-name/ra/radicle-node/package.nix b/pkgs/by-name/ra/radicle-node/package.nix index 05324f6ff44a..a7eab0b0a1e9 100644 --- a/pkgs/by-name/ra/radicle-node/package.nix +++ b/pkgs/by-name/ra/radicle-node/package.nix @@ -7,6 +7,8 @@ , lib , makeWrapper , man-db +, nixos +, nixosTests , openssh , radicle-node , runCommand @@ -86,6 +88,19 @@ touch $out ''; + nixos-build = lib.recurseIntoAttrs { + checkConfig-success = (nixos { + services.radicle.settings = { + node.alias = "foo"; + }; + }).config.services.radicle.configFile; + checkConfig-failure = testers.testBuildFailure (nixos { + services.radicle.settings = { + node.alias = null; + }; + }).config.services.radicle.configFile; + }; + nixos-run = nixosTests.radicle; }; meta = { From 0cbb90ea939e8e1d41df89c9ebaad1c725ea6a29 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Mon, 8 Jul 2024 22:28:28 +0200 Subject: [PATCH 02/77] cpplint: 1.5.5 -> 1.6.1 Diff: https://github.com/cpplint/cpplint/compare/1.5.5...1.6.1 --- ...001-Remove-pytest-runner-version-pin.patch | 16 ------ .../tools/analysis/cpplint/default.nix | 53 +++++++++---------- 2 files changed, 25 insertions(+), 44 deletions(-) delete mode 100644 pkgs/development/tools/analysis/cpplint/0001-Remove-pytest-runner-version-pin.patch diff --git a/pkgs/development/tools/analysis/cpplint/0001-Remove-pytest-runner-version-pin.patch b/pkgs/development/tools/analysis/cpplint/0001-Remove-pytest-runner-version-pin.patch deleted file mode 100644 index 3b602421d100..000000000000 --- a/pkgs/development/tools/analysis/cpplint/0001-Remove-pytest-runner-version-pin.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/setup.py b/setup.py -index aef5c4e..030ea14 100755 ---- a/setup.py -+++ b/setup.py -@@ -73,7 +73,7 @@ setup(name='cpplint', - long_description=open('README.rst').read(), - license='BSD-3-Clause', - setup_requires=[ -- "pytest-runner==5.2" -+ "pytest-runner" - ], - tests_require=test_required, - # extras_require allow pip install .[dev] --- -2.31.1 - diff --git a/pkgs/development/tools/analysis/cpplint/default.nix b/pkgs/development/tools/analysis/cpplint/default.nix index f380f7086e82..f4dcd71f0b3c 100644 --- a/pkgs/development/tools/analysis/cpplint/default.nix +++ b/pkgs/development/tools/analysis/cpplint/default.nix @@ -1,49 +1,46 @@ -{ lib, python3Packages, fetchFromGitHub, fetchpatch }: +{ lib, python3Packages, fetchFromGitHub }: python3Packages.buildPythonApplication rec { pname = "cpplint"; - version = "1.5.5"; - format = "setuptools"; + version = "1.6.1"; + pyproject = true; # Fetch from github instead of pypi, since the test cases are not in the pypi archive src = fetchFromGitHub { - owner = pname; - repo = pname; - rev = version; - hash = "sha256-JXz2Ufo7JSceZVqYwCRkuAsOR08znZlIUk8GCLAyiI4="; + owner = "cpplint"; + repo = "cpplint"; + rev = "refs/tags/${version}"; + hash = "sha256-N5YrlhEXQGYxhsJ4M5dGYZUzA81GKRSI83goaqbtCkI="; }; - patches = [ - ./0001-Remove-pytest-runner-version-pin.patch - - # The patch below stops using the sre_compile module, which was deprecated - # in Python 3.11 and replaces it with re.compile. Upstream is unsure if it - # should use re.compile or re._compiler.compile, so we should monitor the - # thread for updates. - # - # https://github.com/cpplint/cpplint/pull/214 - # - (fetchpatch { - name = "python-3.11-compatibility.patch"; - url = "https://github.com/cpplint/cpplint/commit/e84e84f53915ae2a9214e756cf89c573a73bbcd3.patch"; - hash = "sha256-u57AFWaVmGFSsvSGq1x9gZmTsuZPqXvTC7mTfyb2164="; - }) - ]; - postPatch = '' + substituteInPlace setup.py \ + --replace-fail '"pytest-runner==5.2"' "" + patchShebangs cpplint_unittest.py + + substituteInPlace cpplint_unittest.py \ + --replace-fail "assertEquals" "assertEqual" ''; - nativeCheckInputs = with python3Packages; [ pytest pytest-runner ]; + build-system = with python3Packages; [ + setuptools + ]; + + nativeCheckInputs = with python3Packages; [ + pytest + pytest-runner + ]; + checkPhase = '' ./cpplint_unittest.py ''; - meta = with lib; { + meta = { homepage = "https://github.com/cpplint/cpplint"; description = "Static code checker for C++"; mainProgram = "cpplint"; - maintainers = [ maintainers.bhipple ]; - license = [ licenses.bsd3 ]; + maintainers = [ lib.maintainers.bhipple ]; + license = [ lib.licenses.bsd3 ]; }; } From bb7e6e1ac5e4bb4b201fb9da6cb1d7823ba71e0b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 9 Jul 2024 03:06:39 +0000 Subject: [PATCH 03/77] python312Packages.stanio: 0.5.0 -> 0.5.1 --- pkgs/development/python-modules/stanio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/stanio/default.nix b/pkgs/development/python-modules/stanio/default.nix index 27d754a7d894..a87e753c1886 100644 --- a/pkgs/development/python-modules/stanio/default.nix +++ b/pkgs/development/python-modules/stanio/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "stanio"; - version = "0.5.0"; + version = "0.5.1"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-3uQpMU2WXzkBga+o/3/4FERG7rWMwlR8zBCLpz5nROI="; + hash = "sha256-NI1S+UfexDHhGPS2AcTFKWkpuGQB1NTdWqk3Ow1K5Kw="; }; nativeBuildInputs = [ setuptools ]; From c3aa859ebcd96a40141e08be64e17bb2d4a2da08 Mon Sep 17 00:00:00 2001 From: 21CSM <81891917+21CSM@users.noreply.github.com> Date: Thu, 11 Jul 2024 23:30:46 -0400 Subject: [PATCH 04/77] lollypop: switch youtubeSupport dependency to yt-dlp Fixes #326377 --- pkgs/applications/audio/lollypop/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/audio/lollypop/default.nix b/pkgs/applications/audio/lollypop/default.nix index 8b492e09cc5c..4a74a233d920 100644 --- a/pkgs/applications/audio/lollypop/default.nix +++ b/pkgs/applications/audio/lollypop/default.nix @@ -70,7 +70,7 @@ python3.pkgs.buildPythonApplication rec { propagatedBuildInputs = with python3.pkgs; [ beautifulsoup4 pillow pycairo pygobject3 ] ++ lib.optional lastFMSupport pylast - ++ lib.optional youtubeSupport youtube-dl + ++ lib.optional youtubeSupport yt-dlp ++ lib.optional kid3Support pkgs.kid3; postPatch = '' From 4be0be7e34649f5725c0bead2d2c1078339a6bd6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 13 Jul 2024 06:14:56 +0000 Subject: [PATCH 05/77] python312Packages.qtile-extras: 0.26.0 -> 0.27.0 --- pkgs/development/python-modules/qtile-extras/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/qtile-extras/default.nix b/pkgs/development/python-modules/qtile-extras/default.nix index 28da64efdc1d..6a55316e99c0 100644 --- a/pkgs/development/python-modules/qtile-extras/default.nix +++ b/pkgs/development/python-modules/qtile-extras/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "qtile-extras"; - version = "0.26.0"; + version = "0.27.0"; pyproject = true; src = fetchFromGitHub { owner = "elParaguayo"; repo = "qtile-extras"; rev = "refs/tags/v${version}"; - hash = "sha256-ywqZggn1k7zezk5CS1y6EWZfLoIWMHmGO8mvqxBaB9g="; + hash = "sha256-2HpiUnFfGP3XNe6vFQyXMUxwqdXxFulm919t3o8a/ys="; }; build-system = [ setuptools-scm ]; From 10f34301bb71a4345567819b9b2513b45f7b7341 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 13 Jul 2024 06:15:25 +0000 Subject: [PATCH 06/77] numworks-epsilon: 22.2.0 -> 23.2.2 --- pkgs/applications/science/math/numworks-epsilon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/math/numworks-epsilon/default.nix b/pkgs/applications/science/math/numworks-epsilon/default.nix index 98d5d0d4560a..af896309750e 100644 --- a/pkgs/applications/science/math/numworks-epsilon/default.nix +++ b/pkgs/applications/science/math/numworks-epsilon/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "numworks-epsilon"; - version = "22.2.0"; + version = "23.2.2"; src = fetchFromGitHub { owner = "numworks"; repo = "epsilon"; rev = version; - hash = "sha256-E2WaXTn8+Ky9kdZxvQmEt63Ggo6Ns0fZ0Za+rQGIMSg="; + hash = "sha256-XyKi0IMvXDOYgF7e8nU14sE5YuJPTTfkZnoWZOoJdC0="; }; nativeBuildInputs = [ pkg-config ]; From 0f5dbcbfbb7a9f7419cc22da0fb1bedff0933069 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 13 Jul 2024 06:15:37 +0000 Subject: [PATCH 07/77] python312Packages.qtile: 0.26.0 -> 0.27.0 --- pkgs/development/python-modules/qtile/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/qtile/default.nix b/pkgs/development/python-modules/qtile/default.nix index e65aad91904a..72b6629a752d 100644 --- a/pkgs/development/python-modules/qtile/default.nix +++ b/pkgs/development/python-modules/qtile/default.nix @@ -35,14 +35,14 @@ buildPythonPackage rec { pname = "qtile"; - version = "0.26.0"; + version = "0.27.0"; pyproject = true; src = fetchFromGitHub { owner = "qtile"; repo = "qtile"; rev = "refs/tags/v${version}"; - hash = "sha256-htgrfGBGRlJSm88mmwW92ikXR/M1lr0OTom16TIvdpo="; + hash = "sha256-FO83i6nnMGY4eGsPYFfLuQPbN9ngUWXQMguBYqGrehg="; }; patches = [ From 8378307266c09bc51c8d7708c86588f3651bcf89 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 13 Jul 2024 12:29:26 +0000 Subject: [PATCH 08/77] clipper2: 1.3.0 -> 1.4.0 --- pkgs/development/libraries/clipper2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/clipper2/default.nix b/pkgs/development/libraries/clipper2/default.nix index 4f4dee29ec98..ea3383871433 100644 --- a/pkgs/development/libraries/clipper2/default.nix +++ b/pkgs/development/libraries/clipper2/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "clipper2"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "AngusJohnson"; repo = "Clipper2"; rev = "Clipper2_${version}"; - sha256 = "sha256-3TKhb48cABl0QcbeG12xlA1taQ/8/RdUUHSp0Qh85eE="; + sha256 = "sha256-ASL9uKkXsWyIbD1qaKEL7gf/JuCqzZQZSKHwLT5dKJU="; }; sourceRoot = "${src.name}/CPP"; From 9158c43c06b6e1385bbfb7cac5b44ba3491c8435 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 13 Jul 2024 13:52:36 +0000 Subject: [PATCH 09/77] gscreenshot: 3.5.1 -> 3.6.1 --- pkgs/applications/graphics/gscreenshot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/gscreenshot/default.nix b/pkgs/applications/graphics/gscreenshot/default.nix index f0869bca596d..09b81ac37cb7 100644 --- a/pkgs/applications/graphics/gscreenshot/default.nix +++ b/pkgs/applications/graphics/gscreenshot/default.nix @@ -18,13 +18,13 @@ python3Packages.buildPythonApplication rec { pname = "gscreenshot"; - version = "3.5.1"; + version = "3.6.1"; src = fetchFromGitHub { owner = "thenaterhood"; repo = "${pname}"; rev = "refs/tags/v${version}"; - sha256 = "sha256-3CvPJLenEVpTLNZUj+TG1cEfyWGmtaPZH/FD/AgK1io="; + sha256 = "sha256-JQnXjKl+BBSblHT0qQgz8iie33wnwfPSkFnZM5xNE7k="; }; # needed for wrapGAppsHook3 to function From 765b0810d69daa3a94c62e89299fa2ee9beb0d9b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 13 Jul 2024 16:05:04 +0000 Subject: [PATCH 10/77] python312Packages.galois: 0.3.10 -> 0.4.1 --- pkgs/development/python-modules/galois/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/galois/default.nix b/pkgs/development/python-modules/galois/default.nix index ace8f66e14ea..139e103d40a1 100644 --- a/pkgs/development/python-modules/galois/default.nix +++ b/pkgs/development/python-modules/galois/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "galois"; - version = "0.3.10"; + version = "0.4.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "mhostetter"; repo = "galois"; rev = "refs/tags/v${version}"; - hash = "sha256-GHvLE6xTY37MCDlGOmvyqi42ORRk1W8UcQXqH3Ty/c4="; + hash = "sha256-ZNVBP/c1Q7635PbySk5Yxz7riYNLnBnJLG6AMxy/ZeA="; }; nativeBuildInputs = [ From 9b863ca5f62b8798cb7d7c01a8db73669bbf76dd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 13 Jul 2024 20:57:13 +0000 Subject: [PATCH 11/77] tageditor: 3.9.0 -> 3.9.1 --- pkgs/applications/audio/tageditor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/tageditor/default.nix b/pkgs/applications/audio/tageditor/default.nix index af45e965b7ec..662d7a49a8a2 100644 --- a/pkgs/applications/audio/tageditor/default.nix +++ b/pkgs/applications/audio/tageditor/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "tageditor"; - version = "3.9.0"; + version = "3.9.1"; src = fetchFromGitHub { owner = "martchus"; repo = pname; rev = "v${version}"; - hash = "sha256-caki8WVnu8ELE2mXwRvT9TTTXCtMZEa0E3KVpHl05jg="; + hash = "sha256-FX0wb6GVTB/Y0m6qmoMbaeXPf8bA3+JqbGE8PPS6vAA="; }; nativeBuildInputs = [ From cd577b39a5a8f658004acd7a88e4ff3e84a9f192 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Jul 2024 06:39:10 +0000 Subject: [PATCH 12/77] media-downloader: 4.7.0 -> 4.8.0 --- pkgs/by-name/me/media-downloader/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/me/media-downloader/package.nix b/pkgs/by-name/me/media-downloader/package.nix index 5d3fa37fbebb..2db54695b3b8 100644 --- a/pkgs/by-name/me/media-downloader/package.nix +++ b/pkgs/by-name/me/media-downloader/package.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "media-downloader"; - version = "4.7.0"; + version = "4.8.0"; src = fetchFromGitHub { owner = "mhogomchungu"; repo = "media-downloader"; rev = finalAttrs.version; - hash = "sha256-ykPYxRgzKZrA0KwS1FoxZOkSL+7TbLgy0yLfs7Iqpf4="; + hash = "sha256-qSZb83gB9Kw6goY7RkWRWXpzHTF27EV5T59RitjSuc4="; }; nativeBuildInputs = [ From 8ba624c7192622a3a26908bcc8c9cb073702b97d Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Sun, 14 Jul 2024 21:05:03 +0200 Subject: [PATCH 13/77] jetty_11: 11.0.20 -> 11.0.22 https://github.com/jetty/jetty.project/releases/tag/jetty-11.0.22 https://github.com/jetty/jetty.project/releases/tag/jetty-11.0.21 --- pkgs/servers/http/jetty/11.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/jetty/11.x.nix b/pkgs/servers/http/jetty/11.x.nix index 0744d76a32d1..e19e1b4dc130 100644 --- a/pkgs/servers/http/jetty/11.x.nix +++ b/pkgs/servers/http/jetty/11.x.nix @@ -1,4 +1,4 @@ import ./common.nix { - version = "11.0.20"; - hash = "sha256-qOpIWht7Q8zjNRiHvpN5SBy+hOhddhgor5S55gWxHlQ="; + version = "11.0.22"; + hash = "sha256-afFuUZ1csDuE60m+WKMriU/wObBZleTORLOCFU8qcJk="; } From fa9c8bb1b14c035f6bcd4284020f0088a1be744a Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Sun, 14 Jul 2024 20:44:30 +0200 Subject: [PATCH 14/77] jetty_12: 12.0.9 -> 12.0.11 https://github.com/jetty/jetty.project/releases/tag/jetty-12.0.11 https://github.com/jetty/jetty.project/releases/tag/jetty-12.0.10 --- pkgs/servers/http/jetty/12.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/jetty/12.x.nix b/pkgs/servers/http/jetty/12.x.nix index e35533d547a9..0bbcb76e03a3 100644 --- a/pkgs/servers/http/jetty/12.x.nix +++ b/pkgs/servers/http/jetty/12.x.nix @@ -1,4 +1,4 @@ import ./common.nix { - version = "12.0.9"; - hash = "sha256-+/pn6Q24QDTaK+Slr+B17fshEXXh6sO1DWRuFGfi2h0="; + version = "12.0.11"; + hash = "sha256-5fZMHb2ZpkoAFY/v124F+99Kq9vZypSYrG8QmQ/RK6k="; } From f0e575ba95603472f3ebb137bdf63f4cdfd35811 Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Sun, 14 Jul 2024 20:45:50 +0200 Subject: [PATCH 15/77] jetty: add passthru.updateScript --- pkgs/servers/http/jetty/common.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/http/jetty/common.nix b/pkgs/servers/http/jetty/common.nix index 71f0dee03013..917e241b7f8f 100644 --- a/pkgs/servers/http/jetty/common.nix +++ b/pkgs/servers/http/jetty/common.nix @@ -1,6 +1,6 @@ { version, hash }: -{ lib, stdenvNoCC, fetchurl }: +{ lib, stdenvNoCC, fetchurl, gitUpdater }: stdenvNoCC.mkDerivation rec { pname = "jetty"; @@ -19,6 +19,13 @@ stdenvNoCC.mkDerivation rec { mv etc lib modules start.jar $out ''; + passthru.updateScript = gitUpdater { + url = "https://github.com/jetty/jetty.project.git"; + allowedVersions = "^${lib.versions.major version}\\."; + ignoredVersions = "(alpha|beta).*"; + rev-prefix = "jetty-"; + }; + meta = with lib; { description = "Web server and javax.servlet container"; homepage = "https://eclipse.dev/jetty/"; From 96829d14b785b1fe9c82b1e5a5e64261216a2ae1 Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Sun, 14 Jul 2024 20:46:51 +0200 Subject: [PATCH 16/77] jetty: add meta.changelog, update meta.homepage --- pkgs/servers/http/jetty/common.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/http/jetty/common.nix b/pkgs/servers/http/jetty/common.nix index 917e241b7f8f..9b9e064e993f 100644 --- a/pkgs/servers/http/jetty/common.nix +++ b/pkgs/servers/http/jetty/common.nix @@ -27,8 +27,9 @@ stdenvNoCC.mkDerivation rec { }; meta = with lib; { + changelog = "https://github.com/jetty/jetty.project/releases/tag/jetty-${version}"; description = "Web server and javax.servlet container"; - homepage = "https://eclipse.dev/jetty/"; + homepage = "https://jetty.org/"; platforms = platforms.all; sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = with licenses; [ asl20 epl10 ]; From 823539a37d8881ccf39b9a19bf287831e2e7858a Mon Sep 17 00:00:00 2001 From: hellwolf Date: Sun, 14 Jul 2024 22:41:15 +0300 Subject: [PATCH 17/77] slither-analyzer: 0.10.2 -> 0.10.3 - integrated nix-update-script --- .../python-modules/slither-analyzer/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/slither-analyzer/default.nix b/pkgs/development/python-modules/slither-analyzer/default.nix index 29ac72362016..87cc7f7cf77c 100644 --- a/pkgs/development/python-modules/slither-analyzer/default.nix +++ b/pkgs/development/python-modules/slither-analyzer/default.nix @@ -1,5 +1,6 @@ { lib, + nix-update-script, buildPythonPackage, crytic-compile, fetchFromGitHub, @@ -17,7 +18,7 @@ buildPythonPackage rec { pname = "slither-analyzer"; - version = "0.10.2"; + version = "0.10.3"; pyproject = true; disabled = pythonOlder "3.8"; @@ -26,7 +27,7 @@ buildPythonPackage rec { owner = "crytic"; repo = "slither"; rev = "refs/tags/${version}"; - hash = "sha256-KmbmljtmMtrJxgSMJjQ8fdk6RpEXcAVBuo24EsyMV8k="; + hash = "sha256-KWLv0tpd1FHZ9apipVPWw6VjtfYpngsH7XDQQ3luBZA="; }; nativeBuildInputs = [ @@ -83,6 +84,8 @@ buildPythonPackage rec { version = "${version}"; }; + passthru.updateScript = nix-update-script { }; + meta = with lib; { description = "Static Analyzer for Solidity"; longDescription = '' From 3faf76731dd66a3bfbb7835e623dd0b3bb4bb0eb Mon Sep 17 00:00:00 2001 From: Lan Tian Date: Sun, 14 Jul 2024 15:43:26 -0700 Subject: [PATCH 18/77] openvswitch: add dpdk variant --- pkgs/by-name/op/openvswitch/generic.nix | 48 ++++++++++++++++--------- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 32 insertions(+), 17 deletions(-) diff --git a/pkgs/by-name/op/openvswitch/generic.nix b/pkgs/by-name/op/openvswitch/generic.nix index 74b0725855ce..95fea77f8d1e 100644 --- a/pkgs/by-name/op/openvswitch/generic.nix +++ b/pkgs/by-name/op/openvswitch/generic.nix @@ -26,19 +26,23 @@ which, writeScript, makeWrapper, + withDPDK ? false, + dpdk, + numactl, + libpcap, }: let _kernel = kernel; in stdenv.mkDerivation rec { - pname = "openvswitch"; + pname = if withDPDK then "openvswitch-dpdk" else "openvswitch"; inherit version; kernel = lib.optional (_kernel != null) _kernel.dev; src = fetchurl { - url = "https://www.openvswitch.org/releases/${pname}-${version}.tar.gz"; + url = "https://www.openvswitch.org/releases/openvswitch-${version}.tar.gz"; inherit hash; }; @@ -69,23 +73,32 @@ stdenv.mkDerivation rec { sphinxRoot = "./Documentation"; - buildInputs = [ - libcap_ng - openssl - perl - procps - python3 - util-linux - which - ]; + buildInputs = + [ + libcap_ng + openssl + perl + procps + python3 + util-linux + which + ] + ++ (lib.optionals withDPDK [ + dpdk + numactl + libpcap + ]); preConfigure = "./boot.sh"; - configureFlags = [ - "--localstatedir=/var" - "--sharedstatedir=/var" - "--sbindir=$(out)/bin" - ] ++ (lib.optionals (_kernel != null) [ "--with-linux" ]); + configureFlags = + [ + "--localstatedir=/var" + "--sharedstatedir=/var" + "--sbindir=$(out)/bin" + ] + ++ (lib.optionals (_kernel != null) [ "--with-linux" ]) + ++ (lib.optionals withDPDK [ "--with-dpdk=shared" ]); # Leave /var out of this! installFlags = [ @@ -104,7 +117,7 @@ stdenv.mkDerivation rec { --prefix PYTHONPATH : $out/share/openvswitch/python wrapProgram $out/bin/ovs-tcpdump \ - --prefix PATH : ${lib.makeBinPath [tcpdump]} \ + --prefix PATH : ${lib.makeBinPath [ tcpdump ]} \ --prefix PYTHONPATH : $out/share/openvswitch/python ''; @@ -148,6 +161,7 @@ stdenv.mkDerivation rec { adamcstephens kmcopper netixx + xddxdd ]; platforms = platforms.linux; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b8f517dd18fa..fc5a44fe8e4e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11299,6 +11299,7 @@ with pkgs; opentelemetry-collector-contrib = callPackage ../tools/misc/opentelemetry-collector/contrib.nix { }; openvswitch-lts = callPackage ../by-name/op/openvswitch/lts.nix { }; + openvswitch-dpdk = callPackage ../by-name/op/openvswitch/package.nix { withDPDK = true; }; ovn-lts = callPackage ../by-name/ov/ovn/lts.nix { }; From d874e38a86ad9a001708286ba97214d1df2ddb31 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 15 Jul 2024 05:48:42 +0000 Subject: [PATCH 19/77] python312Packages.optree: 0.11.0 -> 0.12.1 --- pkgs/development/python-modules/optree/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/optree/default.nix b/pkgs/development/python-modules/optree/default.nix index aba72cf59ab9..7e54d04ff3a2 100644 --- a/pkgs/development/python-modules/optree/default.nix +++ b/pkgs/development/python-modules/optree/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "optree"; - version = "0.11.0"; + version = "0.12.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -20,8 +20,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "metaopt"; repo = pname; - rev = "v${version}"; - hash = "sha256-VnnnEoXkYJO+S7baH+JZvsW18Tk3TiY9+Cd230OlZWo="; + rev = "refs/tags/v${version}"; + hash = "sha256-4GvB9Z7qnEjsUSl+x5wd8czV80F50MwJdlNdylUU0zY="; }; dontUseCmakeConfigure = true; From 48c3bb5824b03c223b3eceb4d4e2cad56c221e2e Mon Sep 17 00:00:00 2001 From: phaer Date: Mon, 15 Jul 2024 11:53:23 +0200 Subject: [PATCH 20/77] etebase-server: default to withLdap = false as it's not unsual to run it without ldap and python-ldap is currently broken on master for python 3.12. --- pkgs/servers/etebase/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/etebase/default.nix b/pkgs/servers/etebase/default.nix index f3ee68352ee0..07a084f91e36 100644 --- a/pkgs/servers/etebase/default.nix +++ b/pkgs/servers/etebase/default.nix @@ -1,7 +1,7 @@ { lib , fetchFromGitHub -, withLdap ? true , python3 +, withLdap ? false , withPostgres ? true , nix-update-script , nixosTests From 278bc9384eaad1b82149e34060abfab5b982fcc2 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Mon, 15 Jul 2024 13:18:10 +0200 Subject: [PATCH 21/77] python3.pkgs.testing-postgresql: fix build Failing Hydra build: https://hydra.nixos.org/build/265189058 `assertRegexpMatches` got deprecated and is now called `assertRegex`. --- pkgs/development/python-modules/testing-postgresql/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/testing-postgresql/default.nix b/pkgs/development/python-modules/testing-postgresql/default.nix index 1b1527cc4872..c2b85fe8f9d7 100644 --- a/pkgs/development/python-modules/testing-postgresql/default.nix +++ b/pkgs/development/python-modules/testing-postgresql/default.nix @@ -46,6 +46,8 @@ buildPythonPackage rec { postPatch = '' substituteInPlace setup.py \ --replace "pg8000 >= 1.10" "pg8000" + substituteInPlace tests/test_postgresql.py \ + --replace-fail "self.assertRegexpMatches" "self.assertRegex" ''; pythonImportsCheck = [ "testing.postgresql" ]; From 29eb8e694f50c8c5ab03c3187e066258f189541b Mon Sep 17 00:00:00 2001 From: Giovanni Bassi Date: Sun, 14 Jul 2024 17:41:52 -0300 Subject: [PATCH 22/77] maintainers: add giggio --- maintainers/maintainer-list.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 907b68d41bc9..45c1d29186c2 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -7368,6 +7368,14 @@ github = "Gigahawk"; githubId = 10356230; }; + giggio = { + email = "giggio@giggio.net"; + github = "giggio"; + githubId = 334958; + matrix = "@giggio:matrix.org"; + name = "Giovanni Bassi"; + keys = [ { fingerprint = "275F 6749 AFD2 379D 1033 548C 1237 AB12 2E6F 4761"; } ]; + }; gigglesquid = { email = "jack.connors@protonmail.com"; github = "gigglesquid"; From bdc99383543f4e2615877341d2fe4bc04467fcc1 Mon Sep 17 00:00:00 2001 From: Giovanni Bassi Date: Sun, 14 Jul 2024 17:42:08 -0300 Subject: [PATCH 23/77] azure-cli-extensions.containerapp: init at 0.3.53 --- pkgs/by-name/az/azure-cli/extensions-manual.nix | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/pkgs/by-name/az/azure-cli/extensions-manual.nix b/pkgs/by-name/az/azure-cli/extensions-manual.nix index 6bd86c7a0a7e..e401c11b0778 100644 --- a/pkgs/by-name/az/azure-cli/extensions-manual.nix +++ b/pkgs/by-name/az/azure-cli/extensions-manual.nix @@ -21,6 +21,19 @@ meta.maintainers = with lib.maintainers; [ katexochen ]; }; + containerapp = mkAzExtension rec { + pname = "containerapp"; + version = "0.3.53"; + url = "https://azcliprod.blob.core.windows.net/cli-extensions/containerapp-${version}-py2.py3-none-any.whl"; + sha256 = "f9b4f3928469efcc1bfbc98cd906d9d92e72617e5c21cf3ade8b37651607c3e1"; + description = "Microsoft Azure Command-Line Tools Containerapp Extension"; + propagatedBuildInputs = with python3Packages; [ + docker + pycomposefile + ]; + meta.maintainers = with lib.maintainers; [ giggio ]; + }; + rdbms-connect = mkAzExtension rec { pname = "rdbms-connect"; version = "1.0.6"; From 2f1dd4b4fbe02e728d9dc31cd1073bd672fd1147 Mon Sep 17 00:00:00 2001 From: Joshua Manchester Date: Mon, 12 Feb 2024 22:37:29 +0000 Subject: [PATCH 24/77] maintainers: add JManch --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index e906187a9152..3f709d026412 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -9547,6 +9547,12 @@ githubId = 8900; name = "Johan Magnus Jonsson"; }; + JManch = { + email = "jmanch@protonmail.com"; + github = "JManch"; + githubId = 61563764; + name = "Joshua Manchester"; + }; jmarmstrong1207 = { name = "James Armstrong"; email = "jm.armstrong1207@gmail.com"; From 52a732062c0d65efcc477998b31b35c0652a3d5c Mon Sep 17 00:00:00 2001 From: Josh Hoffer Date: Thu, 25 Apr 2024 18:47:53 -0700 Subject: [PATCH 25/77] electron-mail: 5.1.8 -> 5.2.2 * Update electron-mail from 5.1.8 to 5.2.2. * Add changelog URL. * Set updateScript to nix-update-script. --- .../mailreaders/electron-mail/default.nix | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/electron-mail/default.nix b/pkgs/applications/networking/mailreaders/electron-mail/default.nix index bf40dba20861..d7c971c66a5d 100644 --- a/pkgs/applications/networking/mailreaders/electron-mail/default.nix +++ b/pkgs/applications/networking/mailreaders/electron-mail/default.nix @@ -1,16 +1,22 @@ -{ appimageTools, lib, fetchurl }: +{ + appimageTools, + lib, + fetchurl, + nix-update-script, +}: let pname = "electron-mail"; - version = "5.1.8"; + version = "5.2.2"; src = fetchurl { url = "https://github.com/vladimiry/ElectronMail/releases/download/v${version}/electron-mail-${version}-linux-x86_64.AppImage"; - sha256 = "sha256-btqlxFrQUyb728i99IE65A9jwEFNvJ5b6zji0kwwATU="; + sha256 = "sha256-bGqTPP+djpr+RFS6X7jUlSbxl7UDUaZLWQ3D/R76zEI="; }; appimageContents = appimageTools.extract { inherit pname version src; }; -in appimageTools.wrapType2 { +in +appimageTools.wrapType2 { inherit pname version src; extraInstallCommands = '' @@ -25,6 +31,8 @@ in appimageTools.wrapType2 { pkgs.libappindicator-gtk3 ]; + passthru.updateScript = nix-update-script { }; + meta = with lib; { description = "ElectronMail is an Electron-based unofficial desktop client for ProtonMail"; mainProgram = "electron-mail"; @@ -32,5 +40,6 @@ in appimageTools.wrapType2 { license = licenses.gpl3; maintainers = [ maintainers.princemachiavelli ]; platforms = [ "x86_64-linux" ]; + changelog = "https://github.com/vladimiry/ElectronMail/releases/tag/v${version}"; }; } From a20b3be8d3e1e2b7bf1bdc24320943538bbce643 Mon Sep 17 00:00:00 2001 From: t4ccer Date: Mon, 15 Jul 2024 13:02:42 -0600 Subject: [PATCH 26/77] ntk: fix outdated waf --- pkgs/development/libraries/audio/ntk/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/libraries/audio/ntk/default.nix b/pkgs/development/libraries/audio/ntk/default.nix index d101e2a960c6..4ad3ba33cb5c 100644 --- a/pkgs/development/libraries/audio/ntk/default.nix +++ b/pkgs/development/libraries/audio/ntk/default.nix @@ -15,6 +15,13 @@ stdenv.mkDerivation rec { cairo libjpeg libXft python3 ]; + # NOTE: ntk provides its own waf script that is incompatible with new + # python versions. If the script is not present, wafHook will install + # a compatible version from nixpkgs. + prePatch = '' + rm waf + ''; + meta = { description = "Fork of FLTK 1.3.0 with additional functionality"; version = version; From c7b2ea5dbe39a9d3686f96f90ea9e9103293af4b Mon Sep 17 00:00:00 2001 From: Frank Doepper Date: Mon, 15 Jul 2024 23:49:57 +0200 Subject: [PATCH 27/77] youtube-viewer: 3.7.9 -> 3.11.2 --- .../WWW-YoutubeViewer/default.nix | 25 ++++++++++++++----- 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/pkgs/development/perl-modules/WWW-YoutubeViewer/default.nix b/pkgs/development/perl-modules/WWW-YoutubeViewer/default.nix index 4916c9619c61..cba9ef986362 100644 --- a/pkgs/development/perl-modules/WWW-YoutubeViewer/default.nix +++ b/pkgs/development/perl-modules/WWW-YoutubeViewer/default.nix @@ -1,14 +1,25 @@ -{ stdenv, lib, fetchFromGitHub, buildPerlPackage, shortenPerlShebang, LWP, LWPProtocolHttps, DataDump, JSON }: +{ + stdenv, + lib, + fetchFromGitHub, + buildPerlPackage, + shortenPerlShebang, + LWP, + LWPProtocolHttps, + DataDump, + JSON, + gitUpdater, +}: buildPerlPackage rec { pname = "WWW-YoutubeViewer"; - version = "3.7.9"; + version = "3.11.2"; src = fetchFromGitHub { - owner = "trizen"; - repo = "youtube-viewer"; - rev = version; - sha256 = "16p0sa91h0zpqdpqmy348g6b9qj5f6qrbzrljn157vk00cg6mx18"; + owner = "trizen"; + repo = "youtube-viewer"; + rev = version; + sha256 = "9Z4fv2B0AnwtYsp7h9phnRMmHtBOMObIJvK8DmKQRxs="; }; nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang; @@ -22,6 +33,8 @@ buildPerlPackage rec { shortenPerlShebang $out/bin/youtube-viewer ''; + passthru.updateScript = gitUpdater { }; + meta = with lib; { description = "Lightweight application for searching and streaming videos from YouTube"; homepage = "https://github.com/trizen/youtube-viewer"; From 3e1227a1afad19c436a288f07e1b641a5e7a246e Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Tue, 16 Jul 2024 03:40:28 +0200 Subject: [PATCH 28/77] pkgs/development/ocaml-modules: remove unused arguments --- pkgs/development/ocaml-modules/alcotest/lwt.nix | 2 +- pkgs/development/ocaml-modules/asetmap/default.nix | 3 +-- pkgs/development/ocaml-modules/atdgen/default.nix | 2 +- pkgs/development/ocaml-modules/awa/default.nix | 2 +- pkgs/development/ocaml-modules/batteries/default.nix | 2 +- pkgs/development/ocaml-modules/bigstringaf/default.nix | 2 +- pkgs/development/ocaml-modules/caqti/async.nix | 2 +- .../development/ocaml-modules/caqti/driver-mariadb.nix | 2 +- .../ocaml-modules/caqti/driver-postgresql.nix | 2 +- .../development/ocaml-modules/caqti/driver-sqlite3.nix | 2 +- pkgs/development/ocaml-modules/caqti/dynload.nix | 2 +- pkgs/development/ocaml-modules/caqti/lwt.nix | 2 +- pkgs/development/ocaml-modules/caqti/type-calendar.nix | 2 +- pkgs/development/ocaml-modules/carton/git.nix | 2 -- pkgs/development/ocaml-modules/cmdliner/1_0.nix | 2 +- pkgs/development/ocaml-modules/cmdliner/1_1.nix | 2 +- pkgs/development/ocaml-modules/cohttp/async.nix | 3 +-- pkgs/development/ocaml-modules/cohttp/default.nix | 2 +- pkgs/development/ocaml-modules/cohttp/lwt-jsoo.nix | 2 +- pkgs/development/ocaml-modules/cohttp/lwt-unix.nix | 2 +- pkgs/development/ocaml-modules/cohttp/lwt.nix | 2 +- pkgs/development/ocaml-modules/cohttp/top.nix | 2 +- pkgs/development/ocaml-modules/conduit/async.nix | 2 +- pkgs/development/ocaml-modules/cstruct/async.nix | 2 +- pkgs/development/ocaml-modules/csv/csvtool.nix | 2 +- pkgs/development/ocaml-modules/csv/lwt.nix | 2 +- pkgs/development/ocaml-modules/curly/default.nix | 2 +- .../ocaml-modules/data-encoding/default.nix | 2 -- pkgs/development/ocaml-modules/dns/client-lwt.nix | 9 ++++----- pkgs/development/ocaml-modules/dns/client-mirage.nix | 8 ++++---- pkgs/development/ocaml-modules/dns/client.nix | 10 +++------- pkgs/development/ocaml-modules/dyn/default.nix | 2 +- pkgs/development/ocaml-modules/earley/default.nix | 2 +- pkgs/development/ocaml-modules/earlybird/default.nix | 2 +- pkgs/development/ocaml-modules/eio/default.nix | 1 - pkgs/development/ocaml-modules/emile/default.nix | 1 - pkgs/development/ocaml-modules/faraday/async.nix | 2 +- pkgs/development/ocaml-modules/faraday/default.nix | 2 +- pkgs/development/ocaml-modules/ff/default.nix | 2 +- pkgs/development/ocaml-modules/ff/pbt.nix | 2 +- pkgs/development/ocaml-modules/ffmpeg/default.nix | 2 +- pkgs/development/ocaml-modules/fiber/default.nix | 1 - pkgs/development/ocaml-modules/gapi-ocaml/default.nix | 2 +- pkgs/development/ocaml-modules/git/mirage.nix | 3 +-- pkgs/development/ocaml-modules/git/paf.nix | 2 +- pkgs/development/ocaml-modules/github/data.nix | 2 +- pkgs/development/ocaml-modules/github/jsoo.nix | 2 +- pkgs/development/ocaml-modules/github/unix.nix | 2 +- pkgs/development/ocaml-modules/gitlab/jsoo.nix | 1 - pkgs/development/ocaml-modules/gitlab/unix.nix | 1 - pkgs/development/ocaml-modules/gluten/eio.nix | 2 +- pkgs/development/ocaml-modules/h2/default.nix | 2 -- pkgs/development/ocaml-modules/hacl-star/default.nix | 2 +- pkgs/development/ocaml-modules/hacl-star/raw.nix | 2 -- pkgs/development/ocaml-modules/httpaf/lwt-unix.nix | 2 +- pkgs/development/ocaml-modules/imagelib/default.nix | 1 - pkgs/development/ocaml-modules/ipaddr/cstruct.nix | 2 +- pkgs/development/ocaml-modules/ipaddr/sexp.nix | 2 +- pkgs/development/ocaml-modules/irmin/chunk.nix | 2 +- pkgs/development/ocaml-modules/irmin/default.nix | 4 ++-- pkgs/development/ocaml-modules/irmin/fs.nix | 2 +- pkgs/development/ocaml-modules/irmin/git.nix | 2 +- pkgs/development/ocaml-modules/irmin/graphql.nix | 2 +- pkgs/development/ocaml-modules/irmin/pack.nix | 2 +- .../ocaml-modules/json-data-encoding/bson.nix | 2 +- pkgs/development/ocaml-modules/ke/default.nix | 3 +-- pkgs/development/ocaml-modules/lastfm/default.nix | 2 -- pkgs/development/ocaml-modules/lem/default.nix | 1 - pkgs/development/ocaml-modules/letsencrypt/app.nix | 3 +-- pkgs/development/ocaml-modules/letsencrypt/default.nix | 1 - pkgs/development/ocaml-modules/letsencrypt/dns.nix | 3 +-- pkgs/development/ocaml-modules/linol/lwt.nix | 2 +- pkgs/development/ocaml-modules/lwt/default.nix | 2 +- pkgs/development/ocaml-modules/lwt_react/default.nix | 2 +- pkgs/development/ocaml-modules/macaddr/cstruct.nix | 2 +- pkgs/development/ocaml-modules/macaddr/sexp.nix | 2 +- pkgs/development/ocaml-modules/mec/default.nix | 2 +- pkgs/development/ocaml-modules/metadata/default.nix | 2 +- pkgs/development/ocaml-modules/metrics/rusage.nix | 2 +- pkgs/development/ocaml-modules/mirage-clock/solo5.nix | 3 +-- pkgs/development/ocaml-modules/mirage-console/unix.nix | 2 +- pkgs/development/ocaml-modules/mirage-crypto/ec.nix | 1 - .../ocaml-modules/mirage-crypto/rng-async.nix | 2 +- .../ocaml-modules/mirage-flow/combinators.nix | 2 +- .../ocaml-modules/mirage-net-xen/default.nix | 3 +-- pkgs/development/ocaml-modules/mirage/default.nix | 2 +- pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix | 1 - .../development/ocaml-modules/ocaml-protoc/default.nix | 2 +- pkgs/development/ocaml-modules/odig/default.nix | 2 +- pkgs/development/ocaml-modules/ordering/default.nix | 2 +- pkgs/development/ocaml-modules/ounit2/default.nix | 2 +- pkgs/development/ocaml-modules/paf/cohttp.nix | 3 +-- pkgs/development/ocaml-modules/piaf/default.nix | 3 --- pkgs/development/ocaml-modules/posix/socket.nix | 2 +- pkgs/development/ocaml-modules/posix/types.nix | 2 +- pkgs/development/ocaml-modules/repr/ppx.nix | 2 +- pkgs/development/ocaml-modules/resto/acl.nix | 2 +- .../ocaml-modules/resto/cohttp-self-serving-client.nix | 3 +-- pkgs/development/ocaml-modules/resto/cohttp-server.nix | 3 +-- pkgs/development/ocaml-modules/resto/directory.nix | 2 +- pkgs/development/ocaml-modules/resto/json.nix | 2 +- pkgs/development/ocaml-modules/rpclib/lwt.nix | 3 +-- pkgs/development/ocaml-modules/sail/default.nix | 2 -- pkgs/development/ocaml-modules/sedlex/default.nix | 1 - .../ocaml-modules/shared-memory-ring/lwt.nix | 3 +-- pkgs/development/ocaml-modules/stdune/default.nix | 2 +- .../ocaml-modules/syslog-message/default.nix | 2 +- pkgs/development/ocaml-modules/tar/unix.nix | 3 +-- pkgs/development/ocaml-modules/tcslib/default.nix | 2 +- pkgs/development/ocaml-modules/timed/default.nix | 1 - pkgs/development/ocaml-modules/timedesc/tzdb.nix | 3 +-- pkgs/development/ocaml-modules/timedesc/tzlocal.nix | 3 +-- pkgs/development/ocaml-modules/tls/async.nix | 2 +- pkgs/development/ocaml-modules/tls/lwt.nix | 2 +- pkgs/development/ocaml-modules/yaml/yaml-sexp.nix | 2 +- pkgs/development/ocaml-modules/zmq/default.nix | 2 +- 116 files changed, 106 insertions(+), 154 deletions(-) diff --git a/pkgs/development/ocaml-modules/alcotest/lwt.nix b/pkgs/development/ocaml-modules/alcotest/lwt.nix index cffac7b674d7..44fb987c4779 100644 --- a/pkgs/development/ocaml-modules/alcotest/lwt.nix +++ b/pkgs/development/ocaml-modules/alcotest/lwt.nix @@ -1,4 +1,4 @@ -{ lib, buildDunePackage, alcotest, logs, lwt, fmt +{ buildDunePackage, alcotest, logs, lwt, fmt , re, cmdliner }: diff --git a/pkgs/development/ocaml-modules/asetmap/default.nix b/pkgs/development/ocaml-modules/asetmap/default.nix index 976de44959f6..40152ef5cbf4 100644 --- a/pkgs/development/ocaml-modules/asetmap/default.nix +++ b/pkgs/development/ocaml-modules/asetmap/default.nix @@ -1,5 +1,4 @@ -{ lib -, fetchurl +{ fetchurl , buildDunePackage , topkg , findlib diff --git a/pkgs/development/ocaml-modules/atdgen/default.nix b/pkgs/development/ocaml-modules/atdgen/default.nix index 60bca80fa6f4..6df0e4822634 100644 --- a/pkgs/development/ocaml-modules/atdgen/default.nix +++ b/pkgs/development/ocaml-modules/atdgen/default.nix @@ -1,4 +1,4 @@ -{ buildDunePackage, alcotest, atd, atdgen-codec-runtime, atdgen-runtime, biniou, re, yojson +{ buildDunePackage, alcotest, atd, atdgen-codec-runtime, atdgen-runtime, re , python3 }: diff --git a/pkgs/development/ocaml-modules/awa/default.nix b/pkgs/development/ocaml-modules/awa/default.nix index 6a4ed92cc079..9cdc9e4cad2a 100644 --- a/pkgs/development/ocaml-modules/awa/default.nix +++ b/pkgs/development/ocaml-modules/awa/default.nix @@ -2,7 +2,7 @@ , ppx_sexp_conv , mirage-crypto, mirage-crypto-ec, mirage-crypto-rng, mirage-crypto-pk , x509, cstruct, cstruct-unix, cstruct-sexp, sexplib, eqaf-cstruct -, rresult, mtime, logs, fmt, cmdliner, base64 +, mtime, logs, fmt, cmdliner, base64 , zarith }: diff --git a/pkgs/development/ocaml-modules/batteries/default.nix b/pkgs/development/ocaml-modules/batteries/default.nix index 2d013da25683..610973b5769c 100644 --- a/pkgs/development/ocaml-modules/batteries/default.nix +++ b/pkgs/development/ocaml-modules/batteries/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, buildDunePackage, ocaml, qtest, qcheck, num, camlp-streams +{ lib, fetchFromGitHub, buildDunePackage, ocaml, qtest, qcheck, num, camlp-streams , doCheck ? lib.versionAtLeast ocaml.version "4.08" }: diff --git a/pkgs/development/ocaml-modules/bigstringaf/default.nix b/pkgs/development/ocaml-modules/bigstringaf/default.nix index 1e5d2baed0c9..ac7c6e5a5158 100644 --- a/pkgs/development/ocaml-modules/bigstringaf/default.nix +++ b/pkgs/development/ocaml-modules/bigstringaf/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, buildDunePackage, ocaml, alcotest, bigarray-compat, pkg-config }: +{ lib, fetchFromGitHub, buildDunePackage, alcotest, pkg-config }: buildDunePackage rec { pname = "bigstringaf"; diff --git a/pkgs/development/ocaml-modules/caqti/async.nix b/pkgs/development/ocaml-modules/caqti/async.nix index 22755be193df..a0f3fb035646 100644 --- a/pkgs/development/ocaml-modules/caqti/async.nix +++ b/pkgs/development/ocaml-modules/caqti/async.nix @@ -1,4 +1,4 @@ -{ lib, buildDunePackage, async_kernel, async_unix, caqti, core_kernel }: +{ buildDunePackage, async_kernel, async_unix, caqti, core_kernel }: buildDunePackage { pname = "caqti-async"; diff --git a/pkgs/development/ocaml-modules/caqti/driver-mariadb.nix b/pkgs/development/ocaml-modules/caqti/driver-mariadb.nix index bff515eff381..5a6199de3ccc 100644 --- a/pkgs/development/ocaml-modules/caqti/driver-mariadb.nix +++ b/pkgs/development/ocaml-modules/caqti/driver-mariadb.nix @@ -1,4 +1,4 @@ -{ lib, buildDunePackage, caqti, mariadb }: +{ buildDunePackage, caqti, mariadb }: buildDunePackage { pname = "caqti-driver-mariadb"; diff --git a/pkgs/development/ocaml-modules/caqti/driver-postgresql.nix b/pkgs/development/ocaml-modules/caqti/driver-postgresql.nix index f33e38fab8df..fc440d2a1384 100644 --- a/pkgs/development/ocaml-modules/caqti/driver-postgresql.nix +++ b/pkgs/development/ocaml-modules/caqti/driver-postgresql.nix @@ -1,4 +1,4 @@ -{ lib, buildDunePackage, caqti, postgresql }: +{ buildDunePackage, caqti, postgresql }: buildDunePackage { pname = "caqti-driver-postgresql"; diff --git a/pkgs/development/ocaml-modules/caqti/driver-sqlite3.nix b/pkgs/development/ocaml-modules/caqti/driver-sqlite3.nix index ddac07f7fcfb..362707025ee7 100644 --- a/pkgs/development/ocaml-modules/caqti/driver-sqlite3.nix +++ b/pkgs/development/ocaml-modules/caqti/driver-sqlite3.nix @@ -1,4 +1,4 @@ -{ lib, buildDunePackage, caqti, ocaml_sqlite3, alcotest }: +{ buildDunePackage, caqti, ocaml_sqlite3, alcotest }: buildDunePackage { pname = "caqti-driver-sqlite3"; diff --git a/pkgs/development/ocaml-modules/caqti/dynload.nix b/pkgs/development/ocaml-modules/caqti/dynload.nix index 3dd94fc0e310..3450a6311efd 100644 --- a/pkgs/development/ocaml-modules/caqti/dynload.nix +++ b/pkgs/development/ocaml-modules/caqti/dynload.nix @@ -1,4 +1,4 @@ -{ lib, buildDunePackage, caqti, findlib }: +{ buildDunePackage, caqti, findlib }: buildDunePackage { pname = "caqti-dynload"; diff --git a/pkgs/development/ocaml-modules/caqti/lwt.nix b/pkgs/development/ocaml-modules/caqti/lwt.nix index d06421136280..35aebaebae5a 100644 --- a/pkgs/development/ocaml-modules/caqti/lwt.nix +++ b/pkgs/development/ocaml-modules/caqti/lwt.nix @@ -1,4 +1,4 @@ -{ lib, buildDunePackage, caqti, logs, lwt }: +{ buildDunePackage, caqti, logs, lwt }: buildDunePackage { pname = "caqti-lwt"; diff --git a/pkgs/development/ocaml-modules/caqti/type-calendar.nix b/pkgs/development/ocaml-modules/caqti/type-calendar.nix index 26b0887f20e8..9f71bd1d164c 100644 --- a/pkgs/development/ocaml-modules/caqti/type-calendar.nix +++ b/pkgs/development/ocaml-modules/caqti/type-calendar.nix @@ -1,4 +1,4 @@ -{ lib, buildDunePackage, calendar, caqti }: +{ buildDunePackage, calendar, caqti }: buildDunePackage { pname = "caqti-type-calendar"; diff --git a/pkgs/development/ocaml-modules/carton/git.nix b/pkgs/development/ocaml-modules/carton/git.nix index b361ee1447b2..97055067bc4a 100644 --- a/pkgs/development/ocaml-modules/carton/git.nix +++ b/pkgs/development/ocaml-modules/carton/git.nix @@ -1,8 +1,6 @@ { buildDunePackage, carton, carton-lwt , bigstringaf, lwt, fpath, result , fmt, decompress, astring -, alcotest, alcotest-lwt, cstruct, logs -, mirage-flow, rresult, ke }: buildDunePackage { diff --git a/pkgs/development/ocaml-modules/cmdliner/1_0.nix b/pkgs/development/ocaml-modules/cmdliner/1_0.nix index 0265ed18ecb3..62efd4a11eee 100644 --- a/pkgs/development/ocaml-modules/cmdliner/1_0.nix +++ b/pkgs/development/ocaml-modules/cmdliner/1_0.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, result }: +{ lib, stdenv, fetchurl, ocaml }: assert (lib.versionAtLeast ocaml.version "4.03"); diff --git a/pkgs/development/ocaml-modules/cmdliner/1_1.nix b/pkgs/development/ocaml-modules/cmdliner/1_1.nix index 67d55bc756a9..b9639438c414 100644 --- a/pkgs/development/ocaml-modules/cmdliner/1_1.nix +++ b/pkgs/development/ocaml-modules/cmdliner/1_1.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, result }: +{ lib, stdenv, fetchurl, ocaml }: lib.throwIfNot (lib.versionAtLeast ocaml.version "4.08") "cmdliner 1.1 is not available for OCaml ${ocaml.version}" diff --git a/pkgs/development/ocaml-modules/cohttp/async.nix b/pkgs/development/ocaml-modules/cohttp/async.nix index 3236d4775070..78367fcaba99 100644 --- a/pkgs/development/ocaml-modules/cohttp/async.nix +++ b/pkgs/development/ocaml-modules/cohttp/async.nix @@ -1,5 +1,4 @@ -{ lib -, buildDunePackage +{ buildDunePackage , ppx_sexp_conv , base , async diff --git a/pkgs/development/ocaml-modules/cohttp/default.nix b/pkgs/development/ocaml-modules/cohttp/default.nix index f95c44f66725..6f89c670c6b9 100644 --- a/pkgs/development/ocaml-modules/cohttp/default.nix +++ b/pkgs/development/ocaml-modules/cohttp/default.nix @@ -1,6 +1,6 @@ { lib, fetchurl, buildDunePackage , ppx_sexp_conv, base64, jsonm, re, stringext, uri-sexp -, ocaml, fmt, alcotest +, fmt, alcotest , crowbar }: diff --git a/pkgs/development/ocaml-modules/cohttp/lwt-jsoo.nix b/pkgs/development/ocaml-modules/cohttp/lwt-jsoo.nix index 611abb7751ba..a1d349b647d5 100644 --- a/pkgs/development/ocaml-modules/cohttp/lwt-jsoo.nix +++ b/pkgs/development/ocaml-modules/cohttp/lwt-jsoo.nix @@ -1,4 +1,4 @@ -{ lib, buildDunePackage +{ buildDunePackage , cohttp, cohttp-lwt, logs, lwt, js_of_ocaml, js_of_ocaml-ppx, js_of_ocaml-lwt , nodejs, lwt_ppx }: diff --git a/pkgs/development/ocaml-modules/cohttp/lwt-unix.nix b/pkgs/development/ocaml-modules/cohttp/lwt-unix.nix index b360cf0e587e..e7fecbefb91a 100644 --- a/pkgs/development/ocaml-modules/cohttp/lwt-unix.nix +++ b/pkgs/development/ocaml-modules/cohttp/lwt-unix.nix @@ -1,4 +1,4 @@ -{ lib, buildDunePackage, cohttp-lwt +{ buildDunePackage, cohttp-lwt , conduit-lwt-unix, conduit-lwt, ppx_sexp_conv , cmdliner, fmt, logs, magic-mime , ounit diff --git a/pkgs/development/ocaml-modules/cohttp/lwt.nix b/pkgs/development/ocaml-modules/cohttp/lwt.nix index 42e1d3808639..7d0678d8251d 100644 --- a/pkgs/development/ocaml-modules/cohttp/lwt.nix +++ b/pkgs/development/ocaml-modules/cohttp/lwt.nix @@ -1,4 +1,4 @@ -{ lib, buildDunePackage, cohttp, lwt, uri, ppx_sexp_conv, logs, sexplib0 }: +{ buildDunePackage, cohttp, lwt, uri, ppx_sexp_conv, logs, sexplib0 }: buildDunePackage { pname = "cohttp-lwt"; diff --git a/pkgs/development/ocaml-modules/cohttp/top.nix b/pkgs/development/ocaml-modules/cohttp/top.nix index 0a8f54871b1b..1ed6de0b304c 100644 --- a/pkgs/development/ocaml-modules/cohttp/top.nix +++ b/pkgs/development/ocaml-modules/cohttp/top.nix @@ -1,4 +1,4 @@ -{ lib, buildDunePackage, cohttp }: +{ buildDunePackage, cohttp }: buildDunePackage { pname = "cohttp-top"; diff --git a/pkgs/development/ocaml-modules/conduit/async.nix b/pkgs/development/ocaml-modules/conduit/async.nix index 9522dc552e8d..76e5cfb09cfa 100644 --- a/pkgs/development/ocaml-modules/conduit/async.nix +++ b/pkgs/development/ocaml-modules/conduit/async.nix @@ -1,4 +1,4 @@ -{ lib, buildDunePackage, async, async_ssl ? null, ppx_sexp_conv, ppx_here, uri, conduit +{ buildDunePackage, async, async_ssl ? null, ppx_sexp_conv, ppx_here, uri, conduit , core, ipaddr, ipaddr-sexp, sexplib }: diff --git a/pkgs/development/ocaml-modules/cstruct/async.nix b/pkgs/development/ocaml-modules/cstruct/async.nix index 1fe020f6490b..53762abcc860 100644 --- a/pkgs/development/ocaml-modules/cstruct/async.nix +++ b/pkgs/development/ocaml-modules/cstruct/async.nix @@ -1,4 +1,4 @@ -{ lib, buildDunePackage, cstruct, async_unix, async, core }: +{ buildDunePackage, cstruct, async_unix, async, core }: buildDunePackage rec { pname = "cstruct-async"; diff --git a/pkgs/development/ocaml-modules/csv/csvtool.nix b/pkgs/development/ocaml-modules/csv/csvtool.nix index f5a6f458bfa2..d1705e9fd5cf 100644 --- a/pkgs/development/ocaml-modules/csv/csvtool.nix +++ b/pkgs/development/ocaml-modules/csv/csvtool.nix @@ -1,4 +1,4 @@ -{ lib, ocamlPackages }: +{ ocamlPackages }: let inherit (ocamlPackages) buildDunePackage csv uutf; in diff --git a/pkgs/development/ocaml-modules/csv/lwt.nix b/pkgs/development/ocaml-modules/csv/lwt.nix index 8e91decfd65f..7dfe01d137e5 100644 --- a/pkgs/development/ocaml-modules/csv/lwt.nix +++ b/pkgs/development/ocaml-modules/csv/lwt.nix @@ -1,4 +1,4 @@ -{ lib, buildDunePackage, csv, lwt }: +{ buildDunePackage, csv, lwt }: buildDunePackage { pname = "csv-lwt"; diff --git a/pkgs/development/ocaml-modules/curly/default.nix b/pkgs/development/ocaml-modules/curly/default.nix index 03918c0d4829..5d5cdb360f47 100644 --- a/pkgs/development/ocaml-modules/curly/default.nix +++ b/pkgs/development/ocaml-modules/curly/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, buildDunePackage, fetchurl, ocaml -, result, alcotest, cohttp-lwt-unix, odoc, curl, cacert +, result, alcotest, cohttp-lwt-unix, curl, cacert }: buildDunePackage rec { diff --git a/pkgs/development/ocaml-modules/data-encoding/default.nix b/pkgs/development/ocaml-modules/data-encoding/default.nix index c9a102366fdc..75490c9648db 100644 --- a/pkgs/development/ocaml-modules/data-encoding/default.nix +++ b/pkgs/development/ocaml-modules/data-encoding/default.nix @@ -9,8 +9,6 @@ , hex , json-data-encoding , json-data-encoding-bson -, alcotest -, crowbar , ppx_expect }: diff --git a/pkgs/development/ocaml-modules/dns/client-lwt.nix b/pkgs/development/ocaml-modules/dns/client-lwt.nix index f17b8ed0759c..5e07afe0e012 100644 --- a/pkgs/development/ocaml-modules/dns/client-lwt.nix +++ b/pkgs/development/ocaml-modules/dns/client-lwt.nix @@ -1,9 +1,8 @@ -{ lib, buildDunePackage, dns, dns-client, lwt, mirage-clock, mirage-time -, mirage-random, mirage-crypto-rng, mtime, randomconv -, cstruct, fmt, logs, rresult, domain-name, ipaddr, alcotest -, ca-certs, ca-certs-nss +{ buildDunePackage, dns, dns-client, lwt +, mirage-crypto-rng, mtime +, ipaddr, alcotest +, ca-certs , happy-eyeballs -, tcpip , tls-lwt }: diff --git a/pkgs/development/ocaml-modules/dns/client-mirage.nix b/pkgs/development/ocaml-modules/dns/client-mirage.nix index 2e0768d2b7ca..f236ac425da2 100644 --- a/pkgs/development/ocaml-modules/dns/client-mirage.nix +++ b/pkgs/development/ocaml-modules/dns/client-mirage.nix @@ -1,7 +1,7 @@ -{ lib, buildDunePackage, dns, dns-client, lwt, mirage-clock, mirage-time -, mirage-random, mirage-crypto-rng, mtime, randomconv -, cstruct, fmt, logs, rresult, domain-name, ipaddr, alcotest -, ca-certs, ca-certs-nss +{ buildDunePackage, dns, dns-client, lwt, mirage-clock, mirage-time +, mirage-random +, domain-name, ipaddr +, ca-certs-nss , happy-eyeballs , tcpip , tls, tls-mirage diff --git a/pkgs/development/ocaml-modules/dns/client.nix b/pkgs/development/ocaml-modules/dns/client.nix index bc859945e4e9..78dcd400d185 100644 --- a/pkgs/development/ocaml-modules/dns/client.nix +++ b/pkgs/development/ocaml-modules/dns/client.nix @@ -1,10 +1,6 @@ -{ lib, buildDunePackage, dns, lwt, mirage-clock, mirage-time -, mirage-random, mirage-crypto-rng, mtime, randomconv -, cstruct, fmt, logs, rresult, domain-name, ipaddr, alcotest -, ca-certs, ca-certs-nss -, happy-eyeballs -, tcpip -, tls, tls-mirage +{ buildDunePackage, dns +, mirage-crypto-rng, mtime, randomconv +, domain-name, alcotest }: buildDunePackage { diff --git a/pkgs/development/ocaml-modules/dyn/default.nix b/pkgs/development/ocaml-modules/dyn/default.nix index 81b9e0d745fb..ae1218b844ce 100644 --- a/pkgs/development/ocaml-modules/dyn/default.nix +++ b/pkgs/development/ocaml-modules/dyn/default.nix @@ -1,4 +1,4 @@ -{ lib, buildDunePackage, dune_3, ordering }: +{ buildDunePackage, dune_3, ordering }: buildDunePackage { pname = "dyn"; diff --git a/pkgs/development/ocaml-modules/earley/default.nix b/pkgs/development/ocaml-modules/earley/default.nix index a679ee1ed4fd..5d292607e24a 100644 --- a/pkgs/development/ocaml-modules/earley/default.nix +++ b/pkgs/development/ocaml-modules/earley/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, ocaml, buildDunePackage +{ lib, fetchFromGitHub, buildDunePackage , stdlib-shims }: diff --git a/pkgs/development/ocaml-modules/earlybird/default.nix b/pkgs/development/ocaml-modules/earlybird/default.nix index 9d6c3664822d..7c3bbc801425 100644 --- a/pkgs/development/ocaml-modules/earlybird/default.nix +++ b/pkgs/development/ocaml-modules/earlybird/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, ocaml, buildDunePackage +{ lib, fetchFromGitHub, buildDunePackage , cmdliner, dap, fmt, iter, logs, lru, lwt_ppx, lwt_react, menhir, menhirLib, path_glob, ppx_deriving_yojson , ppx_optcomp , gitUpdater diff --git a/pkgs/development/ocaml-modules/eio/default.nix b/pkgs/development/ocaml-modules/eio/default.nix index 60e09d35db7b..3b3c728fb0c3 100644 --- a/pkgs/development/ocaml-modules/eio/default.nix +++ b/pkgs/development/ocaml-modules/eio/default.nix @@ -5,7 +5,6 @@ , bigstringaf , cstruct , domain-local-await -, dune-configurator , fetchurl , fmt , hmap diff --git a/pkgs/development/ocaml-modules/emile/default.nix b/pkgs/development/ocaml-modules/emile/default.nix index 44764033d6a2..0a70be2c4fee 100644 --- a/pkgs/development/ocaml-modules/emile/default.nix +++ b/pkgs/development/ocaml-modules/emile/default.nix @@ -1,7 +1,6 @@ { lib , buildDunePackage , fetchurl -, ocaml , angstrom , ipaddr , base64 diff --git a/pkgs/development/ocaml-modules/faraday/async.nix b/pkgs/development/ocaml-modules/faraday/async.nix index 18d1b76f043f..d6ee91cacabb 100644 --- a/pkgs/development/ocaml-modules/faraday/async.nix +++ b/pkgs/development/ocaml-modules/faraday/async.nix @@ -1,4 +1,4 @@ -{ buildDunePackage, lib, faraday, core_unix ? null, async }: +{ buildDunePackage, faraday, core_unix ? null, async }: buildDunePackage rec { pname = "faraday-async"; diff --git a/pkgs/development/ocaml-modules/faraday/default.nix b/pkgs/development/ocaml-modules/faraday/default.nix index 38ef4bb475a6..da2647ef2392 100644 --- a/pkgs/development/ocaml-modules/faraday/default.nix +++ b/pkgs/development/ocaml-modules/faraday/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, buildDunePackage, ocaml, alcotest, bigstringaf }: +{ lib, fetchFromGitHub, buildDunePackage, alcotest, bigstringaf }: buildDunePackage rec { pname = "faraday"; diff --git a/pkgs/development/ocaml-modules/ff/default.nix b/pkgs/development/ocaml-modules/ff/default.nix index bffec212b93e..9eb8a8e23db1 100644 --- a/pkgs/development/ocaml-modules/ff/default.nix +++ b/pkgs/development/ocaml-modules/ff/default.nix @@ -1,4 +1,4 @@ -{ lib, buildDunePackage, ff-pbt, ff-sig, zarith, alcotest }: +{ buildDunePackage, ff-pbt, ff-sig, zarith, alcotest }: buildDunePackage rec { pname = "ff"; diff --git a/pkgs/development/ocaml-modules/ff/pbt.nix b/pkgs/development/ocaml-modules/ff/pbt.nix index fe8234c2572c..3d0c8e7a8081 100644 --- a/pkgs/development/ocaml-modules/ff/pbt.nix +++ b/pkgs/development/ocaml-modules/ff/pbt.nix @@ -1,4 +1,4 @@ -{ lib, buildDunePackage, zarith, ff-sig, alcotest }: +{ buildDunePackage, zarith, ff-sig, alcotest }: buildDunePackage { pname = "ff-pbt"; diff --git a/pkgs/development/ocaml-modules/ffmpeg/default.nix b/pkgs/development/ocaml-modules/ffmpeg/default.nix index 1ceea8a75f69..91da782b232b 100644 --- a/pkgs/development/ocaml-modules/ffmpeg/default.nix +++ b/pkgs/development/ocaml-modules/ffmpeg/default.nix @@ -1,4 +1,4 @@ -{ lib, buildDunePackage, callPackage +{ buildDunePackage, callPackage , ffmpeg-base ? callPackage ./base.nix { } , ffmpeg-avutil , ffmpeg-avcodec diff --git a/pkgs/development/ocaml-modules/fiber/default.nix b/pkgs/development/ocaml-modules/fiber/default.nix index 69bd4a067e27..3a785d5306f0 100644 --- a/pkgs/development/ocaml-modules/fiber/default.nix +++ b/pkgs/development/ocaml-modules/fiber/default.nix @@ -2,7 +2,6 @@ , buildDunePackage , dyn , fetchurl -, ocaml , ppx_expect , stdune }: diff --git a/pkgs/development/ocaml-modules/gapi-ocaml/default.nix b/pkgs/development/ocaml-modules/gapi-ocaml/default.nix index 1db8180934bf..f8d6c02e5433 100644 --- a/pkgs/development/ocaml-modules/gapi-ocaml/default.nix +++ b/pkgs/development/ocaml-modules/gapi-ocaml/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, buildDunePackage, ocaml +{ lib, fetchFromGitHub, buildDunePackage , camlp-streams, cppo, cryptokit, ocurl, yojson , ounit2 }: diff --git a/pkgs/development/ocaml-modules/git/mirage.nix b/pkgs/development/ocaml-modules/git/mirage.nix index 28c49b70b183..2ae56da0428e 100644 --- a/pkgs/development/ocaml-modules/git/mirage.nix +++ b/pkgs/development/ocaml-modules/git/mirage.nix @@ -1,5 +1,4 @@ -{ lib -, buildDunePackage +{ buildDunePackage , git , mimic , mimic-happy-eyeballs diff --git a/pkgs/development/ocaml-modules/git/paf.nix b/pkgs/development/ocaml-modules/git/paf.nix index 9f38f0c8606a..09e64bb064a3 100644 --- a/pkgs/development/ocaml-modules/git/paf.nix +++ b/pkgs/development/ocaml-modules/git/paf.nix @@ -1,4 +1,4 @@ -{ lib, buildDunePackage +{ buildDunePackage , git , mimic , paf diff --git a/pkgs/development/ocaml-modules/github/data.nix b/pkgs/development/ocaml-modules/github/data.nix index 803642b509dd..9b8c207e91ac 100644 --- a/pkgs/development/ocaml-modules/github/data.nix +++ b/pkgs/development/ocaml-modules/github/data.nix @@ -1,4 +1,4 @@ -{ lib, buildDunePackage, github +{ buildDunePackage, github , yojson, atdgen }: diff --git a/pkgs/development/ocaml-modules/github/jsoo.nix b/pkgs/development/ocaml-modules/github/jsoo.nix index d387d2fbde01..e5860fd1d72e 100644 --- a/pkgs/development/ocaml-modules/github/jsoo.nix +++ b/pkgs/development/ocaml-modules/github/jsoo.nix @@ -1,4 +1,4 @@ -{ lib, buildDunePackage, github +{ buildDunePackage, github , cohttp, cohttp-lwt-jsoo, js_of_ocaml-lwt }: diff --git a/pkgs/development/ocaml-modules/github/unix.nix b/pkgs/development/ocaml-modules/github/unix.nix index 342be1069ce9..4d3205452094 100644 --- a/pkgs/development/ocaml-modules/github/unix.nix +++ b/pkgs/development/ocaml-modules/github/unix.nix @@ -1,4 +1,4 @@ -{ lib, buildDunePackage, github +{ buildDunePackage, github , cohttp, cohttp-lwt-unix, stringext, cmdliner, lwt }: diff --git a/pkgs/development/ocaml-modules/gitlab/jsoo.nix b/pkgs/development/ocaml-modules/gitlab/jsoo.nix index 60929f60b3b2..c6bcfb6ae39e 100644 --- a/pkgs/development/ocaml-modules/gitlab/jsoo.nix +++ b/pkgs/development/ocaml-modules/gitlab/jsoo.nix @@ -1,5 +1,4 @@ { - lib, buildDunePackage, gitlab, cohttp, diff --git a/pkgs/development/ocaml-modules/gitlab/unix.nix b/pkgs/development/ocaml-modules/gitlab/unix.nix index b914e67b54c9..1bb5ac6525ae 100644 --- a/pkgs/development/ocaml-modules/gitlab/unix.nix +++ b/pkgs/development/ocaml-modules/gitlab/unix.nix @@ -1,5 +1,4 @@ { - lib, buildDunePackage, gitlab, cmdliner, diff --git a/pkgs/development/ocaml-modules/gluten/eio.nix b/pkgs/development/ocaml-modules/gluten/eio.nix index 9c78b1d73cd4..ceeb8f729427 100644 --- a/pkgs/development/ocaml-modules/gluten/eio.nix +++ b/pkgs/development/ocaml-modules/gluten/eio.nix @@ -1,4 +1,4 @@ -{ lib, buildDunePackage, gluten, eio }: +{ buildDunePackage, gluten, eio }: buildDunePackage { pname = "gluten-eio"; diff --git a/pkgs/development/ocaml-modules/h2/default.nix b/pkgs/development/ocaml-modules/h2/default.nix index e8d9d42ff602..f65aeaf0e461 100644 --- a/pkgs/development/ocaml-modules/h2/default.nix +++ b/pkgs/development/ocaml-modules/h2/default.nix @@ -1,7 +1,5 @@ { buildDunePackage -, lib , fetchFromGitHub -, ocaml , hpack , angstrom , faraday diff --git a/pkgs/development/ocaml-modules/hacl-star/default.nix b/pkgs/development/ocaml-modules/hacl-star/default.nix index 18d307655584..558146c3dd4b 100644 --- a/pkgs/development/ocaml-modules/hacl-star/default.nix +++ b/pkgs/development/ocaml-modules/hacl-star/default.nix @@ -1,4 +1,4 @@ -{ lib, buildDunePackage, hacl-star-raw, zarith, cppo, alcotest, secp256k1-internal, qcheck-core, cstruct }: +{ buildDunePackage, hacl-star-raw, zarith, cppo, alcotest, secp256k1-internal, qcheck-core, cstruct }: buildDunePackage { diff --git a/pkgs/development/ocaml-modules/hacl-star/raw.nix b/pkgs/development/ocaml-modules/hacl-star/raw.nix index b4b8c1741535..15dde10e7f26 100644 --- a/pkgs/development/ocaml-modules/hacl-star/raw.nix +++ b/pkgs/development/ocaml-modules/hacl-star/raw.nix @@ -2,11 +2,9 @@ , which , stdenv , fetchzip -, opaline , cmake , ocaml , findlib -, hacl-star , ctypes , cppo }: diff --git a/pkgs/development/ocaml-modules/httpaf/lwt-unix.nix b/pkgs/development/ocaml-modules/httpaf/lwt-unix.nix index 9b78d7bf6401..46490def6f8e 100644 --- a/pkgs/development/ocaml-modules/httpaf/lwt-unix.nix +++ b/pkgs/development/ocaml-modules/httpaf/lwt-unix.nix @@ -1,4 +1,4 @@ -{ lib, buildDunePackage +{ buildDunePackage , httpaf , faraday-lwt-unix , lwt diff --git a/pkgs/development/ocaml-modules/imagelib/default.nix b/pkgs/development/ocaml-modules/imagelib/default.nix index 10509f1e7500..3533a7880e3e 100644 --- a/pkgs/development/ocaml-modules/imagelib/default.nix +++ b/pkgs/development/ocaml-modules/imagelib/default.nix @@ -1,7 +1,6 @@ { lib , fetchurl , buildDunePackage -, ocaml , decompress , stdlib-shims , alcotest diff --git a/pkgs/development/ocaml-modules/ipaddr/cstruct.nix b/pkgs/development/ocaml-modules/ipaddr/cstruct.nix index cbad2d73e545..8471d9c4e8dc 100644 --- a/pkgs/development/ocaml-modules/ipaddr/cstruct.nix +++ b/pkgs/development/ocaml-modules/ipaddr/cstruct.nix @@ -1,4 +1,4 @@ -{ lib, buildDunePackage +{ buildDunePackage , ipaddr, cstruct }: diff --git a/pkgs/development/ocaml-modules/ipaddr/sexp.nix b/pkgs/development/ocaml-modules/ipaddr/sexp.nix index 9484f8203cec..0a05c7fbadd6 100644 --- a/pkgs/development/ocaml-modules/ipaddr/sexp.nix +++ b/pkgs/development/ocaml-modules/ipaddr/sexp.nix @@ -1,4 +1,4 @@ -{ lib, buildDunePackage +{ buildDunePackage , ipaddr, ipaddr-cstruct, ounit2, ppx_sexp_conv }: diff --git a/pkgs/development/ocaml-modules/irmin/chunk.nix b/pkgs/development/ocaml-modules/irmin/chunk.nix index 3e7f3c2a1b70..ce955265a2f8 100644 --- a/pkgs/development/ocaml-modules/irmin/chunk.nix +++ b/pkgs/development/ocaml-modules/irmin/chunk.nix @@ -1,4 +1,4 @@ -{ lib, buildDunePackage, irmin, irmin-test, fmt, logs, lwt, alcotest }: +{ buildDunePackage, irmin, irmin-test, fmt, logs, lwt, alcotest }: buildDunePackage rec { diff --git a/pkgs/development/ocaml-modules/irmin/default.nix b/pkgs/development/ocaml-modules/irmin/default.nix index fdd18aa5abe5..da8531a9dec2 100644 --- a/pkgs/development/ocaml-modules/irmin/default.nix +++ b/pkgs/development/ocaml-modules/irmin/default.nix @@ -1,5 +1,5 @@ -{ lib, buildDunePackage -, astring, digestif, fmt, jsonm, logs, ocaml_lwt, ocamlgraph, uri +{ buildDunePackage +, astring, digestif, fmt, jsonm, logs, ocamlgraph, uri , repr, ppx_irmin, bheap, uutf, mtime, lwt, optint , vector, hex, alcotest, qcheck-alcotest }: diff --git a/pkgs/development/ocaml-modules/irmin/fs.nix b/pkgs/development/ocaml-modules/irmin/fs.nix index 8d56e90fad8b..093a68fe78ef 100644 --- a/pkgs/development/ocaml-modules/irmin/fs.nix +++ b/pkgs/development/ocaml-modules/irmin/fs.nix @@ -1,4 +1,4 @@ -{ lib, buildDunePackage, irmin, astring, logs, lwt +{ buildDunePackage, irmin, astring, logs, lwt , alcotest, irmin-test, irmin-watcher }: diff --git a/pkgs/development/ocaml-modules/irmin/git.nix b/pkgs/development/ocaml-modules/irmin/git.nix index 1e4397e89298..1fde734d9c26 100644 --- a/pkgs/development/ocaml-modules/irmin/git.nix +++ b/pkgs/development/ocaml-modules/irmin/git.nix @@ -1,4 +1,4 @@ -{ lib, buildDunePackage +{ buildDunePackage , git, irmin, ppx_irmin, git-unix, irmin-watcher , digestif, cstruct, fmt, astring, fpath, logs, lwt, uri , cohttp-lwt-unix, mimic diff --git a/pkgs/development/ocaml-modules/irmin/graphql.nix b/pkgs/development/ocaml-modules/irmin/graphql.nix index 1b5ecb51396f..93b5c939e8fa 100644 --- a/pkgs/development/ocaml-modules/irmin/graphql.nix +++ b/pkgs/development/ocaml-modules/irmin/graphql.nix @@ -1,4 +1,4 @@ -{ lib, buildDunePackage, cohttp-lwt, cohttp-lwt-unix, graphql-cohttp, graphql-lwt, irmin, git-unix +{ buildDunePackage, cohttp-lwt, cohttp-lwt-unix, graphql-cohttp, graphql-lwt, irmin, git-unix , alcotest, alcotest-lwt, logs, yojson, cacert }: diff --git a/pkgs/development/ocaml-modules/irmin/pack.nix b/pkgs/development/ocaml-modules/irmin/pack.nix index 3a00c5e99f5f..bb1a65354fb7 100644 --- a/pkgs/development/ocaml-modules/irmin/pack.nix +++ b/pkgs/development/ocaml-modules/irmin/pack.nix @@ -1,4 +1,4 @@ -{ lib, buildDunePackage +{ buildDunePackage , index, ppx_irmin, irmin, optint, fmt, logs, lwt, mtime, cmdliner, checkseum, rusage , alcotest, alcotest-lwt, astring, irmin-test }: diff --git a/pkgs/development/ocaml-modules/json-data-encoding/bson.nix b/pkgs/development/ocaml-modules/json-data-encoding/bson.nix index 46810ab1566b..4430746a7add 100644 --- a/pkgs/development/ocaml-modules/json-data-encoding/bson.nix +++ b/pkgs/development/ocaml-modules/json-data-encoding/bson.nix @@ -1,4 +1,4 @@ -{ lib, buildDunePackage, json-data-encoding, ocplib-endian, crowbar, alcotest }: +{ buildDunePackage, json-data-encoding, ocplib-endian, crowbar, alcotest }: buildDunePackage { pname = "json-data-encoding-bson"; diff --git a/pkgs/development/ocaml-modules/ke/default.nix b/pkgs/development/ocaml-modules/ke/default.nix index 35f083a876ee..db5bcd5e80a3 100644 --- a/pkgs/development/ocaml-modules/ke/default.nix +++ b/pkgs/development/ocaml-modules/ke/default.nix @@ -1,5 +1,4 @@ -{ lib, buildDunePackage, fetchurl -, bigarray-compat, fmt +{ lib, buildDunePackage, fetchurl, fmt , alcotest, bigstringaf }: diff --git a/pkgs/development/ocaml-modules/lastfm/default.nix b/pkgs/development/ocaml-modules/lastfm/default.nix index 807589e19b57..da4bb54d2bf5 100644 --- a/pkgs/development/ocaml-modules/lastfm/default.nix +++ b/pkgs/development/ocaml-modules/lastfm/default.nix @@ -1,8 +1,6 @@ { lib , buildDunePackage , fetchFromGitHub -, pkg-config -, dune-configurator , re , xmlplaylist }: diff --git a/pkgs/development/ocaml-modules/lem/default.nix b/pkgs/development/ocaml-modules/lem/default.nix index 1e797cbb7cb1..a020d2ab692f 100644 --- a/pkgs/development/ocaml-modules/lem/default.nix +++ b/pkgs/development/ocaml-modules/lem/default.nix @@ -1,7 +1,6 @@ { stdenv , fetchFromGitHub , lib -, ncurses , makeWrapper , ocamlbuild , findlib diff --git a/pkgs/development/ocaml-modules/letsencrypt/app.nix b/pkgs/development/ocaml-modules/letsencrypt/app.nix index 0b20eb5c3e6a..c3807a04061a 100644 --- a/pkgs/development/ocaml-modules/letsencrypt/app.nix +++ b/pkgs/development/ocaml-modules/letsencrypt/app.nix @@ -1,5 +1,4 @@ -{ lib -, buildDunePackage +{ buildDunePackage , letsencrypt , letsencrypt-dns , cmdliner diff --git a/pkgs/development/ocaml-modules/letsencrypt/default.nix b/pkgs/development/ocaml-modules/letsencrypt/default.nix index 3eb8c2c08b55..a5e0c8a6ffd2 100644 --- a/pkgs/development/ocaml-modules/letsencrypt/default.nix +++ b/pkgs/development/ocaml-modules/letsencrypt/default.nix @@ -10,7 +10,6 @@ , mirage-crypto , mirage-crypto-ec , mirage-crypto-pk -, mirage-crypto-rng , x509 , yojson , ounit diff --git a/pkgs/development/ocaml-modules/letsencrypt/dns.nix b/pkgs/development/ocaml-modules/letsencrypt/dns.nix index 4f2f04843163..26802cf0cb34 100644 --- a/pkgs/development/ocaml-modules/letsencrypt/dns.nix +++ b/pkgs/development/ocaml-modules/letsencrypt/dns.nix @@ -1,5 +1,4 @@ -{ lib -, buildDunePackage +{ buildDunePackage , letsencrypt , logs , fmt diff --git a/pkgs/development/ocaml-modules/linol/lwt.nix b/pkgs/development/ocaml-modules/linol/lwt.nix index 67b0b7b07fbc..b8d16b023041 100644 --- a/pkgs/development/ocaml-modules/linol/lwt.nix +++ b/pkgs/development/ocaml-modules/linol/lwt.nix @@ -1,4 +1,4 @@ -{ lib, buildDunePackage, linol, jsonrpc, lwt, yojson }: +{ buildDunePackage, linol, jsonrpc, lwt, yojson }: buildDunePackage { pname = "linol-lwt"; diff --git a/pkgs/development/ocaml-modules/lwt/default.nix b/pkgs/development/ocaml-modules/lwt/default.nix index 61cf05151a30..773b0ea81eba 100644 --- a/pkgs/development/ocaml-modules/lwt/default.nix +++ b/pkgs/development/ocaml-modules/lwt/default.nix @@ -1,5 +1,5 @@ { lib, fetchFromGitHub, libev, buildDunePackage -, ocaml, cppo, dune-configurator, ocplib-endian +, cppo, dune-configurator, ocplib-endian }: buildDunePackage rec { diff --git a/pkgs/development/ocaml-modules/lwt_react/default.nix b/pkgs/development/ocaml-modules/lwt_react/default.nix index f6f2bc0f4ef3..492bad647085 100644 --- a/pkgs/development/ocaml-modules/lwt_react/default.nix +++ b/pkgs/development/ocaml-modules/lwt_react/default.nix @@ -1,4 +1,4 @@ -{ lib, buildDunePackage, fetchFromGitHub, cppo, lwt, react }: +{ buildDunePackage, fetchFromGitHub, cppo, lwt, react }: buildDunePackage { pname = "lwt_react"; diff --git a/pkgs/development/ocaml-modules/macaddr/cstruct.nix b/pkgs/development/ocaml-modules/macaddr/cstruct.nix index 9fb3ce304d95..db77c9fb2c56 100644 --- a/pkgs/development/ocaml-modules/macaddr/cstruct.nix +++ b/pkgs/development/ocaml-modules/macaddr/cstruct.nix @@ -1,4 +1,4 @@ -{ lib, buildDunePackage +{ buildDunePackage , macaddr, cstruct }: diff --git a/pkgs/development/ocaml-modules/macaddr/sexp.nix b/pkgs/development/ocaml-modules/macaddr/sexp.nix index 62e2acba4d3e..63a93efab2ed 100644 --- a/pkgs/development/ocaml-modules/macaddr/sexp.nix +++ b/pkgs/development/ocaml-modules/macaddr/sexp.nix @@ -1,4 +1,4 @@ -{ lib, buildDunePackage +{ buildDunePackage , macaddr, ppx_sexp_conv, macaddr-cstruct, ounit2 }: diff --git a/pkgs/development/ocaml-modules/mec/default.nix b/pkgs/development/ocaml-modules/mec/default.nix index ddb610f5570b..de57b3d44d32 100644 --- a/pkgs/development/ocaml-modules/mec/default.nix +++ b/pkgs/development/ocaml-modules/mec/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchzip, buildDunePackage, ocaml +{ lib, fetchzip, buildDunePackage , zarith, eqaf, bigarray-compat, hex, ff-sig, ff , alcotest, bisect_ppx }: diff --git a/pkgs/development/ocaml-modules/metadata/default.nix b/pkgs/development/ocaml-modules/metadata/default.nix index 2d9ea0da8deb..9a8414de75d4 100644 --- a/pkgs/development/ocaml-modules/metadata/default.nix +++ b/pkgs/development/ocaml-modules/metadata/default.nix @@ -1,4 +1,4 @@ -{ lib, buildDunePackage, fetchFromGitHub, dune-configurator, pkg-config, ogg, flac }: +{ lib, buildDunePackage, fetchFromGitHub }: buildDunePackage rec { pname = "metadata"; diff --git a/pkgs/development/ocaml-modules/metrics/rusage.nix b/pkgs/development/ocaml-modules/metrics/rusage.nix index ed944fb6dfc9..fcc188f7db4b 100644 --- a/pkgs/development/ocaml-modules/metrics/rusage.nix +++ b/pkgs/development/ocaml-modules/metrics/rusage.nix @@ -1,4 +1,4 @@ -{ lib, buildDunePackage, metrics +{ buildDunePackage, metrics , fmt, logs }: diff --git a/pkgs/development/ocaml-modules/mirage-clock/solo5.nix b/pkgs/development/ocaml-modules/mirage-clock/solo5.nix index d787c08e1bb0..e13fc60e97bd 100644 --- a/pkgs/development/ocaml-modules/mirage-clock/solo5.nix +++ b/pkgs/development/ocaml-modules/mirage-clock/solo5.nix @@ -1,5 +1,4 @@ -{ lib -, buildDunePackage +{ buildDunePackage , mirage-clock }: diff --git a/pkgs/development/ocaml-modules/mirage-console/unix.nix b/pkgs/development/ocaml-modules/mirage-console/unix.nix index ca8c2aeac5e3..341df7927ed3 100644 --- a/pkgs/development/ocaml-modules/mirage-console/unix.nix +++ b/pkgs/development/ocaml-modules/mirage-console/unix.nix @@ -1,4 +1,4 @@ -{ buildDunePackage, mirage-console, lwt, cstruct, cstruct-lwt }: +{ buildDunePackage, mirage-console, cstruct, cstruct-lwt }: buildDunePackage { pname = "mirage-console-unix"; diff --git a/pkgs/development/ocaml-modules/mirage-crypto/ec.nix b/pkgs/development/ocaml-modules/mirage-crypto/ec.nix index b17182a5efda..f1312f58146d 100644 --- a/pkgs/development/ocaml-modules/mirage-crypto/ec.nix +++ b/pkgs/development/ocaml-modules/mirage-crypto/ec.nix @@ -1,5 +1,4 @@ { lib -, ocaml , buildDunePackage , mirage-crypto , dune-configurator diff --git a/pkgs/development/ocaml-modules/mirage-crypto/rng-async.nix b/pkgs/development/ocaml-modules/mirage-crypto/rng-async.nix index b9979b446d20..bc94e3331316 100644 --- a/pkgs/development/ocaml-modules/mirage-crypto/rng-async.nix +++ b/pkgs/development/ocaml-modules/mirage-crypto/rng-async.nix @@ -1,4 +1,4 @@ -{ lib, buildDunePackage +{ buildDunePackage , mirage-crypto, mirage-crypto-rng , dune-configurator, async, logs }: diff --git a/pkgs/development/ocaml-modules/mirage-flow/combinators.nix b/pkgs/development/ocaml-modules/mirage-flow/combinators.nix index 5500d0551253..290787bf639f 100644 --- a/pkgs/development/ocaml-modules/mirage-flow/combinators.nix +++ b/pkgs/development/ocaml-modules/mirage-flow/combinators.nix @@ -1,4 +1,4 @@ -{ buildDunePackage, mirage-flow, fmt, lwt, logs, cstruct, mirage-clock }: +{ buildDunePackage, mirage-flow, lwt, logs, cstruct, mirage-clock }: buildDunePackage { pname = "mirage-flow-combinators"; diff --git a/pkgs/development/ocaml-modules/mirage-net-xen/default.nix b/pkgs/development/ocaml-modules/mirage-net-xen/default.nix index e03e17905faa..766db21c90ab 100644 --- a/pkgs/development/ocaml-modules/mirage-net-xen/default.nix +++ b/pkgs/development/ocaml-modules/mirage-net-xen/default.nix @@ -1,5 +1,4 @@ -{ lib -, buildDunePackage +{ buildDunePackage , netchannel , ppx_sexp_conv , lwt diff --git a/pkgs/development/ocaml-modules/mirage/default.nix b/pkgs/development/ocaml-modules/mirage/default.nix index 6342184e805d..3317a51cf3a4 100644 --- a/pkgs/development/ocaml-modules/mirage/default.nix +++ b/pkgs/development/ocaml-modules/mirage/default.nix @@ -1,4 +1,4 @@ -{ lib, buildDunePackage, ocaml, alcotest +{ buildDunePackage, ocaml, alcotest , functoria, mirage-runtime, bos , ipaddr, astring, logs, stdlib-shims }: diff --git a/pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix b/pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix index 49a6db7a118e..f06c425c4362 100644 --- a/pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix +++ b/pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix @@ -14,7 +14,6 @@ , re , stdune , chrome-trace -, dune_3 , csexp , result , pp diff --git a/pkgs/development/ocaml-modules/ocaml-protoc/default.nix b/pkgs/development/ocaml-modules/ocaml-protoc/default.nix index 51ca531b0140..717f5755ebac 100644 --- a/pkgs/development/ocaml-modules/ocaml-protoc/default.nix +++ b/pkgs/development/ocaml-modules/ocaml-protoc/default.nix @@ -1,4 +1,4 @@ -{ lib, buildDunePackage +{ buildDunePackage , pbrt , stdlib-shims }: diff --git a/pkgs/development/ocaml-modules/odig/default.nix b/pkgs/development/ocaml-modules/odig/default.nix index 5ea3730c7ff4..3fe26e5b90dd 100644 --- a/pkgs/development/ocaml-modules/odig/default.nix +++ b/pkgs/development/ocaml-modules/odig/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, buildTopkgPackage, cmdliner, odoc, b0 }: +{ lib, fetchurl, buildTopkgPackage, cmdliner, odoc, b0 }: buildTopkgPackage rec { pname = "odig"; diff --git a/pkgs/development/ocaml-modules/ordering/default.nix b/pkgs/development/ocaml-modules/ordering/default.nix index 8613ccf9ae08..7776c0462d05 100644 --- a/pkgs/development/ocaml-modules/ordering/default.nix +++ b/pkgs/development/ocaml-modules/ordering/default.nix @@ -1,4 +1,4 @@ -{ lib, buildDunePackage, dune_3 }: +{ buildDunePackage, dune_3 }: buildDunePackage { pname = "ordering"; diff --git a/pkgs/development/ocaml-modules/ounit2/default.nix b/pkgs/development/ocaml-modules/ounit2/default.nix index 61c1615b5857..0a302d26b624 100644 --- a/pkgs/development/ocaml-modules/ounit2/default.nix +++ b/pkgs/development/ocaml-modules/ounit2/default.nix @@ -1,4 +1,4 @@ -{ lib, ocaml, buildDunePackage, fetchurl, seq, stdlib-shims, ncurses }: +{ lib, buildDunePackage, fetchurl, seq, stdlib-shims, ncurses }: buildDunePackage rec { minimalOCamlVersion = "4.08"; diff --git a/pkgs/development/ocaml-modules/paf/cohttp.nix b/pkgs/development/ocaml-modules/paf/cohttp.nix index 0300076b5215..e5f21b9ea3b2 100644 --- a/pkgs/development/ocaml-modules/paf/cohttp.nix +++ b/pkgs/development/ocaml-modules/paf/cohttp.nix @@ -1,5 +1,4 @@ -{ lib -, buildDunePackage +{ buildDunePackage , paf , cohttp-lwt , domain-name diff --git a/pkgs/development/ocaml-modules/piaf/default.nix b/pkgs/development/ocaml-modules/piaf/default.nix index 46bb62a24669..cc964df9ffbd 100644 --- a/pkgs/development/ocaml-modules/piaf/default.nix +++ b/pkgs/development/ocaml-modules/piaf/default.nix @@ -6,12 +6,9 @@ , gluten-lwt-unix , lib , logs -, lwt_ssl , magic-mime , mrmime -, pecu , psq -, ssl , uri }: diff --git a/pkgs/development/ocaml-modules/posix/socket.nix b/pkgs/development/ocaml-modules/posix/socket.nix index c998965a6189..4c3c6cc0f02b 100644 --- a/pkgs/development/ocaml-modules/posix/socket.nix +++ b/pkgs/development/ocaml-modules/posix/socket.nix @@ -1,4 +1,4 @@ -{ lib, buildDunePackage, posix-base }: +{ buildDunePackage, posix-base }: buildDunePackage { pname = "posix-socket"; diff --git a/pkgs/development/ocaml-modules/posix/types.nix b/pkgs/development/ocaml-modules/posix/types.nix index c346ea86ac76..8672a7dc29f8 100644 --- a/pkgs/development/ocaml-modules/posix/types.nix +++ b/pkgs/development/ocaml-modules/posix/types.nix @@ -1,4 +1,4 @@ -{ lib, buildDunePackage, posix-base }: +{ buildDunePackage, posix-base }: buildDunePackage { pname = "posix-types"; diff --git a/pkgs/development/ocaml-modules/repr/ppx.nix b/pkgs/development/ocaml-modules/repr/ppx.nix index cd3bf78eadda..71fab69b08d1 100644 --- a/pkgs/development/ocaml-modules/repr/ppx.nix +++ b/pkgs/development/ocaml-modules/repr/ppx.nix @@ -1,4 +1,4 @@ -{ lib, buildDunePackage, ppx_deriving, ppxlib, repr, alcotest, hex }: +{ buildDunePackage, ppx_deriving, ppxlib, repr, alcotest, hex }: buildDunePackage { pname = "ppx_repr"; diff --git a/pkgs/development/ocaml-modules/resto/acl.nix b/pkgs/development/ocaml-modules/resto/acl.nix index 92a1b751ed5d..e96f9471b1b2 100644 --- a/pkgs/development/ocaml-modules/resto/acl.nix +++ b/pkgs/development/ocaml-modules/resto/acl.nix @@ -1,4 +1,4 @@ -{ lib, buildDunePackage, resto, uri }: +{ buildDunePackage, resto, uri }: buildDunePackage { pname = "resto-acl"; diff --git a/pkgs/development/ocaml-modules/resto/cohttp-self-serving-client.nix b/pkgs/development/ocaml-modules/resto/cohttp-self-serving-client.nix index fac4ce7422ac..ccce7af29d9c 100644 --- a/pkgs/development/ocaml-modules/resto/cohttp-self-serving-client.nix +++ b/pkgs/development/ocaml-modules/resto/cohttp-self-serving-client.nix @@ -1,5 +1,4 @@ -{ lib -, buildDunePackage +{ buildDunePackage , resto , resto-directory , resto-acl diff --git a/pkgs/development/ocaml-modules/resto/cohttp-server.nix b/pkgs/development/ocaml-modules/resto/cohttp-server.nix index 6347b8628b39..8a528b561a95 100644 --- a/pkgs/development/ocaml-modules/resto/cohttp-server.nix +++ b/pkgs/development/ocaml-modules/resto/cohttp-server.nix @@ -1,5 +1,4 @@ -{ lib -, buildDunePackage +{ buildDunePackage , resto , resto-directory , resto-acl diff --git a/pkgs/development/ocaml-modules/resto/directory.nix b/pkgs/development/ocaml-modules/resto/directory.nix index efbb7cb608e7..d23b64578924 100644 --- a/pkgs/development/ocaml-modules/resto/directory.nix +++ b/pkgs/development/ocaml-modules/resto/directory.nix @@ -1,4 +1,4 @@ -{ lib, buildDunePackage, resto, resto-json, lwt }: +{ buildDunePackage, resto, lwt }: buildDunePackage { pname = "resto-directory"; diff --git a/pkgs/development/ocaml-modules/resto/json.nix b/pkgs/development/ocaml-modules/resto/json.nix index c0f9b00d6ad7..f1ca0c49bb99 100644 --- a/pkgs/development/ocaml-modules/resto/json.nix +++ b/pkgs/development/ocaml-modules/resto/json.nix @@ -1,4 +1,4 @@ -{ lib, buildDunePackage, resto, json-data-encoding, json-data-encoding-bson }: +{ buildDunePackage, resto, json-data-encoding, json-data-encoding-bson }: buildDunePackage { pname = "resto-json"; diff --git a/pkgs/development/ocaml-modules/rpclib/lwt.nix b/pkgs/development/ocaml-modules/rpclib/lwt.nix index a4a3e06bf100..ce02d4b1e66b 100644 --- a/pkgs/development/ocaml-modules/rpclib/lwt.nix +++ b/pkgs/development/ocaml-modules/rpclib/lwt.nix @@ -1,5 +1,4 @@ -{ lib -, buildDunePackage +{ buildDunePackage , rpclib , lwt , alcotest-lwt diff --git a/pkgs/development/ocaml-modules/sail/default.nix b/pkgs/development/ocaml-modules/sail/default.nix index a01afe5904a5..c7df6ef50308 100644 --- a/pkgs/development/ocaml-modules/sail/default.nix +++ b/pkgs/development/ocaml-modules/sail/default.nix @@ -10,9 +10,7 @@ , pprint , makeWrapper , lem -, z3 , linksem -, num , yojson }: diff --git a/pkgs/development/ocaml-modules/sedlex/default.nix b/pkgs/development/ocaml-modules/sedlex/default.nix index b7303a425d62..53a3c718ed6e 100644 --- a/pkgs/development/ocaml-modules/sedlex/default.nix +++ b/pkgs/development/ocaml-modules/sedlex/default.nix @@ -2,7 +2,6 @@ , fetchFromGitHub , fetchurl , buildDunePackage -, ocaml , gen , ppxlib , uchar diff --git a/pkgs/development/ocaml-modules/shared-memory-ring/lwt.nix b/pkgs/development/ocaml-modules/shared-memory-ring/lwt.nix index dc34be8ed746..0dd8d819611d 100644 --- a/pkgs/development/ocaml-modules/shared-memory-ring/lwt.nix +++ b/pkgs/development/ocaml-modules/shared-memory-ring/lwt.nix @@ -1,5 +1,4 @@ -{ lib -, buildDunePackage +{ buildDunePackage , shared-memory-ring , ppx_cstruct , cstruct diff --git a/pkgs/development/ocaml-modules/stdune/default.nix b/pkgs/development/ocaml-modules/stdune/default.nix index 5e0b798772de..ffb73941f0bd 100644 --- a/pkgs/development/ocaml-modules/stdune/default.nix +++ b/pkgs/development/ocaml-modules/stdune/default.nix @@ -1,4 +1,4 @@ -{ lib, buildDunePackage, dune_3, dyn, ordering, csexp }: +{ buildDunePackage, dune_3, dyn, ordering, csexp }: buildDunePackage { pname = "stdune"; diff --git a/pkgs/development/ocaml-modules/syslog-message/default.nix b/pkgs/development/ocaml-modules/syslog-message/default.nix index e33194809526..5d1000c3182e 100644 --- a/pkgs/development/ocaml-modules/syslog-message/default.nix +++ b/pkgs/development/ocaml-modules/syslog-message/default.nix @@ -1,5 +1,5 @@ { lib, buildDunePackage, fetchurl -, astring, ptime, rresult, qcheck +, ptime, qcheck }: buildDunePackage rec { diff --git a/pkgs/development/ocaml-modules/tar/unix.nix b/pkgs/development/ocaml-modules/tar/unix.nix index 92b5a9237f5d..ed12dd57536a 100644 --- a/pkgs/development/ocaml-modules/tar/unix.nix +++ b/pkgs/development/ocaml-modules/tar/unix.nix @@ -1,5 +1,4 @@ -{ lib -, buildDunePackage +{ buildDunePackage , tar , cstruct-lwt , lwt diff --git a/pkgs/development/ocaml-modules/tcslib/default.nix b/pkgs/development/ocaml-modules/tcslib/default.nix index 1feff4e0a39b..2cec5ccc5e5e 100644 --- a/pkgs/development/ocaml-modules/tcslib/default.nix +++ b/pkgs/development/ocaml-modules/tcslib/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, ocamlPackages, buildOasisPackage, extlib, num }: +{ lib, fetchFromGitHub, buildOasisPackage, extlib, num }: buildOasisPackage rec { pname = "tcslib"; diff --git a/pkgs/development/ocaml-modules/timed/default.nix b/pkgs/development/ocaml-modules/timed/default.nix index 988cb3f5487f..f3e925f4eefa 100644 --- a/pkgs/development/ocaml-modules/timed/default.nix +++ b/pkgs/development/ocaml-modules/timed/default.nix @@ -1,6 +1,5 @@ { lib , fetchFromGitHub -, ocaml , buildDunePackage }: diff --git a/pkgs/development/ocaml-modules/timedesc/tzdb.nix b/pkgs/development/ocaml-modules/timedesc/tzdb.nix index 95fab02d11a0..d335ee4c315d 100644 --- a/pkgs/development/ocaml-modules/timedesc/tzdb.nix +++ b/pkgs/development/ocaml-modules/timedesc/tzdb.nix @@ -1,5 +1,4 @@ -{ lib -, buildDunePackage +{ buildDunePackage , timedesc }: diff --git a/pkgs/development/ocaml-modules/timedesc/tzlocal.nix b/pkgs/development/ocaml-modules/timedesc/tzlocal.nix index 6dcbfd741075..780ba7f8bda2 100644 --- a/pkgs/development/ocaml-modules/timedesc/tzlocal.nix +++ b/pkgs/development/ocaml-modules/timedesc/tzlocal.nix @@ -1,5 +1,4 @@ -{ lib -, buildDunePackage +{ buildDunePackage , timedesc }: diff --git a/pkgs/development/ocaml-modules/tls/async.nix b/pkgs/development/ocaml-modules/tls/async.nix index d4bdb84d685d..338658cabbdb 100644 --- a/pkgs/development/ocaml-modules/tls/async.nix +++ b/pkgs/development/ocaml-modules/tls/async.nix @@ -1,4 +1,4 @@ -{ lib, buildDunePackage, tls, async, cstruct-async, core, cstruct, mirage-crypto-rng-async }: +{ buildDunePackage, tls, async, cstruct-async, core, cstruct, mirage-crypto-rng-async }: buildDunePackage rec { pname = "tls-async"; diff --git a/pkgs/development/ocaml-modules/tls/lwt.nix b/pkgs/development/ocaml-modules/tls/lwt.nix index d7db822182d3..b86f41aeaa07 100644 --- a/pkgs/development/ocaml-modules/tls/lwt.nix +++ b/pkgs/development/ocaml-modules/tls/lwt.nix @@ -1,4 +1,4 @@ -{ lib, buildDunePackage, tls, lwt, mirage-crypto-rng-lwt, cmdliner, x509 }: +{ buildDunePackage, tls, lwt, mirage-crypto-rng-lwt, x509 }: buildDunePackage rec { pname = "tls-lwt"; diff --git a/pkgs/development/ocaml-modules/yaml/yaml-sexp.nix b/pkgs/development/ocaml-modules/yaml/yaml-sexp.nix index 051019c73479..44e111715db5 100644 --- a/pkgs/development/ocaml-modules/yaml/yaml-sexp.nix +++ b/pkgs/development/ocaml-modules/yaml/yaml-sexp.nix @@ -1,4 +1,4 @@ -{ lib, buildDunePackage, yaml, dune-configurator, ppx_sexp_conv, sexplib +{ buildDunePackage, yaml, ppx_sexp_conv, sexplib , junit_alcotest }: diff --git a/pkgs/development/ocaml-modules/zmq/default.nix b/pkgs/development/ocaml-modules/zmq/default.nix index abfe608055df..41d91b8cf5db 100644 --- a/pkgs/development/ocaml-modules/zmq/default.nix +++ b/pkgs/development/ocaml-modules/zmq/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, buildDunePackage, dune-configurator, czmq, stdint }: +{ lib, fetchurl, buildDunePackage, dune-configurator, czmq }: buildDunePackage rec { pname = "zmq"; From 8089b842079a3d46285f76108ce1ffcf87157f5a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 16 Jul 2024 02:17:24 +0000 Subject: [PATCH 29/77] python312Packages.python-homeassistant-analytics: 0.6.0 -> 0.7.0 --- .../python-modules/python-homeassistant-analytics/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-homeassistant-analytics/default.nix b/pkgs/development/python-modules/python-homeassistant-analytics/default.nix index 4af23c95cc61..b4626a8d02db 100644 --- a/pkgs/development/python-modules/python-homeassistant-analytics/default.nix +++ b/pkgs/development/python-modules/python-homeassistant-analytics/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "python-homeassistant-analytics"; - version = "0.6.0"; + version = "0.7.0"; pyproject = true; disabled = pythonOlder "3.11"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "joostlek"; repo = "python-homeassistant-analytics"; rev = "refs/tags/v${version}"; - hash = "sha256-uGi72UCIIvb5XZl7RkiAiR/TS+5VCpyvZfBsmlPzQEs="; + hash = "sha256-HPimk401tRBwszWvkyUEAcuLeYeEu0JUld16PESXkbo="; }; postPatch = '' From 7f0a132c24ea047feb13e18792fcfc37b9524e83 Mon Sep 17 00:00:00 2001 From: SharzyL Date: Tue, 16 Jul 2024 11:07:28 +0800 Subject: [PATCH 30/77] Revert "python3Packages.beancount: 2.3.6 -> 3.0.0" This reverts commit 72e7936217a5277a0bcdc0cb48abbbc0177a0f77, which upgrades beancount to 3.0.0. Beancount v3 is an unstable version with major changes compared to the stable v2 version. Tools including fava have not supported it yet, and current v3 build in nixpkgs is broken (failed to run). --- pkgs/development/python-modules/beancount/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/beancount/default.nix b/pkgs/development/python-modules/beancount/default.nix index b0e9c97c5d1a..ebe39136080e 100644 --- a/pkgs/development/python-modules/beancount/default.nix +++ b/pkgs/development/python-modules/beancount/default.nix @@ -18,7 +18,7 @@ }: buildPythonPackage rec { - version = "3.0.0"; + version = "2.3.6"; format = "setuptools"; pname = "beancount"; @@ -26,7 +26,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-z2aGhpx+o+78CU7hPthmv196K7DGHk1PXfPjX4Rs/98="; + hash = "sha256-gB+Tvta1fS4iQ2aIxInVob8fduIQ887RhoB1fmDTR1o="; }; # Tests require files not included in the PyPI archive. From f36d36eebbb2dfd46eb970885b1284eb15be3312 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 16 Jul 2024 09:08:24 +0000 Subject: [PATCH 31/77] rover: 0.23.0 -> 0.24.0 --- pkgs/development/tools/rover/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rover/default.nix b/pkgs/development/tools/rover/default.nix index 6e69aca6dd25..ab146df71acf 100644 --- a/pkgs/development/tools/rover/default.nix +++ b/pkgs/development/tools/rover/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "rover"; - version = "0.23.0"; + version = "0.24.0"; src = fetchFromGitHub { owner = "apollographql"; repo = pname; rev = "v${version}"; - sha256 = "sha256-c1Tnb9ACyV6RZmYnLL+KnybGgy8kwGi0JyWYcoH1J6M="; + sha256 = "sha256-uyeePAHBDCzXzwIWrKcc9LHClwSI7DMBYod/o4LfK+Y="; }; - cargoSha256 = "sha256-wTvQ4QBysppMgwv9pjQckVjMoBzLiDReOt6sJImqKFY="; + cargoSha256 = "sha256-Rf4kRXYW+WAF1rM7o8PmXBLgp/YyA8y/TqbZL22VOqI="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security From b3e4a53127957e47d3c89d1f0f8eafeef5340960 Mon Sep 17 00:00:00 2001 From: Andreas Voss Date: Thu, 11 Jul 2024 23:03:40 +0200 Subject: [PATCH 32/77] maintainers: add andreasvoss --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index ba876ecec8ba..581ae416a117 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1257,6 +1257,12 @@ githubId = 24651767; name = "Felix Andreas"; }; + andreasvoss = { + name = "andreasvoss"; + email = "andreas@anvo.dk"; + github = "andreasuvoss"; + githubId = 25469495; + }; andres = { email = "ksnixos@andres-loeh.de"; github = "kosmikus"; From 38276988bd97bf45cad0016dfa9affe8f9e5c47c Mon Sep 17 00:00:00 2001 From: Andreas Voss Date: Thu, 11 Jul 2024 23:05:44 +0200 Subject: [PATCH 33/77] azure-cli-extensions.application-insights: init at 1.2.1 --- pkgs/by-name/az/azure-cli/extensions-manual.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/by-name/az/azure-cli/extensions-manual.nix b/pkgs/by-name/az/azure-cli/extensions-manual.nix index 6bd86c7a0a7e..da3bfbd0a8f1 100644 --- a/pkgs/by-name/az/azure-cli/extensions-manual.nix +++ b/pkgs/by-name/az/azure-cli/extensions-manual.nix @@ -11,6 +11,18 @@ }: { + application-insights = mkAzExtension rec { + pname = "application-insights"; + version = "1.2.1"; + url = "https://azcliprod.blob.core.windows.net/cli-extensions/application_insights-${version}-py2.py3-none-any.whl"; + sha256 = "e1fa824eb587e2bec7f4cb4d1c4ce1033ab3d3fac65af42dd6218f673b019cee"; + description = "Support for managing Application Insights components and querying metrics, events, and logs from such components"; + propagatedBuildInputs = with python3Packages; [ + isodate + ]; + meta.maintainers = with lib.maintainers; [ andreasvoss ]; + }; + azure-devops = mkAzExtension rec { pname = "azure-devops"; version = "1.0.1"; From eeeb73501603675db597aaf2b63b60c334378d17 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Tue, 16 Jul 2024 14:37:52 +0200 Subject: [PATCH 34/77] python312Packages.cmdstanpy: drop upstreamed patch --- pkgs/development/python-modules/cmdstanpy/default.nix | 6 ------ 1 file changed, 6 deletions(-) diff --git a/pkgs/development/python-modules/cmdstanpy/default.nix b/pkgs/development/python-modules/cmdstanpy/default.nix index f0de12dcc8b3..cb31be20a170 100644 --- a/pkgs/development/python-modules/cmdstanpy/default.nix +++ b/pkgs/development/python-modules/cmdstanpy/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - fetchpatch, substituteAll, cmdstan, setuptools, @@ -32,11 +31,6 @@ buildPythonPackage rec { src = ./use-nix-cmdstan-path.patch; cmdstan = "${cmdstan}/opt/cmdstan"; }) - # Fix seed-dependent tests - (fetchpatch { - url = "https://github.com/stan-dev/cmdstanpy/commit/c72acd0b8123c02b47d5d583bdd7d8408b04562c.patch"; - hash = "sha256-cliyDDko4spYa62DMwWBavy5pePkofJo4Kf8I0RzueM="; - }) ]; postPatch = '' From 6d2349ba77a86da9583c924adc895117aa1e3263 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 16 Jul 2024 06:20:11 -0700 Subject: [PATCH 35/77] imagemagick: drop unused arguments --- pkgs/applications/graphics/ImageMagick/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index 0819a314bd27..cc612d4f45c0 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -30,11 +30,9 @@ , ApplicationServices , Foundation , testers -, imagemagick , nixos-icons , perlPackages , python3 -, fetchpatch }: assert libXtSupport -> libX11Support; From c59d543f1ff7446daafe780789003068832d7454 Mon Sep 17 00:00:00 2001 From: K900 Date: Tue, 16 Jul 2024 17:38:09 +0300 Subject: [PATCH 36/77] libreoffice-fresh: 24.2.3 -> 24.2.5 --- .../office/libreoffice/src-fresh/deps.nix | 48 +++++++++---------- .../office/libreoffice/src-fresh/help.nix | 4 +- .../office/libreoffice/src-fresh/main.nix | 4 +- .../libreoffice/src-fresh/translations.nix | 4 +- .../office/libreoffice/src-fresh/version.nix | 2 +- 5 files changed, 31 insertions(+), 31 deletions(-) diff --git a/pkgs/applications/office/libreoffice/src-fresh/deps.nix b/pkgs/applications/office/libreoffice/src-fresh/deps.nix index cc24540cebd1..d9ef29364fc8 100644 --- a/pkgs/applications/office/libreoffice/src-fresh/deps.nix +++ b/pkgs/applications/office/libreoffice/src-fresh/deps.nix @@ -238,11 +238,11 @@ md5name = "3d4566a0e51e7fc14528f5a1eecc6f12e5ffbbec6484470d3da48b0d8ead345a-NotoSerif-v2.012.zip"; } { - name = "NotoSerifHebrew-v2.003.zip"; - url = "https://dev-www.libreoffice.org/src/NotoSerifHebrew-v2.003.zip"; - sha256 = "e45c149d6c29b38b8981401f875ab4304e73a366312783c41c082eb5366d3921"; + name = "NotoSerifHebrew-v2.004.zip"; + url = "https://dev-www.libreoffice.org/src/NotoSerifHebrew-v2.004.zip"; + sha256 = "99523f4f21051495f18cbd5169ed0d1e9b395eefe770fece1844a4a7a00c46da"; md5 = ""; - md5name = "e45c149d6c29b38b8981401f875ab4304e73a366312783c41c082eb5366d3921-NotoSerifHebrew-v2.003.zip"; + md5name = "99523f4f21051495f18cbd5169ed0d1e9b395eefe770fece1844a4a7a00c46da-NotoSerifHebrew-v2.004.zip"; } { name = "NotoSansArabic-v2.010.zip"; @@ -252,18 +252,18 @@ md5name = "a5a34ac1ea01d0d71c083f99440ebfb1f64224474a0d88bb7ef0e2f8d9a996d2-NotoSansArabic-v2.010.zip"; } { - name = "NotoNaskhArabic-v2.016.zip"; - url = "https://dev-www.libreoffice.org/src/NotoNaskhArabic-v2.016.zip"; - sha256 = "2b6a3f30f21d27bc6b75b40a350221e12e64b753604d613bf3ddf71cdbe331ac"; + name = "NotoNaskhArabic-v2.019.zip"; + url = "https://dev-www.libreoffice.org/src/NotoNaskhArabic-v2.019.zip"; + sha256 = "7a509e10c9c8d21f384a26807ef2f5fbbecec46fdb8626c5441bed6d894edb81"; md5 = ""; - md5name = "2b6a3f30f21d27bc6b75b40a350221e12e64b753604d613bf3ddf71cdbe331ac-NotoNaskhArabic-v2.016.zip"; + md5name = "7a509e10c9c8d21f384a26807ef2f5fbbecec46fdb8626c5441bed6d894edb81-NotoNaskhArabic-v2.019.zip"; } { - name = "NotoSansHebrew-v2.003.zip"; - url = "https://dev-www.libreoffice.org/src/NotoSansHebrew-v2.003.zip"; - sha256 = "ded809309ff924bc45834bf19afaa5693cadf17580972468f6041f5e599ddb8a"; + name = "NotoSansHebrew-v3.001.zip"; + url = "https://dev-www.libreoffice.org/src/NotoSansHebrew-v3.001.zip"; + sha256 = "df0a71814b4e63644cf40fcc4529111b61266b7a2dafbe95068b29a7520cc3cb"; md5 = ""; - md5name = "ded809309ff924bc45834bf19afaa5693cadf17580972468f6041f5e599ddb8a-NotoSansHebrew-v2.003.zip"; + md5name = "df0a71814b4e63644cf40fcc4529111b61266b7a2dafbe95068b29a7520cc3cb-NotoSansHebrew-v3.001.zip"; } { name = "NotoSansArmenian-v2.008.zip"; @@ -539,11 +539,11 @@ md5name = "2fdc3feb6e9deb17adec9bafa3321419aa19f8f4e5dea7bf8486844ca22207bf-libjpeg-turbo-2.1.5.1.tar.gz"; } { - name = "language-subtag-registry-2023-08-02.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/language-subtag-registry-2023-08-02.tar.bz2"; - sha256 = "59fdc026b5088e7947e1e6add482d2a40e1f7e25c50f198b456954216462c2eb"; + name = "language-subtag-registry-2024-06-14.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/language-subtag-registry-2024-06-14.tar.bz2"; + sha256 = "75bc394dd83ddfd62b172a462db1b66bdb5950f40823ed63b8c7db6b71e37e75"; md5 = ""; - md5name = "59fdc026b5088e7947e1e6add482d2a40e1f7e25c50f198b456954216462c2eb-language-subtag-registry-2023-08-02.tar.bz2"; + md5name = "75bc394dd83ddfd62b172a462db1b66bdb5950f40823ed63b8c7db6b71e37e75-language-subtag-registry-2024-06-14.tar.bz2"; } { name = "lcms2-2.16.tar.gz"; @@ -630,11 +630,11 @@ md5name = "4003c56b3d356d21b1db7775318540fad6bfedaf5f117e8f7c010811219be3cf-xmlsec1-1.3.2.tar.gz"; } { - name = "libxml2-2.12.6.tar.xz"; - url = "https://dev-www.libreoffice.org/src/libxml2-2.12.6.tar.xz"; - sha256 = "889c593a881a3db5fdd96cc9318c87df34eb648edfc458272ad46fd607353fbb"; + name = "libxml2-2.12.8.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libxml2-2.12.8.tar.xz"; + sha256 = "43ad877b018bc63deb2468d71f95219c2fac196876ef36d1bee51d226173ec93"; md5 = ""; - md5name = "889c593a881a3db5fdd96cc9318c87df34eb648edfc458272ad46fd607353fbb-libxml2-2.12.6.tar.xz"; + md5name = "43ad877b018bc63deb2468d71f95219c2fac196876ef36d1bee51d226173ec93-libxml2-2.12.8.tar.xz"; } { name = "libxslt-1.1.39.tar.xz"; @@ -742,11 +742,11 @@ md5name = "cd775f625c944ed78a3da18a03b03b08eea73c8aabc97b41bb336e9a10954930-openldap-2.6.7.tgz"; } { - name = "openssl-3.0.13.tar.gz"; - url = "https://dev-www.libreoffice.org/src/openssl-3.0.13.tar.gz"; - sha256 = "88525753f79d3bec27d2fa7c66aa0b92b3aa9498dafd93d7cfa4b3780cdae313"; + name = "openssl-3.0.14.tar.gz"; + url = "https://dev-www.libreoffice.org/src/openssl-3.0.14.tar.gz"; + sha256 = "eeca035d4dd4e84fc25846d952da6297484afa0650a6f84c682e39df3a4123ca"; md5 = ""; - md5name = "88525753f79d3bec27d2fa7c66aa0b92b3aa9498dafd93d7cfa4b3780cdae313-openssl-3.0.13.tar.gz"; + md5name = "eeca035d4dd4e84fc25846d952da6297484afa0650a6f84c682e39df3a4123ca-openssl-3.0.14.tar.gz"; } { name = "liborcus-0.19.2.tar.xz"; diff --git a/pkgs/applications/office/libreoffice/src-fresh/help.nix b/pkgs/applications/office/libreoffice/src-fresh/help.nix index a2ccc9be28ac..164121f06165 100644 --- a/pkgs/applications/office/libreoffice/src-fresh/help.nix +++ b/pkgs/applications/office/libreoffice/src-fresh/help.nix @@ -1,4 +1,4 @@ { - sha256 = "0sxvc6raij7rd8n0rg8pg61ppxlpvsx1i551hs53x972156cz2lf"; - url = "https://download.documentfoundation.org/libreoffice/src/24.2.3/libreoffice-help-24.2.3.2.tar.xz"; + sha256 = "090pi8dnj5izpvng94hgmjid14n7xvy3rlqqvang3pqdn35xnpsl"; + url = "https://download.documentfoundation.org/libreoffice/src/24.2.5/libreoffice-help-24.2.5.2.tar.xz"; } diff --git a/pkgs/applications/office/libreoffice/src-fresh/main.nix b/pkgs/applications/office/libreoffice/src-fresh/main.nix index 7aa7e0810569..c4da201f9272 100644 --- a/pkgs/applications/office/libreoffice/src-fresh/main.nix +++ b/pkgs/applications/office/libreoffice/src-fresh/main.nix @@ -1,4 +1,4 @@ { - sha256 = "0r0y92c7i42iiimzg9b1pyldnswh28j8p0lmilz7j1sxv2f0bqpn"; - url = "https://download.documentfoundation.org/libreoffice/src/24.2.3/libreoffice-24.2.3.2.tar.xz"; + sha256 = "03halzc9w4z8pfs8krpswp2qzrqq9rhnmms8v8ny88am87vy85lw"; + url = "https://download.documentfoundation.org/libreoffice/src/24.2.5/libreoffice-24.2.5.2.tar.xz"; } diff --git a/pkgs/applications/office/libreoffice/src-fresh/translations.nix b/pkgs/applications/office/libreoffice/src-fresh/translations.nix index 42740ef1243d..82291fab8326 100644 --- a/pkgs/applications/office/libreoffice/src-fresh/translations.nix +++ b/pkgs/applications/office/libreoffice/src-fresh/translations.nix @@ -1,4 +1,4 @@ { - sha256 = "0jibmsghr9719nmq6w2m947g4arc8dl3wrj5yyg0fy8znnim6477"; - url = "https://download.documentfoundation.org/libreoffice/src/24.2.3/libreoffice-translations-24.2.3.2.tar.xz"; + sha256 = "0fri41y59zhm8lq0kh6hvf5rpdjdqx0lg1sl40mhh1d6lf1izc1w"; + url = "https://download.documentfoundation.org/libreoffice/src/24.2.5/libreoffice-translations-24.2.5.2.tar.xz"; } diff --git a/pkgs/applications/office/libreoffice/src-fresh/version.nix b/pkgs/applications/office/libreoffice/src-fresh/version.nix index 8996537117f8..ede95eca68ce 100644 --- a/pkgs/applications/office/libreoffice/src-fresh/version.nix +++ b/pkgs/applications/office/libreoffice/src-fresh/version.nix @@ -1 +1 @@ -"24.2.3.2" +"24.2.5.2" From 2cfa2ff274231b39612a220a19fc3375b072e424 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Tue, 16 Jul 2024 18:04:04 +0200 Subject: [PATCH 37/77] python311Packages.cohere: 5.5.8 -> 5.6.0; fix Diff: https://github.com/cohere-ai/cohere-python/compare/5.5.8...5.6.0 Changelog: https://github.com/cohere-ai/cohere-python/releases/tag/5.6.0 --- .../python-modules/cohere/default.nix | 30 ++++++++++++------- 1 file changed, 20 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/cohere/default.nix b/pkgs/development/python-modules/cohere/default.nix index 46aed51be299..3a94a3e70cb3 100644 --- a/pkgs/development/python-modules/cohere/default.nix +++ b/pkgs/development/python-modules/cohere/default.nix @@ -1,12 +1,18 @@ { lib, buildPythonPackage, - fetchPypi, - poetry-core, pythonOlder, + fetchFromGitHub, + + # build-system + poetry-core, + + # dependencies + boto3, fastavro, httpx, httpx-sse, + parameterized, pydantic, requests, tokenizers, @@ -16,22 +22,26 @@ buildPythonPackage rec { pname = "cohere"; - version = "5.5.8"; + version = "5.6.0"; pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; - src = fetchPypi { - inherit pname version; - hash = "sha256-hM52Zv+PvfT0H7X2ykUqsmOaUUvIiWeihUqbG4INbqA="; + src = fetchFromGitHub { + owner = "cohere-ai"; + repo = "cohere-python"; + rev = "refs/tags/${version}"; + hash = "sha256-zv4zSUQzt2jjuKumaV5vI3GbhZWKEjALohfuxQp6i7Q="; }; build-system = [ poetry-core ]; dependencies = [ + boto3 fastavro httpx httpx-sse + parameterized pydantic requests tokenizers @@ -44,11 +54,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "cohere" ]; - meta = with lib; { + meta = { description = "Simplify interfacing with the Cohere API"; homepage = "https://docs.cohere.com/docs"; changelog = "https://github.com/cohere-ai/cohere-python/releases/tag/${version}"; - license = licenses.mit; - maintainers = with maintainers; [ natsukium ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ natsukium ]; }; } From c437fb23e125e07f0468d19fbb463c716a5f0dfd Mon Sep 17 00:00:00 2001 From: phaer Date: Fri, 12 Jul 2024 00:35:53 +0200 Subject: [PATCH 38/77] etebase-server: use buildPythonApplication... ...not pythonPackage. This is an app, living in pkgs/servers, so we just use callPackage in all-packages and drop the python module. python3.pkgs.toPythonModule could be used if a python module was needed. Before that change legacyPackages.x86_64-linux.python311.pkgs.etebase-server.python would give a python 3.12 release, and was therefore broken. etebase-server = toPythonModule (pkgs.etebase-server.override { python3 = python; }); would now be correct --- nixos/modules/services/misc/etebase-server.nix | 2 +- pkgs/servers/etebase/default.nix | 2 +- pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 -- 5 files changed, 4 insertions(+), 5 deletions(-) diff --git a/nixos/modules/services/misc/etebase-server.nix b/nixos/modules/services/misc/etebase-server.nix index 7b6b5249f230..9b2ba34cc30b 100644 --- a/nixos/modules/services/misc/etebase-server.nix +++ b/nixos/modules/services/misc/etebase-server.nix @@ -45,7 +45,7 @@ in package = mkOption { type = types.package; - default = pkgs.python3.pkgs.etebase-server; + default = pkgs.etebase-server; defaultText = literalExpression "pkgs.python3.pkgs.etebase-server"; description = "etebase-server package to use."; }; diff --git a/pkgs/servers/etebase/default.nix b/pkgs/servers/etebase/default.nix index 07a084f91e36..6076bb161fa3 100644 --- a/pkgs/servers/etebase/default.nix +++ b/pkgs/servers/etebase/default.nix @@ -14,7 +14,7 @@ let }; }; in -python.pkgs.buildPythonPackage rec { +python.pkgs.buildPythonApplication rec { pname = "etebase-server"; version = "0.13.1"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 13a3a9dbb8e2..df18f4dbaeb4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30201,7 +30201,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) CoreServices Security SystemConfiguration; }; - etebase-server = with python3Packages; toPythonApplication etebase-server; + etebase-server = callPackage ../servers/etebase {}; etesync-dav = callPackage ../applications/misc/etesync-dav { }; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 34fa065b9945..f26765fe08c5 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -158,6 +158,7 @@ mapAliases ({ email_validator = email-validator; # added 2022-06-22 enhancements = throw "enhancements is unmaintained upstream and has therefore been removed"; # added 2023-10-27 et_xmlfile = et-xmlfile; # added 2023-10-16 + etebase-server = throw "pkgs.python3.etebase-server has been removed, use pkgs.etebase-server"; # added 2024-07-16 ev3dev2 = python-ev3dev2; # added 2023-06-19 eyeD3 = eyed3; # added 2024-01-03 Fabric = fabric; # addedd 2023-02-19 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index fbc820b34823..2338a8a4be00 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3974,8 +3974,6 @@ self: super: with self; { inherit (pkgs.darwin.apple_sdk.frameworks) Security; }; - etebase-server = callPackage ../servers/etebase { }; - eternalegypt = callPackage ../development/python-modules/eternalegypt { }; etesync = callPackage ../development/python-modules/etesync { }; From ec62c958b51f85a396169e637489527f7299fd56 Mon Sep 17 00:00:00 2001 From: Joshua Manchester Date: Mon, 15 Jul 2024 18:44:55 +0100 Subject: [PATCH 39/77] shoutrrr: init at 0.8.0 --- pkgs/by-name/sh/shoutrrr/package.nix | 30 ++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 pkgs/by-name/sh/shoutrrr/package.nix diff --git a/pkgs/by-name/sh/shoutrrr/package.nix b/pkgs/by-name/sh/shoutrrr/package.nix new file mode 100644 index 000000000000..03ba0f9e4d3a --- /dev/null +++ b/pkgs/by-name/sh/shoutrrr/package.nix @@ -0,0 +1,30 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, +}: +let + version = "0.8.0"; +in +buildGoModule { + pname = "shoutrrr"; + inherit version; + + src = fetchFromGitHub { + repo = "shoutrrr"; + owner = "containrrr"; + rev = "refs/tags/v${version}"; + hash = "sha256-DGyFo2oRZ39r1awqh5AXjOL2VShABarFbOMIcEXlWq4="; + }; + + vendorHash = "sha256-+LDA3Q6OSxHwKYoO5gtNUryB9EbLe2jJtUbLXnA2Lug="; + + meta = { + description = "Notification library for gophers and their furry friends"; + homepage = "https://github.com/containrrr/shoutrrr"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ JManch ]; + platforms = lib.platforms.unix; + mainProgram = "shoutrrr"; + }; +} From d0a10df9d07bd504f0b989e18b2517a932188ba6 Mon Sep 17 00:00:00 2001 From: uncenter <47499684+uncenter@users.noreply.github.com> Date: Tue, 16 Jul 2024 15:19:18 -0400 Subject: [PATCH 40/77] vscode-extensions.sswg.swift-lang: init at 1.10.4 --- .../editors/vscode/extensions/default.nix | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 20ca197908f8..d74aacebc296 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -4266,6 +4266,23 @@ let }; }; + sswg.swift-lang = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "swift-lang"; + publisher = "sswg"; + version = "1.10.4"; + hash = "sha256-5NrWBuaNdDNF0ON0HUwdwPFsRO3Hfe0UW4AooJbjiA0="; + }; + meta = { + changelog = "https://marketplace.visualstudio.com/items/sswg.swift-lang/changelog"; + description = "Swift Language Support for Visual Studio Code"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=sswg.swift-lang"; + homepage = "https://github.com/swiftlang/vscode-swift"; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.uncenter ]; + }; + }; + stefanjarina.vscode-eex-snippets = buildVscodeMarketplaceExtension { mktplcRef = { name = "vscode-eex-snippets"; From 86832307ec2d2e7ca9af7496e42c9b0ef8ac96fd Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Tue, 16 Jul 2024 21:03:46 +0100 Subject: [PATCH 41/77] linuxKernel.kernels.linux_lqx: fix build - Override RCU_LAZY since this is defined in the kernel/common-config.nix - Make RCU_BOOST_DELAY optional Fixes issue #327719. --- pkgs/os-specific/linux/kernel/zen-kernels.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/zen-kernels.nix b/pkgs/os-specific/linux/kernel/zen-kernels.nix index 3acf40121d27..698e25a6985c 100644 --- a/pkgs/os-specific/linux/kernel/zen-kernels.nix +++ b/pkgs/os-specific/linux/kernel/zen-kernels.nix @@ -62,7 +62,7 @@ let RCU_FANOUT = freeform "64"; RCU_FANOUT_LEAF = freeform "16"; RCU_BOOST = yes; - RCU_BOOST_DELAY = freeform "500"; + RCU_BOOST_DELAY = option (freeform "500"); RCU_NOCB_CPU = yes; RCU_LAZY = yes; RCU_DOUBLE_CHECK_CB_TIME = yes; @@ -94,7 +94,7 @@ let # https://github.com/damentz/liquorix-package/commit/a7055b936c0f4edb8f6afd5263fe1d2f8a5cd877 RCU_BOOST = no; - RCU_LAZY = no; + RCU_LAZY = lib.mkOverride 60 no; # Swap storage is compressed with LZ4 using zswap ZSWAP_COMPRESSOR_DEFAULT_LZ4 = lib.mkOptionDefault yes; From 397fd60d3710a9ce2f2886d5bb7109a12bc37e58 Mon Sep 17 00:00:00 2001 From: Popa Ioan Alexandru Date: Tue, 16 Jul 2024 17:05:39 +0300 Subject: [PATCH 42/77] themechanger: 0.11.1 -> 0.12.0 --- pkgs/applications/misc/themechanger/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/themechanger/default.nix b/pkgs/applications/misc/themechanger/default.nix index 98f6b6183a33..2f569b4dc90b 100644 --- a/pkgs/applications/misc/themechanger/default.nix +++ b/pkgs/applications/misc/themechanger/default.nix @@ -15,14 +15,14 @@ python3Packages.buildPythonApplication rec { pname = "themechanger"; - version = "0.11.1"; + version = "0.12.0"; format = "other"; src = fetchFromGitHub { owner = "ALEX11BR"; repo = "ThemeChanger"; rev = "v${version}"; - sha256 = "sha256-zSbh+mqCKquOyQASwVUW6hghmUc37nTuoa8pWCHM/a8="; + hash = "sha256-/quCi2srn9XlhJQKYNkOaZDHTwdciB9SAlF/RML0q+M="; }; nativeBuildInputs = [ From 3bad0ef67e95c32b532ab00b7620ef3e3a916e06 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 16 Jul 2024 21:51:40 +0000 Subject: [PATCH 43/77] phpunit: 11.2.6 -> 11.2.7 --- pkgs/by-name/ph/phpunit/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ph/phpunit/package.nix b/pkgs/by-name/ph/phpunit/package.nix index 951a7edb5358..272a7d74e170 100644 --- a/pkgs/by-name/ph/phpunit/package.nix +++ b/pkgs/by-name/ph/phpunit/package.nix @@ -6,16 +6,16 @@ php.buildComposerProject (finalAttrs: { pname = "phpunit"; - version = "11.2.6"; + version = "11.2.7"; src = fetchFromGitHub { owner = "sebastianbergmann"; repo = "phpunit"; rev = finalAttrs.version; - hash = "sha256-cR7tJlx0cnWPDWoZAVrGY1UGe9lS4pohFaViC/MxT+w="; + hash = "sha256-s/zfTW8a+E/FOuHg+oSpVZdxBdfIVL0RmvBBcI6zB9Y="; }; - vendorHash = "sha256-B/uo1isTpGPwQc2K752OwwuNU6jy/YFNWvun8nSSKqM="; + vendorHash = "sha256-Gjii3m8wWmZbozKnJW/n9+wQUupemIU8XjmlCuTtfxU="; passthru.updateScript = nix-update-script { }; From 43c5b3587be37aa00e41abeb0ef6da3ebb2b52bd Mon Sep 17 00:00:00 2001 From: Malo Bourgon Date: Tue, 16 Jul 2024 18:23:29 -0400 Subject: [PATCH 44/77] signalbackup-tools: 20240708 -> 20240715-2 Diff: https://github.com/bepaald/signalbackup-tools/compare/20240708...20240715-2 --- .../instant-messengers/signalbackup-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix b/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix index 29758aed79b5..c83eb4dca798 100644 --- a/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix +++ b/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "signalbackup-tools"; - version = "20240708"; + version = "20240715-2"; src = fetchFromGitHub { owner = "bepaald"; repo = pname; rev = version; - hash = "sha256-UwUygYbmwDdv37mo8rEsHx4mMGdXVfAcscrnn1g0wio="; + hash = "sha256-QyukKuRoF6TWFa73EaOO429u9AF+1NCKsLjwQT/fD6U="; }; postPatch = '' From 70fae53cc38b40f8216cb08c8cc1101794a8cb8c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 16 Jul 2024 22:58:24 +0000 Subject: [PATCH 45/77] thunderbird-unwrapped: 115.12.2 -> 115.13.0 --- .../networking/mailreaders/thunderbird/packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix index a3307782b9d1..0b4a1f8364e0 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix @@ -50,8 +50,8 @@ in rec { thunderbird = thunderbird-115; thunderbird-115 = common { - version = "115.12.2"; - sha512 = "182f35e8e5ece98d18dfefe106c73bc97fbc619f59772d9b3455b7c8af412021ecc5eae97a12515224e91deb814abb7a6ef7f538c450e9e77fdfd84078678038"; + version = "115.13.0"; + sha512 = "98ee23f684aa7a166878459a6a217bf3bcc4ddd8fa8ebbd0a1d2d66392ec1ebff67dbad55d145cdd0771539f127d91c4137211cf4efc80e450e6a34c95e8529c"; updateScript = callPackage ./update.nix { attrPath = "thunderbirdPackages.thunderbird-115"; From 5a7e12c85f0a1f6e6118a605d3454f4eb138ae7f Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Wed, 17 Jul 2024 10:11:28 +1000 Subject: [PATCH 46/77] go_1_23: 1.23rc1 -> 1.23rc2 Changelog: https://go.dev/doc/devel/release#go1.23 --- pkgs/development/compilers/go/1.23.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/go/1.23.nix b/pkgs/development/compilers/go/1.23.nix index 5660710f049f..80c351f7ebd8 100644 --- a/pkgs/development/compilers/go/1.23.nix +++ b/pkgs/development/compilers/go/1.23.nix @@ -48,11 +48,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "go"; - version = "1.23rc1"; + version = "1.23rc2"; src = fetchurl { url = "https://go.dev/dl/go${finalAttrs.version}.src.tar.gz"; - hash = "sha256-bpxHZYcoCGY8zwuTflY3x99nFGlD+m6JCagaDRKcgEU="; + hash = "sha256-9pnOJWD8Iq2CwGseBLYxi4Xn9obLy0/OFWWCEyxX2Ps="; }; strictDeps = true; From c6004f9861db89e145f1cf46dcade1d5555b8b6c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 17 Jul 2024 00:25:24 +0000 Subject: [PATCH 47/77] evil-helix: 20240618 -> 20240716 --- pkgs/by-name/ev/evil-helix/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ev/evil-helix/package.nix b/pkgs/by-name/ev/evil-helix/package.nix index c03d58f192c1..e53faa61d6d9 100644 --- a/pkgs/by-name/ev/evil-helix/package.nix +++ b/pkgs/by-name/ev/evil-helix/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "evil-helix"; - version = "20240618"; + version = "20240716"; src = fetchFromGitHub { owner = "usagi-flow"; repo = "evil-helix"; rev = "release-${version}"; - hash = "sha256-lzae2ypoTyHDpAkL3L7t8FhZ1XXSSkD5958dBEcsTOc="; + hash = "sha256-nvLo8bWjiLJjM+pZArMKu4gjEFPrlqDI/Kf+W8fs9L8="; }; - cargoHash = "sha256-803maQB+QYuLlZnvDGfE4jRjLnwkufPcfU7Lq9SX9uM="; + cargoHash = "sha256-2qrfw/QVfZZ3GTBalNne4QYQsI+JZBf5FdLJD84gnS4="; nativeBuildInputs = [ installShellFiles ]; From e145cabe34a92c1a6eee4d137ca33dbfbba704b5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 17 Jul 2024 00:46:54 +0000 Subject: [PATCH 48/77] gnuastro: 0.22 -> 0.23 --- pkgs/applications/science/astronomy/gnuastro/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/astronomy/gnuastro/default.nix b/pkgs/applications/science/astronomy/gnuastro/default.nix index d1c40d3fefb3..a7ad1342eec0 100644 --- a/pkgs/applications/science/astronomy/gnuastro/default.nix +++ b/pkgs/applications/science/astronomy/gnuastro/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "gnuastro"; - version = "0.22"; + version = "0.23"; src = fetchurl { url = "mirror://gnu/gnuastro/gnuastro-${version}.tar.gz"; - sha256 = "sha256-f9fxaga95VrtliggkM2SITW+6pAjaeWvgUOJ6rnMcwg="; + sha256 = "sha256-+X53X/tZgcY/it++lY/Ov5FHwT8OfpZAfd398zs/dwI="; }; nativeBuildInputs = [ libtool ]; From 8ba2899998cdbce9265e3acf282140fbf9a3ae70 Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Wed, 17 Jul 2024 02:50:18 +0200 Subject: [PATCH 49/77] aflplusplus: 4.20c -> 4.21c --- pkgs/tools/security/aflplusplus/default.nix | 4 ++-- pkgs/tools/security/aflplusplus/qemu.nix | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/security/aflplusplus/default.nix b/pkgs/tools/security/aflplusplus/default.nix index 3f436d650a3f..a9e973f8d00d 100644 --- a/pkgs/tools/security/aflplusplus/default.nix +++ b/pkgs/tools/security/aflplusplus/default.nix @@ -37,13 +37,13 @@ let libtokencap = callPackage ./libtokencap.nix { inherit aflplusplus; }; aflplusplus = stdenvNoCC.mkDerivation rec { pname = "aflplusplus"; - version = "4.20c"; + version = "4.21c"; src = fetchFromGitHub { owner = "AFLplusplus"; repo = "AFLplusplus"; rev = "refs/tags/v${version}"; - hash = "sha256-bS4Zxd2CX8m6zxO/izJi7Cj34260mOaU6GWjEj+xEU8="; + hash = "sha256-DKwPRxSO+JEJYWLldnfrAYqzwqukNzrbo4R5FzJqzzg="; }; enableParallelBuilding = true; diff --git a/pkgs/tools/security/aflplusplus/qemu.nix b/pkgs/tools/security/aflplusplus/qemu.nix index 81fed0ad0046..950e4eb85cba 100644 --- a/pkgs/tools/security/aflplusplus/qemu.nix +++ b/pkgs/tools/security/aflplusplus/qemu.nix @@ -25,9 +25,9 @@ stdenv.mkDerivation { src = fetchFromGitHub { owner = "AFLplusplus"; repo = "qemuafl"; - # rev origin: https://github.com/AFLplusplus/AFLplusplus/commits/stable/qemu_mode/QEMUAFL_VERSION - rev = "40033af00c4c5de172ed4fe60c21b9edbd2c189d"; - sha256 = "sha256-oK0DLJjXDiQuRlbaNOurvw5vlr9HEeOobNywiFTq7xg="; + # rev origin: https://github.com/AFLplusplus/AFLplusplus/blob/v4.21c/qemu_mode/QEMUAFL_VERSION + rev = "a6f0632a65e101e680dd72643a6128dd180dff72"; + sha256 = "sha256-4kaQA5KDUqkK+fbjHg47lxZHRN8JrfSC2zdjrbMbDPo="; fetchSubmodules = true; }; From ee7d0d21944325227e3c9e7ba6a044e49ab72f55 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 17 Jul 2024 01:20:58 +0000 Subject: [PATCH 50/77] govulncheck: 1.1.2 -> 1.1.3 --- pkgs/tools/security/govulncheck/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/govulncheck/default.nix b/pkgs/tools/security/govulncheck/default.nix index 9b51c052ed56..71d03d916e53 100644 --- a/pkgs/tools/security/govulncheck/default.nix +++ b/pkgs/tools/security/govulncheck/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "govulncheck"; - version = "1.1.2"; + version = "1.1.3"; src = fetchFromGitHub { owner = "golang"; repo = "vuln"; rev = "refs/tags/v${version}"; - hash = "sha256-kpAk6Gn/uXWPzg6thp2RYrP0kouMmEaVxZSaJpf445Y="; + hash = "sha256-ydJ8AeoCnLls6dXxjI05+THEqPPdJqtAsKTriTIK9Uc="; }; patches = [ @@ -23,7 +23,7 @@ buildGoModule rec { }) ]; - vendorHash = "sha256-0RtnyeOuvOv8cv4pFjRAR7VJB2FG6hqMML+Vz/FAjFM="; + vendorHash = "sha256-jESQV4Na4Hooxxd0RL96GHkA7Exddco5izjnhfH6xTg="; subPackages = [ "cmd/govulncheck" From 4d36c7a6c7fafe5916a154d9ca76bb9a8c417534 Mon Sep 17 00:00:00 2001 From: aleksana Date: Wed, 17 Jul 2024 00:02:46 +0800 Subject: [PATCH 51/77] nixtract: init at 0.3.0 --- pkgs/by-name/ni/nixtract/package.nix | 60 ++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) create mode 100644 pkgs/by-name/ni/nixtract/package.nix diff --git a/pkgs/by-name/ni/nixtract/package.nix b/pkgs/by-name/ni/nixtract/package.nix new file mode 100644 index 000000000000..e046e49d84f4 --- /dev/null +++ b/pkgs/by-name/ni/nixtract/package.nix @@ -0,0 +1,60 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + pkg-config, + openssl, + stdenv, + libiconv, + darwin, + nix, + testers, + nixtract, +}: + +rustPlatform.buildRustPackage rec { + pname = "nixtract"; + version = "0.3.0"; + + src = fetchFromGitHub { + owner = "tweag"; + repo = "nixtract"; + rev = "v${version}"; + hash = "sha256-36ciPNSlB1LU+UXP8MLakrBRRqbyiVFN8Jp/JbCe1OY="; + }; + + cargoHash = "sha256-fawBRIVcOhtDxxRYCf+HWYadoSB/ENKguTbS0M4odVU="; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = + [ openssl ] + ++ lib.optionals stdenv.isDarwin [ + libiconv + darwin.apple_sdk.frameworks.SystemConfiguration + ]; + + nativeCheckInputs = [ nix ]; + + checkFlags = [ + # Requiring network access + "--skip=nix::narinfo::tests::test_fetch" + "--skip=nix::substituters::tests::test_from_flake_ref" + # Requiring write to `/nix/var` + "--skip=nix::substituters::tests::test_get_substituters" + "--skip=tests::test_main_fixtures" + ]; + + passthru.tests.version = testers.testVersion { package = nixtract; }; + + meta = { + description = "CLI tool to extract the graph of derivations from a Nix flake"; + homepage = "https://github.com/tweag/nixtract"; + license = with lib.licenses; [ + mit # or + asl20 + ]; + mainProgram = "nixtract"; + maintainers = with lib.maintainers; [ aleksana ]; + }; +} From 2ec12b76b7594f2b7561b0bc8e4b3ddb7674ce18 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 17 Jul 2024 01:52:07 +0000 Subject: [PATCH 52/77] staruml: 6.1.2 -> 6.2.1 --- pkgs/tools/misc/staruml/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/staruml/default.nix b/pkgs/tools/misc/staruml/default.nix index 0238ef46a951..b30d66825cb6 100644 --- a/pkgs/tools/misc/staruml/default.nix +++ b/pkgs/tools/misc/staruml/default.nix @@ -24,12 +24,12 @@ let ]; in stdenv.mkDerivation (finalAttrs: { - version = "6.1.2"; + version = "6.2.1"; pname = "staruml"; src = fetchurl { url = "https://files.staruml.io/releases-v6/StarUML_${finalAttrs.version}_amd64.deb"; - sha256 = "sha256-jAvtcgn51RzO+fkS1LucJs0GOK/x7/7+mWhrNu/dyjg="; + sha256 = "sha256-azfh27klczMK8m5jeVmJFkwJgN/qh6lzMUyYqkBNca8="; }; nativeBuildInputs = [ wrapGAppsHook3 dpkg ]; From f4138644781895aa21bf19bb7f452ab3362384d8 Mon Sep 17 00:00:00 2001 From: Coutinho de Souza Date: Tue, 16 Jul 2024 23:04:55 -0300 Subject: [PATCH 53/77] maintainers: update attributes for onemoresuza Change both the email and the keys attributes. --- maintainers/maintainer-list.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index c68df2a28584..f77fec69ef2e 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -15045,10 +15045,10 @@ }; onemoresuza = { name = "Coutinho de Souza"; - email = "dev@onemoresuza.mailer.me"; + email = "dev@onemoresuza.com"; github = "onemoresuza"; githubId = 106456302; - keys = [ { fingerprint = "484F D3B8 BAD7 BF5D 8B68 2AEA A2ED 1159 935E 4D7E"; } ]; + keys = [ { fingerprint = "6FD3 7E64 11C5 C659 2F34 EDBC 4352 D15F B177 F2A8"; } ]; }; onixie = { email = "onixie@gmail.com"; From f4331a4813878826a799a38bd78e41a7cc07226a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 17 Jul 2024 12:38:14 +1000 Subject: [PATCH 54/77] python312Packages.snakemake-interface-storage-plugins: 3.2.2 -> 3.2.3 (#327236) --- .../snakemake-interface-storage-plugins/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/snakemake-interface-storage-plugins/default.nix b/pkgs/development/python-modules/snakemake-interface-storage-plugins/default.nix index 493f142724e3..c16bc8c76640 100644 --- a/pkgs/development/python-modules/snakemake-interface-storage-plugins/default.nix +++ b/pkgs/development/python-modules/snakemake-interface-storage-plugins/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "snakemake-interface-storage-plugins"; - version = "3.2.2"; + version = "3.2.3"; format = "pyproject"; src = fetchFromGitHub { owner = "snakemake"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-syUjK32RPV9FMV7RSpXy+PJ2AVigGH+ywm6iTjUAuec="; + hash = "sha256-xfqxUla3qFnGZSFpWVCmtSJLqCK6XJF1OtDF1EDXbZU="; }; nativeBuildInputs = [ poetry-core ]; From f2310c7d271e69355b5b2017d7a62b54da51fcd7 Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Wed, 17 Jul 2024 04:53:33 +0200 Subject: [PATCH 55/77] treewide: remove unused pytestCheckHook (and other) arguments --- pkgs/development/python-modules/aiohwenergy/default.nix | 1 - pkgs/development/python-modules/aiolivisi/default.nix | 1 - pkgs/development/python-modules/aioqsw/default.nix | 1 - pkgs/development/python-modules/aiosenz/default.nix | 1 - pkgs/development/python-modules/async-tkinter-loop/default.nix | 2 -- pkgs/development/python-modules/asyncio-rlock/default.nix | 1 - pkgs/development/python-modules/attrdict/default.nix | 1 - pkgs/development/python-modules/bech32/default.nix | 1 - pkgs/development/python-modules/command-runner/default.nix | 1 - pkgs/development/python-modules/connio/default.nix | 1 - pkgs/development/python-modules/cron-descriptor/default.nix | 1 - pkgs/development/python-modules/cryptoparser/default.nix | 2 -- pkgs/development/python-modules/dscribe/default.nix | 1 - pkgs/development/python-modules/easy-thumbnails/default.nix | 1 - pkgs/development/python-modules/ecs-logging/default.nix | 1 - pkgs/development/python-modules/fastcore/default.nix | 1 - pkgs/development/python-modules/future-typing/default.nix | 2 -- pkgs/development/python-modules/ghapi/default.nix | 1 - pkgs/development/python-modules/heatzypy/default.nix | 1 - pkgs/development/python-modules/influxdb3-python/default.nix | 1 - pkgs/development/python-modules/iocsearcher/default.nix | 1 - pkgs/development/python-modules/jplephem/default.nix | 1 - pkgs/development/python-modules/junit2html/default.nix | 1 - pkgs/development/python-modules/librespot/default.nix | 1 - pkgs/development/python-modules/life360/default.nix | 1 - .../python-modules/llama-index-embeddings-gemini/default.nix | 1 - .../python-modules/llama-index-embeddings-ollama/default.nix | 2 -- pkgs/development/python-modules/luxtronik/default.nix | 2 -- pkgs/development/python-modules/meross-iot/default.nix | 1 - pkgs/development/python-modules/msgspec/default.nix | 2 -- .../development/python-modules/napari-plugin-engine/default.nix | 1 - pkgs/development/python-modules/numdifftools/default.nix | 1 - pkgs/development/python-modules/oasatelematics/default.nix | 1 - pkgs/development/python-modules/openai-triton/default.nix | 1 - pkgs/development/python-modules/pcodedmp/default.nix | 1 - pkgs/development/python-modules/phonemizer/default.nix | 2 -- pkgs/development/python-modules/ping3/default.nix | 1 - pkgs/development/python-modules/potentials/default.nix | 1 - pkgs/development/python-modules/prisma/default.nix | 1 - pkgs/development/python-modules/psychrolib/default.nix | 1 - pkgs/development/python-modules/pyebus/default.nix | 1 - pkgs/development/python-modules/pyexploitdb/default.nix | 1 - pkgs/development/python-modules/pyhomeworks/default.nix | 1 - pkgs/development/python-modules/pykostalpiko/default.nix | 1 - pkgs/development/python-modules/pylru/default.nix | 1 - pkgs/development/python-modules/pysptk/default.nix | 1 - pkgs/development/python-modules/pytest-grpc/default.nix | 1 - pkgs/development/python-modules/pytest-playwright/default.nix | 2 -- .../python-modules/python-family-hub-local/default.nix | 1 - pkgs/development/python-modules/python-libnmap/default.nix | 1 - pkgs/development/python-modules/red-black-tree-mod/default.nix | 1 - pkgs/development/python-modules/rova/default.nix | 1 - pkgs/development/python-modules/serialio/default.nix | 2 -- pkgs/development/python-modules/sunweg/default.nix | 1 - pkgs/development/python-modules/terminaltexteffects/default.nix | 1 - pkgs/development/python-modules/textx/default.nix | 1 - pkgs/development/python-modules/tplink-omada-client/default.nix | 1 - pkgs/development/python-modules/traits/default.nix | 2 -- pkgs/development/python-modules/weboob/default.nix | 1 - pkgs/development/python-modules/webthing-ws/default.nix | 1 - pkgs/development/python-modules/whois-api/default.nix | 1 - pkgs/development/python-modules/x11-hash/default.nix | 1 - pkgs/development/python-modules/youtokentome/default.nix | 1 - pkgs/os-specific/linux/tuna/default.nix | 2 -- 64 files changed, 75 deletions(-) diff --git a/pkgs/development/python-modules/aiohwenergy/default.nix b/pkgs/development/python-modules/aiohwenergy/default.nix index d5e45c6525b0..a5f6c852d13f 100644 --- a/pkgs/development/python-modules/aiohwenergy/default.nix +++ b/pkgs/development/python-modules/aiohwenergy/default.nix @@ -3,7 +3,6 @@ aiohttp, buildPythonPackage, fetchFromGitHub, - pytestCheckHook, pythonOlder, }: diff --git a/pkgs/development/python-modules/aiolivisi/default.nix b/pkgs/development/python-modules/aiolivisi/default.nix index a432f5ec3534..4f7e703b3d59 100644 --- a/pkgs/development/python-modules/aiolivisi/default.nix +++ b/pkgs/development/python-modules/aiolivisi/default.nix @@ -4,7 +4,6 @@ buildPythonPackage, fetchPypi, pydantic, - pytestCheckHook, pythonOlder, websockets, }: diff --git a/pkgs/development/python-modules/aioqsw/default.nix b/pkgs/development/python-modules/aioqsw/default.nix index b936ef738716..0ec8f1697ca3 100644 --- a/pkgs/development/python-modules/aioqsw/default.nix +++ b/pkgs/development/python-modules/aioqsw/default.nix @@ -3,7 +3,6 @@ aiohttp, buildPythonPackage, fetchFromGitHub, - pytestCheckHook, pythonOlder, setuptools, wheel, diff --git a/pkgs/development/python-modules/aiosenz/default.nix b/pkgs/development/python-modules/aiosenz/default.nix index 48a5ca3d1025..430c5ba68d63 100644 --- a/pkgs/development/python-modules/aiosenz/default.nix +++ b/pkgs/development/python-modules/aiosenz/default.nix @@ -4,7 +4,6 @@ buildPythonPackage, fetchFromGitHub, httpx, - pytestCheckHook, pythonOlder, setuptools, }: diff --git a/pkgs/development/python-modules/async-tkinter-loop/default.nix b/pkgs/development/python-modules/async-tkinter-loop/default.nix index a620c95843cc..b432d359b2a6 100644 --- a/pkgs/development/python-modules/async-tkinter-loop/default.nix +++ b/pkgs/development/python-modules/async-tkinter-loop/default.nix @@ -2,11 +2,9 @@ lib, buildPythonPackage, fetchPypi, - python3Packages, poetry-core, tkinter, typing-extensions, - pytestCheckHook, }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/asyncio-rlock/default.nix b/pkgs/development/python-modules/asyncio-rlock/default.nix index 8ed725d13ccc..89ee558136ea 100644 --- a/pkgs/development/python-modules/asyncio-rlock/default.nix +++ b/pkgs/development/python-modules/asyncio-rlock/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchPypi, - pytestCheckHook, }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/attrdict/default.nix b/pkgs/development/python-modules/attrdict/default.nix index 00c25a332e76..c6d6352559b6 100644 --- a/pkgs/development/python-modules/attrdict/default.nix +++ b/pkgs/development/python-modules/attrdict/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchPypi, - pytestCheckHook, pythonOlder, setuptools, six, diff --git a/pkgs/development/python-modules/bech32/default.nix b/pkgs/development/python-modules/bech32/default.nix index 53c7bc5ec91d..faed8e5615ff 100644 --- a/pkgs/development/python-modules/bech32/default.nix +++ b/pkgs/development/python-modules/bech32/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchPypi, - pytestCheckHook, pythonOlder, }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/command-runner/default.nix b/pkgs/development/python-modules/command-runner/default.nix index f50e32abd5f3..945400c19481 100644 --- a/pkgs/development/python-modules/command-runner/default.nix +++ b/pkgs/development/python-modules/command-runner/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, fetchFromGitHub, psutil, - pytestCheckHook, pythonOlder, setuptools, }: diff --git a/pkgs/development/python-modules/connio/default.nix b/pkgs/development/python-modules/connio/default.nix index 93fe3c0fa5dd..9e8fb88dbac0 100644 --- a/pkgs/development/python-modules/connio/default.nix +++ b/pkgs/development/python-modules/connio/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - pytestCheckHook, pythonOlder, serialio, sockio, diff --git a/pkgs/development/python-modules/cron-descriptor/default.nix b/pkgs/development/python-modules/cron-descriptor/default.nix index d98630e3a381..7ffaef085324 100644 --- a/pkgs/development/python-modules/cron-descriptor/default.nix +++ b/pkgs/development/python-modules/cron-descriptor/default.nix @@ -4,7 +4,6 @@ buildPythonPackage, fetchFromGitHub, mock, - pytestCheckHook, }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/cryptoparser/default.nix b/pkgs/development/python-modules/cryptoparser/default.nix index c0e28720423a..846b2643ebc9 100644 --- a/pkgs/development/python-modules/cryptoparser/default.nix +++ b/pkgs/development/python-modules/cryptoparser/default.nix @@ -5,11 +5,9 @@ buildPythonPackage, cryptodatahub, fetchPypi, - pytestCheckHook, python-dateutil, pythonOlder, setuptools, - unittestCheckHook, urllib3, }: diff --git a/pkgs/development/python-modules/dscribe/default.nix b/pkgs/development/python-modules/dscribe/default.nix index 0df77d3e6805..59ff3cdd88d3 100644 --- a/pkgs/development/python-modules/dscribe/default.nix +++ b/pkgs/development/python-modules/dscribe/default.nix @@ -8,7 +8,6 @@ , sparse , pybind11 , scikit-learn -, pytestCheckHook }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/easy-thumbnails/default.nix b/pkgs/development/python-modules/easy-thumbnails/default.nix index 4fa457481c75..df95a000ef97 100644 --- a/pkgs/development/python-modules/easy-thumbnails/default.nix +++ b/pkgs/development/python-modules/easy-thumbnails/default.nix @@ -4,7 +4,6 @@ django, fetchPypi, pillow, - pytestCheckHook, pythonOlder, reportlab, svglib, diff --git a/pkgs/development/python-modules/ecs-logging/default.nix b/pkgs/development/python-modules/ecs-logging/default.nix index 86caf047fa80..f95fa5df1be2 100644 --- a/pkgs/development/python-modules/ecs-logging/default.nix +++ b/pkgs/development/python-modules/ecs-logging/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, fetchFromGitHub, flit-core, - pytestCheckHook, pythonOlder, }: diff --git a/pkgs/development/python-modules/fastcore/default.nix b/pkgs/development/python-modules/fastcore/default.nix index a0434b6dcd57..880459354e4c 100644 --- a/pkgs/development/python-modules/fastcore/default.nix +++ b/pkgs/development/python-modules/fastcore/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, fetchFromGitHub, packaging, - pytestCheckHook, pythonOlder, setuptools, }: diff --git a/pkgs/development/python-modules/future-typing/default.nix b/pkgs/development/python-modules/future-typing/default.nix index ef2c18fda510..291b26c8c452 100644 --- a/pkgs/development/python-modules/future-typing/default.nix +++ b/pkgs/development/python-modules/future-typing/default.nix @@ -2,8 +2,6 @@ lib, buildPythonPackage, fetchPypi, - pytestCheckHook, - typing-extensions, }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/ghapi/default.nix b/pkgs/development/python-modules/ghapi/default.nix index 5e163ec21c05..154f3b86614d 100644 --- a/pkgs/development/python-modules/ghapi/default.nix +++ b/pkgs/development/python-modules/ghapi/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - pytestCheckHook, fastcore, packaging, pythonOlder, diff --git a/pkgs/development/python-modules/heatzypy/default.nix b/pkgs/development/python-modules/heatzypy/default.nix index 78baf88849c7..4227da42494d 100644 --- a/pkgs/development/python-modules/heatzypy/default.nix +++ b/pkgs/development/python-modules/heatzypy/default.nix @@ -3,7 +3,6 @@ aiohttp, buildPythonPackage, fetchFromGitHub, - pytestCheckHook, pythonOlder, setuptools, setuptools-scm, diff --git a/pkgs/development/python-modules/influxdb3-python/default.nix b/pkgs/development/python-modules/influxdb3-python/default.nix index 8b41b385fd05..8fc53603db00 100644 --- a/pkgs/development/python-modules/influxdb3-python/default.nix +++ b/pkgs/development/python-modules/influxdb3-python/default.nix @@ -4,7 +4,6 @@ certifi, fetchFromGitHub, pyarrow, - pytestCheckHook, python-dateutil, pythonOlder, reactivex, diff --git a/pkgs/development/python-modules/iocsearcher/default.nix b/pkgs/development/python-modules/iocsearcher/default.nix index be8c0cef7007..0d91a2cc765e 100644 --- a/pkgs/development/python-modules/iocsearcher/default.nix +++ b/pkgs/development/python-modules/iocsearcher/default.nix @@ -15,7 +15,6 @@ phonenumbers, python-magic, readabilipy, - pytestCheckHook, pythonOlder, setuptools, }: diff --git a/pkgs/development/python-modules/jplephem/default.nix b/pkgs/development/python-modules/jplephem/default.nix index 654db8037d0d..4fd924c47358 100644 --- a/pkgs/development/python-modules/jplephem/default.nix +++ b/pkgs/development/python-modules/jplephem/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, fetchPypi, numpy, - pytestCheckHook, }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/junit2html/default.nix b/pkgs/development/python-modules/junit2html/default.nix index 2e26887b520b..b53bf1edcea8 100644 --- a/pkgs/development/python-modules/junit2html/default.nix +++ b/pkgs/development/python-modules/junit2html/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, fetchPypi, jinja2, - pytestCheckHook, pythonOlder, setuptools, }: diff --git a/pkgs/development/python-modules/librespot/default.nix b/pkgs/development/python-modules/librespot/default.nix index e2e98bc1e6ed..628f2ab1922f 100644 --- a/pkgs/development/python-modules/librespot/default.nix +++ b/pkgs/development/python-modules/librespot/default.nix @@ -6,7 +6,6 @@ protobuf, pycryptodomex, pyogg, - pytestCheckHook, requests, websocket-client, zeroconf, diff --git a/pkgs/development/python-modules/life360/default.nix b/pkgs/development/python-modules/life360/default.nix index 7e001e79b5f5..1825350631d3 100644 --- a/pkgs/development/python-modules/life360/default.nix +++ b/pkgs/development/python-modules/life360/default.nix @@ -3,7 +3,6 @@ aiohttp, buildPythonPackage, fetchFromGitHub, - pytestCheckHook, pythonOlder, setuptools, }: diff --git a/pkgs/development/python-modules/llama-index-embeddings-gemini/default.nix b/pkgs/development/python-modules/llama-index-embeddings-gemini/default.nix index 05558eb38942..466f93653337 100644 --- a/pkgs/development/python-modules/llama-index-embeddings-gemini/default.nix +++ b/pkgs/development/python-modules/llama-index-embeddings-gemini/default.nix @@ -5,7 +5,6 @@ google-generativeai, llama-index-core, poetry-core, - pytestCheckHook, pythonOlder, }: diff --git a/pkgs/development/python-modules/llama-index-embeddings-ollama/default.nix b/pkgs/development/python-modules/llama-index-embeddings-ollama/default.nix index cd0031854496..5184b9be5502 100644 --- a/pkgs/development/python-modules/llama-index-embeddings-ollama/default.nix +++ b/pkgs/development/python-modules/llama-index-embeddings-ollama/default.nix @@ -2,10 +2,8 @@ lib, buildPythonPackage, fetchPypi, - google-generativeai, llama-index-core, poetry-core, - pytestCheckHook, pythonOlder, }: diff --git a/pkgs/development/python-modules/luxtronik/default.nix b/pkgs/development/python-modules/luxtronik/default.nix index a0e72f975ffd..fd1f6c474fa0 100644 --- a/pkgs/development/python-modules/luxtronik/default.nix +++ b/pkgs/development/python-modules/luxtronik/default.nix @@ -2,8 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - pytestCheckHook, - poetry-core, pythonOlder, }: diff --git a/pkgs/development/python-modules/meross-iot/default.nix b/pkgs/development/python-modules/meross-iot/default.nix index 1d06749f3dec..2359d5fc340b 100644 --- a/pkgs/development/python-modules/meross-iot/default.nix +++ b/pkgs/development/python-modules/meross-iot/default.nix @@ -4,7 +4,6 @@ buildPythonPackage, fetchFromGitHub, paho-mqtt, - pytestCheckHook, pythonOlder, pycryptodomex, requests, diff --git a/pkgs/development/python-modules/msgspec/default.nix b/pkgs/development/python-modules/msgspec/default.nix index e37cb697318d..1af1b9814a16 100644 --- a/pkgs/development/python-modules/msgspec/default.nix +++ b/pkgs/development/python-modules/msgspec/default.nix @@ -2,8 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - msgpack, - pytestCheckHook, pythonOlder, setuptools, }: diff --git a/pkgs/development/python-modules/napari-plugin-engine/default.nix b/pkgs/development/python-modules/napari-plugin-engine/default.nix index 419c949b4ebc..63ad78e96617 100644 --- a/pkgs/development/python-modules/napari-plugin-engine/default.nix +++ b/pkgs/development/python-modules/napari-plugin-engine/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, fetchFromGitHub, setuptools-scm, - pytestCheckHook, pythonOlder, }: diff --git a/pkgs/development/python-modules/numdifftools/default.nix b/pkgs/development/python-modules/numdifftools/default.nix index dc2831a52472..29dee4bbbaa4 100644 --- a/pkgs/development/python-modules/numdifftools/default.nix +++ b/pkgs/development/python-modules/numdifftools/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, fetchFromGitHub, numpy, - pytestCheckHook, pythonOlder, scipy, }: diff --git a/pkgs/development/python-modules/oasatelematics/default.nix b/pkgs/development/python-modules/oasatelematics/default.nix index 5313b8a6fbd6..fca7740dc6de 100644 --- a/pkgs/development/python-modules/oasatelematics/default.nix +++ b/pkgs/development/python-modules/oasatelematics/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - pytestCheckHook, pythonOlder, requests, }: diff --git a/pkgs/development/python-modules/openai-triton/default.nix b/pkgs/development/python-modules/openai-triton/default.nix index 39bc77f1eaef..c51fc9bb590f 100644 --- a/pkgs/development/python-modules/openai-triton/default.nix +++ b/pkgs/development/python-modules/openai-triton/default.nix @@ -6,7 +6,6 @@ fetchFromGitHub, fetchpatch, setuptools, - pytestCheckHook, cmake, ninja, pybind11, diff --git a/pkgs/development/python-modules/pcodedmp/default.nix b/pkgs/development/python-modules/pcodedmp/default.nix index 4a5a1b153f7e..eef04412632a 100644 --- a/pkgs/development/python-modules/pcodedmp/default.nix +++ b/pkgs/development/python-modules/pcodedmp/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - pytestCheckHook, pythonOlder, }: diff --git a/pkgs/development/python-modules/phonemizer/default.nix b/pkgs/development/python-modules/phonemizer/default.nix index ab45d086eacd..66edfc945b0d 100644 --- a/pkgs/development/python-modules/phonemizer/default.nix +++ b/pkgs/development/python-modules/phonemizer/default.nix @@ -10,8 +10,6 @@ dlinfo, typing-extensions, espeak-ng, - pytestCheckHook, - pytest-cov, }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/ping3/default.nix b/pkgs/development/python-modules/ping3/default.nix index 52f780cfad93..548e38c388d5 100644 --- a/pkgs/development/python-modules/ping3/default.nix +++ b/pkgs/development/python-modules/ping3/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchPypi, - pytestCheckHook, pythonOlder, setuptools, }: diff --git a/pkgs/development/python-modules/potentials/default.nix b/pkgs/development/python-modules/potentials/default.nix index 02da784d426a..5270503513a2 100644 --- a/pkgs/development/python-modules/potentials/default.nix +++ b/pkgs/development/python-modules/potentials/default.nix @@ -11,7 +11,6 @@ matplotlib, numpy, pandas, - pytestCheckHook, pythonOlder, requests, scipy, diff --git a/pkgs/development/python-modules/prisma/default.nix b/pkgs/development/python-modules/prisma/default.nix index 23eb592a5706..4b6c9d7d5f4a 100644 --- a/pkgs/development/python-modules/prisma/default.nix +++ b/pkgs/development/python-modules/prisma/default.nix @@ -7,7 +7,6 @@ jinja2, nodeenv, pydantic, - pytestCheckHook, python-dotenv, pythonOlder, setuptools, diff --git a/pkgs/development/python-modules/psychrolib/default.nix b/pkgs/development/python-modules/psychrolib/default.nix index 144d65b3f578..ec8544ff2f6f 100644 --- a/pkgs/development/python-modules/psychrolib/default.nix +++ b/pkgs/development/python-modules/psychrolib/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, fetchFromGitHub, setuptools, - pytestCheckHook, pythonOlder, }: diff --git a/pkgs/development/python-modules/pyebus/default.nix b/pkgs/development/python-modules/pyebus/default.nix index dd299aae5878..5376a546c9b0 100644 --- a/pkgs/development/python-modules/pyebus/default.nix +++ b/pkgs/development/python-modules/pyebus/default.nix @@ -3,7 +3,6 @@ anytree, buildPythonPackage, fetchPypi, - pytestCheckHook, poetry-core, pythonOlder, }: diff --git a/pkgs/development/python-modules/pyexploitdb/default.nix b/pkgs/development/python-modules/pyexploitdb/default.nix index 3e22d72d1928..c4ec39d36138 100644 --- a/pkgs/development/python-modules/pyexploitdb/default.nix +++ b/pkgs/development/python-modules/pyexploitdb/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, fetchPypi, gitpython, - pytestCheckHook, pythonOlder, requests, setuptools, diff --git a/pkgs/development/python-modules/pyhomeworks/default.nix b/pkgs/development/python-modules/pyhomeworks/default.nix index 030066cff5cb..13aad86b2121 100644 --- a/pkgs/development/python-modules/pyhomeworks/default.nix +++ b/pkgs/development/python-modules/pyhomeworks/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, fetchPypi, pythonOlder, - pytestCheckHook, }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/pykostalpiko/default.nix b/pkgs/development/python-modules/pykostalpiko/default.nix index 71c9416ae649..c9c183819818 100644 --- a/pkgs/development/python-modules/pykostalpiko/default.nix +++ b/pkgs/development/python-modules/pykostalpiko/default.nix @@ -4,7 +4,6 @@ buildPythonPackage, click, fetchFromGitHub, - pytestCheckHook, pythonOlder, }: diff --git a/pkgs/development/python-modules/pylru/default.nix b/pkgs/development/python-modules/pylru/default.nix index d97af412e939..27dd4c93d6fc 100644 --- a/pkgs/development/python-modules/pylru/default.nix +++ b/pkgs/development/python-modules/pylru/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - pytestCheckHook, pythonOlder, }: diff --git a/pkgs/development/python-modules/pysptk/default.nix b/pkgs/development/python-modules/pysptk/default.nix index 8f7686a46f09..f6f0de014d36 100644 --- a/pkgs/development/python-modules/pysptk/default.nix +++ b/pkgs/development/python-modules/pysptk/default.nix @@ -6,7 +6,6 @@ decorator, fetchPypi, numpy, - pytestCheckHook, pythonOlder, scipy, six, diff --git a/pkgs/development/python-modules/pytest-grpc/default.nix b/pkgs/development/python-modules/pytest-grpc/default.nix index f3002d2c57da..18fa92f9279d 100644 --- a/pkgs/development/python-modules/pytest-grpc/default.nix +++ b/pkgs/development/python-modules/pytest-grpc/default.nix @@ -4,7 +4,6 @@ fetchPypi, grpcio, pytest, - pytestCheckHook, }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/pytest-playwright/default.nix b/pkgs/development/python-modules/pytest-playwright/default.nix index 3cb7de0da430..5f7f55958595 100644 --- a/pkgs/development/python-modules/pytest-playwright/default.nix +++ b/pkgs/development/python-modules/pytest-playwright/default.nix @@ -6,11 +6,9 @@ playwright-driver, pytest, pytest-base-url, - pytestCheckHook, python-slugify, pythonOlder, setuptools-scm, - django, }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/python-family-hub-local/default.nix b/pkgs/development/python-modules/python-family-hub-local/default.nix index 14a14e829ead..81ea4bff27ca 100644 --- a/pkgs/development/python-modules/python-family-hub-local/default.nix +++ b/pkgs/development/python-modules/python-family-hub-local/default.nix @@ -5,7 +5,6 @@ async-timeout, pillow, fetchPypi, - pytestCheckHook, pythonOlder, }: diff --git a/pkgs/development/python-modules/python-libnmap/default.nix b/pkgs/development/python-modules/python-libnmap/default.nix index 782b23be2538..3e3937051aaf 100644 --- a/pkgs/development/python-modules/python-libnmap/default.nix +++ b/pkgs/development/python-modules/python-libnmap/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, defusedxml, fetchFromGitHub, - pytestCheckHook, pythonOlder, }: diff --git a/pkgs/development/python-modules/red-black-tree-mod/default.nix b/pkgs/development/python-modules/red-black-tree-mod/default.nix index 92eca8c4411f..91de8a60cb74 100644 --- a/pkgs/development/python-modules/red-black-tree-mod/default.nix +++ b/pkgs/development/python-modules/red-black-tree-mod/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchPypi, - pytestCheckHook, pythonOlder, setuptools, }: diff --git a/pkgs/development/python-modules/rova/default.nix b/pkgs/development/python-modules/rova/default.nix index d69947e24575..a127bfffaef4 100644 --- a/pkgs/development/python-modules/rova/default.nix +++ b/pkgs/development/python-modules/rova/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - pytestCheckHook, pythonOlder, requests, setuptools, diff --git a/pkgs/development/python-modules/serialio/default.nix b/pkgs/development/python-modules/serialio/default.nix index d06091fccd2e..e5cfb9bc6d8c 100644 --- a/pkgs/development/python-modules/serialio/default.nix +++ b/pkgs/development/python-modules/serialio/default.nix @@ -2,8 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - pytest-asyncio, - pytestCheckHook, pythonOlder, pyserial, sockio, diff --git a/pkgs/development/python-modules/sunweg/default.nix b/pkgs/development/python-modules/sunweg/default.nix index bb455ad6ba91..535b6d253727 100644 --- a/pkgs/development/python-modules/sunweg/default.nix +++ b/pkgs/development/python-modules/sunweg/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - pytestCheckHook, pythonOlder, python-dateutil, requests, diff --git a/pkgs/development/python-modules/terminaltexteffects/default.nix b/pkgs/development/python-modules/terminaltexteffects/default.nix index 78310f2fd967..27b07d561588 100644 --- a/pkgs/development/python-modules/terminaltexteffects/default.nix +++ b/pkgs/development/python-modules/terminaltexteffects/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, fetchPypi, poetry-core, - pytestCheckHook, pythonOlder, }: diff --git a/pkgs/development/python-modules/textx/default.nix b/pkgs/development/python-modules/textx/default.nix index ec8779e4ccce..b3edc047da93 100644 --- a/pkgs/development/python-modules/textx/default.nix +++ b/pkgs/development/python-modules/textx/default.nix @@ -14,7 +14,6 @@ html5lib, jinja2, psutil, - pytestCheckHook, }: let diff --git a/pkgs/development/python-modules/tplink-omada-client/default.nix b/pkgs/development/python-modules/tplink-omada-client/default.nix index eb53e74cebb6..f534eb40ac50 100644 --- a/pkgs/development/python-modules/tplink-omada-client/default.nix +++ b/pkgs/development/python-modules/tplink-omada-client/default.nix @@ -5,7 +5,6 @@ buildPythonPackage, fetchPypi, hatchling, - pytestCheckHook, pythonOlder, }: diff --git a/pkgs/development/python-modules/traits/default.nix b/pkgs/development/python-modules/traits/default.nix index e2335a8b1b7b..e104f762dedc 100644 --- a/pkgs/development/python-modules/traits/default.nix +++ b/pkgs/development/python-modules/traits/default.nix @@ -3,8 +3,6 @@ buildPythonPackage, fetchPypi, pythonOlder, - numpy, - pytestCheckHook, }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/weboob/default.nix b/pkgs/development/python-modules/weboob/default.nix index 37d639ee336b..53b632abeab8 100644 --- a/pkgs/development/python-modules/weboob/default.nix +++ b/pkgs/development/python-modules/weboob/default.nix @@ -17,7 +17,6 @@ pillow, prettytable, pyqt5, - pytestCheckHook, python-dateutil, pythonOlder, pyyaml, diff --git a/pkgs/development/python-modules/webthing-ws/default.nix b/pkgs/development/python-modules/webthing-ws/default.nix index 83f1c813e88d..3df7d1861813 100644 --- a/pkgs/development/python-modules/webthing-ws/default.nix +++ b/pkgs/development/python-modules/webthing-ws/default.nix @@ -4,7 +4,6 @@ async-timeout, buildPythonPackage, fetchFromGitHub, - pytestCheckHook, pythonOlder, }: diff --git a/pkgs/development/python-modules/whois-api/default.nix b/pkgs/development/python-modules/whois-api/default.nix index 0623b4297fb7..f3a40dcc9a1a 100644 --- a/pkgs/development/python-modules/whois-api/default.nix +++ b/pkgs/development/python-modules/whois-api/default.nix @@ -4,7 +4,6 @@ fetchFromGitHub, setuptools, requests, - pytestCheckHook, }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/x11-hash/default.nix b/pkgs/development/python-modules/x11-hash/default.nix index 907c70080dd3..92af43fad444 100644 --- a/pkgs/development/python-modules/x11-hash/default.nix +++ b/pkgs/development/python-modules/x11-hash/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, fetchPypi, setuptools, - pytestCheckHook, }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/youtokentome/default.nix b/pkgs/development/python-modules/youtokentome/default.nix index ad39637c12b1..0d6328f13a78 100644 --- a/pkgs/development/python-modules/youtokentome/default.nix +++ b/pkgs/development/python-modules/youtokentome/default.nix @@ -5,7 +5,6 @@ setuptools, click, cython, - pytestCheckHook, pythonOlder, tabulate, }: diff --git a/pkgs/os-specific/linux/tuna/default.nix b/pkgs/os-specific/linux/tuna/default.nix index 634680dc318c..a75e9ec4f6a1 100644 --- a/pkgs/os-specific/linux/tuna/default.nix +++ b/pkgs/os-specific/linux/tuna/default.nix @@ -2,8 +2,6 @@ , buildPythonApplication , fetchzip , pygobject3 -, pytestCheckHook -, gdk-pixbuf , glib , gobject-introspection , gtk3 From a3126d1d0cc8defd399a0181c258e85f878ddefc Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 17 Jul 2024 04:53:18 +0200 Subject: [PATCH 56/77] onnxruntime: fix CUDA build Onnxruntime since version 1.17.0 depends on nccl for cuda support. --- pkgs/development/libraries/onnxruntime/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/onnxruntime/default.nix b/pkgs/development/libraries/onnxruntime/default.nix index 9c96f6ebe08c..6297488d491a 100644 --- a/pkgs/development/libraries/onnxruntime/default.nix +++ b/pkgs/development/libraries/onnxruntime/default.nix @@ -159,6 +159,7 @@ effectiveStdenv.mkDerivation rec { libcufft # cufft.h cudnn # cudnn.h cuda_cudart + nccl ]); nativeCheckInputs = [ From 4b118df632e659fe4293a760f52dd777c475f3db Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Tue, 16 Jul 2024 17:04:37 +0200 Subject: [PATCH 57/77] svtplay-dl: fix build for Python 3.12 For now we simply disable checks for 3.12 and later. Also enable pre and post check hooks. --- pkgs/tools/misc/svtplay-dl/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/misc/svtplay-dl/default.nix b/pkgs/tools/misc/svtplay-dl/default.nix index ec8cefeab7a8..75d6449858a6 100644 --- a/pkgs/tools/misc/svtplay-dl/default.nix +++ b/pkgs/tools/misc/svtplay-dl/default.nix @@ -51,9 +51,13 @@ stdenv.mkDerivation rec { --prefix PYTHONPATH : "$PYTHONPATH" ''; - doCheck = true; + doCheck = python3Packages.pythonOlder "3.12"; checkPhase = '' + runHook preCheck + sh scripts/run-tests.sh -2 + + runHook postCheck ''; doInstallCheck = true; From cc4234c6c025fe4fa89bc682a4c8757a68c27106 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Wed, 17 Jul 2024 07:48:47 +0200 Subject: [PATCH 58/77] typstyle: 0.11.29 -> 0.11.30 Diff: https://github.com/Enter-tainer/typstyle/compare/refs/tags/v0.11.29...v0.11.30 Changelog: https://github.com/Enter-tainer/typstyle/blob/refs/tags/v0.11.30/CHANGELOG.md --- pkgs/by-name/ty/typstyle/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ty/typstyle/package.nix b/pkgs/by-name/ty/typstyle/package.nix index 4db419b74395..ddd9037a254a 100644 --- a/pkgs/by-name/ty/typstyle/package.nix +++ b/pkgs/by-name/ty/typstyle/package.nix @@ -13,16 +13,16 @@ rustPlatform.buildRustPackage rec { pname = "typstyle"; - version = "0.11.29"; + version = "0.11.30"; src = fetchFromGitHub { owner = "Enter-tainer"; repo = "typstyle"; rev = "refs/tags/v${version}"; - hash = "sha256-7BjbML7mz5ohEdh+x6qL8pH2BTFW8WdtB0g91NHFIBY="; + hash = "sha256-pdIgngLn0y4+N4nD5b6E8UL1ftinWO9ofde1Vw3Pn7o="; }; - cargoHash = "sha256-bcOfgiQ7mT7HE1hUXfBlj6SzMUtS5Ar2X9kjFGKPR2w="; + cargoHash = "sha256-+iBxVTwAzYpLio9BKD1hYsTw4GgK6CkmbyM5QIiswck="; nativeBuildInputs = [ pkg-config From 9d8abda957dfcfad3722b56a25bb9bef099d30c8 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Mon, 8 Jul 2024 11:07:25 +0200 Subject: [PATCH 59/77] python311Packages.scs: 3.2.4 -> 3.2.6 Diff: https://github.com/bodono/scs-python/compare/3.2.4...3.2.6 --- .../python-modules/scs/default.nix | 53 ++++++++----------- 1 file changed, 21 insertions(+), 32 deletions(-) diff --git a/pkgs/development/python-modules/scs/default.nix b/pkgs/development/python-modules/scs/default.nix index 4afc0219d900..9214204db210 100644 --- a/pkgs/development/python-modules/scs/default.nix +++ b/pkgs/development/python-modules/scs/default.nix @@ -3,56 +3,45 @@ stdenv, buildPythonPackage, fetchFromGitHub, - fetchpatch, + + # build-system meson-python, + numpy, pkg-config, + + # buildInputs Accelerate, blas, lapack, - numpy, + + # dependencies scipy, + # check inputs pytestCheckHook, }: buildPythonPackage rec { pname = "scs"; - version = "3.2.4"; + version = "3.2.6"; pyproject = true; src = fetchFromGitHub { owner = "bodono"; repo = "scs-python"; - rev = version; - hash = "sha256-UmMbnj7QZSvHWSUk1Qa0VP4i3iDCYHxoa+qBmEdFjRs="; + rev = "refs/tags/${version}"; + hash = "sha256-Sl0+1/uEXAg+V2ijDFGmez6hBKQjbi63gN26lPCiEnI="; fetchSubmodules = true; }; - patches = [ - # needed for building against netlib's reference blas implementation and - # the pkg-config patch. remove on next update - (fetchpatch { - name = "find-and-ld-lapack.patch"; - url = "https://github.com/bodono/scs-python/commit/a0aea80e7d490770d6a47d2c79396f6c3341c1f9.patch"; - hash = "sha256-yHF8f7SLoG7veZ6DEq1HVH6rT2KtFONwJtqSiKcxOdg="; - }) - # add support for pkg-config. remove on next update - (fetchpatch { - name = "use-pkg-config.patch"; - url = "https://github.com/bodono/scs-python/commit/dd17e2e5282ebe85f2df8a7c6b25cfdeb894970d.patch"; - hash = "sha256-vSeSJeeu5Wx3RXPyB39YTo0RU8HtAojrUw85Q76/QzA="; - }) - # fix test_solve_random_cone_prob on linux after scipy 1.12 update - # https://github.com/bodono/scs-python/pull/82 - (fetchpatch { - name = "scipy-1.12-fix.patch"; - url = "https://github.com/bodono/scs-python/commit/4baf4effdc2ce7ac2dd1beaf864f1a5292eb06c6.patch"; - hash = "sha256-U/F5MakwYZN5hCaeAkcCG38WQxX9mXy9OvhyEQqN038="; - }) - ]; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "numpy >= 2.0.0" "numpy" + ''; - nativeBuildInputs = [ + build-system = [ meson-python + numpy pkg-config ]; @@ -65,7 +54,7 @@ buildPythonPackage rec { lapack ]; - propagatedBuildInputs = [ + dependencies = [ numpy scipy ]; @@ -73,7 +62,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "scs" ]; - meta = with lib; { + meta = { description = "Python interface for SCS: Splitting Conic Solver"; longDescription = '' Solves convex cone programs via operator splitting. @@ -82,7 +71,7 @@ buildPythonPackage rec { ''; homepage = "https://github.com/cvxgrp/scs"; # upstream C package downloadPage = "https://github.com/bodono/scs-python"; - license = licenses.mit; - maintainers = with maintainers; [ drewrisinger ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ drewrisinger ]; }; } From 6afcc8e9d0b92d9ebfde46943fed37046649d9d1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 17 Jul 2024 06:25:47 +0000 Subject: [PATCH 60/77] tippecanoe: 2.55.0 -> 2.56.0 --- pkgs/by-name/ti/tippecanoe/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ti/tippecanoe/package.nix b/pkgs/by-name/ti/tippecanoe/package.nix index 05d19692f375..c0da90796860 100644 --- a/pkgs/by-name/ti/tippecanoe/package.nix +++ b/pkgs/by-name/ti/tippecanoe/package.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "tippecanoe"; - version = "2.55.0"; + version = "2.56.0"; src = fetchFromGitHub { owner = "felt"; repo = "tippecanoe"; rev = finalAttrs.version; - hash = "sha256-hF1tiI5M8BdJoJEZDqC6BkzndmYRQU4jHhjUvYowBTU="; + hash = "sha256-n1ZhOlhrI1cSOwv7NP2VDAPC/2HmMJBkNLH6NPY3BnM="; }; buildInputs = [ sqlite zlib ]; From 24d0397f64d4cc3689094bf55fc5345b8d73be64 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 17 Jul 2024 06:29:16 +0000 Subject: [PATCH 61/77] tdnf: 3.5.7 -> 3.5.8 --- pkgs/by-name/td/tdnf/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/td/tdnf/package.nix b/pkgs/by-name/td/tdnf/package.nix index 83e9687c2a92..a0749f2a003d 100644 --- a/pkgs/by-name/td/tdnf/package.nix +++ b/pkgs/by-name/td/tdnf/package.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "tdnf"; - version = "3.5.7"; + version = "3.5.8"; src = fetchFromGitHub { owner = "vmware"; repo = "tdnf"; rev = "v${finalAttrs.version}"; - hash = "sha256-+oVmIZqWi1JdiOv40C4dS2a9VqK3hzGl+PQ7sk1l11o="; + hash = "sha256-rs6NMIwpJCBsO7Ca+za8pVJXQwpcgFvpd15ayS01mQM="; }; nativeBuildInputs = [ From 343aa551b4747faa14bec1154f43bf0faf39b48b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 17 Jul 2024 06:39:51 +0000 Subject: [PATCH 62/77] wit-bindgen: 0.27.0 -> 0.28.0 --- pkgs/by-name/wi/wit-bindgen/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/wi/wit-bindgen/package.nix b/pkgs/by-name/wi/wit-bindgen/package.nix index f3bdc3b38f4b..df04aee00ea0 100644 --- a/pkgs/by-name/wi/wit-bindgen/package.nix +++ b/pkgs/by-name/wi/wit-bindgen/package.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "wit-bindgen"; - version = "0.27.0"; + version = "0.28.0"; src = fetchFromGitHub { owner = "bytecodealliance"; repo = "wit-bindgen"; rev = "v${version}"; - hash = "sha256-df2MBn5Ob9lQleiaKJnxFotI0AmdGJs/ifS9WCObXUo="; + hash = "sha256-WE+a0y97aPWEUHZT/LRjZ/WRZP7QxF4DXVjJVRjuJFU="; }; - cargoHash = "sha256-y1jyDRPoaeoZYPTqonYwMOtOkQ/S54mbbTU2jBX6Teg="; + cargoHash = "sha256-Z6dBlYT4aYh92LZGH/+NAkkf80KZtId1emVaeOfpEjM="; # Some tests fail because they need network access to install the `wasm32-unknown-unknown` target. # However, GitHub Actions ensures a proper build. From c67e527a7d9422bb920594c27e030ebe797baf17 Mon Sep 17 00:00:00 2001 From: Kacper Koniuszy <120419423+kkoniuszy@users.noreply.github.com> Date: Tue, 9 Jul 2024 16:06:50 +0200 Subject: [PATCH 63/77] qt6packages.qtwayland: pull upstream fixes for crashes on screen changes Fixes plasmashell crashes described in https://bugs.kde.org/show_bug.cgi?id=489072 and https://bugs.kde.org/show_bug.cgi?id=489180 --- .../libraries/qt-6/modules/qtwayland.nix | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/pkgs/development/libraries/qt-6/modules/qtwayland.nix b/pkgs/development/libraries/qt-6/modules/qtwayland.nix index 82b683d53463..512b084a0bf5 100644 --- a/pkgs/development/libraries/qt-6/modules/qtwayland.nix +++ b/pkgs/development/libraries/qt-6/modules/qtwayland.nix @@ -20,5 +20,19 @@ qtModule { url = "https://invent.kde.org/qt/qt/qtwayland/-/commit/92bcb8f6b7a852c7a5d662fc34de561692a7a454.diff"; sha256 = "sha256-XgGO8VnmQHLhUxTGf9CniwkCr5FsFiuUbnVP0NLNekI="; }) + + # Included in qtwayland 6.7.3 + # Fixes https://bugs.kde.org/show_bug.cgi?id=489072 + (fetchpatch { + url = "https://invent.kde.org/qt/qt/qtwayland/-/commit/c4f91b479303dda2e49499de249018d7c66c5f99.diff"; + sha256 = "sha256-4rUdl6WuJHONW0Uy2wjTvyvDY3bJWeRvhk3tCkaOOro="; + }) + + # Included in qtwayland 6.7.3 + # Fixes https://bugs.kde.org/show_bug.cgi?id=489180 + (fetchpatch { + url = "https://invent.kde.org/qt/qt/qtwayland/-/commit/632127d7f1d86cba4dd17361f24f9fd70a0ae44c.diff"; + sha256 = "sha256-1EIcMj6+yIpqXAGZB3ZbrwRkl4n1o7TVP2SC1Nu1t78="; + }) ]; } From f4cbe8e67a163dc68adc1fc9b1cd73715bc5e476 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Wed, 17 Jul 2024 10:52:16 +0400 Subject: [PATCH 64/77] gnuastro: migrate to by-name --- .../gnuastro/default.nix => by-name/gn/gnuastro/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{applications/science/astronomy/gnuastro/default.nix => by-name/gn/gnuastro/package.nix} (100%) diff --git a/pkgs/applications/science/astronomy/gnuastro/default.nix b/pkgs/by-name/gn/gnuastro/package.nix similarity index 100% rename from pkgs/applications/science/astronomy/gnuastro/default.nix rename to pkgs/by-name/gn/gnuastro/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index afdbcbf9cc11..e63d3e4312e4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8478,8 +8478,6 @@ with pkgs; gpp = callPackage ../development/tools/gpp { }; - gnuastro = callPackage ../applications/science/astronomy/gnuastro { }; - gpredict = callPackage ../applications/science/astronomy/gpredict { hamlib = hamlib_4; }; From 1fa7c1e3f97ecdcb764db1865c3dd8ec7f0da24d Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Mon, 8 Jul 2024 11:01:28 +0200 Subject: [PATCH 65/77] python311Packages.cvxpy: 1.4.3 -> 1.5.2 Changelog: https://github.com/cvxpy/cvxpy/releases/tag/v1.5.2 --- .../python-modules/cvxpy/default.nix | 62 ++++++++++++------- 1 file changed, 41 insertions(+), 21 deletions(-) diff --git a/pkgs/development/python-modules/cvxpy/default.nix b/pkgs/development/python-modules/cvxpy/default.nix index d6fce58eaa73..e75ad737db9c 100644 --- a/pkgs/development/python-modules/cvxpy/default.nix +++ b/pkgs/development/python-modules/cvxpy/default.nix @@ -2,46 +2,66 @@ lib, stdenv, buildPythonPackage, + pythonOlder, + fetchFromGitHub, + fetchpatch, + + # build-system + numpy, + pybind11, + setuptools, + + # dependencies clarabel, cvxopt, ecos, - fetchPypi, - numpy, osqp, - pytestCheckHook, - pythonOlder, scipy, scs, - setuptools, - wheel, - pybind11, + + # checks + pytestCheckHook, + useOpenmp ? (!stdenv.isDarwin), }: buildPythonPackage rec { pname = "cvxpy"; - version = "1.4.3"; - format = "pyproject"; + version = "1.5.2"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; - src = fetchPypi { - inherit pname version; - hash = "sha256-sbB4yMBZI60Sjn2BSwvhwzesBSYqeLdXqOb5V2SK2VM="; + src = fetchFromGitHub { + owner = "cvxpy"; + repo = "cvxpy"; + rev = "refs/tags/v${version}"; + hash = "sha256-g4JVgykGNFT4ZEi5f8hkVjd7eUVJ+LxvPvmiVa86r1Y="; }; + patches = [ + # Fix invalid uses of the scipy library + # https://github.com/cvxpy/cvxpy/pull/2508 + (fetchpatch { + name = "scipy-1-14-compat"; + url = "https://github.com/cvxpy/cvxpy/pull/2508/commits/c343f4381c69f7e6b51a86b3eee8b42fbdda9d6a.patch"; + hash = "sha256-SqIdPs9K+GuCLCEJMHUQ+QGWNH5B3tKuwr46tD9Ao2k="; + }) + ]; + # we need to patch out numpy version caps from upstream postPatch = '' - sed -i 's/\(numpy>=[0-9.]*\),<[0-9.]*;/\1;/g' pyproject.toml + substituteInPlace pyproject.toml \ + --replace-fail "numpy >= 2.0.0" "numpy" ''; - nativeBuildInputs = [ - setuptools - wheel + build-system = [ + numpy pybind11 + setuptools ]; - propagatedBuildInputs = [ + dependencies = [ clarabel cvxopt ecos @@ -77,12 +97,12 @@ buildPythonPackage rec { pythonImportsCheck = [ "cvxpy" ]; - meta = with lib; { + meta = { description = "Domain-specific language for modeling convex optimization problems in Python"; homepage = "https://www.cvxpy.org/"; downloadPage = "https://github.com/cvxpy/cvxpy//releases"; changelog = "https://github.com/cvxpy/cvxpy/releases/tag/v${version}"; - license = licenses.asl20; - maintainers = with maintainers; [ drewrisinger ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ drewrisinger ]; }; } From cb0f14902310212bde7c7361ba2d5b72b657d1ad Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 17 Jul 2024 07:25:57 +0000 Subject: [PATCH 66/77] python312Packages.craft-archives: 1.1.3 -> 1.2.0 --- pkgs/development/python-modules/craft-archives/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/craft-archives/default.nix b/pkgs/development/python-modules/craft-archives/default.nix index 19f0133c6996..6369acc78208 100644 --- a/pkgs/development/python-modules/craft-archives/default.nix +++ b/pkgs/development/python-modules/craft-archives/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "craft-archives"; - version = "1.1.3"; + version = "1.2.0"; pyproject = true; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "canonical"; repo = "craft-archives"; rev = "refs/tags/${version}"; - hash = "sha256-ZUqMjbOsHwzZyn0NsSTlZTljzagYEirWKEGatXVL43g="; + hash = "sha256-4BYRwuBDKFbVvK805e+L4ZR8wtS8GHHYteexH4YZmSE="; }; postPatch = '' From e1536b58a45605b2ec5698b7cc1daeb579e39de1 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Mon, 8 Jul 2024 10:58:40 +0200 Subject: [PATCH 67/77] python311Packages.blackjax: 1.2.1 -> 1.2.2 Diff: https://github.com/blackjax-devs/blackjax/compare/refs/tags/1.2.1...1.2.2 Changelog: https://github.com/blackjax-devs/blackjax/releases/tag/1.2.2 --- pkgs/development/python-modules/blackjax/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/blackjax/default.nix b/pkgs/development/python-modules/blackjax/default.nix index 3e8c680f7c91..fa4ef1b19f06 100644 --- a/pkgs/development/python-modules/blackjax/default.nix +++ b/pkgs/development/python-modules/blackjax/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "blackjax"; - version = "1.2.1"; + version = "1.2.2"; pyproject = true; disabled = pythonOlder "3.9"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "blackjax-devs"; repo = "blackjax"; rev = "refs/tags/${version}"; - hash = "sha256-VoWBCjFMyE5LVJyf7du/pKlnvDHj22lguiP6ZUzH9ak="; + hash = "sha256-W89L/3bpvecZdCpLCQOppev+fPc+SXd/T+zZLBH2wJs="; }; build-system = [ setuptools-scm ]; @@ -65,11 +65,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "blackjax" ]; - meta = with lib; { + meta = { homepage = "https://blackjax-devs.github.io/blackjax"; description = "Sampling library designed for ease of use, speed and modularity"; changelog = "https://github.com/blackjax-devs/blackjax/releases/tag/${version}"; - license = licenses.asl20; - maintainers = with maintainers; [ bcdarwin ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ bcdarwin ]; }; } From e18d3b4894ab9a2d2671f15fa693fd522b254c4a Mon Sep 17 00:00:00 2001 From: Florian Nagel Date: Wed, 17 Jul 2024 10:06:42 +0200 Subject: [PATCH 68/77] Added an error message when using enableFakechroot on Darwin (#327336) * Added an error message when using enableFakechroot on Darwin Co-authored-by: Valentin Gagarin --- pkgs/build-support/docker/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index ea461ccffa07..e9256c0503e6 100644 --- a/pkgs/build-support/docker/default.nix +++ b/pkgs/build-support/docker/default.nix @@ -24,6 +24,7 @@ , runtimeShell , shadow , skopeo +, stdenv , storeDir ? builtins.storeDir , substituteAll , symlinkJoin @@ -922,6 +923,13 @@ rec { assert (lib.assertMsg (maxLayers > 1) "the maxLayers argument of dockerTools.buildLayeredImage function must be greather than 1 (current value: ${toString maxLayers})"); + assert + (lib.assertMsg (enableFakechroot -> !stdenv.isDarwin) '' + cannot use `enableFakechroot` because `proot` is not portable to Darwin. Workarounds: + - use `fakeRootCommands` with the restricted `fakeroot` environment + - cross-compile your packages + - run your packages in a virtual machine + Discussion: https://github.com/NixOS/nixpkgs/issues/327311''); let baseName = baseNameOf name; From 2c51a5b33c6aa87308e36ba1a0f499c6c1edf7db Mon Sep 17 00:00:00 2001 From: Ivan Trubach Date: Thu, 22 Jun 2023 17:44:15 +0300 Subject: [PATCH 69/77] yandex-cloud: init at 0.129.0 --- pkgs/by-name/ya/yandex-cloud/package.nix | 99 ++++++++++++++++++++ pkgs/by-name/ya/yandex-cloud/sources.json | 25 +++++ pkgs/by-name/ya/yandex-cloud/update.py | 107 ++++++++++++++++++++++ 3 files changed, 231 insertions(+) create mode 100644 pkgs/by-name/ya/yandex-cloud/package.nix create mode 100644 pkgs/by-name/ya/yandex-cloud/sources.json create mode 100644 pkgs/by-name/ya/yandex-cloud/update.py diff --git a/pkgs/by-name/ya/yandex-cloud/package.nix b/pkgs/by-name/ya/yandex-cloud/package.nix new file mode 100644 index 000000000000..d93adcae1ab5 --- /dev/null +++ b/pkgs/by-name/ya/yandex-cloud/package.nix @@ -0,0 +1,99 @@ +{ + lib, + stdenv, + fetchurl, + makeBinaryWrapper, + installShellFiles, + buildPackages, + withShellCompletions ? stdenv.hostPlatform.emulatorAvailable buildPackages, + # update script + writers, + python3Packages, + nix, + # tests + testers, + yandex-cloud, +}: +let + pname = "yandex-cloud"; + sources = lib.importJSON ./sources.json; + inherit (sources) version binaries; +in +stdenv.mkDerivation { + inherit pname version; + + src = fetchurl binaries.${stdenv.hostPlatform.system}; + + dontUnpack = true; + + strictDeps = true; + + nativeBuildInputs = [ + installShellFiles + makeBinaryWrapper + ]; + + emulator = lib.optionalString ( + withShellCompletions && !stdenv.buildPlatform.canExecute stdenv.hostPlatform + ) (stdenv.hostPlatform.emulator buildPackages); + + installPhase = + '' + runHook preInstall + mkdir -p -- "$out/bin" + cp -- "$src" "$out/bin/yc" + chmod +x -- "$out/bin/yc" + '' + + lib.optionalString withShellCompletions '' + for shell in bash zsh; do + ''${emulator:+"$emulator"} "$out/bin/yc" completion $shell >yc.$shell + installShellCompletion yc.$shell + done + '' + + '' + makeWrapper "$out/bin/yc" "$out/bin/docker-credential-yc" \ + --add-flags --no-user-output \ + --add-flags container \ + --add-flags docker-credential + runHook postInstall + ''; + + passthru = { + updateScript = writers.writePython3 "${pname}-updater" { + libraries = with python3Packages; [ requests ]; + makeWrapperArgs = [ + "--prefix" + "PATH" + ":" + (lib.makeBinPath [ nix ]) + ]; + } ./update.py; + tests.version = testers.testVersion { package = yandex-cloud; }; + }; + + meta = { + description = "Command line interface that helps you interact with Yandex Cloud services"; + homepage = "https://cloud.yandex/docs/cli"; + changelog = "https://cloud.yandex/docs/cli/release-notes#version${version}"; + sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; + license = lib.licenses.unfree; + maintainers = [ lib.maintainers.tie ]; + platforms = [ + "aarch64-darwin" + "x86_64-darwin" + "aarch64-linux" + "x86_64-linux" + # Built with GO386=sse2. + # + # Unfortunately, we don’t have anything about SSE2 support in lib.systems, + # so we can’t mark this a broken or bad platform if host platform does not + # support SSE2. See also https://github.com/NixOS/nixpkgs/issues/132217 + # + # Perhaps it would be possible to mark it as broken if platform declares + # GO386=softfloat once https://github.com/NixOS/nixpkgs/pull/256761 is + # ready and merged. + "i686-linux" + ]; + mainProgram = "yc"; + }; +} diff --git a/pkgs/by-name/ya/yandex-cloud/sources.json b/pkgs/by-name/ya/yandex-cloud/sources.json new file mode 100644 index 000000000000..0164377af732 --- /dev/null +++ b/pkgs/by-name/ya/yandex-cloud/sources.json @@ -0,0 +1,25 @@ +{ + "version": "0.129.0", + "binaries": { + "aarch64-darwin": { + "url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.129.0/darwin/arm64/yc", + "hash": "sha256-ULd/fmWDBPPALf6Rb95n6zXsSuDBAkeWNH11f5PLIpE=" + }, + "aarch64-linux": { + "url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.129.0/linux/arm64/yc", + "hash": "sha256-Tvy9hTpp37EUrEIDglNFqrH0laD0O+wwVWlCIBh6Jag=" + }, + "i686-linux": { + "url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.129.0/linux/386/yc", + "hash": "sha256-rmcXdz7z1iXOUQTq0sFNNcZ1jG/Dypxfl2oyeJiwkjs=" + }, + "x86_64-darwin": { + "url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.129.0/darwin/amd64/yc", + "hash": "sha256-DjAifjGBiRvJDx3j4iMR/t7zOITaz/iulfeDUZCvIhE=" + }, + "x86_64-linux": { + "url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.129.0/linux/amd64/yc", + "hash": "sha256-igj1iwznsL1OG3V8hOQVCbticzOtDH8dF8jLzMxO5Fg=" + } + } +} diff --git a/pkgs/by-name/ya/yandex-cloud/update.py b/pkgs/by-name/ya/yandex-cloud/update.py new file mode 100644 index 000000000000..d1b95ca50ec6 --- /dev/null +++ b/pkgs/by-name/ya/yandex-cloud/update.py @@ -0,0 +1,107 @@ +import json +import os +import requests +import shutil +import subprocess +import sys +import tempfile + +# See YC_SDK_STORAGE_URL in +# https://storage.yandexcloud.net/yandexcloud-yc/install.sh +storage_url = "https://storage.yandexcloud.net/yandexcloud-yc" + +systems = [ + ("aarch64", "darwin"), + ("aarch64", "linux"), + ("i686", "linux"), + ("x86_64", "darwin"), + ("x86_64", "linux"), +] + + +def to_goarch(cpu): + return { + "aarch64": "arm64", + "i686": "386", + "x86_64": "amd64", + }.get(cpu, cpu) + + +nixpkgs_path = "." +attr_path = os.getenv("UPDATE_NIX_ATTR_PATH", "yandex-cloud") + +package_attrs = json.loads(subprocess.run( + [ + "nix", + "--extra-experimental-features", "nix-command", + "eval", + "--json", + "--file", nixpkgs_path, + "--apply", """p: { + dir = builtins.dirOf p.meta.position; + version = p.version; + }""", + "--", + attr_path, + ], + stdout=subprocess.PIPE, + text=True, + check=True, +).stdout) + +old_version = package_attrs["version"] +new_version = requests.get(f"{storage_url}/release/stable").text.rstrip() + +if new_version == old_version: + sys.exit() + +binaries = {} +for cpu, kernel in systems: + goos = kernel + goarch = to_goarch(cpu) + system = f"{cpu}-{kernel}" + + url = f"{storage_url}/release/{new_version}/{goos}/{goarch}/yc" + + nix_hash = subprocess.run( + [ + "nix-prefetch-url", + "--type", "sha256", + url, + ], + stdout=subprocess.PIPE, + text=True, + check=True, + ).stdout.rstrip() + + sri_hash = subprocess.run( + [ + "nix", + "--extra-experimental-features", "nix-command", + "hash", + "to-sri", + "--type", "sha256", + "--", + nix_hash, + ], + stdout=subprocess.PIPE, + text=True, + check=True, + ).stdout.rstrip() + + binaries[system] = { + "url": url, + "hash": sri_hash, + } + +package_dir = package_attrs["dir"] +file_path = os.path.join(package_dir, "sources.json") +file_content = json.dumps({ + "version": new_version, + "binaries": binaries, +}, indent=2) + "\n" + +with tempfile.NamedTemporaryFile(mode="w") as t: + t.write(file_content) + t.flush() + shutil.copyfile(t.name, file_path) From 16af52ed24b47300d1bfc840b796c3cfe19ac945 Mon Sep 17 00:00:00 2001 From: Roshan Kumar <58213083+Roshaen@users.noreply.github.com> Date: Wed, 17 Jul 2024 13:51:42 +0530 Subject: [PATCH 70/77] python312Packages.python-ffmpeg: init at 2.0.12 (#320185) --- .../python-modules/python-ffmpeg/default.nix | 30 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/development/python-modules/python-ffmpeg/default.nix diff --git a/pkgs/development/python-modules/python-ffmpeg/default.nix b/pkgs/development/python-modules/python-ffmpeg/default.nix new file mode 100644 index 000000000000..12b734c37700 --- /dev/null +++ b/pkgs/development/python-modules/python-ffmpeg/default.nix @@ -0,0 +1,30 @@ +{ + lib, + buildPythonPackage, + pyee, + fetchPypi, + setuptools-scm, +}: + +buildPythonPackage rec { + pname = "python_ffmpeg"; + version = "2.0.12"; + pyproject = true; + + src = fetchPypi { + inherit pname version; + sha256 = "GayAr1oGSi9TwkWvGpCbLXZI6gRVANltO81Qe4jUPcc="; + }; + + propagatedBuildInputs = [ pyee ]; + + nativeBuildInputs = [ setuptools-scm ]; + pythonImportCheck = [ "ffmpeg" ]; + + meta = { + homepage = "https://github.com/jonghwanhyeon/python-ffmpeg"; + description = "Python binding for FFmpeg which provides sync and async APIs"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ roshaen ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d876ee2929e5..b9ae5de95e7d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10306,6 +10306,8 @@ self: super: with self; { python-ecobee-api = callPackage ../development/python-modules/python-ecobee-api { }; + python-ffmpeg = callPackage ../development/python-modules/python-ffmpeg { }; + python-flirt = callPackage ../development/python-modules/python-flirt { }; python-fullykiosk = callPackage ../development/python-modules/python-fullykiosk { }; From b872eb13e4830793be0196d1c84c60beae8807b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 17 Jul 2024 10:33:54 +0200 Subject: [PATCH 71/77] qpdf: add meta.mainProgram --- pkgs/development/libraries/qpdf/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/qpdf/default.nix b/pkgs/development/libraries/qpdf/default.nix index b2858944ef7c..41d21bd7dcc6 100644 --- a/pkgs/development/libraries/qpdf/default.nix +++ b/pkgs/development/libraries/qpdf/default.nix @@ -53,5 +53,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ abbradar ]; platforms = platforms.all; changelog = "https://github.com/qpdf/qpdf/blob/v${version}/ChangeLog"; + mainProgram = "qpdf"; }; } From 8e6417cdc0aede9caf4aa1b1670d4befbacec5cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 17 Jul 2024 10:34:11 +0200 Subject: [PATCH 72/77] unoconv: add meta.mainProgram --- pkgs/tools/text/unoconv/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/text/unoconv/default.nix b/pkgs/tools/text/unoconv/default.nix index 490b961f9710..81e97d1a13fd 100644 --- a/pkgs/tools/text/unoconv/default.nix +++ b/pkgs/tools/text/unoconv/default.nix @@ -34,5 +34,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Only; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; + mainProgram = "unoconv"; }; } From 7b9a81acb066ddb5864b2af84a5a9f7192a2e6b9 Mon Sep 17 00:00:00 2001 From: Pyrox Date: Thu, 11 Jul 2024 03:06:56 -0400 Subject: [PATCH 73/77] gotenberg: init at 8.8.0 --- pkgs/by-name/go/gotenberg/package.nix | 92 +++++++++++++++++++++++++++ 1 file changed, 92 insertions(+) create mode 100644 pkgs/by-name/go/gotenberg/package.nix diff --git a/pkgs/by-name/go/gotenberg/package.nix b/pkgs/by-name/go/gotenberg/package.nix new file mode 100644 index 000000000000..889d2109d4e7 --- /dev/null +++ b/pkgs/by-name/go/gotenberg/package.nix @@ -0,0 +1,92 @@ +{ + lib, + buildGoModule, + chromium, + fetchFromGitHub, + libreoffice, + makeBinaryWrapper, + pdftk, + qpdf, + unoconv, + mktemp, + makeFontsConf, + liberation_ttf_v2, + exiftool, + nix-update-script, +}: +let + fontsConf = makeFontsConf { fontDirectories = [ liberation_ttf_v2 ]; }; + jre' = libreoffice.unwrapped.jdk; + libreoffice' = "${libreoffice}/lib/libreoffice/program/soffice.bin"; + inherit (lib) getExe; +in +buildGoModule rec { + pname = "gotenberg"; + version = "8.8.0"; + + src = fetchFromGitHub { + owner = "gotenberg"; + repo = "gotenberg"; + rev = "refs/tags/v${version}"; + hash = "sha256-OHvtdUFZYm+I8DN8lAdlNAIRLWNRC/GbVEueRfyrwDA="; + }; + + vendorHash = "sha256-w9Q3hK8d5NwDYp8kydrWrlBlOmMyDqDixdv3z79yhK8="; + + postPatch = '' + find ./pkg -name '*_test.go' -exec sed -i -e 's#/tests#${src}#g' {} \; + ''; + + nativeBuildInputs = [ makeBinaryWrapper ]; + + ldflags = [ + "-s" + "-w" + "-X github.com/gotenberg/gotenberg/v8/cmd.Version=${version}" + ]; + + checkInputs = [ + chromium + libreoffice + pdftk + qpdf + unoconv + mktemp + jre' + ]; + + preCheck = '' + export CHROMIUM_BIN_PATH=${getExe chromium} + export PDFTK_BIN_PATH=${getExe pdftk} + export QPDF_BIN_PATH=${getExe qpdf} + export UNOCONVERTER_BIN_PATH=${getExe unoconv} + export EXIFTOOL_BIN_PATH=${getExe exiftool} + # LibreOffice needs all of these set to work properly + export LIBREOFFICE_BIN_PATH=${libreoffice'} + export FONTCONFIG_FILE=${fontsConf} + export HOME=$(mktemp -d) + export JAVA_HOME=${jre'} + ''; + + # These tests fail with a panic, so disable them. + checkFlags = [ "-skip=^TestChromiumBrowser_(screenshot|pdf)$" ]; + + preFixup = '' + wrapProgram $out/bin/gotenberg \ + --set PDFTK_BIN_PATH "${getExe pdftk}" \ + --set QPDF_BIN_PATH "${getExe qpdf}" \ + --set UNOCONVERTER_BIN_PATH "${getExe unoconv}" \ + --set EXIFTOOL_BIN_PATH "${getExe exiftool}" \ + --set JAVA_HOME "${jre'}" + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Converts numerous document formats into PDF files"; + homepage = "https://gotenberg.dev"; + changelog = "https://github.com/gotenberg/gotenberg/releases/tag/v${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ pyrox0 ]; + }; +} From a24fa6098df0116cc89a78ca49712778b304ba32 Mon Sep 17 00:00:00 2001 From: Pyrox Date: Thu, 11 Jul 2024 03:07:40 -0400 Subject: [PATCH 74/77] nixos/gotenberg: init --- .../manual/release-notes/rl-2411.section.md | 2 + nixos/modules/module-list.nix | 1 + nixos/modules/services/misc/gotenberg.nix | 258 ++++++++++++++++++ nixos/tests/all-tests.nix | 1 + nixos/tests/gotenberg.nix | 26 ++ 5 files changed, 288 insertions(+) create mode 100644 nixos/modules/services/misc/gotenberg.nix create mode 100644 nixos/tests/gotenberg.nix diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md index 7e1127ba6cb1..23fe9774237a 100644 --- a/nixos/doc/manual/release-notes/rl-2411.section.md +++ b/nixos/doc/manual/release-notes/rl-2411.section.md @@ -34,6 +34,8 @@ - [realm](https://github.com/zhboner/realm), a simple, high performance relay server written in rust. Available as [services.realm.enable](#opt-services.realm.enable). +- [Gotenberg](https://gotenberg.dev), an API server for converting files to PDFs that can be used alongside Paperless-ngx. Available as [services.gotenberg](options.html#opt-services.gotenberg). + - [Playerctld](https://github.com/altdesktop/playerctl), a daemon to track media player activity. Available as [services.playerctld](option.html#opt-services.playerctld). - [Glance](https://github.com/glanceapp/glance), a self-hosted dashboard that puts all your feeds in one place. Available as [services.glance](option.html#opt-services.glance). diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 3019b23bc870..a2fe394ba607 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -741,6 +741,7 @@ ./services/misc/gitweb.nix ./services/misc/gogs.nix ./services/misc/gollum.nix + ./services/misc/gotenberg.nix ./services/misc/gpsd.nix ./services/misc/graphical-desktop.nix ./services/misc/greenclip.nix diff --git a/nixos/modules/services/misc/gotenberg.nix b/nixos/modules/services/misc/gotenberg.nix new file mode 100644 index 000000000000..57932c656d63 --- /dev/null +++ b/nixos/modules/services/misc/gotenberg.nix @@ -0,0 +1,258 @@ +{ + config, + lib, + pkgs, + ... +}: +let + cfg = config.services.gotenberg; + + args = + [ + "--api-port=${toString cfg.port}" + "--api-timeout=${cfg.timeout}" + "--api-root-path=${cfg.rootPath}" + "--log-level=${cfg.logLevel}" + "--chromium-max-queue-size=${toString cfg.chromium.maxQueueSize}" + "--libreoffice-restart-after=${toString cfg.libreoffice.restartAfter}" + "--libreoffice-max-queue-size=${toString cfg.libreoffice.maxQueueSize}" + "--pdfengines-engines=${lib.concatStringsSep "," cfg.pdfEngines}" + ] + ++ optional cfg.enableBasicAuth "--api-enable-basic-auth" + ++ optional cfg.chromium.autoStart "--chromium-auto-start" + ++ optional cfg.chromium.disableJavascript "--chromium-disable-javascript" + ++ optional cfg.chromium.disableRoutes "--chromium-disable-routes" + ++ optional cfg.libreoffice.autoStart "--libreoffice-auto-start" + ++ optional cfg.libreoffice.disableRoutes "--libreoffice-disable-routes"; + + inherit (lib) + mkEnableOption + mkPackageOption + mkOption + types + mkIf + optional + optionalAttrs + ; +in +{ + options = { + services.gotenberg = { + enable = mkEnableOption "Gotenberg, a stateless API for PDF files"; + + # Users can override only gotenberg, libreoffice and chromium if they want to (eg. ungoogled-chromium, different LO version, etc) + # Don't allow setting the qpdf, pdftk, or unoconv paths, as those are very stable + # and there's only one version of each. + package = mkPackageOption pkgs "gotenberg" { }; + + port = mkOption { + type = types.port; + default = 3000; + description = "Port on which the API should listen."; + }; + + timeout = mkOption { + type = types.nullOr types.str; + default = "30s"; + description = "Timeout for API requests."; + }; + + rootPath = mkOption { + type = types.str; + default = "/"; + description = "Root path for the Gotenberg API."; + }; + + enableBasicAuth = mkOption { + type = types.bool; + default = false; + description = '' + HTTP Basic Authentication. + + If you set this, be sure to set `GOTENBERG_API_BASIC_AUTH_USERNAME`and `GOTENBERG_API_BASIC_AUTH_PASSWORD` + in your `services.gotenberg.environmentFile` file. + ''; + }; + + extraFontPackages = mkOption { + type = types.listOf types.package; + default = [ ]; + description = "Extra fonts to make available."; + }; + + chromium = { + package = mkPackageOption pkgs "chromium" { }; + + maxQueueSize = mkOption { + type = types.int; + default = 0; + description = "Maximum queue size for chromium-based conversions. Setting to 0 disables the limit."; + }; + + autoStart = mkOption { + type = types.bool; + default = false; + description = "Automatically start chromium when Gotenberg starts. If false, Chromium will start on the first conversion request that uses it."; + }; + + disableJavascript = mkOption { + type = types.bool; + default = false; + description = "Disable Javascript execution."; + }; + + disableRoutes = mkOption { + type = types.bool; + default = false; + description = "Disable all routes allowing Chromium-based conversion."; + }; + }; + + libreoffice = { + package = mkPackageOption pkgs "libreoffice" { }; + + restartAfter = mkOption { + type = types.int; + default = 10; + description = "Restart LibreOffice after this many conversions. Setting to 0 disables this feature."; + }; + + maxQueueSize = mkOption { + type = types.int; + default = 0; + description = "Maximum queue size for LibreOffice-based conversions. Setting to 0 disables the limit."; + }; + + autoStart = mkOption { + type = types.bool; + default = false; + description = "Automatically start LibreOffice when Gotenberg starts. If false, Chromium will start on the first conversion request that uses it."; + }; + + disableRoutes = mkOption { + type = types.bool; + default = false; + description = "Disable all routes allowing LibreOffice-based conversion."; + }; + }; + + pdfEngines = mkOption { + type = types.listOf ( + types.enum [ + "pdftk" + "qpdf" + "libreoffice-pdfengine" + "exiftool" + "pdfcpu" + ] + ); + default = [ + "pdftk" + "qpdf" + "libreoffice-pdfengine" + "exiftool" + "pdfcpu" + ]; + description = '' + PDF engines to enable. Each one can be used to perform a specific task. + See [the documentation](https://gotenberg.dev/docs/configuration#pdf-engines) for more details. + Defaults to all possible PDF engines. + ''; + }; + + logLevel = mkOption { + type = types.enum [ + "error" + "warn" + "info" + "debug" + ]; + default = "info"; + description = "The logging level for Gotenberg."; + }; + + environmentFile = mkOption { + type = types.nullOr types.path; + default = null; + description = "Environment file to load extra environment variables from."; + }; + + extraArgs = mkOption { + type = types.listOf types.str; + default = [ ]; + description = "Any extra command-line flags to pass to the Gotenberg service."; + }; + }; + }; + + config = mkIf cfg.enable { + assertions = [ + { + assertion = cfg.enableBasicAuth -> cfg.environmentFile != null; + message = '' + When enabling HTTP Basic Authentication with `services.gotenberg.enableBasicAuth`, + you must provide an environment file via `services.gotenberg.environmentFile` with the appropriate environment variables set in it. + + See `services.gotenberg.enableBasicAuth` for the names of those variables. + ''; + } + ]; + + systemd.services.gotenberg = { + description = "Gotenberg API server"; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + path = [ cfg.package ]; + environment = { + LIBREOFFICE_BIN_PATH = "${cfg.libreoffice.package}/lib/libreoffice/program/soffice.bin"; + CHROMIUM_BIN_PATH = lib.getExe cfg.chromium.package; + FONTCONFIG_FILE = pkgs.makeFontsConf { + fontDirectories = [ pkgs.liberation_ttf_v2 ] ++ cfg.extraFontPackages; + }; + }; + serviceConfig = { + Type = "simple"; + DynamicUser = true; + ExecStart = "${lib.getExe cfg.package} ${lib.escapeShellArgs args}"; + + # Hardening options + PrivateDevices = true; + PrivateIPC = true; + PrivateUsers = true; + + ProtectClock = true; + ProtectControlGroups = true; + ProtectHome = true; + ProtectHostname = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + ProtectProc = "invisible"; + ProcSubset = "pid"; + + RestrictAddressFamilies = [ + "AF_UNIX" + "AF_INET" + "AF_INET6" + "AF_NETLINK" + ]; + RestrictNamespaces = true; + RestrictRealtime = true; + + LockPersonality = true; + MemoryDenyWriteExecute = true; + + SystemCallFilter = [ + "@system-service" + "~@resources" + "~@privileged" + ]; + SystemCallArchitectures = "native"; + + UMask = 77; + } // optionalAttrs (cfg.environmentFile != null) { EnvironmentFile = cfg.environmentFile; }; + }; + }; + + meta.maintainers = with lib.maintainers; [ pyrox0 ]; +} diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index c22c3e961d08..466a8e2dc21b 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -381,6 +381,7 @@ in { gonic = handleTest ./gonic.nix {}; google-oslogin = handleTest ./google-oslogin {}; goss = handleTest ./goss.nix {}; + gotenberg = handleTest ./gotenberg.nix {}; gotify-server = handleTest ./gotify-server.nix {}; gotosocial = runTest ./web-apps/gotosocial.nix; grafana = handleTest ./grafana {}; diff --git a/nixos/tests/gotenberg.nix b/nixos/tests/gotenberg.nix new file mode 100644 index 000000000000..aa39b2d349d7 --- /dev/null +++ b/nixos/tests/gotenberg.nix @@ -0,0 +1,26 @@ +import ./make-test-python.nix ( + { lib, ... }: + + { + name = "gotenberg"; + meta.maintainers = with lib.maintainers; [ pyrox0 ]; + + nodes.machine = { + services.gotenberg = { + enable = true; + }; + }; + + testScript = '' + start_all() + + machine.wait_for_unit("gotenberg.service") + + # Gotenberg startup + machine.wait_for_open_port(3000) + + # Ensure healthcheck endpoint succeeds + machine.succeed("curl http://localhost:3000/health") + ''; + } +) From bab3c1953da3ba314444824d8a18ff69dbd288dc Mon Sep 17 00:00:00 2001 From: confusedalex Date: Wed, 17 Jul 2024 11:40:02 +0200 Subject: [PATCH 75/77] talecast: init at 0.1.39 (#321113) Co-authored-by: Sandro --- maintainers/maintainer-list.nix | 6 ++++ pkgs/by-name/ta/talecast/package.nix | 42 ++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+) create mode 100644 pkgs/by-name/ta/talecast/package.nix diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index b152198f3f12..c58880d779b3 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3986,6 +3986,12 @@ githubId = 11145016; name = "J.C."; }; + confusedalex = { + email = "alex@confusedalex.dev"; + github = "ConfusedAlex"; + githubId = 29258035; + name = "Alexander Loll"; + }; congee = { email = "changshengwu@pm.me"; matrix = "@congeec:matrix.org"; diff --git a/pkgs/by-name/ta/talecast/package.nix b/pkgs/by-name/ta/talecast/package.nix new file mode 100644 index 000000000000..df0f994d5144 --- /dev/null +++ b/pkgs/by-name/ta/talecast/package.nix @@ -0,0 +1,42 @@ +{ + lib, + fetchCrate, + darwin, + rustPlatform, + pkg-config, + openssl, + nix-update-script, + stdenv, + testers, + talecast +}: + +rustPlatform.buildRustPackage rec { + pname = "talecast"; + version = "0.1.39"; + + src = fetchCrate { + inherit pname version; + hash = "sha256-RwB+X+i3CEcTyKac81he9/cT2aQ4M7AqgqSDBEvhFJU="; + }; + + cargoHash = "sha256-mIzrYlAqHYrK2bb/ZUzqIwhPJKcTQpNpqijpEuwLc5A="; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ openssl ] + ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration ]; + + passthru = { + updateScript = nix-update-script { }; + tests.version = testers.testVersion { package = talecast; }; + }; + + meta = { + description = "Simple CLI podcatcher"; + homepage = "https://github.com/TBS1996/TaleCast"; + license = lib.licenses.mit; + mainProgram = "talecast"; + maintainers = with lib.maintainers; [ confusedalex getchoo ]; + }; +} From 74535e9a5c057f4f4d85310657904627bc821c1b Mon Sep 17 00:00:00 2001 From: Ashish Date: Wed, 17 Jul 2024 11:40:36 +0200 Subject: [PATCH 76/77] vaultwarden.webvault: unbreak on aarch64 (#327019) --- pkgs/tools/security/vaultwarden/webvault.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/vaultwarden/webvault.nix b/pkgs/tools/security/vaultwarden/webvault.nix index f9b0915d3ff6..d777fd70006b 100644 --- a/pkgs/tools/security/vaultwarden/webvault.nix +++ b/pkgs/tools/security/vaultwarden/webvault.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , git , nixosTests -, python3 +, python311 , vaultwarden }: @@ -37,7 +37,8 @@ in buildNpmPackage rec { ''; nativeBuildInputs = [ - python3 + # signalr through gyp wants to import distutils + python311 ]; makeCacheWritable = true; From b711d944bd16764739487a5225e4a21c0529400c Mon Sep 17 00:00:00 2001 From: jasper-at-windswept Date: Wed, 17 Jul 2024 19:47:30 +1000 Subject: [PATCH 77/77] fix: restore xorgserver dep to herbstluftwm --- pkgs/applications/window-managers/herbstluftwm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/window-managers/herbstluftwm/default.nix b/pkgs/applications/window-managers/herbstluftwm/default.nix index a67588fea1fd..825ae0de85e4 100644 --- a/pkgs/applications/window-managers/herbstluftwm/default.nix +++ b/pkgs/applications/window-managers/herbstluftwm/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, cmake, pkg-config, python3, libX11, libXext, libXinerama, libXrandr, libXft, libXrender, libXdmcp, libXfixes, freetype, asciidoc -, xdotool, xorg, xsetroot, xterm, runtimeShell +, xdotool, xorgserver, xsetroot, xterm, runtimeShell , fetchpatch , nixosTests }: @@ -78,7 +78,7 @@ stdenv.mkDerivation rec { nativeCheckInputs = [ (python3.withPackages (ps: with ps; [ ewmh pytest xlib ])) xdotool - xorg.xvfb + xorgserver xsetroot xterm python3.pkgs.pytestCheckHook