diff --git a/lib/path/default.nix b/lib/path/default.nix index 4ffee65e1cf5..be559eadf182 100644 --- a/lib/path/default.nix +++ b/lib/path/default.nix @@ -159,7 +159,13 @@ let # but this is not fully specified, so let's tie this too much to the currently implemented concept of store paths. # Similar reasoning applies to the validity of the name part. # We care more about discerning store path-ness on realistic values. Making it airtight would be fragile and slow. - && match ".{32}-.+" (elemAt components storeDirLength) != null; + && match ".{32}-.+" (elemAt components storeDirLength) != null + # alternatively match content‐addressed derivations, which _currently_ do + # not have a store directory prefix. + # This is a workaround for https://github.com/NixOS/nix/issues/12361 which + # was needed during the experimental phase of ca-derivations and should be + # removed once the issue has been resolved. + || match "[0-9a-z]{52}" (head components) != null; in # No rec! Add dependencies on this file at the top. diff --git a/lib/path/tests/unit.nix b/lib/path/tests/unit.nix index 903e8ff0acff..a52b4f44e51d 100644 --- a/lib/path/tests/unit.nix +++ b/lib/path/tests/unit.nix @@ -137,6 +137,16 @@ let expected = true; }; + # Test paths for content‐addressed derivations + testHasStorePathPrefixExample7 = { + expr = hasStorePathPrefix (/. + "/1121rp0gvr1qya7hvy925g5kjwg66acz6sn1ra1hca09f1z5dsab"); + expected = true; + }; + testHasStorePathPrefixExample8 = { + expr = hasStorePathPrefix (/. + "/1121rp0gvr1qya7hvy925g5kjwg66acz6sn1ra1hca09f1z5dsab/foo/bar"); + expected = true; + }; + # Test examples from the lib.path.subpath.isValid documentation testSubpathIsValidExample1 = { expr = subpath.isValid null; diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 8fd22251b90a..e4309a98f93e 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -1163,7 +1163,7 @@ in { tayga = handleTest ./tayga.nix {}; technitium-dns-server = handleTest ./technitium-dns-server.nix {}; teeworlds = handleTest ./teeworlds.nix {}; - telegraf = handleTest ./telegraf.nix {}; + telegraf = runTest ./telegraf.nix; teleport = handleTest ./teleport.nix {}; teleports = runTest ./teleports.nix; thelounge = handleTest ./thelounge.nix {}; diff --git a/nixos/tests/telegraf.nix b/nixos/tests/telegraf.nix index 93d4c85b3e8d..e09b1848882f 100644 --- a/nixos/tests/telegraf.nix +++ b/nixos/tests/telegraf.nix @@ -1,47 +1,45 @@ -import ./make-test-python.nix ( - { pkgs, ... }: - { - name = "telegraf"; - meta = with pkgs.lib.maintainers; { - maintainers = [ mic92 ]; +{ pkgs, ... }: +{ + name = "telegraf"; + meta = with pkgs.lib.maintainers; { + maintainers = [ mic92 ]; + }; + + nodes.machine = + { ... }: + { + services.telegraf.enable = true; + services.telegraf.environmentFiles = [ + (pkgs.writeText "secrets" '' + SECRET=example + '') + ]; + services.telegraf.extraConfig = { + agent.interval = "1s"; + agent.flush_interval = "1s"; + inputs.exec = { + commands = [ + "${pkgs.runtimeShell} -c 'echo $SECRET,tag=a i=42i'" + ]; + timeout = "5s"; + data_format = "influx"; + }; + inputs.ping = { + urls = [ "127.0.0.1" ]; + count = 4; + interval = "10s"; + timeout = 1.0; + }; + outputs.file.files = [ "/tmp/metrics.out" ]; + outputs.file.data_format = "influx"; + }; }; - nodes.machine = - { ... }: - { - services.telegraf.enable = true; - services.telegraf.environmentFiles = [ - (pkgs.writeText "secrets" '' - SECRET=example - '') - ]; - services.telegraf.extraConfig = { - agent.interval = "1s"; - agent.flush_interval = "1s"; - inputs.exec = { - commands = [ - "${pkgs.runtimeShell} -c 'echo $SECRET,tag=a i=42i'" - ]; - timeout = "5s"; - data_format = "influx"; - }; - inputs.ping = { - urls = [ "127.0.0.1" ]; - count = 4; - interval = "10s"; - timeout = 1.0; - }; - outputs.file.files = [ "/tmp/metrics.out" ]; - outputs.file.data_format = "influx"; - }; - }; + testScript = '' + start_all() - testScript = '' - start_all() - - machine.wait_for_unit("telegraf.service") - machine.wait_until_succeeds("grep -q example /tmp/metrics.out") - machine.wait_until_succeeds("grep -q ping /tmp/metrics.out") - ''; - } -) + machine.wait_for_unit("telegraf.service") + machine.wait_until_succeeds("grep -q example /tmp/metrics.out") + machine.wait_until_succeeds("grep -q ping /tmp/metrics.out") + ''; +} diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 4557fb16c4f3..1c5a6b377c4c 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -1423,6 +1423,32 @@ final: prev: meta.hydraPlatforms = [ ]; }; + blink-cmp-avante = buildVimPlugin { + pname = "blink-cmp-avante"; + version = "2025-02-19"; + src = fetchFromGitHub { + owner = "Kaiser-Yang"; + repo = "blink-cmp-avante"; + rev = "e5a1be4c818520385f95fe2663c04e48f5f0c36a"; + sha256 = "13rkypddzpgz6a36s38a30qfx0n3jspd788yvgjdb7dkn0zrvqdg"; + }; + meta.homepage = "https://github.com/Kaiser-Yang/blink-cmp-avante/"; + meta.hydraPlatforms = [ ]; + }; + + blink-cmp-conventional-commits = buildVimPlugin { + pname = "blink-cmp-conventional-commits"; + version = "2025-02-18"; + src = fetchFromGitHub { + owner = "disrupted"; + repo = "blink-cmp-conventional-commits"; + rev = "e7ce3ddcc6d4044067d6d77ab41d480202e814ad"; + sha256 = "0m72nyg3pm1ig04hvch6lzd4hy77dnmdxxmbq154qwkjhbm0bs6m"; + }; + meta.homepage = "https://github.com/disrupted/blink-cmp-conventional-commits/"; + meta.hydraPlatforms = [ ]; + }; + blink-cmp-copilot = buildVimPlugin { pname = "blink-cmp-copilot"; version = "2025-02-21"; @@ -1514,6 +1540,19 @@ final: prev: meta.hydraPlatforms = [ ]; }; + blink-nerdfont-nvim = buildVimPlugin { + pname = "blink-nerdfont.nvim"; + version = "2025-02-06"; + src = fetchFromGitHub { + owner = "MahanRahmati"; + repo = "blink-nerdfont.nvim"; + rev = "2f3cedda78dcf4ef547128ce7f72f7b80e25501d"; + sha256 = "17cab659iiv6l67xjwk5kj624nhxmmng7xjbgimr4v86yhmirk4m"; + }; + meta.homepage = "https://github.com/MahanRahmati/blink-nerdfont.nvim/"; + meta.hydraPlatforms = [ ]; + }; + blink-ripgrep-nvim = buildVimPlugin { pname = "blink-ripgrep.nvim"; version = "2025-03-08"; @@ -8962,7 +9001,7 @@ final: prev: rev = "8239023d299a692784176f202f6a4a5e0a698ad2"; sha256 = "sha256-Fbe7xuu5Qy6GXKsvQbVcE5oG7dgKjghuX470V7sjmqA="; }; - meta.homepage = "https://github.com/adrigzr/neotest-mocha"; + meta.homepage = "https://github.com/adrigzr/neotest-mocha/"; meta.hydraPlatforms = [ ]; }; diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index 4e58e0ebeb71..868c3cd4c042 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -300,6 +300,10 @@ in dependencies = [ self.blink-cmp ]; }; + blink-nerdfont-nvim = super.blink-nerdfont-nvim.overrideAttrs { + dependencies = [ self.blink-cmp ]; + }; + blink-cmp-git = super.blink-cmp-git.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 5b0c01d547d7..b9f5aa343010 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -108,12 +108,15 @@ https://github.com/rbgrouleff/bclose.vim/,, https://github.com/max397574/better-escape.nvim/,, https://github.com/LunarVim/bigfile.nvim/,, https://github.com/APZelos/blamer.nvim/,HEAD, +https://github.com/Kaiser-Yang/blink-cmp-avante/,HEAD, +https://github.com/disrupted/blink-cmp-conventional-commits/,HEAD, https://github.com/giuxtaposition/blink-cmp-copilot/,HEAD, https://github.com/Kaiser-Yang/blink-cmp-dictionary/,HEAD, https://github.com/Kaiser-Yang/blink-cmp-git/,HEAD, https://github.com/ribru17/blink-cmp-spell/,HEAD, https://github.com/fang2hou/blink-copilot/,HEAD, https://github.com/moyiz/blink-emoji.nvim/,HEAD, +https://github.com/MahanRahmati/blink-nerdfont.nvim/,HEAD, https://github.com/mikavilpas/blink-ripgrep.nvim/,HEAD, https://github.com/Saghen/blink.compat/,HEAD, https://github.com/HampusHauffman/block.nvim/,HEAD, @@ -685,8 +688,8 @@ https://github.com/alfaix/neotest-gtest/,HEAD, https://github.com/MrcJkb/neotest-haskell/,HEAD, https://github.com/rcasia/neotest-java/,HEAD, https://github.com/nvim-neotest/neotest-jest/,HEAD, -https://github.com/adrigzr/neotest-mocha/,HEAD, https://github.com/zidhuss/neotest-minitest/,HEAD, +https://github.com/adrigzr/neotest-mocha/,HEAD, https://github.com/theutz/neotest-pest/,HEAD, https://github.com/olimorris/neotest-phpunit/,HEAD, https://github.com/thenbe/neotest-playwright/,HEAD, diff --git a/pkgs/applications/editors/vscode/extensions/saoudrizwan.claude-dev/default.nix b/pkgs/applications/editors/vscode/extensions/saoudrizwan.claude-dev/default.nix index 7dd5251c02f8..7822a034f980 100644 --- a/pkgs/applications/editors/vscode/extensions/saoudrizwan.claude-dev/default.nix +++ b/pkgs/applications/editors/vscode/extensions/saoudrizwan.claude-dev/default.nix @@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "claude-dev"; publisher = "saoudrizwan"; - version = "3.4.0"; - hash = "sha256-7DRj167dEl12aUiGkodRa7Nem/hZNqPvGv35GqFdfb0="; + version = "3.6.9"; + hash = "sha256-KAP9NhZDfga9/qLcoF/KJJNFRYnAxLlxxnITV3bUYtw="; }; meta = { diff --git a/pkgs/applications/misc/cobalt/default.nix b/pkgs/applications/misc/cobalt/default.nix index 4e45238a401d..c90745de5fe0 100644 --- a/pkgs/applications/misc/cobalt/default.nix +++ b/pkgs/applications/misc/cobalt/default.nix @@ -8,17 +8,17 @@ rustPlatform.buildRustPackage rec { pname = "cobalt"; - version = "0.19.6"; + version = "0.19.8"; src = fetchFromGitHub { owner = "cobalt-org"; repo = "cobalt.rs"; rev = "v${version}"; - sha256 = "sha256-6fsKEIgcBu0SE/f0TNfvTdpZX3zc5Bd0F1T82COOqVQ="; + sha256 = "sha256-neOJ3UqRisCcyarRIXfHyl9nAe2Wl9IXVDNwIYEQYys="; }; useFetchCargoVendor = true; - cargoHash = "sha256-NLSdYGZy+FWjA5N1zGf3Lajg2qo4TJ86AzlKVrHxwaU="; + cargoHash = "sha256-j2xmEoMV7lVhqj4lKWA3QdEDEGUpRlZc4ikZoDQJlB8="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices ]; diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index 81be71dab77e..d29d48d14d4c 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -184,9 +184,9 @@ rec { mkTerraform = attrs: pluggable (generic attrs); terraform_1 = mkTerraform { - version = "1.11.1"; - hash = "sha256-z7GX0h6f4N+TszdVUQanqUH1qyIvy07V66MsKiLisrw="; - vendorHash = "sha256-Drje+HEWaqsYhqeRHHw8QFhhB5oGRyOptFXMV0amWhE="; + version = "1.11.2"; + hash = "sha256-HUttExqVbfk8BFMW8PB4ciSoRZP4ieE7rOdJCq4dDA0="; + vendorHash = "sha256-b4KUNRTDHqdKDtMjqN8+eP9kPiLcCku6BhcP8vkf9G0="; patches = [ ./provider-path-0_15.patch ]; passthru = { inherit plugins; diff --git a/pkgs/applications/radio/qlog/default.nix b/pkgs/applications/radio/qlog/default.nix index efccbd20f119..66ec4e7fdc6b 100644 --- a/pkgs/applications/radio/qlog/default.nix +++ b/pkgs/applications/radio/qlog/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "qlog"; - version = "0.42.1"; + version = "0.42.2"; src = fetchFromGitHub { owner = "foldynl"; repo = "QLog"; rev = "v${version}"; - hash = "sha256-pCF6Q/kBPDNbCorXk77edLmc4niUeiYRrJAKfD0kfVs="; + hash = "sha256-DWUfP0C48JMvUashqCaDfnsn1IxzhtOzmSG5Fh+sL/w="; fetchSubmodules = true; }; diff --git a/pkgs/applications/version-management/gfold/default.nix b/pkgs/applications/version-management/gfold/default.nix index a2a98bfe018c..47387cbef479 100644 --- a/pkgs/applications/version-management/gfold/default.nix +++ b/pkgs/applications/version-management/gfold/default.nix @@ -8,7 +8,7 @@ let pname = "gfold"; - version = "4.6.0"; + version = "2025.2.1"; in rustPlatform.buildRustPackage { inherit pname version; @@ -17,11 +17,11 @@ rustPlatform.buildRustPackage { owner = "nickgerace"; repo = pname; rev = version; - hash = "sha256-z5E+YS2zO4zgsW7mZbVN0z4HOurqoXwXn8hQc++9tks="; + hash = "sha256-WgSFLAhPJe7U4ovanqqxYArmPHmN+JRcVHjXYATV+wQ="; }; useFetchCargoVendor = true; - cargoHash = "sha256-7VPMWou23iJHzKFMXirsjlIvq8kyAnNSeQ26IKxfNZE="; + cargoHash = "sha256-zU6ixAlac5TKTVm4vc1qVDYtHVoNDildJpi+RrBwV9Y="; passthru.tests.version = testers.testVersion { package = gfold; diff --git a/pkgs/by-name/am/amazon-ec2-net-utils/package.nix b/pkgs/by-name/am/amazon-ec2-net-utils/package.nix new file mode 100644 index 000000000000..8c0b5d01b7ea --- /dev/null +++ b/pkgs/by-name/am/amazon-ec2-net-utils/package.nix @@ -0,0 +1,120 @@ +{ + lib, + stdenv, + bash, + coreutils, + curl, + fetchFromGitHub, + gnugrep, + gnused, + installShellFiles, + iproute2, + makeWrapper, + nix-update-script, + systemd, + util-linux, +}: + +stdenv.mkDerivation rec { + pname = "amazon-ec2-net-utils"; + version = "2.5.4"; + + src = fetchFromGitHub { + owner = "amazonlinux"; + repo = "amazon-ec2-net-utils"; + tag = "v${version}"; + hash = "sha256-uHYEavdBggdXBYUSDFvajRVLxcRge/kiu60c1a4SPRw="; + }; + + strictDeps = true; + + nativeBuildInputs = [ + installShellFiles + makeWrapper + ]; + + buildInputs = [ + bash + ]; + + # See https://github.com/amazonlinux/amazon-ec2-net-utils/blob/v2.5.4/GNUmakefile#L26-L37. + installPhase = '' + runHook preInstall + + mkdir $out + + 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 + + substituteInPlace $out/bin/setup-policy-routes \ + --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. + # + # lib/lib.sh isn't executable so we can't use it with wrapProgram. + curl + gnugrep + gnused + iproute2 + systemd + util-linux + ] + } + + for file in lib/*.sh; do + install -D -m 644 -t $out/share/amazon-ec2-net-utils "$file" + done + + substituteInPlace $out/share/amazon-ec2-net-utils/lib.sh \ + --replace-fail /usr/lib/systemd $out/lib/systemd + + for file in udev/*.rules; do + install -D -m 644 -t $out/lib/udev/rules.d "$file" + done + + substituteInPlace $out/lib/udev/rules.d/99-vpc-policy-routes.rules \ + --replace-fail /usr/bin/systemctl ${lib.getExe' systemd "systemctl"} + + for file in systemd/network/*.network; do + install -D -m 644 -t $out/lib/systemd/network "$file" + done + + for file in systemd/system/*.{service,timer}; do + install -D -m 644 -t $out/lib/systemd/system "$file" + done + + substituteInPlace $out/lib/systemd/system/policy-routes@.service \ + --replace-fail /usr/bin/setup-policy-routes $out/bin/setup-policy-routes + + substituteInPlace $out/lib/systemd/system/refresh-policy-routes@.service \ + --replace-fail /usr/bin/setup-policy-routes $out/bin/setup-policy-routes + + installManPage doc/*.8 + + runHook postInstall + ''; + + outputs = [ + "out" + "man" + ]; + + passthru = { + updateScript = nix-update-script { }; + }; + + meta = { + description = "Contains a set of utilities for managing elastic network interfaces on Amazon EC2"; + homepage = "https://github.com/amazonlinux/amazon-ec2-net-utils"; + license = lib.licenses.asl20; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ sielicki ]; + }; +} diff --git a/pkgs/by-name/an/anchor/0001-update-time-rs.patch b/pkgs/by-name/an/anchor/0001-update-time-rs.patch deleted file mode 100644 index 7b6a5852889f..000000000000 --- a/pkgs/by-name/an/anchor/0001-update-time-rs.patch +++ /dev/null @@ -1,88 +0,0 @@ -From ff4dfb52767695c066b4ad027983c0d4958094b3 Mon Sep 17 00:00:00 2001 -From: wxt <3264117476@qq.com> -Date: Tue, 24 Sep 2024 17:20:19 +0800 -Subject: [PATCH] update time-rs - ---- - Cargo.lock | 30 ++++++++++++++++++++++++------ - 1 file changed, 24 insertions(+), 6 deletions(-) - -diff --git a/Cargo.lock b/Cargo.lock -index d588e86c..f09caad8 100644 ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -1432,9 +1432,12 @@ dependencies = [ - - [[package]] - name = "deranged" --version = "0.3.8" -+version = "0.3.11" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "f2696e8a945f658fd14dc3b87242e6b80cd0f36ff04ea560fa39082368847946" -+checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" -+dependencies = [ -+ "powerfmt", -+] - - [[package]] - name = "derivation-path" -@@ -2629,6 +2632,12 @@ dependencies = [ - "num-traits", - ] - -+[[package]] -+name = "num-conv" -+version = "0.1.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" -+ - [[package]] - name = "num-derive" - version = "0.3.3" -@@ -3014,6 +3023,12 @@ dependencies = [ - "rand 0.8.5", - ] - -+[[package]] -+name = "powerfmt" -+version = "0.2.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" -+ - [[package]] - name = "ppv-lite86" - version = "0.2.17" -@@ -5276,12 +5291,14 @@ dependencies = [ - - [[package]] - name = "time" --version = "0.3.29" -+version = "0.3.36" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "426f806f4089c493dcac0d24c29c01e2c38baf8e30f1b716ee37e83d200b18fe" -+checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" - dependencies = [ - "deranged", - "itoa", -+ "num-conv", -+ "powerfmt", - "serde", - "time-core", - "time-macros", -@@ -5295,10 +5312,11 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" - - [[package]] - name = "time-macros" --version = "0.2.15" -+version = "0.2.18" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "4ad70d68dba9e1f8aceda7aa6711965dfec1cac869f311a51bd08b3a2ccbce20" -+checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" - dependencies = [ -+ "num-conv", - "time-core", - ] - --- -2.46.0 - diff --git a/pkgs/by-name/an/anchor/package.nix b/pkgs/by-name/an/anchor/package.nix index 700b3f9bcd75..0c497b16f119 100644 --- a/pkgs/by-name/an/anchor/package.nix +++ b/pkgs/by-name/an/anchor/package.nix @@ -6,20 +6,18 @@ rustPlatform.buildRustPackage rec { pname = "anchor"; - version = "0.30.1"; + version = "0.31.0"; src = fetchFromGitHub { owner = "coral-xyz"; repo = "anchor"; rev = "v${version}"; - hash = "sha256-NL8ySfvnCGKu1PTU4PJKTQt+Vsbcj+F1YYDzu0mSUoY="; + hash = "sha256-rwf2PWHoUl8Rkmktb2u7veRrIcLT3syi7M2OZxdxjG4="; fetchSubmodules = true; }; - cargoPatches = [ ./0001-update-time-rs.patch ]; - useFetchCargoVendor = true; - cargoHash = "sha256-CeTkYqRD5Xk61evYLGn8Gtdn2fTUmpKKPyPLtmABv6A="; + cargoHash = "sha256-ack2/WFrycfYHYVnZt0Q94WJdQrvLU/VZYm1KeqOjIQ="; checkFlags = [ # the following test cases try to access network, skip them @@ -33,7 +31,7 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/coral-xyz/anchor"; changelog = "https://github.com/coral-xyz/anchor/blob/${src.rev}/CHANGELOG.md"; license = licenses.asl20; - maintainers = [ ]; + maintainers = with maintainers; [ Denommus ]; mainProgram = "anchor"; }; } diff --git a/pkgs/by-name/ap/appflowy/package.nix b/pkgs/by-name/ap/appflowy/package.nix index 16023ecc3520..cbec3f98d2fd 100644 --- a/pkgs/by-name/ap/appflowy/package.nix +++ b/pkgs/by-name/ap/appflowy/package.nix @@ -17,11 +17,11 @@ let rec { x86_64-linux = { urlSuffix = "linux-x86_64.tar.gz"; - hash = "sha256-fn1UK8+7+vFL4nTnnRbfjCgttVYSw6pmmqabeHqTY3g="; + hash = "sha256-ODhN2Nu53nxzMNLsxlw/hSf6nLS7www6SXAyNeSOHmA="; }; x86_64-darwin = { urlSuffix = "macos-universal.zip"; - hash = "sha256-MoK6GlGmRVRp6feH8hab4CYpP4bXJN3XH7eHHSnhpS4="; + hash = "sha256-ZVJjUHkzEjDbFottwGKi9fTfcMdebDqP0r9Wecwro+o="; }; aarch64-darwin = x86_64-darwin; } @@ -30,7 +30,7 @@ let in stdenvNoCC.mkDerivation (finalAttrs: { pname = "appflowy"; - version = "0.7.1"; + version = "0.8.6"; src = fetchzip { url = "https://github.com/AppFlowy-IO/appflowy/releases/download/${finalAttrs.version}/AppFlowy-${finalAttrs.version}-${dist.urlSuffix}"; diff --git a/pkgs/by-name/au/autobrr/package.nix b/pkgs/by-name/au/autobrr/package.nix index 1ec76b96fd95..13d5453eda32 100644 --- a/pkgs/by-name/au/autobrr/package.nix +++ b/pkgs/by-name/au/autobrr/package.nix @@ -13,12 +13,12 @@ let pname = "autobrr"; - version = "1.58.0"; + version = "1.59.0"; src = fetchFromGitHub { owner = "autobrr"; repo = "autobrr"; tag = "v${version}"; - hash = "sha256-NH3BVD/wZH5L6x6GcXZrynKFiirLRC6u434EBYQs4qQ="; + hash = "sha256-etVhOgE8H8bWuraBepwDSZZzo9Xl819w2sT+UwpUVjM="; }; autobrr-web = stdenvNoCC.mkDerivation { @@ -40,7 +40,7 @@ let src sourceRoot ; - hash = "sha256-ESMrd+2oqytC1dQDQvncoqHGAvIFlH/1sTLrUTuSyDg="; + hash = "sha256-FzYgJvPk2RYC55LON9Wk6q6Fm2RpVeNKm/EH+KZF1hM="; }; postBuild = '' @@ -60,7 +60,7 @@ buildGoModule rec { src ; - vendorHash = "sha256-ifi4KFectr4UC1e+VJKnAWsx0f19XN2T3Paf2ud2/To="; + vendorHash = "sha256-fX2bXF2buXt/T1tfkybq8r9t5MWLGa3Wa+qVMx7z1Jc="; preBuild = '' cp -r ${autobrr-web}/* web/dist diff --git a/pkgs/by-name/ca/candy-icons/package.nix b/pkgs/by-name/ca/candy-icons/package.nix index 8f97a3c3f79d..d7f9d0046e02 100644 --- a/pkgs/by-name/ca/candy-icons/package.nix +++ b/pkgs/by-name/ca/candy-icons/package.nix @@ -8,13 +8,13 @@ stdenvNoCC.mkDerivation { pname = "candy-icons"; - version = "0-unstable-2025-02-23"; + version = "0-unstable-2025-03-10"; src = fetchFromGitHub { owner = "EliverLara"; repo = "candy-icons"; - rev = "75e873759d68b0fe3b52c7939edeb83f01db769b"; - hash = "sha256-tBO8aw4hYe0DxQovdJ39uWhRAQWqR06Prq9XIz1OADk="; + rev = "4dcd20e615ef370c5dfc63c1386c9ee7fe666d83"; + hash = "sha256-4vu3Im0vXYfpfPIXDIKmd6rSqZPnC9CUMdW5fZBejfY="; }; nativeBuildInputs = [ gtk3 ]; diff --git a/pkgs/by-name/ca/cargo-shuttle/package.nix b/pkgs/by-name/ca/cargo-shuttle/package.nix index 15444122fb5d..157a1f175e8c 100644 --- a/pkgs/by-name/ca/cargo-shuttle/package.nix +++ b/pkgs/by-name/ca/cargo-shuttle/package.nix @@ -11,17 +11,17 @@ rustPlatform.buildRustPackage rec { pname = "cargo-shuttle"; - version = "0.52.0"; + version = "0.53.0"; src = fetchFromGitHub { owner = "shuttle-hq"; repo = "shuttle"; rev = "v${version}"; - hash = "sha256-uAxNLoB8ExfHpGRl96OZWhzV8hSiDzt1E7T4OD21w74="; + hash = "sha256-RXt9qcLepJJA+MMFm26UMLuwgh8V13DoBueY1Z+W63w="; }; useFetchCargoVendor = true; - cargoHash = "sha256-cHwF4+5HQmT2hICJjCF1zaivq6AtFhhLatxUWv+esCo="; + cargoHash = "sha256-zaI/W92XyuAXs+wF1KOBEiCRqHiTTMGPiq2wrAbCDH4="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/ch/chatty/package.nix b/pkgs/by-name/ch/chatty/package.nix index 909e13940a6a..b93bbd84b9f0 100644 --- a/pkgs/by-name/ch/chatty/package.nix +++ b/pkgs/by-name/ch/chatty/package.nix @@ -18,12 +18,10 @@ gtk4, gtksourceview5, gst_all_1, - json-glib, - libgcrypt, + libcmatrix, libadwaita, libphonenumber, modemmanager, - olm, pidgin, protobuf, sqlite, @@ -32,17 +30,22 @@ stdenv.mkDerivation (finalAttrs: { pname = "chatty"; - version = "0.8.4"; + version = "0.8.6"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "World"; repo = "Chatty"; - rev = "v${finalAttrs.version}"; - fetchSubmodules = true; - hash = "sha256-1CHreTkw1C3tc6vOCG+7Y/u4R/xTFOnlI4mcxjY/alY="; + tag = "v${finalAttrs.version}"; + hash = "sha256-iPqV3xluzHPm8TCOOLvczoAPe3LuJuhWEBnQWBUU18U="; }; + postPatch = '' + # https://gitlab.gnome.org/World/Chatty/-/merge_requests/1465 + substituteInPlace src/matrix/chatty-ma-account.c \ + --replace-fail '#include ' "" + ''; + nativeBuildInputs = [ appstream-glib desktop-file-utils @@ -63,12 +66,10 @@ stdenv.mkDerivation (finalAttrs: { gtk4 gtksourceview5 gst_all_1.gstreamer - json-glib - libgcrypt + libcmatrix libadwaita libphonenumber modemmanager - olm pidgin protobuf sqlite @@ -85,7 +86,7 @@ stdenv.mkDerivation (finalAttrs: { description = "XMPP and SMS messaging via libpurple and ModemManager"; mainProgram = "chatty"; homepage = "https://gitlab.gnome.org/World/Chatty"; - changelog = "https://gitlab.gnome.org/World/Chatty/-/blob/${finalAttrs.src.rev}/NEWS"; + changelog = "https://gitlab.gnome.org/World/Chatty/-/blob/${finalAttrs.src.tag}/NEWS"; license = licenses.gpl3Plus; maintainers = with maintainers; [ dotlambda ]; platforms = platforms.linux; diff --git a/pkgs/by-name/do/docker-credential-helpers/package.nix b/pkgs/by-name/do/docker-credential-helpers/package.nix index 696ad4a6c086..8e4327f62f24 100644 --- a/pkgs/by-name/do/docker-credential-helpers/package.nix +++ b/pkgs/by-name/do/docker-credential-helpers/package.nix @@ -11,13 +11,13 @@ buildGoModule rec { pname = "docker-credential-helpers"; - version = "0.9.0"; + version = "0.9.2"; src = fetchFromGitHub { owner = "docker"; repo = pname; rev = "v${version}"; - sha256 = "sha256-yVtvLbZZJ+mn1qI0Xx0tkGCAoTaAhGQyU/4cJLk9ZWw="; + sha256 = "sha256-B5w322Jh6HPaLOKTnGgWPVnkkLnIeyIR+lKDc+uCLHk="; }; vendorHash = null; diff --git a/pkgs/by-name/el/element-desktop/element-desktop-pin.nix b/pkgs/by-name/el/element-desktop/element-desktop-pin.nix index ecdec1f89c8c..9429044d7fdb 100644 --- a/pkgs/by-name/el/element-desktop/element-desktop-pin.nix +++ b/pkgs/by-name/el/element-desktop/element-desktop-pin.nix @@ -1,7 +1,7 @@ { - "version" = "1.11.91"; + "version" = "1.11.95"; "hashes" = { - "desktopSrcHash" = "sha256-nHA/j9V+vZUgY+eCCp/iO458GrXSkla+ruJbJjh9NJw="; - "desktopYarnHash" = "09k4kislf1zimbyn6m68bh2s3kpn2cs9h04wqli3j3qgkplcvxdv"; + "desktopSrcHash" = "sha256-0OCL1m+/FOdmp7npavnAygpuEryBypie+yR1eQK1eLM="; + "desktopYarnHash" = "sha256-h5ZjpInF/qh/Cm46uzi1tTEUIbmHC/muV6X/FxGyFms="; }; } diff --git a/pkgs/by-name/el/element-desktop/keytar/default.nix b/pkgs/by-name/el/element-desktop/keytar/default.nix index 80c1828c3caf..a6548b041c25 100644 --- a/pkgs/by-name/el/element-desktop/keytar/default.nix +++ b/pkgs/by-name/el/element-desktop/keytar/default.nix @@ -24,11 +24,11 @@ let in stdenv.mkDerivation rec { - pname = "keytar"; + pname = "keytar-forked"; inherit (pinData) version; src = fetchFromGitHub { - owner = "atom"; + owner = "shiftkey"; repo = "node-keytar"; rev = "v${version}"; hash = pinData.srcHash; diff --git a/pkgs/by-name/el/element-desktop/keytar/pin.json b/pkgs/by-name/el/element-desktop/keytar/pin.json index 626f5a62ea1d..5eba4a97a822 100644 --- a/pkgs/by-name/el/element-desktop/keytar/pin.json +++ b/pkgs/by-name/el/element-desktop/keytar/pin.json @@ -1,5 +1,5 @@ { - "version": "7.9.0", - "srcHash": "sha256-Mnl0Im2hZJXJEtyXb5rgMntekkUAnOG2MN1bwfgh0eg=", - "npmHash": "sha256-ldfRWV+HXBdBYO2ZiGbVFSHV4/bMG43U7w+sJ4kpVUY=" + "version": "7.10.0", + "srcHash": "sha256-G0IYBVB37ANnI/XEyzahs9DbTQLgUKmkDoGryRkra08=", + "npmHash": "sha256-bd4YK3AuD0N5Q9ijx1jqBRBL0WADhw1ZlaxspEctse4=" } diff --git a/pkgs/by-name/el/element-desktop/package.nix b/pkgs/by-name/el/element-desktop/package.nix index 6e47fe087994..8efe960d6b4f 100644 --- a/pkgs/by-name/el/element-desktop/package.nix +++ b/pkgs/by-name/el/element-desktop/package.nix @@ -8,7 +8,7 @@ nodejs, fetchYarnDeps, jq, - electron_33, + electron_34, element-web, sqlcipher, callPackage, @@ -22,7 +22,7 @@ let pinData = import ./element-desktop-pin.nix; inherit (pinData.hashes) desktopSrcHash desktopYarnHash; executableName = "element-desktop"; - electron = electron_33; + electron = electron_34; keytar = callPackage ./keytar { inherit electron; }; @@ -67,8 +67,8 @@ stdenv.mkDerivation ( yarn --offline run i18n yarn --offline run build:res - rm -rf node_modules/matrix-seshat node_modules/keytar - ${lib.optionalString useKeytar "ln -s ${keytar} node_modules/keytar"} + rm -rf node_modules/matrix-seshat node_modules/keytar-forked + ${lib.optionalString useKeytar "ln -s ${keytar} node_modules/keytar-forked"} ln -s $seshat node_modules/matrix-seshat runHook postBuild diff --git a/pkgs/by-name/el/element-web-unwrapped/element-web-pin.nix b/pkgs/by-name/el/element-web-unwrapped/element-web-pin.nix index 75bc7666939a..67b77bbbe0c8 100644 --- a/pkgs/by-name/el/element-web-unwrapped/element-web-pin.nix +++ b/pkgs/by-name/el/element-web-unwrapped/element-web-pin.nix @@ -1,7 +1,7 @@ { - "version" = "1.11.91"; + "version" = "1.11.95"; "hashes" = { - "webSrcHash" = "sha256-kdjkmVkoJuV3SBFkVQr4IAi69mAs8V5i3qFOd66BP2s="; - "webYarnHash" = "sha256-in7qiGIXP+Ki820RB/uB2st2FIwrxjqYpdOmmLI6RSM="; + "webSrcHash" = "sha256-JS+lwPRj4Fb+UZNATS7IFMfytqRou+aIpjDVjI+iqao="; + "webYarnHash" = "sha256-Aw0wDGE0WbI975y+J2FVxlDrHcPeBDkHiD/7W8eTf1E="; }; } diff --git a/pkgs/by-name/em/emitter/package.nix b/pkgs/by-name/em/emitter/package.nix new file mode 100644 index 000000000000..191c434f2f99 --- /dev/null +++ b/pkgs/by-name/em/emitter/package.nix @@ -0,0 +1,44 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + writableTmpDirAsHomeHook, +}: + +buildGoModule rec { + pname = "emitter"; + version = "3.1"; + + src = fetchFromGitHub { + owner = "emitter-io"; + repo = "emitter"; + tag = "v${version}"; + hash = "sha256-eWBgRG0mLdiJj1TMSAxYPs+8CqLNaFUOW6/ghDn/zKE="; + }; + + vendorHash = "sha256-6K9KAvb+05nn2pFuVDiQ9IHZWpm+q01su6pl7CxXxBY="; + + nativeCheckInputs = [ writableTmpDirAsHomeHook ]; + + ldflags = [ + "-X github.com/emitter-io/emitter/internal/command/version.version=${version}" + "-X github.com/emitter-io/emitter/internal/command/version.commit=${src.rev}" + ]; + + doCheck = true; + + checkFlags = [ + # Tests require network access + "-skip=^Test(NewClient|Statsd_BadSnapshot|Statsd_Configure|Join|Random)$" + ]; + + __darwinAllowLocalNetworking = true; + + meta = { + description = "High performance, distributed and low latency publish-subscribe platform"; + homepage = "https://emitter.io/"; + license = lib.licenses.agpl3Plus; + maintainers = with lib.maintainers; [ sikmir ]; + mainProgram = "emitter"; + }; +} diff --git a/pkgs/by-name/ex/exegol/package.nix b/pkgs/by-name/ex/exegol/package.nix index 5a1b997d84ea..66dd61875dc9 100644 --- a/pkgs/by-name/ex/exegol/package.nix +++ b/pkgs/by-name/ex/exegol/package.nix @@ -1,19 +1,27 @@ { fetchPypi, lib, - python3, + python3Packages, xorg, }: -python3.pkgs.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "exegol"; - version = "4.3.9"; - format = "setuptools"; + version = "4.3.10"; + pyproject = true; - # Project has no unit tests - doCheck = false; + src = fetchPypi { + inherit pname version; + hash = "sha256-BtOW7EBbFil7yyhL6uayTUUkDldI8+xxolfQZtX+00c="; + }; - propagatedBuildInputs = - with python3.pkgs; + build-system = with python3Packages; [ pdm-backend ]; + + pythonRelaxDeps = [ + "rich" + ]; + + dependencies = + with python3Packages; [ pyyaml gitpython @@ -21,13 +29,13 @@ python3.pkgs.buildPythonApplication rec { requests rich argcomplete + tzlocal ] ++ [ xorg.xhost ]; - src = fetchPypi { - inherit pname version; - hash = "sha256-CoPQMEk8eagYU/TfaPAM6ItfSCZbrvzUww8H9ND8VUk="; - }; + doCheck = true; + + pythonImportsCheck = [ "exegol" ]; meta = with lib; { description = "Fully featured and community-driven hacking environment"; @@ -41,9 +49,9 @@ python3.pkgs.buildPythonApplication rec { ''; homepage = "https://github.com/ThePorgs/Exegol"; changelog = "https://github.com/ThePorgs/Exegol/releases/tag/${version}"; - license = licenses.gpl3Only; + license = lib.licenses.gpl3Only; mainProgram = "exegol"; - maintainers = with maintainers; [ + maintainers = with lib.maintainers; [ _0b11stan charB66 ]; diff --git a/pkgs/by-name/go/go-tools/package.nix b/pkgs/by-name/go/go-tools/package.nix index 384f1ffa424f..27feb8aeeec3 100644 --- a/pkgs/by-name/go/go-tools/package.nix +++ b/pkgs/by-name/go/go-tools/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "go-tools"; - version = "2025.1"; + version = "2025.1.1"; src = fetchFromGitHub { owner = "dominikh"; repo = "go-tools"; rev = version; - sha256 = "sha256-akNSaZBM1cUuQG4Zg3wQLUv5YI+phW0XnAHOOo1YF6g="; + sha256 = "sha256-ekSOXaVSFdzM76tcj1hbtzhYw4fnFX3VkTnsGtJanXg="; }; vendorHash = "sha256-HssfBnSKdVZVgf4f0mwsGTwhiszBlE2HmDy7cvyvJ60="; diff --git a/pkgs/by-name/go/gogup/package.nix b/pkgs/by-name/go/gogup/package.nix index adbbc48e4bec..6d2d7d63e9c6 100644 --- a/pkgs/by-name/go/gogup/package.nix +++ b/pkgs/by-name/go/gogup/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "gogup"; - version = "0.27.7"; + version = "0.27.8"; src = fetchFromGitHub { owner = "nao1215"; repo = "gup"; rev = "v${version}"; - hash = "sha256-qjzla3LucuU8StApDESi4m9f7Wdf8ibUdOsvRwQhFmQ="; + hash = "sha256-5ZeiW8WPpfQfLe02lXRIOvQ9T9yslmYuYLt7ftqHfqc="; }; - vendorHash = "sha256-QgG0ipVpor7bwIWljLNUzR9l2ICTvyltAb/ydl05EMc="; + vendorHash = "sha256-ceUvLf/kBM/542fia9A6xTFNge8y1QFxBVw2RNODkN8="; doCheck = false; ldflags = [ diff --git a/pkgs/by-name/gr/grpcui/package.nix b/pkgs/by-name/gr/grpcui/package.nix index 0a3e35882035..979a97ca1e83 100644 --- a/pkgs/by-name/gr/grpcui/package.nix +++ b/pkgs/by-name/gr/grpcui/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "grpcui"; - version = "1.4.2"; + version = "1.4.3"; src = fetchFromGitHub { owner = "fullstorydev"; repo = pname; rev = "v${version}"; - sha256 = "sha256-yk9SgQMUga7htP7XTKFk2JGzixxBV3y3PrnkzsiAMbw="; + sha256 = "sha256-Tmema+cMPDGuX6Y8atow58GdGMj7croHyj8oiDXSEYk="; }; - vendorHash = "sha256-uP5jtFji2E6GqpzjD7X5p59TXu7KQVBgEX+Gh0BIclM="; + vendorHash = "sha256-a19m+HY6SQ+06LXUDba9KRHRKNxLjzKmldJQaaI6nro="; doCheck = false; diff --git a/pkgs/by-name/gt/gtree/package.nix b/pkgs/by-name/gt/gtree/package.nix index 5f50a00132ad..1a0ea6020b85 100644 --- a/pkgs/by-name/gt/gtree/package.nix +++ b/pkgs/by-name/gt/gtree/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "gtree"; - version = "1.10.13"; + version = "1.10.14"; src = fetchFromGitHub { owner = "ddddddO"; repo = "gtree"; rev = "v${version}"; - hash = "sha256-9ygy1Xhl50k6ec0xQB4wy7vm9mfmv4oZdpUIa60DDUQ="; + hash = "sha256-c9ocRHvcu8rSgJ0Hc7E9ObsMHZtN/qvif4APUzqpjro="; }; - vendorHash = "sha256-4a9hTT0b+1YG3WFA9lm9dArrNIAYYV2sEw0rzhXqXac="; + vendorHash = "sha256-jZlR29OUefVKx3vxigvHbsIWsZbMPNAIPEa+qoU2oo0="; subPackages = [ "cmd/gtree" diff --git a/pkgs/by-name/ku/kubelogin/package.nix b/pkgs/by-name/ku/kubelogin/package.nix index 7c03265d90ee..d8068053e2f6 100644 --- a/pkgs/by-name/ku/kubelogin/package.nix +++ b/pkgs/by-name/ku/kubelogin/package.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "kubelogin"; - version = "0.1.7"; + version = "0.1.9"; src = fetchFromGitHub { owner = "Azure"; repo = pname; rev = "v${version}"; - sha256 = "sha256-yU9RDzUjN8Ona5Xa7+90qDmc4HFbec3tEzumaPmG6es="; + sha256 = "sha256-u9Fj2YkHVbFHpxrrxdYrRBvbGsLvxQQlsPHf4++L0g0="; }; - vendorHash = "sha256-pAhBUREzancX0cbLm5rgZwJn8N0fLX57wONNypADQLE="; + vendorHash = "sha256-HYUI0x4fCA8nhIHPguGCJ+F36fxb7m97bgyigwiXWd8="; ldflags = [ "-X main.gitTag=v${version}" diff --git a/pkgs/by-name/li/libcmatrix/package.nix b/pkgs/by-name/li/libcmatrix/package.nix new file mode 100644 index 000000000000..4994dfe8697d --- /dev/null +++ b/pkgs/by-name/li/libcmatrix/package.nix @@ -0,0 +1,52 @@ +{ + fetchFromGitLab, + glib, + json-glib, + lib, + libgcrypt, + libsecret, + libsoup_3, + meson, + ninja, + olm, + pkg-config, + sqlite, + stdenv, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "libcmatrix"; + version = "0.0.3"; + + src = fetchFromGitLab { + domain = "source.puri.sm"; + owner = "Librem5"; + repo = "libcmatrix"; + tag = "v${finalAttrs.version}"; + hash = "sha256-Usaqkb6zClVtYCL1VUv4iNeKs2GZECO9sOdPk3N8iLM="; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + ]; + + buildInputs = [ + glib + json-glib + libgcrypt + libsecret + libsoup_3 + olm + sqlite + ]; + + meta = { + changelog = "https://source.puri.sm/Librem5/libcmatrix/-/blob/${finalAttrs.src.tag}/NEWS"; + description = "Matrix protocol library written in C using GObject"; + homepage = "https://source.puri.sm/Librem5/libcmatrix"; + license = lib.licenses.lgpl21Only; + maintainers = with lib.maintainers; [ dotlambda ]; + }; +}) diff --git a/pkgs/by-name/ma/mairix/mmap.patch b/pkgs/by-name/ma/mairix/mmap.patch deleted file mode 100644 index 241083f2dde5..000000000000 --- a/pkgs/by-name/ma/mairix/mmap.patch +++ /dev/null @@ -1,161 +0,0 @@ -Making mairix work with mbox files over 2GB. - -https://github.com/rc0/mairix/pull/19 - -diff --git a/mairix.h b/mairix.h -index 2480492..cb25824 100644 ---- a/mairix.h -+++ b/mairix.h -@@ -327,9 +327,9 @@ enum data_to_rfc822_error { - DTR8_BAD_HEADERS, /* corrupt headers */ - DTR8_BAD_ATTACHMENT /* corrupt attachment (e.g. no body part) */ - }; --struct rfc822 *data_to_rfc822(struct msg_src *src, char *data, int length, enum data_to_rfc822_error *error); --void create_ro_mapping(const char *filename, unsigned char **data, int *len); --void free_ro_mapping(unsigned char *data, int len); -+struct rfc822 *data_to_rfc822(struct msg_src *src, char *data, size_t length, enum data_to_rfc822_error *error); -+void create_ro_mapping(const char *filename, unsigned char **data, size_t *len); -+void free_ro_mapping(unsigned char *data, size_t len); - char *format_msg_src(struct msg_src *src); - - /* In tok.c */ -diff --git a/mbox.c b/mbox.c -index ebbfa78..396e27d 100644 ---- a/mbox.c -+++ b/mbox.c -@@ -816,7 +816,7 @@ void build_mbox_lists(struct database *db, const char *folder_base, /*{{{*/ - mb->n_old_msgs_valid = mb->n_msgs; - } else { - unsigned char *va; -- int len; -+ size_t len; - create_ro_mapping(mb->path, &va, &len); - if (va) { - rescan_mbox(mb, (char *) va, len); -@@ -852,7 +852,7 @@ int add_mbox_messages(struct database *db)/*{{{*/ - int any_new = 0; - int N; - unsigned char *va; -- int valen; -+ size_t valen; - enum data_to_rfc822_error error; - - for (i=0; in_mboxen; i++) { -diff --git a/reader.c b/reader.c -index 71ac5bd..18f0108 100644 ---- a/reader.c -+++ b/reader.c -@@ -81,7 +81,8 @@ static void read_toktable2_db(char *data, struct toktable2_db *toktable, int sta - /*}}}*/ - struct read_db *open_db(char *filename)/*{{{*/ - { -- int fd, len; -+ int fd; -+ size_t len; - char *data; - struct stat sb; - struct read_db *result; -diff --git a/reader.h b/reader.h -index 9b5dfa3..d709cc4 100644 ---- a/reader.h -+++ b/reader.h -@@ -138,7 +138,7 @@ struct toktable2_db {/*{{{*/ - struct read_db {/*{{{*/ - /* Raw file parameters, needed later for munmap */ - char *data; -- int len; -+ size_t len; - - /* Pathname information */ - int n_msgs; -diff --git a/rfc822.c b/rfc822.c -index b411f85..9c8e1a4 100644 ---- a/rfc822.c -+++ b/rfc822.c -@@ -990,7 +990,7 @@ static void scan_status_flags(const char *s, struct headers *hdrs)/*{{{*/ - - /*{{{ data_to_rfc822() */ - struct rfc822 *data_to_rfc822(struct msg_src *src, -- char *data, int length, -+ char *data, size_t length, - enum data_to_rfc822_error *error) - { - struct rfc822 *result; -@@ -1265,7 +1265,7 @@ static struct ro_mapping *add_ro_cache(const char *filename, int fd, size_t len) - } - #endif /* USE_GZIP_MBOX || USE_BZIP_MBOX */ - --void create_ro_mapping(const char *filename, unsigned char **data, int *len)/*{{{*/ -+void create_ro_mapping(const char *filename, unsigned char **data, size_t *len)/*{{{*/ - { - struct stat sb; - int fd; -@@ -1386,7 +1386,7 @@ comp_error: - data_alloc_type = ALLOC_MMAP; - } - /*}}}*/ --void free_ro_mapping(unsigned char *data, int len)/*{{{*/ -+void free_ro_mapping(unsigned char *data, size_t len)/*{{{*/ - { - int r; - -@@ -1414,7 +1414,7 @@ static struct msg_src *setup_msg_src(char *filename)/*{{{*/ - /*}}}*/ - struct rfc822 *make_rfc822(char *filename)/*{{{*/ - { -- int len; -+ size_t len; - unsigned char *data; - struct rfc822 *result; - -diff --git a/search.c b/search.c -index 18b51ee..97967bc 100644 ---- a/search.c -+++ b/search.c -@@ -681,7 +681,7 @@ static void mbox_terminate(const unsigned char *data, int len, FILE *out)/*{{{*/ - static void append_file_to_mbox(const char *path, FILE *out)/*{{{*/ - { - unsigned char *data; -- int len; -+ size_t len; - create_ro_mapping(path, &data, &len); - if (data) { - fprintf(out, "From mairix@mairix Mon Jan 1 12:34:56 1970\n"); -@@ -698,8 +698,8 @@ static int had_failed_checksum; - - static void get_validated_mbox_msg(struct read_db *db, int msg_index,/*{{{*/ - int *mbox_index, -- unsigned char **mbox_data, int *mbox_len, -- unsigned char **msg_data, int *msg_len) -+ unsigned char **mbox_data, size_t *mbox_len, -+ unsigned char **msg_data, size_t *msg_len) - { - /* msg_data==NULL if checksum mismatches */ - unsigned char *start; -@@ -738,7 +738,7 @@ static void append_mboxmsg_to_mbox(struct read_db *db, int msg_index, FILE *out) - { - /* Need to common up code with try_copy_to_path */ - unsigned char *mbox_start, *msg_start; -- int mbox_len, msg_len; -+ size_t mbox_len, msg_len; - int mbox_index; - - get_validated_mbox_msg(db, msg_index, &mbox_index, &mbox_start, &mbox_len, &msg_start, &msg_len); -@@ -759,7 +759,7 @@ static void append_mboxmsg_to_mbox(struct read_db *db, int msg_index, FILE *out) - static void try_copy_to_path(struct read_db *db, int msg_index, char *target_path)/*{{{*/ - { - unsigned char *data; -- int mbox_len, msg_len; -+ size_t mbox_len, msg_len; - int mbi; - FILE *out; - unsigned char *start; -@@ -1214,7 +1214,7 @@ static int do_search(struct read_db *db, char **args, char *output_path, int sho - unsigned int mbix, msgix; - int start, len, after_end; - unsigned char *mbox_start, *msg_start; -- int mbox_len, msg_len; -+ size_t mbox_len, msg_len; - int mbox_index; - - start = db->mtime_table[i]; diff --git a/pkgs/by-name/ma/mairix/package.nix b/pkgs/by-name/ma/mairix/package.nix index e9f0bc2c2d77..2c7dcbe09e99 100644 --- a/pkgs/by-name/ma/mairix/package.nix +++ b/pkgs/by-name/ma/mairix/package.nix @@ -1,20 +1,22 @@ { lib, stdenv, - fetchurl, + fetchFromGitHub, zlib, bzip2, bison, flex, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "mairix"; - version = "0.24"; + version = "0.24-unstable-2024-09-14"; - src = fetchurl { - url = "mirror://sourceforge/mairix/mairix-${version}.tar.gz"; - sha256 = "0msaxz5c5hf7k1ci16i67m4ynrbrpsxbqzk84nz6z2vnkh3jww50"; + src = fetchFromGitHub { + owner = "vandry"; + repo = "mairix"; + rev = "f6c7a5aa141d2b201e8a299ab889ff1ed23992ea"; + hash = "sha256-7SgBbQPuz07eoZJ9km6yYEjkyf2p+BPW1ec0X2X8pKE="; }; buildInputs = [ @@ -24,9 +26,6 @@ stdenv.mkDerivation rec { flex ]; - # https://github.com/rc0/mairix/pull/19 - patches = [ ./mmap.patch ]; - enableParallelBuilding = true; meta = { @@ -35,6 +34,6 @@ stdenv.mkDerivation rec { description = "Program for indexing and searching email messages stored in maildir, MH or mbox"; mainProgram = "mairix"; maintainers = [ ]; - platforms = with lib.platforms; all; + platforms = lib.platforms.all; }; } diff --git a/pkgs/by-name/ma/marble-marcher-ce/package.nix b/pkgs/by-name/ma/marble-marcher-ce/package.nix index b1f0ffa98fd4..4532d6225b2e 100644 --- a/pkgs/by-name/ma/marble-marcher-ce/package.nix +++ b/pkgs/by-name/ma/marble-marcher-ce/package.nix @@ -1,79 +1,87 @@ { lib, stdenv, - makeWrapper, - makeDesktopItem, - copyDesktopItems, fetchFromGitHub, - sfml, + + # nativeBuildInputs + cmake, + copyDesktopItems, + makeWrapper, + + # buildInputs anttweakbar, - glm, eigen, glew, - cmake, + glm, + sfml, + + makeDesktopItem, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "marble-marcher-ce"; - version = "1.4.5"; + version = "1.4.6"; src = fetchFromGitHub { owner = "WAUthethird"; repo = "Marble-Marcher-Community-Edition"; - rev = version; - hash = "sha256-m5i/Q4k5S4wcojHqMYS7e1W/Ph7q/95j3oOK2xbrHSk="; + tag = finalAttrs.version; + hash = "sha256-xzmbC0CnhHaUJ9UHvLDLJsABD/TaJAl+SLVRQRbD9P8="; }; - buildInputs = [ - sfml - anttweakbar - glm - eigen - glew - ]; - nativeBuildInputs = [ - cmake - makeWrapper - copyDesktopItems - ]; - installFlags = [ "DESTDIR=$(out)" ]; - - prePatch = '' + postPatch = # the path /home/MMCE is always added to DESTDIR # we change this to a more sensible path # see https://github.com/WAUthethird/Marble-Marcher-Community-Edition/issues/23 - substituteInPlace CMakeLists.txt \ - --replace '/home/MMCE' '/share/MMCE' - ''; + '' + substituteInPlace CMakeLists.txt \ + --replace-fail '/home/MMCE' '/share/MMCE' + ''; + + nativeBuildInputs = [ + cmake + copyDesktopItems + makeWrapper + ]; + + buildInputs = [ + anttweakbar + eigen + glew + glm + sfml + ]; + + installFlags = [ "DESTDIR=$(out)" ]; postInstall = '' mkdir $out/bin mkdir -p $out/share/icons/ # The executable has to be run from the same directory the assets are in - makeWrapper $out/share/MMCE/MarbleMarcher $out/bin/${pname} --chdir $out/share/MMCE - ln -s $out/share/MMCE/images/MarbleMarcher.png $out/share/icons/${pname}.png + makeWrapper $out/share/MMCE/MarbleMarcher $out/bin/marble-marcher-ce --chdir $out/share/MMCE + ln -s $out/share/MMCE/images/MarbleMarcher.png $out/share/icons/marble-marcher-ce.png ''; desktopItems = [ (makeDesktopItem { - name = pname; - exec = pname; - icon = pname; - desktopName = pname; - comment = meta.description; + name = "marble-marcher-ce"; + exec = "marble-marcher-ce"; + icon = "marble-marcher-ce"; + desktopName = "marble-marcher-ce"; + comment = finalAttrs.meta.description; categories = [ "Game" ]; }) ]; - meta = with lib; { + meta = { description = "A community-developed version of the original Marble Marcher - a fractal physics game"; mainProgram = "marble-marcher-ce"; homepage = "https://michaelmoroz.itch.io/mmce"; - license = with licenses; [ + license = with lib.licenses; [ gpl2Plus # Code cc-by-30 # Assets ofl # Fonts ]; - maintainers = with maintainers; [ rampoina ]; - platforms = platforms.linux; + maintainers = with lib.maintainers; [ rampoina ]; + platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/og/ogen/package.nix b/pkgs/by-name/og/ogen/package.nix index 8f95e9172ddb..4841ecb7cb05 100644 --- a/pkgs/by-name/og/ogen/package.nix +++ b/pkgs/by-name/og/ogen/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "ogen"; - version = "1.10.0"; + version = "1.10.1"; src = fetchFromGitHub { owner = "ogen-go"; repo = "ogen"; tag = "v${version}"; - hash = "sha256-I+SCgOVH0Fo0f5lbv610PPB7dduE2MHixlKoN+v/m7c="; + hash = "sha256-A4ZtwsDBLGEGxQhGhRSAd+dSt6PRu6sPE4ZF83IWHXM="; }; - vendorHash = "sha256-OEESbftF9pF5e2GT31Jo0vugS4WOCBX5I04my/PG99M="; + vendorHash = "sha256-VpJR/VC7Gtqg2jEMqDArtRV+3Cf6/J6numUuTrmmnwQ="; patches = [ ./modify-version-handling.patch ]; diff --git a/pkgs/by-name/pr/proton-ge-bin/package.nix b/pkgs/by-name/pr/proton-ge-bin/package.nix index e45281a03b4e..632eab96a347 100644 --- a/pkgs/by-name/pr/proton-ge-bin/package.nix +++ b/pkgs/by-name/pr/proton-ge-bin/package.nix @@ -9,11 +9,11 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "proton-ge-bin"; - version = "GE-Proton9-25"; + version = "GE-Proton9-26"; src = fetchzip { url = "https://github.com/GloriousEggroll/proton-ge-custom/releases/download/${finalAttrs.version}/${finalAttrs.version}.tar.gz"; - hash = "sha256-cMN/U09NAsghx0A8dy+mjuvSFZxgvETmkigeOLskiQs="; + hash = "sha256-HwwQw888rfej5ZsMQdFOojk5RY1AKNGvVpAnRVW3qUg="; }; dontUnpack = true; diff --git a/pkgs/by-name/ra/ratt/package.nix b/pkgs/by-name/ra/ratt/package.nix index 525f1b7f95d9..442960f2db67 100644 --- a/pkgs/by-name/ra/ratt/package.nix +++ b/pkgs/by-name/ra/ratt/package.nix @@ -2,24 +2,39 @@ buildGoModule, fetchFromSourcehut, lib, + scdoc, + installShellFiles, }: buildGoModule rec { pname = "ratt"; - version = "unstable-2023-02-12"; + version = "0-unstable-2025-03-10"; src = fetchFromSourcehut { owner = "~ghost08"; repo = "ratt"; - rev = "ed1a675685b9d86d6602e168199ba9b4260f5f06"; - hash = "sha256-HfS97Lxt6FAj/2/WAzLI06F/h6TP5m2lHHOTAs8XNFY="; + rev = "7433a875fb5d8f614e8630cd50b3c9580ef931ce"; + hash = "sha256-u4rad2+SN1yMUjyDZgZo3XDQddICWfa35piYe6437MU="; }; + nativeBuildInputs = [ + installShellFiles + scdoc + ]; + proxyVendor = true; - vendorHash = "sha256-L8mDs9teQJW6P3dhKSLfzbpA7kzhJk61oR2q0ME+u0M="; + vendorHash = "sha256-W1snHDmy6Pg35jYfNmV5DpRpQpp9Ju0JjzwMRYGoqXY=="; # tests try to access the internet to scrape websites doCheck = false; + postInstall = '' + scdoc < doc/ratt.1.scd > doc/ratt.1 + installManPage doc/ratt.1 + + scdoc < doc/ratt.5.scd > doc/ratt.5 + installManPage doc/ratt.5 + ''; + meta = with lib; { description = "Tool for converting websites to rss/atom feeds"; homepage = "https://git.sr.ht/~ghost08/ratt"; diff --git a/pkgs/by-name/ru/rush-parallel/package.nix b/pkgs/by-name/ru/rush-parallel/package.nix index 0bc36e86234f..96292cbd65b1 100644 --- a/pkgs/by-name/ru/rush-parallel/package.nix +++ b/pkgs/by-name/ru/rush-parallel/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "rush-parallel"; - version = "0.6.0"; + version = "0.6.1"; src = fetchFromGitHub { owner = "shenwei356"; repo = "rush"; rev = "v${version}"; - hash = "sha256-dhYW0wVniKVe2LfhNRIwLHvkk9vZ99kQX/6Yd7R+2h0="; + hash = "sha256-IV49d4Xu5QqpgqKH4y+yaOHDhhFQ2s4PuyeWHMawZTQ="; }; vendorHash = "sha256-zCloMhjHNkPZHYX1e1nx072IYbWHFWam4Af0l0s8a6M="; diff --git a/pkgs/by-name/sb/sbom4python/package.nix b/pkgs/by-name/sb/sbom4python/package.nix index 75c25a1b4ac3..fcedb1f60e49 100644 --- a/pkgs/by-name/sb/sbom4python/package.nix +++ b/pkgs/by-name/sb/sbom4python/package.nix @@ -9,14 +9,14 @@ python3Packages.buildPythonApplication rec { pname = "sbom4python"; - version = "0.12.1"; + version = "0.12.2"; pyproject = true; src = fetchFromGitHub { owner = "anthonyharrison"; repo = "sbom4python"; tag = "v${version}"; - hash = "sha256-tp5sg3Z3tczWxfYQcpeKMlin1s7PGUqjG3h4ZsAfKHs="; + hash = "sha256-F2rEyHvosP0/FJHFN/kPdM1e18bWdbC1V5L4de3aAZc="; }; build-system = with python3Packages; [ @@ -43,7 +43,7 @@ python3Packages.buildPythonApplication rec { ]; meta = { - changelog = "https://github.com/anthonyharrison/sbom4python/releases/tag/v${version}"; + changelog = "https://github.com/anthonyharrison/sbom4python/releases/tag/${src.tag}"; description = "A tool to generate a SBOM (Software Bill of Materials) for an installed Python module"; homepage = "https://github.com/anthonyharrison/sbom4python"; license = lib.licenses.asl20; diff --git a/pkgs/by-name/se/seqkit/package.nix b/pkgs/by-name/se/seqkit/package.nix index 1b049a4bc7e0..b7b8c5330085 100644 --- a/pkgs/by-name/se/seqkit/package.nix +++ b/pkgs/by-name/se/seqkit/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "seqkit"; - version = "2.9.0"; + version = "2.10.0"; src = fetchFromGitHub { owner = "shenwei356"; repo = "seqkit"; rev = "v${version}"; - sha256 = "sha256-xPlqS0tYx077YD/MIxGFn8Bdy4h25dY8idhypIj28rI="; + sha256 = "sha256-W272ymy56aHRSOmi/0nCaU+AeaC0U/RyxzHOKR9meo4="; }; - vendorHash = "sha256-EzEomz9GVcirx+Uk1Ygmmb1/GkdUS9aBStLxuNzjHAU="; + vendorHash = "sha256-mmefX3SpQoSdpuwoxFmlYocE9ETOHz3fh/IDG5LlY7E="; meta = with lib; { description = "cross-platform and ultrafast toolkit for FASTA/Q file manipulation"; diff --git a/pkgs/by-name/sp/spytrap-adb/package.nix b/pkgs/by-name/sp/spytrap-adb/package.nix index 48b3d592554c..c830c0a1abf0 100644 --- a/pkgs/by-name/sp/spytrap-adb/package.nix +++ b/pkgs/by-name/sp/spytrap-adb/package.nix @@ -7,17 +7,17 @@ rustPlatform.buildRustPackage rec { pname = "spytrap-adb"; - version = "0.3.3"; + version = "0.3.4"; src = fetchFromGitHub { owner = "spytrap-org"; repo = "spytrap-adb"; tag = "v${version}"; - hash = "sha256-CL+MxSzHpOq2MXmsaa9sipQZ06Kkzy4r1eFjUrPSj1E="; + hash = "sha256-Yqa+JmqYCmy9ehxmRebPNlU5U2RPHtnHDHiqSg8EvAo="; }; useFetchCargoVendor = true; - cargoHash = "sha256-vVDMfst7Uh5q92SYTV9CQdZRoi8ZfjKlqDcQm+YfrjE="; + cargoHash = "sha256-hXDxo0b2nJbPyo99Qc39LM0P41SDbyfadHLIRrbQdj0="; env.SPYTRAP_ADB_BINARY = lib.getExe' android-tools "adb"; diff --git a/pkgs/by-name/te/telegraf/package.nix b/pkgs/by-name/te/telegraf/package.nix index 29ddef3535a2..1937bf62089c 100644 --- a/pkgs/by-name/te/telegraf/package.nix +++ b/pkgs/by-name/te/telegraf/package.nix @@ -10,7 +10,7 @@ buildGoModule rec { pname = "telegraf"; - version = "1.33.2"; + version = "1.34.0"; subPackages = [ "cmd/telegraf" ]; @@ -18,10 +18,10 @@ buildGoModule rec { owner = "influxdata"; repo = "telegraf"; rev = "v${version}"; - hash = "sha256-DOsjECXi2OEhSFd+eDXGN0kIZgZdpng6hkNMh6cOQ88="; + hash = "sha256-0l2x/ljKcEBkyxKbeYtRpBGMSKVbKe5UKNHaNJZt2fI="; }; - vendorHash = "sha256-6valHYL2A4+rw1oMw4APT05O9gmj3+zUJQf226GDBaw="; + vendorHash = "sha256-juuC2iM6/w1VA7afkA3qA9r39+z4tcqwVlV54jFOCuw="; proxyVendor = true; ldflags = [ diff --git a/pkgs/by-name/te/tenv/package.nix b/pkgs/by-name/te/tenv/package.nix index 0a4b7126657e..969a1c82f4d9 100644 --- a/pkgs/by-name/te/tenv/package.nix +++ b/pkgs/by-name/te/tenv/package.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "tenv"; - version = "4.2.4"; + version = "4.3.0"; src = fetchFromGitHub { owner = "tofuutils"; repo = "tenv"; tag = "v${version}"; - hash = "sha256-r0vIrhqCHTYuQMafGCsJbEo9mOWjxGRYSEXQa49FCZU="; + hash = "sha256-BSLaoA8nYr+Jt+WRHIOGzWs+IDWqf2IeUUEtsntCeJM="; }; - vendorHash = "sha256-0+RZ4kJS2hIePhWInPqtkeM0V0iWu3+eaaiH8wwRwVI="; + vendorHash = "sha256-qm/r/lqiAerl+FyylL/sPA7ag0bsDrF7lk7eaBakWGo="; excludedPackages = [ "tools" ]; diff --git a/pkgs/by-name/tf/tfswitch/package.nix b/pkgs/by-name/tf/tfswitch/package.nix index 4b51d8eb74f5..2a1abf0c99a5 100644 --- a/pkgs/by-name/tf/tfswitch/package.nix +++ b/pkgs/by-name/tf/tfswitch/package.nix @@ -5,16 +5,16 @@ }: buildGoModule rec { pname = "tfswitch"; - version = "1.4.0"; + version = "1.4.1"; src = fetchFromGitHub { owner = "warrensbox"; repo = "terraform-switcher"; rev = "v${version}"; - sha256 = "sha256-PiYyufx6kXM1QH94LhJnt/cQHD9lpp+hA7hS7p3LNTU="; + sha256 = "sha256-uT5c3y4f/egT2vIVFCDpTIutcqdZE2dPtZ6fT2Y2GvI="; }; - vendorHash = "sha256-nyCa8pGgTpcaEmGHqEIvqmp53eTO4o6NmS88w2QlnPA="; + vendorHash = "sha256-m3QzNSAcUrI4Pg7LMDZftlBbk4Uhjirc6eNSrQxxwLA="; # Disable tests since it requires network access and relies on the # presence of release.hashicorp.com diff --git a/pkgs/by-name/ur/urlfinder/package.nix b/pkgs/by-name/ur/urlfinder/package.nix index 8ffd59e9e326..567ba1f7b992 100644 --- a/pkgs/by-name/ur/urlfinder/package.nix +++ b/pkgs/by-name/ur/urlfinder/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "urlfinder"; - version = "0.0.2"; + version = "0.0.3"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "urlfinder"; rev = "refs/tags/v${version}"; - hash = "sha256-hORZzeGNcRTcFsvY8pfs8f1JNpdTJjMdO/lJHR83DfY="; + hash = "sha256-dtCXCRnI05822+a5Os+I+ZAmL/hC884PRCIPlEY3jok="; }; - vendorHash = "sha256-Wu9itQfcrwWuzRHtTKk+lF7n6eIzSfATWtI+8xLQQsI="; + vendorHash = "sha256-9sIBj1K4N+HTd0OWnhP8+T1pPG9un8+FlpbPFwsV8P8="; ldflags = [ "-s" diff --git a/pkgs/by-name/us/usql/package.nix b/pkgs/by-name/us/usql/package.nix index f0f5793937ec..4679440cf830 100644 --- a/pkgs/by-name/us/usql/package.nix +++ b/pkgs/by-name/us/usql/package.nix @@ -11,13 +11,13 @@ buildGoModule rec { pname = "usql"; - version = "0.19.17"; + version = "0.19.19"; src = fetchFromGitHub { owner = "xo"; repo = "usql"; - rev = "v${version}"; - hash = "sha256-ouUIGvVyQY6tT97HWeDmVvKsVRIVZYI/GEF4P2k7F8Q="; + tag = "v${version}"; + hash = "sha256-IDCF/etK9mNjdcgQWEDj9tXP12c2CcEA2RamKlCXgRE="; }; buildInputs = [ @@ -25,7 +25,7 @@ buildGoModule rec { icu ]; - vendorHash = "sha256-s7lW8kNFfag6TUjzjjUAmAtF/T2gpi7tfnmvuPnSJx8="; + vendorHash = "sha256-Z1Mjc+sI+8VHO9TTXUzF4yRvCtDs4sr/dGtjacXWCfE="; proxyVendor = true; # Exclude drivers from the bad group @@ -67,16 +67,16 @@ buildGoModule rec { }; }; - meta = with lib; { + meta = { description = "Universal command-line interface for SQL databases"; homepage = "https://github.com/xo/usql"; changelog = "https://github.com/xo/usql/releases/tag/v${version}"; - license = licenses.mit; + license = lib.licenses.mit; mainProgram = "usql"; - maintainers = with maintainers; [ + maintainers = with lib.maintainers; [ georgyo anthonyroussel ]; - platforms = with platforms; linux ++ darwin; + platforms = with lib.platforms; linux ++ darwin; }; } diff --git a/pkgs/by-name/uv/uv/package.nix b/pkgs/by-name/uv/uv/package.nix index cf742218e5bf..8545a293db7b 100644 --- a/pkgs/by-name/uv/uv/package.nix +++ b/pkgs/by-name/uv/uv/package.nix @@ -20,17 +20,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "uv"; - version = "0.6.5"; + version = "0.6.6"; src = fetchFromGitHub { owner = "astral-sh"; repo = "uv"; tag = finalAttrs.version; - hash = "sha256-y4TUu7mQAfS6qO8lKOniCD5ShiKzhAuwD+8qK3qcMmw="; + hash = "sha256-KsPfAOEpD47/kqcN9M7lOtS8hSr0dXP3Y3b4x9yh1as="; }; useFetchCargoVendor = true; - cargoHash = "sha256-KCuGQ3OWpzXX5b1X9DuiTTqYNZSlCpi46J4bX7nQGVc="; + cargoHash = "sha256-vcddP6EaNhJNK6UZUPxrABieJf2BPTAIs8r2uppP7N0="; buildInputs = [ rust-jemalloc-sys diff --git a/pkgs/by-name/we/werf/package.nix b/pkgs/by-name/we/werf/package.nix index 4ac5ee3d7edc..31fb7254e5b9 100644 --- a/pkgs/by-name/we/werf/package.nix +++ b/pkgs/by-name/we/werf/package.nix @@ -1,25 +1,26 @@ { - btrfs-progs, - buildGoModule, - fetchFromGitHub, - installShellFiles, lib, stdenv, + buildGoModule, + fetchFromGitHub, + btrfs-progs, + writableTmpDirAsHomeHook, + installShellFiles, versionCheckHook, }: buildGoModule rec { pname = "werf"; - version = "2.24.0"; + version = "2.31.1"; src = fetchFromGitHub { owner = "werf"; repo = "werf"; - rev = "v${version}"; - hash = "sha256-IU9gVEG4MsUkdX4aJYKtd11WQLODU1IYAUyiuK+la40="; + tag = "v${version}"; + hash = "sha256-eEdhAY3vN6hsgggakYpGFiVjR2BBGrg1UF18gFXc8g8="; }; - vendorHash = "sha256-1HK90RqVvpuzkhbsLh0R6/CcdO/RrXRuOr3MBN0dcLU="; + vendorHash = "sha256-g+QZI0mfXSIU+iBnKzMeTGuF5UB1cwOixvRhcrBGrpE="; proxyVendor = true; @@ -64,6 +65,8 @@ buildGoModule rec { "static_build" ]; + nativeCheckInputs = [ writableTmpDirAsHomeHook ]; + preCheck = '' # Test all packages. diff --git a/pkgs/by-name/wi/wifi-qr/package.nix b/pkgs/by-name/wi/wifi-qr/package.nix index dcd90f576758..acae6659f6af 100644 --- a/pkgs/by-name/wi/wifi-qr/package.nix +++ b/pkgs/by-name/wi/wifi-qr/package.nix @@ -13,9 +13,9 @@ xdg-utils, zbar, }: -stdenvNoCC.mkDerivation { +stdenvNoCC.mkDerivation (finalAttr: { pname = "wifi-qr"; - version = "0.3-unstable-2023-09-30"; + version = "0.4"; outputs = [ "out" @@ -25,8 +25,8 @@ stdenvNoCC.mkDerivation { src = fetchFromGitHub { owner = "kokoye2007"; repo = "wifi-qr"; - rev = "821892001f735dc250a549ea36329cdc767db9c9"; - hash = "sha256-kv0qjO+wn4t//NmKkHB+tZB4eRNm+WRUa5rij+7Syuk="; + tag = "v${finalAttr.version}"; + hash = "sha256-tE+9bFDgiFS1Jj+AAwTMKjMh5wS5/gkRSQaCBR/riYQ="; }; buildInputs = [ @@ -50,22 +50,22 @@ stdenvNoCC.mkDerivation { dontConfigure = true; postPatch = '' - substituteInPlace src/wifi-qr.desktop \ - --replace "Icon=wifi-qr.svg" "Icon=wifi-qr" - substituteInPlace src/wifi-qr \ - --replace "/usr/share/doc/wifi-qr/copyright" "$out/share/doc/wifi-qr/copyright" + substituteInPlace wifi-qr.desktop \ + --replace-fail "Icon=wifi-qr.svg" "Icon=wifi-qr" + substituteInPlace wifi-qr \ + --replace-fail "/usr/share/doc/wifi-qr/copyright" "$out/share/doc/wifi-qr/copyright" ''; installPhase = '' runHook preInstall - install -Dm755 src/wifi-qr $out/bin/wifi-qr + install -Dm755 wifi-qr $out/bin/wifi-qr - install -Dm644 src/wifi-qr.desktop $out/share/applications/wifi-qr.desktop - install -Dm644 src/wifi-qr.svg $out/share/icons/hicolor/scalable/apps/wifi-qr.svg - install -Dm644 src/LICENSE $out/share/doc/wifi-qr/copyright + install -Dm644 wifi-qr.desktop $out/share/applications/wifi-qr.desktop + install -Dm644 wifi-qr.svg $out/share/icons/hicolor/scalable/apps/wifi-qr.svg + install -Dm644 LICENSE $out/share/doc/wifi-qr/copyright - installManPage src/wifi-qr.1 + installManPage wifi-qr.1 runHook postInstall ''; @@ -79,12 +79,12 @@ stdenvNoCC.mkDerivation { runHook postFixup ''; - meta = with lib; { + meta = { description = "WiFi password sharing via QR codes"; homepage = "https://github.com/kokoye2007/wifi-qr"; - license = with licenses; [ gpl3Plus ]; - maintainers = with maintainers; [ ambroisie ]; + license = with lib.licenses; [ gpl3Plus ]; + maintainers = with lib.maintainers; [ ambroisie ]; mainProgram = "wifi-qr"; - platforms = platforms.linux; + platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/zo/zoom-us/package.nix b/pkgs/by-name/zo/zoom-us/package.nix index 3169e8dff28e..e6aedacd4ebd 100644 --- a/pkgs/by-name/zo/zoom-us/package.nix +++ b/pkgs/by-name/zo/zoom-us/package.nix @@ -51,23 +51,23 @@ let # and often with different versions. We write them on three lines # like this (rather than using {}) so that the updater script can # find where to edit them. - versions.aarch64-darwin = "6.3.10.49367"; - versions.x86_64-darwin = "6.3.10.49367"; - versions.x86_64-linux = "6.3.10.7150"; + versions.aarch64-darwin = "6.3.11.50104"; + versions.x86_64-darwin = "6.3.11.50104"; + versions.x86_64-linux = "6.3.11.7212"; srcs = { aarch64-darwin = fetchurl { url = "https://zoom.us/client/${versions.aarch64-darwin}/zoomusInstallerFull.pkg?archType=arm64"; name = "zoomusInstallerFull.pkg"; - hash = "sha256-NRLloJiCpIWUdIEPaEUBYunYotrM95sc6dlpFGN5EjE="; + hash = "sha256-RZVBq2TQcPs+8wx3YwwISVgaPvxS8hP93vxbJMpEhT0="; }; x86_64-darwin = fetchurl { url = "https://zoom.us/client/${versions.x86_64-darwin}/zoomusInstallerFull.pkg"; - hash = "sha256-eiEDx96Xgr14yIVtiUyN0BJNhrMjlcLM1zregT51z14="; + hash = "sha256-OwHVqQZVIQlasehX6UTD1fg1YZDAtvBZSdPq2Ze2JTA="; }; x86_64-linux = fetchurl { url = "https://zoom.us/client/${versions.x86_64-linux}/zoom_x86_64.pkg.tar.xz"; - hash = "sha256-aWU5eGbBvrJ8T5tKWVpx1KiPjH0oMPDSAMtEdH/GAqM="; + hash = "sha256-wSXb2v2qXoLXctmjOZpL0SiOP8+ySwpTDpJmPrfQQco="; }; }; diff --git a/pkgs/development/python-modules/asyncstdlib/default.nix b/pkgs/development/python-modules/asyncstdlib/default.nix index 929b39fa4848..27646b51e606 100644 --- a/pkgs/development/python-modules/asyncstdlib/default.nix +++ b/pkgs/development/python-modules/asyncstdlib/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "asyncstdlib"; - version = "3.13.0"; + version = "3.13.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "maxfischer2781"; repo = "asyncstdlib"; tag = "v${version}"; - hash = "sha256-0VEJ26MP6gIgPvjan7LgCEtSLpg4wXhmFNPGZGntPD8="; + hash = "sha256-U2/LPbg/U6CUB22EpsJHprK2ngjQmZhLtEEuszuzB8Q="; }; build-system = [ flit-core ]; @@ -30,7 +30,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library that extends the Python asyncio standard library"; homepage = "https://asyncstdlib.readthedocs.io/"; - changelog = "https://github.com/maxfischer2781/asyncstdlib/releases/tag/v${version}"; + changelog = "https://github.com/maxfischer2781/asyncstdlib/releases/tag/${src.tag}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/bilibili-api-python/default.nix b/pkgs/development/python-modules/bilibili-api-python/default.nix index 439d3c095ab2..9413949ba22f 100644 --- a/pkgs/development/python-modules/bilibili-api-python/default.nix +++ b/pkgs/development/python-modules/bilibili-api-python/default.nix @@ -24,13 +24,13 @@ }: buildPythonPackage rec { pname = "bilibili-api-python"; - version = "17.1.2"; + version = "17.1.3"; pyproject = true; src = fetchPypi { pname = "bilibili_api_python"; inherit version; - hash = "sha256-pZrn78/uIlivT+OSlNyrbO6vuxBgeigfdZ9AScOM1Ak="; + hash = "sha256-mTBn20gKVhxdK7s/0KcC25C1uwnFlyWUuV6jK4jnrYE="; }; # The upstream uses requirements.txt, which overly strict version constraints. diff --git a/pkgs/development/python-modules/boto3-stubs/default.nix b/pkgs/development/python-modules/boto3-stubs/default.nix index 4c64f87c1c51..2cd85cb7858e 100644 --- a/pkgs/development/python-modules/boto3-stubs/default.nix +++ b/pkgs/development/python-modules/boto3-stubs/default.nix @@ -359,7 +359,7 @@ buildPythonPackage rec { pname = "boto3-stubs"; - version = "1.37.9"; + version = "1.37.11"; pyproject = true; disabled = pythonOlder "3.7"; @@ -367,7 +367,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "boto3_stubs"; inherit version; - hash = "sha256-mIwymkihvjP/IQ4gQQiutrJfIG3VNWYE0XBteGii6tA="; + hash = "sha256-LmLJYT5JYTV3J8fe8PfNONy2AWuOYn45Ao6QV2Pz6h8="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/botocore-stubs/default.nix b/pkgs/development/python-modules/botocore-stubs/default.nix index dffaef0681c5..ad420e1e2c96 100644 --- a/pkgs/development/python-modules/botocore-stubs/default.nix +++ b/pkgs/development/python-modules/botocore-stubs/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "botocore-stubs"; - version = "1.37.9"; + version = "1.37.11"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "botocore_stubs"; inherit version; - hash = "sha256-y6DKr51dFQB8ioXPGXjWTvjWm2LDP0szRehB3Eicn5Y="; + hash = "sha256-m4m6mpjrnwiKX4LFJIgBOFgJJ3fBe1YmVXS78tIdpCI="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/brother/default.nix b/pkgs/development/python-modules/brother/default.nix index eafcb2dc96a8..01a1fac72a1f 100644 --- a/pkgs/development/python-modules/brother/default.nix +++ b/pkgs/development/python-modules/brother/default.nix @@ -15,16 +15,16 @@ buildPythonPackage rec { pname = "brother"; - version = "4.3.1"; + version = "5.0.0"; pyproject = true; - disabled = pythonOlder "3.11"; + disabled = pythonOlder "3.12"; src = fetchFromGitHub { owner = "bieniu"; repo = "brother"; tag = version; - hash = "sha256-fWa5FNBGV8tnJ3CozMicXLGsDvnTjNzU8PdV266MeeQ="; + hash = "sha256-hMHvrZV6Q4ih0XvLH/pDArdHSE/X8JlpeN2YyMrYJGQ="; }; build-system = [ setuptools ]; @@ -47,7 +47,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python wrapper for getting data from Brother laser and inkjet printers via SNMP"; homepage = "https://github.com/bieniu/brother"; - changelog = "https://github.com/bieniu/brother/releases/tag/${version}"; + changelog = "https://github.com/bieniu/brother/releases/tag/${src.tag}"; license = licenses.asl20; maintainers = with maintainers; [ hexa ]; }; diff --git a/pkgs/development/python-modules/cf-xarray/default.nix b/pkgs/development/python-modules/cf-xarray/default.nix index e1fe2594845c..cb1b6ea46bb3 100644 --- a/pkgs/development/python-modules/cf-xarray/default.nix +++ b/pkgs/development/python-modules/cf-xarray/default.nix @@ -24,14 +24,14 @@ buildPythonPackage rec { pname = "cf-xarray"; - version = "0.10.1"; + version = "0.10.2"; pyproject = true; src = fetchFromGitHub { owner = "xarray-contrib"; repo = "cf-xarray"; tag = "v${version}"; - hash = "sha256-rWTaVhRqmTwogqYQ+mesZY6ET9YnSiAqDItoZfVgpYg="; + hash = "sha256-uhlJOOxmyW7WxiWUOwj2T1wSdvUlpRVE2gWz6rLO9VY="; }; build-system = [ @@ -71,7 +71,7 @@ buildPythonPackage rec { meta = { description = "Accessor for xarray objects that interprets CF attributes"; homepage = "https://github.com/xarray-contrib/cf-xarray"; - changelog = "https://github.com/xarray-contrib/cf-xarray/releases/tag/v${version}"; + changelog = "https://github.com/xarray-contrib/cf-xarray/releases/tag/${src.tag}"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/command-runner/default.nix b/pkgs/development/python-modules/command-runner/default.nix index ce19e32b6561..a42209093cad 100644 --- a/pkgs/development/python-modules/command-runner/default.nix +++ b/pkgs/development/python-modules/command-runner/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "command-runner"; - version = "1.7.0"; + version = "1.7.2"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "netinvent"; repo = "command_runner"; tag = "v${version}"; - hash = "sha256-rdbZtqNndtIxrLA90eWzR6dB8EyFrBALduBUkOVq4oE="; + hash = "sha256-2+Tvp0nFDcD6D99z/13RGRTrioFR0dhPDnicX9ZbIxY="; }; build-system = [ setuptools ]; @@ -37,7 +37,7 @@ buildPythonPackage rec { Platform agnostic command execution, timed background jobs with live stdout/stderr output capture, and UAC/sudo elevation ''; - changelog = "https://github.com/netinvent/command_runner/releases/tag/v${version}"; + changelog = "https://github.com/netinvent/command_runner/releases/tag/${src.tag}"; license = licenses.bsd3; maintainers = teams.wdz.members; }; diff --git a/pkgs/development/python-modules/djangorestframework-stubs/default.nix b/pkgs/development/python-modules/djangorestframework-stubs/default.nix index 33dfb2f8ae8d..986c09e304a1 100644 --- a/pkgs/development/python-modules/djangorestframework-stubs/default.nix +++ b/pkgs/development/python-modules/djangorestframework-stubs/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "djangorestframework-stubs"; - version = "3.15.2"; + version = "3.15.3"; pyproject = true; disabled = pythonOlder "3.9"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "typeddjango"; repo = "djangorestframework-stubs"; tag = version; - hash = "sha256-ZpnPJZhuKZCy6tV8KBRC4Wjr3t0igQOkkUyVtmmVRMg="; + hash = "sha256-6bs/FGCxxV1sE4J3aqzYS1wIr82mWlnGGXIuYOF5+dw="; }; nativeBuildInputs = [ setuptools ]; @@ -61,7 +61,7 @@ buildPythonPackage rec { meta = with lib; { description = "PEP-484 stubs for Django REST Framework"; homepage = "https://github.com/typeddjango/djangorestframework-stubs"; - changelog = "https://github.com/typeddjango/djangorestframework-stubs/releases/tag/${version}"; + changelog = "https://github.com/typeddjango/djangorestframework-stubs/releases/tag/${src.tag}"; license = licenses.mit; maintainers = with maintainers; [ elohmeier ]; }; diff --git a/pkgs/development/python-modules/dnf-plugins-core/default.nix b/pkgs/development/python-modules/dnf-plugins-core/default.nix index dfcf0b746f73..bc213157ed00 100644 --- a/pkgs/development/python-modules/dnf-plugins-core/default.nix +++ b/pkgs/development/python-modules/dnf-plugins-core/default.nix @@ -23,7 +23,7 @@ in buildPythonPackage rec { pname = "dnf-plugins-core"; - version = "4.10.0"; + version = "4.10.1"; format = "other"; outputs = [ @@ -35,7 +35,7 @@ buildPythonPackage rec { owner = "rpm-software-management"; repo = "dnf-plugins-core"; tag = version; - hash = "sha256-7MPCLnclRT07m6CrGguDxSB+sIybp4tMcExU9+Sz9EM="; + hash = "sha256-nZyM61bQ9L4t3/fa9cP+xo9ke00e6w2Obt80OpqOG8A="; }; postPatch = '' diff --git a/pkgs/development/python-modules/drf-yasg/default.nix b/pkgs/development/python-modules/drf-yasg/default.nix index 8f75b2e11c4e..91edd3d73e9d 100644 --- a/pkgs/development/python-modules/drf-yasg/default.nix +++ b/pkgs/development/python-modules/drf-yasg/default.nix @@ -19,12 +19,12 @@ buildPythonPackage rec { pname = "drf-yasg"; - version = "1.21.9"; + version = "1.21.10"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-U9Qxl2m6wSHFa+GAlTQjkrZtdV6f3TCUFOGoa1w91eo="; + hash = "sha256-+G1Q+u48MfzsRUWYWocfgyNmx/tbd7YsSAidVuz0+NQ="; }; postPatch = '' diff --git a/pkgs/development/python-modules/fontbakery/default.nix b/pkgs/development/python-modules/fontbakery/default.nix index 6a1e9dd3a281..8f91bbde8e71 100644 --- a/pkgs/development/python-modules/fontbakery/default.nix +++ b/pkgs/development/python-modules/fontbakery/default.nix @@ -29,7 +29,6 @@ protobuf, pytest-xdist, pytestCheckHook, - pythonOlder, pyyaml, requests-mock, requests, @@ -51,8 +50,6 @@ buildPythonPackage rec { version = "0.13.1"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchPypi { inherit pname version; hash = "sha256-NoUqR+u2GgjE+nj05AXvtprdWieT6XbGGcmOnEMolC4="; @@ -62,6 +59,7 @@ buildPythonPackage rec { pythonRelaxDeps = [ "collidoscope" + "freetype-py" "protobuf" "vharfbuzz" ]; @@ -132,6 +130,7 @@ buildPythonPackage rec { disabledTests = [ # These require network access + "test_check_axes_match" "test_check_description_broken_links" "test_check_description_family_update" "test_check_metadata_designer_profiles" @@ -158,6 +157,7 @@ buildPythonPackage rec { homepage = "https://github.com/googlefonts/fontbakery"; changelog = "https://github.com/fonttools/fontbakery/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; + mainProgram = "fontbakery"; maintainers = with maintainers; [ danc86 ]; }; } diff --git a/pkgs/development/python-modules/fontbakery/tests.nix b/pkgs/development/python-modules/fontbakery/tests.nix index 5fdebb6f3aa8..5b9a5fac9c55 100644 --- a/pkgs/development/python-modules/fontbakery/tests.nix +++ b/pkgs/development/python-modules/fontbakery/tests.nix @@ -1,17 +1,21 @@ -{ runCommand, fontbakery }: +{ + fontbakery, + lib, + runCommand, +}: let - inherit (fontbakery) pname version src; + inherit (fontbakery) version src; in -runCommand "${pname}-tests" { meta.timeout = 5; } '' +runCommand "fontbakery-tests" { meta.timeout = 5; } '' # Check the version matches what we packaged. - ${fontbakery}/bin/fontbakery --version | grep -q "${version}" + ${lib.getExe fontbakery} --version | grep -q "${version}" # Unpack src to get some test fonts. - tar -xzf ${src} --strip-components=1 ${pname}-${version}/data/test + tar -xzf ${src} --strip-components=1 fontbakery-${version}/data/test # Run some font checks. - ${fontbakery}/bin/fontbakery check-ufo --no-progress --no-colors data/test/test.ufo >>$out + ${lib.getExe fontbakery} check-ufo --no-progress --no-colors data/test/test.ufo >>$out # TODO add more '' diff --git a/pkgs/development/python-modules/globus-sdk/default.nix b/pkgs/development/python-modules/globus-sdk/default.nix index a485d3015f6d..18e1d1c9b4e1 100644 --- a/pkgs/development/python-modules/globus-sdk/default.nix +++ b/pkgs/development/python-modules/globus-sdk/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "globus-sdk"; - version = "3.50.0"; + version = "3.51.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "globus"; repo = "globus-sdk-python"; tag = version; - hash = "sha256-gjctcpaV9L8x4ubS4Ox6kyNG7/kl7tZt9c9/7SWVXkg="; + hash = "sha256-u33weBn4WEKI7MpafJGlTnRGRusDIZ6RFoqEbknRtMM="; }; build-system = [ setuptools ]; @@ -51,7 +51,7 @@ buildPythonPackage rec { meta = { description = "Interface to Globus REST APIs, including the Transfer API and the Globus Auth API"; homepage = "https://github.com/globus/globus-sdk-python"; - changelog = "https://github.com/globus/globus-sdk-python/releases/tag/${version}"; + changelog = "https://github.com/globus/globus-sdk-python/releases/tag/${src.tag}"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ bot-wxt1221 ]; }; diff --git a/pkgs/development/python-modules/google-nest-sdm/default.nix b/pkgs/development/python-modules/google-nest-sdm/default.nix index cf9dec089924..aa1a2f5bf9a8 100644 --- a/pkgs/development/python-modules/google-nest-sdm/default.nix +++ b/pkgs/development/python-modules/google-nest-sdm/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "google-nest-sdm"; - version = "7.1.4"; + version = "7.1.5"; pyproject = true; disabled = pythonOlder "3.11"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "allenporter"; repo = "python-google-nest-sdm"; tag = version; - hash = "sha256-wE28+GqZGIhg/+JOnyn2hXw5ia0yg3RLywb1PqgkXw0="; + hash = "sha256-YpXpQnfRp5Kvr3fNAnlwsZwJdXuES7KXOykt+YK5Wz4="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/latex2pydata/default.nix b/pkgs/development/python-modules/latex2pydata/default.nix index e4bbd47c0eb0..bab54a891b61 100644 --- a/pkgs/development/python-modules/latex2pydata/default.nix +++ b/pkgs/development/python-modules/latex2pydata/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "latex2pydata"; - version = "0.4.1"; + version = "0.5.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-9MsAwzP8j52mh+azaEkfkaLmDOBWZoVnr9LnGSvK3mk="; + hash = "sha256-vMrSCDw6btcEkmU9XYGczZNgo6/Dwxnb7PSW+6BXQok="; }; build-system = [ diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index 4b4ef06df7d5..aa21f5f67ddb 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -182,8 +182,8 @@ rec { "sha256-M1WWs/HMcN0L9qK2eu4x+JmZsvbEbmxZzQBkjU5gfh4="; mypy-boto3-ce = - buildMypyBoto3Package "ce" "1.37.0" - "sha256-nlk8Jb31LevHaTX8DwCv6H3h6CSQKzoBwXWDqgfqZa0="; + buildMypyBoto3Package "ce" "1.37.10" + "sha256-Agjn23LIsugsUW5a5ov7j5D2WBcYCrNYP1CbXj1feTk="; mypy-boto3-chime = buildMypyBoto3Package "chime" "1.37.2" @@ -338,8 +338,8 @@ rec { "sha256-ZksL1EtJj4H12D8JvRS8sTDnhKc2j+1UiRlMTN3yHGc="; mypy-boto3-connect = - buildMypyBoto3Package "connect" "1.37.0" - "sha256-1qVuMxUgtcGrwzpgrR6BYXzNjtI605H30qensAnbOdg="; + buildMypyBoto3Package "connect" "1.37.10" + "sha256-5oHBPdOYeB+6eAXrw0xPy7uLAORtflFbYzG8fGgzrXE="; mypy-boto3-connect-contact-lens = buildMypyBoto3Package "connect-contact-lens" "1.37.0" @@ -446,24 +446,24 @@ rec { "sha256-wvOqjmqNMbCG7E1o+ZSOlWEwBdcCKjD/qVFlepZ51ec="; mypy-boto3-ec2 = - buildMypyBoto3Package "ec2" "1.37.9" - "sha256-LUjkcBdkC54ySF/a1kjQZxEvtzfu3nC50Cx5pCBPzC8="; + buildMypyBoto3Package "ec2" "1.37.11" + "sha256-uiwvGWgtXkkeuWsFMdU4u8auKihY7EFYvBVrTu7dsm8="; mypy-boto3-ec2-instance-connect = buildMypyBoto3Package "ec2-instance-connect" "1.37.0" "sha256-Sqer8nDDdeGo8/ZEi7Cv7duJ2OQB0uEBOAY9CsaKDqI="; mypy-boto3-ecr = - buildMypyBoto3Package "ecr" "1.37.0" - "sha256-SpHLFBc0vXSkrPVJ0dfpLLap4ladWARi1aQkAzBrkHU="; + buildMypyBoto3Package "ecr" "1.37.11" + "sha256-bMn4iAgkr1W/CHd/j7qzqc2hifyErTxf8lCINOeidDE="; mypy-boto3-ecr-public = buildMypyBoto3Package "ecr-public" "1.37.0" "sha256-7Sz4g1+0B99ZybhrzJOS0K71thybaDPUYmF4+SN1sGc="; mypy-boto3-ecs = - buildMypyBoto3Package "ecs" "1.37.0" - "sha256-bL23Spt21iUGPYuDKphfHHaMMeGxbsrieowsWA+0wBQ="; + buildMypyBoto3Package "ecs" "1.37.11" + "sha256-lUFZE7dC5C2RZQjt515X7gn/4U2Md8GYrrCDX1E6Edk="; mypy-boto3-efs = buildMypyBoto3Package "efs" "1.37.0" @@ -626,8 +626,8 @@ rec { "sha256-RgmXpEJXEw/FOdxuiSs09BAhsgb4WBJj6/icuM7uCrI="; mypy-boto3-inspector2 = - buildMypyBoto3Package "inspector2" "1.37.0" - "sha256-iFTzEIhVgRojrEBJSsl5kRS1diHZr3pfuSgqj5La0Hw="; + buildMypyBoto3Package "inspector2" "1.37.11" + "sha256-5zb3wzEZ5fud8fJw125X79wuJNO2Jt+n606fgUpWW3Q="; mypy-boto3-internetmonitor = buildMypyBoto3Package "internetmonitor" "1.37.0" @@ -866,8 +866,8 @@ rec { "sha256-xBMBhCrnTV7sILg2/dXUy2PeNeCuNHkb7plAumD5Pq8="; mypy-boto3-medialive = - buildMypyBoto3Package "medialive" "1.37.0" - "sha256-iiMMahrizVr130wfPOzT/N+WWWfWu4yp+/Y/m/lWoKo="; + buildMypyBoto3Package "medialive" "1.37.11" + "sha256-9OoL9nE7IBwaaacAfJDBKTxeZu2Q55XgH6TQ6+H+B0w="; mypy-boto3-mediapackage = buildMypyBoto3Package "mediapackage" "1.37.0" @@ -1010,8 +1010,8 @@ rec { "sha256-+kdNkCBxY7tyNDgmZ9KNhkv4KB1kYr4A667AeRoY0XA="; mypy-boto3-pca-connector-ad = - buildMypyBoto3Package "pca-connector-ad" "1.37.0" - "sha256-/NC3h3x5uXVuxvo/h0l8ByN/WUH6pgQ1twhlaFevQko="; + buildMypyBoto3Package "pca-connector-ad" "1.37.10" + "sha256-e9sP379VsbZeKUhLURtsMsSPxfIvCsYVNqZhUg67+MY="; mypy-boto3-personalize = buildMypyBoto3Package "personalize" "1.37.0" @@ -1222,8 +1222,8 @@ rec { "sha256-BpQNhC56YA/fVCGQ4rD9Ncp5FMsRi1pXgDa6bOZZpBs="; mypy-boto3-securityhub = - buildMypyBoto3Package "securityhub" "1.37.0" - "sha256-lB9ls6aFWkUyhkVDKnQ3Jcr7rdfrsFEj+uD//R7pptM="; + buildMypyBoto3Package "securityhub" "1.37.10" + "sha256-WTy4XVBxtaVZ5n6A8I9TFGH7Ye9dpJDq6+nV2zQpnls="; mypy-boto3-securitylake = buildMypyBoto3Package "securitylake" "1.37.0" diff --git a/pkgs/development/python-modules/planetary-computer/default.nix b/pkgs/development/python-modules/planetary-computer/default.nix index 2307d4c02459..3e581328e10e 100644 --- a/pkgs/development/python-modules/planetary-computer/default.nix +++ b/pkgs/development/python-modules/planetary-computer/default.nix @@ -27,14 +27,14 @@ buildPythonPackage rec { pname = "planetary-computer"; - version = "1.0.0"; + version = "1.0.0.post0"; pyproject = true; src = fetchFromGitHub { owner = "microsoft"; repo = "planetary-computer-sdk-for-python"; tag = "v${version}"; - hash = "sha256-FcTEXtZ2zZQ3i4zmwecaZHdaHni7UbHSF9TDKP/k4sw="; + hash = "sha256-NPHUxThSZzENw4W91WAOqChyIl6Z/Afi4mddz+lXlXA="; }; build-system = [ @@ -77,7 +77,7 @@ buildPythonPackage rec { meta = { description = "Planetary Computer SDK for Python"; homepage = "https://github.com/microsoft/planetary-computer-sdk-for-python"; - changelog = "https://github.com/microsoft/planetary-computer-sdk-for-python/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/microsoft/planetary-computer-sdk-for-python/blob/${src.tag}/CHANGELOG.md"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ daspk04 ]; mainProgram = "planetarycomputer"; diff --git a/pkgs/development/python-modules/publicsuffixlist/default.nix b/pkgs/development/python-modules/publicsuffixlist/default.nix index c63812044fc5..f5da024dea30 100644 --- a/pkgs/development/python-modules/publicsuffixlist/default.nix +++ b/pkgs/development/python-modules/publicsuffixlist/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "publicsuffixlist"; - version = "1.0.2.20250307"; + version = "1.0.2.20250312"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-LgC8KbBCeahCI3WDo7DkeDLVn1/53by/EFLNnI4BYsQ="; + hash = "sha256-xa8ZlThHFuw97SLVVxWS2YUFUD9mQ1V+vyfVPYYZ6Pk="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pydaikin/default.nix b/pkgs/development/python-modules/pydaikin/default.nix index b83163d26fd9..297379d9d4b8 100644 --- a/pkgs/development/python-modules/pydaikin/default.nix +++ b/pkgs/development/python-modules/pydaikin/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "pydaikin"; - version = "2.14.0"; + version = "2.14.1"; pyproject = true; disabled = pythonOlder "3.11"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "fredrike"; repo = "pydaikin"; tag = "v${version}"; - hash = "sha256-5qkJjGfVoNVHHmr77aWajpYmyfmV/ZyO3tXY9/gj6eU="; + hash = "sha256-AyW9hQC8fF5T+E1FXhLemVvWggeEpZok5OVhzcZh9G0="; }; __darwinAllowLocalNetworking = true; @@ -51,7 +51,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python Daikin HVAC appliances interface"; homepage = "https://github.com/fredrike/pydaikin"; - changelog = "https://github.com/fredrike/pydaikin/releases/tag/v${version}"; + changelog = "https://github.com/fredrike/pydaikin/releases/tag/${src.tag}"; license = with licenses; [ gpl3Only ]; maintainers = with maintainers; [ fab ]; mainProgram = "pydaikin"; diff --git a/pkgs/development/python-modules/pyperf/default.nix b/pkgs/development/python-modules/pyperf/default.nix index be517c6eca27..8eb9987aeba4 100644 --- a/pkgs/development/python-modules/pyperf/default.nix +++ b/pkgs/development/python-modules/pyperf/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "pyperf"; - version = "2.8.1"; + version = "2.9.0"; pyproject = true; disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-7xA+IaTQSZkxUAMCai1lnEinz85eFEDwPW5yWRQAcTo="; + hash = "sha256-2+D+747BpGXfGRu6JXYUl2LRWoyZhcn+qTq2Jdh1w2I="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/pyquil/default.nix b/pkgs/development/python-modules/pyquil/default.nix index b082e3172ff3..7b3fa02a8e1e 100644 --- a/pkgs/development/python-modules/pyquil/default.nix +++ b/pkgs/development/python-modules/pyquil/default.nix @@ -25,14 +25,14 @@ buildPythonPackage rec { pname = "pyquil"; - version = "4.16.0"; + version = "4.16.1"; pyproject = true; src = fetchFromGitHub { owner = "rigetti"; repo = "pyquil"; tag = "v${version}"; - hash = "sha256-6nJ0eozqbzHDF3e/Q/bVJnng1b+LUL2tsv4X7sWE9/0="; + hash = "sha256-8ZIkWFHKgb5PFhkhvjaWkxJuX/0Hvl2R+w9tqe2nYNg="; }; pythonRelaxDeps = [ @@ -77,7 +77,7 @@ buildPythonPackage rec { meta = { description = "Python library for creating Quantum Instruction Language (Quil) programs"; homepage = "https://github.com/rigetti/pyquil"; - changelog = "https://github.com/rigetti/pyquil/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/rigetti/pyquil/blob/${src.tag}/CHANGELOG.md"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ fab ]; }; diff --git a/pkgs/development/tools/buildah/default.nix b/pkgs/development/tools/buildah/default.nix index 468f419f93c7..59fdbc570dc2 100644 --- a/pkgs/development/tools/buildah/default.nix +++ b/pkgs/development/tools/buildah/default.nix @@ -18,13 +18,13 @@ buildGoModule rec { pname = "buildah"; - version = "1.39.1"; + version = "1.39.2"; src = fetchFromGitHub { owner = "containers"; repo = "buildah"; rev = "v${version}"; - hash = "sha256-/ECkB9IxNClHic1wuR1auymOLmH7YjyUWazqSXPHk6o="; + hash = "sha256-OmDchq0ngdDbgDUyrz/jRwrCI1FJNKeq7ZLMOK4B+z0="; }; outputs = [ diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 0f89f4beba94..20939aab7546 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -107,6 +107,16 @@ let }; }); + brother = super.brother.overridePythonAttrs (rec { + version = "4.3.1"; + src = fetchFromGitHub { + owner = "bieniu"; + repo = "brother"; + tag = version; + hash = "sha256-fWa5FNBGV8tnJ3CozMicXLGsDvnTjNzU8PdV266MeeQ="; + }; + }); + eq3btsmart = super.eq3btsmart.overridePythonAttrs (oldAttrs: rec { version = "1.4.1"; src = fetchFromGitHub { diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index b476daa36cb8..5e682627d109 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -74,6 +74,44 @@ rec { # a fork of luarocks used to generate nix lua derivations from rockspecs luarocks-nix = toLuaModule (callPackage ../development/tools/misc/luarocks/luarocks-nix.nix { }); + awesome-wm-widgets = callPackage ( + { + stdenv, + fetchFromGitHub, + lua, + lib, + }: + + stdenv.mkDerivation { + pname = "awesome-wm-widgets"; + version = "0-unstable-2024-02-15"; + + src = fetchFromGitHub { + owner = "streetturtle"; + repo = "awesome-wm-widgets"; + rev = "2a27e625056c50b40b1519eed623da253d36cc27"; + hash = "sha256-qz/kUIpuhWwTLbwbaES32wGKe4D2hfz90dnq+mrHrj0="; + }; + + installPhase = '' + runHook preInstall + + target=$out/lib/lua/${lua.luaversion}/awesome-wm-widgets + mkdir -p $target + cp -r $src/* $target + + runHook postInstall + ''; + + meta = { + description = "Widgets for Awesome window manager"; + homepage = "https://github.com/streetturtle/awesome-wm-widgets"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ averdow ]; + }; + } + ) { }; + lua-pam = callPackage ( { fetchFromGitHub,