diff --git a/ci/OWNERS b/ci/OWNERS index fa76f045c29b..ea52e0dd9386 100644 --- a/ci/OWNERS +++ b/ci/OWNERS @@ -400,9 +400,9 @@ pkgs/development/python-modules/buildcatrust/ @ajs124 @lukegb @mweinelt /pkgs/applications/blockchains @mmahut @RaghavSood # Go -/doc/languages-frameworks/go.section.md @kalbasit @katexochen @Mic92 @zowoq -/pkgs/build-support/go @kalbasit @katexochen @Mic92 @zowoq -/pkgs/development/compilers/go @kalbasit @katexochen @Mic92 @zowoq +/doc/languages-frameworks/go.section.md @kalbasit @katexochen @Mic92 +/pkgs/build-support/go @kalbasit @katexochen @Mic92 +/pkgs/development/compilers/go @kalbasit @katexochen @Mic92 # GNOME /pkgs/desktops/gnome @jtojnar diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index f0a06a71c1e7..15f498c1b4b7 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -8719,6 +8719,7 @@ }; FlameFlag = { name = "FlameFlag"; + email = "github@flameflag.dev"; github = "FlameFlag"; githubId = 57304299; matrix = "@donteatoreo:matrix.org"; @@ -20393,11 +20394,6 @@ github = "peat-psuwit"; githubId = 6771175; }; - pedohorse = { - github = "permahorse"; - githubId = 13556996; - name = "pedohorse"; - }; pedrohlc = { email = "root@pedrohlc.com"; github = "PedroHLC"; @@ -20447,6 +20443,11 @@ github = "peret"; githubId = 617977; }; + permahorse = { + github = "permahorse"; + githubId = 13556996; + name = "permahorse"; + }; perstark = { email = "perstark.se@gmail.com"; github = "perstarkse"; diff --git a/nixos/modules/services/databases/lldap.nix b/nixos/modules/services/databases/lldap.nix index 1680965573c9..df27b404ba0f 100644 --- a/nixos/modules/services/databases/lldap.nix +++ b/nixos/modules/services/databases/lldap.nix @@ -8,6 +8,10 @@ let cfg = config.services.lldap; format = pkgs.formats.toml { }; + dbName = "lldap"; + dbUser = "lldap"; + localPostgresql = cfg.database.createLocally && cfg.database.type == "postgresql"; + localMysql = cfg.database.createLocally && cfg.database.type == "mariadb"; in { options.services.lldap = with lib; { @@ -36,6 +40,25 @@ in ''; }; + database = { + createLocally = mkOption { + type = types.bool; + default = true; + description = "Create the database and database user locally."; + }; + + type = mkOption { + type = types.enum [ + "mariadb" + "postgresql" + "sqlite" + ]; + example = "postgresql"; + default = "sqlite"; + description = "Database engine to use."; + }; + }; + settings = mkOption { description = '' Free-form settings written directly to the `lldap_config.toml` file. @@ -96,9 +119,20 @@ in }; database_url = mkOption { - type = types.str; + type = types.nullOr types.str; + default = null; + defaultText = lib.literalExpression '' + if config.services.lldap.database.createLocally + then + if cfg.database.type == "sqlite" + then "sqlite://./users.db?mode=rwc" + else if cfg.database.type == "postgresql" + then "postgresql:///lldap?host=/run/postgresql" + else if cfg.database.type == "mariadb" + then "mysql://lldap@localhost/lldap?socket=/run/mysqld/mysqld.sock" + else null + ''; description = "Database URL."; - default = "sqlite://./users.db?mode=rwc"; example = "postgres://postgres-user:password@postgres-server/my-database"; }; @@ -188,7 +222,7 @@ in ]; warnings = - lib.optionals (cfg.settings.ldap_user_pass or null != null) [ + lib.optionals ((cfg.settings.ldap_user_pass or null) != null) [ '' lldap: Unsecure `ldap_user_pass` setting is used. Prefer `ldap_user_pass_file` instead. '' @@ -205,10 +239,29 @@ in '' ]; + services.lldap.settings.database_url = lib.mkIf cfg.database.createLocally ( + lib.mkDefault ( + if cfg.database.type == "sqlite" then + "sqlite://./users.db?mode=rwc" + else if cfg.database.type == "postgresql" then + "postgresql:///${dbName}?host=/run/postgresql" + else if cfg.database.type == "mariadb" then + "mysql://${dbUser}@localhost/${dbName}?socket=/run/mysqld/mysqld.sock" + else + null + ) + ); + systemd.services.lldap = { description = "Lightweight LDAP server (lldap)"; wants = [ "network-online.target" ]; - after = [ "network-online.target" ]; + after = [ + "network-online.target" + ] + ++ lib.optional localPostgresql "postgresql.target" + ++ lib.optional localMysql "mysql.service"; + requires = + lib.optional localPostgresql "postgresql.target" ++ lib.optional localMysql "mysql.service"; wantedBy = [ "multi-user.target" ]; # lldap defaults to a hardcoded `jwt_secret` value if none is provided, which is bad, because # an attacker could create a valid admin jwt access token fairly trivially. @@ -238,5 +291,30 @@ in }; inherit (cfg) environment; }; + + services.postgresql = lib.mkIf localPostgresql { + enable = true; + ensureDatabases = [ dbName ]; + ensureUsers = [ + { + name = dbUser; + ensureDBOwnership = true; + } + ]; + }; + + services.mysql = lib.mkIf localMysql { + enable = true; + package = lib.mkDefault pkgs.mariadb; + ensureDatabases = [ dbName ]; + ensureUsers = [ + { + name = dbUser; + ensurePermissions = { + "${dbName}.*" = "ALL PRIVILEGES"; + }; + } + ]; + }; }; } diff --git a/pkgs/applications/editors/jetbrains/ides/datagrip.nix b/pkgs/applications/editors/jetbrains/ides/datagrip.nix index cf93cea8a260..8a20707fc429 100644 --- a/pkgs/applications/editors/jetbrains/ides/datagrip.nix +++ b/pkgs/applications/editors/jetbrains/ides/datagrip.nix @@ -12,20 +12,20 @@ let # update-script-start: urls urls = { x86_64-linux = { - url = "https://download.jetbrains.com/datagrip/datagrip-2025.3.3.tar.gz"; - hash = "sha256-cV0shZxezpvllsM4aUJPLw+PzvSxqy44F5WE10VA764="; + url = "https://download.jetbrains.com/datagrip/datagrip-2025.3.4.tar.gz"; + hash = "sha256-8sR4C+a1FsngYTRnjgHKzZpmGQY2ury2Ynp3zQ3U9nk="; }; aarch64-linux = { - url = "https://download.jetbrains.com/datagrip/datagrip-2025.3.3-aarch64.tar.gz"; - hash = "sha256-MWqkJiZ7ElSPLv0BT1dcszFbbZOr2Ub7gRrN2bUG1BY="; + url = "https://download.jetbrains.com/datagrip/datagrip-2025.3.4-aarch64.tar.gz"; + hash = "sha256-FRZP/2a7yBL7NdikAoc2StRLsgjI+qADtHPfkQFdwxI="; }; x86_64-darwin = { - url = "https://download.jetbrains.com/datagrip/datagrip-2025.3.3.dmg"; - hash = "sha256-JQfAVG4N2UFlQtyWF2GjHzozwOPGi6elInOSQyBf7js="; + url = "https://download.jetbrains.com/datagrip/datagrip-2025.3.4.dmg"; + hash = "sha256-E3i7bxnOeHP38LGY+Dw0rlpKn4ps4iyHY23L+qzCIjc="; }; aarch64-darwin = { - url = "https://download.jetbrains.com/datagrip/datagrip-2025.3.3-aarch64.dmg"; - hash = "sha256-QwPJLy4Hv0FJErVTUDirG1iDn8noMlnyk4Zmk0uqZnQ="; + url = "https://download.jetbrains.com/datagrip/datagrip-2025.3.4-aarch64.dmg"; + hash = "sha256-OmfIeVJ69HWBdsfI9sXnWUgDIWbp9EbdOsDXdL3/taM="; }; }; # update-script-end: urls @@ -39,8 +39,8 @@ mkJetBrainsProduct { product = "DataGrip"; # update-script-start: version - version = "2025.3.3"; - buildNumber = "253.29346.270"; + version = "2025.3.4"; + buildNumber = "253.30387.92"; # update-script-end: version src = fetchurl (urls.${system} or (throw "Unsupported system: ${system}")); diff --git a/pkgs/applications/editors/jetbrains/ides/idea.nix b/pkgs/applications/editors/jetbrains/ides/idea.nix index bde01070d5a7..793ca3dac294 100644 --- a/pkgs/applications/editors/jetbrains/ides/idea.nix +++ b/pkgs/applications/editors/jetbrains/ides/idea.nix @@ -15,20 +15,20 @@ let # update-script-start: urls urls = { x86_64-linux = { - url = "https://download.jetbrains.com/idea/ideaIU-2025.3.1.1.tar.gz"; - hash = "sha256-OgZLIpYfPzm4ZrZLYoVY4ND3CNQjo/lWXUPw6BGWmXs="; + url = "https://download.jetbrains.com/idea/ideaIU-2025.3.2.tar.gz"; + hash = "sha256-o0QsnxlTxm3LCCXpt4jH5077WG7b8dMO+LDfVT/hNuQ="; }; aarch64-linux = { - url = "https://download.jetbrains.com/idea/ideaIU-2025.3.1.1-aarch64.tar.gz"; - hash = "sha256-h1FtLwe47B/2z+nRTWj8P3b11XuGYRMlueq6wbYEPMs="; + url = "https://download.jetbrains.com/idea/ideaIU-2025.3.2-aarch64.tar.gz"; + hash = "sha256-yu8YsKgqaxCEHozq0Ar8DEbuBUDwsWelPZwG7ZI3JiE="; }; x86_64-darwin = { - url = "https://download.jetbrains.com/idea/ideaIU-2025.3.1.1.dmg"; - hash = "sha256-XMaynB2VjtB3xUSobmNGT7//HWkIcinZbwvIEn9Kdqo="; + url = "https://download.jetbrains.com/idea/ideaIU-2025.3.2.dmg"; + hash = "sha256-624WPcLwXqP/WsUss+6Upo1W7E504S/+BvtJcjTD9uY="; }; aarch64-darwin = { - url = "https://download.jetbrains.com/idea/ideaIU-2025.3.1.1-aarch64.dmg"; - hash = "sha256-e9pi80XBGJL/lAaCu1nmDu5AZ0uy8s3GIEsuGyrTjfg="; + url = "https://download.jetbrains.com/idea/ideaIU-2025.3.2-aarch64.dmg"; + hash = "sha256-uaBXwFX6fd5Aa7+YB/yis2fwwdR3cd9qwGigf/23bsk="; }; }; # update-script-end: urls @@ -43,8 +43,8 @@ mkJetBrainsProduct { productShort = "IDEA"; # update-script-start: version - version = "2025.3.1.1"; - buildNumber = "253.29346.240"; + version = "2025.3.2"; + buildNumber = "253.30387.90"; # update-script-end: version src = fetchurl (urls.${system} or (throw "Unsupported system: ${system}")); diff --git a/pkgs/applications/editors/jetbrains/ides/phpstorm.nix b/pkgs/applications/editors/jetbrains/ides/phpstorm.nix index a121ce982e89..83bc8dd4da89 100644 --- a/pkgs/applications/editors/jetbrains/ides/phpstorm.nix +++ b/pkgs/applications/editors/jetbrains/ides/phpstorm.nix @@ -12,20 +12,20 @@ let # update-script-start: urls urls = { x86_64-linux = { - url = "https://download.jetbrains.com/webide/PhpStorm-2025.3.1.1.tar.gz"; - hash = "sha256-u5b/elgB4/kMrgkgyqhz4L2BZqsNqt6Fwb+JIC1eSEk="; + url = "https://download.jetbrains.com/webide/PhpStorm-2025.3.2.tar.gz"; + hash = "sha256-W9O2DYzJAEtgFb79xYGMUNvi8yMmH+oRhNeoKyHtYO8="; }; aarch64-linux = { - url = "https://download.jetbrains.com/webide/PhpStorm-2025.3.1.1-aarch64.tar.gz"; - hash = "sha256-iHIsnxTpuunA/L8/ZQsbQCqEfIu2lvtNNq9V0yPvBvY="; + url = "https://download.jetbrains.com/webide/PhpStorm-2025.3.2-aarch64.tar.gz"; + hash = "sha256-YiDHheT9ZbmE75WLd0+/VLa1d+WHzXCcGDkWM0LOj/g="; }; x86_64-darwin = { - url = "https://download.jetbrains.com/webide/PhpStorm-2025.3.1.1.dmg"; - hash = "sha256-L4brbVVJgRgv/A2yu3oDGycWX6z5IiDf/7Zd/W2V2tk="; + url = "https://download.jetbrains.com/webide/PhpStorm-2025.3.2.dmg"; + hash = "sha256-sNfPhCnJXS3IYPuDMLjptvm05zzHFdsJkLBbht7oiXg="; }; aarch64-darwin = { - url = "https://download.jetbrains.com/webide/PhpStorm-2025.3.1.1-aarch64.dmg"; - hash = "sha256-I1j18NK10Vda4F2VOIm3mvjqUvhFMc7OYq1NpyRG+bw="; + url = "https://download.jetbrains.com/webide/PhpStorm-2025.3.2-aarch64.dmg"; + hash = "sha256-1zNcdCtb6BwtFMaDoZLVwXaS1xD8HXbBa2Jd5wSMsI4="; }; }; # update-script-end: urls @@ -39,8 +39,8 @@ mkJetBrainsProduct { product = "PhpStorm"; # update-script-start: version - version = "2025.3.1.1"; - buildNumber = "253.29346.257"; + version = "2025.3.2"; + buildNumber = "253.30387.85"; # update-script-end: version src = fetchurl (urls.${system} or (throw "Unsupported system: ${system}")); diff --git a/pkgs/applications/editors/jetbrains/ides/ruby-mine.nix b/pkgs/applications/editors/jetbrains/ides/ruby-mine.nix index 9390faf324f4..fd86ffd90498 100644 --- a/pkgs/applications/editors/jetbrains/ides/ruby-mine.nix +++ b/pkgs/applications/editors/jetbrains/ides/ruby-mine.nix @@ -12,20 +12,20 @@ let # update-script-start: urls urls = { x86_64-linux = { - url = "https://download.jetbrains.com/ruby/RubyMine-2025.3.1.1.tar.gz"; - hash = "sha256-dVd/4LBssEsuzEB+RX44RCrlXfNOyYkRPe3SvOD+N20="; + url = "https://download.jetbrains.com/ruby/RubyMine-2025.3.2.tar.gz"; + hash = "sha256-CUiJ/TRFOpcXSp1JhqpFQQvo0baOLmy2GRaWlDx1uQU="; }; aarch64-linux = { - url = "https://download.jetbrains.com/ruby/RubyMine-2025.3.1.1-aarch64.tar.gz"; - hash = "sha256-FNco8STJ+HEmcfZFpFiDzM0QYQPxchmPizAPqYHiYWo="; + url = "https://download.jetbrains.com/ruby/RubyMine-2025.3.2-aarch64.tar.gz"; + hash = "sha256-mR+3C4UBBlVeL/wO0uLNTv8U5HAHl7huVNyvNDFPRAw="; }; x86_64-darwin = { - url = "https://download.jetbrains.com/ruby/RubyMine-2025.3.1.1.dmg"; - hash = "sha256-FWHsKzpmvr3CHCcB5nhHKq9NRWVP+IyPGuk2lunLDKU="; + url = "https://download.jetbrains.com/ruby/RubyMine-2025.3.2.dmg"; + hash = "sha256-bhK9MPiMN8zSEgg2UFAEAoXLJE0yBd/+VnGCCd25mtg="; }; aarch64-darwin = { - url = "https://download.jetbrains.com/ruby/RubyMine-2025.3.1.1-aarch64.dmg"; - hash = "sha256-K66IoMXqfs1frfo+gUCKQrp9pIm2iFyLNdFFNkHPYPc="; + url = "https://download.jetbrains.com/ruby/RubyMine-2025.3.2-aarch64.dmg"; + hash = "sha256-u4XLyBR9p5/k5UZ3ZWB42JxlTqax75logTzJ6Av23Y0="; }; }; # update-script-end: urls @@ -39,8 +39,8 @@ mkJetBrainsProduct { product = "RubyMine"; # update-script-start: version - version = "2025.3.1.1"; - buildNumber = "253.29346.331"; + version = "2025.3.2"; + buildNumber = "253.30387.79"; # update-script-end: version src = fetchurl (urls.${system} or (throw "Unsupported system: ${system}")); diff --git a/pkgs/applications/editors/jetbrains/ides/webstorm.nix b/pkgs/applications/editors/jetbrains/ides/webstorm.nix index 0d3f853b7398..cd587abe75b6 100644 --- a/pkgs/applications/editors/jetbrains/ides/webstorm.nix +++ b/pkgs/applications/editors/jetbrains/ides/webstorm.nix @@ -12,20 +12,20 @@ let # update-script-start: urls urls = { x86_64-linux = { - url = "https://download.jetbrains.com/webstorm/WebStorm-2025.3.1.1.tar.gz"; - hash = "sha256-1VFBGjpKgpseFMh06RdpYbYLNehM1sLJlnarhZShmVM="; + url = "https://download.jetbrains.com/webstorm/WebStorm-2025.3.2.tar.gz"; + hash = "sha256-qkDuuP8QU+Ptcafw12LFD2n4s6tClg40uHVqZx2+hII="; }; aarch64-linux = { - url = "https://download.jetbrains.com/webstorm/WebStorm-2025.3.1.1-aarch64.tar.gz"; - hash = "sha256-Pv4nLusRtX0FXo+vWH+rwFFAgQSLvL1GeX/zasC2yQ8="; + url = "https://download.jetbrains.com/webstorm/WebStorm-2025.3.2-aarch64.tar.gz"; + hash = "sha256-k8FX/hn+U8XppVopB/ArvupH4CH+5cJlbBtjSaIarLA="; }; x86_64-darwin = { - url = "https://download.jetbrains.com/webstorm/WebStorm-2025.3.1.1.dmg"; - hash = "sha256-98Io2xHGc3lVg2DQRh0fBVYyDUoJb/3zPuk2A7nd0xw="; + url = "https://download.jetbrains.com/webstorm/WebStorm-2025.3.2.dmg"; + hash = "sha256-GsOQE3NLqIifQ9mXWRT0M7hJeN+fdzSqn7pwjWf8Vcw="; }; aarch64-darwin = { - url = "https://download.jetbrains.com/webstorm/WebStorm-2025.3.1.1-aarch64.dmg"; - hash = "sha256-dUi9xEMqK+4ycOPrMQoJMODAyGniT6oIAbdtqCa/XoQ="; + url = "https://download.jetbrains.com/webstorm/WebStorm-2025.3.2-aarch64.dmg"; + hash = "sha256-Pc3+hlKpCIOgJLxWMOn0Uw+7cIzLD4iayaNsWYoB4mo="; }; }; # update-script-end: urls @@ -39,8 +39,8 @@ mkJetBrainsProduct { product = "WebStorm"; # update-script-start: version - version = "2025.3.1.1"; - buildNumber = "253.29346.242"; + version = "2025.3.2"; + buildNumber = "253.30387.83"; # update-script-end: version src = fetchurl (urls.${system} or (throw "Unsupported system: ${system}")); diff --git a/pkgs/by-name/ba/babl/package.nix b/pkgs/by-name/ba/babl/package.nix index 3454630b2dd1..8ef897e1b7c1 100644 --- a/pkgs/by-name/ba/babl/package.nix +++ b/pkgs/by-name/ba/babl/package.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "babl"; - version = "0.1.120"; + version = "0.1.122"; outputs = [ "out" @@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "https://download.gimp.org/pub/babl/${lib.versions.majorMinor finalAttrs.version}/babl-${finalAttrs.version}.tar.xz"; - hash = "sha256-9HatFSAftO0MkMF0xSSx5CcczWmjdyQtamn834fOrMI="; + hash = "sha256-aFH3Bc2jjy3wikuoYYJ5zjDQpG+Vf+aqMlt7feKXvtI="; }; patches = [ diff --git a/pkgs/by-name/co/code/package.nix b/pkgs/by-name/co/code/package.nix index a7f97ea4b1cc..c3e4175e5919 100644 --- a/pkgs/by-name/co/code/package.nix +++ b/pkgs/by-name/co/code/package.nix @@ -11,13 +11,13 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "code"; - version = "0.6.49"; + version = "0.6.53"; src = fetchFromGitHub { owner = "just-every"; repo = "code"; tag = "v${finalAttrs.version}"; - hash = "sha256-iklIQPs44SjJlQq+qkuyuCQLfv+xcmvmBDSIweFsSTs="; + hash = "sha256-lKe6OKIrf1k8sJpWIEippbvwamTWLe0uP1KOg7UsY6A="; }; sourceRoot = "${finalAttrs.src.name}/code-rs"; diff --git a/pkgs/by-name/ea/eask-cli/package.nix b/pkgs/by-name/ea/eask-cli/package.nix index eb0cde010adc..5f10b0900c75 100644 --- a/pkgs/by-name/ea/eask-cli/package.nix +++ b/pkgs/by-name/ea/eask-cli/package.nix @@ -6,16 +6,16 @@ buildNpmPackage rec { pname = "eask-cli"; - version = "0.12.2"; + version = "0.12.4"; src = fetchFromGitHub { owner = "emacs-eask"; repo = "cli"; rev = version; - hash = "sha256-n2NL8B6hxQLB8xdRWzclVlqp3B4K7VxgdQ3zgFC1YyI="; + hash = "sha256-0pSOPz+wSz6DhbO/dGj7AOfBm0Cyj530Xqu1PRTPRjU="; }; - npmDepsHash = "sha256-kHi/8kPTk9hg5NI4u0b+k9OoocHLX2rY3diXt9WMlRo="; + npmDepsHash = "sha256-NhfpqoImRQaELiKO8hTAc1KCeaVWUtckcBG8SfYpzaM="; dontBuild = true; diff --git a/pkgs/by-name/gr/greenbone-feed-sync/package.nix b/pkgs/by-name/gr/greenbone-feed-sync/package.nix new file mode 100644 index 000000000000..44fd72a61297 --- /dev/null +++ b/pkgs/by-name/gr/greenbone-feed-sync/package.nix @@ -0,0 +1,43 @@ +{ + lib, + python3, + fetchFromGitHub, + pkgs, +}: + +python3.pkgs.buildPythonApplication (finalAttrs: { + pname = "greenbone-feed-sync"; + version = "25.2.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "greenbone"; + repo = "greenbone-feed-sync"; + tag = "v${finalAttrs.version}"; + hash = "sha256-lpbbAODk/uLg1nbSPj9Ico5/8klM5Fm5tyXeRQao7N8="; + }; + + build-system = with python3.pkgs; [ poetry-core ]; + + dependencies = with python3.pkgs; [ + rich + shtab + ]; + + nativeCheckInputs = with python3.pkgs; [ + pkgs.rsync + pontos + pytestCheckHook + ]; + + pythonImportsCheck = [ "greenbone.feed.sync" ]; + + meta = { + description = "Tool for downloading the Greenbone Community Feed"; + homepage = "https://github.com/greenbone/greenbone-feed-sync"; + changelog = "https://github.com/greenbone/greenbone-feed-sync/releases/tag/${finalAttrs.src.tag}"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ fab ]; + mainProgram = "greenbone-feed-sync"; + }; +}) diff --git a/pkgs/by-name/ho/houdini/package.nix b/pkgs/by-name/ho/houdini/package.nix index 7d74e20b19d3..131f56cf4026 100644 --- a/pkgs/by-name/ho/houdini/package.nix +++ b/pkgs/by-name/ho/houdini/package.nix @@ -126,7 +126,7 @@ buildFHSEnv { maintainers = with lib.maintainers; [ canndrew kwohlfahrt - pedohorse + permahorse ]; }; } diff --git a/pkgs/by-name/ho/houdini/runtime.nix b/pkgs/by-name/ho/houdini/runtime.nix index e8a161b18108..06ed877f8ca7 100644 --- a/pkgs/by-name/ho/houdini/runtime.nix +++ b/pkgs/by-name/ho/houdini/runtime.nix @@ -1,12 +1,12 @@ { requireFile, callPackage }: callPackage ./runtime-build.nix rec { - version = "21.0.440"; + version = "21.0.559"; eulaDate = "2021-10-13"; src = requireFile { name = "houdini-${version}-linux_x86_64_gcc11.2.tar.gz"; - hash = "sha256-qHRR+RRtUgUam6FC1TWTZjg1FSakjLoMYVaiIfO+WOY="; + hash = "sha256-bZmoH1NKQhhMAhIl3pTL7irUZ7HrOhS8R7GApLD5514="; url = "https://www.sidefx.com/download/daily-builds/?production=true"; }; - outputHash = "sha256-SSBiqNZRnxz6tnvusYRi2UASY1k3voiblDpkiu+qU0w="; + outputHash = "sha256-/7ctlMUoyJdPdBQV7rRO9pWcg9bXcnMJsB9TN/Jo8QQ="; } diff --git a/pkgs/by-name/ma/magic-vlsi/package.nix b/pkgs/by-name/ma/magic-vlsi/package.nix index 9595a29433eb..6f15d7f3f5ed 100644 --- a/pkgs/by-name/ma/magic-vlsi/package.nix +++ b/pkgs/by-name/ma/magic-vlsi/package.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "magic-vlsi"; - version = "8.3.573"; + version = "8.3.593"; src = fetchFromGitHub { owner = "RTimothyEdwards"; repo = "magic"; tag = finalAttrs.version; - hash = "sha256-P5qfMsn3DGHjeF7zsZWeG9j38C6j5UEwUqGyjaEVO1E="; + hash = "sha256-5Mh2KUvtBOSab3s/Co/hWjKU4SQmY5UxWfrqqDz3q6c="; leaveDotGit = true; }; diff --git a/pkgs/by-name/mo/mongodb-compass/package.nix b/pkgs/by-name/mo/mongodb-compass/package.nix index cfd62c808d71..43a42ada061f 100644 --- a/pkgs/by-name/mo/mongodb-compass/package.nix +++ b/pkgs/by-name/mo/mongodb-compass/package.nix @@ -52,7 +52,7 @@ let pname = "mongodb-compass"; - version = "1.49.0"; + version = "1.49.1"; selectSystem = attrs: @@ -67,9 +67,9 @@ let } }"; hash = selectSystem { - x86_64-linux = "sha256-XbVgFYkamZWCVcik3Hh0MiuwCHCi2NDKusT/CRO+q0E="; - x86_64-darwin = "sha256-mqnVYJ1wsC1qekEM9CYkZ05DTKHTDUHnoVytm/5QMw4="; - aarch64-darwin = "sha256-fVnW4mygJOgpqIHlO2qjMt9zdQaVBqFLKX4CL31KvXg="; + x86_64-linux = "sha256-6wjwV6KViRJiJiS+Cc3+sjLjKm/K7dGHUHAx9u5Rngk="; + x86_64-darwin = "sha256-v4lxvKMcLabMfshpBD4PqCXcyf/cJz+kn6qKIfLruNc="; + aarch64-darwin = "sha256-7FmRgA+5qHUiozGGlzGM/gWffzcpHwiOY52yGKvH5GY="; }; }; diff --git a/pkgs/by-name/pa/parallel/package.nix b/pkgs/by-name/pa/parallel/package.nix index 91e2943cca97..b381b183221d 100644 --- a/pkgs/by-name/pa/parallel/package.nix +++ b/pkgs/by-name/pa/parallel/package.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "parallel"; - version = "20251222"; + version = "20260122"; src = fetchurl { url = "mirror://gnu/parallel/parallel-${finalAttrs.version}.tar.bz2"; - hash = "sha256-tWtTiNoPLK3/b3DG6eafivlRbrJmWtok00ctWWWSwnU="; + hash = "sha256-OmLPeawkiLQed4HVT/H9qhxSa3Lgl90efWLverudbDs="; }; outputs = [ diff --git a/pkgs/by-name/se/search-vulns/package.nix b/pkgs/by-name/se/search-vulns/package.nix index ec0f84ff5f8f..e419934a7a78 100644 --- a/pkgs/by-name/se/search-vulns/package.nix +++ b/pkgs/by-name/se/search-vulns/package.nix @@ -4,16 +4,16 @@ fetchFromGitHub, }: -python3.pkgs.buildPythonApplication rec { +python3.pkgs.buildPythonApplication (finalAttrs: { pname = "search-vulns"; - version = "0.8.4"; + version = "1.0.2"; pyproject = true; src = fetchFromGitHub { owner = "ra1nb0rn"; repo = "search_vulns"; - tag = "v${version}"; - hash = "sha256-lvFx+ozbw7cYAJvaEFkeFxG+CfvbvDO0VRuNJ/Ub+bA="; + tag = "v${finalAttrs.version}"; + hash = "sha256-xdZq4Er+0CT59Iv0mEcmkZcUM+xbBi/x+TtBNCiyhbY="; fetchSubmodules = true; }; @@ -26,9 +26,11 @@ python3.pkgs.buildPythonApplication rec { aiolimiter cpe-search cvss + pydantic requests tqdm ujson + univers ]; optional-dependencies = with python3.pkgs; { @@ -42,9 +44,11 @@ python3.pkgs.buildPythonApplication rec { gunicorn mariadb markdown + pydantic requests tqdm ujson + univers ]; mariadb = [ mariadb ]; web = [ @@ -63,9 +67,9 @@ python3.pkgs.buildPythonApplication rec { meta = { description = "Search for known vulnerabilities in software using software titles or a CPE 2.3 string"; homepage = "https://github.com/ra1nb0rn/search_vulns"; - changelog = "https://github.com/ra1nb0rn/search_vulns/blob/${src.tag}/CHANGELOG.md"; + changelog = "https://github.com/ra1nb0rn/search_vulns/blob/${finalAttrs.src.tag}/CHANGELOG.md"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; mainProgram = "search_vulns"; }; -} +}) diff --git a/pkgs/by-name/sq/sqruff/package.nix b/pkgs/by-name/sq/sqruff/package.nix index 36a0d95b8f60..1ff6b77ca74e 100644 --- a/pkgs/by-name/sq/sqruff/package.nix +++ b/pkgs/by-name/sq/sqruff/package.nix @@ -8,16 +8,16 @@ }: rustPlatform.buildRustPackage rec { pname = "sqruff"; - version = "0.34.0"; + version = "0.34.1"; src = fetchFromGitHub { owner = "quarylabs"; repo = "sqruff"; tag = "v${version}"; - hash = "sha256-fkk7PB2O657J2ZjDdo40gByleGDiFGbgvfrk4Tk4kQo="; + hash = "sha256-Yk4ejrIs8/8RVvXS2V2ZTBn6zawVO502Xeeb8rjU6e4="; }; - cargoHash = "sha256-4bYoKtvtUtOfwM3X+/+du5zvukWSvS08wmeXRaOG4lA="; + cargoHash = "sha256-4jB1chciQaR/RYhRTfwWOOUIZgePezl8lAngpfoSuJc="; # Disable the `python` feature which doesn't work on Nix yet buildNoDefaultFeatures = true; diff --git a/pkgs/by-name/tr/troubadix/package.nix b/pkgs/by-name/tr/troubadix/package.nix index a4dd0c521764..1515f9a33a35 100644 --- a/pkgs/by-name/tr/troubadix/package.nix +++ b/pkgs/by-name/tr/troubadix/package.nix @@ -5,16 +5,16 @@ python3, }: -python3.pkgs.buildPythonApplication rec { +python3.pkgs.buildPythonApplication (finalAttrs: { pname = "troubadix"; - version = "25.2.4"; + version = "26.1.0"; pyproject = true; src = fetchFromGitHub { owner = "greenbone"; repo = "troubadix"; - tag = "v${version}"; - hash = "sha256-+2G7wlhtoKmjluHsmYb62i+DvWuXlaYw6ktYb77X/LA="; + tag = "v${finalAttrs.version}"; + hash = "sha256-FWauAvySks536KFdU/4X6ru2zr2nwIWzlfOG9OpZ9m4="; }; pythonRelaxDeps = [ @@ -29,6 +29,7 @@ python3.pkgs.buildPythonApplication rec { charset-normalizer pkgs.codespell gitpython + networkx pontos python-magic validators @@ -55,9 +56,9 @@ python3.pkgs.buildPythonApplication rec { meta = { description = "Linting tool for NASL files"; homepage = "https://github.com/greenbone/troubadix"; - changelog = "https://github.com/greenbone/troubadix/releases/tag/${src.tag}"; + changelog = "https://github.com/greenbone/troubadix/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ fab ]; mainProgram = "troubadix"; }; -} +}) diff --git a/pkgs/by-name/vi/vicinae/package.nix b/pkgs/by-name/vi/vicinae/package.nix index cdd75be3c287..c415ea524d4e 100644 --- a/pkgs/by-name/vi/vicinae/package.nix +++ b/pkgs/by-name/vi/vicinae/package.nix @@ -22,13 +22,13 @@ }: gcc15Stdenv.mkDerivation (finalAttrs: { pname = "vicinae"; - version = "0.18.3"; + version = "0.19.2"; src = fetchFromGitHub { owner = "vicinaehq"; repo = "vicinae"; tag = "v${finalAttrs.version}"; - hash = "sha256-TU8MKOBYgTvYIFI8Col3ePeGntOlux3yYqmbSi7FG70="; + hash = "sha256-YXFSCJ4q1XIom4/CzCy4ASt7RDjxSkIWH6MqrCg+PNY="; }; apiDeps = fetchNpmDeps { @@ -45,6 +45,7 @@ gcc15Stdenv.mkDerivation (finalAttrs: { "VICINAE_GIT_TAG" = "v${finalAttrs.version}"; "VICINAE_PROVENANCE" = "nix"; "INSTALL_NODE_MODULES" = "OFF"; + "INSTALL_BROWSER_NATIVE_HOST" = "OFF"; "USE_SYSTEM_GLAZE" = "ON"; "CMAKE_INSTALL_PREFIX" = placeholder "out"; "CMAKE_INSTALL_DATAROOTDIR" = "share"; diff --git a/pkgs/by-name/wh/whatsapp-emoji-font/package.nix b/pkgs/by-name/wh/whatsapp-emoji-font/package.nix index b39911d45682..877bba8f7c6d 100644 --- a/pkgs/by-name/wh/whatsapp-emoji-font/package.nix +++ b/pkgs/by-name/wh/whatsapp-emoji-font/package.nix @@ -12,13 +12,13 @@ stdenvNoCC.mkDerivation rec { pname = "whatsapp-emoji-linux"; - version = "2.25.9.78-2"; + version = "2.25.9.78-3"; src = fetchFromGitHub { tag = version; owner = "dmlls"; repo = "whatsapp-emoji-linux"; - hash = "sha256-qWI8aSqgwaCMgg97huwICT3Hsgke2Wgj5mQCcUuK6OQ="; + hash = "sha256-IP8zWFttr7Osy8rrTLL0bTrdEMLvTNjuadZ2ksfTViw="; }; makeFlags = [ diff --git a/pkgs/by-name/wo/wooz/package.nix b/pkgs/by-name/wo/wooz/package.nix new file mode 100644 index 000000000000..1e7a5109891b --- /dev/null +++ b/pkgs/by-name/wo/wooz/package.nix @@ -0,0 +1,45 @@ +{ + stdenv, + lib, + fetchFromGitHub, + pkg-config, + meson, + ninja, + wayland, + wayland-protocols, + wayland-scanner, +}: +stdenv.mkDerivation { + pname = "wooz"; + + # Using latest master, until at least https://github.com/negrel/wooz/issues/11 is resolved in some release after 0.1.0 + version = "0-unstable-2025-10-08"; + + src = fetchFromGitHub { + owner = "negrel"; + repo = "wooz"; + rev = "cd8bc6092462d438f6497c016b7e79115c4b4723"; + hash = "sha256-ViAXu/13I4dTHWj7v10XVaOVXkf8682hPYyETzhGFzA="; + }; + + nativeBuildInputs = [ + pkg-config + meson + ninja + wayland-scanner + ]; + + buildInputs = [ + wayland + wayland-protocols + ]; + + meta = { + description = "Zoom / magnifier utility for wayland compositors"; + homepage = "https://github.com/negrel/wooz"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ samuela ]; + platforms = lib.platforms.linux; + mainProgram = "wooz"; + }; +} diff --git a/pkgs/desktops/mate/marco/default.nix b/pkgs/desktops/mate/marco/default.nix index fdfe06118510..276f473c9af0 100644 --- a/pkgs/desktops/mate/marco/default.nix +++ b/pkgs/desktops/mate/marco/default.nix @@ -1,7 +1,10 @@ { lib, stdenv, - fetchurl, + fetchFromGitHub, + autoconf-archive, + autoreconfHook, + mate-common, pkg-config, gettext, itstool, @@ -18,24 +21,31 @@ mate-desktop, mate-settings-daemon, wrapGAppsHook3, + yelp-tools, gitUpdater, }: stdenv.mkDerivation (finalAttrs: { pname = "marco"; - version = "1.28.1"; + version = "1.28.2"; - src = fetchurl { - url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor finalAttrs.version}/marco-${finalAttrs.version}.tar.xz"; - sha256 = "JJbl5A7pgM1oSUk6w+D4/Q3si4HGdNqNm6GaV38KwuE="; + src = fetchFromGitHub { + owner = "mate-desktop"; + repo = "marco"; + tag = "v${finalAttrs.version}"; + hash = "sha256-k45k49mPxy4vmDtCFHaqk0kwZ5wXVAaTj3kanK79n7I="; }; nativeBuildInputs = [ + autoconf-archive + autoreconfHook pkg-config gettext itstool libxml2 # xmllint + mate-common # mate-common.m4 macros wrapGAppsHook3 + yelp-tools ]; buildInputs = [ @@ -62,7 +72,6 @@ stdenv.mkDerivation (finalAttrs: { enableParallelBuilding = true; passthru.updateScript = gitUpdater { - url = "https://git.mate-desktop.org/marco"; odd-unstable = true; rev-prefix = "v"; }; diff --git a/pkgs/desktops/pantheon/apps/switchboard/wrapper.nix b/pkgs/desktops/pantheon/apps/switchboard/wrapper.nix index b4f06ce9cfa3..4d3753946bcc 100644 --- a/pkgs/desktops/pantheon/apps/switchboard/wrapper.nix +++ b/pkgs/desktops/pantheon/apps/switchboard/wrapper.nix @@ -36,6 +36,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ glib + lndir wrapGAppsHook4 ]; @@ -47,11 +48,12 @@ stdenv.mkDerivation { preferLocalBuild = true; allowSubstitutes = false; + strictDeps = true; installPhase = '' mkdir -p $out for i in $(cat $pathsPath); do - ${lndir}/bin/lndir -silent $i $out + lndir -silent $i $out done dbus_file="share/dbus-1/services/io.elementary.settings.service" diff --git a/pkgs/development/python-modules/apiflask/default.nix b/pkgs/development/python-modules/apiflask/default.nix new file mode 100644 index 000000000000..d602fffc52b1 --- /dev/null +++ b/pkgs/development/python-modules/apiflask/default.nix @@ -0,0 +1,72 @@ +{ + lib, + apispec, + asgiref, + buildPythonPackage, + fetchFromGitHub, + flask-httpauth, + flask-marshmallow, + flask-sqlalchemy, + flask, + marshmallow, + marshmallow-dataclass, + openapi-spec-validator, + pydantic, + pytest-cov-stub, + pytestCheckHook, + python-dotenv, + pyyaml, + setuptools, + webargs, +}: + +buildPythonPackage (finalAttrs: { + pname = "apiflask"; + version = "3.0.2"; + pyproject = true; + + src = fetchFromGitHub { + owner = "apiflask"; + repo = "apiflask"; + tag = finalAttrs.version; + hash = "sha256-1nWA2PDgTG++AA0pJeGDiSQyRqLRGfDuzRwfDl8RKl0="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + apispec + flask + flask-httpauth + flask-marshmallow + flask-sqlalchemy + marshmallow + marshmallow-dataclass + pydantic + webargs + ] + ++ pydantic.optional-dependencies.email; + + optional-dependencies = { + async = [ asgiref ]; + dotenv = [ python-dotenv ]; + yaml = [ pyyaml ]; + }; + + nativeCheckInputs = [ + openapi-spec-validator + pytest-cov-stub + pytestCheckHook + ] + ++ lib.flatten (builtins.attrValues finalAttrs.passthru.optional-dependencies); + + pythonImportsCheck = [ "apiflask" ]; + + meta = { + description = "Lightweight Python web API framework"; + homepage = "https://github.com/apiflask/apiflask"; + changelog = "https://github.com/apiflask/apiflask/blob/${finalAttrs.src.tag}/CHANGES.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ fab ]; + }; +}) diff --git a/pkgs/development/python-modules/boto3-stubs/default.nix b/pkgs/development/python-modules/boto3-stubs/default.nix index 3201bf0ab679..eb9e3744008d 100644 --- a/pkgs/development/python-modules/boto3-stubs/default.nix +++ b/pkgs/development/python-modules/boto3-stubs/default.nix @@ -358,13 +358,13 @@ buildPythonPackage (finalAttrs: { pname = "boto3-stubs"; - version = "1.42.35"; + version = "1.42.37"; pyproject = true; src = fetchPypi { pname = "boto3_stubs"; inherit (finalAttrs) version; - hash = "sha256-IKq13uWdTQqVFSvXvlhPqvufa88Ub//zzWBV9x0AbWo="; + hash = "sha256-FiBRmlW7smzr7ZW22PJrqWuOqR2t0F6vw7jxelh+IQg="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/botocore-stubs/default.nix b/pkgs/development/python-modules/botocore-stubs/default.nix index 686d13255e45..9810a2c92361 100644 --- a/pkgs/development/python-modules/botocore-stubs/default.nix +++ b/pkgs/development/python-modules/botocore-stubs/default.nix @@ -9,13 +9,13 @@ buildPythonPackage (finalAttrs: { pname = "botocore-stubs"; - version = "1.42.35"; + version = "1.42.37"; pyproject = true; src = fetchPypi { pname = "botocore_stubs"; inherit (finalAttrs) version; - hash = "sha256-N1z5U09vKjW9LJ5wduiPtJ+31YnFqsEp22qf/BNWHK0="; + hash = "sha256-c1fRh2rhmHV9vgpz+IdEn/3aGOsHXX08wuItNYDcsXw="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/deebot-client/default.nix b/pkgs/development/python-modules/deebot-client/default.nix index 90dc97a34259..e683487ff1ed 100644 --- a/pkgs/development/python-modules/deebot-client/default.nix +++ b/pkgs/development/python-modules/deebot-client/default.nix @@ -20,9 +20,9 @@ xz, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "deebot-client"; - version = "17.0.1"; + version = "17.1.0"; pyproject = true; disabled = pythonOlder "3.13"; @@ -30,19 +30,15 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "DeebotUniverse"; repo = "client.py"; - tag = version; - hash = "sha256-evd0wqID9kEBzhJgRSpcd95ALp9LPSb5RM3wEIKuY0Y="; + tag = finalAttrs.version; + hash = "sha256-0gKjps5KqbicYYyN3VTO9diF11zR1UYsTyIwZG34doI="; }; cargoDeps = rustPlatform.fetchCargoVendor { - inherit pname version src; - hash = "sha256-cLNFUDT74NrBgUL6vGC6lbFy2A2W1jYF7A8H3BQ/s8A="; + inherit (finalAttrs) pname version src; + hash = "sha256-h1iSXoVv9J6u30VCudIhGBuJsWCKUJyXhVaM/5f5NqI="; }; - pythonRelaxDeps = [ - "aiohttp" - ]; - nativeBuildInputs = [ pkg-config rustPlatform.cargoSetupHook @@ -93,8 +89,8 @@ buildPythonPackage rec { meta = { description = "Deebot client library"; homepage = "https://github.com/DeebotUniverse/client.py"; - changelog = "https://github.com/DeebotUniverse/client.py/releases/tag/${version}"; + changelog = "https://github.com/DeebotUniverse/client.py/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ fab ]; }; -} +}) diff --git a/pkgs/development/python-modules/fsspec-xrootd/default.nix b/pkgs/development/python-modules/fsspec-xrootd/default.nix index 87a0f321b45f..05dc71ba7932 100644 --- a/pkgs/development/python-modules/fsspec-xrootd/default.nix +++ b/pkgs/development/python-modules/fsspec-xrootd/default.nix @@ -17,16 +17,16 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "fsspec-xrootd"; - version = "0.5.1"; + version = "0.5.2"; pyproject = true; src = fetchFromGitHub { owner = "CoffeaTeam"; repo = "fsspec-xrootd"; - tag = "v${version}"; - hash = "sha256-Vpe/Gcm6rmehG05h2H7BDZcBQDyie0Ww9X8LgoTgAkE="; + tag = "v${finalAttrs.version}"; + hash = "sha256-UKZO5lgOOfzyOsrDZ2En67Xhm+BKvHELGuvkwSHbolY="; }; build-system = [ @@ -45,8 +45,10 @@ buildPythonPackage rec { pkgs.xrootd pytestCheckHook ]; - disabledTests = [ + # Hangs indefinitely + "test_broken_server" + # Fails (on aarch64-linux) as it runs sleep, touch, stat and makes assumptions about the # scheduler and the filesystem. "test_touch_modified" @@ -58,8 +60,8 @@ buildPythonPackage rec { meta = { description = "XRootD implementation for fsspec"; homepage = "https://github.com/CoffeaTeam/fsspec-xrootd"; - changelog = "https://github.com/CoffeaTeam/fsspec-xrootd/releases/tag/v${version}"; + changelog = "https://github.com/CoffeaTeam/fsspec-xrootd/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ GaetanLepage ]; }; -} +}) diff --git a/pkgs/development/python-modules/iplotx/default.nix b/pkgs/development/python-modules/iplotx/default.nix index 6f69ca7818f2..3f098ef33d2b 100644 --- a/pkgs/development/python-modules/iplotx/default.nix +++ b/pkgs/development/python-modules/iplotx/default.nix @@ -12,16 +12,16 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "iplotx"; - version = "0.9.0"; + version = "1.6.0"; pyproject = true; src = fetchFromGitHub { owner = "fabilab"; repo = "iplotx"; - tag = version; - hash = "sha256-VYqNz6sbLgniNB9DTCbhgno/91Pd7zoGFg2vx68211Q="; + tag = finalAttrs.version; + hash = "sha256-pTSY7eEYKwBSDttxZqauGCofYK5SFaxjJLXYBwSr3ew="; }; build-system = [ hatchling ]; @@ -49,13 +49,18 @@ buildPythonPackage rec { # These tests result in an ImageComparisonFailure "test_complex" "test_complex_rotatelabels" + "test_curved_waypoints" "test_directed_graph" "test_display_shortest_path" "test_labels" "test_labels_and_colors" + "test_vertex_labels" ]; - nativeCheckInputs = [ pytestCheckHook ] ++ lib.concatAttrValues optional-dependencies; + nativeCheckInputs = [ + pytestCheckHook + ] + ++ lib.concatAttrValues finalAttrs.passthru.optional-dependencies; pythonImportsCheck = [ "iplotx" ]; @@ -65,4 +70,4 @@ buildPythonPackage rec { license = lib.licenses.mit; maintainers = with lib.maintainers; [ jboy ]; }; -} +}) diff --git a/pkgs/development/python-modules/llama-index-llms-openai/default.nix b/pkgs/development/python-modules/llama-index-llms-openai/default.nix index 8a7304f57812..310bae8e1652 100644 --- a/pkgs/development/python-modules/llama-index-llms-openai/default.nix +++ b/pkgs/development/python-modules/llama-index-llms-openai/default.nix @@ -9,13 +9,13 @@ buildPythonPackage (finalAttrs: { pname = "llama-index-llms-openai"; - version = "0.6.13"; + version = "0.6.15"; pyproject = true; src = fetchPypi { pname = "llama_index_llms_openai"; inherit (finalAttrs) version; - hash = "sha256-47dCK8ciduAKmA2CZHfQsU1b90O6acSk8L3uD1Il1FA="; + hash = "sha256-W9BZ6kRBLpJ3Q6mLseW4Sy4ZS7OW75WVJ/w6isgLAl0="; }; pythonRemoveDeps = [ diff --git a/pkgs/development/python-modules/marshmallow-dataclass/default.nix b/pkgs/development/python-modules/marshmallow-dataclass/default.nix index 1638fb33e17a..c229ae66d40c 100644 --- a/pkgs/development/python-modules/marshmallow-dataclass/default.nix +++ b/pkgs/development/python-modules/marshmallow-dataclass/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, + fetchpatch, marshmallow, pytestCheckHook, setuptools, @@ -9,7 +10,7 @@ typing-inspect, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "marshmallow-dataclass"; version = "8.7.1"; pyproject = true; @@ -17,10 +18,19 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "lovasoa"; repo = "marshmallow_dataclass"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-0OXP78oyNe/UcI05NHskPyXAuX3dwAW4Uz4dI4b8KV0="; }; + patches = [ + # Fix test_set_only_work_in_hashable_types on Python 3.14, https://github.com/lovasoa/marshmallow_dataclass/pull/286 + (fetchpatch { + name = "fix-test.patch"; + url = "https://github.com/lovasoa/marshmallow_dataclass/commit/9a2ea19924a3cd5fadeb41663bfca64b9c0f75e4.patch"; + hash = "sha256-T2UbZdCj4+HRglMp8w3kU20sUcN6WoSyKiLNr1kSius="; + }) + ]; + build-system = [ setuptools ]; dependencies = [ @@ -48,8 +58,8 @@ buildPythonPackage rec { meta = { description = "Automatic generation of marshmallow schemas from dataclasses"; homepage = "https://github.com/lovasoa/marshmallow_dataclass"; - changelog = "https://github.com/lovasoa/marshmallow_dataclass/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/lovasoa/marshmallow_dataclass/blob/v${finalAttrs.version}/CHANGELOG.md"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; }; -} +}) diff --git a/pkgs/development/python-modules/meteofrance-api/default.nix b/pkgs/development/python-modules/meteofrance-api/default.nix index ed506fc4d49d..b12966185929 100644 --- a/pkgs/development/python-modules/meteofrance-api/default.nix +++ b/pkgs/development/python-modules/meteofrance-api/default.nix @@ -4,24 +4,21 @@ fetchFromGitHub, poetry-core, pytestCheckHook, - pythonOlder, pytz, requests, requests-mock, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "meteofrance-api"; - version = "1.4.0"; + version = "1.5.0"; pyproject = true; - disabled = pythonOlder "3.11"; - src = fetchFromGitHub { owner = "hacf-fr"; repo = "meteofrance-api"; - tag = "v${version}"; - hash = "sha256-5zqmzPbzC9IUZ+y1FRh+u1gds/ZdGeRm5/ajQf8UKTQ="; + tag = "v${finalAttrs.version}"; + hash = "sha256-zvfFMxXbCul14OXaoRdjMWKW3FYyTUcYGklHgb04nvA="; }; build-system = [ poetry-core ]; @@ -57,9 +54,9 @@ buildPythonPackage rec { meta = { description = "Module to access information from the Meteo-France API"; homepage = "https://github.com/hacf-fr/meteofrance-api"; - changelog = "https://github.com/hacf-fr/meteofrance-api/releases/tag/v${version}"; + changelog = "https://github.com/hacf-fr/meteofrance-api/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; mainProgram = "meteofrance-api"; }; -} +}) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index 5d53d8d63497..ed8eabd09a75 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -311,8 +311,8 @@ in "sha256-N9PEmvqI7Yc7AAuDdOj1iePSq7hJTgOmS+4z7GzYd98="; mypy-boto3-cognito-idp = - buildMypyBoto3Package "cognito-idp" "1.42.3" - "sha256-KCVazTb8gIjJokV+jyjpBzcXt6cg3B8i5ogt3iFYlyk="; + buildMypyBoto3Package "cognito-idp" "1.42.37" + "sha256-Njxu5vNc9GPHqBTIvUMQGYxjVSYJrqQMbgd0B2e98pQ="; mypy-boto3-cognito-sync = buildMypyBoto3Package "cognito-sync" "1.42.3" @@ -335,8 +335,8 @@ in "sha256-HQUL0R1NWP6DXQ26iS9k6lIAVdwK899fwLGH4/Z4U8Q="; mypy-boto3-connect = - buildMypyBoto3Package "connect" "1.42.34" - "sha256-gXaO6np/xvtkrzYQUSJ60xUk0tm/R6U5tk6ATXciF8I="; + buildMypyBoto3Package "connect" "1.42.37" + "sha256-LoZkeyFIr8U3OnFc2ay/731aS86kGEPZqwQr9DjTZt0="; mypy-boto3-connect-contact-lens = buildMypyBoto3Package "connect-contact-lens" "1.42.3" @@ -443,8 +443,8 @@ in "sha256-92qhSUqTiLgbtvCdi/Mmgve18mcYR00ABL+bNy7/OnY="; mypy-boto3-ec2 = - buildMypyBoto3Package "ec2" "1.42.35" - "sha256-uiUIfubdYTR0JL4fLLArnL9fHMc35JtpBwud2pW3HEw="; + buildMypyBoto3Package "ec2" "1.42.37" + "sha256-sOFp3vTHqYPI4YE8Gye5r+8zG4ly3xtj0UHncytqobw="; mypy-boto3-ec2-instance-connect = buildMypyBoto3Package "ec2-instance-connect" "1.42.3" @@ -766,8 +766,8 @@ in "sha256-Yb24aPwMfxgh4ftE8k6mCvvJCTuUCxD5J+GElQBMD+U="; mypy-boto3-lambda = - buildMypyBoto3Package "lambda" "1.42.8" - "sha256-Vd6tv68OXxGCN4MahNNfSNxxZM4r9+/ctU9UrvQCVgI="; + buildMypyBoto3Package "lambda" "1.42.37" + "sha256-lPfwcI+bX/pbiz621WS+HvQC67i4zZYEUzK3o7weoOA="; mypy-boto3-lex-models = buildMypyBoto3Package "lex-models" "1.42.3" @@ -854,16 +854,16 @@ in "sha256-1cIpxNx/Q1C89D27DO0PTsFRhZvSok7L1e+B6WjPXvs="; mypy-boto3-mediaconnect = - buildMypyBoto3Package "mediaconnect" "1.42.3" - "sha256-NcDxuCqZqbynRmVPzmCNQpGml6tXBaZzTjlqqnTw+RI="; + buildMypyBoto3Package "mediaconnect" "1.42.37" + "sha256-NYn/N65sVAUxA4kTCi/IJNP/QQeutFjH8S7N2AeK3g8="; mypy-boto3-mediaconvert = - buildMypyBoto3Package "mediaconvert" "1.42.12" - "sha256-aRL46lVNdGu/D0xioGFn/pVUioEiLm8+5XTgUPHqguo="; + buildMypyBoto3Package "mediaconvert" "1.42.37" + "sha256-Z+TiVg/mjr0vTU+awHlS7GCynOeSl+IPl0n9GaLTsYE="; mypy-boto3-medialive = - buildMypyBoto3Package "medialive" "1.42.25" - "sha256-d4fhwg0JmAlApMmQqHw0XwwVEziIlY8JYB5NswQUdUc="; + buildMypyBoto3Package "medialive" "1.42.36" + "sha256-XBfcemUPy5FRouYK1nMgcC8YFLHaZX62PaEpCVW6QI8="; mypy-boto3-mediapackage = buildMypyBoto3Package "mediapackage" "1.42.3" @@ -1158,20 +1158,20 @@ in "sha256-4/Q39UsUYaluauoaLm6BOej+Krl2VbO1xKKo1orRIkI="; mypy-boto3-s3 = - buildMypyBoto3Package "s3" "1.42.21" - "sha256-yrcckYqsfZjE10JUTHIuN9jnF4rLi8iKCurXsQNQJtI="; + buildMypyBoto3Package "s3" "1.42.37" + "sha256-YopGUvcnhwoH4cOFTW8w3FRafdWktxmixZwyqV2S5ME="; mypy-boto3-s3control = - buildMypyBoto3Package "s3control" "1.42.3" - "sha256-mAWbiTGs5SBCIetTF9aD8HxdJO1JixqahOOihqMHsi4="; + buildMypyBoto3Package "s3control" "1.42.37" + "sha256-t4obevidkovfitA/wQXCMJGcvBTKPDOxWqsHUbK0cHk="; mypy-boto3-s3outposts = buildMypyBoto3Package "s3outposts" "1.42.3" "sha256-juVfwdjPDNPaT5tvyXpzDtomugqxeu++AERLkVtFIxw="; mypy-boto3-sagemaker = - buildMypyBoto3Package "sagemaker" "1.42.30" - "sha256-X4wR1GUZ1rFVDoWx5IODmCYaqGEfuN7oTJRqIE7ypqA="; + buildMypyBoto3Package "sagemaker" "1.42.36" + "sha256-fChgTJ4OGgn2eHV8xdKZrYCrgGHZ37s0JTn2MoawxUQ="; mypy-boto3-sagemaker-a2i-runtime = buildMypyBoto3Package "sagemaker-a2i-runtime" "1.42.3" diff --git a/pkgs/development/python-modules/pynetbox/default.nix b/pkgs/development/python-modules/pynetbox/default.nix index 99c041bd444d..9f234c0873f4 100644 --- a/pkgs/development/python-modules/pynetbox/default.nix +++ b/pkgs/development/python-modules/pynetbox/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "pynetbox"; - version = "7.6.0"; + version = "7.6.1"; pyproject = true; src = fetchFromGitHub { owner = "netbox-community"; repo = "pynetbox"; tag = "v${version}"; - hash = "sha256-XflMJ6mrXOeUt+Tlmaa2Tw59M3zssnjgnZ7RoQRdOTQ="; + hash = "sha256-PAWcLJvDrS70Y9pLGtdTbwiEjhOb6yiOPCT34RfnyjU="; }; build-system = [ diff --git a/pkgs/development/python-modules/reolink-aio/default.nix b/pkgs/development/python-modules/reolink-aio/default.nix index 366d8198394e..d70750b38084 100644 --- a/pkgs/development/python-modules/reolink-aio/default.nix +++ b/pkgs/development/python-modules/reolink-aio/default.nix @@ -10,16 +10,16 @@ typing-extensions, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "reolink-aio"; - version = "0.18.0"; + version = "0.18.1"; pyproject = true; src = fetchFromGitHub { owner = "starkillerOG"; repo = "reolink_aio"; - tag = version; - hash = "sha256-a5XeELUtOjBdCPLsfsryGqgJnlDC5nZqCSbpXX6ZjcI="; + tag = finalAttrs.version; + hash = "sha256-j11jB/yO9l2HYbHNFPuGZU1x5sTFnxlXi2lt9J0H7FE="; }; build-system = [ setuptools ]; @@ -40,8 +40,8 @@ buildPythonPackage rec { meta = { description = "Module to interact with the Reolink IP camera API"; homepage = "https://github.com/starkillerOG/reolink_aio"; - changelog = "https://github.com/starkillerOG/reolink_aio/releases/tag/${src.tag}"; + changelog = "https://github.com/starkillerOG/reolink_aio/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; }; -} +}) diff --git a/pkgs/tools/misc/opentelemetry-collector/builder.nix b/pkgs/tools/misc/opentelemetry-collector/builder.nix index db4b6d7e2f1a..d8b3dc1100e9 100644 --- a/pkgs/tools/misc/opentelemetry-collector/builder.nix +++ b/pkgs/tools/misc/opentelemetry-collector/builder.nix @@ -7,17 +7,17 @@ buildGoModule rec { pname = "ocb"; # Also update `pkgs/tools/misc/opentelemetry-collector/releases.nix` # whenever that version changes. - version = "0.142.0"; + version = "0.144.0"; src = fetchFromGitHub { owner = "open-telemetry"; repo = "opentelemetry-collector"; rev = "cmd/builder/v${version}"; - hash = "sha256-WHljFdxRXQyhEdDlwNAGGri2ow0Qf7T046MlIhF4V+E="; + hash = "sha256-u7OVkRmSn0DomwkFByOHSNCmpPaLwQnMumJYKHbqdl0="; }; sourceRoot = "${src.name}/cmd/builder"; - vendorHash = "sha256-DxMnFrqrTgoghA8MeXSl2JOyZ4D9Y83PqUXm9Uofy7c="; + vendorHash = "sha256-W+Ap4JMQTI7g9s668VL1rMj4CErbyczW+nKh5ZW94/Y="; env.CGO_ENABLED = 0; ldflags = [ diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index abd85a81e1d8..c95665f430a5 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -814,6 +814,8 @@ self: super: with self; { apeye-core = callPackage ../development/python-modules/apeye-core { }; + apiflask = callPackage ../development/python-modules/apiflask { }; + apipkg = callPackage ../development/python-modules/apipkg { }; apischema = callPackage ../development/python-modules/apischema { };