diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 68496e0d54c2..acc04a533f60 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -9756,12 +9756,12 @@ githubId = 71795; name = "Mica Semrick"; }; - papojari = { - email = "papojari-git.ovoid@aleeas.com"; + annaaurora = { + email = "anna@annaaurora.eu"; matrix = "@papojari:artemislena.eu"; github = "auroraanna"; githubId = 81317317; - name = "papojari"; + name = "Anna Aurora"; }; paraseba = { email = "paraseba@gmail.com"; diff --git a/nixos/modules/services/monitoring/prometheus/exporters/mail.nix b/nixos/modules/services/monitoring/prometheus/exporters/mail.nix index 956bd96aa454..a60f47f63932 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters/mail.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters/mail.nix @@ -5,6 +5,8 @@ with lib; let cfg = config.services.prometheus.exporters.mail; + configFile = if cfg.configuration != null then configurationFile else (escapeShellArg cfg.configFile); + configurationFile = pkgs.writeText "prometheus-mail-exporter.conf" (builtins.toJSON ( # removes the _module attribute, null values and converts attrNames to lowercase mapAttrs' (name: value: @@ -137,6 +139,13 @@ in { port = 9225; extraOpts = { + environmentFile = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + File containing env-vars to be substituted into the exporter's config. + ''; + }; configFile = mkOption { type = types.nullOr types.path; default = null; @@ -162,13 +171,19 @@ in serviceOpts = { serviceConfig = { DynamicUser = false; + EnvironmentFile = mkIf (cfg.environmentFile != null) [ cfg.environmentFile ]; + RuntimeDirectory = "prometheus-mail-exporter"; + ExecStartPre = [ + "${pkgs.writeShellScript "subst-secrets-mail-exporter" '' + umask 0077 + ${pkgs.envsubst}/bin/envsubst -i ${configFile} -o ''${RUNTIME_DIRECTORY}/mail-exporter.json + ''}" + ]; ExecStart = '' ${pkgs.prometheus-mail-exporter}/bin/mailexporter \ --web.listen-address ${cfg.listenAddress}:${toString cfg.port} \ --web.telemetry-path ${cfg.telemetryPath} \ - --config.file ${ - if cfg.configuration != null then configurationFile else (escapeShellArg cfg.configFile) - } \ + --config.file ''${RUNTIME_DIRECTORY}/mail-exporter.json \ ${concatStringsSep " \\\n " cfg.extraFlags} ''; }; diff --git a/nixos/modules/services/networking/mxisd.nix b/nixos/modules/services/networking/mxisd.nix index 5b1e0dee8e35..1509671bc54a 100644 --- a/nixos/modules/services/networking/mxisd.nix +++ b/nixos/modules/services/networking/mxisd.nix @@ -130,6 +130,7 @@ in { EnvironmentFile = mkIf (cfg.environmentFile != null) [ cfg.environmentFile ]; ExecStart = "${cfg.package}/bin/${executable} -c ${cfg.dataDir}/mxisd-config.yaml"; ExecStartPre = "${pkgs.writeShellScript "mxisd-substitute-secrets" '' + umask 0077 ${pkgs.envsubst}/bin/envsubst -o ${cfg.dataDir}/mxisd-config.yaml \ -i ${configFile} ''}"; diff --git a/nixos/modules/services/security/privacyidea.nix b/nixos/modules/services/security/privacyidea.nix index 13e27f255068..1f5639d475e8 100644 --- a/nixos/modules/services/security/privacyidea.nix +++ b/nixos/modules/services/security/privacyidea.nix @@ -332,6 +332,7 @@ in [ cfg.ldap-proxy.environmentFile ]; ExecStartPre = "${pkgs.writeShellScript "substitute-secrets-ldap-proxy" '' + umask 0077 ${pkgs.envsubst}/bin/envsubst \ -i ${ldapProxyConfig} \ -o $STATE_DIRECTORY/ldap-proxy.ini diff --git a/nixos/tests/polaris.nix b/nixos/tests/polaris.nix index 62f0fb6a9c20..fb2e67f075aa 100644 --- a/nixos/tests/polaris.nix +++ b/nixos/tests/polaris.nix @@ -24,7 +24,7 @@ with lib; testScript = '' machine.wait_for_unit("polaris.service") - machine.wait_for_open_port("5050") + machine.wait_for_open_port(5050) machine.succeed("curl http://localhost:5050/api/version") machine.succeed("curl -X GET http://localhost:5050/api/initial_setup -H 'accept: application/json' | jq -e '.has_any_users == true'") ''; diff --git a/nixos/tests/prometheus-exporters.nix b/nixos/tests/prometheus-exporters.nix index a3092d101d87..0a1ec824986a 100644 --- a/nixos/tests/prometheus-exporters.nix +++ b/nixos/tests/prometheus-exporters.nix @@ -557,10 +557,12 @@ let systemd.services.prometheus-mail-exporter = { after = [ "postfix.service" ]; requires = [ "postfix.service" ]; - preStart = '' - mkdir -p -m 0700 mail-exporter/new - ''; serviceConfig = { + ExecStartPre = [ + "${pkgs.writeShellScript "create-maildir" '' + mkdir -p -m 0700 mail-exporter/new + ''}" + ]; ProtectHome = true; ReadOnlyPaths = "/"; ReadWritePaths = "/var/spool/mail"; diff --git a/pkgs/applications/audio/bitwig-studio/bitwig-studio4.nix b/pkgs/applications/audio/bitwig-studio/bitwig-studio4.nix index 2f177c2f8c63..ce019af95a8b 100644 --- a/pkgs/applications/audio/bitwig-studio/bitwig-studio4.nix +++ b/pkgs/applications/audio/bitwig-studio/bitwig-studio4.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "bitwig-studio"; - version = "4.2.3"; + version = "4.3.1"; src = fetchurl { url = "https://downloads.bitwig.com/stable/${version}/${pname}-${version}.deb"; - sha256 = "sha256-UCafrjrEwwHkhPum7sTOjtXzy7PNeK5/aeKg+b3CGJU="; + sha256 = "sha256-8V8ryb+ANPSyjObAKioSYpzNWJTdDA9ax/8gZ3X4mvs="; }; nativeBuildInputs = [ dpkg makeWrapper wrapGAppsHook ]; diff --git a/pkgs/applications/backup/unifi-protect-backup/default.nix b/pkgs/applications/backup/unifi-protect-backup/default.nix new file mode 100644 index 000000000000..07e078b588f5 --- /dev/null +++ b/pkgs/applications/backup/unifi-protect-backup/default.nix @@ -0,0 +1,41 @@ +{ fetchFromGitHub, python3, lib }: + +python3.pkgs.buildPythonApplication rec { + pname = "unifi-protect-backup"; + version = "0.7.1"; + + format = "pyproject"; + + src = fetchFromGitHub { + owner = "ep1cman"; + repo = pname; + rev = "v${version}"; + hash = "sha256-HAiyNFWLs1McrlAB48me/iI15LssO8ec7BiWuJbRlbs="; + }; + + preBuild = '' + sed -i 's_click = "8.0.1"_click = "^8"_' pyproject.toml + sed -i 's_pyunifiprotect = .*_pyunifiprotect = "*"_' pyproject.toml + ''; + + nativeBuildInputs = with python3.pkgs; [ + poetry-core + ]; + + propagatedBuildInputs = with python3.pkgs; [ + aiocron + click + pyunifiprotect + ]; + + checkInputs = with python3.pkgs; [ + pytestCheckHook + ]; + + meta = with lib; { + description = "Python tool to backup unifi event clips in realtime"; + homepage = "https://github.com/ep1cman/unifi-protect-backup"; + maintainers = with maintainers; [ ajs124 ]; + license = licenses.mit; + }; +} diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index fd8e0092ea75..551d898cdf56 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -1201,8 +1201,8 @@ let mktplcRef = { name = "haskell"; publisher = "haskell"; - version = "1.8.0"; - sha256 = "sha256-+k8XT2COe9Z8HvZvcrzfVuocRcxXBrVoNHDT/uKK7Hs="; + version = "2.2.0"; + sha256 = "sha256-YGPytmI4PgH6GQuWaRF5quiKGoOabkv7On+WVupI92E="; }; meta = with lib; { license = licenses.mit; @@ -1415,8 +1415,8 @@ let mktplcRef = { name = "language-haskell"; publisher = "justusadam"; - version = "3.4.0"; - sha256 = "0ab7m5jzxakjxaiwmg0jcck53vnn183589bbxh3iiylkpicrv67y"; + version = "3.6.0"; + sha256 = "sha256-rZXRzPmu7IYmyRWANtpJp3wp0r/RwB7eGHEJa7hBvoQ="; }; meta = { license = lib.licenses.bsd3; @@ -2028,6 +2028,26 @@ let }; }; + sanaajani.taskrunnercode = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "taskrunnercode"; + publisher = "sanaajani"; + version = "0.3.0"; + sha256 = "NVGMM9ugmYZNCWhNmclcGuVJPhJ9h4q2G6nNzVUEpes="; + }; + meta = { + description = "Extension to view and run tasks from Explorer pane"; + longDescription = '' + This extension adds an additional "Task Runner" view in your Explorer Pane + to visualize and individually run the auto-detected or configured tasks + in your project. + ''; + homepage = "https://github.com/sana-ajani/taskrunner-code"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ pbsds ]; + }; + }; + scala-lang.scala = buildVscodeMarketplaceExtension { mktplcRef = { name = "scala"; @@ -2077,6 +2097,26 @@ let }; }; + shd101wyy.markdown-preview-enhanced = buildVscodeMarketplaceExtension { + mktplcRef = { + publisher = "shd101wyy"; + name = "markdown-preview-enhanced"; + version = "0.6.3"; + sha256 = "dCWERQ5rHnmYLtYl12gJ+dXLnpMu55WnmF1VfdP0x34="; + }; + meta = { + description = "Provides a live preview of markdown using either markdown-it or pandoc"; + longDescription = '' + Markdown Preview Enhanced provides you with many useful functionalities + such as automatic scroll sync, math typesetting, mermaid, PlantUML, + pandoc, PDF export, code chunk, presentation writer, etc. + ''; + homepage = "https://github.com/shd101wyy/vscode-markdown-preview-enhanced"; + license = lib.licenses.ncsa; + maintainers = with lib.maintainers; [ pbsds ]; + }; + }; + shyykoserhiy.vscode-spotify = buildVscodeMarketplaceExtension { mktplcRef = { name = "vscode-spotify"; @@ -2352,6 +2392,8 @@ let sha256 = "1bcj546bp0w4yndd0qxwr8grhiwjd1jvf33jgmpm0j96y34vcszz"; }; meta = { + description = "Show PDF preview in VSCode"; + homepage = "https://github.com/tomoki1207/vscode-pdfviewer"; license = lib.licenses.mit; }; }; diff --git a/pkgs/applications/editors/vscode/extensions/vscode-utils.nix b/pkgs/applications/editors/vscode/extensions/vscode-utils.nix index 49b730361af1..8f0112e5f608 100644 --- a/pkgs/applications/editors/vscode/extensions/vscode-utils.nix +++ b/pkgs/applications/editors/vscode/extensions/vscode-utils.nix @@ -43,7 +43,7 @@ let }); fetchVsixFromVscodeMarketplace = mktplcExtRef: - fetchurl((import ./mktplcExtRefToFetchArgs.nix mktplcExtRef)); + fetchurl (import ./mktplcExtRefToFetchArgs.nix mktplcExtRef); buildVscodeMarketplaceExtension = a@{ name ? "", @@ -65,11 +65,12 @@ let "publisher" "version" "sha256" + "arch" ]; mktplcExtRefToExtDrv = ext: - buildVscodeMarketplaceExtension ((removeAttrs ext mktplcRefAttrList) // { - mktplcRef = ext; + buildVscodeMarketplaceExtension (removeAttrs ext mktplcRefAttrList // { + mktplcRef = builtins.intersectAttrs (lib.genAttrs mktplcRefAttrList (_: null)) ext; }); extensionFromVscodeMarketplace = mktplcExtRefToExtDrv; diff --git a/pkgs/applications/gis/grass/default.nix b/pkgs/applications/gis/grass/default.nix index 23cee79b5e22..8ec293e489a7 100644 --- a/pkgs/applications/gis/grass/default.nix +++ b/pkgs/applications/gis/grass/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "grass"; - version = "8.0.1"; + version = "8.2.0"; src = with lib; fetchFromGitHub { owner = "OSGeo"; repo = "grass"; rev = version; - sha256 = "sha256-rcOT21HRJDR+DEYsZn6BjOOhy28DWapz9PN7cRAdWGc="; + sha256 = "sha256-VK9FCqIwHGmeJe5lk12lpAGcsC1aPRBiI+XjACXjDd4="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/graphics/imgcat/default.nix b/pkgs/applications/graphics/imgcat/default.nix index cb2301d6339e..b904dec08569 100644 --- a/pkgs/applications/graphics/imgcat/default.nix +++ b/pkgs/applications/graphics/imgcat/default.nix @@ -1,14 +1,12 @@ -{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, ncurses }: +{ lib, stdenv, fetchFromGitHub, cimg, ncurses }: stdenv.mkDerivation rec { pname = "imgcat"; - version = "2.3.1"; + version = "2.5.1"; - nativeBuildInputs = [ autoconf automake libtool ]; - buildInputs = [ ncurses ]; + buildInputs = [ ncurses cimg ]; preConfigure = '' - ${autoconf}/bin/autoconf sed -i -e "s|-ltermcap|-L ${ncurses}/lib -lncurses|" Makefile ''; @@ -18,7 +16,7 @@ stdenv.mkDerivation rec { owner = "eddieantonio"; repo = pname; rev = "v${version}"; - sha256 = "0frz40rjwi73nx2dlqvmnn56zwr29bmnngfb11hhwr7v58yfajdi"; + sha256 = "sha256-EkVE6BgoA1lo4oqlNETTxLILIVvGXspFyXykxpmYk8M="; }; NIX_CFLAGS_COMPILE = "-Wno-error"; diff --git a/pkgs/applications/misc/bemenu/default.nix b/pkgs/applications/misc/bemenu/default.nix index e92bd4b82ad0..f0e0b877d9d7 100644 --- a/pkgs/applications/misc/bemenu/default.nix +++ b/pkgs/applications/misc/bemenu/default.nix @@ -11,13 +11,13 @@ assert x11Support -> xorg != null; stdenv.mkDerivation rec { pname = "bemenu"; - version = "0.6.7"; + version = "0.6.10"; src = fetchFromGitHub { owner = "Cloudef"; repo = pname; rev = version; - sha256 = "sha256-cUkSXEB92I0UYTobQzUb2so1MUXJkryAqrmASx9RMF0="; + sha256 = "sha256-pv/GxTGmpGc8RHjKO8F03jybS0uO+SS3z4KCZfHYV0Q="; }; nativeBuildInputs = [ pkg-config pcre ]; diff --git a/pkgs/applications/misc/logseq/default.nix b/pkgs/applications/misc/logseq/default.nix index 2f9996988e50..36b06219a237 100644 --- a/pkgs/applications/misc/logseq/default.nix +++ b/pkgs/applications/misc/logseq/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "logseq"; - version = "0.7.6"; + version = "0.7.7"; src = fetchurl { url = "https://github.com/logseq/logseq/releases/download/${version}/logseq-linux-x64-${version}.AppImage"; - sha256 = "sha256-3YCO0pQT5vUkscQEE4+XrfEkQJro8DpQ5xDLglfqJjI="; + sha256 = "sha256-FRhtB7l40nNy8YTocXShbvhGudFWOrzpXsfe4yFY4us="; name = "${pname}-${version}.AppImage"; }; diff --git a/pkgs/applications/misc/rofimoji/default.nix b/pkgs/applications/misc/rofimoji/default.nix index 1cc78282f6c2..44ce37c4564f 100644 --- a/pkgs/applications/misc/rofimoji/default.nix +++ b/pkgs/applications/misc/rofimoji/default.nix @@ -15,14 +15,14 @@ buildPythonApplication rec { pname = "rofimoji"; - version = "5.4.0"; + version = "5.5.0"; format = "pyproject"; src = fetchFromGitHub { owner = "fdw"; repo = "rofimoji"; - rev = version; - sha256 = "sha256-D45XGnKWHUsE0DQThITBcgpghelsfGkSEIdg9jvOJlw="; + rev = "refs/tags/${version}"; + sha256 = "sha256-rYqEeAoHCx0j83R1vmtj+CVuR0QFEd3e1c5O454mANM="; }; # `rofi` and the `waylandSupport` and `x11Support` dependencies diff --git a/pkgs/applications/misc/tuhi/default.nix b/pkgs/applications/misc/tuhi/default.nix index bf939cfa1758..4cc925d3bf95 100644 --- a/pkgs/applications/misc/tuhi/default.nix +++ b/pkgs/applications/misc/tuhi/default.nix @@ -14,7 +14,7 @@ python3Packages.buildPythonApplication rec { pname = "tuhi"; - version = "0.5"; + version = "0.6"; format = "other"; @@ -22,7 +22,7 @@ python3Packages.buildPythonApplication rec { owner = "tuhiproject"; repo = "tuhi"; rev = version; - sha256 = "17kggm9c423vj7irxx248fjc8sxvkp9w1mgawlx1snrii817p3db"; + sha256 = "sha256-NwyG2KhOrAKRewgmU23OMO0+A9SjkQZsDL4SGnLVCvo="; }; dontWrapGApps = true; diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix index f17bdcd8f9fd..bc707dfb9935 100644 --- a/pkgs/applications/networking/browsers/brave/default.nix +++ b/pkgs/applications/networking/browsers/brave/default.nix @@ -90,11 +90,11 @@ in stdenv.mkDerivation rec { pname = "brave"; - version = "1.40.113"; + version = "1.41.96"; src = fetchurl { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; - sha256 = "sha256-+lJjLfxEOf82uvcVaRbWYQ93KEzWGVrzXvI9Rt1U9Bc="; + sha256 = "sha256-sPIzQkaa6PGxwLkCHYz2GdSDns5x/Q2YwWcXBWBx+Fo="; }; dontConfigure = true; diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 3ed40359ed3b..fbc70f0328c9 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -1,8 +1,8 @@ { "stable": { - "version": "103.0.5060.114", - "sha256": "0rarcd2q1ggl10cw3vwjk7j9aka7i129a0qv8qr7751vy083as3p", - "sha256bin64": "1qxbnnnq0miizazprwynvxxvgaaw9dd9y7bssybvmga3g2c00fk9", + "version": "103.0.5060.134", + "sha256": "0wdmy15602qxrb403p8yyx69k7py85fbawdsgap1l6z4h4j2g2p4", + "sha256bin64": "143jc70cyns2bh5cizy32fdsfl6hq22rphx216vywhncdsd96cnw", "deps": { "gn": { "version": "2022-05-11", @@ -12,16 +12,16 @@ } }, "chromedriver": { - "version": "103.0.5060.53", - "sha256_linux": "1gpxfrqf2wm2c76701rnw0h5ppmaqzf5ygcrasj1mmwjsfk49v5d", - "sha256_darwin": "03ibi0ybr3mmk02mmn6dp7ygjn7c9wwvahbhm2syh0fhxyyxmf0p", - "sha256_darwin_aarch64": "13bb2ai32b1q4lvyhcgp5315zzxwbi6609xxb67h7h3i3rb2yhcd" + "version": "103.0.5060.134", + "sha256_linux": "13ld47n16b9adb6gh9bc7gr0vi3afyz5pn15rq1w983yqab49vwb", + "sha256_darwin": "0rpnny902h8il8wvxh4ccrvviqfpds28zgqv1v0vhlbgzgykcw3z", + "sha256_darwin_aarch64": "19v7q2wnvp5yfhh8x73p9shayar5yddf22rzqnlvy59saygcc7wa" } }, "beta": { - "version": "104.0.5112.48", - "sha256": "1zk4ywphcy6nrv0yf38yhl2bcq6fk34makglx31aalf2nhhw945i", - "sha256bin64": "14cx0m6jak4cma62axli0l4gqzqqh4gs7gam2dfahmwxsgcdwwn7", + "version": "104.0.5112.57", + "sha256": "1fvcmnxfw65c2dgis2vwhzg671y62irzvcl609vxwxcslhwwqc4r", + "sha256bin64": "0nx4ca2v1bgk25yjlfgn8vgdwwplyim6a0ai1hppy4yhm9mhppk7", "deps": { "gn": { "version": "2022-06-08", @@ -45,9 +45,9 @@ } }, "ungoogled-chromium": { - "version": "103.0.5060.114", - "sha256": "0rarcd2q1ggl10cw3vwjk7j9aka7i129a0qv8qr7751vy083as3p", - "sha256bin64": "1qxbnnnq0miizazprwynvxxvgaaw9dd9y7bssybvmga3g2c00fk9", + "version": "103.0.5060.134", + "sha256": "0wdmy15602qxrb403p8yyx69k7py85fbawdsgap1l6z4h4j2g2p4", + "sha256bin64": "143jc70cyns2bh5cizy32fdsfl6hq22rphx216vywhncdsd96cnw", "deps": { "gn": { "version": "2022-05-11", @@ -56,8 +56,8 @@ "sha256": "03dqfrdpf5xxl64dby3qmbwpzdq2gsa8g7xl438py3a629rgxg63" }, "ungoogled-patches": { - "rev": "103.0.5060.114-1", - "sha256": "11i7d480q21vcd9p14rc7rb408xwlg2nkj88dq0sfj2rz60lzy0a" + "rev": "103.0.5060.134-1", + "sha256": "00mpmyaa8bqxf1f4vhk1waxhjbhcwab8m1x1vf341al64f6bmr1r" } } } diff --git a/pkgs/applications/networking/instant-messengers/dino/default.nix b/pkgs/applications/networking/instant-messengers/dino/default.nix index 3e992899e43e..fff08699fa82 100644 --- a/pkgs/applications/networking/instant-messengers/dino/default.nix +++ b/pkgs/applications/networking/instant-messengers/dino/default.nix @@ -14,7 +14,7 @@ , qrencode , icu , gspell -, srtp, libnice, gnutls, gstreamer, gst-plugins-base, gst-plugins-good +, srtp, libnice, gnutls, gstreamer, gst-plugins-base, gst-plugins-good, webrtc-audio-processing }: stdenv.mkDerivation rec { @@ -65,6 +65,7 @@ stdenv.mkDerivation rec { gstreamer gst-plugins-base gst-plugins-good + webrtc-audio-processing ] ++ lib.optionals (!stdenv.isDarwin) [ xorg.libxcb xorg.libpthreadstubs diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix index 1835e59e86c2..4631cef04fa1 100644 --- a/pkgs/applications/networking/irc/weechat/default.nix +++ b/pkgs/applications/networking/irc/weechat/default.nix @@ -85,7 +85,7 @@ let on https://nixos.org/nixpkgs/manual/#sec-weechat . ''; license = lib.licenses.gpl3; - maintainers = with lib.maintainers; [ lovek323 lheckemann ]; + maintainers = with lib.maintainers; [ lovek323 ]; platforms = lib.platforms.unix; }; } diff --git a/pkgs/applications/networking/n8n/node-packages.nix b/pkgs/applications/networking/n8n/node-packages.nix index 21c95de397ad..9f062f72d909 100644 --- a/pkgs/applications/networking/n8n/node-packages.nix +++ b/pkgs/applications/networking/n8n/node-packages.nix @@ -175,31 +175,31 @@ let sha512 = "aK4s3Xxjrx3daZr3VylxejK3vG5ExXck5WOHDJ8in/k9AqlfIyFMMT1uG7u8mNjX+QRILTIn0/Xgschfh/dQ9g=="; }; }; - "@azure/msal-browser-2.27.0" = { + "@azure/msal-browser-2.28.0" = { name = "_at_azure_slash_msal-browser"; packageName = "@azure/msal-browser"; - version = "2.27.0"; + version = "2.28.0"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/msal-browser/-/msal-browser-2.27.0.tgz"; - sha512 = "PyATq2WvK+x32waRqqikym8wvn939iO9UhpFqhLwitNrfLa3PHUgJuuI9oLSQOS3/UzjYb8aqN+XzchU3n/ZuQ=="; + url = "https://registry.npmjs.org/@azure/msal-browser/-/msal-browser-2.28.0.tgz"; + sha512 = "d83BBMT6id+eAdox+M37PCVWYDiqd6BrXxvjAVI2xJluRoSJCZQvB02Bcg6QCSe3ruLUK6vGwMTe8p1cDExePQ=="; }; }; - "@azure/msal-common-7.1.0" = { + "@azure/msal-common-7.2.0" = { name = "_at_azure_slash_msal-common"; packageName = "@azure/msal-common"; - version = "7.1.0"; + version = "7.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/msal-common/-/msal-common-7.1.0.tgz"; - sha512 = "WyfqE5mY/rggjqvq0Q5DxLnA33KSb0vfsUjxa95rycFknI03L5GPYI4HTU9D+g0PL5TtsQGnV3xzAGq9BFCVJQ=="; + url = "https://registry.npmjs.org/@azure/msal-common/-/msal-common-7.2.0.tgz"; + sha512 = "+Oz8LKTOACDHqDmv+MZy/z+DZRH8RZbMjhadmvp0scQ0R75OrzZro+HkxifWhtDG8l1ViYkvV9NHb4pEZyajAQ=="; }; }; - "@azure/msal-node-1.11.0" = { + "@azure/msal-node-1.12.0" = { name = "_at_azure_slash_msal-node"; packageName = "@azure/msal-node"; - version = "1.11.0"; + version = "1.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/msal-node/-/msal-node-1.11.0.tgz"; - sha512 = "KW/XEexfCrPzdYbjY7NVmhq9okZT3Jvck55CGXpz9W5asxeq3EtrP45p+ZXtQVEfko0YJdolpCNqWUyXvanWZg=="; + url = "https://registry.npmjs.org/@azure/msal-node/-/msal-node-1.12.0.tgz"; + sha512 = "bNJe5xx3YXj7lrj9wUYl7HX4g1Be7s8VHjDhKPzOnlI54JnRKI+nQ95EmFBs3ckUYM9u82HUsHumDcB21YIC9w=="; }; }; "@azure/storage-blob-12.11.0" = { @@ -211,22 +211,22 @@ let sha512 = "na+FisoARuaOWaHWpmdtk3FeuTWf2VWamdJ9/TJJzj5ZdXPLC3juoDgFs6XVuJIoK30yuBpyFBEDXVRK4pB7Tg=="; }; }; - "@babel/parser-7.18.8" = { + "@babel/parser-7.18.9" = { name = "_at_babel_slash_parser"; packageName = "@babel/parser"; - version = "7.18.8"; + version = "7.18.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/parser/-/parser-7.18.8.tgz"; - sha512 = "RSKRfYX20dyH+elbJK2uqAkVyucL+xXzhqlMD5/ZXx+dAAwpyB7HsvnHe/ZUGOF+xLr5Wx9/JoXVTj6BQE2/oA=="; + url = "https://registry.npmjs.org/@babel/parser/-/parser-7.18.9.tgz"; + sha512 = "9uJveS9eY9DJ0t64YbIBZICtJy8a5QrDEVdiLCG97fVLpDTpGX7t8mMSb6OWw6Lrnjqj4O8zwjELX3dhoMgiBg=="; }; }; - "@babel/runtime-7.18.6" = { + "@babel/runtime-7.18.9" = { name = "_at_babel_slash_runtime"; packageName = "@babel/runtime"; - version = "7.18.6"; + version = "7.18.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.18.6.tgz"; - sha512 = "t9wi7/AW6XtKahAe20Yw0/mMljKq0B1r2fPdvaAdV/KPDZewFXdaaa6K7lxmZBZ8FBNpCiAT6iHPmd6QO9bKfQ=="; + url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.18.9.tgz"; + sha512 = "lkqXDcvlFT5rvEjiu6+QYO+1GXrEHRo2LOtS7E4GtX5ESIZOgepqsZBVIj6Pv+a6zqsya9VCgiK1KAK4BvJDAw=="; }; }; "@colors/colors-1.5.0" = { @@ -400,13 +400,13 @@ let sha512 = "sBpko86IrTscc39EvHUhL+c++81BVTsIZ3ETu/vG+cCdi0N6vb2DoahR67A9FI2CGnxRRHjnTfa3m6LulwNATA=="; }; }; - "@oclif/core-1.9.5" = { + "@oclif/core-1.12.0" = { name = "_at_oclif_slash_core"; packageName = "@oclif/core"; - version = "1.9.5"; + version = "1.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/@oclif/core/-/core-1.9.5.tgz"; - sha512 = "C605Cr4RhHTMXYApLxdVt/PL6IA5cguN6MPvsMjxkvBppk2Fvcsj05dtRdDqShskRpZzHtu65emG1tHy8TWPWQ=="; + url = "https://registry.npmjs.org/@oclif/core/-/core-1.12.0.tgz"; + sha512 = "TR7k5EaekRH+TI1KxpxGda6DirGmUjVi+rz/RBtVxXTyGS446ZHRjlmogU7TIfTGLd1fdS0w0Eo8AHPjd3kh1w=="; }; }; "@oclif/errors-1.3.5" = { @@ -688,6 +688,15 @@ let sha512 = "/THyiqyQAP9AfARo4pF+aCGcyiQ94tX/Is2I7HofNRqoYLgN1PBoOWu2/zTA5zMxzP5EFutMtWtGAFRKUe961Q=="; }; }; + "@types/lodash.intersection-4.4.7" = { + name = "_at_types_slash_lodash.intersection"; + packageName = "@types/lodash.intersection"; + version = "4.4.7"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/lodash.intersection/-/lodash.intersection-4.4.7.tgz"; + sha512 = "7ukD2s54bmRNNpiH9ApEErO4H6mB8+WmXFr/6RpP3e/n7h3UFhEJC7QwLcoWAqOrYCIRFMAAwDf3ambSsW8c5Q=="; + }; + }; "@types/lossless-json-1.0.1" = { name = "_at_types_slash_lossless-json"; packageName = "@types/lossless-json"; @@ -724,13 +733,13 @@ let sha512 = "/SNsDidUFCvqqcWDwxv2feww/yqhNeTRL5CVoL3jU4Goc4kKEL10T7Eye65ZqPNi4HRx8sAEX59pV1aEH7drNA=="; }; }; - "@types/node-18.0.3" = { + "@types/node-18.0.6" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "18.0.3"; + version = "18.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-18.0.3.tgz"; - sha512 = "HzNRZtp4eepNitP+BD6k2L6DROIDG4Q0fm4x+dwfsr6LGmROENnok75VGw40628xf+iR24WeMFcHuuBDUAzzsQ=="; + url = "https://registry.npmjs.org/@types/node/-/node-18.0.6.tgz"; + sha512 = "/xUq6H2aQm261exT6iZTMifUySEt4GR5KX8eYyY+C4MSNPqSh9oNIP7tz2GLKTlFaiBbgZNxffoR3CVRG+cljw=="; }; }; "@types/node-fetch-2.6.2" = { @@ -841,13 +850,13 @@ let sha512 = "QcJ5ZczaXAqbVD3o8mw/mEBhRvO5UAdTtbvgwL/OgoWubvNBh6/MxLBAigtcgIFaq3shon9m3POIxQaLQt4fxQ=="; }; }; - "@vue/compiler-sfc-2.7.5" = { + "@vue/compiler-sfc-2.7.7" = { name = "_at_vue_slash_compiler-sfc"; packageName = "@vue/compiler-sfc"; - version = "2.7.5"; + version = "2.7.7"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-2.7.5.tgz"; - sha512 = "f2xlkMzBLbTAUy13N4aJBnmb7+86WJqoGqHDibkGHd1/CabpNVvzhpBFlfWJjBrGWIcWywNGgGSuoWzpCUuD4w=="; + url = "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-2.7.7.tgz"; + sha512 = "Ah8dIuo6ZVPHTq9+s4rBU/YpJu3vGSNyeOTCrPrVPQnkUfnT5Ig+IKBhePuQWFXguYb2TuEWrEfiiX9DZ3aJlA=="; }; }; "abbrev-1.1.1" = { @@ -1201,6 +1210,15 @@ let sha512 = "h7diyELoq692AA4oqO50ULoYKIomUdzuQ+NW+eFPwIX0xzVbXEu9cIcgzZ3TYNVbpkGtcNKh51aRfAQNef7HVA=="; }; }; + "available-typed-arrays-1.0.5" = { + name = "available-typed-arrays"; + packageName = "available-typed-arrays"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz"; + sha512 = "DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw=="; + }; + }; "avsc-5.7.4" = { name = "avsc"; packageName = "avsc"; @@ -1210,13 +1228,13 @@ let sha512 = "z4oo33lmnvvNRqfUe3YjDGGpqu/L2+wXBIhMtwq6oqZ+exOUAkQYM6zd2VWKF7AIlajOF8ZZuPFfryTG9iLC/w=="; }; }; - "aws-sdk-2.1173.0" = { + "aws-sdk-2.1178.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.1173.0"; + version = "2.1178.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1173.0.tgz"; - sha512 = "RR5OENCE5N7J9sp6Are+8WacIa4sGgeVi3K0wezV97nDTHXJD82hSiaRCCN/xGfnB/GcWtPIBCetRD2tpiCN2w=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1178.0.tgz"; + sha512 = "ZsFuVbTp9aakAIZ7lTJspuCzSw5VRIDF0bUmSZmE2tc/X/haTu/TrMeWgwPjyLkQtdhfjChCyI71V+ADqFkjsA=="; }; }; "aws-sign2-0.7.0" = { @@ -2011,13 +2029,13 @@ let sha512 = "P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg=="; }; }; - "commander-9.3.0" = { + "commander-9.4.0" = { name = "commander"; packageName = "commander"; - version = "9.3.0"; + version = "9.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/commander/-/commander-9.3.0.tgz"; - sha512 = "hv95iU5uXPbK83mjrJKuZyFM/LBAoCV/XhVGkS5Je6tl7sxr6A0ITMw5WoRV46/UaJ46Nllm3Xt7IaJhXTIkzw=="; + url = "https://registry.npmjs.org/commander/-/commander-9.4.0.tgz"; + sha512 = "sRPT+umqkz90UA8M1yqYfnHlZA7fF6nSphDtxeywPZ49ysjxDQybzk13CL+mXekDRG92skbcqCLVovuCusNmFw=="; }; }; "commist-1.1.0" = { @@ -2182,13 +2200,13 @@ let sha512 = "Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ=="; }; }; - "core-js-3.23.4" = { + "core-js-3.23.5" = { name = "core-js"; packageName = "core-js"; - version = "3.23.4"; + version = "3.23.5"; src = fetchurl { - url = "https://registry.npmjs.org/core-js/-/core-js-3.23.4.tgz"; - sha512 = "vjsKqRc1RyAJC3Ye2kYqgfdThb3zYnx9CrqoCcjMOENMtQPC7ZViBvlDxwYU/2z2NI/IPuiXw5mT4hWhddqjzQ=="; + url = "https://registry.npmjs.org/core-js/-/core-js-3.23.5.tgz"; + sha512 = "7Vh11tujtAZy82da4duVreQysIoO2EvVrur7y6IzZkH1IHPSekuDi8Vuw1+YKjkbfWLRD7Nc9ICQ/sIUDutcyg=="; }; }; "core-util-is-1.0.2" = { @@ -2443,13 +2461,13 @@ let sha512 = "XwE+iZ4D6ZUB7mfYRMb5wByE8L74HCn30FBN7sWnXksWc1LO1bPDl67pBR9o/kC4z/xSNAwkMYcGgqDV3BE3Hw=="; }; }; - "denque-2.0.1" = { + "denque-2.1.0" = { name = "denque"; packageName = "denque"; - version = "2.0.1"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/denque/-/denque-2.0.1.tgz"; - sha512 = "tfiWc6BQLXNLpNiR5iGd0Ocu3P3VpxfzFiqubLgMfhfOw9WyvgJBd46CClNn9k3qfbjvT//0cf7AlYRX/OslMQ=="; + url = "https://registry.npmjs.org/denque/-/denque-2.1.0.tgz"; + sha512 = "HVQE3AAb/pxF8fQAoiqpvg9i3evqug3hoiwakOyZAwJm+6vZehbkYXZ0l4JxS+I3QxM97v5aaRNhj8v5oBhekw=="; }; }; "depd-2.0.0" = { @@ -3739,6 +3757,15 @@ let sha512 = "dOWoqflvcydARa360Gvv18DZ/gRuHKi2NU/wU5X1ZFzdYfH29nkiNZsF3mp4OJ3H4yo9Mx8A/uAGNzpzPN3yBA=="; }; }; + "is-arguments-1.1.1" = { + name = "is-arguments"; + packageName = "is-arguments"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.1.tgz"; + sha512 = "8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA=="; + }; + }; "is-arrayish-0.3.2" = { name = "is-arrayish"; packageName = "is-arrayish"; @@ -3838,6 +3865,15 @@ let sha512 = "zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="; }; }; + "is-generator-function-1.0.10" = { + name = "is-generator-function"; + packageName = "is-generator-function"; + version = "1.0.10"; + src = fetchurl { + url = "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.0.10.tgz"; + sha512 = "jsEjy9l3yiXEQ+PsXdmBwEPcOxaXWLspKdplFUVI9vq1iZgIekeC0L167qeu86czQaxed3q/Uzuw0swL0irL8A=="; + }; + }; "is-glob-3.1.0" = { name = "is-glob"; packageName = "is-glob"; @@ -3991,6 +4027,15 @@ let sha512 = "C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg=="; }; }; + "is-typed-array-1.1.9" = { + name = "is-typed-array"; + packageName = "is-typed-array"; + version = "1.1.9"; + src = fetchurl { + url = "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.9.tgz"; + sha512 = "kfrlnTTn8pZkfpJMUgYD7YZ3qzeJgWUn8XfVYBARc4wnmNOmLbmuuaAs3q5fvB0UJOn6yHAKaGTPM7d6ezoD/A=="; + }; + }; "is-typedarray-1.0.0" = { name = "is-typedarray"; packageName = "is-typedarray"; @@ -4360,13 +4405,13 @@ let sha512 = "xOqorG21Va+3CjpFOfFTU7SWohHH2uIX9ZY4Byz6J+lvpfvc486tOAT/G9GfbrKtJ9O7NCX9o0aC2lxqbnZ9EA=="; }; }; - "libphonenumber-js-1.10.8" = { + "libphonenumber-js-1.10.9" = { name = "libphonenumber-js"; packageName = "libphonenumber-js"; - version = "1.10.8"; + version = "1.10.9"; src = fetchurl { - url = "https://registry.npmjs.org/libphonenumber-js/-/libphonenumber-js-1.10.8.tgz"; - sha512 = "MGgHrKRGE7sg7y0DikHybRDgTXcYv4HL+WwhDm5UAiChCNb5tcy5OEaU8XTTt5bDBwhZGCJNxoGMVBpZ4RfhIg=="; + url = "https://registry.npmjs.org/libphonenumber-js/-/libphonenumber-js-1.10.9.tgz"; + sha512 = "BvPlectKyHuA8xVBU4PerKdI1t+l71F/GCh6CQhe4j5bTwibF6Jcle88kDcyvq4aW55CXxWZg7yIYhzmjgrjkQ=="; }; }; "libqp-1.1.0" = { @@ -4477,6 +4522,15 @@ let sha512 = "W3Bx6mdkRTGtlJISOvVD/lbqjTlPPUDTMnlXZFnVwi9NKJ6tiAk6LVdlhZMm17VZisqhKcgzpO5Wz91PCt5b0w=="; }; }; + "lodash.intersection-4.4.0" = { + name = "lodash.intersection"; + packageName = "lodash.intersection"; + version = "4.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.intersection/-/lodash.intersection-4.4.0.tgz"; + sha512 = "N+L0cCfnqMv6mxXtSPeKt+IavbOBBSiAEkKyLasZ8BVcP9YXQgxLO12oPR8OyURwKV8l5vJKiE1M8aS70heuMg=="; + }; + }; "lodash.isarguments-3.1.0" = { name = "lodash.isarguments"; packageName = "lodash.isarguments"; @@ -4549,6 +4603,15 @@ let sha512 = "0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ=="; }; }; + "lodash.omit-4.5.0" = { + name = "lodash.omit"; + packageName = "lodash.omit"; + version = "4.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.omit/-/lodash.omit-4.5.0.tgz"; + sha512 = "XeqSp49hNGmlkj2EJlfrQFIzQ6lXdNro9sddtQzcJY8QaoC2GO0DT7xaIokHeyM+mIT0mPMlPvkYzg2xCuHdZg=="; + }; + }; "lodash.once-4.1.1" = { name = "lodash.once"; packageName = "lodash.once"; @@ -4567,6 +4630,15 @@ let sha512 = "4hNPN5jlm/N/HLMCO43v8BXKq9Z7QdAGc/VGrRD61w8gN9g/6jF9A4L1pbUgBLCffi0w9VsXfTOij5x8iTyFvg=="; }; }; + "lodash.split-4.4.2" = { + name = "lodash.split"; + packageName = "lodash.split"; + version = "4.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.split/-/lodash.split-4.4.2.tgz"; + sha512 = "kn1IDX0aHfg0FsnPIyxCHTamZXt3YK3aExRH1LW8YhzP6+sCldTm8+E4aIg+nSmM6R4eqdWGrXWtfYI961bwIw=="; + }; + }; "lodash.throttle-4.1.1" = { name = "lodash.throttle"; packageName = "lodash.throttle"; @@ -5080,49 +5152,49 @@ let sha512 = "z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q=="; }; }; - "n8n-core-0.126.0" = { + "n8n-core-0.127.0" = { name = "n8n-core"; packageName = "n8n-core"; - version = "0.126.0"; + version = "0.127.0"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-core/-/n8n-core-0.126.0.tgz"; - sha512 = "+vXSQenGtjBBT+i5N3GZRYtbTxqXcWDOSPIZdO4HLVkt7YzfjF0ZFAILgs1baGaSEsXZuM6OE8uk5TKsjnUYKg=="; + url = "https://registry.npmjs.org/n8n-core/-/n8n-core-0.127.0.tgz"; + sha512 = "f/Ye4fN5/QL+MMEpXto/FYA4MiT2n2Dq2Kk5twoCxpF8221n+sg/i5s9byVkiJqC0gvxJSnhDI3d+ZFD3++rvA=="; }; }; - "n8n-design-system-0.26.0" = { + "n8n-design-system-0.27.0" = { name = "n8n-design-system"; packageName = "n8n-design-system"; - version = "0.26.0"; + version = "0.27.0"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-design-system/-/n8n-design-system-0.26.0.tgz"; - sha512 = "wiD3V2Fkqs1jgNJBl+nvrbTDmDFVGyxJ0N6PY8/2tO1TxwWbWO03uj1dbGjzuepYGChyMnCM8h2pZplYRJbemw=="; + url = "https://registry.npmjs.org/n8n-design-system/-/n8n-design-system-0.27.0.tgz"; + sha512 = "+nKIqKIsfmhympdv/fcEcee7mBf56WbPyEOgPY2thGR+WXCahi4WWB+2uPv9AhPmB4O3q+KWxJmqCDYUW1NYNw=="; }; }; - "n8n-editor-ui-0.152.0" = { + "n8n-editor-ui-0.153.0" = { name = "n8n-editor-ui"; packageName = "n8n-editor-ui"; - version = "0.152.0"; + version = "0.153.0"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-editor-ui/-/n8n-editor-ui-0.152.0.tgz"; - sha512 = "Gz65kORkN4aNtwcHxc9rOugX+hPoG5g6v4+Fv5sEW40ac6jxw9ZT3ApkJ8+UpE/7jvoLFmzhks8gar1I85Yh3w=="; + url = "https://registry.npmjs.org/n8n-editor-ui/-/n8n-editor-ui-0.153.0.tgz"; + sha512 = "850ygJNB6IYjIAF//npveNDvcG0pXxrJ/UYZivAsW5tdTPRXHQ37R/TeTsWDI3TrYWGtrWi0cj/4k7M68W/YYQ=="; }; }; - "n8n-nodes-base-0.184.0" = { + "n8n-nodes-base-0.185.0" = { name = "n8n-nodes-base"; packageName = "n8n-nodes-base"; - version = "0.184.0"; + version = "0.185.0"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-nodes-base/-/n8n-nodes-base-0.184.0.tgz"; - sha512 = "9jrZejz8INnkU8avs+BohvrlQ+YZcJnh1CIy0m7Q5+mkYQE8t/aoazU/k79TL93QXRfxYrNNa/34DtqbMgkcWw=="; + url = "https://registry.npmjs.org/n8n-nodes-base/-/n8n-nodes-base-0.185.0.tgz"; + sha512 = "RywDQYNtidBsH/gItKF6qKipEUr8Oj5t6z3O57pQGLRyDYbxqpNQjKB0iqLaflE/UqTZthPmFvUnOiYgbZa9jQ=="; }; }; - "n8n-workflow-0.108.0" = { + "n8n-workflow-0.109.0" = { name = "n8n-workflow"; packageName = "n8n-workflow"; - version = "0.108.0"; + version = "0.109.0"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-workflow/-/n8n-workflow-0.108.0.tgz"; - sha512 = "l9fXbNcXsMZkRZU9Ourn3MxCNTujub2ScZBXNefvvwPlto1Mr8602JpNP0v0dKYFd3+gJefgWXXCUKkfkuqTGQ=="; + url = "https://registry.npmjs.org/n8n-workflow/-/n8n-workflow-0.109.0.tgz"; + sha512 = "kosBVbCui8OzpiVfpo9I1BOb0ZtQDGh826Omii+xJs0UXDqDP5EeRq1NCBK5zx2po4x3FpDNg+zxKrKpPgUnXA=="; }; }; "named-placeholders-1.1.2" = { @@ -7141,13 +7213,13 @@ let sha512 = "VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug=="; }; }; - "sqlite3-5.0.8" = { + "sqlite3-5.0.9" = { name = "sqlite3"; packageName = "sqlite3"; - version = "5.0.8"; + version = "5.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/sqlite3/-/sqlite3-5.0.8.tgz"; - sha512 = "f2ACsbSyb2D1qFFcqIXPfFscLtPVOWJr5GmUzYxf4W+0qelu5MWrR+FAQE1d5IUArEltBrzSDxDORG8P/IkqyQ=="; + url = "https://registry.npmjs.org/sqlite3/-/sqlite3-5.0.9.tgz"; + sha512 = "e2lEKevUF65UJu4IIuuFytgW7yNMkmCkfyn66jXWeb7OcdHvRo7nXhF+IQ25iW6x2grB0DyKdGCpx8Rd8EkA2Q=="; }; }; "sqlstring-2.3.3" = { @@ -7375,22 +7447,22 @@ let sha512 = "ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w=="; }; }; - "swagger-ui-dist-4.12.0" = { + "swagger-ui-dist-4.13.0" = { name = "swagger-ui-dist"; packageName = "swagger-ui-dist"; - version = "4.12.0"; + version = "4.13.0"; src = fetchurl { - url = "https://registry.npmjs.org/swagger-ui-dist/-/swagger-ui-dist-4.12.0.tgz"; - sha512 = "B0Iy2ueXtbByE6OOyHTi3lFQkpPi/L7kFOKFeKTr44za7dJIELa9kzaca6GkndCgpK1QTjArnoXG+aUy0XQp1w=="; + url = "https://registry.npmjs.org/swagger-ui-dist/-/swagger-ui-dist-4.13.0.tgz"; + sha512 = "5yqhkUU9uV5oT/MTMBeSgDGI0Vx6eCOU43AszQBs88poI8OB1v+FoXEFHv+NaBbEfTkXCMWlAJrH6iWyDzLETQ=="; }; }; - "swagger-ui-express-4.4.0" = { + "swagger-ui-express-4.5.0" = { name = "swagger-ui-express"; packageName = "swagger-ui-express"; - version = "4.4.0"; + version = "4.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/swagger-ui-express/-/swagger-ui-express-4.4.0.tgz"; - sha512 = "1CzRkHG386VQMVZK406jcpgnW2a9A5A/NiAjKhsFTQqUBWRF+uGbXTU/mA7WSV3mTzyOQDvjBdWP/c2qd5lqKw=="; + url = "https://registry.npmjs.org/swagger-ui-express/-/swagger-ui-express-4.5.0.tgz"; + sha512 = "DHk3zFvsxrkcnurGvQlAcLuTDacAVN1JHKDgcba/gr2NFRE4HGwP1YeHIXMiGznkWR4AeS7X5vEblNn4QljuNA=="; }; }; "tar-6.1.11" = { @@ -7897,6 +7969,15 @@ let sha512 = "QXo+O/QkLP/x1nyi54uQiG0XrODxdysuQvE5dtVqv7F5K2Qb6FsN+qbr6KhF5wQ20tfcV3VQp0/2x1e1MRSPWg=="; }; }; + "util-0.12.4" = { + name = "util"; + packageName = "util"; + version = "0.12.4"; + src = fetchurl { + url = "https://registry.npmjs.org/util/-/util-0.12.4.tgz"; + sha512 = "bxZ9qtSlGUWSOy9Qa9Xgk11kSslpuZwaxCg4sNIDj6FLucDab2JxnHwyNTCpHMtK1MjoQiWQ6DiUMZYbSrO+Sw=="; + }; + }; "util-deprecate-1.0.2" = { name = "util-deprecate"; packageName = "util-deprecate"; @@ -8005,13 +8086,13 @@ let sha512 = "AuECTSvwu2OHLAZYhG716YzwodKCIJxB6u1zG7PgSQwIgAlEaoXH52bxdcvT8GkGjnYK7r7yWDW0m0sOsPuBjQ=="; }; }; - "vue-2.7.5" = { + "vue-2.7.7" = { name = "vue"; packageName = "vue"; - version = "2.7.5"; + version = "2.7.7"; src = fetchurl { - url = "https://registry.npmjs.org/vue/-/vue-2.7.5.tgz"; - sha512 = "mUDXXgBIFr9dk0k/3dpB6wtnCxRhe9mbGxWLtha9mTUrEWkdkZW1d58vl98VKWH067NA8f1Wj4Qwq7y7DDYfyw=="; + url = "https://registry.npmjs.org/vue/-/vue-2.7.7.tgz"; + sha512 = "osfkncsGCWqtch+YWYxbqTNQ9hl/UQ6TFRkdmK/VqAjuMpxzr5QotFsYpmJ1AB1ez2LJeIKXDmtMkXUotMOTsA=="; }; }; "vue-color-2.8.1" = { @@ -8050,6 +8131,15 @@ let sha512 = "N3FYX9Z6rZdTeP3BOBz2LMxlWo9WRmPF6SOsYzz+tEuUH0QjX8UD7c1X95J8pZ7cFvbh9QflVujYQRqRiiwoAg=="; }; }; + "vue2-teleport-1.0.1" = { + name = "vue2-teleport"; + packageName = "vue2-teleport"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/vue2-teleport/-/vue2-teleport-1.0.1.tgz"; + sha512 = "hbY/Q0x8qXGFxo6h4KU4YYesUcN+uUjliqqC0PoNSgpcbS2QRb3qXi+7XMTgLYs0a8i7o1H6Mu43UV4Vbgkhgw=="; + }; + }; "webidl-conversions-3.0.1" = { name = "webidl-conversions"; packageName = "webidl-conversions"; @@ -8095,6 +8185,15 @@ let sha512 = "B+enWhmw6cjfVC7kS8Pj9pCrKSc5txArRyaYGe088shv/FGWH+0Rjx/xPgtsWfsUtS27FkP697E4DDhgrgoc0Q=="; }; }; + "which-typed-array-1.1.8" = { + name = "which-typed-array"; + packageName = "which-typed-array"; + version = "1.1.8"; + src = fetchurl { + url = "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.8.tgz"; + sha512 = "Jn4e5PItbcAHyLoRDwvPj1ypu27DJbtdYXUa5zsinrUx77Uvfb0cXwwnGMTn7cjUfhhqgVQnVJCwF+7cgU7tpw=="; + }; + }; "wide-align-1.1.5" = { name = "wide-align"; packageName = "wide-align"; @@ -8185,13 +8284,13 @@ let sha512 = "l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ=="; }; }; - "ws-7.5.8" = { + "ws-7.5.9" = { name = "ws"; packageName = "ws"; - version = "7.5.8"; + version = "7.5.9"; src = fetchurl { - url = "https://registry.npmjs.org/ws/-/ws-7.5.8.tgz"; - sha512 = "ri1Id1WinAX5Jqn9HejiGb8crfRio0Qgu8+MtL36rlTA6RLsMdWt1Az/19A2Qij6uSHUMphEFaTKa4WG+UNHNw=="; + url = "https://registry.npmjs.org/ws/-/ws-7.5.9.tgz"; + sha512 = "F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q=="; }; }; "xlsx-0.17.5" = { @@ -8416,10 +8515,10 @@ in n8n = nodeEnv.buildNodePackage { name = "n8n"; packageName = "n8n"; - version = "0.186.0"; + version = "0.187.1"; src = fetchurl { - url = "https://registry.npmjs.org/n8n/-/n8n-0.186.0.tgz"; - sha512 = "2AGjWTEw0vvySVoBjuZogDXEtn0QTFhaOXF/l99jA+xI3P/QwAHGycdv/uBG9f5gMsvHtypSNX5lkx0NLUKWhg=="; + url = "https://registry.npmjs.org/n8n/-/n8n-0.187.1.tgz"; + sha512 = "d/7NHER6mVhierIcq1IaaftZ0kIQN7IbL/vnPu1xHVx/vCFAI1oXTk645UM+5Jlxqrn6TD4LrAcNj0rqZQRBUw=="; }; dependencies = [ sources."@apidevtools/json-schema-ref-parser-8.0.0" @@ -8504,17 +8603,17 @@ in sources."tslib-2.4.0" ]; }) - sources."@azure/msal-browser-2.27.0" - sources."@azure/msal-common-7.1.0" - sources."@azure/msal-node-1.11.0" + sources."@azure/msal-browser-2.28.0" + sources."@azure/msal-common-7.2.0" + sources."@azure/msal-node-1.12.0" (sources."@azure/storage-blob-12.11.0" // { dependencies = [ sources."@azure/core-tracing-1.0.0-preview.13" sources."tslib-2.4.0" ]; }) - sources."@babel/parser-7.18.8" - sources."@babel/runtime-7.18.6" + sources."@babel/parser-7.18.9" + sources."@babel/runtime-7.18.9" sources."@colors/colors-1.5.0" (sources."@dabh/diagnostics-2.0.3" // { dependencies = [ @@ -8548,7 +8647,7 @@ in sources."tslib-2.4.0" ]; }) - (sources."@oclif/core-1.9.5" // { + (sources."@oclif/core-1.12.0" // { dependencies = [ sources."tslib-2.4.0" ]; @@ -8599,11 +8698,12 @@ in sources."@types/json-schema-7.0.11" sources."@types/jsonwebtoken-8.5.8" sources."@types/lodash-4.14.182" + sources."@types/lodash.intersection-4.4.7" sources."@types/lossless-json-1.0.1" sources."@types/mime-1.3.2" sources."@types/minimatch-3.0.5" sources."@types/multer-1.4.7" - sources."@types/node-18.0.3" + sources."@types/node-18.0.6" (sources."@types/node-fetch-2.6.2" // { dependencies = [ sources."form-data-3.0.1" @@ -8620,7 +8720,7 @@ in sources."@types/tough-cookie-2.3.8" sources."@types/tunnel-0.0.3" sources."@types/yamljs-0.2.31" - sources."@vue/compiler-sfc-2.7.5" + sources."@vue/compiler-sfc-2.7.7" sources."abbrev-1.1.1" sources."accepts-1.3.8" sources."access-control-1.0.1" @@ -8671,8 +8771,9 @@ in sources."semver-6.3.0" ]; }) + sources."available-typed-arrays-1.0.5" sources."avsc-5.7.4" - (sources."aws-sdk-2.1173.0" // { + (sources."aws-sdk-2.1178.0" // { dependencies = [ sources."buffer-4.9.2" sources."events-1.1.1" @@ -8845,7 +8946,7 @@ in sources."cookie-0.4.1" sources."cookie-parser-1.4.6" sources."cookie-signature-1.0.6" - sources."core-js-3.23.4" + sources."core-js-3.23.5" sources."core-util-is-1.0.3" sources."crc-32-1.2.2" sources."cron-1.7.2" @@ -9059,6 +9160,7 @@ in sources."ip-regex-2.1.0" sources."ipaddr.js-1.9.1" sources."is-absolute-1.0.0" + sources."is-arguments-1.1.1" sources."is-arrayish-0.3.2" sources."is-bigint-1.0.4" sources."is-binary-path-2.1.0" @@ -9070,6 +9172,7 @@ in sources."is-docker-2.2.1" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-3.0.0" + sources."is-generator-function-1.0.10" sources."is-glob-4.0.3" sources."is-nan-1.3.2" sources."is-negated-glob-1.0.0" @@ -9086,6 +9189,7 @@ in sources."is-stream-2.0.1" sources."is-string-1.0.7" sources."is-symbol-1.0.4" + sources."is-typed-array-1.1.9" sources."is-typedarray-1.0.0" sources."is-unc-path-1.0.0" sources."is-weakref-1.0.2" @@ -9135,7 +9239,7 @@ in sources."iconv-lite-0.6.3" ]; }) - sources."libphonenumber-js-1.10.8" + sources."libphonenumber-js-1.10.9" sources."libqp-1.1.0" sources."limiter-1.1.5" sources."linkify-it-4.0.0" @@ -9156,6 +9260,7 @@ in sources."lodash.flatten-4.4.0" sources."lodash.get-4.4.2" sources."lodash.includes-4.3.0" + sources."lodash.intersection-4.4.0" sources."lodash.isarguments-3.1.0" sources."lodash.isboolean-3.0.3" sources."lodash.isequal-4.5.0" @@ -9164,8 +9269,10 @@ in sources."lodash.isplainobject-4.0.6" sources."lodash.isstring-4.0.1" sources."lodash.merge-4.6.2" + sources."lodash.omit-4.5.0" sources."lodash.once-4.1.1" sources."lodash.set-4.3.2" + sources."lodash.split-4.4.2" sources."lodash.throttle-4.1.1" sources."lodash.uniq-4.5.0" sources."lodash.uniqby-4.7.0" @@ -9250,27 +9357,27 @@ in sources."ms-2.1.2" (sources."mssql-8.1.2" // { dependencies = [ - sources."commander-9.3.0" + sources."commander-9.4.0" ]; }) sources."multer-1.4.5-lts.1" sources."mute-stream-0.0.8" (sources."mysql2-2.3.3" // { dependencies = [ - sources."denque-2.0.1" + sources."denque-2.1.0" sources."iconv-lite-0.6.3" ]; }) sources."mz-2.7.0" - sources."n8n-core-0.126.0" - sources."n8n-design-system-0.26.0" - sources."n8n-editor-ui-0.152.0" - (sources."n8n-nodes-base-0.184.0" // { + sources."n8n-core-0.127.0" + sources."n8n-design-system-0.27.0" + sources."n8n-editor-ui-0.153.0" + (sources."n8n-nodes-base-0.185.0" // { dependencies = [ sources."iconv-lite-0.6.3" ]; }) - sources."n8n-workflow-0.108.0" + sources."n8n-workflow-0.109.0" (sources."named-placeholders-1.1.2" // { dependencies = [ sources."lru-cache-4.1.5" @@ -9548,7 +9655,7 @@ in sources."shelljs-0.8.5" (sources."showdown-2.1.0" // { dependencies = [ - sources."commander-9.3.0" + sources."commander-9.4.0" ]; }) sources."side-channel-1.0.4" @@ -9580,7 +9687,7 @@ in ]; }) sources."sprintf-js-1.0.3" - sources."sqlite3-5.0.8" + sources."sqlite3-5.0.9" sources."sqlstring-2.3.3" sources."sse-channel-3.1.1" sources."ssf-0.11.2" @@ -9617,8 +9724,8 @@ in ]; }) sources."supports-preserve-symlinks-flag-1.0.0" - sources."swagger-ui-dist-4.12.0" - sources."swagger-ui-express-4.4.0" + sources."swagger-ui-dist-4.13.0" + sources."swagger-ui-express-4.5.0" (sources."tar-6.1.11" // { dependencies = [ sources."mkdirp-1.0.4" @@ -9718,6 +9825,7 @@ in ]; }) sources."utf8-2.1.2" + sources."util-0.12.4" sources."util-deprecate-1.0.2" sources."util.promisify-1.1.1" sources."utils-merge-1.0.1" @@ -9732,16 +9840,18 @@ in ]; }) sources."vm2-3.9.10" - sources."vue-2.7.5" + sources."vue-2.7.7" sources."vue-color-2.8.1" sources."vue-fragment-1.5.1" sources."vue-i18n-8.27.2" sources."vue2-boring-avatars-0.3.4" + sources."vue2-teleport-1.0.1" sources."webidl-conversions-3.0.1" sources."whatwg-url-5.0.0" sources."which-1.3.1" sources."which-boxed-primitive-1.0.2" sources."which-module-2.0.0" + sources."which-typed-array-1.1.8" sources."wide-align-1.1.5" sources."widest-line-3.1.0" (sources."winston-3.8.1" // { @@ -9759,7 +9869,7 @@ in sources."wordwrap-1.0.0" sources."wrap-ansi-7.0.0" sources."wrappy-1.0.2" - sources."ws-7.5.8" + sources."ws-7.5.9" sources."xlsx-0.17.5" sources."xml2js-0.4.23" sources."xmlbuilder-11.0.1" diff --git a/pkgs/applications/networking/opsdroid/default.nix b/pkgs/applications/networking/opsdroid/default.nix index 9b5b27e7ca49..2b3cbce2cb4e 100644 --- a/pkgs/applications/networking/opsdroid/default.nix +++ b/pkgs/applications/networking/opsdroid/default.nix @@ -29,7 +29,7 @@ python3Packages.buildPythonPackage rec { meta = with lib; { description = "An open source chat-ops bot framework"; homepage = "https://opsdroid.dev"; - maintainers = with maintainers; [ fpletz globin willibutz lheckemann ]; + maintainers = with maintainers; [ fpletz globin willibutz ]; license = licenses.asl20; platforms = platforms.unix; }; diff --git a/pkgs/applications/science/biology/dssp/default.nix b/pkgs/applications/science/biology/dssp/default.nix new file mode 100644 index 000000000000..762b0515e85c --- /dev/null +++ b/pkgs/applications/science/biology/dssp/default.nix @@ -0,0 +1,25 @@ +{ lib, stdenv, fetchFromGitHub, boost, cmake, libcifpp, zlib, }: + +stdenv.mkDerivation rec { + pname = "dssp"; + version = "4.0.5"; + + src = fetchFromGitHub { + owner = "PDB-REDO"; + repo = pname; + rev = "v${version}"; + sha256 = "1x35rdcm4fch66pjbmy73lv0gdb6g9y3v023a66512a6nzsqjsir"; + }; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ boost libcifpp zlib ]; + + meta = with lib; { + description = "Calculate the most likely secondary structure assignment given the 3D structure of a protein"; + homepage = "https://github.com/PDB-REDO/dssp"; + license = licenses.bsd2; + maintainers = with maintainers; [ natsukium ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix b/pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix index f1d34062d2aa..6b5f04fe7349 100644 --- a/pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix +++ b/pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, ninja, pkg-config, python3Packages +{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, ninja, pkg-config, python3Packages , boost, rapidjson, qtbase, qtsvg, igraph, spdlog, wrapQtAppsHook , graphviz, llvmPackages, z3 }: @@ -13,6 +13,18 @@ stdenv.mkDerivation rec { rev = "v${version}"; sha256 = "sha256-uNpELHhSAVRJL/4iypvnl3nX45SqB419r37lthd2WmQ="; }; + + patches = [ + (fetchpatch { + # Fix build with python 3.10 + # https://github.com/emsec/hal/pull/463 + name = "hal-fix-python-3.10.patch"; + url = "https://github.com/emsec/hal/commit/f695f55cb2209676ef76366185b7c419417fbbc9.patch"; + sha256 = "sha256-HsCdG3tPllUsLw6kQtGaaEGkEHqZPSC2v9k6ycO2I/8="; + includes = [ "plugins/gui/src/python/python_context.cpp" ]; + }) + ]; + # make sure bundled dependencies don't get in the way - install also otherwise # copies them in full to the output, bloating the package postPatch = '' diff --git a/pkgs/applications/science/misc/root/default.nix b/pkgs/applications/science/misc/root/default.nix index 872438158d66..3316284349bc 100644 --- a/pkgs/applications/science/misc/root/default.nix +++ b/pkgs/applications/science/misc/root/default.nix @@ -40,13 +40,27 @@ , noSplash ? false }: +let + + _llvm_9 = llvm_9.overrideAttrs (prev: { + patches = (prev.patches or []) ++ [ + (fetchpatch { + url = "https://github.com/root-project/root/commit/a9c961cf4613ff1f0ea50f188e4a4b0eb749b17d.diff"; + stripLen = 3; + hash = "sha256-LH2RipJICEDWOr7JzX5s0QiUhEwXNMFEJihYKy9qWpo="; + }) + ]; + }); + +in + stdenv.mkDerivation rec { pname = "root"; - version = "6.24.06"; + version = "6.26.04"; src = fetchurl { url = "https://root.cern.ch/download/root_v${version}.source.tar.gz"; - sha256 = "sha256-kH9p9LrKHk8w7rSXlZjKdZm2qoA8oEboDiW2u6oO9SI="; + hash = "sha256-onHPgngtbtLIfqXu9mgYA/LmnhezA2352GNjbpNYQh4="; }; nativeBuildInputs = [ makeWrapper cmake pkg-config git ]; @@ -59,7 +73,7 @@ stdenv.mkDerivation rec { zstd lapack libxml2 - llvm_9 + _llvm_9 lz4 xz gsl @@ -80,13 +94,6 @@ stdenv.mkDerivation rec { patches = [ ./sw_vers.patch - - # Fix builtin_llvm=OFF support - (fetchpatch { - url = "https://github.com/root-project/root/commit/0cddef5d3562a89fe254e0036bb7d5ca8a5d34d2.diff"; - excludes = [ "interpreter/cling/tools/plugins/clad/CMakeLists.txt" ]; - sha256 = "sha256-VxWUbxRHB3O6tERFQdbGI7ypDAZD3sjSi+PYfu1OAbM="; - }) ]; # Fix build against vanilla LLVM 9 diff --git a/pkgs/applications/version-management/git-and-tools/git-machete/default.nix b/pkgs/applications/version-management/git-and-tools/git-machete/default.nix index 1e2af3023c2f..d0fabf46b65c 100644 --- a/pkgs/applications/version-management/git-and-tools/git-machete/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-machete/default.nix @@ -12,13 +12,13 @@ buildPythonApplication rec { pname = "git-machete"; - version = "3.11.1"; + version = "3.11.2"; src = fetchFromGitHub { owner = "virtuslab"; repo = pname; rev = "v${version}"; - sha256 = "sha256-BhR1dE6+K7UKaCbLmWPtLMyq0oIj/xYenXp5s7kRINc="; + sha256 = "sha256-alSok5/qcAOBUTNlGjeVSEbT4xW+HzPWj59njfXpG6w="; }; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/version-management/git-repo/default.nix b/pkgs/applications/version-management/git-repo/default.nix index ad41afe5ac15..f680fc6b1438 100644 --- a/pkgs/applications/version-management/git-repo/default.nix +++ b/pkgs/applications/version-management/git-repo/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "git-repo"; - version = "2.25"; + version = "2.28"; src = fetchFromGitHub { owner = "android"; repo = "tools_repo"; rev = "v${version}"; - sha256 = "sha256-3S4peybytlO432ui+bECVWQTbyNfs2kSMqcqQyVc1os="; + sha256 = "sha256-wuEwyhKclbfkcm8Wc5wyoLT1p/V0zAtaQB1gbuwqalM="; }; # Fix 'NameError: name 'ssl' is not defined' diff --git a/pkgs/applications/version-management/github-desktop/default.nix b/pkgs/applications/version-management/github-desktop/default.nix index 7c07dc17c2ee..f439c62504d6 100644 --- a/pkgs/applications/version-management/github-desktop/default.nix +++ b/pkgs/applications/version-management/github-desktop/default.nix @@ -19,11 +19,11 @@ stdenv.mkDerivation rec { pname = "github-desktop"; - version = "2.9.12"; + version = "3.0.3"; src = fetchurl { url = "https://github.com/shiftkey/desktop/releases/download/release-${version}-linux1/GitHubDesktop-linux-${version}-linux1.deb"; - sha256 = "sha256-tr1u6q7sHI1Otor53d1F7J0f9eV9tKtLZx8+40I16y8="; + sha256 = "sha256-KC+D4epjEhZPIN6LutRRo2ViX6YVyol3UUEA56ymyfM="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/virtualization/crun/default.nix b/pkgs/applications/virtualization/crun/default.nix index c0c53b9c6ae1..f224e03de04f 100644 --- a/pkgs/applications/virtualization/crun/default.nix +++ b/pkgs/applications/virtualization/crun/default.nix @@ -39,25 +39,16 @@ let in stdenv.mkDerivation rec { pname = "crun"; - version = "1.4.5"; + version = "1.5"; src = fetchFromGitHub { owner = "containers"; repo = pname; rev = version; - sha256 = "sha256-YXbyGUY/E8odjljDok+yYyU8yZSyUFc22zumrUuuXXQ="; + sha256 = "sha256-eirCENgt25VRPub7c9cxYQ1uFxYbzm75cJ1v4r6O/+k="; fetchSubmodules = true; }; - patches = [ - # Should dropped in next release after 1.4.5 - (fetchpatch { - name = "usrbin-paths.patch"; - url = "https://github.com/containers/crun/commit/dd29f7f7f713c49784ac30f7cdca33b2ef94d5b8.patch"; - sha256 = "sha256-kHHix8CUL+c8HbOe5qx4PeF1P19113U4bRZyleMUjqk="; - }) - ]; - nativeBuildInputs = [ autoreconfHook go-md2man pkg-config python3 ]; buildInputs = [ libcap libseccomp systemd yajl ] diff --git a/pkgs/applications/virtualization/lima/default.nix b/pkgs/applications/virtualization/lima/default.nix index c6b9b4149fea..f5de8aaf5346 100644 --- a/pkgs/applications/virtualization/lima/default.nix +++ b/pkgs/applications/virtualization/lima/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "lima"; - version = "0.11.1"; + version = "0.11.2"; src = fetchFromGitHub { owner = "lima-vm"; repo = pname; rev = "v${version}"; - sha256 = "sha256-tTa/FQiF2qZ36OGORr5fqvKR5i6qo7OTBJFGWJMShQ0="; + sha256 = "sha256-DN8YXbpD7TVVPvl8LKAwLHKt50G37cu8dJBqF+DDE6g="; }; - vendorSha256 = "sha256-wvb592mmxOeRSX8Rxx2m7tZ2S8wQTcQkL3b6z0F6OEQ="; + vendorSha256 = "sha256-lrJVnWd94nELROP5VYI+Qs8cK5U9PYiZo9j9cusb9cY="; nativeBuildInputs = [ makeWrapper installShellFiles ]; diff --git a/pkgs/build-support/libredirect/default.nix b/pkgs/build-support/libredirect/default.nix index 8f7df3386d14..b5eb21e5ba4b 100644 --- a/pkgs/build-support/libredirect/default.nix +++ b/pkgs/build-support/libredirect/default.nix @@ -27,7 +27,7 @@ else stdenv.mkDerivation rec { outputs = ["out" "hook"]; - libName = "libredirect" + stdenv.targetPlatform.extensions.sharedLibrary; + libName = "libredirect" + stdenv.hostPlatform.extensions.sharedLibrary; buildPhase = '' runHook preBuild diff --git a/pkgs/data/fonts/cardo/default.nix b/pkgs/data/fonts/cardo/default.nix new file mode 100644 index 000000000000..21763365de30 --- /dev/null +++ b/pkgs/data/fonts/cardo/default.nix @@ -0,0 +1,37 @@ +{ fetchzip, lib }: + +let + version = "1.04"; +in +fetchzip { + name = "cardo-${version}"; + + url = "http://scholarsfonts.net/cardo104.zip"; + + hash = "sha256-eBK6+VQpreWA7jIneNXOcKFcT+cJzhoQ9XXyq93SZ8M="; + stripRoot = false; + + postFetch = '' + mkdir -p $out/share/fonts/truetype + mv $out/*.ttf $out/share/fonts/truetype + rm $out/*.pdf + ''; + + meta = with lib; { + description = "Cardo is a large Unicode font specifically designed for the needs of classicists, Biblical scholars, medievalists, and linguists"; + longDescription = '' + Cardo is a large Unicode font specifically designed for the needs of + classicists, Biblical scholars, medievalists, and linguists. It also + works well for general typesetting in situations where a high-quality Old + Style font is appropriate. Its large character set supports many modern + languages as well as those needed by scholars. Cardo also contains + features that are required for high-quality typography such as ligatures, + text figures (also known as old style numerals), true small capitals and + a variety of punctuation and space characters. + ''; + homepage = "http://scholarsfonts.net/cardofnt.html"; + license = licenses.ofl; + maintainers = with lib.maintainers; [ kmein ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/desktops/arcan/arcan/clone-sources.nix b/pkgs/desktops/arcan/arcan/clone-sources.nix index c7c6bebb704a..bd39c0843a86 100644 --- a/pkgs/desktops/arcan/arcan/clone-sources.nix +++ b/pkgs/desktops/arcan/arcan/clone-sources.nix @@ -3,23 +3,23 @@ letoram-openal-src = fetchFromGitHub { owner = "letoram"; repo = "openal"; - rev = "1c7302c580964fee9ee9e1d89ff56d24f934bdef"; - hash = "sha256-InqU59J0zvwJ20a7KU54xTM7d76VoOlFbtj7KbFlnTU="; + rev = "81e1b364339b6aa2b183f39fc16c55eb5857e97a"; + sha256 = "sha256-X3C3TDZPiOhdZdpApC4h4KeBiWFMxkFsmE3gQ1Rz420="; }; freetype-src = fetchgit { url = "git://git.sv.nongnu.org/freetype/freetype2.git"; - rev = "94cb3a2eb96b3f17a1a3bd0e6f7da97c0e1d8f57"; - sha256 = "sha256-LzjqunX/T8khF2UjPlPYiQOwMGem8MqPYneR2LdZ5Fg="; + rev = "275b116b40c9d183d42242099ea9ff276985855b"; + sha256 = "sha256-YVyJttaXt19MSuD0pmazwxNKz65jcqqWvIgmDj4d3MA="; }; libuvc-src = fetchFromGitHub { owner = "libuvc"; repo = "libuvc"; - rev = "b2b01ae6a2875d05c99eb256bb15815018d6e837"; - sha256 = "sha256-2zCTjyodRARkHM/Q0r4bdEH9LO1Z9xPCnY2xE4KZddA="; + rev = "a4de53e7e265f8c6a64df7ccd289f318104e1916"; + hash = "sha256-a+Q0PTV4ujGnX55u49VJfMgQljZunZYRvkR0tIkGnHI="; }; luajit-src = fetchgit { url = "https://luajit.org/git/luajit-2.0.git"; - rev = "d3294fa63b344173db68dd612c6d3801631e28d4"; - sha256 = "sha256-1iHBXcbYhWN4M8g5oH09S1j1WrjYzI6qcRbHsdfpRkk="; + rev = "899093a9e0fa5b16f27016381ef4b15529dadff2"; + sha256 = "sha256-bCi1ms78HCOOgStIY2tSGM9LUEX3qnwadLLeYWWu1KI="; }; } diff --git a/pkgs/desktops/arcan/arcan/default.nix b/pkgs/desktops/arcan/arcan/default.nix index a15d5ac6be93..9623a47807d2 100644 --- a/pkgs/desktops/arcan/arcan/default.nix +++ b/pkgs/desktops/arcan/arcan/default.nix @@ -8,7 +8,10 @@ , ffmpeg , file , freetype +, glib +, gumbo , harfbuzz +, jbig2dec , leptonica , libGL , libX11 @@ -24,11 +27,14 @@ , libvncserver , libxcb , libxkbcommon -, lua +, lua5_1 , luajit , makeWrapper , mesa +, mupdf , openal +, openjpeg +, pcre , pkg-config , sqlite , tesseract @@ -48,13 +54,13 @@ stdenv.mkDerivation rec { pname = "arcan" + lib.optionalString useStaticOpenAL "-static-openal"; - version = "0.6.1.1"; + version = "0.6.2"; src = fetchFromGitHub { owner = "letoram"; repo = "arcan"; rev = version; - hash = "sha256-+dJaBSKGbHOwzA26/jDyh2UF9YRwGUcysJIeAM4kvfc="; + hash = "sha256-Qwyt927eLqaCqJ4Lo4J1lQX2A24ke+AH52rmSCTnpO0="; }; nativeBuildInputs = [ @@ -71,7 +77,10 @@ stdenv.mkDerivation rec { ffmpeg file freetype + glib + gumbo harfbuzz + jbig2dec leptonica libGL libX11 @@ -87,10 +96,13 @@ stdenv.mkDerivation rec { libvncserver libxcb libxkbcommon - lua + lua5_1 luajit mesa + mupdf.dev openal + openjpeg.dev + pcre sqlite tesseract valgrind diff --git a/pkgs/development/compilers/cmdstan/default.nix b/pkgs/development/compilers/cmdstan/default.nix index 369828ff1024..077df4983214 100644 --- a/pkgs/development/compilers/cmdstan/default.nix +++ b/pkgs/development/compilers/cmdstan/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "cmdstan"; - version = "2.29.2"; + version = "2.30.0"; # includes stanc binaries needed to build cmdstand src = fetchurl { url = "https://github.com/stan-dev/cmdstan/releases/download/v${version}/cmdstan-${version}.tar.gz"; - sha256 = "sha256-VntTH6c//fcGyqF+szROHftB6GmTyvi6QIdf+RAzUVM="; + sha256 = "sha256-AJwuoAQ6pKkcA6x4ky5k88/0+qPnNBOi4CadW+LY3mw="; }; buildFlags = [ "build" ]; diff --git a/pkgs/development/compilers/gcc/common/configure-flags.nix b/pkgs/development/compilers/gcc/common/configure-flags.nix index 910d93d42da1..bf33e1a1dad5 100644 --- a/pkgs/development/compilers/gcc/common/configure-flags.nix +++ b/pkgs/development/compilers/gcc/common/configure-flags.nix @@ -195,7 +195,7 @@ let ++ lib.optional (langJava && javaAntlr != null) "--with-antlr-jar=${javaAntlr}" # TODO: aarch64-darwin has clang stdenv and its arch and cpu flag values are incompatible with gcc - ++ lib.optional (!(stdenv.isDarwin && stdenv.isAarch64)) (import ../common/platform-flags.nix { inherit (stdenv) targetPlatform; inherit lib; }) + ++ lib.optionals (!(stdenv.isDarwin && stdenv.isAarch64)) (import ../common/platform-flags.nix { inherit (stdenv) targetPlatform; inherit lib; }) ++ lib.optionals (targetPlatform != hostPlatform) crossConfigureFlags ++ lib.optional (targetPlatform != hostPlatform) "--disable-bootstrap" diff --git a/pkgs/development/compilers/gnu-cobol/default.nix b/pkgs/development/compilers/gnu-cobol/default.nix index 44c966fa974b..3f1268a9d65a 100644 --- a/pkgs/development/compilers/gnu-cobol/default.nix +++ b/pkgs/development/compilers/gnu-cobol/default.nix @@ -1,5 +1,22 @@ -{ lib, stdenv, fetchurl, gcc, makeWrapper -, db, gmp, ncurses }: +{ lib +, stdenv +, fetchurl +, autoconf269 +, automake +, libtool +# libs +, cjson +, db +, gmp +, libxml2 +, ncurses +# docs +, help2man +, texinfo +, texlive +# test +, writeText +}: stdenv.mkDerivation rec { pname = "gnu-cobol"; @@ -10,27 +27,76 @@ stdenv.mkDerivation rec { sha256 = "0x15ybfm63g7c9340fc6712h9v59spnbyaz4rf85pmnp3zbhaw2r"; }; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ + autoconf269 + automake + libtool + help2man + texinfo + texlive.combined.scheme-basic + ]; - buildInputs = [ db gmp ncurses ]; + buildInputs = [ + cjson + db + gmp + libxml2 + ncurses + ]; - cflags = lib.concatMapStringsSep " " (p: "-L" + (lib.getLib p) + "/lib ") buildInputs; - ldflags = lib.concatMapStringsSep " " (p: "-I" + (lib.getDev p) + "/include ") buildInputs; + outputs = [ "bin" "dev" "lib" "out" ]; + # XXX: Without this, we get a cycle between bin and dev + propagatedBuildOutputs = []; - cobolCCFlags = "-I$out/include ${ldflags} -L$out/lib ${cflags}"; + # Skips a broken test + postPatch = '' + sed -i '/^AT_CHECK.*crud\.cob/i AT_SKIP_IF([true])' tests/testsuite.src/listings.at + ''; - postInstall = with lib; '' - wrapProgram "$out/bin/cobc" \ - --set COB_CC "${gcc}/bin/gcc" \ - --prefix COB_LDFLAGS " " "${cobolCCFlags}" \ - --prefix COB_CFLAGS " " "${cobolCCFlags}" + preConfigure = '' + autoconf + aclocal + automake + ''; + + enableParallelBuilding = true; + + installFlags = [ "install-pdf" "install-html" "localedir=$out/share/locale" ]; + + # Tests must run after install. + doCheck = false; + + doInstallCheck = true; + installCheckPhase = '' + runHook preInstallCheck + + # Run tests + make -j$NIX_BUILD_CORES check + + # Sanity check + message="Hello, COBOL!" + # XXX: Don't for a second think you can just get rid of these spaces, they + # are load bearing. + tee hello.cbl < +Date: Tue, 26 Apr 2022 22:17:00 +0200 +Subject: [PATCH] TST: fix tests for GEOS main (#1357) (backported for nixpkgs) + +--- + pygeos/tests/test_constructive.py | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/pygeos/tests/test_constructive.py b/pygeos/tests/test_constructive.py +index 87c0a9f..b3459d1 100644 +--- a/pygeos/tests/test_constructive.py ++++ b/pygeos/tests/test_constructive.py +@@ -48,7 +48,11 @@ def test_no_args_array(geometry, func): + @pytest.mark.parametrize("geometry", all_types) + @pytest.mark.parametrize("func", CONSTRUCTIVE_FLOAT_ARG) + def test_float_arg_array(geometry, func): +- if func is pygeos.offset_curve and pygeos.get_type_id(geometry) not in [1, 2]: ++ if ( ++ func is pygeos.offset_curve ++ and pygeos.get_type_id(geometry) not in [1, 2] ++ and pygeos.geos_version < (3, 11, 0) ++ ): + with pytest.raises(GEOSException, match="only accept linestrings"): + func([geometry, geometry], 0.0) + return +-- +2.36.1 + diff --git a/pkgs/development/python-modules/pystemd/default.nix b/pkgs/development/python-modules/pystemd/default.nix index 8dd24814cdcd..763ac34c5171 100644 --- a/pkgs/development/python-modules/pystemd/default.nix +++ b/pkgs/development/python-modules/pystemd/default.nix @@ -1,23 +1,36 @@ -{ stdenv, lib, python, systemd }: +{ stdenv +, buildPythonPackage +, lib +, python +, systemd +, pytest +, mock +, pkg-config }: -python.pkgs.buildPythonPackage rec { +buildPythonPackage rec { pname = "pystemd"; - version = "0.8.0"; + version = "0.10.0"; src = python.pkgs.fetchPypi { inherit pname version; - sha256 = "0wlrid2xd73dmzl4m0jgg6cqmkx3qs9v9nikvwxd8a5b8chf9hna"; + sha256 = "sha256-10qBS/2gEIXbGorZC+PLJ9ryOlGrawPn4p7IEfoq6Fk="; }; disabled = python.pythonOlder "3.4"; buildInputs = [ systemd ]; - checkInputs = with python.pkgs; [ pytest mock ]; + nativeBuildInputs = [ pkg-config ]; + + checkInputs = [ pytest mock ]; + checkPhase = "pytest tests"; meta = with lib; { broken = (stdenv.isLinux && stdenv.isAarch64); - description = "A thin Cython-based wrapper on top of libsystemd, focused on exposing the dbus API via sd-bus in an automated and easy to consume way."; + description = '' + Thin Cython-based wrapper on top of libsystemd, focused on exposing the + dbus API via sd-bus in an automated and easy to consume way + ''; homepage = "https://github.com/facebookincubator/pystemd/"; license = licenses.lgpl21Plus; maintainers = with maintainers; [ flokli ]; diff --git a/pkgs/development/python-modules/pyswitchbot/default.nix b/pkgs/development/python-modules/pyswitchbot/default.nix index 702f179b6dad..961ef5f246a8 100644 --- a/pkgs/development/python-modules/pyswitchbot/default.nix +++ b/pkgs/development/python-modules/pyswitchbot/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "pyswitchbot"; - version = "0.14.0"; + version = "0.14.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -15,8 +15,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Danielhiversen"; repo = "pySwitchbot"; - rev = version; - hash = "sha256-6u7PqYv7Q5rVzsUnoQi495svX8puBz0Oj3SGgcpJrcQ="; + rev = "refs/tags/${version}"; + hash = "sha256-/p5rmoxSl4Y3X1N3E3BSwPUGV8MCxI0sxv1i9w3fJiY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/sagemaker/default.nix b/pkgs/development/python-modules/sagemaker/default.nix index 34dd01607ca0..42bb28917ced 100644 --- a/pkgs/development/python-modules/sagemaker/default.nix +++ b/pkgs/development/python-modules/sagemaker/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "sagemaker"; - version = "2.99.0"; + version = "2.100.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-az3SmbDgA5bbyV6BPYVIWf2fgXLqNu67/6NoM/K7NL8="; + hash = "sha256-0x0zNgmyXXZokTZ/nUMjvBKbqJ5cmSbuuuXtNY6bsTU="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/shapely/default.nix b/pkgs/development/python-modules/shapely/default.nix index 49f5dcc822b6..a41381fe35bf 100644 --- a/pkgs/development/python-modules/shapely/default.nix +++ b/pkgs/development/python-modules/shapely/default.nix @@ -2,6 +2,7 @@ , stdenv , buildPythonPackage , fetchPypi +, fetchpatch , substituteAll , pythonOlder , geos @@ -43,6 +44,12 @@ buildPythonPackage rec { libgeos_c = GEOS_LIBRARY_PATH; libc = lib.optionalString (!stdenv.isDarwin) "${stdenv.cc.libc}/lib/libc${stdenv.hostPlatform.extensions.sharedLibrary}.6"; }) + (fetchpatch { + name = "fix-tests-geos-3.11.patch"; + url = "https://github.com/shapely/shapely/commit/21c8e8a7909e7fb3cce6daa5c5b8284ac927fcb0.patch"; + includes = [ "tests/test_parallel_offset.py" ]; + sha256 = "sha256-85c8NlmAzzfCgepe/411ug5Sq+665dFMb3ySaUt9Kew="; + }) ]; preCheck = '' diff --git a/pkgs/development/python-modules/simple-salesforce/default.nix b/pkgs/development/python-modules/simple-salesforce/default.nix index af81f519f015..e508ab9dbf97 100644 --- a/pkgs/development/python-modules/simple-salesforce/default.nix +++ b/pkgs/development/python-modules/simple-salesforce/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "simple-salesforce"; - version = "1.12.0"; + version = "1.12.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-Y+pNEjj6OBPhe0RPpcHF452YLFPm/zYaCCbMt3e/GKM="; + sha256 = "sha256-eDaqL4CsP5wOqfwrkeWJdg+rlcMnFT3l7A9xgVnhx0w="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/slack-sdk/default.nix b/pkgs/development/python-modules/slack-sdk/default.nix index a4bef1ab8e14..49e911f307bc 100644 --- a/pkgs/development/python-modules/slack-sdk/default.nix +++ b/pkgs/development/python-modules/slack-sdk/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "slack-sdk"; - version = "3.17.2"; + version = "3.18.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "slackapi"; repo = "python-slack-sdk"; rev = "refs/tags/v${version}"; - sha256 = "sha256-Rzs2ugG6Xm8IVWt20+1oLB0FxhBHyIfDGNL2jzgDnwc="; + sha256 = "sha256-R4ZiILsU3HCSra2qwIzMIfsD91QrpN9LvXl9gFYa8N0="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/sphinx-book-theme/default.nix b/pkgs/development/python-modules/sphinx-book-theme/default.nix index 78f3e2b12f4c..3fd28acef9cb 100644 --- a/pkgs/development/python-modules/sphinx-book-theme/default.nix +++ b/pkgs/development/python-modules/sphinx-book-theme/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "sphinx-book-theme"; - version = "0.3.2"; + version = "0.3.3"; format = "wheel"; @@ -20,7 +20,7 @@ buildPythonPackage rec { dist = "py3"; python = "py3"; pname = "sphinx_book_theme"; - sha256 = "4aed92f2ed9d27e002eac5dce1daa8eca42dd9e6464811533c569ee156a6f67d"; + sha256 = "9685959dbbb492af005165ef1b9229fdd5d5431580ac181578beae3b4d012d91"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/youtube-search/default.nix b/pkgs/development/python-modules/youtube-search/default.nix index 439cc31c8c99..7eac21a5e7ee 100644 --- a/pkgs/development/python-modules/youtube-search/default.nix +++ b/pkgs/development/python-modules/youtube-search/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "youtube-search"; - version = "2.1.0"; + version = "2.1.1"; src = fetchPypi { inherit pname version; - sha256 = "1541120273996fa433698b2e57b73296dfb8e90536211f29ea997dcf161b66fe"; + sha256 = "sha256-veu7PUPAbTz3B7tRYMGptIMbmmaGLCdL6azv0kCEd08="; }; propagatedBuildInputs = [ requests ]; diff --git a/pkgs/development/tools/grpc-gateway/default.nix b/pkgs/development/tools/grpc-gateway/default.nix index 800836dc9b08..450c03e7435e 100644 --- a/pkgs/development/tools/grpc-gateway/default.nix +++ b/pkgs/development/tools/grpc-gateway/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "grpc-gateway"; - version = "2.10.3"; + version = "2.11.0"; src = fetchFromGitHub { owner = "grpc-ecosystem"; repo = "grpc-gateway"; rev = "v${version}"; - sha256 = "sha256-4/iE+sK+ZbG6194i8E1ZHla/7C9blKGRHwM7iX7nvXU="; + sha256 = "sha256-Z3eZFd53c4cZG7CL3FrXQLi2n9A5TfUnZiB9KoA6sF4="; }; - vendorSha256 = "sha256-FhiTU9VmDZNCPBWrmCqmQo/kPdDe8Da1T2E06CVN2kw="; + vendorSha256 = "sha256-PKeqjr5MZWK6ILizwRJ7oy6eUj3cH9ju/55cbS5LT8M="; meta = with lib; { description = diff --git a/pkgs/development/tools/ocaml/dune/3.nix b/pkgs/development/tools/ocaml/dune/3.nix index 299a337d276c..d2819d8d300d 100644 --- a/pkgs/development/tools/ocaml/dune/3.nix +++ b/pkgs/development/tools/ocaml/dune/3.nix @@ -6,11 +6,11 @@ else stdenv.mkDerivation rec { pname = "dune"; - version = "3.3.1"; + version = "3.4.0"; src = fetchurl { url = "https://github.com/ocaml/dune/releases/download/${version}/dune-${version}.tbz"; - sha256 = "sha256-hAyASRv+Erq18rmdSeFj8+TE0vxLSj5vsWwk3M1VAuE="; + sha256 = "sha256-ClVmxJEPGT1gmWWgNLSCCF3ATgvN/sl1b/mVffK2ejw="; }; nativeBuildInputs = [ ocaml findlib ]; diff --git a/pkgs/development/tools/spr/default.nix b/pkgs/development/tools/spr/default.nix index 4d2c005b719c..a9ed5c3c2128 100644 --- a/pkgs/development/tools/spr/default.nix +++ b/pkgs/development/tools/spr/default.nix @@ -7,14 +7,14 @@ rustPlatform.buildRustPackage rec { pname = "spr"; - version = "1.3.3"; + version = "1.3.4"; src = fetchCrate { inherit pname version; - sha256 = "sha256-ozirfRyJWgs5+CWZrXkIHzlNQcUOEAuX/XV+VrUnJC8="; + sha256 = "sha256-lsdWInJWcofwU3P4vAWcLQeZuV3Xn1z30B7mhODJ4Vc="; }; - cargoSha256 = "sha256-Khua8g/vk0KTBmca37VhiBSHvfi8tKVhqxDYeJ594Qg="; + cargoSha256 = "sha256-VQg3HDNw+L1FsFtHXnIw6dMVUxV63ZWHCxiknzsqXW8="; buildInputs = lib.optional stdenv.isDarwin Security; diff --git a/pkgs/games/kabeljau/default.nix b/pkgs/games/kabeljau/default.nix index b277966f31db..0b5b1167ead3 100644 --- a/pkgs/games/kabeljau/default.nix +++ b/pkgs/games/kabeljau/default.nix @@ -6,7 +6,7 @@ stdenvNoCC.mkDerivation rec { src = fetchFromGitea { domain = "codeberg.org"; - owner = "papojari"; + owner = "annaaurora"; repo = "kabeljau"; rev = "v${version}"; sha256 = "sha256-RedVItgfr6vgqXHA3bOiHXDpfGuHI+sX4jCHL9G5jYk="; @@ -33,8 +33,8 @@ stdenvNoCC.mkDerivation rec { meta = with lib; { description = "Survive as a stray cat in an ncurses game"; - homepage = "https://codeberg.org/papojari/kabeljau"; + homepage = "https://codeberg.org/annaaurora/kabeljau"; license = licenses.lgpl3Only; - maintainers = with maintainers; [ papojari ]; + maintainers = with maintainers; [ annaaurora ]; }; } diff --git a/pkgs/games/osu-lazer/default.nix b/pkgs/games/osu-lazer/default.nix index 945f70ebbc86..6fa7029f37a0 100644 --- a/pkgs/games/osu-lazer/default.nix +++ b/pkgs/games/osu-lazer/default.nix @@ -14,13 +14,13 @@ buildDotnetModule rec { pname = "osu-lazer"; - version = "2022.709.1"; + version = "2022.719.0"; src = fetchFromGitHub { owner = "ppy"; repo = "osu"; rev = version; - sha256 = "sha256-7tK3jRTfkCn4quQ52fgGsXeXIViaIQTcteq6FMiJzyU="; + sha256 = "sha256-SSKiXIj02VCTHDLgQMV0vZyKUoUv2c4KOfEJJ2NOLjY="; }; projectFile = "osu.Desktop/osu.Desktop.csproj"; @@ -73,7 +73,7 @@ buildDotnetModule rec { cc-by-nc-40 unfreeRedistributable # osu-framework contains libbass.so in repository ]; - maintainers = with maintainers; [ oxalica ]; + maintainers = with maintainers; [ oxalica thiagokokada ]; platforms = [ "x86_64-linux" ]; mainProgram = "osu!"; }; diff --git a/pkgs/games/osu-lazer/deps.nix b/pkgs/games/osu-lazer/deps.nix index fa413238291e..a2370f1e2041 100644 --- a/pkgs/games/osu-lazer/deps.nix +++ b/pkgs/games/osu-lazer/deps.nix @@ -1,12 +1,12 @@ { fetchNuGet }: [ (fetchNuGet { pname = "AutoMapper"; version = "11.0.1"; sha256 = "1z1x5c1dkwk6142km5q6jglhpq9x82alwjjy5a72c8qnq9ppdfg3"; }) - (fetchNuGet { pname = "Clowd.Squirrel"; version = "2.9.40"; sha256 = "171pq2zh26hlnwjv4n1lvsammi94an72ggms9n1n1qfi7zak1i4l"; }) + (fetchNuGet { pname = "Clowd.Squirrel"; version = "2.9.42"; sha256 = "1xxrr9jmgn343d467nz40569mkybinnmxaxyc4fhgy6yddvzk1y0"; }) (fetchNuGet { pname = "DiffPlex"; version = "1.7.1"; sha256 = "1q78r70pirgb7j5wkh454ws237lihh0fig212cpbj02cz53c2h6j"; }) (fetchNuGet { pname = "DiscordRichPresence"; version = "1.0.175"; sha256 = "180sax976327d70qbinv07f65g3w2zbw80n49hckg8wd4rw209vd"; }) (fetchNuGet { pname = "FFmpeg.AutoGen"; version = "4.3.0.1"; sha256 = "0n6x57mnnvcjnrs8zyvy07h5zm4bcfy9gh4n4bvd9fx5ys4pxkvv"; }) (fetchNuGet { pname = "Fody"; version = "6.6.2"; sha256 = "1jnpvqzi7bdk96skqax82765q1kjpx921yqakqawkx5b3bhqpihs"; }) (fetchNuGet { pname = "HidSharpCore"; version = "1.2.1.1"; sha256 = "1zkndglmz0s8rblfhnqcvv90rkq2i7lf4bc380g7z8h1avf2ikll"; }) - (fetchNuGet { pname = "HtmlAgilityPack"; version = "1.11.42"; sha256 = "0cvnc1qdfcjbqkh335bv4wp44zisb4hc69lq3zphiyzqfrjisnyb"; }) + (fetchNuGet { pname = "HtmlAgilityPack"; version = "1.11.43"; sha256 = "08xh6fm5l9f8lhhkk0h9vrp8qa60qmiq8k6wyip8lqn810jld50m"; }) (fetchNuGet { pname = "Humanizer"; version = "2.14.1"; sha256 = "18cycx9gvbc3735chdi2r583x73m2fkz1ws03yi3g640j9zv00fp"; }) (fetchNuGet { pname = "Humanizer.Core"; version = "2.14.1"; sha256 = "1ai7hgr0qwd7xlqfd92immddyi41j3ag91h3594yzfsgsy6yhyqi"; }) (fetchNuGet { pname = "Humanizer.Core"; version = "2.8.26"; sha256 = "1v8xd12yms4qq1md4vh6faxicmqrvahqdd7sdkyzrphab9v44nsm"; }) @@ -64,19 +64,18 @@ (fetchNuGet { pname = "ManagedBass.Fx"; version = "3.1.0"; sha256 = "130rrf6sb64dcq58mr1gigma3pzr7hg5mxn5fbryg375x3vphbs8"; }) (fetchNuGet { pname = "ManagedBass.Mix"; version = "3.1.0"; sha256 = "1ppxczh1i67k5xicr0q4n0k7zdzghs99wwkcpjmh726hkdsshnib"; }) (fetchNuGet { pname = "Markdig"; version = "0.23.0"; sha256 = "1bwn885w7balwncmr764vidyyp9bixqlq6r3lhsapj8ykrpxxa70"; }) - (fetchNuGet { pname = "MessagePack"; version = "2.3.85"; sha256 = "0n7kv4i6knhv1dd35cv45sfpidsiy9albfdmbrdschykd1mzxmiy"; }) - (fetchNuGet { pname = "MessagePack.Annotations"; version = "2.3.85"; sha256 = "0axjgy9r533bw00lflnc6acjyza76mf2x1nn6fw7qacvak9rqxm3"; }) + (fetchNuGet { pname = "MessagePack"; version = "2.4.35"; sha256 = "0y8pz073ync51cv39lxldc797nmcm39r4pdhy2il6r95rppjqg5h"; }) + (fetchNuGet { pname = "MessagePack.Annotations"; version = "2.4.35"; sha256 = "1jny2r6rwq7xzwymm779w9x8a5rhyln97mxzplxwd53wwbb0wbzd"; }) (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "6.0.6"; sha256 = "0ndah9cqkgswhi60wrnni10j1d2hdg8jljij83lk1wbfqbng86jm"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.Connections.Abstractions"; version = "6.0.5"; sha256 = "05crn1mj59yvljlmhfdy6wkblw8fj9hamyq9zvijl6ah684a9fwq"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.Http.Connections.Client"; version = "6.0.5"; sha256 = "1nirf76vwhg4r96mvc6ajbm2b4gkmvn7s8dp5zdf9vxmnka9r76l"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.Http.Connections.Common"; version = "6.0.5"; sha256 = "162kqhv8gsx6w52xa4hd7mkvgzwpf424k4pnqvjyz3m5piym10af"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.SignalR.Client"; version = "6.0.5"; sha256 = "0wrpw1l3jbid7hv76h8jvcpjaw3mc2ybmxhp2fk65d9bjni9xjmf"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.SignalR.Client.Core"; version = "6.0.5"; sha256 = "139sfsgq6nkr55yd8sfqk536k9517lhha51a3fck7svqwr7fapxx"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.SignalR.Common"; version = "6.0.5"; sha256 = "0grkijyfbq0pa76hflp5xiddii75zm98prpxw0gn64qj4i3sxlx0"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.SignalR.Protocols.Json"; version = "6.0.5"; sha256 = "0b5xy15jz3kw4qzfpi2p9h6k0flv6sazjmplyx9x0rl4ysq01jjq"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.SignalR.Protocols.MessagePack"; version = "6.0.5"; sha256 = "0z6cjyl0ycwcgmgncapmls8cirhy50dmymzz48mnfsv5456w232c"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson"; version = "6.0.5"; sha256 = "1dhgpv4iwrg0p68bz2w1bzk9vqdh0m0b7dvdlm2p0gqdc5kvwkry"; }) - (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "1.0.0"; sha256 = "00dx5armvkqjxvkldz3invdlck9nj7w21dlsr2aqp1rqbyrbsbbh"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.Connections.Abstractions"; version = "6.0.6"; sha256 = "1xdck1rg6flfh8l4gsfcq72yk0vh81k646i503s73573qhlc3hr4"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.Http.Connections.Client"; version = "6.0.6"; sha256 = "0jkr96x382hdcjnfw6m8lglamcnrmaxi3pjc6w8si7lgacn6h0jz"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.Http.Connections.Common"; version = "6.0.6"; sha256 = "19hsxybw189v07d618pf7n8ib3sgwl6rd3r9dyincbp4qfgp20zr"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.SignalR.Client"; version = "6.0.6"; sha256 = "1cnyw4cx4pvw2086anlz734c60iqb5j9y6xwx26ppgimrm54py3h"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.SignalR.Client.Core"; version = "6.0.6"; sha256 = "0snmcxssxaig920g7vj5hj79f2hyisxj6npy8hgg8v3rh0948iia"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.SignalR.Common"; version = "6.0.6"; sha256 = "0js5n6chb9vrmrn5rxip3d241ml9f091k50k0cak8yvmz7v531x0"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.SignalR.Protocols.Json"; version = "6.0.6"; sha256 = "197dx2311dxm1fl22b9x7a8kbsjjgq5r88qk487d337clsbbq4gc"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.SignalR.Protocols.MessagePack"; version = "6.0.6"; sha256 = "1lq2l95m1x9xsw8a9dh7dp0pxs4kjjwa6v8l485bj4yx1icb8w0k"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson"; version = "6.0.6"; sha256 = "1ihg09dqsx03z90im0nwyypakz3hla79mjy7mas5rdymnm6k0lbw"; }) (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "5.0.0"; sha256 = "0cp5jbax2mf6xr3dqiljzlwi05fv6n9a35z337s92jcljiq674kf"; }) (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "6.0.0"; sha256 = "15gqy2m14fdlvy1g59207h5kisznm355kbw010gy19vh47z8gpz3"; }) (fetchNuGet { pname = "Microsoft.CodeAnalysis.BannedApiAnalyzers"; version = "3.3.3"; sha256 = "1z6x0d8lpcfjr3sxy25493i17vvcg5bsay6c03qan6mnj5aqzw2k"; }) @@ -104,7 +103,7 @@ (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "6.0.0"; sha256 = "1vi67fw7q99gj7jd64gnnfr4d2c0ijpva7g9prps48ja6g91x6a9"; }) (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "6.0.0-rc.1.21451.13"; sha256 = "11dg16x6g0gssb143qpghxz1s41himvhr7yhjwxs9hacx4ij2dm1"; }) (fetchNuGet { pname = "Microsoft.Extensions.DependencyModel"; version = "5.0.0"; sha256 = "1mma1zxi0b40972cwfvkj9y0w9r7vjbi74784jzcb22pric00k5x"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Features"; version = "6.0.5"; sha256 = "01lsvmqg58570nwsm6j2x86dda1j51nlzyl5hfrfrz5l2kpx6pas"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Features"; version = "6.0.6"; sha256 = "0w94hm2r2dsqhd1q8xqf0v9cbf4sxash7pmw9f2pjr91c34lrvw0"; }) (fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "5.0.0"; sha256 = "1qa1l18q2jh9azya8gv1p8anzcdirjzd9dxxisb4911i9m1648i3"; }) (fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "6.0.0"; sha256 = "0fd9jii3y3irfcwlsiww1y9npjgabzarh33rn566wpcz24lijszi"; }) (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "5.0.0"; sha256 = "1yza38675dbv1qqnnhqm23alv2bbaqxp0pb7zinjmw8j2mr5r6wc"; }) @@ -115,6 +114,7 @@ (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "6.0.0"; sha256 = "008pnk2p50i594ahz308v81a41mbjz9mwcarqhmrjpl2d20c868g"; }) (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "5.0.0"; sha256 = "0swqcknyh87ns82w539z1mvy804pfwhgzs97cr3nwqk6g5s42gd6"; }) (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "6.0.0"; sha256 = "1kjiw6s4yfz9gm7mx3wkhp06ghnbs95icj9hi505shz9rjrg42q2"; }) + (fetchNuGet { pname = "Microsoft.NET.StringTools"; version = "1.0.0"; sha256 = "06yakiyzgss399giivfx6xdrnfxqfsvy5fzm90scjanvandv0sdj"; }) (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "6.0.6"; sha256 = "0fjbjh7yxqc9h47ix37y963xi9f9y99jvl26cw3x3kvjlb8x0bgj"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.0.1"; sha256 = "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; }) @@ -147,9 +147,9 @@ (fetchNuGet { pname = "OpenTabletDriver.Native"; version = "0.6.0.2"; sha256 = "12hf4v8j8asc9wlywpykajb8yrzx10w6h11qbykckmrfxvz8pc0a"; }) (fetchNuGet { pname = "OpenTabletDriver.Plugin"; version = "0.6.0.2"; sha256 = "0z2n5jysw06zp2cxmfqddbg3g88jdm1irr2hv04q8valq0plaq5c"; }) (fetchNuGet { pname = "ppy.LocalisationAnalyser"; version = "2022.607.0"; sha256 = "07rf10lpnly9d8wf7mwys3jsr4kh0rkf86rjck1hmb73b8524jq9"; }) - (fetchNuGet { pname = "ppy.osu.Framework"; version = "2022.707.0"; sha256 = "08s5yfj1h5d6mzkamssbx6fqfgc5q6rr31wvwdj0kfvnfz470iax"; }) + (fetchNuGet { pname = "ppy.osu.Framework"; version = "2022.719.0"; sha256 = "1rm72pm1m1nrfla2m3943nm85aj2i32rx4ikggm97fm74018cjsx"; }) (fetchNuGet { pname = "ppy.osu.Framework.NativeLibs"; version = "2022.525.0"; sha256 = "1zsqj3xng06bb46vg79xx35n2dsh3crqg951r1ga2gxqzgzy4nk0"; }) - (fetchNuGet { pname = "ppy.osu.Game.Resources"; version = "2022.702.0"; sha256 = "1vw8prjdvf91zpkqwn6n0kv834kwv9fd2si6lx9jm3z3wsf3ydkz"; }) + (fetchNuGet { pname = "ppy.osu.Game.Resources"; version = "2022.716.0"; sha256 = "03g70lsxad0xrrii4d1qh8xb1q4983hn7raydwihvm15pqwv9741"; }) (fetchNuGet { pname = "ppy.osuTK.NS20"; version = "1.0.192"; sha256 = "0k6nlsxdl6qa5kbn66nbxh5x43hkgpnz8h3zjlbr5siqdjcrvcvg"; }) (fetchNuGet { pname = "ppy.SDL2-CS"; version = "1.0.563-alpha"; sha256 = "09bk81nibfwicjmy8bg4h14myp3x0a7yz4axwdfnk33pj5dsn953"; }) (fetchNuGet { pname = "Realm"; version = "10.14.0"; sha256 = "0pbnqp2z27lm6i8j8pbb2500gyyv8gb73kskv49ympvpa09mzcrv"; }) @@ -196,8 +196,9 @@ (fetchNuGet { pname = "runtime.unix.System.Net.Sockets"; version = "4.3.0"; sha256 = "03npdxzy8gfv035bv1b9rz7c7hv0rxl5904wjz51if491mw0xy12"; }) (fetchNuGet { pname = "runtime.unix.System.Private.Uri"; version = "4.3.0"; sha256 = "1jx02q6kiwlvfksq1q9qr17fj78y5v6mwsszav4qcz9z25d5g6vk"; }) (fetchNuGet { pname = "runtime.unix.System.Runtime.Extensions"; version = "4.3.0"; sha256 = "0pnxxmm8whx38dp6yvwgmh22smknxmqs5n513fc7m4wxvs1bvi4p"; }) - (fetchNuGet { pname = "Sentry"; version = "3.17.1"; sha256 = "1k83a5kz6yyfd3iamxfa7wrgayxvs72slywq15aaw5ywl1a5c6i0"; }) + (fetchNuGet { pname = "Sentry"; version = "3.19.0"; sha256 = "0nkkzy7xzaij2cbj7y6v227f2s26fs1i1arbmg8i48q4gllb4pr0"; }) (fetchNuGet { pname = "SharpCompress"; version = "0.31.0"; sha256 = "01az7amjkxjbya5rdcqwxzrh2d3kybf1gsd3617rsxvvxadyra1r"; }) + (fetchNuGet { pname = "SharpCompress"; version = "0.32.1"; sha256 = "0n7iv6kp7gzgqrxxvwdxklvhia3ngpydc6l2nw7hzw637v4bjfl6"; }) (fetchNuGet { pname = "SharpFNT"; version = "2.0.0"; sha256 = "1bgacgh9hbck0qvji6frbb50sdiqfdng2fvvfgfw8b9qaql91mx0"; }) (fetchNuGet { pname = "SixLabors.ImageSharp"; version = "2.1.0"; sha256 = "0lmj3qs39v5jcf2rjwav43nqnc7g6sd4l226l2jw85nidzmpvkwr"; }) (fetchNuGet { pname = "SQLitePCLRaw.bundle_e_sqlite3"; version = "2.0.4"; sha256 = "1l3vbkwismsx5jcy3d5bj4bzh8bni8bk2gq4lqplz82pz5phjpxm"; }) @@ -213,7 +214,6 @@ (fetchNuGet { pname = "System.Collections"; version = "4.0.11"; sha256 = "1ga40f5lrwldiyw6vy67d0sg7jd7ww6kgwbksm19wrvq9hr0bsm6"; }) (fetchNuGet { pname = "System.Collections"; version = "4.3.0"; sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; }) (fetchNuGet { pname = "System.Collections.Concurrent"; version = "4.3.0"; sha256 = "0wi10md9aq33jrkh2c24wr2n9hrpyamsdhsxdcnf43b7y86kkii8"; }) - (fetchNuGet { pname = "System.Collections.Immutable"; version = "1.5.0"; sha256 = "1d5gjn5afnrf461jlxzawcvihz195gayqpcfbv6dd7pxa9ialn06"; }) (fetchNuGet { pname = "System.Collections.Immutable"; version = "1.7.1"; sha256 = "1nh4nlxfc7lbnbl86wwk1a3jwl6myz5j6hvgh5sp4krim9901hsq"; }) (fetchNuGet { pname = "System.Collections.Immutable"; version = "5.0.0"; sha256 = "1kvcllagxz2q92g81zkz81djkn2lid25ayjfgjalncyc68i15p0r"; }) (fetchNuGet { pname = "System.ComponentModel.Annotations"; version = "5.0.0"; sha256 = "021h7x98lblq9avm1bgpa4i31c2kgsa7zn4sqhxf39g087ar756j"; }) @@ -259,12 +259,12 @@ (fetchNuGet { pname = "System.Reflection"; version = "4.3.0"; sha256 = "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m"; }) (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.0.1"; sha256 = "0ydqcsvh6smi41gyaakglnv252625hf29f7kywy2c70nhii2ylqp"; }) (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.3.0"; sha256 = "11f8y3qfysfcrscjpjym9msk7lsfxkk4fmz9qq95kn3jd0769f74"; }) - (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.6.0"; sha256 = "18h375q5bn9h7swxnk4krrxym1dxmi9bm26p89xps9ygrj4q6zqw"; }) + (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.7.0"; sha256 = "121l1z2ypwg02yz84dy6gr82phpys0njk7yask3sihgy214w43qp"; }) (fetchNuGet { pname = "System.Reflection.Emit.ILGeneration"; version = "4.0.1"; sha256 = "1pcd2ig6bg144y10w7yxgc9d22r7c7ww7qn1frdfwgxr24j9wvv0"; }) (fetchNuGet { pname = "System.Reflection.Emit.ILGeneration"; version = "4.3.0"; sha256 = "0w1n67glpv8241vnpz1kl14sy7zlnw414aqwj4hcx5nd86f6994q"; }) (fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.0.1"; sha256 = "1s4b043zdbx9k39lfhvsk68msv1nxbidhkq6nbm27q7sf8xcsnxr"; }) (fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.3.0"; sha256 = "0ql7lcakycrvzgi9kxz1b3lljd990az1x6c4jsiwcacrvimpib5c"; }) - (fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.6.0"; sha256 = "0hry2k6b7kicg4zxnq0hhn0ys52711pxy7l9v5sp7gvp9cicwpgp"; }) + (fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.7.0"; sha256 = "0mbjfajmafkca47zr8v36brvknzks5a7pgb49kfq2d188pyv6iap"; }) (fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.0.1"; sha256 = "0m7wqwq0zqq9gbpiqvgk3sr92cbrw7cp3xn53xvw7zj6rz6fdirn"; }) (fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.3.0"; sha256 = "02bly8bdc98gs22lqsfx9xicblszr2yan7v2mmw3g7hy6miq5hwq"; }) (fetchNuGet { pname = "System.Reflection.Metadata"; version = "1.8.1"; sha256 = "17xxl3m99wa4hcpqy42vl8qb1jk2jfq32rj3sfjc1a46hi2si5jj"; }) @@ -309,13 +309,14 @@ (fetchNuGet { pname = "System.Text.Encoding"; version = "4.0.11"; sha256 = "1dyqv0hijg265dwxg6l7aiv74102d6xjiwplh2ar1ly6xfaa4iiw"; }) (fetchNuGet { pname = "System.Text.Encoding"; version = "4.3.0"; sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; }) (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "5.0.0"; sha256 = "1bn2pzaaq4wx9ixirr8151vm5hynn3lmrljcgjx9yghmm4k677k0"; }) + (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "6.0.0"; sha256 = "0gm2kiz2ndm9xyzxgi0jhazgwslcs427waxgfa30m7yqll1kcrww"; }) (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.3.0"; sha256 = "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy"; }) (fetchNuGet { pname = "System.Text.Encodings.Web"; version = "5.0.0"; sha256 = "144pgy65jc3bkar7d4fg1c0rq6qmkx68gj9k1ldk97558w22v1r1"; }) (fetchNuGet { pname = "System.Text.Encodings.Web"; version = "5.0.1"; sha256 = "00yg63qnp94q2qryxxggzigi276bibb8b3b96gcvsyrxy7b703n9"; }) (fetchNuGet { pname = "System.Text.Encodings.Web"; version = "6.0.0"; sha256 = "06n9ql3fmhpjl32g3492sj181zjml5dlcc5l76xq2h38c4f87sai"; }) (fetchNuGet { pname = "System.Text.Json"; version = "5.0.0"; sha256 = "1gpgl18z6qrgmqrikgh99xkjwzb1didrjp77bch7nrlra21gr4ks"; }) (fetchNuGet { pname = "System.Text.Json"; version = "5.0.2"; sha256 = "0vd0wd29cdhgcjngl9sw391sn2s8xm974y15zvym0whsdgjwiqfx"; }) - (fetchNuGet { pname = "System.Text.Json"; version = "6.0.4"; sha256 = "19ygfw7b6rasjk0v6bdra85a5rh1qq4q2wgrclzvcrps66lcv5w1"; }) + (fetchNuGet { pname = "System.Text.Json"; version = "6.0.5"; sha256 = "12fg196sdq3gcjcz365kypfkkmdrprpcw2fvjnww9jqa4yn8v99l"; }) (fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.3.0"; sha256 = "1bgq51k7fwld0njylfn7qc5fmwrk2137gdq7djqdsw347paa9c2l"; }) (fetchNuGet { pname = "System.Threading"; version = "4.0.11"; sha256 = "19x946h926bzvbsgj28csn46gak2crv2skpwsx80hbgazmkgb1ls"; }) (fetchNuGet { pname = "System.Threading"; version = "4.3.0"; sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"; }) @@ -323,7 +324,6 @@ (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.0.11"; sha256 = "0nr1r41rak82qfa5m0lhk9mp0k93bvfd7bbd9sdzwx9mb36g28p5"; }) (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.3.0"; sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; }) (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.3.0"; sha256 = "1xxcx2xh8jin360yjwm4x4cf5y3a2bwpn2ygkfkwkicz7zk50s2z"; }) - (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.5.3"; sha256 = "0g7r6hm572ax8v28axrdxz1gnsblg6kszq17g51pj14a5rn2af7i"; }) (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.5.4"; sha256 = "0y6ncasgfcgnjrhynaf0lwpkpkmv4a07sswwkwbwb5h7riisj153"; }) (fetchNuGet { pname = "System.Threading.ThreadPool"; version = "4.3.0"; sha256 = "027s1f4sbx0y1xqw2irqn6x161lzj8qwvnh2gn78ciiczdv10vf1"; }) (fetchNuGet { pname = "System.Threading.Timer"; version = "4.3.0"; sha256 = "1nx773nsx6z5whv8kaa1wjh037id2f1cxhb69pvgv12hd2b6qs56"; }) diff --git a/pkgs/games/polymc/default.nix b/pkgs/games/polymc/default.nix index c28542390039..f7d0f9af13d7 100644 --- a/pkgs/games/polymc/default.nix +++ b/pkgs/games/polymc/default.nix @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { ''; platforms = platforms.linux; changelog = "https://github.com/PolyMC/PolyMC/releases/tag/${version}"; - license = licenses.gpl3Plus; + license = licenses.gpl3Only; maintainers = with maintainers; [ cleverca22 starcraft66 ]; }; } diff --git a/pkgs/misc/drivers/epson-escpr/default.nix b/pkgs/misc/drivers/epson-escpr/default.nix index 9c4998ecaa0f..40e6c7b3b18b 100644 --- a/pkgs/misc/drivers/epson-escpr/default.nix +++ b/pkgs/misc/drivers/epson-escpr/default.nix @@ -1,8 +1,9 @@ { lib, stdenv, fetchurl, cups }: -stdenv.mkDerivation { +let version = "1.7.20"; +in stdenv.mkDerivation { pname = "epson-escpr"; - version = "1.7.16"; + inherit version; src = fetchurl { # To find new versions, visit @@ -11,10 +12,11 @@ stdenv.mkDerivation { # version. # NOTE: Don't forget to update the webarchive link too! urls = [ - "https://download3.ebz.epson.net/dsc/f/03/00/12/97/30/97f146010d33b9a55badbc23429296f6b9b46011/epson-inkjet-printer-escpr-1.7.16-1lsb3.2.tar.gz" - "https://web.archive.org/web/https://download3.ebz.epson.net/dsc/f/03/00/12/97/30/97f146010d33b9a55badbc23429296f6b9b46011/epson-inkjet-printer-escpr-1.7.16-1lsb3.2.tar.gz" + "https://download3.ebz.epson.net/dsc/f/03/00/13/76/45/5ac2ea8f9cf94a48abd64afd0f967f98c4fc24aa/epson-inkjet-printer-escpr-${version}-1lsb3.2.tar.gz" + + "https://web.archive.org/web/https://download3.ebz.epson.net/dsc/f/03/00/13/76/45/5ac2ea8f9cf94a48abd64afd0f967f98c4fc24aa/epson-inkjet-printer-escpr-${version}-1lsb3.2.tar.gz" ]; - sha256 = "18n6fgyrii8084vdjhys94lr6nhhbmn7zzjd8jckvv1grb0iz9nv"; + sha256 = "sha256:09rscpm557dgaflylr93wcwmyn6fnvr8nc77abwnq97r6hxwrkhk"; }; patches = [ ./cups-filter-ppd-dirs.patch ]; diff --git a/pkgs/servers/atlassian/crowd.nix b/pkgs/servers/atlassian/crowd.nix index f62abe805c27..7714fccf5d82 100644 --- a/pkgs/servers/atlassian/crowd.nix +++ b/pkgs/servers/atlassian/crowd.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "atlassian-crowd"; - version = "4.4.0"; + version = "5.0.1"; src = fetchurl { url = "https://www.atlassian.com/software/crowd/downloads/binary/${pname}-${version}.tar.gz"; - sha256 = "0ipfvdjs8v02y37rmihljy9lkb3ycz5hyc14mcg65ilsscsq3x91"; + sha256 = "sha256-ccXSNuiXP0+b9WObboikqVd0nKH0Fi2gMVEF3+WAx5M="; }; buildPhase = '' diff --git a/pkgs/servers/geospatial/tile38/default.nix b/pkgs/servers/geospatial/tile38/default.nix index 50342fef59c8..9389b45deaf1 100644 --- a/pkgs/servers/geospatial/tile38/default.nix +++ b/pkgs/servers/geospatial/tile38/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "tile38"; - version = "1.28.0"; + version = "1.29.0"; src = fetchFromGitHub { owner = "tidwall"; repo = pname; rev = version; - sha256 = "sha256-Kac0iNqJFLLRR+Xu5GlxrsQqvim60uDlToe883++/7g="; + sha256 = "sha256-sb/DKfQ9dmItxKqICVjG5cslpf8lHzLcs5gd6ue/Zn8="; }; vendorSha256 = "sha256-/7dDPUXutyzkWq6EVVINFKzhuaiBCv5GrAF5pWG3ikc="; diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index d719916e8a67..366720b01bb7 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -11,11 +11,11 @@ in with python3.pkgs; buildPythonApplication rec { pname = "matrix-synapse"; - version = "1.62.0"; + version = "1.63.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-14aHO13FCUEq3pwLUDvrI1au6i8Wykhc5d5C3tLpE3g="; + sha256 = "sha256-AjxvZye3bRjGT355eAnwuP2lvTU/RSnOPxxKqaUxN9g="; }; buildInputs = [ openssl ]; diff --git a/pkgs/servers/mautrix-whatsapp/default.nix b/pkgs/servers/mautrix-whatsapp/default.nix index 52fac7f963cd..493f067f0f92 100644 --- a/pkgs/servers/mautrix-whatsapp/default.nix +++ b/pkgs/servers/mautrix-whatsapp/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "mautrix-whatsapp"; - version = "0.5.0"; + version = "0.6.0"; src = fetchFromGitHub { owner = "mautrix"; repo = "whatsapp"; rev = "v${version}"; - sha256 = "xKj1iKKzFQFjzXZGqoCDyuwXs55QNmnPdojgxy0dQTY="; + sha256 = "zhFc6BAurjrp0pHa48Eb8Iypww6o6YXPXp2ba2CXB6Q="; }; buildInputs = [ olm ]; - vendorSha256 = "svpUQQI9dDNQoL+LDoxhEch7dtNd20ojG3YHga1r15c="; + vendorSha256 = "EiaQDEsysTiXNHKhbfGVgVdMKgfdUHm48eooGR1rtQg="; doCheck = false; diff --git a/pkgs/servers/radicale/3.x.nix b/pkgs/servers/radicale/3.x.nix index 670db1532978..0d980a6c3ff0 100644 --- a/pkgs/servers/radicale/3.x.nix +++ b/pkgs/servers/radicale/3.x.nix @@ -2,13 +2,13 @@ python3.pkgs.buildPythonApplication rec { pname = "radicale"; - version = "3.1.7"; + version = "3.1.8"; src = fetchFromGitHub { owner = "Kozea"; repo = "Radicale"; rev = "v${version}"; - hash = "sha256-D/JPq8p+iLmm0XaoXvNonRHr9PIhQ11yTDqur3DiYdc="; + hash = "sha256-V0nqgxGUxcTRAYFuxpKUEVB/g/Mbvw+9OIcvAexXwuM="; }; postPatch = '' diff --git a/pkgs/servers/web-apps/sogo/default.nix b/pkgs/servers/web-apps/sogo/default.nix index f94436c1f372..94672ffe6f10 100644 --- a/pkgs/servers/web-apps/sogo/default.nix +++ b/pkgs/servers/web-apps/sogo/default.nix @@ -1,27 +1,24 @@ { gnustep, lib, fetchFromGitHub, fetchpatch, makeWrapper, python3, lndir , openssl, openldap, sope, libmemcached, curl, libsodium, libytnef, libzip, pkg-config, nixosTests -, oath-toolkit }: +, oath-toolkit +, enableActiveSync ? false +, libwbxml }: gnustep.stdenv.mkDerivation rec { pname = "SOGo"; - version = "5.5.0"; + version = "5.7.0"; src = fetchFromGitHub { owner = "inverse-inc"; repo = pname; rev = "SOGo-${version}"; - sha256 = "1kyfn3qw299qsyivbrm487h68va99rrb3gmhpgjpwqd2xdg9aypk"; + hash = "sha256-3Xy0y1sdixy4gXhzhP9mfWeaDmOVJty+X95xCyxayPE="; }; nativeBuildInputs = [ gnustep.make makeWrapper python3 ]; - buildInputs = [ gnustep.base sope openssl libmemcached curl libsodium libytnef libzip pkg-config openldap oath-toolkit ]; + buildInputs = [ gnustep.base sope openssl libmemcached curl libsodium libytnef libzip pkg-config openldap oath-toolkit ] + ++ lib.optional enableActiveSync libwbxml; - patches = [ - # TODO: take a closer look at other patches in https://sources.debian.org/patches/sogo/ and https://github.com/Skrupellos/sogo-patches - (fetchpatch { - url = "https://salsa.debian.org/debian/sogo/-/raw/120ac6390602c811908c7fcb212a79acbc7f7f28/debian/patches/0005-Remove-build-date.patch"; - sha256 = "151i8504kwdlcirgd0pbif7cxnb1q6jsp5j7dbh9p6zw2xgwkp25"; - }) - ]; + patches = lib.optional enableActiveSync ./enable-activesync.patch; postPatch = '' # Exclude NIX_ variables @@ -68,6 +65,8 @@ gnustep.stdenv.mkDerivation rec { for bin in $out/bin/*; do wrapProgram $bin --prefix LD_LIBRARY_PATH : $out/lib/sogo --prefix GNUSTEP_CONFIG_FILE : $out/share/GNUstep/GNUstep.conf done + + rmdir $out/nix ''; passthru.tests.sogo = nixosTests.sogo; diff --git a/pkgs/servers/web-apps/sogo/enable-activesync.patch b/pkgs/servers/web-apps/sogo/enable-activesync.patch new file mode 100644 index 000000000000..2c2aba26a211 --- /dev/null +++ b/pkgs/servers/web-apps/sogo/enable-activesync.patch @@ -0,0 +1,21 @@ +--- a/ActiveSync/NSData+ActiveSync.m ++++ b/ActiveSync/NSData+ActiveSync.m +@@ -36,7 +36,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + #import + #import + +-#include ++#include + + #define WBXMLDEBUG 0 + +--- a/GNUmakefile ++++ b/GNUmakefile +@@ -11,6 +11,7 @@ SUBPROJECTS = \ + UI \ + Tools \ + Tests/Unit \ ++ ActiveSync \ + + + include $(GNUSTEP_MAKEFILES)/aggregate.make diff --git a/pkgs/shells/fish/default.nix b/pkgs/shells/fish/default.nix index f2a6492e251d..01219e2165ec 100644 --- a/pkgs/shells/fish/default.nix +++ b/pkgs/shells/fish/default.nix @@ -134,7 +134,7 @@ let fish = stdenv.mkDerivation rec { pname = "fish"; - version = "3.5.0"; + version = "3.5.1"; src = fetchurl { # There are differences between the release tarball and the tarball GitHub @@ -144,7 +144,7 @@ let # --version`), as well as the local documentation for all builtins (and # maybe other things). url = "https://github.com/fish-shell/fish-shell/releases/download/${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-KR5Ox8bD/qVNwa7QV849QrNW+m9whlYnssffzsrv0hA="; + sha256 = "sha256-ptRbPcWkXdMXcuf439/sq8BjmG6PZ9YL18pgzIHbaSg="; }; # Fix FHS paths in tests diff --git a/pkgs/tools/admin/awscli2/default.nix b/pkgs/tools/admin/awscli2/default.nix index d772d1d16e4f..1d4e7a5f2fc2 100644 --- a/pkgs/tools/admin/awscli2/default.nix +++ b/pkgs/tools/admin/awscli2/default.nix @@ -29,13 +29,13 @@ let in with py.pkgs; buildPythonApplication rec { pname = "awscli2"; - version = "2.7.9"; # N.B: if you change this, check if overrides are still up-to-date + version = "2.7.14"; # N.B: if you change this, check if overrides are still up-to-date src = fetchFromGitHub { owner = "aws"; repo = "aws-cli"; rev = version; - sha256 = "sha256-6JlBgcHpR2ZfrljS+flxaog/KZQLvPUacJGLMQNsZ5Y="; + sha256 = "sha256-ji/hKoYxM3wag9DXy2e/VsJZVGN5UEebWX/ctOVJ42M="; }; propagatedBuildInputs = [ @@ -101,6 +101,6 @@ with py.pkgs; buildPythonApplication rec { changelog = "https://github.com/aws/aws-cli/blob/${version}/CHANGELOG.rst"; description = "Unified tool to manage your AWS services"; license = licenses.asl20; - maintainers = with maintainers; [ bhipple davegallant bryanasdev000 ]; + maintainers = with maintainers; [ bhipple davegallant bryanasdev000 devusb ]; }; } diff --git a/pkgs/tools/admin/fastlane/Gemfile.lock b/pkgs/tools/admin/fastlane/Gemfile.lock index 5c5edfbe06e7..6f8de9b9a34a 100644 --- a/pkgs/tools/admin/fastlane/Gemfile.lock +++ b/pkgs/tools/admin/fastlane/Gemfile.lock @@ -8,20 +8,20 @@ GEM artifactory (3.0.15) atomos (0.1.3) aws-eventstream (1.2.0) - aws-partitions (1.603.0) - aws-sdk-core (3.131.2) + aws-partitions (1.608.0) + aws-sdk-core (3.131.3) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.525.0) aws-sigv4 (~> 1.1) jmespath (~> 1, >= 1.6.1) - aws-sdk-kms (1.57.0) + aws-sdk-kms (1.58.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-s3 (1.114.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.4) - aws-sigv4 (1.5.0) + aws-sigv4 (1.5.1) aws-eventstream (~> 1, >= 1.0.2) babosa (1.0.4) claide (1.1.0) @@ -66,7 +66,7 @@ GEM faraday_middleware (1.2.0) faraday (~> 1.0) fastimage (2.2.6) - fastlane (2.207.0) + fastlane (2.208.0) CFPropertyList (>= 2.3, < 4.0.0) addressable (>= 2.8, < 3.0.0) artifactory (~> 3.0) @@ -106,7 +106,7 @@ GEM xcpretty (~> 0.3.0) xcpretty-travis-formatter (>= 0.0.3) gh_inspector (1.1.3) - google-apis-androidpublisher_v3 (0.24.0) + google-apis-androidpublisher_v3 (0.25.0) google-apis-core (>= 0.7, < 2.a) google-apis-core (0.7.0) addressable (~> 2.5, >= 2.5.1) @@ -121,7 +121,7 @@ GEM google-apis-core (>= 0.7, < 2.a) google-apis-playcustomapp_v1 (0.10.0) google-apis-core (>= 0.7, < 2.a) - google-apis-storage_v1 (0.17.0) + google-apis-storage_v1 (0.18.0) google-apis-core (>= 0.7, < 2.a) google-cloud-core (1.6.0) google-cloud-env (~> 1.0) diff --git a/pkgs/tools/admin/fastlane/gemset.nix b/pkgs/tools/admin/fastlane/gemset.nix index 882b607df1e9..45df8e938578 100644 --- a/pkgs/tools/admin/fastlane/gemset.nix +++ b/pkgs/tools/admin/fastlane/gemset.nix @@ -45,10 +45,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1i1ci3jibkqizr2ms31grj0j9ymhfq8rx7dn6nr10x6arv0db31z"; + sha256 = "0qym8s8msgpm0ybx34i0nmr8hvmvxn6x785kxymq7cf63hbpf2a0"; type = "gem"; }; - version = "1.603.0"; + version = "1.608.0"; }; aws-sdk-core = { dependencies = ["aws-eventstream" "aws-partitions" "aws-sigv4" "jmespath"]; @@ -56,10 +56,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "164abp3cvmvfa2qsgzbxvkafbhwbgn3qwknp0amwmxw5nwvz8p3s"; + sha256 = "1ri89cvl1wj3w64wx6l57fnv3w2mpgn03rfhpn2l7nl5lhn2d5x2"; type = "gem"; }; - version = "3.131.2"; + version = "3.131.3"; }; aws-sdk-kms = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -67,10 +67,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1m8vwm4cakfv3i4f723a6id07myx18fpdbq8ypa2j7r5njwxpmzz"; + sha256 = "1p2dbmb1vl8vk2xchrrsp2sxa95ya5w7ll1jlw89yyhls3l2l1ag"; type = "gem"; }; - version = "1.57.0"; + version = "1.58.0"; }; aws-sdk-s3 = { dependencies = ["aws-sdk-core" "aws-sdk-kms" "aws-sigv4"]; @@ -89,10 +89,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xp7diwq7nv4vvxrl9x3lis2l4x6bissrfzbfyy6rv5bmj5w109z"; + sha256 = "1d4bifmll4hrf4gihr5hdvn59wjpz4qpyg5jj95kp17fykzqg36n"; type = "gem"; }; - version = "1.5.0"; + version = "1.5.1"; }; babosa = { groups = ["default"]; @@ -368,10 +368,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0qfjqscldva6njrggs3cyvsdnbcz4rvdi69lp7h5rl74y0mr07ak"; + sha256 = "00wv58qhf6kywqzj6ynlgh718h43269c93jfh24h0jknb9gkq8wa"; type = "gem"; }; - version = "2.207.0"; + version = "2.208.0"; }; gh_inspector = { groups = ["default"]; @@ -389,10 +389,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0vswj47jc5k3x8frywsq295wfngfm8rgmb5i8z7bksxlcc4iysag"; + sha256 = "0psz3w8c95ashk5hlfvn5l32mg111z7fv07ngvvgm5mkw6wksh4d"; type = "gem"; }; - version = "0.24.0"; + version = "0.25.0"; }; google-apis-core = { dependencies = ["addressable" "googleauth" "httpclient" "mini_mime" "representable" "retriable" "rexml" "webrick"]; @@ -433,10 +433,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "19ccrdgb34w49l62p28yy5qrgwgb4wxs9q3mnb2d334q4q3wsk9f"; + sha256 = "00jq03n0ff20rv4smjgx7ggv70crh2whpj5p6jmlb41nim267fvz"; type = "gem"; }; - version = "0.17.0"; + version = "0.18.0"; }; google-cloud-core = { dependencies = ["google-cloud-env" "google-cloud-errors"]; diff --git a/pkgs/tools/backup/duplicity/default.nix b/pkgs/tools/backup/duplicity/default.nix index 46f841c8f5b3..d6ab926c0caf 100644 --- a/pkgs/tools/backup/duplicity/default.nix +++ b/pkgs/tools/backup/duplicity/default.nix @@ -19,13 +19,13 @@ let in pythonPackages.buildPythonApplication rec { pname = "duplicity"; - version = "0.8.20"; + version = "0.8.23"; src = fetchFromGitLab { owner = "duplicity"; repo = "duplicity"; rev = "rel.${version}"; - sha256 = "13ghra0myq6h6yx8qli55bh8dg91nf1hpd8l7d7xamgrw6b188sm"; + sha256 = "0my015zc8751smjgbsysmca7hvdm96cjw5zilqn3zq971nmmrksb"; }; patches = [ @@ -35,13 +35,6 @@ pythonPackages.buildPythonApplication rec { # Our Python infrastructure runs test in installCheckPhase so we need # to make the testing code stop assuming it is run from the source directory. ./use-installed-scripts-in-test.patch - - # https://gitlab.com/duplicity/duplicity/-/merge_requests/64 - # remove on next release - (fetchpatch { - url = "https://gitlab.com/duplicity/duplicity/-/commit/5c229a9b42f67257c747fbc0022c698fec405bbc.patch"; - sha256 = "05v931rnawfv11cyxj8gykmal8rj5vq2ksdysyr2mb4sl81mi7v0"; - }) ] ++ lib.optionals stdenv.isLinux [ # Broken on Linux in Nix' build environment ./linux-disable-timezone-test.patch diff --git a/pkgs/tools/bluetooth/bluez-alsa/default.nix b/pkgs/tools/bluetooth/bluez-alsa/default.nix index a108d55c6b5a..6164a39ac76f 100644 --- a/pkgs/tools/bluetooth/bluez-alsa/default.nix +++ b/pkgs/tools/bluetooth/bluez-alsa/default.nix @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { homepage = src.meta.homepage; license = licenses.mit; platforms = platforms.linux; - maintainers = [ maintainers.oxij maintainers.lheckemann ]; + maintainers = [ maintainers.oxij ]; }; } diff --git a/pkgs/tools/graphics/pixel2svg/default.nix b/pkgs/tools/graphics/pixel2svg/default.nix index 630e896ee75b..8e5e86624900 100644 --- a/pkgs/tools/graphics/pixel2svg/default.nix +++ b/pkgs/tools/graphics/pixel2svg/default.nix @@ -15,6 +15,6 @@ python310Packages.buildPythonPackage rec { homepage = "https://florian-berger.de/en/software/pixel2svg/"; description = "Converts pixel art to SVG - pixel by pixel"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ papojari ]; + maintainers = with maintainers; [ annaaurora ]; }; } diff --git a/pkgs/tools/misc/colorpanes/default.nix b/pkgs/tools/misc/colorpanes/default.nix index 7028232c367d..e89dc66897c0 100644 --- a/pkgs/tools/misc/colorpanes/default.nix +++ b/pkgs/tools/misc/colorpanes/default.nix @@ -6,7 +6,7 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitea { domain = "codeberg.org"; - owner = "papojari"; + owner = "annaaurora"; repo = pname; rev = "v${version}"; sha256 = "qaOH+LXNDq+utwyI1yzHWNt25AvdAXCTAziGV9ElroU="; @@ -20,8 +20,8 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "Panes in the 8 bright terminal colors with shadows of the respective darker color"; - homepage = "https://codeberg.org/papojari/colorpanes"; + homepage = "https://codeberg.org/annaaurora/colorpanes"; license = licenses.lgpl3Only; - maintainers = with maintainers; [ papojari ]; + maintainers = with maintainers; [ annaaurora ]; }; } diff --git a/pkgs/tools/misc/dabet/default.nix b/pkgs/tools/misc/dabet/default.nix index 13a63b392c1c..3440a6e561b3 100644 --- a/pkgs/tools/misc/dabet/default.nix +++ b/pkgs/tools/misc/dabet/default.nix @@ -6,7 +6,7 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitea { domain = "codeberg.org"; - owner = "papojari"; + owner = "annaaurora"; repo = pname; rev = "v${version}"; sha256 = "sha256-B5z2RUkvztnGCKeVsjp/yzrI8m/6mjBB0DS1yhFZhM4="; @@ -16,9 +16,9 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "Print the duration between two times"; - homepage = "https://codeberg.org/papojari/dabet"; + homepage = "https://codeberg.org/annaaurora/dabet"; license = licenses.lgpl3Only; - maintainers = with maintainers; [ papojari ]; + maintainers = with maintainers; [ annaaurora ]; }; } diff --git a/pkgs/tools/misc/elfcat/Cargo.lock b/pkgs/tools/misc/elfcat/Cargo.lock new file mode 100644 index 000000000000..b6e39fd5edce --- /dev/null +++ b/pkgs/tools/misc/elfcat/Cargo.lock @@ -0,0 +1,7 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "elfcat" +version = "0.1.8" diff --git a/pkgs/tools/misc/elfcat/default.nix b/pkgs/tools/misc/elfcat/default.nix index da3316da0e37..e2dec357d6d2 100644 --- a/pkgs/tools/misc/elfcat/default.nix +++ b/pkgs/tools/misc/elfcat/default.nix @@ -2,16 +2,17 @@ rustPlatform.buildRustPackage rec { pname = "elfcat"; - version = "0.1.7"; + version = "0.1.8"; src = fetchFromGitHub { owner = "ruslashev"; repo = pname; rev = version; - sha256 = "sha256-qmyD9BkD00yAQxmkgP2g5uvv/U7D/hUkCMJq44MI4YI="; + sha256 = "sha256-NzFKNCCPWBj/fhaEJF34nyeyvLMeQwIcQgTlYc6mgYo="; }; - cargoSha256 = null; + # There is no dependency to vendor in this project. + cargoLock.lockFile = ./Cargo.lock; meta = with lib; { description = "ELF visualizer, generates HTML files from ELF binaries."; diff --git a/pkgs/tools/misc/mloader/default.nix b/pkgs/tools/misc/mloader/default.nix index dcecbc903687..8e8854a5e6f2 100644 --- a/pkgs/tools/misc/mloader/default.nix +++ b/pkgs/tools/misc/mloader/default.nix @@ -1,15 +1,12 @@ -{ lib, python3Packages, fetchFromGitHub }: +{ lib, python3Packages }: python3Packages.buildPythonApplication rec { pname = "mloader"; - version = "1.1.8"; + version = "1.1.9"; - # PyPI tarball doesn't ship requirements.txt - src = fetchFromGitHub { - owner = "hurlenko"; - repo = "mloader"; - rev = version; - sha256 = "sha256-cZ9jaRrzzc5M7QYGuLxMv1J1mlfp/UEJ4dugTuJIQ/A="; + src = python3Packages.fetchPypi { + inherit pname version; + sha256 = "81e4dc7117999d502e3345f8e32df8b16cca226b8b508976dde2de81a4cc2b19"; }; propagatedBuildInputs = with python3Packages; [ diff --git a/pkgs/tools/misc/sanctity/default.nix b/pkgs/tools/misc/sanctity/default.nix index c0e85340c856..6cb33a78bf40 100644 --- a/pkgs/tools/misc/sanctity/default.nix +++ b/pkgs/tools/misc/sanctity/default.nix @@ -6,7 +6,7 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitea { domain = "codeberg.org"; - owner = "papojari"; + owner = "annaaurora"; repo = pname; rev = "v${version}"; sha256 = "sha256-rK4em0maJQS50zPfnuFSxRoXUuFCaw9ZOfmgf70Sdac="; @@ -16,8 +16,8 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "Test the 16 terminal colors in all combinations"; - homepage = "https://codeberg.org/papojari/sanctity"; + homepage = "https://codeberg.org/annaaurora/sanctity"; license = licenses.lgpl3Only; - maintainers = with maintainers; [ papojari ]; + maintainers = with maintainers; [ annaaurora ]; }; } diff --git a/pkgs/tools/misc/starfetch/default.nix b/pkgs/tools/misc/starfetch/default.nix index 3dfff1400e9e..f5e7bf741215 100755 --- a/pkgs/tools/misc/starfetch/default.nix +++ b/pkgs/tools/misc/starfetch/default.nix @@ -31,6 +31,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/Haruno19/starfetch"; license = licenses.gpl3Plus; platforms = platforms.all; - maintainers = with maintainers; [ papojari ]; + maintainers = with maintainers; [ annaaurora ]; }; } diff --git a/pkgs/tools/networking/ipfetch/default.nix b/pkgs/tools/networking/ipfetch/default.nix index a8b354ec9e6d..29a37a1004dc 100755 --- a/pkgs/tools/networking/ipfetch/default.nix +++ b/pkgs/tools/networking/ipfetch/default.nix @@ -33,6 +33,6 @@ stdenv.mkDerivation rec { description = "Neofetch but for ip adresses"; license = licenses.gpl3Only; platforms = platforms.all; - maintainers = with maintainers; [ papojari ]; + maintainers = with maintainers; [ annaaurora ]; }; } diff --git a/pkgs/tools/networking/nbd/default.nix b/pkgs/tools/networking/nbd/default.nix index e0679c089bcd..66b27062043a 100644 --- a/pkgs/tools/networking/nbd/default.nix +++ b/pkgs/tools/networking/nbd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, glib, which, bison, nixosTests, linuxHeaders }: +{ lib, stdenv, fetchurl, pkg-config, glib, which, bison, nixosTests, linuxHeaders, gnutls }: stdenv.mkDerivation rec { pname = "nbd"; @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "sha256-aHcVbSOnsz917uidL1wskcVCr8PNy2Nt6lqIU5pY0Qw="; }; - buildInputs = [ glib linuxHeaders ]; + buildInputs = [ glib gnutls ] + ++ lib.optionals stdenv.isLinux [ linuxHeaders ]; nativeBuildInputs = [ pkg-config which bison ]; @@ -18,7 +19,7 @@ stdenv.mkDerivation rec { cp README.md "$out/share/doc/nbd-${version}/" ''; - doCheck = true; + doCheck = !stdenv.isDarwin; passthru.tests = { test = nixosTests.nbd; @@ -30,9 +31,9 @@ stdenv.mkDerivation rec { NIX_LDFLAGS = lib.optionalString stdenv.isLinux "-lrt -lpthread"; meta = { - homepage = "http://nbd.sourceforge.net"; + homepage = "https://nbd.sourceforge.io/"; description = "Map arbitrary files as block devices over the network"; license = lib.licenses.gpl2; - platforms = lib.platforms.linux; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/tools/system/setserial/default.nix b/pkgs/tools/system/setserial/default.nix index da5d3b2a0d11..be4ffa3388e7 100644 --- a/pkgs/tools/system/setserial/default.nix +++ b/pkgs/tools/system/setserial/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0jkrnn3i8gbsl48k3civjmvxyv9rbm1qjha2cf2macdc439qfi3y"; }; - buildInputs = [ groff ]; + nativeBuildInputs = [ groff ]; installFlags = [ "DESTDIR=$(out)" ]; diff --git a/pkgs/tools/text/seehecht/default.nix b/pkgs/tools/text/seehecht/default.nix index e9ee07ee8ca6..718f22728e02 100644 --- a/pkgs/tools/text/seehecht/default.nix +++ b/pkgs/tools/text/seehecht/default.nix @@ -6,7 +6,7 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitea { domain = "codeberg.org"; - owner = "papojari"; + owner = "annaaurora"; repo = "seehecht"; rev = "v${version}"; sha256 = "sha256-x5zZEDaBmWpyvY+sKuiK4L+hc85prxCueWYUNMi9ty0="; @@ -22,6 +22,6 @@ rustPlatform.buildRustPackage rec { description = "A tool to quickly open a markdown document with already filled out frontmatter"; license = licenses.lgpl3Only; platforms = platforms.all; - maintainers = with maintainers; [ papojari ]; + maintainers = with maintainers; [ annaaurora ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e9445d0f3093..352b1246eac2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16115,7 +16115,9 @@ with pkgs; kubeaudit = callPackage ../tools/security/kubeaudit { }; - kubectx = callPackage ../development/tools/kubectx { }; + kubectx = callPackage ../development/tools/kubectx { + buildGoModule = buildGo117Module; + }; kube-linter = callPackage ../development/tools/kube-linter { }; @@ -16959,6 +16961,8 @@ with pkgs; arrow-cpp = callPackage ../development/libraries/arrow-cpp {}; + arrow-glib = callPackage ../development/libraries/arrow-glib {}; + arsenal = callPackage ../tools/security/arsenal { }; assimp = callPackage ../development/libraries/assimp { }; @@ -18729,6 +18733,8 @@ with pkgs; libchop = callPackage ../development/libraries/libchop { }; + libcifpp = callPackage ../development/libraries/libcifpp { }; + libcint = callPackage ../development/libraries/libcint { }; libclc = callPackage ../development/libraries/libclc { }; @@ -23129,6 +23135,8 @@ with pkgs; unifi = unifi7; + unifi-protect-backup = callPackage ../applications/backup/unifi-protect-backup { }; + unifi-video = callPackage ../servers/unifi-video { }; unpackerr = callPackage ../servers/unpackerr { @@ -26051,6 +26059,8 @@ with pkgs; cardboard = callPackage ../applications/window-managers/cardboard { }; + cardo = callPackage ../data/fonts/cardo { }; + cage = callPackage ../applications/window-managers/cage { wlroots = wlroots_0_14; }; @@ -33410,6 +33420,8 @@ with pkgs; diamond = callPackage ../applications/science/biology/diamond { }; + dssp = callPackage ../applications/science/biology/dssp { }; + ecopcr = callPackage ../applications/science/biology/ecopcr { }; eggnog-mapper = callPackage ../applications/science/biology/eggnog-mapper { };