diff --git a/ci/OWNERS b/ci/OWNERS index ec693ccd3e91..e08961b38210 100644 --- a/ci/OWNERS +++ b/ci/OWNERS @@ -402,9 +402,6 @@ pkgs/development/python-modules/buildcatrust/ @ajs124 @lukegb @mweinelt /nixos/tests/docker-tools* @roberth @jhol /doc/build-helpers/images/dockertools.section.md @roberth @jhol -# Blockchains -/pkgs/applications/blockchains @mmahut @RaghavSood - # Go /doc/languages-frameworks/go.section.md @kalbasit @katexochen @Mic92 /pkgs/build-support/go @kalbasit @katexochen @Mic92 diff --git a/nixos/doc/manual/release-notes/rl-2605.section.md b/nixos/doc/manual/release-notes/rl-2605.section.md index 23e888c602eb..412afda72e2a 100644 --- a/nixos/doc/manual/release-notes/rl-2605.section.md +++ b/nixos/doc/manual/release-notes/rl-2605.section.md @@ -360,6 +360,8 @@ See . If client certificates, keys or other files are needed, these should be stored under `/etc/wpa_supplicant` and owned by `wpa_supplicant` to ensure the daemon can read them. + Similarly, the `ctrl_interface` directory set in `wpa_supplicant`'s conf must be writeable by the `wpa_supplicant` user so that the `wpa_supplicant` daemon can start successfully. If you were changing `ctrl_interface` in [extraConfig](#opt-networking.wireless.extraConfig) or in `/etc/wpa_supplicant/imperative.conf`, please remove that line. + Also, the {option}`networking.wireless.userControlled.group` option has been removed since there is now a dedicated `wpa_supplicant` group to control the daemon, and {option}`networking.wireless.userControlled.enable` has been renamed to [](#opt-networking.wireless.userControlled). No functionality should have been impacted by these changes (including controlling via `wpa_cli`, integration with NetworkManager or connman), but if you find any problems, please open an issue on GitHub. diff --git a/nixos/modules/config/malloc.nix b/nixos/modules/config/malloc.nix index bc6a27673e3e..ebc173a642e8 100644 --- a/nixos/modules/config/malloc.nix +++ b/nixos/modules/config/malloc.nix @@ -142,10 +142,14 @@ in # so we can warn the user about the change. legacyOptionsUsed = lib.lists.filter (opt: lib.strings.hasInfix opt scudoOpts) legacyOptionNames; in - lib.optional (cfg.provider == "scudo" && legacyOptionsUsed != [ ]) '' - environment.variables.SCUDO_OPTIONS: ${lib.concatStringsSep ", " legacyOptionsUsed} is/are no longer valid Scudo options. - Use snake_case instead of CamelCase: https://llvm.org/docs/ScudoHardenedAllocator.html#options - ''; + lib.optional + ( + config.environment.variables ? SCUDO_OPTIONS && cfg.provider == "scudo" && legacyOptionsUsed != [ ] + ) + '' + environment.variables.SCUDO_OPTIONS: ${lib.concatStringsSep ", " legacyOptionsUsed} is/are no longer valid Scudo options. + Use snake_case instead of CamelCase: https://llvm.org/docs/ScudoHardenedAllocator.html#options + ''; environment.etc."ld-nix.so.preload".text = '' ${providerLibPath} diff --git a/pkgs/applications/blockchains/teos/default.nix b/pkgs/applications/blockchains/teos/default.nix deleted file mode 100644 index 4d687602ab13..000000000000 --- a/pkgs/applications/blockchains/teos/default.nix +++ /dev/null @@ -1,78 +0,0 @@ -{ - lib, - rustPlatform, - fetchFromGitHub, - protobuf, - rustfmt, - pkg-config, - openssl, -}: - -let - version = "0.2.0"; - - src = fetchFromGitHub { - owner = "talaia-labs"; - repo = "rust-teos"; - rev = "v${version}"; - hash = "sha256-UrzH9xmhVq12TcSUQ1AihCG1sNGcy/N8LDsZINVKFkY="; - }; - - meta = { - homepage = "https://github.com/talaia-labs/rust-teos"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ seberm ]; - }; - updateScript = ./update.sh; -in -{ - teos = rustPlatform.buildRustPackage { - pname = "teos"; - inherit version src; - - cargoHash = "sha256-lod5I94T4wGwXEDtvh2AyaDYM0byCfaSBP8emKV7+3M="; - - buildAndTestSubdir = "teos"; - - nativeBuildInputs = [ - protobuf - rustfmt - ]; - - passthru.updateScript = updateScript; - - __darwinAllowLocalNetworking = true; - - meta = meta // { - description = "Lightning watchtower compliant with BOLT13, written in Rust"; - }; - }; - - teos-watchtower-plugin = rustPlatform.buildRustPackage { - pname = "teos-watchtower-plugin"; - inherit version src; - - cargoHash = "sha256-lod5I94T4wGwXEDtvh2AyaDYM0byCfaSBP8emKV7+3M="; - - buildAndTestSubdir = "watchtower-plugin"; - - nativeBuildInputs = [ - pkg-config - protobuf - rustfmt - ]; - - buildInputs = [ - openssl - ]; - - passthru.updateScript = updateScript; - - __darwinAllowLocalNetworking = true; - - meta = meta // { - description = "Lightning watchtower plugin for clightning"; - mainProgram = "watchtower-client"; - }; - }; -} diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index cb398d86be57..e9b32ef7665e 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -535,11 +535,11 @@ "vendorHash": null }, "hashicorp_azurerm": { - "hash": "sha256-DR68u61zP/eyllRkwNqKSXktAKjJJ0psXd9WWa2zA20=", + "hash": "sha256-NJ3g5w9bkY7tM/f67HOEiq6Uz99CHaJBKaW+mLHrxFM=", "homepage": "https://registry.terraform.io/providers/hashicorp/azurerm", "owner": "hashicorp", "repo": "terraform-provider-azurerm", - "rev": "v4.75.0", + "rev": "v4.76.0", "spdx": "MPL-2.0", "vendorHash": null }, @@ -1247,13 +1247,13 @@ "vendorHash": "sha256-C8TE7uxMf6LOTS6v22mXwUdk2eqQRinwrCH4ZVUCx4k=" }, "splunk-terraform_signalfx": { - "hash": "sha256-x7mpVptTJ60tJfGt2svzAGErMmYYoMmt7+bT7frb8Lc=", + "hash": "sha256-bX6CtNP7uB50kk3ddu52YfKE04PsEJw6DXl6yQxOeVI=", "homepage": "https://registry.terraform.io/providers/splunk-terraform/signalfx", "owner": "splunk-terraform", "repo": "terraform-provider-signalfx", - "rev": "v9.29.0", + "rev": "v9.30.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-41c6wsahOn1AAPz/vx9JJpUjmXGf+DNMORjSto4lca4=" + "vendorHash": "sha256-27mA2OAApUtPawZZk7Wxme9TfQY19TraIJSqHh8MFZg=" }, "spotinst_spotinst": { "hash": "sha256-cZ2gKgXLM/0msBvtlWn16TdM1kwd2wRUyV7bvVEd+SE=", diff --git a/pkgs/by-name/al/algia/package.nix b/pkgs/by-name/al/algia/package.nix index 4d8b8229f1e1..dce0559cd5ab 100644 --- a/pkgs/by-name/al/algia/package.nix +++ b/pkgs/by-name/al/algia/package.nix @@ -7,13 +7,13 @@ buildGoModule (finalAttrs: { pname = "algia"; - version = "0.0.121"; + version = "0.0.122"; src = fetchFromGitHub { owner = "mattn"; repo = "algia"; tag = "v${finalAttrs.version}"; - hash = "sha256-oDJyppe0SUES4Wbd9SH2A2QCBh9sFE97vD8IvL1gq9Y="; + hash = "sha256-G6FEmLmZRUYVpj1ipNtMNi166GKUapIl/hAkPyvFLN0="; }; vendorHash = "sha256-JTTWVs0KwceiLy6tpyd48zORiXLc18zwgG1c+ceivKU="; diff --git a/pkgs/by-name/an/antigravity-cli/package.nix b/pkgs/by-name/an/antigravity-cli/package.nix index f6d67358379d..0b017339516c 100644 --- a/pkgs/by-name/an/antigravity-cli/package.nix +++ b/pkgs/by-name/an/antigravity-cli/package.nix @@ -41,7 +41,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { sourceRoot = "."; - nativeBuildInputs = lib.optionals stdenvNoCC.hostPlatform.isLinux [ autoPatchelfHook ]; + nativeBuildInputs = lib.optionals stdenvNoCC.hostPlatform.isElf [ autoPatchelfHook ]; dontConfigure = true; dontBuild = true; diff --git a/pkgs/by-name/at/atkmm/package.nix b/pkgs/by-name/at/atkmm/package.nix index 5b793a06baaf..40929610a2ce 100644 --- a/pkgs/by-name/at/atkmm/package.nix +++ b/pkgs/by-name/at/atkmm/package.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "atkmm"; - version = "2.28.4"; + version = "2.28.5"; src = fetchurl { url = "mirror://gnome/sources/atkmm/${lib.versions.majorMinor finalAttrs.version}/atkmm-${finalAttrs.version}.tar.xz"; - sha256 = "sha256-ChQqgSj4PAAe+4AU7kY+mnZgVO+EaGr5UxNeBNKP2rM="; + sha256 = "sha256-rkSRkqWColgqleBgKxXXkrvWOeg2M5uB75FqqHVArFw="; }; outputs = [ diff --git a/pkgs/by-name/at/atlantis/package.nix b/pkgs/by-name/at/atlantis/package.nix index aa24e1764d77..d7cbb985ef41 100644 --- a/pkgs/by-name/at/atlantis/package.nix +++ b/pkgs/by-name/at/atlantis/package.nix @@ -7,13 +7,13 @@ buildGoModule (finalAttrs: { pname = "atlantis"; - version = "0.43.0"; + version = "0.44.0"; src = fetchFromGitHub { owner = "runatlantis"; repo = "atlantis"; tag = "v${finalAttrs.version}"; - hash = "sha256-btCfoku8LgsZEJ/aza75wg8spacYEeliXVmjMZYkO3M="; + hash = "sha256-ZHd/RSzFXbcZ7324Bbgtx681zwdHi5xYgqVlTR4glHY="; }; ldflags = [ @@ -21,7 +21,7 @@ buildGoModule (finalAttrs: { "-X=main.date=1970-01-01T00:00:00Z" ]; - vendorHash = "sha256-ilKrQulEmsyv8w2ENjhfICoiXOexjUZXeb3cPeqcTqw="; + vendorHash = "sha256-hxgujZGbcEelOpoy7eCnbrypXraN7aPe8Ox81kkg3gs="; subPackages = [ "." ]; diff --git a/pkgs/applications/misc/blucontrol/wrapper.nix b/pkgs/by-name/bl/blucontrol/package.nix similarity index 90% rename from pkgs/applications/misc/blucontrol/wrapper.nix rename to pkgs/by-name/bl/blucontrol/package.nix index eb004835ae20..dfa595a6a1cb 100644 --- a/pkgs/applications/misc/blucontrol/wrapper.nix +++ b/pkgs/by-name/bl/blucontrol/package.nix @@ -2,11 +2,11 @@ stdenv, lib, makeWrapper, - ghcWithPackages, + haskellPackages, packages ? (_: [ ]), }: let - blucontrolEnv = ghcWithPackages (self: [ self.blucontrol ] ++ packages self); + blucontrolEnv = haskellPackages.ghcWithPackages (self: [ self.blucontrol ] ++ packages self); in stdenv.mkDerivation { pname = "blucontrol-with-packages"; diff --git a/pkgs/by-name/ca/cargo-flamegraph/package.nix b/pkgs/by-name/ca/cargo-flamegraph/package.nix index 3e821d17758c..7d71c6786d68 100644 --- a/pkgs/by-name/ca/cargo-flamegraph/package.nix +++ b/pkgs/by-name/ca/cargo-flamegraph/package.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cargo-flamegraph"; - version = "0.6.12"; + version = "0.6.13"; src = fetchFromGitHub { owner = "flamegraph-rs"; repo = "flamegraph"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-lFbVv6VN4VsAzLY35KJAQ9YNHPyR1orLBp3QuKVW94U="; + sha256 = "sha256-XB0/ltiiYZpOlQWoyEPyNFhHqolDgIq0waIjQwT3L88="; }; - cargoHash = "sha256-i9OBHekHDvvcOLH/hQJk7AXmNKpBsekx/cT0axPnGF0="; + cargoHash = "sha256-OxPvye1HjcQOazAWn7VIa+twWC7uKXeyXkicPiWVe6I="; nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ makeWrapper ]; diff --git a/pkgs/by-name/da/davis/package.nix b/pkgs/by-name/da/davis/package.nix index 30b4805bac3f..b07923f1d13f 100644 --- a/pkgs/by-name/da/davis/package.nix +++ b/pkgs/by-name/da/davis/package.nix @@ -7,17 +7,17 @@ php.buildComposerProject2 (finalAttrs: { pname = "davis"; - version = "5.4.2"; + version = "5.4.3"; src = fetchFromGitHub { owner = "tchapi"; repo = "davis"; tag = "v${finalAttrs.version}"; - hash = "sha256-ZoNd4RvHKdKhfWZN8KrDBGvRbLG6SWUytVEuCQRlnG4="; + hash = "sha256-QCXjw01uJAt22/Vybm/bgE7GeGj4utwdTbXJ2oIVWRo="; }; composerNoPlugins = false; - vendorHash = "sha256-Cpwr8YP1WiMW/ki7WK4zu88ycULP31vXbsqnzYEFHKs="; + vendorHash = "sha256-YSpDBkg/Xlq4cPeil5CaSVXgfKcrUFFRdR4kvFtwzhU="; postInstall = '' chmod -R u+w $out/share diff --git a/pkgs/applications/misc/ding/dict.patch b/pkgs/by-name/di/ding/dict.patch similarity index 100% rename from pkgs/applications/misc/ding/dict.patch rename to pkgs/by-name/di/ding/dict.patch diff --git a/pkgs/applications/misc/ding/default.nix b/pkgs/by-name/di/ding/package.nix similarity index 89% rename from pkgs/applications/misc/ding/default.nix rename to pkgs/by-name/di/ding/package.nix index 5be85e033846..fb870dce115a 100644 --- a/pkgs/applications/misc/ding/default.nix +++ b/pkgs/by-name/di/ding/package.nix @@ -1,7 +1,6 @@ { aspell, - aspellDicts_de, - aspellDicts_en, + aspellDicts, buildEnv, fetchurl, fortune, @@ -17,18 +16,18 @@ let name = "env-ding-aspell"; paths = [ aspell - aspellDicts_de - aspellDicts_en + aspellDicts.de + aspellDicts.en ]; }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ding"; version = "1.9"; src = fetchurl { - url = "https://ftp.tu-chemnitz.de/pub/Local/urz/ding/ding-${version}.tar.gz"; - sha256 = "sha256-aabIH894WihsBTo1LzIBzIZxxyhRYVxLcHpDQwmwmOU="; + url = "https://ftp.tu-chemnitz.de/pub/Local/urz/ding/ding-${finalAttrs.version}.tar.gz"; + hash = "sha256-aabIH894WihsBTo1LzIBzIZxxyhRYVxLcHpDQwmwmOU="; }; nativeBuildInputs = [ makeWrapper ]; @@ -81,4 +80,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; # homepage says: unix-like except darwin maintainers = [ lib.maintainers.exi ]; }; -} +}) diff --git a/pkgs/by-name/el/element-call/missing-hashes.json b/pkgs/by-name/el/element-call/missing-hashes.json deleted file mode 100644 index d07a1b8b2cbd..000000000000 --- a/pkgs/by-name/el/element-call/missing-hashes.json +++ /dev/null @@ -1,115 +0,0 @@ -{ - "@esbuild/aix-ppc64@npm:0.25.1": "6de3a364b7f79f21f66d606d4d29c72ef81c741d71ab4bb941c4eabe7b6a809b1340f4dd5c943827005e421912880741320b9617d17fce762d204cfb94175223", - "@esbuild/aix-ppc64@npm:0.27.2": "78d13201fd4d048d19955fc510db508b14b5fc1a38f4ea506469eac65db770c65fc3727df15b087778178fc8e3304df88559a7441d227451efd8a0b1a688a729", - "@esbuild/android-arm64@npm:0.25.1": "716c98ad3220c71cbaedcfa34aa7c877a3fae911938c3776a66600d7f65980e384799a6832a1b9aea96c6d5a8880610f54744bd0813e743c511d44056ef528d6", - "@esbuild/android-arm64@npm:0.27.2": "e8aded79b2f1f8841c082396f7476bee51c056ed468e438fe2ee00b6b73e96acd640d0b8d0cc13e63c972898f6cdd275483c36c562d4186f0efc01881672b08a", - "@esbuild/android-arm@npm:0.25.1": "d2c9e95dd2027f6e14250a90a11136d9ce73a2157a8d104df4a9dd199d3c50cd91f25813536b4776630acb78596bd5a025976962c6d624df7594c32f2d9c1395", - "@esbuild/android-arm@npm:0.27.2": "ac673502cf6672dabb4b82a26bb3cc120402acba1b87a92481c0a37c8fa06847fd16503714bb227f6351d836f6f60c644ab50fda95c896d8eeb3e5ec3af96226", - "@esbuild/android-x64@npm:0.25.1": "92f1bec801b414ecdc4b73adfbb4482f4f2cfba423d33296914fa59ffdafb81facc445a7f65d1eea813c078220a0606f4be02252843bb9039ceb2755f643387c", - "@esbuild/android-x64@npm:0.27.2": "dcf5c84443645af089e3b82421097c0288a4bdebabf231449ddd66e1b48952e5af975bd26954a50be0441605b91cfe779ca2192bc4b02b7b19192a2a86f912f1", - "@esbuild/darwin-arm64@npm:0.25.1": "9c4cd09c0bd8479e27e04e2397edccebae928184c463684490137d2b7ea3171051b66596db229af2ad3e6a911c1c8a9d10b8aed30d11d0aa155ac0d309fd5dd6", - "@esbuild/darwin-arm64@npm:0.27.2": "cf08b03672941acbea8b509db79a7cb9cf8c81b563c75414c87b8c8442cb1178063eaa14b7cd1ae6cae95dba7e1de9343b721a6d19523a5f21c3d1367e3688b7", - "@esbuild/darwin-x64@npm:0.25.1": "31b64c02be9438e175e8b343c52e0bbc7964f08a1b44e0adbfa2a1b229ccd0ad0184cdb8313272b4590298833ea0b197d82a909466caffe90105f8acb30402d0", - "@esbuild/darwin-x64@npm:0.27.2": "5d3207cf85674b01a817c43064525e39b215802a9ecf352d15e92e926c3e549d95b30e127c2d3f8196ac9472ecca87a861d9f270221ee55884c7a6d0aa636fe1", - "@esbuild/freebsd-arm64@npm:0.25.1": "e04018ffd760dd101a5931e0248751bdfca98e3f29be9b41051d55278907f52a3e5ab80c32168e208c2ff287510d6d5b765d3adc841bfd621af7930c10a547e6", - "@esbuild/freebsd-arm64@npm:0.27.2": "45f475fc6ab2f4760155ca2b50c4cf0ea8aef2bfad3ba4548f4547898d3cc785dcfc2ea58a190be3c20c715c771d1d694a9eb6ef5fb6b72d93b6abc94f366b98", - "@esbuild/freebsd-x64@npm:0.25.1": "438215bea2dc716d2c9ffe9b921bbde06e77d96ec0c837fd79f46bc6e195aa50e5f55490228f7433df7aa47810eec5c602a9d9cf956c1794778018632b196f34", - "@esbuild/freebsd-x64@npm:0.27.2": "7fb62475cb9cdf54d22f2fa984ef57f891d05f366143227efd1d28d507a3b1f2c723239b3e22b3ac418467e6284a08eaf6dcf0bfd2a0f1bea06d0ac73c2aa8de", - "@esbuild/linux-arm64@npm:0.25.1": "c839788b6db471f144bc2627a117083c9a50402c76cde2f0e5411faaeb3a5cde4972bb7336b87de67cd0a65d4d5b00759668407a03b5d4ed3130d4984837429a", - "@esbuild/linux-arm64@npm:0.27.2": "89b8e94e2f4e7cf564623bb6b1d2e9ab218c6d4cafed93778fb797b552d3495f08c99e49d9a2573823bc62660353ce4b4cf17a2828359a3437a9caf8da99673b", - "@esbuild/linux-arm@npm:0.25.1": "ecf9fd9028d2166619b9a45161a987eebb6ef3dcb0159a2607ab164c58c26a15cf274e0b1088834c07ef9166349276d595fdad5c42bce8d03a55cb213d947efa", - "@esbuild/linux-arm@npm:0.27.2": "fd7c845a5ee2073ef6c5bc9d914844b48b82006ebf00f5acb98a43f600ee83fda578034ed8eb6f7f462ed4e3ecd8b7c6570a78bb708ee7eb10b93751ab879ad6", - "@esbuild/linux-ia32@npm:0.25.1": "36f208e10a4b778a28a9002338872e52d24dfc18e25d3b41dc53892279c3ee842d76c7b608a30620f128d85344acac0dc86f203f5de7082a21fa2e908c96b68c", - "@esbuild/linux-ia32@npm:0.27.2": "23f67cfbab67aa860d7afa842e29fa75eb16af8577a811c54263fc3a276c05e468d532bcdb118d174624ed76a9e133d2520567937d4ed646caf9dd19aadbae15", - "@esbuild/linux-loong64@npm:0.25.1": "75d95e6ee995c9f2abb202ca430685e5d58fbe9b0b5b01a69b498c9b360d309026d15bae7831de9c0c4f02e45028a92ffb169117c3b56dd1ac7ea8c6ef50628d", - "@esbuild/linux-loong64@npm:0.27.2": "b37e531c91346c7b5d31ce6664a334c391a27c3c9fb282136abf232111575387e9d066abf27f29436afc913270a8e2c2b09c1210fbf87e70f1028685d94ec4de", - "@esbuild/linux-mips64el@npm:0.25.1": "7fc22eb8a7dc9ee743113cb327eef3591bced4753f416f8dd722794a198a053ab6e120b3b13c1bb6cc89cbd02ea502187b1a3c9ebe8187407665c78995153740", - "@esbuild/linux-mips64el@npm:0.27.2": "8b48a6c7dc8f16147c1087b56710685f3b89279498caab6b63cad3db9402308adf633111d773cfe31756d41fe46e895f2c1ece0fc1ed484ab02e92c28357f0c6", - "@esbuild/linux-ppc64@npm:0.25.1": "84f914a776774bf209c5f96a3708e52477e1966b689a880c0256530063bc581125b5cc04b9700f4aa892e7770ba47c5a950a4be9f1bb3ccbe60a500383602156", - "@esbuild/linux-ppc64@npm:0.27.2": "4f207f87bfc1253974e00d3cf27316d3e93b7e51fde46ed618367e62f2875dffd66812acb85e8d2949dffc73eed7b3939a42bb93f40ec8fca4a6988173709dab", - "@esbuild/linux-riscv64@npm:0.25.1": "97f47cd5695686254b58f950ca973df1fcecfebf3bd585629121a65323ffaa7f95cf821392011ee069da492b46fdff771be332c699a438cf123351610e12d621", - "@esbuild/linux-riscv64@npm:0.27.2": "837a0aa03e82a1b853632d153515d68035e57b39ccf730a778311c04e3429aa80f001d990392519a641945501f6ab3af331481eb4551e99718e7cd2ba5862089", - "@esbuild/linux-s390x@npm:0.25.1": "10760a999d432d092a8ebe5f09752ee7e8ea77a1afa5f1adfe7f9ccb5bbf77d6e0da6dce5d1a4a7cd731d89b6075723c2bc0328f446ed129c4b63c6441ba22ae", - "@esbuild/linux-s390x@npm:0.27.2": "426a4b9d9d4c58d61031a412c64c8cfb0db0e38da3cf4dade253c45a46dc539dccee24700e965e66c7c397a65fef765fc43bdc6b3f46d6bc6f289f79c4b6d7d5", - "@esbuild/linux-x64@npm:0.25.1": "4cdb1625726580eb42432878912d5480a0321559ef2c6425c1db55f89f3fe1c35fb03b3adec92c3f52a4db751d7535f23086b80ed7b219d1edbb254ffbe96e68", - "@esbuild/linux-x64@npm:0.27.2": "febde9f6908220698cf72947534eca590c2b5ce8b0c9bc6170649c5f64f7f93808bb9be2caabd7c63068dc68e218741f27a17ffb8826d87fb487a0639888b90f", - "@esbuild/netbsd-arm64@npm:0.25.1": "f2427b094e072d2db7944b1d2a988dd9f17627976a395b941f225aec2d0565da2ea110a845eafae960af08e3eea74eb327e5eb9dbe06dc1e14f4439596c3b47c", - "@esbuild/netbsd-arm64@npm:0.27.2": "1f69c833bfc5d1d7c58f52fca35637df1686a5bff5c15af900c165b2561a809d805201dc8de712fa73c69205e96a078096cd00b00e9ca8fb5cd8741e4ec943b8", - "@esbuild/netbsd-x64@npm:0.25.1": "c8347ecc18b175923a3cbdaef61b64815ffe0cf2cc285f4034337c2df83e78a118ebfdf2ac3a46a8d8a19ce6a0e0605d27d11570d1758ab90074c99047b82fc0", - "@esbuild/netbsd-x64@npm:0.27.2": "29c9cbd018788521145d719013020dfbf744185eaeaff845f0fc925c67630c66743b03486a2531493f79482d2315e910a27a31f89a791e0a9589e04d86d295d7", - "@esbuild/openbsd-arm64@npm:0.25.1": "719812786b4f3ab4471a306c930ab1bf31e9d92f933ea2a34566f07d6269df5058e7d48408127daa197e6fdb21e30697303127d259b76b18936d534619a3eb15", - "@esbuild/openbsd-arm64@npm:0.27.2": "dccfe8ca6c0d648a26a626b5a4caf3325fed90d7ae343db2a86be9af2479391518c02d54470c2690aec23af1359debe7fbf125d979b5ea891a63fe4b206c2d6f", - "@esbuild/openbsd-x64@npm:0.25.1": "21590cbeda028e9b9f8131c54c36bab65a5d5bd5dd4e6bd9f80438045a655e9ac634bb3535a8650b694db267fe23bd2318a59cdec2fae1ba389ed1a00cc0bbe7", - "@esbuild/openbsd-x64@npm:0.27.2": "0bc581af266608ba01c530ec1fe2b475630dbd56538562f8b1748f7044727bd08d0784afa9aee8aa0a2afe843bb0b47572b4c6babb2a9953808d37263d730be1", - "@esbuild/openharmony-arm64@npm:0.27.2": "1f04a6d690bd2ef231801b0c46b40359b4d4451409cf46a865613f3942835e7633286c328c31f3a10065491f314e6c7c47d7a8f79c1a1ec25f59ff46f5765c6f", - "@esbuild/sunos-x64@npm:0.25.1": "e20ce3891d8717fe2cb885d92d16e9409802316eaa91071be5c7d75164d23dbc5a502be3691039051843d94192e8cf43ade61014a8bce298cfc13a8d3ddd85b0", - "@esbuild/sunos-x64@npm:0.27.2": "9543db0acc86a762f9fd708a3226ebc45a1625885532d153928b9d2b0de90b6d78db0f9b77261d345b95c1ba7282ff3ab0fa37932c2dcd9b1c2b7da7cf39cd76", - "@esbuild/win32-arm64@npm:0.25.1": "749a211eae6a47e5ceb71898df668d083bdec2ed762116fea7772824281f793aceb0487946e20ff604d7e102d1fc8538a73f15b476ca36e07f7ddfb601f6dfa1", - "@esbuild/win32-arm64@npm:0.27.2": "2bfe0fef3ace4a5b0f7647168ae21eda9344a8bef4924d60d1ca781b59eb1f7fef0858aef6e2fb8c185638117bfb7dc18c55a700db57799955c8f655eaaf1f44", - "@esbuild/win32-ia32@npm:0.25.1": "bb45fd889d858678ec68114bfc398965ed8d44e46a9517fcd9f7b397101c2cf94d78938a2640f6f2a1fe65de4ae8830fd426cd21a28302bb92333913b3c16c85", - "@esbuild/win32-ia32@npm:0.27.2": "c510d04bc11f11b7bd6bbf0ea28e2ba484e6232b7655b5cc8ccf8276ef7da760d54a79eaef87a1a40a81632a5ec4a9f7bb08f63920e5d145c8a893ae76d93094", - "@esbuild/win32-x64@npm:0.25.1": "e33291b9834095e6460bd20bb15c49361758bf66d28ccffe0c06a1565211c91f668d9cfc0cbd5bd7a5def693fe7272dbe290b08d4eadba29e750c8a9c739f564", - "@esbuild/win32-x64@npm:0.27.2": "d11933a70f9c908e3cd7202071dc23a9dea8afa58a4c2e22a3beab3516d0898345a5ebb2af47ffb2cc7f5d2a6d788ed4681fa7f37e121f1605149f124d632c67", - "@oxc-resolver/binding-android-arm-eabi@npm:11.19.1": "7fe35b00927acc6b1e9abd7cbf001cc4855f697b1a6604f245cf80ecb09628195d724545680b11ee58c462482247017e6d25d3b6074437ac61842ebb2200e925", - "@oxc-resolver/binding-android-arm64@npm:11.19.1": "2074f0f614aac0178d8c879f0a3897aebbe9cce66241bb8db8dd0400bf30db8a322fbcfb3dffd90e4a9f08eb52f32026155094c3515901f9e50f8c8115508bc2", - "@oxc-resolver/binding-darwin-arm64@npm:11.19.1": "43f0ebd467387f508dd13749b67a1b21b81902dfec7c7fdee24df1976942a78171e29e4ef09390dae88181dcdc4ccf08f43ade727c101572fff961b925f79834", - "@oxc-resolver/binding-darwin-x64@npm:11.19.1": "efad8b905d7cab94ddb749a7b486e7606d21a71ba3f2c8bb117e4a7648aa22499663c96819196e0f38830bb87885f147f517147f3117f805f908274086de01f9", - "@oxc-resolver/binding-freebsd-x64@npm:11.19.1": "750c57d8291f8ab8759f68f16b10aa5967879b7f6f432aed838d3e4b3ea25857c3f5dc1fd4677e79de890e79cc5bdf8bc845ab403bc7d9b7d7827c6af11404a3", - "@oxc-resolver/binding-linux-arm-gnueabihf@npm:11.19.1": "d1a71513000f2d7c300c45ac6b0900831e37759fd0df7c92a6cd2c66b87a724a303da7df94ed16fcbba72ccda45766923212c9711edd228b9f97dfa8da38e08a", - "@oxc-resolver/binding-linux-arm-musleabihf@npm:11.19.1": "4f1b757e8e86fbfdb7f8fd43e9684f3fe339e46606d836b509241c9217ae608397c5c4383b45ba9eabc3b6b4664842839037d41a9e49e726e4ef6e75d871904c", - "@oxc-resolver/binding-linux-arm64-gnu@npm:11.19.1": "6b1342772f5f347fe2a25582a8cd60f3814a7a6e4d2bc8e4a140355409df550858b961ce93932e3ce01fd440e7d4b2dd144978cd6372af325a6e2d85e496b4e8", - "@oxc-resolver/binding-linux-arm64-musl@npm:11.19.1": "40b99fcf1401d0f09a701572927bae4305a15705d2bb44003773ca5bb3ea8f28037e1e64fef5525eef314bd6ef348997b36cd521b4023053e0e0873b6700d52f", - "@oxc-resolver/binding-linux-ppc64-gnu@npm:11.19.1": "3581288514ce58eb79c927a03a43667e7e51b67b20be1f2c8343bce07f1fa848b9802f2d12990af73e8dae790d1ac6200611699c5350bd28a06abe3115a98002", - "@oxc-resolver/binding-linux-riscv64-gnu@npm:11.19.1": "1a8e43df91d8e7fec21c3cf816f20f98a0237b202e99d3768e1a9c49d9ddfbf0acea962991c4ae67dea936f3d2031d77bcacd3af615eecacf7828246be79becc", - "@oxc-resolver/binding-linux-riscv64-musl@npm:11.19.1": "a71fd4c5a13d7cb588d341318811d2728d64111878757988b15c2be3199d0e3f9dacb867ca990ec3cc38ff9eeaf9dfdee7aeb23738028031e6303903f0e501c4", - "@oxc-resolver/binding-linux-s390x-gnu@npm:11.19.1": "f4fc6a75967235ab88550b30891eb17a490e5bcfa8e9b2eaad33b3a4e7fd52ca60e6e0df3dbed5ab9bf4cab51bf05725e86e6d3172a46a1a95a928012a2d52bc", - "@oxc-resolver/binding-linux-x64-gnu@npm:11.19.1": "090f364639f4c6c021f345dc182c37c0d8370bc7b7ce5d93c546a49a3188d400a9c030106cba27a8c02dd7044384efc51187cee4f2e617109593e3c237a65509", - "@oxc-resolver/binding-linux-x64-musl@npm:11.19.1": "653779d9f6b78df664667e5f8693741727cd7c3e74831e0642a3ecd84fbfb36d302c1ae38a53cf33cc9516aef7d7f5ff66dacbb5f3701805baefc5785a5d7669", - "@oxc-resolver/binding-openharmony-arm64@npm:11.19.1": "4d88027b1ad55ab8b4820e8ee24c3a23b6ab6731c14da0da3c6b27394657bb54dd09d01085a64884e8f7219f719b48ea2221f0d7c8f10d2e7288c8a5e0b68287", - "@oxc-resolver/binding-wasm32-wasi@npm:11.19.1": "53be10977b68276a5e72be2a6b56361ff5548243aac269b93178a6058b0cf4dc14484a73ee5d0b68be1582982d96d434d97838515d1a9034a901080aef9d1b75", - "@oxc-resolver/binding-win32-arm64-msvc@npm:11.19.1": "f7671ed2e4f73d9f5ec386355fc9d93940c32bccdfbb7a7fb16bdc51e3cc42ed920cf9cd2f72d77c56e4a4a2c9357e53df3ae88b36106fcb363771e47f50e19e", - "@oxc-resolver/binding-win32-ia32-msvc@npm:11.19.1": "d60ccab0778023eb6977636c32d05c2369b54390aa8bdba4da1809323149548359bc546bccd9e5e717310c46e2a742ccd4dbc3f4750789aa97b5f9cef10ddcf7", - "@oxc-resolver/binding-win32-x64-msvc@npm:11.19.1": "bd84616bb214bd3f63531299f5576538f3f63411f95f1fb470fc8d7434c409fa1922bcbe535c4137673ceb3517e61b102e739a06b1963df600b717a954d22b16", - "@parcel/watcher-android-arm64@npm:2.5.1": "f99d569e4f6cf78a1b0097fb9d4682cb201a74370ae440c531da4e1d5021e46141bfcdf8ef708b51a5b9cb1c30f78eea933ce75216d5eeb7b969a2ad27c68e4a", - "@parcel/watcher-darwin-arm64@npm:2.5.1": "973c7ef3c94608da9cd1b20b18b9a7de2fb46fe44553731fe372b640de524491976150d0845f3d5953b74ed8ea469cb8d18a48651d0e5fb82f549a6b46b54f79", - "@parcel/watcher-darwin-x64@npm:2.5.1": "848c5516aed9c36e14751200dbbf57e83c0bd46cdab0932df33db120e66b9596de18eeb98980e319efde84014f67d9e7924d7555383d8ffcefe35c501166b84b", - "@parcel/watcher-freebsd-x64@npm:2.5.1": "cbd2b7884bc92422edabc0c74c3fbc06512bb7300fc137aaff2e96f46f61e5272265a0b5d230acc82a0e777b0c11661f0b8b7f89a9342c0920b752436dd2c750", - "@parcel/watcher-linux-arm-glibc@npm:2.5.1": "f2e1ec14dbb0f85a84a75f55fd7721598694976ba3ad439832b57e558b0d9240cc80ff83053fb8cf7caffb0592d51bb39d325112763ec1734924b49d4ba9c144", - "@parcel/watcher-linux-arm-musl@npm:2.5.1": "83344c7ecda2e79db59d711bcee0c3fa26922989139c031bd762cf3d5bfb191797e22e9ed6072690b822dfd62629623ba4e7eedb3c41930a987fc3d4106000e1", - "@parcel/watcher-linux-arm64-glibc@npm:2.5.1": "562231feb159a294752378bebecc69a2d33366a9d877835844578799f8536398006e0e570849f9e2db04085a3ea82131459cd10fd6b42dea10cd73bd0c9ca13e", - "@parcel/watcher-linux-arm64-musl@npm:2.5.1": "f62db52a90ebbaa29ca9900e6b9bd3fc6e5c650741bbde9a2742cbc332c678b753fc6a596d67659394fd9262aa826463ea667d18cc554bcaaac9e8da1a2a29d0", - "@parcel/watcher-linux-x64-glibc@npm:2.5.1": "425e557991fde5092d6a9e20be71810600415e5fa157dca0b39bd8db86653d3ee7b037305261c8782d1a065f2a64d235e17b57876b26f5bb0dd7a9bdbe364690", - "@parcel/watcher-linux-x64-musl@npm:2.5.1": "4dbb066ba9478c8b8de39e3c1083cbb74f86f03eaf4445603e69909d6c072134644316faa20a2445419b9fe1a8063ade7b5331a5766d807ee0b15b8a70c59a2d", - "@parcel/watcher-win32-arm64@npm:2.5.1": "e015314d6b9b727cbe25eedf963ca8b23bf6d4e78d3c28008bd0d2657940ad54a271330486df3a93a5f1a30f2b8d052d14415b85cc7e7b747c6c73b5dc055628", - "@parcel/watcher-win32-ia32@npm:2.5.1": "920b6ad6a2095aeb9c2d329c5118472a3c14669fa93eaa99aa8050c76c5c2d3d76d92677167ed748c2ac5487c568d5df16d5d94f4bc7c354094fccd8e0d6350c", - "@parcel/watcher-win32-x64@npm:2.5.1": "8f1c8e41ec9f86e4dcd0d4db0a077742d5dcc853f15ea888387183e34e2efcff09fd1cc9ec46fc1121b9ad4ddc0e221283f2ffb23cfd7dbcbb8b03060b461963", - "@rollup/rollup-android-arm-eabi@npm:4.50.1": "fc43d07ffb8be5b65f124a0d9ebbfce82c1126e38747c3c277bca067e188fe9618c0139ef2ec542857700ff2331aff297a7076309aa5e37cb970dd13871ab715", - "@rollup/rollup-android-arm64@npm:4.50.1": "a0ce9ce850a61c79b89b80624444521bdd067863883575448152fb8b7806626acbcf94c14bef42604b6149f50c9907273bbbdda406df6ebddc730195ef43eee1", - "@rollup/rollup-darwin-arm64@npm:4.50.1": "7545f01772f92cd050ce4e60dc1f182fe2eab85217be2eba8d05d971df603ab7fde6531c90472b3c5a0ae1509a1c038f61c14686695b7dd1863eb11192c27832", - "@rollup/rollup-darwin-x64@npm:4.50.1": "3e4eb9799b3c674902c8ea849a72f03f626371622279b95005c3937afabef6673f1ddeff047339a4b2f73670354fc5477f7698d5b1576faee9dc3640ced8d614", - "@rollup/rollup-freebsd-arm64@npm:4.50.1": "d5125df84bb7923185db9f77d096a0b31fd0262e1d28a1abf4372370a1630772edd8f50dfd8bd98de58ebe58a7d4a8034ad2333de6df1daa22d4bab9561c2752", - "@rollup/rollup-freebsd-x64@npm:4.50.1": "219f5206b2f0430b76da61e0c49b311275df6ecb9e7af3baac35b16dcb43f8d6d132b959c8287d8938ed2420e6f1d889a8a562fad4395c49ce24ee475e26476f", - "@rollup/rollup-linux-arm-gnueabihf@npm:4.50.1": "c8136810a86436369bc030d98afcfe53d7a8e1d33152f1c8a86f206213079b364089fc4445ddcfaa375b71868b9b9b58cabc9c3ea0a1b40b64bc5aac421d9a21", - "@rollup/rollup-linux-arm-musleabihf@npm:4.50.1": "61a435947f9d74b8e8618a03ac5e0c82dbc17a77a40b7c088c8f3c77fb571c469d89a440310bd83b054fbb0822487954161b78e7886f51f6418a6b1a45f7c379", - "@rollup/rollup-linux-arm64-gnu@npm:4.50.1": "7e06235ea040781c9a73e377cfeb0f051253f59d7ca56fc9b4f2a615342508779238c713dab3118de504b2ad62f1dafb6f8c97ec0c1fe7d2fc8124f0bdae3f98", - "@rollup/rollup-linux-arm64-musl@npm:4.50.1": "9b874c876de5be7f9290b7858952c6f5014958ef1db83ffe54a14877b12a6a912e34099a9278fbe1c2e23c910c09c6feee90e167b4d748dfb0ae63047062fff4", - "@rollup/rollup-linux-loongarch64-gnu@npm:4.50.1": "2ba32899d57949734db5ac0518656d53d1f54b7e970ac8424f8548364b867d7ee530a7a275af58bf5ac328ac8f12943a706446946b0a2b46a48662d75194cecc", - "@rollup/rollup-linux-ppc64-gnu@npm:4.50.1": "6d34e6737175738a86ec3b6b8d5cecdaa9fff9bf115aec434d15cdad3823afda7dfc68acae97e38256ffdc3ef45080907a980626f20682efe1c2d95e62970e3e", - "@rollup/rollup-linux-riscv64-gnu@npm:4.50.1": "df48c61bff1c47a3b109260c4bf13d0b72d0b18b4dd8b43828844ab81cd09b1c1974d353f8562df3281e0369c4fb0f5fd368f0a59078a58349123cc04e6e5b72", - "@rollup/rollup-linux-riscv64-musl@npm:4.50.1": "c8be03392cacd3b92bed221ea4b92694d8c8779c6e3e91d387cd81b280ebc0b5078b8e617c37ff317f3f05574e2c4b3443dea15c5a82f98f90b48c353aa9e2d1", - "@rollup/rollup-linux-s390x-gnu@npm:4.50.1": "4ae6fa0d82232f34357c85de9d4eb5b6865b547b17587caca7e9fdd06df5081bbff1fde9b193012ee5279b62cd8471e3257ad1c5a3fdaf6f484bb8758c14e756", - "@rollup/rollup-linux-x64-gnu@npm:4.50.1": "1d69c7626091b648547fea9a021fa35423a77b4e51297aa4fb7cf6c2d3492525ff2cef7392f77159eefaf53fcaad7ddbfb28b10bff3b633d756ee86f48445354", - "@rollup/rollup-linux-x64-musl@npm:4.50.1": "35de0d4d070b3d470e4ca08b7f66ca21ba44b71d79e530ecb2e81329edcd9b4ebc10e530008caac2c11b18b8093190bd62b5e5e06652a52097f84148d3228d3f", - "@rollup/rollup-openharmony-arm64@npm:4.50.1": "2721d51beca80da39a36b07b97c34d9a880d371ca69635aac21023774852de9f0ee282972969555b2f6ab31703915d18d7ef880bf13830cf63a463c37e017de8", - "@rollup/rollup-win32-arm64-msvc@npm:4.50.1": "909b72f1c9535ffb443dfa0be72f00662369c2292561f02804bf34d88908ff46ad7fb61284f3b58cc4cf52e046a38001b69f0a4e927dced3933fb4eba3e7e107", - "@rollup/rollup-win32-ia32-msvc@npm:4.50.1": "7454e38f68825ea98812fcc6a130e77968225af1347e3629930cea2cb18a23bf502624e3eafc6c47cb056f9755eb02ff4b2273b65cfa24d00211cee2fbdff080", - "@rollup/rollup-win32-x64-msvc@npm:4.50.1": "dfe41235a62327c50da7fcab7207f22ccc469ba3deabd8e55c1eccb1b45a88f8e7b0e86f8e77403fc938cb208aa652d0a62b531ba2671c6c64db93e45ea2b03b", - "@sentry/cli-darwin@npm:2.50.2": "c3584d15672040bd57f206f767c0fb1636db469337cd4e01cb290b3152ffe369e4ab58ec8f1e25b9198cf378eada0f932b558a426e66b125e053328ef2542c14", - "@sentry/cli-linux-arm64@npm:2.50.2": "6818e4746d1e47f852ecb71ca84ea2cc99ee1615ffd18803fb1edaaa3dd10ec87d02c21c259ce58d02b79d6c4bb6eed8d65762d5ea32c8e103220cb3d8e94d43", - "@sentry/cli-linux-arm@npm:2.50.2": "fcc0fe7b13fa98e3b4669ebe4375211b752b9f455c5caf2c06b31dd25c8d1c8f3e4cb8cb96be4cd10e8ee6aef7d4b0b04927244ede69b2806ca2c9e7fae183de", - "@sentry/cli-linux-i686@npm:2.50.2": "4b914dc15cc1a469f76d496900d8c912a4be1b0c803124aa157b1432d4c35db48e03f8e4fb0d2fa26ed671e85d7d0ebbc470b895b2f137ebe57b8589844743fc", - "@sentry/cli-linux-x64@npm:2.50.2": "b733701b644bfa872a51c88bdb714c029e32d0ca44b46c11c725a3f899739f6a1c15f8468b89631544001092fd7377b48d93628d20e4435b522fa92fba144e67", - "@sentry/cli-win32-arm64@npm:2.50.2": "ec047ae8c71450430151a75f7045752b0d6265805acad211249aeb4d10e36cabf0ba5ef9c6c388e862cc1e3137c78452231cb503891987467ddaad59917fcc46", - "@sentry/cli-win32-i686@npm:2.50.2": "b5e8752fe277aef134e92801a6186f007d1b328ff62caf2449593d7be4a6671df5d78e297be32ca1e5ae3ba61de69457f75d1affb4299d1320a3b7b021e58ee0", - "@sentry/cli-win32-x64@npm:2.50.2": "8d8e9e5210986f2766d1b70dcd1f086ffd3c702d881c52ba554409b004fba0b182a27d7dd6853802b0b21c92e9baf66d405252cf391e1c1b8999cc1ee02d0adf" -} diff --git a/pkgs/by-name/el/element-call/package.nix b/pkgs/by-name/el/element-call/package.nix index be6a7c822c9d..1eb2861f3c5b 100644 --- a/pkgs/by-name/el/element-call/package.nix +++ b/pkgs/by-name/el/element-call/package.nix @@ -2,71 +2,91 @@ lib, stdenv, fetchFromGitHub, - fetchYarnDeps, - git, - yarn-berry, - yarnConfigHook, + pnpm_10, + pnpmConfigHook, + fetchPnpmDeps, nodejs, runCommand, }: +let + pnpm = pnpm_10; + + # Separately build matrix-js-sdk, as upstream expects to 'pnpm i && pnpm build' in the dependency's directory + # Keep this in sync with upstream locked version (likely a stable release, but not always latest) + matrix-js-sdk = stdenv.mkDerivation (finalAttrs: { + pname = "matrix-js-sdk"; + version = "41.7.0-rc.3"; + + src = fetchFromGitHub { + owner = "matrix-org"; + repo = "matrix-js-sdk"; + tag = "v${finalAttrs.version}"; + hash = "sha256-KD+AbMGVAaGEU5h2JB5JyQtwG0SYejdADjJ7TrxqVrY="; + }; + + pnpmDeps = fetchPnpmDeps { + inherit (finalAttrs) pname version src; + inherit pnpm; + fetcherVersion = 4; + hash = "sha256-mWtzWAV/lyaCZEIiGmOLUkhwwMouNAWoYJWL7Srr/bM="; + }; + + nativeBuildInputs = [ + nodejs + pnpmConfigHook + pnpm + ]; + + buildPhase = '' + runHook preBuild + pnpm build + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + mkdir $out + cp -r src $out/ + cp -r lib $out/ + cp package.json $out/ + + runHook postInstall + ''; + }); +in stdenv.mkDerivation (finalAttrs: { pname = "element-call"; - version = "0.18.0"; + version = "0.20.1"; src = fetchFromGitHub { owner = "element-hq"; repo = "element-call"; tag = "v${finalAttrs.version}"; - hash = "sha256-/5RkZNf/ErSxNwW0ZfPwF52k3fZzAQAFMmbJ9xM7f74="; + hash = "sha256-g71b0GVpe181iNum5i6z1bTAbCykyoYUy300Ebeds1Q="; }; - patches = [ - # Remove after updating since project has moved to pnpm - # https://github.com/element-hq/element-call/blob/v0.19.2/package.json#L159 - ./yarn-4.14-support.patch - ]; - - matrixJsSdkRevision = "6e3efef0c5f660df47cf00874927dec1c75cc3cf"; - matrixJsSdkOfflineCache = fetchYarnDeps { - yarnLock = "${finalAttrs.offlineCache}/checkouts/${finalAttrs.matrixJsSdkRevision}/yarn.lock"; - hash = "sha256-YvXmPWHt3qL9z8uap0/faKi5OId6zZ0ISiMT3x6ARx8="; + pnpmDeps = fetchPnpmDeps { + inherit (finalAttrs) pname version src; + inherit pnpm; + fetcherVersion = 4; + hash = "sha256-K+ccoUDNYdmeVyVSYLP1UsvdsAgD1aH80HIubZY4Mf8="; }; - dontYarnInstallDeps = true; - preConfigure = '' - cp -r $offlineCache writable - chmod u+w -R writable - pushd writable/checkouts/${finalAttrs.matrixJsSdkRevision}/ - mkdir -p .git/{refs,objects} - echo ${finalAttrs.matrixJsSdkRevision} > .git/HEAD - SKIP_YARN_COREPACK_CHECK=1 offlineCache=$matrixJsSdkOfflineCache yarnConfigHook - SKIP_YARN_COREPACK_CHECK=1 yarn build - popd - offlineCache=writable - # The matrix-js-sdk git package checksum in yarn.lock was computed against a - # developer checkout with pre-compiled lib/. nix-prefetch-git stores a bare - # working tree so the repack at build time produces a different zip hash. - # The offline cache is already verified by the FOD hash, so this is safe. - export YARN_CHECKSUM_BEHAVIOR=ignore - ''; - - missingHashes = ./missing-hashes.json; - offlineCache = yarn-berry.fetchYarnBerryDeps { - inherit (finalAttrs) src missingHashes patches; - hash = "sha256-2P4kwccT2WP2SlJJ1biZCRU8O+Y43sGJmfRTUujklUg="; - }; + inherit matrix-js-sdk; nativeBuildInputs = [ - git - yarn-berry.yarnBerryConfigHook - yarnConfigHook nodejs + pnpmConfigHook + pnpm ]; buildPhase = '' runHook preBuild - ${lib.getExe yarn-berry} build + # Instead of making an override, invalidating the pnpm lock, just add the built files in lib right before invoking pnpm build + cp -r ${finalAttrs.matrix-js-sdk}/* node_modules/matrix-js-sdk/ + pnpm build runHook postBuild ''; @@ -79,17 +99,23 @@ stdenv.mkDerivation (finalAttrs: { runHook postInstall ''; - passthru.tests.build = runCommand "${finalAttrs.pname}-test" { } '' - test -f ${finalAttrs.finalPackage}/index.html - test -d ${finalAttrs.finalPackage}/assets - touch $out - ''; + passthru = { + tests.build = runCommand "${finalAttrs.pname}-test" { } '' + test -f ${finalAttrs.finalPackage}/index.html + test -d ${finalAttrs.finalPackage}/assets + touch $out + ''; + inherit (finalAttrs) matrix-js-sdk; + }; meta = { changelog = "https://github.com/element-hq/element-call/releases/tag/${finalAttrs.src.tag}"; homepage = "https://github.com/element-hq/element-call"; description = "Group calls powered by Matrix"; - license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ kilimnik ]; + license = lib.licenses.agpl3Only; + maintainers = with lib.maintainers; [ + bartoostveen + kilimnik + ]; }; }) diff --git a/pkgs/by-name/el/element-call/yarn-4.14-support.patch b/pkgs/by-name/el/element-call/yarn-4.14-support.patch deleted file mode 100644 index bb64eb874448..000000000000 --- a/pkgs/by-name/el/element-call/yarn-4.14-support.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/.yarnrc.yml b/.yarnrc.yml ---- a/.yarnrc.yml -+++ b/.yarnrc.yml -@@ -1,3 +1,6 @@ - nodeLinker: node-modules - plugins: - - .yarn/plugins/linker.cjs -+approvedGitRepositories: -+ - "**" -+enableScripts: true -diff --git a/yarn.lock b/yarn.lock ---- a/yarn.lock -+++ b/yarn.lock -@@ -2,6 +2,6 @@ - # Manual changes might be lost - proceed with caution! - - __metadata: -- version: 8 -+ version: 9 - cacheKey: 10c0 - diff --git a/pkgs/by-name/fa/fastly/package.nix b/pkgs/by-name/fa/fastly/package.nix index ba7eabb6eced..2243b8917e38 100644 --- a/pkgs/by-name/fa/fastly/package.nix +++ b/pkgs/by-name/fa/fastly/package.nix @@ -12,13 +12,13 @@ buildGoModule (finalAttrs: { pname = "fastly"; - version = "15.1.0"; + version = "15.2.0"; src = fetchFromGitHub { owner = "fastly"; repo = "cli"; tag = "v${finalAttrs.version}"; - hash = "sha256-bNdTvjWs43qO3gAtaKZR5CgGmOnJmNWrJUbm6Xv+q+g="; + hash = "sha256-q75cNedu+loAkntMykfPil7/gd7inrJx5RyWJPq0NE0="; # The git commit is part of the `fastly version` original output; # leave that output the same in nixpkgs. Use the `.git` directory # to retrieve the commit SHA, and remove the directory afterwards, @@ -35,7 +35,7 @@ buildGoModule (finalAttrs: { "cmd/fastly" ]; - vendorHash = "sha256-gR8FIVk+D40ALLdM+AzMkIUWLsBlWgoLp3DfEQa3a0s="; + vendorHash = "sha256-dTu+LFxKrLCXnbBH3QJ3PgbXEEtJ0NUIKfoKuCHWlgQ="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/fe/feedbackd/package.nix b/pkgs/by-name/fe/feedbackd/package.nix index 4c69db645be7..c7f33858bd52 100644 --- a/pkgs/by-name/fe/feedbackd/package.nix +++ b/pkgs/by-name/fe/feedbackd/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitLab, + testers, docbook-xsl-nons, docutils, gi-docgen, @@ -27,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "feedbackd"; - version = "0.8.5"; + version = "0.8.9"; outputs = [ "out" @@ -37,12 +38,19 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; - owner = "agx"; + owner = "feedbackd"; repo = "feedbackd"; - rev = "v${finalAttrs.version}"; - hash = "sha256-m8jDn7gDrZOsdFl17IsIINgcpuHmmtNOCEEdQFwVj6g="; + tag = "v${finalAttrs.version}"; + hash = "sha256-4cbH5jzbLROs/FtbiktlyZPGPYiIo3wgqgOCzyzNzzs="; }; + postPatch = '' + patchShebangs run.in + + substituteInPlace data/72-feedbackd.rules \ + --replace-fail '/usr/libexec/' "$out/libexec/" + ''; + depsBuildBuild = [ pkg-config ]; @@ -73,6 +81,7 @@ stdenv.mkDerivation (finalAttrs: { mesonFlags = [ "-Dgtk_doc=true" "-Dman=true" + "-Dmedia-roles=true" # Make compiling work when doCheck = false "-Dtests=${lib.boolToString finalAttrs.finalPackage.doCheck}" ]; @@ -84,11 +93,6 @@ stdenv.mkDerivation (finalAttrs: { doCheck = true; - postInstall = '' - mkdir -p $out/lib/udev/rules.d - sed "s|/usr/libexec/|$out/libexec/|" < $src/data/90-feedbackd.rules > $out/lib/udev/rules.d/90-feedbackd.rules - ''; - postFixup = '' # Move developer documentation to devdoc output. # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back. @@ -103,6 +107,10 @@ stdenv.mkDerivation (finalAttrs: { doInstallCheck = true; passthru = { + tests.pkg-config = testers.hasPkgConfigModules { + package = finalAttrs.finalPackage; + versionCheck = true; + }; updateScript = nix-update-script { }; }; @@ -110,7 +118,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Theme based Haptic, Visual and Audio Feedback"; - homepage = "https://gitlab.freedesktop.org/agx/feedbackd/"; + homepage = "https://gitlab.freedesktop.org/feedbackd/feedbackd/"; license = with lib.licenses; [ # feedbackd gpl3Plus @@ -122,6 +130,7 @@ stdenv.mkDerivation (finalAttrs: { pacman99 Luflosi ]; + pkgConfigModules = [ "libfeedback-0.0" ]; platforms = lib.platforms.linux; }; }) diff --git a/pkgs/by-name/gh/gh/package.nix b/pkgs/by-name/gh/gh/package.nix index 75907d8c9ea5..d03d00f150f0 100644 --- a/pkgs/by-name/gh/gh/package.nix +++ b/pkgs/by-name/gh/gh/package.nix @@ -10,7 +10,7 @@ buildGoModule (finalAttrs: { pname = "gh"; - version = "2.93.0"; + version = "2.94.0"; __structuredAttrs = true; @@ -18,10 +18,10 @@ buildGoModule (finalAttrs: { owner = "cli"; repo = "cli"; tag = "v${finalAttrs.version}"; - hash = "sha256-r/+JFdMOUIb32St+VkUw+Q7Lb2L6IiPczmONFE4hwDw="; + hash = "sha256-wv9hMep8dDKKpqzNI5We6KThOFX82ppzvkoGyhY21pk="; }; - vendorHash = "sha256-eMPcla1XKfq+zBb633Zz4cn820FWuEaRrXQJ1TQ8Lkg="; + vendorHash = "sha256-sRpHQTJNDPVe1jaLO9zMqtIMDE6JQB3vUL7AMxlcnJA="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/gl/glaze/package.nix b/pkgs/by-name/gl/glaze/package.nix index 5bdb15fb4c67..e7268ded081c 100644 --- a/pkgs/by-name/gl/glaze/package.nix +++ b/pkgs/by-name/gl/glaze/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "glaze"; - version = "7.7.1"; + version = "7.8.0"; src = fetchFromGitHub { owner = "stephenberry"; repo = "glaze"; tag = "v${finalAttrs.version}"; - hash = "sha256-CfN2mv1s+yv2HvRLBZhHUHBNfsgRzTT7USNYkkahh8M="; + hash = "sha256-E906rvJh6URPvtsLmOjvNKZQtI52ItkoXQvISIQlNXE="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/gp/gpauth/package.nix b/pkgs/by-name/gp/gpauth/package.nix index 0ebd8cb93433..08906b1fe59b 100644 --- a/pkgs/by-name/gp/gpauth/package.nix +++ b/pkgs/by-name/gp/gpauth/package.nix @@ -12,19 +12,19 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "gpauth"; - version = "2.5.1"; + version = "2.5.4"; src = fetchFromGitHub { owner = "yuezk"; repo = "GlobalProtect-openconnect"; tag = "v${finalAttrs.version}"; - hash = "sha256-rux2rToqs5GZEDTryPAkm62yGdhWfEqapTMQOGyqCRI="; + hash = "sha256-RDfxhf0t70Ex6MfgHAX2AaWcPAwTCvjm1bQkek+92zc="; fetchSubmodules = true; }; buildAndTestSubdir = "apps/gpauth"; - cargoHash = "sha256-xza7AfuOcSUkDyliGHUx9bEd+M94d23xVrVVvZo2nas="; + cargoHash = "sha256-SY0PS5GxvVO1jaCNyLa3/l/v8/JT2R+4lM3W9kA7fVM="; nativeBuildInputs = [ perl diff --git a/pkgs/by-name/gp/gpclient/package.nix b/pkgs/by-name/gp/gpclient/package.nix index bdd6c40375ac..1aa7b97cda5a 100644 --- a/pkgs/by-name/gp/gpclient/package.nix +++ b/pkgs/by-name/gp/gpclient/package.nix @@ -6,26 +6,39 @@ autoconf, automake, cairo, + coreutils, + gawk, glib, glib-networking, + gmp, gnutls, + gnugrep, gpauth, gtk3, + iproute2, libtool, libxml2, lz4, makeBinaryWrapper, + net-tools, + nettle, + openresolv, openssl, p11-kit, pango, perl, pkg-config, - vpnc-scripts, + systemd, + zlib, + withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd, }: rustPlatform.buildRustPackage { pname = "gpclient"; + # Keep automatic updates anchored on gpauth so the bot updates both + # package outputs in one PR. + # nixpkgs-update: no auto update inherit (gpauth) cargoHash meta @@ -48,14 +61,17 @@ rustPlatform.buildRustPackage { buildInputs = [ glib glib-networking + gmp + gnutls gpauth - openssl # used for vendored openconnect - gnutls libxml2 lz4 + nettle + openssl p11-kit + zlib ] ++ lib.optionals stdenv.hostPlatform.isLinux [ atk @@ -66,14 +82,17 @@ rustPlatform.buildRustPackage { postPatch = '' substituteInPlace crates/openconnect/src/vpn_utils.rs \ - --replace-fail /etc/vpnc/vpnc-script ${vpnc-scripts}/bin/vpnc-script \ + --replace-fail /usr/libexec/gpclient/vpnc-script $out/libexec/gpclient/vpnc-script \ --replace-fail /usr/libexec/gpclient/hipreport.sh $out/libexec/gpclient/hipreport.sh substituteInPlace crates/common/src/constants.rs \ + --replace-fail /usr/bin/gpauth ${gpauth}/bin/gpauth \ + --replace-fail /opt/homebrew/bin/gpauth ${gpauth}/bin/gpauth \ + --replace-fail /usr/local/bin/gpauth ${gpauth}/bin/gpauth \ --replace-fail /usr/bin/gpclient $out/bin/gpclient \ --replace-fail /usr/bin/gpservice $out/bin/gpservice \ - --replace-fail /usr/bin/gpauth ${gpauth}/bin/gpauth \ - --replace-fail /opt/homebrew/ $out/ + --replace-fail /opt/homebrew/ $out/ \ + --replace-fail /usr/local/ $out/ ''; postInstall = '' @@ -82,6 +101,32 @@ rustPlatform.buildRustPackage { substituteInPlace $out/libexec/gpclient/hipreport.sh \ --replace-fail /usr/bin/gpclient $out/bin/gpclient '' + + lib.optionalString stdenv.hostPlatform.isLinux '' + substituteInPlace $out/libexec/gpclient/vpnc-script \ + --replace-fail /sbin/resolvconf ${openresolv}/bin/resolvconf + '' + + lib.optionalString withSystemd '' + substituteInPlace $out/libexec/gpclient/vpnc-script \ + --replace-fail /usr/bin/resolvectl ${systemd}/bin/resolvectl \ + --replace-fail /usr/bin/busctl ${systemd}/bin/busctl + '' + + '' + wrapProgram "$out/libexec/gpclient/vpnc-script" \ + --prefix PATH : "${ + lib.makeBinPath ( + [ + coreutils + gawk + gnugrep + net-tools + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + iproute2 + openresolv + ] + ) + }" + '' + lib.optionalString stdenv.hostPlatform.isLinux '' cp -r packaging/files/usr/lib $out/lib substituteInPlace $out/lib/NetworkManager/dispatcher.d/pre-down.d/gpclient.down \ diff --git a/pkgs/by-name/k9/k9s/package.nix b/pkgs/by-name/k9/k9s/package.nix index 76a58dac9520..386161b25861 100644 --- a/pkgs/by-name/k9/k9s/package.nix +++ b/pkgs/by-name/k9/k9s/package.nix @@ -12,13 +12,13 @@ buildGoModule (finalAttrs: { pname = "k9s"; - version = "0.50.18"; + version = "0.51.0"; src = fetchFromGitHub { owner = "derailed"; repo = "k9s"; tag = "v${finalAttrs.version}"; - hash = "sha256-WIcT4LfoIZ8BctwrUgn+mLbqwJ2NZx6Sc5sJeT9fsus="; + hash = "sha256-70Rfu1BVd/QnwWXRRpwIeZ2UJNWIGixpdiOHo4v7adA="; }; ldflags = [ @@ -32,7 +32,7 @@ buildGoModule (finalAttrs: { proxyVendor = true; - vendorHash = "sha256-QvMT/pHtwXAsbGxcOLwqYQoa2gdplhDUnPhwc/50PFs="; + vendorHash = "sha256-PkYDJK2oGl+siCG9p4R8shC0e5BhGFdJsc+ksL9J5zw="; # TODO investigate why some config tests are failing doCheck = !(stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64); diff --git a/pkgs/by-name/li/libvirt/package.nix b/pkgs/by-name/li/libvirt/package.nix index 31c7a85c1b1f..a17ec8bbe5fe 100644 --- a/pkgs/by-name/li/libvirt/package.nix +++ b/pkgs/by-name/li/libvirt/package.nix @@ -121,14 +121,14 @@ assert enableZfs -> isLinux; stdenv.mkDerivation rec { pname = "libvirt"; # if you update, also bump and SysVirt in - version = "12.2.0"; + version = "12.4.0"; src = fetchFromGitLab { owner = "libvirt"; repo = "libvirt"; tag = "v${version}"; fetchSubmodules = true; - hash = "sha256-4F5cGEMg2TNyzt9Cmc3vLXdJnSEz4X5vPOsd0rHdpi0="; + hash = "sha256-xgXbgZ8UDdiKPJSGEHB5PasGws5VvCgd+DpoOxwceEA="; }; patches = [ diff --git a/pkgs/by-name/ma/matterjs-server/package.nix b/pkgs/by-name/ma/matterjs-server/package.nix index 0131f27d05ff..389a8d34c39a 100644 --- a/pkgs/by-name/ma/matterjs-server/package.nix +++ b/pkgs/by-name/ma/matterjs-server/package.nix @@ -12,7 +12,7 @@ buildNpmPackage (finalAttrs: { pname = "matterjs-server"; - version = "0.8.0"; + version = "1.0.0"; __structuredAttrs = true; strictDeps = true; @@ -20,10 +20,10 @@ buildNpmPackage (finalAttrs: { owner = "matter-js"; repo = "matterjs-server"; tag = "v${finalAttrs.version}"; - hash = "sha256-AjCfPovhYKUeU4Xrsh6uL0pPG+ja0n+efFTbwre83m4="; + hash = "sha256-c/jhQfenRgE0qHisGM1TOtqWjDy/RcwGa04RE0FzR/U="; }; - npmDepsHash = "sha256-1q8eRCLrYJDdD4Tku3NVCvXHSY+bmyw8vZk95WvsYOI="; + npmDepsHash = "sha256-7Anz+Foz5jKP8u9jmpw1wn/LgknR1LWyozamBs83v1A="; nativeBuildInputs = [ makeBinaryWrapper diff --git a/pkgs/applications/misc/mu-repo/default.nix b/pkgs/by-name/mu/mu-repo/package.nix similarity index 85% rename from pkgs/applications/misc/mu-repo/default.nix rename to pkgs/by-name/mu/mu-repo/package.nix index 99f52a5901b3..9dc5e67e2e07 100644 --- a/pkgs/applications/misc/mu-repo/default.nix +++ b/pkgs/by-name/mu/mu-repo/package.nix @@ -7,7 +7,7 @@ mu-repo, }: -python3Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication (finalAttrs: { pname = "mu-repo"; version = "1.9.0"; format = "setuptools"; @@ -15,7 +15,7 @@ python3Packages.buildPythonApplication rec { src = fetchFromGitHub { owner = "fabioz"; repo = "mu-repo"; - tag = "mu_repo_${lib.replaceStrings [ "." ] [ "_" ] version}"; + tag = "mu_repo_${lib.replaceStrings [ "." ] [ "_" ] finalAttrs.version}"; hash = "sha256-aSRf0B/skoZLsn4dykWOFKVNtHYCsD9RtZ1frHDrcJU="; }; @@ -40,4 +40,4 @@ python3Packages.buildPythonApplication rec { maintainers = with lib.maintainers; [ sikmir ]; mainProgram = "mu"; }; -} +}) diff --git a/pkgs/applications/misc/mwic/default.nix b/pkgs/by-name/mw/mwic/package.nix similarity index 70% rename from pkgs/applications/misc/mwic/default.nix rename to pkgs/by-name/mw/mwic/package.nix index 9aa8902f416d..46a1cfe0efeb 100644 --- a/pkgs/applications/misc/mwic/default.nix +++ b/pkgs/by-name/mw/mwic/package.nix @@ -2,25 +2,25 @@ lib, stdenv, fetchurl, - pythonPackages, + python3Packages, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "0.7.10"; pname = "mwic"; src = fetchurl { - url = "https://github.com/jwilk/mwic/releases/download/${version}/${pname}-${version}.tar.gz"; + url = "https://github.com/jwilk/mwic/releases/download/${finalAttrs.version}/mwic-${finalAttrs.version}.tar.gz"; sha256 = "sha256-dmIHPehkxpSb78ymVpcPCu4L41coskrHQOg067dprOo="; }; makeFlags = [ "PREFIX=\${out}" ]; nativeBuildInputs = [ - pythonPackages.wrapPython + python3Packages.wrapPython ]; - propagatedBuildInputs = with pythonPackages; [ + propagatedBuildInputs = with python3Packages; [ pyenchant regex ]; @@ -36,4 +36,4 @@ stdenv.mkDerivation rec { license = lib.licenses.mit; maintainers = with lib.maintainers; [ matthiasbeyer ]; }; -} +}) diff --git a/pkgs/by-name/ne/nerva/package.nix b/pkgs/by-name/ne/nerva/package.nix index aba6ee8996d9..2849dab69ada 100644 --- a/pkgs/by-name/ne/nerva/package.nix +++ b/pkgs/by-name/ne/nerva/package.nix @@ -6,13 +6,13 @@ buildGoModule (finalAttrs: { pname = "nerva"; - version = "1.4.2"; + version = "1.15.0"; src = fetchFromGitHub { owner = "praetorian-inc"; repo = "nerva"; tag = "v${finalAttrs.version}"; - hash = "sha256-xARdj2oo097jwfXy/FwMg1KMIXFJdjCV90W0lEPw8KM="; + hash = "sha256-kIwiHGI0vfcDOfUmJDlPMfRV03P1UCi0t7GGQNyE/nI="; }; vendorHash = "sha256-j+8KZxHnYrtxwdBxpAXZ+Q5Sm1REluUEmD69tKYTCag="; diff --git a/pkgs/by-name/ne/netbird/package.nix b/pkgs/by-name/ne/netbird/package.nix index 88eec9c8376d..9ae8b431e3d7 100644 --- a/pkgs/by-name/ne/netbird/package.nix +++ b/pkgs/by-name/ne/netbird/package.nix @@ -73,16 +73,16 @@ let in buildGoModule (finalAttrs: { pname = "netbird-${componentName}"; - version = "0.72.2"; + version = "0.72.3"; src = fetchFromGitHub { owner = "netbirdio"; repo = "netbird"; tag = "v${finalAttrs.version}"; - hash = "sha256-4j/yA8ehf/9E+3pzrMf7EmshUFXTJewdLESTIxZTYxU="; + hash = "sha256-osWOVV8nX5OC6YFO8lRO+q/IoEth1wZhrukkZZk3K+0="; }; - vendorHash = "sha256-gxSf2X7IsZecvfM2xGE5Y1jZgvaKaRG780MRkZKFkHg="; + vendorHash = "sha256-6FN7l+e75Pw2+v0sktomlck+7daro1i6c4ZV53SRePI="; nativeBuildInputs = [ installShellFiles ] ++ lib.optional (componentName == "ui") pkg-config; diff --git a/pkgs/by-name/ne/nethack/function-parameters.patch b/pkgs/by-name/ne/nethack/function-parameters.patch deleted file mode 100644 index 7060916d0392..000000000000 --- a/pkgs/by-name/ne/nethack/function-parameters.patch +++ /dev/null @@ -1,86 +0,0 @@ -diff --git a/include/system.h b/include/system.h -index a2cb51f..9f40fdd 100644 ---- a/include/system.h -+++ b/include/system.h -@@ -60,17 +60,17 @@ typedef long off_t; - #endif - #ifndef SIG_RET_TYPE - #if defined(NHSTDC) || defined(POSIX_TYPES) || defined(OS2) || defined(__DECC) --#define SIG_RET_TYPE void (*)() -+#define SIG_RET_TYPE void (*)(int) - #endif - #endif - #ifndef SIG_RET_TYPE - #if defined(ULTRIX) || defined(SUNOS4) || defined(SVR3) || defined(SVR4) - /* SVR3 is defined automatically by some systems */ --#define SIG_RET_TYPE void (*)() -+#define SIG_RET_TYPE void (*)(int) - #endif - #endif - #ifndef SIG_RET_TYPE /* BSD, SIII, SVR2 and earlier, Sun3.5 and earlier */ --#define SIG_RET_TYPE int (*)() -+#define SIG_RET_TYPE int (*)(int) - #endif - - #if !defined(__cplusplus) && !defined(__GO32__) -@@ -96,7 +96,7 @@ E long NDECL(lrand48); - E void FDECL(srand48, (long)); - #else - E long lrand48(); --E void srand48(); -+E void srand48(long); - #endif /* MACOSX */ - #endif /* BSD || ULTRIX || RANDOM */ - -@@ -352,10 +352,10 @@ E char *FDECL(memset, (char *, int, int)); - #endif /* MICRO */ - - #if defined(BSD) && defined(ultrix) /* i.e., old versions of Ultrix */ --E void sleep(); -+E void sleep(unsigned); - #endif - #if defined(ULTRIX) || defined(SYSV) --E unsigned sleep(); -+E unsigned sleep(unsigned); - #endif - #if defined(HPUX) - E unsigned int FDECL(sleep, (unsigned int)); -@@ -519,7 +519,7 @@ E char *FDECL(tgoto, (const char *, int, int)); - #else - #if !(defined(HPUX) && defined(_POSIX_SOURCE)) - E int FDECL(tgetent, (char *, const char *)); --E void FDECL(tputs, (const char *, int, int (*)())); -+E void FDECL(tputs, (const char *, int, int (*)(int))); - #endif - E int FDECL(tgetnum, (const char *)); - E int FDECL(tgetflag, (const char *)); -diff --git a/include/winX.h b/include/winX.h -index a1a5605..1d6b84b 100644 ---- a/include/winX.h -+++ b/include/winX.h -@@ -279,7 +279,7 @@ typedef struct { - } AppResources; - - E AppResources appResources; --E void (*input_func)(); -+E void (*input_func)(Widget, XEvent *, String *, Cardinal *); - - extern struct window_procs X11_procs; - -diff --git a/include/xwindow.h b/include/xwindow.h -index 8b9cfa0..8307c25 100644 ---- a/include/xwindow.h -+++ b/include/xwindow.h -@@ -76,8 +76,10 @@ - #define XtNexposeCallback "exposeCallback" - #define XtNresizeCallback "resizeCallback" - --extern XFontStruct *WindowFontStruct(/* Widget */); --extern Font WindowFont(/* Widget */); -+struct Widget; -+ -+extern XFontStruct *WindowFontStruct(Widget); -+extern Font WindowFont(Widget); - - #define XtCWindowResource "WindowResource" - #define XtCRows "Rows" diff --git a/pkgs/by-name/ne/nethack/package.nix b/pkgs/by-name/ne/nethack/package.nix index 6a03396657a6..37e5507a37d0 100644 --- a/pkgs/by-name/ne/nethack/package.nix +++ b/pkgs/by-name/ne/nethack/package.nix @@ -3,12 +3,11 @@ lib, fetchurl, coreutils, + groff, ncurses, gzip, - gccStdenv, - flex, - bison, less, + bash, buildPackages, x11Mode ? false, qtMode ? false, @@ -17,6 +16,9 @@ libxpm, bdftopcf, mkfontdir, + xset, + font-misc-misc, + font-adobe-75dpi, pkg-config, qt5, copyDesktopItems, @@ -24,23 +26,11 @@ }: let - stdenvUsed = if qtMode then gccStdenv else stdenv; - - platform = - if stdenvUsed.hostPlatform.isUnix then - "unix" - else - throw "Unknown platform for NetHack: ${stdenvUsed.hostPlatform.system}"; - unixHint = - if x11Mode then - "linux-x11" - else if qtMode then - "linux-qt4" - else if stdenvUsed.hostPlatform.isLinux then - "linux" - else if stdenvUsed.hostPlatform.isDarwin then - "macosx10.14" - # We probably want something different for Darwin + hint = + if stdenv.hostPlatform.isLinux then + "linux.500" + else if stdenv.hostPlatform.isDarwin then + "macos.500" else "unix"; userDir = "~/.config/nethack"; @@ -49,9 +39,19 @@ let less ]; + # The X11 interface loads core X bitmap fonts by XLFD: the "fixed" font for + # the map and menus (the iso10646-1 variant is used for ENHANCED_SYMBOLS) and + # adobe "times" for the tombstone. NixOS's X server doesn't have these on its + # font path by default, so we make the launcher add them at startup, the same + # way upstream's nethack.sh does for its own bundled font. + x11FontPath = lib.concatStringsSep "," [ + "${font-misc-misc}/share/fonts/X11/misc" + "${font-adobe-75dpi}/share/fonts/X11/75dpi" + ]; in -stdenvUsed.mkDerivation (finalAttrs: { - version = "3.6.7"; + +stdenv.mkDerivation (finalAttrs: { + version = "5.0.0"; pname = if x11Mode then "nethack-x11" @@ -64,13 +64,20 @@ stdenvUsed.mkDerivation (finalAttrs: { url = "https://nethack.org/download/${finalAttrs.version}/nethack-${ lib.replaceStrings [ "." ] [ "" ] finalAttrs.version }-src.tgz"; - hash = "sha256-mM9n323r+WaKYXRaqEwJvKs2Ll0z9blE7FFV1E0qrLI="; + sha256 = "sha256-KVm3iGqsdhhbkK6gyfgNFDQ/YE3grpaz3Sp2D3qzvek="; }; - patches = [ - # Newer GCC rejects function declarations without explicit parameters. - ./function-parameters.patch - ]; + postUnpack = + let + lua548 = fetchurl { + url = "https://www.lua.org/ftp/lua-5.4.8.tar.gz"; + hash = "sha256-TxjdrhVOeT5G7qtyfFnvHAwMK3ROe5QhlxDXb1MGKa4="; + }; + in + '' + mkdir -p NetHack-${finalAttrs.version}/lib + tar zxf ${lua548} -C NetHack-${finalAttrs.version}/lib + ''; buildInputs = [ ncurses @@ -87,16 +94,15 @@ stdenvUsed.mkDerivation (finalAttrs: { ]; nativeBuildInputs = [ - flex - bison copyDesktopItems + groff + pkg-config ] ++ lib.optionals x11Mode [ mkfontdir bdftopcf ] ++ lib.optionals qtMode [ - pkg-config mkfontdir qt5.qtbase.dev qt5.qtmultimedia.dev @@ -104,63 +110,85 @@ stdenvUsed.mkDerivation (finalAttrs: { bdftopcf ]; - makeFlags = [ "PREFIX=$(out)" ]; + makeFlags = [ + "PREFIX=$(out)" + "WANT_WIN_TTY=1" + "WANT_WIN_CURSES=1" + "WANT_DEFAULT=curses" + ] + ++ lib.optionals x11Mode [ + "WANT_WIN_X11=1" + "WANT_DEFAULT=X11" + ] + ++ lib.optionals qtMode [ + "WANT_WIN_QT=1" + "WANT_DEFAULT=Qt" + ]; postPatch = '' sed -e '/^ *cd /d' -i sys/unix/nethack.sh - sed \ - -e 's/^YACC *=.*/YACC = bison -y/' \ - -e 's/^LEX *=.*/LEX = flex/' \ - -i sys/unix/Makefile.utl - sed \ - -e 's,^WINQT4LIB =.*,WINQT4LIB = `pkg-config Qt5Gui --libs` \\\ - `pkg-config Qt5Widgets --libs` \\\ - `pkg-config Qt5Multimedia --libs`,' \ - -i sys/unix/Makefile.src + sed -e '/rm -f $(MAKEDEFS)/d' -i sys/unix/Makefile.src sed \ -e 's,^CFLAGS=-g,CFLAGS=,' \ -e 's,/bin/gzip,${gzip}/bin/gzip,g' \ -e 's,^WINTTYLIB=.*,WINTTYLIB=-lncurses,' \ - -i sys/unix/hints/linux + -e 's,NHCFLAGS+=-DCOMPRESS[^ ]*,NHCFLAGS+=-DCOMPRESS=\\"${gzip}/bin/gzip\\" \\\ + -DCOMPRESS_EXTENSION=\\".gz\\",' \ + -i sys/unix/hints/linux.500 + sed \ + -E 's/^(GDBPATH|GREPPATH)/#\1/' \ + -i sys/unix/sysconf sed \ - -e 's,^#WANT_WIN_CURSES=1$,WANT_WIN_CURSES=1,' \ - -e 's,^CC=.*$,CC=${stdenvUsed.cc.targetPrefix}cc,' \ -e 's,^HACKDIR=.*$,HACKDIR=\$(PREFIX)/games/lib/\$(GAME)dir,' \ -e 's,^SHELLDIR=.*$,SHELLDIR=\$(PREFIX)/games,' \ - -e 's,^CFLAGS=-g,CFLAGS=,' \ + -e 's,^CFLAGS+=-DCRASHREPORT,#CFLAGS+=-DCRASHREPORT,' \ + -e 's,^NHCFLAGS+=-DGREPPATH,#NHCFLAGS+=-DGREPPATH,' \ -e 's,/usr/bin/true,${coreutils}/bin/true,g' \ - -i sys/unix/hints/macosx10.14 - sed -e '/define CHDIR/d' -i include/config.h + -e 's,NHCFLAGS+=-DCOMPRESS[^ ]*,NHCFLAGS+=-DCOMPRESS=\\"${gzip}/bin/gzip\\" \\\ + -DCOMPRESS_EXTENSION=\\".gz\\",' \ + -i sys/unix/hints/macOS.500 + sed -e '/define CHDIR/d' \ + -i include/config.h + sed \ + -e 's,AR=.*,AR := $(AR) rcu,' \ + -e 's,RANLIB=.*,RANLIB := $(RANLIB),' \ + -i lib/lua-5.4.8/src/Makefile + sed \ + -e 's,AR =.*,AR := $(AR),' \ + -i sys/unix/Makefile.src ${lib.optionalString qtMode '' sed \ -e 's,^QTDIR *=.*,QTDIR=${qt5.qtbase.dev},' \ - -e 's,CFLAGS.*QtGui.*,CFLAGS += `pkg-config Qt5Gui --cflags`,' \ - -e 's,CFLAGS+=-DCOMPRESS.*,CFLAGS+=-DCOMPRESS=\\"${gzip}/bin/gzip\\" \\\ - -DCOMPRESS_EXTENSION=\\".gz\\",' \ - -e 's,moc-qt4,moc,' \ - -i sys/unix/hints/linux-qt4 + -e 's,PKG_CONFIG_PATH=$(QTDIR)/lib/pkgconfig,,' \ + -i sys/unix/hints/linux.500 + sed \ + -e 's,^endif # QTDIR,endif # QTDIR \ + QTDIR=${qt5.qtbase.dev},' \ + -e 's,PKG_CONFIG_PATH=$(QTDIR)/lib/pkgconfig,,' \ + -i sys/unix/hints/macOS.500 ''} - ${lib.optionalString (stdenvUsed.buildPlatform != stdenvUsed.hostPlatform) + ${lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) # If we're cross-compiling, replace the paths to the data generation tools # with the ones from the build platform's nethack package, since we can't # run the ones we've built here. '' - ${buildPackages.perl}/bin/perl -p \ - -e 's,[a-z./]+/(makedefs|dgn_comp|lev_comp|dlb)(?!\.),${buildPackages.nethack}/libexec/nethack/\1,g' \ + sed \ + -e 's, ../util/makedefs,,' \ + -e 's,\t../util/makedefs,\t${buildPackages.nethack}/libexec/nethack/makedefs,' \ + -e 's,\t../util/dlb,\t${buildPackages.nethack}/libexec/nethack/dlb,' \ + -e 's,../util/dlb cf nhdat,${buildPackages.nethack}/libexec/nethack/dlb cf nhdat,' \ + -e 's,pkg-config,$(PKG_CONFIG),' \ -i sys/unix/Makefile.* + sed \ + -e 's,pkg-config,$(PKG_CONFIG),' \ + -i sys/unix/hints/linux.500 '' } - sed -i -e '/rm -f $(MAKEDEFS)/d' sys/unix/Makefile.src - # Fix building on darwin where otherwise __has_attribute fails with an empty parameter - sed -e 's/define __warn_unused_result__ .*/define __warn_unused_result__ __unused__/' -i include/tradstdc.h - sed -e 's/define warn_unused_result .*/define warn_unused_result __unused__/' -i include/tradstdc.h ''; configurePhase = '' - pushd sys/${platform} - ${lib.optionalString (platform == "unix") '' - sh setup.sh hints/${unixHint} - ''} + pushd sys/unix + sh setup.sh hints/${hint} popd ''; @@ -179,7 +207,7 @@ stdenvUsed.mkDerivation (finalAttrs: { mkdir -p $out/bin cat <$out/bin/nethack - #! ${stdenvUsed.shell} -e + #! ${lib.getExe bash} -e PATH=${binPath}:\$PATH if [ ! -d ${userDir} ]; then @@ -191,10 +219,15 @@ stdenvUsed.mkDerivation (finalAttrs: { RUNDIR=\$(mktemp -d) cleanup() { - rm -rf \$RUNDIR + rm -rf \$RUNDIR${lib.optionalString x11Mode '' + + ${xset}/bin/xset -fp ${x11FontPath} >/dev/null 2>&1 || true''} } trap cleanup EXIT - + ${lib.optionalString x11Mode '' + ${xset}/bin/xset +fp ${x11FontPath} >/dev/null 2>&1 || true + ${xset}/bin/xset fp rehash >/dev/null 2>&1 || true + ''} cd \$RUNDIR for i in ${userDir}/*; do ln -s \$i \$(basename \$i) @@ -212,11 +245,13 @@ stdenvUsed.mkDerivation (finalAttrs: { chmod +x $out/bin/nethack ${lib.optionalString x11Mode "mv $out/bin/nethack $out/bin/nethack-x11"} ${lib.optionalString qtMode "mv $out/bin/nethack $out/bin/nethack-qt"} - install -Dm 555 util/{makedefs,dgn_comp,lev_comp} -t $out/libexec/nethack/ - ${lib.optionalString (!(x11Mode || qtMode)) "install -Dm 555 util/dlb -t $out/libexec/nethack/"} + ${lib.optionalString (!x11Mode && !qtMode && (stdenv.buildPlatform == stdenv.hostPlatform)) '' + install -Dm 555 util/makedefs -t $out/libexec/nethack/ + install -Dm 555 util/dlb -t $out/libexec/nethack/ + ''} ''; - desktopItems = [ + desktopItems = lib.optionals (x11Mode || qtMode) [ (makeDesktopItem { name = "NetHack"; exec = @@ -240,9 +275,14 @@ stdenvUsed.mkDerivation (finalAttrs: { description = "Rogue-like game"; homepage = "http://nethack.org/"; license = lib.licenses.ngpl; - platforms = if x11Mode then lib.platforms.linux else lib.platforms.unix; + platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ olduser101 ]; - mainProgram = "nethack"; - broken = if qtMode then stdenv.hostPlatform.isDarwin else false; + mainProgram = + if x11Mode then + "nethack-x11" + else if qtMode then + "nethack-qt" + else + "nethack"; }; }) diff --git a/pkgs/by-name/nz/nzbget/package.nix b/pkgs/by-name/nz/nzbget/package.nix index c90710075a86..c7f26a3e7ba7 100644 --- a/pkgs/by-name/nz/nzbget/package.nix +++ b/pkgs/by-name/nz/nzbget/package.nix @@ -22,23 +22,29 @@ let par2TurboSrc = fetchFromGitHub { owner = "nzbgetcom"; repo = "par2cmdline-turbo"; - rev = "v1.3.0-20250808"; # from cmake/par2-turbo.cmake - hash = "sha256-ZP8AI5htmEcxQQtvgShcQ8qNoRL+jBR1BdKS6yyuB/E="; + rev = "v1.4.0-20260323"; # from cmake/par2-turbo.cmake + hash = "sha256-oeQY7GJkaEmxEqJALpjAPFpfq+YsNWv4VajotE25xCI="; + }; + rapidyencSrc = fetchFromGitHub { + owner = "nzbgetcom"; + repo = "rapidyenc"; + rev = "v1.1.1-20260217"; # from cmake/rapidyenc.cmake + hash = "sha256-1K0LrB1AhacYS/54eCn+vQFAwP6IUVUrPCqFopojXDE="; }; in stdenv.mkDerivation (finalAttrs: { pname = "nzbget"; - version = "26.0"; + version = "26.1"; src = fetchFromGitHub { owner = "nzbgetcom"; repo = "nzbget"; rev = "v${finalAttrs.version}"; - hash = "sha256-IyaTe0bBQKnIuG3wq29KMZjKSiKu3Atd3GsNg8PGhRI="; + hash = "sha256-sZwUixSoqs0l2KOx6WnvLTCUGsSAO4QCTKqnhD58r70="; }; patches = [ - # remove git usage for fetching modified+vendored par2cmdline-turbo + # remove git usage for fetching modified+vendored par2cmdline-turbo and rapidyenc ./remove-git-usage.patch ]; @@ -60,13 +66,13 @@ stdenv.mkDerivation (finalAttrs: { zlib ]; - preConfigure = '' - mkdir -p build/par2-turbo/src - cp -r ${par2TurboSrc} build/par2-turbo/src/par2-turbo - chmod -R u+w build/par2-turbo/src/par2-turbo - ''; - postPatch = '' + substituteInPlace cmake/par2-turbo.cmake \ + --subst-var-by 'par2_turbo_src' '${par2TurboSrc}' \ + + substituteInPlace cmake/rapidyenc.cmake \ + --subst-var-by 'rapidyenc_src' '${rapidyencSrc}' + substituteInPlace daemon/util/Util.cpp \ --replace-fail "std::string(\"uname \")" "std::string(\"${lib.getExe deterministic-uname} \")" ''; diff --git a/pkgs/by-name/nz/nzbget/remove-git-usage.patch b/pkgs/by-name/nz/nzbget/remove-git-usage.patch index 226b52cb9fe7..481ea076f230 100644 --- a/pkgs/by-name/nz/nzbget/remove-git-usage.patch +++ b/pkgs/by-name/nz/nzbget/remove-git-usage.patch @@ -1,42 +1,47 @@ -From 15dc4c64531845b64b574647fc7218170b100533 Mon Sep 17 00:00:00 2001 +From f0fc5eb48ff3a0e6f350bf1db6388a458a653cf7 Mon Sep 17 00:00:00 2001 From: Morgan Helton -Date: Tue, 25 Feb 2025 20:36:19 -0600 -Subject: [PATCH] feat: use pre-fetched par2-turbo +Date: Sat, 30 May 2026 06:59:25 -0500 +Subject: [PATCH] chore: use placeholders for par2-turbo and rapidyenc --- - cmake/par2-turbo.cmake | 19 +++++++------------ - 1 file changed, 7 insertions(+), 12 deletions(-) + cmake/par2-turbo.cmake | 6 +----- + cmake/rapidyenc.cmake | 6 +----- + 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/cmake/par2-turbo.cmake b/cmake/par2-turbo.cmake -index 0062b4d3..c0dd56ea 100644 +index 16a80ffa..992bfe79 100644 --- a/cmake/par2-turbo.cmake +++ b/cmake/par2-turbo.cmake -@@ -48,18 +48,13 @@ if(CMAKE_SYSROOT) - ) - endif() - --ExternalProject_add( -- par2-turbo -- PREFIX par2-turbo +@@ -56,11 +56,7 @@ endif() + ExternalProject_add( + par2-turbo + PREFIX par2-turbo - GIT_REPOSITORY https://github.com/nzbgetcom/par2cmdline-turbo.git -- GIT_TAG v1.3.0-20250808 +- GIT_TAG v1.4.0-20260323 - TLS_VERIFY TRUE - GIT_SHALLOW TRUE - GIT_PROGRESS TRUE -- DOWNLOAD_EXTRACT_TIMESTAMP TRUE -- BUILD_BYPRODUCTS ${PAR2_LIBS} -- CMAKE_ARGS ${CMAKE_ARGS} -- INSTALL_COMMAND "" -+ExternalProject_Add( -+ par2-turbo -+ PREFIX par2-turbo -+ SOURCE_DIR ${CMAKE_BINARY_DIR}/par2-turbo/src/par2-turbo -+ BUILD_BYPRODUCTS ${PAR2_LIBS} -+ CMAKE_ARGS ${CMAKE_ARGS} -+ INSTALL_COMMAND "" - ) - - set(LIBS ${LIBS} ${PAR2_LIBS}) ++ URL @par2_turbo_src@ + DOWNLOAD_EXTRACT_TIMESTAMP TRUE + BUILD_BYPRODUCTS ${PAR2_LIBS} + CMAKE_ARGS ${CMAKE_ARGS} +diff --git a/cmake/rapidyenc.cmake b/cmake/rapidyenc.cmake +index 9242efe4..0e8d7527 100644 +--- a/cmake/rapidyenc.cmake ++++ b/cmake/rapidyenc.cmake +@@ -51,11 +51,7 @@ endif() + ExternalProject_add( + rapidyenc + PREFIX rapidyenc +- GIT_REPOSITORY https://github.com/nzbgetcom/rapidyenc.git +- GIT_TAG v1.1.1-20260217 +- TLS_VERIFY TRUE +- GIT_SHALLOW TRUE +- GIT_PROGRESS TRUE ++ URL @rapidyenc_src@ + DOWNLOAD_EXTRACT_TIMESTAMP TRUE + BUILD_BYPRODUCTS ${RAPIDYENC_LIBS} + CMAKE_ARGS ${CMAKE_ARGS} -- -2.50.1 +2.54.0 diff --git a/pkgs/applications/misc/parsec/bin.nix b/pkgs/by-name/pa/parsec-bin/package.nix similarity index 97% rename from pkgs/applications/misc/parsec/bin.nix rename to pkgs/by-name/pa/parsec-bin/package.nix index c483c5bb6488..05663920b9a2 100644 --- a/pkgs/applications/misc/parsec/bin.nix +++ b/pkgs/by-name/pa/parsec-bin/package.nix @@ -31,7 +31,7 @@ stdenvNoCC.mkDerivation { src = fetchurl { url = "https://web.archive.org/web/20250226223019/https://builds.parsec.app/package/parsec-linux.deb"; - sha256 = "sha256-8Wkbo6l1NGBPX2QMJszq+u9nLM96tu7WYRTQq6/CzM8="; + hash = "sha256-8Wkbo6l1NGBPX2QMJszq+u9nLM96tu7WYRTQq6/CzM8="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/qu/qui/package.nix b/pkgs/by-name/qu/qui/package.nix index 6454cfbff46a..4d24190dc46a 100644 --- a/pkgs/by-name/qu/qui/package.nix +++ b/pkgs/by-name/qu/qui/package.nix @@ -14,12 +14,12 @@ }: buildGo126Module (finalAttrs: { pname = "qui"; - version = "1.19.0"; + version = "1.20.0"; src = fetchFromGitHub { owner = "autobrr"; repo = "qui"; tag = "v${finalAttrs.version}"; - hash = "sha256-h6GmxwOxqh88Zy7tFD/GFQ8NrpBcanFPBXGUmfoIe3I="; + hash = "sha256-h1OIz+4oVuHg7bKWSKgkEwouX1oJKJmOC1VI+nrPwmI="; }; qui-web = stdenvNoCC.mkDerivation (finalAttrs': { @@ -44,7 +44,7 @@ buildGo126Module (finalAttrs: { ; pnpm = pnpm_11; fetcherVersion = 4; - hash = "sha256-vTVZItC5SUocdw+fHbbGM/v+CHKaB45dc2mUh4Jy8K8="; + hash = "sha256-nSlW06//r/olVgSBgHc8LGWWfNXewAF5cZXfoZemC+w="; }; postBuild = '' @@ -56,7 +56,7 @@ buildGo126Module (finalAttrs: { ''; }); - vendorHash = "sha256-pkktl+0dBSbUuxZ1ycTV0HZl/wO79LtmNaamyZ+Z9lY="; + vendorHash = "sha256-4HQOoBDjV3Pt4O/KMu8c3aeUB5evceIdlAnsixO1Pjs="; preBuild = '' cp -r ${finalAttrs.qui-web}/* web/dist diff --git a/pkgs/by-name/re/readest/package.nix b/pkgs/by-name/re/readest/package.nix index 6c5ce29cd413..a0b70812e9c5 100644 --- a/pkgs/by-name/re/readest/package.nix +++ b/pkgs/by-name/re/readest/package.nix @@ -119,7 +119,7 @@ rustPlatform.buildRustPackage (finalAttrs: { src = "${finalAttrs.src}/apps/readest-app/src-tauri/plugins/tauri-plugin-turso"; pnpm = pnpm_11; fetcherVersion = 3; - hash = "sha256-NEnZYXN83zYkkIJ5ZjzPqaaee+GE5jYGNGcaxzY9ae8="; + hash = "sha256-RIoTkX0ivaM9EJt3fsLpZhHd2lE4ZtDnAi9syONXUus="; }; passthru.tursoPlugin = stdenv.mkDerivation { diff --git a/pkgs/applications/editors/rednotebook/default.nix b/pkgs/by-name/re/rednotebook/package.nix similarity index 100% rename from pkgs/applications/editors/rednotebook/default.nix rename to pkgs/by-name/re/rednotebook/package.nix diff --git a/pkgs/by-name/rt/rtk/package.nix b/pkgs/by-name/rt/rtk/package.nix index 744e5710707a..bfa37c96186a 100644 --- a/pkgs/by-name/rt/rtk/package.nix +++ b/pkgs/by-name/rt/rtk/package.nix @@ -12,17 +12,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "rtk"; - version = "0.42.0"; + version = "0.42.3"; __structuredAttrs = true; src = fetchFromGitHub { owner = "rtk-ai"; repo = "rtk"; tag = "v${finalAttrs.version}"; - hash = "sha256-ZCDVS/AFljljMac+cAzQztYPQgvQrcEhKIHHRhkMsv8="; + hash = "sha256-UWiu6y3Ci5F5OYQZIB0QuFmgv+tRUTouD9RZfX+PcsA="; }; - cargoHash = "sha256-CFhKBzJc2/+gZDfHq7wxBWEbtHV8EF3OYa+t1b9aL8k="; + cargoHash = "sha256-ryOxbRwtkmeVnV/oF33eAZu/WileUd18ucgdsOvb5QU="; nativeBuildInputs = [ makeWrapper diff --git a/pkgs/applications/misc/stag/default.nix b/pkgs/by-name/st/stag/package.nix similarity index 97% rename from pkgs/applications/misc/stag/default.nix rename to pkgs/by-name/st/stag/package.nix index f5507ba47824..51f6f6a05ba1 100644 --- a/pkgs/applications/misc/stag/default.nix +++ b/pkgs/by-name/st/stag/package.nix @@ -2,7 +2,7 @@ lib, stdenv, fetchFromGitHub, - curses, + ncurses, fetchpatch, }: @@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: { ' -Werror ' ' ' ''; - buildInputs = [ curses ]; + buildInputs = [ ncurses ]; installPhase = '' make install PREFIX=$out diff --git a/pkgs/by-name/st/steelix/package.nix b/pkgs/by-name/st/steelix/package.nix index 872fa14bf980..25dbb27ffcca 100644 --- a/pkgs/by-name/st/steelix/package.nix +++ b/pkgs/by-name/st/steelix/package.nix @@ -1,80 +1,80 @@ { + rustPlatform, fetchFromGitHub, fetchpatch, - helix, - installShellFiles, lib, - rustPlatform, - makeBinaryWrapper, + helix, + helix-unwrapped, }: +let + steelix-unwrapped = helix-unwrapped.overrideAttrs ( + finalAttrs: _: { + pname = "steelix-unwrapped"; + version = "0-unstable-2026-05-21"; -rustPlatform.buildRustPackage (finalAttrs: { - pname = "steelix"; - version = "0-unstable-2026-05-21"; + src = fetchFromGitHub { + owner = "mattwparas"; + repo = "helix"; + rev = "4d86612df48447088ef4190bf503fd54a7562aa9"; + hash = "sha256-qAUODNxHM9K6CrRCFgfBcbqzRd+YHiWn9fEfmIzrohA="; + }; - src = fetchFromGitHub { - owner = "mattwparas"; - repo = "helix"; - rev = "4d86612df48447088ef4190bf503fd54a7562aa9"; - hash = "sha256-qAUODNxHM9K6CrRCFgfBcbqzRd+YHiWn9fEfmIzrohA="; - }; + cargoDeps = rustPlatform.fetchCargoVendor { + inherit (finalAttrs) src pname version; + hash = "sha256-6bu8sIM4So3AbnHHYbh8uu+rEB4IjMQjDgh7/AkLQs0="; + }; - # This fork is built from Helix master, whose loader expects tree-sitter - # grammars with the platform-native extension (`.dylib` on Darwin) since - # helix-editor/helix#14982. We reuse the grammars from `helix.runtime`, built - # from the last Helix *release*, which still names them `.so` on Darwin, so - # revert that commit to make the loader look for `.so`. Remove once a Helix - # release ships #14982 and nixpkgs' grammars switch to `.dylib`. - patches = [ - (fetchpatch { - name = "revert-dylib-grammar-extension.patch"; - url = "https://github.com/helix-editor/helix/commit/430914b298a32653ab1847fdfdf2177a002be04c.patch"; - revert = true; - hash = "sha256-4KUFppkso4/XwNU+mGIgLvl+mJXHZWkmaguYMy8oTyI="; - }) - ]; + cargoBuildFlags = [ + "--package" + "helix-term" + "--features" + "steel,git" + ]; - cargoHash = "sha256-6bu8sIM4So3AbnHHYbh8uu+rEB4IjMQjDgh7/AkLQs0="; + # This fork is built from Helix master, whose loader expects tree-sitter + # grammars with the platform-native extension (`.dylib` on Darwin) since + # helix-editor/helix#14982. We reuse the grammars from `helix.runtime`, built + # from the last Helix *release*, which still names them `.so` on Darwin, so + # revert that commit to make the loader look for `.so`. Remove once a Helix + # release ships #14982 and nixpkgs' grammars switch to `.dylib`. + patches = [ + (fetchpatch { + name = "revert-dylib-grammar-extension.patch"; + url = "https://github.com/helix-editor/helix/commit/430914b298a32653ab1847fdfdf2177a002be04c.patch"; + revert = true; + hash = "sha256-4KUFppkso4/XwNU+mGIgLvl+mJXHZWkmaguYMy8oTyI="; + }) + ]; - nativeBuildInputs = [ - installShellFiles - makeBinaryWrapper - ]; + doInstallCheck = false; + } + ); +in +(helix.override { + helix-unwrapped = steelix-unwrapped; +}).overrideAttrs + ( + _: previousAttrs: { + pname = "steelix"; + strictDeps = true; - cargoBuildFlags = [ - "--package" - "helix-term" - "--features" - "steel,git" - ]; + meta = previousAttrs.meta // { + description = "Helix editor with Steel (Scheme) scripting support"; + longDescription = '' + Steelix is a fork of the Helix editor with Steel (Scheme) scripting support. + ''; + homepage = "https://github.com/mattwparas/helix"; + changelog = "https://github.com/mattwparas/helix/blob/${steelix-unwrapped.src.rev}/CHANGELOG.md"; + license = lib.licenses.mpl20; + mainProgram = "hx"; + maintainers = with lib.maintainers; [ + aciceri + Ra77a3l3-jar + ]; + }; - env = { - HELIX_DISABLE_AUTO_GRAMMAR_BUILD = "1"; - HELIX_DEFAULT_RUNTIME = helix.runtime; - }; - - postInstall = '' - installShellCompletion contrib/completion/hx.{bash,fish,zsh} - mkdir -p $out/share/{applications,icons/hicolor/256x256/apps} - cp contrib/Helix.desktop $out/share/applications - cp contrib/helix.png $out/share/icons/hicolor/256x256/apps - wrapProgram $out/bin/hx --set HELIX_RUNTIME "${helix.runtime}" - ''; - - passthru.updateScript = ./update.sh; - - meta = { - description = "Helix editor with Steel (Scheme) scripting support"; - longDescription = '' - Steelix is a fork of the Helix editor with Steel (Scheme) scripting support. - ''; - homepage = "https://github.com/mattwparas/helix"; - changelog = "https://github.com/mattwparas/helix/blob/${finalAttrs.src.rev}/CHANGELOG.md"; - license = lib.licenses.mpl20; - mainProgram = "hx"; - maintainers = with lib.maintainers; [ - aciceri - Ra77a3l3-jar - ]; - }; -}) + passthru = previousAttrs.passthru // { + updateScript = ./update.sh; + }; + } + ) diff --git a/pkgs/by-name/st/stripe-cli/package.nix b/pkgs/by-name/st/stripe-cli/package.nix index 511b79a82398..61ad7784ab52 100644 --- a/pkgs/by-name/st/stripe-cli/package.nix +++ b/pkgs/by-name/st/stripe-cli/package.nix @@ -12,7 +12,7 @@ buildGoModule (finalAttrs: { pname = "stripe-cli"; - version = "1.37.2"; + version = "1.41.2"; # required for tests __darwinAllowLocalNetworking = true; @@ -21,9 +21,9 @@ buildGoModule (finalAttrs: { owner = "stripe"; repo = "stripe-cli"; tag = "v${finalAttrs.version}"; - hash = "sha256-Hsp90qmwy8D6SpDrgElB0Om6lumtkFjp2e///GEwkuE="; + hash = "sha256-2SjfaJTHj++o1hTs1UdzlPHrOq51HQmPLbQQ6yvl9ik="; }; - vendorHash = "sha256-EDdRgApJ7gv/4ma/IfaHi+jjpTPegsUfqHbvoFMn048="; + vendorHash = "sha256-nyzBNR4D50vNbyzVwoRsiGqsu7ehv20PKTvMG/QM6f4="; nativeBuildInputs = [ installShellFiles ]; @@ -64,10 +64,14 @@ buildGoModule (finalAttrs: { # network access "TestConflictWithPluginCommand" "TestLogin" + "TestRefreshPluginManifestSucceedsIfNoAPIKey" # not providing git or the various editors it wants to call "TestGetOpenEditorCommand" "TestGetDefaultGitEditor" + + # broken for aarch64 + "TestGetReleaseForVersion" ]; in [ "-skip=^${lib.concatStringsSep "$|^" skippedTests}$" ]; diff --git a/pkgs/applications/version-management/svn2git/default.nix b/pkgs/by-name/sv/svn2git/package.nix similarity index 81% rename from pkgs/applications/version-management/svn2git/default.nix rename to pkgs/by-name/sv/svn2git/package.nix index c839b01239c0..e5aadb8e949a 100644 --- a/pkgs/applications/version-management/svn2git/default.nix +++ b/pkgs/by-name/sv/svn2git/package.nix @@ -4,18 +4,18 @@ fetchFromGitHub, ruby, makeWrapper, - git, + gitSVN, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "svn2git"; version = "2.4.0"; src = fetchFromGitHub { owner = "nirvdrum"; repo = "svn2git"; - rev = "v${version}"; - sha256 = "sha256-w649l/WO68vYYxZOBKzI8XhGFkaSwWx/O3oVOtnGg6w="; + tag = "v${finalAttrs.version}"; + hash = "sha256-w649l/WO68vYYxZOBKzI8XhGFkaSwWx/O3oVOtnGg6w="; }; nativeBuildInputs = [ @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/svn2git \ --set RUBYLIB $out/lib \ - --prefix PATH : ${git}/bin + --prefix PATH : ${gitSVN}/bin ''; meta = { @@ -46,4 +46,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; mainProgram = "svn2git"; }; -} +}) diff --git a/pkgs/by-name/te/temporal-cli/package.nix b/pkgs/by-name/te/temporal-cli/package.nix index 5e5ce315161a..506dcb427281 100644 --- a/pkgs/by-name/te/temporal-cli/package.nix +++ b/pkgs/by-name/te/temporal-cli/package.nix @@ -10,16 +10,16 @@ buildGoModule (finalAttrs: { pname = "temporal-cli"; - version = "1.7.0"; + version = "1.7.1"; src = fetchFromGitHub { owner = "temporalio"; repo = "cli"; tag = "v${finalAttrs.version}"; - hash = "sha256-P/wfvKRAvqRgUJabVE9RvT4o3fNZ52JX48hXm3C3orI="; + hash = "sha256-8e6sBlUC+N4P7FO4EOtc7sDzSAZwDovN+cGpV+rWObs="; }; - vendorHash = "sha256-dD21m6tlwkZkclYOcYUNlsPXxYmLggjrFTv9XctCIt0="; + vendorHash = "sha256-N9K05Kcb0YaQO7M9gR22QzAOzbmgEhIqADcAESqYtQ8="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/te/teos-watchtower-plugin/package.nix b/pkgs/by-name/te/teos-watchtower-plugin/package.nix new file mode 100644 index 000000000000..3da03f5357b4 --- /dev/null +++ b/pkgs/by-name/te/teos-watchtower-plugin/package.nix @@ -0,0 +1,35 @@ +{ + lib, + rustPlatform, + teos, + pkg-config, + protobuf, + rustfmt, + openssl, +}: + +rustPlatform.buildRustPackage { + pname = "teos-watchtower-plugin"; + inherit (teos) version src; + + cargoHash = "sha256-lod5I94T4wGwXEDtvh2AyaDYM0byCfaSBP8emKV7+3M="; + + buildAndTestSubdir = "watchtower-plugin"; + + nativeBuildInputs = [ + pkg-config + protobuf + rustfmt + ]; + + buildInputs = [ + openssl + ]; + + __darwinAllowLocalNetworking = true; + + meta = teos.meta // { + description = "Lightning watchtower plugin for clightning"; + mainProgram = "watchtower-client"; + }; +} diff --git a/pkgs/by-name/te/teos/package.nix b/pkgs/by-name/te/teos/package.nix new file mode 100644 index 000000000000..707d9adc2949 --- /dev/null +++ b/pkgs/by-name/te/teos/package.nix @@ -0,0 +1,41 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + protobuf, + rustfmt, + pkg-config, + openssl, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "teos"; + version = "0.2.0"; + + src = fetchFromGitHub { + owner = "talaia-labs"; + repo = "rust-teos"; + tag = "v${finalAttrs.version}"; + hash = "sha256-UrzH9xmhVq12TcSUQ1AihCG1sNGcy/N8LDsZINVKFkY="; + }; + + cargoHash = "sha256-lod5I94T4wGwXEDtvh2AyaDYM0byCfaSBP8emKV7+3M="; + + buildAndTestSubdir = "teos"; + + nativeBuildInputs = [ + protobuf + rustfmt + ]; + + passthru.updateScript = ./update.sh; + + __darwinAllowLocalNetworking = true; + + meta = { + homepage = "https://github.com/talaia-labs/rust-teos"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ seberm ]; + description = "Lightning watchtower compliant with BOLT13, written in Rust"; + }; +}) diff --git a/pkgs/applications/blockchains/teos/update.sh b/pkgs/by-name/te/teos/update.sh similarity index 100% rename from pkgs/applications/blockchains/teos/update.sh rename to pkgs/by-name/te/teos/update.sh diff --git a/pkgs/by-name/te/tetrio-desktop/package.nix b/pkgs/by-name/te/tetrio-desktop/package.nix index a7ba025f0029..2e29cae9eeb1 100644 --- a/pkgs/by-name/te/tetrio-desktop/package.nix +++ b/pkgs/by-name/te/tetrio-desktop/package.nix @@ -75,7 +75,8 @@ stdenv.mkDerivation { cp ${asarPath} $out/share/TETR.IO/app.asar substituteInPlace $out/share/applications/TETR.IO.desktop \ - --replace-fail "Exec=/opt/TETR.IO/TETR.IO" "Exec=$out/bin/tetrio" + --replace-fail "Exec=/opt/TETR.IO/TETR.IO" "Exec=$out/bin/tetrio" \ + --replace-fail "StartupWMClass=TETR.IO" "StartupWMClass=tetrio-desktop" runHook postInstall ''; diff --git a/pkgs/by-name/te/texstudio/package.nix b/pkgs/by-name/te/texstudio/package.nix index ba6734313c7e..42a19d66e050 100644 --- a/pkgs/by-name/te/texstudio/package.nix +++ b/pkgs/by-name/te/texstudio/package.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "texstudio"; - version = "4.9.3"; + version = "4.9.5"; src = fetchFromGitHub { owner = "texstudio-org"; repo = "texstudio"; rev = finalAttrs.version; - hash = "sha256-NTabdGaB87otc1zzKQLWXx4/nU5rXeTIw2O9nWXUMi0="; + hash = "sha256-//UhDSyCFIy/xhOKrTVoZFA0nh6q9xShAI5GxJrNz4w="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/to/topgrade/package.nix b/pkgs/by-name/to/topgrade/package.nix index a2df50a7f08c..df647c886ed5 100644 --- a/pkgs/by-name/to/topgrade/package.nix +++ b/pkgs/by-name/to/topgrade/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "topgrade"; - version = "17.5.1"; + version = "17.6.1"; src = fetchFromGitHub { owner = "topgrade-rs"; repo = "topgrade"; tag = "v${finalAttrs.version}"; - hash = "sha256-VNh490nYPPsyWX8DUujTUUMY0hMDisjdBIw1LcCHNGc="; + hash = "sha256-JXLLPglpf8X6PlbT55jgQa/XZbbAJlB/HhSxGiS1w0I="; }; - cargoHash = "sha256-eAmfYjbKU9zyIh2lsZ/+bmhqON85tYjT2YJ5iHoVyRs="; + cargoHash = "sha256-FRBxo5x0imxh3F0ZBsScdQTirfaGcQ+y5RSy7DmDSmk="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/tu/turso-cli/package.nix b/pkgs/by-name/tu/turso-cli/package.nix index e3a6bba5e2a7..16a1d26dc79a 100644 --- a/pkgs/by-name/tu/turso-cli/package.nix +++ b/pkgs/by-name/tu/turso-cli/package.nix @@ -8,13 +8,13 @@ }: buildGoModule (finalAttrs: { pname = "turso-cli"; - version = "1.0.26"; + version = "1.0.27"; src = fetchFromGitHub { owner = "tursodatabase"; repo = "turso-cli"; rev = "v${finalAttrs.version}"; - hash = "sha256-M7bYt5eH+beUMQYh/dFhEALot6MRdfc2vH0b9iEvhqc="; + hash = "sha256-WTelkOo3b9y4ZpDscSsVITqzTVLGCGH9H1PkvkgFLY0="; }; vendorHash = "sha256-4OIJVL3N2mWOw7ZDP4xFCxa9zmUTPCA8N79TVoi1lys="; diff --git a/pkgs/by-name/vi/vivaldi/package.nix b/pkgs/by-name/vi/vivaldi/package.nix index 55569e4fd6af..c6f5afcebf4f 100644 --- a/pkgs/by-name/vi/vivaldi/package.nix +++ b/pkgs/by-name/vi/vivaldi/package.nix @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { pname = "vivaldi"; - version = "8.0.4033.42"; + version = "8.0.4033.46"; suffix = { @@ -80,8 +80,8 @@ stdenv.mkDerivation rec { url = "https://downloads.vivaldi.com/stable/vivaldi-stable_${version}-1_${suffix}.deb"; hash = { - aarch64-linux = "sha256-qHIUVfD+rVIrBse5xsmJwVjCAszieAJzuHAC/oKzCHA="; - x86_64-linux = "sha256-abaU3PiUQNhpliCnmih96pkU6CgW/S1GgxFKFo8PBmo="; + aarch64-linux = "sha256-Eq6dH65FY8u0OyeoqiCjx+c37Vt//CTVm245OMzxbdk="; + x86_64-linux = "sha256-1rvqwRIRHbGo5vYCIeDFYdOQVMW8K2mshoju75H46qE="; } .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); }; diff --git a/pkgs/by-name/ya/yazi-unwrapped/package.nix b/pkgs/by-name/ya/yazi-unwrapped/package.nix index 0073eb002a96..a2b0a1ce6747 100644 --- a/pkgs/by-name/ya/yazi-unwrapped/package.nix +++ b/pkgs/by-name/ya/yazi-unwrapped/package.nix @@ -30,6 +30,12 @@ rustPlatform.buildRustPackage (finalAttrs: { --fish ./yazi-boot/completions/yazi.fish \ --zsh ./yazi-boot/completions/_yazi + installShellCompletion --cmd ya \ + --nushell ./yazi-cli/completions/ya.nu \ + --bash ./yazi-cli/completions/ya.bash \ + --fish ./yazi-cli/completions/ya.fish \ + --zsh ./yazi-cli/completions/_ya + installManPage ../${finalAttrs.passthru.srcs.man_src.name}/yazi{.1,-config.5} install -Dm444 assets/yazi.desktop -t $out/share/applications diff --git a/pkgs/development/beam-modules/hooks/beam-module-install-hook.sh b/pkgs/development/beam-modules/hooks/beam-module-install-hook.sh index ba66032751bc..273a8e622642 100644 --- a/pkgs/development/beam-modules/hooks/beam-module-install-hook.sh +++ b/pkgs/development/beam-modules/hooks/beam-module-install-hook.sh @@ -7,6 +7,8 @@ beamModuleInstallHook() { echo "Executing beamModuleInstallHook" + runHook preInstall + mkdir -p "$out/lib/erlang/lib/${beamModuleName}-${version}" # default to rebar3 @@ -25,6 +27,8 @@ beamModuleInstallHook() { fi done + runHook postInstall + echo "Finished beamModuleInstallHook" } diff --git a/pkgs/development/compilers/dart/default.nix b/pkgs/development/compilers/dart/default.nix index e1d691cbd77e..5f8c5a1be82d 100644 --- a/pkgs/development/compilers/dart/default.nix +++ b/pkgs/development/compilers/dart/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "dart"; - version = "3.12.1"; + version = "3.12.2"; src = let @@ -25,10 +25,10 @@ stdenv.mkDerivation (finalAttrs: { aarch64-darwin = "macos-arm64"; }; hash = selectSystem { - x86_64-linux = "sha256-aiu/ZKEzychqYqUy29PgtNtKw2Wr1Fbp+dHF32H82/g="; - aarch64-linux = "sha256-tECHkwEI9tf1a/WAoC1dKpf/lFGcWiiDOZgiAuG0xIE="; - x86_64-darwin = "sha256-xWsyLNvBXg18NzlwwuK+U7+0OEWL1nwYKHA+dErLeRY="; - aarch64-darwin = "sha256-6v84I9Wgxc3LZbOK3yBOXzUpD81WDUjLR8L6x+FUe5c="; + x86_64-linux = "sha256-KOR7RM8HXzZ3EEbAaLsNF0IBz5x2CHRK7RzCMgQpnC0="; + aarch64-linux = "sha256-+CyD7OfRaAR1UN/UpmTkBxrHxIi923LcQxAsItfgtRg="; + x86_64-darwin = "sha256-OBmfVv4i8iNednmRkdW5UW42A2nGG2ukQROY1dWSC6s="; + aarch64-darwin = "sha256-zYdTko53trZlvXDc4OZLTsbS4v3hQdZAm7cWyKwfHAo="; }; in fetchurl { diff --git a/pkgs/development/compilers/mrustc/bootstrap.nix b/pkgs/development/compilers/mrustc/bootstrap.nix index 3b6d676e5c7f..8105b0e11db1 100644 --- a/pkgs/development/compilers/mrustc/bootstrap.nix +++ b/pkgs/development/compilers/mrustc/bootstrap.nix @@ -4,7 +4,7 @@ fetchurl, mrustc, mrustc-minicargo, - #llvm_12, + llvm_20, libffi, cmake, perl, @@ -18,11 +18,11 @@ }: let - mrustcTargetVersion = "1.54"; - rustcVersion = "1.54.0"; + mrustcTargetVersion = "1.90"; + rustcVersion = "1.90.0"; rustcSrc = fetchurl { url = "https://static.rust-lang.org/dist/rustc-${rustcVersion}-src.tar.gz"; - sha256 = "0xk9dhfff16caambmwij67zgshd8v9djw6ha0fnnanlv7rii31dc"; + hash = "sha256-eZqfnLpO1TUeBxBIvPa1VgdV2QCWSN7zOkB91JYfm34="; }; rustcDir = "rustc-${rustcVersion}-src"; outputDir = "output-${rustcVersion}"; @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ # for rustc - #llvm_12 + llvm_20 libffi zlib libxml2 @@ -76,7 +76,7 @@ stdenv.mkDerivation rec { # Use shared mrustc/minicargo/llvm instead of rebuilding them "MRUSTC=${mrustc}/bin/mrustc" #"MINICARGO=${mrustc-minicargo}/bin/minicargo" # FIXME: we need to rebuild minicargo locally so --manifest-overrides is applied - #"LLVM_CONFIG=${llvm_12.dev}/bin/llvm-config" + "LLVM_CONFIG=${llvm_20.dev}/bin/llvm-config" "RUSTC_TARGET=${stdenv.targetPlatform.rust.rustcTarget}" ]; @@ -153,24 +153,5 @@ stdenv.mkDerivation rec { asl20 ]; platforms = [ "x86_64-linux" ]; - # rustc 1.54 only supports LLVM 12, which was removed from Nixpkgs. - # mrustc can bootstrap up to rustc 1.74, which supported LLVM 17, - # which has also been removed. - # - # 1.74 also shipped with the Cranelift backend, so perhaps that - # could be used instead? Alternatively, it may be possible to - # backport the upstream patches to support LLVM 18 to 1.74. - # Assuming LLVM 18 is still in Nixpkgs by the time you read this - # comment, anyway. But if not, then maybe mrustc has been updated - # to support newer rustc versions? Hope springs eternal. - # - # (Note that you still have to “draw the rest of the owl” to - # bootstrap the chain of rustc versions between this bootstrap - # and the version currently used in Nixpkgs, anyway, so this was - # already not useful for bootstrapping a Rust compiler for use with - # Nixpkgs without a lot of additional work. See Guix’s Rust - # bootstrap chain, or the non‐Rust minimal bootstrap in Guix and - # Nixpkgs, for inspiration.) - broken = true; }; } diff --git a/pkgs/development/python-modules/asyncstdlib-fw/default.nix b/pkgs/development/python-modules/asyncstdlib-fw/default.nix deleted file mode 100644 index 2ffad097191a..000000000000 --- a/pkgs/development/python-modules/asyncstdlib-fw/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchPypi, - - # build-system - pdm-backend, -}: - -buildPythonPackage rec { - pname = "asyncstdlib-fw"; - version = "3.13.2"; - pyproject = true; - - # Not available from any repo - src = fetchPypi { - pname = "asyncstdlib_fw"; - inherit version; - hash = "sha256-Ua0JTCBMWTbDBA84wy/W1UmzkcmA8h8foJW2X7aAah8="; - }; - - build-system = [ - pdm-backend - ]; - - doCheck = false; # no tests supplied - - pythonImportsCheck = [ - "asyncstdlib" - ]; - - meta = { - description = "Fork of asyncstdlib that work with fireworks-ai"; - homepage = "https://pypi.org/project/asyncstdlib-fw/"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ sarahec ]; - }; -} diff --git a/pkgs/development/python-modules/betterproto-fw/default.nix b/pkgs/development/python-modules/betterproto-fw/default.nix deleted file mode 100644 index 979710d92747..000000000000 --- a/pkgs/development/python-modules/betterproto-fw/default.nix +++ /dev/null @@ -1,64 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchPypi, - - # build-system - pdm-backend, - - # dependencies - grpclib, - python-dateutil, - typing-extensions, - - # optional dependencies - jinja2, - ruff, - betterproto-rust-codec, -}: - -buildPythonPackage rec { - pname = "betterproto-fw"; - version = "2.0.3"; - pyproject = true; - - # Not available on Github - src = fetchPypi { - pname = "betterproto_fw"; - inherit version; - hash = "sha256-ut5GchUiTygHhC2hj+gSWKCoVnZrrV8KIKFHTFzba5M="; - }; - - build-system = [ - pdm-backend - ]; - - dependencies = [ - grpclib - python-dateutil - typing-extensions - ]; - - optional-dependencies = { - compiler = [ - jinja2 - ruff - ]; - rust-codec = [ - betterproto-rust-codec - ]; - }; - - doCheck = false; # no tests supplied - - pythonImportsCheck = [ - "betterproto" - ]; - - meta = { - description = "Fork of betterproto used in fireworks-ai"; - homepage = "https://pypi.org/project/betterproto-fw/"; - license = lib.licenses.mit; - maintainers = [ lib.maintainers.sarahec ]; - }; -} diff --git a/pkgs/development/python-modules/claude-agent-sdk/default.nix b/pkgs/development/python-modules/claude-agent-sdk/default.nix index 818be3c6bab0..420ebd02156f 100644 --- a/pkgs/development/python-modules/claude-agent-sdk/default.nix +++ b/pkgs/development/python-modules/claude-agent-sdk/default.nix @@ -13,14 +13,14 @@ buildPythonPackage (finalAttrs: { pname = "claude-agent-sdk"; - version = "0.2.95"; + version = "0.2.97"; pyproject = true; src = fetchFromGitHub { owner = "anthropics"; repo = "claude-agent-sdk-python"; tag = "v${finalAttrs.version}"; - hash = "sha256-lRKZJoNMXvC0uwp9yAOQSYQwNEV9AUivBO338QosVMc="; + hash = "sha256-Xq+qFAgJj4jnCLdgLaSW+ogJcdJc/VDgBlD2SQ7xnnw="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/fireworks-ai/default.nix b/pkgs/development/python-modules/fireworks-ai/default.nix index 9fcd5105dfe8..d6df722bb5b7 100644 --- a/pkgs/development/python-modules/fireworks-ai/default.nix +++ b/pkgs/development/python-modules/fireworks-ai/default.nix @@ -1,107 +1,109 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, # build-system - pdm-backend, + hatchling, + hatch-fancy-pypi-readme, # dependencies - asyncstdlib-fw, - betterproto-fw, - googleapis-common-protos, - grpcio, - grpclib, - httpx-sse, - httpx-ws, httpx, - mmh3, - openai, - pillow, - protobuf, pydantic, - python-dateutil, - rich, - toml, typing-extensions, + anyio, + distro, + sniffio, + aiohttp, + httpx-aiohttp, # optional dependencies - fastapi, - gitignore-parser, - openapi-spec-validator, - prance, - safetensors, - tabulate, + datasets, + numpy, + requests, + tiktoken, + # tinker -- not packaged yet torch, - tqdm, + transformers, + wandb, + + # tests + dirty-equals, + pytest-asyncio, + pytestCheckHook, + respx, + time-machine, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "fireworks-ai"; - version = "0.19.20"; + version = "1.2.0-alpha.71"; pyproject = true; + __structuredAttrs = true; + strictDeps = true; - # no source available - src = fetchPypi { - pname = "fireworks_ai"; - inherit version; - hash = "sha256-zK8lO+vFnMEPPl79QGfqPdemZT7kQdCqAPiCrcXdqYQ="; + src = fetchFromGitHub { + owner = "fw-ai-external"; + repo = "python-sdk"; + tag = "v${finalAttrs.version}"; + hash = "sha256-N5JjcYa3dRh1JTRjOIDpC8wykYzdj1rrMcU49UvWF7w="; }; - build-system = [ - pdm-backend - ]; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "hatchling==1.26.3" "hatchling>=1.26.3" + ''; - pythonRelaxDeps = [ - "attrs" - "protobuf" + build-system = [ + hatchling + hatch-fancy-pypi-readme ]; dependencies = [ - asyncstdlib-fw - betterproto-fw - googleapis-common-protos - grpcio - grpclib + aiohttp + anyio + distro httpx - httpx - httpx-sse - httpx-ws - mmh3 - openai - pillow - protobuf + httpx-aiohttp pydantic - python-dateutil - rich - toml + sniffio typing-extensions ]; optional-dependencies = { - flumina = [ - fastapi - gitignore-parser - openapi-spec-validator - prance - safetensors - tabulate - torch - tqdm + training-sdk = [ + # tinker is not available in nixpkgs + requests ]; + training = [ + datasets + numpy + tiktoken + torch + transformers + wandb + ] + ++ finalAttrs.passthru.optional-dependencies.training-sdk; }; - # no tests available - doCheck = false; + nativeCheckInputs = [ + dirty-equals + pytest-asyncio + pytestCheckHook + respx + time-machine + ] + ++ lib.concatAttrValues finalAttrs.passthru.optional-dependencies; pythonImportsCheck = [ "fireworks" ]; meta = { - description = "Client library for the Fireworks.ai platform"; - homepage = "https://pypi.org/project/fireworks-ai/"; + description = "Client library for Fireworks.ai"; + homepage = "https://github.com/fw-ai-external/python-sdk"; + changelog = "https://github.com/fw-ai-external/python-sdk/blob/${finalAttrs.src.tag}/CHANGELOG.md"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ sarahec ]; }; -} +}) diff --git a/pkgs/development/python-modules/flask-socketio/default.nix b/pkgs/development/python-modules/flask-socketio/default.nix index 9eb34ef0fd92..687a049b79c2 100644 --- a/pkgs/development/python-modules/flask-socketio/default.nix +++ b/pkgs/development/python-modules/flask-socketio/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "flask-socketio"; - version = "5.6.0"; + version = "5.6.1"; pyproject = true; src = fetchFromGitHub { owner = "miguelgrinberg"; repo = "Flask-SocketIO"; tag = "v${version}"; - hash = "sha256-1FMAooXktrbA4FDHrS0CQuqoTV6B4xWh5IIxRTDAzLs="; + hash = "sha256-tTpogVhyMNLLtK3UDOtZD2m2zIbcIAc9Opa/1xdJRa8="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/iamdata/default.nix b/pkgs/development/python-modules/iamdata/default.nix index 555f5afc4ada..8dc1dbf6e973 100644 --- a/pkgs/development/python-modules/iamdata/default.nix +++ b/pkgs/development/python-modules/iamdata/default.nix @@ -8,14 +8,14 @@ buildPythonPackage (finalAttrs: { pname = "iamdata"; - version = "0.1.202606101"; + version = "0.1.202606111"; pyproject = true; src = fetchFromGitHub { owner = "cloud-copilot"; repo = "iam-data-python"; tag = "v${finalAttrs.version}"; - hash = "sha256-tEa1DRwZyh8ZY0yfzvYHReSZH/Cyt4xP0K6pO5NKtzI="; + hash = "sha256-1TQlMrNuBiUHB4APdFq2cQE/MAxaZ+P6VF+/q8pzeXQ="; }; __darwinAllowLocalNetworking = true; diff --git a/pkgs/development/python-modules/junit2html/default.nix b/pkgs/development/python-modules/junit2html/default.nix index d4f179db3256..d5074293dfb6 100644 --- a/pkgs/development/python-modules/junit2html/default.nix +++ b/pkgs/development/python-modules/junit2html/default.nix @@ -1,35 +1,38 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitLab, jinja2, setuptools, + pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "junit2html"; - version = "30.1.3"; + version = "31.1.3"; pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-1q6KpKdrZvp8XvxGCkoorlZDDgvGg/imTX8+NEOBbWs="; + src = fetchFromGitLab { + owner = "inorton"; + repo = "junit2html"; + tag = "v${finalAttrs.version}"; + hash = "sha256-TF+ifAFPn3PQwYQFruP++bWo6/6J8LEmDJYXDYSwcq0="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ jinja2 ]; + dependencies = [ jinja2 ]; - # Tests are not shipped with PyPi and source is not tagged - doCheck = false; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "junit2htmlreport" ]; meta = { description = "Generate HTML reports from Junit results"; homepage = "https://gitlab.com/inorton/junit2html"; + changelog = "https://gitlab.com/inorton/junit2html/-/releases/${finalAttrs.src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ otavio ]; mainProgram = "junit2html"; }; -} +}) diff --git a/pkgs/development/python-modules/labgrid/default.nix b/pkgs/development/python-modules/labgrid/default.nix index 08a45405ea9a..9863e41d97a0 100644 --- a/pkgs/development/python-modules/labgrid/default.nix +++ b/pkgs/development/python-modules/labgrid/default.nix @@ -2,6 +2,7 @@ ansicolors, attrs, buildPythonPackage, + exceptiongroup, fetchFromGitHub, fetchpatch, fetchpatch2, @@ -10,6 +11,7 @@ grpcio-reflection, jinja2, lib, + nix-update-script, mock, openssh, pexpect, @@ -23,44 +25,27 @@ pyudev, pyusb, pyyaml, + py-netgear-plus, requests, setuptools, setuptools-scm, + util-linux, xmodem, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "labgrid"; - version = "25.0.1"; + version = "26.0"; pyproject = true; src = fetchFromGitHub { owner = "labgrid-project"; repo = "labgrid"; - tag = "v${version}"; - hash = "sha256-cLofkkp2T6Y9nQ5LIS7w9URZlt8DQNN8dm3NnrvcKWY="; + tag = "v${finalAttrs.version}"; + hash = "sha256-SX7FIaSl2sy1hMPEmgGCQQAzXUeFZRw/CrXf/ZHRBDU="; }; - # Remove after package bump - patches = [ - (fetchpatch { - url = "https://github.com/Emantor/labgrid/commit/4a66b43882811d50600e37aa39b24ec40398d184.patch"; - sha256 = "sha256-eJMB1qFWiDzQXEB4dYOHYMQqCPHXEWCwWjNNY0yTC2s="; - }) - (fetchpatch { - url = "https://github.com/Emantor/labgrid/commit/d9933b3ec444c35d98fd41685481ecae8ff28bf4.patch"; - sha256 = "sha256-Zx5j+CD6Q89dLmTl5QSKI9M1IcZ97OCjEWtEbG+CKWE="; - }) - (fetchpatch { - url = "https://github.com/Emantor/labgrid/commit/f0b672afe1e8976c257f0adff9bf6e7ee9760d6f.patch"; - sha256 = "sha256-M7rg+W9SjWDdViWyWe3ERzbUowxzf09c4w1yG3jQGak="; - }) - # Fix test_help under python 3.14 argparse colored output. - (fetchpatch2 { - url = "https://github.com/labgrid-project/labgrid/commit/417ace60b9dc043767afb312113a02bcb0807b17.patch?full_index=1"; - hash = "sha256-QCkO/PQbosqUldzJiOyF6BHvyzZI06CGs9IxHPPa6Ek="; - }) - ]; + passthru.updateScript = nix-update-script { }; build-system = [ setuptools @@ -70,6 +55,7 @@ buildPythonPackage rec { dependencies = [ ansicolors attrs + exceptiongroup jinja2 grpcio grpcio-tools @@ -96,6 +82,8 @@ buildPythonPackage rec { pytest-benchmark pytest-mock pytest-dependency + util-linux + py-netgear-plus ]; disabledTests = [ @@ -109,6 +97,15 @@ buildPythonPackage rec { # flaky: teardown race on x86_64-linux "test_remoteplace_target" + + # netns tests require working SSH & Agentwrapper + "test_tcp" + "test_udp" + "test_getaddrinfo" + "test_closed_socket" + "test_dup" + "test_detach" + "test_socks" ]; pytestFlags = [ "--benchmark-disable" ]; @@ -120,4 +117,4 @@ buildPythonPackage rec { maintainers = with lib.maintainers; [ emantor ]; platforms = with lib.platforms; linux; }; -} +}) diff --git a/pkgs/development/python-modules/langchain-fireworks/default.nix b/pkgs/development/python-modules/langchain-fireworks/default.nix index 58a837f00b58..078a77568031 100644 --- a/pkgs/development/python-modules/langchain-fireworks/default.nix +++ b/pkgs/development/python-modules/langchain-fireworks/default.nix @@ -22,19 +22,21 @@ gitUpdater, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "langchain-fireworks"; - version = "1.3.1"; + version = "1.4.2"; pyproject = true; + __structuredAttrs = true; + strictDeps = true; src = fetchFromGitHub { owner = "langchain-ai"; repo = "langchain"; - tag = "langchain-fireworks==${version}"; - hash = "sha256-ladhHikzzLOf8mz98c+vawoSCTKBAx2XcQPtzMePr2A="; + tag = "langchain-fireworks==${finalAttrs.version}"; + hash = "sha256-d0Pd44/+YX+eOZ9a5P3V9cBASTEW/vvLUv5Kt5nWI8w="; }; - sourceRoot = "${src.name}/libs/partners/fireworks"; + sourceRoot = "${finalAttrs.src.name}/libs/partners/fireworks"; build-system = [ hatchling ]; @@ -47,8 +49,7 @@ buildPythonPackage rec { ]; pythonRelaxDeps = [ - # Each component release requests the exact latest core. - # That prevents us from updating individual components. + "fireworks-ai" "langchain-core" ]; @@ -76,7 +77,7 @@ buildPythonPackage rec { }; meta = { - changelog = "https://github.com/langchain-ai/langchain/releases/tag/${src.tag}"; + changelog = "https://github.com/langchain-ai/langchain/releases/tag/${finalAttrs.src.tag}"; description = "Build LangChain applications with Fireworks"; homepage = "https://github.com/langchain-ai/langchain/tree/master/libs/partners/fireworks"; license = lib.licenses.mit; @@ -84,4 +85,4 @@ buildPythonPackage rec { sarahec ]; }; -} +}) diff --git a/pkgs/development/python-modules/osc/default.nix b/pkgs/development/python-modules/osc/default.nix index ecabb5c0b428..2ad4ddf784a2 100644 --- a/pkgs/development/python-modules/osc/default.nix +++ b/pkgs/development/python-modules/osc/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "osc"; - version = "1.27.0"; + version = "1.27.1"; format = "setuptools"; src = fetchFromGitHub { owner = "openSUSE"; repo = "osc"; rev = version; - hash = "sha256-PurzvqERRZDL4uVh0aiT5f8R9ui0t75WFmSCnlvH4I4="; + hash = "sha256-vturi/HNruJB76miLFbQhV9acl/MsfZ8dGOty3ytlvQ="; }; buildInputs = [ bashInteractive ]; # needed for bash-completion helper diff --git a/pkgs/development/python-modules/pyinfra/default.nix b/pkgs/development/python-modules/pyinfra/default.nix index 2e6fc8ede05b..4b4b5cdbaa0a 100644 --- a/pkgs/development/python-modules/pyinfra/default.nix +++ b/pkgs/development/python-modules/pyinfra/default.nix @@ -29,7 +29,7 @@ buildPythonPackage (finalAttrs: { pname = "pyinfra"; - version = "3.8.0"; + version = "3.9.2"; pyproject = true; __structuredAttrs = true; @@ -37,7 +37,7 @@ buildPythonPackage (finalAttrs: { owner = "Fizzadar"; repo = "pyinfra"; tag = "v${finalAttrs.version}"; - hash = "sha256-0DIG1Msttg7tqLbCZKi07uWTg3KYgH9rVlWPeJs4wwA="; + hash = "sha256-5qgPfBtPqysEtNCLFAgGAxlVK/CRH9VYmiC/98VWomI="; }; build-system = [ diff --git a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix index 995e81af8396..bae34c8e39c1 100644 --- a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix +++ b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix @@ -9,14 +9,14 @@ buildPythonPackage (finalAttrs: { pname = "tencentcloud-sdk-python"; - version = "3.1.111"; + version = "3.1.112"; pyproject = true; src = fetchFromGitHub { owner = "TencentCloud"; repo = "tencentcloud-sdk-python"; tag = finalAttrs.version; - hash = "sha256-F1of1vtdIkyZpefXd9aEkNLz8HQd86tHw7eilfYvYfY="; + hash = "sha256-uB9WcR2XT9BsCB8D7IWCBcTf4Re6dGGxtuiSJ1Wik/k="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/uefi-firmware-parser/default.nix b/pkgs/development/python-modules/uefi-firmware-parser/default.nix index 031880430d35..de95d2f5a495 100644 --- a/pkgs/development/python-modules/uefi-firmware-parser/default.nix +++ b/pkgs/development/python-modules/uefi-firmware-parser/default.nix @@ -4,7 +4,7 @@ buildPythonPackage, nix-update-script, setuptools, - wheel, + setuptools-scm, }: buildPythonPackage (finalAttrs: { @@ -21,7 +21,7 @@ buildPythonPackage (finalAttrs: { build-system = [ setuptools - wheel + setuptools-scm ]; pythonRemoveDeps = [ "future" ]; diff --git a/pkgs/development/python-modules/zipstream-ng/default.nix b/pkgs/development/python-modules/zipstream-ng/default.nix index 7d1308d929ca..9d1f9e2660c1 100644 --- a/pkgs/development/python-modules/zipstream-ng/default.nix +++ b/pkgs/development/python-modules/zipstream-ng/default.nix @@ -3,22 +3,22 @@ buildPythonPackage, fetchFromGitHub, pytestCheckHook, - setuptools, + hatchling, }: buildPythonPackage rec { pname = "zipstream-ng"; - version = "1.9.0"; + version = "1.9.2"; pyproject = true; src = fetchFromGitHub { owner = "pR0Ps"; repo = "zipstream-ng"; tag = "v${version}"; - hash = "sha256-dkSTZkj6Rx6OMdlX4oDOydetosf/iEJhlARmEc0W9gQ="; + hash = "sha256-1MSnabckpAwV/NmD5wKxF7k7hwve6fBiCPyw7skxdlM="; }; - build-system = [ setuptools ]; + build-system = [ hatchling ]; pythonImportsCheck = [ "zipstream" ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ca543516cb3c..8944205f1b1f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1207,10 +1207,6 @@ with pkgs; libsForQt5.callPackage ../applications/version-management/svn-all-fast-export { }; - svn2git = callPackage ../applications/version-management/svn2git { - git = gitSVN; - }; - inherit (haskellPackages) git-annex; inherit (haskellPackages) git-brunch; @@ -1622,11 +1618,6 @@ with pkgs; inherit (haskellPackages) ghcWithPackages diagrams-builder; }; - ding = callPackage ../applications/misc/ding { - aspellDicts_de = aspellDicts.de; - aspellDicts_en = aspellDicts.en; - }; - discourse = callPackage ../servers/web-apps/discourse { }; discourseAllPlugins = discourse.override { @@ -8751,10 +8742,6 @@ with pkgs; bitwig-studio = bitwig-studio6; - blucontrol = callPackage ../applications/misc/blucontrol/wrapper.nix { - inherit (haskellPackages) ghcWithPackages; - }; - breezy = with python3Packages; toPythonApplication breezy; # calico-felix and calico-node have not been packaged due to libbpf, linking issues @@ -9414,8 +9401,6 @@ with pkgs; mpvScripts = callPackage ../by-name/mp/mpv/scripts.nix { }; - mu-repo = callPackage ../applications/misc/mu-repo { }; - murmur = (callPackages ../applications/networking/mumble { avahi = avahi-compat; @@ -9432,10 +9417,6 @@ with pkgs; mumble_overlay = (callPackages ../applications/networking/mumble { }).overlay; - mwic = callPackage ../applications/misc/mwic { - pythonPackages = python3Packages; - }; - netmaker = callPackage ../applications/networking/netmaker { subPackages = [ "." ]; }; netmaker-full = callPackage ../applications/networking/netmaker { }; @@ -9535,8 +9516,6 @@ with pkgs; ocamlPackages = ocaml-ng.ocamlPackages_4_14; }; - parsec-bin = callPackage ../applications/misc/parsec/bin.nix { }; - pdfpc = callPackage ../applications/misc/pdfpc { inherit (gst_all_1) gstreamer @@ -9642,8 +9621,6 @@ with pkgs; withXineBackend = true; }; - rednotebook = callPackage ../applications/editors/rednotebook { }; - ringboard-wayland = callPackage ../by-name/ri/ringboard/package.nix { displayServer = "wayland"; }; ripcord = @@ -9682,10 +9659,6 @@ with pkgs; scantailor-universal = callPackage ../applications/graphics/scantailor/universal.nix { }; - stag = callPackage ../applications/misc/stag { - curses = ncurses; - }; - sweethome3d = recurseIntoAttrs ( (callPackage ../applications/misc/sweethome3d { }) // (callPackage ../applications/misc/sweethome3d/editors.nix { @@ -10222,11 +10195,6 @@ with pkgs; pycoin = with python3Packages; toPythonApplication pycoin; - inherit (callPackages ../applications/blockchains/teos { }) - teos - teos-watchtower-plugin - ; - vertcoind = vertcoin.override { withGui = false; }; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index b58cd5bd0732..887e3432c74a 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -32603,12 +32603,12 @@ with self; SysVirt = buildPerlModule rec { pname = "Sys-Virt"; - version = "12.1.0"; + version = "12.4.0"; src = fetchFromGitLab { owner = "libvirt"; repo = "libvirt-perl"; tag = "v${version}"; - hash = "sha256-WjTDvmnj1i1hoC6dska1VEJOiKi+obPjGlO7T2Now+U="; + hash = "sha256-GMZvSRZnxrPvhhLOJoFnNas7+ccsGXsL6s16EAeeFJQ="; }; nativeBuildInputs = [ pkgs.pkg-config ]; buildInputs = [ diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 1a4d9b53fafa..a7d277f88617 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -96,6 +96,7 @@ mapAliases { async_generator = throw "'async_generator' has been renamed to/replaced by 'async-generator'"; # Converted to throw 2025-10-29 async_stagger = throw "'async_stagger' has been renamed to/replaced by 'async-stagger'"; # Converted to throw 2025-10-29 asyncio-nats-client = throw "'asyncio-nats-client' has been renamed to/replaced by 'nats-py'"; # Converted to throw 2025-10-29 + asyncstdlib-fw = throw "'asyncstdlib-fw' has been removed as it is not longer required by fireworks-ai"; # Added 2026-06-09 atsim_potentials = throw "'atsim_potentials' has been renamed to/replaced by 'atsim-potentials'"; # Converted to throw 2025-10-29 aubio = throw "'aubio' only direct user LedFX switched to a fork named 'aubio-ledfx', hence the aubio package has been replaced."; # Added 2026-04-20 audio-metadata = throw "'audio-metadata' has been removed as it's unmaintained since 2020"; # Added 2026-03-12 @@ -111,6 +112,7 @@ mapAliases { beancount_docverif = throw "'beancount_docverif' has been renamed to/replaced by 'beancount-docverif'"; # Converted to throw 2025-10-29 beets-stable = lib.warn "beets-stable was aliased to beets, since upstream releases are frequent nowadays" self.beets; # added 2025-10-16 beets-unstable = lib.warn "beets-unstable was aliased to beets, since upstream releases are frequent nowadays" self.beets; # added 2025-10-16 + betterproto-fw = throw "'betterproto-fw' has been removed as it is not longer required by fireworks-ai"; # Added 2026-06-09 bimmer-connected = throw "'bimmer-connected' was removed because BMW started blocking third parties"; # added 2026-03-30 bip_utils = throw "'bip_utils' has been renamed to/replaced by 'bip-utils'"; # Converted to throw 2025-10-29 bjoern = throw "'bjoern' has been removed, as the upstream repository was unmaintained and it was using libraries with severe security issues."; # Added 2025-09-01 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b25fc5e08b17..e82b1fc240a6 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1180,8 +1180,6 @@ self: super: with self; { asyncstdlib = callPackage ../development/python-modules/asyncstdlib { }; - asyncstdlib-fw = callPackage ../development/python-modules/asyncstdlib-fw { }; - asynctest = callPackage ../development/python-modules/asynctest { }; asyncua = callPackage ../development/python-modules/asyncua { }; @@ -2032,8 +2030,6 @@ self: super: with self; { betterproto = callPackage ../development/python-modules/betterproto { }; - betterproto-fw = callPackage ../development/python-modules/betterproto-fw { }; - betterproto-rust-codec = callPackage ../development/python-modules/betterproto-rust-codec { }; bezier = callPackage ../development/python-modules/bezier { };