diff --git a/.github/workflows/codeowners-v2.yml b/.github/workflows/codeowners-v2.yml index 8b5267b25c63..a7afd41589f5 100644 --- a/.github/workflows/codeowners-v2.yml +++ b/.github/workflows/codeowners-v2.yml @@ -35,6 +35,7 @@ env: jobs: get-merge-commit: + if: github.repository_owner == 'NixOS' uses: ./.github/workflows/get-merge-commit.yml # Check that code owners is valid @@ -42,12 +43,11 @@ jobs: name: Check runs-on: ubuntu-24.04 needs: get-merge-commit - if: needs.get-merge-commit.outputs.mergedSha + if: github.repository_owner == 'NixOS' && needs.get-merge-commit.outputs.mergedSha steps: - uses: cachix/install-nix-action@08dcb3a5e62fa31e2da3d490afc4176ef55ecd72 # v30 - uses: cachix/cachix-action@ad2ddac53f961de1989924296a1f236fcfbaa4fc # v15 - if: github.repository_owner == 'NixOS' with: # This cache is for the nixpkgs repo checks and should not be trusted or used elsewhere. name: nixpkgs-ci @@ -88,6 +88,7 @@ jobs: request: name: Request runs-on: ubuntu-24.04 + if: github.repository_owner == 'NixOS' steps: - uses: cachix/install-nix-action@08dcb3a5e62fa31e2da3d490afc4176ef55ecd72 # v30 diff --git a/.github/workflows/eval.yml b/.github/workflows/eval.yml index 273b2e2a0521..dcb664c6fa8e 100644 --- a/.github/workflows/eval.yml +++ b/.github/workflows/eval.yml @@ -53,7 +53,7 @@ jobs: echo "systems=$(> "$GITHUB_OUTPUT" - name: Upload the list of all attributes - uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0 + uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0 with: name: paths path: result/* @@ -122,7 +122,7 @@ jobs: # If it uses too much memory, slightly decrease chunkSize - name: Upload the output paths and eval stats - uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0 + uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0 with: name: intermediate-${{ matrix.system }} path: result/* @@ -159,7 +159,7 @@ jobs: -o prResult - name: Upload the combined results - uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0 + uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0 with: name: result path: prResult/* @@ -223,7 +223,7 @@ jobs: - name: Upload the combined results if: steps.targetRunId.outputs.targetRunId - uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0 + uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0 with: name: comparison path: comparison/* diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 71be98d7796d..a6db3ae48faf 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -16699,10 +16699,16 @@ githubId = 99221043; }; numinit = { - email = "me@numin.it"; + email = "me+nixpkgs@numin.it"; + name = "Morgan Jones"; github = "numinit"; githubId = 369111; - name = "Morgan Jones"; + keys = [ + # >=2025 + { fingerprint = "FD28 F9C9 81C5 D78E 56E8 8311 5C3E B94D 198F 1491"; } + # <=2024 + { fingerprint = "190B DA97 F616 DE35 6899 ED17 F819 F1AF 2FC1 C1FF"; } + ]; }; numkem = { name = "Sebastien Bariteau"; diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md index 5899bf33058f..3b3a77036b33 100644 --- a/nixos/doc/manual/release-notes/rl-2505.section.md +++ b/nixos/doc/manual/release-notes/rl-2505.section.md @@ -210,6 +210,8 @@ - `sm64ex-coop` has been removed as it was archived upstream. Consider migrating to `sm64coopdx`. +- `tldr` now uses [`tldr-python-client`](https://github.com/tldr-pages/tldr-python-client) instead of [`tldr-c-client`](https://github.com/tldr-pages/tldr-c-client) which is unmaintained. + - `renovate` was updated to v39. See the [upstream release notes](https://docs.renovatebot.com/release-notes-for-major-versions/#version-39) for breaking changes. Like upstream's docker images, renovate now runs on NodeJS 22. diff --git a/nixos/modules/image/images.nix b/nixos/modules/image/images.nix index 84e364818adc..6040a5c76182 100644 --- a/nixos/modules/image/images.nix +++ b/nixos/modules/image/images.nix @@ -9,59 +9,52 @@ let inherit (lib) types; imageModules = { - amazon = [ ../../maintainers/scripts/ec2/amazon-image.nix ]; - azure = [ ../virtualisation/azure-image.nix ]; - digital-ocean = [ ../virtualisation/digital-ocean-image.nix ]; - google-compute = [ ../virtualisation/google-compute-image.nix ]; - hyperv = [ ../virtualisation/hyperv-image.nix ]; - linode = [ ../virtualisation/linode-image.nix ]; - lxc = [ ../virtualisation/lxc-container.nix ]; - lxc-metadata = [ ../virtualisation/lxc-image-metadata.nix ]; - oci = [ ../virtualisation/oci-image.nix ]; - openstack = [ ../../maintainers/scripts/openstack/openstack-image.nix ]; - openstack-zfs = [ ../../maintainers/scripts/openstack/openstack-image-zfs.nix ]; - proxmox = [ ../virtualisation/proxmox-image.nix ]; - proxmox-lxc = [ ../virtualisation/proxmox-lxc.nix ]; - qemu-efi = [ ../virtualisation/disk-image.nix ]; - qemu = [ - ../virtualisation/disk-image.nix - { - image.efiSupport = false; - } - ]; - raw-efi = [ - ../virtualisation/disk-image.nix - { - image.format = "raw"; - } - ]; - raw = [ - ../virtualisation/disk-image.nix - { - image.format = "raw"; - image.efiSupport = false; - } - ]; - kubevirt = [ ../virtualisation/kubevirt.nix ]; - vagrant-virtualbox = [ ../virtualisation/vagrant-virtualbox-image.nix ]; - virtualbox = [ ../virtualisation/virtualbox-image.nix ]; - vmware = [ ../virtualisation/vmware-image.nix ]; - iso = [ ../installer/cd-dvd/iso-image.nix ]; - iso-installer = [ ../installer/cd-dvd/installation-cd-base.nix ]; - sd-card = [ - ( + amazon = ../../maintainers/scripts/ec2/amazon-image.nix; + azure = ../virtualisation/azure-image.nix; + digital-ocean = ../virtualisation/digital-ocean-image.nix; + google-compute = ../virtualisation/google-compute-image.nix; + hyperv = ../virtualisation/hyperv-image.nix; + linode = ../virtualisation/linode-image.nix; + lxc = ../virtualisation/lxc-container.nix; + lxc-metadata = ../virtualisation/lxc-image-metadata.nix; + oci = ../virtualisation/oci-image.nix; + openstack = ../../maintainers/scripts/openstack/openstack-image.nix; + openstack-zfs = ../../maintainers/scripts/openstack/openstack-image-zfs.nix; + proxmox = ../virtualisation/proxmox-image.nix; + proxmox-lxc = ../virtualisation/proxmox-lxc.nix; + qemu-efi = ../virtualisation/disk-image.nix; + qemu = { + imports = [ ../virtualisation/disk-image.nix ]; + image.efiSupport = false; + }; + raw-efi = { + imports = [ ../virtualisation/disk-image.nix ]; + image.format = "raw"; + }; + raw = { + imports = [ ../virtualisation/disk-image.nix ]; + image.format = "raw"; + image.efiSupport = false; + }; + kubevirt = ../virtualisation/kubevirt.nix; + vagrant-virtualbox = ../virtualisation/vagrant-virtualbox-image.nix; + virtualbox = ../virtualisation/virtualbox-image.nix; + vmware = ../virtualisation/vmware-image.nix; + iso = ../installer/cd-dvd/iso-image.nix; + iso-installer = ../installer/cd-dvd/installation-cd-base.nix; + sd-card = { + imports = let module = ../. + "/installer/sd-card/sd-image-${pkgs.targetPlatform.linuxArch}.nix"; in - if builtins.pathExists module then module else throw "The module ${module} does not exist." - ) - ]; - kexec = [ ../installer/netboot/netboot-minimal.nix ]; + if builtins.pathExists module then [ module ] else throw "The module ${module} does not exist."; + }; + kexec = ../installer/netboot/netboot-minimal.nix; }; imageConfigs = lib.mapAttrs ( - name: modules: + name: module: extendModules { - inherit modules; + modules = [ module ]; } ) config.image.modules; in @@ -77,7 +70,7 @@ in }; }; image.modules = lib.mkOption { - type = types.attrsOf (types.listOf types.deferredModule); + type = types.attrsOf types.deferredModule; description = '' image-specific NixOS Modules used for `system.build.images`. ''; diff --git a/nixos/modules/services/home-automation/home-assistant.nix b/nixos/modules/services/home-automation/home-assistant.nix index 2e91ee55f95e..338c61f89677 100644 --- a/nixos/modules/services/home-automation/home-assistant.nix +++ b/nixos/modules/services/home-automation/home-assistant.nix @@ -708,6 +708,9 @@ in { "zha" "zwave" "zwave_js" + + # Custom components, maintained manually. + "amshan" ]; in { ExecStart = escapeSystemdExecArgs ([ diff --git a/nixos/modules/services/home-automation/wyoming/faster-whisper.nix b/nixos/modules/services/home-automation/wyoming/faster-whisper.nix index 69407efba0c6..25216689599d 100644 --- a/nixos/modules/services/home-automation/wyoming/faster-whisper.nix +++ b/nixos/modules/services/home-automation/wyoming/faster-whisper.nix @@ -273,7 +273,8 @@ in ProtectKernelTunables = true; ProtectControlGroups = true; ProtectProc = "invisible"; - ProcSubset = "pid"; + # "all" is required because faster-whisper accesses /proc/cpuinfo to determine cpu capabilities + ProcSubset = "all"; RestrictAddressFamilies = [ "AF_INET" "AF_INET6" diff --git a/nixos/modules/services/web-apps/calibre-web.nix b/nixos/modules/services/web-apps/calibre-web.nix index 0ca9ed2fbcf3..c0fdbaa23435 100644 --- a/nixos/modules/services/web-apps/calibre-web.nix +++ b/nixos/modules/services/web-apps/calibre-web.nix @@ -32,9 +32,9 @@ in dataDir = mkOption { type = types.str; - default = "calibre-web"; + default = "/var/lib/calibre-web"; description = '' - The directory below {file}`/var/lib` where Calibre-Web stores its data. + The directory where Calibre-Web stores its data. ''; }; @@ -107,9 +107,14 @@ in }; config = mkIf cfg.enable { + systemd.tmpfiles.settings."10-calibre-web".${cfg.dataDir}.d = { + inherit (cfg) user group; + mode = "0700"; + }; + systemd.services.calibre-web = let - appDb = "/var/lib/${cfg.dataDir}/app.db"; - gdriveDb = "/var/lib/${cfg.dataDir}/gdrive.db"; + appDb = "${cfg.dataDir}/app.db"; + gdriveDb = "${cfg.dataDir}/gdrive.db"; calibreWebCmd = "${cfg.package}/bin/calibre-web -p ${appDb} -g ${gdriveDb}"; settings = concatStringsSep ", " ( @@ -134,7 +139,6 @@ in User = cfg.user; Group = cfg.group; - StateDirectory = cfg.dataDir; ExecStartPre = pkgs.writeShellScript "calibre-web-pre-start" ( '' __RUN_MIGRATIONS_AND_EXIT=1 ${calibreWebCmd} diff --git a/pkgs/applications/blockchains/bitcoin/default.nix b/pkgs/applications/blockchains/bitcoin/default.nix index 43f72f4bba1c..1bcbab13b063 100644 --- a/pkgs/applications/blockchains/bitcoin/default.nix +++ b/pkgs/applications/blockchains/bitcoin/default.nix @@ -35,14 +35,14 @@ let in stdenv.mkDerivation rec { pname = if withGui then "bitcoin" else "bitcoind"; - version = "28.0"; + version = "28.1"; src = fetchurl { urls = [ "https://bitcoincore.org/bin/bitcoin-core-${version}/bitcoin-${version}.tar.gz" ]; # hash retrieved from signed SHA256SUMS - sha256 = "700ae2d1e204602eb07f2779a6e6669893bc96c0dca290593f80ff8e102ff37f"; + sha256 = "c5ae2dd041c7f9d9b7c722490ba5a9d624f7e9a089c67090615e1ba4ad0883ba"; }; nativeBuildInputs = diff --git a/pkgs/applications/misc/librecad/default.nix b/pkgs/applications/misc/librecad/default.nix deleted file mode 100644 index 7d41c040db8e..000000000000 --- a/pkgs/applications/misc/librecad/default.nix +++ /dev/null @@ -1,78 +0,0 @@ -{ - lib, - boost, - fetchFromGitHub, - installShellFiles, - mkDerivation, - muparser, - pkg-config, - qmake, - qtbase, - qtsvg, - qttools, - runtimeShell, -}: - -mkDerivation rec { - pname = "librecad"; - version = "2.2.0.2"; - - src = fetchFromGitHub { - owner = "LibreCAD"; - repo = "LibreCAD"; - rev = version; - sha256 = "sha256-Vj6nvOfmhzou2hhmujm47a7aKBzmgchDb/BbwCb3/hI="; - }; - - buildInputs = [ - boost - muparser - qtbase - qtsvg - ]; - - nativeBuildInputs = [ - installShellFiles - pkg-config - qmake - qttools - ]; - - qmakeFlags = [ - "MUPARSER_DIR=${muparser}" - "BOOST_DIR=${boost.dev}" - ]; - - postPatch = '' - substituteInPlace scripts/postprocess-unix.sh \ - --replace /bin/sh ${runtimeShell} - - substituteInPlace librecad/src/main/qc_applicationwindow.cpp \ - --replace __DATE__ 0 - ''; - - installPhase = '' - runHook preInstall - - install -Dm555 -t $out/bin unix/{librecad,ttf2lff} - install -Dm444 -t $out/share/applications desktop/librecad.desktop - install -Dm644 -t $out/share/pixmaps librecad/res/main/librecad.png - install -Dm444 desktop/librecad.sharedmimeinfo $out/share/mime/packages/librecad.xml - install -Dm444 desktop/graphics_icons_and_splash/Icon\ LibreCAD/Icon_Librecad.svg \ - $out/share/icons/hicolor/scalable/apps/librecad.svg - - installManPage desktop/librecad.? - - cp -R unix/resources $out/share/librecad - - runHook postInstall - ''; - - meta = with lib; { - description = "2D CAD package based on Qt"; - homepage = "https://librecad.org"; - license = licenses.gpl2Only; - maintainers = [ ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/by-name/ab/abracadabra/package.nix b/pkgs/by-name/ab/abracadabra/package.nix index 30f14f074c94..e597a3807d03 100644 --- a/pkgs/by-name/ab/abracadabra/package.nix +++ b/pkgs/by-name/ab/abracadabra/package.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "abracadabra"; - version = "2.9.0"; + version = "2.9.1"; src = fetchFromGitHub { owner = "KejPi"; repo = "AbracaDABra"; rev = "v${version}"; - hash = "sha256-PPG71W5HeLr4R8je88K4VXPiSbJn5T7dP3M05C+bkv0="; + hash = "sha256-T2l5wjE62xBb55IzKzInf/K4VPOuZ68vp5VxS0vIn+I="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/al/alt-tab-macos/package.nix b/pkgs/by-name/al/alt-tab-macos/package.nix index 640fd55fa146..f4e59d2af129 100644 --- a/pkgs/by-name/al/alt-tab-macos/package.nix +++ b/pkgs/by-name/al/alt-tab-macos/package.nix @@ -8,11 +8,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "alt-tab-macos"; - version = "7.18.0"; + version = "7.18.1"; src = fetchurl { url = "https://github.com/lwouis/alt-tab-macos/releases/download/v${finalAttrs.version}/AltTab-${finalAttrs.version}.zip"; - hash = "sha256-9+XK+rDyV2V4RIAfMR2EUcSf6AEpQKAOLDp6RXb5Wb8="; + hash = "sha256-PMnA0G/CuofKR7mlWkcbQ+JVdGf91yQf7q8znFCIujY="; }; sourceRoot = "."; diff --git a/pkgs/by-name/an/ansel/package.nix b/pkgs/by-name/an/ansel/package.nix index 8899d6efbbcc..fbc8c8046f6b 100644 --- a/pkgs/by-name/an/ansel/package.nix +++ b/pkgs/by-name/an/ansel/package.nix @@ -78,13 +78,13 @@ let in stdenv.mkDerivation { pname = "ansel"; - version = "0-unstable-2024-12-19"; + version = "0-unstable-2025-01-12"; src = fetchFromGitHub { owner = "aurelienpierreeng"; repo = "ansel"; - rev = "854924f0cefd485ede726eb060b765712c0d393c"; - hash = "sha256-G8+A4c2d6OFfYo7T5sk8JsDw5RrNnH5Bmmo8YkCsbsA="; + rev = "c15d92ab7236e61454aaf8e8591777adfa3a73f7"; + hash = "sha256-FVb4xoHIs+DJG6Lw6Qf755Tjt0Sg9i+Hp979/GgD3IQ="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/ap/appium-inspector/package.nix b/pkgs/by-name/ap/appium-inspector/package.nix new file mode 100644 index 000000000000..ac17e91e8eb6 --- /dev/null +++ b/pkgs/by-name/ap/appium-inspector/package.nix @@ -0,0 +1,87 @@ +{ + lib, + buildNpmPackage, + copyDesktopItems, + electron_33, + fetchFromGitHub, + makeDesktopItem, + makeWrapper, + nix-update-script, +}: + +let + electron = electron_33; + version = "2024.12.1"; +in + +buildNpmPackage { + pname = "appium-inspector"; + inherit version; + + src = fetchFromGitHub { + owner = "appium"; + repo = "appium-inspector"; + tag = "v${version}"; + hash = "sha256-O2rBODsZuW6M3dM1zL2TVTPxnTPaReD+yOyBLywnxIU="; + }; + + npmDepsHash = "sha256-RhRa0VgEfVv9kW+EY7yhmm6k/waYAVcvom55xUbfhDs="; + npmFlags = [ "--ignore-scripts" ]; + + nativeBuildInputs = [ + makeWrapper + copyDesktopItems + ]; + + buildPhase = '' + runHook preBuild + + npm run build:electron + npm exec electron-builder -- \ + --dir \ + -c.electronDist=${electron.dist} \ + -c.electronVersion=${electron.version} + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + mkdir -p "$out/share/appium-inspector" + cp -r release/*-unpacked/resources "$out/share/appium-inspector/" + + makeWrapper '${electron}/bin/electron' "$out/bin/appium-inspector" \ + --add-flags "$out/share/appium-inspector/resources/app.asar" \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \ + --set NODE_ENV production + + install -m 444 -D 'app/common/renderer/assets/images/icon.png' \ + $out/share/icons/hicolor/512x512/apps/appium-inspector.png + + runHook postInstall + ''; + + desktopItems = [ + (makeDesktopItem { + name = "appium-inspector"; + exec = "appium-inspector"; + desktopName = "Appium Inspector"; + comment = "A GUI inspector for mobile apps and more, powered by a (separately installed) Appium server"; + categories = [ "Development" ]; + icon = "appium-inspector"; + }) + ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "GUI inspector for the appium UI automation tool"; + homepage = "https://appium.github.io/appium-inspector"; + changelog = "https://github.com/appium/appium-inspector/releases/tag/v${version}"; + license = lib.licenses.asl20; + mainProgram = "appium-inspector"; + maintainers = with lib.maintainers; [ marie ]; + inherit (electron.meta) platforms; + }; +} diff --git a/pkgs/by-name/br/bruno/package.nix b/pkgs/by-name/br/bruno/package.nix index 7de25e8cd9c5..cda28d731177 100644 --- a/pkgs/by-name/br/bruno/package.nix +++ b/pkgs/by-name/br/bruno/package.nix @@ -17,20 +17,20 @@ buildNpmPackage rec { pname = "bruno"; - version = "1.37.0"; + version = "1.38.1"; src = fetchFromGitHub { owner = "usebruno"; repo = "bruno"; tag = "v${version}"; - hash = "sha256-+CLop9fU0fk5n5jNkLbTXZfXyfOXyigukRhTHnML4t0="; + hash = "sha256-VZRVmOJkNjZLpIG5oBIbDVJl8EZhOtBMywwJKdfD9Hc="; postFetch = '' ${lib.getExe npm-lockfile-fix} $out/package-lock.json ''; }; - npmDepsHash = "sha256-K7M4eZQpI79TUI2rf0UP2hEipqaOVjhjMRjIVlcy7c8="; + npmDepsHash = "sha256-qgg/dpkBAbOgBeGC0BiKQTyLsOOKwfsJD3fhs/cXYHo="; npmFlags = [ "--legacy-peer-deps" ]; nativeBuildInputs = diff --git a/pkgs/by-name/bu/buf/package.nix b/pkgs/by-name/bu/buf/package.nix index 6912f03d0527..7f0b80515f7e 100644 --- a/pkgs/by-name/bu/buf/package.nix +++ b/pkgs/by-name/bu/buf/package.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "buf"; - version = "1.48.0"; + version = "1.49.0"; src = fetchFromGitHub { owner = "bufbuild"; repo = "buf"; rev = "v${version}"; - hash = "sha256-F1ZmhVAjm8KVFePXLeOnyvh1TvjXBDCwUizwQSpp6L4="; + hash = "sha256-fYCMVR3meuSrTCkM2SfKeh03k4a3n4RHMhWgQ7FsIAU="; }; - vendorHash = "sha256-M5q93hJjEsdMG4N+bjHTTUqBLgy2b7oIRmkizuGxeoE="; + vendorHash = "sha256-jfpB1QVc5xjJ9uYDcyVmK6fDqnNLV1goEBYX3oEDQQw="; patches = [ # Skip a test that requires networking to be available to work. diff --git a/pkgs/by-name/bu/bup/package.nix b/pkgs/by-name/bu/bup/package.nix index 67adb0dd6143..a6f00096dafb 100644 --- a/pkgs/by-name/bu/bup/package.nix +++ b/pkgs/by-name/bu/bup/package.nix @@ -42,7 +42,6 @@ stdenv.mkDerivation { }; buildInputs = [ - git python3 ]; nativeBuildInputs = [ @@ -51,7 +50,13 @@ stdenv.mkDerivation { makeWrapper ]; - postPatch = "patchShebangs ."; + configurePlatforms = [ ]; + + postPatch = '' + patchShebangs --build . + substituteInPlace ./config/configure \ + --replace-fail 'bup_git=' 'bup_git="${lib.getExe git}" #' + ''; dontAddPrefix = true; @@ -62,6 +67,7 @@ stdenv.mkDerivation { "LIBDIR=$(out)/lib/bup" ]; + env.BUP_PYTHON_CONFIG = lib.getExe' (lib.getDev python3) "python-config"; env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=implicit-function-declaration -Wno-error=implicit-int"; postInstall = '' @@ -88,5 +94,7 @@ stdenv.mkDerivation { platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ rnhmjoj ]; + # bespoke ./configure does not like cross + broken = stdenv.buildPlatform != stdenv.hostPlatform; }; } diff --git a/pkgs/by-name/ca/cargo-temp/package.nix b/pkgs/by-name/ca/cargo-temp/package.nix index d481f297006d..c1381e0920f6 100644 --- a/pkgs/by-name/ca/cargo-temp/package.nix +++ b/pkgs/by-name/ca/cargo-temp/package.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-temp"; - version = "0.3.0"; + version = "0.3.1"; src = fetchFromGitHub { owner = "yozhgoor"; repo = "cargo-temp"; rev = "v${version}"; - hash = "sha256-nfkFrNVt5DmYiy/V9rztJjDU07lGw7QwXR6NDYW9Jc0="; + hash = "sha256-fy4bG+UoN/51hiveYecl3ciJPV1g8/fC2dTFnUJZqAY="; }; - cargoHash = "sha256-x3DqU1KGKwfazCl305SmLWi/yUhPOkWcL0Z67FPdY8Y="; + cargoHash = "sha256-st8BLru9hp1qi784Zm4yVB8AJQfowF36201Yw8uQQ2k="; meta = with lib; { description = "CLI tool that allow you to create a temporary new Rust project using cargo with already installed dependencies"; diff --git a/pkgs/by-name/ch/chirp/package.nix b/pkgs/by-name/ch/chirp/package.nix index 092ce48b52dc..11f8d65e671d 100644 --- a/pkgs/by-name/ch/chirp/package.nix +++ b/pkgs/by-name/ch/chirp/package.nix @@ -11,14 +11,14 @@ python3Packages.buildPythonApplication { pname = "chirp"; - version = "0.4.0-unstable-2024-12-26"; + version = "0.4.0-unstable-2025-01-12"; pyproject = true; src = fetchFromGitHub { owner = "kk7ds"; repo = "chirp"; - rev = "43449629fb3c2ae0b71e8b7cb7d49e8e97a00c64"; - hash = "sha256-zn9pInfJ/QbwgvBqkqzdW7txVGZVU1EPDo4I4ZQDdLY="; + rev = "fc94f14823f3257961c4d0e144083fe6f397ad55"; + hash = "sha256-J1Hhz6M1VhfIttz9lJnPNQsOJbzKBrb6Yz154oh3moo="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/cn/cntr/package.nix b/pkgs/by-name/cn/cntr/package.nix index 01cdabf3ce77..d4fab9658f54 100644 --- a/pkgs/by-name/cn/cntr/package.nix +++ b/pkgs/by-name/cn/cntr/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "cntr"; - version = "1.5.4"; + version = "1.6.0"; src = fetchFromGitHub { owner = "Mic92"; repo = "cntr"; rev = version; - sha256 = "sha256-ErGratd1RCynE+iS+qn9feJi5o9f94lUNJZfy4XAjkc="; + sha256 = "sha256-A622DfygwZ8HVgSxmPINkuCsYFKQBAUdsnXQmB/LS8w="; }; - cargoHash = "sha256-4EDAQ0MG0BTN0L3W4Jm0IdVY8vj5U3faO+ruUjLMBMY="; + cargoHash = "sha256-LRX7NuNLyEnw+2kj1MG4JvSL2jzVFxH6tMAx4+cCeow="; passthru.tests = nixosTests.cntr; diff --git a/pkgs/by-name/co/codecrafters-cli/package.nix b/pkgs/by-name/co/codecrafters-cli/package.nix index 9f37ae28361b..8662580a829f 100644 --- a/pkgs/by-name/co/codecrafters-cli/package.nix +++ b/pkgs/by-name/co/codecrafters-cli/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "codecrafters-cli"; - version = "35"; + version = "36"; src = fetchFromGitHub { owner = "codecrafters-io"; repo = "cli"; rev = "v${version}"; - hash = "sha256-gCSlXI8DggQts7Em1onD4B5CxrfAlPuwovWRUgpsu/E="; + hash = "sha256-YgQPDc5BUIoEd44NLpRluxCKooW99qvcSTrFPm6qJKM="; # A shortened git commit hash is part of the version output, and is # needed at build time. Use the `.git` directory to retrieve the # commit SHA, and remove the directory afterwards since it is not needed @@ -25,7 +25,7 @@ buildGoModule rec { ''; }; - vendorHash = "sha256-lRDHe/7kCy8T4paA/6FVfM/sjBpvcGWLeW7b+dOnFo0="; + vendorHash = "sha256-5t/bRx3mT66e/efjWbb527ZdKOn3qV3hroqiLwP180g="; ldflags = [ "-s" diff --git a/pkgs/by-name/co/cosmic-wallpapers/package.nix b/pkgs/by-name/co/cosmic-wallpapers/package.nix index 26c64b5f5738..de370d6da187 100644 --- a/pkgs/by-name/co/cosmic-wallpapers/package.nix +++ b/pkgs/by-name/co/cosmic-wallpapers/package.nix @@ -8,7 +8,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "cosmic-wallpapers"; - version = "1.0.0-alpha.4"; + version = "1.0.0-alpha.5"; src = fetchFromGitHub { owner = "pop-os"; diff --git a/pkgs/by-name/db/dbeaver-bin/package.nix b/pkgs/by-name/db/dbeaver-bin/package.nix index 854f9688a796..5a53d5cf6d12 100644 --- a/pkgs/by-name/db/dbeaver-bin/package.nix +++ b/pkgs/by-name/db/dbeaver-bin/package.nix @@ -17,7 +17,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "dbeaver-bin"; - version = "24.3.0"; + version = "24.3.2"; src = let @@ -30,10 +30,10 @@ stdenvNoCC.mkDerivation (finalAttrs: { aarch64-darwin = "macos-aarch64.dmg"; }; hash = selectSystem { - x86_64-linux = "sha256-7tmz6ThT6oH2eMRl5XTf1+nr/ufDlp4BvGyKFICiTRw="; - aarch64-linux = "sha256-idnTeh37Ew6fg1gdJaoFF+wpgoShcJZokmWsid6g3ow="; - x86_64-darwin = "sha256-P1XseM1Al7y1JFVe/8VCIE84nMT4l9KF+Ik+rHjrv20="; - aarch64-darwin = "sha256-Xl4D8qTwB0tccuXqon4DApOOM95swxbfwSTD8gqc7jo="; + x86_64-linux = "sha256-kbpdAA/ZmH1f+MEfozyjr8HTKLhWEhswAGc7iSpy9rE="; + aarch64-linux = "sha256-SiNriPbyiMeHZSHab3JwyedURogPjI9McXwJqjpZXiA="; + x86_64-darwin = "sha256-cBJvElGfuCbyFRXzqcuQRa4GA6nXmEDxtse388FuH30="; + aarch64-darwin = "sha256-kzJeKY7V8CBcdsoDZDI9eBrr1hEWh3vyHI3wgos/s/M="; }; in fetchurl { @@ -107,10 +107,15 @@ stdenvNoCC.mkDerivation (finalAttrs: { runHook postInstall ''; + autoPatchelfIgnoreMissingDeps = [ + "libc.so.8" + ]; + passthru.updateScript = ./update.sh; - meta = with lib; { + meta = { homepage = "https://dbeaver.io/"; + changelog = "https://github.com/dbeaver/dbeaver/releases/tag/${finalAttrs.version}"; description = "Universal SQL Client for developers, DBA and analysts. Supports MySQL, PostgreSQL, MariaDB, SQLite, and more"; longDescription = '' Free multi-platform database tool for developers, SQL programmers, database @@ -118,10 +123,10 @@ stdenvNoCC.mkDerivation (finalAttrs: { PostgreSQL, MariaDB, SQLite, Oracle, DB2, SQL Server, Sybase, MS Access, Teradata, Firebird, Derby, etc. ''; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - license = licenses.asl20; - platforms = platforms.linux ++ platforms.darwin; - maintainers = with maintainers; [ + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + license = lib.licenses.asl20; + platforms = with lib.platforms; linux ++ darwin; + maintainers = with lib.maintainers; [ gepbird mkg20001 yzx9 diff --git a/pkgs/by-name/dr/dracula-theme/package.nix b/pkgs/by-name/dr/dracula-theme/package.nix index 6212bb63e4f0..2d2971dc6421 100644 --- a/pkgs/by-name/dr/dracula-theme/package.nix +++ b/pkgs/by-name/dr/dracula-theme/package.nix @@ -8,7 +8,7 @@ let themeName = "Dracula"; - version = "4.0.0-unstable-2024-12-05"; + version = "4.0.0-unstable-2025-01-10"; in stdenvNoCC.mkDerivation { pname = "dracula-theme"; @@ -17,8 +17,8 @@ stdenvNoCC.mkDerivation { src = fetchFromGitHub { owner = "dracula"; repo = "gtk"; - rev = "3478e48925f33af411393adaa4043193f03a4e9a"; - hash = "sha256-/7/zJXk1LLZKWOpYbrFWBfhFcyddU1y0IwT+RXyyP1M="; + rev = "79235b53c33f02d826d76cf991f5aa8f04ed4e76"; + hash = "sha256-glcDK0zUSYRU3SOrjxDUI170Ky995Js24DPxmL1rSPA="; }; propagatedUserEnvPkgs = [ diff --git a/pkgs/by-name/ej/ejabberd/package.nix b/pkgs/by-name/ej/ejabberd/package.nix index 1ea6e18fb3b8..5a2b939eff67 100644 --- a/pkgs/by-name/ej/ejabberd/package.nix +++ b/pkgs/by-name/ej/ejabberd/package.nix @@ -17,10 +17,8 @@ gd, autoreconfHook, gawk, - rebar3WithPlugins, fetchFromGitHub, fetchgit, - fetchHex, beamPackages, nixosTests, withMysql ? false, @@ -40,6 +38,8 @@ }: let + inherit (beamPackages) buildRebar3 fetchHex rebar3WithPlugins; + ctlpath = lib.makeBinPath [ bash gnused @@ -50,7 +50,7 @@ let procps ]; - provider_asn1 = beamPackages.buildRebar3 { + provider_asn1 = buildRebar3 { name = "provider_asn1"; version = "0.3.0"; src = fetchHex { @@ -60,7 +60,7 @@ let }; beamDeps = [ ]; }; - rebar3_hex = beamPackages.buildRebar3 { + rebar3_hex = buildRebar3 { name = "rebar3_hex"; version = "7.0.7"; src = fetchHex { @@ -73,7 +73,7 @@ let allBeamDeps = import ./rebar-deps.nix { inherit fetchHex fetchgit fetchFromGitHub; - builder = lib.makeOverridable beamPackages.buildRebar3; + builder = lib.makeOverridable buildRebar3; overrides = final: prev: { jiffy = prev.jiffy.override { buildPlugins = [ beamPackages.pc ]; }; diff --git a/pkgs/by-name/fa/factoriolab/package.nix b/pkgs/by-name/fa/factoriolab/package.nix index 6ecfce2bb8ec..60a237b3d185 100644 --- a/pkgs/by-name/fa/factoriolab/package.nix +++ b/pkgs/by-name/fa/factoriolab/package.nix @@ -10,13 +10,13 @@ }: buildNpmPackage rec { pname = "factoriolab"; - version = "3.8.10"; + version = "3.9.2"; src = fetchFromGitHub { owner = "factoriolab"; repo = "factoriolab"; tag = "v${version}"; - hash = "sha256-vwcqUsqlggmqqlQ3fyn+s3NKQ0oNcVztfjTpJPW1mFs="; + hash = "sha256-ogmez21QwFdRYVsMxeFmNnEerXbH4rQXmOwKuKbpuGs="; }; buildInputs = [ vips ]; nativeBuildInputs = [ diff --git a/pkgs/by-name/fa/fastfetch/package.nix b/pkgs/by-name/fa/fastfetch/package.nix index d28c873e837c..39d4044ebc44 100644 --- a/pkgs/by-name/fa/fastfetch/package.nix +++ b/pkgs/by-name/fa/fastfetch/package.nix @@ -45,13 +45,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "fastfetch"; - version = "2.34.0"; + version = "2.34.1"; src = fetchFromGitHub { owner = "fastfetch-cli"; repo = "fastfetch"; tag = finalAttrs.version; - hash = "sha256-ZTtDYUnLp8IzGluJXLCHBxHCZAXxO+akUkPOCPMdA5w="; + hash = "sha256-kCSRS2GD58HS9Qdrv7ju8b7IGznBsP1IIAvvzkWPaLk="; }; outputs = [ diff --git a/pkgs/by-name/gh/gh-ost/package.nix b/pkgs/by-name/gh/gh-ost/package.nix index 1cd7fb9dd20b..29b0e58ef0f3 100644 --- a/pkgs/by-name/gh/gh-ost/package.nix +++ b/pkgs/by-name/gh/gh-ost/package.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "gh-ost"; - version = "1.1.6"; + version = "1.1.7"; src = fetchFromGitHub { owner = "github"; repo = "gh-ost"; rev = "v${version}"; - hash = "sha256-dTz4w+OJXe2+ygsYsQ9tanDyaMXvdh8W3d8xpjQMapI="; + hash = "sha256-TTc69dWasqMVwwJNo+M9seMKEWgerZ2ZR7dwDfM1gWI="; }; vendorHash = null; @@ -25,14 +25,26 @@ buildGoModule rec { "-X main.AppVersion=${version}" ]; + checkFlags = + let + # Skip tests that require docker daemon + skippedTests = [ + "TestApplier" + "TestEventsStreamer" + "TestMigrator" + ]; + in + [ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ]; + passthru.tests.version = testers.testVersion { package = gh-ost; }; - meta = with lib; { + meta = { description = "Triggerless online schema migration solution for MySQL"; homepage = "https://github.com/github/gh-ost"; - license = licenses.mit; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ aaronjheng ]; mainProgram = "gh-ost"; }; } diff --git a/pkgs/by-name/gl/glaze/package.nix b/pkgs/by-name/gl/glaze/package.nix index f0926ddfe4ee..d441faa36428 100644 --- a/pkgs/by-name/gl/glaze/package.nix +++ b/pkgs/by-name/gl/glaze/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (final: { pname = "glaze"; - version = "4.2.3"; + version = "4.3.0"; src = fetchFromGitHub { owner = "stephenberry"; repo = "glaze"; rev = "v${final.version}"; - hash = "sha256-exEmEV4j18WGnnEFPaHlfFuLk0dPu18pYp85XBX8Y2w="; + hash = "sha256-iFFc2FjcvlQqvjXvFZ+J3RTEIritSM6AZXQlLE5YF9A="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/gn/gnome-recipes/package.nix b/pkgs/by-name/gn/gnome-recipes/package.nix index c2eac8eb8baa..a3fe050d1dd8 100644 --- a/pkgs/by-name/gn/gnome-recipes/package.nix +++ b/pkgs/by-name/gn/gnome-recipes/package.nix @@ -2,6 +2,7 @@ stdenv, lib, fetchFromGitLab, + fetchpatch, meson, ninja, pkg-config, @@ -35,6 +36,15 @@ stdenv.mkDerivation rec { sha256 = "GyFOwEYmipQdFLtTXn7+NvhDTzxBlOAghr3cZT4QpQw="; }; + patches = [ + # gcc-14 build failure fix + (fetchpatch { + name = "gcc-14.patch"; + url = "https://gitlab.gnome.org/GNOME/recipes/-/commit/c0304675f63a33737b24fdf37e06c6b154a91a31.patch"; + hash = "sha256-YTf4NDwUiU/q96RAXKTO499pW9sPrgh8IvdPBPEnV6Q="; + }) + ]; + nativeBuildInputs = [ meson ninja diff --git a/pkgs/by-name/gt/gtkradiant/package.nix b/pkgs/by-name/gt/gtkradiant/package.nix index 009c9c416e93..9a7c543b1167 100644 --- a/pkgs/by-name/gt/gtkradiant/package.nix +++ b/pkgs/by-name/gt/gtkradiant/package.nix @@ -234,6 +234,9 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + # GCC 14 makes these errors by default + env.NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types -Wno-error=implicit-function-declaration -Wno-error=int-conversion"; + desktopItems = [ (makeDesktopItem { name = "gtkradiant"; diff --git a/pkgs/by-name/ha/hashlink/package.nix b/pkgs/by-name/ha/hashlink/package.nix index 3e5e4809da86..42b45b119165 100644 --- a/pkgs/by-name/ha/hashlink/package.nix +++ b/pkgs/by-name/ha/hashlink/package.nix @@ -1,6 +1,8 @@ { stdenv , lib , fetchFromGitHub +, cmake +, ninja , libGL , libGLU , libpng @@ -12,7 +14,6 @@ , pcre , SDL2 , sqlite -, getconf }: stdenv.mkDerivation rec { @@ -26,7 +27,13 @@ stdenv.mkDerivation rec { sha256 = "sha256-rXw56zoFpLMzz8U3RHWGBF0dUFCUTjXShUEhzp2Qc5g="; }; - makeFlags = [ "PREFIX=$(out)" ]; + # incompatible pointer type error: const char ** -> const void ** + postPatch = '' + substituteInPlace libs/sqlite/sqlite.c \ + --replace-warn \ + "sqlite3_prepare16_v2(db->db, sql, -1, &r->r, &tl)" \ + "sqlite3_prepare16_v2(db->db, sql, -1, &r->r, (const void**)&tl)" + ''; buildInputs = [ libGL @@ -42,7 +49,7 @@ stdenv.mkDerivation rec { sqlite ]; - nativeBuildInputs = [ getconf ]; + nativeBuildInputs = [ cmake ninja ]; # append default installPhase with library install for haxe postInstall = let @@ -50,11 +57,7 @@ stdenv.mkDerivation rec { in '' mkdir -p "${haxelibPath}" echo -n "${version}" > "${haxelibPath}/../.current" - cp -r other/haxelib/* "${haxelibPath}" - ''; - - postFixup = lib.optionalString stdenv.hostPlatform.isDarwin '' - install_name_tool -change libhl.dylib $out/lib/libhl.dylib $out/bin/hl + cp -r ../other/haxelib/* "${haxelibPath}" ''; meta = with lib; { diff --git a/pkgs/by-name/ha/havn/package.nix b/pkgs/by-name/ha/havn/package.nix index 3b823bb0bf27..99f0e8ccbe4e 100644 --- a/pkgs/by-name/ha/havn/package.nix +++ b/pkgs/by-name/ha/havn/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "havn"; - version = "0.1.17"; + version = "0.1.18"; src = fetchFromGitHub { owner = "mrjackwills"; repo = "havn"; tag = "v${version}"; - hash = "sha256-13ilzqFSBrOOPuSu0sqROqAPu6QWAI3dag5paSnq+2A="; + hash = "sha256-G6nhWcrnMYysIHSocIeQsBGG51D1ozZPF/LGsDNG/+k="; }; - cargoHash = "sha256-Pl4+zVrhr2AZ4fcE/bhmmgfZaKpTqAktjiUfqLXq1BI="; + cargoHash = "sha256-xlaf6S4JeFmSuBOxykTXZlP2dXg4R/5RY7HsJi3/7PU="; checkFlags = [ # Skip tests that require network access diff --git a/pkgs/by-name/io/iotop-c/package.nix b/pkgs/by-name/io/iotop-c/package.nix index 62c37c4a2e6b..4cd9f5a47049 100644 --- a/pkgs/by-name/io/iotop-c/package.nix +++ b/pkgs/by-name/io/iotop-c/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "iotop-c"; - version = "1.26"; + version = "1.27"; src = fetchFromGitHub { owner = "Tomas-M"; repo = "iotop"; rev = "v${version}"; - sha256 = "sha256-m75BHvKMk9ckZ6TgT1QDfHYcEfvfEwWu0bQacnVgSmU="; + sha256 = "sha256-o8OJnZjrDbzzhwfzRWmyCmhBWxMVKRDeDWWBCXy3C90="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/kd/kdlfmt/package.nix b/pkgs/by-name/kd/kdlfmt/package.nix index ccddc5d97a05..74f650074bdf 100644 --- a/pkgs/by-name/kd/kdlfmt/package.nix +++ b/pkgs/by-name/kd/kdlfmt/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "kdlfmt"; - version = "0.0.8"; + version = "0.0.10"; src = fetchFromGitHub { owner = "hougesen"; repo = "kdlfmt"; rev = "v${version}"; - hash = "sha256-Eq/m5PnStfZokktgrsYx7e8uWZDB/JgomsrahuL5GYo="; + hash = "sha256-XqcexHeXXVfNoIu0h0Ooxlkm/FaDh/ctkH3cod1mlwY="; }; - cargoHash = "sha256-ay8QO2mHsbfidM9iBHfSdt7JN33T1o87jA/3ZIg1eUw="; + cargoHash = "sha256-ZlaILIVG3gLVFGqv1cozDtbHcL+dxUJXq/DvuJ077O8="; meta = { description = "Formatter for kdl documents"; diff --git a/pkgs/by-name/ko/kor/package.nix b/pkgs/by-name/ko/kor/package.nix index 2886fe61997f..bf2a0f9cf521 100644 --- a/pkgs/by-name/ko/kor/package.nix +++ b/pkgs/by-name/ko/kor/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "kor"; - version = "0.5.7"; + version = "0.5.8"; src = fetchFromGitHub { owner = "yonahd"; repo = pname; rev = "v${version}"; - hash = "sha256-r494fmkT94rLEAfeXpiYKt8sCmTHT5fktQXaIbUgMoM="; + hash = "sha256-cRnhLh1LSI9JXNes8USoGs8crVejh57tXWWI3xzf7o8="; }; - vendorHash = "sha256-OldJ80DYSlihhnjaCGh3Qh0g80pC4EstP+r3UO309Y0="; + vendorHash = "sha256-VxSdN4VjVDT2gjQFPY79O/yGX87TFQG6+fe/lckQ7J8="; preCheck = '' HOME=$(mktemp -d) diff --git a/pkgs/by-name/ku/kubernetes-controller-tools/package.nix b/pkgs/by-name/ku/kubernetes-controller-tools/package.nix index 413c950d2511..8fa94f902d1f 100644 --- a/pkgs/by-name/ku/kubernetes-controller-tools/package.nix +++ b/pkgs/by-name/ku/kubernetes-controller-tools/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "controller-tools"; - version = "0.17.0"; + version = "0.17.1"; src = fetchFromGitHub { owner = "kubernetes-sigs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ybm20A8VCbLZdS190O0VnzCKxasRg6zX2S8rEtB+igA="; + sha256 = "sha256-6tqUWsI8SJsBOUO9i+czilOJWlflZ8Sj/rdnZaLJeSQ="; }; - vendorHash = "sha256-QCl0IOWJzk1ddr8yS94Jh/RuGruK/0BLbFnIxbwV9pE="; + vendorHash = "sha256-NX4e//77G+jTL2309x6+UEmFarsNWO/n0Pex2pJ+S/s="; ldflags = [ "-s" diff --git a/pkgs/by-name/le/lefthook/package.nix b/pkgs/by-name/le/lefthook/package.nix index 2207b1f83431..586b899d5851 100644 --- a/pkgs/by-name/le/lefthook/package.nix +++ b/pkgs/by-name/le/lefthook/package.nix @@ -7,7 +7,7 @@ let pname = "lefthook"; - version = "1.10.1"; + version = "1.10.2"; in buildGoModule { inherit pname version; @@ -16,10 +16,10 @@ buildGoModule { owner = "evilmartians"; repo = "lefthook"; rev = "v${version}"; - hash = "sha256-M+JbbrHmN+ayLKXostvsVdSueXG7CHJXPRyOjWoabpI="; + hash = "sha256-blrg55q+wjzGo3v+tE3fSrKIfQ+O+P1Uus5QaNT4mOE="; }; - vendorHash = "sha256-phXZUKmadtWmevSXGOxu3NRIdAYCALiD3yepvMTLmT4="; + vendorHash = "sha256-nwjw58Ut4Ozx3OZtQ21qLd/Ohg/jcl+JCxc1X+JlNNE="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/li/librecad/package.nix b/pkgs/by-name/li/librecad/package.nix new file mode 100644 index 000000000000..d8ca362ee8e6 --- /dev/null +++ b/pkgs/by-name/li/librecad/package.nix @@ -0,0 +1,88 @@ +{ + lib, + stdenv, + boost, + fetchFromGitHub, + installShellFiles, + muparser, + pkg-config, + qt5, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "librecad"; + version = "2.2.1"; + + src = fetchFromGitHub { + owner = "LibreCAD"; + repo = "LibreCAD"; + tag = "v${finalAttrs.version}"; + hash = "sha256-GBn4lduzaKWEWzeTNjC9TpioSouVj+jVl32PLjc8FBc="; + }; + + buildInputs = [ + boost + muparser + qt5.qtbase + qt5.qtsvg + ]; + + nativeBuildInputs = [ + installShellFiles + pkg-config + qt5.qmake + qt5.qttools + qt5.wrapQtAppsHook + ]; + + qmakeFlags = [ + "MUPARSER_DIR=${muparser}" + "BOOST_DIR=${boost.dev}" + ]; + + postPatch = '' + substituteInPlace librecad/src/main/qc_applicationwindow.cpp \ + --replace-warn __DATE__ 0 + + substituteInPlace librecad/src/src.pro \ + --replace-warn '$$[QT_INSTALL_BINS]' '${lib.getDev qt5.qttools}/bin' + substituteInPlace librecad/src/muparser.pri \ + --replace-warn "macx|" "" + ''; + + installPhase = '' + runHook preInstall + + ${lib.optionalString stdenv.hostPlatform.isDarwin '' + mkdir -p $out/{Applications,bin} + mv LibreCAD.app $out/Applications + ln -s $out/Applications/LibreCAD.app/Contents/MacOS/LibreCAD $out/bin/librecad + # Prevent wrapping, otherwise plugins will not be loaded + chmod -x $out/Applications/LibreCAD.app/Contents/Resources/plugins/*.dylib + ''} + + ${lib.optionalString (!stdenv.hostPlatform.isDarwin) '' + install -Dm555 -t $out/bin unix/{librecad,ttf2lff} + install -Dm444 -t $out/share/applications desktop/librecad.desktop + install -Dm644 -t $out/share/pixmaps librecad/res/main/librecad.png + install -Dm444 desktop/librecad.sharedmimeinfo $out/share/mime/packages/librecad.xml + install -Dm444 desktop/graphics_icons_and_splash/Icon\ LibreCAD/Icon_Librecad.svg \ + $out/share/icons/hicolor/scalable/apps/librecad.svg + + installManPage desktop/librecad.? + + cp -R unix/resources $out/share/librecad + ''} + + runHook postInstall + ''; + + meta = { + description = "2D CAD package based on Qt"; + homepage = "https://librecad.org"; + license = lib.licenses.gpl2Only; + maintainers = with lib.maintainers; [ sikmir ]; + platforms = lib.platforms.unix; + mainProgram = "librecad"; + }; +}) diff --git a/pkgs/by-name/lo/lock/package.nix b/pkgs/by-name/lo/lock/package.nix index 37c8defe5ee7..1c979db91ee6 100644 --- a/pkgs/by-name/lo/lock/package.nix +++ b/pkgs/by-name/lo/lock/package.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "lock"; - version = "1.3.7"; + version = "1.3.8"; src = fetchFromGitHub { owner = "konstantintutsch"; repo = "Lock"; tag = "v${finalAttrs.version}"; - hash = "sha256-UZt8SlkwhtVRLUMf1uYNLchzkWnL+6e7xLYZ81+YQsw="; + hash = "sha256-6nZwxNwCxMCx+6lE7roteCIZp5b7MIDosB0/TseBXeg="; }; strictDeps = true; diff --git a/pkgs/by-name/m4/m4ri/package.nix b/pkgs/by-name/m4/m4ri/package.nix index c5cc261704a4..ecdaf447b6bb 100644 --- a/pkgs/by-name/m4/m4ri/package.nix +++ b/pkgs/by-name/m4/m4ri/package.nix @@ -19,6 +19,35 @@ stdenv.mkDerivation rec { hash = "sha256-untwo0go8O8zNO0EyZ4n/n7mngSXLr3Z/FSkXA8ptnU="; }; + # based on the list in m4/m4_ax_ext.m4 + configureFlags = builtins.map (s: "ax_cv_have_${s}_cpu_ext=no") ( + [ + "sha" + "xop" + ] + ++ lib.optional (!stdenv.hostPlatform.sse3Support) "sse3" + ++ lib.optional (!stdenv.hostPlatform.ssse3Support) "ssse3" + ++ lib.optional (!stdenv.hostPlatform.sse4_1Support) "sse41" + ++ lib.optional (!stdenv.hostPlatform.sse4_2Support) "sse42" + ++ lib.optional (!stdenv.hostPlatform.sse4_aSupport) "sse4a" + ++ lib.optional (!stdenv.hostPlatform.aesSupport) "aes" + ++ lib.optional (!stdenv.hostPlatform.avxSupport) "avx" + ++ lib.optional (!stdenv.hostPlatform.fmaSupport) "fma3" + ++ lib.optional (!stdenv.hostPlatform.fma4Support) "fma4" + ++ lib.optional (!stdenv.hostPlatform.avx2Support) "avx2" + ++ lib.optionals (!stdenv.hostPlatform.avx512Support) [ + "avx512f" + "avx512cd" + "avx512pf" + "avx512er" + "avx512vl" + "avx512bw" + "avx512dq" + "avx512ifma" + "avx512vbmi" + ] + ); + doCheck = true; nativeBuildInputs = [ diff --git a/pkgs/by-name/mi/mimalloc/package.nix b/pkgs/by-name/mi/mimalloc/package.nix index f638d1fa36bb..7a92d86dca13 100644 --- a/pkgs/by-name/mi/mimalloc/package.nix +++ b/pkgs/by-name/mi/mimalloc/package.nix @@ -12,13 +12,13 @@ let in stdenv.mkDerivation rec { pname = "mimalloc"; - version = "2.1.7"; + version = "2.1.8"; src = fetchFromGitHub { owner = "microsoft"; repo = pname; rev = "v${version}"; - sha256 = "sha256-slAi8Ht/jwpsFy5zC3CpfTdAkxEMpHJlgmNqMgz+psU="; + sha256 = "sha256-C0cqYiXxx8tW3plUZrfAJYKeY36opGKymkZ/CWrVuEI="; }; doCheck = !stdenv.hostPlatform.isStatic; diff --git a/pkgs/by-name/mo/moe/package.nix b/pkgs/by-name/mo/moe/package.nix index 7d1f9a875cd5..2ee19530eec9 100644 --- a/pkgs/by-name/mo/moe/package.nix +++ b/pkgs/by-name/mo/moe/package.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "moe"; - version = "1.14"; + version = "1.15"; src = fetchurl { url = "mirror://gnu/moe/moe-${finalAttrs.version}.tar.lz"; - hash = "sha256-9Lq9bOCuGVFvmDRU+yDTLf9xrTFjN6xr+TpCpf8gnJ0="; + hash = "sha256-QfjIsJnOMEeUXKTgl6YNkkPpxz+7JowZShLaiw2fCmY="; }; prePatch = '' diff --git a/pkgs/by-name/mo/molden/package.nix b/pkgs/by-name/mo/molden/package.nix index 0d46797fc0b1..7ca292390b95 100644 --- a/pkgs/by-name/mo/molden/package.nix +++ b/pkgs/by-name/mo/molden/package.nix @@ -27,6 +27,9 @@ stdenv.mkDerivation rec { patches = [ ./dont_register_file_types.patch ]; + # fix build with GCC 14 + env.NIX_CFLAGS_COMPILE = "-Wno-implicit-function-declaration -Wno-implicit-int -Wno-return-mismatch"; + postPatch = '' substituteInPlace ./makefile --replace '-L/usr/X11R6/lib' "" \ --replace '-I/usr/X11R6/include' "" \ diff --git a/pkgs/by-name/ni/nitrocli/package.nix b/pkgs/by-name/ni/nitrocli/package.nix new file mode 100644 index 000000000000..3d16e5744a56 --- /dev/null +++ b/pkgs/by-name/ni/nitrocli/package.nix @@ -0,0 +1,54 @@ +{ + fetchFromGitHub, + installShellFiles, + lib, + libnitrokey, + rustPlatform, + stdenv, +}: +let + version = "0.4.1"; +in +rustPlatform.buildRustPackage { + pname = "nitrocli"; + inherit version; + + src = fetchFromGitHub { + owner = "d-e-s-o"; + repo = "nitrocli"; + tag = "v${version}"; + hash = "sha256-j1gvh/CmRhPTeesMIK5FtaqUW7c8hN3ub+kQ2NM3dNM="; + }; + + cargoHash = "sha256-loCVYe4vdalo2AvoMo9th/V9xXulaq6HlPOw3idbqEw="; + + # tests require a connected Nitrokey device + doCheck = false; + + # link against packaged libnitrokey + USE_SYSTEM_LIBNITROKEY = 1; + + nativeBuildInputs = [ installShellFiles ]; + + buildInputs = [ libnitrokey ]; + + postInstall = + (lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + installShellCompletion --cmd nitrocli \ + --bash <($out/bin/shell-complete bash nitrocli) \ + --fish <($out/bin/shell-complete fish nitrocli) \ + --zsh <($out/bin/shell-complete zsh nitrocli) + '') + + '' + installManPage doc/nitrocli.1 + rm $out/bin/shell-complete + ''; + + meta = { + description = "Command line tool for interacting with Nitrokey devices"; + homepage = "https://github.com/d-e-s-o/nitrocli"; + license = lib.licenses.gpl3Plus; + mainProgram = "nitrocli"; + maintainers = with lib.maintainers; [ robinkrahl ]; + }; +} diff --git a/pkgs/by-name/no/notcurses/package.nix b/pkgs/by-name/no/notcurses/package.nix index adeadd172a50..01ba41a8c397 100644 --- a/pkgs/by-name/no/notcurses/package.nix +++ b/pkgs/by-name/no/notcurses/package.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "notcurses"; - version = "3.0.11"; + version = "3.0.12"; src = fetchFromGitHub { owner = "dankamongmen"; repo = "notcurses"; rev = "v${version}"; - sha256 = "sha256-3ddiHzPZ74GN2Hu+6Oe1DaNFn6S9gegGwXSX8fbtPp8="; + sha256 = "sha256-x7utMjXel5ax3mN7/QmSwFXCUVrkAx4exRHDTNIEETM="; }; outputs = [ diff --git a/pkgs/by-name/no/noto-fonts/package.nix b/pkgs/by-name/no/noto-fonts/package.nix index b9d274fcd20b..18201b28c584 100644 --- a/pkgs/by-name/no/noto-fonts/package.nix +++ b/pkgs/by-name/no/noto-fonts/package.nix @@ -20,13 +20,13 @@ stdenvNoCC.mkDerivation rec { pname = "noto-fonts${suffix}"; - version = "2024.12.01"; + version = "2025.01.01"; src = fetchFromGitHub { owner = "notofonts"; repo = "notofonts.github.io"; rev = "noto-monthly-release-${version}"; - hash = "sha256-CmYGnQOSABTMir120VWtROiLcEBVj117ZpgwPijoWnI="; + hash = "sha256-25517Bkx/kcMETJvGJvcHSJ3e/N7U8LWqp62dADm9G4="; }; _variants = map (variant: builtins.replaceStrings [ " " ] [ "" ] variant) variants; diff --git a/pkgs/by-name/oa/oauth2c/package.nix b/pkgs/by-name/oa/oauth2c/package.nix index 8a3052b78a28..ce05dd9faa97 100644 --- a/pkgs/by-name/oa/oauth2c/package.nix +++ b/pkgs/by-name/oa/oauth2c/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "oauth2c"; - version = "1.17.0"; + version = "1.17.1"; src = fetchFromGitHub { owner = "cloudentity"; repo = pname; rev = "v${version}"; - hash = "sha256-2EfkNtTbHSa0UZGfYylz0HlyVxGdSJNIUj6682DICSg="; + hash = "sha256-rrQSQDrdaU3HBTZL0vwHYK07XzcYwUZQp9aG6lwuDsc="; }; vendorHash = "sha256-ZQFIETfiNKyeZuskwNfoTXBy3MSWmG0tDztz0Mm7xJY="; diff --git a/pkgs/tools/graphics/povray/default.nix b/pkgs/by-name/po/povray/package.nix similarity index 91% rename from pkgs/tools/graphics/povray/default.nix rename to pkgs/by-name/po/povray/package.nix index 1309f506c556..9dd19ef88e2a 100644 --- a/pkgs/tools/graphics/povray/default.nix +++ b/pkgs/by-name/po/povray/package.nix @@ -57,6 +57,12 @@ stdenv.mkDerivation (finalAttrs: { sed -i -e 's/^povgroup.*/povgroup=nogroup/' Makefile.{am,in} ''; + # https://github.com/POV-Ray/povray/issues/460 + env.NIX_CFLAGS_COMPILE = toString [ + "-fno-finite-math-only" + "-DBOOST_BIND_GLOBAL_PLACEHOLDERS" + ]; + configureFlags = [ "COMPILED_BY=NixOS" "--with-boost-thread=boost_thread" diff --git a/pkgs/by-name/pv/pv/package.nix b/pkgs/by-name/pv/pv/package.nix index 189089dfd1c7..30f6ba8b050e 100644 --- a/pkgs/by-name/pv/pv/package.nix +++ b/pkgs/by-name/pv/pv/package.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "pv"; - version = "1.9.25"; + version = "1.9.27"; src = fetchurl { url = "https://www.ivarch.com/programs/sources/pv-${finalAttrs.version}.tar.gz"; - hash = "sha256-FiSVqrscuEIYbLIkmV49X2Cp9SeknMvYISODzHK3w2w="; + hash = "sha256-JTZZ3IZWk2PwZfXogeE1oMlZS5h/NKGbEEx0FKLSxHk="; }; meta = { diff --git a/pkgs/by-name/re/renode-dts2repl/package.nix b/pkgs/by-name/re/renode-dts2repl/package.nix index 94d33583ba40..3caff4d41017 100644 --- a/pkgs/by-name/re/renode-dts2repl/package.nix +++ b/pkgs/by-name/re/renode-dts2repl/package.nix @@ -7,14 +7,14 @@ python3.pkgs.buildPythonApplication { pname = "renode-dts2repl"; - version = "0-unstable-2024-12-28"; + version = "0-unstable-2025-01-13"; pyproject = true; src = fetchFromGitHub { owner = "antmicro"; repo = "dts2repl"; - rev = "f655a1380364fdab9fa0f72909c19ab8ff16dbb6"; - hash = "sha256-mErr95/Ew9HwKDJhQy7V86H1MJb5Y7IFzg7Id8Llqy8="; + rev = "d9b880c36988c0500f67d2206c4b2fdf42fd6e65"; + hash = "sha256-Apu5WEwlUhO8/j84jH/CzWae17H5U1cwV7h9J8Nx5J0="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ro/roslyn-ls/deps.json b/pkgs/by-name/ro/roslyn-ls/deps.json index dc33763e9741..891fda20b2a4 100644 --- a/pkgs/by-name/ro/roslyn-ls/deps.json +++ b/pkgs/by-name/ro/roslyn-ls/deps.json @@ -329,12 +329,6 @@ "hash": "sha256-0AqQ2gMS8iNlYkrD+BxtIg7cXMnr9xZHtKAuN4bjfaQ=", "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.targets/1.1.0/microsoft.netcore.targets.1.1.0.nupkg" }, - { - "pname": "Microsoft.NETCore.Targets", - "version": "1.1.3", - "hash": "sha256-WLsf1NuUfRWyr7C7Rl9jiua9jximnVvzy6nk2D2bVRc=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.targets/1.1.3/microsoft.netcore.targets.1.1.3.nupkg" - }, { "pname": "Microsoft.NETFramework.ReferenceAssemblies", "version": "1.0.3", @@ -409,9 +403,9 @@ }, { "pname": "Microsoft.VisualStudio.Telemetry", - "version": "17.12.32", - "hash": "sha256-HkAQyMovZEABmgcaaSo/DOyRbx+pyVOZGxEm7GEKd2E=", - "url": "https://pkgs.dev.azure.com/azure-public/3ccf6661-f8ce-4e8a-bb2e-eff943ddd3c7/_packaging/491596af-6d2d-439e-80bb-1ebb3b54f9a8/nuget/v3/flat2/microsoft.visualstudio.telemetry/17.12.32/microsoft.visualstudio.telemetry.17.12.32.nupkg" + "version": "17.13.28", + "hash": "sha256-DAmV0dT0Bw+BITSQbL/26055k2tAXtIfhnBmv1DwrA8=", + "url": "https://pkgs.dev.azure.com/azure-public/3ccf6661-f8ce-4e8a-bb2e-eff943ddd3c7/_packaging/491596af-6d2d-439e-80bb-1ebb3b54f9a8/nuget/v3/flat2/microsoft.visualstudio.telemetry/17.13.28/microsoft.visualstudio.telemetry.17.13.28.nupkg" }, { "pname": "Microsoft.VisualStudio.Threading", @@ -427,9 +421,9 @@ }, { "pname": "Microsoft.VisualStudio.Utilities.Internal", - "version": "16.3.73", - "hash": "sha256-zwk4jWuCw2ANhG00TnwT9JE7n/h2EQkYKeq6o966ilo=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.visualstudio.utilities.internal/16.3.73/microsoft.visualstudio.utilities.internal.16.3.73.nupkg" + "version": "16.3.90", + "hash": "sha256-3OkOduGmMmenv73Yidzz6dvbRISyjo+hGRYhWOFmV4s=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.visualstudio.utilities.internal/16.3.90/microsoft.visualstudio.utilities.internal.16.3.90.nupkg" }, { "pname": "Microsoft.VisualStudio.Validation", @@ -991,9 +985,9 @@ }, { "pname": "System.Private.Uri", - "version": "4.3.2", - "hash": "sha256-jB2+W3tTQ6D9XHy5sEFMAazIe1fu2jrENUO0cb48OgU=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.private.uri/4.3.2/system.private.uri.4.3.2.nupkg" + "version": "4.3.0", + "hash": "sha256-fVfgcoP4AVN1E5wHZbKBIOPYZ/xBeSIdsNF+bdukIRM=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.private.uri/4.3.0/system.private.uri.4.3.0.nupkg" }, { "pname": "System.Reflection", @@ -1159,9 +1153,9 @@ }, { "pname": "System.Text.Json", - "version": "8.0.4", - "hash": "sha256-g5oT7fbXxQ9Iah1nMCr4UUX/a2l+EVjJyTrw3FTbIaI=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.text.json/8.0.4/system.text.json.8.0.4.nupkg" + "version": "8.0.5", + "hash": "sha256-yKxo54w5odWT6nPruUVsaX53oPRe+gKzGvLnnxtwP68=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.text.json/8.0.5/system.text.json.8.0.5.nupkg" }, { "pname": "System.Threading", diff --git a/pkgs/by-name/ro/roslyn-ls/force-sdk_8_0.patch b/pkgs/by-name/ro/roslyn-ls/force-sdk_8_0.patch new file mode 100644 index 000000000000..21b12177e3d4 --- /dev/null +++ b/pkgs/by-name/ro/roslyn-ls/force-sdk_8_0.patch @@ -0,0 +1,45 @@ +diff --git a/eng/targets/TargetFrameworks.props b/eng/targets/TargetFrameworks.props +index 2dddaff1560..bc8fd1938d5 100644 +--- a/eng/targets/TargetFrameworks.props ++++ b/eng/targets/TargetFrameworks.props +@@ -17,7 +17,7 @@ + net8.0 + net8.0 + net8.0 +- net6.0 ++ net8.0 + net9.0 + + +diff --git a/src/Workspaces/Core/MSBuild.BuildHost/Microsoft.CodeAnalysis.Workspaces.MSBuild.BuildHost.csproj b/src/Workspaces/Core/MSBuild.BuildHost/Microsoft.CodeAnalysis.Workspaces.MSBuild.BuildHost.csproj +index 8101f56b8be..1733955dc3d 100644 +--- a/src/Workspaces/Core/MSBuild.BuildHost/Microsoft.CodeAnalysis.Workspaces.MSBuild.BuildHost.csproj ++++ b/src/Workspaces/Core/MSBuild.BuildHost/Microsoft.CodeAnalysis.Workspaces.MSBuild.BuildHost.csproj +@@ -28,6 +28,12 @@ + --> + <_MsbuildVersion>17.3.4 + ++ ++ <_MsbuildFramework>$(TargetFramework) ++ ++ ++ <_MsbuildFramework>net6.0 ++ + + + +@@ -36,10 +42,10 @@ + + + +- +- +- +- ++ ++ ++ ++ + + + diff --git a/pkgs/by-name/ro/roslyn-ls/package.nix b/pkgs/by-name/ro/roslyn-ls/package.nix index 571b7da8b6d5..52fe26f065cd 100644 --- a/pkgs/by-name/ro/roslyn-ls/package.nix +++ b/pkgs/by-name/ro/roslyn-ls/package.nix @@ -18,9 +18,6 @@ let (combinePackages [ sdk_9_0 sdk_8_0 - # NOTE: we should be able to remove net6.0 after upstream removes from here: - # https://github.com/dotnet/roslyn/blob/6cc106c0eaa9b0ae070dba3138a23aeab9b50c13/eng/targets/TargetFrameworks.props#L20 - sdk_6_0 ]) packages targetPackages @@ -35,24 +32,28 @@ in buildDotnetModule rec { inherit pname dotnet-sdk dotnet-runtime; - vsVersion = "2.59.14"; + vsVersion = "2.61.27"; src = fetchFromGitHub { owner = "dotnet"; repo = "roslyn"; rev = "VSCode-CSharp-${vsVersion}"; - hash = "sha256-tzBIqXBtPGupBBvHTFO93w6f5qCgllWY420xtjf9o3g="; + hash = "sha256-mqlCfgymhH/pR/GW3qZd0rmLdNezgVGZS6Q6zaNor8E="; }; # versioned independently from vscode-csharp # "roslyn" in here: # https://github.com/dotnet/vscode-csharp/blob/main/package.json - version = "4.13.0-3.24577.4"; + version = "4.13.0-3.25051.1"; projectFile = "src/LanguageServer/${project}/${project}.csproj"; useDotnetFromEnv = true; nugetDeps = ./deps.json; nativeBuildInputs = [ jq ]; + # until upstream updates net6.0 here: + # https://github.com/dotnet/roslyn/blob/6cc106c0eaa9b0ae070dba3138a23aeab9b50c13/eng/targets/TargetFrameworks.props#L20 + patches = [ ./force-sdk_8_0.patch ]; + postPatch = '' # Upstream uses rollForward = latestPatch, which pins to an *exact* .NET SDK version. jq '.sdk.rollForward = "latestMinor"' < global.json > global.json.tmp diff --git a/pkgs/by-name/rp/rpl/package.nix b/pkgs/by-name/rp/rpl/package.nix index 74b890a6ee20..099d34f37cb2 100644 --- a/pkgs/by-name/rp/rpl/package.nix +++ b/pkgs/by-name/rp/rpl/package.nix @@ -6,13 +6,13 @@ python3Packages.buildPythonApplication rec { pname = "rpl"; - version = "1.15.7"; + version = "1.16"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-Xq3GLa1TnS4nobPHHCkFUEo9vgI4DGyY2/hQWtkwNRA="; + hash = "sha256-uBpzKYfdGu2j1ZEaw4TN1fH+W9VLrJf7a87vzZBBU3Y="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/se/seagoat/failing_tests.nix b/pkgs/by-name/se/seagoat/failing_tests.nix new file mode 100644 index 000000000000..75ed4e5bbab4 --- /dev/null +++ b/pkgs/by-name/se/seagoat/failing_tests.nix @@ -0,0 +1,54 @@ +[ + # network access + "test_connecting_to_remote_server" + "test_does_not_crash_with_slash_in_request" + "test_query_codebase" + "test_status_endpoint_with_all_files_analyzed" + "test_status_endpoint_with_some_files_not_analyzed" + "test_status_2" + "test_stop" + "test_status_with_json_when_server_running" + "test_server_status_not_running_if_process_does_not_exist" + "test_query_codebase_no_results" + "test_servers_info_includes_version_and_server_details" + "test_query_files_endpoint" + "test_snapshot_results_with_real_repo" + "test_ignores_certain_branches" + "test_analysis_results_are_persisted_between_runs" + "test_damaged_cache_doesnt_crash_app_1" + "test_damaged_cache_doesnt_crash_app_2" + "test_only_returns_supported_file_types" + "test_file_score_is_recalculated_when_needed" + "test_does_not_crash_because_of_non_existent_files" + "test_ignored_files_is_really_ignored" + "test_allows_limiting_how_many_files_are_automatically_analized" + "test_allows_limiting_how_many_files_are_automatically_analized" + "test_allows_limiting_how_many_files_are_automatically_analized" + "test_includes_all_matching_lines_from_line" + "test_search_is_case_insensitive" + "test_respects_file_extension_restrictions" + "test_includes_context_lines_properly" + "test_includes_context_lines_properly" + "test_includes_context_lines_properly" + "test_includes_context_lines_properly" + "test_ripgrep_respects_custom_ignore_patterns" + "test_filters_stop_words" + "test_does_not_filter_stop_words_if_that_is_all_whats_in_the_query" + "test_integration_test_without_color" + "test_integration_test_vimgrep_mode" + "test_integration_test_no_results" + "test_server_is_not_running_error" + "test_server_is_not_running_error" + "test_reverse_ordering" + "test_reverse_ordering" + "test_file_returns_global_metadata_1" + "test_file_returns_global_metadata_2" + "test_important_files_are_analyzed_first" + "test_simple_regexp" + "test_regexp_combined_with_chroma" + "test_returns_file_list_1" + "test_returns_file_list_2" + "test_file_change_many_times_is_first_result" + "test_newer_change_can_beat_frequent_change_in_past" + "test_commit_messages_with_three_or_more_colons" +] diff --git a/pkgs/by-name/se/seagoat/package.nix b/pkgs/by-name/se/seagoat/package.nix new file mode 100644 index 000000000000..de670053596b --- /dev/null +++ b/pkgs/by-name/se/seagoat/package.nix @@ -0,0 +1,74 @@ +{ + lib, + fetchFromGitHub, + python3Packages, + ripgrep, + gitMinimal, +}: + +python3Packages.buildPythonApplication rec { + pname = "seagoat"; + version = "0.50.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "kantord"; + repo = "SeaGOAT"; + tag = "v${version}"; + hash = "sha256-tf3elcKXUwBqtSStDksOaSN3Q66d72urrG/Vab2M4f0="; + }; + + build-system = [ python3Packages.poetry-core ]; + + dependencies = with python3Packages; [ + appdirs + blessed + chardet + flask + deepmerge + chromadb + gitpython + jsonschema + pygments + requests + nest-asyncio + waitress + psutil + stop-words + ]; + + nativeCheckInputs = with python3Packages; [ + pytestCheckHook + freezegun + pytest-asyncio + pytest-mock + pytest-snapshot + gitMinimal + ripgrep + ]; + + disabledTests = import ./failing_tests.nix; + + # require network access + disabledTestPaths = [ + "tests/test_chroma.py" + ]; + + preCheck = '' + export HOME=$(mktemp -d) + git init + ''; + + postInstall = '' + wrapProgram $out/bin/seagoat-server \ + --prefix PATH : "${ripgrep}/bin" + ''; + + meta = { + description = "Local-first semantic code search engine"; + homepage = "https://kantord.github.io/SeaGOAT/"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ lavafroth ]; + mainProgram = "seagoat"; + }; +} diff --git a/pkgs/by-name/se/ser2net/package.nix b/pkgs/by-name/se/ser2net/package.nix index 287897119cba..cb821998d2e3 100644 --- a/pkgs/by-name/se/ser2net/package.nix +++ b/pkgs/by-name/se/ser2net/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "ser2net"; - version = "4.6.2"; + version = "4.6.3"; src = fetchFromGitHub { owner = "cminyard"; repo = pname; rev = "v${version}"; - hash = "sha256-cREtVvUZggVZpd3HFqrfikCInIyrRXSk4HKYhEWkXXc="; + hash = "sha256-rxFCACCfnPV5Lbd3k/zk9JbFAXJJTNGQzpOpD2M9zhg="; }; passthru = { diff --git a/pkgs/by-name/se/serie/package.nix b/pkgs/by-name/se/serie/package.nix index b891cff95f45..8e8d367d73f0 100644 --- a/pkgs/by-name/se/serie/package.nix +++ b/pkgs/by-name/se/serie/package.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "serie"; - version = "0.4.1"; + version = "0.4.2"; src = fetchFromGitHub { owner = "lusingander"; repo = "serie"; rev = "v${version}"; - hash = "sha256-F7AlDuvRYCMhOXyzg9/oTukAEaDJENG0ZEhIlNe+Cic="; + hash = "sha256-F+pKnvsBh3bVnFBe4HSPiUIUKivMCeVPuLX3MqxxjPQ="; }; - cargoHash = "sha256-Ug4dB3Xx0bm4brztpBbf55QdWc+7nyShMYP8kPC/82k="; + cargoHash = "sha256-TXDZsT+p8s6jd3D7EakaDHkzKiM/ad1LPnJtIy1QcPo="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin ( with darwin.apple_sdk.frameworks; diff --git a/pkgs/by-name/sh/shiori/package.nix b/pkgs/by-name/sh/shiori/package.nix index 98e9b9ad5c88..606db18f04c3 100644 --- a/pkgs/by-name/sh/shiori/package.nix +++ b/pkgs/by-name/sh/shiori/package.nix @@ -9,7 +9,7 @@ buildGoModule rec { pname = "shiori"; - version = "1.7.3"; + version = "1.7.4"; vendorHash = "sha256-RTnaDAl79LScbeKKAGJOI/YOiHEwwlxS2CmNhw80KL0="; @@ -19,7 +19,7 @@ buildGoModule rec { owner = "go-shiori"; repo = pname; rev = "v${version}"; - sha256 = "sha256-e60eeP0vgQ2/ZE/kO3LcG50EITeF1eN7m1/Md23/HwU="; + sha256 = "sha256-T4EFwvejLgNkcykPjSHU8WXJwqSqYPFaAD+9JX+uiJU="; }; ldflags = [ diff --git a/pkgs/by-name/so/sonarlint-ls/package.nix b/pkgs/by-name/so/sonarlint-ls/package.nix index 5ffc83975d53..50319f1d8e78 100644 --- a/pkgs/by-name/so/sonarlint-ls/package.nix +++ b/pkgs/by-name/so/sonarlint-ls/package.nix @@ -17,30 +17,25 @@ maven.buildMavenPackage rec { pname = "sonarlint-ls"; - version = "3.5.1.75119"; + version = "3.14.1.75775"; src = fetchFromGitHub { owner = "SonarSource"; repo = "sonarlint-language-server"; rev = version; - hash = "sha256-6tbuX0wUpqbTyM44e7PqZHL0/XjN8hTFCgfzV+qc1m0="; + hash = "sha256-QXBSdXpkhqcvfjihcWwy4oCjTMmbAJRZG1T66sa8T4U="; }; + # Replaces unavailable versions with available ones in maven central. Can be + # removed again if + # https://github.com/SonarSource/sonarlint-language-server/pull/427 is + # merged. + patches = [ ./sonar-analyzers-versions.patch ]; + mvnJdk = jdk17; - manualMvnArtifacts = [ - "org.apache.maven.surefire:surefire-junit-platform:3.1.2" - "org.junit.platform:junit-platform-launcher:1.8.2" - ]; + mvnHash = "sha256-SKkOf3f9Ze3Rm6i2uYbFkvSnnEySARvaoiAS1e2kFi0="; - mvnHash = "sha256-ZhAQtpi0wQP8+QPeYaor2MveY+DZ9RPENb3kITnuWd8="; - - buildOffline = true; - - # disable node and npm module installation because the need network access - # for the tests. - mvnDepsParameters = "-Dskip.installnodenpm=true -Dskip.npm package"; - - # disable failing tests which either need network access or are flaky + # Disables failing tests which either need network access or are flaky. mvnParameters = lib.escapeShellArgs [ "-Dskip.installnodenpm=true" "-Dskip.npm" @@ -48,20 +43,16 @@ maven.buildMavenPackage rec { !LanguageServerWithFoldersMediumTests, !NotebookMediumTests, !ConnectedModeMediumTests, - !JavaMediumTests" + !JavaMediumTests, + !OpenNotebooksCacheTests" ]; - doCheck = false; - installPhase = '' runHook preInstall mkdir -p $out/{bin,share/plugins} - install -Dm644 target/sonarlint-language-server-*.jar \ - $out/share/sonarlint-ls.jar - install -Dm644 target/plugins/* \ - $out/share/plugins - + install -Dm644 target/sonarlint-language-server-*.jar $out/share/sonarlint-ls.jar + install -Dm644 target/plugins/* $out/share/plugins makeWrapper ${jre_headless}/bin/java $out/bin/sonarlint-ls \ --add-flags "-jar $out/share/sonarlint-ls.jar" \ @@ -95,17 +86,23 @@ maven.buildMavenPackage rec { gnused ]; text = '' - LATEST_TAG=$(curl https://api.github.com/repos/${src.owner}/${src.repo}/tags | \ + if [ -z "''${GITHUB_TOKEN:-}" ]; then + echo "no GITHUB_TOKEN provided - you could meet API request limiting" >&2 + fi + + LATEST_TAG=$(curl -H "Accept: application/vnd.github+json" \ + ''${GITHUB_TOKEN:+-H "Authorization: bearer $GITHUB_TOKEN"} \ + -Lsf https://api.github.com/repos/${src.owner}/${src.repo}/tags | \ jq -r '[.[] | select(.name | test("^[0-9]"))] | sort_by(.name | split(".") | map(tonumber)) | reverse | .[0].name') - update-source-version sonarlint-ls "$LATEST_TAG" + update-source-version ${pname} "$LATEST_TAG" sed -i '0,/mvnHash *= *"[^"]*"/{s/mvnHash = "[^"]*"/mvnHash = ""/}' ${pkgFile} echo -e "\nFetching all mvn dependencies to calculate the mvnHash. This may take a while ..." - nix-build -A sonarlint-ls.fetchedMavenDeps 2> sonarlint-ls-stderr.log || true + nix-build -A ${pname}.fetchedMavenDeps 2> ${pname}-stderr.log || true - NEW_MVN_HASH=$(grep "got:" sonarlint-ls-stderr.log | awk '{print ''$2}') - rm sonarlint-ls-stderr.log + NEW_MVN_HASH=$(grep "got:" ${pname}-stderr.log | awk '{print ''$2}') + rm ${pname}-stderr.log # escaping double quotes looks ugly but is needed for variable substitution # use # instead of / as separator because the sha256 might contain the / character sed -i "0,/mvnHash *= *\"[^\"]*\"/{s#mvnHash = \"[^\"]*\"#mvnHash = \"$NEW_MVN_HASH\"#}" ${pkgFile} diff --git a/pkgs/by-name/so/sonarlint-ls/sonar-analyzers-versions.patch b/pkgs/by-name/so/sonarlint-ls/sonar-analyzers-versions.patch new file mode 100644 index 000000000000..75eb412f44d6 --- /dev/null +++ b/pkgs/by-name/so/sonarlint-ls/sonar-analyzers-versions.patch @@ -0,0 +1,17 @@ +diff --git a/pom.xml b/pom.xml +index c020fd1..fd4146b 100644 +--- a/pom.xml ++++ b/pom.xml +@@ -34,10 +34,10 @@ + 4.17.0.14845 + 3.16.0.5274 + 2.10.0.4108 +- 2.18.0.4812 ++ 2.18.0.4866 + 1.15.0.4655 + 1.27.0.9518 +- 10.2.0.103721 ++ 10.2.0.105762 + 1.25.0.100242 + sonarlint-language-server + diff --git a/pkgs/by-name/sp/spaceFM/package.nix b/pkgs/by-name/sp/spaceFM/package.nix index 418f285bd6cf..da44ad45380c 100644 --- a/pkgs/by-name/sp/spaceFM/package.nix +++ b/pkgs/by-name/sp/spaceFM/package.nix @@ -1,6 +1,7 @@ { pkgs, fetchFromGitHub, + fetchpatch, lib, stdenv, gtk3, @@ -35,6 +36,14 @@ stdenv.mkDerivation rec { # restrict GDK backends to only X11 ./x11-only.patch + + # gcc-14 build fix from: + # https://github.com/IgnorantGuru/spacefm/pull/816 + (fetchpatch { + name = "gcc-14.patch"; + url = "https://github.com/IgnorantGuru/spacefm/commit/98efb1f43e6339b3ceddb9f65ee85e26790fefdf.patch"; + hash = "sha256-dau1AMnSBsp8iDrjoo0WTnFQ13vNZW2kM4qz0B/beDI="; + }) ]; # Workaround build failure on -fno-common toolchains: diff --git a/pkgs/by-name/ta/task-keeper/package.nix b/pkgs/by-name/ta/task-keeper/package.nix index 098ae263619f..8acf10bffa77 100644 --- a/pkgs/by-name/ta/task-keeper/package.nix +++ b/pkgs/by-name/ta/task-keeper/package.nix @@ -8,18 +8,18 @@ rustPlatform.buildRustPackage rec { pname = "task-keeper"; - version = "0.28.0"; + version = "0.28.1"; src = fetchFromGitHub { owner = "linux-china"; repo = "task-keeper"; tag = "v${version}"; - hash = "sha256-ufKHKQULN1zaEmnLx4voL/rL8bBe0aZEfclb+5/ybps="; + hash = "sha256-PT8NN6rHY9Ph15KikoAYAfJ++u6t6Mp8SPm24ZBdPDk="; }; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ]; - cargoHash = "sha256-g2CxCpSBAKUn+ENduuh+u5l3KD7rchY0qLAuPz8ATww="; + cargoHash = "sha256-fFN7nkkOlOreFVg2phvX2uj3crnohJrLgpgDUJucz5Y="; # tests depend on many packages (java, node, python, sbt, ...) - which I'm not currently willing to set up 😅 doCheck = false; diff --git a/pkgs/by-name/tl/tlclient/package.nix b/pkgs/by-name/tl/tlclient/package.nix index 04dc61b4e703..36bfa0d2e956 100644 --- a/pkgs/by-name/tl/tlclient/package.nix +++ b/pkgs/by-name/tl/tlclient/package.nix @@ -12,8 +12,8 @@ stdenv.mkDerivation ( finalAttrs: let - version = "4.17.0"; - buildNum = "3543"; + version = "4.18.0"; + buildNum = "3768"; in { pname = "tlclient"; @@ -21,7 +21,7 @@ stdenv.mkDerivation ( src = fetchurl { url = "https://www.cendio.com/downloads/clients/tl-${finalAttrs.version}-client-linux-dynamic-x86_64.tar.gz"; - hash = "sha256-7pl97xGNFwSDpWMpBvkz/bfMsWquVsJVGB+feWJvRQY="; + hash = "sha256-fTezGhn0UESEQRPrHYVZNcplV48wb5X/xqplIfLRLAA="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/tl/tldr/package.nix b/pkgs/by-name/tl/tldr/package.nix index fc63b374570e..ca3ec3a0db22 100644 --- a/pkgs/by-name/tl/tldr/package.nix +++ b/pkgs/by-name/tl/tldr/package.nix @@ -1,60 +1,68 @@ { - lib, stdenv, + lib, fetchFromGitHub, - curl, - libzip, - pkg-config, installShellFiles, + python3Packages, }: -stdenv.mkDerivation rec { +python3Packages.buildPythonApplication rec { pname = "tldr"; - version = "1.6.1"; + version = "3.3.0"; + pyproject = true; src = fetchFromGitHub { owner = "tldr-pages"; - repo = "tldr-c-client"; - rev = "v${version}"; - sha256 = "sha256-1L9frURnzfq0XvPBs8D+hBikybAw8qkb0DyZZtkZleY="; + repo = "tldr-python-client"; + tag = version; + hash = "sha256-lc0Jen8vW4BNg784td1AZa2GTYvXC1d83FnAe5RZqpY="; }; - buildInputs = [ - curl - libzip - ]; - nativeBuildInputs = [ - pkg-config - installShellFiles + build-system = with python3Packages; [ + setuptools + wheel ]; - makeFlags = [ - "CC=${stdenv.cc.targetPrefix}cc" - "LD=${stdenv.cc.targetPrefix}cc" - "CFLAGS=" + dependencies = with python3Packages; [ + termcolor + colorama + shtab ]; - installFlags = [ "PREFIX=$(out)" ]; + nativeBuildInputs = [ installShellFiles ]; - postInstall = '' - installShellCompletion --cmd tldr autocomplete/complete.{bash,fish,zsh} + nativeCheckInputs = with python3Packages; [ + pytest + ]; + + checkPhase = '' + runHook preCheck + pytest -k 'not test_error_message' + runHook postCheck ''; - meta = with lib; { + doCheck = true; + + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + installShellCompletion --cmd tldr \ + --bash <($out/bin/tldr --print-completion bash) \ + --zsh <($out/bin/tldr --print-completion zsh) + ''; + + meta = { description = "Simplified and community-driven man pages"; longDescription = '' tldr pages gives common use cases for commands, so you don't need to hunt through a man page for the correct flags. ''; homepage = "https://tldr.sh"; - changelog = "https://github.com/tldr-pages/tldr-c-client/blob/v${version}/CHANGELOG.md"; - license = licenses.mit; - maintainers = with maintainers; [ + changelog = "https://github.com/tldr-pages/tldr-python-client/blob/${version}/CHANGELOG.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ taeer carlosdagos kbdharun ]; - platforms = platforms.all; mainProgram = "tldr"; }; } diff --git a/pkgs/by-name/tu/tutanota-desktop/package.nix b/pkgs/by-name/tu/tutanota-desktop/package.nix index 7c0470e6bafa..070be4a4aefe 100644 --- a/pkgs/by-name/tu/tutanota-desktop/package.nix +++ b/pkgs/by-name/tu/tutanota-desktop/package.nix @@ -7,11 +7,11 @@ appimageTools.wrapType2 rec { pname = "tutanota-desktop"; - version = "259.241223.0"; + version = "259.241223.2"; src = fetchurl { url = "https://github.com/tutao/tutanota/releases/download/tutanota-desktop-release-${version}/tutanota-desktop-linux.AppImage"; - hash = "sha256-PfgdYKy3JfId04hu8qrNhmdpwOmyfsfz7Bk7KpLTdzk="; + hash = "sha256-VeAXOCdvy9liCJBNMdPc6iIeuOutqQ9sShc4XytApH4="; }; extraPkgs = pkgs: [ pkgs.libsecret ]; diff --git a/pkgs/by-name/uv/uv/package.nix b/pkgs/by-name/uv/uv/package.nix index f20dd986aec9..b50559808266 100644 --- a/pkgs/by-name/uv/uv/package.nix +++ b/pkgs/by-name/uv/uv/package.nix @@ -17,17 +17,17 @@ rustPlatform.buildRustPackage rec { pname = "uv"; - version = "0.5.17"; + version = "0.5.18"; src = fetchFromGitHub { owner = "astral-sh"; repo = "uv"; tag = version; - hash = "sha256-LK+S1L5XaflfkmKQcYHPDrXO+XjNJNX4mBg1ST74PzY="; + hash = "sha256-n/Vh79CZ6mq5JB8Z+wZo+s6t87Bt9ISPj4svMOrMJf0="; }; useFetchCargoVendor = true; - cargoHash = "sha256-3wPR9OOgmZ99BXaHBzPPPPt5dHPXRDiNY0S6nhC2nx4="; + cargoHash = "sha256-+hv1LPbw1GAMcHIb7lxt8QNyQFtuuhPFJAa3iOJq3PQ="; nativeBuildInputs = [ cmake diff --git a/pkgs/by-name/ux/uxn/package.nix b/pkgs/by-name/ux/uxn/package.nix index d4bab7374854..9937e3d2cb37 100644 --- a/pkgs/by-name/ux/uxn/package.nix +++ b/pkgs/by-name/ux/uxn/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "uxn"; - version = "1.0-unstable-2024-12-25"; + version = "1.0-unstable-2025-01-04"; src = fetchFromSourcehut { owner = "~rabbits"; repo = "uxn"; - rev = "c93972cae22be2300d1cade49142546cf162da50"; - hash = "sha256-SXzuNfiCQaQxC2AOwm2+SYMb4Z3vQE+g1yolRoPaCQc="; + rev = "b2d09ce518742de16add4d5f5b96f320e274e5a2"; + hash = "sha256-BNI2226vWo/XcIRrTWdoHmkckQ0U9yWawqlPamTu0PI="; }; outputs = [ diff --git a/pkgs/by-name/v2/v2ray/package.nix b/pkgs/by-name/v2/v2ray/package.nix index 6d2ddf71be9c..ffcc687ddbcf 100644 --- a/pkgs/by-name/v2/v2ray/package.nix +++ b/pkgs/by-name/v2/v2ray/package.nix @@ -16,13 +16,13 @@ buildGoModule rec { pname = "v2ray-core"; - version = "5.23.0"; + version = "5.24.0"; src = fetchFromGitHub { owner = "v2fly"; repo = "v2ray-core"; rev = "v${version}"; - hash = "sha256-V7/dhTJWd9Qf+80xYpfPJtm4VdH9vVQoL84RKAcyoVo="; + hash = "sha256-3xbXqfac1Kv77uBxykoX1nDB5NqTJDYmmzRloZUL/dA="; }; # `nix-update` doesn't support `vendorHash` yet. diff --git a/pkgs/by-name/va/vault-tasks/package.nix b/pkgs/by-name/va/vault-tasks/package.nix index c7f2e53309ee..e42d1758c4c6 100644 --- a/pkgs/by-name/va/vault-tasks/package.nix +++ b/pkgs/by-name/va/vault-tasks/package.nix @@ -5,7 +5,7 @@ nix-update-script, }: let - version = "0.8.0"; + version = "0.8.1"; in rustPlatform.buildRustPackage { pname = "vault-tasks"; @@ -14,9 +14,9 @@ rustPlatform.buildRustPackage { owner = "louis-thevenet"; repo = "vault-tasks"; rev = "v${version}"; - hash = "sha256-liU2zxBEOH5KMftru2PaIYZHLskm9WLNmUakn300/Xo="; + hash = "sha256-4sg1v541NknaOClZAkYC6tGlpItBT6RzUK9Itniu7OQ="; }; - cargoHash = "sha256-uKhgi3u7YSKLqG2ROCWs6+p206xghnsQ7nIZw5OtkY4="; + cargoHash = "sha256-7MSe2YpVV68nXXeMPy+AGO0hYPpsOaR2S82c/EBczwQ="; postInstall = "install -Dm444 desktop/vault-tasks.desktop -t $out/share/applications"; diff --git a/pkgs/by-name/wa/wastebin/package.nix b/pkgs/by-name/wa/wastebin/package.nix index 82bf03f601f3..3a292eb208b7 100644 --- a/pkgs/by-name/wa/wastebin/package.nix +++ b/pkgs/by-name/wa/wastebin/package.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "wastebin"; - version = "2.5.0"; + version = "2.6.0"; src = fetchFromGitHub { owner = "matze"; repo = "wastebin"; rev = version; - hash = "sha256-abqVjjV1RK9F8xo23Ir8jqoo9jqSe/Kra1IJNHadqXs="; + hash = "sha256-iiGg5En7p+7142qURsdOj7nYwS/ushbxfa5QlT/pHDc="; }; - cargoHash = "sha256-D/a+aEK4Usa4HFOKCxCIy9bHabH5tmBdFRRRQ7aKs/I="; + cargoHash = "sha256-yfjAtORymdSn0pLwnGPvjLH3/R4juY08+NanTdm4420="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/wh/whisper-ctranslate2/package.nix b/pkgs/by-name/wh/whisper-ctranslate2/package.nix index ade3f8c86cb8..b1ab24638246 100644 --- a/pkgs/by-name/wh/whisper-ctranslate2/package.nix +++ b/pkgs/by-name/wh/whisper-ctranslate2/package.nix @@ -7,7 +7,7 @@ }: let pname = "whisper-ctranslate2"; - version = "0.5.1"; + version = "0.5.2"; in python3Packages.buildPythonApplication { inherit pname version; @@ -17,7 +17,7 @@ python3Packages.buildPythonApplication { owner = "Softcatala"; repo = "whisper-ctranslate2"; tag = version; - hash = "sha256-y1xCycWUxrLwmnk6tlyag0uN0oo6DRQFeIIBw555VjY="; + hash = "sha256-53sKuaZJcH/i2C4oeKcvxRs3OmkvR3USw6nnPh+i+Eo="; }; build-system = [ python3Packages.setuptools ]; diff --git a/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix b/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix index ac0ad40d8455..ba36581173b1 100644 --- a/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchFromGitHub, - fetchpatch, nix-update-script, pkg-config, meson, @@ -22,30 +21,15 @@ stdenv.mkDerivation rec { pname = "elementary-terminal"; - version = "6.3.0"; + version = "6.3.1"; src = fetchFromGitHub { owner = "elementary"; repo = "terminal"; rev = version; - sha256 = "sha256-Pr2Jm37vuw1DOx63BXKT3oPK6C7i5v9ObYFNR6Hvhns="; + sha256 = "sha256-W06J+QqouoZBWGm/w5aBuL009IO4odmSKHoeJkXnVpA="; }; - patches = [ - # Fix clear and reset actions when ongoing foreground process - # https://github.com/elementary/terminal/pull/823 - (fetchpatch { - url = "https://github.com/elementary/terminal/commit/3c84bcb98ecdadb4d5e0c7a8f52fb5238f5e92f0.patch"; - hash = "sha256-XViJR+vj+qy2A1nZa3Pdo8uY24tS4ZqZKjTAyPN9sPA="; - }) - # Only reset/clear screen when is pressed - # https://github.com/elementary/terminal/pull/827 - (fetchpatch { - url = "https://github.com/elementary/terminal/commit/91b93d883c2b8a8549d9743292d6a564e3b2d3cb.patch"; - hash = "sha256-3opiRhQLJCYFDwDjEbm0CZ9y8CF/6biU+cJk1Ideyks="; - }) - ]; - nativeBuildInputs = [ desktop-file-utils meson diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix index 4027cc03da1b..c5bb4b556432 100644 --- a/pkgs/development/interpreters/python/cpython/default.nix +++ b/pkgs/development/interpreters/python/cpython/default.nix @@ -434,6 +434,8 @@ in with passthru; stdenv.mkDerivation (finalAttrs: { '' + optionalString (stdenv.hostPlatform.isDarwin && x11Support && pythonAtLeast "3.11") '' export TCLTK_LIBS="-L${tcl}/lib -L${tk}/lib -l${tcl.libPrefix} -l${tk.libPrefix}" export TCLTK_CFLAGS="-I${tcl}/include -I${tk}/include" + '' + optionalString stdenv.hostPlatform.isWindows '' + export NIX_CFLAGS_COMPILE+=" -Wno-error=incompatible-pointer-types" '' + optionalString stdenv.hostPlatform.isMusl '' export NIX_CFLAGS_COMPILE+=" -DTHREAD_STACK_SIZE=0x100000" '' + @@ -665,5 +667,7 @@ in with passthru; stdenv.mkDerivation (finalAttrs: { platforms = platforms.linux ++ platforms.darwin ++ platforms.windows ++ platforms.freebsd; mainProgram = executable; maintainers = lib.teams.python.members; + # mingw patches only apply to Python 3.11 currently + broken = (lib.versions.minor version) != "11" && stdenv.hostPlatform.isWindows; }; }) diff --git a/pkgs/development/libraries/astal/buildAstalModule.nix b/pkgs/development/libraries/astal/buildAstalModule.nix index a29c5905db3b..dd6929161031 100644 --- a/pkgs/development/libraries/astal/buildAstalModule.nix +++ b/pkgs/development/libraries/astal/buildAstalModule.nix @@ -39,7 +39,7 @@ let cleanArgs args // { pname = "astal-${name}"; - version = "0-unstable-2025-01-12"; + version = "0-unstable-2025-01-13"; __structuredAttrs = true; strictDeps = true; @@ -47,8 +47,8 @@ let src = fetchFromGitHub { owner = "Aylur"; repo = "astal"; - rev = "6fd7ae514af36ff9baf1209a2eeebd3a26cf94ce"; - hash = "sha256-IjLW96gjrCAjx/QZOvYyNpoeb53bkOJ6dDQt8ubaMMY="; + rev = "cac0fc63bfe098b26753db8262f5d95ac42b281b"; + hash = "sha256-kNtKWbQ+gMzmAF7KNSZ4Hb8/2cfSNoURCyRSB0nx2I4="; }; sourceRoot = "${finalAttrs.src.name}/${sourceRoot}"; diff --git a/pkgs/development/python-modules/alexapy/default.nix b/pkgs/development/python-modules/alexapy/default.nix index 7ff595cb8b33..dfe18239ee88 100644 --- a/pkgs/development/python-modules/alexapy/default.nix +++ b/pkgs/development/python-modules/alexapy/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "alexapy"; - version = "1.28.0"; + version = "1.29.5"; pyproject = true; disabled = pythonOlder "3.10"; @@ -27,17 +27,17 @@ buildPythonPackage rec { src = fetchFromGitLab { owner = "keatontaylor"; repo = "alexapy"; - rev = "refs/tags/v${version}"; - hash = "sha256-sRTK3qaIiYxz9Z+LT2pFjqKXBHyr3EkSD4dtc+KXFQw="; + tag = "v${version}"; + hash = "sha256-46dRjVm3d1/bMlJCO6Dy/+cOYsPNruUADshrdrObw5Q="; }; pythonRelaxDeps = [ "aiofiles" ]; - nativeBuildInputs = [ + build-system = [ poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ aiofiles aiohttp authcaptureproxy @@ -56,11 +56,11 @@ buildPythonPackage rec { # Module has no tests (only a websocket test which seems unrelated to the module) doCheck = false; - meta = with lib; { + meta = { description = "Python Package for controlling Alexa devices (echo dot, etc) programmatically"; homepage = "https://gitlab.com/keatontaylor/alexapy"; changelog = "https://gitlab.com/keatontaylor/alexapy/-/blob/v${version}/CHANGELOG.md"; - license = licenses.asl20; - maintainers = with maintainers; [ fab ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ fab ]; }; } diff --git a/pkgs/development/python-modules/amshan/default.nix b/pkgs/development/python-modules/amshan/default.nix new file mode 100644 index 000000000000..82eaa056d876 --- /dev/null +++ b/pkgs/development/python-modules/amshan/default.nix @@ -0,0 +1,50 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + construct, + paho-mqtt, + pyserial-asyncio, + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "amshan"; + version = "2.1.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "toreamun"; + repo = "amshan"; + rev = version; + hash = "sha256-aw0wTqb2s84STVUN55h6L926pXwaMSppBCfXZVb87w0="; + }; + + build-system = [ + setuptools + ]; + + dependencies = [ + construct + paho-mqtt + pyserial-asyncio + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "han" ]; + + meta = { + description = "Decode smart power meter data stream of Cosem HDLC frames used by MBUS"; + longDescription = '' + The package has special support of formats for Aidon, Kaifa and Kamstrup + meters used in Norway and Sweden (AMS HAN). + ''; + homepage = "https://github.com/toreamun/amshan"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ bjornfor ]; + }; +} diff --git a/pkgs/development/python-modules/casbin/default.nix b/pkgs/development/python-modules/casbin/default.nix index 778f9b9effd7..0f8db87f0ef5 100644 --- a/pkgs/development/python-modules/casbin/default.nix +++ b/pkgs/development/python-modules/casbin/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "casbin"; - version = "1.37.0"; + version = "1.38.0"; pyproject = true; disabled = pythonOlder "3.6"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "casbin"; repo = "pycasbin"; tag = "v${version}"; - hash = "sha256-gFh8+fcunDG4kT+cJpmuVGsgWQzntbbm6AQmvS/iCo0="; + hash = "sha256-HrPf56J9tKQRzdXIGYTrbyvGOAXGUovm3VaHndBw+gY="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/dvc/default.nix b/pkgs/development/python-modules/dvc/default.nix index a226106c23dc..f45905882b50 100644 --- a/pkgs/development/python-modules/dvc/default.nix +++ b/pkgs/development/python-modules/dvc/default.nix @@ -57,7 +57,7 @@ buildPythonPackage rec { pname = "dvc"; - version = "3.58.0"; + version = "3.59.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -66,7 +66,7 @@ buildPythonPackage rec { owner = "iterative"; repo = "dvc"; tag = version; - hash = "sha256-ljrQV+Ca0EooCdoEU1B2mnN62bpKV0ZGnX8W1yZWyjM="; + hash = "sha256-kjaYn0DJAKETtVDcBs43OTif0TwKsAaKs4jnLODNQz8="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/facedancer/default.nix b/pkgs/development/python-modules/facedancer/default.nix index c3e4afff3c4b..e341d09aff69 100644 --- a/pkgs/development/python-modules/facedancer/default.nix +++ b/pkgs/development/python-modules/facedancer/default.nix @@ -12,15 +12,15 @@ buildPythonPackage rec { pname = "facedancer"; - version = "3.0.6"; + version = "3.1.0"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.10"; src = fetchFromGitHub { owner = "greatscottgadgets"; repo = "facedancer"; tag = version; - hash = "sha256-okpxZzVwVgpFuZIsmJ8+1UwwxYFAPFpCkVnIxJjddwE="; + hash = "sha256-u1fvrfjk79R16MUuYx8m63EkgHJiMmAksaduk4lVnTw="; }; postPatch = '' diff --git a/pkgs/development/python-modules/flask-limiter/default.nix b/pkgs/development/python-modules/flask-limiter/default.nix index 6f95eab01b2e..4365cd89bd39 100644 --- a/pkgs/development/python-modules/flask-limiter/default.nix +++ b/pkgs/development/python-modules/flask-limiter/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "flask-limiter"; - version = "3.9.2"; + version = "3.10.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "alisaifee"; repo = "flask-limiter"; tag = version; - hash = "sha256-JkO5DNGVTnqbMfkadQGdyJEsfDfMDZ+nfjEjRpoMOfk="; + hash = "sha256-spE0gVrPlbz0JDXGznJ6RN2uNAsQn7tbHxWGU98221M="; }; postPatch = '' diff --git a/pkgs/development/python-modules/fuse-python/default.nix b/pkgs/development/python-modules/fuse-python/default.nix index 35eab496d91b..092ff612b318 100644 --- a/pkgs/development/python-modules/fuse-python/default.nix +++ b/pkgs/development/python-modules/fuse-python/default.nix @@ -4,22 +4,32 @@ buildPythonPackage, fetchPypi, pkg-config, + setuptools, fuse, }: buildPythonPackage rec { pname = "fuse-python"; - version = "1.0.7"; - format = "setuptools"; + version = "1.0.9"; + pyproject = true; src = fetchPypi { - inherit pname version; - hash = "sha256-MhiAY2UkCM1HKuu2+S0135LIu0IAk3H4yJJ7s35r3Rs="; + inherit version; + pname = "fuse_python"; + hash = "sha256-ntWVd8NqshjXAKooOfAh8SwlKzVxhgV1crmOGbwqhYk="; }; - buildInputs = [ fuse ]; + postPatch = '' + substituteInPlace setup.py \ + --replace-fail 'pkg-config' "${stdenv.cc.targetPrefix}pkg-config" + ''; + nativeBuildInputs = [ pkg-config ]; + build-system = [ setuptools ]; + + buildInputs = [ fuse ]; + # no tests implemented doCheck = false; diff --git a/pkgs/development/python-modules/kestra/default.nix b/pkgs/development/python-modules/kestra/default.nix new file mode 100644 index 000000000000..474b7fa0024f --- /dev/null +++ b/pkgs/development/python-modules/kestra/default.nix @@ -0,0 +1,53 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + requests, + pytestCheckHook, + requests-mock, +}: +buildPythonPackage rec { + pname = "kestra"; + version = "0.20.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "kestra-io"; + repo = "libs"; + rev = "v${version}"; + hash = "sha256-Ck0eM3YZRRoORN77e46J9CG5Uj6Y7fNdVWAErT7LbpA="; + }; + + sourceRoot = "${src.name}/python"; + + build-system = [ + setuptools + ]; + + preBuild = '' + # Required for building the library (https://github.com/kestra-io/libs/blob/v0.20.0/python/setup.py#L20) + # The path resolve to CWD, so README.md isn't picked in the parent folder + ln -s ../README.md README.md + ''; + + dependencies = [ + requests + ]; + + pythonImportsCheck = [ + "kestra" + ]; + + nativeCheckInputs = [ + pytestCheckHook + requests-mock + ]; + + meta = { + description = "Infinitely scalable orchestration and scheduling platform, creating, running, scheduling, and monitoring millions of complex pipelines"; + homepage = "https://github.com/kestra-io/libs"; + license = lib.licenses.apsl20; + maintainers = with lib.maintainers; [ DataHearth ]; + }; +} diff --git a/pkgs/development/python-modules/pbs-installer/default.nix b/pkgs/development/python-modules/pbs-installer/default.nix index 2458d1f9206c..f6de3a76e2d1 100644 --- a/pkgs/development/python-modules/pbs-installer/default.nix +++ b/pkgs/development/python-modules/pbs-installer/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pbs-installer"; - version = "2024.10.16"; + version = "2025.01.06"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "frostming"; repo = "pbs-installer"; tag = version; - hash = "sha256-rMj0zKqfYvOvKZVNoZxOULaXyzjiMfBN49M+Z3+SAaM="; + hash = "sha256-PWKzIRVpiSJK/aS3fwqnXnyT6lpXjtGxdm4ZKinwkBI="; }; build-system = [ pdm-backend ]; diff --git a/pkgs/development/python-modules/pyexploitdb/default.nix b/pkgs/development/python-modules/pyexploitdb/default.nix index ebe307a48b31..843774d365be 100644 --- a/pkgs/development/python-modules/pyexploitdb/default.nix +++ b/pkgs/development/python-modules/pyexploitdb/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pyexploitdb"; - version = "0.2.62"; + version = "0.2.63"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "pyExploitDb"; inherit version; - hash = "sha256-lXmhRMyb7yB9qq/CmR/pnY0ttpiINhhPHPZfcfNjqpg="; + hash = "sha256-PJfbs1qSiumTiHOoffZqag+jVpNbvTOeTpz/peRUlq0="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pyicu/default.nix b/pkgs/development/python-modules/pyicu/default.nix index 8dd0fb09c740..a258462bf77a 100644 --- a/pkgs/development/python-modules/pyicu/default.nix +++ b/pkgs/development/python-modules/pyicu/default.nix @@ -1,4 +1,5 @@ { + stdenv, lib, buildPythonPackage, fetchPypi, @@ -18,6 +19,12 @@ buildPythonPackage rec { hash = "sha256-1JGQheqgfaErrejuch57v3reAVHKD4KUaibI9LmM3Os="; }; + patches = lib.optionals stdenv.hostPlatform.isDarwin [ + # fails testExemplarSet2 test due to sjd locale not having an auxiliary + # esType. icuReal doesn't have an sjd locale + ./skip-sjd-local.diff + ]; + nativeBuildInputs = [ icu ]; # for icu-config, but should be replaced with pkg-config buildInputs = [ icu ]; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/pyicu/skip-sjd-local.diff b/pkgs/development/python-modules/pyicu/skip-sjd-local.diff new file mode 100644 index 000000000000..995b0d5f57dc --- /dev/null +++ b/pkgs/development/python-modules/pyicu/skip-sjd-local.diff @@ -0,0 +1,13 @@ +diff --git a/test/test_LocaleData.py b/test/test_LocaleData.py +index 76410e7..7db6f13 100644 +--- a/test/test_LocaleData.py ++++ b/test/test_LocaleData.py +@@ -126,6 +126,7 @@ class TestLocaleData(TestCase): + ld = LocaleData(locale) + scriptCodes = Script.getCode(locale) + exemplarSets = [] ++ if locale == 'sjd': continue + for k in range(2): # for casing option in (normal, uncased) + # it seems USET_CASE_INSENSITIVE = 2 + option = 0 if k == 0 else 2 + diff --git a/pkgs/development/python-modules/pylibjpeg-libjpeg/default.nix b/pkgs/development/python-modules/pylibjpeg-libjpeg/default.nix index f9e60844a84f..4f54cca42a7b 100644 --- a/pkgs/development/python-modules/pylibjpeg-libjpeg/default.nix +++ b/pkgs/development/python-modules/pylibjpeg-libjpeg/default.nix @@ -8,47 +8,62 @@ poetry-core, setuptools, numpy, + pydicom, + pylibjpeg-data, + pylibjpeg, }: -buildPythonPackage rec { - pname = "pylibjpeg-libjpeg"; - version = "2.3.0"; - pyproject = true; +let + self = buildPythonPackage { + pname = "pylibjpeg-libjpeg"; + version = "2.3.0"; + pyproject = true; - disabled = pythonOlder "3.9"; + disabled = pythonOlder "3.9"; - src = fetchFromGitHub { - owner = "pydicom"; - repo = pname; - tag = "v${version}"; - hash = "sha256-xqSA1cutTsH9k4l9CW96n/CURzkAyDi3PZylZeedVjA="; - fetchSubmodules = true; + src = fetchFromGitHub { + owner = "pydicom"; + repo = "pylibjpeg-libjpeg"; + tag = "v${self.version}"; + hash = "sha256-xqSA1cutTsH9k4l9CW96n/CURzkAyDi3PZylZeedVjA="; + fetchSubmodules = true; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail 'poetry-core >=1.8,<2' 'poetry-core' + ''; + + build-system = [ + cython + poetry-core + setuptools + ]; + + dependencies = [ numpy ]; + + nativeCheckInputs = [ + pydicom + pylibjpeg-data + pylibjpeg + pytestCheckHook + ]; + + doCheck = false; # circular test dependency with `pylibjpeg` and `pydicom` + + passthru.tests.check = self.overridePythonAttrs (_: { + doCheck = true; + }); + + pythonImportsCheck = [ "libjpeg" ]; + + meta = { + description = "JPEG, JPEG-LS and JPEG XT plugin for pylibjpeg"; + homepage = "https://github.com/pydicom/pylibjpeg-libjpeg"; + changelog = "https://github.com/pydicom/pylibjpeg-libjpeg/releases/tag/v${self.version}"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ bcdarwin ]; + }; }; - - postPatch = '' - substituteInPlace pyproject.toml \ - --replace-fail 'poetry-core >=1.8,<2' 'poetry-core' - ''; - - build-system = [ - cython - poetry-core - setuptools - ]; - - dependencies = [ numpy ]; - - nativeCheckInputs = [ pytestCheckHook ]; - - doCheck = false; # tests try to import 'libjpeg.data', which errors - - pythonImportsCheck = [ "libjpeg" ]; - - meta = with lib; { - description = "JPEG, JPEG-LS and JPEG XT plugin for pylibjpeg"; - homepage = "https://github.com/pydicom/pylibjpeg-libjpeg"; - changelog = "https://github.com/pydicom/pylibjpeg-libjpeg/releases/tag/v${version}"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ bcdarwin ]; - }; -} +in +self diff --git a/pkgs/development/python-modules/pypalazzetti/default.nix b/pkgs/development/python-modules/pypalazzetti/default.nix index ad588f95e455..afe57f70bb4e 100644 --- a/pkgs/development/python-modules/pypalazzetti/default.nix +++ b/pkgs/development/python-modules/pypalazzetti/default.nix @@ -7,11 +7,12 @@ pytestCheckHook, pythonOlder, setuptools, + syrupy, }: buildPythonPackage rec { pname = "pypalazzetti"; - version = "0.1.16"; + version = "0.1.19"; pyproject = true; disabled = pythonOlder "3.10"; @@ -20,7 +21,7 @@ buildPythonPackage rec { owner = "dotvav"; repo = "py-palazzetti-api"; tag = "v${version}"; - hash = "sha256-JYTrZ1Ty9y+yvoeVXus1qqNFnB0NmczCz6Kq2PjpiLk="; + hash = "sha256-Bmx4CU6bx5FVR7xdDxrtVSXunthi2s2Esj1FtSjh61U="; }; build-system = [ setuptools ]; @@ -30,6 +31,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytest-asyncio pytestCheckHook + syrupy ]; pythonImportsCheck = [ "pypalazzetti" ]; diff --git a/pkgs/development/python-modules/python-hpilo/default.nix b/pkgs/development/python-modules/python-hpilo/default.nix index 6aeeab370c1b..5ac44afe985b 100644 --- a/pkgs/development/python-modules/python-hpilo/default.nix +++ b/pkgs/development/python-modules/python-hpilo/default.nix @@ -2,32 +2,37 @@ lib, buildPythonPackage, fetchFromGitHub, + setuptools, }: buildPythonPackage rec { pname = "python-hpilo"; version = "4.4.3"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "seveas"; - repo = pname; - rev = version; - sha256 = "1dk5xswydw7nmn9hlna1xca1mzcas9qv2kmid5yx8kvk3hjqci9v"; + repo = "python-hpilo"; + tag = version; + hash = "sha256-O0WGJRxzT9R9abFOsXHSiv0aFOtBWQqTrfbw5rnuZbY="; }; + build-system = [ setuptools ]; + # Most tests requires an actual iLO to run doCheck = false; + pythonImportsCheck = [ "hpilo" ]; meta = with lib; { description = "Python module to access the HP iLO XML interface"; - mainProgram = "hpilo_cli"; homepage = "https://seveas.github.io/python-hpilo/"; + changelog = "https://github.com/seveas/python-hpilo/blob/${version}/CHANGES"; license = with licenses; [ asl20 gpl3Plus ]; maintainers = with maintainers; [ fab ]; + mainProgram = "hpilo_cli"; }; } diff --git a/pkgs/development/python-modules/switchbot-api/default.nix b/pkgs/development/python-modules/switchbot-api/default.nix index c628a5b8094c..85f302b3ffeb 100644 --- a/pkgs/development/python-modules/switchbot-api/default.nix +++ b/pkgs/development/python-modules/switchbot-api/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "switchbot-api"; - version = "2.2.1"; + version = "2.3.1"; pyproject = true; disabled = pythonOlder "3.10"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "SeraphicCorp"; repo = "py-switchbot-api"; tag = "v${version}"; - hash = "sha256-jpm01wDVLgGr5SMaevxiYGfv8tVa1ibRtcHkEK3yb58="; + hash = "sha256-SVVFz+8LjPOJNjEREkKE4yyrDPE5Gf5qKY3ftsx3SyI="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix index 430baca08ccf..7f33059565d3 100644 --- a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix +++ b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "tencentcloud-sdk-python"; - version = "3.0.1300"; + version = "3.0.1301"; pyproject = true; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "TencentCloud"; repo = "tencentcloud-sdk-python"; tag = version; - hash = "sha256-pvs2vLceRtg4Ro+ZqGdTNXchezu/dO6xizoRZ4xYRZ8="; + hash = "sha256-FdLulpo58oj54R289dnI2gEQJCxQk8asSjpIBwKkjZI="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/tplink-omada-client/default.nix b/pkgs/development/python-modules/tplink-omada-client/default.nix index 7edc33b88e5b..16cecf66048b 100644 --- a/pkgs/development/python-modules/tplink-omada-client/default.nix +++ b/pkgs/development/python-modules/tplink-omada-client/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "tplink-omada-client"; - version = "1.4.3"; + version = "1.4.4"; pyproject = true; disabled = pythonOlder "3.9"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "tplink_omada_client"; inherit version; - hash = "sha256-REzjeZs2Ddhw2TLD4Vp75XT2iLaxxzDK/F3UmrC1deo="; + hash = "sha256-6MiPgseHrqgD+DGth5rJ03HK+0YfBpmDPXybzrTDeeA="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/ufo2ft/default.nix b/pkgs/development/python-modules/ufo2ft/default.nix index 06a0307ba731..324401136cbb 100644 --- a/pkgs/development/python-modules/ufo2ft/default.nix +++ b/pkgs/development/python-modules/ufo2ft/default.nix @@ -20,24 +20,16 @@ buildPythonPackage rec { pname = "ufo2ft"; - version = "3.3.0"; + version = "3.4.0"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-lw5mLcVw1NFT1c/AOcMyo2a8aGOyxFG+ZAU6Ggnssko="; + hash = "sha256-DPfbxyPI8dVwPxOBIy55C3XNvWZqQ1Zd6/L8liCdbyg="; }; - patches = [ - (fetchpatch2 { - # update syrupy snapshots - url = "https://github.com/googlefonts/ufo2ft/commit/7a3edb2e4202cf388e3ffe31b5b3783dbb392db2.patch"; - hash = "sha256-YEgUgrtgH3PBZlt+xoJme+oPRuDMwq7M/4cJ3JbeuyU="; - }) - ]; - build-system = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/versionfinder/default.nix b/pkgs/development/python-modules/versionfinder/default.nix index 2672fc20f99e..647b339f4e90 100644 --- a/pkgs/development/python-modules/versionfinder/default.nix +++ b/pkgs/development/python-modules/versionfinder/default.nix @@ -8,23 +8,26 @@ pytestCheckHook, pythonOlder, requests, + setuptools, }: buildPythonPackage rec { pname = "versionfinder"; version = "1.1.1"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "jantman"; - repo = pname; + repo = "versionfinder"; rev = version; - sha256 = "16mvjwyhmw39l8by69dgr9b9jnl7yav36523lkh7w7pwd529pbb9"; + hash = "sha256-aa2bRGn8Hn7gpEMUM7byh1qZVsqvJeMXomnwCj2Xu5o="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ gitpython backoff ]; diff --git a/pkgs/development/python-modules/yahooweather/default.nix b/pkgs/development/python-modules/yahooweather/default.nix deleted file mode 100644 index 1b183d0e8aca..000000000000 --- a/pkgs/development/python-modules/yahooweather/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchPypi, - isPy3k, -}: - -buildPythonPackage rec { - pname = "yahooweather"; - version = "0.10"; - format = "setuptools"; - - disabled = !isPy3k; - - src = fetchPypi { - inherit pname version; - sha256 = "0bsxmngkpzvqm50i2cnxjzhpbdhb8s10ly8h5q08696cjihqdkpa"; - }; - - # Tests require network access - doCheck = false; - - meta = with lib; { - description = "Provide an interface to the Yahoo! Weather RSS feed"; - homepage = "https://github.com/pvizeli/yahooweather"; - license = licenses.bsd2; - maintainers = with maintainers; [ peterhoeg ]; - }; -} diff --git a/pkgs/development/tcl-modules/by-name/le/lexec/package.nix b/pkgs/development/tcl-modules/by-name/le/lexec/package.nix new file mode 100644 index 000000000000..ca1e40aeeeec --- /dev/null +++ b/pkgs/development/tcl-modules/by-name/le/lexec/package.nix @@ -0,0 +1,28 @@ +{ + lib, + mkTclDerivation, + fetchzip, + autoreconfHook, +}: + +mkTclDerivation rec { + pname = "lexec"; + version = "0-unstable-2020-03-11"; + + src = fetchzip { + url = "https://chiselapp.com/user/pooryorick/repository/lexec/tarball/3880618cfe/unnamed-3880618cfe.tar.gz"; + hash = "sha256-MHsVcCPjdNn1ca6GFP4jWlDk7zioD0VSEh1CImud4fc="; + }; + + nativeBuildInputs = [ + autoreconfHook + ]; + + meta = { + description = "Implementation of Tcl TIP 424 \"Improving [exec]\" as a separate package"; + homepage = "https://chiselapp.com/user/pooryorick/repository/lexec/index"; + license = lib.licenses.tcltk; + maintainers = with lib.maintainers; [ fgaz ]; + platforms = lib.platforms.all; + }; +} diff --git a/pkgs/development/tools/misc/blackfire/default.nix b/pkgs/development/tools/misc/blackfire/default.nix index bfb9ecd204e0..fb45464155ce 100644 --- a/pkgs/development/tools/misc/blackfire/default.nix +++ b/pkgs/development/tools/misc/blackfire/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { pname = "blackfire"; - version = "2.28.21"; + version = "2.28.22"; src = passthru.sources.${stdenv.hostPlatform.system} @@ -60,23 +60,23 @@ stdenv.mkDerivation rec { sources = { "x86_64-linux" = fetchurl { url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_amd64.deb"; - sha256 = "PT2qUKRoIIFu2FGHAHfhufmm8s+rc5TZBs1xr0qVSPg="; + sha256 = "vZemxC5Vg916imzecW2Wa88nBO9NH8zMY0RFfRjKoF4="; }; "i686-linux" = fetchurl { url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_i386.deb"; - sha256 = "S0cpqoJbwHSfH46MxoWh0iitNmBQ+yi2nWcGwXdcZUk="; + sha256 = "hTqeL5xLyd6QWk4aFH3k5/GBc4fsc4EHZ5PMpT9j24g="; }; "aarch64-linux" = fetchurl { url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_arm64.deb"; - sha256 = "ZJIw8cB/GIAeyDgPmJVwwkMdQsRqgIyBjGDZZeEu/ro="; + sha256 = "ARYJY5xDDzhatUWmyyjmewRV47hmNYgC5xlOdHBV0Po="; }; "aarch64-darwin" = fetchurl { url = "https://packages.blackfire.io/blackfire/${version}/blackfire-darwin_arm64.pkg.tar.gz"; - sha256 = "usvKbAp7RgiPGQOvrzCeHNYHddj3VCGwg1oYFVTMVN4="; + sha256 = "gqA40eKuDneFKAC1oCby9aE6iLGwO2VNjazkf0U+uzU="; }; "x86_64-darwin" = fetchurl { url = "https://packages.blackfire.io/blackfire/${version}/blackfire-darwin_amd64.pkg.tar.gz"; - sha256 = "fKad8UipQIJYRoFQD1wWn8N86TpEGjR9G+qdI4Syiig="; + sha256 = "hgtQJtu3beRrcDuR8reX+82D/5n8XiRBOSmNtykf1RE="; }; }; diff --git a/pkgs/development/tools/misc/patchelf/unstable.nix b/pkgs/development/tools/misc/patchelf/unstable.nix index 71b79121614d..10c2e5e2edba 100644 --- a/pkgs/development/tools/misc/patchelf/unstable.nix +++ b/pkgs/development/tools/misc/patchelf/unstable.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation { pname = "patchelf"; - version = "0.18.0-unstable-2024-11-18"; + version = "0.18.0-unstable-2025-01-07"; src = fetchFromGitHub { owner = "NixOS"; repo = "patchelf"; - rev = "769337c227799aa60911562b6940530f4a86eb3c"; - sha256 = "sha256-eOHQ7pD8OfSLIIFfF6daCnntzHKqpraAGFfFqSlPtbY="; + rev = "43b75fbc9ffbc1190fee7c8693ad74cb8286cfd4"; + sha256 = "sha256-rqFH9xUu36Hky763cQ9D1V7iuWteItAFDM2jIQGP5Us="; }; # Drop test that fails on musl (?) diff --git a/pkgs/servers/authelia/sources.nix b/pkgs/servers/authelia/sources.nix index dabe13b12621..e660aa76d925 100644 --- a/pkgs/servers/authelia/sources.nix +++ b/pkgs/servers/authelia/sources.nix @@ -1,14 +1,14 @@ { fetchFromGitHub }: rec { pname = "authelia"; - version = "4.38.17"; + version = "4.38.18"; src = fetchFromGitHub { owner = "authelia"; repo = "authelia"; rev = "v${version}"; - hash = "sha256-JymfNe7Xoa2Hh219GtBjlyaGK+Jn8XWqrTnkY8377Ro="; + hash = "sha256-gJEKjplESS6wNN2cM/JYRAHm7200tMlBKs1lZi0ShiE="; }; - vendorHash = "sha256-q38jSX7jZO3Y4gn7dxq4NYLEfCUWVcUwmNfqT52AU/M="; - pnpmDepsHash = "sha256-jih+mFZKKOBUH0f2zzKN49VV6iUbMhVImFDWFYaZWWI="; + vendorHash = "sha256-K5PunLkbcEuWL4IWbXYqgP3H5S/d5IHrWqCin//qJxw="; + pnpmDepsHash = "sha256-jkghQGWLvmL1Vxwl7v4T/H1UUN8DeaCgbc8lnUcS4nA="; } diff --git a/pkgs/servers/home-assistant/custom-components/amshan/package.nix b/pkgs/servers/home-assistant/custom-components/amshan/package.nix new file mode 100644 index 000000000000..60e55f3edad7 --- /dev/null +++ b/pkgs/servers/home-assistant/custom-components/amshan/package.nix @@ -0,0 +1,34 @@ +{ + lib, + fetchFromGitHub, + buildHomeAssistantComponent, + amshan, +}: + +buildHomeAssistantComponent rec { + owner = "toreamun"; + domain = "amshan"; + version = "2024.12.0"; + + src = fetchFromGitHub { + owner = "toreamun"; + repo = "amshan-homeassistant"; + tag = version; + hash = "sha256-L7TGdUjDvIRP9dHIkng9GYwilmRzhGbUK6ivx8PVtQ4="; + }; + + dependencies = [ + amshan + ]; + + meta = { + description = "Home Assistant integration for electricity meters (AMS/HAN/P1)"; + longDescription = '' + The integration supports both streaming (serial port / TCP/IP) and MQTT + (Tibber Pulse, energyintelligence.se etc.). + ''; + homepage = "https://github.com/toreamun/amshan-homeassistant"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ bjornfor ]; + }; +} diff --git a/pkgs/servers/tautulli/default.nix b/pkgs/servers/tautulli/default.nix index af9c015bf94a..09ff1cfdeeea 100644 --- a/pkgs/servers/tautulli/default.nix +++ b/pkgs/servers/tautulli/default.nix @@ -9,7 +9,7 @@ buildPythonApplication rec { pname = "Tautulli"; - version = "2.15.0"; + version = "2.15.1"; format = "other"; pythonPath = [ setuptools ]; @@ -22,7 +22,7 @@ buildPythonApplication rec { owner = "Tautulli"; repo = pname; tag = "v${version}"; - sha256 = "sha256-QhJc4Jwxlp3yB0jWa7sRDnIOWLW8CQUupnzbUscJH+c="; + sha256 = "sha256-c+xGgjmn2HE+sl8Vbw9Neztm8g6s9eF/QOVXRtOZWgI="; }; installPhase = '' diff --git a/pkgs/tools/backup/awsbck/default.nix b/pkgs/tools/backup/awsbck/default.nix index 097143e54421..361c2fea583f 100644 --- a/pkgs/tools/backup/awsbck/default.nix +++ b/pkgs/tools/backup/awsbck/default.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "awsbck"; - version = "0.3.9"; + version = "0.3.10"; src = fetchFromGitHub { owner = "beeb"; repo = "awsbck"; rev = "v${version}"; - hash = "sha256-KHbAmx2CsRqatGt5zTvqZSq8fwcClRZkeMHucLAr8bY="; + hash = "sha256-6AJTNJ/vuRAMnkuOoBVmEAlJy18OZDWVr4OzFv9/oag="; }; - cargoHash = "sha256-dMXaIFc0e6PMYiQrokQoUc1xAVCccE92WzM2fl7tOBQ="; + cargoHash = "sha256-kJLkI+01tZMYnvxr8Gnuq7ia9iGEYrlUNvHv9Fg7L6s="; # tests run in CI on the source repo doCheck = false; diff --git a/pkgs/tools/graphics/asymptote/default.nix b/pkgs/tools/graphics/asymptote/default.nix index 56e60edf77e8..5caee29bf15d 100644 --- a/pkgs/tools/graphics/asymptote/default.nix +++ b/pkgs/tools/graphics/asymptote/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: { }; # https://github.com/vectorgraphics/asymptote/issues/513 - postConfigure = '' + postConfigure = lib.optionalString (stdenv.hostPlatform.isLinux) '' substituteInPlace Makefile \ --replace-fail 'glew.o -lGLX' 'glew.o' ''; @@ -166,10 +166,7 @@ stdenv.mkDerivation (finalAttrs: { ''; # do not use bundled libgc.so - configureFlags = - [ "--enable-gc=system" ] - # TODO add open_memstream to enable XDR/V3D on Darwin (requires memstream or >=10.13 Apple SDK) - ++ lib.optional stdenv.hostPlatform.isDarwin "--enable-xdr=no"; + configureFlags = [ "--enable-gc=system" ]; env.NIX_CFLAGS_COMPILE = "-I${boehmgc.dev}/include/gc"; diff --git a/pkgs/tools/misc/starship/default.nix b/pkgs/tools/misc/starship/default.nix index 1075b868e20b..2de7e22032d7 100644 --- a/pkgs/tools/misc/starship/default.nix +++ b/pkgs/tools/misc/starship/default.nix @@ -14,13 +14,13 @@ rustPlatform.buildRustPackage rec { pname = "starship"; - version = "1.21.1"; + version = "1.22.1"; src = fetchFromGitHub { owner = "starship"; repo = "starship"; rev = "v${version}"; - hash = "sha256-Xn9qV26/ST+3VtVq6OJP823lIVIo0zEdno+nIUv8B9c="; + hash = "sha256-YoLi4wxBK9TFTtZRm+2N8HO5ZiC3V2GMqKFKKLHq++s="; }; nativeBuildInputs = [ @@ -57,7 +57,7 @@ rustPlatform.buildRustPackage rec { --zsh <($out/bin/starship completions zsh) ''; - cargoHash = "sha256-YbZCe2OcX/wq0OWvWK61nWvRT0O+CyW0QY0J7vv6QaM="; + cargoHash = "sha256-Z/dMKExGemssCMqRzQ58xXxXvbFR84WX3KI2pC20omI="; nativeCheckInputs = [ git ]; diff --git a/pkgs/tools/security/ronin/Gemfile.lock b/pkgs/tools/security/ronin/Gemfile.lock index 4157e5994130..6877829aa857 100644 --- a/pkgs/tools/security/ronin/Gemfile.lock +++ b/pkgs/tools/security/ronin/Gemfile.lock @@ -1,165 +1,288 @@ GEM remote: https://rubygems.org/ specs: - activemodel (7.1.0) - activesupport (= 7.1.0) - activerecord (7.1.0) - activemodel (= 7.1.0) - activesupport (= 7.1.0) + activemodel (7.2.2.1) + activesupport (= 7.2.2.1) + activerecord (7.2.2.1) + activemodel (= 7.2.2.1) + activesupport (= 7.2.2.1) timeout (>= 0.4.0) - activesupport (7.1.0) + activesupport (7.2.2.1) base64 + benchmark (>= 0.3) bigdecimal - concurrent-ruby (~> 1.0, >= 1.0.2) + concurrent-ruby (~> 1.0, >= 1.3.1) connection_pool (>= 2.2.5) drb i18n (>= 1.6, < 2) + logger (>= 1.4.2) minitest (>= 5.1) - mutex_m - tzinfo (~> 2.0) - addressable (2.8.5) - public_suffix (>= 2.0.2, < 6.0) - async (2.6.4) - console (~> 1.10) + securerandom (>= 0.3) + tzinfo (~> 2.0, >= 2.0.5) + addressable (2.8.7) + public_suffix (>= 2.0.2, < 7.0) + async (2.21.1) + console (~> 1.29) fiber-annotation - io-event (~> 1.1) - timers (~> 4.1) - async-io (1.36.0) + io-event (~> 1.6, >= 1.6.5) + async-dns (1.3.0) + async-io (~> 1.15) + async-http (0.86.0) + async (>= 2.10.2) + async-pool (~> 0.9) + io-endpoint (~> 0.14) + io-stream (~> 0.6) + metrics (~> 0.12) + protocol-http (~> 0.43) + protocol-http1 (>= 0.28.1) + protocol-http2 (~> 0.22) + traces (~> 0.10) + async-io (1.43.2) async - base64 (0.1.1) - bigdecimal (3.1.4) - chars (0.3.2) - combinatorics (0.4.4) - command_kit (0.4.0) - command_mapper (0.3.1) - concurrent-ruby (1.2.2) + async-pool (0.10.2) + async (>= 1.25) + traces + base64 (0.2.0) + benchmark (0.4.0) + bigdecimal (3.1.9) + chars (0.3.3) + combinatorics (0.5.0) + command_kit (0.6.0) + command_mapper (0.3.2) + concurrent-ruby (1.3.4) connection_pool (2.4.1) - console (1.23.2) + console (1.29.2) fiber-annotation - fiber-local - date (3.3.3) - domain_name (0.5.20190701) - unf (>= 0.0.5, < 1.0.0) - drb (2.1.1) - ruby2_keywords - fake_io (0.1.0) - fiber-annotation (0.2.0) - fiber-local (1.0.0) - hexdump (1.0.0) - http-cookie (1.0.5) - domain_name (~> 0.5) - i18n (1.14.1) + fiber-local (~> 1.1) + json + date (3.4.1) + drb (2.2.1) + dry-configurable (1.2.0) + dry-core (~> 1.0, < 2) + zeitwerk (~> 2.6) + dry-core (1.1.0) concurrent-ruby (~> 1.0) - io-console (0.6.0) - io-event (1.3.2) - irb (1.8.1) - rdoc - reline (>= 0.3.8) - mechanize (2.9.1) - addressable (~> 2.8) - domain_name (~> 0.5, >= 0.5.20190701) - http-cookie (~> 1.0, >= 1.0.3) - mime-types (~> 3.0) - net-http-digest_auth (~> 1.4, >= 1.4.1) - net-http-persistent (>= 2.5.2, < 5.0.dev) - nokogiri (~> 1.11, >= 1.11.2) - rubyntlm (~> 0.6, >= 0.6.3) + logger + zeitwerk (~> 2.6) + dry-inflector (1.2.0) + dry-initializer (3.2.0) + dry-logic (1.6.0) + bigdecimal + concurrent-ruby (~> 1.0) + dry-core (~> 1.1) + zeitwerk (~> 2.6) + dry-schema (1.13.4) + concurrent-ruby (~> 1.0) + dry-configurable (~> 1.0, >= 1.0.1) + dry-core (~> 1.0, < 2) + dry-initializer (~> 3.0) + dry-logic (>= 1.4, < 2) + dry-types (>= 1.7, < 2) + zeitwerk (~> 2.6) + dry-struct (1.6.0) + dry-core (~> 1.0, < 2) + dry-types (>= 1.7, < 2) + ice_nine (~> 0.11) + zeitwerk (~> 2.6) + dry-types (1.7.2) + bigdecimal (~> 3.0) + concurrent-ruby (~> 1.0) + dry-core (~> 1.0) + dry-inflector (~> 1.0) + dry-logic (~> 1.4) + zeitwerk (~> 2.6) + dry-validation (1.10.0) + concurrent-ruby (~> 1.0) + dry-core (~> 1.0, < 2) + dry-initializer (~> 3.0) + dry-schema (>= 1.12, < 2) + zeitwerk (~> 2.6) + fake_io (0.1.0) + ferrum (0.16) + addressable (~> 2.5) + base64 (~> 0.2) + concurrent-ruby (~> 1.1) webrick (~> 1.7) - webrobots (~> 0.1.2) - mime-types (3.5.1) - mime-types-data (~> 3.2015) - mime-types-data (3.2023.1003) - mini_portile2 (2.8.4) - minitest (5.20.0) - mustermann (3.0.0) + websocket-driver (~> 0.7) + fiber-annotation (0.2.0) + fiber-local (1.1.0) + fiber-storage + fiber-storage (1.0.0) + hexdump (1.0.1) + i18n (1.14.6) + concurrent-ruby (~> 1.0) + ice_nine (0.11.2) + io-console (0.8.0) + io-endpoint (0.14.0) + io-event (1.7.5) + io-stream (0.6.1) + irb (1.14.3) + rdoc (>= 4.0.0) + reline (>= 0.4.2) + json (2.9.1) + logger (1.6.4) + metrics (0.12.1) + mini_portile2 (2.8.8) + minitest (5.25.4) + multi_json (1.15.0) + mustermann (3.0.3) ruby2_keywords (~> 0.0.1) - mutex_m (0.1.2) - net-ftp (0.2.0) + net-ftp (0.3.8) net-protocol time - net-http-digest_auth (1.4.1) - net-http-persistent (4.0.2) - connection_pool (~> 2.2) - net-imap (0.4.1) + net-imap (0.5.5) date net-protocol net-pop (0.1.2) net-protocol - net-protocol (0.2.1) + net-protocol (0.2.2) timeout - net-smtp (0.4.0) + net-smtp (0.5.0) net-protocol - nokogiri (1.15.4) + nio4r (2.7.4) + nokogiri (1.18.1) mini_portile2 (~> 2.8.2) racc (~> 1.4) - nokogiri-diff (0.2.0) + nokogiri-diff (0.3.0) nokogiri (~> 1.5) - tdiff (~> 0.3, >= 0.3.2) - nokogiri-ext (0.1.0) + tdiff (~> 0.4) + nokogiri-ext (0.1.1) nokogiri (~> 1.0) - open_namespace (0.4.1) - psych (5.1.0) + open_namespace (0.4.2) + pagy (6.5.0) + protocol-hpack (1.5.1) + protocol-http (0.47.1) + protocol-http1 (0.28.1) + protocol-http (~> 0.22) + protocol-http2 (0.22.0) + protocol-hpack (~> 1.4) + protocol-http (~> 0.18) + psych (5.2.2) + date stringio - public_suffix (5.0.3) - racc (1.7.1) - rack (2.2.8) - rack-protection (3.1.0) + public_suffix (6.0.1) + puma (6.5.0) + nio4r (~> 2.0) + python-pickle (0.2.0) + racc (1.8.1) + rack (2.2.10) + rack-protection (3.2.0) + base64 (>= 0.1.0) rack (~> 2.2, >= 2.2.4) + rack-session (1.0.2) + rack (< 3) rack-user_agent (0.5.3) rack (>= 1.5) woothee (>= 1.0.0) - rdoc (6.5.0) + rdoc (6.10.0) psych (>= 4.0.0) - reline (0.3.9) + redis (5.3.0) + redis-client (>= 0.22.0) + redis-client (0.23.0) + connection_pool + redis-namespace (1.11.0) + redis (>= 4) + reline (0.6.0) io-console (~> 0.5) - ronin (2.0.5) + robots (0.10.1) + ronin (2.1.0) async-io (~> 1.0) open_namespace (~> 0.4) + ronin-app (~> 0.1) ronin-code-asm (~> 1.0) ronin-code-sql (~> 2.0) - ronin-core (~> 0.1, >= 0.1.2) - ronin-db (~> 0.1) - ronin-exploits (~> 1.0, >= 1.0.1) - ronin-fuzzer (~> 0.1) - ronin-payloads (~> 0.1, >= 0.1.1) - ronin-repos (~> 0.1) - ronin-support (~> 1.0, >= 1.0.3) - ronin-vulns (~> 0.1, >= 0.1.2) - ronin-web (~> 1.0, >= 1.0.1) + ronin-core (~> 0.2) + ronin-db (~> 0.2) + ronin-dns-proxy (~> 0.1) + ronin-exploits (~> 1.1) + ronin-fuzzer (~> 0.2) + ronin-listener (~> 0.1) + ronin-masscan (~> 0.1) + ronin-nmap (~> 0.1) + ronin-payloads (~> 0.2) + ronin-recon (~> 0.1) + ronin-repos (~> 0.2) + ronin-support (~> 1.1) + ronin-vulns (~> 0.2) + ronin-web (~> 2.0) + ronin-wordlists (~> 0.1) rouge (~> 3.0) - wordlist (~> 1.0, >= 1.0.3) + wordlist (~> 1.1) + ronin-app (0.1.0) + dry-schema (~> 1.0) + dry-struct (~> 1.0) + dry-validation (~> 1.0) + pagy (~> 6.2) + puma (~> 6.0) + redis (~> 5.0) + redis-namespace (~> 1.10) + ronin-core (~> 0.2) + ronin-db (~> 0.2) + ronin-db-activerecord (~> 0.2) + ronin-exploits (~> 1.1) + ronin-masscan (~> 0.1) + ronin-nmap (~> 0.1) + ronin-payloads (~> 0.2) + ronin-recon (~> 0.1) + ronin-repos (~> 0.2) + ronin-support (~> 1.1) + ronin-vulns (~> 0.2) + ronin-web-spider (~> 0.2) + sidekiq (~> 7.0) + sinatra (~> 3.0) + sinatra-contrib (~> 3.0) + sinatra-flash (~> 0.3) ronin-code-asm (1.0.0) ruby-yasm (~> 0.3) ronin-code-sql (2.1.0) ronin-support (~> 1.0) - ronin-core (0.1.2) - command_kit (~> 0.4) + ronin-core (0.2.0) + command_kit (~> 0.5) irb (~> 1.0) reline (~> 0.1) - ronin-db (0.1.2) - ronin-core (~> 0.1) - ronin-db-activerecord (~> 0.1) + ronin-db (0.2.0) + ronin-core (~> 0.2) + ronin-db-activerecord (~> 0.2) ronin-support (~> 1.0) sqlite3 (~> 1.0) - ronin-db-activerecord (0.1.2) + ronin-db-activerecord (0.2.0) activerecord (~> 7.0) uri-query_params (~> 0.6) - ronin-exploits (1.0.3) + ronin-dns-proxy (0.1.0) + async-dns (~> 1.0) + ronin-support (~> 1.0) + ronin-exploits (1.1.0) ronin-code-sql (~> 2.0) - ronin-core (~> 0.1) + ronin-core (~> 0.2) ronin-payloads (~> 0.1, >= 0.1.1) ronin-post_ex (~> 0.1) ronin-repos (~> 0.1) ronin-support (~> 1.0, >= 1.0.1) ronin-vulns (~> 0.1, >= 0.1.1) uri-query_params (~> 0.6) - ronin-fuzzer (0.1.0) + ronin-fuzzer (0.2.0) combinatorics (~> 0.4) - ronin-core (~> 0.1) + ronin-core (~> 0.2) ronin-support (~> 1.0) - ronin-payloads (0.1.4) + ronin-listener (0.1.0) + ronin-core (~> 0.2) + ronin-listener-dns (~> 0.1) + ronin-listener-http (~> 0.1) + ronin-listener-dns (0.1.0) + async-dns (~> 1.0) + ronin-listener-http (0.1.0) + async-http (~> 0.60) + ronin-masscan (0.1.0) + ronin-core (~> 0.2) + ronin-db (~> 0.2) + ruby-masscan (~> 0.1) + ronin-nmap (0.1.0) + ronin-core (~> 0.2) + ronin-db (~> 0.2) + ruby-nmap (~> 1.0) + ronin-payloads (0.2.0) ronin-code-asm (~> 1.0) - ronin-core (~> 0.1) + ronin-core (~> 0.2) ronin-post_ex (~> 0.1) ronin-repos (~> 0.1) ronin-support (~> 1.0) @@ -167,69 +290,123 @@ GEM fake_io (~> 0.1) hexdump (~> 1.0) ronin-core (~> 0.1) - ronin-repos (0.1.1) - ronin-core (~> 0.1) - ronin-support (1.0.3) + ronin-recon (0.1.0) + async-dns (~> 1.0) + async-http (~> 0.60) + async-io (~> 1.0) + ronin-core (~> 0.2) + ronin-db (~> 0.2) + ronin-masscan (~> 0.1) + ronin-nmap (~> 0.1) + ronin-repos (~> 0.1) + ronin-support (~> 1.1) + ronin-web-spider (~> 0.2) + thread-local (~> 1.0) + wordlist (~> 1.0, >= 1.0.3) + ronin-repos (0.2.0) + ronin-core (~> 0.2) + ronin-support (1.1.0) addressable (~> 2.0) chars (~> 0.3, >= 0.3.2) combinatorics (~> 0.4) hexdump (~> 1.0) uri-query_params (~> 0.8) - ronin-vulns (0.1.4) - ronin-core (~> 0.1) + ronin-support-web (0.1.0.1) + nokogiri (~> 1.4) + nokogiri-ext (~> 0.1) + ronin-support (~> 1.1) + websocket (~> 1.2) + ronin-vulns (0.2.0) + ronin-core (~> 0.2) + ronin-db (~> 0.2) ronin-support (~> 1.0, >= 1.0.1) - ronin-web (1.0.2) - mechanize (~> 2.0) + ronin-web (2.0.0) nokogiri (~> 1.4) nokogiri-diff (~> 0.2) - nokogiri-ext (~> 0.1) open_namespace (~> 0.4) - ronin-core (~> 0.1) - ronin-support (~> 1.0) + robots (~> 0.10) + ronin-core (~> 0.2) + ronin-support (~> 1.1) + ronin-support-web (~> 0.1) + ronin-vulns (~> 0.2) + ronin-web-browser (~> 0.1) ronin-web-server (~> 0.1, >= 0.1.1) - ronin-web-spider (~> 0.1) + ronin-web-session_cookie (~> 0.1) + ronin-web-spider (~> 0.2) ronin-web-user_agents (~> 0.1) + wordlist (~> 1.0, >= 1.0.1) + ronin-web-browser (0.1.0) + ferrum (~> 0.13) + ronin-support (~> 1.0) ronin-web-server (0.1.1) rack (~> 2.2) rack-user_agent (~> 0.5) ronin-support (~> 1.0) sinatra (~> 3.0) webrick (~> 1.0) - ronin-web-spider (0.1.0) + ronin-web-session_cookie (0.1.0) + python-pickle (~> 0.1) + rack-session (~> 1.0) + ronin-support (~> 1.1) + ronin-web-spider (0.2.0) ronin-support (~> 1.0) spidr (~> 0.7) ronin-web-user_agents (0.1.0) + ronin-wordlists (0.1.0) + ronin-core (~> 0.2) + wordlist (~> 1.1) rouge (3.30.0) - ruby-yasm (0.3.0) + ruby-masscan (0.3.0) + command_mapper (~> 0.1) + ruby-nmap (1.0.3) + command_mapper (~> 0.3) + nokogiri (~> 1.3) + ruby-yasm (0.3.1) command_mapper (~> 0.1) ruby2_keywords (0.0.5) - rubyntlm (0.6.3) - sinatra (3.1.0) + securerandom (0.4.1) + sidekiq (7.3.7) + connection_pool (>= 2.3.0) + logger + rack (>= 2.2.4) + redis-client (>= 0.22.2) + sinatra (3.2.0) mustermann (~> 3.0) rack (~> 2.2, >= 2.2.4) - rack-protection (= 3.1.0) + rack-protection (= 3.2.0) tilt (~> 2.0) - spidr (0.7.0) + sinatra-contrib (3.2.0) + multi_json (>= 0.0.2) + mustermann (~> 3.0) + rack-protection (= 3.2.0) + sinatra (= 3.2.0) + tilt (~> 2.0) + sinatra-flash (0.3.0) + sinatra (>= 1.0.0) + spidr (0.7.1) nokogiri (~> 1.3) - sqlite3 (1.6.6) + sqlite3 (1.7.3) mini_portile2 (~> 2.8.0) - stringio (3.0.8) - tdiff (0.3.4) - tilt (2.3.0) - time (0.2.2) + stringio (3.1.2) + tdiff (0.4.0) + thread-local (1.1.0) + tilt (2.5.0) + time (0.4.1) date - timeout (0.4.0) - timers (4.3.5) + timeout (0.4.3) + traces (0.14.1) tzinfo (2.0.6) concurrent-ruby (~> 1.0) - unf (0.1.4) - unf_ext - unf_ext (0.0.8.2) - uri-query_params (0.8.1) - webrick (1.8.1) - webrobots (0.1.2) + uri-query_params (0.8.2) + webrick (1.9.1) + websocket (1.2.11) + websocket-driver (0.7.7) + base64 + websocket-extensions (>= 0.1.0) + websocket-extensions (0.1.5) woothee (1.13.0) - wordlist (1.1.0) + wordlist (1.1.1) + zeitwerk (2.7.1) PLATFORMS ruby @@ -242,4 +419,4 @@ DEPENDENCIES ronin BUNDLED WITH - 2.3.26 + 2.5.16 diff --git a/pkgs/tools/security/ronin/default.nix b/pkgs/tools/security/ronin/default.nix index b5ed99317296..d5a3a0080bda 100644 --- a/pkgs/tools/security/ronin/default.nix +++ b/pkgs/tools/security/ronin/default.nix @@ -8,6 +8,7 @@ bundlerEnv { name = "ronin"; + version = "2.1.0"; gemdir = ./.; gemConfig = defaultGemConfig // { diff --git a/pkgs/tools/security/ronin/gemset.nix b/pkgs/tools/security/ronin/gemset.nix index 6faaeb3b8249..9c659d5efd54 100644 --- a/pkgs/tools/security/ronin/gemset.nix +++ b/pkgs/tools/security/ronin/gemset.nix @@ -5,10 +5,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "01jrk2i6vp8jcll65d03mqmp1ibxa0ip7bdg5157fkm5syblzsqw"; + sha256 = "1bzxvccj8349slymls7navb5y14anglkkasphcd6gi72kqgqd643"; type = "gem"; }; - version = "7.1.0"; + version = "7.2.2.1"; }; activerecord = { dependencies = [ @@ -20,31 +20,33 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1lpcbgqbrb3yfk3i66mnxa5i36r0ig9dwzksjbm15i30rndr27p5"; + sha256 = "1fgscw775wj4l7f5pj274a984paz23zy0111giqkhl9dqdqiz8vr"; type = "gem"; }; - version = "7.1.0"; + version = "7.2.2.1"; }; activesupport = { dependencies = [ "base64" + "benchmark" "bigdecimal" "concurrent-ruby" "connection_pool" "drb" "i18n" + "logger" "minitest" - "mutex_m" + "securerandom" "tzinfo" ]; groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1xpwx7hw7mgmjk3w3g8bkz5jfapixhgn3ihly0xkpyvgp1shp8h1"; + sha256 = "1xa7hr4gp2p86ly6n1j2skyx8pfg6yi621kmnh7zhxr9m7wcnaw4"; type = "gem"; }; - version = "7.1.0"; + version = "7.2.2.1"; }; addressable = { dependencies = [ "public_suffix" ]; @@ -52,26 +54,57 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "05r1fwy487klqkya7vzia8hnklcxy4vr92m9dmni3prfwk6zpw33"; + sha256 = "0cl2qpvwiffym62z991ynks7imsm87qmgxf0yfsmlwzkgi9qcaa6"; type = "gem"; }; - version = "2.8.5"; + version = "2.8.7"; }; async = { dependencies = [ "console" "fiber-annotation" "io-event" - "timers" ]; groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "02ng89h9s4wwpncyqbkm9n26swp4q45dkvqsb2fpmkan32zn48ji"; + sha256 = "17aq671gzxsv1irmqjcj7p7vm4jpmy74hw2x1f3r7i71xnfgcq2x"; type = "gem"; }; - version = "2.6.4"; + version = "2.21.1"; + }; + async-dns = { + dependencies = [ "async-io" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1czw1dcz18yx0piqjamf2x0h2zbqzh0r4h6g0mn515rkxsz6z67z"; + type = "gem"; + }; + version = "1.3.0"; + }; + async-http = { + dependencies = [ + "async" + "async-pool" + "io-endpoint" + "io-stream" + "metrics" + "protocol-http" + "protocol-http1" + "protocol-http2" + "traces" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0c2dfbpfyhjd12dypd5sv8sfdr3j75abvc9lnyp0q5jqzprz76sd"; + type = "gem"; + }; + version = "0.86.0"; }; async-io = { dependencies = [ "async" ]; @@ -79,80 +112,104 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "11lgd7276rgy651zwbzvbsz8q0k09ljgngyhsppy7kvkjzj25n58"; + sha256 = "1isyrpbsnp00kh38jjqzk933zx48xyvpr2mzk3lsybvs885aybl9"; type = "gem"; }; - version = "1.36.0"; + version = "1.43.2"; + }; + async-pool = { + dependencies = [ + "async" + "traces" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1b1miyfdj2rm7f5br0ibrm27zqp984nhnqc600xg48xdqr7b5rr6"; + type = "gem"; + }; + version = "0.10.2"; }; base64 = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0cydk9p2cv25qysm0sn2pb97fcpz1isa7n3c8xm1gd99li8x6x8c"; + sha256 = "01qml0yilb9basf7is2614skjp8384h2pycfx86cr8023arfj98g"; type = "gem"; }; - version = "0.1.1"; + version = "0.2.0"; + }; + benchmark = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0jl71qcgamm96dzyqk695j24qszhcc7liw74qc83fpjljp2gh4hg"; + type = "gem"; + }; + version = "0.4.0"; }; bigdecimal = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "07y615s8yldk3k13lmkhpk1k190lcqvmxmnjwgh4bzjan9xrc36y"; + sha256 = "1k6qzammv9r6b2cw3siasaik18i6wjc5m0gw5nfdc6jj64h79z1g"; type = "gem"; }; - version = "3.1.4"; + version = "3.1.9"; }; chars = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "18lgsszrrh3xnaym2jdz7g5gm7c8hv5faj7zyrm1ws9l107jrhr5"; + sha256 = "1vmpki1q4glglfp25flb2i6qy6jj80438z5x4rdqrcvvm869w8sd"; type = "gem"; }; - version = "0.3.2"; + version = "0.3.3"; }; combinatorics = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1sf0pj29xzriwsqv607iwzs76piac6kygqxpg0i59qwx029100fw"; + sha256 = "0bwkk3hw3ll585y4558zy8ahbc1049ylc3321sjvlhm2lvha7717"; type = "gem"; }; - version = "0.4.4"; + version = "0.5.0"; }; command_kit = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "179mlrnzj56ghviyvvwk0kdfyvr050yk4jj4nwb78izlbxw1wl1m"; + sha256 = "147s9bc97k2pkh9pbzidwi4mgy47zw8djh8044f5fkzfbb7jjzz5"; type = "gem"; }; - version = "0.4.0"; + version = "0.6.0"; }; command_mapper = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1v363y9g7zxfx2y7p50hdvxj6c0a8mfh30wac2rm3ibldspcjmn1"; + sha256 = "08x2c5vfhljcws535mdlqfqxf3qmpgvw69hjgb6bg0k7ybddmyhn"; type = "gem"; }; - version = "0.3.1"; + version = "0.3.2"; }; concurrent-ruby = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0krcwb6mn0iklajwngwsg850nk8k9b35dhmc2qkbdqvmifdi2y9q"; + sha256 = "0chwfdq2a6kbj6xz9l6zrdfnyghnh32si82la1dnpa5h75ir5anl"; type = "gem"; }; - version = "1.2.2"; + version = "1.3.4"; }; connection_pool = { groups = [ "default" ]; @@ -168,47 +225,171 @@ dependencies = [ "fiber-annotation" "fiber-local" + "json" ]; groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "150wdj94qg8c95b9v1g7ak5a9g159wxfanclpihrz9p9qbv1ga0w"; + sha256 = "1mkwwz5ry6hbn328fb3myr86zsc6lg0f7w1dlbfmjw043ddbgndg"; type = "gem"; }; - version = "1.23.2"; + version = "1.29.2"; }; date = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "03skfikihpx37rc27vr3hwrb057gxnmdzxhmzd4bf4jpkl0r55w1"; + sha256 = "0kz6mc4b9m49iaans6cbx031j9y7ldghpi5fzsdh0n3ixwa8w9mz"; type = "gem"; }; - version = "3.3.3"; - }; - domain_name = { - dependencies = [ "unf" ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0lcqjsmixjp52bnlgzh4lg9ppsk52x9hpwdjd53k8jnbah2602h0"; - type = "gem"; - }; - version = "0.5.20190701"; + version = "3.4.1"; }; drb = { - dependencies = [ "ruby2_keywords" ]; groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0h9c2qiam82y3caapa2x157j1lkk9954hrjg3p22hxcsk8fli3vb"; + sha256 = "0h5kbj9hvg5hb3c7l425zpds0vb42phvln2knab8nmazg2zp5m79"; type = "gem"; }; - version = "2.1.1"; + version = "2.2.1"; + }; + dry-configurable = { + dependencies = [ + "dry-core" + "zeitwerk" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1yp4psw39zj7iydrk8fjlb29rlv3fhq2fap6dn83z1cnbcpnwfrx"; + type = "gem"; + }; + version = "1.2.0"; + }; + dry-core = { + dependencies = [ + "concurrent-ruby" + "logger" + "zeitwerk" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "15di39ssfkwigyyqla65n4x6cfhgwa4cv8j5lmyrlr07jwd840q9"; + type = "gem"; + }; + version = "1.1.0"; + }; + dry-inflector = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0blgyg9l4gpzhb7rs9hqq9j7br80ngiigjp2ayp78w6m1ysx1x92"; + type = "gem"; + }; + version = "1.2.0"; + }; + dry-initializer = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1qy4cv0j0ahabprdbp02nc3r1606jd5dp90lzqg0mp0jz6c9gm9p"; + type = "gem"; + }; + version = "3.2.0"; + }; + dry-logic = { + dependencies = [ + "bigdecimal" + "concurrent-ruby" + "dry-core" + "zeitwerk" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "18nf8mbnhgvkw34drj7nmvpx2afmyl2nyzncn3wl3z4h1yyfsvys"; + type = "gem"; + }; + version = "1.6.0"; + }; + dry-schema = { + dependencies = [ + "concurrent-ruby" + "dry-configurable" + "dry-core" + "dry-initializer" + "dry-logic" + "dry-types" + "zeitwerk" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0ahx9fam9lq31pl9iszw5k18xvyfaqfdk9mlgqs2shdyw16n9sya"; + type = "gem"; + }; + version = "1.13.4"; + }; + dry-struct = { + dependencies = [ + "dry-core" + "dry-types" + "ice_nine" + "zeitwerk" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1rnlgn4wif0dvkvi10xwh1vd1q6mp35q6a7lwva0zmbc79dh4drp"; + type = "gem"; + }; + version = "1.6.0"; + }; + dry-types = { + dependencies = [ + "bigdecimal" + "concurrent-ruby" + "dry-core" + "dry-inflector" + "dry-logic" + "zeitwerk" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0sn4n13jj8x27n07yv2s7zp0c5cdlwsbh21laqm5f7ikhp10y67z"; + type = "gem"; + }; + version = "1.7.2"; + }; + dry-validation = { + dependencies = [ + "concurrent-ruby" + "dry-core" + "dry-initializer" + "dry-schema" + "zeitwerk" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1b7aik6bmnpi956qfigkidi5wd5c8xw3wgghah7mfwlpc9szsaim"; + type = "gem"; + }; + version = "1.10.0"; }; fake_io = { groups = [ "default" ]; @@ -220,6 +401,23 @@ }; version = "0.1.0"; }; + ferrum = { + dependencies = [ + "addressable" + "base64" + "concurrent-ruby" + "webrick" + "websocket-driver" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1lwdra73yxinx9c2gffq5b7778b4dpfpwnw46ds7wshk4j2z7rnf"; + type = "gem"; + }; + version = "0.16"; + }; fiber-annotation = { groups = [ "default" ]; platforms = [ ]; @@ -231,11 +429,22 @@ version = "0.2.0"; }; fiber-local = { + dependencies = [ "fiber-storage" ]; groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1vrxxb09fc7aicb9zb0pmn5akggjy21dmxkdl3w949y4q05rldr9"; + sha256 = "01lz929qf3xa90vra1ai1kh059kf2c8xarfy6xbv1f8g457zk1f8"; + type = "gem"; + }; + version = "1.1.0"; + }; + fiber-storage = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0zxblmxwdpj3587wji5325y53gjdcmzxzm6126dyg58b3qzk42mq"; type = "gem"; }; version = "1.0.0"; @@ -245,21 +454,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1787w456yzmy4c13ray228n89a5wz6p6k3ibssjvy955qlr44b7g"; + sha256 = "1wvi685igjmi00b7pmjpxnki5gwgzxn71qxhycbivbqy9vj86jvk"; type = "gem"; }; - version = "1.0.0"; - }; - http-cookie = { - dependencies = [ "domain_name" ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "13rilvlv8kwbzqfb644qp6hrbsj82cbqmnzcvqip1p6vqx36sxbk"; - type = "gem"; - }; - version = "1.0.5"; + version = "1.0.1"; }; i18n = { dependencies = [ "concurrent-ruby" ]; @@ -267,30 +465,60 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0qaamqsh5f3szhcakkak8ikxlzxqnv49n2p7504hcz2l0f4nj0wx"; + sha256 = "0k31wcgnvcvd14snz0pfqj976zv6drfsnq6x8acz10fiyms9l8nw"; type = "gem"; }; - version = "1.14.1"; + version = "1.14.6"; + }; + ice_nine = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1nv35qg1rps9fsis28hz2cq2fx1i96795f91q4nmkm934xynll2x"; + type = "gem"; + }; + version = "0.11.2"; }; io-console = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0dikardh14c72gd9ypwh8dim41wvqmzfzf35mincaj5yals9m7ff"; + sha256 = "18pgvl7lfjpichdfh1g50rpz0zpaqrpr52ybn9liv1v9pjn9ysnd"; type = "gem"; }; - version = "0.6.0"; + version = "0.8.0"; + }; + io-endpoint = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0damgyz4pxw64isv7lwvsxa4vcbybnr8wh3g5147z8hsxwsm4xai"; + type = "gem"; + }; + version = "0.14.0"; }; io-event = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1m2x5m2m8fa83p5890byf46qb4s1073vn3z6gan9jmbq2a5w0iy8"; + sha256 = "1s2ja3x17ffakc5iq56js0bp0wrqdvyhcbz5a9m3nnzks06wkywr"; type = "gem"; }; - version = "1.3.2"; + version = "1.7.5"; + }; + io-stream = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0vz9sad4kmgby53hn8jh31a462m9mkln7lxhk972dz9d870z0825"; + type = "gem"; + }; + version = "0.6.1"; }; irb = { dependencies = [ @@ -301,73 +529,70 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "17p6arsklbzh2hvwwr8i4cfrpa7vhk8q88fhickhwmn7m80lxdw7"; + sha256 = "0lh71mn0mszffwvxgiwlp1zyr38kw8d9iqsvbk7fk2j3y7rg2my4"; type = "gem"; }; - version = "1.8.1"; + version = "1.14.3"; }; - mechanize = { - dependencies = [ - "addressable" - "domain_name" - "http-cookie" - "mime-types" - "net-http-digest_auth" - "net-http-persistent" - "nokogiri" - "rubyntlm" - "webrick" - "webrobots" - ]; + json = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "08lcl3qwgi8r3q0hm5ysmj7j5xqb289kqrd15w09anirj36jc80z"; + sha256 = "048danb0x10mpch6mf88mky35zjn6wk4hpbqq68ssbq58i3fzgfj"; type = "gem"; }; version = "2.9.1"; }; - mime-types = { - dependencies = [ "mime-types-data" ]; + logger = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0q8d881k1b3rbsfcdi3fx0b5vpdr5wcrhn88r2d9j7zjdkxp5mw5"; + sha256 = "1rrf3y8j3fjjmn74d2i3l85pjm7yhvl8xgz7684hac92j8fbj9xn"; type = "gem"; }; - version = "3.5.1"; + version = "1.6.4"; }; - mime-types-data = { + metrics = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0yjv0apysnrhbc70ralinfpcqn9382lxr643swp7a5sdwpa9cyqg"; + sha256 = "1762zjanzjzr7jwig2arpj4h09ylhspipp9blx4pb9cjvgm8xv22"; type = "gem"; }; - version = "3.2023.1003"; + version = "0.12.1"; }; mini_portile2 = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "02mj8mpd6ck5gpcnsimx5brzggw5h5mmmpq2djdypfq16wcw82qq"; + sha256 = "0x8asxl83msn815lwmb2d7q5p29p7drhjv5va0byhk60v9n16iwf"; type = "gem"; }; - version = "2.8.4"; + version = "2.8.8"; }; minitest = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0bkmfi9mb49m0fkdhl2g38i3xxa02d411gg0m8x0gvbwfmmg5ym3"; + sha256 = "0izrg03wn2yj3gd76ck7ifbm9h2kgy8kpg4fk06ckpy4bbicmwlw"; type = "gem"; }; - version = "5.20.0"; + version = "5.25.4"; + }; + multi_json = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0pb1g1y3dsiahavspyzkdy39j4q377009f6ix0bh1ag4nqw43l0z"; + type = "gem"; + }; + version = "1.15.0"; }; mustermann = { dependencies = [ "ruby2_keywords" ]; @@ -375,20 +600,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0rwbq20s2gdh8dljjsgj5s6wqqfmnbclhvv2c2608brv7jm6jdbd"; + sha256 = "123ycmq6pkivv29bqbv79jv2cs04xakzd0fz1lalgvfs5nxfky6i"; type = "gem"; }; - version = "3.0.0"; - }; - mutex_m = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1pkxnp7p44kvs460bbbgjarr7xy1j8kjjmhwkg1kypj9wgmwb6qa"; - type = "gem"; - }; - version = "0.1.2"; + version = "3.0.3"; }; net-ftp = { dependencies = [ @@ -399,31 +614,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0bqy9xg5225x102873j1qqq1bvnwfbi8lnf4357mpq6wimnw9pf9"; + sha256 = "0kw7g0j35fla8438s90m72b3xr0mqnpgm910qcwrgnvyg903xmi8"; type = "gem"; }; - version = "0.2.0"; - }; - net-http-digest_auth = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1nq859b0gh2vjhvl1qh1zrk09pc7p54r9i6nnn6sb06iv07db2jb"; - type = "gem"; - }; - version = "1.4.1"; - }; - net-http-persistent = { - dependencies = [ "connection_pool" ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0i1as2lgnw7b4jid0gw5glv5hnxz36nmfsbr9rmxbcap72ijgy03"; - type = "gem"; - }; - version = "4.0.2"; + version = "0.3.8"; }; net-imap = { dependencies = [ @@ -434,10 +628,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0d0r31b79appz95dd63wmasly1qjz3hn58ffxw6ix4mqk49jcbq2"; + sha256 = "0ak8w6ypw4lba1y1mdmqwvkrh84ps6h9kd7hn029h9k85j9sirmb"; type = "gem"; }; - version = "0.4.1"; + version = "0.5.5"; }; net-pop = { dependencies = [ "net-protocol" ]; @@ -456,10 +650,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0dxckrlw4q1lcn3qg4mimmjazmg9bma5gllv72f8js3p36fb3b91"; + sha256 = "1a32l4x73hz200cm587bc29q8q9az278syw3x6fkc9d1lv5y0wxa"; type = "gem"; }; - version = "0.2.1"; + version = "0.2.2"; }; net-smtp = { dependencies = [ "net-protocol" ]; @@ -467,10 +661,20 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1rx3758w0bmbr21s2nsc6llflsrnp50fwdnly3ixra4v53gbhzid"; + sha256 = "0amlhz8fhnjfmsiqcjajip57ici2xhw089x7zqyhpk51drg43h2z"; type = "gem"; }; - version = "0.4.0"; + version = "0.5.0"; + }; + nio4r = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1a9www524fl1ykspznz54i0phfqya4x45hqaz67in9dvw1lfwpfr"; + type = "gem"; + }; + version = "2.7.4"; }; nokogiri = { dependencies = [ @@ -481,10 +685,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0k9w2z0953mnjrsji74cshqqp08q7m1r6zhadw1w0g34xzjh3a74"; + sha256 = "0xc4qs4izky1zgafabzykbxk8lc4dq6aivgxmfv3ciy3jrzbw66z"; type = "gem"; }; - version = "1.15.4"; + version = "1.18.1"; }; nokogiri-diff = { dependencies = [ @@ -495,10 +699,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0njr1s42war0bj1axb2psjvk49l74a8wzr799wckqqdcb6n51lc1"; + sha256 = "1x96g7zbfiqac3h2prhaz0zz8xbryapdbxpsra3019a2q29ac3yj"; type = "gem"; }; - version = "0.2.0"; + version = "0.3.0"; }; nokogiri-ext = { dependencies = [ "nokogiri" ]; @@ -506,72 +710,165 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0y1yflr1989vfy46lxhvs5njlskwiv08akkjybnh8n0cdqms4lhs"; + sha256 = "03jgdkdmh5ny9c49l18ls9cr8rwwlff3vfawqg2s7cwzpndn7lk9"; type = "gem"; }; - version = "0.1.0"; + version = "0.1.1"; }; open_namespace = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "11j392gl62ibhkidjrjfnb3sygmqmvsc7zd5bhmnigd65x5gs310"; + sha256 = "0k7093vbkf4mgppjz2r7pk7w3gcpmmzm4a6l8q2aa1fks4bvqhxl"; type = "gem"; }; - version = "0.4.1"; + version = "0.4.2"; }; - psych = { - dependencies = [ "stringio" ]; + pagy = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1msambb54r3d1sg6smyj4k2pj9h9lz8jq4jamip7ivcyv32a85vz"; + sha256 = "01qsxw0686k0987yybqb2z2blrb6sxpszp8dhanbnynnkgkih91v"; type = "gem"; }; - version = "5.1.0"; + version = "6.5.0"; + }; + protocol-hpack = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "14ddqg5mcs9ysd1hdzkm5pwil0660vrxcxsn576s3387p0wa5v3g"; + type = "gem"; + }; + version = "1.5.1"; + }; + protocol-http = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "05rzzf5minb77ahj2cjkkqbsh7a686b678xvn16d2kxn22rq9w5a"; + type = "gem"; + }; + version = "0.47.1"; + }; + protocol-http1 = { + dependencies = [ "protocol-http" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0ijjp4jn7wbwcvms1gra4pdp4zm1cngy22pgb81ch68wy95p85jc"; + type = "gem"; + }; + version = "0.28.1"; + }; + protocol-http2 = { + dependencies = [ + "protocol-hpack" + "protocol-http" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "04q5m5sbrqm92dsdhlris0p93pjd007hg7kf4dmfrr79r9rr8fla"; + type = "gem"; + }; + version = "0.22.0"; + }; + psych = { + dependencies = [ + "date" + "stringio" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1aq6k7zw1pi022q4ilpfn78l1gka17kn9krqdh45is6khmy4gad4"; + type = "gem"; + }; + version = "5.2.2"; }; public_suffix = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0n9j7mczl15r3kwqrah09cxj8hxdfawiqxa60kga2bmxl9flfz9k"; + sha256 = "0vqcw3iwby3yc6avs1vb3gfd0vcp2v7q310665dvxfswmcf4xm31"; type = "gem"; }; - version = "5.0.3"; + version = "6.0.1"; + }; + puma = { + dependencies = [ "nio4r" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1wl9q4fl8gvhwdpfxghx6jdqi4508287pcgiwi96sdbzmdfbglcl"; + type = "gem"; + }; + version = "6.5.0"; + }; + python-pickle = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1nk6wylwn5l8cx4m01z41c9ib6fnf7hlki0p9srwqdm1zs0ifsjf"; + type = "gem"; + }; + version = "0.2.0"; }; racc = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "11v3l46mwnlzlc371wr3x6yylpgafgwdf0q7hc7c1lzx6r414r5g"; + sha256 = "0byn0c9nkahsl93y9ln5bysq4j31q8xkf2ws42swighxd4lnjzsa"; type = "gem"; }; - version = "1.7.1"; + version = "1.8.1"; }; rack = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "15rdwbyk71c9nxvd527bvb8jxkcys8r3dj3vqra5b3sa63qs30vv"; + sha256 = "0ax778fsfvlhj7c11n0d1wdcb8bxvkb190a9lha5d91biwzyx9g4"; type = "gem"; }; - version = "2.2.8"; + version = "2.2.10"; }; rack-protection = { + dependencies = [ + "base64" + "rack" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1zzvivmdb4dkscc58i3gmcyrnypynsjwp6xgc4ylarlhqmzvlx1w"; + type = "gem"; + }; + version = "3.2.0"; + }; + rack-session = { dependencies = [ "rack" ]; groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0xsz78hccgza144n37bfisdkzpr2c8m0xl6rnlzgxdbsm1zrkg7r"; + sha256 = "0xhxhlsz6shh8nm44jsmd9276zcnyzii364vhcvf0k8b8bjia8d0"; type = "gem"; }; - version = "3.1.0"; + version = "1.0.2"; }; rack-user_agent = { dependencies = [ @@ -593,10 +890,43 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "05r2cxscapr9saqjw8dlp89as7jvc2mlz1h5kssrmkbz105qmfcm"; + sha256 = "1niyzaiwz155nhardgxiin44j1wnrsp73pwwl8xxzj9si0hm0rnv"; type = "gem"; }; - version = "6.5.0"; + version = "6.10.0"; + }; + redis = { + dependencies = [ "redis-client" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1cbjvb61kx2p1mjg2z55mw80760h6d8dnxszqkq8g4c8mv2i1y3b"; + type = "gem"; + }; + version = "5.3.0"; + }; + redis-client = { + dependencies = [ "connection_pool" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0k0qbbxxzinffqmsvgw5avqbpzpwip0p2qyh98c872xhl578i0qz"; + type = "gem"; + }; + version = "0.23.0"; + }; + redis-namespace = { + dependencies = [ "redis" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0f92i9cwlp6xj6fyn7qn4qsaqvxfw4wqvayll7gbd26qnai1l6p9"; + type = "gem"; + }; + version = "1.11.0"; }; reline = { dependencies = [ "io-console" ]; @@ -604,26 +934,43 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0187pj9k7d8kdvzjk6r6mf7z7wy18saxxhn7x7pqc840w6h4s0ja"; + sha256 = "1lirwlw59apc8m1wjk85y2xidiv0fkxjn6f7p84yqmmyvish6qjp"; type = "gem"; }; - version = "0.3.9"; + version = "0.6.0"; + }; + robots = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "141gvihcr2c0dpzl3dqyh8kqc9121prfdql2iamaaw0mf9qs3njs"; + type = "gem"; + }; + version = "0.10.1"; }; ronin = { dependencies = [ "async-io" "open_namespace" + "ronin-app" "ronin-code-asm" "ronin-code-sql" "ronin-core" "ronin-db" + "ronin-dns-proxy" "ronin-exploits" "ronin-fuzzer" + "ronin-listener" + "ronin-masscan" + "ronin-nmap" "ronin-payloads" + "ronin-recon" "ronin-repos" "ronin-support" "ronin-vulns" "ronin-web" + "ronin-wordlists" "rouge" "wordlist" ]; @@ -631,10 +978,45 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0v1v1xb2brgajhh1w38qs4lhnmgygymh1q0q63xpwq32w7a5k7s3"; + sha256 = "1x2wjhzm6zqbasfilwmpj16398ysmh2yy9v60863jwmb041bfrdw"; type = "gem"; }; - version = "2.0.5"; + version = "2.1.0"; + }; + ronin-app = { + dependencies = [ + "dry-schema" + "dry-struct" + "dry-validation" + "pagy" + "puma" + "redis" + "redis-namespace" + "ronin-core" + "ronin-db" + "ronin-db-activerecord" + "ronin-exploits" + "ronin-masscan" + "ronin-nmap" + "ronin-payloads" + "ronin-recon" + "ronin-repos" + "ronin-support" + "ronin-vulns" + "ronin-web-spider" + "sidekiq" + "sinatra" + "sinatra-contrib" + "sinatra-flash" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1d5lrc0wq8vvxcl7gp78h6yk3j3hb1rspn94w5mmk4n79xm2cy3i"; + type = "gem"; + }; + version = "0.1.0"; }; ronin-code-asm = { dependencies = [ "ruby-yasm" ]; @@ -668,10 +1050,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1s2hndkdh4pw6xppq4jqn30fk2b26gk08yym5gavlzkcg5k17vvd"; + sha256 = "0v4k4acqaz9sb052bd8x45m9j82d6z0bvqzdav44x2r5fy7dyadx"; type = "gem"; }; - version = "0.1.2"; + version = "0.2.0"; }; ronin-db = { dependencies = [ @@ -684,10 +1066,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0fiqdk1rnqk86icx27z531yc1qjs2n41nw9p361980wg0j8b4hsj"; + sha256 = "109bal7b6shghwcshjzcbpxfr5nkx49i1cf0pj5hxf9b9z98zlk8"; type = "gem"; }; - version = "0.1.2"; + version = "0.2.0"; }; ronin-db-activerecord = { dependencies = [ @@ -698,10 +1080,24 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0igw9syk4psdmijji0cx1dhrv76r1abji8fzdndnrn5h819b2fm3"; + sha256 = "16y5b9a0m808snwhjs6iddxa2380r1l11yspblvxzy1b3srvx1ha"; type = "gem"; }; - version = "0.1.2"; + version = "0.2.0"; + }; + ronin-dns-proxy = { + dependencies = [ + "async-dns" + "ronin-support" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0lnmbb6cc2j8id1rprjlh2jynarq682mdq42bklcp203wvvifanq"; + type = "gem"; + }; + version = "0.1.0"; }; ronin-exploits = { dependencies = [ @@ -718,10 +1114,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1g2ilmmn6vccjn1i72wyakvjlh0b1qrgnw2nshl9f50j7yj93xpn"; + sha256 = "0yqqv1ssa08aryvzwyg9s18m2mgvxc0j8cjmh6v6iyyvnk79z1l0"; type = "gem"; }; - version = "1.0.3"; + version = "1.1.0"; }; ronin-fuzzer = { dependencies = [ @@ -733,7 +1129,74 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "19sc4kk6lwpq6fd23dmji0vf4mjkf1z5pjq4wp0xs2cby2fzld5p"; + sha256 = "1ikvyy7xa1z9p4ww7fgxzn0kqv2knz1c5nb9hhk5k47j4rrlxlky"; + type = "gem"; + }; + version = "0.2.0"; + }; + ronin-listener = { + dependencies = [ + "ronin-core" + "ronin-listener-dns" + "ronin-listener-http" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0iashm02jlfk1w0v9y03r595jb1v2mh4raa6mcvdz2gsjvpngd4a"; + type = "gem"; + }; + version = "0.1.0"; + }; + ronin-listener-dns = { + dependencies = [ "async-dns" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1nh990mykhjrpnzqnypgm6csrhb8xkvd1r2m7skx67jdyyh42b5w"; + type = "gem"; + }; + version = "0.1.0"; + }; + ronin-listener-http = { + dependencies = [ "async-http" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0nqg61n1ladrg9cfwb1w8l9i14020crhpxnjqhc36zwmshi28rz2"; + type = "gem"; + }; + version = "0.1.0"; + }; + ronin-masscan = { + dependencies = [ + "ronin-core" + "ronin-db" + "ruby-masscan" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "03r27dhsr9wmh8060imqn9l57fl1gwjyxi9r4rhxxlsl9bgnisjc"; + type = "gem"; + }; + version = "0.1.0"; + }; + ronin-nmap = { + dependencies = [ + "ronin-core" + "ronin-db" + "ruby-nmap" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0wgy4wywmbcjgc41v0xwqas1063gi12j791yqzwnz7h5wsmf69c3"; type = "gem"; }; version = "0.1.0"; @@ -750,10 +1213,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1gsgbw90xmwwnpc8i873wwgia56hcjkhlyjpxl7s4yvd7ml7pj0f"; + sha256 = "16002162x9rgzxqxfgpk1xgf8in1hf7n56w2zyq32mpbpnn4agsv"; type = "gem"; }; - version = "0.1.4"; + version = "0.2.0"; }; ronin-post_ex = { dependencies = [ @@ -770,16 +1233,40 @@ }; version = "0.1.0"; }; + ronin-recon = { + dependencies = [ + "async-dns" + "async-http" + "async-io" + "ronin-core" + "ronin-db" + "ronin-masscan" + "ronin-nmap" + "ronin-repos" + "ronin-support" + "ronin-web-spider" + "thread-local" + "wordlist" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "11fqjhl3dckwz9rm9zff2kwf38026799sq6d89cnwajr6pwz6ffh"; + type = "gem"; + }; + version = "0.1.0"; + }; ronin-repos = { dependencies = [ "ronin-core" ]; groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0c453qw7xr4vsq2y5dlnihfmzy95q3xjbfl5cm1y0xwzdm7ibbzx"; + sha256 = "15np60qj069235gnmgsv3yy3jlj2w4ypdh5dblhxcrwq8fhawcwy"; type = "gem"; }; - version = "0.1.1"; + version = "0.2.0"; }; ronin-support = { dependencies = [ @@ -793,46 +1280,81 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0k2vs6mkcyx0h7k3rjs2bwqimhkfa2m50ll8rgm7zygxz3f6gny3"; + sha256 = "0ap094r3j35s9nv9n891s78ddzfixg27fbfcqrm9r3j2k4m9slrn"; type = "gem"; }; - version = "1.0.3"; + version = "1.1.0"; + }; + ronin-support-web = { + dependencies = [ + "nokogiri" + "nokogiri-ext" + "ronin-support" + "websocket" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1h6gpvhf0gcm3k04kbpvkbykfp5prhhmgv1b2p1y4b5gx5ym5dax"; + type = "gem"; + }; + version = "0.1.0.1"; }; ronin-vulns = { dependencies = [ "ronin-core" + "ronin-db" "ronin-support" ]; groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1p00xrj71436g301b0wnq23ps89x4g9mmzvkghw9sqyfazgc829f"; + sha256 = "0jq26cblzxf8mmbs8mx6xmkqn9qd2ahha1mgmsawdfacci6vb94d"; type = "gem"; }; - version = "0.1.4"; + version = "0.2.0"; }; ronin-web = { dependencies = [ - "mechanize" "nokogiri" "nokogiri-diff" - "nokogiri-ext" "open_namespace" + "robots" "ronin-core" "ronin-support" + "ronin-support-web" + "ronin-vulns" + "ronin-web-browser" "ronin-web-server" + "ronin-web-session_cookie" "ronin-web-spider" "ronin-web-user_agents" + "wordlist" ]; groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "06rh7hrkj4yl6pn1m3isfim2sk5vb3ap3rba91bw7drcqsra7fmw"; + sha256 = "0glvkc2fl5j1df2q18b87bfgbwp8za8g53p8h5jkmqzrjh76m7dl"; type = "gem"; }; - version = "1.0.2"; + version = "2.0.0"; + }; + ronin-web-browser = { + dependencies = [ + "ferrum" + "ronin-support" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0d0d4mw5gs3a8a0pzvnil4sbhyh84davly0q2z2h7967dxa7rfyg"; + type = "gem"; + }; + version = "0.1.0"; }; ronin-web-server = { dependencies = [ @@ -851,6 +1373,21 @@ }; version = "0.1.1"; }; + ronin-web-session_cookie = { + dependencies = [ + "python-pickle" + "rack-session" + "ronin-support" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "04nz75h0xvzzxz1iqqq2mf4jkzf0i69l8fwd68qfbp8f282rc1r6"; + type = "gem"; + }; + version = "0.1.0"; + }; ronin-web-spider = { dependencies = [ "ronin-support" @@ -860,10 +1397,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0592llhzm8miy0lj4xsb4h0ppy18wmwqi54rjzzsm7h3d2py7iv9"; + sha256 = "0yl1dd1dvh2gi476y356fgd9dg83480fm9s1pcvzkgdxc2a43lrw"; type = "gem"; }; - version = "0.1.0"; + version = "0.2.0"; }; ronin-web-user_agents = { groups = [ "default" ]; @@ -875,6 +1412,20 @@ }; version = "0.1.0"; }; + ronin-wordlists = { + dependencies = [ + "ronin-core" + "wordlist" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "09yb1dnaygq86ahhq9hhh5ddl2ylawjg68m3nz2cv43h85ax2xsa"; + type = "gem"; + }; + version = "0.1.0"; + }; rouge = { groups = [ "default" ]; platforms = [ ]; @@ -885,16 +1436,41 @@ }; version = "3.30.0"; }; + ruby-masscan = { + dependencies = [ "command_mapper" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "018jjdah2zyw12wcyk0qmislysb9847wisyv593r4f9m8aq5ppbi"; + type = "gem"; + }; + version = "0.3.0"; + }; + ruby-nmap = { + dependencies = [ + "command_mapper" + "nokogiri" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "17a0qgj0sk8dyw80pnvih81027f1mnf4a1xh1vj6x48xajzvsdmy"; + type = "gem"; + }; + version = "1.0.3"; + }; ruby-yasm = { dependencies = [ "command_mapper" ]; groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1vf0kdaaysx9kr7v8rl0hl0j73zkfkg7zqvg0b41sgfg3zfib0ap"; + sha256 = "06gdp5d5mw7rs4qh6m2nar8yir8di0n8cqrc5ls6zpw18lsbzyfd"; type = "gem"; }; - version = "0.3.0"; + version = "0.3.1"; }; ruby2_keywords = { groups = [ "default" ]; @@ -906,15 +1482,31 @@ }; version = "0.0.5"; }; - rubyntlm = { + securerandom = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0b8hczk8hysv53ncsqzx4q6kma5gy5lqc7s5yx8h64x3vdb18cjv"; + sha256 = "1cd0iriqfsf1z91qg271sm88xjnfd92b832z49p1nd542ka96lfc"; type = "gem"; }; - version = "0.6.3"; + version = "0.4.1"; + }; + sidekiq = { + dependencies = [ + "connection_pool" + "logger" + "rack" + "redis-client" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "05navs6f5904mqkrdmfafan448c5sn41aah2hb6rfbsn66a9rcjy"; + type = "gem"; + }; + version = "7.3.7"; }; sinatra = { dependencies = [ @@ -927,10 +1519,38 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "00541cnypsh1mnilfxxqlz6va9afrixf9m1asn4wzjp5m59777p8"; + sha256 = "01wq20aqk5kfggq3wagx5xr1cz0x08lg6dxbk9yhd1sf0d6pywkf"; type = "gem"; }; - version = "3.1.0"; + version = "3.2.0"; + }; + sinatra-contrib = { + dependencies = [ + "multi_json" + "mustermann" + "rack-protection" + "sinatra" + "tilt" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1hggy6m87bam8h3hs2d7m9wnfgw0w3fzwi60jysyj8icxghsjchc"; + type = "gem"; + }; + version = "3.2.0"; + }; + sinatra-flash = { + dependencies = [ "sinatra" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1vhpyzv3nvx6rl01pgzg5a9wdarb5iccj73gvk6hv1218gd49w7y"; + type = "gem"; + }; + version = "0.3.0"; }; spidr = { dependencies = [ "nokogiri" ]; @@ -938,10 +1558,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "15gjqry61z93f4p84x5b1bi6f65xd4djax0563ljngmsckyg7xg5"; + sha256 = "02ww7p3pdhmg56i5b3215grs5mrlgq5x53a5v8in8d9iinp40fhw"; type = "gem"; }; - version = "0.7.0"; + version = "0.7.1"; }; sqlite3 = { dependencies = [ "mini_portile2" ]; @@ -949,40 +1569,50 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "15415lmz69jbzl6nch4q5l2jxv054676nk6y0vgy0g3iklmjrxvc"; + sha256 = "073hd24qwx9j26cqbk0jma0kiajjv9fb8swv9rnz8j4mf0ygcxzs"; type = "gem"; }; - version = "1.6.6"; + version = "1.7.3"; }; stringio = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0ix96dxbjqlpymdigb4diwrifr0bq7qhsrng95fkkp18av326nqk"; + sha256 = "0cd1kdrf62p2ya3ia4rz49d5012bqinvqjmcgkakknswz0l1hkr0"; type = "gem"; }; - version = "3.0.8"; + version = "3.1.2"; }; tdiff = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0rjvqyyxrybzhaqmgh4zjcdrvmqyqcqqbq4vda39idhrqcd2gy67"; + sha256 = "0c4kaj6yqh84rln9iixvcngyf0ghrcr9baysvdr2cjbyh19vwnv8"; type = "gem"; }; - version = "0.3.4"; + version = "0.4.0"; + }; + thread-local = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1ryjgfwcsbkxph1l24x87p1yabnnbqy958s57w37iwhf3z9nid9g"; + type = "gem"; + }; + version = "1.1.0"; }; tilt = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0p3l7v619hwfi781l3r7ypyv1l8hivp09r18kmkn6g11c4yr1pc2"; + sha256 = "059v569b4wi53g7wx0rld3mixfkildvdgfyq8hcikn0gzfgim1rw"; type = "gem"; }; - version = "2.3.0"; + version = "2.5.0"; }; time = { dependencies = [ "date" ]; @@ -990,30 +1620,30 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "13pzdsgf3v06mymzipcpa7p80shyw328ybn775nzpnhc6n8y9g30"; + sha256 = "0qgarmdyqypzsaanf4w9vqrd9axrcrjqilxwrfmxp954102kcpq3"; type = "gem"; }; - version = "0.2.2"; + version = "0.4.1"; }; timeout = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1d9cvm0f4zdpwa795v3zv4973y5zk59j7s1x3yn90jjrhcz1yvfd"; + sha256 = "03p31w5ghqfsbz5mcjzvwgkw3h9lbvbknqvrdliy8pxmn9wz02cm"; type = "gem"; }; - version = "0.4.0"; + version = "0.4.3"; }; - timers = { + traces = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0pjzipnmzfywvgsr3gxwj6nmg47lz4700g0q71jgcy1z6rb7dn7p"; + sha256 = "1zxbxbgf33fxniycgqvgscad4jvil9pywwdg7q8bx5ym40lbdg0k"; type = "gem"; }; - version = "4.3.5"; + version = "0.14.1"; }; tzinfo = { dependencies = [ "concurrent-ruby" ]; @@ -1026,56 +1656,59 @@ }; version = "2.0.6"; }; - unf = { - dependencies = [ "unf_ext" ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0bh2cf73i2ffh4fcpdn9ir4mhq8zi50ik0zqa1braahzadx536a9"; - type = "gem"; - }; - version = "0.1.4"; - }; - unf_ext = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1yj2nz2l101vr1x9w2k83a0fag1xgnmjwp8w8rw4ik2rwcz65fch"; - type = "gem"; - }; - version = "0.0.8.2"; - }; uri-query_params = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "08i91q1q2fvjq7n21p4f4pryi8b9msknrgwz132spvhm4l55n6l6"; + sha256 = "0z7w39zz9pfs5zcjkk5ga6q0yadc82kn1wlhmj6f56bj0jpdnlbi"; type = "gem"; }; - version = "0.8.1"; + version = "0.8.2"; }; webrick = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "13qm7s0gr2pmfcl7dxrmq38asaza4w0i2n9my4yzs499j731wh8r"; + sha256 = "12d9n8hll67j737ym2zw4v23cn4vxyfkb6vyv1rzpwv6y6a3qbdl"; type = "gem"; }; - version = "1.8.1"; + version = "1.9.1"; }; - webrobots = { + websocket = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "19ndcbba8s8m62hhxxfwn83nax34rg2k5x066awa23wknhnamg7b"; + sha256 = "0dr78vh3ag0d1q5gfd8960g1ca9g6arjd2w54mffid8h4i7agrxp"; type = "gem"; }; - version = "0.1.2"; + version = "1.2.11"; + }; + websocket-driver = { + dependencies = [ + "base64" + "websocket-extensions" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1d26l4qn55ivzahbc7fwc4k4z3j7wzym05i9n77i4mslrpr9jv85"; + type = "gem"; + }; + version = "0.7.7"; + }; + websocket-extensions = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0hc2g9qps8lmhibl5baa91b4qx8wqw872rgwagml78ydj8qacsqw"; + type = "gem"; + }; + version = "0.1.5"; }; woothee = { groups = [ "default" ]; @@ -1092,9 +1725,19 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "06d4nj2nd172sn5yjw9qmpz7zqnymadbsxph741yx2h9va8q0qgd"; + sha256 = "1lg0sp95ny4i62n9zw0mc87i5vdrwm4g692f0lv9wc6ad0xd5gmd"; type = "gem"; }; - version = "1.1.0"; + version = "1.1.1"; + }; + zeitwerk = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0mi7b90hvc6nqv37q27df4i2m27yy56yfy2ki5073474a1h9hi89"; + type = "gem"; + }; + version = "2.7.1"; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7059353f9d83..1b580dedf959 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -938,12 +938,7 @@ with pkgs; llvm = llvm_16; }; - aflplusplus = callPackage ../tools/security/aflplusplus { - clang = clang_15; - llvm = llvm_15; - llvmPackages = llvmPackages_15; - wine = null; - }; + aflplusplus = callPackage ../tools/security/aflplusplus { wine = null; }; libdislocator = callPackage ../tools/security/aflplusplus/libdislocator.nix { }; @@ -4775,12 +4770,6 @@ with pkgs; polaris-web = callPackage ../servers/polaris/web.nix { }; - povray = callPackage ../tools/graphics/povray { - # https://github.com/POV-Ray/povray/issues/460 - # https://github.com/NixOS/nixpkgs/issues/311017 - stdenv = gcc12Stdenv; - }; - projectlibre = callPackage ../applications/misc/projectlibre { jre = jre8; jdk = jdk8; @@ -14201,8 +14190,6 @@ with pkgs; libkiwix = callPackage ../applications/misc/kiwix/lib.nix { }; - librecad = libsForQt5.callPackage ../applications/misc/librecad { }; - libreoffice-bin = callPackage ../applications/office/libreoffice/darwin { }; libreoffice = hiPrio libreoffice-still; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index d0615eaed2ca..f83c53188c61 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -740,6 +740,7 @@ mapAliases ({ xarray-datatree = throw "Datatree has been merged upstream into pydata/xarray, and released as of xarray version 2024.10.0."; # added 2024-11-02 xenomapper = throw "xenomapper was moved to pkgs.xenomapper"; # added 2021-12-31 XlsxWriter = xlsxwriter; # added 2023-02-19 + yahooweather = throw "yahooweather has been removed because it is no longer maintained"; # added 2025-01-13 xsser = "xsser has been removed because it was unmaintained and relies on a archived project"; # added 2024-07-27 Yapsy = yapsy; # added 2023-02-19 yanc = throw "yanc has been removed because it relies on nose"; # added 2024-07-27 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a9080f17a419..5f6aa4213ee9 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -584,6 +584,8 @@ self: super: with self; { amqtt = callPackage ../development/python-modules/amqtt { }; + amshan = callPackage ../development/python-modules/amshan { }; + anchor-kr = callPackage ../development/python-modules/anchor-kr { }; ancp-bids = callPackage ../development/python-modules/ancp-bids { }; @@ -6945,6 +6947,8 @@ self: super: with self; { kerberos = callPackage ../development/python-modules/kerberos { }; + kestra = callPackage ../development/python-modules/kestra { }; + keyboard = callPackage ../development/python-modules/keyboard { }; keyring = callPackage ../development/python-modules/keyring { }; @@ -18288,8 +18292,6 @@ self: super: with self; { yabadaba = callPackage ../development/python-modules/yabadaba { }; - yahooweather = callPackage ../development/python-modules/yahooweather { }; - yalesmartalarmclient = callPackage ../development/python-modules/yalesmartalarmclient { }; yalexs = callPackage ../development/python-modules/yalexs { };