diff options
Diffstat (limited to 'pkgs')
32 files changed, 126 insertions, 178 deletions
diff --git a/pkgs/applications/audio/waylyrics/default.nix b/pkgs/applications/audio/waylyrics/default.nix index 69069f01243c3..e3cf437258df9 100644 --- a/pkgs/applications/audio/waylyrics/default.nix +++ b/pkgs/applications/audio/waylyrics/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "waylyrics"; - version = "0.3.12"; + version = "0.3.13"; src = fetchFromGitHub { owner = "waylyrics"; repo = "waylyrics"; rev = "v${version}"; - hash = "sha256-FfrgeUDKiM9m0mvKlu02KEuvsq+3Gv3yPFW1DIQw05I="; + hash = "sha256-hx0g5JBf0v7B26GCcU5BkmxVvbHQNPSQ2d+ohDk3080="; }; - cargoHash = "sha256-xD46aKT18Kl+81Pfv+zleUUKhSV1Px7JFjhXw1/4cBA="; + cargoHash = "sha256-v1+1ivbJAZLqnnFaR6vmpcZ7vd5j3afZliggXaHiwWM="; nativeBuildInputs = [ pkg-config wrapGAppsHook4 ]; buildInputs = [ openssl dbus ]; diff --git a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix index bb45c383487cc..1e9a8191b3f16 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix @@ -508,14 +508,29 @@ let rime = super.rime.overrideAttrs (old: { buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.librime ]; - preBuild = (old.preBuild or "") + '' + preBuild = (old.preBuild or "") + + (if pkgs.stdenv.isDarwin then + '' + export MODULE_FILE_SUFFIX=".dylib" + make lib + mkdir -p /tmp/build/rime-lib + cp *.dylib /tmp/build/rime-lib + '' + else + '' make lib mkdir -p /build/rime-lib cp *.so /build/rime-lib - ''; - postInstall = (old.postInstall or "") + '' + ''); + postInstall = (old.postInstall or "") + + (if pkgs.stdenv.isDarwin then + '' + install -m444 -t $out/share/emacs/site-lisp/elpa/rime-* /tmp/build/rime-lib/*.dylib + '' + else + '' install -m444 -t $out/share/emacs/site-lisp/elpa/rime-* /build/rime-lib/*.so - ''; + ''); }); shm = super.shm.overrideAttrs (attrs: { diff --git a/pkgs/applications/misc/elastic/default.nix b/pkgs/applications/misc/elastic/default.nix index ae614d35a4e05..d9d7681b36c82 100644 --- a/pkgs/applications/misc/elastic/default.nix +++ b/pkgs/applications/misc/elastic/default.nix @@ -11,21 +11,20 @@ , gtksourceview5 , blueprint-compiler , wrapGAppsHook4 -, appstream-glib , desktop-file-utils , template-glib }: stdenv.mkDerivation rec { pname = "elastic"; - version = "0.1.4"; + version = "0.1.5"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "World"; repo = "elastic"; rev = version; - hash = "sha256-EExVhf71SEWVcAOAt+IuQH3umNOY4hzzkFVIqnESppo="; + hash = "sha256-y/XBXN5RIqnFmxnmkThBGW0B5owgy/1Q/6jmkBCi+rk="; }; nativeBuildInputs = [ @@ -34,7 +33,6 @@ stdenv.mkDerivation rec { vala pkg-config wrapGAppsHook4 - appstream-glib desktop-file-utils blueprint-compiler ]; diff --git a/pkgs/applications/misc/obsidian/default.nix b/pkgs/applications/misc/obsidian/default.nix index 000d94bbeec39..9ca05a653a358 100644 --- a/pkgs/applications/misc/obsidian/default.nix +++ b/pkgs/applications/misc/obsidian/default.nix @@ -13,7 +13,7 @@ let inherit (stdenv.hostPlatform) system; pname = "obsidian"; - version = "1.6.3"; + version = "1.6.5"; appname = "Obsidian"; meta = with lib; { description = "Powerful knowledge base that works on top of a local folder of plain text Markdown files"; @@ -23,10 +23,10 @@ let maintainers = with maintainers; [ atila conradmearns zaninime qbit kashw2 w-lfchen ]; }; - filename = if stdenv.isDarwin then "Obsidian-${version}-universal.dmg" else "obsidian-${version}.tar.gz"; + filename = if stdenv.isDarwin then "Obsidian-${version}.dmg" else "obsidian-${version}.tar.gz"; src = fetchurl { url = "https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/${filename}"; - hash = if stdenv.isDarwin then "sha256-o5ELpG82mJgcd9Pil6A99BPK6Hoa0OKJJkYpyfGJR9I=" else "sha256-ho8E2Iq+s/w8NjmxzZo/y5aj3MNgbyvIGjk3nSKPLDw="; + hash = if stdenv.isDarwin then "sha256-gA6FkCalGw0pgnCbOJliItLzMGr+CG9r6mSMdvVUAoQ=" else "sha256-9goJnKOgJk5TrFUNz4vff8704cvHfqZpGL/iBkcU2GY="; }; icon = fetchurl { diff --git a/pkgs/applications/misc/sc-im/default.nix b/pkgs/applications/misc/sc-im/default.nix index 2ec7f35a219b4..d4509411dcfee 100644 --- a/pkgs/applications/misc/sc-im/default.nix +++ b/pkgs/applications/misc/sc-im/default.nix @@ -46,6 +46,8 @@ stdenv.mkDerivation rec { makeFlags = [ "prefix=${placeholder "out"}" ]; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=implicit-function-declaration"; + postInstall = '' wrapProgram "$out/bin/sc-im" --prefix PATH : "${lib.makeBinPath [ gnuplot ]}" ''; diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json index 382038ac99a5b..41fe2756ff47e 100644 --- a/pkgs/applications/version-management/gitlab/data.json +++ b/pkgs/applications/version-management/gitlab/data.json @@ -1,15 +1,15 @@ { - "version": "16.11.4", - "repo_hash": "sha256-VtjGV/0Xtmwqu/YZa6P6jUvlTYj9FNKALcJ3ZvMUJBw=", + "version": "16.11.5", + "repo_hash": "1bhg6glb644m55m50q2kp0azf3c4if11vymjn823rhs68jw3jqcp", "yarn_hash": "03q7h8dyssvsr91klr1jk65f5jz1ac71lx0114zq9c7awxrgp6kq", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v16.11.4-ee", + "rev": "v16.11.5-ee", "passthru": { - "GITALY_SERVER_VERSION": "16.11.4", - "GITLAB_PAGES_VERSION": "16.11.4", + "GITALY_SERVER_VERSION": "16.11.5", + "GITLAB_PAGES_VERSION": "16.11.5", "GITLAB_SHELL_VERSION": "14.35.0", "GITLAB_ELASTICSEARCH_INDEXER_VERSION": "4.8.0", - "GITLAB_WORKHORSE_VERSION": "16.11.4" + "GITLAB_WORKHORSE_VERSION": "16.11.5" } } diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix index fb175aad462a6..c978c1884577b 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -5,7 +5,7 @@ }: let - version = "16.11.4"; + version = "16.11.5"; package_version = "v${lib.versions.major version}"; gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}"; @@ -17,7 +17,7 @@ let owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - hash = "sha256-sdRKKOWoX0yyqUGpu/mqDdTq2nLZ2Gr5GNV9x99rdeU="; + hash = "sha256-iBLRhkFPsopy6m3y+9Qc+v3FCbV5nOWMs+DMwW+JiSk="; }; vendorHash = "sha256-WCZF7XVW6J1zyPx8e/Mcn+HmHElAUGcEICxiF5HLzBg="; diff --git a/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix b/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix index 480d9921f9c7f..3cb270e2cae02 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix @@ -2,14 +2,14 @@ buildGoModule rec { pname = "gitlab-pages"; - version = "16.11.4"; + version = "16.11.5"; # nixpkgs-update: no auto update src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-pages"; rev = "v${version}"; - hash = "sha256-6Fh1IKCs2Bg7Eg44kbCMM8YhLmwWvdZnXp39fphLzcE="; + hash = "sha256-mJKzaFICE7f4aIFGeV/4PbbQkaxwmRd9QO2pRXpM2ag="; }; vendorHash = "sha256-WrR4eZRAuYkhr7ZqP7OXqJ6uwvxzn+t+3OdBNcNaq0M="; diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix index d01deb57b2006..682376e40a111 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix @@ -5,7 +5,7 @@ in buildGoModule rec { pname = "gitlab-workhorse"; - version = "16.11.4"; + version = "16.11.5"; # nixpkgs-update: no auto update src = fetchFromGitLab { diff --git a/pkgs/applications/video/streamlink/default.nix b/pkgs/applications/video/streamlink/default.nix index e5f0cac20b523..65b8406e8ee36 100644 --- a/pkgs/applications/video/streamlink/default.nix +++ b/pkgs/applications/video/streamlink/default.nix @@ -7,12 +7,12 @@ python3Packages.buildPythonApplication rec { pname = "streamlink"; - version = "6.7.4"; + version = "6.8.1"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-kzdTerEZ/ndSSl1mWq7Ou/sG4suN8o0SYNkodkJXUc4="; + hash = "sha256-TEN++sKCtN8CZRnyBp4niRFlb+LPSNcyMCu9Rm+GOZ0="; }; patches = [ @@ -42,7 +42,6 @@ python3Packages.buildPythonApplication rec { propagatedBuildInputs = with python3Packages; [ certifi - exceptiongroup isodate lxml pycountry diff --git a/pkgs/applications/misc/cartridges/default.nix b/pkgs/by-name/ca/cartridges/package.nix index 3674d61fafcae..eeb20dbfda77a 100644 --- a/pkgs/applications/misc/cartridges/default.nix +++ b/pkgs/by-name/ca/cartridges/package.nix @@ -1,66 +1,61 @@ -{ blueprint-compiler -, desktop-file-utils -, fetchFromGitHub -, gobject-introspection -, lib -, libadwaita -, meson -, ninja -, python3Packages -, stdenv -, wrapGAppsHook4 -, nix-update-script +{ + lib, + fetchFromGitHub, + python3Packages, + appstream, + blueprint-compiler, + desktop-file-utils, + gobject-introspection, + glib-networking, + libadwaita, + meson, + ninja, + pkg-config, + wrapGAppsHook4, }: -stdenv.mkDerivation (finalAttrs: { +python3Packages.buildPythonApplication rec { pname = "cartridges"; version = "2.8.5"; + pyproject = false; src = fetchFromGitHub { owner = "kra-mo"; repo = "cartridges"; - rev = "v${finalAttrs.version}"; + rev = "v${version}"; hash = "sha256-7T+q3T8z8SCpAn3ayodZeETOsTwL+hhVWzY2JyBEoi4="; }; - pythonPath = with python3Packages; [ - pillow - pygobject3 - pyyaml - requests - ]; - # TODO: remove this when #286814 hits master mesonFlags = [ "-Dtiff_compression=jpeg" ]; - buildInputs = [ - libadwaita - (python3Packages.python.withPackages (_: finalAttrs.pythonPath)) - ]; - nativeBuildInputs = [ + appstream blueprint-compiler desktop-file-utils gobject-introspection meson ninja - python3Packages.wrapPython + pkg-config wrapGAppsHook4 ]; - dontWrapGApps = true; + buildInputs = [ + glib-networking + libadwaita + ]; - postFixup = '' - makeWrapperArgs+=("''${gappsWrapperArgs[@]}") - wrapPythonPrograms "$out/bin" "$out" "$pythonPath" - ''; + dependencies = with python3Packages; [ + pillow + pygobject3 + pyyaml + requests + ]; - passthru = { - updateScript = nix-update-script { }; - }; + dontWrapGApps = true; + makeWrapperArgs = [ ''''${gappsWrapperArgs[@]}'' ]; - meta = with lib; { + meta = { description = "GTK4 + Libadwaita game launcher"; - mainProgram = "cartridges"; longDescription = '' A simple game launcher for all of your games. It has support for importing games from Steam, Lutris, Heroic @@ -68,8 +63,10 @@ stdenv.mkDerivation (finalAttrs: { You can sort and hide games or download cover art from SteamGridDB. ''; homepage = "https://apps.gnome.org/Cartridges/"; - license = licenses.gpl3Plus; - maintainers = [ maintainers.getchoo ]; - platforms = platforms.linux; + changelog = "https://github.com/kra-mo/cartridges/releases/tag/${src.rev}"; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ getchoo ]; + mainProgram = "cartridges"; + platforms = lib.platforms.linux; }; -}) +} diff --git a/pkgs/by-name/hy/hyperlink/package.nix b/pkgs/by-name/hy/hyperlink/package.nix index 2d2ac51f30fe4..4bf253c030f7d 100644 --- a/pkgs/by-name/hy/hyperlink/package.nix +++ b/pkgs/by-name/hy/hyperlink/package.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "hyperlink"; - version = "0.1.31"; + version = "0.1.32"; src = fetchFromGitHub { owner = "untitaker"; repo = "hyperlink"; rev = version; - hash = "sha256-ZmNw4NmDD0VWwnmNjxsA4y5gzVbTzshZLRYzaNJ4iGw="; + hash = "sha256-QejpyleugPWvr4p8JOMieswVtfQMGxtH+fb46mRLlH4="; }; - cargoHash = "sha256-5j1Ziwk5uQNIKCRMZpJP4qR0tcyUUvT8i/KZbXq3WzI="; + cargoHash = "sha256-d0JwxxI6Quyan2lgymxGpROKR757LEOUIgJcs5c9Kmc="; meta = with lib; { description = "Very fast link checker for CI"; diff --git a/pkgs/by-name/li/limine/package.nix b/pkgs/by-name/li/limine/package.nix index f313ab80863f1..4402cad9816ab 100644 --- a/pkgs/by-name/li/limine/package.nix +++ b/pkgs/by-name/li/limine/package.nix @@ -12,7 +12,7 @@ }: let - version = "7.7.2"; + version = "7.8.0"; in # The output of the derivation is a tool to create bootable images using Limine # as bootloader for various platforms and corresponding binary and helper files. @@ -24,7 +24,7 @@ stdenv.mkDerivation { # Packaging that in Nix is very cumbersome. src = fetchurl { url = "https://github.com/limine-bootloader/limine/releases/download/v${version}/limine-${version}.tar.gz"; - sha256 = "sha256-t3ymsKn+pFW2xOn+BKJriqx2cMbCjtnGGgvCF82/8TE="; + sha256 = "sha256-Fue2KPyJ76Q1f+chvhwmJlmQ4QwXksyCeztd2d2cTH0="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/li/livi/package.nix b/pkgs/by-name/li/livi/package.nix index d39007f9efe99..eec7878794232 100644 --- a/pkgs/by-name/li/livi/package.nix +++ b/pkgs/by-name/li/livi/package.nix @@ -15,14 +15,14 @@ stdenv.mkDerivation rec { pname = "livi"; - version = "0.1.0"; + version = "0.2.0"; src = fetchFromGitLab { owner = "guidog"; repo = "livi"; domain = "gitlab.gnome.org"; rev = "v${version}"; - sha256 = "sha256-FJ43BDRsZUFuRrNFWuEJ/nSO+suWad2QvqhwzuXWBtY="; + hash = "sha256-4CWH8TWxuDGYlOilxyCa/HL/vtO6A9u/x39s1OLDODo"; }; nativeBuildInputs = [ meson diff --git a/pkgs/development/python-modules/google-cloud-bigquery/default.nix b/pkgs/development/python-modules/google-cloud-bigquery/default.nix index 35de32bea6c51..7062b2b2e3d84 100644 --- a/pkgs/development/python-modules/google-cloud-bigquery/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigquery/default.nix @@ -30,14 +30,14 @@ buildPythonPackage rec { pname = "google-cloud-bigquery"; - version = "3.24.0"; + version = "3.25.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-6V5vbgqjLmxFPUTisymJMf3XlHwwnqMpoxtv8fk54X4="; + hash = "sha256-Wyr/MgWoVEgRF0NoNq4UA/EfJZTmgQqYiGr9V+2ihQk="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/google-cloud-monitoring/default.nix b/pkgs/development/python-modules/google-cloud-monitoring/default.nix index f3cafa489d6e5..fb5e089228f7f 100644 --- a/pkgs/development/python-modules/google-cloud-monitoring/default.nix +++ b/pkgs/development/python-modules/google-cloud-monitoring/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "google-cloud-monitoring"; - version = "2.21.0"; + version = "2.22.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-57HIdY/DVj/7mjR7xRcuJ4L0TBIbyA/BUoPiic/2db8="; + hash = "sha256-SUaW4XiMVe9bL61GSBP92fWRF/wogZt9nSehhz17f60="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/google-cloud-pubsub/default.nix b/pkgs/development/python-modules/google-cloud-pubsub/default.nix index 8ba2f84e072f3..4f4877e3589a8 100644 --- a/pkgs/development/python-modules/google-cloud-pubsub/default.nix +++ b/pkgs/development/python-modules/google-cloud-pubsub/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "google-cloud-pubsub"; - version = "2.21.4"; + version = "2.21.5"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-LLjHaYrb/qBEjbbIm3iqchf84HweN7RtPlNfoWM/OuY="; + hash = "sha256-T6lufyADWczEnPZlfjGsNfXm5V0A+7PO36ZykDz3WyQ="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/influxdb-client/default.nix b/pkgs/development/python-modules/influxdb-client/default.nix index 0c959277f31e1..7fe84b567d362 100644 --- a/pkgs/development/python-modules/influxdb-client/default.nix +++ b/pkgs/development/python-modules/influxdb-client/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "influxdb-client"; - version = "1.43.0"; + version = "1.44.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "influxdata"; repo = "influxdb-client-python"; rev = "refs/tags/v${version}"; - hash = "sha256-CwSqJj9MslcvTzYGaDRygskSxbSh80uCJQM2tNz743k="; + hash = "sha256-iG9edGHqhExUoL+1q8s5QvY/mrYOMosgtA2P1zwO3o8="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/llama-index-graph-stores-neo4j/default.nix b/pkgs/development/python-modules/llama-index-graph-stores-neo4j/default.nix index 71b90f73f1964..06d00b774787c 100644 --- a/pkgs/development/python-modules/llama-index-graph-stores-neo4j/default.nix +++ b/pkgs/development/python-modules/llama-index-graph-stores-neo4j/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "llama-index-graph-stores-neo4j"; - version = "0.2.5"; + version = "0.2.6"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_graph_stores_neo4j"; inherit version; - hash = "sha256-K+k3tsELhF6TXVK/voMRYpb0vVkGQpkzYnB9syCLmoY="; + hash = "sha256-xv/Z/HLFUEfLqjE4052bc8aBJq3bvreYD/XZw1vijQQ="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/neo4j/default.nix b/pkgs/development/python-modules/neo4j/default.nix index 1dc1de3daab13..d1a6903a666b0 100644 --- a/pkgs/development/python-modules/neo4j/default.nix +++ b/pkgs/development/python-modules/neo4j/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "neo4j"; - version = "5.21.0"; + version = "5.22.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "neo4j"; repo = "neo4j-python-driver"; rev = "refs/tags/${version}"; - hash = "sha256-SGRe5O+6HqLFu4VQc0QC+91KVjqKeqNt5hIBwophvP0="; + hash = "sha256-/yilbKui0D49zviNM9MI5ElGAYPB3MlbMgpDyI1kVX8="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pyTelegramBotAPI/default.nix b/pkgs/development/python-modules/pyTelegramBotAPI/default.nix index e5f32b9507560..e86332342bb9b 100644 --- a/pkgs/development/python-modules/pyTelegramBotAPI/default.nix +++ b/pkgs/development/python-modules/pyTelegramBotAPI/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "pytelegrambotapi"; - version = "4.19.0"; + version = "4.20.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "eternnoir"; repo = "pyTelegramBotAPI"; rev = "refs/tags/${version}"; - hash = "sha256-vyhX6TG3B6f1u49ngzdaCOZwSnEUQ2XMiq80bqCSmxU="; + hash = "sha256-JKT3kllOV9VEwhUwv3geAP5ibJgaAApCahD1N4V5SE8="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/tools/rubyfmt/default.nix b/pkgs/development/tools/rubyfmt/default.nix index a2bd6d453fcdb..287959dbf0b57 100644 --- a/pkgs/development/tools/rubyfmt/default.nix +++ b/pkgs/development/tools/rubyfmt/default.nix @@ -73,12 +73,12 @@ rustPlatform.buildRustPackage rec { mv $out/bin/rubyfmt{-main,} ''; - meta = with lib; { + meta = { description = "Ruby autoformatter"; homepage = "https://github.com/fables-tales/rubyfmt"; - license = licenses.mit; - maintainers = with maintainers; [ bobvanderlinden ]; - broken = stdenv.isDarwin && stdenv.isx86_64; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ bobvanderlinden ]; + broken = stdenv.isDarwin; mainProgram = "rubyfmt"; }; } diff --git a/pkgs/development/web/flyctl/default.nix b/pkgs/development/web/flyctl/default.nix index e04421421180d..47743d296e591 100644 --- a/pkgs/development/web/flyctl/default.nix +++ b/pkgs/development/web/flyctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "flyctl"; - version = "0.2.72"; + version = "0.2.75"; src = fetchFromGitHub { owner = "superfly"; repo = "flyctl"; rev = "v${version}"; - hash = "sha256-v2+xDeErVkgiGavPpBtKg7+BBhiKZdmbo2NIFL7iXvw="; + hash = "sha256-7qJDlMy2LmrUMxeacH6n/JP8Zg4ln12iC1BGysejMws="; }; - vendorHash = "sha256-iRZrjkWQxuUW/YM5TygFt+g8suM5iLGsWsCt4QQOX3M="; + vendorHash = "sha256-RSLwEOtZsYfTgBdkZIxccxehz8lbozWJV5UdKiMeoLU="; subPackages = [ "." ]; diff --git a/pkgs/servers/http/envoy/0004-nixpkgs-add-cstdint-in-dd-trace-cpp.patch b/pkgs/servers/http/envoy/0004-nixpkgs-add-cstdint-in-dd-trace-cpp.patch deleted file mode 100644 index 31dfe08f91b90..0000000000000 --- a/pkgs/servers/http/envoy/0004-nixpkgs-add-cstdint-in-dd-trace-cpp.patch +++ /dev/null @@ -1,29 +0,0 @@ -From dd3509a7d646a970480f94a8e09f377e9783504d Mon Sep 17 00:00:00 2001 -From: Malte Poll <1780588+malt3@users.noreply.github.com> -Date: Mon, 22 Apr 2024 16:07:58 +0200 -Subject: [PATCH 4/4] nixpkgs: add cstdint in dd-trace-cpp - ---- - bazel/repositories.bzl | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/bazel/repositories.bzl b/bazel/repositories.bzl -index d91aa712bd..467348e773 100644 ---- a/bazel/repositories.bzl -+++ b/bazel/repositories.bzl -@@ -772,7 +772,11 @@ def _io_opentelemetry_api_cpp(): - ) - - def _com_github_datadog_dd_trace_cpp(): -- external_http_archive("com_github_datadog_dd_trace_cpp") -+ external_http_archive( -+ name = "com_github_datadog_dd_trace_cpp", -+ patch_args = ["-p1"], -+ patches = ["@envoy//bazel:dd_trace_cpp.patch"], -+ ) - native.bind( - name = "dd_trace_cpp", - actual = "@com_github_datadog_dd_trace_cpp//:dd_trace_cpp", --- -2.42.0 - diff --git a/pkgs/servers/http/envoy/dd_trace_cpp.patch b/pkgs/servers/http/envoy/dd_trace_cpp.patch deleted file mode 100644 index d9873c8f1a8c9..0000000000000 --- a/pkgs/servers/http/envoy/dd_trace_cpp.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 4851a6a722b228ecbfd9df255dab3d8f30bd84b9 Mon Sep 17 00:00:00 2001 -From: Malte Poll <1780588+malt3@users.noreply.github.com> -Date: Mon, 22 Apr 2024 15:36:33 +0200 -Subject: [PATCH] nixpkgs: add cstdint to fix compilation under GCC 13 - -https://gcc.gnu.org/gcc-13/porting_to.html#header-dep-changes ---- - src/datadog/parse_util.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/datadog/parse_util.h b/src/datadog/parse_util.h -index c603286..c8e4e83 100644 ---- a/src/datadog/parse_util.h -+++ b/src/datadog/parse_util.h -@@ -2,6 +2,7 @@ - - // This component provides parsing-related miscellanea. - -+#include <cstdint> - #include <string> - #include <unordered_map> - #include <vector> --- -2.42.0 - diff --git a/pkgs/servers/http/envoy/default.nix b/pkgs/servers/http/envoy/default.nix index f979cc92ba7ef..2ea00c598e276 100644 --- a/pkgs/servers/http/envoy/default.nix +++ b/pkgs/servers/http/envoy/default.nix @@ -24,15 +24,15 @@ let # However, the version string is more useful for end-users. # These are contained in a attrset of their own to make it obvious that # people should update both. - version = "1.30.2"; - rev = "d79f6e8d453ee260e9094093b8dd31af0056e67b"; - hash = "sha256-qbe9M4dH7NFDY5UF17urJ6WvnZNhvdMU4HAg0BaL+KA="; + version = "1.30.3"; + rev = "12a6a79966203969a23aa2f0d705f39b679744c2"; + hash = "sha256-S18bnAVha4CnYKHTzytKY6PHWSbOzmObbyZEhzIHsf8="; }; # these need to be updated for any changes to fetchAttrs depsHash = { - x86_64-linux = "sha256-/IpTRFBkif1HSycPrWxphKTnhL6wHgPAweyxoXZ1oVg="; - aarch64-linux = "sha256-uA1CHKzdBht+WYxgwR2g5t7fRybhbo6Hgpzdr+H1vqY="; + x86_64-linux = "sha256-m7dMr/dCmjpKLPT+8FXBHGkTlNoN9x1oQ7D6uO0sHtQ="; + aarch64-linux = "sha256-9GqVpWkMHP9nb5EZHjGKixkWazi//oLlIUum45xTvoM="; }.${stdenv.system} or (throw "unsupported system ${stdenv.system}"); in buildBazelPackage { @@ -55,8 +55,6 @@ buildBazelPackage { sed -i 's,#!/usr/bin/env python3,#!${python3}/bin/python,' bazel/foreign_cc/luajit.patch sed -i '/javabase=/d' .bazelrc sed -i '/"-Werror"/d' bazel/envoy_internal.bzl - - cp ${./dd_trace_cpp.patch} bazel/dd_trace_cpp.patch ''; patches = [ @@ -68,11 +66,6 @@ buildBazelPackage { # use system C/C++ tools ./0003-nixpkgs-use-system-C-C-toolchains.patch - - # apply patch to dd-trace-cpp - # remove once a version of dd-trace-cpp is released and adopted by envoy - # that contains https://github.com/DataDog/dd-trace-cpp/commit/3a8e1e9a3cf4e87ef053e954a39dc7a967ac6965 - ./0004-nixpkgs-add-cstdint-in-dd-trace-cpp.patch ]; nativeBuildInputs = [ diff --git a/pkgs/tools/admin/stripe-cli/default.nix b/pkgs/tools/admin/stripe-cli/default.nix index e03024c4a5742..acbc464663dd4 100644 --- a/pkgs/tools/admin/stripe-cli/default.nix +++ b/pkgs/tools/admin/stripe-cli/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "stripe-cli"; - version = "1.19.5"; + version = "1.21.0"; src = fetchFromGitHub { owner = "stripe"; repo = pname; rev = "v${version}"; - hash = "sha256-gunLbZOT0cnWGxc6714XcPdHJVK4LbDBwC2zt03WrUM="; + hash = "sha256-8r+Gu36zAmNTZb6xA5iS0+smkmJ7UrdGi9TaUXUr5aQ="; }; - vendorHash = "sha256-xFWU+OazwLTb5qdFeYth1MlPJ76nEK4qSCNGVhC/PxE="; + vendorHash = "sha256-TuxYJ3u4/5PJYRoRgom+M1au9XerZ+vj9X3jUWTPM58="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/filesystems/btrfs-progs/default.nix b/pkgs/tools/filesystems/btrfs-progs/default.nix index e3fae05fe01ec..955a2b97e7452 100644 --- a/pkgs/tools/filesystems/btrfs-progs/default.nix +++ b/pkgs/tools/filesystems/btrfs-progs/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { pname = "btrfs-progs"; - version = "6.9.1"; + version = "6.9.2"; src = fetchurl { url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz"; - hash = "sha256-7VSz1w0MfBHaBCipz6WoHLguYzFkx7pXz2cU+LaUGLo="; + hash = "sha256-Q4ZbsnLcCrJYXeNgVDTYG6IXV48Il79wDNNsFKxAZSo="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/security/asnmap/default.nix b/pkgs/tools/security/asnmap/default.nix index 1c2c52fd00984..84a0cf709b2a0 100644 --- a/pkgs/tools/security/asnmap/default.nix +++ b/pkgs/tools/security/asnmap/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "asnmap"; - version = "1.1.0"; + version = "1.1.1"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "asnmap"; rev = "refs/tags/v${version}"; - hash = "sha256-Of4IVra6kMHY9btWcF9grM/r3lTWFP/geeT309Seasw="; + hash = "sha256-dGSWUuM4Zcz9QYjYaHur3RYryxe1wJycx/wUL5yqCpM="; }; - vendorHash = "sha256-RDv8vkBI3miyeNAbhUsMpuZCYRUZ0ATfXYHxaTgTVfA="; + vendorHash = "sha256-bSpMYQvrlR9T06dYF8gaTZmMAp6Gnb2cfsYCUes7i2s="; ldflags = [ "-w" diff --git a/pkgs/tools/security/exploitdb/default.nix b/pkgs/tools/security/exploitdb/default.nix index 086927a43fcea..c74c2aa6b05a1 100644 --- a/pkgs/tools/security/exploitdb/default.nix +++ b/pkgs/tools/security/exploitdb/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "exploitdb"; - version = "2024-06-15"; + version = "2024-06-27"; src = fetchFromGitLab { owner = "exploit-database"; repo = "exploitdb"; rev = "refs/tags/${version}"; - hash = "sha256-bETNSUv36GobOke1bwE+uTSRqln3kANqfl8UIx7bdjM="; + hash = "sha256-8TYraSY6dA7Q9CE9sTjfteNzrVIc6CuMPD6umOmAoHk="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/security/trufflehog/default.nix b/pkgs/tools/security/trufflehog/default.nix index 4bbd65c09b65c..6d012096b4611 100644 --- a/pkgs/tools/security/trufflehog/default.nix +++ b/pkgs/tools/security/trufflehog/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "trufflehog"; - version = "3.78.2"; + version = "3.79.0"; src = fetchFromGitHub { owner = "trufflesecurity"; repo = "trufflehog"; rev = "refs/tags/v${version}"; - hash = "sha256-s+8l203ntPsp54yZpEX2wz8Dt/p3rokfu6KI8LSwpko="; + hash = "sha256-YgalvCAhtL0y2bVqeI0w/n5eVMIW2QPPbm9zpBzzuAM="; }; - vendorHash = "sha256-0YNvqJlSF6TIGSbQrAu47G2oXPY9+2wiZbDP94oAaVA="; + vendorHash = "sha256-fBcBY6P2V2ZkBDqCLk5AMBtGF1vTZzZ8ohxc1BPTSVQ="; proxyVendor = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9c46a54b464ac..323db08fc9c40 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -411,8 +411,6 @@ with pkgs; caroline = callPackage ../development/libraries/caroline { }; - cartridges = callPackage ../applications/misc/cartridges { }; - castget = callPackage ../applications/networking/feedreaders/castget { }; catatonit = callPackage ../applications/virtualization/catatonit { }; |