diff --git a/maintainers/scripts/check-cherry-picks.sh b/maintainers/scripts/check-cherry-picks.sh index e7ffe2bf4c73..0e02c709d8f5 100755 --- a/maintainers/scripts/check-cherry-picks.sh +++ b/maintainers/scripts/check-cherry-picks.sh @@ -1,16 +1,23 @@ #!/usr/bin/env bash # Find alleged cherry-picks -set -e +set -eo pipefail if [ $# != "2" ] ; then echo "usage: check-cherry-picks.sh base_rev head_rev" exit 2 fi +# Make sure we are inside the nixpkgs repo, even when called from outside +cd "$(dirname "${BASH_SOURCE[0]}")" + PICKABLE_BRANCHES=${PICKABLE_BRANCHES:-master staging release-??.?? staging-??.??} problem=0 +commits="$(git rev-list \ + -E -i --grep="cherry.*[0-9a-f]{40}" --reverse \ + "$1..$2")" + while read new_commit_sha ; do if [ -z "$new_commit_sha" ] ; then continue # skip empty lines @@ -88,10 +95,6 @@ while read new_commit_sha ; do echo "$original_commit_sha not found in any pickable branch" problem=1 -done <<< "$( - git rev-list \ - -E -i --grep="cherry.*[0-9a-f]{40}" --reverse \ - "$1..$2" -)" +done <<< "$commits" exit $problem diff --git a/nixos/modules/services/mail/postfix.nix b/nixos/modules/services/mail/postfix.nix index 34c236dcd2a6..4936edc3dd25 100644 --- a/nixos/modules/services/mail/postfix.nix +++ b/nixos/modules/services/mail/postfix.nix @@ -13,7 +13,7 @@ let haveAliases = cfg.postmasterAlias != "" || cfg.rootAlias != "" || cfg.extraAliases != ""; haveCanonical = cfg.canonical != ""; - haveTransport = cfg.transport != ""; + haveTransport = cfg.transport != "" || (cfg.enableSlowDomains && cfg.slowDomains != [ ]); haveVirtual = cfg.virtual != ""; haveLocalRecipients = cfg.localRecipients != null; @@ -319,13 +319,20 @@ let aliasesFile = pkgs.writeText "postfix-aliases" aliases; canonicalFile = pkgs.writeText "postfix-canonical" cfg.canonical; virtualFile = pkgs.writeText "postfix-virtual" cfg.virtual; + transportFile = pkgs.writeText "postfix-transport" ( + lib.optionalString (cfg.enableSlowDomains && cfg.slowDomains != [ ]) ( + lib.concatMapStrings (domain: '' + ${domain} slow: + '') cfg.slowDomains + ) + + cfg.transport + ); localRecipientMapFile = pkgs.writeText "postfix-local-recipient-map" ( lib.concatMapStrings (x: x + " ACCEPT\n") cfg.localRecipients ); checkClientAccessFile = pkgs.writeText "postfix-check-client-access" cfg.dnsBlacklistOverrides; mainCfFile = pkgs.writeText "postfix-main.cf" mainCf; masterCfFile = pkgs.writeText "postfix-master.cf" masterCfContent; - transportFile = pkgs.writeText "postfix-transport" cfg.transport; headerChecksFile = pkgs.writeText "postfix-header-checks" headerChecks; in @@ -550,6 +557,32 @@ in ''; }; + enableSlowDomains = lib.mkEnableOption "slow domains feature for rate limiting specific domains"; + + slowDomains = lib.mkOption { + type = with lib.types; listOf str; + default = [ ]; + example = [ + "orange.fr" + "gmail.com" + ]; + description = "List of domains to be rate-limited using the slow transport."; + }; + + slowDomainsConfig = { + defaultDestinationRateDelay = lib.mkOption { + type = lib.types.str; + default = "5s"; + description = "Default rate delay for destinations."; + }; + + defaultDestinationConcurrencyLimit = lib.mkOption { + type = lib.types.int; + default = 3; + description = "Concurrency limit for slow destinations."; + }; + }; + aliasMapType = lib.mkOption { type = with lib.types; @@ -985,7 +1018,10 @@ in smtpd_tls_key_file = cfg.sslKey; smtpd_tls_security_level = lib.mkDefault "may"; - + } + // lib.optionalAttrs cfg.enableSlowDomains { + default_destination_rate_delay = cfg.slowDomainsConfig.defaultDestinationRateDelay; + default_destination_concurrency_limit = cfg.slowDomainsConfig.defaultDestinationConcurrencyLimit; }; services.postfix.masterConfig = @@ -1077,6 +1113,14 @@ in lib.concatLists (lib.mapAttrsToList mkKeyVal cfg.submissionOptions); }; } + // lib.optionalAttrs cfg.enableSlowDomains { + slow = { + command = "smtp"; + type = "unix"; + private = true; + maxproc = 2; + }; + } // lib.optionalAttrs cfg.enableSmtp { smtp_inet = { name = "smtp"; @@ -1128,7 +1172,7 @@ in (lib.mkIf haveCanonical { services.postfix.mapFiles.canonical = canonicalFile; }) - (lib.mkIf haveTransport { + (lib.mkIf (haveTransport || (cfg.enableSlowDomains && cfg.slowDomains != [ ])) { services.postfix.mapFiles.transport = transportFile; }) (lib.mkIf haveVirtual { diff --git a/nixos/modules/services/misc/open-webui.nix b/nixos/modules/services/misc/open-webui.nix index a31c6b42d696..521aacd39939 100644 --- a/nixos/modules/services/misc/open-webui.nix +++ b/nixos/modules/services/misc/open-webui.nix @@ -132,6 +132,21 @@ in "@system-service" "~@privileged" ]; + SupplementaryGroups = [ "render" ]; # for rocm to access /dev/dri/renderD* devices + DeviceAllow = [ + # CUDA + # https://docs.nvidia.com/dgx/pdf/dgx-os-5-user-guide.pdf + "char-nvidiactl" + "char-nvidia-caps" + "char-nvidia-frontend" + "char-nvidia-uvm" + # ROCm + "char-drm" + "char-fb" + "char-kfd" + # WSL (Windows Subsystem for Linux) + "/dev/dxg" + ]; }; }; diff --git a/nixos/tests/lomiri-music-app.nix b/nixos/tests/lomiri-music-app.nix index 87722db239d7..9efff85fee20 100644 --- a/nixos/tests/lomiri-music-app.nix +++ b/nixos/tests/lomiri-music-app.nix @@ -1,7 +1,8 @@ { lib, ... }: let ocrContent = "Music Test"; - musicFile = "test.mp3"; + musicFileName = "Example"; + musicFile = "${musicFileName}.mp3"; ocrPauseColor = "#FF00FF"; ocrStartColor = "#00FFFF"; @@ -136,6 +137,7 @@ in with subtest("lomiri music launches"): machine.succeed("lomiri-music-app >&2 &") + machine.wait_for_console_text("Queue is empty") machine.sleep(10) machine.send_key("alt-f10") machine.sleep(2) @@ -144,11 +146,14 @@ in with subtest("lomiri music plays music"): machine.succeed("xdotool mousemove 30 720 click 1") # Skip intro + machine.sleep(2) machine.wait_for_text("Albums") machine.succeed("xdotool mousemove 25 45 click 1") # Open categories + machine.sleep(2) machine.wait_for_text("Tracks") machine.succeed("xdotool mousemove 25 240 click 1") # Switch to Tracks category - machine.wait_for_text("test") # the test file + machine.sleep(2) + machine.wait_for_text("${musicFileName}") # the test file machine.screenshot("lomiri-music_listing") # Ensure pause colours isn't present already @@ -185,6 +190,7 @@ in with subtest("lomiri music localisation works"): machine.succeed("env LANG=de_DE.UTF-8 lomiri-music-app .mp4 >&2 &") + machine.wait_for_console_text("Restoring library queue") machine.sleep(10) machine.send_key("alt-f10") machine.sleep(2) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index ef7513b15f35..836b7de7dfc2 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -5282,6 +5282,19 @@ final: prev: { meta.hydraPlatforms = [ ]; }; + gh-nvim = buildVimPlugin { + pname = "gh.nvim"; + version = "0-unstable-2025-01-21"; + src = fetchFromGitHub { + owner = "ldelossa"; + repo = "gh.nvim"; + rev = "6f367b2ab8f9d4a0a23df2b703a3f91137618387"; + hash = "sha256-XI4FVjajin0NM+OaEN+O5vmalPpOB2RII+aOERSzjJA="; + }; + meta.description = "Fully featured GitHub integration for performing code reviews in Neovim"; + meta.homepage = "https://github.com/ldelossa/gh.nvim"; + }; + git-blame-nvim = buildVimPlugin { pname = "git-blame.nvim"; version = "2025-04-12"; diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index 8a3339845d59..3a1ea038d4d8 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -1278,6 +1278,10 @@ in configurePhase = "cd plugins/nvim"; }; + gh-nvim = super.gh-nvim.overrideAttrs { + dependencies = [ self.litee-nvim ]; + }; + gitlinker-nvim = super.gitlinker-nvim.overrideAttrs { dependencies = [ self.plenary-nvim ]; }; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 432b80653cf7..b64aa114eb05 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -403,6 +403,7 @@ https://github.com/David-Kunz/gen.nvim/,HEAD, https://github.com/jsfaint/gen_tags.vim/,, https://github.com/gentoo/gentoo-syntax/,, https://github.com/ndmitchell/ghcid/,, +https://github.com/ldelossa/gh.nvim/,, https://github.com/eagletmt/ghcmod-vim/,, https://github.com/f-person/git-blame.nvim/,, https://github.com/akinsho/git-conflict.nvim/,HEAD, diff --git a/pkgs/applications/networking/cluster/k3s/1_33/images-versions.json b/pkgs/applications/networking/cluster/k3s/1_33/images-versions.json index 5d212c7f9e0e..8caf711a8a74 100644 --- a/pkgs/applications/networking/cluster/k3s/1_33/images-versions.json +++ b/pkgs/applications/networking/cluster/k3s/1_33/images-versions.json @@ -1,18 +1,18 @@ { "airgap-images-amd64": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.0%2Bk3s1/k3s-airgap-images-amd64.tar.zst", - "sha256": "2822af9a2341033243bd1aff7433c0670bcad4059a8d0a35fb314dba24692674" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.1%2Bk3s1/k3s-airgap-images-amd64.tar.zst", + "sha256": "5fd0e18b7cd7457773d30e86270a4e1caed66d2e5c1380e65b3d0375227d241c" }, "airgap-images-arm": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.0%2Bk3s1/k3s-airgap-images-arm.tar.zst", - "sha256": "cf175be8674dd1812cd92930a852ef7a11572c4588180f51d5c19bdfd0a810e4" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.1%2Bk3s1/k3s-airgap-images-arm.tar.zst", + "sha256": "518343da6213e7edba9da2f58fcf30c268600fc8003f92f245d9818ead2db03e" }, "airgap-images-arm64": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.0%2Bk3s1/k3s-airgap-images-arm64.tar.zst", - "sha256": "c97f7a86a04aad7d5dc74d7e85e0fbc097e9edf76358f8a7c2097e6ca9740211" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.1%2Bk3s1/k3s-airgap-images-arm64.tar.zst", + "sha256": "2ac40b650104a1dc21b4b77fccf943efca8893de0432e6cdf1e7e1534eb6f4aa" }, "images-list": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.0%2Bk3s1/k3s-images.txt", + "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.1%2Bk3s1/k3s-images.txt", "sha256": "aa8e10337aef453cb17e6408dbaec9eb2da409ca6ba1f8bc7332fcef97fdaf3a" } } diff --git a/pkgs/applications/networking/cluster/k3s/1_33/versions.nix b/pkgs/applications/networking/cluster/k3s/1_33/versions.nix index be10b6dd7b6a..9665eb3c02af 100644 --- a/pkgs/applications/networking/cluster/k3s/1_33/versions.nix +++ b/pkgs/applications/networking/cluster/k3s/1_33/versions.nix @@ -1,15 +1,15 @@ { - k3sVersion = "1.33.0+k3s1"; - k3sCommit = "63ab8e534cdfce2a60f4b016dfedb4f8d74ae8ec"; - k3sRepoSha256 = "1ysfzb4216qk9gjmp2zp103xzjgz8irc7h9m4yp041gkvffa7pyg"; - k3sVendorHash = "sha256-eVMCrOAOCB7saYuxQQUUrmRHT+ZURXESTI6ZRKSDGZs="; + k3sVersion = "1.33.1+k3s1"; + k3sCommit = "99d91538b1327da933356c318dc8040335fbb66c"; + k3sRepoSha256 = "1ncj30nid3x96irw2raxf1naa2jap1d0s1ygxsvfckblbb6rjnmx"; + k3sVendorHash = "sha256-jrPVY+FVZV9wlbik/I35W8ChcLrHlYbLAwUYU16mJLM="; chartVersions = import ./chart-versions.nix; imagesVersions = builtins.fromJSON (builtins.readFile ./images-versions.json); k3sRootVersion = "0.14.1"; k3sRootSha256 = "0svbi42agqxqh5q2ri7xmaw2a2c70s7q5y587ls0qkflw5vx4sl7"; k3sCNIVersion = "1.6.0-k3s1"; k3sCNISha256 = "0g7zczvwba5xqawk37b0v96xysdwanyf1grxn3l3lhxsgjjsmkd7"; - containerdVersion = "2.0.4-k3s4"; - containerdSha256 = "05j5jyjnirks11z2930w4k5ij015hsm4pd2wxgj2531fyiy98azl"; + containerdVersion = "2.0.5-k3s1"; + containerdSha256 = "1c3hv22zx8y94zwmv5r59bnwgqyhxd10zkinm0jrcvny32ijqdfj"; criCtlVersion = "1.31.0-k3s2"; } diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 1e832248c2f1..467baa9bb085 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -317,13 +317,13 @@ "vendorHash": "sha256-ZCMSmOCPEMxCSpl3DjIUGPj1W/KNJgyjtHpmQ19JquA=" }, "datadog": { - "hash": "sha256-exndOGDZQqvh6m8sJg9/dIGup5SQruwE7qK9T0s/FJ8=", + "hash": "sha256-+C+pvw3ghriw3mR/lvpsSH0inTMPNwc6QAEtt6nXINw=", "homepage": "https://registry.terraform.io/providers/DataDog/datadog", "owner": "DataDog", "repo": "terraform-provider-datadog", - "rev": "v3.62.0", + "rev": "v3.63.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-uLNBbgW4oA8Cq0mjjMQFh7g37V+Ea9ek+ugBYJww88I=" + "vendorHash": "sha256-FmNeAwJ/lZZEIGt5QlYm9Cqu2cgkXVa1B/ej+5/G7wg=" }, "deno": { "hash": "sha256-7IvJrhXMeAmf8e21QBdYNSJyVMEzLpat4Tm4zHWglW8=", @@ -1111,13 +1111,13 @@ "vendorHash": "sha256-KezwDRmQQj0MnmsVlrX1OhNG6oMgw8fCxX5VFGdUynw=" }, "routeros": { - "hash": "sha256-/tTd8EzA1/Js7S3eGg3L9AY9dyoIA3lFSU6VlT6p4us=", + "hash": "sha256-vL1ijiP+WDe8nqtSudOuOTPohHe8JRU6wF4el5P/pWg=", "homepage": "https://registry.terraform.io/providers/terraform-routeros/routeros", "owner": "terraform-routeros", "repo": "terraform-provider-routeros", - "rev": "v1.85.0", + "rev": "v1.85.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-DDmJ/mEOd94E7DqLKjT6Y4XkpVdXyKeAaE/Wj6M3vuw=" + "vendorHash": "sha256-ysmNy+xojcHPSs++HofOxBKg1AlUO7taYVIcsmW/2kM=" }, "rundeck": { "hash": "sha256-cf+0qXpgxIsc/JbB7+u3MpmWFwUmpsinp1uARRhuBw0=", @@ -1391,13 +1391,13 @@ "vendorHash": null }, "utils": { - "hash": "sha256-BnC5ihbOnua4ddTzM8mvWbKz5L13R2NT9c68teVLWo0=", + "hash": "sha256-vCdPG8cZUdFhs1OmqDlgCDqBdyFiL99p6I8JhL8C6lY=", "homepage": "https://registry.terraform.io/providers/cloudposse/utils", "owner": "cloudposse", "repo": "terraform-provider-utils", - "rev": "v1.29.0", + "rev": "v1.30.0", "spdx": "Apache-2.0", - "vendorHash": "sha256-rHJabyfgu3wU79h3DHHYQauFmcR/SDuikauBF+CybZA=" + "vendorHash": "sha256-giqZi1CmuyANNwzW+y9BUUUEfBhFZKkVGAvIPVvZnzE=" }, "vault": { "hash": "sha256-6gCpXzvF4p2otwo3dJ8c+EvzbsMZfzVZymb41+hEZoM=", diff --git a/pkgs/by-name/bu/bustools/package.nix b/pkgs/by-name/bu/bustools/package.nix index 38ae60fa0ab9..31e66e6542f4 100644 --- a/pkgs/by-name/bu/bustools/package.nix +++ b/pkgs/by-name/bu/bustools/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "bustools"; - version = "0.45.0"; + version = "0.45.1"; src = fetchFromGitHub { owner = "BUStools"; repo = "bustools"; rev = "v${version}"; - sha256 = "sha256-Af2WUryx4HQuAlNJ1RWJK1Mj2M7X+4Ckap3rqEJ3vto="; + sha256 = "sha256-G+ZMoUmhINp18XKmXpdb5GT7YMsiK/XX2zrjt56CbLg="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/ch/checkov/package.nix b/pkgs/by-name/ch/checkov/package.nix index 997565c026e8..85c2a75ac2d1 100644 --- a/pkgs/by-name/ch/checkov/package.nix +++ b/pkgs/by-name/ch/checkov/package.nix @@ -25,14 +25,14 @@ with py.pkgs; python3.pkgs.buildPythonApplication rec { pname = "checkov"; - version = "3.2.433"; + version = "3.2.435"; pyproject = true; src = fetchFromGitHub { owner = "bridgecrewio"; repo = "checkov"; tag = version; - hash = "sha256-c9I3VDiKzk9Bybian3bX4OU3WUvHEHyQyGrO4//azqM="; + hash = "sha256-zV430pGFkfyf0oznXe69lTsMkGUrrA5TTyGobE4AK9I="; }; pythonRelaxDeps = [ diff --git a/pkgs/by-name/cl/clorinde/package.nix b/pkgs/by-name/cl/clorinde/package.nix index c6a4052d8999..981fd2cf1b14 100644 --- a/pkgs/by-name/cl/clorinde/package.nix +++ b/pkgs/by-name/cl/clorinde/package.nix @@ -8,17 +8,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "clorinde"; - version = "0.15.0"; + version = "0.15.1"; src = fetchFromGitHub { owner = "halcyonnouveau"; repo = "clorinde"; tag = "clorinde-v${finalAttrs.version}"; - hash = "sha256-PUAySbgmbulSlkabABiSFeDDa+o0tQ2uQtiQGSqO1/w="; + hash = "sha256-Ynz1pdgckQzMLuUJUGSzNRNwWZKrEZuYgrrT/BxAxzc="; }; useFetchCargoVendor = true; - cargoHash = "sha256-zSeAD3MBflO+lhuLxH57YhR6wxsqZn62XQ0dgImdNLE="; + cargoHash = "sha256-g3pWvoTq1DlKlIDJq79IJrvDiLR0HZRPIt4K1YUPsvM="; cargoBuildFlags = [ "--package=clorinde" ]; diff --git a/pkgs/by-name/co/connman/package.nix b/pkgs/by-name/co/connman/package.nix index e62def2dccab..1995a54fa143 100644 --- a/pkgs/by-name/co/connman/package.nix +++ b/pkgs/by-name/co/connman/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchurl, + fetchpatch, autoreconfHook, dbus, file, @@ -78,13 +79,26 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-ElfOvjJ+eQC34rhMD7MwqpCBXkVYmM0vlB9DCO0r47w="; }; - patches = optionals stdenv.hostPlatform.isMusl [ - # Fix Musl build by avoiding a Glibc-only API. - (fetchurl { - url = "https://git.alpinelinux.org/aports/plain/community/connman/libresolv.patch?id=e393ea84386878cbde3cccadd36a30396e357d1e"; - hash = "sha256-7Q1bp8rD/gGVYUqnIXqjr9vypR8jlC926p3KYWl9kLw="; - }) - ]; + patches = + [ + (fetchpatch { + name = "CVE-2025-32366.patch"; + url = "https://git.kernel.org/pub/scm/network/connman/connman.git/patch/?id=8d3be0285f1d4667bfe85dba555c663eb3d704b4"; + hash = "sha256-kPb4pZVWvnvTUcpc4wRc8x/pMUTXGIywj3w8IYKRTBs="; + }) + (fetchpatch { + name = "CVE-2025-32743.patch"; + url = "https://git.kernel.org/pub/scm/network/connman/connman.git/patch/?id=d90b911f6760959bdf1393c39fe8d1118315490f"; + hash = "sha256-odkjYC/iM6dTIJx2WM/KKotXdTtgv8NMFNJMzx5+YU4="; + }) + ] + ++ optionals stdenv.hostPlatform.isMusl [ + # Fix Musl build by avoiding a Glibc-only API. + (fetchurl { + url = "https://git.alpinelinux.org/aports/plain/community/connman/libresolv.patch?id=e393ea84386878cbde3cccadd36a30396e357d1e"; + hash = "sha256-7Q1bp8rD/gGVYUqnIXqjr9vypR8jlC926p3KYWl9kLw="; + }) + ]; nativeBuildInputs = [ autoreconfHook diff --git a/pkgs/by-name/ec/ec2-instance-selector/package.nix b/pkgs/by-name/ec/ec2-instance-selector/package.nix new file mode 100644 index 000000000000..c6620d0af98f --- /dev/null +++ b/pkgs/by-name/ec/ec2-instance-selector/package.nix @@ -0,0 +1,46 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + versionCheckHook, + nix-update-script, +}: + +buildGoModule (finalAttrs: { + pname = "ec2-instance-selector"; + version = "3.1.1"; + + src = fetchFromGitHub { + owner = "aws"; + repo = "amazon-ec2-instance-selector"; + tag = "v${finalAttrs.version}"; + hash = "sha256-4J66/LiFFeUW20du2clqjz9ozLV+Sn2VVqF9VISXpb0="; + }; + + vendorHash = "sha256-ocysHrbkmFQ96dEVJvc5YuuBiaXToAcMUUPFiLpMCpU="; + + ldflags = [ + "-s" + "-w" + "-X=main.versionID=${finalAttrs.version}" + "-X=github.com/aws/amazon-ec2-instance-selector/v3/pkg/selector.versionID=${finalAttrs.version}" + ]; + + postInstall = '' + rm $out/bin/readme-test + mv $out/bin/cmd $out/bin/ec2-instance-selector + ''; + + doInstallCheck = true; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Recommends instance types based on resource criteria like vcpus and memory"; + homepage = "https://github.com/aws/amazon-ec2-instance-selector"; + changelog = "https://github.com/aws/amazon-ec2-instance-selector/tags/v${finalAttrs.version}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ wcarlsen ]; + mainProgram = "ec2-instance-selector"; + }; +}) diff --git a/pkgs/by-name/es/esphome/package.nix b/pkgs/by-name/es/esphome/package.nix index 42ce5755059e..b88b9dd967fa 100644 --- a/pkgs/by-name/es/esphome/package.nix +++ b/pkgs/by-name/es/esphome/package.nix @@ -33,14 +33,14 @@ let in python.pkgs.buildPythonApplication rec { pname = "esphome"; - version = "2025.5.0"; + version = "2025.5.1"; pyproject = true; src = fetchFromGitHub { owner = pname; repo = pname; tag = version; - hash = "sha256-BcPdgAvRR7zataL4KOhLAvQaQnS60z8UZ9xdIK7ydz4="; + hash = "sha256-z4FwymWFjyqNx95r2o7LLCmytRQYkogfCKiUFNyGOuA="; }; build-systems = with python.pkgs; [ diff --git a/pkgs/by-name/ex/exploitdb/package.nix b/pkgs/by-name/ex/exploitdb/package.nix index 4aec5276f880..42ba290d79e4 100644 --- a/pkgs/by-name/ex/exploitdb/package.nix +++ b/pkgs/by-name/ex/exploitdb/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "exploitdb"; - version = "2025-05-22"; + version = "2025-05-26"; src = fetchFromGitLab { owner = "exploit-database"; repo = "exploitdb"; rev = "refs/tags/${version}"; - hash = "sha256-2dnIchOJJrqqePgOxb7tWw0j1neTlXFyxT30qwTOkrc="; + hash = "sha256-e9a0bzlyqI3lR87X+S9XIVTpEv1a9RxlfKqyk6CsDGU="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/ex/expr/package.nix b/pkgs/by-name/ex/expr/package.nix index ee5916854ad6..469cc2511e05 100644 --- a/pkgs/by-name/ex/expr/package.nix +++ b/pkgs/by-name/ex/expr/package.nix @@ -6,18 +6,18 @@ buildGoModule rec { pname = "expr"; - version = "1.17.3"; + version = "1.17.4"; src = fetchFromGitHub { owner = "expr-lang"; repo = "expr"; rev = "v${version}"; - hash = "sha256-oi5dMTuirAnUFOC8zBlu7YErp13DZPoSGNpueKXdNtE="; + hash = "sha256-Ss1rs4BiKFOSzfL6VXKZA2Z/LYJ9N+AYkgdVCeintOk="; }; sourceRoot = "${src.name}/repl"; - vendorHash = "sha256-tSerrcRS7Nl0rZQqGfUKgdHsGBXEAFFF+Cn7HqFyfqA="; + vendorHash = "sha256-mjqbO3qgX7ak8VRFHnz9UYNoOd+bbHBImDLvnaJhdqI="; ldflags = [ "-s" diff --git a/pkgs/by-name/fa/falcoctl/package.nix b/pkgs/by-name/fa/falcoctl/package.nix index 6f36d1ebf140..056c15dc889e 100644 --- a/pkgs/by-name/fa/falcoctl/package.nix +++ b/pkgs/by-name/fa/falcoctl/package.nix @@ -6,16 +6,16 @@ buildGoModule (finalAttrs: { pname = "falcoctl"; - version = "0.11.1"; + version = "0.11.2"; src = fetchFromGitHub { owner = "falcosecurity"; repo = "falcoctl"; tag = "v${finalAttrs.version}"; - hash = "sha256-3YsxshQh+LQBpKt7YG52rwOdWyjkfn+kTa6nsHpkA+A="; + hash = "sha256-cbrlFxRRHwrK1+mkvEktrOCbg5bhKG7GXvv+YJ6un7I="; }; - vendorHash = "sha256-uIs3e2E8ThW7n9SXX2lu63KFmsy/QrVGQ4NgY1J+Qr0="; + vendorHash = "sha256-L7VXGMWs2eRQUT37CCtQsiYZnsDi/a8QSwAw/f/mydc="; ldflags = [ "-s" diff --git a/pkgs/by-name/fw/fw/package.nix b/pkgs/by-name/fw/fw/package.nix index 1c362653909f..e178d77dbc3e 100644 --- a/pkgs/by-name/fw/fw/package.nix +++ b/pkgs/by-name/fw/fw/package.nix @@ -10,17 +10,17 @@ rustPlatform.buildRustPackage rec { pname = "fw"; - version = "2.20.0"; + version = "2.21.0"; src = fetchFromGitHub { owner = "brocode"; repo = "fw"; rev = "v${version}"; - hash = "sha256-bq8N49qArdF0EFIGiK4lCsC0CZxwmeo0R8OiehrifTg="; + hash = "sha256-tqtiAw4+bnCJMF37SluAE9NM55MAjBGkJTvGLcmYFnA="; }; useFetchCargoVendor = true; - cargoHash = "sha256-sU7PfD77Sqi1Vrq2DgkkBF1bzL8d+/csa60CtQ7itSQ="; + cargoHash = "sha256-B32GegI3rvame0Ds+8+oBVUbcNhr2kwm3oVVxng8BZY="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/ga/gamescope/package.nix b/pkgs/by-name/ga/gamescope/package.nix index 57a6c6ccc575..26c47796dcdc 100644 --- a/pkgs/by-name/ga/gamescope/package.nix +++ b/pkgs/by-name/ga/gamescope/package.nix @@ -49,14 +49,14 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "gamescope"; - version = "3.16.9"; + version = "3.16.10"; src = fetchFromGitHub { owner = "ValveSoftware"; repo = "gamescope"; tag = finalAttrs.version; fetchSubmodules = true; - hash = "sha256-Dw9EErOINGoOlnNqroKR+fbRfMGL7Q13gP3E5iw4RhU="; + hash = "sha256-MZhIsnSp2uGMQds5zEhF8WZgGNHDGH+3A2TGjB6Vn10="; }; patches = [ diff --git a/pkgs/by-name/gh/gh-gei/package.nix b/pkgs/by-name/gh/gh-gei/package.nix index 68f9040a6036..73f360632092 100644 --- a/pkgs/by-name/gh/gh-gei/package.nix +++ b/pkgs/by-name/gh/gh-gei/package.nix @@ -7,13 +7,13 @@ buildDotnetModule rec { pname = "gh-gei"; - version = "1.15.0"; + version = "1.15.1"; src = fetchFromGitHub { owner = "github"; repo = "gh-gei"; rev = "v${version}"; - hash = "sha256-33Npwf4C6IFrrsIRq4+udphfovaCXQ8JfN0yzfxIRq0="; + hash = "sha256-Iuhz/kaamgMWNxilNvCRnjdTFrhSPhHpFKYllQ8OuGU="; }; dotnet-sdk = dotnetCorePackages.sdk_8_0_4xx; diff --git a/pkgs/by-name/gl/glitchtip/frontend.nix b/pkgs/by-name/gl/glitchtip/frontend.nix index 2f075b546bde..6b536f6b6425 100644 --- a/pkgs/by-name/gl/glitchtip/frontend.nix +++ b/pkgs/by-name/gl/glitchtip/frontend.nix @@ -9,18 +9,18 @@ buildNpmPackage (finalAttrs: { pname = "glitchtip-frontend"; - version = "5.0.1"; + version = "5.0.4"; src = fetchFromGitLab { owner = "glitchtip"; repo = "glitchtip-frontend"; tag = "v${finalAttrs.version}"; - hash = "sha256-mqwPCp7C5n2fOE8kgUnW3SYuuaY8ZkJtuhYXP4HevnM="; + hash = "sha256-2XZCIIWQAM2Nk8/JTs5MzUJJOvJS+wrsa2m/XiC9FHM="; }; npmDeps = fetchNpmDeps { inherit (finalAttrs) src; - hash = "sha256-Jzwarti+WwKecWn3fPcF9LV+mbU22rgiTP7mslyoqRk="; + hash = "sha256-iJFEeUaPP6ZnntoZ2X0TyR6f923zPuzzZNW/zkd8M7E="; }; postPatch = '' diff --git a/pkgs/by-name/gl/glitchtip/package.nix b/pkgs/by-name/gl/glitchtip/package.nix index b39900869faa..8de4566399f5 100644 --- a/pkgs/by-name/gl/glitchtip/package.nix +++ b/pkgs/by-name/gl/glitchtip/package.nix @@ -102,14 +102,14 @@ in stdenv.mkDerivation (finalAttrs: { pname = "glitchtip"; - version = "5.0.1"; + version = "5.0.4"; pyproject = true; src = fetchFromGitLab { owner = "glitchtip"; repo = "glitchtip-backend"; tag = "v${finalAttrs.version}"; - hash = "sha256-vfsuJn6lpaesK40nqCdJMCDiaaqS1EdZdvgmy9jPuo8="; + hash = "sha256-ihefyunZc191w9cn7iSqblNA4V4hELi9jwxfFrjPvu0="; }; propagatedBuildInputs = pythonPackages; diff --git a/pkgs/by-name/je/jellyfin-ffmpeg/package.nix b/pkgs/by-name/je/jellyfin-ffmpeg/package.nix index d419d6b38f42..aa6749446c02 100644 --- a/pkgs/by-name/je/jellyfin-ffmpeg/package.nix +++ b/pkgs/by-name/je/jellyfin-ffmpeg/package.nix @@ -5,7 +5,7 @@ }: let - version = "7.1.1-1"; + version = "7.1.1-3"; in (ffmpeg_7-full.override { @@ -14,7 +14,7 @@ in owner = "jellyfin"; repo = "jellyfin-ffmpeg"; rev = "v${version}"; - hash = "sha256-gu6+fOCcrGIZiR2hMl9tk97OmCmewOVJibz52DNpL1Q="; + hash = "sha256-pJLIhXDPDRhEqzmc1bXViSTSnRifFhMlixkEbGA0GRE="; }; }).overrideAttrs (old: { diff --git a/pkgs/by-name/kd/kdsingleapplication/package.nix b/pkgs/by-name/kd/kdsingleapplication/package.nix index ed53ce683a4a..cbf7906a0d0f 100644 --- a/pkgs/by-name/kd/kdsingleapplication/package.nix +++ b/pkgs/by-name/kd/kdsingleapplication/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "KDSingleApplication"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "KDAB"; repo = "KDSingleApplication"; tag = "v${version}"; - hash = "sha256-Ymm+qOZMWULg7u5xEpGzcAfIrbWBQ3jsndnFSnh6/PA="; + hash = "sha256-rglt89Gw6OHXXVOEwf0TxezDzyHEvWepeGeup7fBlLs="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/le/legendary-heroic/package.nix b/pkgs/by-name/le/legendary-heroic/package.nix index c0fbd88df158..8aa57c2458e0 100644 --- a/pkgs/by-name/le/legendary-heroic/package.nix +++ b/pkgs/by-name/le/legendary-heroic/package.nix @@ -5,7 +5,7 @@ python3Packages, }: let - version = "0.20.36"; + version = "0.20.37"; in python3Packages.buildPythonApplication { pname = "legendary-heroic"; @@ -15,7 +15,7 @@ python3Packages.buildPythonApplication { owner = "Heroic-Games-Launcher"; repo = "legendary"; rev = version; - sha256 = "sha256-+aywgd5RZfkmVuA0MaF2/Ie4a5If/zQxvVCcTfGpQpE="; + sha256 = "sha256-mOys7lOPrrzBUBMIM/JvKygFQ/qIGD68BDNigk5BCIo="; }; propagatedBuildInputs = with python3Packages; [ diff --git a/pkgs/by-name/li/libfaketime/package.nix b/pkgs/by-name/li/libfaketime/package.nix index 9eba7b189c1f..4a48a3881806 100644 --- a/pkgs/by-name/li/libfaketime/package.nix +++ b/pkgs/by-name/li/libfaketime/package.nix @@ -53,6 +53,8 @@ stdenv.mkDerivation rec { nativeCheckInputs = [ perl ]; + doCheck = true; + meta = with lib; { description = "Report faked system time to programs without having to change the system-wide time"; homepage = "https://github.com/wolfcw/libfaketime/"; diff --git a/pkgs/by-name/li/libplacebo/package.nix b/pkgs/by-name/li/libplacebo/package.nix index d50c722327ac..b959f62574b9 100644 --- a/pkgs/by-name/li/libplacebo/package.nix +++ b/pkgs/by-name/li/libplacebo/package.nix @@ -21,14 +21,14 @@ stdenv.mkDerivation rec { pname = "libplacebo"; - version = "7.349.0"; + version = "7.351.0"; src = fetchFromGitLab { domain = "code.videolan.org"; owner = "videolan"; repo = "libplacebo"; rev = "v${version}"; - hash = "sha256-mIjQvc7SRjE1Orb2BkHK+K1TcRQvzj2oUOCUT4DzIuA="; + hash = "sha256-ccoEFpp6tOFdrfMyE0JNKKMAdN4Q95tP7j7vzUj+lSQ="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/lx/lxc/package.nix b/pkgs/by-name/lx/lxc/package.nix index 5c14f5f64172..14b13e73527d 100644 --- a/pkgs/by-name/lx/lxc/package.nix +++ b/pkgs/by-name/lx/lxc/package.nix @@ -17,6 +17,7 @@ pkg-config, systemd, + fetchpatch, nix-update-script, }: @@ -57,6 +58,13 @@ stdenv.mkDerivation (finalAttrs: { # Fix hardcoded path of lxc-user-nic # This is needed to use unprivileged containers ./user-nic.diff + + # Fixes https://github.com/zabbly/incus/issues/81 + (fetchpatch { + name = "4536.patch"; + url = "https://patch-diff.githubusercontent.com/raw/lxc/lxc/pull/4536.patch"; + hash = "sha256-yEqK9deO2MhfPROPfBw44Z752Mc5bR8DBKl1KrGC+5c="; + }) ]; mesonFlags = [ diff --git a/pkgs/by-name/mu/museeks/package.nix b/pkgs/by-name/mu/museeks/package.nix index eb551c222a8b..86d0f0e85459 100644 --- a/pkgs/by-name/mu/museeks/package.nix +++ b/pkgs/by-name/mu/museeks/package.nix @@ -1,41 +1,60 @@ { lib, + stdenv, fetchurl, - appimageTools, + dpkg, + autoPatchelfHook, + webkitgtk_4_1, + libsoup_3, + glib, + gtk3, + cairo, + dbus, + gdk-pixbuf, + nix-update-script, }: -let +stdenv.mkDerivation (finalAttrs: { pname = "museeks"; - version = "0.13.1"; + version = "0.20.9"; src = fetchurl { - url = "https://github.com/martpie/museeks/releases/download/${version}/museeks-x86_64.AppImage"; - hash = "sha256-LvunhCFmpv00TnXzWjp3kQUAhoKpmp6pqKgcaUqZV+o="; + url = "https://github.com/martpie/museeks/releases/download/${finalAttrs.version}/Museeks_${finalAttrs.version}_amd64.deb"; + hash = "sha256-7jRgMpfQTJr3yW3YAPTnPSvtrqumScN3Tr7YXQX3Fi8="; }; - appimageContents = appimageTools.extractType2 { - inherit pname version src; - }; -in -appimageTools.wrapType2 { - inherit pname version src; + nativeBuildInputs = [ + dpkg + autoPatchelfHook + ]; - extraInstallCommands = '' - mkdir -p $out/share/${pname} - cp -a ${appimageContents}/{locales,resources} $out/share/${pname} - cp -a ${appimageContents}/usr/share/icons $out/share/ - install -Dm 444 ${appimageContents}/${pname}.desktop -t $out/share/applications + buildInputs = [ + dbus + webkitgtk_4_1 + libsoup_3 + gtk3 + cairo + gdk-pixbuf + glib + (lib.getLib stdenv.cc.cc) + ]; - substituteInPlace $out/share/applications/${pname}.desktop \ - --replace 'Exec=AppRun' 'Exec=${pname}' + installPhase = '' + runHook preInstall + + cp -r usr $out + + runHook postInstall ''; - meta = with lib; { + passthru.updateScript = nix-update-script { }; + + meta = { description = "Simple, clean and cross-platform music player"; homepage = "https://github.com/martpie/museeks"; - license = licenses.mit; + license = lib.licenses.mit; platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ zendo ]; + maintainers = with lib.maintainers; [ zendo ]; mainProgram = "museeks"; }; -} +}) diff --git a/pkgs/by-name/nc/ncgopher/package.nix b/pkgs/by-name/nc/ncgopher/package.nix index 50deded81024..a4652d0c2f25 100644 --- a/pkgs/by-name/nc/ncgopher/package.nix +++ b/pkgs/by-name/nc/ncgopher/package.nix @@ -6,35 +6,40 @@ ncurses6, openssl, sqlite, + perl, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "ncgopher"; - version = "0.5.0"; + version = "0.7.0"; src = fetchFromGitHub { owner = "jansc"; repo = "ncgopher"; - rev = "v${version}"; - sha256 = "sha256-KrvTwcIeINIBkia6PTnKXp4jFd6GEMBh/xbn0Ot/wmE="; + tag = "v${finalAttrs.version}"; + hash = "sha256-9bwQgFZkwOV28qflWL7ZyUE3SLvPhf77sjomurqMK6E="; }; useFetchCargoVendor = true; - cargoHash = "sha256-QhkYyvoWMGtLH5HhpOJ3JsBIWeZN/CllcXwNW+iM3WI="; + cargoHash = "sha256-wfodxA1fvdsvWvmnzYmL4GzgdIiQbXuhGq/U9spM+0s="; + + nativeBuildInputs = [ + pkg-config + perl + ]; - nativeBuildInputs = [ pkg-config ]; buildInputs = [ ncurses6 openssl sqlite ]; - meta = with lib; { + meta = { description = "Gopher and gemini client for the modern internet"; homepage = "https://github.com/jansc/ncgopher"; - license = licenses.bsd2; - maintainers = with maintainers; [ shamilton ]; - platforms = platforms.linux; + license = lib.licenses.bsd2; + maintainers = with lib.maintainers; [ shamilton ]; + platforms = lib.platforms.linux; mainProgram = "ncgopher"; }; -} +}) diff --git a/pkgs/by-name/ng/ngrok/versions.json b/pkgs/by-name/ng/ngrok/versions.json index 534f529f3337..8831f0240f5c 100644 --- a/pkgs/by-name/ng/ngrok/versions.json +++ b/pkgs/by-name/ng/ngrok/versions.json @@ -1,38 +1,38 @@ { "linux-386": { "sys": "linux-386", - "url": "https://bin.equinox.io/a/7rWAoLaoN6E/ngrok-v3-3.19.1-linux-386", - "sha256": "ade3cb371e0420b4d314051f702029661ec051158892ae8de87b0dd3fb8c9ae2", - "version": "3.19.1" + "url": "https://bin.equinox.io/a/fK7zHbUXRW4/ngrok-v3-3.22.1-linux-386", + "sha256": "25d1317d5f2014b6ee8e27408256c96efb68e5ae855ae31ec78f39a16c6af2c9", + "version": "3.22.1" }, "linux-amd64": { "sys": "linux-amd64", - "url": "https://bin.equinox.io/a/aNKWdiDQehF/ngrok-v3-3.19.1-linux-amd64", - "sha256": "eea9510a71beab13f50024c23938d00ba9cfe4a8b4840030b8432c8637b4427a", - "version": "3.19.1" + "url": "https://bin.equinox.io/a/jBvFVwnCxra/ngrok-v3-3.22.1-linux-amd64", + "sha256": "edf3b724fd9768c380257aec415ea0636f3e1e8d4f67318e3e1ad71c71fb7c3d", + "version": "3.22.1" }, "linux-arm": { "sys": "linux-arm", - "url": "https://bin.equinox.io/a/fHwvcnrN4W1/ngrok-v3-3.19.1-linux-arm", - "sha256": "ff1260e987641b0b280e5da3004d020093745a7586ecca65e1025bc3738d55d9", - "version": "3.19.1" + "url": "https://bin.equinox.io/a/3nCe4mzMEnu/ngrok-v3-3.22.1-linux-arm", + "sha256": "ef9e6d0796d9e73e3811a6b45f40dc534b2bafdf2c53e9d837d633417916bf0e", + "version": "3.22.1" }, "linux-arm64": { "sys": "linux-arm64", - "url": "https://bin.equinox.io/a/ckBcN6JRV3s/ngrok-v3-3.19.1-linux-arm64", - "sha256": "1f8eec521c00eece4a4a15750927dc492f1243e34598868b15996940ab2bed5b", - "version": "3.19.1" + "url": "https://bin.equinox.io/a/7qiGrRXJ1od/ngrok-v3-3.22.1-linux-arm64", + "sha256": "ef154e04bbc0d48a28f387c20ccf7a57d38485fbdad2c7e46c04749cd79e42b5", + "version": "3.22.1" }, "darwin-amd64": { "sys": "darwin-amd64", - "url": "https://bin.equinox.io/a/yubNbWvsvB/ngrok-v3-3.19.1-darwin-amd64", - "sha256": "4e19fee94598a74164516a8b439742bd8bee8844bfea4e3f41ba33b761323583", - "version": "3.19.1" + "url": "https://bin.equinox.io/a/bCPsqUE6DvJ/ngrok-v3-3.22.1-darwin-amd64", + "sha256": "7b2fb1bb04a4e18756ff59903bc5dc06a99a3426713058259f5359965a699b70", + "version": "3.22.1" }, "darwin-arm64": { "sys": "darwin-arm64", - "url": "https://bin.equinox.io/a/iv6WKkDK2i5/ngrok-v3-3.19.1-darwin-arm64", - "sha256": "1da4acdf28b7c64ded056d29a2f3bb452481b4112a04f520f33fcead8794e2a1", - "version": "3.19.1" + "url": "https://bin.equinox.io/a/4XSXTVcG6uw/ngrok-v3-3.22.1-darwin-arm64", + "sha256": "7911865275673426fc8bc24afbbe079a3047e61300ffe622b6e6214d4da85786", + "version": "3.22.1" } } diff --git a/pkgs/by-name/ni/nixfmt-tree/package.nix b/pkgs/by-name/ni/nixfmt-tree/package.nix index f9a7991544ef..a36a449b3449 100644 --- a/pkgs/by-name/ni/nixfmt-tree/package.nix +++ b/pkgs/by-name/ni/nixfmt-tree/package.nix @@ -4,6 +4,8 @@ treefmt, nixfmt-rfc-style, nixfmt-tree, + git, + writableTmpDirAsHomeHook, settings ? { }, runtimeInputs ? [ ], @@ -30,9 +32,6 @@ let # The default is warn, which would be too annoying for people who just care about Nix on-unmatched = lib.mkOptionDefault "info"; - # Assume the tree is a Git repository, will fail if it's not - tree-root-file = lib.mkOptionDefault ".git/index"; - # NOTE: The `mkIf` condition should not be needed once `runtimePackages` is removed. formatter.nixfmt = lib.mkIf (lib.any isNixfmt allRuntimeInputs) { command = "nixfmt"; @@ -102,9 +101,6 @@ treefmtWithConfig.overrideAttrs { # Log level for files treefmt won't format on-unmatched = "info"; - # Assume the tree is a Git repository, will fail if it's not - tree-root-file = ".git/index"; - # Configure nixfmt for .nix files formatter.nixfmt = { command = "nixfmt"; @@ -122,49 +118,63 @@ treefmtWithConfig.overrideAttrs { platforms = lib.platforms.all; }; - passthru.tests.simple = runCommand "nixfmt-tree-test-simple" { } '' - export XDG_CACHE_HOME=$(mktemp -d) - cat > unformatted.nix < formatted.nix < unformatted.nix < formatted.nix <&1 | grep "QuickJS version" - qjscalc --help 2>&1 | grep "QuickJS version" set -o pipefail '' @@ -93,10 +93,6 @@ stdenv.mkDerivation (finalAttrs: { ES2023 specification including modules, asynchronous generators, proxies and BigInt. - It optionally supports mathematical extensions such as big decimal - floating point numbers (BigDecimal), big binary floating point numbers - (BigFloat) and operator overloading. - Main Features: - Small and easily embeddable: just a few C files, no external @@ -112,8 +108,6 @@ stdenv.mkDerivation (finalAttrs: { - Can compile Javascript sources to executables with no external dependency. - Garbage collection using reference counting (to reduce memory usage and have deterministic behavior) with cycle removal. - - Mathematical extensions: BigDecimal, BigFloat, operator overloading, - bigint mode, math mode. - Command line interpreter with contextual colorization implemented in Javascript. - Small built-in standard library with C library wrappers. diff --git a/pkgs/by-name/r2/r2modman/package.nix b/pkgs/by-name/r2/r2modman/package.nix index 8ff252ef6fdf..cef3abad2691 100644 --- a/pkgs/by-name/r2/r2modman/package.nix +++ b/pkgs/by-name/r2/r2modman/package.nix @@ -15,18 +15,18 @@ stdenv.mkDerivation (finalAttrs: { pname = "r2modman"; - version = "3.1.58"; + version = "3.2.0"; src = fetchFromGitHub { owner = "ebkr"; repo = "r2modmanPlus"; rev = "v${finalAttrs.version}"; - hash = "sha256-ICLKkhgEi0ThWHLgm9fr0QXXtWMCAOJ6nkD66JR8XMo="; + hash = "sha256-RCMb9NaGzFRV2sXBxeb9G9pHmKf66/wwlNrpKIUE2iQ="; }; offlineCache = fetchYarnDeps { yarnLock = "${finalAttrs.src}/yarn.lock"; - hash = "sha256-3SMvUx+TwUmOur/50HDLWt0EayY5tst4YANWIlXdiPQ="; + hash = "sha256-F+TYP8F/2YAubeBIFMXlhNjjAPVTPMkZ+oH6UVt/gbs="; }; patches = [ diff --git a/pkgs/by-name/rb/rbdoom-3-bfg/package.nix b/pkgs/by-name/rb/rbdoom-3-bfg/package.nix index 137be74c7a0d..7dbf12a24e54 100644 --- a/pkgs/by-name/rb/rbdoom-3-bfg/package.nix +++ b/pkgs/by-name/rb/rbdoom-3-bfg/package.nix @@ -2,12 +2,10 @@ lib, stdenv, fetchFromGitHub, - fetchpatch, cmake, directx-shader-compiler, - libGLU, - libpng, - libjpeg_turbo, + ispc, + ncurses, openal, rapidjson, SDL2, @@ -18,22 +16,16 @@ stdenv.mkDerivation rec { pname = "rbdoom-3-bfg"; - version = "1.5.1"; + version = "1.6.0"; src = fetchFromGitHub { owner = "RobertBeckebans"; repo = pname; rev = "v${version}"; - hash = "sha256-bjjeTdbQDWTibSrIWhCnr6F0Ef17efLgWGQAAwezjUw="; + hash = "sha256-9BZEFO+e5IG6hv9+QI9OJecQ84rLTWBDz4k0GU6SeDE="; fetchSubmodules = true; }; - patches = fetchpatch { - name = "replace-HLSL-ternary-operators.patch"; - url = "https://github.com/RobertBeckebans/RBDOOM-3-BFG/commit/feffa4a4dd9a2a5f3c608f720cde41bea37797d3.patch"; - hash = "sha256-aR1eoWZL3+ps7P7yFXFvGsMFxpUSBDiyBsja/ISin4I="; - }; - postPatch = '' substituteInPlace neo/extern/nvrhi/tools/shaderCompiler/CMakeLists.txt \ --replace "AppleClang" "Clang" @@ -42,12 +34,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake directx-shader-compiler + ispc ]; buildInputs = [ - libGLU - libpng - libjpeg_turbo + ncurses openal rapidjson SDL2 @@ -60,9 +51,6 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DFFMPEG=OFF" "-DBINKDEC=ON" - "-DUSE_SYSTEM_LIBGLEW=ON" - "-DUSE_SYSTEM_LIBPNG=ON" - "-DUSE_SYSTEM_LIBJPEG=ON" "-DUSE_SYSTEM_RAPIDJSON=ON" "-DUSE_SYSTEM_ZLIB=ON" ]; diff --git a/pkgs/by-name/re/reindeer/package.nix b/pkgs/by-name/re/reindeer/package.nix index 672152e9f1a7..97fe361b4546 100644 --- a/pkgs/by-name/re/reindeer/package.nix +++ b/pkgs/by-name/re/reindeer/package.nix @@ -9,17 +9,17 @@ rustPlatform.buildRustPackage rec { pname = "reindeer"; - version = "2025.05.12.00"; + version = "2025.05.26.00"; src = fetchFromGitHub { owner = "facebookincubator"; repo = "reindeer"; tag = "v${version}"; - hash = "sha256-e6kP2vLJURjp+iCgyQGX3gHFaHyLhGzNJ1qjEcDBjz4="; + hash = "sha256-I5I5m9UutBMgX7PygPjMgglqvRfZxuWiyJ4l+77WYAQ="; }; useFetchCargoVendor = true; - cargoHash = "sha256-hpOcPMrgUXDUrTml8nl737NFe0WYPdIY66rU+QRqyx0="; + cargoHash = "sha256-i0HAT8L9rf0r/jOqDFe60PakXwHz9lr4gwXm0ZwN4No="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/ru/runitor/package.nix b/pkgs/by-name/ru/runitor/package.nix index b5e157aca970..afcc7c661565 100644 --- a/pkgs/by-name/ru/runitor/package.nix +++ b/pkgs/by-name/ru/runitor/package.nix @@ -8,14 +8,14 @@ buildGoModule rec { pname = "runitor"; - version = "1.3.0"; - vendorHash = null; + version = "1.4.0"; + vendorHash = "sha256-SYYAAtuWt/mTmZPBilYxf2uZ6OcgeTnobYiye47i8mI="; src = fetchFromGitHub { owner = "bdd"; repo = "runitor"; rev = "v${version}"; - sha256 = "sha256-9sg+ku3Qh/X/EZ2VCrvIc0pq5iyn4O8RZrO4KpkciAI="; + sha256 = "sha256-eD8bJ34ZfTPToQrZ8kZGcSBdMmmCwRtuXgwZmz15O3s="; }; ldflags = [ diff --git a/pkgs/by-name/si/simplotask/package.nix b/pkgs/by-name/si/simplotask/package.nix index 67cb01ac86c7..8fd2638c5d2a 100644 --- a/pkgs/by-name/si/simplotask/package.nix +++ b/pkgs/by-name/si/simplotask/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "simplotask"; - version = "1.17.0"; + version = "1.17.1"; src = fetchFromGitHub { owner = "umputun"; repo = "spot"; rev = "v${version}"; - hash = "sha256-uMS2Nf5Brx4hXMGMG3vTU3V2y83gLPb8vau7GA+DGak="; + hash = "sha256-6SWWf1ZprCZPXLvUtIln1+TrOztn7WWkN8o/fQXau5I="; }; vendorHash = null; diff --git a/pkgs/by-name/te/teams-for-linux/package.nix b/pkgs/by-name/te/teams-for-linux/package.nix index f4e1769e8caf..434226ffef39 100644 --- a/pkgs/by-name/te/teams-for-linux/package.nix +++ b/pkgs/by-name/te/teams-for-linux/package.nix @@ -16,16 +16,16 @@ buildNpmPackage rec { pname = "teams-for-linux"; - version = "2.0.13"; + version = "2.0.14"; src = fetchFromGitHub { owner = "IsmaelMartinez"; repo = "teams-for-linux"; tag = "v${version}"; - hash = "sha256-xkVJ8PrW2huf3oNVSYySQnzKPadsYFXnrMgi+mFXBQU="; + hash = "sha256-B7u5xJHss09QOP1AHoHZWIiHyd2RBcF/XU3BB9N2C60="; }; - npmDepsHash = "sha256-jDJH/lAbmUURMkdv49S1KeE4I/MOEzK0ZDWh1sbnzXY="; + npmDepsHash = "sha256-JJUkZlol09Hehxc26DMdEzdxy8Nxa16G8YdTZkHhi78="; nativeBuildInputs = [ makeWrapper diff --git a/pkgs/by-name/te/texturepacker/package.nix b/pkgs/by-name/te/texturepacker/package.nix index 61dc23ea5ee6..389c685de710 100644 --- a/pkgs/by-name/te/texturepacker/package.nix +++ b/pkgs/by-name/te/texturepacker/package.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "texturepacker"; - version = "7.6.3"; + version = "7.7.0"; src = fetchurl { url = "https://www.codeandweb.com/download/texturepacker/${finalAttrs.version}/TexturePacker-${finalAttrs.version}.deb"; - hash = "sha256-A1YNy6Y5EdOnV0dY0VN/k7nX26L/uaHqDHmdC5N1Otk="; + hash = "sha256-0HSKushYQXt13z619ZmZt0ADpQA20jmRrext1w6/Ghc="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/lomiri/applications/lomiri-music-app/default.nix b/pkgs/desktops/lomiri/applications/lomiri-music-app/default.nix index 3a1dcf319dff..34654e838795 100644 --- a/pkgs/desktops/lomiri/applications/lomiri-music-app/default.nix +++ b/pkgs/desktops/lomiri/applications/lomiri-music-app/default.nix @@ -2,7 +2,6 @@ stdenv, lib, fetchFromGitLab, - fetchpatch, gitUpdater, nixosTests, cmake, @@ -12,6 +11,7 @@ lomiri-content-hub, lomiri-thumbnailer, lomiri-ui-toolkit, + mediascanner2, qtbase, qtdeclarative, qtmultimedia, @@ -22,31 +22,15 @@ stdenv.mkDerivation (finalAttrs: { pname = "lomiri-music-app"; - version = "3.2.2"; + version = "3.3.0"; src = fetchFromGitLab { owner = "ubports"; repo = "development/apps/lomiri-music-app"; - rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-tHCbZF+7i/gYs8WqM5jDBhhKmM4ZeUbG3DYBdQAiUT8="; + tag = "v${finalAttrs.version}"; + hash = "sha256-lCpRt0SeNszlCsmJOZvnzoDmHV7xCGKdmIZBJTlBQDo="; }; - patches = [ - # Remove when version > 3.2.2 - (fetchpatch { - name = "0001-lomiri-music-app-Fix-GNUInstallDirs-usage.patch"; - url = "https://gitlab.com/ubports/development/apps/lomiri-music-app/-/commit/32591f2332aa204b9ee2857992e50594db0e6ff2.patch"; - hash = "sha256-SXn+7jItzi1Q0xK0iK57+W3SpEdSCx1dKSfeghOCePg="; - }) - - # Remove when version > 3.2.2 - (fetchpatch { - name = "0002-lomiri-music-app-bindtextdomain.patch"; - url = "https://gitlab.com/ubports/development/apps/lomiri-music-app/-/commit/4e950521a67e201f3d02b3b71c6bb1ddce8ef2b2.patch"; - hash = "sha256-HgGKk44FU+IXRVx2NK3iGSo/wPJce1T2k/vP8nZtewQ="; - }) - ]; - postPatch = '' # We don't want absolute paths in desktop files substituteInPlace CMakeLists.txt \ @@ -73,6 +57,7 @@ stdenv.mkDerivation (finalAttrs: { lomiri-content-hub lomiri-thumbnailer lomiri-ui-toolkit + mediascanner2 qtmultimedia qtsystems ] @@ -113,7 +98,9 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Default Music application for Ubuntu devices"; homepage = "https://gitlab.com/ubports/development/apps/lomiri-music-app"; - changelog = "https://gitlab.com/ubports/development/apps/lomiri-music-app/-/blob/v${finalAttrs.version}/ChangeLog"; + changelog = "https://gitlab.com/ubports/development/apps/lomiri-music-app/-/blob/${ + if (!builtins.isNull finalAttrs.src.tag) then finalAttrs.src.tag else finalAttrs.src.rev + }/ChangeLog"; license = with lib.licenses; [ gpl3Only ]; diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index c404bfe6d46b..65bfdfe6cfc2 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -93,9 +93,9 @@ major = "3"; minor = "14"; patch = "0"; - suffix = "b1"; + suffix = "b2"; }; - hash = "sha256-Ld0wp3yfYuBlzmSGZKJUubDAEbzaqMHCeHCH5kTL6zk="; + hash = "sha256-esnoSES7wKWo8feaN6aLO4yvKli0qlmZxJInyzbnDqY="; inherit passthruFun; }; # Minimal versions of Python (built without optional dependencies) diff --git a/pkgs/development/python-modules/azure-eventhub/default.nix b/pkgs/development/python-modules/azure-eventhub/default.nix index 5f4c8615ddf8..1cfda2439a9e 100644 --- a/pkgs/development/python-modules/azure-eventhub/default.nix +++ b/pkgs/development/python-modules/azure-eventhub/default.nix @@ -3,6 +3,7 @@ azure-core, buildPythonPackage, fetchFromGitHub, + gitUpdater, setuptools, typing-extensions, }: @@ -36,6 +37,10 @@ buildPythonPackage rec { "azure.eventhub.aio" ]; + passthru = { + updateScript = gitUpdater { rev-prefix = "azure.eventhub."; }; + }; + meta = with lib; { description = "Microsoft Azure Event Hubs Client Library for Python"; homepage = "https://github.com/Azure/azure-sdk-for-python/tree/master/sdk/eventhub/azure-eventhub"; diff --git a/pkgs/development/python-modules/caldav/default.nix b/pkgs/development/python-modules/caldav/default.nix index 76ffc259e48f..1343bae47695 100644 --- a/pkgs/development/python-modules/caldav/default.nix +++ b/pkgs/development/python-modules/caldav/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "caldav"; - version = "1.4.0"; + version = "1.5.0"; pyproject = true; src = fetchFromGitHub { owner = "python-caldav"; repo = "caldav"; tag = "v${version}"; - hash = "sha256-rixhEIcl37ZIiYFOnJY0Ww75xZy3o/436JcgLmoOGi0="; + hash = "sha256-SYjfQG4muuBcnVeu9cl00Zb2fGUhw157LLxA5/N5EJ0="; }; build-system = [ diff --git a/pkgs/development/python-modules/cement/default.nix b/pkgs/development/python-modules/cement/default.nix index 85071fbb0301..ea70f7895ab0 100644 --- a/pkgs/development/python-modules/cement/default.nix +++ b/pkgs/development/python-modules/cement/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "cement"; - version = "3.0.12"; + version = "3.0.14"; pyproject = true; disabled = pythonOlder "3.8"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "datafolklabs"; repo = "cement"; tag = version; - hash = "sha256-weBqmNEjeSh5YQfHK48VVFW3UbZQmV4MiIQ3UPQKTTI="; + hash = "sha256-hZ9kKQmMomjy5nnHKQ2RWB+6vIID8XMn3qutg0wCBq8="; }; build-system = [ pdm-backend ]; diff --git a/pkgs/development/python-modules/devito/default.nix b/pkgs/development/python-modules/devito/default.nix index 3503ea42f522..34a18bca77af 100644 --- a/pkgs/development/python-modules/devito/default.nix +++ b/pkgs/development/python-modules/devito/default.nix @@ -6,11 +6,11 @@ # build-system setuptools, + setuptools-scm, # dependencies anytree, cgen, - click, cloudpickle, codepy, llvmPackages, @@ -22,6 +22,7 @@ sympy, # tests + click, gcc, matplotlib, pytest-xdist, @@ -31,26 +32,28 @@ buildPythonPackage rec { pname = "devito"; - version = "4.8.16"; + version = "4.8.17"; pyproject = true; src = fetchFromGitHub { owner = "devitocodes"; repo = "devito"; tag = "v${version}"; - hash = "sha256-yG4nJLnzIrITRMbtT/9UxDB0xvRiwnQMW13Z9HNQIq8="; + hash = "sha256-1aZSL23yNi/X9hnYKpIvgEOjEZtvPgTo5Pi5kKOWJhQ="; }; pythonRemoveDeps = [ "pip" ]; pythonRelaxDeps = true; - build-system = [ setuptools ]; + build-system = [ + setuptools + setuptools-scm + ]; dependencies = [ anytree cgen - click cloudpickle codepy multidict @@ -62,6 +65,7 @@ buildPythonPackage rec { ] ++ lib.optionals stdenv.cc.isClang [ llvmPackages.openmp ]; nativeCheckInputs = [ + click gcc matplotlib pytest-xdist diff --git a/pkgs/development/python-modules/djangosaml2/default.nix b/pkgs/development/python-modules/djangosaml2/default.nix index 37db74d9c29b..27a23298d60a 100644 --- a/pkgs/development/python-modules/djangosaml2/default.nix +++ b/pkgs/development/python-modules/djangosaml2/default.nix @@ -47,7 +47,7 @@ buildPythonPackage rec { meta = { description = "Django SAML2 Service Provider based on pySAML2"; homepage = "https://github.com/IdentityPython/djangosaml2"; - changelog = "https://github.com/IdentityPython/djangosaml2/blob/${src.tag}/CHANGES"; + changelog = "https://github.com/IdentityPython/djangosaml2/releases/tag/${src.tag}"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ melvyn2 ]; }; diff --git a/pkgs/development/python-modules/google-photos-library-api/default.nix b/pkgs/development/python-modules/google-photos-library-api/default.nix index bc2965b3eeb1..87a7c8a5f626 100644 --- a/pkgs/development/python-modules/google-photos-library-api/default.nix +++ b/pkgs/development/python-modules/google-photos-library-api/default.nix @@ -39,6 +39,8 @@ buildPythonPackage rec { pytestCheckHook ]; + __darwinAllowLocalNetworking = true; + meta = { changelog = "https://github.com/allenporter/python-google-photos-library-api/releases/tag/${version}"; description = "Python client library for Google Photos Library API"; diff --git a/pkgs/development/python-modules/http-sf/default.nix b/pkgs/development/python-modules/http-sf/default.nix index cddce17259ec..fcbde1e7d21d 100644 --- a/pkgs/development/python-modules/http-sf/default.nix +++ b/pkgs/development/python-modules/http-sf/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "http-sf"; - version = "1.0.3"; + version = "1.0.4"; pyproject = true; disabled = pythonOlder "3.9"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "mnot"; repo = "http-sf"; tag = "v${version}"; - hash = "sha256-P4dr0prd4FeMdHP4vu6SBWNjYLF/gPAkkL8xyBMtDxQ="; + hash = "sha256-swstFntoox9cafLZ5tj02uFoReIRf+9xGOxHvga+Q5o="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/identify/default.nix b/pkgs/development/python-modules/identify/default.nix index 2de77a776357..f59607f9981e 100644 --- a/pkgs/development/python-modules/identify/default.nix +++ b/pkgs/development/python-modules/identify/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "identify"; - version = "2.6.10"; + version = "2.6.12"; pyproject = true; disabled = pythonOlder "3.9"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "pre-commit"; repo = "identify"; tag = "v${version}"; - hash = "sha256-PI7EDA6CZs6nGcggCt008LaQtJLlkAHj0Pnx44plggY="; + hash = "sha256-zV9NRHFh/bfbg+pO0xX5aXunc1y4aGfKDugyCFLj/xA="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/minikerberos/default.nix b/pkgs/development/python-modules/minikerberos/default.nix index 44d44f3b969d..03b560720c13 100644 --- a/pkgs/development/python-modules/minikerberos/default.nix +++ b/pkgs/development/python-modules/minikerberos/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "minikerberos"; - version = "0.4.4"; + version = "0.4.6"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-GweGHGxAOLZqOnVdzOtw0xuvsrKsaB1gf1xZ/WuFR7w="; + hash = "sha256-Vv04ngYZcEO32J7ucT6aXyu1RgINtqBk4ZIddA+VcpA="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/murmurhash/default.nix b/pkgs/development/python-modules/murmurhash/default.nix index dc3aa8a32468..a508e3257ff8 100644 --- a/pkgs/development/python-modules/murmurhash/default.nix +++ b/pkgs/development/python-modules/murmurhash/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "murmurhash"; - version = "1.0.12"; + version = "1.0.13"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-Rnt+4xwfefRtAENqGVf8UqDlgBNp3S8w63ZV84BzW18="; + hash = "sha256-c3JG1B7gD/dLB7C9HwiIvjBNIDzmaOZCyGqmTt4w+Lc="; }; postPatch = '' diff --git a/pkgs/development/python-modules/mypy-boto3-builder/default.nix b/pkgs/development/python-modules/mypy-boto3-builder/default.nix index 7afc3c03d8ab..532c9a93b5de 100644 --- a/pkgs/development/python-modules/mypy-boto3-builder/default.nix +++ b/pkgs/development/python-modules/mypy-boto3-builder/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "mypy-boto3-builder"; - version = "8.10.1"; + version = "8.11.0"; pyproject = true; disabled = pythonOlder "3.12"; @@ -31,12 +31,12 @@ buildPythonPackage rec { owner = "youtype"; repo = "mypy_boto3_builder"; tag = version; - hash = "sha256-2XWFmmTkT5LpGqzHK3h8KeqQXP1+nwNEPeGHt/gowRo="; + hash = "sha256-7NrN42DcM+NNTjRnOdDzPBTKFRex8Ph4bVjdVgJa4Po="; }; postPatch = '' substituteInPlace pyproject.toml \ - --replace-fail 'version = "8.10.0"' 'version = "${version}"' + --replace-fail 'version = "8.10.1"' 'version = "${version}"' ''; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/oelint-data/default.nix b/pkgs/development/python-modules/oelint-data/default.nix index 580bae09ecf8..01c53b7eda78 100644 --- a/pkgs/development/python-modules/oelint-data/default.nix +++ b/pkgs/development/python-modules/oelint-data/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "oelint-data"; - version = "1.0.14"; + version = "1.0.15"; pyproject = true; src = fetchFromGitHub { owner = "priv-kweihmann"; repo = "oelint-data"; tag = version; - hash = "sha256-4EfvRj9vtSZRtsypCshg2T7raV3a0bozZVu1IdRdtdg="; + hash = "sha256-OZtBJWjAYuwXt1ehgt6bIZPeVByXCjOcctPJGLrsxiU="; }; build-system = [ @@ -34,7 +34,7 @@ buildPythonPackage rec { meta = { description = "Data for oelint-adv"; homepage = "https://github.com/priv-kweihmann/oelint-data"; - changelog = "https://github.com/priv-kweihmann/oelint-data/releases/tag/${version}"; + changelog = "https://github.com/priv-kweihmann/oelint-data/releases/tag/${src.tag}"; license = lib.licenses.bsd2; maintainers = with lib.maintainers; [ GaetanLepage ]; }; diff --git a/pkgs/development/python-modules/opower/default.nix b/pkgs/development/python-modules/opower/default.nix index 00f656dfab46..84d5348a85b6 100644 --- a/pkgs/development/python-modules/opower/default.nix +++ b/pkgs/development/python-modules/opower/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "opower"; - version = "0.12.1"; + version = "0.12.2"; pyproject = true; disabled = pythonOlder "3.9"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "tronikos"; repo = "opower"; tag = "v${version}"; - hash = "sha256-4Sbx7qvQFY/9yKXF4CiRqKh3CNTsHZrmS5BjJ80UaXM="; + hash = "sha256-9qDkhhx96+Zu2yr+EWJc0m2ntNlCo0luFOr6NxWtJSw="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pyspellchecker/default.nix b/pkgs/development/python-modules/pyspellchecker/default.nix index 693863346bb7..5d7321371d74 100644 --- a/pkgs/development/python-modules/pyspellchecker/default.nix +++ b/pkgs/development/python-modules/pyspellchecker/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "pyspellchecker"; - version = "0.8.2"; + version = "0.8.3"; format = "pyproject"; src = fetchFromGitHub { owner = "barrust"; repo = "pyspellchecker"; tag = "v${version}"; - hash = "sha256-sQNYtm+EK/F4S/Kfy87MwqDjCfV33/v8bYi48UBz+qc="; + hash = "sha256-cfYtUOXO4xzO2CYYhWMv3o40iw5/+nvA8MAzJn6LPlQ="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/pytricia/default.nix b/pkgs/development/python-modules/pytricia/default.nix deleted file mode 100644 index d2caf52c6010..000000000000 --- a/pkgs/development/python-modules/pytricia/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchFromGitHub, -}: - -buildPythonPackage { - pname = "pytricia"; - version = "unstable-2019-01-16"; - format = "setuptools"; - - src = fetchFromGitHub { - owner = "jsommers"; - repo = "pytricia"; - rev = "4ba88f68c3125f789ca8cd1cfae156e1464bde87"; - sha256 = "0qp5774xkm700g35k5c76pck8pdzqlyzbaqgrz76a1yh67s2ri8h"; - }; - - meta = with lib; { - description = "Library for fast IP address lookup in Python"; - homepage = "https://github.com/jsommers/pytricia"; - license = with licenses; [ lgpl3Plus ]; - maintainers = with maintainers; [ mkg ]; - }; -} diff --git a/pkgs/development/python-modules/starlette-compress/default.nix b/pkgs/development/python-modules/starlette-compress/default.nix new file mode 100644 index 000000000000..970d665ae9a4 --- /dev/null +++ b/pkgs/development/python-modules/starlette-compress/default.nix @@ -0,0 +1,53 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + hatchling, + brotli, + brotlicffi, + starlette, + zstandard, + pytestCheckHook, + httpx, + trio, +}: + +buildPythonPackage rec { + pname = "starlette-compress"; + version = "1.6.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "Zaczero"; + repo = "starlette-compress"; + tag = version; + hash = "sha256-VEVPbCGE4BQo/0t/P785TyMHZGSKCicV6H0LbBsv8uo="; + }; + + build-system = [ hatchling ]; + + dependencies = [ + brotli + brotlicffi + starlette + zstandard + ]; + + checkInputs = [ + httpx + trio + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "starlette_compress" ]; + + meta = { + description = "Compression middleware for Starlette - supporting ZStd, Brotli, and GZip"; + homepage = "https://pypi.org/p/starlette-compress"; + license = lib.licenses.bsd0; + maintainers = with lib.maintainers; [ wrvsrx ]; + }; +} diff --git a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix index e4591f77f53d..7557d4b46eb2 100644 --- a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix +++ b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "tencentcloud-sdk-python"; - version = "3.0.1387"; + version = "3.0.1388"; pyproject = true; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "TencentCloud"; repo = "tencentcloud-sdk-python"; tag = version; - hash = "sha256-kBy5fSfD7LFpFH8X6p/ZP4DCAkDlBh+Yt5P7TZbIkzc="; + hash = "sha256-gUioBNnOGZgoURnkO4Yh4uok80rTMZcZY1M2lCdHJJ0="; }; build-system = [ setuptools ]; diff --git a/pkgs/tools/system/netdata/default.nix b/pkgs/tools/system/netdata/default.nix index 505e75df85a7..127f52d8669c 100644 --- a/pkgs/tools/system/netdata/default.nix +++ b/pkgs/tools/system/netdata/default.nix @@ -239,7 +239,9 @@ stdenv.mkDerivation (finalAttrs: { wrapProgram $out/bin/netdata-claim.sh --prefix PATH : ${lib.makeBinPath [ openssl ]} wrapProgram $out/libexec/netdata/plugins.d/cgroup-network-helper.sh --prefix PATH : ${lib.makeBinPath [ bash ]} wrapProgram $out/bin/netdatacli --set NETDATA_PIPENAME /run/netdata/ipc - substituteInPlace $out/lib/netdata/conf.d/go.d/sensors.conf --replace-fail '/usr/bin/sensors' '${lm_sensors}/bin/sensors' + ${lib.optionalString (stdenv.hostPlatform.isLinux) '' + substituteInPlace $out/lib/netdata/conf.d/go.d/sensors.conf --replace-fail '/usr/bin/sensors' '${lm_sensors}/bin/sensors' + ''} # Time to cleanup the output directory. unlink $out/sbin diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index a49d67cfe7ed..deae43830fe0 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -521,6 +521,7 @@ mapAliases ({ pwndbg = throw "'pwndbg' has been removed due to dependency version incompatibilities that are infeasible to maintain in nixpkgs. Use the downstream flake that pwndbg provides instead: https://github.com/pwndbg/pwndbg"; # Added 2025-02-09 pxml = throw "pxml was removed, because it was disabled on all python version since 3.8 and last updated in 2020."; # added 2024-05-13 py3to2 = throw "py3to2 is unmaintained and source is no longer available"; # added 2024-10-23 + pytricia = throw "pytricia has been removed, since it is unmaintained"; # added 2025-05-25 py-radix = throw "py-radix has been removed, since it abandoned"; # added 2023-07-07 py_stringmatching = py-stringmatching; # added 2023-11-12 py17track = throw "py17track was removed because Home Assistant switched to pyseventeentrack"; # added 2024-08-08 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 16ed1fa0480e..fbd80431a5b1 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -14520,8 +14520,6 @@ self: super: with self; { pytransportnswv2 = callPackage ../development/python-modules/pytransportnswv2 { }; - pytricia = callPackage ../development/python-modules/pytricia { }; - pytrydan = callPackage ../development/python-modules/pytrydan { }; pyttsx3 = callPackage ../development/python-modules/pyttsx3 { }; @@ -16726,6 +16724,8 @@ self: super: with self; { starlette-admin = callPackage ../development/python-modules/starlette-admin { }; + starlette-compress = callPackage ../development/python-modules/starlette-compress { }; + starlette-context = callPackage ../development/python-modules/starlette-context { }; starlette-wtf = callPackage ../development/python-modules/starlette-wtf { };