diff options
author | Alyssa Ross <hi@alyssa.is> | 2023-08-26 09:19:25 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2023-08-26 09:19:25 +0000 |
commit | 55abc327b49b4097e48c916e40803caa8cf46e8f (patch) | |
tree | 1c0420ab3fb21d9485460b912f1c3eae18781871 /nixpkgs/pkgs/servers | |
parent | 7936cf821dccc1eaade44b852db09d03fae8e5f3 (diff) | |
parent | 18324978d632ffc55ef1d928e81630c620f4f447 (diff) | |
download | nixlib-55abc327b49b4097e48c916e40803caa8cf46e8f.tar nixlib-55abc327b49b4097e48c916e40803caa8cf46e8f.tar.gz nixlib-55abc327b49b4097e48c916e40803caa8cf46e8f.tar.bz2 nixlib-55abc327b49b4097e48c916e40803caa8cf46e8f.tar.lz nixlib-55abc327b49b4097e48c916e40803caa8cf46e8f.tar.xz nixlib-55abc327b49b4097e48c916e40803caa8cf46e8f.tar.zst nixlib-55abc327b49b4097e48c916e40803caa8cf46e8f.zip |
Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs
Conflicts: nixpkgs/pkgs/build-support/go/module.nix
Diffstat (limited to 'nixpkgs/pkgs/servers')
29 files changed, 165 insertions, 70 deletions
diff --git a/nixpkgs/pkgs/servers/amqp/rabbitmq-server/default.nix b/nixpkgs/pkgs/servers/amqp/rabbitmq-server/default.nix index d6ae074ced95..f64183684074 100644 --- a/nixpkgs/pkgs/servers/amqp/rabbitmq-server/default.nix +++ b/nixpkgs/pkgs/servers/amqp/rabbitmq-server/default.nix @@ -38,12 +38,12 @@ in stdenv.mkDerivation rec { pname = "rabbitmq-server"; - version = "3.12.1"; + version = "3.12.3"; # when updating, consider bumping elixir version in all-packages.nix src = fetchurl { url = "https://github.com/rabbitmq/rabbitmq-server/releases/download/v${version}/${pname}-${version}.tar.xz"; - hash = "sha256-n++vqJlRH0C4WdZEswoaJxkuvghbu9MYhBUqFhbhISA="; + hash = "sha256-ZtfybHy6gsLcUz5LGTQrzG/a8x+s6ZkIQsiFC845NC0="; }; nativeBuildInputs = [ unzip xmlto docbook_xml_dtd_45 docbook_xsl zip rsync python3 ]; diff --git a/nixpkgs/pkgs/servers/calibre-web/default.nix b/nixpkgs/pkgs/servers/calibre-web/default.nix index 8ba198873f5a..607ced4606ff 100644 --- a/nixpkgs/pkgs/servers/calibre-web/default.nix +++ b/nixpkgs/pkgs/servers/calibre-web/default.nix @@ -40,7 +40,7 @@ python.pkgs.buildPythonApplication rec { chardet flask-babel flask-login - flask_principal + flask-principal flask-wtf flask-limiter iso-639 diff --git a/nixpkgs/pkgs/servers/clickhouse/default.nix b/nixpkgs/pkgs/servers/clickhouse/default.nix index 4c8435836313..c5d5298a1619 100644 --- a/nixpkgs/pkgs/servers/clickhouse/default.nix +++ b/nixpkgs/pkgs/servers/clickhouse/default.nix @@ -28,7 +28,7 @@ let else llvmPackages.stdenv).mkDerivation; in mkDerivation rec { pname = "clickhouse"; - version = "23.3.8.21"; + version = "23.3.10.5"; src = fetchFromGitHub rec { owner = "ClickHouse"; @@ -36,7 +36,7 @@ in mkDerivation rec { rev = "v${version}-lts"; fetchSubmodules = true; name = "clickhouse-${rev}.tar.gz"; - hash = "sha256-bynr196H6g/GmvNTtrfB6QDdAScvYvbe7EIceoOwCKc="; + hash = "sha256-xvmZOJqXrGToQRoEl+4AL9ewUhNdKGZFnCdBnSlB+tk="; postFetch = '' # delete files that make the source too big rm -rf $out/contrib/llvm-project/llvm/test diff --git a/nixpkgs/pkgs/servers/computing/slurm/default.nix b/nixpkgs/pkgs/servers/computing/slurm/default.nix index 436332834aef..fa71aefbd24a 100644 --- a/nixpkgs/pkgs/servers/computing/slurm/default.nix +++ b/nixpkgs/pkgs/servers/computing/slurm/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { pname = "slurm"; - version = "23.02.3.1"; + version = "23.02.4.1"; # N.B. We use github release tags instead of https://www.schedmd.com/downloads.php # because the latter does not keep older releases. @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { repo = "slurm"; # The release tags use - instead of . rev = "${pname}-${builtins.replaceStrings ["."] ["-"] version}"; - sha256 = "sha256-YMm8a7uyZpPEuWQcgddX+0Me+ndgbYoDnC+sbmN/Hh8="; + sha256 = "sha256-sNZqC6F7Q05AqkKVVUG4mCO3JXRjVZBppt3VgRHf5+o="; }; outputs = [ "out" "dev" ]; diff --git a/nixpkgs/pkgs/servers/dgraph/default.nix b/nixpkgs/pkgs/servers/dgraph/default.nix index eb3072c0c872..b800b0b77804 100644 --- a/nixpkgs/pkgs/servers/dgraph/default.nix +++ b/nixpkgs/pkgs/servers/dgraph/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "dgraph"; - version = "23.0.1"; + version = "23.1.0"; src = fetchFromGitHub { owner = "dgraph-io"; repo = "dgraph"; rev = "v${version}"; - sha256 = "sha256-FB+bgrv6KojbuXDB4FKKe7eW4d9lcm9x4gA6Ceop734="; + sha256 = "sha256-AC/5ykNH2eb6IrZ3KlU0DTP4r8RiHE5iUZFCUn6H2cw="; }; - vendorHash = "sha256-HoZpxY+xT1gRHgEpkscPXogVq2eDKGlKE6KTMIQ+mMI="; + vendorHash = "sha256-YRfFRCCm25zS+tQer6UcrBBltOxA7+Iqi+Ejyrjdu/A="; doCheck = false; diff --git a/nixpkgs/pkgs/servers/dns/knot-resolver/default.nix b/nixpkgs/pkgs/servers/dns/knot-resolver/default.nix index d893c10d142b..8df8b1807f09 100644 --- a/nixpkgs/pkgs/servers/dns/knot-resolver/default.nix +++ b/nixpkgs/pkgs/servers/dns/knot-resolver/default.nix @@ -17,11 +17,11 @@ lua = luajitPackages; unwrapped = stdenv.mkDerivation rec { pname = "knot-resolver"; - version = "5.6.0"; + version = "5.7.0"; src = fetchurl { url = "https://secure.nic.cz/files/knot-resolver/${pname}-${version}.tar.xz"; - sha256 = "0c82ae937b685dc477fb3176098e3dc106c898b7cd83553e5bc54dccb83c80d7"; + sha256 = "383ef6db1cccabd2dd788ea9385f05e98a2bafdfeb7f0eda57ff9d572f4fad71"; }; outputs = [ "out" "dev" ]; diff --git a/nixpkgs/pkgs/servers/elasticmq-server-bin/default.nix b/nixpkgs/pkgs/servers/elasticmq-server-bin/default.nix index a76f585ed12b..c6aa3c756259 100644 --- a/nixpkgs/pkgs/servers/elasticmq-server-bin/default.nix +++ b/nixpkgs/pkgs/servers/elasticmq-server-bin/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "elasticmq-server"; - version = "1.4.2"; + version = "1.4.3"; src = fetchurl { url = "https://s3-eu-west-1.amazonaws.com/softwaremill-public/${finalAttrs.pname}-${finalAttrs.version}.jar"; - sha256 = "sha256-71GlX8zwiC5tZm2LGSUdOa4ZDZUQQJ9zTY8viu2MQLk="; + sha256 = "sha256-7eWdhsYkeUKnr7BzJhJ9/jFn76CdK7Qq1eIfV/OG7es="; }; # don't do anything? diff --git a/nixpkgs/pkgs/servers/gnss-share/default.nix b/nixpkgs/pkgs/servers/gnss-share/default.nix index f0700121c362..14aa294da503 100644 --- a/nixpkgs/pkgs/servers/gnss-share/default.nix +++ b/nixpkgs/pkgs/servers/gnss-share/default.nix @@ -1,12 +1,12 @@ { buildGoModule, fetchFromGitLab, lib }: buildGoModule rec { pname = "gnss-share"; - version = "0.7.1"; + version = "0.7.2"; src = fetchFromGitLab { owner = "postmarketOS"; repo = "gnss-share"; rev = version; - hash = "sha256-HlaT4TeVAyGN95cWUw1XgVNfGa+cUibh8nkBt/Eb7Yo="; + hash = "sha256-0osXA+t+trm41ekcDiJwq0IAB+6ibrlwP/c2JNAXRpU="; }; vendorHash = "sha256-a5CZxh92MW3yP/ZhwGI9UWUT8hwJ0/zeTyPNC+c2R9U="; meta = with lib; { diff --git a/nixpkgs/pkgs/servers/home-assistant/component-packages.nix b/nixpkgs/pkgs/servers/home-assistant/component-packages.nix index 13637663d6ce..80d3c1a189f7 100644 --- a/nixpkgs/pkgs/servers/home-assistant/component-packages.nix +++ b/nixpkgs/pkgs/servers/home-assistant/component-packages.nix @@ -328,7 +328,8 @@ sqlalchemy ]; "baf" = ps: with ps; [ - ]; # missing inputs: aiobafi6 + aiobafi6 + ]; "baidu" = ps: with ps; [ ]; # missing inputs: baidu-aip "balboa" = ps: with ps; [ @@ -915,7 +916,8 @@ pdunehd ]; "duotecno" = ps: with ps; [ - ]; # missing inputs: pyduotecno + pyduotecno + ]; "dwd_weather_warnings" = ps: with ps; [ dwdwfsapi ]; @@ -1344,13 +1346,15 @@ psutil-home-assistant sqlalchemy xmltodict - ]; # missing inputs: fritzconnection.optional-dependencies.qr + ] + ++ fritzconnection.optional-dependencies.qr; "fritzbox" = ps: with ps; [ pyfritzhome ]; "fritzbox_callmonitor" = ps: with ps; [ fritzconnection - ]; # missing inputs: fritzconnection.optional-dependencies.qr + ] + ++ fritzconnection.optional-dependencies.qr; "fronius" = ps: with ps; [ pyfronius ]; @@ -4887,6 +4891,7 @@ "azure_devops" "azure_event_hub" "backup" + "baf" "balboa" "bayesian" "binary_sensor" @@ -4967,6 +4972,7 @@ "dte_energy_bridge" "duckdns" "dunehd" + "duotecno" "dwd_weather_warnings" "eafm" "easyenergy" @@ -5028,7 +5034,9 @@ "freebox" "freedns" "freedompro" + "fritz" "fritzbox" + "fritzbox_callmonitor" "fronius" "frontend" "frontier_silicon" diff --git a/nixpkgs/pkgs/servers/home-assistant/stubs.nix b/nixpkgs/pkgs/servers/home-assistant/stubs.nix index c40b8beb8b7a..b8259e573673 100644 --- a/nixpkgs/pkgs/servers/home-assistant/stubs.nix +++ b/nixpkgs/pkgs/servers/home-assistant/stubs.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "homeassistant-stubs"; - version = "2023.8.2"; + version = "2023.8.3"; format = "pyproject"; disabled = python.version != home-assistant.python.version; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "KapJI"; repo = "homeassistant-stubs"; rev = "refs/tags/${version}"; - hash = "sha256-uoDpwXJfZC26oesMTv1mjO7Ib0dKamTQdIYyLJnrERk="; + hash = "sha256-odZ0rKydFtj2bwNrP3KsE5xxFLAssYMoaEe+sBMIeYI="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/servers/http/couchdb/3.nix b/nixpkgs/pkgs/servers/http/couchdb/3.nix index 3ce5272c1d93..8913dae50be4 100644 --- a/nixpkgs/pkgs/servers/http/couchdb/3.nix +++ b/nixpkgs/pkgs/servers/http/couchdb/3.nix @@ -22,6 +22,10 @@ stdenv.mkDerivation rec { substituteInPlace src/couch/rebar.config.script --replace '/usr/include/mozjs-91' "${spidermonkey_91.dev}/include/mozjs-91" substituteInPlace configure --replace '/usr/include/''${SM_HEADERS}' "${spidermonkey_91.dev}/include/mozjs-91" patchShebangs bin/rebar + '' + lib.optionalString stdenv.isDarwin '' + # LTO with Clang produces LLVM bitcode, which causes linking to fail quietly. + # (There are warnings, but no hard errors, and it produces an empty dylib.) + substituteInPlace src/jiffy/rebar.config.script --replace '"-flto"' '""' ''; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/servers/jackett/default.nix b/nixpkgs/pkgs/servers/jackett/default.nix index 5393188ccd6f..fa08cb20b234 100644 --- a/nixpkgs/pkgs/servers/jackett/default.nix +++ b/nixpkgs/pkgs/servers/jackett/default.nix @@ -9,13 +9,13 @@ buildDotnetModule rec { pname = "jackett"; - version = "0.21.635"; + version = "0.21.674"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha512-KhQUuRJUqnCOLbwhTJiWOHj/yGsdne9TY9qyuE6c7y0gvAdKPE9Xkolt0RV/pjQtr6Hnbw5MaXahHHDOrhkN5Q=="; + hash = "sha512-sLgTnj1Z/zeAML8B1I40xGuEkyrxYeXVR/Two7vMGP3xmyv/KfssikVu8yFDtA4bdQq9RsLU8GxC74VQKe3txQ=="; }; projectFile = "src/Jackett.Server/Jackett.Server.csproj"; diff --git a/nixpkgs/pkgs/servers/keycloak/default.nix b/nixpkgs/pkgs/servers/keycloak/default.nix index b2bd54c56b2c..8a395d917caa 100644 --- a/nixpkgs/pkgs/servers/keycloak/default.nix +++ b/nixpkgs/pkgs/servers/keycloak/default.nix @@ -5,12 +5,18 @@ , jre , nixosTests , callPackage - , confFile ? null , plugins ? [ ] +, extraFeatures ? [ ] +, disabledFeatures ? [ ] }: -stdenv.mkDerivation rec { +let + featuresSubcommand = '' + ${lib.optionalString (extraFeatures != [ ]) "--features=${lib.concatStringsSep "," extraFeatures}"} \ + ${lib.optionalString (disabledFeatures != [ ]) "--features-disabled=${lib.concatStringsSep "," disabledFeatures}"} + ''; +in stdenv.mkDerivation rec { pname = "keycloak"; version = "22.0.1"; @@ -44,7 +50,7 @@ stdenv.mkDerivation rec { patchShebangs bin/kc.sh export KC_HOME_DIR=$(pwd) export KC_CONF_DIR=$(pwd)/conf - bin/kc.sh build + bin/kc.sh build ${featuresSubcommand} runHook postBuild ''; diff --git a/nixpkgs/pkgs/servers/klipper/default.nix b/nixpkgs/pkgs/servers/klipper/default.nix index 432c94fed26f..03b3504c68e8 100644 --- a/nixpkgs/pkgs/servers/klipper/default.nix +++ b/nixpkgs/pkgs/servers/klipper/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "klipper"; - version = "unstable-2023-08-15"; + version = "unstable-2023-08-21"; src = fetchFromGitHub { owner = "KevinOConnor"; repo = "klipper"; - rev = "01ed8096d8b53fd58f760b413533f1ef15f1b667"; - sha256 = "sha256-vP1EmvUmxYRlBcxY7MKnBpLaSTEi5bZGaP42TsJhfjw="; + rev = "5f990f93d533247d3a675e8c423280f4333ad8ce"; + sha256 = "sha256-jICOEzLvy2wBInW4qIbFZbhRuHjsio6UM13K9UlZi1U="; }; sourceRoot = "${src.name}/klippy"; diff --git a/nixpkgs/pkgs/servers/klipper/klipper-genconf.nix b/nixpkgs/pkgs/servers/klipper/klipper-genconf.nix index d810bccd4366..293a8112007b 100644 --- a/nixpkgs/pkgs/servers/klipper/klipper-genconf.nix +++ b/nixpkgs/pkgs/servers/klipper/klipper-genconf.nix @@ -2,12 +2,10 @@ , klipper , python3 , gnumake -, pkgsCross }: writeShellApplication { name = "klipper-genconf"; runtimeInputs = [ python3 - pkgsCross.avr.stdenv.cc gnumake ]; text = '' diff --git a/nixpkgs/pkgs/servers/mail/listmonk/default.nix b/nixpkgs/pkgs/servers/mail/listmonk/default.nix index 97ec1924c2a8..7e55fde4504e 100644 --- a/nixpkgs/pkgs/servers/mail/listmonk/default.nix +++ b/nixpkgs/pkgs/servers/mail/listmonk/default.nix @@ -1,17 +1,24 @@ -{ lib, buildGoModule, fetchFromGitHub, callPackage, stuffbin, nixosTests }: +{ lib, buildGoModule, fetchFromGitHub, callPackage, stuffbin, nixosTests, fetchpatch }: buildGoModule rec { pname = "listmonk"; - version = "2.2.0"; + version = "2.5.1"; src = fetchFromGitHub { owner = "knadh"; repo = "listmonk"; rev = "v${version}"; - sha256 = "sha256-dtIM0dkr8y+GbyCqrBlR5VRq6qMiZdmQyFvIoVY1eUg="; + sha256 = "sha256-gCnIblc83CmG1auvYYxqW/xBl6Oy1KHGkqSY/3yIm3I="; }; - vendorSha256 = "sha256-qeBuDM3REUxgu3ty02d7qsULH04USE0JUvBrtVnW8vg="; + patches = [ + (fetchpatch { + url = "https://github.com/knadh/listmonk/pull/1479.patch"; + hash = "sha256-SYACM8r+NgeSWn9VJV4+wkm+6s/MhNGwn5zyc2tw7FU="; + }) + ]; + + vendorSha256 = "sha256-0sgC1+ueZTUCP+7JwI/OKLktfMHQq959GEk1mC0TQgE="; nativeBuildInputs = [ stuffbin diff --git a/nixpkgs/pkgs/servers/mail/listmonk/frontend.nix b/nixpkgs/pkgs/servers/mail/listmonk/frontend.nix index 81e5afa8fd96..1e5cccc36415 100644 --- a/nixpkgs/pkgs/servers/mail/listmonk/frontend.nix +++ b/nixpkgs/pkgs/servers/mail/listmonk/frontend.nix @@ -5,13 +5,13 @@ yarn2nix-moretea.mkYarnPackage rec { pname = "listmonk-frontend"; - version = "2.2.0"; + version = "2.5.1"; src = fetchFromGitHub { owner = "knadh"; repo = "listmonk"; rev = "v${version}"; - sha256 = "sha256-dtIM0dkr8y+GbyCqrBlR5VRq6qMiZdmQyFvIoVY1eUg="; + sha256 = "sha256-gCnIblc83CmG1auvYYxqW/xBl6Oy1KHGkqSY/3yIm3I="; }; packageJSON = ./package.json; diff --git a/nixpkgs/pkgs/servers/matrix-synapse/sliding-sync/default.nix b/nixpkgs/pkgs/servers/matrix-synapse/sliding-sync/default.nix index bd1f7358b11d..25e1c9c205fc 100644 --- a/nixpkgs/pkgs/servers/matrix-synapse/sliding-sync/default.nix +++ b/nixpkgs/pkgs/servers/matrix-synapse/sliding-sync/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "matrix-sliding-sync"; - version = "0.99.5"; + version = "0.99.7"; src = fetchFromGitHub { owner = "matrix-org"; repo = "sliding-sync"; rev = "v${version}"; - hash = "sha256-L2cWKPVclurOCpyQezHPB+5zYD91EREBXjRYBzjxkII="; + hash = "sha256-LSxh7dvw4B0hVcIzbknIpXGOWZYEs+cjO9w4xJxkZps="; }; - vendorHash = "sha256-447P2TbBUEHmHubHiiZCrFVCj2/tmEuYFzLo27UyCk4="; + vendorHash = "sha256-JYSpjAgIvQFpYmOTifRXHVB6bSrukqSVhmAAmHylPbQ="; subPackages = [ "cmd/syncv3" ]; diff --git a/nixpkgs/pkgs/servers/monitoring/grafana/default.nix b/nixpkgs/pkgs/servers/monitoring/grafana/default.nix index 2433f92b1cf8..9fa03091c866 100644 --- a/nixpkgs/pkgs/servers/monitoring/grafana/default.nix +++ b/nixpkgs/pkgs/servers/monitoring/grafana/default.nix @@ -2,23 +2,23 @@ buildGoModule rec { pname = "grafana"; - version = "10.0.3"; + version = "10.1.0"; - excludedPackages = [ "alert_webhook_listener" "clean-swagger" "release_publisher" "slow_proxy" "slow_proxy_mac" "macaron" "devenv" ]; + excludedPackages = [ "alert_webhook_listener" "clean-swagger" "release_publisher" "slow_proxy" "slow_proxy_mac" "macaron" "devenv" "modowners" ]; src = fetchFromGitHub { rev = "v${version}"; owner = "grafana"; repo = "grafana"; - hash = "sha256-2LHCG2x4SJzUgBfYZFQCTlrUGule9j+1x3R1vDmBlAs="; + hash = "sha256-u+Jug4U2dq6naHRMOwpm7/18o6Kk9/6fw/42XLT7C1s="; }; srcStatic = fetchurl { url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz"; - hash = "sha256-2ut+7hMnttQHzarxojTsnY4q5abQheD9PYxgYhTrYDI="; + hash = "sha256-lgCSJgFcrZb4ki4/YdVRgXvVBjQrmEoTPf/KficA3sM="; }; - vendorHash = "sha256-VMy7RGp5F5cc1nBpt5Fm1LbY6IK1/JHLEEGIoYzUvdw="; + vendorHash = "sha256-mnrGnQ7clzu2dkAHyCuxfX0sGU5EcHybut6GfpmOSoU="; nativeBuildInputs = [ wire ]; @@ -51,6 +51,13 @@ buildGoModule rec { # main module (github.com/grafana/grafana) does not contain package github.com/grafana/grafana/scripts/go rm -r scripts/go + + # Requires making API calls against storage.googleapis.com: + # + # [...] + # grafana> 2023/08/24 08:30:23 failed to copy objects, err: Post "https://storage.googleapis.com/upload/storage/v1/b/grafana-testing-repo/o?alt=json&name=test-path%2Fbuild%2FTestCopyLocalDir2194093976%2F001%2Ffile2.txt&prettyPrint=false&projection=full&uploadType=multipart": dial tcp: lookup storage.googleapis.com on [::1]:53: read udp [::1]:36436->[::1]:53: read: connection refused + # grafana> panic: test timed out after 10m0s + rm pkg/build/gcloud/storage/gsutil_test.go ''; ldflags = [ diff --git a/nixpkgs/pkgs/servers/monitoring/telegraf/default.nix b/nixpkgs/pkgs/servers/monitoring/telegraf/default.nix index df09e86c2415..cfd723620cf9 100644 --- a/nixpkgs/pkgs/servers/monitoring/telegraf/default.nix +++ b/nixpkgs/pkgs/servers/monitoring/telegraf/default.nix @@ -8,7 +8,7 @@ buildGoModule rec { pname = "telegraf"; - version = "1.27.3"; + version = "1.27.4"; excludedPackages = "test"; @@ -18,10 +18,10 @@ buildGoModule rec { owner = "influxdata"; repo = "telegraf"; rev = "v${version}"; - hash = "sha256-mVkzJ2dFBR8QYGO5rAT3tfA+eFFO01VsPoWp2iadUew="; + hash = "sha256-HcNqvl8wWMMefrRl7cXgfE22+dzebhVmo7vKf0nEIyk="; }; - vendorHash = "sha256-xtPniKc6aR8JRSsaefqoRCLL8AQH6YVTG67trK58YaU="; + vendorHash = "sha256-z1HNOVsSdA5bf0iZcAhbXgv/IaFpHjfoe7rqMtmscQM="; proxyVendor = true; ldflags = [ diff --git a/nixpkgs/pkgs/servers/nitter/default.nix b/nixpkgs/pkgs/servers/nitter/default.nix index a282565ddfe3..013a66ef3d3f 100644 --- a/nixpkgs/pkgs/servers/nitter/default.nix +++ b/nixpkgs/pkgs/servers/nitter/default.nix @@ -21,13 +21,13 @@ buildNimPackage rec { pname = "nitter"; - version = "unstable-2023-07-21"; + version = "unstable-2023-08-08"; src = fetchFromGitHub { owner = "zedeus"; repo = "nitter"; - rev = "cc5841df308506356d329662d0f0c2ec4713a35c"; - hash = "sha256-QuWLoKy7suUCTYK79ghdf3o/FGFIDNyN1Iu69DFp6wg="; + rev = "d7ca353a55ea3440a2ec1f09155951210a374cc7"; + hash = "sha256-nlpUzbMkDzDk1n4X+9Wk7+qQk+KOfs5ID6euIfHBoa8="; }; patches = [ diff --git a/nixpkgs/pkgs/servers/nosql/ferretdb/default.nix b/nixpkgs/pkgs/servers/nosql/ferretdb/default.nix index 3bf38eb4c2fd..3fce4380f951 100644 --- a/nixpkgs/pkgs/servers/nosql/ferretdb/default.nix +++ b/nixpkgs/pkgs/servers/nosql/ferretdb/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "ferretdb"; - version = "1.7.0"; + version = "1.8.0"; src = fetchFromGitHub { owner = "FerretDB"; repo = "FerretDB"; rev = "v${version}"; - hash = "sha256-c3xHB0CvgvT2h1F7KFddYuBuikWkGsiApTy3gj61x9s="; + hash = "sha256-7AYNQiRCPdy7DkkkLofOa5nUFOEev/brPnMa7Ff6Vp0="; }; postPatch = '' @@ -19,7 +19,7 @@ buildGoModule rec { echo nixpkgs > build/version/package.txt ''; - vendorSha256 = "sha256-g2dOfzzOeivAoc0/RNNeVgIYJTOiMQpQfkl8eVy48o0="; + vendorSha256 = "sha256-VM/m8c2gH+/pmm+72O1nZLZzvsVH1c/QvhAqMdMIY94="; CGO_ENABLED = 0; diff --git a/nixpkgs/pkgs/servers/nosql/influxdb2/provision.nix b/nixpkgs/pkgs/servers/nosql/influxdb2/provision.nix new file mode 100644 index 000000000000..dfb1d6083a71 --- /dev/null +++ b/nixpkgs/pkgs/servers/nosql/influxdb2/provision.nix @@ -0,0 +1,34 @@ +{ lib +, stdenv +, fetchFromGitHub +, python3Packages +, makeWrapper +}: + +stdenv.mkDerivation rec { + pname = "influxdb2-provision"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "oddlama"; + repo = "influxdb2-provision"; + rev = "v${version}"; + hash = "sha256-kgpUtXmwy9buupNzQj/6AIeN8XG2x0XjIckK3WIFC+I="; + }; + + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ python3Packages.python python3Packages.influxdb-client ]; + + installPhase = '' + install -Dm0555 influxdb2-provision.py $out/bin/influxdb2-provision + wrapProgram $out/bin/influxdb2-provision --prefix PYTHONPATH : "$PYTHONPATH" + ''; + + meta = with lib; { + description = "A small utility to help provisioning influxdb2"; + homepage = "https://github.com/oddlama/influxdb2-provision"; + license = licenses.mit; + maintainers = with maintainers; [oddlama]; + mainProgram = "influxdb2-provision"; + }; +} diff --git a/nixpkgs/pkgs/servers/nosql/influxdb2/token-manipulator.nix b/nixpkgs/pkgs/servers/nosql/influxdb2/token-manipulator.nix new file mode 100644 index 000000000000..88713941b465 --- /dev/null +++ b/nixpkgs/pkgs/servers/nosql/influxdb2/token-manipulator.nix @@ -0,0 +1,26 @@ +{ buildGoModule +, fetchFromGitHub +, lib +}: + +buildGoModule rec { + pname = "influxdb2-token-manipulator"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "oddlama"; + repo = "influxdb2-token-manipulator"; + rev = "v${version}"; + hash = "sha256-9glz+TdqvGJgSsbLm4J/fn7kzMC75z74/jxZrEZiooc="; + }; + + vendorHash = "sha256-zBZk7JbNILX18g9+2ukiESnFtnIVWhdN/J/MBhIITh8="; + + meta = with lib; { + description = "Utility program to manipulate influxdb api tokens for declarative setups"; + homepage = "https://github.com/oddlama/influxdb2-token-manipulator"; + license = licenses.mit; + maintainers = with maintainers; [oddlama]; + mainProgram = "influxdb2-token-manipulator"; + }; +} diff --git a/nixpkgs/pkgs/servers/nosql/questdb/default.nix b/nixpkgs/pkgs/servers/nosql/questdb/default.nix index fc21fedc03d1..5d91e6dc3245 100644 --- a/nixpkgs/pkgs/servers/nosql/questdb/default.nix +++ b/nixpkgs/pkgs/servers/nosql/questdb/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "questdb"; - version = "7.3"; + version = "7.3.1"; src = fetchurl { url = "https://github.com/questdb/questdb/releases/download/${finalAttrs.version}/questdb-${finalAttrs.version}-no-jre-bin.tar.gz"; - hash = "sha256-teZ9oJ5aUPs0aTUxyK9UmpFRclHZVLEVl0jlWbrbiBs="; + hash = "sha256-bnnuIoARr7awwdxDo9NDKy1HEJVl24YTqYhBpmc8n/o="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix b/nixpkgs/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix index b3f4825f22cf..8700a82ad823 100644 --- a/nixpkgs/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix +++ b/nixpkgs/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "plpgsql_check"; - version = "2.3.4"; + version = "2.4.0"; src = fetchFromGitHub { owner = "okbob"; repo = pname; rev = "v${version}"; - hash = "sha256-kXci/4o7rK1CiLp8alkAGMhxjiQBIPpavS/1/7BBWI8="; + hash = "sha256-flRkPyHLc/cf+JQK04/Vl0I6ILx1GxWYMy9FnT9M//Q="; }; buildInputs = [ postgresql ]; @@ -22,8 +22,10 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Linter tool for language PL/pgSQL"; homepage = "https://github.com/okbob/plpgsql_check"; + changelog = "https://github.com/okbob/plpgsql_check/releases/tag/v${version}"; platforms = postgresql.meta.platforms; license = licenses.mit; + broken = versionOlder postgresql.version "12"; maintainers = [ maintainers.marsam ]; }; } diff --git a/nixpkgs/pkgs/servers/static-web-server/default.nix b/nixpkgs/pkgs/servers/static-web-server/default.nix index 170ed6ecb1ad..f338427ae371 100644 --- a/nixpkgs/pkgs/servers/static-web-server/default.nix +++ b/nixpkgs/pkgs/servers/static-web-server/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "static-web-server"; - version = "2.21.0"; + version = "2.21.1"; src = fetchFromGitHub { owner = "static-web-server"; repo = pname; rev = "v${version}"; - hash = "sha256-4BQDbJTGEOZ+lB7b7KQE82I95+JCbPY9z/oU32TjYc4="; + hash = "sha256-odt9ztEjb+ppi1e+SI7T6BGtSWVG4EM14lyuVoz5gOM="; }; - cargoHash = "sha256-kPd77hJHVfzfBLixROTXxIbWtAskxUEJqbdFME+FL1U="; + cargoHash = "sha256-HWiMaMnco4xkskjRroqgy11D/Plg/1VDZwn/IpNG6LM="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security diff --git a/nixpkgs/pkgs/servers/tailscale/default.nix b/nixpkgs/pkgs/servers/tailscale/default.nix index 05a6180fa9cd..5b1253cd8c8a 100644 --- a/nixpkgs/pkgs/servers/tailscale/default.nix +++ b/nixpkgs/pkgs/servers/tailscale/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, buildGoModule, fetchFromGitHub, makeWrapper, iptables, iproute2, procps, shadow, getent }: let - version = "1.46.1"; + version = "1.48.1"; in buildGoModule { pname = "tailscale"; @@ -11,9 +11,9 @@ buildGoModule { owner = "tailscale"; repo = "tailscale"; rev = "v${version}"; - hash = "sha256-aweJys46MMnkSKJoLUFCzc6sWUP+Cv5+IFVVe9iEPGI="; + hash = "sha256-jWnke49b6inybPmiZOkxI3C8VoYe4Syi84YhvL8zxeI="; }; - vendorHash = "sha256-oELDIt+mRiBGAdoEUkSAs2SM6urkHm1aAtJnev8jDYM="; + vendorHash = "sha256-Fr4VZcKrXnT1PZuEG110KBefjcZzRsQRBSvByELKAy4="; nativeBuildInputs = lib.optionals stdenv.isLinux [ makeWrapper ]; @@ -43,6 +43,6 @@ buildGoModule { description = "The node agent for Tailscale, a mesh VPN built on WireGuard"; license = licenses.bsd3; mainProgram = "tailscale"; - maintainers = with maintainers; [ danderson mbaillie twitchyliquid64 jk ]; + maintainers = with maintainers; [ danderson mbaillie twitchyliquid64 jk mfrw ]; }; } diff --git a/nixpkgs/pkgs/servers/web-apps/netbox/default.nix b/nixpkgs/pkgs/servers/web-apps/netbox/default.nix index f68ec501185c..e5f99033b5d4 100644 --- a/nixpkgs/pkgs/servers/web-apps/netbox/default.nix +++ b/nixpkgs/pkgs/servers/web-apps/netbox/default.nix @@ -17,20 +17,23 @@ in }) ]; - tests.netbox = nixosTests.netbox_3_3; + tests = { + netbox = nixosTests.netbox_3_3; + inherit (nixosTests) netbox-upgrade; + }; maintainers = with lib.maintainers; [ n0emis raitobezarius ]; eol = true; }; netbox = callPackage generic { - version = "3.5.6"; - hash = "sha256-n5EJQcC5uVoL5KjGzF7bLF8c4Wke/YBJpx2V9KZz5Qo="; + version = "3.5.7"; + hash = "sha256-R5P4FOhn7rE6e9H9U3JlE3ms4Svv6ps4c3+ZjE1KwNM="; extraPatches = [ # Allow setting the STATIC_ROOT from within the configuration and setting a custom redis URL ./config.patch ]; tests = { - inherit (nixosTests) netbox; + inherit (nixosTests) netbox netbox-upgrade; }; maintainers = with lib.maintainers; [ minijackson n0emis raitobezarius ]; |