diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2024-02-26 12:01:37 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-02-26 12:01:37 +0000 |
commit | 50d12072e063820feb8a5cf003e0f6c2c29bac86 (patch) | |
tree | 0f4785e2eecf679f0118e339fdd53ef12581bedf /pkgs | |
parent | d7deb8a89d6ce8aab98cb50a7384d3eafee36d4a (diff) | |
parent | 318dafba9b561e8b98a9b073deac1aef7513ce9a (diff) | |
download | nixlib-50d12072e063820feb8a5cf003e0f6c2c29bac86.tar nixlib-50d12072e063820feb8a5cf003e0f6c2c29bac86.tar.gz nixlib-50d12072e063820feb8a5cf003e0f6c2c29bac86.tar.bz2 nixlib-50d12072e063820feb8a5cf003e0f6c2c29bac86.tar.lz nixlib-50d12072e063820feb8a5cf003e0f6c2c29bac86.tar.xz nixlib-50d12072e063820feb8a5cf003e0f6c2c29bac86.tar.zst nixlib-50d12072e063820feb8a5cf003e0f6c2c29bac86.zip |
Merge staging-next into staging
Diffstat (limited to 'pkgs')
26 files changed, 189 insertions, 151 deletions
diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index aea3b3e3488c..678bd8ea4df9 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -3955,6 +3955,24 @@ let }; }; + uloco.theme-bluloco-light = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "theme-bluloco-light"; + publisher = "uloco"; + version = "3.7.3"; + sha256 = "1il557x7c51ic9bjq7z431105m582kig9v2vpy3k2z3xhrbb0211"; + }; + postInstall = '' + rm -r $out/share/vscode/extensions/uloco.theme-bluloco-light/screenshots + ''; + meta = { + description = "A fancy but yet sophisticated light designer color scheme / theme for Visual Studio Code"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=uloco.theme-bluloco-light"; + homepage = "https://github.com/uloco/theme-bluloco-light"; + license = lib.licenses.lgpl3; + }; + }; + unifiedjs.vscode-mdx = buildVscodeMarketplaceExtension { mktplcRef = { name = "vscode-mdx"; diff --git a/pkgs/applications/networking/browsers/microsoft-edge/default.nix b/pkgs/applications/networking/browsers/microsoft-edge/default.nix index 62fb771cd3a7..ae98d8aa44a2 100644 --- a/pkgs/applications/networking/browsers/microsoft-edge/default.nix +++ b/pkgs/applications/networking/browsers/microsoft-edge/default.nix @@ -1,15 +1,9 @@ { - stable = import ./browser.nix { - channel = "stable"; - version = "121.0.2277.128"; - revision = "1"; - hash = "sha256-ooZzTDmddlYwWoDMqzFPfbUImT351/ptfdlxKEtI77s="; - }; beta = import ./browser.nix { channel = "beta"; - version = "122.0.2365.38"; + version = "122.0.2365.52"; revision = "1"; - hash = "sha256-u0qk4T695LyhtfMw5929z4U8+jM2o/gbq8DFtD1PNTU="; + hash = "sha256-H8VTDyDY2Rm5z4cJruzMa1YorBAUL0pJuwhQ6cy4WfY="; }; dev = import ./browser.nix { channel = "dev"; @@ -17,4 +11,10 @@ revision = "1"; hash = "sha256-I9PT320DJgqJYNwB0pvngyLlV+N2jaS5tOwVwwNHex0="; }; + stable = import ./browser.nix { + channel = "stable"; + version = "122.0.2365.52"; + revision = "1"; + hash = "sha256-hULyUUFhMjiareXr1zTynyknVyert45N0H4iR8woGRw="; + }; } diff --git a/pkgs/applications/networking/instant-messengers/quaternion/default.nix b/pkgs/applications/networking/instant-messengers/quaternion/default.nix index 133766d8cc0d..a900061d0667 100644 --- a/pkgs/applications/networking/instant-messengers/quaternion/default.nix +++ b/pkgs/applications/networking/instant-messengers/quaternion/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "quaternion"; - version = "0.0.96-beta4"; + version = "0.0.96.1"; src = fetchFromGitHub { owner = "quotient-im"; repo = "Quaternion"; rev = "refs/tags/${version}"; - hash = "sha256-yItl31Ze48lRIIey+FlRLMVAkg4mHu8G1sFOceHvTJw="; + hash = "sha256-lRCSEb/ldVnEv6z0moU4P5rf0ssKb9Bw+4QEssLjuwI="; }; buildInputs = [ diff --git a/pkgs/tools/networking/clash-meta/default.nix b/pkgs/by-name/cl/clash-meta/package.nix index 2ec32960d7fa..5ebb461a595b 100644 --- a/pkgs/tools/networking/clash-meta/default.nix +++ b/pkgs/by-name/cl/clash-meta/package.nix @@ -2,26 +2,26 @@ , fetchFromGitHub , buildGoModule }: + buildGoModule rec { pname = "clash-meta"; - version = "1.16.0"; + version = "1.18.1"; src = fetchFromGitHub { owner = "MetaCubeX"; - repo = "Clash.Meta"; + repo = "mihomo"; rev = "v${version}"; - hash = "sha256-ORyjCYf2OPrSt/juiBk0Gf2Az4XoZipKBWWFXf8nIqE="; + hash = "sha256-ezOkDrpytZQdc+Txe4eUyuWY6oipn9jIrmu7aO8lNlQ="; }; - vendorHash = "sha256-ySCmHLuMTCxBcAYo7YD8zOpUAa90PQmeLLt+uOn40Pk="; + vendorHash = "sha256-tvPR5kAta4MlMTwjfxwVOacRr2nVpfalbN08mfxml64="; - # Do not build testing suit excludedPackages = [ "./test" ]; ldflags = [ "-s" "-w" - "-X github.com/Dreamacro/clash/constant.Version=${version}" + "-X github.com/metacubex/mihomo/constant.Version=${version}" ]; tags = [ @@ -32,12 +32,12 @@ buildGoModule rec { doCheck = false; postInstall = '' - mv $out/bin/clash $out/bin/clash-meta + mv $out/bin/mihomo $out/bin/clash-meta ''; meta = with lib; { - description = "Another Clash Kernel"; - homepage = "https://github.com/MetaCubeX/Clash.Meta"; + description = "A rule-based tunnel in Go. Present named mihomo"; + homepage = "https://github.com/MetaCubeX/mihomo"; license = licenses.gpl3Only; maintainers = with maintainers; [ oluceps ]; mainProgram = "clash-meta"; diff --git a/pkgs/by-name/in/intune-portal/package.nix b/pkgs/by-name/in/intune-portal/package.nix index fa8e7b5871a4..8b6667867627 100644 --- a/pkgs/by-name/in/intune-portal/package.nix +++ b/pkgs/by-name/in/intune-portal/package.nix @@ -23,11 +23,11 @@ }: stdenv.mkDerivation rec { pname = "intune-portal"; - version = "1.2312.35-jammy"; + version = "1.2401.21-jammy"; src = fetchurl { url = "https://packages.microsoft.com/ubuntu/22.04/prod/pool/main/i/${pname}/${pname}_${version}_amd64.deb"; - hash = "sha256-mgcnqj/+4ffMf4PhMW4ovCotLilyudGOpn0qqXZCmzc="; + hash = "sha256-BIPTVhOBzaKzZR0WhQOX2W8kDg64UWOgIVvgaw2Gckc="; }; nativeBuildInputs = [ dpkg ]; diff --git a/pkgs/by-name/sa/satellite/package.nix b/pkgs/by-name/sa/satellite/package.nix new file mode 100644 index 000000000000..e1ab6b934c3b --- /dev/null +++ b/pkgs/by-name/sa/satellite/package.nix @@ -0,0 +1,57 @@ +{ lib +, python3 +, fetchFromGitea +, gobject-introspection +, gtk3 +, libhandy +, modemmanager +, wrapGAppsHook +}: + +python3.pkgs.buildPythonApplication rec { + pname = "satellite"; + version = "0.4.2"; + + pyproject = true; + + src = fetchFromGitea { + domain ="codeberg.org"; + owner = "tpikonen"; + repo = "satellite"; + rev = version; + hash = "sha256-VPljvbHsPpBvH//LFs1P0YiyMfQxTLHrrxqnVk261hg="; + }; + + nativeBuildInputs = [ + gobject-introspection + python3.pkgs.setuptools + wrapGAppsHook + ]; + + buildInputs = [ + gtk3 + libhandy + modemmanager + ]; + + propagatedBuildInputs = with python3.pkgs; [ + gpxpy + pygobject3 + pynmea2 + ]; + + strictDeps = true; + + meta = with lib; { + description = "A program for showing navigation satellite data"; + longDescription = '' + Satellite is an adaptive GTK3 / libhandy application which displays global navigation satellite system (GNSS: GPS et al.) data obtained from ModemManager or gnss-share. + It can also save your position to a GPX-file. + ''; + homepage = "https://codeberg.org/tpikonen/satellite"; + license = licenses.gpl3Only; + mainProgram = "satellite"; + platforms = platforms.linux; + maintainers = with maintainers; [ Luflosi ]; + }; +} diff --git a/pkgs/by-name/sc/scrutiny-collector/package.nix b/pkgs/by-name/sc/scrutiny-collector/package.nix index 2c1ec9efb27f..0fc1835bfa52 100644 --- a/pkgs/by-name/sc/scrutiny-collector/package.nix +++ b/pkgs/by-name/sc/scrutiny-collector/package.nix @@ -6,7 +6,7 @@ , lib }: let - version = "0.7.2"; + version = "0.7.3"; in buildGoModule rec { inherit version; @@ -16,7 +16,7 @@ buildGoModule rec { owner = "AnalogJ"; repo = "scrutiny"; rev = "refs/tags/v${version}"; - hash = "sha256-UYKi+WTsasUaE6irzMAHr66k7wXyec8FXc8AWjEk0qs="; + hash = "sha256-S7GW8z6EWB+5vntKew0+EDVqhun+Ae2//15dSIlfoSs="; }; subPackages = "collector/cmd/collector-metrics"; diff --git a/pkgs/by-name/sc/scrutiny/package.nix b/pkgs/by-name/sc/scrutiny/package.nix index 5ca6a86e9dc1..0abe624af53d 100644 --- a/pkgs/by-name/sc/scrutiny/package.nix +++ b/pkgs/by-name/sc/scrutiny/package.nix @@ -6,13 +6,13 @@ }: let pname = "scrutiny"; - version = "0.7.2"; + version = "0.7.3"; src = fetchFromGitHub { owner = "AnalogJ"; repo = "scrutiny"; rev = "refs/tags/v${version}"; - hash = "sha256-UYKi+WTsasUaE6irzMAHr66k7wXyec8FXc8AWjEk0qs="; + hash = "sha256-S7GW8z6EWB+5vntKew0+EDVqhun+Ae2//15dSIlfoSs="; }; frontend = buildNpmPackage { diff --git a/pkgs/by-name/se/searxng/package.nix b/pkgs/by-name/se/searxng/package.nix index 24fd8be88478..c0d6cd63036d 100644 --- a/pkgs/by-name/se/searxng/package.nix +++ b/pkgs/by-name/se/searxng/package.nix @@ -5,13 +5,13 @@ python3.pkgs.toPythonModule (python3.pkgs.buildPythonApplication rec { pname = "searxng"; - version = "unstable-2023-10-31"; + version = "0-unstable-2024-02-24"; src = fetchFromGitHub { - owner = pname; - repo = pname; - rev = "b05a15540e1dc2dfb8e4e25aa537b2a68e713844"; - hash = "sha256-x0PyS+A4KjbBnTpca17Wx3BQjtOHvVuWpusPPc1ULnU="; + owner = "searxng"; + repo = "searxng"; + rev = "d72fa99bd0a4d702a55188b07919ce5a764b1d6c"; + hash = "sha256-1A7dyWrF63fSSvWP+2HrCS6H8o/4CUlqiP0KANVZHUA="; }; postPatch = '' @@ -20,7 +20,7 @@ python3.pkgs.toPythonModule (python3.pkgs.buildPythonApplication rec { preBuild = let - versionString = lib.concatStringsSep "." (builtins.tail (lib.splitString "-" version)); + versionString = lib.concatStringsSep "." (builtins.tail (lib.splitString "-" (lib.removePrefix "0-" version))); commitAbbrev = builtins.substring 0 8 src.rev; in '' @@ -66,7 +66,7 @@ python3.pkgs.toPythonModule (python3.pkgs.buildPythonApplication rec { ln -s ../${python3.sitePackages}/searx/static $out/share/ # copy config schema for the limiter - cp searx/botdetection/limiter.toml $out/${python3.sitePackages}/searx/botdetection/limiter.toml + cp searx/limiter.toml $out/${python3.sitePackages}/searx/limiter.toml ''; meta = with lib; { diff --git a/pkgs/by-name/su/supersonic/package.nix b/pkgs/by-name/su/supersonic/package.nix index 9feb440c8087..1189dc5ba61f 100644 --- a/pkgs/by-name/su/supersonic/package.nix +++ b/pkgs/by-name/su/supersonic/package.nix @@ -20,16 +20,16 @@ assert waylandSupport -> stdenv.isLinux; buildGoModule rec { pname = "supersonic" + lib.optionalString waylandSupport "-wayland"; - version = "0.9.0"; + version = "0.9.1"; src = fetchFromGitHub { owner = "dweymouth"; repo = "supersonic"; rev = "v${version}"; - hash = "sha256-QHDTbcWSEFleMsjt4BR4xt6DlqPSowUbHmi4+83c0kc="; + hash = "sha256-R9Bn+xFq8pBSuGX1okA3l/7ralKodKDxcpGov9diuxw="; }; - vendorHash = "sha256-ANVkQpCnPsRueHyxRJMY5cqMZ5Q/QMVW4KS+TFYMpUQ="; + vendorHash = "sha256-4Un1twPfjRfLVl91GqYJsyY8GbKgYoMIsdNESpumH5M="; nativeBuildInputs = [ copyDesktopItems diff --git a/pkgs/development/libraries/quarto/default.nix b/pkgs/development/libraries/quarto/default.nix index 47cfae648294..c9223aef6550 100644 --- a/pkgs/development/libraries/quarto/default.nix +++ b/pkgs/development/libraries/quarto/default.nix @@ -1,6 +1,7 @@ { stdenv , lib , pandoc +, typst , esbuild , deno , fetchurl @@ -18,35 +19,31 @@ stdenv.mkDerivation (final: { pname = "quarto"; - version = "1.3.450"; + version = "1.4.550"; src = fetchurl { url = "https://github.com/quarto-dev/quarto-cli/releases/download/v${final.version}/quarto-${final.version}-linux-amd64.tar.gz"; - sha256 = "sha256-bcj7SzEGfQxsw9P8WkcLrKurPupzwpgIGtxoE3KVwAU="; + sha256 = "sha256-cWHd7ZWGBdRTaSHYVa8LuTDA5gefJ5baOGERS2g6Vvg="; }; nativeBuildInputs = [ makeWrapper ]; - patches = [ - ./fix-deno-path.patch - ]; - postPatch = '' # Compat for Deno >=1.26 substituteInPlace bin/quarto.js \ - --replace 'Deno.setRaw(stdin.rid, ' 'Deno.stdin.setRaw(' \ - --replace 'Deno.setRaw(Deno.stdin.rid, ' 'Deno.stdin.setRaw(' + --replace-fail ']))?.trim();' ']))?.trim().split(" ")[0];' ''; dontStrip = true; preFixup = '' wrapProgram $out/bin/quarto \ - --prefix PATH : ${lib.makeBinPath [ deno ]} \ - --prefix QUARTO_PANDOC : ${pandoc}/bin/pandoc \ - --prefix QUARTO_ESBUILD : ${esbuild}/bin/esbuild \ - --prefix QUARTO_DART_SASS : ${dart-sass}/bin/dart-sass \ + --prefix QUARTO_DENO : ${lib.getExe deno} \ + --prefix QUARTO_PANDOC : ${lib.getExe pandoc} \ + --prefix QUARTO_ESBUILD : ${lib.getExe esbuild} \ + --prefix QUARTO_DART_SASS : ${lib.getExe dart-sass} \ + --prefix QUARTO_TYPST : ${lib.getExe typst} \ ${lib.optionalString (rWrapper != null) "--prefix QUARTO_R : ${rWrapper.override { packages = [ rPackages.rmarkdown ] ++ extraRPackages; }}/bin/R"} \ ${lib.optionalString (python3 != null) "--prefix QUARTO_PYTHON : ${python3.withPackages (ps: with ps; [ jupyter ipython ] ++ (extraPythonPackages ps))}/bin/python3"} ''; diff --git a/pkgs/development/libraries/quarto/fix-deno-path.patch b/pkgs/development/libraries/quarto/fix-deno-path.patch deleted file mode 100644 index 895419712ad8..000000000000 --- a/pkgs/development/libraries/quarto/fix-deno-path.patch +++ /dev/null @@ -1,8 +0,0 @@ ---- a/bin/quarto -+++ b/bin/quarto -@@ -125,4 +125,4 @@ fi - # Be sure to include any already defined QUARTO_DENO_OPTIONS - QUARTO_DENO_OPTIONS="--unstable --no-config --cached-only --allow-read --allow-write --allow-run --allow-env --allow-net --allow-ffi ${QUARTO_DENO_OPTIONS}" - --"${QUARTO_DENO}" ${QUARTO_ACTION} ${QUARTO_DENO_OPTIONS} ${QUARTO_DENO_EXTRA_OPTIONS} "${QUARTO_IMPORT_ARGMAP}" "${QUARTO_TARGET}" "$@" -+deno ${QUARTO_ACTION} ${QUARTO_DENO_OPTIONS} ${QUARTO_DENO_EXTRA_OPTIONS} "${QUARTO_IMPORT_ARGMAP}" "${QUARTO_TARGET}" "$@" diff --git a/pkgs/development/misc/brev-cli/default.nix b/pkgs/development/misc/brev-cli/default.nix index 40a5d0860801..cd2b854d7955 100644 --- a/pkgs/development/misc/brev-cli/default.nix +++ b/pkgs/development/misc/brev-cli/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "brev-cli"; - version = "0.6.273"; + version = "0.6.276"; src = fetchFromGitHub { owner = "brevdev"; repo = pname; rev = "v${version}"; - sha256 = "sha256-bZaSRRFlQ67q09BkeZBqOJalnkhwir/moC10m3ugFEc="; + sha256 = "sha256-IAzsoKPFmhyBgd3jD6qEBav5ynQYrn8/cl6epsjrVKg="; }; vendorHash = "sha256-IR/tgqh8rS4uN5jSOcopCutbHCKHSU9icUfRhOgu4t8="; diff --git a/pkgs/development/ocaml-modules/mirage-fs/default.nix b/pkgs/development/ocaml-modules/mirage-fs/default.nix deleted file mode 100644 index f880a71d417c..000000000000 --- a/pkgs/development/ocaml-modules/mirage-fs/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ lib, fetchurl, buildDunePackage -, cstruct, fmt, lwt, mirage-kv -}: - -buildDunePackage rec { - pname = "mirage-fs"; - version = "4.0.0"; - - duneVersion = "3"; - - src = fetchurl { - url = "https://github.com/mirage/mirage-fs/releases/download/v${version}/mirage-fs-v${version}.tbz"; - hash = "sha256-PYZ2HCPuxOv4FU7EHymsa1oIZU7q8TSzzRvlngYdZ3s="; - }; - - propagatedBuildInputs = [ cstruct fmt lwt mirage-kv ]; - - meta = { - description = "MirageOS signatures for filesystem devices"; - homepage = "https://github.com/mirage/mirage-fs"; - license = lib.licenses.isc; - maintainers = [ lib.maintainers.vbgl ]; - }; -} diff --git a/pkgs/development/python-modules/azure-eventhub/default.nix b/pkgs/development/python-modules/azure-eventhub/default.nix index ba589b8aa5e6..3f0adab003df 100644 --- a/pkgs/development/python-modules/azure-eventhub/default.nix +++ b/pkgs/development/python-modules/azure-eventhub/default.nix @@ -1,23 +1,28 @@ { lib +, azure-core , buildPythonPackage , fetchPypi -, azure-core , pythonOlder +, setuptools , typing-extensions }: buildPythonPackage rec { pname = "azure-eventhub"; - version = "5.11.5"; - format = "setuptools"; + version = "5.11.6"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-HDdOmQezNIPVCLTHst8p+crGM15dpaGNIYU0+UL01Uw="; + hash = "sha256-89Q1o/cnR64i4Jblypx2w1BTTyrZk5l9EvTO+ZMq58E="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ azure-core typing-extensions diff --git a/pkgs/development/python-modules/enamlx/default.nix b/pkgs/development/python-modules/enamlx/default.nix index db16d913cbdb..7c90d8a4b971 100644 --- a/pkgs/development/python-modules/enamlx/default.nix +++ b/pkgs/development/python-modules/enamlx/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "enamlx"; - version = "0.6.2"; + version = "0.6.4"; format = "setuptools"; src = fetchFromGitHub { owner = "frmdstryr"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-LHqOZ1uLWFbUeQAGKoMH9GljhRq1K4RTVWzgV/pt3g8="; + hash = "sha256-C3/G0bnu1EQh0elqdrpCwkFPZU4qmkUX7WRSRK9nkM4="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-securitycenter/default.nix b/pkgs/development/python-modules/google-cloud-securitycenter/default.nix index 1e0c86b61a73..83634833d4cb 100644 --- a/pkgs/development/python-modules/google-cloud-securitycenter/default.nix +++ b/pkgs/development/python-modules/google-cloud-securitycenter/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-securitycenter"; - version = "1.26.1"; + version = "1.27.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-oZWY7n/8638/WkIG9s/9LN4NKWSfhnrQp+9Pydq103E="; + hash = "sha256-ALdAT+C5LBTrSAXk6ko9KidutN5Tub+ufDAxfZsSGtk="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/sphinxcontrib-apidoc/default.nix b/pkgs/development/python-modules/sphinxcontrib-apidoc/default.nix index 327ff267eebc..9abab99c0598 100644 --- a/pkgs/development/python-modules/sphinxcontrib-apidoc/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-apidoc/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "sphinxcontrib-apidoc"; - version = "0.4.0"; + version = "0.5.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-/lnRWIJHKqk8Jzevvepr7bNM41y9NKpJR5CfXfFQCq0="; + hash = "sha256-Ze/NkiEqX4I3FfuV7gmLRYprsJpe5hfZ7T3q2XF3zVU="; }; postPatch = '' diff --git a/pkgs/development/tools/yq-go/default.nix b/pkgs/development/tools/yq-go/default.nix index effd541660ea..d05b60457a63 100644 --- a/pkgs/development/tools/yq-go/default.nix +++ b/pkgs/development/tools/yq-go/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "yq-go"; - version = "4.41.1"; + version = "4.42.1"; src = fetchFromGitHub { owner = "mikefarah"; repo = "yq"; rev = "v${version}"; - hash = "sha256-1zYem/cvvndyrWaE8wYoxouDDnQyT+VeupFF1VkuC2w="; + hash = "sha256-IBEW+IiDymquBhc+nsaYHM59uhBR3o6nt62undeprdY="; }; - vendorHash = "sha256-5jc9AQ1T4818kvAF6SU6JEdCQWt1gRJnESXRMGvqrB0="; + vendorHash = "sha256-Sdml4C6fTp7dnEy4a+GqwoJoGyO1TLCiJlNf5Yoy5cg="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/games/r2modman/default.nix b/pkgs/games/r2modman/default.nix index 30648d67ae67..27cb156a1fe6 100644 --- a/pkgs/games/r2modman/default.nix +++ b/pkgs/games/r2modman/default.nix @@ -14,18 +14,18 @@ stdenv.mkDerivation (finalAttrs: { pname = "r2modman"; - version = "3.1.46"; + version = "3.1.47"; src = fetchFromGitHub { owner = "ebkr"; repo = "r2modmanPlus"; rev = "v${finalAttrs.version}"; - hash = "sha256-Oo23U3hwkhhLRiOIikIZcnoBFmkRWMK8UECyDRohBj0="; + hash = "sha256-refFd/d4y8657FltEvogQVAEl48c5gtrwpuGa8vluqE="; }; offlineCache = fetchYarnDeps { yarnLock = "${finalAttrs.src}/yarn.lock"; - hash = "sha256-CXitb/b2tvTfrkFrFv4KP4WdmMg+1sDtC/s2u5ezDfI="; + hash = "sha256-1JXd1pDGEFDG+ogXbEpl4WMYXwksJJJBx20ZPykc7OM="; }; patches = [ diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index f082e0cd4776..cb825a1adbac 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -2,52 +2,52 @@ "4.19": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-4.19.306-hardened1.patch", - "sha256": "0g38iy5vw9glqmqhmj5y8nnx8gbdj312yb14qnwcl21m78k63mxk", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.306-hardened1/linux-hardened-4.19.306-hardened1.patch" + "name": "linux-hardened-4.19.307-hardened1.patch", + "sha256": "01i15w3qzwag2v4r5r5bqyk337pidhmcfif228f286cnjnqz5d7h", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.307-hardened1/linux-hardened-4.19.307-hardened1.patch" }, - "sha256": "06dy270xw4frnrc9p2qjh8chgp02fr5ll5g2b0lx9xqzlq7y86xr", - "version": "4.19.306" + "sha256": "0lp3fc7sqy48vpcl2g0n1bz7i1hp9k0nlz3i1xfh9l056ihzzvl3", + "version": "4.19.307" }, "5.10": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.10.209-hardened1.patch", - "sha256": "1vccxrwi8a8fz3fcjxxqbkdbfjjhzwqpcibfg0nrydcix79ixgyw", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.209-hardened1/linux-hardened-5.10.209-hardened1.patch" + "name": "linux-hardened-5.10.210-hardened1.patch", + "sha256": "1fdkkl303kvw9sg9lpzg83157xrl9jcl4jjli1gi2a4j0yz2479n", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.210-hardened1/linux-hardened-5.10.210-hardened1.patch" }, - "sha256": "1mc8rssk5aypgb58jz6i2bbflfr6qh1kgqpam0k8fqvwcjnjzqj4", - "version": "5.10.209" + "sha256": "0vggj3a71awc1w803cdzrnkn88rxr7l1xh9mmdcw9hzxj1d3r9jf", + "version": "5.10.210" }, "5.15": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.15.148-hardened1.patch", - "sha256": "0pryxvr058fisns01w52xsfbx4aqx2ssfk9n1r575lgywp6q03fj", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.148-hardened1/linux-hardened-5.15.148-hardened1.patch" + "name": "linux-hardened-5.15.149-hardened1.patch", + "sha256": "1y56l5l50h673a4n2pb3i3wh494lpnlw9vvdfr6m0jr0vymldb57", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.149-hardened1/linux-hardened-5.15.149-hardened1.patch" }, - "sha256": "1n75lrck581mppx84cds1a1l5vj05cdkp8ahpry7dx6rgz4pb1f4", - "version": "5.15.148" + "sha256": "1c01fnaghj55mkgsgddznq1zq4mswsa05rz00kmh1d3y6sd8115x", + "version": "5.15.149" }, "5.4": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.4.268-hardened1.patch", - "sha256": "1lz9i5iaa6pchnk1bw9dg85n82j9hvjdh8pb7vxjg05fxvwgn7jh", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.268-hardened1/linux-hardened-5.4.268-hardened1.patch" + "name": "linux-hardened-5.4.269-hardened1.patch", + "sha256": "06vf0mlp822i4bkpsxbyk1xjlbzabqpncy8qw9zajpjajwv87d7x", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.269-hardened1/linux-hardened-5.4.269-hardened1.patch" }, - "sha256": "081695lgkdwlrp6gpp6pyflgh76zax1w52shys4s9zjnrfkarj5g", - "version": "5.4.268" + "sha256": "1kqqm4hpif3jy2ycnb0dfjgzyn18vqhm1i5q7d7rkisks33bwm7z", + "version": "5.4.269" }, "6.1": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-6.1.78-hardened1.patch", - "sha256": "1qgjm0j8h08qrsx79gj16dmdylfpmqq80mvlq6nipq0gvbdmcfsb", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/6.1.78-hardened1/linux-hardened-6.1.78-hardened1.patch" + "name": "linux-hardened-6.1.79-hardened1.patch", + "sha256": "0inip6pmlwrj75vwjimkjgvh4jn6ldrq5312r02xh1i95qb0sg3a", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/6.1.79-hardened1/linux-hardened-6.1.79-hardened1.patch" }, - "sha256": "12fn23m2xwdlv6gr1s8872lk8mvigqkblvlhr54nh8rik2b6n835", - "version": "6.1.78" + "sha256": "16xkd0hcslqlcf55d4ivzhf1fkhfs5yy0m9arbax8pmm5yi9r97s", + "version": "6.1.79" }, "6.5": { "patch": { @@ -62,21 +62,21 @@ "6.6": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-6.6.17-hardened1.patch", - "sha256": "1j3xgavbi24hpvg932rs095mpf8s6dzng9g17qm3gdfclq4xk41i", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/6.6.17-hardened1/linux-hardened-6.6.17-hardened1.patch" + "name": "linux-hardened-6.6.18-hardened1.patch", + "sha256": "0svlck53b7bd38b9b0hzgppmhm59d35r2vqv30ga85ghkvc61byn", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/6.6.18-hardened1/linux-hardened-6.6.18-hardened1.patch" }, - "sha256": "0si20m9ckir826jg40bh7sh4kwlp610rnc3gwsgs4nm7dfcm0xpf", - "version": "6.6.17" + "sha256": "07cv97l5jiakmmv35n0ganvqfr0590b02f3qb617qkx1zg2xhhsf", + "version": "6.6.18" }, "6.7": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-6.7.5-hardened1.patch", - "sha256": "0z5m37712rnnd2hy1qfgrzr09falgy1l0vx607660pblbmh8a4m1", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/6.7.5-hardened1/linux-hardened-6.7.5-hardened1.patch" + "name": "linux-hardened-6.7.6-hardened1.patch", + "sha256": "063yrs3g0knlz37aq979jhng9k6l19873nbi1jy167xfqmpqqajr", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/6.7.6-hardened1/linux-hardened-6.7.6-hardened1.patch" }, - "sha256": "1zrralagnv9yr8qdg7lc05735691dbh92mgwfyxrq5xqc504dxi9", - "version": "6.7.5" + "sha256": "1lrp7pwnxnqyy8c2l4n4nz997039gbnssrfm8ss8kl3h2c7fr2g4", + "version": "6.7.6" } } diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix index b321e0bcd649..e94f9f7d0fb8 100644 --- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix +++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix @@ -6,14 +6,14 @@ let # NOTE: When updating these, please also take a look at the changes done to # kernel config in the xanmod version commit ltsVariant = { - version = "6.6.17"; - hash = "sha256-WSWI3UByuD2SrcFC6El3ao0DINeG0IgtrvazDiHaIR0="; + version = "6.6.18"; + hash = "sha256-WGfbCmM0fpWXQt1ThfaHn4bqZz22bNkhc9I2qeXMsws="; variant = "lts"; }; mainVariant = { - version = "6.7.5"; - hash = "sha256-achx+rElMOdPUD0qU2TStrlJXZU71E89HVlM4tKf7WE="; + version = "6.7.6"; + hash = "sha256-gg8B/i6kidgvRBOm3JiMBwP18UtVRH1ELNGQUBkDOMs="; variant = "main"; }; diff --git a/pkgs/os-specific/linux/switcheroo-control/default.nix b/pkgs/os-specific/linux/switcheroo-control/default.nix index bb0f262a2b1c..a749168f5bc4 100644 --- a/pkgs/os-specific/linux/switcheroo-control/default.nix +++ b/pkgs/os-specific/linux/switcheroo-control/default.nix @@ -6,11 +6,10 @@ , libgudev , pkg-config , glib -, python3 -, gobject-introspection +, python3Packages }: -python3.pkgs.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "switcheroo-control"; version = "2.6"; @@ -19,7 +18,7 @@ python3.pkgs.buildPythonApplication rec { src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "hadess"; - repo = pname; + repo = "switcheroo-control"; rev = version; hash = "sha256-F+5HhMxM8pcnAGmVBARKWNCL0rIEzHW/jsGHHqYZJug="; }; @@ -28,18 +27,16 @@ python3.pkgs.buildPythonApplication rec { ninja meson pkg-config - - # needed for glib-compile-resources - glib ]; buildInputs = [ systemd libgudev + glib ]; propagatedBuildInputs = [ - python3.pkgs.pygobject3 + python3Packages.pygobject3 ]; mesonFlags = [ diff --git a/pkgs/servers/minio/default.nix b/pkgs/servers/minio/default.nix index 3cbcb21b3590..2936aa6a8736 100644 --- a/pkgs/servers/minio/default.nix +++ b/pkgs/servers/minio/default.nix @@ -21,13 +21,13 @@ let in buildGoModule rec { pname = "minio"; - version = "2024-02-17T01-15-57Z"; + version = "2024-02-24T17-11-14Z"; src = fetchFromGitHub { owner = "minio"; repo = "minio"; rev = "RELEASE.${version}"; - hash = "sha256-lgNQamHw5sI6rGy8TP62Vb5esUOivPkyWj15EOPsjkM="; + hash = "sha256-LD32cNKvW0mfYeXHNOqgiWXAiHjWJrorRqbQkosjaNE="; }; vendorHash = "sha256-0EymK7jQhr+NJDg1zgWpcniV5zZ33Av6zpq0IDuWw7M="; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 638cf02d22e8..5e2f6504e4b4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4658,8 +4658,6 @@ with pkgs; clash-geoip = callPackage ../data/misc/clash-geoip { }; - clash-meta = callPackage ../tools/networking/clash-meta { }; - clash-verge = callPackage ../applications/networking/clash-verge { }; clevercsv = with python3Packages; toPythonApplication clevercsv; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 464554ff9808..3bdd9b4df8a9 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -1134,8 +1134,6 @@ let mirage-flow-unix = callPackage ../development/ocaml-modules/mirage-flow/unix.nix { }; - mirage-fs = callPackage ../development/ocaml-modules/mirage-fs { }; - mirage-kv = callPackage ../development/ocaml-modules/mirage-kv { }; mirage-logs = callPackage ../development/ocaml-modules/mirage-logs { }; |