diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 8bdb442204b9..b7e174930deb 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -18976,6 +18976,11 @@ github = "noaccOS"; githubId = 24324352; }; + Noah765 = { + name = "Noah765"; + github = "Noah765"; + githubId = 99338019; + }; noahfraiture = { name = "Noahcode"; email = "pro@noahcode.dev"; diff --git a/nixos/doc/manual/release-notes/rl-2605.section.md b/nixos/doc/manual/release-notes/rl-2605.section.md index f30935952c8a..8b14848bf1f0 100644 --- a/nixos/doc/manual/release-notes/rl-2605.section.md +++ b/nixos/doc/manual/release-notes/rl-2605.section.md @@ -28,6 +28,8 @@ - [dsearch](https://github.com/AvengeMedia/danksearch), a fast filesystem search service with fuzzy matching. Available as [programs.dsearch](#opt-programs.dsearch.enable). +- [Ente Auth](https://ente.io/auth/), an open source 2FA authenticator, with end-to-end encrypted backups. Available as [programs.ente-auth](#opt-programs.ente-auth.enable). + - [udp-over-tcp](https://github.com/mullvad/udp-over-tcp), a tunnel for proxying UDP traffic over a TCP stream. Available as `services.udp-over-tcp`. - [Komodo Periphery](https://github.com/moghtech/komodo), a multi-server Docker and Git deployment agent by Komodo. Available as [services.komodo-periphery](#opt-services.komodo-periphery.enable). diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index ed876450bac2..10823b360fa8 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -204,6 +204,7 @@ ./programs/dsearch.nix ./programs/dublin-traceroute.nix ./programs/ecryptfs.nix + ./programs/ente-auth.nix ./programs/environment.nix ./programs/envision.nix ./programs/evince.nix diff --git a/nixos/modules/programs/ente-auth.nix b/nixos/modules/programs/ente-auth.nix new file mode 100644 index 000000000000..18a82fe686a1 --- /dev/null +++ b/nixos/modules/programs/ente-auth.nix @@ -0,0 +1,27 @@ +{ + config, + lib, + pkgs, + ... +}: +let + cfg = config.programs.ente-auth; +in +{ + options.programs.ente-auth = { + enable = lib.mkEnableOption "Ente Auth"; + package = lib.mkPackageOption pkgs "ente-auth" { }; + }; + + config = lib.mkIf cfg.enable { + environment.systemPackages = [ cfg.package ]; + services.gnome.gnome-keyring.enable = lib.mkIf ( + !config.services.desktopManager.plasma6.enable + ) true; + }; + + meta.maintainers = with lib.maintainers; [ + gepbird + yiyu + ]; +} diff --git a/nixos/modules/services/misc/gitlab.md b/nixos/modules/services/misc/gitlab.md index b583836e2ff7..f37feb9df6fe 100644 --- a/nixos/modules/services/misc/gitlab.md +++ b/nixos/modules/services/misc/gitlab.md @@ -143,7 +143,7 @@ configure a Gitlab Runner with caching and reasonably good security practices. ::: {#ex-gitlab-runner-podman .example} -## Example: Gitlab Runner with `podman` and Nix Store Caching +## Gitlab Runner with `podman` and Nix Store Caching The [VM tested `podman-runner`](https://github.com/NixOS/nixpkgs/blob/master/nixos/tests/gitlab/runner/podman-runner/default.nix) (a NixOS module for reuse) configures an advanced Gitlab runner with the following features: diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix index 6df53cfe509e..6730a9faa4d8 100644 --- a/nixos/release-combined.nix +++ b/nixos/release-combined.nix @@ -99,7 +99,7 @@ rec { (onFullSupported "nixos.tests.firewall") (onFullSupported "nixos.tests.fontconfig-default-fonts") (onFullSupported "nixos.tests.gitlab.gitlab") - (onSystems [ "x86_64-linux" ] "nixos.tests.gitlab.runner") + (onFullSupported "nixos.tests.gitlab.runner") (onFullSupported "nixos.tests.gnome") (onSystems [ "x86_64-linux" ] "nixos.tests.hibernate") (onFullSupported "nixos.tests.i3wm") diff --git a/nixos/tests/gitlab/runner.nix b/nixos/tests/gitlab/runner.nix index 8a97bea4b596..37e42dfa8850 100644 --- a/nixos/tests/gitlab/runner.nix +++ b/nixos/tests/gitlab/runner.nix @@ -25,8 +25,10 @@ let # The Gitlab runner where each job runs # on the host (not containerized and very insecure). shell = { + enabled = true; # Works on all systems. desc = "Shell runner (host NixOS shell, host Nix store)"; name = "shell"; + path = ./runner/shell-runner.nix; tokenFile = "${runnerTokenDir}/token-shell.env"; }; @@ -36,8 +38,12 @@ let # - All jobs run in an unprivileged container, e.g. with image # (`local/nix`, `local/alpine`, `local/ubuntu`) podman = { + # Only enabled on x86_64-linux: due to container images. + # TODO: See https://github.com/NixOS/nixpkgs/issues/474409 + enabled = pkgs.stdenv.buildPlatform.isx86_64; desc = "Podman runner (containers, shared containerized Nix store)"; name = "podman"; + path = ./runner/podman-runner; tokenFile = "${runnerTokenDir}/token-podman.env"; }; }; @@ -54,17 +60,14 @@ in { imports = [ ../common/user-account.nix - (import ./runner/shell-runner.nix { - runnerConfig = runnerConfigs.shell; - }) ] - # Only enable the podman runner on x86_64 - # cause of built images. - ++ (lib.optional pkgs.stdenv.buildPlatform.isx86_64 ( - import ./runner/podman-runner { - runnerConfig = runnerConfigs.podman; + # Include all runners which are enabled. + ++ (lib.mapAttrsToList ( + k: runnerConfig: + import runnerConfig.path { + inherit runnerConfig; } - )); + ) (lib.filterAttrs (k: runnerCfg: runnerCfg.enabled) runnerConfigs)); virtualisation = { diskSize = 10000; @@ -169,10 +172,17 @@ in # Run all tests. test_connection() - test_register_runner(name="shell", tokenFile="${runnerConfigs.shell.tokenFile}") - test_register_runner(name="podman", tokenFile="${runnerConfigs.podman.tokenFile}") + + # Register all runners which are enabled. + for name, tokenFile, enabled in [ + ("shell", "${runnerConfigs.shell.tokenFile}", "${lib.boolToString runnerConfigs.shell.enabled}"), + ("podman", "${runnerConfigs.podman.tokenFile}", "${lib.boolToString runnerConfigs.podman.enabled}")]: + if enabled == "true": + test_register_runner(name=name, tokenFile=tokenFile) + restart_gitlab_runner_service(runnerConfigs) - test_runner_registered(runnerConfigs["shell"]) - test_runner_registered(runnerConfigs["podman"]) + + for config in runnerConfigs.values(): + test_runner_registered(config) ''; } diff --git a/nixos/tests/gitlab/runner_test.py b/nixos/tests/gitlab/runner_test.py index adc98e363915..4d0b7e80eeb8 100644 --- a/nixos/tests/gitlab/runner_test.py +++ b/nixos/tests/gitlab/runner_test.py @@ -116,6 +116,9 @@ def test_register_runner(name: str, tokenFile: str): def restart_gitlab_runner_service(runnerConfigs): print("==> Restart Gitlab Runner") + if len(runnerConfigs) == 0: + raise Exception("You must have at least one runner registered!") + if any([n == "podman" for n in runnerConfigs.keys()]): vms.gitlab_runner.wait_for_unit("podman-nix-daemon-container.service") vms.gitlab_runner.wait_for_unit("podman-podman-daemon-container.service") diff --git a/pkgs/applications/editors/vim/plugins/non-generated/avante-nvim/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/avante-nvim/default.nix index 881a6561656d..ea1882506256 100644 --- a/pkgs/applications/editors/vim/plugins/non-generated/avante-nvim/default.nix +++ b/pkgs/applications/editors/vim/plugins/non-generated/avante-nvim/default.nix @@ -12,12 +12,12 @@ pkgs, }: let - version = "0.0.27-unstable-2025-12-19"; + version = "0.0.27-unstable-2025-12-22"; src = fetchFromGitHub { owner = "yetone"; repo = "avante.nvim"; - rev = "15548d50fcfb2ebda173bff0d751a1b0bc53e4c5"; - hash = "sha256-jTXV/IV/vIu+pWL/C1OkWvrVRg39yGalfC28VIfDvqI="; + rev = "476f342fe6bc1e120ba3e334b5d9cf3ef66de56a"; + hash = "sha256-jnDANbe2PfCl375rK+goEu2LkwBpqvTaPBk6zq5ada0="; }; avante-nvim-lib = rustPlatform.buildRustPackage { pname = "avante-nvim-lib"; diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 538e62aed995..73042a843e02 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -2609,8 +2609,8 @@ let mktplcRef = { name = "language-julia"; publisher = "julialang"; - version = "1.158.2"; - hash = "sha256-H3T/SiBqkjhItFDfGlVM+UINimrWlLryampggFPhvzM="; + version = "1.167.2"; + hash = "sha256-0BrJjnKli7GE/CLGUSXJySFJjjpd1S/GMLa6PmddO1Q="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/julialang.language-julia/changelog"; @@ -3194,8 +3194,8 @@ let mktplcRef = { name = "vscode-kubernetes-tools"; publisher = "ms-kubernetes-tools"; - version = "1.3.26"; - hash = "sha256-wiRV8FQw9TPNYvsgoVy8nAvCA9eosxXTaXs7YjdoBFs="; + version = "1.3.28"; + hash = "sha256-5O0WxTuAIDeTk2/YospejjvHWVkCcMvVwiVYQWQYZKc="; }; meta = { license = lib.licenses.mit; @@ -4496,8 +4496,8 @@ let mktplcRef = { name = "svelte-vscode"; publisher = "svelte"; - version = "109.12.0"; - hash = "sha256-pPzpP7xYZ2cxj1euA3jj6d0g0c+tK+1is+o4zeMdT/Q="; + version = "109.12.1"; + hash = "sha256-0KotF1HGrM9BkImYAfSHGvAeUCZMRnveIBldjhxUUuY="; }; meta = { changelog = "https://github.com/sveltejs/language-tools/releases"; @@ -5068,8 +5068,8 @@ let mktplcRef = { publisher = "vscjava"; name = "vscode-java-dependency"; - version = "0.26.3"; - hash = "sha256-o7FWpesuG6qS1UFVaSQ97X3sWc/6vOOZPy/iid3nNJs="; + version = "0.26.5"; + hash = "sha256-prg8Dmba0bLr7NEmP7q4bE/oUW7YrsLBfsnXIF7ozyA="; }; meta = { license = lib.licenses.mit; @@ -5108,8 +5108,8 @@ let mktplcRef = { publisher = "vscjava"; name = "vscode-maven"; - version = "0.44.2024072906"; - hash = "sha256-9S8Zzefg9i3nZiPZAtW5aT07dpZnhV0w9DP5vdnEtFc="; + version = "0.45.1"; + hash = "sha256-ZMfw04RhSz6VlNlgxZuJWHprpI9PyjsfyzOihjrhuo8="; }; meta = { license = lib.licenses.mit; @@ -5120,8 +5120,8 @@ let mktplcRef = { name = "vscode-spring-initializr"; publisher = "vscjava"; - version = "0.11.2024112703"; - hash = "sha256-5GLgU3hqfsBCmv0ltWcxWrQIyR0rjh7aiixXFQEzV/s="; + version = "0.12.0"; + hash = "sha256-q2++9C01okq5pFdmKKc3ZSr0G4XTAchpEmBMqZm3q7Y="; }; meta = { license = lib.licenses.mit; @@ -5448,8 +5448,8 @@ let mktplcRef = { name = "tabler-icons"; publisher = "zguolee"; - version = "0.3.7"; - hash = "sha256-zBMsEovKBFl5LTcYWMHMep1D/4vP8jba3mFRZZP41RU="; + version = "0.4.1"; + hash = "sha256-Pqc91AXOH8K4as/978rM41M18IzGwzjefqCTAyJ5fOQ="; }; meta = { description = "Tabler product icon theme for Visual Studio Code"; diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 2a299a45632e..29903547b2ce 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -373,13 +373,13 @@ "vendorHash": "sha256-Q3H/6mpkWn1Gw0NRMtKtkBRGHjPJZGBFdGwfalyQ4Z0=" }, "equinix_equinix": { - "hash": "sha256-78gEVUTWuHtZh1qPyO/J2YjCJvHnRSko7gbS38Z6EC0=", + "hash": "sha256-4G1xrFWSjyNFC7uLdzTYG8SWPwLQgid+zB+wfGSNons=", "homepage": "https://registry.terraform.io/providers/equinix/equinix", "owner": "equinix", "repo": "terraform-provider-equinix", - "rev": "v4.11.1", + "rev": "v4.12.0", "spdx": "MIT", - "vendorHash": "sha256-vk5yWeMhQBm8txzAxgD8JtpQnZcETWFdDQJQ2nipRAA=" + "vendorHash": "sha256-M5cX70GwfdEJ22V8CwoaNEdEWb1CX7wsBgvj3GvjE0Q=" }, "exoscale_exoscale": { "hash": "sha256-8FIZO+iRqYa7y5Li8GoGnFT069vx4q4KczCgEB4SKuk=", @@ -806,13 +806,13 @@ "vendorHash": "sha256-UuLHaOEG6jmOAgfdNOtLyUimlAr3g6K8n3Ehu64sKqk=" }, "keycloak_keycloak": { - "hash": "sha256-1iElc1BemBqQ10FRozd+Pi5jkcMS/d9pexp+VKdO4BY=", + "hash": "sha256-u9gIh3iM9mpBJbO0Vgyt8YZNsRHvewJTY6vNm+KVxwY=", "homepage": "https://registry.terraform.io/providers/keycloak/keycloak", "owner": "keycloak", "repo": "terraform-provider-keycloak", - "rev": "v5.5.0", + "rev": "v5.6.0", "spdx": "Apache-2.0", - "vendorHash": "sha256-OZG8EA8xtskbLZgHzWm865wjnhRCsWdNepNMHfdtkyw=" + "vendorHash": "sha256-va9B1CPLLT0NH4VP+1Fjr8O/I2K8xVO9aVjM3fZ9jVE=" }, "kislerdm_neon": { "hash": "sha256-4icz/nGHIP2nzGbP4iGuPVbn8OC+u13qBSwYbyFLCto=", @@ -1121,11 +1121,11 @@ "vendorHash": "sha256-L1wufPa7LPPyOPTL+jFQgiWzJoJYS+fCdw3N0KZqKtc=" }, "rancher_rancher2": { - "hash": "sha256-tj7Ay9hQRfkP1BGoEWlUFZSzxnce/KV1xz3MuZifjfQ=", + "hash": "sha256-w0ACYyXj3S5yw4ZZ59c0UpPVo2ZL8EOIheGvWQorYLE=", "homepage": "https://registry.terraform.io/providers/rancher/rancher2", "owner": "rancher", "repo": "terraform-provider-rancher2", - "rev": "v13.1.3", + "rev": "v13.1.4", "spdx": "MPL-2.0", "vendorHash": "sha256-33NOGIvqLpgndG68GxAeoiISjWV7ApR4jmvqyZHjPKo=" }, diff --git a/pkgs/applications/science/astronomy/calcmysky/default.nix b/pkgs/applications/science/astronomy/calcmysky/default.nix index d103e4feea39..5c961c99a85c 100644 --- a/pkgs/applications/science/astronomy/calcmysky/default.nix +++ b/pkgs/applications/science/astronomy/calcmysky/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "calcmysky"; - version = "0.3.5"; + version = "0.4.0"; src = fetchFromGitHub { owner = "10110111"; repo = "CalcMySky"; tag = "v${version}"; - hash = "sha256-++011c4/IFf/5GKmFostTnxgfEdw3/GJf0e5frscCQ4="; + hash = "sha256-AuDHLgOS+Cu2xSJQVi8XfrINoh18STP1ox7JElafW3k="; }; nativeBuildInputs = [ @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { meta = { description = "Simulator of light scattering by planetary atmospheres"; homepage = "https://github.com/10110111/CalcMySky"; - license = lib.licenses.gpl3Only; + license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ nickcao ]; }; } diff --git a/pkgs/applications/version-management/sublime-merge/default.nix b/pkgs/applications/version-management/sublime-merge/default.nix index 44026fede1b3..6e91361e1d03 100644 --- a/pkgs/applications/version-management/sublime-merge/default.nix +++ b/pkgs/applications/version-management/sublime-merge/default.nix @@ -5,9 +5,9 @@ let in { sublime-merge = common { - buildVersion = "2112"; - aarch64sha256 = "XtJ4bAKiCZnBEG1ssXhViuyOsLNdeahHAkWZqqCRmvU="; - x64sha256 = "rzk3PlGpGXDh3Ig3gKb9WSER6PzPKmp1PJJiD0sGVS4="; + buildVersion = "2121"; + aarch64sha256 = "WAT2gmAg63cu3FJIw5D3rRa+SNonymfsLaTY8ALa1ec="; + x64sha256 = "yWrrlDe5C90EMQVdpENWnGURcVEdxJlFkalEfPpztzQ="; } { }; sublime-merge-dev = common { diff --git a/pkgs/applications/video/kodi/addons/steam-library/default.nix b/pkgs/applications/video/kodi/addons/steam-library/default.nix index 03407280a02e..1052c8bcc56e 100644 --- a/pkgs/applications/video/kodi/addons/steam-library/default.nix +++ b/pkgs/applications/video/kodi/addons/steam-library/default.nix @@ -10,13 +10,13 @@ buildKodiAddon rec { pname = "steam-library"; namespace = "plugin.program.steam.library"; - version = "0.9.0"; + version = "0.10.0"; src = fetchFromGitHub { owner = "aanderse"; repo = namespace; rev = "v${version}"; - sha256 = "sha256-LVdFih0n/lkjyaYf8jw0IFlcDiXXOtUH2N9OduV1H9Q="; + sha256 = "sha256-HwPNBqD+zS5sDNXtiGEmoc1RJ1SFCRzVOzUCjunMCnU="; }; propagatedBuildInputs = [ diff --git a/pkgs/by-name/am/amazon-ec2-net-utils/package.nix b/pkgs/by-name/am/amazon-ec2-net-utils/package.nix index 7d2ec3384f2f..53675ae31dac 100644 --- a/pkgs/by-name/am/amazon-ec2-net-utils/package.nix +++ b/pkgs/by-name/am/amazon-ec2-net-utils/package.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "amazon-ec2-net-utils"; - version = "2.6.0"; + version = "2.7.1"; src = fetchFromGitHub { owner = "amazonlinux"; repo = "amazon-ec2-net-utils"; tag = "v${finalAttrs.version}"; - hash = "sha256-PtnRgNmVrIGndLjYjXWWx85z4oxjn637iZqXd6OSiQg="; + hash = "sha256-9dhTQLmWIOm0q51l/BgkxTFcUjub7w9Yk+QdvuZi/3k="; }; strictDeps = true; @@ -47,18 +47,18 @@ stdenv.mkDerivation (finalAttrs: { for file in bin/*.sh; do install -D -m 755 "$file" $out/bin/$(basename --suffix ".sh" "$file") - substituteInPlace $out/bin/$(basename --suffix ".sh" "$file") \ - --replace-fail AMAZON_EC2_NET_UTILS_LIBDIR $out/share/amazon-ec2-net-utils done + # setup-policy-routes uses AMAZON_EC2_NET_UTILS_LIBDIR placeholder substituteInPlace $out/bin/setup-policy-routes \ + --replace-fail AMAZON_EC2_NET_UTILS_LIBDIR $out/share/amazon-ec2-net-utils \ --replace-fail /lib/systemd ${systemd}/lib/systemd wrapProgram $out/bin/setup-policy-routes \ --prefix PATH : ${ lib.makeBinPath [ coreutils - # bin/setup-policy-roots.sh sources lib/lib.sh which needs these. + # bin/setup-policy-routes.sh sources lib/lib.sh which needs these. # # lib/lib.sh isn't executable so we can't use it with wrapProgram. curl @@ -70,6 +70,17 @@ stdenv.mkDerivation (finalAttrs: { ] } + # set-hostname-imds uses LIBDIR_OVERRIDE environment variable + wrapProgram $out/bin/set-hostname-imds \ + --set LIBDIR_OVERRIDE $out/share/amazon-ec2-net-utils \ + --prefix PATH : ${ + lib.makeBinPath [ + coreutils + curl + systemd + ] + } + for file in lib/*.sh; do install -D -m 644 -t $out/share/amazon-ec2-net-utils "$file" done @@ -98,6 +109,9 @@ stdenv.mkDerivation (finalAttrs: { substituteInPlace $out/lib/systemd/system/refresh-policy-routes@.service \ --replace-fail /usr/bin/setup-policy-routes $out/bin/setup-policy-routes + substituteInPlace $out/lib/systemd/system/set-hostname-imds.service \ + --replace-fail /usr/bin/set-hostname-imds $out/bin/set-hostname-imds + installManPage doc/*.8 runHook postInstall diff --git a/pkgs/by-name/au/auth0-cli/package.nix b/pkgs/by-name/au/auth0-cli/package.nix index a0a88a10e14f..7873573a0436 100644 --- a/pkgs/by-name/au/auth0-cli/package.nix +++ b/pkgs/by-name/au/auth0-cli/package.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "auth0-cli"; - version = "1.25.0"; + version = "1.25.1"; src = fetchFromGitHub { owner = "auth0"; repo = "auth0-cli"; tag = "v${version}"; - hash = "sha256-w0v73ZebUssDZ5mvFri9kcFVk7AXDfhSjEO48jTuRJc="; + hash = "sha256-Qtxn3VnqJOAIKI4jURFXnH5fHCWtZU419XtnjdqFlkY="; }; vendorHash = "sha256-WN71xEU9GBNj0M5tnVthBdxh13UH78zUOaCEtczFDck="; diff --git a/pkgs/by-name/ba/bant/package.nix b/pkgs/by-name/ba/bant/package.nix index de0d6b53e2b7..6b364c284223 100644 --- a/pkgs/by-name/ba/bant/package.nix +++ b/pkgs/by-name/ba/bant/package.nix @@ -20,13 +20,13 @@ let in buildBazelPackage rec { pname = "bant"; - version = "0.2.3"; + version = "0.2.4"; src = fetchFromGitHub { owner = "hzeller"; repo = "bant"; rev = "v${version}"; - hash = "sha256-0RWR793+qXc5QYIc7wIL323iDkNts9w4e90FCdHT6t4="; + hash = "sha256-A+qaFTfAAU2k4AnFB+0ahw1udmJ+BIOK8Af0OQ+4LMY="; }; bazelFlags = [ diff --git a/pkgs/by-name/bt/btop/package.nix b/pkgs/by-name/bt/btop/package.nix index 53c8ee7fc3a7..e781eb4038e2 100644 --- a/pkgs/by-name/bt/btop/package.nix +++ b/pkgs/by-name/bt/btop/package.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "btop"; - version = "1.4.5"; + version = "1.4.6"; src = fetchFromGitHub { owner = "aristocratos"; repo = "btop"; tag = "v${finalAttrs.version}"; - hash = "sha256-ZLT+Hc1rvBFyhey+imbgGzSH/QaVxIh/jvDKVSmDrA0="; + hash = "sha256-h472rcXzpBkPYAEy9JaVlanaavaz0WcdkhmwsVdDRdo="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ch/chirp/package.nix b/pkgs/by-name/ch/chirp/package.nix index 855184dcb27a..a370e2fb8643 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-2025-12-18"; + version = "0.4.0-unstable-2025-12-23"; pyproject = true; src = fetchFromGitHub { owner = "kk7ds"; repo = "chirp"; - rev = "2d4950134e89df7d9b2bde975dfe90edf02220cc"; - hash = "sha256-3d2tH+3ecQeF6OkXElwBe18iHp3Nvxwt3vufTVotAK4="; + rev = "79cb755ff71afe2266da4a4aa40e573929d7b071"; + hash = "sha256-LyHS4LG2e70IAPKLFwAdcfjDyNJNU2etG7VzEnvQy6g="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/cn/cnquery/package.nix b/pkgs/by-name/cn/cnquery/package.nix index 9cc0bf420a69..58f582f9693e 100644 --- a/pkgs/by-name/cn/cnquery/package.nix +++ b/pkgs/by-name/cn/cnquery/package.nix @@ -6,18 +6,18 @@ buildGoModule rec { pname = "cnquery"; - version = "12.14.0"; + version = "12.15.0"; src = fetchFromGitHub { owner = "mondoohq"; repo = "cnquery"; tag = "v${version}"; - hash = "sha256-zVyt1/j87vK3UqA/NbFU9PRs1yWxcBSmV2V6nXwh27g="; + hash = "sha256-Vw+jGxPQBIwrHvh5JGJss5H9DR9QnktsKlW1CRnEN4Q="; }; subPackages = [ "apps/cnquery" ]; - vendorHash = "sha256-DyRGllgUFS/r5/SvzW3Lh+dz1z9dWskHzIDTvGlR23o="; + vendorHash = "sha256-BKMzSdl5h9bVTNviSv7KeI7cz6QTP0jX+LU9HqWkVgo="; ldflags = [ "-w" diff --git a/pkgs/by-name/co/codex-acp/package.nix b/pkgs/by-name/co/codex-acp/package.nix index a7495f359b44..aea61bbfcde8 100644 --- a/pkgs/by-name/co/codex-acp/package.nix +++ b/pkgs/by-name/co/codex-acp/package.nix @@ -7,16 +7,16 @@ }: rustPlatform.buildRustPackage rec { pname = "codex-acp"; - version = "0.7.3"; + version = "0.7.4"; src = fetchFromGitHub { owner = "zed-industries"; repo = "codex-acp"; tag = "v${version}"; - hash = "sha256-QePCPTQsuW69TieWqiseI+TZi0N+2VpqZjNryo83Qxg="; + hash = "sha256-QGK4CkcH3eaOsjBwCoUSIYglFQ7pw0KtIfJAR9tTpbI="; }; - cargoHash = "sha256-HtprRteC5UBiX+3QJ+4z+DE2XVUEzBTlsnF8Fxwa2T8="; + cargoHash = "sha256-Cojr5+ZZTpnOYA0QJ622UFlMhiEbdkkxvnVQqkFxBEI="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/dy/dyff/package.nix b/pkgs/by-name/dy/dyff/package.nix index 1d73f922e07b..f993e55bb1d4 100644 --- a/pkgs/by-name/dy/dyff/package.nix +++ b/pkgs/by-name/dy/dyff/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "dyff"; - version = "1.10.2"; + version = "1.10.3"; src = fetchFromGitHub { owner = "homeport"; repo = "dyff"; rev = "v${version}"; - sha256 = "sha256-kmL1WzsfuV6O3mFryQKnUeImisMlLd3K43/00l6Trvs="; + sha256 = "sha256-tMb/SjrD1Sruvb/qeKu75EwTg4MyX9rCT0T4cJzIyko="; }; - vendorHash = "sha256-8xXw2ITHqw6dPtRuO4aesJzeobb/QGI+z1tn1ebNdzQ="; + vendorHash = "sha256-NPCC8cVpJ07k5H4z2/fiPkxiWgW852pWqyW4gIQfIpw="; subPackages = [ "cmd/dyff" diff --git a/pkgs/by-name/fl/fluida-lv2/package.nix b/pkgs/by-name/fl/fluida-lv2/package.nix new file mode 100644 index 000000000000..71549bdd7721 --- /dev/null +++ b/pkgs/by-name/fl/fluida-lv2/package.nix @@ -0,0 +1,53 @@ +{ + lib, + stdenv, + fetchFromGitHub, + pkg-config, + libX11, + cairo, + lv2, + fluidsynth, + writableTmpDirAsHomeHook, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "fluida-lv2"; + version = "0.9.5"; + + src = fetchFromGitHub { + owner = "brummer10"; + repo = "Fluida.lv2"; + tag = "v${finalAttrs.version}"; + # submodule: https://github.com/brummer10/libxputty.git + fetchSubmodules = true; + hash = "sha256-5Oud5s81DIc7p/GAJT3i8FHHBh4y9uJqOxfchmX1nE4="; + }; + + nativeBuildInputs = [ + writableTmpDirAsHomeHook + pkg-config + ]; + + buildInputs = [ + cairo + fluidsynth + libX11 + lv2 + ]; + + postInstall = '' + # Output files were installed in ~/.lv2 + # copy to the output directory: + mkdir -p $out/lib/lv2 + cp -r $HOME/.lv2/* $out/lib/lv2/ + ''; + + meta = { + changelog = "https://github.com/brummer10/Fluida.lv2/releases/tag/v${finalAttrs.version}"; + description = "Fluidsynth as LV2 plugin"; + homepage = "https://github.com/brummer10/Fluida.lv2"; + license = lib.licenses.gpl2; + maintainers = with lib.maintainers; [ joostn ]; + platforms = [ "x86_64-linux" ]; + }; +}) diff --git a/pkgs/by-name/fm/fm-go/package.nix b/pkgs/by-name/fm/fm-go/package.nix index 473759c4aa07..568b37d94345 100644 --- a/pkgs/by-name/fm/fm-go/package.nix +++ b/pkgs/by-name/fm/fm-go/package.nix @@ -7,16 +7,16 @@ let finalAttrs = { pname = "fm"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "mistakenelf"; repo = "fm"; rev = "v${finalAttrs.version}"; - hash = "sha256-m0hjLXgaScJydwiV00b8W7f1y1Ka7bbYqcMPAOw1j+c="; + hash = "sha256-5+hwubyMgnyYPR7+UdK8VEyk2zo4kniBu7Vj4QarvMg="; }; - vendorHash = "sha256-/tUL08Vo3W7PMPAnJA9RPdMl0AwZj8BzclYs2257nqM="; + vendorHash = "sha256-uhrE8ZuUeQSm+Jg1xi83RsBrzjex+aBlElJRT61k0BU="; meta = { homepage = "https://github.com/mistakenelf/fm"; diff --git a/pkgs/by-name/fo/forgejo-runner/package.nix b/pkgs/by-name/fo/forgejo-runner/package.nix index f9ac1605b371..e3a367a0c37e 100644 --- a/pkgs/by-name/fo/forgejo-runner/package.nix +++ b/pkgs/by-name/fo/forgejo-runner/package.nix @@ -48,14 +48,14 @@ let in buildGoModule rec { pname = "forgejo-runner"; - version = "12.2.0"; + version = "12.3.1"; src = fetchFromGitea { domain = "code.forgejo.org"; owner = "forgejo"; repo = "runner"; rev = "v${version}"; - hash = "sha256-UzBRIa+mhynJDYHzssApMPyLeHdFVSAZ6SZtPbtJpB4="; + hash = "sha256-Rw6/G4gbWKikYjeKYw2cHxLMw8ULqnbhqHQFDzHCMrY="; }; vendorHash = "sha256-ReGxoPvW4G6DbFfR2OeeT3tupZkpLpX80zK824oeyVg="; diff --git a/pkgs/by-name/fo/foundry/package.nix b/pkgs/by-name/fo/foundry/package.nix index 28689b0e3e02..2f6b138fe16b 100644 --- a/pkgs/by-name/fo/foundry/package.nix +++ b/pkgs/by-name/fo/foundry/package.nix @@ -13,16 +13,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "foundry"; - version = "1.5.0"; + version = "1.5.1"; src = fetchFromGitHub { owner = "foundry-rs"; repo = "foundry"; tag = "v${finalAttrs.version}"; - hash = "sha256-mbOv5XZH+AYZQjSUI+ksuAdLxZyRdF0LXK/8Q1DIgrU="; + hash = "sha256-dMYuv5noIn86WuUJkUixnoNGLgByacung/TBU+EYhUw="; }; - cargoHash = "sha256-vws7LcBRtoha+Sa4TLDNxMKA8caKkWFOauCLZs6we4Y="; + cargoHash = "sha256-+5RLCkAQR8UepdUIsq1FnQmjKMg7YNC1Sxu0CVpWcnc="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/go/go-cve-search/package.nix b/pkgs/by-name/go/go-cve-search/package.nix index 483c8a7414e7..8d647a459cf3 100644 --- a/pkgs/by-name/go/go-cve-search/package.nix +++ b/pkgs/by-name/go/go-cve-search/package.nix @@ -12,7 +12,7 @@ buildGoModule rec { owner = "s-index"; repo = "go-cve-search"; tag = "v${version}"; - hash = "sha256-ofa6lfA3XKj70YM6AVNKRgGI53teK7OB09luAom8HpQ="; + hash = "sha256-gx2No5XGflGY6TIU92gz9XrNDzd4NiSuxpbwxChlqWo="; }; vendorHash = "sha256-QXYjLPrfIPcZE8UTcE1kR9QQIusR/rAJG+e/IQ4P0PU="; diff --git a/pkgs/by-name/go/goawk/package.nix b/pkgs/by-name/go/goawk/package.nix index 3e33ee995bca..badaffbd0730 100644 --- a/pkgs/by-name/go/goawk/package.nix +++ b/pkgs/by-name/go/goawk/package.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "goawk"; - version = "1.30.1"; + version = "1.31.0"; src = fetchFromGitHub { owner = "benhoyt"; repo = "goawk"; rev = "v${version}"; - hash = "sha256-143KcCeZOwn3FkAtpPkfbyTupYCWw2R+tD7R3ldla6I="; + hash = "sha256-Luz6boPGIJqF/PJHZmnu3zChT5g8Wt37eOMtFS7j2pI="; }; vendorHash = null; diff --git a/pkgs/by-name/ju/just-lsp/package.nix b/pkgs/by-name/ju/just-lsp/package.nix index d962984fe974..d3d2a538eeb6 100644 --- a/pkgs/by-name/ju/just-lsp/package.nix +++ b/pkgs/by-name/ju/just-lsp/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "just-lsp"; - version = "0.2.8"; + version = "0.3.0"; src = fetchFromGitHub { owner = "terror"; repo = "just-lsp"; tag = finalAttrs.version; - hash = "sha256-QwpChzZ+zC4MoVp6kNqbNF6+p4Rsd0KJfVuKPyxnnZU="; + hash = "sha256-VA6rUcOc/O4KocefxGr4BFnGSb1Gv8+UObtHua/6lbg="; }; - cargoHash = "sha256-j/qLLyt9Sl1cXfNkKsyEYL/MQbxRMhni6uGmRVI+Xd8="; + cargoHash = "sha256-t+a24rBEHLgnrADRzMtrZHdeQ2tDxHK/bMzYidLPNQw="; passthru = { updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ki/kind/package.nix b/pkgs/by-name/ki/kind/package.nix index d000d31b2bd3..8dc96202b9f5 100644 --- a/pkgs/by-name/ki/kind/package.nix +++ b/pkgs/by-name/ki/kind/package.nix @@ -11,13 +11,13 @@ buildGoModule rec { pname = "kind"; - version = "0.30.0"; + version = "0.31.0"; src = fetchFromGitHub { rev = "v${version}"; owner = "kubernetes-sigs"; repo = "kind"; - hash = "sha256-TssyKO5v3xqSDjS3DYIlO7iOx/zzS3E9O88V9R7S5Ac="; + hash = "sha256-3icwtfwlSkYOEw9bzEhKJC7OtE1lnBjZSYp+cC/2XNc="; }; patches = [ diff --git a/pkgs/by-name/ku/kube-bench/package.nix b/pkgs/by-name/ku/kube-bench/package.nix index d9d1aeff0645..023b775aa02d 100644 --- a/pkgs/by-name/ku/kube-bench/package.nix +++ b/pkgs/by-name/ku/kube-bench/package.nix @@ -10,7 +10,7 @@ buildGoModule (finalAttrs: { pname = "kube-bench"; - version = "0.14.0"; + version = "0.14.1"; __darwinAllowLocalNetworking = true; # required for tests @@ -18,10 +18,10 @@ buildGoModule (finalAttrs: { owner = "aquasecurity"; repo = "kube-bench"; tag = "v${finalAttrs.version}"; - hash = "sha256-zu1ckblQnn3Df71myPIYebIQHjMi7S3LoSbsY8RAiVQ="; + hash = "sha256-ZX4va+Ft5OAZb90pn3AfXrG7Wp4KVy3C6FO9TCLy6zM="; }; - vendorHash = "sha256-qRtEkYL+OgcfdYS+u2vRynr+6w6ZEEURxOXE/vCt2fM="; + vendorHash = "sha256-whBFvChlpp6wnFLXL6ejB8l92q1q4kOaXxvIrRQmmjE="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/ku/kube-linter/package.nix b/pkgs/by-name/ku/kube-linter/package.nix index 43ed7aeff4c4..b972f8b772b6 100644 --- a/pkgs/by-name/ku/kube-linter/package.nix +++ b/pkgs/by-name/ku/kube-linter/package.nix @@ -10,13 +10,13 @@ buildGoModule rec { pname = "kube-linter"; - version = "0.8.0"; + version = "0.8.1"; src = fetchFromGitHub { owner = "stackrox"; repo = "kube-linter"; rev = "v${version}"; - sha256 = "sha256-SYGxwS74+tcgbl2KwNJN2KdM/VSV4uN8aAW29b54i1U="; + sha256 = "sha256-UUg7QOu+G5g8cj1C2q9G6km002kqOjOiesdFGy8BqgI="; }; vendorHash = "sha256-A8aNyMX9WtDDuqy6qOHTQkLnuckcsHEKZ3mfnC4Rx2s="; diff --git a/pkgs/by-name/ku/kubecm/package.nix b/pkgs/by-name/ku/kubecm/package.nix index 5cffcf649c54..adac2e072f1d 100644 --- a/pkgs/by-name/ku/kubecm/package.nix +++ b/pkgs/by-name/ku/kubecm/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "kubecm"; - version = "0.33.3"; + version = "0.34.0"; src = fetchFromGitHub { owner = "sunny0826"; repo = "kubecm"; rev = "v${version}"; - hash = "sha256-pezn1s2IvAfVbF8b5jJ4uoVNi5g/2OfUuE4YXrK0gZk="; + hash = "sha256-UPjo21tbPCC+l6aWrTcYZEJ9a1k8/kJ7anBHWZSkYwI="; }; - vendorHash = "sha256-HKHUN3vOhNl46T06pMUZIjcZMxDw/gkeimbs7kdmtdI="; + vendorHash = "sha256-P+CkGgMCDpW/PaGFljj+WRxfeieuTFax6xvNq6p8lHw="; ldflags = [ "-s" "-w" diff --git a/pkgs/by-name/ku/kubedock/package.nix b/pkgs/by-name/ku/kubedock/package.nix index 6d82bff7357a..2425950c4b38 100644 --- a/pkgs/by-name/ku/kubedock/package.nix +++ b/pkgs/by-name/ku/kubedock/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "kubedock"; - version = "0.19.0"; + version = "0.20.0"; src = fetchFromGitHub { owner = "joyrex2001"; repo = "kubedock"; rev = version; - hash = "sha256-Kw18zTTZDWB4I4HdiHUv4GTBT4qC3ChAdL/60VF1rjk="; + hash = "sha256-6I4fIaFtA4WjYQ0RO9tniUGH1p6hnYcazj6VNOyElLg="; }; - vendorHash = "sha256-uICdDBOctvFlLIXC10UqAzUyJSbpq206kcxwJqAfLtk="; + vendorHash = "sha256-QLiu014QowDqebDCXSxOH2TPHUG2d+34mlnbo3NdafA="; # config.Build not defined as it would break r-ryantm ldflags = [ diff --git a/pkgs/by-name/le/leetgo/package.nix b/pkgs/by-name/le/leetgo/package.nix index 78144fbead0a..aa2cd2f1ab47 100644 --- a/pkgs/by-name/le/leetgo/package.nix +++ b/pkgs/by-name/le/leetgo/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "leetgo"; - version = "1.4.15"; + version = "1.4.16"; src = fetchFromGitHub { owner = "j178"; repo = "leetgo"; rev = "v${version}"; - hash = "sha256-9GM4V7NOYMsvWwBgJSnGl4/S+UexdlVL/NyIiMRnL8A="; + hash = "sha256-rhMEeVkH9Z0pvtOtxooZKaiIQYyc067vqdSB9SIvqxg="; }; - vendorHash = "sha256-I3H2uVIvOGM6aQelM/69LpwJvg3TBZwq3i4R913etH4="; + vendorHash = "sha256-nKGLjpxtjcoR1mO1/ZhDoLubzfkws2nE5qvk2jqYGf4="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/li/libvpl/package.nix b/pkgs/by-name/li/libvpl/package.nix index 1d4b09a892aa..d977947a9df3 100644 --- a/pkgs/by-name/li/libvpl/package.nix +++ b/pkgs/by-name/li/libvpl/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "libvpl"; - version = "2.15.0"; + version = "2.16.0"; src = fetchFromGitHub { owner = "intel"; repo = "libvpl"; rev = "v${finalAttrs.version}"; - hash = "sha256-aCoyIHgX3ftlk0CKg/cXNAVjuGI8GMT358GoiyaNjnI="; + hash = "sha256-TbneMexrGShBE83WRCHvECucG2/eYMtljwb3yvCTP7k="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/li/limine/package.nix b/pkgs/by-name/li/limine/package.nix index f9ca65329200..a83dc8824125 100644 --- a/pkgs/by-name/li/limine/package.nix +++ b/pkgs/by-name/li/limine/package.nix @@ -47,14 +47,14 @@ in # as bootloader for various platforms and corresponding binary and helper files. stdenv.mkDerivation (finalAttrs: { pname = "limine"; - version = "10.5.0"; + version = "10.5.1"; # We don't use the Git source but the release tarball, as the source has a # `./bootstrap` script performing network access to download resources. # Packaging that in Nix is very cumbersome. src = fetchurl { url = "https://codeberg.org/Limine/Limine/releases/download/v${finalAttrs.version}/limine-${finalAttrs.version}.tar.gz"; - hash = "sha256-2hTBjv9L2lYsxExpx+KuvZQZrB8ci+MtdiMuqjZ1A9I="; + hash = "sha256-sD41QQJ3zGDHinynlj5lpZoOPVPyutMCLDnNZNmttHI="; }; enableParallelBuilding = true; diff --git a/pkgs/by-name/lu/luminaut/package.nix b/pkgs/by-name/lu/luminaut/package.nix new file mode 100644 index 000000000000..83e2debe0337 --- /dev/null +++ b/pkgs/by-name/lu/luminaut/package.nix @@ -0,0 +1,66 @@ +{ + lib, + fetchFromGitHub, + nmap, + python3, + whatweb, +}: + +python3.pkgs.buildPythonApplication rec { + pname = "luminaut"; + version = "0.13.2"; + pyproject = true; + + src = fetchFromGitHub { + owner = "luminaut-org"; + repo = "luminaut"; + tag = "v${version}"; + hash = "sha256-TPb/Rk1cLCwItfsv/R2qyixCXA8aNnltiGePjdpO6GM="; + }; + + pythonRelaxDeps = true; + + build-system = with python3.pkgs; [ hatchling ]; + + dependencies = [ + nmap + whatweb + ] + ++ (with python3.pkgs; [ + boto3 + google-cloud-compute + google-cloud-logging + google-cloud-run + orjson + python3-nmap + rich + shodan + tqdm + ]); + + nativeCheckInputs = with python3.pkgs; [ + moto + pytest-cov-stub + pytestCheckHook + ]; + + pythonImportsCheck = [ "luminaut" ]; + + disabledTests = [ + # Tests require setting a region + "test_explore_region" + "test_list_security_group_rules" + "test_setup_client_region" + "test_skip_resource" + "test_discover_public_ips_only_runs_if_aws_enabled" + ]; + + meta = { + description = "Tool to detect exposure of resources deployed in AWS"; + homepage = "https://github.com/luminaut-org/luminaut"; + changelog = "https://github.com/luminaut-org/luminaut/releases/tag/${src.tag}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ fab ]; + mainProgram = "luminaut"; + }; +} diff --git a/pkgs/by-name/mo/modrinth-app-unwrapped/deps.json b/pkgs/by-name/mo/modrinth-app-unwrapped/deps.json index 889349230274..a36c1f6b3e9f 100644 --- a/pkgs/by-name/mo/modrinth-app-unwrapped/deps.json +++ b/pkgs/by-name/mo/modrinth-app-unwrapped/deps.json @@ -21,20 +21,13 @@ "jar": "sha256-gSZpIKHNxHMGqKK0cmyZ7Imz+/McJHDk9eR32dhXyp8=", "pom": "sha256-+ZXFCx0gl18KjW8OUyK8jRPHiuPcGCcXdoQUlypmzIU=" }, - "com/google/code/gson#gson-parent/2.10.1": { - "pom": "sha256-QkjgiCQmxhUYI4XWCGw+8yYudplXGJ4pMGKAuFSCuDM=" + "com/gradleup/shadow#com.gradleup.shadow.gradle.plugin/9.2.2": { + "pom": "sha256-ZLCuyyPFfukfzPJXx4F8uyxpXQT565nM+9pth/TFlOk=" }, - "com/google/code/gson#gson/2.10.1": { - "jar": "sha256-QkHBSncnw0/uplB+yAExij1KkPBw5FJWgQefuU7kxZM=", - "pom": "sha256-0rEVY09cCF20ucn/wmWOieIx/b++IkISGhzZXU2Ujdc=" - }, - "com/gradleup/shadow#com.gradleup.shadow.gradle.plugin/9.0.0-rc2": { - "pom": "sha256-uKkn9s51uhAWjcrA8xjfpYEyzmuUB6c57mfbUHeuAtc=" - }, - "com/gradleup/shadow#shadow-gradle-plugin/9.0.0-rc2": { - "jar": "sha256-ahe27qKH9v4Twu4FPpuoOreLRsymwFPtOMxSgonaIdo=", - "module": "sha256-knUwimifoY61+xvPfcvmH60Jkbr99Osmmo7zDQx+gbk=", - "pom": "sha256-WqoWzo1nn3vXlmrNdvy9QLx6aEfIT+a0tKlcpQZuo9k=" + "com/gradleup/shadow#shadow-gradle-plugin/9.2.2": { + "jar": "sha256-rqYDnab2KTcMEKFxcOjz2o1nPhS++FgL0aZc3kSQc9A=", + "module": "sha256-4tXqtRULxjBI6WcI6t6/0XbmOfIsgFFoBVszcQdo3YI=", + "pom": "sha256-bO3IWZV0n5H/XNb8Z3H6PfZ4qlZSIl5uoFjNnXmVjGo=" }, "commons-io#commons-io/2.20.0": { "jar": "sha256-35C7oP48tYa38WTnj+j49No/LdXCf6ZF+IgQDMwl3XI=", @@ -67,21 +60,21 @@ "module": "sha256-1sIlTINHuEzahMr3SRShh8Lzd+QoTo2Ls/kBUhgQqos=", "pom": "sha256-qkTrUr/f5h0ns+RQ0rNI2I3qo0N6tNnUmoQJU0j59vs=" }, - "org/apache/logging/log4j#log4j-api/2.25.1": { - "jar": "sha256-ILnHfAqeVNEGOjnlUdyvmMfY56SZRkj4TQueFMcfchU=", - "module": "sha256-6tMmKCISCzyfiiDNDZnVY1lg1SeyBD1n//Zr6HeDHJo=", - "pom": "sha256-up6JUpGBShh506YMLUEReZMk64R5seASpHs1GjeIMcM=" + "org/apache/logging/log4j#log4j-api/2.25.2": { + "jar": "sha256-n9Zsn+C+oG+pZmwUeYmkbK+qkrSoh1NpfTlFzEMzjLs=", + "module": "sha256-WPeF66u6zDA/Ow5aSF91X9qzKQ9p5JsDT4lj0ngjZV4=", + "pom": "sha256-CVYJaiUCQIyVioMXTytqV9yy5bB7uRTISHMrRLirvcM=" }, - "org/apache/logging/log4j#log4j-bom/2.25.1": { - "pom": "sha256-uKwjMoSXEbL3R0QVk3vbuWfSuTAO9M/+PzW+Oxqhik4=" + "org/apache/logging/log4j#log4j-bom/2.25.2": { + "pom": "sha256-Tym32cLZcP0qZpcXa/fd3EFQifYNaW0ov98xsk6S8Rw=" }, - "org/apache/logging/log4j#log4j-core/2.25.1": { - "jar": "sha256-eMIydHhVRksYLwq/eKmaIsiNTScP9YU0PatVV210IOI=", - "module": "sha256-pEq9beGPyZl+VT5fUXldXA2g9fOC2gNaubnt7HXlZnU=", - "pom": "sha256-nps2cOfwwwmXHS3TQ3qxEdPApmg9MgTWC2ql5KhELLg=" + "org/apache/logging/log4j#log4j-core/2.25.2": { + "jar": "sha256-5Q23cBQw/5B5gYUO9SekHVGlPdABf1Oghgr8urhXAnc=", + "module": "sha256-JRQSc3eFDwR83jJbc7efriEzKSK+tkmiUzr9CEIlihE=", + "pom": "sha256-L/9GPTmclAgtmCLCG/v0cOEFHbt9S0XyWw54G8Xg9BI=" }, - "org/apache/logging/log4j#log4j/2.25.1": { - "pom": "sha256-CuZl9wnhMQboIwM2+GzYMrgbytXAWQlyXD/3dD3U/10=" + "org/apache/logging/log4j#log4j/2.25.2": { + "pom": "sha256-HYBXBY0LBcj3clyhrbpoc5y+rHWJjsoGpIymEVRsA+w=" }, "org/apache/maven#maven-api-annotations/4.0.0-rc-3": { "jar": "sha256-XTSQ9yrTp+gr6IsnYp83xZ/SUxuuURw7E4ZkINXYYr0=", @@ -113,18 +106,31 @@ "org/eclipse/ee4j#project/1.0.7": { "pom": "sha256-IFwDmkLLrjVW776wSkg+s6PPlVC9db+EJg3I8oIY8QU=" }, - "org/gradle/toolchains#foojay-resolver/0.10.0": { - "jar": "sha256-DNfKn57RuooyPxkCwFryHdYiOhMDRfvnj15I1YzNbUw=", - "module": "sha256-SduV7YEABA8dZfCWuied7msSeCSNL3k7z7itAg59HNA=", - "pom": "sha256-vndZUF4PPTTVzJzcaGwZxlIuhMzg+MEJ69LW9HsYqSU=" + "org/gradle/toolchains#foojay-resolver/1.0.0": { + "jar": "sha256-eLhqR9/fdpfJvRXaeJg/2A2nJH1uAvwQa98H4DiLYKg=", + "module": "sha256-YZDPDkLmZMEeGsCnhWmasCtUnOo0OSxnnzbYosVQ/Lk=", + "pom": "sha256-m8SLSeQi2e2rw5asGNiwQd/CIhLX+ujjVmfShdSBApo=" }, - "org/gradle/toolchains/foojay-resolver-convention#org.gradle.toolchains.foojay-resolver-convention.gradle.plugin/0.10.0": { - "pom": "sha256-OpLrFa3uBcGiaCT2SIcqVx6fk99koO3L4TTjjtLY4Q8=" + "org/gradle/toolchains/foojay-resolver-convention#org.gradle.toolchains.foojay-resolver-convention.gradle.plugin/1.0.0": { + "pom": "sha256-8TMkmhh1Suah0nAdANhJsa+6ewaD3bX8GxinAHHOwvo=" }, "org/jdom#jdom2/2.0.6.1": { "jar": "sha256-CyD0XjoP2PDRLNxTFrBndukCsTZdsAEYh2+RdcYPMCw=", "pom": "sha256-VXleEBi4rmR7k3lnz4EKmbCFgsI3TnhzwShzTIyRS/M=" }, + "org/jetbrains#annotations/13.0": { + "jar": "sha256-rOKhDcji1f00kl7KwD5JiLLA+FFlDJS4zvSbob0RFHg=", + "pom": "sha256-llrrK+3/NpgZvd4b96CzuJuCR91pyIuGN112Fju4w5c=" + }, + "org/jetbrains/kotlin#kotlin-metadata-jvm/2.2.20": { + "jar": "sha256-hSTqyQ9+jg8TZog/LGyCDJO/ph3z12hXyNPoA89nMV0=", + "pom": "sha256-e2qAtqLSZ2oEIvaWg4EyMVQlUfYbMgxochz7nh9ZCdA=" + }, + "org/jetbrains/kotlin#kotlin-stdlib/2.0.21": { + "jar": "sha256-8xzFPxBafkjAk2g7vVQ3Vh0SM5IFE3dLRwgFZBvtvAk=", + "module": "sha256-gf1tGBASSH7jJG7/TiustktYxG5bWqcpcaTd8b0VQe0=", + "pom": "sha256-/LraTNLp85ZYKTVw72E3UjMdtp/R2tHKuqYFSEA+F9o=" + }, "org/junit#junit-bom/5.11.4": { "module": "sha256-qaTye+lOmbnVcBYtJGqA9obSd9XTGutUgQR89R2vRuQ=", "pom": "sha256-GdS3R7IEgFMltjNFUylvmGViJ3pKwcteWTpeTE9eQRU=" @@ -165,63 +171,63 @@ } }, "https://repo.maven.apache.org/maven2": { - "com/google/code/gson#gson-parent/2.13.1": { - "pom": "sha256-+IEKzlDd/j/ag9ESbeZdmdXSUVoUo2uIvrG5mkdpeDY=" + "com/google/code/gson#gson-parent/2.13.2": { + "pom": "sha256-g6tSip1Q/XauuK1vcns+6ct2ZYYlV3TtFsqMTHbZ2s0=" }, - "com/google/code/gson#gson/2.13.1": { - "jar": "sha256-lIVZQtSZLxEpRtPeHDNOcJI3uBJtgTC/B4B8AYpKISA=", - "pom": "sha256-wPZXItdcDljNGDWzBGBG9ga12mmZBBYfjba3j+ubQBo=" + "com/google/code/gson#gson/2.13.2": { + "jar": "sha256-3QzhtVo+0ggMtw+cZVhQzahsIGhiMQAJ3LXlyVJlpeA=", + "pom": "sha256-OqBqp8D5rwkpYaQtCVeOQyS+FGNIoO5u1HhX98Jne3Y=" }, - "com/google/errorprone#error_prone_annotations/2.38.0": { - "jar": "sha256-ZmHVM1CQpfxh3YadIJW8bB4hVuOqR6bkq6vfZMmaeIk=", - "pom": "sha256-MAe++K/zro6hLYHD/qy08Vl5ss9cPjj8kYmpjeoUEWc=" + "com/google/errorprone#error_prone_annotations/2.41.0": { + "jar": "sha256-pW54K1tQgRrCBAc6NVoh2RWiEH/OE+xxEzGtA29mD8w=", + "pom": "sha256-oVHfHi4LSGGNiwahgHSKKbOrs5sbI5b2och5pydIjG4=" }, - "com/google/errorprone#error_prone_parent/2.38.0": { - "pom": "sha256-5iRYpqPmMIG8fFezwPrJ8E92zjL2BlMttp/is9R7k0w=" + "com/google/errorprone#error_prone_parent/2.41.0": { + "pom": "sha256-xTg4jXYKXByY3PBvbtPP5fEaZRgn21y9LtgojHlcrUI=" }, "org/apiguardian#apiguardian-api/1.1.2": { "jar": "sha256-tQlEisUG1gcxnxglN/CzXXEAdYLsdBgyofER5bW3Czg=", "module": "sha256-4IAoExN1s1fR0oc06aT7QhbahLJAZByz7358fWKCI/w=", "pom": "sha256-MjVQgdEJCVw9XTdNWkO09MG3XVSemD71ByPidy5TAqA=" }, - "org/junit#junit-bom/5.12.1": { - "module": "sha256-TdKqnplFecYwRX35lbkZsDVFYzZGNy6q3R0WXQv1jBo=", - "pom": "sha256-fIJrxyvt3IF9rZJjAn+QEqD1Wjd9ON+JxCkyolAcK/A=" + "org/junit#junit-bom/5.14.0": { + "module": "sha256-etPdstdOanfWWuiaykXUaMl7+ZFba8UvRJ1nXk5vmzU=", + "pom": "sha256-9apHs2ZIPo0fm+8Q5noMZvZq/A8zHJ+WaxMQutYND28=" }, - "org/junit/jupiter#junit-jupiter-api/5.12.1": { - "jar": "sha256-pAHgtgNz7fffCWLCXrMhPkUaR3h5LTOnaHbDuKW7IJs=", - "module": "sha256-iv9r5FYIFhBl7mO4QDyfKTE6HdnzkfP5eIVlpiMxGXY=", - "pom": "sha256-zqRvFdpTNT8vtSYZyvbcAH7CqE8O2vQMwSV/jjzvd9w=" + "org/junit/jupiter#junit-jupiter-api/5.14.0": { + "jar": "sha256-00MaAEuDgjvN2VtnOBMAh+wysvsopaXetPvBY1e6uPk=", + "module": "sha256-V86ZtxkZ0eDbZV6tULSICJBLKO5qv3xUWBB/mEjVw1o=", + "pom": "sha256-BB5HJeF9zQfpo65wj6aHHXEq3dsLXTbqy0D1xC4nE7s=" }, - "org/junit/jupiter#junit-jupiter-engine/5.12.1": { - "jar": "sha256-Dn8tvrkb+usNTLM6SHNRuvDlpu1ykGFU2P2ZddMpxZI=", - "module": "sha256-tvSQZ/FmJdFN7gmT8weKTGYeF8kOV0yf0SoWRur98tA=", - "pom": "sha256-GCeXDlNI10sY6757guDLGdxOj5np1NmEyyZJTVcTPao=" + "org/junit/jupiter#junit-jupiter-engine/5.14.0": { + "jar": "sha256-IDt6JAsVcW+LiB4t+rDFgPHaWydKGW/zYPjK2i0XUuo=", + "module": "sha256-KGfhYWM1n7KIfHUvqy8A0Z2Pyj8NzO2dHV8BiM32rgY=", + "pom": "sha256-KPX4YI+V7PYg3qXcJg2BTF6RFZuKrayxa5QrcVBmXZI=" }, - "org/junit/jupiter#junit-jupiter-params/5.12.1": { - "jar": "sha256-WVFwaZnjWVHU3w7KbgkdNhn2WanBCFjy9aPOGRy1dnM=", - "module": "sha256-KYwQtU+G3dtCeclfSYnRW+DV5QDEU+yTXv1Wd8v6Guk=", - "pom": "sha256-dHNtHnFnHQDeQFyxnD2GhOHFl9BwfeJmH7gHGyeEJ8M=" + "org/junit/jupiter#junit-jupiter-params/5.14.0": { + "jar": "sha256-f7tRg3khwylgS6EZ3BrwVz02Iw6oD3hqo9T9jB27ihs=", + "module": "sha256-V/+2UZyCd8xdhK7GB1hLfcPgA/Dtjc4sJYBHBWHELGY=", + "pom": "sha256-RkOJ7Dv6ZGLKy944a9Ba0f9/3iCY24vQXD73fC5Omdg=" }, - "org/junit/jupiter#junit-jupiter/5.12.1": { - "jar": "sha256-IoqUye50PVW/6gm1djBoHqeyCmYaR3RH9cH2DcEtnjo=", - "module": "sha256-OY71Q1eCyqfceKDRVRBpP6Xt7w/HP5PFVOZ3FxtCIj4=", - "pom": "sha256-m42YgPjFl2/JUEKEnzsSwRWdom5UUkMSY3edCx54yKQ=" + "org/junit/jupiter#junit-jupiter/5.14.0": { + "jar": "sha256-qJUBx26Rq/3AggGs2qrmgdXI1Zti83XVkptmgaARj0M=", + "module": "sha256-cbSt8Ak6UM6YuGLTp1eIinVug+X58LsfU0guaQ4zWQo=", + "pom": "sha256-lKGuTY5jmp+gt0JTGMQjwf3U8tJlFoDnxjNvRlUwl5M=" }, - "org/junit/platform#junit-platform-commons/1.12.1": { - "jar": "sha256-wxYWNYGqpWSSgBIrEuo2/k6cICoaImd1P+p8nh3wVes=", - "module": "sha256-ypN54aC/xbLOQ8dOh0SxT7fEkhPiISv1pH7QIv3bMM4=", - "pom": "sha256-tzKBEektR47QlWxjCgwkZm52gbUTgWj6FchbUJRqcAM=" + "org/junit/platform#junit-platform-commons/1.14.0": { + "jar": "sha256-5UOjqEIvHf5gR/U1MFtwx3fg20MfHvP1XvXIasC7y5s=", + "module": "sha256-Kwq1YmEUumwASZEJ6MOJoXy6XhP7+BEExBjoY3UNSLw=", + "pom": "sha256-Ed3u4UN656ybNGhLDophehZaIKobIjyk0YM3ZMxwZJI=" }, - "org/junit/platform#junit-platform-engine/1.12.1": { - "jar": "sha256-f+3/k/2SrsfSn8YNwB+gJyRrNrgIhCOl78SUnl9q/6Q=", - "module": "sha256-Vb3CX4rhKh3yQQisSArgiAKMiOMV+ou01HbU4RXyrGE=", - "pom": "sha256-TANohTegh/d9NLNNjczZO5NhcWu5u/S0ucbYMXkBS5w=" + "org/junit/platform#junit-platform-engine/1.14.0": { + "jar": "sha256-V80p3oNEaa7mVuXevaHwn3xZYw/Ve5DMDLqjFyb8TUo=", + "module": "sha256-panr9kOUz5HYW/InO6g+K3f5V2dAYYiEV+4nzr00gOQ=", + "pom": "sha256-dAumF9c4ITX+Ekf3H3Umh0ljeYj9OdEq5Qn9Rl+v3QY=" }, - "org/junit/platform#junit-platform-launcher/1.12.1": { - "jar": "sha256-67sU57KfYHMOrt6GLtadfeDVgeoMA4+mogKVXHVB9SU=", - "module": "sha256-e+5FMgZp1sP8SKnaJV9Xn7zlgA+mY8QgT6NL1XgkUfQ=", - "pom": "sha256-nd9DNXV223LpTvM8ipY09gOrQEb+Cubl4ZJMq2aIjtk=" + "org/junit/platform#junit-platform-launcher/1.14.0": { + "jar": "sha256-EACyeHl1ENzsQNkPd/DYTcwT5ZgtpWPBi2tWZarkuBw=", + "module": "sha256-pJlI15aokT/22Jl1ITnUl2YxQ7AS3fgEqxzlMuC/1zw=", + "pom": "sha256-q41bLHzlSaDJEsG9E7yNV0dYOcLneiLlb4DxniPcdQI=" }, "org/opentest4j#opentest4j/1.3.0": { "jar": "sha256-SOLfY2yrZWPO1k3N/4q7I1VifLI27wvzdZhoLd90Lxs=", @@ -231,13 +237,13 @@ "org/ow2#ow2/1.5.1": { "pom": "sha256-Mh3bt+5v5PU96mtM1tt0FU1r+kI5HB92OzYbn0hazwU=" }, - "org/ow2/asm#asm-tree/9.8": { - "jar": "sha256-FLeIDLfIXu0QHicQQy/D/7gydVMqaolNxMQJXUmtWfE=", - "pom": "sha256-cUnn+qDhkSlvh5ru2SCciULTmPBpjSzKGpxijy4qj3c=" + "org/ow2/asm#asm-tree/9.9": { + "jar": "sha256-QhePN3XJxj+eXhRGdH0ptOyk2RvW515cQ8+jcqR9OMY=", + "pom": "sha256-0BeI7Y5ujiSsr2y0p73MJzNBYlL6oAIylZ4+Lp3xv0Q=" }, - "org/ow2/asm#asm/9.8": { - "jar": "sha256-h26raoPa7K1cpn65/KuwY8l7WuuM8fynqYns3hdSIFE=", - "pom": "sha256-wTZ8O7OD12Gef3l+ON91E4hfLu8ErntZCPaCImV7W6o=" + "org/ow2/asm#asm/9.9": { + "jar": "sha256-A9madK0e5ccTNO9nQ39O9P40iMqnyW2GRavHPI4gF9Q=", + "pom": "sha256-z4Ye8edF1XFUr3muFN80DtU0Hl3NAVfO/NLrfxqgXFc=" } } } diff --git a/pkgs/by-name/mo/modrinth-app-unwrapped/gradle-from-path.patch b/pkgs/by-name/mo/modrinth-app-unwrapped/gradle-from-path.patch index ef97f6e66e6e..70cd2dac4a11 100644 --- a/pkgs/by-name/mo/modrinth-app-unwrapped/gradle-from-path.patch +++ b/pkgs/by-name/mo/modrinth-app-unwrapped/gradle-from-path.patch @@ -1,5 +1,5 @@ diff --git a/packages/app-lib/build.rs b/packages/app-lib/build.rs -index 251c4e84..eeacd02a 100644 +index 10ed29b9..97c832e1 100644 --- a/packages/app-lib/build.rs +++ b/packages/app-lib/build.rs @@ -1,7 +1,7 @@ @@ -10,8 +10,8 @@ index 251c4e84..eeacd02a 100644 +use std::env; fn main() { - println!("cargo::rerun-if-changed=java/gradle"); -@@ -19,21 +19,11 @@ fn main() { + println!("cargo::rerun-if-changed=.env"); +@@ -38,21 +38,12 @@ fn build_java_jars() { out_dir.join("java/libs").display() ); @@ -22,7 +22,7 @@ index 251c4e84..eeacd02a 100644 - "java/gradlew", - ) - .unwrap(); -- + let mut build_dir_str = OsString::from("-Dorg.gradle.project.buildDir="); build_dir_str.push(out_dir.join("java")); - let exit_status = Command::new(gradle_path) diff --git a/pkgs/by-name/mo/modrinth-app-unwrapped/package.nix b/pkgs/by-name/mo/modrinth-app-unwrapped/package.nix index ef37bffd807d..491b8d4af218 100644 --- a/pkgs/by-name/mo/modrinth-app-unwrapped/package.nix +++ b/pkgs/by-name/mo/modrinth-app-unwrapped/package.nix @@ -6,7 +6,7 @@ desktop-file-utils, fetchFromGitHub, gradle_8, - jdk11, + jdk17, makeBinaryWrapper, makeShellWrapper, nix-update-script, @@ -21,22 +21,23 @@ rustPlatform, turbo, webkitgtk_4_1, + xcbuild, }: let gradle = gradle_8.override { java = jdk; }; - jdk = jdk11; + jdk = jdk17; in rustPlatform.buildRustPackage (finalAttrs: { pname = "modrinth-app-unwrapped"; - version = "0.10.5"; + version = "0.10.23"; src = fetchFromGitHub { owner = "modrinth"; repo = "code"; tag = "v${finalAttrs.version}"; - hash = "sha256-KqC+5RLLvg3cyjY7Ecw9qxQ5XUKsK7Tfxl4WC1OwZeI="; + hash = "sha256-Or2KkcZnZCZOnUd++SmDgbUOwa6ZmRDaoo7gF3XvN6I="; }; patches = [ @@ -66,8 +67,7 @@ rustPlatform.buildRustPackage (finalAttrs: { --replace-fail '1.0.0-local' '${finalAttrs.version}' ''; - cargoHash = "sha256-chUPd1fLZ7dm0MXkbD7Bv4tE520ooEyliVZ9Pp+LIdk="; - + cargoHash = "sha256-hWjoNwKA39YYhPSrQUNaM1nS+CtV9vff+aXpoQLPCOM="; mitmCache = gradle.fetchDeps { inherit (finalAttrs) pname; data = ./deps.json; @@ -77,7 +77,7 @@ rustPlatform.buildRustPackage (finalAttrs: { inherit (finalAttrs) pname version src; pnpm = pnpm_9; fetcherVersion = 1; - hash = "sha256-1tDegt8OgG0ZhvNGpkYQR+PuX/xI287OFk4MGAXUKZQ="; + hash = "sha256-jLuI8qNJgFkuBbKuBNKGuk/6v62iY7fNZX2t3U3olk0="; }; nativeBuildInputs = [ @@ -90,7 +90,10 @@ rustPlatform.buildRustPackage (finalAttrs: { pnpmConfigHook pnpm_9 ] - ++ lib.optional stdenv.hostPlatform.isDarwin makeBinaryWrapper; + ++ lib.optional stdenv.hostPlatform.isDarwin [ + makeBinaryWrapper + xcbuild + ]; buildInputs = [ openssl ] ++ lib.optional stdenv.hostPlatform.isLinux webkitgtk_4_1; @@ -163,7 +166,7 @@ rustPlatform.buildRustPackage (finalAttrs: { # This builds on architectures like aarch64, but the launcher itself does not support them yet. # Darwin is the only exception # See https://github.com/modrinth/code/issues/776#issuecomment-1742495678 - broken = !stdenv.hostPlatform.isx86_64 && !stdenv.hostPlatform.isDarwin; + broken = !stdenv.hostPlatform.isx86_64 || !stdenv.hostPlatform.isLinux; sourceProvenance = with lib.sourceTypes; [ fromSource binaryBytecode # mitm cache diff --git a/pkgs/by-name/mo/modrinth-app-unwrapped/remove-spotless.patch b/pkgs/by-name/mo/modrinth-app-unwrapped/remove-spotless.patch index 7a4761a98699..d989756554cc 100644 --- a/pkgs/by-name/mo/modrinth-app-unwrapped/remove-spotless.patch +++ b/pkgs/by-name/mo/modrinth-app-unwrapped/remove-spotless.patch @@ -1,15 +1,15 @@ diff --git a/packages/app-lib/java/build.gradle.kts b/packages/app-lib/java/build.gradle.kts -index a671dd6f..d18c28de 100644 +index 10435b98..c4346a0c 100644 --- a/packages/app-lib/java/build.gradle.kts +++ b/packages/app-lib/java/build.gradle.kts @@ -1,6 +1,5 @@ plugins { java -- id("com.diffplug.spotless") version "7.0.4" - id("com.gradleup.shadow") version "9.0.0-rc2" +- id("com.diffplug.spotless") version "8.0.0" + id("com.gradleup.shadow") version "9.2.2" } -@@ -27,13 +26,6 @@ tasks.withType().configureEach { +@@ -28,12 +27,6 @@ tasks.withType().configureEach { options.compilerArgs.addAll(listOf("-Xlint:all", "-Werror")) } @@ -19,7 +19,6 @@ index a671dd6f..d18c28de 100644 - removeUnusedImports() - } -} -- + tasks.jar { enabled = false - } diff --git a/pkgs/by-name/mo/modrinth-app/package.nix b/pkgs/by-name/mo/modrinth-app/package.nix index be0442eabfbb..3047fe2aa192 100644 --- a/pkgs/by-name/mo/modrinth-app/package.nix +++ b/pkgs/by-name/mo/modrinth-app/package.nix @@ -7,6 +7,7 @@ glib, glib-networking, gsettings-desktop-schemas, + jdk25, jdk17, jdk21, jdk8, @@ -14,6 +15,7 @@ jdk8 jdk17 jdk21 + jdk25 ], libGL, libjack2, diff --git a/pkgs/by-name/nf/nfpm/package.nix b/pkgs/by-name/nf/nfpm/package.nix index 0eef2aaff645..c9eceb90d7b8 100644 --- a/pkgs/by-name/nf/nfpm/package.nix +++ b/pkgs/by-name/nf/nfpm/package.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "nfpm"; - version = "2.44.0"; + version = "2.44.1"; src = fetchFromGitHub { owner = "goreleaser"; repo = "nfpm"; rev = "v${version}"; - hash = "sha256-G/wXsRJCuWCGIqyHLTKtOz1WA+uJghC7khLG4ff8tZ0="; + hash = "sha256-zgj+cwgTyCzg1s3ta0sUDvwNdQJrlhCmuI2Qgqrf28Q="; }; - vendorHash = "sha256-HNukXrKkKvWDLKMgaihhVGZJTI8oZpjYnbT62gBwBn8="; + vendorHash = "sha256-8Kt/TdL75Cs34Su7Pf2MSZaIrjpP/oFZygGdMZlxpAk="; ldflags = [ "-s" diff --git a/pkgs/by-name/nu/nu_scripts/package.nix b/pkgs/by-name/nu/nu_scripts/package.nix index 90fd7bb175d6..d4302fe99b4c 100644 --- a/pkgs/by-name/nu/nu_scripts/package.nix +++ b/pkgs/by-name/nu/nu_scripts/package.nix @@ -7,13 +7,13 @@ stdenvNoCC.mkDerivation { pname = "nu_scripts"; - version = "0-unstable-2025-12-14"; + version = "0-unstable-2025-12-17"; src = fetchFromGitHub { owner = "nushell"; repo = "nu_scripts"; - rev = "a67d490237d30d2cce6c0a19f422b822aa40f77c"; - hash = "sha256-rY+c9Fiqs4/gUWBPWnzkxR7KJxSO9soKO4Fokar17Ug="; + rev = "4af008a317185b4e247bdb13002dbc074e98b60c"; + hash = "sha256-KsS3Brtt9tXKpogXdGQJK6QfJq3tbGnyU/ydVaYggE4="; }; installPhase = '' diff --git a/pkgs/by-name/nu/numix-icon-theme-square/package.nix b/pkgs/by-name/nu/numix-icon-theme-square/package.nix index 5222e031be2d..372b6c7f7ad4 100644 --- a/pkgs/by-name/nu/numix-icon-theme-square/package.nix +++ b/pkgs/by-name/nu/numix-icon-theme-square/package.nix @@ -10,13 +10,13 @@ stdenvNoCC.mkDerivation rec { pname = "numix-icon-theme-square"; - version = "25.11.15"; + version = "25.12.15"; src = fetchFromGitHub { owner = "numixproject"; repo = "numix-icon-theme-square"; rev = version; - sha256 = "sha256-fHNOzalDY736/4L317QpyFWan+349rWwRz2Kr5FH28A="; + sha256 = "sha256-89OyttP8Mc1zRqIbIE9gpY9BHINLGJwUqkGVfeULCH4="; }; nativeBuildInputs = [ gtk3 ]; diff --git a/pkgs/by-name/om/omnictl/package.nix b/pkgs/by-name/om/omnictl/package.nix index 48814bc34929..b22304aa2591 100644 --- a/pkgs/by-name/om/omnictl/package.nix +++ b/pkgs/by-name/om/omnictl/package.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "omnictl"; - version = "1.4.0"; + version = "1.4.4"; src = fetchFromGitHub { owner = "siderolabs"; repo = "omni"; rev = "v${version}"; - hash = "sha256-+5loARNGjZwqav9xEBa55tRhsMV5ZukPWBtC/eTOl4g="; + hash = "sha256-0dj8z7u0drd7cVDgprwEHKLZJyPyZmhDqk6nEhtr62s="; }; vendorHash = "sha256-RdwdocSQK54f8vD7waBzYJ4DsbgdBDpUVlk4MVn6tvQ="; diff --git a/pkgs/by-name/ot/otpclient/package.nix b/pkgs/by-name/ot/otpclient/package.nix index e286f04ffbab..148e5c21075e 100644 --- a/pkgs/by-name/ot/otpclient/package.nix +++ b/pkgs/by-name/ot/otpclient/package.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation rec { pname = "otpclient"; - version = "4.1.1"; + version = "4.2.0"; src = fetchFromGitHub { owner = "paolostivanin"; repo = "otpclient"; tag = "v${version}"; - hash = "sha256-yve6DMtMqPTkyI01lRvJy0rObEt9KMrekjPegjT5blk="; + hash = "sha256-KGtASCc07NGdjvQ8tIrnQIaEeld9H6z3odytKd8c5aQ="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/pa/parlay/package.nix b/pkgs/by-name/pa/parlay/package.nix index f209d51a0c05..bb59e14bccfc 100644 --- a/pkgs/by-name/pa/parlay/package.nix +++ b/pkgs/by-name/pa/parlay/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "parlay"; - version = "0.9.0"; + version = "0.10.0"; src = fetchFromGitHub { owner = "snyk"; repo = "parlay"; rev = "v${version}"; - hash = "sha256-56N8eVsNvaK1gCJWk7h+C0w5DbBaDHH1DpIqmflc2e4="; + hash = "sha256-hyAvVd3P/ya7iSVsq3jbwe4qzJeWeA/hwAs2VTSIuAI="; }; vendorHash = "sha256-X/cgNdsUG0Ics/DCk1HOdzez9Ewwm1odFL1EiyFv1Sw="; diff --git a/pkgs/by-name/pg/pgscv/package.nix b/pkgs/by-name/pg/pgscv/package.nix index b480fd80a8ce..b04de182c951 100644 --- a/pkgs/by-name/pg/pgscv/package.nix +++ b/pkgs/by-name/pg/pgscv/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "pgscv"; - version = "0.15.0"; + version = "0.15.1"; src = fetchFromGitHub { owner = "CHERTS"; repo = "pgscv"; tag = "v${version}"; - hash = "sha256-5n2HANuWQT1eQfz+cP0AlKLVe/aNJmGrTJ9l7l40T0k="; + hash = "sha256-ilYr6Q3YpAIqOKTOXhSVDyu4PXiUCgXEI8imUa4sbd4="; }; - vendorHash = "sha256-epQCbmfa2qlgEp0ta3FqjUlkEkq1duE0a20CSTLrS28="; + vendorHash = "sha256-qn6e95yB5iaqI/B2C4eM3JGjd9MiHIrHJrAhggdCO7c="; ldflags = [ "-X=main.appName=pgscv" diff --git a/pkgs/by-name/ph/phel/package.nix b/pkgs/by-name/ph/phel/package.nix index dc1f3c314283..ba1c0851cebf 100644 --- a/pkgs/by-name/ph/phel/package.nix +++ b/pkgs/by-name/ph/phel/package.nix @@ -7,16 +7,16 @@ php.buildComposerProject2 (finalAttrs: { pname = "phel"; - version = "0.23.1"; + version = "0.27.0"; src = fetchFromGitHub { owner = "phel-lang"; repo = "phel-lang"; tag = "v${finalAttrs.version}"; - hash = "sha256-v/xRYzKCwF1kKDV00jK7Cwz3TupkNZVec/h2JnhVq4E="; + hash = "sha256-8e29IQcTOT6kgcluGxp5bJ/tmD1tmA2VfrgAqpoao4o="; }; - vendorHash = "sha256-rA05SIv+rP90KHTeYTym1Db64KMOY6iXnLh3I/DY3ks="; + vendorHash = "sha256-G78w7Cwhrs2kqtVEZFlbw9EqnE3roOWlR+O16R5M3eI="; doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; diff --git a/pkgs/by-name/pl/plasma-panel-colorizer/package.nix b/pkgs/by-name/pl/plasma-panel-colorizer/package.nix index 203f7b53c668..c0c046f00aa2 100644 --- a/pkgs/by-name/pl/plasma-panel-colorizer/package.nix +++ b/pkgs/by-name/pl/plasma-panel-colorizer/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "plasma-panel-colorizer"; - version = "5.7.0"; + version = "6.0.0"; src = fetchFromGitHub { owner = "luisbocanegra"; repo = "plasma-panel-colorizer"; tag = "v${finalAttrs.version}"; - hash = "sha256-Bx4TS6j5smI4SbkxJK7oiLIu72ClArUcZSB+MKf0kfM="; + hash = "sha256-gK5WkGWAS64R/msPbHDrMPtWlHQQbnxfPINmFARCBR8="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/pr/prow/package.nix b/pkgs/by-name/pr/prow/package.nix index b12695f4f56a..5f4a86ebebf4 100644 --- a/pkgs/by-name/pr/prow/package.nix +++ b/pkgs/by-name/pr/prow/package.nix @@ -8,15 +8,15 @@ buildGoModule rec { pname = "prow"; - version = "0-unstable-2025-12-18"; - rev = "6bd26c8c553779752ecd8b21d8d32cb7067a8e71"; + version = "0-unstable-2025-12-23"; + rev = "f0341d7b566080979b11661dc61a98f64db0d028"; src = fetchFromGitHub { inherit rev; owner = "kubernetes-sigs"; repo = "prow"; - hash = "sha256-ImjNTj0VdPrH0C0FKfH8AgfUFWGr0VD6GNACeTR2THU="; + hash = "sha256-V0tdABcZ/ob3duUkKbdcLn4AyOA8um7WkcohoH5J/pQ="; }; vendorHash = "sha256-/ZAnYxUHHq+tqk0hcJrt6ZrpDDRqyLITWGL/hgW4A6A="; diff --git a/pkgs/by-name/ri/rinf_cli/package.nix b/pkgs/by-name/ri/rinf_cli/package.nix new file mode 100644 index 000000000000..a0058fec3b51 --- /dev/null +++ b/pkgs/by-name/ri/rinf_cli/package.nix @@ -0,0 +1,28 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, +}: +rustPlatform.buildRustPackage (finalAttrs: { + pname = "rinf_cli"; + version = "8.8.1"; + + src = fetchFromGitHub { + owner = "cunarist"; + repo = "rinf"; + tag = "v${finalAttrs.version}"; + hash = "sha256-Nqzc3GXOXl+0zBOUQN58ib9HvVRMKymHckw9KGoKKyU="; + }; + sourceRoot = "${finalAttrs.src.name}/rust_crate_cli"; + + cargoHash = "sha256-R55WVlVR5gjg4U4Icp379dXUp9tJAR0eTZy6glzA7nk="; + + meta = { + description = "Framework for creating cross-platform Rust apps leveraging Flutter"; + homepage = "https://rinf.cunarist.com"; + changelog = "https://github.com/cunarist/rinf/blob/v${finalAttrs.version}/CHANGELOG.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ Noah765 ]; + mainProgram = "rinf"; + }; +}) diff --git a/pkgs/by-name/ro/roc/package.nix b/pkgs/by-name/ro/roc/package.nix index 6bbac562f1d4..0081612abc77 100755 --- a/pkgs/by-name/ro/roc/package.nix +++ b/pkgs/by-name/ro/roc/package.nix @@ -85,12 +85,12 @@ rustPlatform.buildRustPackage { checkPhase = lib.optionalString stdenv.isLinux '' runHook preCheck - NIX_GLIBC_PATH=${glibc.out}/lib NIX_LIBGCC_S_PATH=${stdenv.cc.cc.lib}/lib cargo test --release --workspace --exclude test_mono --exclude uitest -- --skip glue_cli_tests + NIX_GLIBC_PATH=${glibc.out}/lib NIX_LIBGCC_S_PATH=${stdenv.cc.cc.lib}/lib cargo test --release --workspace --exclude test_mono --exclude uitest -- --skip glue_cli_tests --skip test_snapshots runHook postCheck '' + lib.optionalString (!stdenv.isLinux) '' runHook preCheck - cargo test --release --workspace --exclude test_mono --exclude uitest -- --skip glue_cli_tests + cargo test --release --workspace --exclude test_mono --exclude uitest -- --skip glue_cli_tests --skip test_snapshots runHook postCheck ''; diff --git a/pkgs/by-name/ru/rust-analyzer-unwrapped/package.nix b/pkgs/by-name/ru/rust-analyzer-unwrapped/package.nix index 1672bc7c9f1e..036b5dd0215f 100644 --- a/pkgs/by-name/ru/rust-analyzer-unwrapped/package.nix +++ b/pkgs/by-name/ru/rust-analyzer-unwrapped/package.nix @@ -13,15 +13,15 @@ rustPlatform.buildRustPackage rec { pname = "rust-analyzer-unwrapped"; - version = "2025-12-15"; + version = "2025-12-22"; - cargoHash = "sha256-ChsaWQ4gfBuucdab1uRw7tCZJcqDn9drwyAqQ6b4Dac="; + cargoHash = "sha256-nCBk88TUeIC6kG3xp3B6bbLOtHkQtOS90GspKWeY09s="; src = fetchFromGitHub { owner = "rust-lang"; repo = "rust-analyzer"; rev = version; - hash = "sha256-OepmesaROt1QloBXDm+goBqjrbrJ+rtOBIF3m7+A5eA="; + hash = "sha256-8DHvVHKPZ4GLf4xjCEZMaJjyv81hA+YHzztczFizLo0="; }; cargoBuildFlags = [ diff --git a/pkgs/by-name/ru/rustical/package.nix b/pkgs/by-name/ru/rustical/package.nix index 4703257f8ce6..9f1eb069ce33 100644 --- a/pkgs/by-name/ru/rustical/package.nix +++ b/pkgs/by-name/ru/rustical/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "rustical"; - version = "0.11.4"; + version = "0.11.5"; src = fetchFromGitHub { owner = "lennart-k"; repo = "rustical"; tag = "v${finalAttrs.version}"; - hash = "sha256-nTpFVtnKOB+yEhKXB9tFzNtdTm5sA3cDPt2De26ntjE="; + hash = "sha256-hvdYwh9nmSXS9QhyxW5mLRS4kgf164I+UxGHRlK1oH4="; }; - cargoHash = "sha256-JpvDGbd6dQ/1vu8BEDmRj7V1Wb7R86wV1NHbHYwZ/Zc="; + cargoHash = "sha256-rpTQpb0a8QhFT7Qo6hYZ+nPmWFnR/vSVCoHvZFQR3Cs="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ]; diff --git a/pkgs/by-name/si/sing-box/package.nix b/pkgs/by-name/si/sing-box/package.nix index f5b78b11fcb8..ffa5cf42ac30 100644 --- a/pkgs/by-name/si/sing-box/package.nix +++ b/pkgs/by-name/si/sing-box/package.nix @@ -10,16 +10,16 @@ buildGoModule (finalAttrs: { pname = "sing-box"; - version = "1.12.13"; + version = "1.12.14"; src = fetchFromGitHub { owner = "SagerNet"; repo = "sing-box"; tag = "v${finalAttrs.version}"; - hash = "sha256-P2sGnBvChGnQpCSGGiJWK20Tz6KCt6sWEPrJHQjLcSE="; + hash = "sha256-mm6MnCYNCIOBmn53QxGnGB6ftLf2T0Z1EBtBFeoDE6I="; }; - vendorHash = "sha256-R9dN2/MmuAeYB9UkNDbhc48SelBMR80nMnptNKD0y9c="; + vendorHash = "sha256-mSQHW8QwXA6TmpXexhWlgY0BWsNRPOnmGAGvPvnX8wU="; tags = [ "with_quic" diff --git a/pkgs/by-name/te/terragrunt/package.nix b/pkgs/by-name/te/terragrunt/package.nix index dbf7cc0c7000..171887124368 100644 --- a/pkgs/by-name/te/terragrunt/package.nix +++ b/pkgs/by-name/te/terragrunt/package.nix @@ -17,25 +17,29 @@ buildGo125Module (finalAttrs: { }; nativeBuildInputs = [ - versionCheckHook mockgen ]; + proxyVendor = true; + preBuild = '' make generate-mocks ''; - vendorHash = "sha256-9KrOn55C3c8G7PkIgnqkUQM6jqnZwUW0Mas1ZgEINxI="; + vendorHash = "sha256-cjbVE8b8CKSl7cRkMuHMKcRb/Yj26oLKU3rAdRCBbk0="; doCheck = false; ldflags = [ "-s" - "-w" "-X github.com/gruntwork-io/go-commons/version.Version=v${finalAttrs.version}" "-extldflags '-static'" ]; + nativeInstallCheckInputs = [ + versionCheckHook + ]; + versionCheckProgramArg = "--version"; doInstallCheck = true; meta = { diff --git a/pkgs/by-name/uh/uhk-agent/package.nix b/pkgs/by-name/uh/uhk-agent/package.nix index 194a9a382cf9..b036b9b6de29 100644 --- a/pkgs/by-name/uh/uhk-agent/package.nix +++ b/pkgs/by-name/uh/uhk-agent/package.nix @@ -13,12 +13,12 @@ let pname = "uhk-agent"; - version = "8.0.1"; + version = "9.0.0"; src = fetchurl { url = "https://github.com/UltimateHackingKeyboard/agent/releases/download/v${version}/UHK.Agent-${version}-linux-x86_64.AppImage"; name = "${pname}-${version}.AppImage"; - sha256 = "sha256-3oyVz+DG35YlUwsMhp80QRm67FBsLRj0tQXjZH9asI8="; + sha256 = "sha256-QMs4xCXOuxDNlWcprUsb/+RvTcW83nkUcoH9/Oi0OYY="; }; appimageContents = appimageTools.extract { diff --git a/pkgs/by-name/wa/wayscriber/package.nix b/pkgs/by-name/wa/wayscriber/package.nix index 0f838242f665..f225739db0a4 100644 --- a/pkgs/by-name/wa/wayscriber/package.nix +++ b/pkgs/by-name/wa/wayscriber/package.nix @@ -10,20 +10,20 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "wayscriber"; - version = "0.9.1"; + version = "0.9.7"; src = fetchFromGitHub { owner = "devmobasa"; repo = "wayscriber"; tag = "v${finalAttrs.version}"; - hash = "sha256-lhETehKxu4mdQDzM0Lj0FMlrvBfrvEP1T4URyrDFEJ0="; + hash = "sha256-lPtgH4HaqBq7qQAgGUqbWiwaTSHXzPGuHe/PuMw0HmA="; }; nativeBuildInputs = [ pkg-config ]; buildInputs = [ pango libxkbcommon ]; - cargoHash = "sha256-pnw6QNukzykYyNSJxG5gcnlOyGJOJrzfQJa5eb+mQmE="; + cargoHash = "sha256-rWUkWL1qPGzbAhRnOSX+A2RXWlfTbkFbKj3n8cHXk3c="; passthru.updateScript = nix-update-script { }; meta = { diff --git a/pkgs/by-name/xk/xk6/package.nix b/pkgs/by-name/xk/xk6/package.nix index 37c793a9b1aa..1d6fa3f9d8cb 100644 --- a/pkgs/by-name/xk/xk6/package.nix +++ b/pkgs/by-name/xk/xk6/package.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "xk6"; - version = "1.3.1"; + version = "1.3.2"; src = fetchFromGitHub { owner = "grafana"; repo = "xk6"; tag = "v${version}"; - hash = "sha256-Ewbx53+fdAIhFLJcNBBtp+xd0k1jtjgQKm8AQNYtSMs="; + hash = "sha256-5ZrkSYJlHRaEc8Quv2EoPAHp2Th9mE/Vi/scwPt/maE="; }; vendorHash = null; diff --git a/pkgs/by-name/xu/xurlfind3r/package.nix b/pkgs/by-name/xu/xurlfind3r/package.nix new file mode 100644 index 000000000000..eb4209a55f72 --- /dev/null +++ b/pkgs/by-name/xu/xurlfind3r/package.nix @@ -0,0 +1,33 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, +}: + +buildGoModule rec { + pname = "xurlfind3r"; + version = "1.3.0"; + + src = fetchFromGitHub { + owner = "hueristiq"; + repo = "xurlfind3r"; + tag = version; + hash = "sha256-Zrjc6/7c8A2Bz4tgia0NGK3H4Bu2eSpHQ6TCQ2zsU3c="; + }; + + vendorHash = "sha256-4wHSArTutAIGytSWheQF8KgeLymCW3zJVr4GQN7TTXQ="; + + ldflags = [ + "-s" + "-w" + ]; + + meta = { + description = "Tool to discover URLs for a given domain"; + homepage = "https://github.com/hueristiq/xurlfind3r"; + changelog = "https://github.com/hueristiq/xurlfind3r/releases/tag/${src.tag}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ fab ]; + mainProgram = "xurlfind3r"; + }; +} diff --git a/pkgs/by-name/zu/zuban/package.nix b/pkgs/by-name/zu/zuban/package.nix index dac2e27c6b24..cc3bed8a187f 100644 --- a/pkgs/by-name/zu/zuban/package.nix +++ b/pkgs/by-name/zu/zuban/package.nix @@ -9,13 +9,13 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "zuban"; - version = "0.3.0"; + version = "0.4.0"; src = fetchFromGitHub { owner = "zubanls"; repo = "zuban"; tag = "v${finalAttrs.version}"; - hash = "sha256-LHIrIO9ew5iXgem9W7QkPGic8XH6fQymLrbvQbmkB0M="; + hash = "sha256-nNbrZI1L9sw0sBTg2H2+9K05eoVmIl4bF5o1ADRXGDM="; fetchSubmodules = true; }; @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage (finalAttrs: { buildAndTestSubdir = "crates/zuban"; - cargoHash = "sha256-y3lqa+WWY8+KG59DzGdpiBLMybeqeN1fMAUMFidHX3Q="; + cargoHash = "sha256-7SHXqWSfzEZo2BRY9S3LiVLRd9v8MuxdbgWC7KDfgJM="; nativeInstallCheckInputs = [ versionCheckHook diff --git a/pkgs/development/compilers/ghc/9.6.6-debian-binary.nix b/pkgs/development/compilers/ghc/9.6.6-debian-binary.nix new file mode 100644 index 000000000000..81af893586d7 --- /dev/null +++ b/pkgs/development/compilers/ghc/9.6.6-debian-binary.nix @@ -0,0 +1,267 @@ +{ + lib, + stdenv, + fetchurl, + perl, + gcc, + ncurses5, + ncurses6, + gmp, + libiconv, + numactl, + libffi, + coreutils, + targetPackages, +}: + +# Prebuilt only does native +assert stdenv.targetPlatform == stdenv.hostPlatform; + +let + version = "9.6.6"; + + # GHC upstream doesn't release bindist tarballs for some platforms. + # We're using Debian's binary package, and patching it into a usable-in-Nixpkgs state. + ghcDebs = { + powerpc64-linux = { + variantSuffix = ""; + src = { + url = "http://ftp.ports.debian.org/debian-ports/pool-ppc64/main/g/ghc/ghc_9.6.6-4_ppc64.deb"; + sha256 = "722cc301b6ba70b342e5e3d9d0671440bcd749cd2f13dcccbd23c3f6a6060171"; + }; + exePathForLibraryCheck = null; + archSpecificLibraries = [ + { + nixPackage = gmp; + fileToCheckFor = null; + } + { + nixPackage = ncurses6; + fileToCheckFor = "libtinfo.so.6"; + } + { + nixPackage = numactl; + fileToCheckFor = null; + } + { + nixPackage = libffi; + fileToCheckFor = null; + } + ]; + }; + }; + + debUsed = + ghcDebs.${stdenv.hostPlatform.system} + or (throw "cannot bootstrap GHC on this platform ('${stdenv.hostPlatform.system}') from Debian debs"); + + gmpUsed = + (builtins.head ( + builtins.filter (drv: lib.hasPrefix "gmp" (drv.nixPackage.name or "")) debUsed.archSpecificLibraries + )).nixPackage; + + runtimeDeps = [ + targetPackages.stdenv.cc + targetPackages.stdenv.cc.bintools + coreutils # for cat + ]; + + extraLibraryMapping = { + gmp = gmpUsed; + numa = numactl; + ffi = libffi; + }; + +in + +stdenv.mkDerivation (finalAttrs: { + inherit version; + pname = "ghc-debian-binary${debUsed.variantSuffix}"; + + src = fetchurl debUsed.src; + + nativeBuildInputs = [ perl ]; + + sourceRoot = "${finalAttrs.pname}-${finalAttrs.version}"; + + # Custom unpack phase to handle .deb files + unpackPhase = '' + runHook preUnpack + + ar x $src + tar xf data.tar.xz + mkdir -p ${finalAttrs.sourceRoot} + mv -t ${finalAttrs.sourceRoot}/ usr var + + runHook postUnpack + ''; + + postUnpack = + # Verify our assumptions of which `libtinfo.so` (ncurses) version is used, + # so that we know when ghc debs upgrade that and we need to update the + # version used in `archSpecificLibraries`. + lib.optionalString (debUsed.exePathForLibraryCheck != null) ( + lib.concatStringsSep "\n" [ + '' + shopt -u nullglob + echo "Checking that ghc binary exists in deb at ${debUsed.exePathForLibraryCheck}" + if ! test -e ${debUsed.exePathForLibraryCheck}; then + echo >&2 "GHC binary ${debUsed.exePathForLibraryCheck} could not be found in the deb unpack directory for arch ${stdenv.hostPlatform.system}, please check that ghcDebs correctly reflect the deb dependencies!"; exit 1; + fi + '' + (lib.concatMapStringsSep "\n" ( + { fileToCheckFor, nixPackage }: + lib.optionalString (fileToCheckFor != null) '' + echo "Checking deb for ${fileToCheckFor} to ensure that is still used" + if ! readelf -d ${debUsed.exePathForLibraryCheck} | grep "${fileToCheckFor}"; then + echo >&2 "File ${fileToCheckFor} could not be found in ${debUsed.exePathForLibraryCheck} for arch ${stdenv.hostPlatform.system}, please check that ghcDebs correctly reflect the deb dependencies!"; exit 1; + fi + + echo "Checking that the nix package ${nixPackage} contains ${fileToCheckFor}" + if ! test -e "${lib.getLib nixPackage}/lib/${fileToCheckFor}"; then + echo >&2 "Nix package ${nixPackage} did not contain ${fileToCheckFor} for arch ${stdenv.hostPlatform.system}, please check that ghcDebs correctly reflect the deb dependencies!"; exit 1; + fi + '' + ) debUsed.archSpecificLibraries) + ] + ) + + # Linking to non-compiler libraries requires GHC to know about our non-FHS paths for those libraries + + (lib.strings.concatMapAttrsStringSep "\n" (libName: libPackage: '' + for packageDbDir in $(find . -name package.conf.d); do + for packageDb in $(grep -l 'extra-libraries:.*${libName}' "$packageDbDir"/*.conf); do + echo "Patching include & library path for ${libName} into package DB: $packageDb" + sed -i "$packageDb" \ + -e '/^[a-z-]*include-dirs/a \ ${lib.getDev libPackage}/include' \ + -e '/^[a-z-]*library-dirs/a \ ${lib.getLib libPackage}/lib' + done + done + '') extraLibraryMapping) + + + + # Rename needed libraries and binaries, fix interpreter + lib.optionalString stdenv.hostPlatform.isLinux '' + find . -type f -executable -exec patchelf \ + --interpreter ${stdenv.cc.bintools.dynamicLinker} {} \; + ''; + + # Not a bindist, nothing to configure + dontConfigure = true; + + # Not a bindist, it's already built + dontBuild = true; + + # Install prebuilt GHC files + installPhase = '' + runHook preInstall + + mkdir -p $out + + cp -t $out/ -a usr/* + rm -f $out/lib/ghc/lib/package.conf.d + find var -name "package.conf.d" -type d -exec cp -a {} $out/lib/ghc/lib/ \; + + runHook postInstall + ''; + + postInstall = + # Patch scripts to include runtime dependencies in $PATH. + '' + for i in "$out/bin/"*; do + test ! -h "$i" || continue + isScript "$i" || continue + sed -i -e '2i export PATH="${lib.makeBinPath runtimeDeps}:$PATH"' "$i" + done + '' + + # Patch /usr paths + + '' + for i in "$out/bin/"*; do + test ! -h "$i" || continue + isScript "$i" || continue + substituteInPlace "$i" \ + --replace-fail '="/usr' '="${placeholder "out"}' + done + find "$out/lib/ghc/lib/package.conf.d" -type f -name '*.conf' \ + -exec sed -i "s|/usr/|$out/|g" {} + + '' + + # Patch ghc settings + + '' + substituteInPlace $out/lib/ghc/lib/settings \ + --replace-fail powerpc64-linux-gnu-gcc gcc \ + --replace-fail powerpc64-linux-gnu-g++ g++ \ + --replace-fail powerpc64-linux-gnu-ld ld \ + --replace-fail powerpc64-linux-gnu-ar ar \ + --replace-fail powerpc64-linux-gnu-ranlib ranlib \ + --replace-fail llc-18 llc \ + --replace-fail opt-18 opt + ''; + + # On Linux, use patchelf to modify the executables so that they can + # find editline/gmp. + postFixup = + lib.optionalString (stdenv.hostPlatform.isLinux && !(debUsed.isStatic or false)) + # Keep rpath as small as possible, running autoPatchelf makes everything segfault (maybe similar to patchelf#244). + # All Elfs are 2 directories deep from $out/lib, so pooling symlinks there makes a short rpath. + '' + (cd $out/lib; ln -s ${ncurses6.out}/lib/libtinfo.so.6) + (cd $out/lib; ln -s ${lib.getLib gmpUsed}/lib/libgmp.so.10) + (cd $out/lib; ln -s ${numactl.out}/lib/libnuma.so.1) + (cd $out/lib; ln -s ${libffi.out}/lib/libffi.so.8) + for p in $(find "$out/lib" -type f -name "*\.so*"); do + (cd $out/lib; ln -s $p) + done + + for p in $(find "$out/lib" -type f -executable); do + if isELF "$p"; then + echo "Patchelfing $p" + patchelf --set-rpath "\$ORIGIN:\$ORIGIN/../.." $p + fi + done + '' + # Recache package db which needs to happen because + # we modify the package db + + '' + "$out/bin/ghc-pkg" --package-db=$out/lib/ghc/lib/package.conf.d recache + ''; + + doInstallCheck = true; + installCheckPhase = '' + # Sanity check, can ghc create executables? + cd $TMP + mkdir test-ghc; cd test-ghc + cat > main.hs << EOF + {-# LANGUAGE TemplateHaskell #-} + module Main where + main = putStrLn \$([|"yes"|]) + EOF + env -i $out/bin/ghc --make main.hs || exit 1 + echo compilation ok + [ $(./main) == "yes" ] + ''; + + passthru = { + targetPrefix = ""; + enableShared = true; + + llvmPackages = null; + + # Our Cabal compiler name + haskellCompilerName = "ghc-${version}"; + + # Normal GHC derivations expose the hadrian derivation used to build them + # here. In the case of debs we just make sure that the attribute exists, + # as it is used for checking if a GHC derivation has been built with hadrian. + hadrian = null; + }; + + meta = { + homepage = "http://haskell.org/ghc"; + description = "Glasgow Haskell Compiler"; + license = lib.licenses.bsd3; + platforms = builtins.attrNames ghcDebs; + maintainers = [ lib.maintainers.OPNA2608 ]; + teams = [ lib.teams.haskell ]; + }; +}) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index b333d93fa166..fa83e22bb9d0 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -276,6 +276,8 @@ with haskellLib; # Ironically, we still need to build the doctest suite. # vector-0.13.2.0 has a doctest < 0.24 constraint jailbreak = true; + # inspection-testing doesn't work on all archs & ABIs + doCheck = !self.inspection-testing.meta.broken; }) super.vector; # https://github.com/lspitzner/data-tree-print/issues/4 @@ -697,6 +699,12 @@ with haskellLib; hash = "sha256-feGEuALVJ0Zl8zJPIfgEFry9eH/MxA0Aw7zlDq0PC/s="; }) super.algebraic-graphs; + # Relies on DWARF <-> register mappings in GHC, not available for every arch & ABI + # (check dwarfReturnRegNo in compiler/GHC/CmmToAsm/Dwarf/Constants.hs, that's where ppc64 elfv1 gives up) + inspection-testing = overrideCabal (drv: { + broken = with pkgs.stdenv.hostPlatform; !(isx86 || (isPower64 && isAbiElfv2) || isAarch64); + }) super.inspection-testing; + # Too strict bounds on filepath, hpsec, tasty, tasty-quickcheck, transformers # https://github.com/illia-shkroba/pfile/issues/3 pfile = doJailbreak super.pfile; @@ -2439,6 +2447,26 @@ with haskellLib; )) ]; + # Test failures on various archs + # https://github.com/kazu-yamamoto/crypton/issues/49 + crypton = dontCheckIf ( + pkgs.stdenv.hostPlatform.isPower64 && pkgs.stdenv.hostPlatform.isBigEndian + ) super.crypton; + + # Test failures on at least ppc64 + # https://github.com/kazu-yamamoto/crypton-certificate/issues/25 + # Likely related to the issues in crypton + # https://github.com/kazu-yamamoto/crypton/issues/49 + crypton-x509-validation = dontCheckIf ( + pkgs.stdenv.hostPlatform.isPower64 && pkgs.stdenv.hostPlatform.isBigEndian + ) super.crypton-x509-validation; + + # Likely fallout from the crypton issues + # exception: HandshakeFailed (Error_Protocol "bad PubKeyALG_Ed448 signature for ecdhparams" DecryptError) + tls = dontCheckIf ( + pkgs.stdenv.hostPlatform.isPower64 && pkgs.stdenv.hostPlatform.isBigEndian + ) super.tls; + # Too strict bounds on text and tls # https://github.com/barrucadu/irc-conduit/issues/54 # Use crypton-connection instead of connection @@ -2670,8 +2698,23 @@ with haskellLib; # hashable <1.4, mmorph <1.2 composite-aeson = doJailbreak super.composite-aeson; - # Overly strict bounds on tasty-quickcheck (test suite) (< 0.11) - hashable = doJailbreak super.hashable; + hashable = lib.pipe super.hashable [ + # Overly strict bounds on tasty-quickcheck (test suite) (< 0.11) + doJailbreak + + # Big-endian POWER: + # Test suite xxhash-tests: RUNNING... + # xxhash + # oneshot + # w64-ref: OK (0.03s) + # +++ OK, passed 100 tests. + # w64-examples: FAIL + # tests/xxhash-tests.hs:21: + # expected: 2768807632077661767 + # but got: 13521078365639231154 + # https://github.com/haskell-unordered-containers/hashable/issues/323 + (dontCheckIf pkgs.stdenv.hostPlatform.isBigEndian) + ]; cborg = appendPatches [ # This patch changes CPP macros form gating on the version of ghc-prim to base diff --git a/pkgs/development/python-modules/aioamazondevices/default.nix b/pkgs/development/python-modules/aioamazondevices/default.nix index 1adf0ba2249d..99b22ee2aedb 100644 --- a/pkgs/development/python-modules/aioamazondevices/default.nix +++ b/pkgs/development/python-modules/aioamazondevices/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "aioamazondevices"; - version = "10.0.0"; + version = "11.0.0"; pyproject = true; src = fetchFromGitHub { owner = "chemelli74"; repo = "aioamazondevices"; tag = "v${version}"; - hash = "sha256-OS6qROAnH3JnlhAJJWevfLvMq5PQGL/lQM4XToqHZEU="; + hash = "sha256-uyMtQs5nLwIgG9A5peCzFjUIyjeM8VfjmicVcTLV36I="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/aioesphomeapi/default.nix b/pkgs/development/python-modules/aioesphomeapi/default.nix index a900ee4a7372..8cc4ec81f630 100644 --- a/pkgs/development/python-modules/aioesphomeapi/default.nix +++ b/pkgs/development/python-modules/aioesphomeapi/default.nix @@ -26,14 +26,14 @@ buildPythonPackage rec { pname = "aioesphomeapi"; - version = "43.3.0"; + version = "43.6.0"; pyproject = true; src = fetchFromGitHub { owner = "esphome"; repo = "aioesphomeapi"; tag = "v${version}"; - hash = "sha256-x6X1iqTrmBfPA6/gy/qBIUYtr0jv0hPO26pWaONAV3c="; + hash = "sha256-ghm+44EEgzlIfbcHrIrOLVyCSYH+Sj2b7RWIhD3mgUA="; }; build-system = [ diff --git a/pkgs/development/python-modules/biocutils/default.nix b/pkgs/development/python-modules/biocutils/default.nix index 4c1a87281cf1..bcc022611ed1 100644 --- a/pkgs/development/python-modules/biocutils/default.nix +++ b/pkgs/development/python-modules/biocutils/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "biocutils"; - version = "0.2.3"; + version = "0.3.0"; pyproject = true; src = fetchFromGitHub { owner = "BiocPy"; repo = "BiocUtils"; tag = "${version}"; - hash = "sha256-4LzXBP/cp+nqIOM5QZIa1QptkSfv3fqdACHEHjJUtsw="; + hash = "sha256-fomRB/qozB6QUCe2n4tzIFZOufchcjFUGOlApUR/KRo="; }; build-system = [ diff --git a/pkgs/development/python-modules/colcon-cd/default.nix b/pkgs/development/python-modules/colcon-cd/default.nix index ff66d6420806..c2acd60cb967 100644 --- a/pkgs/development/python-modules/colcon-cd/default.nix +++ b/pkgs/development/python-modules/colcon-cd/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { "test/test_spell_check.py" ]; - pythonImportCheck = [ "colcon_cd" ]; + pythonImportsCheck = [ "colcon_cd" ]; meta = { description = "A shell function for colcon-core to change the current working directory."; diff --git a/pkgs/development/python-modules/coloraide/default.nix b/pkgs/development/python-modules/coloraide/default.nix index 556ccb3fc3cb..ca0e879f3a85 100644 --- a/pkgs/development/python-modules/coloraide/default.nix +++ b/pkgs/development/python-modules/coloraide/default.nix @@ -7,7 +7,7 @@ typing-extensions, }: let - version = "6.1"; + version = "6.2"; in buildPythonPackage { pname = "coloraide"; @@ -18,7 +18,7 @@ buildPythonPackage { owner = "facelessuser"; repo = "coloraide"; tag = version; - hash = "sha256-hsuFouesw4B9rr17NCQVB6LyYUdNRm9Cj2Cqj+MdLkc="; + hash = "sha256-WWqHYeFqdVAgBIiBgr5o8URI+ZyMIn7efnbTyelJgII="; }; build-system = [ diff --git a/pkgs/development/python-modules/execnb/default.nix b/pkgs/development/python-modules/execnb/default.nix index 7567ac4e402d..a7d918e3ace6 100644 --- a/pkgs/development/python-modules/execnb/default.nix +++ b/pkgs/development/python-modules/execnb/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "execnb"; - version = "0.1.15"; + version = "0.1.16"; pyproject = true; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-KQYpCJBKXCjaVuRwWGTdltwlBBNprUqqII50vPXENXE="; + hash = "sha256-ZsnACca6Awv9DA9qce5NhWodjvxDBv6ajBU3DAZFAAw="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/fmpy/default.nix b/pkgs/development/python-modules/fmpy/default.nix index b15975381f76..99b7699ae935 100644 --- a/pkgs/development/python-modules/fmpy/default.nix +++ b/pkgs/development/python-modules/fmpy/default.nix @@ -41,7 +41,7 @@ }: buildPythonPackage rec { pname = "fmpy"; - version = "0.3.26"; + version = "0.3.27"; pyproject = true; # Bumping version? Make sure to look through the commit history for @@ -51,7 +51,7 @@ buildPythonPackage rec { repo = "FMPy"; tag = "v${version}"; fetchSubmodules = true; - hash = "sha256-NAaROHrZ8OPmj/3lWFk9hNrrlqsDbscGdDn6G7xfFeQ="; + hash = "sha256-Sx3lHiEMPESbUN8LIb4o0J7t/ZPavsyfh1QJJpocNaA="; }; patches = [ diff --git a/pkgs/development/python-modules/google-cloud-run/default.nix b/pkgs/development/python-modules/google-cloud-run/default.nix new file mode 100644 index 000000000000..26d895b62960 --- /dev/null +++ b/pkgs/development/python-modules/google-cloud-run/default.nix @@ -0,0 +1,48 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + google-api-core, + google-auth, + grpc-google-iam-v1, + grpcio, + proto-plus, + protobuf, + setuptools, +}: + +buildPythonPackage rec { + pname = "google-cloud-run"; + version = "0.13.0"; + pyproject = true; + + src = fetchPypi { + pname = "google_cloud_run"; + inherit version; + hash = "sha256-l1NK1206LCBH0STAoKKUpIIvzCQzHroPKUyt+xk8Sa0="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + google-api-core + google-auth + grpc-google-iam-v1 + grpcio + proto-plus + protobuf + ]; + + # Tests are only available in the google-cloud-python monorepo + doCheck = false; + + pythonImportsCheck = [ "google.cloud.run" ]; + + meta = { + description = "Google Cloud Run API client library"; + homepage = "https://pypi.org/project/google-cloud-run/"; + changelog = "https://github.com/googleapis/google-cloud-python/blob/google-cloud-run-v${version}/packages/google-cloud-run/CHANGELOG.md"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/iamdata/default.nix b/pkgs/development/python-modules/iamdata/default.nix index 29559233be1b..b68f0b136a7b 100644 --- a/pkgs/development/python-modules/iamdata/default.nix +++ b/pkgs/development/python-modules/iamdata/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "iamdata"; - version = "0.1.202512251"; + version = "0.1.202512261"; pyproject = true; src = fetchFromGitHub { owner = "cloud-copilot"; repo = "iam-data-python"; tag = "v${version}"; - hash = "sha256-p9rHa2ibeZjHwu3qYaIIK/4wPocQSL3B75A4bXqcwiY="; + hash = "sha256-xwYPF+u37MbIgiirBR0I5Z6vdDttEzuLAA/psP3/1bM="; }; __darwinAllowLocalNetworking = true; diff --git a/pkgs/development/python-modules/knx-frontend/default.nix b/pkgs/development/python-modules/knx-frontend/default.nix index 499006aca930..6e336f100900 100644 --- a/pkgs/development/python-modules/knx-frontend/default.nix +++ b/pkgs/development/python-modules/knx-frontend/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "knx-frontend"; - version = "2025.10.31.195356"; + version = "2025.12.25.200238"; pyproject = true; # TODO: source build, uses yarn.lock src = fetchPypi { pname = "knx_frontend"; inherit version; - hash = "sha256-m490gincBGm5qN1ndVfw8HZYnIh9RNLHQkW6w4duTTE="; + hash = "sha256-xE54xdF/+6Un8VmdqBoqYopngIafEwU5IdtkOyxbuFI="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/liberty-parser/default.nix b/pkgs/development/python-modules/liberty-parser/default.nix index 820ea8ed201d..32659ccad678 100644 --- a/pkgs/development/python-modules/liberty-parser/default.nix +++ b/pkgs/development/python-modules/liberty-parser/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "liberty-parser"; - version = "0.0.25"; + version = "0.0.27"; pyproject = true; src = fetchFromGitea { @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "tok"; repo = "liberty-parser"; tag = version; - hash = "sha256-Nl+FRG93DeP1ctDphaTKZqkukEywmGprj6JORJQTunw="; + hash = "sha256-WT27nOcl+a86ZgBo/hZItPu/IOrK+t3bUFV2TXy8GnU="; }; # Tests try to write to /tmp directly. use $TMPDIR instead. diff --git a/pkgs/development/python-modules/llm-perplexity/default.nix b/pkgs/development/python-modules/llm-perplexity/default.nix index 6e2cb794220b..1fd3067f50b2 100644 --- a/pkgs/development/python-modules/llm-perplexity/default.nix +++ b/pkgs/development/python-modules/llm-perplexity/default.nix @@ -19,14 +19,14 @@ }: buildPythonPackage rec { pname = "llm-perplexity"; - version = "2025.10.0"; + version = "2025.12.0"; pyproject = true; src = fetchFromGitHub { owner = "hex"; repo = "llm-perplexity"; tag = version; - hash = "sha256-8vgHlua+fPwZf2Accf0/CMFBIFAEZujP4hB3yTbLGG8="; + hash = "sha256-jPSYwhEGph/1C9n/fv1nZurY4Inu/XNHYSE1r86N1Kw="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pysrdaligateway/default.nix b/pkgs/development/python-modules/pysrdaligateway/default.nix index ce1ccb5e252f..9473a1db7240 100644 --- a/pkgs/development/python-modules/pysrdaligateway/default.nix +++ b/pkgs/development/python-modules/pysrdaligateway/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "pysrdaligateway"; - version = "0.19.2"; + version = "0.19.3"; pyproject = true; src = fetchFromGitHub { owner = "maginawin"; repo = "PySrDaliGateway"; tag = "v${version}"; - hash = "sha256-ONwWEgipiXW8lsF6KLeZRKfIGKxoQVVqkqL9IW/ldrw="; + hash = "sha256-tVnTSpEAZC7DzAiKRQWKhtrp5epnwPZQr4XimG525Rw="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/python3-nmap/default.nix b/pkgs/development/python-modules/python3-nmap/default.nix new file mode 100644 index 000000000000..c41f20fc6acf --- /dev/null +++ b/pkgs/development/python-modules/python3-nmap/default.nix @@ -0,0 +1,37 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + simplejson, +}: + +buildPythonPackage rec { + pname = "python3-nmap"; + version = "1.9.2"; + pyproject = true; + + src = fetchFromGitHub { + owner = "nmmapper"; + repo = "python3-nmap"; + tag = version; + hash = "sha256-d/rH3aRNh9SDyVvbiTFCQyfZ6amtnH2iSwKqTOlVLNY="; + }; + + build-system = [ setuptools ]; + + dependencies = [ simplejson ]; + + pythonImportsCheck = [ "nmap3" ]; + + # Module has no tests + doCheck = false; + + meta = { + description = "Library which helps in using nmap port scanner"; + homepage = "https://github.com/nmmapper/python3-nmap"; + changelog = "https://github.com/nmmapper/python3-nmap/releases/tag/${src.tag}"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/rospkg/default.nix b/pkgs/development/python-modules/rospkg/default.nix index 06c95ad2f8a8..00b89b41f05f 100644 --- a/pkgs/development/python-modules/rospkg/default.nix +++ b/pkgs/development/python-modules/rospkg/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "rospkg"; - version = "1.6.0"; + version = "1.6.1"; pyproject = true; src = fetchFromGitHub { owner = "ros-infrastructure"; repo = "rospkg"; tag = version; - hash = "sha256-6nfdY+p3P3iGuj+7Lo7ybsZ+1x104m7WzGgxr8dDDuw="; + hash = "sha256-YRBmL+aXQ/0rxivERja9ng+GqL8NQGmNYhKjMY7+6nc="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/scikit-survival/default.nix b/pkgs/development/python-modules/scikit-survival/default.nix index 8b7ba4bcce2c..b08e0bd6d89b 100644 --- a/pkgs/development/python-modules/scikit-survival/default.nix +++ b/pkgs/development/python-modules/scikit-survival/default.nix @@ -27,14 +27,14 @@ buildPythonPackage rec { pname = "scikit-survival"; - version = "0.25.0"; + version = "0.26.0"; pyproject = true; src = fetchFromGitHub { owner = "sebp"; repo = "scikit-survival"; tag = "v${version}"; - hash = "sha256-OvdmZ2vDptYB2tq7OtokIQzjKzhQBWwnXZLW0m6FqlI="; + hash = "sha256-xtrGFNRHF8bL8Q82gIQLayuCSDFMrBBkQ63F+Nmbdes="; }; postPatch = '' diff --git a/pkgs/development/python-modules/unstructured-client/default.nix b/pkgs/development/python-modules/unstructured-client/default.nix index 9779300c4200..f6fb1b8cce11 100644 --- a/pkgs/development/python-modules/unstructured-client/default.nix +++ b/pkgs/development/python-modules/unstructured-client/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "unstructured-client"; - version = "0.42.5"; + version = "0.42.6"; pyproject = true; src = fetchFromGitHub { owner = "Unstructured-IO"; repo = "unstructured-python-client"; tag = "v${version}"; - hash = "sha256-BLzWdiDLY4VTeaZnbaleUYSHR9bs62pnos6jJpzHzIg="; + hash = "sha256-94d4OBaQTMacbOaRniNlaDVE3jZ+g28Hl3xbTmvY8L8="; }; preBuild = '' diff --git a/pkgs/development/tools/pnpm/generic.nix b/pkgs/development/tools/pnpm/generic.nix index 7326d9930933..1dbdec7c5c8b 100644 --- a/pkgs/development/tools/pnpm/generic.nix +++ b/pkgs/development/tools/pnpm/generic.nix @@ -89,7 +89,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { ); configHook = lib.warn - "pnpm.configHook: The package attribue is deprecated. Use the top-level pnpmConfigHook attribute instead" + "pnpm.configHook: The package attribute is deprecated. Use the top-level pnpmConfigHook attribute instead" ( pnpmConfigHook.overrideAttrs (prevAttrs: { propagatedBuildInputs = prevAttrs.propagatedBuildInputs or [ ] ++ [ diff --git a/pkgs/servers/home-assistant/custom-components/pirate-weather/package.nix b/pkgs/servers/home-assistant/custom-components/pirate-weather/package.nix new file mode 100644 index 000000000000..05515a10dd4c --- /dev/null +++ b/pkgs/servers/home-assistant/custom-components/pirate-weather/package.nix @@ -0,0 +1,39 @@ +{ + lib, + buildHomeAssistantComponent, + fetchFromGitHub, + nix-update-script, + # Test dependencies + pytestCheckHook, + pytest-homeassistant-custom-component, + pytest-asyncio, +}: + +buildHomeAssistantComponent rec { + owner = "Pirate-Weather"; + domain = "pirateweather"; + version = "1.8.3"; + + src = fetchFromGitHub { + inherit owner; + repo = "pirate-weather-ha"; + tag = "v${version}"; + hash = "sha256-0IEuMuzTj6puUXYr815ZOn5pqu11R+uhKKsSVtxMvHM="; + }; + + nativeCheckInputs = [ + pytestCheckHook + pytest-homeassistant-custom-component + pytest-asyncio + ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + changelog = "https://github.com/Pirate-Weather/pirate-weather-ha/releases/tag/${src.tag}"; + description = "Replacement for the default Dark Sky Home Assistant integration using Pirate Weather"; + homepage = "https://github.com/Pirate-Weather/pirate-weather-ha"; + maintainers = with lib.maintainers; [ CodedNil ]; + license = lib.licenses.asl20; + }; +} diff --git a/pkgs/servers/monitoring/prometheus/fastly-exporter.nix b/pkgs/servers/monitoring/prometheus/fastly-exporter.nix index 8cfee432e2c2..7ce2f93e0660 100644 --- a/pkgs/servers/monitoring/prometheus/fastly-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/fastly-exporter.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "fastly-exporter"; - version = "10.1.0"; + version = "10.2.0"; src = fetchFromGitHub { owner = "fastly"; repo = "fastly-exporter"; rev = "v${version}"; - hash = "sha256-Iu+GqCE7Eg2oN6vmdpgsPKHqxz91f12waxj0J2K+gWk="; + hash = "sha256-MlEscksRj3FR6tDzCZDaQ5iOhLubqvxYdXNH7HCcpfM="; }; vendorHash = "sha256-83qUoQNiQ3D2Bm6D4DoVZDEO8EtUmxBXlpV6F+N1eSA="; diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-chewing.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-chewing.nix index 7285218e8f3c..d0ccdd52de98 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-chewing.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-chewing.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "fcitx5-chewing"; - version = "5.1.9"; + version = "5.1.10"; src = fetchFromGitHub { owner = "fcitx"; repo = pname; rev = version; - hash = "sha256-xl6jNC1tud121rnUFsphF0A739W16Vb9Qx4v1+vu99U="; + hash = "sha256-CdmzO7wPJkue3PdGYav8/Smj0Fich80Z1biCjqTsO5I="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix index 2b9a193597bc..0f3822490511 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix @@ -31,13 +31,13 @@ stdenv.mkDerivation rec { pname = "fcitx5-configtool"; - version = "5.1.11"; + version = "5.1.12"; src = fetchFromGitHub { owner = "fcitx"; repo = pname; rev = version; - hash = "sha256-SEQelUMigcqs0C+jY+A/dfncEogzU1e5tjP+wK+MylM="; + hash = "sha256-XwVvkxG5627E5BE2Yp0w/mFjaG1nYa0Olm8Gz6V4+eA="; }; cmakeFlags = [ diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix index b54bd499cd0c..3d7725904916 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix @@ -28,13 +28,13 @@ stdenv.mkDerivation rec { pname = "fcitx5-gtk"; - version = "5.1.4"; + version = "5.1.5"; src = fetchFromGitHub { owner = "fcitx"; repo = pname; rev = version; - hash = "sha256-MlBLhgqpF+A9hotnhX83349wIpCQfzsqpyZb0xME2XQ="; + hash = "sha256-eMo/ZsZdfAxR14aSnit3yHdw/yv8KdfKjK1Hu7Ce/3o="; }; outputs = [ diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-unikey.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-unikey.nix index 27e78124532d..00f1fe10342b 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-unikey.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-unikey.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "fcitx5-unikey"; - version = "5.1.8"; + version = "5.1.9"; src = fetchFromGitHub { owner = "fcitx"; repo = "fcitx5-unikey"; rev = version; - hash = "sha256-Yeyk6c4bjsxTi8DvRBGip/gayKaOvO6R5PGYkc0uUdk="; + hash = "sha256-tTJPoFmhILPvKNwut0vLohkvm+nJzX8VrMVTopfmF1Q="; }; nativeBuildInputs = [ diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 3826bbc16788..bb2248b269bd 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -14,6 +14,7 @@ let "native-bignum" # Binary GHCs "ghc902Binary" + "ghc966DebianBinary" "ghc984Binary" ]; @@ -86,6 +87,8 @@ in inherit llvmPackages; }; + ghc966DebianBinary = callPackage ../development/compilers/ghc/9.6.6-debian-binary.nix { }; + ghc984Binary = callPackage ../development/compilers/ghc/9.8.4-binary.nix { }; ghc948 = callPackage ../development/compilers/ghc/9.4.8.nix { @@ -99,27 +102,69 @@ in }; ghc94 = compiler.ghc948; ghc967 = callPackage ../development/compilers/ghc/9.6.7.nix { - bootPkgs = bb.packages.ghc948; + bootPkgs = + if + stdenv.buildPlatform.isPower64 + && stdenv.buildPlatform.isBigEndian + && pkgs.stdenv.hostPlatform.isAbiElfv1 + then + # No bindist, "borrowing" the GHC from Debian + bb.packages.ghc966DebianBinary + else + bb.packages.ghc948; inherit (buildPackages.python3Packages) sphinx; inherit (buildPackages.darwin) xattr autoSignDarwinBinariesHook; inherit buildTargetLlvmPackages llvmPackages; }; ghc96 = compiler.ghc967; ghc984 = callPackage ../development/compilers/ghc/9.8.4.nix { - bootPkgs = if stdenv.buildPlatform.isi686 then bb.packages.ghc948 else bb.packages.ghc984Binary; + bootPkgs = + if + stdenv.buildPlatform.isPower64 + && stdenv.buildPlatform.isBigEndian + && pkgs.stdenv.hostPlatform.isAbiElfv1 + then + # No bindist, "borrowing" the GHC from Debian + bb.packages.ghc966DebianBinary + else if stdenv.buildPlatform.isi686 then + bb.packages.ghc948 + else + bb.packages.ghc984Binary; inherit (buildPackages.python3Packages) sphinx; inherit (buildPackages.darwin) xattr autoSignDarwinBinariesHook; inherit buildTargetLlvmPackages llvmPackages; }; ghc98 = compiler.ghc984; ghc9102 = callPackage ../development/compilers/ghc/9.10.2.nix { - bootPkgs = if stdenv.buildPlatform.isi686 then bb.packages.ghc967 else bb.packages.ghc984Binary; + bootPkgs = + if + stdenv.buildPlatform.isPower64 + && stdenv.buildPlatform.isBigEndian + && pkgs.stdenv.hostPlatform.isAbiElfv1 + then + # No bindist, "borrowing" the GHC from Debian + bb.packages.ghc966DebianBinary + else if stdenv.buildPlatform.isi686 then + bb.packages.ghc967 + else + bb.packages.ghc984Binary; inherit (buildPackages.python3Packages) sphinx; inherit (buildPackages.darwin) xattr autoSignDarwinBinariesHook; inherit buildTargetLlvmPackages llvmPackages; }; ghc9103 = callPackage ../development/compilers/ghc/9.10.3.nix { - bootPkgs = if stdenv.buildPlatform.isi686 then bb.packages.ghc967 else bb.packages.ghc984Binary; + bootPkgs = + if + stdenv.buildPlatform.isPower64 + && stdenv.buildPlatform.isBigEndian + && pkgs.stdenv.hostPlatform.isAbiElfv1 + then + # No bindist, "borrowing" the GHC from Debian + bb.packages.ghc966DebianBinary + else if stdenv.buildPlatform.isi686 then + bb.packages.ghc967 + else + bb.packages.ghc984Binary; inherit (buildPackages.python3Packages) sphinx; inherit (buildPackages.darwin) xattr autoSignDarwinBinariesHook; inherit buildTargetLlvmPackages llvmPackages; @@ -144,7 +189,16 @@ in }; ghc914 = compiler.ghc9141; ghcHEAD = callPackage ../development/compilers/ghc/head.nix { - bootPkgs = bb.packages.ghc984Binary; + bootPkgs = + if + stdenv.buildPlatform.isPower64 + && stdenv.buildPlatform.isBigEndian + && pkgs.stdenv.hostPlatform.isAbiElfv1 + then + # No bindist, using older source-built GHC + bb.packages.ghc910 + else + bb.packages.ghc984Binary; inherit (buildPackages.python3Packages) sphinx; inherit (buildPackages.darwin) xattr autoSignDarwinBinariesHook; inherit buildTargetLlvmPackages llvmPackages; @@ -189,6 +243,12 @@ in compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.0.x.nix { }; packageSetConfig = bootstrapPackageSet; }; + ghc966DebianBinary = callPackage ../development/haskell-modules { + buildHaskellPackages = bh.packages.ghc966DebianBinary; + ghc = bh.compiler.ghc966DebianBinary; + compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.6.x.nix { }; + packageSetConfig = bootstrapPackageSet; + }; ghc984Binary = callPackage ../development/haskell-modules { buildHaskellPackages = bh.packages.ghc984Binary; ghc = bh.compiler.ghc984Binary; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2cd01749ef15..0cd39d20a1c0 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6330,6 +6330,8 @@ self: super: with self; { callPackage ../development/python-modules/google-cloud-resource-manager { }; + google-cloud-run = callPackage ../development/python-modules/google-cloud-run { }; + google-cloud-runtimeconfig = callPackage ../development/python-modules/google-cloud-runtimeconfig { }; @@ -15619,6 +15621,8 @@ self: super: with self; { python3-gnutls = callPackage ../development/python-modules/python3-gnutls { }; + python3-nmap = callPackage ../development/python-modules/python3-nmap { }; + python3-openid = callPackage ../development/python-modules/python3-openid { }; python3-saml = callPackage ../development/python-modules/python3-saml { };