diff --git a/ci/eval/compare/default.nix b/ci/eval/compare/default.nix index 0c55b01c71601..b844d45f59026 100644 --- a/ci/eval/compare/default.nix +++ b/ci/eval/compare/default.nix @@ -69,7 +69,6 @@ let groupByPlatform extractPackageNames getLabels - uniqueStrings ; getAttrs = dir: builtins.fromJSON (builtins.readFile "${dir}/outpaths.json"); @@ -81,7 +80,7 @@ let # - values: lists of `packagePlatformPath`s diffAttrs = diff beforeAttrs afterAttrs; - rebuilds = uniqueStrings (diffAttrs.added ++ diffAttrs.changed); + rebuilds = diffAttrs.added ++ diffAttrs.changed; rebuildsPackagePlatformAttrs = convertToPackagePlatformAttrs rebuilds; changed-paths = @@ -110,7 +109,7 @@ let ); maintainers = import ./maintainers.nix { - changedattrs = lib.unique (map (a: a.packagePath) rebuildsPackagePlatformAttrs); + changedattrs = lib.attrNames (lib.groupBy (a: a.name) rebuildsPackagePlatformAttrs); changedpathsjson = touchedFilesJson; }; in diff --git a/ci/eval/compare/maintainers.nix b/ci/eval/compare/maintainers.nix index 6728929952d40..64025c066f965 100644 --- a/ci/eval/compare/maintainers.nix +++ b/ci/eval/compare/maintainers.nix @@ -11,17 +11,13 @@ let changedpaths = builtins.fromJSON (builtins.readFile changedpathsjson); anyMatchingFile = - filename: - let - matching = builtins.filter (changed: lib.strings.hasSuffix changed filename) changedpaths; - in - (builtins.length matching) > 0; + filename: builtins.any (changed: lib.strings.hasSuffix changed filename) changedpaths; - anyMatchingFiles = files: (builtins.length (builtins.filter anyMatchingFile files)) > 0; + anyMatchingFiles = files: builtins.any anyMatchingFile files; - enrichedAttrs = builtins.map (path: { - path = path; - name = builtins.concatStringsSep "." path; + enrichedAttrs = builtins.map (name: { + path = lib.splitString "." name; + name = name; }) changedattrs; validPackageAttributes = builtins.filter ( @@ -45,14 +41,6 @@ let pkg: pkg // { maintainers = (pkg.package.meta or { }).maintainers or [ ]; } ) attrsWithPackages; - attrsWeCanPing = builtins.filter ( - pkg: - if (builtins.length pkg.maintainers) > 0 then - true - else - builtins.trace "Package has no maintainers: ${pkg.name}" false - ) attrsWithMaintainers; - relevantFilenames = drv: (lib.lists.unique ( @@ -88,33 +76,16 @@ let attrsWithModifiedFiles = builtins.filter (pkg: anyMatchingFiles pkg.filenames) attrsWithFilenames; - listToPing = lib.lists.flatten ( - builtins.map ( - pkg: - builtins.map (maintainer: { - id = maintainer.githubId; - packageName = pkg.name; - dueToFiles = pkg.filenames; - }) pkg.maintainers - ) attrsWithModifiedFiles - ); - - byMaintainer = lib.lists.foldr ( - ping: collector: - collector - // { - "${toString ping.id}" = [ - { inherit (ping) packageName dueToFiles; } - ] ++ (collector."${toString ping.id}" or [ ]); - } - ) { } listToPing; - - textForPackages = - packages: lib.strings.concatStringsSep ", " (builtins.map (pkg: pkg.packageName) packages); - - textPerMaintainer = lib.attrsets.mapAttrs ( - maintainer: packages: "- @${maintainer} for ${textForPackages packages}" - ) byMaintainer; + listToPing = lib.concatMap ( + pkg: + builtins.map (maintainer: { + id = maintainer.githubId; + packageName = pkg.name; + dueToFiles = pkg.filenames; + }) pkg.maintainers + ) attrsWithModifiedFiles; + + byMaintainer = lib.groupBy (ping: toString ping.id) listToPing; packagesPerMaintainer = lib.attrsets.mapAttrs ( maintainer: packages: builtins.map (pkg: pkg.packageName) packages diff --git a/doc/hooks/tauri.section.md b/doc/hooks/tauri.section.md index 3fad872e4306e..400e493d7feeb 100644 --- a/doc/hooks/tauri.section.md +++ b/doc/hooks/tauri.section.md @@ -26,6 +26,7 @@ In Nixpkgs, `cargo-tauri.hook` overrides the default build and install phases. rustPlatform.buildRustPackage rec { # . . . + useFetchCargoVendor = true; cargoHash = "..."; # Assuming our app's frontend uses `npm` as a package manager diff --git a/doc/languages-frameworks/rust.section.md b/doc/languages-frameworks/rust.section.md index f1f951b9650fd..d0ba09b51621e 100644 --- a/doc/languages-frameworks/rust.section.md +++ b/doc/languages-frameworks/rust.section.md @@ -26,16 +26,17 @@ Rust applications are packaged by using the `buildRustPackage` helper from `rust rustPlatform.buildRustPackage rec { pname = "ripgrep"; - version = "12.1.1"; + version = "14.1.1"; src = fetchFromGitHub { owner = "BurntSushi"; repo = pname; rev = version; - hash = "sha256-+s5RBC3XSgb8omTbUNLywZnP6jSxZBKSS1BmXOjRF8M="; + hash = "sha256-gyWnahj1A+iXUQlQ1O1H1u7K5euYQOld9qWm99Vjaeg="; }; - cargoHash = "sha256-jtBw4ahSl88L0iuCXxQgZVm1EcboWRJMNtjxLVTtzts="; + useFetchCargoVendor = true; + cargoHash = "sha256-9atn5qyBDy4P6iUoHFhg+TV6Ur71fiah4oTJbBMeEy4="; meta = { description = "Fast line-oriented regex search tool, similar to ag and ack"; @@ -63,18 +64,7 @@ hash using `nix-hash --to-sri --type sha256 ""`. } ``` -Exception: If the application has cargo `git` dependencies, the `cargoHash` -approach will not work by default. In this case, you can set `useFetchCargoVendor = true` -to use an improved fetcher that supports handling `git` dependencies. - -```nix -{ - useFetchCargoVendor = true; - cargoHash = "sha256-RqPVFovDaD2rW31HyETJfQ0qVwFxoGEvqkIgag3H6KU="; -} -``` - -If this method still does not work, you can resort to copying the `Cargo.lock` file into nixpkgs +If this method does not work, you can resort to copying the `Cargo.lock` file into nixpkgs and importing it as described in the [next section](#importing-a-cargo.lock-file). Both types of hashes are permitted when contributing to nixpkgs. The @@ -119,7 +109,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-aDQA4A5mScX9or3Lyiv/5GyAehidnpKKE0grhbP1Ctc="; }; - cargoHash = "sha256-tbrTbutUs5aPSV+yE0IBUZAAytgmZV7Eqxia7g+9zRs="; + useFetchCargoVendor = true; + cargoHash = "sha256-iDYh52rj1M5Uupvbx2WeDd/jvQZ+2A50V5rp5e2t7q4="; cargoDepsName = pname; # ... @@ -443,14 +434,14 @@ hooks that can be used to integrate Cargo in non-Rust packages. Since network access is not allowed in sandboxed builds, Rust crate dependencies need to be retrieved using a fetcher. `rustPlatform` -provides the `fetchCargoTarball` fetcher, which vendors all +provides the `fetchCargoVendor` fetcher, which vendors all dependencies of a crate. For example, given a source path `src` -containing `Cargo.toml` and `Cargo.lock`, `fetchCargoTarball` +containing `Cargo.toml` and `Cargo.lock`, `fetchCargoVendor` can be used as follows: ```nix { - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; hash = "sha256-BoHIN/519Top1NUBjpB/oEMqi86Omt3zTQcXFWqrek0="; }; @@ -482,7 +473,7 @@ In case the lockfile contains cargo `git` dependencies, you can use ``` If a `Cargo.lock` file is available, you can alternatively use the -`importCargoLock` function. In contrast to `fetchCargoTarball`, this +`importCargoLock` function. In contrast to `fetchCargoVendor`, this function does not require a hash (unless git dependencies are used) and fetches every dependency as a separate fixed-output derivation. `importCargoLock` can be used as follows: @@ -521,12 +512,13 @@ you of the correct hash. `rustPlatform` provides the following hooks to automate Cargo builds: * `cargoSetupHook`: configure Cargo to use dependencies vendored - through `fetchCargoTarball`. This hook uses the `cargoDeps` - environment variable to find the vendored dependencies. If a project - already vendors its dependencies, the variable `cargoVendorDir` can - be used instead. When the `Cargo.toml`/`Cargo.lock` files are not in - `sourceRoot`, then the optional `cargoRoot` is used to specify the - Cargo root directory relative to `sourceRoot`. + through `fetchCargoVendor` or `importCargoLock`. This hook uses the + `cargoDeps` environment variable to find the vendored + dependencies. If a project already vendors its dependencies, the + variable `cargoVendorDir` can be used instead. When the + `Cargo.toml`/`Cargo.lock` files are not in `sourceRoot`, then the + optional `cargoRoot` is used to specify the Cargo root directory + relative to `sourceRoot`. * `cargoBuildHook`: use Cargo to build a crate. If the crate to be built is a crate in e.g. a Cargo workspace, the relative path to the crate to build can be set through the optional `buildAndTestSubdir` @@ -557,7 +549,7 @@ you of the correct hash. #### Python package using `setuptools-rust` {#python-package-using-setuptools-rust} For Python packages using `setuptools-rust`, you can use -`fetchCargoTarball` and `cargoSetupHook` to retrieve and set up Cargo +`fetchCargoVendor` and `cargoSetupHook` to retrieve and set up Cargo dependencies. The build itself is then performed by `buildPythonPackage`. @@ -586,9 +578,9 @@ buildPythonPackage rec { hash = "sha256-rQ2hRV52naEf6PvRsWVCTN7B1oXAQGmnpJw4iIdhamw="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit pname version src sourceRoot; - hash = "sha256-miW//pnOmww2i6SOGbkrAIdc/JMDT4FJLqdMFojZeoY="; + hash = "sha256-RO1m8wEd5Ic2M9q+zFHeCJWhCr4Sv3CEWd08mkxsBec="; }; sourceRoot = "${src.name}/bindings/python"; @@ -609,7 +601,7 @@ directory. In such cases, the `cargoRoot` attribute can be used to specify the crate's directory relative to `sourceRoot`. In the following example, the crate is in `src/rust`, as specified in the `cargoRoot` attribute. Note that we also need to specify the correct -path for `fetchCargoTarball`. +path for `fetchCargoVendor`. ```nix @@ -629,10 +621,10 @@ buildPythonPackage rec { hash = "sha256-xGDilsjLOnls3MfVbGKnj80KCUCczZxlis5PmHzpNcQ="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit pname version src; sourceRoot = "${pname}-${version}/${cargoRoot}"; - hash = "sha256-PS562W4L1NimqDV2H0jl5vYhL08H9est/pbIxSdYVfo="; + hash = "sha256-ctUt8maCjnGddKPf+Ii++wKsAXA1h+JM6zKQNXXwJqQ="; }; cargoRoot = "src/rust"; @@ -644,9 +636,9 @@ buildPythonPackage rec { #### Python package using `maturin` {#python-package-using-maturin} Python packages that use [Maturin](https://github.com/PyO3/maturin) -can be built with `fetchCargoTarball`, `cargoSetupHook`, and +can be built with `fetchCargoVendor`, `cargoSetupHook`, and `maturinBuildHook`. For example, the following (partial) derivation -builds the `retworkx` Python package. `fetchCargoTarball` and +builds the `retworkx` Python package. `fetchCargoVendor` and `cargoSetupHook` are used to fetch and set up the crate dependencies. `maturinBuildHook` is used to perform the build. @@ -669,9 +661,9 @@ buildPythonPackage rec { hash = "sha256-11n30ldg3y3y6qxg3hbj837pnbwjkqw3nxq6frds647mmmprrd20="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit pname version src; - hash = "sha256-heOBK8qi2nuc/Ib+I/vLzZ1fUUD/G/KTw9d7M4Hz5O0="; + hash = "sha256-QsPCQhNZKYCAogQriQX6pBYQUDAIUsEdRX/63dAqTzg="; }; nativeBuildInputs = with rustPlatform; [ cargoSetupHook maturinBuildHook ]; @@ -682,7 +674,7 @@ buildPythonPackage rec { #### Rust package built with `meson` {#rust-package-built-with-meson} -Some projects, especially GNOME applications, are built with the Meson Build System instead of calling Cargo directly. Using `rustPlatform.buildRustPackage` may successfully build the main program, but related files will be missing. Instead, you need to set up Cargo dependencies with `fetchCargoTarball` and `cargoSetupHook` and leave the rest to Meson. `rust` and `cargo` are still needed in `nativeBuildInputs` for Meson to use. +Some projects, especially GNOME applications, are built with the Meson Build System instead of calling Cargo directly. Using `rustPlatform.buildRustPackage` may successfully build the main program, but related files will be missing. Instead, you need to set up Cargo dependencies with `fetchCargoVendor` and `cargoSetupHook` and leave the rest to Meson. `rust` and `cargo` are still needed in `nativeBuildInputs` for Meson to use. ```nix { lib @@ -713,9 +705,9 @@ stdenv.mkDerivation rec { hash = "sha256-PrNPprSS98yN8b8yw2G6hzTSaoE65VbsM3q7FVB4mds="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit pname version src; - hash = "sha256-8fa3fa+sFi5H+49B5sr2vYPkp9C9s6CcE0zv4xB8gww="; + hash = "sha256-eR1ZGtTZQNhofFUEjI7IX16sMKPJmAl7aIFfPJukecg="; }; nativeBuildInputs = [ @@ -998,16 +990,17 @@ in rustPlatform.buildRustPackage rec { pname = "ripgrep"; - version = "12.1.1"; + version = "14.1.1"; src = fetchFromGitHub { owner = "BurntSushi"; repo = "ripgrep"; rev = version; - hash = "sha256-+s5RBC3XSgb8omTbUNLywZnP6jSxZBKSS1BmXOjRF8M="; + hash = "sha256-gyWnahj1A+iXUQlQ1O1H1u7K5euYQOld9qWm99Vjaeg="; }; - cargoHash = "sha256-l1vL2ZdtDRxSGvP0X/l3nMw8+6WF67KPutJEzUROjg8="; + useFetchCargoVendor = true; + cargoHash = "sha256-9atn5qyBDy4P6iUoHFhg+TV6Ur71fiah4oTJbBMeEy4="; doCheck = false; diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 02865fd4ff374..9d1d1f3e2b199 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2602,6 +2602,12 @@ name = "Wanderson Ferreira"; keys = [ { fingerprint = "A3E1 C409 B705 50B3 BF41 492B 5684 0A61 4DBE 37AE"; } ]; }; + bashsu = { + name = "Joeal Subash"; + email = "joeal.subash@cern.ch"; + github = "joealsubash"; + githubId = 98759349; + }; bastaynav = { name = "Ivan Bastrakov"; email = "bastaynav@proton.me"; @@ -6421,6 +6427,12 @@ githubId = 15128988; name = "Maksim Dzabraev"; }; + dzmitry-lahoda = { + email = "dzmitry@lahoda.pro"; + github = "dzmitry-lahoda"; + githubId = 757125; + name = "Dzmitry Lahoda"; + }; e1mo = { email = "nixpkgs@e1mo.de"; matrix = "@e1mo:chaos.jetzt"; @@ -7810,6 +7822,12 @@ githubId = 24463229; name = "Forden"; }; + ForgottenBeast = { + email = "forgottenbeast@riseup.net"; + github = "ForgottenBeast"; + githubId = 5754552; + name = "ForgottenBeast"; + }; forkk = { email = "forkk@forkk.net"; github = "Forkk"; @@ -9526,6 +9544,12 @@ githubId = 1592375; name = "Walter Huf"; }; + huggy = { + email = "nixpkgs@huggy.moe"; + github = "makeding"; + githubId = 6511667; + name = "huggy"; + }; hughmandalidis = { name = "Hugh Mandalidis"; email = "mandalidis.hugh@gmail.com"; @@ -14237,6 +14261,12 @@ githubId = 585424; name = "Massimo Gengarelli"; }; + MasterEvarior = { + email = "nix-maintainer@giannin.ch"; + github = "MasterEvarior"; + githubId = 36074738; + name = "MasterEvarior"; + }; matdibu = { email = "contact@mateidibu.dev"; github = "matdibu"; @@ -15738,6 +15768,13 @@ githubId = 2176611; name = "Marko Poikonen"; }; + mtpham99 = { + name = "Matthew Pham"; + email = "mtpham.nixos@protonmail.com"; + github = "mtpham99"; + githubId = 72663763; + keys = [ { fingerprint = "DB3E A12D B291 594A 79C5 F6B3 10AB 6868 37F6 FA3F"; } ]; + }; mtreca = { email = "maxime.treca@gmail.com"; github = "mtreca"; @@ -16459,6 +16496,12 @@ github = "NiklasVousten"; githubId = 24965952; }; + nikolaizombie1 = { + name = "Fabio J. Matos Nieves"; + email = "fabio.matos999@gmail.com"; + githubId = 70602908; + github = "nikolaizombie1"; + }; nikstur = { email = "nikstur@outlook.com"; name = "nikstur"; @@ -17337,6 +17380,12 @@ githubId = 108072; name = "Slawomir Gonet"; }; + oughie = { + name = "Oughie"; + email = "oughery@gmail.com"; + github = "Oughie"; + githubId = 123173954; + }; outfoxxed = { name = "outfoxxed"; email = "nixpkgs@outfoxxed.me"; @@ -22994,6 +23043,12 @@ githubId = 5409166; name = "Rishi Desai"; }; + therobot2105 = { + email = "felix.kimmel@web.de"; + github = "TheRobot2105"; + githubId = 91203390; + name = "Felix Kimmel"; + }; thesola10 = { email = "me@thesola.io"; github = "Thesola10"; @@ -24179,6 +24234,12 @@ githubId = 245573; name = "Dmitry Kalinkin"; }; + versality = { + email = "artyom@pertsovsky.com"; + github = "versality"; + githubId = 1486626; + name = "Artyom Pertsovsky"; + }; vglfr = { email = "vf.velt@gmail.com"; github = "vglfr"; @@ -24320,6 +24381,12 @@ githubId = 7444430; name = "Radik Islamov"; }; + vji = { + email = "mail@viktor.im"; + github = "v-ji"; + githubId = 1476338; + name = "Viktor Illmer"; + }; vklquevs = { email = "vklquevs@gmail.com"; github = "vklquevs"; diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index 4778365d5c9a7..f384eb18e7473 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -46,10 +46,11 @@ with lib.maintainers; android = { members = [ - numinit + adrian-gierakowski hadilq + johnrtitor + numinit RossComputerGuy - adrian-gierakowski ]; scope = "Maintain Android-related tooling in nixpkgs."; githubTeams = [ "android" ]; @@ -521,6 +522,20 @@ with lib.maintainers; shortName = "Home Assistant"; }; + hyprland = { + members = [ + donovanglover + fufexan + johnrtitor + khaneliman + NotAShelf + ]; + githubTeams = [ "hyprland" ]; + scope = "Maintain Hyprland compositor and ecosystem"; + shortName = "Hyprland"; + enableFeatureFreezePing = true; + }; + infisical = { members = [ akhilmhdh ]; scope = "Maintain Infisical"; diff --git a/nixos/doc/manual/redirects.json b/nixos/doc/manual/redirects.json index 443cc445ad69f..a103e8bd5cff7 100644 --- a/nixos/doc/manual/redirects.json +++ b/nixos/doc/manual/redirects.json @@ -836,6 +836,12 @@ "module-services-netbird-multiple-connections": [ "index.html#module-services-netbird-multiple-connections" ], + "module-services-netbird-firewall": [ + "index.html#module-services-netbird-firewall" + ], + "module-services-netbird-customization": [ + "index.html#module-services-netbird-customization" + ], "module-services-mosquitto": [ "index.html#module-services-mosquitto" ], diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md index bd37c94644216..a0058d6682776 100644 --- a/nixos/doc/manual/release-notes/rl-2505.section.md +++ b/nixos/doc/manual/release-notes/rl-2505.section.md @@ -209,6 +209,8 @@ word-breaking. So you want to write `extraArgs = [ "--prefer" "spaced pat" ]` rather than previous `extraArgs = [ "--prefer 'spaced pat'" ]`. +- `nodePackages."@commitlint/config-conventional"` has been removed, as it is a library, and projects should depend on it instead. + - `nodePackages.vls` has been deprecated, as the upstream consumer of it, vetur, has been deprecated by upstream. Upstream suggests migrating to Volar for Vue LSP tooling instead. - `nodePackages.create-react-native-app` has been removed, as it is deprecated. Upstream suggests using a framework for React Native apps instead. @@ -376,6 +378,9 @@ as before, you can use plugins like `python3Packages.jax-cuda12-plugin`. +- `services.netbird.tunnels` was renamed to [`services.netbird.clients`](#opt-services.netbird.clients), + hardened (using dedicated less-privileged users) and significantly extended. + ## Other Notable Changes {#sec-release-25.05-notable-changes} @@ -451,6 +456,8 @@ - `gerbera` now has wavpack support. +- `ddclient` was updated from 3.11.2 to 4.0.0 [Release notes](https://github.com/ddclient/ddclient/releases/tag/v4.0.0) + ```{=include=} sections diff --git a/nixos/modules/hardware/rtl-sdr.nix b/nixos/modules/hardware/rtl-sdr.nix index 05a3b54124127..7124d7e4280a1 100644 --- a/nixos/modules/hardware/rtl-sdr.nix +++ b/nixos/modules/hardware/rtl-sdr.nix @@ -19,6 +19,7 @@ in This is a prerequisite to using devices supported by rtl-sdr without being root, since rtl-sdr USB descriptors will be owned by plugdev through udev. ''; }; + package = lib.mkPackageOption pkgs "rtl-sdr" { }; }; config = lib.mkIf cfg.enable { @@ -27,7 +28,10 @@ in "e4000" "rtl2832" ]; - services.udev.packages = [ pkgs.rtl-sdr ]; + services.udev.packages = [ cfg.package ]; + environment.systemPackages = [ cfg.package ]; users.groups.plugdev = { }; }; + + meta.maintainers = with lib.maintainers; [ pandapip1 ]; } diff --git a/nixos/modules/installer/tools/nix-fallback-paths.nix b/nixos/modules/installer/tools/nix-fallback-paths.nix index 6248f80d9f0aa..dcf6689ec8cea 100644 --- a/nixos/modules/installer/tools/nix-fallback-paths.nix +++ b/nixos/modules/installer/tools/nix-fallback-paths.nix @@ -1,8 +1,8 @@ { - x86_64-linux = "/nix/store/wsa13yx6kl6zzjlhjb8vmcqb6msbxym3-nix-2.24.11"; - i686-linux = "/nix/store/rn1449hjxh77f723m5rc1skgv4paknic-nix-2.24.11"; - aarch64-linux = "/nix/store/psrkach0v2s66rw30nxzpz7hgsqrvg28-nix-2.24.11"; - riscv64-linux = "/nix/store/zc8clmxxi9zr7vx7y8v8kg1rsmhwsp42-nix-riscv64-unknown-linux-gnu-2.24.11"; - x86_64-darwin = "/nix/store/nc81g85wlkzqck5mxdfbnxscavg2xh09-nix-2.24.11"; - aarch64-darwin = "/nix/store/nqzxb4h7sbkk6876zx8yc88ahlgl5kkl-nix-2.24.11"; + x86_64-linux = "/nix/store/kwck2vdfdp2v4jr9c4daryyk9mlbx406-nix-2.24.12"; + i686-linux = "/nix/store/s9qqyxzcgjl7xrfhnnjiiy9v876pcphi-nix-2.24.12"; + aarch64-linux = "/nix/store/pmj4g05d4nlr3gcr8nyadgwir3svbkmx-nix-2.24.12"; + riscv64-linux = "/nix/store/nzr3m4x3mcnfpnmyap31f9pviwv29vyc-nix-riscv64-unknown-linux-gnu-2.24.12"; + x86_64-darwin = "/nix/store/pf6msb0yzccznd75yil32mzk284h90z4-nix-2.24.12"; + aarch64-darwin = "/nix/store/vaaakw66qnbw4g007rf2nggy0rmhf8fh-nix-2.24.12"; } diff --git a/nixos/modules/installer/tools/tools.nix b/nixos/modules/installer/tools/tools.nix index e4d03f39018e2..3731b011a8455 100644 --- a/nixos/modules/installer/tools/tools.nix +++ b/nixos/modules/installer/tools/tools.nix @@ -4,7 +4,7 @@ { config, lib, pkgs, ... }: let - makeProg = args: pkgs.substituteAll (args // { + makeProg = args: pkgs.replaceVarsWith (args // { dir = "bin"; isExecutable = true; nativeBuildInputs = [ @@ -18,28 +18,32 @@ let nixos-generate-config = makeProg { name = "nixos-generate-config"; src = ./nixos-generate-config.pl; - perl = "${pkgs.perl.withPackages (p: [ p.FileSlurp ])}/bin/perl"; - hostPlatformSystem = pkgs.stdenv.hostPlatform.system; - detectvirt = "${config.systemd.package}/bin/systemd-detect-virt"; - btrfs = "${pkgs.btrfs-progs}/bin/btrfs"; - inherit (config.system.nixos-generate-config) configuration desktopConfiguration; - xserverEnabled = config.services.xserver.enable; + replacements = { + perl = "${pkgs.perl.withPackages (p: [ p.FileSlurp ])}/bin/perl"; + hostPlatformSystem = pkgs.stdenv.hostPlatform.system; + detectvirt = "${config.systemd.package}/bin/systemd-detect-virt"; + btrfs = "${pkgs.btrfs-progs}/bin/btrfs"; + inherit (config.system.nixos-generate-config) configuration desktopConfiguration; + xserverEnabled = config.services.xserver.enable; + }; manPage = ./manpages/nixos-generate-config.8; }; nixos-version = makeProg { name = "nixos-version"; src = ./nixos-version.sh; - inherit (pkgs) runtimeShell; - inherit (config.system.nixos) version codeName revision; - inherit (config.system) configurationRevision; - json = builtins.toJSON ({ - nixosVersion = config.system.nixos.version; - } // lib.optionalAttrs (config.system.nixos.revision != null) { - nixpkgsRevision = config.system.nixos.revision; - } // lib.optionalAttrs (config.system.configurationRevision != null) { - configurationRevision = config.system.configurationRevision; - }); + replacements = { + inherit (pkgs) runtimeShell; + inherit (config.system.nixos) version codeName revision; + inherit (config.system) configurationRevision; + json = builtins.toJSON ({ + nixosVersion = config.system.nixos.version; + } // lib.optionalAttrs (config.system.nixos.revision != null) { + nixpkgsRevision = config.system.nixos.revision; + } // lib.optionalAttrs (config.system.configurationRevision != null) { + configurationRevision = config.system.configurationRevision; + }); + }; manPage = ./manpages/nixos-version.8; }; diff --git a/nixos/modules/programs/wayland/hyprland.nix b/nixos/modules/programs/wayland/hyprland.nix index d00f2a188d6d5..21f8266d4292a 100644 --- a/nixos/modules/programs/wayland/hyprland.nix +++ b/nixos/modules/programs/wayland/hyprland.nix @@ -139,5 +139,5 @@ in ] "Nvidia patches are no longer needed") ]; - meta.maintainers = with lib.maintainers; [ fufexan ]; + meta.maintainers = lib.teams.hyprland.members; } diff --git a/nixos/modules/programs/wayland/hyprlock.nix b/nixos/modules/programs/wayland/hyprlock.nix index 1b55c75f08529..e05d8f826a4c7 100644 --- a/nixos/modules/programs/wayland/hyprlock.nix +++ b/nixos/modules/programs/wayland/hyprlock.nix @@ -26,5 +26,5 @@ in security.pam.services.hyprlock = { }; }; - meta.maintainers = with lib.maintainers; [ johnrtitor ]; + meta.maintainers = lib.teams.hyprland.members; } diff --git a/nixos/modules/services/networking/netbird.md b/nixos/modules/services/networking/netbird.md index e1f6753cbd30c..876c27cb0d22e 100644 --- a/nixos/modules/services/networking/netbird.md +++ b/nixos/modules/services/networking/netbird.md @@ -2,7 +2,7 @@ ## Quickstart {#module-services-netbird-quickstart} -The absolute minimal configuration for the netbird daemon looks like this: +The absolute minimal configuration for the Netbird client daemon looks like this: ```nix { @@ -13,52 +13,76 @@ The absolute minimal configuration for the netbird daemon looks like this: This will set up a netbird service listening on the port `51820` associated to the `wt0` interface. -It is strictly equivalent to setting: +Which is equivalent to: ```nix { - services.netbird.tunnels.wt0.stateDir = "netbird"; + services.netbird.clients.wt0 = { + port = 51820; + name = "netbird"; + interface = "wt0"; + hardened = false; + }; } ``` -The `enable` option is mainly kept for backward compatibility, as defining netbird -tunnels through the `tunnels` option is more expressive. +This will set up a `netbird.service` listening on the port `51820` associated to the +`wt0` interface. There will also be `netbird-wt0` binary installed in addition to `netbird`. + +see [clients](#opt-services.netbird.clients) option documentation for more details. ## Multiple connections setup {#module-services-netbird-multiple-connections} -Using the `services.netbird.tunnels` option, it is also possible to define more than +Using the `services.netbird.clients` option, it is possible to define more than one netbird service running at the same time. -The following configuration will start a netbird daemon using the interface `wt1` and -the port 51830. Its configuration file will then be located at `/var/lib/netbird-wt1/config.json`. +You must at least define a `port` for the service to listen on, the rest is optional: ```nix { - services.netbird.tunnels = { - wt1 = { - port = 51830; - }; - }; + services.netbird.clients.wt1.port = 51830; + services.netbird.clients.wt2.port = 51831; } ``` -To interact with it, you will need to specify the correct daemon address: - -```bash -netbird --daemon-addr unix:///var/run/netbird-wt1/sock ... -``` +see [clients](#opt-services.netbird.clients) option documentation for more details. -The address will by default be `unix:///var/run/netbird-`. +## Exposing services internally on the Netbird network {#module-services-netbird-firewall} -It is also possible to overwrite default options passed to the service, for -example: +You can easily expose services exclusively to Netbird network by combining +[`networking.firewall.interfaces`](#opt-networking.firewall.interfaces) rules +with [`interface`](#opt-services.netbird.clients._name_.interface) names: ```nix { - services.netbird.tunnels.wt1.environment = { - NB_DAEMON_ADDR = "unix:///var/run/toto.sock"; + services.netbird.clients.priv.port = 51819; + services.netbird.clients.work.port = 51818; + networking.firewall.interfaces = { + "${config.services.netbird.clients.priv.interface}" = { + allowedUDPPorts = [ 1234 ]; + }; + "${config.services.netbird.clients.work.interface}" = { + allowedTCPPorts = [ 8080 ]; + }; }; } ``` -This will set the socket to interact with the netbird service to `/var/run/toto.sock`. +### Additional customizations {#module-services-netbird-customization} + +Each Netbird client service by default: + +- runs in a [hardened](#opt-services.netbird.clients._name_.hardened) mode, +- starts with the system, +- [opens up a firewall](#opt-services.netbird.clients._name_.openFirewall) for direct (without TURN servers) + peer-to-peer communication, +- can be additionally configured with environment variables, +- automatically determines whether `netbird-ui-` should be available, + +[autoStart](#opt-services.netbird.clients._name_.autoStart) allows you to start the client (an actual systemd service) +on demand, for example to connect to work-related or otherwise conflicting network only when required. +See the option description for more information. + +[environment](#opt-services.netbird.clients._name_.environment) allows you to pass additional configurations +through environment variables, but special care needs to be taken for overriding config location and +daemon address due [hardened](#opt-services.netbird.clients._name_.hardened) option. diff --git a/nixos/modules/services/networking/netbird.nix b/nixos/modules/services/networking/netbird.nix index 9771503e14e28..1dc5267563dd4 100644 --- a/nixos/modules/services/networking/netbird.nix +++ b/nixos/modules/services/networking/netbird.nix @@ -4,67 +4,187 @@ pkgs, ... }: - let inherit (lib) - attrNames + attrValues + concatLists + concatStringsSep + escapeShellArgs + filterAttrs getExe literalExpression maintainers + makeBinPath mapAttrs' + mapAttrsToList + mkAliasOptionModule mkDefault - mkEnableOption mkIf mkMerge mkOption + mkOptionDefault mkPackageOption nameValuePair optional + optionalAttrs + optionalString + toShellVars + versionAtLeast versionOlder ; inherit (lib.types) attrsOf + bool + enum + nullOr + package + path port str submodule ; - kernel = config.boot.kernelPackages; + inherit (config.boot) kernelPackages; + inherit (config.boot.kernelPackages) kernel; cfg = config.services.netbird; + + toClientList = fn: map fn (attrValues cfg.clients); + toClientAttrs = fn: mapAttrs' (_: fn) cfg.clients; + + hardenedClients = filterAttrs (_: client: client.hardened) cfg.clients; + toHardenedClientList = fn: map fn (attrValues hardenedClients); + toHardenedClientAttrs = fn: mapAttrs' (_: fn) hardenedClients; + + mkBinName = + client: name: + if client.bin.suffix == "" || client.bin.suffix == "netbird" then + name + else + "${name}-${client.bin.suffix}"; + + nixosConfig = config; in { - meta.maintainers = with maintainers; [ ]; + meta.maintainers = with maintainers; [ + nazarewk + ]; meta.doc = ./netbird.md; + imports = [ + (mkAliasOptionModule [ "services" "netbird" "tunnels" ] [ "services" "netbird" "clients" ]) + ]; + options.services.netbird = { - enable = mkEnableOption "Netbird daemon"; + enable = mkOption { + type = bool; + default = false; + description = '' + Enables backwards compatible Netbird client service. + + This is strictly equivalent to: + + ```nix + services.netbird.clients.default = { + port = 51820; + name = "netbird"; + systemd.name = "netbird"; + interface = "wt0"; + hardened = false; + }; + ``` + ''; + }; package = mkPackageOption pkgs "netbird" { }; - tunnels = mkOption { + ui.enable = mkOption { + type = bool; + default = config.services.displayManager.sessionPackages != [ ] || config.services.xserver.enable; + defaultText = literalExpression '' + config.services.displayManager.sessionPackages != [ ] || config.services.xserver.enable + ''; + description = '' + Controls presence `netbird-ui` wrappers, defaults to presence of graphical sessions. + ''; + }; + ui.package = mkPackageOption pkgs "netbird-ui" { }; + + clients = mkOption { type = attrsOf ( submodule ( { name, config, ... }: + let + client = config; + in { options = { port = mkOption { type = port; - default = 51820; + example = literalExpression "51820"; + description = '' + Port the Netbird client listens on. + ''; + }; + + name = mkOption { + type = str; + default = name; + description = '' + Primary name for use (as a suffix) in: + - systemd service name, + - hardened user name and group, + - [systemd `*Directory=`](https://www.freedesktop.org/software/systemd/man/latest/systemd.exec.html#RuntimeDirectory=) names, + - desktop application identification, + ''; + }; + + dns-resolver.address = mkOption { + type = nullOr str; + default = null; + example = "127.0.0.123"; + description = '' + An explicit address that Netbird will serve `*.netbird.cloud.` (usually) entries on. + + Netbird serves DNS on it's own (dynamic) client address by default. + ''; + }; + + dns-resolver.port = mkOption { + type = port; + default = 53; + description = '' + A port to serve DNS entries on when `dns-resolver.address` is enabled. + ''; + }; + + interface = mkOption { + type = str; + default = "nb-${client.name}"; description = '' - Port for the ${name} netbird interface. + Name of the network interface managed by this client. ''; + apply = + iface: + lib.throwIfNot ( + builtins.stringLength iface <= 15 + ) "Network interface name must be 15 characters or less" iface; }; environment = mkOption { type = attrsOf str; defaultText = literalExpression '' { - NB_CONFIG = "/var/lib/''${stateDir}/config.json"; - NB_LOG_FILE = "console"; - NB_WIREGUARD_PORT = builtins.toString port; - NB_INTERFACE_NAME = name; - NB_DAMEON_ADDR = "/var/run/''${stateDir}" + NB_STATE_DIR = client.dir.state; + NB_CONFIG = "''${client.dir.state}/config.json"; + NB_DAEMON_ADDR = "unix://''${client.dir.runtime}/sock"; + NB_INTERFACE_NAME = client.interface; + NB_LOG_FILE = mkOptionDefault "console"; + NB_LOG_LEVEL = client.logLevel; + NB_SERVICE = client.service.name; + NB_WIREGUARD_PORT = toString client.port; + } // optionalAttrs (client.dns-resolver.address != null) { + NB_DNS_RESOLVER_ADDRESS = "''${client.dns-resolver.address}:''${builtins.toString client.dns-resolver.port}"; } ''; description = '' @@ -72,64 +192,311 @@ in ''; }; - stateDir = mkOption { + autoStart = mkOption { + type = bool; + default = true; + description = '' + Start the service with the system. + + As of 2024-02-13 it is not possible to start a Netbird client daemon without immediately + connecting to the network, but it is [planned for a near future](https://github.com/netbirdio/netbird/projects/2#card-91718018). + ''; + }; + + openFirewall = mkOption { + type = bool; + default = true; + description = '' + Opens up firewall `port` for communication between Netbird peers directly over LAN or public IP, + without using (internet-hosted) TURN servers as intermediaries. + ''; + }; + + hardened = mkOption { + type = bool; + default = true; + description = '' + Hardened service: + - runs as a dedicated user with minimal set of permissions (see caveats), + - restricts daemon configuration socket access to dedicated user group + (you can grant access to it with `users.users."".extraGroups = [ ${client.user.group} ]`), + + Even though the local system resources access is restricted: + - `CAP_NET_RAW`, `CAP_NET_ADMIN` and `CAP_BPF` still give unlimited network manipulation possibilites, + - older kernels don't have `CAP_BPF` and use `CAP_SYS_ADMIN` instead, + + Known security features that are not (yet) integrated into the module: + - 2024-02-14: `rosenpass` is an experimental feature configurable solely + through `--enable-rosenpass` flag on the `netbird up` command, + see [the docs](https://docs.netbird.io/how-to/enable-post-quantum-cryptography) + ''; + }; + + logLevel = mkOption { + type = enum [ + # logrus loglevels + "panic" + "fatal" + "error" + "warn" + "warning" + "info" + "debug" + "trace" + ]; + default = "info"; + description = "Log level of the Netbird daemon."; + }; + + ui.enable = mkOption { + type = bool; + default = nixosConfig.services.netbird.ui.enable; + defaultText = literalExpression ''client.ui.enable''; + description = '' + Controls presence of `netbird-ui` wrapper for this Netbird client. + ''; + }; + + wrapper = mkOption { + type = package; + internal = true; + default = + let + makeWrapperArgs = concatLists ( + mapAttrsToList (key: value: [ + "--set-default" + key + value + ]) client.environment + ); + mkBin = mkBinName client; + in + pkgs.stdenv.mkDerivation { + name = "${cfg.package.name}-wrapper-${client.name}"; + meta.mainProgram = mkBin "netbird"; + nativeBuildInputs = with pkgs; [ makeWrapper ]; + phases = [ "installPhase" ]; + installPhase = concatStringsSep "\n" [ + '' + mkdir -p "$out/bin" + makeWrapper ${lib.getExe cfg.package} "$out/bin/${mkBin "netbird"}" \ + ${escapeShellArgs makeWrapperArgs} + '' + (optionalString cfg.ui.enable '' + # netbird-ui doesn't support envvars + makeWrapper ${lib.getExe cfg.ui.package} "$out/bin/${mkBin "netbird-ui"}" \ + --add-flags '--daemon-addr=${client.environment.NB_DAEMON_ADDR}' + + mkdir -p "$out/share/applications" + substitute ${cfg.ui.package}/share/applications/netbird.desktop \ + "$out/share/applications/${mkBin "netbird"}.desktop" \ + --replace-fail 'Name=Netbird' "Name=Netbird @ ${client.service.name}" \ + --replace-fail '${lib.getExe cfg.ui.package}' "$out/bin/${mkBin "netbird-ui"}" + '') + ]; + }; + }; + + # see https://github.com/netbirdio/netbird/blob/88747e3e0191abc64f1e8c7ecc65e5e50a1527fd/client/internal/config.go#L49-L82 + config = mkOption { + type = (pkgs.formats.json { }).type; + defaultText = literalExpression '' + { + DisableAutoConnect = !client.autoStart; + WgIface = client.interface; + WgPort = client.port; + } // optionalAttrs (client.dns-resolver.address != null) { + CustomDNSAddress = "''${client.dns-resolver.address}:''${builtins.toString client.dns-resolver.port}"; + } + ''; + description = '' + Additional configuration that exists before the first start and + later overrides the existing values in `config.json`. + + It is mostly helpful to manage configuration ignored/not yet implemented + outside of `netbird up` invocation. + + WARNING: this is not an upstream feature, it could break in the future + (by having lower priority) after upstream implements an equivalent. + + It is implemented as a `preStart` script which overrides `config.json` + with content of `/etc/${client.dir.baseName}/config.d/*.json` files. + This option manages specifically `50-nixos.json` file. + + Consult [the source code](https://github.com/netbirdio/netbird/blob/88747e3e0191abc64f1e8c7ecc65e5e50a1527fd/client/internal/config.go#L49-L82) + or inspect existing file for a complete list of available configurations. + ''; + }; + + suffixedName = mkOption { + type = str; + default = if client.name != "netbird" then "netbird-${client.name}" else client.name; + description = '' + A systemd service name to use (without `.service` suffix). + ''; + }; + dir.baseName = mkOption { + type = str; + default = client.suffixedName; + description = '' + A systemd service name to use (without `.service` suffix). + ''; + }; + dir.state = mkOption { + type = path; + default = "/var/lib/${client.dir.baseName}"; + description = '' + A state directory used by Netbird client to store `config.json`, `state.json` & `resolv.conf`. + ''; + }; + dir.runtime = mkOption { + type = path; + default = "/var/run/${client.dir.baseName}"; + description = '' + A runtime directory used by Netbird client. + ''; + }; + service.name = mkOption { type = str; - default = "netbird-${name}"; + default = client.suffixedName; description = '' - Directory storing the netbird configuration. + A systemd service name to use (without `.service` suffix). + ''; + }; + user.name = mkOption { + type = str; + default = client.suffixedName; + description = '' + A system user name for this client instance. + ''; + }; + user.group = mkOption { + type = str; + default = client.suffixedName; + description = '' + A system group name for this client instance. + ''; + }; + bin.suffix = mkOption { + type = str; + default = if client.name != "netbird" then client.name else ""; + description = '' + A system group name for this client instance. ''; }; }; - config.environment = builtins.mapAttrs (_: mkDefault) { - NB_CONFIG = "/var/lib/${config.stateDir}/config.json"; - NB_LOG_FILE = "console"; - NB_WIREGUARD_PORT = builtins.toString config.port; - NB_INTERFACE_NAME = name; - NB_DAEMON_ADDR = "unix:///var/run/${config.stateDir}/sock"; - }; + config.environment = + { + NB_STATE_DIR = client.dir.state; + NB_CONFIG = "${client.dir.state}/config.json"; + NB_DAEMON_ADDR = "unix://${client.dir.runtime}/sock"; + NB_INTERFACE_NAME = client.interface; + NB_LOG_FILE = mkOptionDefault "console"; + NB_LOG_LEVEL = client.logLevel; + NB_SERVICE = client.service.name; + NB_WIREGUARD_PORT = toString client.port; + } + // optionalAttrs (client.dns-resolver.address != null) { + NB_DNS_RESOLVER_ADDRESS = "${client.dns-resolver.address}:${builtins.toString client.dns-resolver.port}"; + }; + + config.config = + { + DisableAutoConnect = !client.autoStart; + WgIface = client.interface; + WgPort = client.port; + } + // optionalAttrs (client.dns-resolver.address != null) { + CustomDNSAddress = "${client.dns-resolver.address}:${builtins.toString client.dns-resolver.port}"; + }; } ) ); default = { }; description = '' - Attribute set of Netbird tunnels, each one will spawn a daemon listening on ... + Attribute set of Netbird client daemons, by default each one will: + + 1. be manageable using dedicated tooling: + - `netbird-` script, + - `Netbird - netbird-` graphical interface when appropriate (see `ui.enable`), + 2. run as a `netbird-.service`, + 3. listen for incoming remote connections on the port `51820` (`openFirewall` by default), + 4. manage the `netbird-` wireguard interface, + 5. use the `/var/lib/netbird-/config.json` configuration file, + 6. override `/var/lib/netbird-/config.json` with values from `/etc/netbird-/config.d/*.json`, + 7. (`hardened`) be locally manageable by `netbird-` system group, + + With following caveats: + + - multiple daemons will interfere with each other's DNS resolution of `netbird.cloud`, but + should remain fully operational otherwise. + Setting up custom (non-conflicting) DNS zone is currently possible only when self-hosting. + ''; + example = lib.literalExpression '' + { + services.netbird.clients.wt0.port = 51820; + services.netbird.clients.personal.port = 51821; + services.netbird.clients.work1.port = 51822; + } ''; }; }; config = mkMerge [ (mkIf cfg.enable { - # For backwards compatibility - services.netbird.tunnels.wt0.stateDir = "netbird"; + services.netbird.clients.default = { + port = mkDefault 51820; + interface = mkDefault "wt0"; + name = mkDefault "netbird"; + hardened = mkDefault false; + }; }) + { + boot.extraModulePackages = optional ( + cfg.clients != { } && (versionOlder kernel.version "5.6") + ) kernelPackages.wireguard; - (mkIf (cfg.tunnels != { }) { - boot.extraModulePackages = optional (versionOlder kernel.kernel.version "5.6") kernel.wireguard; + environment.systemPackages = toClientList (client: client.wrapper) + # omitted due to https://github.com/netbirdio/netbird/issues/1562 + #++ optional (cfg.clients != { }) cfg.package + # omitted due to https://github.com/netbirdio/netbird/issues/1581 + #++ optional (cfg.clients != { } && cfg.ui.enable) cfg.ui.package + ; - environment.systemPackages = [ cfg.package ]; + networking.dhcpcd.denyInterfaces = toClientList (client: client.interface); + networking.networkmanager.unmanaged = toClientList (client: "interface-name:${client.interface}"); - networking.dhcpcd.denyInterfaces = attrNames cfg.tunnels; + networking.firewall.allowedUDPPorts = concatLists ( + toClientList (client: optional client.openFirewall client.port) + ); systemd.network.networks = mkIf config.networking.useNetworkd ( - mapAttrs' ( - name: _: - nameValuePair "50-netbird-${name}" { + toClientAttrs ( + client: + nameValuePair "50-netbird-${client.interface}" { matchConfig = { - Name = name; + Name = client.interface; }; linkConfig = { Unmanaged = true; ActivationPolicy = "manual"; }; } - ) cfg.tunnels + ) + ); + + environment.etc = toClientAttrs ( + client: + nameValuePair "${client.dir.baseName}/config.d/50-nixos.json" { + text = builtins.toJSON client.config; + mode = "0444"; + } ); - systemd.services = mapAttrs' ( - name: - { environment, stateDir, ... }: - nameValuePair "netbird-${name}" { + systemd.services = toClientAttrs ( + client: + nameValuePair client.service.name { description = "A WireGuard-based mesh network that connects your devices into a single private network"; documentation = [ "https://netbird.io/docs/" ]; @@ -137,17 +504,19 @@ in after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; - path = with pkgs; [ openresolv ]; - - inherit environment; + path = optional (!config.services.resolved.enable) pkgs.openresolv; serviceConfig = { - ExecStart = "${getExe cfg.package} service run"; + ExecStart = "${getExe client.wrapper} service run"; Restart = "always"; - RuntimeDirectory = stateDir; - StateDirectory = stateDir; + + RuntimeDirectory = client.dir.baseName; + RuntimeDirectoryMode = mkDefault "0755"; + ConfigurationDirectory = client.dir.baseName; + StateDirectory = client.dir.baseName; StateDirectoryMode = "0700"; - WorkingDirectory = "/var/lib/${stateDir}"; + + WorkingDirectory = client.dir.state; }; unitConfig = { @@ -157,7 +526,124 @@ in stopIfChanged = false; } - ) cfg.tunnels; + ); + } + # Hardening section + (mkIf (hardenedClients != { }) { + users.groups = toHardenedClientAttrs (client: nameValuePair client.user.group { }); + users.users = toHardenedClientAttrs ( + client: + nameValuePair client.user.name { + isSystemUser = true; + home = client.dir.state; + group = client.user.group; + } + ); + + systemd.services = toHardenedClientAttrs ( + client: + nameValuePair client.service.name ( + mkIf client.hardened { + serviceConfig = { + RuntimeDirectoryMode = "0750"; + + User = client.user.name; + Group = client.user.group; + + # settings implied by DynamicUser=true, without actully using it, + # see https://www.freedesktop.org/software/systemd/man/latest/systemd.exec.html#DynamicUser= + RemoveIPC = true; + PrivateTmp = true; + ProtectSystem = "strict"; + ProtectHome = "yes"; + + AmbientCapabilities = + [ + # see https://man7.org/linux/man-pages/man7/capabilities.7.html + # see https://docs.netbird.io/how-to/installation#running-net-bird-in-docker + # + # seems to work fine without CAP_SYS_ADMIN and CAP_SYS_RESOURCE + # CAP_NET_BIND_SERVICE could be added to allow binding on low ports, but is not required, + # see https://github.com/netbirdio/netbird/pull/1513 + + # failed creating tunnel interface wt-priv: [operation not permitted + "CAP_NET_ADMIN" + # failed to pull up wgInterface [wt-priv]: failed to create ipv4 raw socket: socket: operation not permitted + "CAP_NET_RAW" + ] + # required for eBPF filter, used to be subset of CAP_SYS_ADMIN + ++ optional (versionAtLeast kernel.version "5.8") "CAP_BPF" + ++ optional (versionOlder kernel.version "5.8") "CAP_SYS_ADMIN" + ++ optional ( + client.dns-resolver.address != null && client.dns-resolver.port < 1024 + ) "CAP_NET_BIND_SERVICE"; + }; + } + ) + ); + + # see https://github.com/systemd/systemd/blob/17f3e91e8107b2b29fe25755651b230bbc81a514/src/resolve/org.freedesktop.resolve1.policy#L43-L43 + # see all actions used at https://github.com/netbirdio/netbird/blob/13e7198046a0d73a9cd91bf8e063fafb3d41885c/client/internal/dns/systemd_linux.go#L29-L32 + security.polkit.extraConfig = mkIf config.services.resolved.enable '' + // systemd-resolved access for Netbird clients + polkit.addRule(function(action, subject) { + var actions = [ + "org.freedesktop.resolve1.revert", + "org.freedesktop.resolve1.set-default-route", + "org.freedesktop.resolve1.set-dns-servers", + "org.freedesktop.resolve1.set-domains", + ]; + var users = ${builtins.toJSON (toHardenedClientList (client: client.user.name))}; + + if (actions.indexOf(action.id) >= 0 && users.indexOf(subject.user) >= 0 ) { + return polkit.Result.YES; + } + }); + ''; }) + # migration & temporary fixups section + { + systemd.services = toClientAttrs ( + client: + nameValuePair client.service.name { + preStart = '' + set -eEuo pipefail + ${optionalString (client.logLevel == "trace" || client.logLevel == "debug") "set -x"} + + PATH="${ + makeBinPath ( + with pkgs; + [ + coreutils + jq + diffutils + ] + ) + }:$PATH" + export ${toShellVars client.environment} + + # merge /etc/${client.dir.baseName}/config.d' into "$NB_CONFIG" + { + test -e "$NB_CONFIG" || echo -n '{}' > "$NB_CONFIG" + + # merge config.d with "$NB_CONFIG" into "$NB_CONFIG.new" + jq -sS 'reduce .[] as $i ({}; . * $i)' \ + "$NB_CONFIG" \ + /etc/${client.dir.baseName}/config.d/*.json \ + > "$NB_CONFIG.new" + + echo "Comparing $NB_CONFIG with $NB_CONFIG.new ..." + if ! diff <(jq -S <"$NB_CONFIG") "$NB_CONFIG.new" ; then + echo "Updating $NB_CONFIG ..." + mv "$NB_CONFIG.new" "$NB_CONFIG" + else + echo "Files are the same, not doing anything." + rm "$NB_CONFIG.new" + fi + } + ''; + } + ); + } ]; } diff --git a/nixos/modules/services/networking/wpa_supplicant.nix b/nixos/modules/services/networking/wpa_supplicant.nix index 69c3f25d1870c..f4caf21dc3b25 100644 --- a/nixos/modules/services/networking/wpa_supplicant.nix +++ b/nixos/modules/services/networking/wpa_supplicant.nix @@ -94,7 +94,7 @@ let ++ optional (pskString != null) "psk=${pskString}" ++ optionals (opts.auth != null) (filter (x: x != "") (splitString "\n" opts.auth)) ++ optional (opts.priority != null) "priority=${toString opts.priority}" - ++ optional (opts.extraConfig != "") opts.extraConfig; + ++ filter (x: x != "") (splitString "\n" opts.extraConfig); in '' network={ diff --git a/nixos/modules/services/search/hound.nix b/nixos/modules/services/search/hound.nix index 33ade1b963b4a..98ef752aa8e8c 100644 --- a/nixos/modules/services/search/hound.nix +++ b/nixos/modules/services/search/hound.nix @@ -7,6 +7,13 @@ let cfg = config.services.hound; settingsFormat = pkgs.formats.json { }; + houndConfigFile = pkgs.writeTextFile { + name = "hound-config.json"; + text = builtins.toJSON cfg.settings; + checkPhase = '' + ${cfg.package}/bin/houndd -check-conf -conf $out + ''; + }; in { imports = [ @@ -96,13 +103,7 @@ in }; }; - environment.etc."hound/config.json".source = pkgs.writeTextFile { - name = "hound-config"; - text = builtins.toJSON cfg.settings; - checkPhase = '' - ${cfg.package}/bin/houndd -check-conf -conf $out - ''; - }; + environment.etc."hound/config.json".source = houndConfigFile; services.hound.settings = { dbpath = "${config.services.hound.home}/data"; @@ -112,6 +113,7 @@ in description = "Hound Code Search"; wantedBy = [ "multi-user.target" ]; after = [ "network.target" ]; + restartTriggers = [ houndConfigFile ]; serviceConfig = { User = cfg.user; Group = cfg.group; diff --git a/nixos/modules/services/security/canaille.nix b/nixos/modules/services/security/canaille.nix index 427ecaffde219..4489b5f71c1ed 100644 --- a/nixos/modules/services/security/canaille.nix +++ b/nixos/modules/services/security/canaille.nix @@ -33,9 +33,12 @@ let old.dependencies ++ old.optional-dependencies.front ++ old.optional-dependencies.oidc + ++ old.optional-dependencies.scim ++ old.optional-dependencies.ldap ++ old.optional-dependencies.sentry - ++ old.optional-dependencies.postgresql; + ++ old.optional-dependencies.postgresql + ++ old.optional-dependencies.otp + ++ old.optional-dependencies.sms; makeWrapperArgs = (old.makeWrapperArgs or [ ]) ++ [ "--set CONFIG /etc/canaille/config.toml" "--set SECRETS_DIR \"${secretsDir}\"" diff --git a/nixos/modules/services/wayland/hypridle.nix b/nixos/modules/services/wayland/hypridle.nix index 83a081aa67414..4ccb126b56f2c 100644 --- a/nixos/modules/services/wayland/hypridle.nix +++ b/nixos/modules/services/wayland/hypridle.nix @@ -28,5 +28,5 @@ in }; }; - meta.maintainers = with lib.maintainers; [ johnrtitor ]; + meta.maintainers = lib.teams.hyprland.members; } diff --git a/nixos/modules/services/web-apps/calibre-web.nix b/nixos/modules/services/web-apps/calibre-web.nix index c0fdbaa234358..8f61a8ac9e979 100644 --- a/nixos/modules/services/web-apps/calibre-web.nix +++ b/nixos/modules/services/web-apps/calibre-web.nix @@ -2,6 +2,7 @@ let cfg = config.services.calibre-web; + dataDir = if lib.hasPrefix "/" cfg.dataDir then cfg.dataDir else "/var/lib/${cfg.dataDir}"; inherit (lib) concatStringsSep mkEnableOption mkIf mkOption optional optionalString types; in @@ -32,9 +33,10 @@ in dataDir = mkOption { type = types.str; - default = "/var/lib/calibre-web"; + default = "calibre-web"; description = '' - The directory where Calibre-Web stores its data. + Where Calibre-Web stores its data. + Either an absolute path, or the directory name below {file}`/var/lib`. ''; }; @@ -107,14 +109,16 @@ in }; config = mkIf cfg.enable { - systemd.tmpfiles.settings."10-calibre-web".${cfg.dataDir}.d = { - inherit (cfg) user group; - mode = "0700"; + systemd.tmpfiles.settings = lib.optionalAttrs (lib.hasPrefix "/" cfg.dataDir) { + "10-calibre-web".${dataDir}.d = { + inherit (cfg) user group; + mode = "0700"; + }; }; systemd.services.calibre-web = let - appDb = "${cfg.dataDir}/app.db"; - gdriveDb = "${cfg.dataDir}/gdrive.db"; + appDb = "${dataDir}/app.db"; + gdriveDb = "${dataDir}/gdrive.db"; calibreWebCmd = "${cfg.package}/bin/calibre-web -p ${appDb} -g ${gdriveDb}"; settings = concatStringsSep ", " ( @@ -151,6 +155,8 @@ in ExecStart = "${calibreWebCmd} -i ${cfg.listen.ip}"; Restart = "on-failure"; + } // lib.optionalAttrs (!(lib.hasPrefix "/" cfg.dataDir)) { + StateDirectory = cfg.dataDir; }; }; diff --git a/nixos/modules/services/web-apps/freshrss.nix b/nixos/modules/services/web-apps/freshrss.nix index 9bd690d211670..a1aae7e31844f 100644 --- a/nixos/modules/services/web-apps/freshrss.nix +++ b/nixos/modules/services/web-apps/freshrss.nix @@ -3,6 +3,7 @@ with lib; let cfg = config.services.freshrss; + webserver = config.services.${cfg.webserver}; extension-env = pkgs.buildEnv { name = "freshrss-extensions"; @@ -129,13 +130,25 @@ in example = "/mnt/freshrss"; }; + webserver = mkOption { + type = types.enum [ "nginx" "caddy" "none"]; + default = "nginx"; + description = '' + Whether to use nginx or caddy for virtual host management. + + Further nginx configuration can be done by adapting `services.nginx.virtualHosts.`. + See [](#opt-services.nginx.virtualHosts) for further information. + + Further caddy configuration can be done by adapting `services.caddy.virtualHosts.`. + See [](#opt-services.caddy.virtualHosts) for further information. + ''; + }; + virtualHost = mkOption { - type = types.nullOr types.str; + type = types.str; default = "freshrss"; description = '' - Name of the nginx virtualhost to use and setup. If null, do not setup any virtualhost. - You may need to configure the virtualhost further through services.nginx.virtualHosts., - for example to enable SSL. + Name of the caddy/nginx virtualhost to use and setup. ''; }; @@ -204,8 +217,21 @@ in ''; } ]; + + # Set up a Caddy virtual host. + services.caddy = mkIf (cfg.webserver == "caddy") { + enable = true; + virtualHosts.${cfg.virtualHost}.extraConfig = '' + root * ${config.services.freshrss.package}/p + php_fastcgi unix/${config.services.phpfpm.pools.freshrss.socket} { + env FRESHRSS_DATA_PATH ${config.services.freshrss.dataDir} + } + file_server + ''; + }; + # Set up a Nginx virtual host. - services.nginx = mkIf (cfg.virtualHost != null) { + services.nginx = mkIf (cfg.webserver == "nginx") { enable = true; virtualHosts.${cfg.virtualHost} = { root = "${cfg.package}/p"; @@ -237,8 +263,8 @@ in ${cfg.pool} = { user = "freshrss"; settings = { - "listen.owner" = "nginx"; - "listen.group" = "nginx"; + "listen.owner" = webserver.user; + "listen.group" = webserver.group; "listen.mode" = "0600"; "pm" = "dynamic"; "pm.max_children" = 32; diff --git a/nixos/modules/services/web-apps/homebox.nix b/nixos/modules/services/web-apps/homebox.nix index 9b72a45e7d341..a6f4a58d0e578 100644 --- a/nixos/modules/services/web-apps/homebox.nix +++ b/nixos/modules/services/web-apps/homebox.nix @@ -24,11 +24,12 @@ in HBOX_STORAGE_DATA = "/var/lib/homebox/data"; HBOX_STORAGE_SQLITE_URL = "/var/lib/homebox/data/homebox.db?_pragma=busy_timeout=999&_pragma=journal_mode=WAL&_fk=1"; HBOX_OPTIONS_ALLOW_REGISTRATION = "false"; + HBOX_OPTIONS_CHECK_GITHUB_RELEASE = "false"; HBOX_MODE = "production"; ''; description = '' The homebox configuration as Environment variables. For definitions and available options see the upstream - [documentation](https://homebox.software/en/quick-start.html#env-variables-configuration). + [documentation](https://homebox.software/en/configure-homebox.html). ''; }; }; @@ -43,6 +44,7 @@ in HBOX_STORAGE_DATA = mkDefault "/var/lib/homebox/data"; HBOX_STORAGE_SQLITE_URL = mkDefault "/var/lib/homebox/data/homebox.db?_pragma=busy_timeout=999&_pragma=journal_mode=WAL&_fk=1"; HBOX_OPTIONS_ALLOW_REGISTRATION = mkDefault "false"; + HBOX_OPTIONS_CHECK_GITHUB_RELEASE = mkDefault "false"; HBOX_MODE = mkDefault "production"; }; systemd.services.homebox = { diff --git a/nixos/modules/services/web-apps/pixelfed.nix b/nixos/modules/services/web-apps/pixelfed.nix index 4c64a10951ab2..41416e5e529e7 100644 --- a/nixos/modules/services/web-apps/pixelfed.nix +++ b/nixos/modules/services/web-apps/pixelfed.nix @@ -109,7 +109,7 @@ in { } ''; description = '' - With this option, you can customize an nginx virtual host which already has sensible defaults for Dolibarr. + With this option, you can customize an nginx virtual host which already has sensible defaults for Pixelfed. Set to {} if you do not need any customization to the virtual host. If enabled, then by default, the {option}`serverName` is `''${domain}`, diff --git a/nixos/modules/system/activation/pre-switch-check.nix b/nixos/modules/system/activation/pre-switch-check.nix index e8640a0db3f23..2b53e390b19d0 100644 --- a/nixos/modules/system/activation/pre-switch-check.nix +++ b/nixos/modules/system/activation/pre-switch-check.nix @@ -44,6 +44,9 @@ in A set of shell script fragments that are executed before the switch to a new NixOS system configuration. A failure in any of these fragments will cause the switch to fail and exit early. + The scripts receive the new configuration path and the action verb passed + to switch-to-configuration, as the first and second positional arguments + (meaning that you can access them using `$1` and `$2`, respectively). ''; type = lib.types.attrsOf lib.types.str; diff --git a/nixos/modules/system/activation/switch-to-configuration.pl b/nixos/modules/system/activation/switch-to-configuration.pl index 3553c5fce4ce8..672291541d034 100755 --- a/nixos/modules/system/activation/switch-to-configuration.pl +++ b/nixos/modules/system/activation/switch-to-configuration.pl @@ -103,7 +103,7 @@ chomp(my $pre_switch_checks = <<'EOFCHECKS'); @preSwitchCheck@ EOFCHECKS - system("$pre_switch_checks $out") == 0 or exit 1; + system("$pre_switch_checks $out $action") == 0 or exit 1; if ($action eq "check") { exit 0; } diff --git a/nixos/modules/system/boot/loader/grub/install-grub.pl b/nixos/modules/system/boot/loader/grub/install-grub.pl index 6f0f62546a018..3e88d43bd9a11 100644 --- a/nixos/modules/system/boot/loader/grub/install-grub.pl +++ b/nixos/modules/system/boot/loader/grub/install-grub.pl @@ -527,7 +527,7 @@ sub addGeneration { my @links = sort (glob "$path/specialisation/*"); if ($current != 1 && scalar(@links) != 0) { - $conf .= "submenu \"> $name$nameSuffix\" --class submenu {\n"; + $conf .= "submenu \"$name$nameSuffix\" --class submenu {\n"; } addEntry("$name" . (scalar(@links) == 0 ? "" : " - Default") . $nameSuffix, $path, $options, $current); diff --git a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix index 85fcbb83cecee..e5080bd8d191a 100644 --- a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix +++ b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix @@ -31,7 +31,7 @@ let edk2ShellEspPath = "efi/edk2-uefi-shell/shell.efi"; - systemdBootBuilder = pkgs.substituteAll rec { + systemdBootBuilder = pkgs.replaceVarsWith { name = "systemd-boot"; dir = "bin"; @@ -40,68 +40,66 @@ let isExecutable = true; - inherit (builtins) storeDir; + replacements = rec { + inherit (builtins) storeDir; - inherit (pkgs) python3; + inherit (pkgs) python3; - systemd = config.systemd.package; + systemd = config.systemd.package; - bootspecTools = pkgs.bootspec; + bootspecTools = pkgs.bootspec; - nix = config.nix.package.out; + nix = config.nix.package.out; - timeout = if config.boot.loader.timeout == null then "menu-force" else config.boot.loader.timeout; + timeout = if config.boot.loader.timeout == null then "menu-force" else config.boot.loader.timeout; - configurationLimit = if cfg.configurationLimit == null then 0 else cfg.configurationLimit; + configurationLimit = if cfg.configurationLimit == null then 0 else cfg.configurationLimit; - inherit (cfg) - consoleMode - graceful - editor - rebootForBitlocker - ; + inherit (cfg) + consoleMode + graceful + editor + rebootForBitlocker + ; - inherit (efi) efiSysMountPoint canTouchEfiVariables; + inherit (efi) efiSysMountPoint canTouchEfiVariables; - bootMountPoint = - if cfg.xbootldrMountPoint != null then cfg.xbootldrMountPoint else efi.efiSysMountPoint; + bootMountPoint = + if cfg.xbootldrMountPoint != null then cfg.xbootldrMountPoint else efi.efiSysMountPoint; - nixosDir = "/EFI/nixos"; + nixosDir = "/EFI/nixos"; - inherit (config.system.nixos) distroName; + inherit (config.system.nixos) distroName; - memtest86 = optionalString cfg.memtest86.enable pkgs.memtest86plus; - - netbootxyz = optionalString cfg.netbootxyz.enable pkgs.netbootxyz-efi; + checkMountpoints = pkgs.writeShellScript "check-mountpoints" '' + fail() { + echo "$1 = '$2' is not a mounted partition. Is the path configured correctly?" >&2 + exit 1 + } + ${pkgs.util-linuxMinimal}/bin/findmnt ${efiSysMountPoint} > /dev/null || fail efiSysMountPoint ${efiSysMountPoint} + ${lib.optionalString (cfg.xbootldrMountPoint != null) + "${pkgs.util-linuxMinimal}/bin/findmnt ${cfg.xbootldrMountPoint} > /dev/null || fail xbootldrMountPoint ${cfg.xbootldrMountPoint}" + } + ''; - checkMountpoints = pkgs.writeShellScript "check-mountpoints" '' - fail() { - echo "$1 = '$2' is not a mounted partition. Is the path configured correctly?" >&2 - exit 1 - } - ${pkgs.util-linuxMinimal}/bin/findmnt ${efiSysMountPoint} > /dev/null || fail efiSysMountPoint ${efiSysMountPoint} - ${lib.optionalString (cfg.xbootldrMountPoint != null) - "${pkgs.util-linuxMinimal}/bin/findmnt ${cfg.xbootldrMountPoint} > /dev/null || fail xbootldrMountPoint ${cfg.xbootldrMountPoint}" - } - ''; - - copyExtraFiles = pkgs.writeShellScript "copy-extra-files" '' - empty_file=$(${pkgs.coreutils}/bin/mktemp) - - ${concatStrings ( - mapAttrsToList (n: v: '' - ${pkgs.coreutils}/bin/install -Dp "${v}" "${bootMountPoint}/"${escapeShellArg n} - ${pkgs.coreutils}/bin/install -D $empty_file "${bootMountPoint}/${nixosDir}/.extra-files/"${escapeShellArg n} - '') cfg.extraFiles - )} - - ${concatStrings ( - mapAttrsToList (n: v: '' - ${pkgs.coreutils}/bin/install -Dp "${pkgs.writeText n v}" "${bootMountPoint}/loader/entries/"${escapeShellArg n} - ${pkgs.coreutils}/bin/install -D $empty_file "${bootMountPoint}/${nixosDir}/.extra-files/loader/entries/"${escapeShellArg n} - '') cfg.extraEntries - )} - ''; + copyExtraFiles = pkgs.writeShellScript "copy-extra-files" '' + empty_file=$(${pkgs.coreutils}/bin/mktemp) + + ${concatStrings ( + mapAttrsToList (n: v: '' + ${pkgs.coreutils}/bin/install -Dp "${v}" "${bootMountPoint}/"${escapeShellArg n} + ${pkgs.coreutils}/bin/install -D $empty_file "${bootMountPoint}/${nixosDir}/.extra-files/"${escapeShellArg n} + '') cfg.extraFiles + )} + + ${concatStrings ( + mapAttrsToList (n: v: '' + ${pkgs.coreutils}/bin/install -Dp "${pkgs.writeText n v}" "${bootMountPoint}/loader/entries/"${escapeShellArg n} + ${pkgs.coreutils}/bin/install -D $empty_file "${bootMountPoint}/${nixosDir}/.extra-files/loader/entries/"${escapeShellArg n} + '') cfg.extraEntries + )} + ''; + }; }; finalSystemdBootBuilder = pkgs.writeScript "install-systemd-boot.sh" '' diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 384371033c727..4dfc0e1e7831e 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -975,6 +975,7 @@ in { spark = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./spark {}; spiped = runTest ./spiped.nix; sqlite3-to-mysql = handleTest ./sqlite3-to-mysql.nix {}; + squid = handleTest ./squid.nix {}; sslh = handleTest ./sslh.nix {}; ssh-agent-auth = handleTest ./ssh-agent-auth.nix {}; ssh-audit = handleTest ./ssh-audit.nix {}; diff --git a/nixos/tests/freshrss/caddy-sqlite.nix b/nixos/tests/freshrss/caddy-sqlite.nix new file mode 100644 index 0000000000000..69b62ab3b8992 --- /dev/null +++ b/nixos/tests/freshrss/caddy-sqlite.nix @@ -0,0 +1,30 @@ +import ../make-test-python.nix ( + { lib, pkgs, ... }: + { + name = "freshrss-caddy-sqlite"; + meta.maintainers = with lib.maintainers; [ + etu + stunkymonkey + ]; + + nodes.machine = + { pkgs, ... }: + { + services.freshrss = { + enable = true; + baseUrl = "http://localhost"; + passwordFile = pkgs.writeText "password" "secret"; + dataDir = "/srv/freshrss"; + webserver = "caddy"; + virtualHost = "freshrss:80"; + }; + }; + + testScript = '' + machine.wait_for_unit("multi-user.target") + machine.wait_for_open_port(80) + response = machine.succeed("curl -vvv -s -H 'Host: freshrss' http://localhost:80/i/") + assert 'Login · FreshRSS' in response, "Login page didn't load successfully" + ''; + } +) diff --git a/nixos/tests/freshrss/default.nix b/nixos/tests/freshrss/default.nix index 67892596ba23c..9253ee7f7e4ab 100644 --- a/nixos/tests/freshrss/default.nix +++ b/nixos/tests/freshrss/default.nix @@ -5,5 +5,6 @@ http-auth = import ./http-auth.nix { inherit system pkgs; }; none-auth = import ./none-auth.nix { inherit system pkgs; }; pgsql = import ./pgsql.nix { inherit system pkgs; }; - sqlite = import ./sqlite.nix { inherit system pkgs; }; + nginx-sqlite = import ./nginx-sqlite.nix { inherit system pkgs; }; + caddy-sqlite = import ./caddy-sqlite.nix { inherit system pkgs; }; } diff --git a/nixos/tests/freshrss/extensions.nix b/nixos/tests/freshrss/extensions.nix index 7aba55a3f5e1a..d2758fd387b40 100644 --- a/nixos/tests/freshrss/extensions.nix +++ b/nixos/tests/freshrss/extensions.nix @@ -17,7 +17,7 @@ import ../make-test-python.nix ( testScript = '' machine.wait_for_unit("multi-user.target") machine.wait_for_open_port(80) - response = machine.succeed("curl -vvv -s http://127.0.0.1:80/i/?c=extension") + response = machine.succeed("curl -vvv -s http://localhost:80/i/?c=extension") assert 'YouTube Video Feed' in response, "Extension not present in extensions page." ''; } diff --git a/nixos/tests/freshrss/http-auth.nix b/nixos/tests/freshrss/http-auth.nix index 84c308a7e48d3..f0fb28ee188f9 100644 --- a/nixos/tests/freshrss/http-auth.nix +++ b/nixos/tests/freshrss/http-auth.nix @@ -18,7 +18,7 @@ import ../make-test-python.nix ( testScript = '' machine.wait_for_unit("multi-user.target") machine.wait_for_open_port(80) - response = machine.succeed("curl -vvv -s -H 'Host: freshrss' -H 'Remote-User: testuser' http://127.0.0.1:80/i/") + response = machine.succeed("curl -vvv -s -H 'Host: freshrss' -H 'Remote-User: testuser' http://localhost:80/i/") assert 'Account: testuser' in response, "http_auth method didn't work." ''; } diff --git a/nixos/tests/freshrss/sqlite.nix b/nixos/tests/freshrss/nginx-sqlite.nix similarity index 91% rename from nixos/tests/freshrss/sqlite.nix rename to nixos/tests/freshrss/nginx-sqlite.nix index 5edc081e5d7ce..2425dc086549f 100644 --- a/nixos/tests/freshrss/sqlite.nix +++ b/nixos/tests/freshrss/nginx-sqlite.nix @@ -1,7 +1,7 @@ import ../make-test-python.nix ( { lib, pkgs, ... }: { - name = "freshrss-sqlite"; + name = "freshrss-nginx-sqlite"; meta.maintainers = with lib.maintainers; [ etu stunkymonkey @@ -21,7 +21,7 @@ import ../make-test-python.nix ( testScript = '' machine.wait_for_unit("multi-user.target") machine.wait_for_open_port(80) - response = machine.succeed("curl -vvv -s -H 'Host: freshrss' http://127.0.0.1:80/i/") + response = machine.succeed("curl -vvv -s -H 'Host: freshrss' http://localhost:80/i/") assert 'Login · FreshRSS' in response, "Login page didn't load successfully" ''; } diff --git a/nixos/tests/freshrss/none-auth.nix b/nixos/tests/freshrss/none-auth.nix index 1a945ebb9b382..1e504a8695344 100644 --- a/nixos/tests/freshrss/none-auth.nix +++ b/nixos/tests/freshrss/none-auth.nix @@ -17,7 +17,7 @@ import ../make-test-python.nix ( testScript = '' machine.wait_for_unit("multi-user.target") machine.wait_for_open_port(80) - response = machine.succeed("curl -vvv -s http://127.0.0.1:80/i/") + response = machine.succeed("curl -vvv -s http://localhost:80/i/") assert 'Main stream · FreshRSS' in response, "FreshRSS stream page didn't load successfully" ''; } diff --git a/nixos/tests/freshrss/pgsql.nix b/nixos/tests/freshrss/pgsql.nix index feb3b3bf1314a..a3f3f938db98a 100644 --- a/nixos/tests/freshrss/pgsql.nix +++ b/nixos/tests/freshrss/pgsql.nix @@ -47,7 +47,7 @@ import ../make-test-python.nix ( machine.wait_for_unit("multi-user.target") machine.wait_for_open_port(5432) machine.wait_for_open_port(80) - response = machine.succeed("curl -vvv -s -H 'Host: freshrss' http://127.0.0.1:80/i/") + response = machine.succeed("curl -vvv -s -H 'Host: freshrss' http://localhost:80/i/") assert 'Login · FreshRSS' in response, "Login page didn't load successfully" ''; } diff --git a/nixos/tests/hound.nix b/nixos/tests/hound.nix index 75400eca232bd..b73ba27bed296 100644 --- a/nixos/tests/hound.nix +++ b/nixos/tests/hound.nix @@ -11,17 +11,15 @@ import ./make-test-python.nix ( { services.hound = { enable = true; - config = '' - { - "max-concurrent-indexers": 1, - "dbpath": "/var/lib/hound/data", - "repos": { - "nix": { - "url": "file:///var/lib/hound/my-git" - } - } - } - ''; + settings = { + "max-concurrent-indexers" = 1; + "dbpath" = "/var/lib/hound/data"; + "repos" = { + "nix" = { + "url" = "file:///var/lib/hound/my-git"; + }; + }; + }; }; systemd.services.houndseed = { diff --git a/nixos/tests/netbird.nix b/nixos/tests/netbird.nix index 887747437c22c..f684a31042651 100644 --- a/nixos/tests/netbird.nix +++ b/nixos/tests/netbird.nix @@ -1,19 +1,59 @@ -import ./make-test-python.nix ({ pkgs, lib, ... }: -{ - name = "netbird"; +import ./make-test-python.nix ( + { pkgs, lib, ... }: + { + name = "netbird"; - meta.maintainers = with pkgs.lib.maintainers; [ ]; + meta.maintainers = with pkgs.lib.maintainers; [ + nazarewk + ]; - nodes = { - node = { ... }: { - services.netbird.enable = true; + nodes = { + clients = + { ... }: + { + services.netbird.enable = true; + services.netbird.clients.custom.port = 51819; + }; }; - }; - testScript = '' - start_all() - node.wait_for_unit("netbird-wt0.service") - node.wait_for_file("/var/run/netbird/sock") - node.succeed("netbird status | grep -q 'Daemon status: NeedsLogin'") - ''; -}) + # TODO: confirm the whole solution is working end-to-end when netbird server is implemented + testScript = '' + start_all() + def did_start(node, name): + node.wait_for_unit(f"{name}.service") + node.wait_for_file(f"/var/run/{name}/sock") + output = node.succeed(f"{name} status") + + # not sure why, but it can print either of: + # - Daemon status: NeedsLogin + # - Management: Disconnected + expected = [ + "Disconnected", + "NeedsLogin", + ] + assert any(msg in output for msg in expected) + + did_start(clients, "netbird") + did_start(clients, "netbird-custom") + ''; + + /* + `netbird status` used to print `Daemon status: NeedsLogin` + https://github.com/netbirdio/netbird/blob/23a14737974e3849fa86408d136cc46db8a885d0/client/cmd/status.go#L154-L164 + as the first line, but now it is just: + + Daemon version: 0.26.3 + CLI version: 0.26.3 + Management: Disconnected + Signal: Disconnected + Relays: 0/0 Available + Nameservers: 0/0 Available + FQDN: + NetBird IP: N/A + Interface type: N/A + Quantum resistance: false + Routes: - + Peers count: 0/0 Connected + */ + } +) diff --git a/nixos/tests/squid.nix b/nixos/tests/squid.nix new file mode 100644 index 0000000000000..7b38e5c75b105 --- /dev/null +++ b/nixos/tests/squid.nix @@ -0,0 +1,165 @@ +# This is a distributed test of the Squid as a forward proxy +# - "external" -- i.e. the internet, where the proxy and server communicate +# - "internal" -- i.e. an office LAN, where the client and proxy communicat + +import ./make-test-python.nix ( + { + pkgs, + lib, + ... + }: + # VLANS: + # 1 -- simulates the internal network + # 2 -- simulates the external network + let + commonConfig = { + # Disable eth0 autoconfiguration + networking.useDHCP = false; + + environment.systemPackages = [ + (pkgs.writeScriptBin "check-connection" '' + #!/usr/bin/env bash + + set -e + + if [[ "$2" == "" || "$1" == "--help" || "$1" == "-h" ]]; + then + echo "check-connection <[expect-success|expect-failure]>" + exit 1 + fi + + ADDRESS="$1" + + function test_icmp() { timeout 3 ping -c 1 "$ADDRESS"; } + + if [[ "$2" == "expect-success" ]]; + then + test_icmp + else + ! test_icmp + fi + '') + ]; + }; + in + { + name = "squid"; + meta = with pkgs.lib.maintainers; { + maintainers = [ cobalt ]; + }; + + nodes = { + client = + { ... }: + lib.mkMerge [ + commonConfig + { + virtualisation.vlans = [ 1 ]; + networking.firewall.enable = true; + } + ]; + + proxy = + { config, nodes, ... }: + let + clientIp = (pkgs.lib.head nodes.client.networking.interfaces.eth1.ipv4.addresses).address; + serverIp = (pkgs.lib.head nodes.server.networking.interfaces.eth1.ipv4.addresses).address; + in + lib.mkMerge [ + commonConfig + { + virtualisation.vlans = [ + 1 + 2 + ]; + networking.firewall.enable = true; + networking.firewall.allowedTCPPorts = [ config.services.squid.proxyPort ]; + + nixpkgs.config.permittedInsecurePackages = [ + "squid-6.12" + ]; + + services.squid = { + enable = true; + + extraConfig = '' + acl client src ${clientIp} + acl server dst ${serverIp} + http_access allow client server + ''; + }; + } + ]; + + server = + { ... }: + lib.mkMerge [ + commonConfig + { + virtualisation.vlans = [ 2 ]; + networking.firewall.enable = true; + networking.firewall.allowedTCPPorts = [ 80 ]; + + services.nginx = { + enable = true; + + virtualHosts."server" = { + root = "/etc"; + locations."/".index = "hostname"; + listen = [ + { + addr = "0.0.0.0"; + port = 80; + } + ]; + }; + }; + } + ]; + }; + + testScript = + { nodes, ... }: + let + clientIp = (pkgs.lib.head nodes.client.networking.interfaces.eth1.ipv4.addresses).address; + serverIp = (pkgs.lib.head nodes.server.networking.interfaces.eth1.ipv4.addresses).address; + proxyExternalIp = (pkgs.lib.head nodes.proxy.networking.interfaces.eth2.ipv4.addresses).address; + proxyInternalIp = (pkgs.lib.head nodes.proxy.networking.interfaces.eth1.ipv4.addresses).address; + in + '' + client.start() + proxy.start() + server.start() + + proxy.wait_for_unit("network.target") + proxy.wait_for_unit("squid.service") + client.wait_for_unit("network.target") + server.wait_for_unit("network.target") + server.wait_for_unit("nginx.service") + + # Topology checks. + with subtest("proxy connectivity"): + ## The proxy should have direct access to the server and client + proxy.succeed("check-connection ${serverIp} expect-success") + proxy.succeed("check-connection ${clientIp} expect-success") + + with subtest("server connectivity"): + ## The server should have direct access to the proxy + server.succeed("check-connection ${proxyExternalIp} expect-success") + ## ... and not have access to the client + server.succeed("check-connection ${clientIp} expect-failure") + + with subtest("client connectivity"): + # The client should be also able to connect to the proxy + client.succeed("check-connection ${proxyInternalIp} expect-success") + # but not the client to the server + client.succeed("check-connection ${serverIp} expect-failure") + + with subtest("HTTP"): + # the client cannot reach the server directly over HTTP + client.fail('[[ `timeout 3 curl http://${serverIp}` ]]') + # ... but can with the proxy + client.succeed('[[ `timeout 3 curl --proxy http://${proxyInternalIp}:3128 http://${serverIp}` == "server" ]]') + ''; + } +) diff --git a/nixos/tests/switch-test.nix b/nixos/tests/switch-test.nix index 37a808c3c471d..4ad08b726bf53 100644 --- a/nixos/tests/switch-test.nix +++ b/nixos/tests/switch-test.nix @@ -612,8 +612,10 @@ in { system.switch.enable = true; users.mutableUsers = true; system.preSwitchChecks.succeeds = '' - echo this will succeed - true + config="$1" + action="$2" + echo "this should succeed (config: $config, action: $action)" + [ "$action" == "check" ] || [ "$action" == "test" ] ''; specialisation.failingCheck.configuration.system.preSwitchChecks.failEveryTime = '' echo this will fail diff --git a/pkgs/applications/audio/librespot/default.nix b/pkgs/applications/audio/librespot/default.nix index 8493793969f0c..6a29a96e470b2 100644 --- a/pkgs/applications/audio/librespot/default.nix +++ b/pkgs/applications/audio/librespot/default.nix @@ -29,7 +29,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-dGQDRb7fgIkXelZKa+PdodIs9DxbgEMlVGJjK/hU3Mo="; }; - cargoHash = "sha256-GScAUqALoocqvsHz4XgPytI8cl0hiuWjqaO/ItNo4v4="; + useFetchCargoVendor = true; + cargoHash = "sha256-SqvJSHkyd1IicT6c4pE96dBJNNodULhpyG14HRGVWCk="; nativeBuildInputs = [ diff --git a/pkgs/applications/audio/schismtracker/default.nix b/pkgs/applications/audio/schismtracker/default.nix index faa298c06f63f..b35fdd3013c7e 100644 --- a/pkgs/applications/audio/schismtracker/default.nix +++ b/pkgs/applications/audio/schismtracker/default.nix @@ -9,17 +9,19 @@ SDL2, libXext, Cocoa, + utf8proc, + nix-update-script, }: stdenv.mkDerivation rec { pname = "schismtracker"; - version = "20240809"; + version = "20241226"; src = fetchFromGitHub { - owner = pname; - repo = pname; - rev = version; - sha256 = "sha256-J4al7XU+vvehDnp2fRrVesWyUN4i63g5btUkjarpXbk="; + owner = "schismtracker"; + repo = "schismtracker"; + tag = version; + hash = "sha256-CZc5rIAgEydb8JhtkRSqEB9PI7TC58oJZg939GIEiMs="; }; # If we let it try to get the version from git, it will fail and fall back @@ -30,9 +32,21 @@ stdenv.mkDerivation rec { --replace-fail 'git log' 'echo ${version} #' ''; - configureFlags = [ - "--enable-dependency-tracking" - ] ++ lib.optional stdenv.hostPlatform.isDarwin "--disable-sdltest"; + configureFlags = + [ + (lib.enableFeature true "dependency-tracking") + (lib.withFeature true "sdl2") + (lib.enableFeature true "sdl2-linking") + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + (lib.enableFeature true "alsa") + (lib.enableFeature true "alsa-linking") + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + (lib.enableFeature false "sdltest") + ]; + + strictDeps = true; nativeBuildInputs = [ autoreconfHook @@ -41,7 +55,10 @@ stdenv.mkDerivation rec { ]; buildInputs = - [ SDL2 ] + [ + SDL2 + utf8proc + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib libXext @@ -56,12 +73,14 @@ stdenv.mkDerivation rec { --replace '-lSDL2main' '-lSDL2' ''; - meta = with lib; { + passthru.updateScript = nix-update-script { }; + + meta = { description = "Music tracker application, free reimplementation of Impulse Tracker"; homepage = "https://schismtracker.org/"; - license = licenses.gpl2Plus; - platforms = platforms.unix; - maintainers = with maintainers; [ ftrvxmtrx ]; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ ftrvxmtrx ]; mainProgram = "schismtracker"; }; } diff --git a/pkgs/applications/audio/strawberry/default.nix b/pkgs/applications/audio/strawberry/default.nix index 0ffda870d8f5b..64588ad27d931 100644 --- a/pkgs/applications/audio/strawberry/default.nix +++ b/pkgs/applications/audio/strawberry/default.nix @@ -40,13 +40,13 @@ let in stdenv.mkDerivation rec { pname = "strawberry"; - version = "1.2.4"; + version = "1.2.6"; src = fetchFromGitHub { owner = "jonaski"; repo = pname; rev = version; - hash = "sha256-acTFJS8E0hQNbiiOi8DfPyTiUcKjXwg5trk3Q2mYYmQ="; + hash = "sha256-FfyvSNaO8dE6zz/PNKp/2kJHbauJjmQAhTriRE5lXEk="; }; # the big strawberry shown in the context menu is *very* much in your face, so use the grey version instead diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/el-easydraw/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/el-easydraw/package.nix index f9a586b23b8de..9282ff5cd4977 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/el-easydraw/package.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/el-easydraw/package.nix @@ -8,13 +8,13 @@ melpaBuild { pname = "edraw"; - version = "1.2.0-unstable-2025-01-06"; + version = "1.2.0-unstable-2025-01-16"; src = fetchFromGitHub { owner = "misohena"; repo = "el-easydraw"; - rev = "9a5b5e2b071be99350bfc8db6fbc2c9c667f3725"; - hash = "sha256-lQYSUQFAv6rqvZySsFbe8B7ZqEaa2L+L3HXB231D4OQ="; + rev = "449c1226f7108e1cf8b4b447a65fa053b6bd782f"; + hash = "sha256-u6lc2s4fqNWNCuICu832vAbMmV5X6FB8fIkJwgdBKfg="; }; propagatedUserEnvPkgs = [ gzip ]; diff --git a/pkgs/applications/editors/jetbrains/bin/versions.json b/pkgs/applications/editors/jetbrains/bin/versions.json index 6ac306823db80..5cf8080d0466d 100644 --- a/pkgs/applications/editors/jetbrains/bin/versions.json +++ b/pkgs/applications/editors/jetbrains/bin/versions.json @@ -3,10 +3,10 @@ "aqua": { "update-channel": "Aqua RELEASE", "url-template": "https://download.jetbrains.com/aqua/aqua-{version}.tar.gz", - "version": "2024.3.1", - "sha256": "e304d8f900881d18865010819dc035d59be00b1364baa2b98ef47d923907ce57", - "url": "https://download.jetbrains.com/aqua/aqua-2024.3.1.tar.gz", - "build_number": "243.22562.238" + "version": "2024.3.2", + "sha256": "de073e8a3734a2c4ef984b3e1bd68f5de72a6180e73400889510439ac3f419aa", + "url": "https://download.jetbrains.com/aqua/aqua-2024.3.2.tar.gz", + "build_number": "243.23654.154" }, "clion": { "update-channel": "CLion RELEASE", @@ -35,99 +35,99 @@ "gateway": { "update-channel": "Gateway RELEASE", "url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}.tar.gz", - "version": "2024.3.1.1", - "sha256": "625bd0794b535b40926f3fed15b50e1df8ee181acd5a1a8fb174f19cd450cef0", - "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2024.3.1.1.tar.gz", - "build_number": "243.22562.252" + "version": "2024.3.2", + "sha256": "39c8f8414cfeaacbbb011c33c539d7ca4007d7f867421438292572dc51398664", + "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2024.3.2.tar.gz", + "build_number": "243.23654.132" }, "goland": { "update-channel": "GoLand RELEASE", "url-template": "https://download.jetbrains.com/go/goland-{version}.tar.gz", - "version": "2024.3.2", - "sha256": "6700ec71240cbde6002e9b28680b02f3a4b9ee0a7bd7a4d3bf5a13f67b8d53af", - "url": "https://download.jetbrains.com/go/goland-2024.3.2.tar.gz", - "build_number": "243.23654.119" + "version": "2024.3.2.1", + "sha256": "8bd2420312acd4936ca3d2a4f9ceb0f0fcf96da538f6042d219c6839d25c6a6a", + "url": "https://download.jetbrains.com/go/goland-2024.3.2.1.tar.gz", + "build_number": "243.23654.166" }, "idea-community": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}.tar.gz", - "version": "2024.3.2", - "sha256": "ad9d587b704806d9a21dfebe5c51415df94699bba958d7133763cfd56934ced8", - "url": "https://download.jetbrains.com/idea/ideaIC-2024.3.2.tar.gz", - "build_number": "243.23654.117" + "version": "2024.3.2.2", + "sha256": "d73fd631943c300d55729bd33e06e193751478a83477153807cfa941e4bf12e5", + "url": "https://download.jetbrains.com/idea/ideaIC-2024.3.2.2.tar.gz", + "build_number": "243.23654.189" }, "idea-ultimate": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}.tar.gz", - "version": "2024.3.2", - "sha256": "05f30fff53c1b73f9c261e812c236134e203bf7d847424a27d9409fd6b0b6fcb", - "url": "https://download.jetbrains.com/idea/ideaIU-2024.3.2.tar.gz", - "build_number": "243.23654.117" + "version": "2024.3.2.2", + "sha256": "7094daa174aa74c163ecbc3958405c99b209333ca23e5accd02ed8100c015e38", + "url": "https://download.jetbrains.com/idea/ideaIU-2024.3.2.2.tar.gz", + "build_number": "243.23654.189" }, "mps": { "update-channel": "MPS RELEASE", "url-template": "https://download.jetbrains.com/mps/{versionMajorMinor}/MPS-{version}.tar.gz", - "version": "2024.1.1", - "sha256": "008fc1c27002d7cd247f72cf5045b46cad35a0117e120565f4cce2311509be22", - "url": "https://download.jetbrains.com/mps/2024.1/MPS-2024.1.1.tar.gz", - "build_number": "241.19072.1155" + "version": "2024.3", + "sha256": "449048a9cdb944d4c3addf8156545c363be237ceb2b6f8516d72cb53eb00a37c", + "url": "https://download.jetbrains.com/mps/2024.3/MPS-2024.3.tar.gz", + "build_number": "243.21565.447" }, "phpstorm": { "update-channel": "PhpStorm RELEASE", "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}.tar.gz", - "version": "2024.3.2", - "sha256": "922f11f877b66d1815d5440b4891421269d2d235112e2fa6270b61096db36c2f", - "url": "https://download.jetbrains.com/webide/PhpStorm-2024.3.2.tar.gz", - "build_number": "243.23654.115", + "version": "2024.3.2.1", + "sha256": "d6f7e7c60659fb4215da32ac7daeae5202a86bbb2e971963081ee4a56e579685", + "url": "https://download.jetbrains.com/webide/PhpStorm-2024.3.2.1.tar.gz", + "build_number": "243.23654.168", "version-major-minor": "2022.3" }, "pycharm-community": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-community-{version}.tar.gz", - "version": "2024.3.1.1", - "sha256": "36b9332262815099d0b86d2689fcf91b379730cb838623d82c0845969bb6470f", - "url": "https://download.jetbrains.com/python/pycharm-community-2024.3.1.1.tar.gz", - "build_number": "243.22562.220" + "version": "2024.3.2", + "sha256": "1674426c19a62f1046500b2bb170c849ddd259b2c4a4394bb2c90106aa316c4b", + "url": "https://download.jetbrains.com/python/pycharm-community-2024.3.2.tar.gz", + "build_number": "243.23654.177" }, "pycharm-professional": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}.tar.gz", - "version": "2024.3.1.1", - "sha256": "5698131d93d00a261c720a31ec54ef1c850581c274be6938dd923e8c0383da25", - "url": "https://download.jetbrains.com/python/pycharm-professional-2024.3.1.1.tar.gz", - "build_number": "243.22562.220" + "version": "2024.3.2", + "sha256": "520ffc8c2d4ebd2d75663c74567882af28c3a5d595d165a494394842330b2b5a", + "url": "https://download.jetbrains.com/python/pycharm-professional-2024.3.2.tar.gz", + "build_number": "243.23654.177" }, "rider": { "update-channel": "Rider RELEASE", "url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}.tar.gz", - "version": "2024.3.3", - "sha256": "3185826c0d85c06bf18c5ece3f5f9698acef006932b7a92b6cb190fd4d8e2807", - "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2024.3.3.tar.gz", - "build_number": "243.22562.250" + "version": "2024.3.4", + "sha256": "8f63b8ae5be2834212b629a0d3f7d8a17c03154f069920dab8e24f61dbe5a4a5", + "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2024.3.4.tar.gz", + "build_number": "243.23654.126" }, "ruby-mine": { "update-channel": "RubyMine RELEASE", "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}.tar.gz", - "version": "2024.3.2", - "sha256": "8c064b6119062ae568df795c45054cbdf608951e9c59957d95879fed7c30714e", - "url": "https://download.jetbrains.com/ruby/RubyMine-2024.3.2.tar.gz", - "build_number": "243.23654.112" + "version": "2024.3.2.1", + "sha256": "94c68e534f420648316867470271d9a3111f3c2afa7fcde6a4e3986058b2cdd2", + "url": "https://download.jetbrains.com/ruby/RubyMine-2024.3.2.1.tar.gz", + "build_number": "243.23654.167" }, "rust-rover": { "update-channel": "RustRover RELEASE", "url-template": "https://download.jetbrains.com/rustrover/RustRover-{version}.tar.gz", - "version": "2024.3.3", - "sha256": "abb5738327c0530c05be26b65abaead342e6aedb409b481dd537274d3dfd33f0", - "url": "https://download.jetbrains.com/rustrover/RustRover-2024.3.3.tar.gz", - "build_number": "243.23654.116" + "version": "2024.3.4", + "sha256": "1e7347b37a26715f5afdf101208342e6088d0d8421c9ee1661f48efb38cac8b4", + "url": "https://download.jetbrains.com/rustrover/RustRover-2024.3.4.tar.gz", + "build_number": "243.23654.180" }, "webstorm": { "update-channel": "WebStorm RELEASE", "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}.tar.gz", - "version": "2024.3.2", - "sha256": "2e9054ae506e578cf89e4cea017d953c416281470a4a5728b157e43ac4888d4e", - "url": "https://download.jetbrains.com/webstorm/WebStorm-2024.3.2.tar.gz", - "build_number": "243.23654.120" + "version": "2024.3.2.1", + "sha256": "9857bdcd2c05eb215e3974b4df2a5a9b0fc8c1df929d31c9c9dae4c87496de60", + "url": "https://download.jetbrains.com/webstorm/WebStorm-2024.3.2.1.tar.gz", + "build_number": "243.23654.157" }, "writerside": { "update-channel": "Writerside EAP", @@ -142,10 +142,10 @@ "aqua": { "update-channel": "Aqua RELEASE", "url-template": "https://download.jetbrains.com/aqua/aqua-{version}-aarch64.tar.gz", - "version": "2024.3.1", - "sha256": "4895ad44a456f56121cc4e78be45b6a4ccae8080ab7251cd434304465d01f7c4", - "url": "https://download.jetbrains.com/aqua/aqua-2024.3.1-aarch64.tar.gz", - "build_number": "243.22562.238" + "version": "2024.3.2", + "sha256": "d2a3c781756a83ccea63dc6d9aebf85f819de1edb5bcd4e5a1a161eaa0779c84", + "url": "https://download.jetbrains.com/aqua/aqua-2024.3.2-aarch64.tar.gz", + "build_number": "243.23654.154" }, "clion": { "update-channel": "CLion RELEASE", @@ -174,99 +174,99 @@ "gateway": { "update-channel": "Gateway RELEASE", "url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}-aarch64.tar.gz", - "version": "2024.3.1.1", - "sha256": "d5481582f8448659a293bc101b9ce2355368c60ab5a18370d4ba09a2eeebf458", - "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2024.3.1.1-aarch64.tar.gz", - "build_number": "243.22562.252" + "version": "2024.3.2", + "sha256": "8f8dafbd75fe134235053d58b495dc017e8c9399976613b08b4c724579847f71", + "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2024.3.2-aarch64.tar.gz", + "build_number": "243.23654.132" }, "goland": { "update-channel": "GoLand RELEASE", "url-template": "https://download.jetbrains.com/go/goland-{version}-aarch64.tar.gz", - "version": "2024.3.2", - "sha256": "46a83f45cbc7193483d19cacd79ab310adb7b88af859903c2dc7713835d53f6c", - "url": "https://download.jetbrains.com/go/goland-2024.3.2-aarch64.tar.gz", - "build_number": "243.23654.119" + "version": "2024.3.2.1", + "sha256": "4738ad9275c9a08c4a1e5bec7432a5338eeb4c02662179d1c6e9efa9226277a1", + "url": "https://download.jetbrains.com/go/goland-2024.3.2.1-aarch64.tar.gz", + "build_number": "243.23654.166" }, "idea-community": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}-aarch64.tar.gz", - "version": "2024.3.2", - "sha256": "0135027b97fcabd8f9e31d34cd2444323c63c894ef3f8c6eaf734fbecb8694ef", - "url": "https://download.jetbrains.com/idea/ideaIC-2024.3.2-aarch64.tar.gz", - "build_number": "243.23654.117" + "version": "2024.3.2.2", + "sha256": "ffdf4a5bdf8ba88c7afdbcd777aee7ce4113af016f0a671fa8a7fe6703734c7f", + "url": "https://download.jetbrains.com/idea/ideaIC-2024.3.2.2-aarch64.tar.gz", + "build_number": "243.23654.189" }, "idea-ultimate": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}-aarch64.tar.gz", - "version": "2024.3.2", - "sha256": "d41082d25ec1639d399a5cbbabf29afa8082d6eddff8b24e56107f159dbe85b4", - "url": "https://download.jetbrains.com/idea/ideaIU-2024.3.2-aarch64.tar.gz", - "build_number": "243.23654.117" + "version": "2024.3.2.2", + "sha256": "1e279d974b0134bdfc2cfb2ab8f46576c3372e5fa868e5c6a6e40916b9144f6c", + "url": "https://download.jetbrains.com/idea/ideaIU-2024.3.2.2-aarch64.tar.gz", + "build_number": "243.23654.189" }, "mps": { "update-channel": "MPS RELEASE", "url-template": "https://download.jetbrains.com/mps/{versionMajorMinor}/MPS-{version}.tar.gz", - "version": "2024.1.1", - "sha256": "008fc1c27002d7cd247f72cf5045b46cad35a0117e120565f4cce2311509be22", - "url": "https://download.jetbrains.com/mps/2024.1/MPS-2024.1.1.tar.gz", - "build_number": "241.19072.1155" + "version": "2024.3", + "sha256": "449048a9cdb944d4c3addf8156545c363be237ceb2b6f8516d72cb53eb00a37c", + "url": "https://download.jetbrains.com/mps/2024.3/MPS-2024.3.tar.gz", + "build_number": "243.21565.447" }, "phpstorm": { "update-channel": "PhpStorm RELEASE", "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}-aarch64.tar.gz", - "version": "2024.3.2", - "sha256": "b01643f20e9db333baa5204f8e0cf7da2eb952ca9e5a526290daf8cb4b14b74f", - "url": "https://download.jetbrains.com/webide/PhpStorm-2024.3.2-aarch64.tar.gz", - "build_number": "243.23654.115", + "version": "2024.3.2.1", + "sha256": "637edd1410045c6c42d54909c4548dbd82fc02d809401d817606efc7e1afe4bd", + "url": "https://download.jetbrains.com/webide/PhpStorm-2024.3.2.1-aarch64.tar.gz", + "build_number": "243.23654.168", "version-major-minor": "2022.3" }, "pycharm-community": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-community-{version}-aarch64.tar.gz", - "version": "2024.3.1.1", - "sha256": "cbc36953b6943e70468e1908bef9adddc2a9597124e5d794f294095888b0914c", - "url": "https://download.jetbrains.com/python/pycharm-community-2024.3.1.1-aarch64.tar.gz", - "build_number": "243.22562.220" + "version": "2024.3.2", + "sha256": "9fff53f58d2ba25b076725e9087ee4c2e0d550b5358137e435d9224f7b5dda45", + "url": "https://download.jetbrains.com/python/pycharm-community-2024.3.2-aarch64.tar.gz", + "build_number": "243.23654.177" }, "pycharm-professional": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}-aarch64.tar.gz", - "version": "2024.3.1.1", - "sha256": "a301f7316b17ace60c9e765f50ae0987262e99da3feb222c9abf761fda10cff3", - "url": "https://download.jetbrains.com/python/pycharm-professional-2024.3.1.1-aarch64.tar.gz", - "build_number": "243.22562.220" + "version": "2024.3.2", + "sha256": "7e7a4ebe5e78414695c3701eecf7e170a0574b2ca511a545594efa2587ea1a47", + "url": "https://download.jetbrains.com/python/pycharm-professional-2024.3.2-aarch64.tar.gz", + "build_number": "243.23654.177" }, "rider": { "update-channel": "Rider RELEASE", "url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}-aarch64.tar.gz", - "version": "2024.3.3", - "sha256": "8ca14eeae6a9164da955f9e292dda788bda53a031c24ef6c2fab505e3e2f175b", - "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2024.3.3-aarch64.tar.gz", - "build_number": "243.22562.250" + "version": "2024.3.4", + "sha256": "11107efdd6d15965817709d283362f0b0c522ffdc4f8175e85180bf9b0451443", + "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2024.3.4-aarch64.tar.gz", + "build_number": "243.23654.126" }, "ruby-mine": { "update-channel": "RubyMine RELEASE", "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}-aarch64.tar.gz", - "version": "2024.3.2", - "sha256": "8d6981e056bfded160b2a14d81aaa3ca45d1b102a9f58c11578389988c8c6441", - "url": "https://download.jetbrains.com/ruby/RubyMine-2024.3.2-aarch64.tar.gz", - "build_number": "243.23654.112" + "version": "2024.3.2.1", + "sha256": "eacd0a8b9c8e5445bc52bac7094667b6d9f1973d951ae47878ced4af97c95a0b", + "url": "https://download.jetbrains.com/ruby/RubyMine-2024.3.2.1-aarch64.tar.gz", + "build_number": "243.23654.167" }, "rust-rover": { "update-channel": "RustRover RELEASE", "url-template": "https://download.jetbrains.com/rustrover/RustRover-{version}-aarch64.tar.gz", - "version": "2024.3.3", - "sha256": "7e002489c7167f39744d746127dc7a3f06d5cfbf9d63aa6a2835b0a80a261155", - "url": "https://download.jetbrains.com/rustrover/RustRover-2024.3.3-aarch64.tar.gz", - "build_number": "243.23654.116" + "version": "2024.3.4", + "sha256": "a1b3626907930d32f256d14598e1013ce6999fae28a61f71013be2a7e7c52a1d", + "url": "https://download.jetbrains.com/rustrover/RustRover-2024.3.4-aarch64.tar.gz", + "build_number": "243.23654.180" }, "webstorm": { "update-channel": "WebStorm RELEASE", "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}-aarch64.tar.gz", - "version": "2024.3.2", - "sha256": "9914fe6e6b5f0a7e87c9628fdf70b5083b68ec14b8873ad6847e4ea8e8c80a96", - "url": "https://download.jetbrains.com/webstorm/WebStorm-2024.3.2-aarch64.tar.gz", - "build_number": "243.23654.120" + "version": "2024.3.2.1", + "sha256": "82ba3c43848e8a16ce2b9c4df4d8b3e8717e42b46328cebdcf09a51545b6a24e", + "url": "https://download.jetbrains.com/webstorm/WebStorm-2024.3.2.1-aarch64.tar.gz", + "build_number": "243.23654.157" }, "writerside": { "update-channel": "Writerside EAP", @@ -281,10 +281,10 @@ "aqua": { "update-channel": "Aqua RELEASE", "url-template": "https://download.jetbrains.com/aqua/aqua-{version}.dmg", - "version": "2024.3.1", - "sha256": "2efd04de1b67a394529fb154e63c58e34654af42a5fb12b5989ab8d5a784483b", - "url": "https://download.jetbrains.com/aqua/aqua-2024.3.1.dmg", - "build_number": "243.22562.238" + "version": "2024.3.2", + "sha256": "423d492e9849beb7edbbd1771650a04e8df9f469bf1789b41bc5878c84cee393", + "url": "https://download.jetbrains.com/aqua/aqua-2024.3.2.dmg", + "build_number": "243.23654.154" }, "clion": { "update-channel": "CLion RELEASE", @@ -313,99 +313,99 @@ "gateway": { "update-channel": "Gateway RELEASE", "url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}.dmg", - "version": "2024.3.1.1", - "sha256": "f31962a284ec68e175d6f5678c0e4fe33c0948514f92673bb7989b38c3622951", - "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2024.3.1.1.dmg", - "build_number": "243.22562.252" + "version": "2024.3.2", + "sha256": "6c3e4d0bb7b93e522be59c00243589e571d7575ae71678fa807645ea00a9dcae", + "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2024.3.2.dmg", + "build_number": "243.23654.132" }, "goland": { "update-channel": "GoLand RELEASE", "url-template": "https://download.jetbrains.com/go/goland-{version}.dmg", - "version": "2024.3.2", - "sha256": "a8a0567d571f5bb94fe48cba6035db054f07db87c353765c823c90cb2f9783a1", - "url": "https://download.jetbrains.com/go/goland-2024.3.2.dmg", - "build_number": "243.23654.119" + "version": "2024.3.2.1", + "sha256": "694feba07f9ded15403971396d54c94bb7e306f1d6c37a995c83d229c73218dc", + "url": "https://download.jetbrains.com/go/goland-2024.3.2.1.dmg", + "build_number": "243.23654.166" }, "idea-community": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}.dmg", - "version": "2024.3.2", - "sha256": "d60b7148d6d0da8d3bf1d43282d282d41ea8d7b3443d8173d4dd1e692c44ce9a", - "url": "https://download.jetbrains.com/idea/ideaIC-2024.3.2.dmg", - "build_number": "243.23654.117" + "version": "2024.3.2.2", + "sha256": "7a537dc57f88657bda1efc1d9c0ad86b3defa2c232b0cf678779ac6fcf90efa7", + "url": "https://download.jetbrains.com/idea/ideaIC-2024.3.2.2.dmg", + "build_number": "243.23654.189" }, "idea-ultimate": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}.dmg", - "version": "2024.3.2", - "sha256": "eaa4fc6f6aecdf023965d76f391fa5d438193d1f2fe42d6a8c2cffab7599c22b", - "url": "https://download.jetbrains.com/idea/ideaIU-2024.3.2.dmg", - "build_number": "243.23654.117" + "version": "2024.3.2.2", + "sha256": "acedea9b54e3de575aa7679d478731d681d99b6b448230cf0c99e0b7c0cc8754", + "url": "https://download.jetbrains.com/idea/ideaIU-2024.3.2.2.dmg", + "build_number": "243.23654.189" }, "mps": { "update-channel": "MPS RELEASE", "url-template": "https://download.jetbrains.com/mps/{versionMajorMinor}/MPS-{version}-macos.dmg", - "version": "2024.1.1", - "sha256": "85f936a8d4a610b0232f5716f364cfae6edac5322fd40714c07e9ffabb11e85a", - "url": "https://download.jetbrains.com/mps/2024.1/MPS-2024.1.1-macos.dmg", - "build_number": "241.19072.1155" + "version": "2024.3", + "sha256": "a5476c8aa604f3c37c192a5301eebf1c33d2ae733be018f485f3bf48d2a52366", + "url": "https://download.jetbrains.com/mps/2024.3/MPS-2024.3-macos.dmg", + "build_number": "243.21565.447" }, "phpstorm": { "update-channel": "PhpStorm RELEASE", "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}.dmg", - "version": "2024.3.2", - "sha256": "df4b63e60d22a63d75f1780dc1354b570982eca6d4462ced232c2492a158d520", - "url": "https://download.jetbrains.com/webide/PhpStorm-2024.3.2.dmg", - "build_number": "243.23654.115", + "version": "2024.3.2.1", + "sha256": "d0eb3ee21d3c79cc262e0186b70c52a8d887100881b2691537744b97656ed187", + "url": "https://download.jetbrains.com/webide/PhpStorm-2024.3.2.1.dmg", + "build_number": "243.23654.168", "version-major-minor": "2022.3" }, "pycharm-community": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-community-{version}.dmg", - "version": "2024.3.1.1", - "sha256": "72cf007a2f5505544b821c97b34f61f6195f32beaf3bfd032370ee7f03cb5046", - "url": "https://download.jetbrains.com/python/pycharm-community-2024.3.1.1.dmg", - "build_number": "243.22562.220" + "version": "2024.3.2", + "sha256": "7244a81461290b1e555e5de9e00ddfad18ece5d31383a6539e0feaa1a734b233", + "url": "https://download.jetbrains.com/python/pycharm-community-2024.3.2.dmg", + "build_number": "243.23654.177" }, "pycharm-professional": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}.dmg", - "version": "2024.3.1.1", - "sha256": "d0329b017d21c25426f625c31fb9e193b9dc0be17150675c1010d3bfd27f2ca2", - "url": "https://download.jetbrains.com/python/pycharm-professional-2024.3.1.1.dmg", - "build_number": "243.22562.220" + "version": "2024.3.2", + "sha256": "71544961bab32d6dd3af554bc2af0af59e9f748fc0a7a87d6026d5aebf3a6105", + "url": "https://download.jetbrains.com/python/pycharm-professional-2024.3.2.dmg", + "build_number": "243.23654.177" }, "rider": { "update-channel": "Rider RELEASE", "url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}.dmg", - "version": "2024.3.3", - "sha256": "55e851ef7dcfde75bc8e81a9650577ffa2b3c1fed4f49c529b5bac766e8e734e", - "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2024.3.3.dmg", - "build_number": "243.22562.250" + "version": "2024.3.4", + "sha256": "7a8be161e0574cbe699b82f5bf0bd74de8d13b9ff8851f620f90c4c301469680", + "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2024.3.4.dmg", + "build_number": "243.23654.126" }, "ruby-mine": { "update-channel": "RubyMine RELEASE", "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}.dmg", - "version": "2024.3.2", - "sha256": "a70feb35207706d25d5da7357f4e3ac0d8af63c43e6bbe0d350681745586dd2e", - "url": "https://download.jetbrains.com/ruby/RubyMine-2024.3.2.dmg", - "build_number": "243.23654.112" + "version": "2024.3.2.1", + "sha256": "93b58637964adbb7b8be9f69f64546cdf66420c3f4b9ef8548a0a3cf6c80b9c7", + "url": "https://download.jetbrains.com/ruby/RubyMine-2024.3.2.1.dmg", + "build_number": "243.23654.167" }, "rust-rover": { "update-channel": "RustRover RELEASE", "url-template": "https://download.jetbrains.com/rustrover/RustRover-{version}.dmg", - "version": "2024.3.3", - "sha256": "b33400542422d7b3a0206014347de2e7a299c76b49ebf8aa8c8728f2a995309c", - "url": "https://download.jetbrains.com/rustrover/RustRover-2024.3.3.dmg", - "build_number": "243.23654.116" + "version": "2024.3.4", + "sha256": "8a883cc59218904bdc21facf08719e4afb5f8d4c160742bf242d6dba1a35ae57", + "url": "https://download.jetbrains.com/rustrover/RustRover-2024.3.4.dmg", + "build_number": "243.23654.180" }, "webstorm": { "update-channel": "WebStorm RELEASE", "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}.dmg", - "version": "2024.3.2", - "sha256": "c95225ad78b1109feccf539c9005aa3ddf1388459a3af0fa49571f5643591dbd", - "url": "https://download.jetbrains.com/webstorm/WebStorm-2024.3.2.dmg", - "build_number": "243.23654.120" + "version": "2024.3.2.1", + "sha256": "89a4fc730cdba15d09146d15e9f7fededef2f9ef10a748a386aaddaeb56cbe27", + "url": "https://download.jetbrains.com/webstorm/WebStorm-2024.3.2.1.dmg", + "build_number": "243.23654.157" }, "writerside": { "update-channel": "Writerside EAP", @@ -420,10 +420,10 @@ "aqua": { "update-channel": "Aqua RELEASE", "url-template": "https://download.jetbrains.com/aqua/aqua-{version}-aarch64.dmg", - "version": "2024.3.1", - "sha256": "ee6ae8231315aff5908d240449be182c9bab58a09ec03bc3afb302b7d7e597d2", - "url": "https://download.jetbrains.com/aqua/aqua-2024.3.1-aarch64.dmg", - "build_number": "243.22562.238" + "version": "2024.3.2", + "sha256": "43974cdbbb71aaf5bfcfaf2cfd0e69e9920dda3973e64671936c1d52b267494d", + "url": "https://download.jetbrains.com/aqua/aqua-2024.3.2-aarch64.dmg", + "build_number": "243.23654.154" }, "clion": { "update-channel": "CLion RELEASE", @@ -452,99 +452,99 @@ "gateway": { "update-channel": "Gateway RELEASE", "url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}-aarch64.dmg", - "version": "2024.3.1.1", - "sha256": "f4ff084d4054f75d3b10110b2abaddecbac30204d80c39dcb7a5925f2278c41a", - "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2024.3.1.1-aarch64.dmg", - "build_number": "243.22562.252" + "version": "2024.3.2", + "sha256": "a8a36e25cf011941156344bc6b6f7f6b6de8e6905a2ad0c3d8106dda6b40342f", + "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2024.3.2-aarch64.dmg", + "build_number": "243.23654.132" }, "goland": { "update-channel": "GoLand RELEASE", "url-template": "https://download.jetbrains.com/go/goland-{version}-aarch64.dmg", - "version": "2024.3.2", - "sha256": "75579b5b6815d3f365c72b18d0455eb8402ae0a53d714e2776a75716383d402e", - "url": "https://download.jetbrains.com/go/goland-2024.3.2-aarch64.dmg", - "build_number": "243.23654.119" + "version": "2024.3.2.1", + "sha256": "d93f3bd0ca598f37032110275336c98c5aa46ef566e51e2d290b986416e4bd7a", + "url": "https://download.jetbrains.com/go/goland-2024.3.2.1-aarch64.dmg", + "build_number": "243.23654.166" }, "idea-community": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}-aarch64.dmg", - "version": "2024.3.2", - "sha256": "1cc440d163460d345aa31ccb9ca9309218f4f887ceddcd8eddf96d09b0218250", - "url": "https://download.jetbrains.com/idea/ideaIC-2024.3.2-aarch64.dmg", - "build_number": "243.23654.117" + "version": "2024.3.2.2", + "sha256": "8a0435dabe4ff169430b46d119afcaa053b8d7d8d5d6a666e56292f6d470a2c7", + "url": "https://download.jetbrains.com/idea/ideaIC-2024.3.2.2-aarch64.dmg", + "build_number": "243.23654.189" }, "idea-ultimate": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}-aarch64.dmg", - "version": "2024.3.2", - "sha256": "60c96ca67507f811d66ac1fa42a2a93d3310c4457f32689a6e10d0a04e6bc34a", - "url": "https://download.jetbrains.com/idea/ideaIU-2024.3.2-aarch64.dmg", - "build_number": "243.23654.117" + "version": "2024.3.2.2", + "sha256": "da5e9c6ea95d1709e1602efeb5736d8daf2c5d108c9e04e544eb30bd6c2dac11", + "url": "https://download.jetbrains.com/idea/ideaIU-2024.3.2.2-aarch64.dmg", + "build_number": "243.23654.189" }, "mps": { "update-channel": "MPS RELEASE", "url-template": "https://download.jetbrains.com/mps/{versionMajorMinor}/MPS-{version}-macos-aarch64.dmg", - "version": "2024.1.1", - "url": "https://download.jetbrains.com/mps/2024.1/MPS-2024.1.1-macos-aarch64.dmg", - "sha256": "381b6c527f444ca2ea652054e172afee2096c29ad445cec7fa7fe6432cb41bea", - "build_number": "241.19072.1155" + "version": "2024.3", + "url": "https://download.jetbrains.com/mps/2024.3/MPS-2024.3-macos-aarch64.dmg", + "sha256": "9c7118db757ba4fa7b6725efa5b006f4e6db47ca2b2948a92e43c435329c9c79", + "build_number": "243.21565.447" }, "phpstorm": { "update-channel": "PhpStorm RELEASE", "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}-aarch64.dmg", - "version": "2024.3.2", - "sha256": "0fcec802f70143b926db9ce7700331dadf85063ea310cbb0360bc7428ec385bf", - "url": "https://download.jetbrains.com/webide/PhpStorm-2024.3.2-aarch64.dmg", - "build_number": "243.23654.115", + "version": "2024.3.2.1", + "sha256": "42d0243042485928bc2a3c390e78d7de721c8a54b388e5ae8cff0d8982aaa521", + "url": "https://download.jetbrains.com/webide/PhpStorm-2024.3.2.1-aarch64.dmg", + "build_number": "243.23654.168", "version-major-minor": "2022.3" }, "pycharm-community": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-community-{version}-aarch64.dmg", - "version": "2024.3.1.1", - "sha256": "ad894fdd3f56260afde718bf8f8dd342780e5a5ecfdbf3c66772a4e1562376fe", - "url": "https://download.jetbrains.com/python/pycharm-community-2024.3.1.1-aarch64.dmg", - "build_number": "243.22562.220" + "version": "2024.3.2", + "sha256": "855440e5a38705d8cd1d0d6b5d3fe4817fdfde62fd1bc934c51de16cd6227ba9", + "url": "https://download.jetbrains.com/python/pycharm-community-2024.3.2-aarch64.dmg", + "build_number": "243.23654.177" }, "pycharm-professional": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}-aarch64.dmg", - "version": "2024.3.1.1", - "sha256": "b2afcf6bb9a9a2fb6c516815ce08073429ea506f44c7cafa9503c59da310caae", - "url": "https://download.jetbrains.com/python/pycharm-professional-2024.3.1.1-aarch64.dmg", - "build_number": "243.22562.220" + "version": "2024.3.2", + "sha256": "793c9c03a6c4d3c6446a0f068a5d8e0fd3611e096aabc04918ae0daf739c134d", + "url": "https://download.jetbrains.com/python/pycharm-professional-2024.3.2-aarch64.dmg", + "build_number": "243.23654.177" }, "rider": { "update-channel": "Rider RELEASE", "url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}-aarch64.dmg", - "version": "2024.3.3", - "sha256": "139f8444b48c89745216616bc7a263259a95105892233651fb08b14cc18953a1", - "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2024.3.3-aarch64.dmg", - "build_number": "243.22562.250" + "version": "2024.3.4", + "sha256": "6d0439fb5ce9364ceab5b839aafd1f904ccda99483b4e8f3d41ffbcb8469afe7", + "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2024.3.4-aarch64.dmg", + "build_number": "243.23654.126" }, "ruby-mine": { "update-channel": "RubyMine RELEASE", "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}-aarch64.dmg", - "version": "2024.3.2", - "sha256": "c2285b17539f77667897dc2534182f0d9f1e8f8cd48c970f1ea9fa37b38704ce", - "url": "https://download.jetbrains.com/ruby/RubyMine-2024.3.2-aarch64.dmg", - "build_number": "243.23654.112" + "version": "2024.3.2.1", + "sha256": "68235be97430c0e2e18b7bdc997604b63c092fa9f0e6529f11d488c44167fb51", + "url": "https://download.jetbrains.com/ruby/RubyMine-2024.3.2.1-aarch64.dmg", + "build_number": "243.23654.167" }, "rust-rover": { "update-channel": "RustRover RELEASE", "url-template": "https://download.jetbrains.com/rustrover/RustRover-{version}-aarch64.dmg", - "version": "2024.3.3", - "sha256": "0777399d545ff01a4c65fde3eaa7917556b60d1cc474a29dc68bb20fcf717575", - "url": "https://download.jetbrains.com/rustrover/RustRover-2024.3.3-aarch64.dmg", - "build_number": "243.23654.116" + "version": "2024.3.4", + "sha256": "32687e28d478ec052444578c4625d441265896e3e297c46b5474d2050663ad37", + "url": "https://download.jetbrains.com/rustrover/RustRover-2024.3.4-aarch64.dmg", + "build_number": "243.23654.180" }, "webstorm": { "update-channel": "WebStorm RELEASE", "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}-aarch64.dmg", - "version": "2024.3.2", - "sha256": "de4ac18cf6002b7540a9fe3ec5c774cd4cf4021bf57893164e38971ec1efc2b4", - "url": "https://download.jetbrains.com/webstorm/WebStorm-2024.3.2-aarch64.dmg", - "build_number": "243.23654.120" + "version": "2024.3.2.1", + "sha256": "cc69e6ec0ecf8ecfae47afd17240637a89da8a51a3f77698bd08c611b8d1a9e8", + "url": "https://download.jetbrains.com/webstorm/WebStorm-2024.3.2.1-aarch64.dmg", + "build_number": "243.23654.157" }, "writerside": { "update-channel": "Writerside EAP", diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index 4b0828a47371a..29096bacf57fb 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -15,7 +15,7 @@ in zlib, python3, lldb, - dotnet-sdk_8, + dotnetCorePackages, maven, openssl, expat, @@ -44,6 +44,8 @@ let products = versions.${system} or (throw "Unsupported system: ${system}"); + dotnet-sdk = dotnetCorePackages.sdk_8_0-source; + package = if stdenv.hostPlatform.isDarwin then ./bin/darwin.nix else ./bin/linux.nix; mkJetBrainsProductCore = callPackage package { inherit vmopts; }; mkMeta = meta: fromSource: { @@ -188,7 +190,7 @@ rec { for dir in plugins/clion-radler/DotFiles/linux-*; do rm -rf $dir/dotnet - ln -s ${dotnet-sdk_8.unwrapped}/share/dotnet $dir/dotnet + ln -s ${dotnet-sdk}/share/dotnet $dir/dotnet done ) ''; @@ -352,7 +354,7 @@ rec { for dir in lib/ReSharperHost/linux-*; do rm -rf $dir/dotnet - ln -s ${dotnet-sdk_8.unwrapped}/share/dotnet $dir/dotnet + ln -s ${dotnet-sdk}/share/dotnet $dir/dotnet done ) ''; diff --git a/pkgs/applications/editors/jetbrains/plugins/plugins.json b/pkgs/applications/editors/jetbrains/plugins/plugins.json index 43621fad545ba..4ec97b6e54d93 100644 --- a/pkgs/applications/editors/jetbrains/plugins/plugins.json +++ b/pkgs/applications/editors/jetbrains/plugins/plugins.json @@ -17,17 +17,18 @@ "webstorm" ], "builds": { - "241.19072.1155": "https://plugins.jetbrains.com/files/164/590339/IdeaVIM-2.16.0.zip", + "243.21565.447": "https://plugins.jetbrains.com/files/164/666347/IdeaVIM-2.18.1.zip", "243.22562.218": "https://plugins.jetbrains.com/files/164/666347/IdeaVIM-2.18.1.zip", "243.22562.220": "https://plugins.jetbrains.com/files/164/666347/IdeaVIM-2.18.1.zip", - "243.22562.250": "https://plugins.jetbrains.com/files/164/666347/IdeaVIM-2.18.1.zip", - "243.23654.112": "https://plugins.jetbrains.com/files/164/666347/IdeaVIM-2.18.1.zip", "243.23654.114": "https://plugins.jetbrains.com/files/164/666347/IdeaVIM-2.18.1.zip", - "243.23654.115": "https://plugins.jetbrains.com/files/164/666347/IdeaVIM-2.18.1.zip", - "243.23654.116": "https://plugins.jetbrains.com/files/164/666347/IdeaVIM-2.18.1.zip", - "243.23654.117": "https://plugins.jetbrains.com/files/164/666347/IdeaVIM-2.18.1.zip", - "243.23654.119": "https://plugins.jetbrains.com/files/164/666347/IdeaVIM-2.18.1.zip", - "243.23654.120": "https://plugins.jetbrains.com/files/164/666347/IdeaVIM-2.18.1.zip", + "243.23654.126": "https://plugins.jetbrains.com/files/164/666347/IdeaVIM-2.18.1.zip", + "243.23654.157": "https://plugins.jetbrains.com/files/164/666347/IdeaVIM-2.18.1.zip", + "243.23654.166": "https://plugins.jetbrains.com/files/164/666347/IdeaVIM-2.18.1.zip", + "243.23654.167": "https://plugins.jetbrains.com/files/164/666347/IdeaVIM-2.18.1.zip", + "243.23654.168": "https://plugins.jetbrains.com/files/164/666347/IdeaVIM-2.18.1.zip", + "243.23654.177": "https://plugins.jetbrains.com/files/164/666347/IdeaVIM-2.18.1.zip", + "243.23654.180": "https://plugins.jetbrains.com/files/164/666347/IdeaVIM-2.18.1.zip", + "243.23654.189": "https://plugins.jetbrains.com/files/164/666347/IdeaVIM-2.18.1.zip", "243.23654.19": "https://plugins.jetbrains.com/files/164/666347/IdeaVIM-2.18.1.zip" }, "name": "ideavim" @@ -37,7 +38,7 @@ "idea-ultimate" ], "builds": { - "243.23654.117": "https://plugins.jetbrains.com/files/631/666772/python-243.23654.117.zip" + "243.23654.189": "https://plugins.jetbrains.com/files/631/673131/python-243.23654.189.zip" }, "name": "python" }, @@ -48,7 +49,7 @@ ], "builds": { "243.22562.218": "https://plugins.jetbrains.com/files/1347/667258/scala-intellij-bin-2024.3.35.zip", - "243.23654.117": "https://plugins.jetbrains.com/files/1347/667258/scala-intellij-bin-2024.3.35.zip" + "243.23654.189": "https://plugins.jetbrains.com/files/1347/667258/scala-intellij-bin-2024.3.35.zip" }, "name": "scala" }, @@ -69,17 +70,18 @@ "webstorm" ], "builds": { - "241.19072.1155": "https://plugins.jetbrains.com/files/2162/640476/StringManipulation-9.15.0.zip", + "243.21565.447": "https://plugins.jetbrains.com/files/2162/640476/StringManipulation-9.15.0.zip", "243.22562.218": "https://plugins.jetbrains.com/files/2162/640476/StringManipulation-9.15.0.zip", "243.22562.220": "https://plugins.jetbrains.com/files/2162/640476/StringManipulation-9.15.0.zip", - "243.22562.250": "https://plugins.jetbrains.com/files/2162/640476/StringManipulation-9.15.0.zip", - "243.23654.112": "https://plugins.jetbrains.com/files/2162/640476/StringManipulation-9.15.0.zip", "243.23654.114": "https://plugins.jetbrains.com/files/2162/640476/StringManipulation-9.15.0.zip", - "243.23654.115": "https://plugins.jetbrains.com/files/2162/640476/StringManipulation-9.15.0.zip", - "243.23654.116": "https://plugins.jetbrains.com/files/2162/640476/StringManipulation-9.15.0.zip", - "243.23654.117": "https://plugins.jetbrains.com/files/2162/640476/StringManipulation-9.15.0.zip", - "243.23654.119": "https://plugins.jetbrains.com/files/2162/640476/StringManipulation-9.15.0.zip", - "243.23654.120": "https://plugins.jetbrains.com/files/2162/640476/StringManipulation-9.15.0.zip", + "243.23654.126": "https://plugins.jetbrains.com/files/2162/640476/StringManipulation-9.15.0.zip", + "243.23654.157": "https://plugins.jetbrains.com/files/2162/640476/StringManipulation-9.15.0.zip", + "243.23654.166": "https://plugins.jetbrains.com/files/2162/640476/StringManipulation-9.15.0.zip", + "243.23654.167": "https://plugins.jetbrains.com/files/2162/640476/StringManipulation-9.15.0.zip", + "243.23654.168": "https://plugins.jetbrains.com/files/2162/640476/StringManipulation-9.15.0.zip", + "243.23654.177": "https://plugins.jetbrains.com/files/2162/640476/StringManipulation-9.15.0.zip", + "243.23654.180": "https://plugins.jetbrains.com/files/2162/640476/StringManipulation-9.15.0.zip", + "243.23654.189": "https://plugins.jetbrains.com/files/2162/640476/StringManipulation-9.15.0.zip", "243.23654.19": "https://plugins.jetbrains.com/files/2162/640476/StringManipulation-9.15.0.zip" }, "name": "string-manipulation" @@ -101,17 +103,18 @@ "webstorm" ], "builds": { - "241.19072.1155": null, + "243.21565.447": null, "243.22562.218": null, "243.22562.220": null, - "243.22562.250": null, - "243.23654.112": null, "243.23654.114": null, - "243.23654.115": null, - "243.23654.116": null, - "243.23654.117": null, - "243.23654.119": null, - "243.23654.120": null, + "243.23654.126": null, + "243.23654.157": null, + "243.23654.166": null, + "243.23654.167": null, + "243.23654.168": null, + "243.23654.177": null, + "243.23654.180": null, + "243.23654.189": null, "243.23654.19": null }, "name": "kotlin" @@ -133,18 +136,19 @@ "webstorm" ], "builds": { - "241.19072.1155": null, + "243.21565.447": "https://plugins.jetbrains.com/files/6981/633889/ini-243.21565.208.zip", "243.22562.218": "https://plugins.jetbrains.com/files/6981/654905/ini-243.22562.236.zip", "243.22562.220": "https://plugins.jetbrains.com/files/6981/654905/ini-243.22562.236.zip", - "243.22562.250": "https://plugins.jetbrains.com/files/6981/654905/ini-243.22562.236.zip", - "243.23654.112": "https://plugins.jetbrains.com/files/6981/667161/ini-243.23654.119.zip", - "243.23654.114": "https://plugins.jetbrains.com/files/6981/667161/ini-243.23654.119.zip", - "243.23654.115": "https://plugins.jetbrains.com/files/6981/667161/ini-243.23654.119.zip", - "243.23654.116": "https://plugins.jetbrains.com/files/6981/667161/ini-243.23654.119.zip", - "243.23654.117": "https://plugins.jetbrains.com/files/6981/667161/ini-243.23654.119.zip", - "243.23654.119": "https://plugins.jetbrains.com/files/6981/667161/ini-243.23654.119.zip", - "243.23654.120": "https://plugins.jetbrains.com/files/6981/667161/ini-243.23654.119.zip", - "243.23654.19": "https://plugins.jetbrains.com/files/6981/667161/ini-243.23654.119.zip" + "243.23654.114": "https://plugins.jetbrains.com/files/6981/672286/ini-243.23654.177.zip", + "243.23654.126": "https://plugins.jetbrains.com/files/6981/672286/ini-243.23654.177.zip", + "243.23654.157": "https://plugins.jetbrains.com/files/6981/672286/ini-243.23654.177.zip", + "243.23654.166": "https://plugins.jetbrains.com/files/6981/672286/ini-243.23654.177.zip", + "243.23654.167": "https://plugins.jetbrains.com/files/6981/672286/ini-243.23654.177.zip", + "243.23654.168": "https://plugins.jetbrains.com/files/6981/672286/ini-243.23654.177.zip", + "243.23654.177": "https://plugins.jetbrains.com/files/6981/672286/ini-243.23654.177.zip", + "243.23654.180": "https://plugins.jetbrains.com/files/6981/672286/ini-243.23654.177.zip", + "243.23654.189": "https://plugins.jetbrains.com/files/6981/672286/ini-243.23654.177.zip", + "243.23654.19": "https://plugins.jetbrains.com/files/6981/672286/ini-243.23654.177.zip" }, "name": "ini" }, @@ -165,17 +169,18 @@ "webstorm" ], "builds": { - "241.19072.1155": "https://plugins.jetbrains.com/files/7086/610924/AceJump.zip", + "243.21565.447": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", "243.22562.218": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", "243.22562.220": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", - "243.22562.250": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", - "243.23654.112": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", "243.23654.114": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", - "243.23654.115": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", - "243.23654.116": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", - "243.23654.117": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", - "243.23654.119": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", - "243.23654.120": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", + "243.23654.126": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", + "243.23654.157": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", + "243.23654.166": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", + "243.23654.167": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", + "243.23654.168": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", + "243.23654.177": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", + "243.23654.180": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", + "243.23654.189": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", "243.23654.19": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip" }, "name": "acejump" @@ -186,8 +191,8 @@ "phpstorm" ], "builds": { - "243.23654.115": "https://plugins.jetbrains.com/files/7219/605730/Symfony_Plugin-2024.1.276.zip", - "243.23654.117": "https://plugins.jetbrains.com/files/7219/605730/Symfony_Plugin-2024.1.276.zip" + "243.23654.168": "https://plugins.jetbrains.com/files/7219/605730/Symfony_Plugin-2024.1.276.zip", + "243.23654.189": "https://plugins.jetbrains.com/files/7219/605730/Symfony_Plugin-2024.1.276.zip" }, "name": "symfony-support" }, @@ -197,8 +202,8 @@ "phpstorm" ], "builds": { - "243.23654.115": "https://plugins.jetbrains.com/files/7320/630497/PHP_Annotations-11.1.1.zip", - "243.23654.117": "https://plugins.jetbrains.com/files/7320/630497/PHP_Annotations-11.1.1.zip" + "243.23654.168": "https://plugins.jetbrains.com/files/7320/630497/PHP_Annotations-11.1.1.zip", + "243.23654.189": "https://plugins.jetbrains.com/files/7320/630497/PHP_Annotations-11.1.1.zip" }, "name": "php-annotations" }, @@ -217,13 +222,14 @@ "builds": { "243.22562.218": "https://plugins.jetbrains.com/files/7322/646590/python-ce-243.22562.145.zip", "243.22562.220": "https://plugins.jetbrains.com/files/7322/646590/python-ce-243.22562.145.zip", - "243.22562.250": "https://plugins.jetbrains.com/files/7322/646590/python-ce-243.22562.145.zip", - "243.23654.114": "https://plugins.jetbrains.com/files/7322/666773/python-ce-243.23654.117.zip", - "243.23654.116": "https://plugins.jetbrains.com/files/7322/666773/python-ce-243.23654.117.zip", - "243.23654.117": "https://plugins.jetbrains.com/files/7322/666773/python-ce-243.23654.117.zip", - "243.23654.119": "https://plugins.jetbrains.com/files/7322/666773/python-ce-243.23654.117.zip", - "243.23654.120": "https://plugins.jetbrains.com/files/7322/666773/python-ce-243.23654.117.zip", - "243.23654.19": "https://plugins.jetbrains.com/files/7322/666773/python-ce-243.23654.117.zip" + "243.23654.114": "https://plugins.jetbrains.com/files/7322/673130/python-ce-243.23654.189.zip", + "243.23654.126": "https://plugins.jetbrains.com/files/7322/673130/python-ce-243.23654.189.zip", + "243.23654.157": "https://plugins.jetbrains.com/files/7322/673130/python-ce-243.23654.189.zip", + "243.23654.166": "https://plugins.jetbrains.com/files/7322/673130/python-ce-243.23654.189.zip", + "243.23654.177": "https://plugins.jetbrains.com/files/7322/673130/python-ce-243.23654.189.zip", + "243.23654.180": "https://plugins.jetbrains.com/files/7322/673130/python-ce-243.23654.189.zip", + "243.23654.189": "https://plugins.jetbrains.com/files/7322/673130/python-ce-243.23654.189.zip", + "243.23654.19": "https://plugins.jetbrains.com/files/7322/673130/python-ce-243.23654.189.zip" }, "name": "python-community-edition" }, @@ -244,17 +250,18 @@ "webstorm" ], "builds": { - "241.19072.1155": "https://plugins.jetbrains.com/files/7391/561441/asciidoctor-intellij-plugin-0.42.2.zip", + "243.21565.447": "https://plugins.jetbrains.com/files/7391/658997/asciidoctor-intellij-plugin-0.43.6.zip", "243.22562.218": "https://plugins.jetbrains.com/files/7391/658997/asciidoctor-intellij-plugin-0.43.6.zip", "243.22562.220": "https://plugins.jetbrains.com/files/7391/658997/asciidoctor-intellij-plugin-0.43.6.zip", - "243.22562.250": "https://plugins.jetbrains.com/files/7391/658997/asciidoctor-intellij-plugin-0.43.6.zip", - "243.23654.112": "https://plugins.jetbrains.com/files/7391/658997/asciidoctor-intellij-plugin-0.43.6.zip", "243.23654.114": "https://plugins.jetbrains.com/files/7391/658997/asciidoctor-intellij-plugin-0.43.6.zip", - "243.23654.115": "https://plugins.jetbrains.com/files/7391/658997/asciidoctor-intellij-plugin-0.43.6.zip", - "243.23654.116": "https://plugins.jetbrains.com/files/7391/658997/asciidoctor-intellij-plugin-0.43.6.zip", - "243.23654.117": "https://plugins.jetbrains.com/files/7391/658997/asciidoctor-intellij-plugin-0.43.6.zip", - "243.23654.119": "https://plugins.jetbrains.com/files/7391/658997/asciidoctor-intellij-plugin-0.43.6.zip", - "243.23654.120": "https://plugins.jetbrains.com/files/7391/658997/asciidoctor-intellij-plugin-0.43.6.zip", + "243.23654.126": "https://plugins.jetbrains.com/files/7391/658997/asciidoctor-intellij-plugin-0.43.6.zip", + "243.23654.157": "https://plugins.jetbrains.com/files/7391/658997/asciidoctor-intellij-plugin-0.43.6.zip", + "243.23654.166": "https://plugins.jetbrains.com/files/7391/658997/asciidoctor-intellij-plugin-0.43.6.zip", + "243.23654.167": "https://plugins.jetbrains.com/files/7391/658997/asciidoctor-intellij-plugin-0.43.6.zip", + "243.23654.168": "https://plugins.jetbrains.com/files/7391/658997/asciidoctor-intellij-plugin-0.43.6.zip", + "243.23654.177": "https://plugins.jetbrains.com/files/7391/658997/asciidoctor-intellij-plugin-0.43.6.zip", + "243.23654.180": "https://plugins.jetbrains.com/files/7391/658997/asciidoctor-intellij-plugin-0.43.6.zip", + "243.23654.189": "https://plugins.jetbrains.com/files/7391/658997/asciidoctor-intellij-plugin-0.43.6.zip", "243.23654.19": "https://plugins.jetbrains.com/files/7391/658997/asciidoctor-intellij-plugin-0.43.6.zip" }, "name": "asciidoc" @@ -275,16 +282,17 @@ "webstorm" ], "builds": { - "241.19072.1155": null, + "243.21565.447": null, "243.22562.218": null, "243.22562.220": null, - "243.22562.250": null, - "243.23654.112": null, "243.23654.114": null, - "243.23654.115": null, - "243.23654.117": null, - "243.23654.119": null, - "243.23654.120": null, + "243.23654.126": null, + "243.23654.157": null, + "243.23654.166": null, + "243.23654.167": null, + "243.23654.168": null, + "243.23654.177": null, + "243.23654.189": null, "243.23654.19": null }, "name": "-deprecated-rust" @@ -305,16 +313,17 @@ "webstorm" ], "builds": { - "241.19072.1155": null, + "243.21565.447": null, "243.22562.218": null, "243.22562.220": null, - "243.22562.250": null, - "243.23654.112": null, "243.23654.114": null, - "243.23654.115": null, - "243.23654.117": null, - "243.23654.119": null, - "243.23654.120": null, + "243.23654.126": null, + "243.23654.157": null, + "243.23654.166": null, + "243.23654.167": null, + "243.23654.168": null, + "243.23654.177": null, + "243.23654.189": null, "243.23654.19": null }, "name": "-deprecated-rust-beta" @@ -336,18 +345,19 @@ "webstorm" ], "builds": { - "241.19072.1155": null, + "243.21565.447": "https://plugins.jetbrains.com/files/8554/633920/featuresTrainer-243.21565.204.zip", "243.22562.218": "https://plugins.jetbrains.com/files/8554/654690/featuresTrainer-243.22562.233.zip", "243.22562.220": "https://plugins.jetbrains.com/files/8554/654690/featuresTrainer-243.22562.233.zip", - "243.22562.250": "https://plugins.jetbrains.com/files/8554/654690/featuresTrainer-243.22562.233.zip", - "243.23654.112": "https://plugins.jetbrains.com/files/8554/666817/featuresTrainer-243.23654.115.zip", - "243.23654.114": "https://plugins.jetbrains.com/files/8554/666817/featuresTrainer-243.23654.115.zip", - "243.23654.115": "https://plugins.jetbrains.com/files/8554/666817/featuresTrainer-243.23654.115.zip", - "243.23654.116": "https://plugins.jetbrains.com/files/8554/666817/featuresTrainer-243.23654.115.zip", - "243.23654.117": "https://plugins.jetbrains.com/files/8554/666817/featuresTrainer-243.23654.115.zip", - "243.23654.119": "https://plugins.jetbrains.com/files/8554/666817/featuresTrainer-243.23654.115.zip", - "243.23654.120": "https://plugins.jetbrains.com/files/8554/666817/featuresTrainer-243.23654.115.zip", - "243.23654.19": "https://plugins.jetbrains.com/files/8554/666817/featuresTrainer-243.23654.115.zip" + "243.23654.114": "https://plugins.jetbrains.com/files/8554/672476/featuresTrainer-243.23654.180.zip", + "243.23654.126": "https://plugins.jetbrains.com/files/8554/672476/featuresTrainer-243.23654.180.zip", + "243.23654.157": "https://plugins.jetbrains.com/files/8554/672476/featuresTrainer-243.23654.180.zip", + "243.23654.166": "https://plugins.jetbrains.com/files/8554/672476/featuresTrainer-243.23654.180.zip", + "243.23654.167": "https://plugins.jetbrains.com/files/8554/672476/featuresTrainer-243.23654.180.zip", + "243.23654.168": "https://plugins.jetbrains.com/files/8554/672476/featuresTrainer-243.23654.180.zip", + "243.23654.177": "https://plugins.jetbrains.com/files/8554/672476/featuresTrainer-243.23654.180.zip", + "243.23654.180": "https://plugins.jetbrains.com/files/8554/672476/featuresTrainer-243.23654.180.zip", + "243.23654.189": "https://plugins.jetbrains.com/files/8554/672476/featuresTrainer-243.23654.180.zip", + "243.23654.19": "https://plugins.jetbrains.com/files/8554/672476/featuresTrainer-243.23654.180.zip" }, "name": "ide-features-trainer" }, @@ -368,17 +378,18 @@ "webstorm" ], "builds": { - "241.19072.1155": "https://plugins.jetbrains.com/files/8607/606922/NixIDEA-0.4.0.16.zip", + "243.21565.447": "https://plugins.jetbrains.com/files/8607/606922/NixIDEA-0.4.0.16.zip", "243.22562.218": "https://plugins.jetbrains.com/files/8607/606922/NixIDEA-0.4.0.16.zip", "243.22562.220": "https://plugins.jetbrains.com/files/8607/606922/NixIDEA-0.4.0.16.zip", - "243.22562.250": "https://plugins.jetbrains.com/files/8607/606922/NixIDEA-0.4.0.16.zip", - "243.23654.112": "https://plugins.jetbrains.com/files/8607/606922/NixIDEA-0.4.0.16.zip", "243.23654.114": "https://plugins.jetbrains.com/files/8607/606922/NixIDEA-0.4.0.16.zip", - "243.23654.115": "https://plugins.jetbrains.com/files/8607/606922/NixIDEA-0.4.0.16.zip", - "243.23654.116": "https://plugins.jetbrains.com/files/8607/606922/NixIDEA-0.4.0.16.zip", - "243.23654.117": "https://plugins.jetbrains.com/files/8607/606922/NixIDEA-0.4.0.16.zip", - "243.23654.119": "https://plugins.jetbrains.com/files/8607/606922/NixIDEA-0.4.0.16.zip", - "243.23654.120": "https://plugins.jetbrains.com/files/8607/606922/NixIDEA-0.4.0.16.zip", + "243.23654.126": "https://plugins.jetbrains.com/files/8607/606922/NixIDEA-0.4.0.16.zip", + "243.23654.157": "https://plugins.jetbrains.com/files/8607/606922/NixIDEA-0.4.0.16.zip", + "243.23654.166": "https://plugins.jetbrains.com/files/8607/606922/NixIDEA-0.4.0.16.zip", + "243.23654.167": "https://plugins.jetbrains.com/files/8607/606922/NixIDEA-0.4.0.16.zip", + "243.23654.168": "https://plugins.jetbrains.com/files/8607/606922/NixIDEA-0.4.0.16.zip", + "243.23654.177": "https://plugins.jetbrains.com/files/8607/606922/NixIDEA-0.4.0.16.zip", + "243.23654.180": "https://plugins.jetbrains.com/files/8607/606922/NixIDEA-0.4.0.16.zip", + "243.23654.189": "https://plugins.jetbrains.com/files/8607/606922/NixIDEA-0.4.0.16.zip", "243.23654.19": "https://plugins.jetbrains.com/files/8607/606922/NixIDEA-0.4.0.16.zip" }, "name": "nixidea" @@ -389,8 +400,8 @@ "idea-ultimate" ], "builds": { - "243.23654.117": "https://plugins.jetbrains.com/files/9568/666746/go-plugin-243.23654.117.zip", - "243.23654.119": "https://plugins.jetbrains.com/files/9568/666746/go-plugin-243.23654.117.zip" + "243.23654.166": "https://plugins.jetbrains.com/files/9568/666746/go-plugin-243.23654.117.zip", + "243.23654.189": "https://plugins.jetbrains.com/files/9568/666746/go-plugin-243.23654.117.zip" }, "name": "go" }, @@ -411,17 +422,18 @@ "webstorm" ], "builds": { - "241.19072.1155": "https://plugins.jetbrains.com/files/10037/585243/CSVEditor-3.4.0-241.zip", + "243.21565.447": "https://plugins.jetbrains.com/files/10037/658496/intellij-csv-validator-4.0.2.zip", "243.22562.218": "https://plugins.jetbrains.com/files/10037/658496/intellij-csv-validator-4.0.2.zip", "243.22562.220": "https://plugins.jetbrains.com/files/10037/658496/intellij-csv-validator-4.0.2.zip", - "243.22562.250": "https://plugins.jetbrains.com/files/10037/658496/intellij-csv-validator-4.0.2.zip", - "243.23654.112": "https://plugins.jetbrains.com/files/10037/658496/intellij-csv-validator-4.0.2.zip", "243.23654.114": "https://plugins.jetbrains.com/files/10037/658496/intellij-csv-validator-4.0.2.zip", - "243.23654.115": "https://plugins.jetbrains.com/files/10037/658496/intellij-csv-validator-4.0.2.zip", - "243.23654.116": "https://plugins.jetbrains.com/files/10037/658496/intellij-csv-validator-4.0.2.zip", - "243.23654.117": "https://plugins.jetbrains.com/files/10037/658496/intellij-csv-validator-4.0.2.zip", - "243.23654.119": "https://plugins.jetbrains.com/files/10037/658496/intellij-csv-validator-4.0.2.zip", - "243.23654.120": "https://plugins.jetbrains.com/files/10037/658496/intellij-csv-validator-4.0.2.zip", + "243.23654.126": "https://plugins.jetbrains.com/files/10037/658496/intellij-csv-validator-4.0.2.zip", + "243.23654.157": "https://plugins.jetbrains.com/files/10037/658496/intellij-csv-validator-4.0.2.zip", + "243.23654.166": "https://plugins.jetbrains.com/files/10037/658496/intellij-csv-validator-4.0.2.zip", + "243.23654.167": "https://plugins.jetbrains.com/files/10037/658496/intellij-csv-validator-4.0.2.zip", + "243.23654.168": "https://plugins.jetbrains.com/files/10037/658496/intellij-csv-validator-4.0.2.zip", + "243.23654.177": "https://plugins.jetbrains.com/files/10037/658496/intellij-csv-validator-4.0.2.zip", + "243.23654.180": "https://plugins.jetbrains.com/files/10037/658496/intellij-csv-validator-4.0.2.zip", + "243.23654.189": "https://plugins.jetbrains.com/files/10037/658496/intellij-csv-validator-4.0.2.zip", "243.23654.19": "https://plugins.jetbrains.com/files/10037/658496/intellij-csv-validator-4.0.2.zip" }, "name": "csv-editor" @@ -443,18 +455,19 @@ "webstorm" ], "builds": { - "241.19072.1155": "https://plugins.jetbrains.com/files/11349/666864/aws-toolkit-jetbrains-standalone-3.48-241.zip", - "243.22562.218": "https://plugins.jetbrains.com/files/11349/666866/aws-toolkit-jetbrains-standalone-3.48-243.zip", - "243.22562.220": "https://plugins.jetbrains.com/files/11349/666866/aws-toolkit-jetbrains-standalone-3.48-243.zip", - "243.22562.250": "https://plugins.jetbrains.com/files/11349/666866/aws-toolkit-jetbrains-standalone-3.48-243.zip", - "243.23654.112": "https://plugins.jetbrains.com/files/11349/666866/aws-toolkit-jetbrains-standalone-3.48-243.zip", - "243.23654.114": "https://plugins.jetbrains.com/files/11349/666866/aws-toolkit-jetbrains-standalone-3.48-243.zip", - "243.23654.115": "https://plugins.jetbrains.com/files/11349/666866/aws-toolkit-jetbrains-standalone-3.48-243.zip", - "243.23654.116": "https://plugins.jetbrains.com/files/11349/666866/aws-toolkit-jetbrains-standalone-3.48-243.zip", - "243.23654.117": "https://plugins.jetbrains.com/files/11349/666866/aws-toolkit-jetbrains-standalone-3.48-243.zip", - "243.23654.119": "https://plugins.jetbrains.com/files/11349/666866/aws-toolkit-jetbrains-standalone-3.48-243.zip", - "243.23654.120": "https://plugins.jetbrains.com/files/11349/666866/aws-toolkit-jetbrains-standalone-3.48-243.zip", - "243.23654.19": "https://plugins.jetbrains.com/files/11349/666866/aws-toolkit-jetbrains-standalone-3.48-243.zip" + "243.21565.447": "https://plugins.jetbrains.com/files/11349/670543/aws-toolkit-jetbrains-standalone-3.50-243.zip", + "243.22562.218": "https://plugins.jetbrains.com/files/11349/670543/aws-toolkit-jetbrains-standalone-3.50-243.zip", + "243.22562.220": "https://plugins.jetbrains.com/files/11349/670543/aws-toolkit-jetbrains-standalone-3.50-243.zip", + "243.23654.114": "https://plugins.jetbrains.com/files/11349/670543/aws-toolkit-jetbrains-standalone-3.50-243.zip", + "243.23654.126": "https://plugins.jetbrains.com/files/11349/670543/aws-toolkit-jetbrains-standalone-3.50-243.zip", + "243.23654.157": "https://plugins.jetbrains.com/files/11349/670543/aws-toolkit-jetbrains-standalone-3.50-243.zip", + "243.23654.166": "https://plugins.jetbrains.com/files/11349/670543/aws-toolkit-jetbrains-standalone-3.50-243.zip", + "243.23654.167": "https://plugins.jetbrains.com/files/11349/670543/aws-toolkit-jetbrains-standalone-3.50-243.zip", + "243.23654.168": "https://plugins.jetbrains.com/files/11349/670543/aws-toolkit-jetbrains-standalone-3.50-243.zip", + "243.23654.177": "https://plugins.jetbrains.com/files/11349/670543/aws-toolkit-jetbrains-standalone-3.50-243.zip", + "243.23654.180": "https://plugins.jetbrains.com/files/11349/670543/aws-toolkit-jetbrains-standalone-3.50-243.zip", + "243.23654.189": "https://plugins.jetbrains.com/files/11349/670543/aws-toolkit-jetbrains-standalone-3.50-243.zip", + "243.23654.19": "https://plugins.jetbrains.com/files/11349/670543/aws-toolkit-jetbrains-standalone-3.50-243.zip" }, "name": "aws-toolkit" }, @@ -475,17 +488,18 @@ "webstorm" ], "builds": { - "241.19072.1155": null, + "243.21565.447": "https://plugins.jetbrains.com/files/12062/630060/keymap-vscode-243.21565.122.zip", "243.22562.218": "https://plugins.jetbrains.com/files/12062/630060/keymap-vscode-243.21565.122.zip", "243.22562.220": "https://plugins.jetbrains.com/files/12062/630060/keymap-vscode-243.21565.122.zip", - "243.22562.250": "https://plugins.jetbrains.com/files/12062/630060/keymap-vscode-243.21565.122.zip", - "243.23654.112": "https://plugins.jetbrains.com/files/12062/630060/keymap-vscode-243.21565.122.zip", "243.23654.114": "https://plugins.jetbrains.com/files/12062/630060/keymap-vscode-243.21565.122.zip", - "243.23654.115": "https://plugins.jetbrains.com/files/12062/630060/keymap-vscode-243.21565.122.zip", - "243.23654.116": "https://plugins.jetbrains.com/files/12062/630060/keymap-vscode-243.21565.122.zip", - "243.23654.117": "https://plugins.jetbrains.com/files/12062/630060/keymap-vscode-243.21565.122.zip", - "243.23654.119": "https://plugins.jetbrains.com/files/12062/630060/keymap-vscode-243.21565.122.zip", - "243.23654.120": "https://plugins.jetbrains.com/files/12062/630060/keymap-vscode-243.21565.122.zip", + "243.23654.126": "https://plugins.jetbrains.com/files/12062/630060/keymap-vscode-243.21565.122.zip", + "243.23654.157": "https://plugins.jetbrains.com/files/12062/630060/keymap-vscode-243.21565.122.zip", + "243.23654.166": "https://plugins.jetbrains.com/files/12062/630060/keymap-vscode-243.21565.122.zip", + "243.23654.167": "https://plugins.jetbrains.com/files/12062/630060/keymap-vscode-243.21565.122.zip", + "243.23654.168": "https://plugins.jetbrains.com/files/12062/630060/keymap-vscode-243.21565.122.zip", + "243.23654.177": "https://plugins.jetbrains.com/files/12062/630060/keymap-vscode-243.21565.122.zip", + "243.23654.180": "https://plugins.jetbrains.com/files/12062/630060/keymap-vscode-243.21565.122.zip", + "243.23654.189": "https://plugins.jetbrains.com/files/12062/630060/keymap-vscode-243.21565.122.zip", "243.23654.19": "https://plugins.jetbrains.com/files/12062/630060/keymap-vscode-243.21565.122.zip" }, "name": "vscode-keymap" @@ -507,17 +521,18 @@ "webstorm" ], "builds": { - "241.19072.1155": null, + "243.21565.447": "https://plugins.jetbrains.com/files/12559/629985/keymap-eclipse-243.21565.122.zip", "243.22562.218": "https://plugins.jetbrains.com/files/12559/629985/keymap-eclipse-243.21565.122.zip", "243.22562.220": "https://plugins.jetbrains.com/files/12559/629985/keymap-eclipse-243.21565.122.zip", - "243.22562.250": "https://plugins.jetbrains.com/files/12559/629985/keymap-eclipse-243.21565.122.zip", - "243.23654.112": "https://plugins.jetbrains.com/files/12559/629985/keymap-eclipse-243.21565.122.zip", "243.23654.114": "https://plugins.jetbrains.com/files/12559/629985/keymap-eclipse-243.21565.122.zip", - "243.23654.115": "https://plugins.jetbrains.com/files/12559/629985/keymap-eclipse-243.21565.122.zip", - "243.23654.116": "https://plugins.jetbrains.com/files/12559/629985/keymap-eclipse-243.21565.122.zip", - "243.23654.117": "https://plugins.jetbrains.com/files/12559/629985/keymap-eclipse-243.21565.122.zip", - "243.23654.119": "https://plugins.jetbrains.com/files/12559/629985/keymap-eclipse-243.21565.122.zip", - "243.23654.120": "https://plugins.jetbrains.com/files/12559/629985/keymap-eclipse-243.21565.122.zip", + "243.23654.126": "https://plugins.jetbrains.com/files/12559/629985/keymap-eclipse-243.21565.122.zip", + "243.23654.157": "https://plugins.jetbrains.com/files/12559/629985/keymap-eclipse-243.21565.122.zip", + "243.23654.166": "https://plugins.jetbrains.com/files/12559/629985/keymap-eclipse-243.21565.122.zip", + "243.23654.167": "https://plugins.jetbrains.com/files/12559/629985/keymap-eclipse-243.21565.122.zip", + "243.23654.168": "https://plugins.jetbrains.com/files/12559/629985/keymap-eclipse-243.21565.122.zip", + "243.23654.177": "https://plugins.jetbrains.com/files/12559/629985/keymap-eclipse-243.21565.122.zip", + "243.23654.180": "https://plugins.jetbrains.com/files/12559/629985/keymap-eclipse-243.21565.122.zip", + "243.23654.189": "https://plugins.jetbrains.com/files/12559/629985/keymap-eclipse-243.21565.122.zip", "243.23654.19": "https://plugins.jetbrains.com/files/12559/629985/keymap-eclipse-243.21565.122.zip" }, "name": "eclipse-keymap" @@ -539,17 +554,18 @@ "webstorm" ], "builds": { - "241.19072.1155": null, + "243.21565.447": "https://plugins.jetbrains.com/files/13017/630016/keymap-visualStudio-243.21565.122.zip", "243.22562.218": "https://plugins.jetbrains.com/files/13017/630016/keymap-visualStudio-243.21565.122.zip", "243.22562.220": "https://plugins.jetbrains.com/files/13017/630016/keymap-visualStudio-243.21565.122.zip", - "243.22562.250": "https://plugins.jetbrains.com/files/13017/630016/keymap-visualStudio-243.21565.122.zip", - "243.23654.112": "https://plugins.jetbrains.com/files/13017/630016/keymap-visualStudio-243.21565.122.zip", "243.23654.114": "https://plugins.jetbrains.com/files/13017/630016/keymap-visualStudio-243.21565.122.zip", - "243.23654.115": "https://plugins.jetbrains.com/files/13017/630016/keymap-visualStudio-243.21565.122.zip", - "243.23654.116": "https://plugins.jetbrains.com/files/13017/630016/keymap-visualStudio-243.21565.122.zip", - "243.23654.117": "https://plugins.jetbrains.com/files/13017/630016/keymap-visualStudio-243.21565.122.zip", - "243.23654.119": "https://plugins.jetbrains.com/files/13017/630016/keymap-visualStudio-243.21565.122.zip", - "243.23654.120": "https://plugins.jetbrains.com/files/13017/630016/keymap-visualStudio-243.21565.122.zip", + "243.23654.126": "https://plugins.jetbrains.com/files/13017/630016/keymap-visualStudio-243.21565.122.zip", + "243.23654.157": "https://plugins.jetbrains.com/files/13017/630016/keymap-visualStudio-243.21565.122.zip", + "243.23654.166": "https://plugins.jetbrains.com/files/13017/630016/keymap-visualStudio-243.21565.122.zip", + "243.23654.167": "https://plugins.jetbrains.com/files/13017/630016/keymap-visualStudio-243.21565.122.zip", + "243.23654.168": "https://plugins.jetbrains.com/files/13017/630016/keymap-visualStudio-243.21565.122.zip", + "243.23654.177": "https://plugins.jetbrains.com/files/13017/630016/keymap-visualStudio-243.21565.122.zip", + "243.23654.180": "https://plugins.jetbrains.com/files/13017/630016/keymap-visualStudio-243.21565.122.zip", + "243.23654.189": "https://plugins.jetbrains.com/files/13017/630016/keymap-visualStudio-243.21565.122.zip", "243.23654.19": "https://plugins.jetbrains.com/files/13017/630016/keymap-visualStudio-243.21565.122.zip" }, "name": "visual-studio-keymap" @@ -571,17 +587,18 @@ "webstorm" ], "builds": { - "241.19072.1155": null, + "243.21565.447": "https://plugins.jetbrains.com/files/14004/629971/protoeditor-243.21565.122.zip", "243.22562.218": "https://plugins.jetbrains.com/files/14004/636643/protoeditor-243.22562.13.zip", "243.22562.220": "https://plugins.jetbrains.com/files/14004/636643/protoeditor-243.22562.13.zip", - "243.22562.250": "https://plugins.jetbrains.com/files/14004/636643/protoeditor-243.22562.13.zip", - "243.23654.112": "https://plugins.jetbrains.com/files/14004/636643/protoeditor-243.22562.13.zip", "243.23654.114": "https://plugins.jetbrains.com/files/14004/636643/protoeditor-243.22562.13.zip", - "243.23654.115": "https://plugins.jetbrains.com/files/14004/636643/protoeditor-243.22562.13.zip", - "243.23654.116": "https://plugins.jetbrains.com/files/14004/636643/protoeditor-243.22562.13.zip", - "243.23654.117": "https://plugins.jetbrains.com/files/14004/636643/protoeditor-243.22562.13.zip", - "243.23654.119": "https://plugins.jetbrains.com/files/14004/636643/protoeditor-243.22562.13.zip", - "243.23654.120": "https://plugins.jetbrains.com/files/14004/636643/protoeditor-243.22562.13.zip", + "243.23654.126": "https://plugins.jetbrains.com/files/14004/636643/protoeditor-243.22562.13.zip", + "243.23654.157": "https://plugins.jetbrains.com/files/14004/636643/protoeditor-243.22562.13.zip", + "243.23654.166": "https://plugins.jetbrains.com/files/14004/636643/protoeditor-243.22562.13.zip", + "243.23654.167": "https://plugins.jetbrains.com/files/14004/636643/protoeditor-243.22562.13.zip", + "243.23654.168": "https://plugins.jetbrains.com/files/14004/636643/protoeditor-243.22562.13.zip", + "243.23654.177": "https://plugins.jetbrains.com/files/14004/636643/protoeditor-243.22562.13.zip", + "243.23654.180": "https://plugins.jetbrains.com/files/14004/636643/protoeditor-243.22562.13.zip", + "243.23654.189": "https://plugins.jetbrains.com/files/14004/636643/protoeditor-243.22562.13.zip", "243.23654.19": "https://plugins.jetbrains.com/files/14004/636643/protoeditor-243.22562.13.zip" }, "name": "protocol-buffers" @@ -603,17 +620,18 @@ "webstorm" ], "builds": { - "241.19072.1155": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", + "243.21565.447": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", "243.22562.218": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", "243.22562.220": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "243.22562.250": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "243.23654.112": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", "243.23654.114": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "243.23654.115": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "243.23654.116": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "243.23654.117": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "243.23654.119": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "243.23654.120": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", + "243.23654.126": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", + "243.23654.157": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", + "243.23654.166": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", + "243.23654.167": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", + "243.23654.168": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", + "243.23654.177": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", + "243.23654.180": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", + "243.23654.189": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", "243.23654.19": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar" }, "name": "darcula-pitch-black" @@ -635,18 +653,19 @@ "webstorm" ], "builds": { - "241.19072.1155": "https://plugins.jetbrains.com/files/17718/654596/github-copilot-intellij-1.5.30-231.zip", - "243.22562.218": "https://plugins.jetbrains.com/files/17718/654597/github-copilot-intellij-1.5.30-242.zip", - "243.22562.220": "https://plugins.jetbrains.com/files/17718/654597/github-copilot-intellij-1.5.30-242.zip", - "243.22562.250": "https://plugins.jetbrains.com/files/17718/654597/github-copilot-intellij-1.5.30-242.zip", - "243.23654.112": "https://plugins.jetbrains.com/files/17718/654597/github-copilot-intellij-1.5.30-242.zip", - "243.23654.114": "https://plugins.jetbrains.com/files/17718/654597/github-copilot-intellij-1.5.30-242.zip", - "243.23654.115": "https://plugins.jetbrains.com/files/17718/654597/github-copilot-intellij-1.5.30-242.zip", - "243.23654.116": "https://plugins.jetbrains.com/files/17718/654597/github-copilot-intellij-1.5.30-242.zip", - "243.23654.117": "https://plugins.jetbrains.com/files/17718/654597/github-copilot-intellij-1.5.30-242.zip", - "243.23654.119": "https://plugins.jetbrains.com/files/17718/654597/github-copilot-intellij-1.5.30-242.zip", - "243.23654.120": "https://plugins.jetbrains.com/files/17718/654597/github-copilot-intellij-1.5.30-242.zip", - "243.23654.19": "https://plugins.jetbrains.com/files/17718/654597/github-copilot-intellij-1.5.30-242.zip" + "243.21565.447": "https://plugins.jetbrains.com/files/17718/671850/github-copilot-intellij-1.5.32-242.zip", + "243.22562.218": "https://plugins.jetbrains.com/files/17718/671850/github-copilot-intellij-1.5.32-242.zip", + "243.22562.220": "https://plugins.jetbrains.com/files/17718/671850/github-copilot-intellij-1.5.32-242.zip", + "243.23654.114": "https://plugins.jetbrains.com/files/17718/671850/github-copilot-intellij-1.5.32-242.zip", + "243.23654.126": "https://plugins.jetbrains.com/files/17718/671850/github-copilot-intellij-1.5.32-242.zip", + "243.23654.157": "https://plugins.jetbrains.com/files/17718/671850/github-copilot-intellij-1.5.32-242.zip", + "243.23654.166": "https://plugins.jetbrains.com/files/17718/671850/github-copilot-intellij-1.5.32-242.zip", + "243.23654.167": "https://plugins.jetbrains.com/files/17718/671850/github-copilot-intellij-1.5.32-242.zip", + "243.23654.168": "https://plugins.jetbrains.com/files/17718/671850/github-copilot-intellij-1.5.32-242.zip", + "243.23654.177": "https://plugins.jetbrains.com/files/17718/671850/github-copilot-intellij-1.5.32-242.zip", + "243.23654.180": "https://plugins.jetbrains.com/files/17718/671850/github-copilot-intellij-1.5.32-242.zip", + "243.23654.189": "https://plugins.jetbrains.com/files/17718/671850/github-copilot-intellij-1.5.32-242.zip", + "243.23654.19": "https://plugins.jetbrains.com/files/17718/671850/github-copilot-intellij-1.5.32-242.zip" }, "name": "github-copilot" }, @@ -667,17 +686,18 @@ "webstorm" ], "builds": { - "241.19072.1155": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", + "243.21565.447": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", "243.22562.218": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", "243.22562.220": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "243.22562.250": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "243.23654.112": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", "243.23654.114": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "243.23654.115": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "243.23654.116": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "243.23654.117": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "243.23654.119": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "243.23654.120": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", + "243.23654.126": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", + "243.23654.157": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", + "243.23654.166": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", + "243.23654.167": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", + "243.23654.168": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", + "243.23654.177": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", + "243.23654.180": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", + "243.23654.189": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", "243.23654.19": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip" }, "name": "netbeans-6-5-keymap" @@ -699,17 +719,18 @@ "webstorm" ], "builds": { - "241.19072.1155": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip", + "243.21565.447": "https://plugins.jetbrains.com/files/20146/633971/Mermaid-0.0.24_IJ.243.zip", "243.22562.218": "https://plugins.jetbrains.com/files/20146/633971/Mermaid-0.0.24_IJ.243.zip", "243.22562.220": "https://plugins.jetbrains.com/files/20146/633971/Mermaid-0.0.24_IJ.243.zip", - "243.22562.250": "https://plugins.jetbrains.com/files/20146/633971/Mermaid-0.0.24_IJ.243.zip", - "243.23654.112": "https://plugins.jetbrains.com/files/20146/633971/Mermaid-0.0.24_IJ.243.zip", "243.23654.114": "https://plugins.jetbrains.com/files/20146/633971/Mermaid-0.0.24_IJ.243.zip", - "243.23654.115": "https://plugins.jetbrains.com/files/20146/633971/Mermaid-0.0.24_IJ.243.zip", - "243.23654.116": "https://plugins.jetbrains.com/files/20146/633971/Mermaid-0.0.24_IJ.243.zip", - "243.23654.117": "https://plugins.jetbrains.com/files/20146/633971/Mermaid-0.0.24_IJ.243.zip", - "243.23654.119": "https://plugins.jetbrains.com/files/20146/633971/Mermaid-0.0.24_IJ.243.zip", - "243.23654.120": "https://plugins.jetbrains.com/files/20146/633971/Mermaid-0.0.24_IJ.243.zip", + "243.23654.126": "https://plugins.jetbrains.com/files/20146/633971/Mermaid-0.0.24_IJ.243.zip", + "243.23654.157": "https://plugins.jetbrains.com/files/20146/633971/Mermaid-0.0.24_IJ.243.zip", + "243.23654.166": "https://plugins.jetbrains.com/files/20146/633971/Mermaid-0.0.24_IJ.243.zip", + "243.23654.167": "https://plugins.jetbrains.com/files/20146/633971/Mermaid-0.0.24_IJ.243.zip", + "243.23654.168": "https://plugins.jetbrains.com/files/20146/633971/Mermaid-0.0.24_IJ.243.zip", + "243.23654.177": "https://plugins.jetbrains.com/files/20146/633971/Mermaid-0.0.24_IJ.243.zip", + "243.23654.180": "https://plugins.jetbrains.com/files/20146/633971/Mermaid-0.0.24_IJ.243.zip", + "243.23654.189": "https://plugins.jetbrains.com/files/20146/633971/Mermaid-0.0.24_IJ.243.zip", "243.23654.19": "https://plugins.jetbrains.com/files/20146/633971/Mermaid-0.0.24_IJ.243.zip" }, "name": "mermaid" @@ -721,46 +742,42 @@ "rust-rover" ], "builds": { - "243.23654.114": "https://plugins.jetbrains.com/files/22407/666537/intellij-rust-243.23654.116.zip", - "243.23654.116": "https://plugins.jetbrains.com/files/22407/666537/intellij-rust-243.23654.116.zip", - "243.23654.117": "https://plugins.jetbrains.com/files/22407/666537/intellij-rust-243.23654.116.zip" + "243.23654.114": "https://plugins.jetbrains.com/files/22407/672481/intellij-rust-243.23654.180.zip", + "243.23654.180": "https://plugins.jetbrains.com/files/22407/672481/intellij-rust-243.23654.180.zip", + "243.23654.189": "https://plugins.jetbrains.com/files/22407/672481/intellij-rust-243.23654.180.zip" }, "name": "rust" } }, "files": { - "https://plugins.jetbrains.com/files/10037/585243/CSVEditor-3.4.0-241.zip": "sha256-QwguD4ENrL7GxmX+CGEyCPowbAPNpYgntVGAbHxOlyQ=", "https://plugins.jetbrains.com/files/10037/658496/intellij-csv-validator-4.0.2.zip": "sha256-frvQ+Dm1ueID6+vNlja0HtecGyn+ppq9GTgmU3kQ+58=", - "https://plugins.jetbrains.com/files/11349/666864/aws-toolkit-jetbrains-standalone-3.48-241.zip": "sha256-2bz6CZQr+pQ5Sl+zhBnfKBQMyTF5wBk+Xk3Y+wh5c48=", - "https://plugins.jetbrains.com/files/11349/666866/aws-toolkit-jetbrains-standalone-3.48-243.zip": "sha256-jKcanbs0qobJebe4onrSY43xp6V7ViAOVZNEMyaSvkY=", + "https://plugins.jetbrains.com/files/11349/670543/aws-toolkit-jetbrains-standalone-3.50-243.zip": "sha256-Jr+Oe7LbC5QW/sxevoq/uasKGT7rwgI+uiVHYdoBkQM=", "https://plugins.jetbrains.com/files/12062/630060/keymap-vscode-243.21565.122.zip": "sha256-phv8MTGKNGzRviKzX+nIVTbkX4WkU82QVO5zXUQLtAo=", "https://plugins.jetbrains.com/files/12559/629985/keymap-eclipse-243.21565.122.zip": "sha256-/g1ucT18ywVJnCePH7WyMWKgM9umowBz5wFObmO7cws=", "https://plugins.jetbrains.com/files/13017/630016/keymap-visualStudio-243.21565.122.zip": "sha256-VQqK0Cm9ddXN63KYIqimuGOh7EB9VvdlErp/VrWx8SA=", "https://plugins.jetbrains.com/files/1347/667258/scala-intellij-bin-2024.3.35.zip": "sha256-4I75KqXyFl73S63O+00usrg8QBcuBRBgfjRmCQMpNks=", + "https://plugins.jetbrains.com/files/14004/629971/protoeditor-243.21565.122.zip": "sha256-cv6JTujoD5g90ngXTtnj5x31wjbIZlKZ6Zn0H+vHCTk=", "https://plugins.jetbrains.com/files/14004/636643/protoeditor-243.22562.13.zip": "sha256-Tgu8CfDhO6KugfuLNhmxe89dMm+Qo3fmAg/8hwjUaoc=", "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar": "sha256-eXInfAqY3yEZRXCAuv3KGldM1pNKEioNwPB0rIGgJFw=", - "https://plugins.jetbrains.com/files/164/590339/IdeaVIM-2.16.0.zip": "sha256-uMIrYoZE16X/K96HuDJx8QMh6wUbi4+qSw+HJAq7ukI=", "https://plugins.jetbrains.com/files/164/666347/IdeaVIM-2.18.1.zip": "sha256-wkh88imoNLt9Q7M6chu28+e0EhudpVGN4ZhvfSdj/l4=", - "https://plugins.jetbrains.com/files/17718/654596/github-copilot-intellij-1.5.30-231.zip": "sha256-xrZJBCGPT1s5+fyWsMSEC69vILM+BkKef2wKxzbTCM4=", - "https://plugins.jetbrains.com/files/17718/654597/github-copilot-intellij-1.5.30-242.zip": "sha256-bWrtG3cE6qAqXiQ4mtgRLutt8XaTqts+kyClDWVcMO4=", + "https://plugins.jetbrains.com/files/17718/671850/github-copilot-intellij-1.5.32-242.zip": "sha256-WJxjcazelBgNBusqiv9ws9XhtszKpdk+8iNV+jP+ros=", "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip": "sha256-KrzZTKZMQqoEMw+vDUv2jjs0EX0leaPBkU8H/ecq/oI=", - "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip": "sha256-DUiIQYIzYoXmgtBakSLtMB+xxJMaR70Jgg9erySa3wQ=", "https://plugins.jetbrains.com/files/20146/633971/Mermaid-0.0.24_IJ.243.zip": "sha256-jGWRU0g120qYvvFiUFI10zvprTsemuIq3XmIjYxZGts=", "https://plugins.jetbrains.com/files/2162/640476/StringManipulation-9.15.0.zip": "sha256-TZPup3EJ0cBv4i2eVAQwVmmzy0rmt4KptEsk3C7baEM=", - "https://plugins.jetbrains.com/files/22407/666537/intellij-rust-243.23654.116.zip": "sha256-abOkEYViOYFht9hk4KhqANfk63q4rp3ywenXeKj2ovQ=", - "https://plugins.jetbrains.com/files/631/666772/python-243.23654.117.zip": "sha256-UGGhKZGlnq+MrTWfpb3eiIGkLkJE77V4sLKZi16oATU=", + "https://plugins.jetbrains.com/files/22407/672481/intellij-rust-243.23654.180.zip": "sha256-9MB+kR8GZePzVU6i9sr+vFyeGqGnXwGRThTv6lKouVU=", + "https://plugins.jetbrains.com/files/631/673131/python-243.23654.189.zip": "sha256-4uuHNZhmSh+vqARBZ+ilRmkYnr0otZdgeZUPziv+lQc=", + "https://plugins.jetbrains.com/files/6981/633889/ini-243.21565.208.zip": "sha256-CJjUYj3GR9MrNhrejrxJ4reZX/80XQ+gkZffFKd0nhc=", "https://plugins.jetbrains.com/files/6981/654905/ini-243.22562.236.zip": "sha256-kL/A2R8j2JKMU61T/xJahPwKPYmwFCFy55NPSoBh/Xc=", - "https://plugins.jetbrains.com/files/6981/667161/ini-243.23654.119.zip": "sha256-MhN7iARzX/xB3H1sC5T2A3psMNDmws0QGhQOUqhGlIc=", + "https://plugins.jetbrains.com/files/6981/672286/ini-243.23654.177.zip": "sha256-5IgVW7Aa+eVh5hUF7/Qa1g7nQtkAQkFKyGY5ROr/5fM=", "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip": "sha256-kVUEgfEKUupV/qlB4Dpzi5pFHjhVvX74XIPetKtjysM=", - "https://plugins.jetbrains.com/files/7086/610924/AceJump.zip": "sha256-Qp24juITBXEF5izdzayWq28Ioy4/kgT0qz6snZ0dND0=", "https://plugins.jetbrains.com/files/7219/605730/Symfony_Plugin-2024.1.276.zip": "sha256-drNmhJMe+kuY2fcHjY+SQmkACvFk0rVI4vAhyZ/bgLc=", "https://plugins.jetbrains.com/files/7320/630497/PHP_Annotations-11.1.1.zip": "sha256-05aBYbqNIuwe/JTwntFdIqML8NHbTOwVusl1P9FzuYY=", "https://plugins.jetbrains.com/files/7322/646590/python-ce-243.22562.145.zip": "sha256-45UtQRZMtKF6addrrB3A+goeyICMfcZ2FKcJvJSqgg4=", - "https://plugins.jetbrains.com/files/7322/666773/python-ce-243.23654.117.zip": "sha256-l6ePJtwdj6+k7Qvpus9zGqIs141eT0/qTeZL0Ud4rM0=", - "https://plugins.jetbrains.com/files/7391/561441/asciidoctor-intellij-plugin-0.42.2.zip": "sha256-oKczkLHAk2bJRNRgToVe0ySEJGF8+P4oWqQ33olwzWw=", + "https://plugins.jetbrains.com/files/7322/673130/python-ce-243.23654.189.zip": "sha256-7P9JsxCDWUf0HPHZNPjoF8Ivh3Ks7AO5s2kWm+Cq9j4=", "https://plugins.jetbrains.com/files/7391/658997/asciidoctor-intellij-plugin-0.43.6.zip": "sha256-3RJ7YVFtynyqeLIzdrirCMbWNZmUkJ+DT/9my71H0Dk=", + "https://plugins.jetbrains.com/files/8554/633920/featuresTrainer-243.21565.204.zip": "sha256-3MCG1SNEy2Mf9r+nTLcRwJ+rIJRvtO0kYKFNjIan86E=", "https://plugins.jetbrains.com/files/8554/654690/featuresTrainer-243.22562.233.zip": "sha256-JugbJM8Lr2kbhP9hdLE3kUStl2vOMUB5wGTwNLxAZd0=", - "https://plugins.jetbrains.com/files/8554/666817/featuresTrainer-243.23654.115.zip": "sha256-3HiNFTBJ1b/6IvMMkMCmNVo/4VMtTTKeiC6XqR6LIUs=", + "https://plugins.jetbrains.com/files/8554/672476/featuresTrainer-243.23654.180.zip": "sha256-YRf5sj+quf/dQv6eFU6f190vWW+RHtyGS+S2a6DhUoM=", "https://plugins.jetbrains.com/files/8607/606922/NixIDEA-0.4.0.16.zip": "sha256-9GMqs/hSavcw1E4ZJTLDH1lx3HEeQ5NR8BT+Q9pN3io=", "https://plugins.jetbrains.com/files/9568/666746/go-plugin-243.23654.117.zip": "sha256-8Y7JyjX8ytias4ix1azWkhPEVYXDomWRiMQlrKco9zM=" } diff --git a/pkgs/applications/editors/neovim/tests/default.nix b/pkgs/applications/editors/neovim/tests/default.nix index 431e4fbb0762b..7448d9d17cebb 100644 --- a/pkgs/applications/editors/neovim/tests/default.nix +++ b/pkgs/applications/editors/neovim/tests/default.nix @@ -368,4 +368,5 @@ in ${nvim-with-luasnip}/bin/nvim -i NONE --cmd "lua require'jsregexp'" -e +quitall! ''; + inherit (vimPlugins) corePlugins; }) diff --git a/pkgs/applications/editors/tiled/default.nix b/pkgs/applications/editors/tiled/default.nix index ea5cba92460d9..95ff14a96bd53 100644 --- a/pkgs/applications/editors/tiled/default.nix +++ b/pkgs/applications/editors/tiled/default.nix @@ -28,13 +28,13 @@ in stdenv.mkDerivation rec { pname = "tiled"; - version = "1.11.1"; + version = "1.11.2"; src = fetchFromGitHub { owner = "mapeditor"; repo = pname; rev = "v${version}"; - sha256 = "sha256-9cgGweo0D43U/puS82JCmBrikKe/TclHsrghQ4OZVEo="; + sha256 = "sha256-9oUKn51MQcsStgIJrp9XW5YAIpAUcO0kzfGnYA3gz/E="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/editors/vim/common.nix b/pkgs/applications/editors/vim/common.nix index d6a8185048bbb..a6cc1fab50ad5 100644 --- a/pkgs/applications/editors/vim/common.nix +++ b/pkgs/applications/editors/vim/common.nix @@ -37,7 +37,7 @@ rec { meta = with lib; { description = "Most popular clone of the VI editor"; - homepage = "http://www.vim.org"; + homepage = "https://www.vim.org"; license = licenses.vim; maintainers = with maintainers; [ das_j diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 39b00d195e165..63f0266f395fe 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -1,5 +1,5 @@ # GENERATED by ./pkgs/applications/editors/vim/plugins/update.py. Do not edit! -{ lib, buildVimPlugin, buildNeovimPlugin, fetchFromGitHub, fetchgit }: +{ lib, buildVimPlugin, buildNeovimPlugin, fetchFromGitHub }: final: prev: { @@ -65,12 +65,12 @@ final: prev: CopilotChat-nvim = buildVimPlugin { pname = "CopilotChat.nvim"; - version = "2024-12-14"; + version = "2025-01-27"; src = fetchFromGitHub { owner = "CopilotC-Nvim"; repo = "CopilotChat.nvim"; - rev = "2ebe591cff06018e265263e71e1dbc4c5aa8281e"; - sha256 = "1lw43yhpbi3kl6j5lmz027yhndqjp95ms123dx9lxyqpfa6zkwr0"; + rev = "1b375c24602680b5fe28c3c223a822111857dc37"; + sha256 = "19cab0n6sjmmw4p4qd3n99a677mj6fbkf7m37i8qvhzdyqli4035"; }; meta.homepage = "https://github.com/CopilotC-Nvim/CopilotChat.nvim/"; }; @@ -173,28 +173,40 @@ final: prev: LazyVim = buildVimPlugin { pname = "LazyVim"; - version = "2025-01-18"; + version = "2025-01-23"; src = fetchFromGitHub { owner = "LazyVim"; repo = "LazyVim"; - rev = "4e8d75144de92e62eb58c87f61938118d3b1e37c"; - sha256 = "0kwrbsxp7sy2dw4z14abfh1mnsxr1lgv411zi5wfi8grgbc04h83"; + rev = "83bf6360a1f28a3fc1afe31ae300247fc01c7a90"; + sha256 = "1m04jryv3hi3a70im6mn7xmb1j457c1la2l62ji4k3bl6frysx4z"; }; meta.homepage = "https://github.com/LazyVim/LazyVim/"; }; LeaderF = buildVimPlugin { pname = "LeaderF"; - version = "2025-01-17"; + version = "2025-01-20"; src = fetchFromGitHub { owner = "Yggdroot"; repo = "LeaderF"; - rev = "1b907fbf7717ae1244745b8ffa2b604510e713c7"; - sha256 = "0bww20hp83ahi2w66h8qmrkx49fd54xap543yf9bldj5nq5gb440"; + rev = "399c5af43755a9c09f840d892921186514171d87"; + sha256 = "0kc6plxxf48php5s44xsyhy4in7s37p4vnnigmnw45mg4d9sb6aq"; }; meta.homepage = "https://github.com/Yggdroot/LeaderF/"; }; + LuaSnip-snippets-nvim = buildVimPlugin { + pname = "LuaSnip-snippets.nvim"; + version = "2022-03-17"; + src = fetchFromGitHub { + owner = "molleweide"; + repo = "LuaSnip-snippets.nvim"; + rev = "d7e40e4cce622eab2316607dbcd8d6039bcb9fe0"; + sha256 = "063fz3f9byzmb1qavhrjdcphr3nk4l4d19h7mzj5sx4wv7cn8nl8"; + }; + meta.homepage = "https://github.com/molleweide/LuaSnip-snippets.nvim/"; + }; + MatchTagAlways = buildVimPlugin { pname = "MatchTagAlways"; version = "2017-05-20"; @@ -329,12 +341,12 @@ final: prev: SchemaStore-nvim = buildVimPlugin { pname = "SchemaStore.nvim"; - version = "2025-01-17"; + version = "2025-01-24"; src = fetchFromGitHub { owner = "b0o"; repo = "SchemaStore.nvim"; - rev = "b62efcb71077bfeb407dcd05fb0584e422131150"; - sha256 = "0hgfqjmrca57zy08q4hjws0326djly1jwvrfchingamm15q2g0mw"; + rev = "bb52c530698654355bbddb9f0035dc35cea401a5"; + sha256 = "0xxn7i44h4wmxhwbkn2m51jgpfa2xybrn1arhsp100mdfb2w6fa9"; }; meta.homepage = "https://github.com/b0o/SchemaStore.nvim/"; }; @@ -546,12 +558,12 @@ final: prev: aerial-nvim = buildVimPlugin { pname = "aerial.nvim"; - version = "2025-01-09"; + version = "2025-01-25"; src = fetchFromGitHub { owner = "stevearc"; repo = "aerial.nvim"; - rev = "4c959cf65c5420d54b24b61a77b681dcfca0bc57"; - sha256 = "07sl2vbwn4fk1vyaqq2yiqbp6pglqgj6qhbbzfra2cdx0jhk5v5f"; + rev = "2aeafd99937602fc40609ffffbdd2f99d77343e9"; + sha256 = "1l21zvg8zd42ssd2y28pc054m1fxq8kn4sl51mj60xxxpb2jlxlj"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/aerial.nvim/"; @@ -1196,12 +1208,12 @@ final: prev: base46 = buildVimPlugin { pname = "base46"; - version = "2025-01-19"; + version = "2025-01-26"; src = fetchFromGitHub { owner = "nvchad"; repo = "base46"; - rev = "1b822aa37005d2cfe010dd0febfb4024fc327576"; - sha256 = "18ykwgcpvwj25aw1bca3yy6dl3n7c5mqrhly15v6z94z18rc7p8q"; + rev = "1f6b990f6ca3597d0d1cbfe6cb683b0080b17516"; + sha256 = "113qinpv6bg5c026xgm353il8qbb9kp31vqshys73jaa58khf5qp"; }; meta.homepage = "https://github.com/nvchad/base46/"; }; @@ -1292,12 +1304,12 @@ final: prev: blink-compat = buildVimPlugin { pname = "blink.compat"; - version = "2024-12-25"; + version = "2025-01-20"; src = fetchFromGitHub { owner = "Saghen"; repo = "blink.compat"; - rev = "5ca8848c8cc32abdc980e5db4f0eb7bb8fbf84dc"; - sha256 = "0g53dkcsl2y77yvsnhsdw523i4jfl495n9ynlsppk8wx58miwm5l"; + rev = "d375d838042dbef34114139839fdda16b2485d63"; + sha256 = "1qgscw95iicnkki6mw5c9akyjrvsgdc9lyqi0srsybpw90i68mxl"; }; meta.homepage = "https://github.com/Saghen/blink.compat/"; }; @@ -1332,8 +1344,8 @@ final: prev: src = fetchFromGitHub { owner = "mikavilpas"; repo = "blink-ripgrep.nvim"; - rev = "ccffe82ffb7a0b3967a5f5ed97d415a11a3c3a8e"; - sha256 = "1ia40cg5dv6xl7a1nxs59p86ck0q46rzix37k7m9bqc9brmdhmxi"; + rev = "a17697bba1bd351f6686b9f9285cf2fd1b03cf4a"; + sha256 = "0s2i54lqz9nzasfhiy2x6n4df3a2axzp0cyhma8jhv2y7v4pa8gi"; }; meta.homepage = "https://github.com/mikavilpas/blink-ripgrep.nvim/"; }; @@ -1364,12 +1376,12 @@ final: prev: bluloco-nvim = buildVimPlugin { pname = "bluloco.nvim"; - version = "2025-01-16"; + version = "2025-01-21"; src = fetchFromGitHub { owner = "uloco"; repo = "bluloco.nvim"; - rev = "d14fa758c6dc73e622384e1ee895e5f614d9d9d5"; - sha256 = "1aa59nkc1qfli6ak7lnnz4a6kvbn0rqsz5n8rxhr88hvhb4pab9p"; + rev = "6b014b473aac4bf9470f926a3f5568ebc2ce5f08"; + sha256 = "100gbjpkd6mj2k9whcji82lqg6xl4nnq2vg6nxcw5zq0lhgp2lrq"; }; meta.homepage = "https://github.com/uloco/bluloco.nvim/"; }; @@ -1674,17 +1686,6 @@ final: prev: meta.homepage = "https://github.com/xavierd/clang_complete/"; }; - clangd_extensions-nvim = buildVimPlugin { - pname = "clangd_extensions.nvim"; - version = "2024-10-05"; - src = fetchgit { - url = "https://git.sr.ht/~p00f/clangd_extensions.nvim"; - rev = "8f7b72100883e0e34400d9518d40a03f21e4d0a6"; - sha256 = "1rlw3h9f9cnbniqqpv9fv2s63g7s4p8ag4n15xja1r4scfxhyrip"; - }; - meta.homepage = "https://git.sr.ht/~p00f/clangd_extensions.nvim"; - }; - clever-f-vim = buildVimPlugin { pname = "clever-f.vim"; version = "2022-10-15"; @@ -1747,12 +1748,12 @@ final: prev: cmake-tools-nvim = buildVimPlugin { pname = "cmake-tools.nvim"; - version = "2025-01-13"; + version = "2025-01-20"; src = fetchFromGitHub { owner = "Civitasv"; repo = "cmake-tools.nvim"; - rev = "a673bb68680197143902ec4d0a0078e4ae3d2141"; - sha256 = "0mlz6mc1zm9cby7b4vns053x0p0bzx8xb0z565nird0gg4bfrgyl"; + rev = "83268ea6f969f1e6eaa85f72118a11acb6198bf0"; + sha256 = "0m3zhdzf58fpxaywmyqm4hljkynw0wws4gk6h45w3km0cawwz6qj"; }; meta.homepage = "https://github.com/Civitasv/cmake-tools.nvim/"; }; @@ -1781,17 +1782,6 @@ final: prev: meta.homepage = "https://github.com/tzachar/cmp-ai/"; }; - cmp-async-path = buildVimPlugin { - pname = "cmp-async-path"; - version = "2024-10-21"; - src = fetchgit { - url = "https://codeberg.org/FelipeLema/cmp-async-path/"; - rev = "d6d1ffa2075039632a2d71e8fa139818e15ac757"; - sha256 = "1x10v0kd0i2pdxknzdn3zgqdn4hgbivgnczsj56wc32jzcs6k49i"; - }; - meta.homepage = "https://codeberg.org/FelipeLema/cmp-async-path/"; - }; - cmp-beancount = buildVimPlugin { pname = "cmp-beancount"; version = "2024-07-16"; @@ -2454,12 +2444,12 @@ final: prev: coc-nvim = buildVimPlugin { pname = "coc.nvim"; - version = "2024-12-24"; + version = "2025-01-21"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc.nvim"; - rev = "4cc169449fa6fd69e5f5f0a67bda8fd74837f924"; - sha256 = "0dwag116y4dykfz3zzgqh8d59s7gc9k9xwvs5ailxi30ws8ii7qz"; + rev = "b45563656be26e518992ffede778f918dc443012"; + sha256 = "0kpx3vx4j0d4izhsljnmyliwxlhszi6hxmm1m7f75h180p5ncjda"; }; meta.homepage = "https://github.com/neoclide/coc.nvim/"; }; @@ -2502,12 +2492,12 @@ final: prev: codecompanion-nvim = buildVimPlugin { pname = "codecompanion.nvim"; - version = "2025-01-18"; + version = "2025-01-27"; src = fetchFromGitHub { owner = "olimorris"; repo = "codecompanion.nvim"; - rev = "72d95c0126c82f02d1b3f43744f7b333d3dc5d22"; - sha256 = "1p2jjsjqgg3vjg1kfmb03va83zkkn9dywfkd3h6snxjn0sbp84v7"; + rev = "d9f6ae48b9e0b1ec09594d8bd04dea49223f4f22"; + sha256 = "1i4s4prxwz94g9igl7wd19ilji3j7kard8ad7v8ngbjdxlfx3aj0"; }; meta.homepage = "https://github.com/olimorris/codecompanion.nvim/"; }; @@ -2754,12 +2744,12 @@ final: prev: conform-nvim = buildVimPlugin { pname = "conform.nvim"; - version = "2025-01-16"; + version = "2025-01-25"; src = fetchFromGitHub { owner = "stevearc"; repo = "conform.nvim"; - rev = "6dc21d4ce050c2e592d9635b7983d67baf216e3d"; - sha256 = "1gcc6lz7cx5vn42c82hxan61xhli891aka5775pzlrhxxc8pyd8j"; + rev = "363243c03102a531a8203311d4f2ae704c620d9b"; + sha256 = "1lf7a5b30g37ys9f4z9gq68ymzfzsw7bwzqp1bb91cx9df1bdyck"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/conform.nvim/"; @@ -2827,12 +2817,12 @@ final: prev: copilot-lualine = buildVimPlugin { pname = "copilot-lualine"; - version = "2024-09-03"; + version = "2025-01-21"; src = fetchFromGitHub { owner = "AndreM222"; repo = "copilot-lualine"; - rev = "f40450c3e138766026327e7807877ea860618258"; - sha256 = "0qx9x28f0c20cz2ax1631rd7qzzkzvhbnv9ivmyw44v5nzp8jy1x"; + rev = "dc4b8ed0f75bc2557b3158c526624bf04ad233ea"; + sha256 = "062azz55qbrh07md9p610q6p278n9s60f83wwq890lvdm94x4lgc"; }; meta.homepage = "https://github.com/AndreM222/copilot-lualine/"; }; @@ -2851,12 +2841,12 @@ final: prev: coq-artifacts = buildVimPlugin { pname = "coq.artifacts"; - version = "2024-08-31"; + version = "2025-01-20"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq.artifacts"; - rev = "a1ffcee295905171d87b40ee456001d45b10329b"; - sha256 = "0ag8ryq7figzvf0693077ifwj38jwig09521v04h9jyivickiq6w"; + rev = "ef5f21d638ccc456cfa5b8d0ab37093cefe48c8b"; + sha256 = "0h7hz9p564pq116pski6q6jng1qws29brxf12gzmj0iamgb8alzp"; }; meta.homepage = "https://github.com/ms-jpq/coq.artifacts/"; }; @@ -2899,12 +2889,12 @@ final: prev: coq_nvim = buildVimPlugin { pname = "coq_nvim"; - version = "2025-01-19"; + version = "2025-01-20"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq_nvim"; - rev = "7db5a5f80bd2fc5f6f930acb5a3ded063463a621"; - sha256 = "036mgp9b9ynmrwv6bch9kf6xblj88llv3dxccfkr9q20yb0lc0q3"; + rev = "df646c5d39a949009d9109c1a2ec2725819726ff"; + sha256 = "1xcnbiq37sg1ipv5kjw61yli8qj5adzf0fqbhqsdvlxmfplwvv8k"; }; meta.homepage = "https://github.com/ms-jpq/coq_nvim/"; }; @@ -3067,12 +3057,12 @@ final: prev: cyberdream-nvim = buildVimPlugin { pname = "cyberdream.nvim"; - version = "2025-01-17"; + version = "2025-01-21"; src = fetchFromGitHub { owner = "scottmckendry"; repo = "cyberdream.nvim"; - rev = "f5e9c14a3026ef7cdb26d00145baebe166b52848"; - sha256 = "18g3jjc6spzzhxcpsm5xvwv3a61yscfhrzmca8bv3frgcwp4z7wd"; + rev = "5b42c2e6764312c166c25bc79dfcbaadac2d5425"; + sha256 = "0wwd3qrbv3cdhas6vicl3m5wvxhl18r85j5khf3yslbppzjfnfr6"; }; meta.homepage = "https://github.com/scottmckendry/cyberdream.nvim/"; }; @@ -3115,24 +3105,24 @@ final: prev: dashboard-nvim = buildVimPlugin { pname = "dashboard-nvim"; - version = "2025-01-19"; + version = "2025-01-22"; src = fetchFromGitHub { owner = "nvimdev"; repo = "dashboard-nvim"; - rev = "4bad0f5608b7305091e5baab2dda0b988729692e"; - sha256 = "1cmai7z99x804lkb5c7kiaw1gzgvxznq227fr93ag18rrb620z4g"; + rev = "000448d837f6e7a47f8f342f29526c4d7e49e9ce"; + sha256 = "11kh15qp819dhr2r3q78dv9pzxrswzzpjqmdpa5nlba9mvgjzzy3"; }; meta.homepage = "https://github.com/nvimdev/dashboard-nvim/"; }; ddc-filter-matcher_head = buildVimPlugin { pname = "ddc-filter-matcher_head"; - version = "2024-09-03"; + version = "2025-01-22"; src = fetchFromGitHub { owner = "Shougo"; repo = "ddc-filter-matcher_head"; - rev = "2be49f0c547fc224f70bd4a0b354b1c1dd9c9eac"; - sha256 = "0liglv3rlag29bivsx2m5m6xnqxc6d7z5ar88zyqmrwrzs20f83h"; + rev = "2c46a670191cb883bc07a2286883a7c438f731fb"; + sha256 = "1xhdrm07xibdl100rbvpqf3m3r2c2iy0lnnaf06rhng6i7d1kn71"; }; meta.homepage = "https://github.com/Shougo/ddc-filter-matcher_head/"; }; @@ -3175,12 +3165,12 @@ final: prev: ddc-source-file = buildVimPlugin { pname = "ddc-source-file"; - version = "2024-09-24"; + version = "2025-01-22"; src = fetchFromGitHub { owner = "LumaKernel"; repo = "ddc-source-file"; - rev = "34b362d45957183b4ec99d618a19a5f5f517c365"; - sha256 = "070k693x8di1safyrb1dbki626akmnpi25wzvjnjd4vvvknzwbj8"; + rev = "4f3cead1774e4718a91476fe883eccff1137773c"; + sha256 = "17nibc8xgl73p0cvc27v0zjn3mw89nrsch02js32070x21dj6l8v"; }; meta.homepage = "https://github.com/LumaKernel/ddc-source-file/"; }; @@ -3235,12 +3225,12 @@ final: prev: debugprint-nvim = buildVimPlugin { pname = "debugprint.nvim"; - version = "2025-01-15"; + version = "2025-01-25"; src = fetchFromGitHub { owner = "andrewferrier"; repo = "debugprint.nvim"; - rev = "1a7b2b9c08c01b975adadae540b831e11577922c"; - sha256 = "1lh0nvfc1afayryb6y6ciww3wk56lh7vwbcy0aq65lvwpryz37vh"; + rev = "91c3a7c51aafce919f1ed30e56dbb2fc62b22e13"; + sha256 = "09dc6xvrqvxqq78a90p01scinwcxnpggvqc4g6mb7da69zdbyjy2"; }; meta.homepage = "https://github.com/andrewferrier/debugprint.nvim/"; }; @@ -3355,12 +3345,12 @@ final: prev: deol-nvim = buildVimPlugin { pname = "deol.nvim"; - version = "2025-01-15"; + version = "2025-01-27"; src = fetchFromGitHub { owner = "Shougo"; repo = "deol.nvim"; - rev = "154df2c63b5f547933e911dc6b6e3810edcce194"; - sha256 = "1cfrc5zxd8x96bz2xcy8xq4zrf1cid4x93fc74kzndiq2dsvhhl3"; + rev = "649f52aa7eb2d5ddae2f20426fcda413289b9510"; + sha256 = "0c5wgx9mvysp4a2jcs05rkn9si91ka0qb257zrn10i8wd20kk35b"; }; meta.homepage = "https://github.com/Shougo/deol.nvim/"; }; @@ -3765,24 +3755,24 @@ final: prev: dressing-nvim = buildVimPlugin { pname = "dressing.nvim"; - version = "2024-12-21"; + version = "2025-01-25"; src = fetchFromGitHub { owner = "stevearc"; repo = "dressing.nvim"; - rev = "3a45525bb182730fe462325c99395529308f431e"; - sha256 = "0wd9zgqh9i9f77ny7avgsnsl6rxamcqcr7qlbzmsb8p003kl321p"; + rev = "56ef6a969a4990d938c5fed40c370f65e125fc97"; + sha256 = "00wpbb4hgkngx29jn4mrcyl1d6xzd2hn6safm5vz0ydl5sxla48c"; }; meta.homepage = "https://github.com/stevearc/dressing.nvim/"; }; dropbar-nvim = buildVimPlugin { pname = "dropbar.nvim"; - version = "2025-01-19"; + version = "2025-01-26"; src = fetchFromGitHub { owner = "Bekaboo"; repo = "dropbar.nvim"; - rev = "40ef4c492edc08090d31d12fb9b7eb2315463a7e"; - sha256 = "090s9b454lhwzy5ynsrfvp0p9r0rygafl3gxr0fjv5jhks9bgf63"; + rev = "b27bb0353cb34bded65a8911e7d232b12100568b"; + sha256 = "1wr65a41xpqvzw2yy2q8mg6yv12czb2fr4abf0zn0iyspk4vkm8c"; }; meta.homepage = "https://github.com/Bekaboo/dropbar.nvim/"; }; @@ -3801,12 +3791,12 @@ final: prev: easy-dotnet-nvim = buildVimPlugin { pname = "easy-dotnet.nvim"; - version = "2025-01-17"; + version = "2025-01-27"; src = fetchFromGitHub { owner = "GustavEikaas"; repo = "easy-dotnet.nvim"; - rev = "b093bed64349e86d653fff19773f1ff3202b878f"; - sha256 = "1dny7pwd2nmvd112dag0xwbvzi3sv58hpjg2f54yh7la6843hwvb"; + rev = "65a53aa9159313f18dfa0c8ec40394b2f06e5ad8"; + sha256 = "1cblj7ivqkd09q7ap01gv0k9xq8ni4sgz0618dh4h6yf5zj7mz2g"; }; meta.homepage = "https://github.com/GustavEikaas/easy-dotnet.nvim/"; }; @@ -3934,12 +3924,12 @@ final: prev: embark-vim = buildVimPlugin { pname = "embark-vim"; - version = "2024-09-21"; + version = "2025-01-26"; src = fetchFromGitHub { owner = "embark-theme"; repo = "vim"; - rev = "530e361aa81a8665c3a909a787b918aaf7d702e2"; - sha256 = "1fyjri2i8cg4kykx64xf4i6xwyfdgzhimmr2mpwhjwgkjh8mhlph"; + rev = "3456e3c23981aeb951e8a804ce6358569023c96e"; + sha256 = "1649606jcpfn5n64xgma0wxz907i0j4hq15l72mcadwf5zi89j7g"; }; meta.homepage = "https://github.com/embark-theme/vim/"; }; @@ -4103,12 +4093,12 @@ final: prev: feline-nvim = buildVimPlugin { pname = "feline.nvim"; - version = "2024-11-13"; + version = "2025-01-24"; src = fetchFromGitHub { owner = "freddiehaddad"; repo = "feline.nvim"; - rev = "9f1313f61a75ec5ebe805fedd46bdc130c420963"; - sha256 = "0z8gq8hx2qn7v12lx9cjk48vx53zwpa4v6xvwpakyyink8fa0fpx"; + rev = "8184e3765d2a604b73c059f7eeab73212575fb0e"; + sha256 = "0fwsly72b9s7gjk1sval25mwp3s9v5ha8x1rks50ljcl5xvfzci6"; }; meta.homepage = "https://github.com/freddiehaddad/feline.nvim/"; }; @@ -4655,17 +4645,6 @@ final: prev: meta.homepage = "https://github.com/vim-scripts/gitignore.vim/"; }; - gitlab-vim = buildVimPlugin { - pname = "gitlab.vim"; - version = "2025-01-17"; - src = fetchgit { - url = "https://gitlab.com/gitlab-org/editor-extensions/gitlab.vim"; - rev = "7de00395ec13ab568b0bf50f1bf7d201ec395b1a"; - sha256 = "1bppvyvpm32jps898nrv096r5kigdsdz6kimmhiigv4xf3iwjv9j"; - }; - meta.homepage = "https://gitlab.com/gitlab-org/editor-extensions/gitlab.vim"; - }; - gitlinker-nvim = buildVimPlugin { pname = "gitlinker.nvim"; version = "2023-02-03"; @@ -4680,12 +4659,12 @@ final: prev: gitsigns-nvim = buildNeovimPlugin { pname = "gitsigns.nvim"; - version = "2025-01-17"; + version = "2025-01-24"; src = fetchFromGitHub { owner = "lewis6991"; repo = "gitsigns.nvim"; - rev = "817bd848fffe82e697b4da656e3f2834cd0665c5"; - sha256 = "085d953zlaxxmv1rymmbbnclgvmccx6hzrv3amp6n5g1nh3zpp9w"; + rev = "d8918f06624dd53b9a82bd0e29c31bcfd541b40d"; + sha256 = "19j7y5z9sz967rcyk4lxb3l5z3rrk07fi6wakvxqnwqwqvag4x9x"; }; meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/"; }; @@ -4740,12 +4719,12 @@ final: prev: go-nvim = buildVimPlugin { pname = "go.nvim"; - version = "2025-01-16"; + version = "2025-01-27"; src = fetchFromGitHub { owner = "ray-x"; repo = "go.nvim"; - rev = "6e5a74b866aa4a112ed85a1169befff2ef82c027"; - sha256 = "10y12jgf6c8hcsqrp0y9zcvp1p0yvdx0jrmvvzfb65hgjxkqr5lz"; + rev = "5308b3eb07640d5aff28461048179552b7b7d015"; + sha256 = "0bd4ypb3rvypwqm0nrwyk0axkz31wrq5cj1gzgq7dkki40iasvnj"; }; meta.homepage = "https://github.com/ray-x/go.nvim/"; }; @@ -4860,12 +4839,12 @@ final: prev: grug-far-nvim = buildVimPlugin { pname = "grug-far.nvim"; - version = "2025-01-11"; + version = "2025-01-25"; src = fetchFromGitHub { owner = "MagicDuck"; repo = "grug-far.nvim"; - rev = "8e8f3429038d45a6d4144c0642d92f470e5480f3"; - sha256 = "0b66744sxrsdxl9ir5pkcmq29qr8q7w5yap6ca5yna9q92wmdd4h"; + rev = "635e69adf3a714621bd0a289314bc23c5848babb"; + sha256 = "17km6zbly55c5lqahlksbxqajzg6k6xia25dfysd7nxhjf92nyg5"; }; meta.homepage = "https://github.com/MagicDuck/grug-far.nvim/"; }; @@ -5041,27 +5020,16 @@ final: prev: hardtime-nvim = buildVimPlugin { pname = "hardtime.nvim"; - version = "2024-12-22"; + version = "2025-01-26"; src = fetchFromGitHub { owner = "m4xshen"; repo = "hardtime.nvim"; - rev = "5d9adcbe2f12741de79e435c8b85dca69a3b22e4"; - sha256 = "11h8gbxf6fqfi7qav9w0s5ld5a6v9j52gal47svd90qn53xjncsq"; + rev = "3fef94069fe842fd43e2865334a7ff8e8139dc6b"; + sha256 = "1scl6iyla1nbzqdx69sk7avdq4z4zlrgd6kx5649d9rgc5f740y3"; }; meta.homepage = "https://github.com/m4xshen/hardtime.nvim/"; }; - hare-vim = buildVimPlugin { - pname = "hare.vim"; - version = "2025-01-15"; - src = fetchgit { - url = "https://git.sr.ht/~sircmpwn/hare.vim"; - rev = "e139320314611e3acf7947d0fd6f42d9b499c7ef"; - sha256 = "1fja5irszf98awi6rsrk6ws6i44xvsqa26hmcrpkw541c8s4gprg"; - }; - meta.homepage = "https://git.sr.ht/~sircmpwn/hare.vim"; - }; - harpoon = buildVimPlugin { pname = "harpoon"; version = "2024-08-29"; @@ -5437,12 +5405,12 @@ final: prev: img-clip-nvim = buildVimPlugin { pname = "img-clip.nvim"; - version = "2024-11-26"; + version = "2025-01-24"; src = fetchFromGitHub { owner = "HakonHarnes"; repo = "img-clip.nvim"; - rev = "5ff183655ad98b5fc50c55c66540375bbd62438c"; - sha256 = "15db3md2c822v8w3rkbfhw2jfmx31fak6b6mpvbsmjqsq89zi2s3"; + rev = "da61a81872276b75a2971b056da1b849e0c1870b"; + sha256 = "07hv24n7a9yb8b5vsiwsxq6qn33qph44c70j4hq42396bxnjfv6s"; }; meta.homepage = "https://github.com/HakonHarnes/img-clip.nvim/"; }; @@ -5473,12 +5441,12 @@ final: prev: inc-rename-nvim = buildVimPlugin { pname = "inc-rename.nvim"; - version = "2025-01-16"; + version = "2025-01-20"; src = fetchFromGitHub { owner = "smjonas"; repo = "inc-rename.nvim"; - rev = "e510160beefa9806751d883a5945c4fe6520b633"; - sha256 = "0lczdzkqkbsjhadvxrmqj0rhzksk4212zljv36a9bzp0jh49dv4i"; + rev = "f9b9e5b9a75074810f40881b7e254b5bbeaf122e"; + sha256 = "0ply4qyly1hsiv75y71i3scnav5z8gxjsh34nspmpk0lcldrhxpd"; }; meta.homepage = "https://github.com/smjonas/inc-rename.nvim/"; }; @@ -5521,12 +5489,12 @@ final: prev: indent-blankline-nvim = buildVimPlugin { pname = "indent-blankline.nvim"; - version = "2025-01-14"; + version = "2025-01-20"; src = fetchFromGitHub { owner = "lukas-reineke"; repo = "indent-blankline.nvim"; - rev = "7a698a1d7ed755af9f5a88733b23ca246ce2df28"; - sha256 = "1dxfp67zzqzxibapacwf5xjwpsgmx15b2v3dm5hc3n7303gqymb3"; + rev = "e10626f7fcd51ccd56d7ffc00883ba7e0aa28f78"; + sha256 = "1whsjd715rr59warfy7nmw0hzkxfkxgzx9c8r6k2vka4flifirnk"; }; meta.homepage = "https://github.com/lukas-reineke/indent-blankline.nvim/"; }; @@ -5641,12 +5609,12 @@ final: prev: iron-nvim = buildVimPlugin { pname = "iron.nvim"; - version = "2024-12-12"; + version = "2025-01-27"; src = fetchFromGitHub { owner = "Vigemus"; repo = "iron.nvim"; - rev = "916538ebf75b8ede8e0feef4f4cd88d5cc82a67e"; - sha256 = "1bwg424fgrlg7c9f3r0xdmayi9a50ybrgk85idwmmhhxz99jcx90"; + rev = "46cf1a1ae664091ab13b4e794c92ebb4402512c1"; + sha256 = "04j71siin3xrjcfnlvnvlvazyfl1f70alyh0if1vq7nqb4hva1nz"; }; meta.homepage = "https://github.com/Vigemus/iron.nvim/"; }; @@ -5872,12 +5840,12 @@ final: prev: kulala-nvim = buildVimPlugin { pname = "kulala.nvim"; - version = "2025-01-18"; + version = "2025-01-27"; src = fetchFromGitHub { owner = "mistweaverco"; repo = "kulala.nvim"; - rev = "691d68eb69afa8476fb1f42e8abb8ac9a55636e0"; - sha256 = "1jjz65ldbskw9hhsh9gf3hw88z350lwmgkbl0653l36ijb00xj0k"; + rev = "d6d3f61a58e6fcad40b91545c84afb4364e65a69"; + sha256 = "110b49n7468lg7wx4dbx4y2xljiv4wz29djkf2yhbpymkraivd3l"; }; meta.homepage = "https://github.com/mistweaverco/kulala.nvim/"; }; @@ -5956,12 +5924,12 @@ final: prev: lazydev-nvim = buildVimPlugin { pname = "lazydev.nvim"; - version = "2024-12-20"; + version = "2025-01-23"; src = fetchFromGitHub { owner = "folke"; repo = "lazydev.nvim"; - rev = "8620f82ee3f59ff2187647167b6b47387a13a018"; - sha256 = "1z822ylm2zfg6ydwxwxfyg2k16rchpr20wm4rfiq61h47hcj9835"; + rev = "a1b78b2ac6f978c72e76ea90ae92a94edf380cfc"; + sha256 = "1ch75kwgyzpplvlp04h6aa4yymkjcwsfkwgzwicnqpsxylsw6z9r"; }; meta.homepage = "https://github.com/folke/lazydev.nvim/"; }; @@ -5980,12 +5948,12 @@ final: prev: lean-nvim = buildVimPlugin { pname = "lean.nvim"; - version = "2025-01-18"; + version = "2025-01-20"; src = fetchFromGitHub { owner = "Julian"; repo = "lean.nvim"; - rev = "27bfc20b0b53cade52bdd8fd2553a710f55c3afc"; - sha256 = "1bkh4h3j20gca386n22kcgs0ja196b84w5f90cz3s065cmbfsxab"; + rev = "46012b9288b50de664f5cf5a038a8771ae3d7b34"; + sha256 = "1dqldkf0633y0q0izqrl5aa6gry9hr67hscaqcs8k7ps9dj47a87"; }; meta.homepage = "https://github.com/Julian/lean.nvim/"; }; @@ -6016,12 +5984,12 @@ final: prev: leap-nvim = buildVimPlugin { pname = "leap.nvim"; - version = "2025-01-17"; + version = "2025-01-25"; src = fetchFromGitHub { owner = "ggandor"; repo = "leap.nvim"; - rev = "67d26a13cfbf558450955ee9c76e78e03d13ee9e"; - sha256 = "15b7d28zz491lymiv8gd4x1gnl3jg8sp2fqcf1qn47x7ima2n15d"; + rev = "be8e6eee2dabc68ce810ddf2e800c14bfda09fee"; + sha256 = "0l3jmc06js1l4rarhn6h2zvc3gkvs2ziqkycy8nvca4xri9b8xy4"; }; meta.homepage = "https://github.com/ggandor/leap.nvim/"; }; @@ -6040,12 +6008,12 @@ final: prev: legendary-nvim = buildVimPlugin { pname = "legendary.nvim"; - version = "2025-01-10"; + version = "2025-01-26"; src = fetchFromGitHub { owner = "mrjones2014"; repo = "legendary.nvim"; - rev = "180dd9e59ab597a985baf912d2b2cd11181c0ca6"; - sha256 = "1hnls7m9qkd20ypiakvsmgnd15bch894gw13kgcfr5w9y6afm052"; + rev = "f0067589b9e6de063afac707451689aa13cf6aff"; + sha256 = "13kvz35jx3frp23warl9mvarjql39srfl4dzrn3hqal6ch4zks0b"; }; meta.homepage = "https://github.com/mrjones2014/legendary.nvim/"; }; @@ -6316,12 +6284,12 @@ final: prev: llama-vim = buildVimPlugin { pname = "llama.vim"; - version = "2025-01-24"; + version = "2025-01-27"; src = fetchFromGitHub { owner = "ggml-org"; repo = "llama.vim"; - rev = "81e6802ebd00f177a8db73d62c7eeaf14a30819a"; - sha256 = "0fcg0xmdjc9z25ssjmg9pl5q0vk1h1k65ipd4dfzxchvmfzirl5j"; + rev = "a0dd85c7054c8cd70f226e43ebbfa7728de33099"; + sha256 = "01l7y76ywgkx3sk8zsglxr2xbgcafr4c3y4z0diwhv7jfqkxasiz"; }; meta.homepage = "https://github.com/ggml-org/llama.vim/"; }; @@ -6434,17 +6402,6 @@ final: prev: meta.homepage = "https://github.com/nvim-lua/lsp_extensions.nvim/"; }; - lsp_lines-nvim = buildVimPlugin { - pname = "lsp_lines.nvim"; - version = "2024-12-21"; - src = fetchgit { - url = "https://git.sr.ht/~whynothugo/lsp_lines.nvim"; - rev = "a92c755f182b89ea91bd8a6a2227208026f27b4d"; - sha256 = "14ym4d8vgvw2vhsaxik8612wyvszd895q69n9h100yd7x5jqhy4c"; - }; - meta.homepage = "https://git.sr.ht/~whynothugo/lsp_lines.nvim"; - }; - lsp_signature-nvim = buildVimPlugin { pname = "lsp_signature.nvim"; version = "2025-01-10"; @@ -6471,12 +6428,12 @@ final: prev: lspecho-nvim = buildVimPlugin { pname = "lspecho.nvim"; - version = "2024-11-30"; + version = "2025-01-26"; src = fetchFromGitHub { owner = "deathbeam"; repo = "lspecho.nvim"; - rev = "8817eef7ebeb518341c621091c21946f547034c8"; - sha256 = "02g3b7ymgzrv95g4kxc58kydldikynw92ks519rznciw1ddl0s2d"; + rev = "936efe4c15c92fc1d4bd72b6cbc2cf3b3b1f882c"; + sha256 = "1ij8nic1mn51wrdvy5jjc286acijfg0bgiym44gpzlqz8dm303lf"; }; meta.homepage = "https://github.com/deathbeam/lspecho.nvim/"; }; @@ -6495,24 +6452,24 @@ final: prev: lspsaga-nvim = buildVimPlugin { pname = "lspsaga.nvim"; - version = "2025-01-19"; + version = "2025-01-27"; src = fetchFromGitHub { owner = "nvimdev"; repo = "lspsaga.nvim"; - rev = "13b3cdc9a53ec821b9e693ee71501cc2d6cf206c"; - sha256 = "189jasphz3xr0alfkhpw6ha91g2ps5r8dcx04ipllv0fngdx71xq"; + rev = "b0f44305bb316552208e59bebaebbd9b9d8d5dde"; + sha256 = "0bzrg785h15fs5zd1i5ai2p0a2npf41j7gldxnxhcsv1qhmhngb8"; }; meta.homepage = "https://github.com/nvimdev/lspsaga.nvim/"; }; ltex_extra-nvim = buildVimPlugin { pname = "ltex_extra.nvim"; - version = "2025-01-16"; + version = "2025-01-26"; src = fetchFromGitHub { owner = "barreiroleo"; repo = "ltex_extra.nvim"; - rev = "a34d7a32f004bf65aa78a0f7ed64012fe88dcc34"; - sha256 = "1dcxx2rfck89d5cilwcri9bsg787x8a4yjpxrk8m6n8imq23zar2"; + rev = "e451d22abf664ae17037f0e0857b1c9c46716320"; + sha256 = "184p6xxv85v6py6a7yrx8z02bwbsvzy7fyvyk2jyr0pn985aphxs"; }; meta.homepage = "https://github.com/barreiroleo/ltex_extra.nvim/"; }; @@ -6529,18 +6486,6 @@ final: prev: meta.homepage = "https://github.com/nvim-java/lua-async/"; }; - lua-async-await = buildVimPlugin { - pname = "lua-async-await"; - version = "2024-03-31"; - src = fetchFromGitHub { - owner = "nvim-java"; - repo = "lua-async"; - rev = "652d94df34e97abe2d4a689edbc4270e7ead1a98"; - sha256 = "0jpw9008xghqmzjnikwq417p497lj7v9hkjbrach5p652yca07s8"; - }; - meta.homepage = "https://github.com/nvim-java/lua-async/"; - }; - lualine-lsp-progress = buildVimPlugin { pname = "lualine-lsp-progress"; version = "2021-10-23"; @@ -6977,12 +6922,12 @@ final: prev: mini-bracketed = buildVimPlugin { pname = "mini.bracketed"; - version = "2025-01-16"; + version = "2025-01-23"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.bracketed"; - rev = "0091e11fabe34973fc038a8d0d0485202742e403"; - sha256 = "0yw7lmgwwvraflcwzrl33rwcdb94qsyvdi0rzq9b3ps7bla4dsyb"; + rev = "937573c7e7d9be6cb29ffd0909d9ff83c92afbf0"; + sha256 = "1yxdbsbcq3yd2838qa2bnwbim37d6jbpf13w73z30flj8xq53j28"; }; meta.homepage = "https://github.com/echasnovski/mini.bracketed/"; }; @@ -7001,12 +6946,12 @@ final: prev: mini-clue = buildVimPlugin { pname = "mini.clue"; - version = "2025-01-17"; + version = "2025-01-27"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.clue"; - rev = "63e42dad781b9ed4845d90ef1da8c52dfb6dce3f"; - sha256 = "039fq0svkgr96l3z7h750iyah6fz9n18zy8wm1dfhpp3bxjyjh7z"; + rev = "8e7681e9433766142e8c0977e7f9c31220c78cff"; + sha256 = "1h6d7mvjyfcp93hcn83rx24pafk36i37fd03kjmnhyfmbqpjsdd5"; }; meta.homepage = "https://github.com/echasnovski/mini.clue/"; }; @@ -7061,12 +7006,12 @@ final: prev: mini-deps = buildVimPlugin { pname = "mini.deps"; - version = "2024-10-18"; + version = "2025-01-23"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.deps"; - rev = "bafaa69d9054fc01ef8dbff8e4f0211c285cd840"; - sha256 = "12vahms3vpvinp362x1zi3z9si7r912bps55yp6v9vlvfdjmc9gf"; + rev = "6e6dc2b56de255b82ccd7bc78a97f9be58f95ddc"; + sha256 = "0fbhq49kj6b3x6rb3phdv0dk3jj6kxpmy7dympl6xzlfq21jg1yp"; }; meta.homepage = "https://github.com/echasnovski/mini.deps/"; }; @@ -7097,24 +7042,24 @@ final: prev: mini-extra = buildVimPlugin { pname = "mini.extra"; - version = "2025-01-07"; + version = "2025-01-23"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.extra"; - rev = "477e3dda7b597b49bc1373951ea7da4da834c352"; - sha256 = "02ydzdiiqf0ydrjiz847f6cbaxy3imvggchds9xn40i34nz6nhlm"; + rev = "6927348ae967d229fa01c5d2a0baca9ef7d30de4"; + sha256 = "1sjwnznkpfkj1dh2055zkndagq2zr1v760a22cm6fp3c77w3wlqz"; }; meta.homepage = "https://github.com/echasnovski/mini.extra/"; }; mini-files = buildVimPlugin { pname = "mini.files"; - version = "2025-01-10"; + version = "2025-01-23"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.files"; - rev = "d0f03a5c38836fd2cce3dc80734124959002078c"; - sha256 = "0k5g5l9pb3br4vb5cm1b0hv081fdn967cw00mh687281dvrbnxah"; + rev = "01001e0cfc1e79f581d055ae3f70fbac96a2f378"; + sha256 = "0pkj82qz0mpism0hzv57da78qqw24ijd49gqlbdrwq3h5phwcydh"; }; meta.homepage = "https://github.com/echasnovski/mini.files/"; }; @@ -7265,12 +7210,12 @@ final: prev: mini-nvim = buildVimPlugin { pname = "mini.nvim"; - version = "2025-01-19"; + version = "2025-01-27"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.nvim"; - rev = "fcf982a66df4c9e7ebb31a6a01c604caee2cd488"; - sha256 = "1x5a17qwmxm3j58j48yglcy04p878pp9vbfh580bqdykd4pmva0p"; + rev = "1f782e38109e3380fc339b794183019ac957fd21"; + sha256 = "157w935bjcj8mbwghbwg6p9fzc702h5kf4b735a1qzr43nzydhg3"; }; meta.homepage = "https://github.com/echasnovski/mini.nvim/"; }; @@ -7301,12 +7246,12 @@ final: prev: mini-pick = buildVimPlugin { pname = "mini.pick"; - version = "2025-01-19"; + version = "2025-01-25"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.pick"; - rev = "c71983579d1ea86158d3285a36d3a1688c75bae7"; - sha256 = "14g3lgjrj9p3hrmp73lhymbk8dpil9r8mrnh6simfvbmfv2l5g5k"; + rev = "fc0d862a044af97f7850535fc8799ab38a223fe6"; + sha256 = "0b695xsh3m3akxdqk70xj9jpkizzkrjq5v8sn4gdwjjkazwbj281"; }; meta.homepage = "https://github.com/echasnovski/mini.pick/"; }; @@ -7349,12 +7294,12 @@ final: prev: mini-starter = buildVimPlugin { pname = "mini.starter"; - version = "2025-01-14"; + version = "2025-01-23"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.starter"; - rev = "4b257cfc93241e8c8cde3f9302d1616ad4e0d036"; - sha256 = "135l18l6n88v8zrdk95dfvw2ycsgd8m4wp9430g74bry99jj95m4"; + rev = "a816f50ac99a6fa1f21e0f07ee13f975444dd4a1"; + sha256 = "1lajfi0sgy89j2zd3xd0ibbm4bfychwsvamd9ls5m32j1pgn3pqz"; }; meta.homepage = "https://github.com/echasnovski/mini.starter/"; }; @@ -7421,24 +7366,24 @@ final: prev: mini-visits = buildVimPlugin { pname = "mini.visits"; - version = "2025-01-16"; + version = "2025-01-23"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.visits"; - rev = "90f20ba6ab7d3d7cb984fffddd82f5f6c7a6bea7"; - sha256 = "00drzhrxdyrysbdj4fnxk3lzn9alg8xhwfwgrscywvjfks0vbsa3"; + rev = "daf681c297f00d9cc75233a4bd8b93986cb8232b"; + sha256 = "0n52szfan38w7z3r0p8q47pldps120nyiyq2gw4arqn9fd51kz4b"; }; meta.homepage = "https://github.com/echasnovski/mini.visits/"; }; minimap-vim = buildVimPlugin { pname = "minimap.vim"; - version = "2024-03-17"; + version = "2025-01-26"; src = fetchFromGitHub { owner = "wfxr"; repo = "minimap.vim"; - rev = "395378137e6180762d5b963ca9ad5ac2db5d3283"; - sha256 = "0pfzmlf36in086g83g3sdqdy57jyyh5nbh2lrfmpbr2sg401a7qr"; + rev = "57287e2dd28fa3e63276a32d11c729df14741d54"; + sha256 = "05k4cgcrz0gj92xy685bd4p6nh2jmaywc2f5sw1lap0v685h7n79"; }; meta.homepage = "https://github.com/wfxr/minimap.vim/"; }; @@ -7853,12 +7798,12 @@ final: prev: neo-tree-nvim = buildVimPlugin { pname = "neo-tree.nvim"; - version = "2025-01-18"; + version = "2025-01-26"; src = fetchFromGitHub { owner = "nvim-neo-tree"; repo = "neo-tree.nvim"; - rev = "1f2753e7ce38e47eef960a8a9f5f8f3215ec2b05"; - sha256 = "1sjkk38l38wrbzds20l3iww06yyyhixr2bjqbmdsmnvsyq7drscc"; + rev = "521bb4253b1adc2a1ff6c584bc839eba9bc99c0b"; + sha256 = "01ws7n9yzlf86706479xyb881x6lnxcigkmx1qz885gjb1v54yjs"; }; meta.homepage = "https://github.com/nvim-neo-tree/neo-tree.nvim/"; }; @@ -7877,12 +7822,12 @@ final: prev: neoconf-nvim = buildVimPlugin { pname = "neoconf.nvim"; - version = "2025-01-17"; + version = "2025-01-26"; src = fetchFromGitHub { owner = "folke"; repo = "neoconf.nvim"; - rev = "638216aa8725b06d27c315574de63ad41966a3cd"; - sha256 = "1ag7pxqjxhd9gfkqdp8m8sgq613dswncl41zljm748cqz28c7909"; + rev = "a4d1d337e23a087847f7a1d2bc4420ce7ad355f4"; + sha256 = "00h3a6il90rk96lxjjzw97bgxdjdrd3i4q3hc6dwzydr9xkk6dh7"; }; meta.homepage = "https://github.com/folke/neoconf.nvim/"; }; @@ -7949,12 +7894,12 @@ final: prev: neogit = buildVimPlugin { pname = "neogit"; - version = "2025-01-14"; + version = "2025-01-21"; src = fetchFromGitHub { owner = "NeogitOrg"; repo = "neogit"; - rev = "060a625660b2816649d83dbd6c7ab1b4345ea8bc"; - sha256 = "0vjlszykpy6wfhiy3csf3ljh22wyagvmjb5a2ngsznkxgh29bb5j"; + rev = "63124cf520ff24d09deb3b850e053908ab0fc66a"; + sha256 = "1qmwl9rfkf6aydk0sd9xmmd59f2wyw020j318gm56lhav2yg03cs"; }; meta.homepage = "https://github.com/NeogitOrg/neogit/"; }; @@ -8179,12 +8124,12 @@ final: prev: neotest-golang = buildVimPlugin { pname = "neotest-golang"; - version = "2025-01-19"; + version = "2025-01-24"; src = fetchFromGitHub { owner = "fredrikaverpil"; repo = "neotest-golang"; - rev = "b1c5aed508d73174d0ed98d58ec4a87a9c3375c1"; - sha256 = "1bzzci1v4wa4k36j0hcnfyfx1sw6l90zljamvbsy5ml2csv3h4yq"; + rev = "059c5754a17629c25dce61eefcea40164ee62975"; + sha256 = "0mkz9pjby8q19ib8y7ps32f0jafwlxadav9j64pjpflr7yp4ivp7"; }; meta.homepage = "https://github.com/fredrikaverpil/neotest-golang/"; }; @@ -8216,24 +8161,24 @@ final: prev: neotest-haskell = buildVimPlugin { pname = "neotest-haskell"; - version = "2025-01-19"; + version = "2025-01-26"; src = fetchFromGitHub { owner = "MrcJkb"; repo = "neotest-haskell"; - rev = "44c485e0f891778f93b0f2c7bef0217b91f1f83f"; - sha256 = "1jblvbq2k03aphw5d1ky818kmbzk1jf41s5n1q7mc4vc8r0gsj2y"; + rev = "074a6eb728ef74c35fcec0db84959e1d70471c3f"; + sha256 = "02b0jsbi9xhpaxmarfxdnp6ynsdq3c23nxyffl0xw5nws4b25xrz"; }; meta.homepage = "https://github.com/MrcJkb/neotest-haskell/"; }; neotest-java = buildVimPlugin { pname = "neotest-java"; - version = "2024-11-19"; + version = "2025-01-26"; src = fetchFromGitHub { owner = "rcasia"; repo = "neotest-java"; - rev = "43b4cf9ee0d3d05f56a9a43c89c4268157cfbc79"; - sha256 = "0653fx7bcr8mn38dfza4qywia1i862zc42frwf18s51zp5jjrfqy"; + rev = "bbbad04bda7af216a8c24509d47d1f51356b37ce"; + sha256 = "0mw3q19y18nr4kn1zd5qjyk6bbkdrv4ypakxyn2gc3xf6p3zl1id"; }; meta.homepage = "https://github.com/rcasia/neotest-java/"; }; @@ -8564,12 +8509,12 @@ final: prev: nightfly = buildVimPlugin { pname = "nightfly"; - version = "2025-01-19"; + version = "2025-01-22"; src = fetchFromGitHub { owner = "bluz71"; repo = "vim-nightfly-colors"; - rev = "4385803056055ebc0b87e34ca334d874787eb125"; - sha256 = "0zxkk4y0ww5dxncvpnnlpxkiw297zijadzk4p7yr779w4r7sl85b"; + rev = "1105d1b755ba59df2dc663f68e0c8228ded2afe9"; + sha256 = "02fyg3hailkb4r7dazgy8fywssg6sv4zf21f2q7nlalpchppdkp1"; }; meta.homepage = "https://github.com/bluz71/vim-nightfly-colors/"; }; @@ -8624,12 +8569,12 @@ final: prev: nlsp-settings-nvim = buildVimPlugin { pname = "nlsp-settings.nvim"; - version = "2025-01-15"; + version = "2025-01-25"; src = fetchFromGitHub { owner = "tamago324"; repo = "nlsp-settings.nvim"; - rev = "25c2ea8f0a97bbd20318ecb912c890ee3cacc863"; - sha256 = "0gh41nrqhb0iqnvhzmynci41z7pd8arkh52scivzqx6vxbjch1fj"; + rev = "3f0f0baddb46276c71be2c6c0ea31a50f70669ed"; + sha256 = "07sld8dxvm74dv2q8r1sha4cfycc23mvgqya9cglqdqhcdsz9wpk"; }; meta.homepage = "https://github.com/tamago324/nlsp-settings.nvim/"; }; @@ -8648,24 +8593,24 @@ final: prev: no-clown-fiesta-nvim = buildVimPlugin { pname = "no-clown-fiesta.nvim"; - version = "2024-12-26"; + version = "2025-01-26"; src = fetchFromGitHub { owner = "aktersnurra"; repo = "no-clown-fiesta.nvim"; - rev = "6453c0ca2f31607829457694b4208c1f612fdd61"; - sha256 = "1hvps3xrgws4mvkkbjkap75wf9knq12p7nic0zba3pkfgr3klwg7"; + rev = "2f57d1115e246b62a1a81bba806fe79aaa53b610"; + sha256 = "0a73zd73y0s08ilid0631mbm78q34d3qfb2rky03qqwvqz3zp7sc"; }; meta.homepage = "https://github.com/aktersnurra/no-clown-fiesta.nvim/"; }; no-neck-pain-nvim = buildVimPlugin { pname = "no-neck-pain.nvim"; - version = "2025-01-17"; + version = "2025-01-23"; src = fetchFromGitHub { owner = "shortcuts"; repo = "no-neck-pain.nvim"; - rev = "6aaa6e3c2d3d52a38ec095176a3d845cf9fd1e6e"; - sha256 = "02v52lnxc2a6a93rcvagypr0gl4n184dnkr0fvi7bxdrzh0ds2df"; + rev = "860462dd8b3d36861a81724a7b473db279f673f2"; + sha256 = "1nv0dii8a3n7rip5j729mj03zklga7v57l673gm6pvjx05v6qnlz"; }; meta.homepage = "https://github.com/shortcuts/no-neck-pain.nvim/"; }; @@ -8696,12 +8641,12 @@ final: prev: none-ls-nvim = buildVimPlugin { pname = "none-ls.nvim"; - version = "2025-01-17"; + version = "2025-01-21"; src = fetchFromGitHub { owner = "nvimtools"; repo = "none-ls.nvim"; - rev = "af318216b744f2fe2d5afa6febb01f455ae61d6c"; - sha256 = "1s2jb7labf5h88pvl33882b0j8pij1qaba4wa3qi4qay3rgachlp"; + rev = "ed8f80849ef1ad31c2f74679fafdef7801091247"; + sha256 = "155c6kadvw6381rgyq3n5f44np8c4bj9z3nwcjzky4shxgi8qkq0"; }; meta.homepage = "https://github.com/nvimtools/none-ls.nvim/"; }; @@ -8816,12 +8761,12 @@ final: prev: nvchad-ui = buildVimPlugin { pname = "nvchad-ui"; - version = "2025-01-19"; + version = "2025-01-24"; src = fetchFromGitHub { owner = "nvchad"; repo = "ui"; - rev = "715cc06f0d3abfc68326808cdc484348829843f6"; - sha256 = "1bnwfkfhjrq5zvlg7ihrimnj065f8dd66awjahzxrvnq4v0jszhi"; + rev = "23cc288deaeafe6641f0092252dee25136616a47"; + sha256 = "0knjzigb7x0nh8p3avlk5615pyqi3m0xnzvznyy0psgblm19s9d2"; }; meta.homepage = "https://github.com/nvchad/ui/"; }; @@ -8876,12 +8821,12 @@ final: prev: nvim-bacon = buildVimPlugin { pname = "nvim-bacon"; - version = "2024-11-26"; + version = "2025-01-20"; src = fetchFromGitHub { owner = "Canop"; repo = "nvim-bacon"; - rev = "25eaf9daa29ef7c335578bd9600e2c6349f16ed1"; - sha256 = "0b8hqbzamw7bsgag9wriayz08fyidis6h4c7gldavnam00p8hjcr"; + rev = "c9cef8ac576800b6b813ad16be692d141262a4c3"; + sha256 = "10x0rphxnhwlwmzb0bzrp03r6l25f4lmxcjlf8h1cprgl56h71ky"; }; meta.homepage = "https://github.com/Canop/nvim-bacon/"; }; @@ -8936,12 +8881,12 @@ final: prev: nvim-cmp = buildNeovimPlugin { pname = "nvim-cmp"; - version = "2025-01-06"; + version = "2025-01-23"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "nvim-cmp"; - rev = "8c82d0bd31299dbff7f8e780f5e06d2283de9678"; - sha256 = "0yjll1qz4qbdg28c43lgx307qpfmc0va4pp9wgkp2n8g14rfjraf"; + rev = "12509903a5723a876abd65953109f926f4634c30"; + sha256 = "0a592vvfbyv1y1j9bbiq7wxy0vp63bwngjav0qkm0czdf8y4b3kb"; }; meta.homepage = "https://github.com/hrsh7th/nvim-cmp/"; }; @@ -8960,24 +8905,24 @@ final: prev: nvim-cokeline = buildVimPlugin { pname = "nvim-cokeline"; - version = "2024-07-12"; + version = "2025-01-24"; src = fetchFromGitHub { owner = "willothy"; repo = "nvim-cokeline"; - rev = "adfd1eb87e0804b6b86126e03611db6f62bb2909"; - sha256 = "19acpgh3n0ma8idl2wbgf9mb2dw9j6xv5gzdb4ya3lmkq8k8ivsz"; + rev = "9fbed130683b7b6f73198c09e35ba4b33f547c08"; + sha256 = "07prjb4z98h460wdfyvmi4fsl26xg0j3hhfirpw8hdgjb01aqj9v"; }; meta.homepage = "https://github.com/willothy/nvim-cokeline/"; }; nvim-colorizer-lua = buildVimPlugin { pname = "nvim-colorizer.lua"; - version = "2025-01-14"; + version = "2025-01-25"; src = fetchFromGitHub { owner = "catgoose"; repo = "nvim-colorizer.lua"; - rev = "86c9a6a309b4812abf726c11ab3d9779415ce90b"; - sha256 = "0x20jwp32yy66xaiws46i5jlsb8v6f37j02lykr2d6ladlf8vns0"; + rev = "39142aa1390d6ccdca57cb6dc5b2c7bfed460ffe"; + sha256 = "16sjfq765hab8ns4kgr39hyj0gd5yizh2vk8sk177gvajhjr7pxs"; }; meta.homepage = "https://github.com/catgoose/nvim-colorizer.lua/"; }; @@ -9008,12 +8953,12 @@ final: prev: nvim-config-local = buildVimPlugin { pname = "nvim-config-local"; - version = "2023-06-15"; + version = "2025-01-21"; src = fetchFromGitHub { owner = "klen"; repo = "nvim-config-local"; - rev = "83bb6d9881653a5cf8b489ba8a6fe5a06049a10a"; - sha256 = "0gx1dd5i20z9kh6g70jdhwilg81vjm3cjwdg6gq0xsczzichzf66"; + rev = "990f3e35e0fba8fb83012d7e85f9a6a77de7f87f"; + sha256 = "0a7c22fcwl7gczip7bl9lcm2na0dz698bc6xgkryrg0y6fmzbc6k"; }; meta.homepage = "https://github.com/klen/nvim-config-local/"; }; @@ -9044,12 +8989,12 @@ final: prev: nvim-dap = buildVimPlugin { pname = "nvim-dap"; - version = "2025-01-08"; + version = "2025-01-26"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-dap"; - rev = "99807078c5089ed30e0547aa4b52c5867933f426"; - sha256 = "19v3q4rps66rwli4w7fz8s44np7q0ibcc8xrszg7ml474w1i8l82"; + rev = "1fdfe74661170ce58d37dc46259448987ffe706c"; + sha256 = "0f5pdwcjhzrhgz3iz4bsq452prdq4lq6z9yjwzx3m2xgzp7kmcz1"; }; meta.homepage = "https://github.com/mfussenegger/nvim-dap/"; }; @@ -9116,12 +9061,12 @@ final: prev: nvim-dap-ui = buildVimPlugin { pname = "nvim-dap-ui"; - version = "2025-01-09"; + version = "2025-01-23"; src = fetchFromGitHub { owner = "rcarriga"; repo = "nvim-dap-ui"; - rev = "727c032a8f63899baccb42a1c26f27687e62fc5e"; - sha256 = "08543qwfgb693isakpfrccfh16cwfcfvs2i7mvb276irn2yls6ja"; + rev = "bc81f8d3440aede116f821114547a476b082b319"; + sha256 = "0hk34mfjxqiq82faf3q75ixpxd822vh8zbl1i5pvx6akn4v3mxk7"; }; meta.homepage = "https://github.com/rcarriga/nvim-dap-ui/"; }; @@ -9200,24 +9145,24 @@ final: prev: nvim-gdb = buildVimPlugin { pname = "nvim-gdb"; - version = "2024-10-29"; + version = "2025-01-21"; src = fetchFromGitHub { owner = "sakhnik"; repo = "nvim-gdb"; - rev = "a8a5289c4424360dc89225e15356104495736446"; - sha256 = "0l9d8bn70lingbmdlqkj1qqs06acf005c06wkswgfi4ic4h6935h"; + rev = "cf00140361cabcd4e55a987fd9770a92ee682301"; + sha256 = "1y4m3m27bkzyjx8g2zd1ampgm84c2f10a7sd4v5qpirf9xiqhhqb"; }; meta.homepage = "https://github.com/sakhnik/nvim-gdb/"; }; nvim-genghis = buildVimPlugin { pname = "nvim-genghis"; - version = "2024-12-30"; + version = "2025-01-26"; src = fetchFromGitHub { owner = "chrisgrieser"; repo = "nvim-genghis"; - rev = "ac6fccc67a3a95ca76b5d3fd4c2fa547bff704d0"; - sha256 = "11xss95qzr7hyqr93dgihgwdpq06nnqr74n681p1rrgjkwg4l23s"; + rev = "99ca8b9e6e6bae0899cc2902f4103204572ac8ee"; + sha256 = "0f9w2510y26k2mihhmx6rsmijszsl2haj5848faqqw3nfhsph890"; }; meta.homepage = "https://github.com/chrisgrieser/nvim-genghis/"; }; @@ -9308,24 +9253,24 @@ final: prev: nvim-java = buildVimPlugin { pname = "nvim-java"; - version = "2025-01-10"; + version = "2025-01-26"; src = fetchFromGitHub { owner = "nvim-java"; repo = "nvim-java"; - rev = "4d810a546c262ca8f60228dc98ba51f81f5649c6"; - sha256 = "17d846c682s2kn6f4p5gxcawrdw4vrqsajhqc1z2ky18pgy4s49l"; + rev = "04e3a41afce7357ad7c8d9c6676f0f3b5f5634e6"; + sha256 = "07nr0ym37xr19a9wbca11yr3fa8crplki913725yixm4njfnavma"; }; meta.homepage = "https://github.com/nvim-java/nvim-java/"; }; nvim-java-core = buildVimPlugin { pname = "nvim-java-core"; - version = "2024-12-25"; + version = "2025-01-26"; src = fetchFromGitHub { owner = "nvim-java"; repo = "nvim-java-core"; - rev = "22eca6b90b7e209299d99cbf60421f0ffdae5629"; - sha256 = "1m9p3m97nmkvs4v34lv7sly9896l47ff73aa40r2x60y6z2b98pq"; + rev = "401bf7683012a25929a359deec418f36beb876e2"; + sha256 = "0s6wqz9z8r0hvvgf5dnl8drgzb49vrk798rc7gk2cbm85blzk7p8"; }; meta.homepage = "https://github.com/nvim-java/nvim-java-core/"; }; @@ -9368,12 +9313,12 @@ final: prev: nvim-jdtls = buildVimPlugin { pname = "nvim-jdtls"; - version = "2025-01-17"; + version = "2025-01-23"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-jdtls"; - rev = "5b079475890a2a9ff45c850b428357cc89c95278"; - sha256 = "1nf4mf9fjlq834kq4sy7m7yc80xk6yjmvz2skxrkz3rms32hrxkq"; + rev = "3efcd0700a293efea9dada58f79c32a64850eb24"; + sha256 = "1131svlirdbz31rqi39m6pmnnnkg3g1z5lab8xxhxx3c5dgn16aq"; }; meta.homepage = "https://github.com/mfussenegger/nvim-jdtls/"; }; @@ -9390,17 +9335,6 @@ final: prev: meta.homepage = "https://github.com/gennaro-tedesco/nvim-jqx/"; }; - nvim-julia-autotest = buildVimPlugin { - pname = "nvim-julia-autotest"; - version = "2022-10-31"; - src = fetchgit { - url = "https://gitlab.com/usmcamp0811/nvim-julia-autotest"; - rev = "b74e2f9c961e604cb56cc23f87188348bfa0f33f"; - sha256 = "0jd6r5chh4rdj1jyrsqhb67glwqjcygzvk8gyp0v7axr2xn6r8r1"; - }; - meta.homepage = "https://gitlab.com/usmcamp0811/nvim-julia-autotest"; - }; - nvim-lastplace = buildVimPlugin { pname = "nvim-lastplace"; version = "2023-07-27"; @@ -9451,12 +9385,12 @@ final: prev: nvim-lint = buildVimPlugin { pname = "nvim-lint"; - version = "2025-01-19"; + version = "2025-01-21"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-lint"; - rev = "ec9fda13a5254783a80b37563ed5eb97b75c28b7"; - sha256 = "1y2ll268z602llnmhwz8qhbg13g3mnn7m9jxzapj2pbnx4gkwhqk"; + rev = "789b7ada1b4f00e08d026dffde410dcfa6a0ba87"; + sha256 = "1npjlv0gml66mw9v8d95p3c5zzijpc362bkji6zvc5n152yy59qc"; }; meta.homepage = "https://github.com/mfussenegger/nvim-lint/"; }; @@ -9499,12 +9433,12 @@ final: prev: nvim-lspconfig = buildVimPlugin { pname = "nvim-lspconfig"; - version = "2025-01-18"; + version = "2025-01-27"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "14b5a806c928390fac9ff4a5630d20eb902afad8"; - sha256 = "0azb8qc6pg8j59jrh1ywplii11y0qlbls4x16zmawx2ngqipr7vg"; + rev = "637293ce23c6a965d2f11dfbf92f604bb1978052"; + sha256 = "1z395i57bhhxc87673fbp84m2k9sn923ib9qsmmrry7414lp99zm"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -9607,24 +9541,24 @@ final: prev: nvim-neoclip-lua = buildVimPlugin { pname = "nvim-neoclip.lua"; - version = "2025-01-11"; + version = "2025-01-26"; src = fetchFromGitHub { owner = "AckslD"; repo = "nvim-neoclip.lua"; - rev = "c4ce7f6c402872469795f8a47ffabe87e142f0fb"; - sha256 = "0qm1m6464lyqrar7dc4ddv9jrj6m69913frjmz788gcj459kbzkv"; + rev = "90e4dd66bb6b1cc0c03f01aaf8b005f69f565421"; + sha256 = "0mp15k7db5vnl19mc9p40fb7q0ycdjd97px24gbq7ajrzys13lbp"; }; meta.homepage = "https://github.com/AckslD/nvim-neoclip.lua/"; }; nvim-nio = buildNeovimPlugin { pname = "nvim-nio"; - version = "2024-07-11"; + version = "2025-01-20"; src = fetchFromGitHub { owner = "nvim-neotest"; repo = "nvim-nio"; - rev = "a428f309119086dc78dd4b19306d2d67be884eee"; - sha256 = "0n40q6znpy1xzywd1hwyivx7y1n0i0fcp3m7jp0vgipm6qssda4b"; + rev = "21f5324bfac14e22ba26553caf69ec76ae8a7662"; + sha256 = "1bz5msxwk232zkkhfxcmr7a665la8pgkdx70q99ihl4x04jg6dkq"; }; meta.homepage = "https://github.com/nvim-neotest/nvim-nio/"; }; @@ -9643,12 +9577,12 @@ final: prev: nvim-notify = buildVimPlugin { pname = "nvim-notify"; - version = "2025-01-09"; + version = "2025-01-20"; src = fetchFromGitHub { owner = "rcarriga"; repo = "nvim-notify"; - rev = "a3020c2cf4dfc4c4f390c4a21e84e35e46cf5d17"; - sha256 = "0841kdr25cmi3n0binxpgsa9z1spknn2diijl0b3qv4q4h8y7q8b"; + rev = "22f29093eae7785773ee9d543f8750348b1a195c"; + sha256 = "0nnxmi65ppmn8dzwh38vx2w7w6piq0i28mw0s32wa31xn5rmzwza"; }; meta.homepage = "https://github.com/rcarriga/nvim-notify/"; }; @@ -9799,12 +9733,12 @@ final: prev: nvim-scrollview = buildVimPlugin { pname = "nvim-scrollview"; - version = "2025-01-14"; + version = "2025-01-21"; src = fetchFromGitHub { owner = "dstein64"; repo = "nvim-scrollview"; - rev = "9cb1ab7f6cb821612e9a7f41652c200be0e75123"; - sha256 = "0fi31apr3ckkn63qhbr5flqsr54vbmhvrbx6f1q7qd6y3r5cnl8a"; + rev = "e8ad0e0f9c38c1bf3b03e3266cb6ecf3967d6e47"; + sha256 = "0yx7n27fbmdrz7s5ka598kfy1k1qgqfy2vv7xiqcr0vdcwgjrwwc"; }; meta.homepage = "https://github.com/dstein64/nvim-scrollview/"; }; @@ -9931,24 +9865,24 @@ final: prev: nvim-tree-lua = buildVimPlugin { pname = "nvim-tree.lua"; - version = "2025-01-17"; + version = "2025-01-27"; src = fetchFromGitHub { owner = "nvim-tree"; repo = "nvim-tree.lua"; - rev = "fca0b67c0b5a31727fb33addc4d9c100736a2894"; - sha256 = "0sjj89a7hnpn0xqavi5b59y971i8igl4nfw6rf5dcbqchqw0xikg"; + rev = "d05881f65f0a653db8d830ccc4d2e07d6a720628"; + sha256 = "1kpl7cjsl31mma8q3h27482lb8ivc04pb7fc1n1hzfr3lcv88n62"; }; meta.homepage = "https://github.com/nvim-tree/nvim-tree.lua/"; }; nvim-treesitter = buildVimPlugin { pname = "nvim-treesitter"; - version = "2025-01-19"; + version = "2025-01-27"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "4423f3053964461656c7432fd33f205ef88a6168"; - sha256 = "0n349l4k3bivcnaq60clzsyhiy19j1bqn1f22jkcdyd4h6abjs2l"; + rev = "61a385d74f822dcd1d223f42f1267d1317aaa2d0"; + sha256 = "0vlrqa97wrr33ihnkriilvvg2qdjxkf2kyhf8mqacqqsgpsqxmh7"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; @@ -10087,12 +10021,12 @@ final: prev: nvim-ufo = buildVimPlugin { pname = "nvim-ufo"; - version = "2024-12-25"; + version = "2025-01-26"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "nvim-ufo"; - rev = "32cb247b893a384f1888b9cd737264159ecf183c"; - sha256 = "0p2f5p1nky56m666lbl8g111pf6h4piv8a29z86kdhm9hadrzp3s"; + rev = "6e810dff2e590ed32dd697f90d5910443c78b8e1"; + sha256 = "19axwbplv6d3xmprgggasyy8192k7vfrhpal7x0h4cnw7j5yb21f"; }; meta.homepage = "https://github.com/kevinhwang91/nvim-ufo/"; }; @@ -10111,24 +10045,24 @@ final: prev: nvim-various-textobjs = buildVimPlugin { pname = "nvim-various-textobjs"; - version = "2024-12-30"; + version = "2025-01-21"; src = fetchFromGitHub { owner = "chrisgrieser"; repo = "nvim-various-textobjs"; - rev = "b43a13448c3c3a4fca027595f7b6fc3522758e00"; - sha256 = "1lb4m9vg4m0zyqhqvyzpfzlrvkzmicxa1qb9pz76rgizzwpv7hrz"; + rev = "18a2092173a6773f32adea42d4095d41d5eca09d"; + sha256 = "07x3qvxy3n51p33ixbp9hd6rg8bd1y94vskznzmbrds9inh81b6v"; }; meta.homepage = "https://github.com/chrisgrieser/nvim-various-textobjs/"; }; nvim-web-devicons = buildVimPlugin { pname = "nvim-web-devicons"; - version = "2025-01-10"; + version = "2025-01-27"; src = fetchFromGitHub { owner = "nvim-tree"; repo = "nvim-web-devicons"; - rev = "aafa5c187a15701a7299a392b907ec15d9a7075f"; - sha256 = "08my2gdhqpc1rzps9wic37v3a5x84jf9dj0m7y1chpyp9ia48jcm"; + rev = "1c9136332840edee0c593f2f4f89598c8ed97f5f"; + sha256 = "10liz7hpdb5vavn45hpqn0c39s0cqdns8dygr1472b5fyxh5ld29"; }; meta.homepage = "https://github.com/nvim-tree/nvim-web-devicons/"; }; @@ -10147,12 +10081,12 @@ final: prev: nvim-window-picker = buildVimPlugin { pname = "nvim-window-picker"; - version = "2025-01-14"; + version = "2025-01-24"; src = fetchFromGitHub { owner = "s1n7ax"; repo = "nvim-window-picker"; - rev = "276879db5234185f22cd19ed8366bf62437667af"; - sha256 = "0s9svcw8l45va4fz4l9449ljzxc76ich3i14j5ia625ivic2zwkn"; + rev = "0dfef64eaf063e1cd27983ab11a30e7bc5b74fac"; + sha256 = "1cxir4yd913f6rxvan535badqfp43m7djadac95rdcbvypdg0iqj"; }; meta.homepage = "https://github.com/s1n7ax/nvim-window-picker/"; }; @@ -10231,24 +10165,24 @@ final: prev: nvzone-typr = buildVimPlugin { pname = "nvzone-typr"; - version = "2025-01-15"; + version = "2025-01-27"; src = fetchFromGitHub { owner = "nvzone"; repo = "typr"; - rev = "a60c7f237be94d4b39228a3bd2ced80fe9fe2781"; - sha256 = "0hbd85s2d28832qqy0lnm7f2iqa5n5s16h7n10hsm9iawi0z2ll9"; + rev = "249fd11305e9adf92762474691e00f5a32b12f6e"; + sha256 = "1pg0w2p4a3ppdxz8c4s8aw80zjfagq5fds3cdcaf5p417krg3s10"; }; meta.homepage = "https://github.com/nvzone/typr/"; }; nvzone-volt = buildVimPlugin { pname = "nvzone-volt"; - version = "2025-01-19"; + version = "2025-01-24"; src = fetchFromGitHub { owner = "nvzone"; repo = "volt"; - rev = "91fe3e82842a709443cdd61fc1a1315a5eb57a8d"; - sha256 = "1rx5yhgk69nz4rvywsr2x23hnrbhgkkwlxcdnb4m6n2y9dpxa81w"; + rev = "1a7d6b1dfb2f176715ccc9e838be32d044f8a734"; + sha256 = "1kax2kx7gn6jswjcrlxmkh71x5xjfkj5bgh2ybyyamqsaya4d8g0"; }; meta.homepage = "https://github.com/nvzone/volt/"; }; @@ -10291,24 +10225,24 @@ final: prev: octo-nvim = buildVimPlugin { pname = "octo.nvim"; - version = "2025-01-17"; + version = "2025-01-24"; src = fetchFromGitHub { owner = "pwntester"; repo = "octo.nvim"; - rev = "b4f00b00dec14fd396be979b04453336d6e83182"; - sha256 = "1r0il8rr5lgh8i6jkb860q34cf2ip1jx1xibr8sb8x2vrgiffwjq"; + rev = "75d1f6a09536e3bffa86a781cdb0bd72da57acc3"; + sha256 = "1gmfnz8hspwnc8ay699msxfgmnq5v4krp9ijszksc1pl8ch3xlnr"; }; meta.homepage = "https://github.com/pwntester/octo.nvim/"; }; oil-nvim = buildVimPlugin { pname = "oil.nvim"; - version = "2025-01-13"; + version = "2025-01-26"; src = fetchFromGitHub { owner = "stevearc"; repo = "oil.nvim"; - rev = "09fa1d22f5edf0730824d2b222d726c8c81bbdc9"; - sha256 = "0r12sj6chi4l2rx3dp9adhb7zjcanxk2fkpxvcb6acbflr6gkh57"; + rev = "add50252b5e9147c0a09d36480d418c7e2737472"; + sha256 = "0752q6syb686d2k31ynpsk2l4apd7nsbn00q71qifi09h1y43fxa"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/oil.nvim/"; @@ -10412,12 +10346,12 @@ final: prev: onedarkpro-nvim = buildVimPlugin { pname = "onedarkpro.nvim"; - version = "2025-01-11"; + version = "2025-01-19"; src = fetchFromGitHub { owner = "olimorris"; repo = "onedarkpro.nvim"; - rev = "0feb5f55dd777352f2dddd7478dd13d050864ee3"; - sha256 = "1s5f73vyqlh8mpm2qpriyf0iim33xbh6wl9hgsxn3h9x9zyvfsw4"; + rev = "44775f8206ee43b692e7f3dc894ddc47996ee523"; + sha256 = "1qgvw08v08c9vi7vlzm96qard6xrdyghi7sra83i3imfh5xnkh8b"; }; meta.homepage = "https://github.com/olimorris/onedarkpro.nvim/"; }; @@ -10496,12 +10430,12 @@ final: prev: orgmode = buildNeovimPlugin { pname = "orgmode"; - version = "2025-01-19"; + version = "2025-01-26"; src = fetchFromGitHub { owner = "nvim-orgmode"; repo = "orgmode"; - rev = "3ba6db78601a82732c71e02e6e96e34da5d3827e"; - sha256 = "0irglq82p6n4fbrpmvhs88nlmclrmhm1lq7jw04akli15v0xmfbd"; + rev = "98bf44d0adfaa04bd02c0ae630b182fba892cbbd"; + sha256 = "08rryqbqynaw0c8rqy7j22adyplm091x2qhxbfzq39qi15h4b2dp"; }; meta.homepage = "https://github.com/nvim-orgmode/orgmode/"; }; @@ -10532,24 +10466,24 @@ final: prev: outline-nvim = buildVimPlugin { pname = "outline.nvim"; - version = "2025-01-07"; + version = "2025-01-22"; src = fetchFromGitHub { owner = "hedyhli"; repo = "outline.nvim"; - rev = "454aedc7cc6d5abd1e6776e87ccf8a3df119c207"; - sha256 = "11q137zjpwl5nqykij35ail0749mv1bkjcdd4k792dlyi9wnwrqr"; + rev = "d5c29ee3ff3b7d1bdd454b37698316e67808c36e"; + sha256 = "1ilikhfpsjqwn3bdmgy5dcnxfrir2wvsrn2bkpvw18y69990fqxr"; }; meta.homepage = "https://github.com/hedyhli/outline.nvim/"; }; overseer-nvim = buildVimPlugin { pname = "overseer.nvim"; - version = "2025-01-16"; + version = "2025-01-25"; src = fetchFromGitHub { owner = "stevearc"; repo = "overseer.nvim"; - rev = "35b729b746a4d65c83efee5b5643f07c2c1105d2"; - sha256 = "06168r8iq0qpgvawp6595h02wc6bqkiy2f4dcrh35r8kvrf5cdlm"; + rev = "390332d4687e3d07495a545ba11e62fcf30339f1"; + sha256 = "0asjnnn63h7kq1asglpqnxwhpff8r2lh30nhj9ij6ygg3slvmxj9"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/overseer.nvim/"; @@ -10641,12 +10575,12 @@ final: prev: papis-nvim = buildNeovimPlugin { pname = "papis.nvim"; - version = "2025-01-19"; + version = "2025-01-27"; src = fetchFromGitHub { owner = "jghauser"; repo = "papis.nvim"; - rev = "0b9e8ef6ddbac0a2208b44ae660732b049a6d7a8"; - sha256 = "0dzzv949iy3yi9lk0h6nybg39cbzfrn1jvz3r3ffa9vinknmi8wl"; + rev = "77e4e489ce1adfbc27b41f57a444ca2828f367c5"; + sha256 = "1qwihqd0lkj22k0vvwxi6g7shiys86y7wb85f1771b8hvals2qwx"; }; meta.homepage = "https://github.com/jghauser/papis.nvim/"; }; @@ -11099,12 +11033,12 @@ final: prev: quicker-nvim = buildVimPlugin { pname = "quicker.nvim"; - version = "2025-01-16"; + version = "2025-01-25"; src = fetchFromGitHub { owner = "stevearc"; repo = "quicker.nvim"; - rev = "049def718213d3cdf49fdf29835aded09b3e54a3"; - sha256 = "03mzq5cikg73nsq6lrcvz7jz3aq86ni88zgccqv49ss91gf66k28"; + rev = "92e0f61a5d6422424cf7728ad323d2a06e3ab2d5"; + sha256 = "09ahfy88hb5cp152y0alda7i9515xgmb5z43ax69y5apjdnv9z39"; }; meta.homepage = "https://github.com/stevearc/quicker.nvim/"; }; @@ -11157,17 +11091,6 @@ final: prev: meta.homepage = "https://github.com/luochen1990/rainbow/"; }; - rainbow-delimiters-nvim = buildVimPlugin { - pname = "rainbow-delimiters.nvim"; - version = "2025-01-12"; - src = fetchgit { - url = "https://gitlab.com/HiPhish/rainbow-delimiters.nvim"; - rev = "85b80abaa09cbbc039e3095b2f515b3cf8cadd11"; - sha256 = "10sz2qp42rpf341qpr7cvjkwn0r07mmkdr5pbs3a7siczid4y935"; - }; - meta.homepage = "https://gitlab.com/HiPhish/rainbow-delimiters.nvim"; - }; - rainbow_parentheses-vim = buildVimPlugin { pname = "rainbow_parentheses.vim"; version = "2013-03-05"; @@ -11336,14 +11259,26 @@ final: prev: meta.homepage = "https://github.com/gabrielpoca/replacer.nvim/"; }; + repolink-nvim = buildVimPlugin { + pname = "repolink.nvim"; + version = "2023-12-08"; + src = fetchFromGitHub { + owner = "9seconds"; + repo = "repolink.nvim"; + rev = "55edfedbaef3e894d2ab5107ea7fadc64cb8258d"; + sha256 = "1pa75cmb1fyxz4b9lam4vbgkcy2g3lfj0f31s17cppzapk0aqh6a"; + }; + meta.homepage = "https://github.com/9seconds/repolink.nvim/"; + }; + resession-nvim = buildVimPlugin { pname = "resession.nvim"; - version = "2024-12-24"; + version = "2025-01-25"; src = fetchFromGitHub { owner = "stevearc"; repo = "resession.nvim"; - rev = "271a6fd7afa90142be59fca3a5c3b9865e40e6b9"; - sha256 = "0l2zbfpsb62f4q3k8sxwiyj6sqwglpafjx3mzb48ncc0xbx0lhhg"; + rev = "c5274f625ba9dcec408ab4efbbb4b92df63e2a96"; + sha256 = "0n17qp1alazn3gf9x0yln8dmmbzs0kx93n0nlhwyack96yrgfxms"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/resession.nvim/"; @@ -11436,12 +11371,12 @@ final: prev: roslyn-nvim = buildVimPlugin { pname = "roslyn.nvim"; - version = "2024-12-30"; + version = "2025-01-27"; src = fetchFromGitHub { owner = "seblj"; repo = "roslyn.nvim"; - rev = "85aca5d48ddf8ada4e010ee9fa4d43c77ebf68c9"; - sha256 = "1053bm1dvyiqh5axapqbc5p730da1qb51jnccb434njdcdc24vai"; + rev = "490fd2d0f76249032ef6ce503e43ccdaeed9616e"; + sha256 = "15jqg907fnnxh3415yls90cwly75im1awi4bqs2jf94ssirnn4fc"; }; meta.homepage = "https://github.com/seblj/roslyn.nvim/"; }; @@ -11556,12 +11491,12 @@ final: prev: scnvim = buildVimPlugin { pname = "scnvim"; - version = "2024-09-16"; + version = "2025-01-23"; src = fetchFromGitHub { owner = "davidgranstrom"; repo = "scnvim"; - rev = "cb6a968b3de9b9a176f4012dd18efcb8d9d34f71"; - sha256 = "1z1jg201q0k6lkywkgl5phxkndklz3yw4cw4h0hp8v7whjh5yn9p"; + rev = "2bd34cb3feed697bd81b399857139c08fc6856f1"; + sha256 = "1xr5lrhgs952bilvfdqxj9ss3krg3i9y5fms7icssmvm41gzvvcg"; }; meta.homepage = "https://github.com/davidgranstrom/scnvim/"; }; @@ -11592,12 +11527,12 @@ final: prev: scrollbar-nvim = buildVimPlugin { pname = "scrollbar.nvim"; - version = "2024-11-28"; + version = "2025-01-22"; src = fetchFromGitHub { owner = "Xuyuanp"; repo = "scrollbar.nvim"; - rev = "a399fc9048293f635992b1c6755d7eba7ce2b341"; - sha256 = "1ifg1bb8fwi2k3n11aark9gvpcwpbdl2kdh276pjiys6rycadq32"; + rev = "3f0d4170db4c4e148c2796f9cdd211970432fec4"; + sha256 = "08l5b5hb80rr5agjzzh3x0z5i59c0xqnjxgk87sjsary18dbgzn2"; }; meta.homepage = "https://github.com/Xuyuanp/scrollbar.nvim/"; }; @@ -11700,12 +11635,12 @@ final: prev: sideways-vim = buildVimPlugin { pname = "sideways.vim"; - version = "2024-11-15"; + version = "2025-01-25"; src = fetchFromGitHub { owner = "AndrewRadev"; repo = "sideways.vim"; - rev = "3cfe62d57e59e4c86812e2559fb56796655fd4da"; - sha256 = "0bikch34j5520l31xy7p093h6ar4i8fxc63m5g93h47yvlkndyfn"; + rev = "23d493820643d029ea369c5d1368993d5bbd97b1"; + sha256 = "0lr75apdf5v0s2lnfvkd0m70xihc0a304cjska815vrxvifzyx58"; fetchSubmodules = true; }; meta.homepage = "https://github.com/AndrewRadev/sideways.vim/"; @@ -11761,12 +11696,12 @@ final: prev: smart-splits-nvim = buildVimPlugin { pname = "smart-splits.nvim"; - version = "2025-01-10"; + version = "2025-01-26"; src = fetchFromGitHub { owner = "mrjones2014"; repo = "smart-splits.nvim"; - rev = "7266722346df921535ca3f317164a62069436b7c"; - sha256 = "043j5ypqjplycxnkycga5c6w8ad25mjzx4lb0572vyyzczpkhav0"; + rev = "bfb5e63bd4639439b48815f46636dbd52b19b1bd"; + sha256 = "0k1510hqyzg7lgqfqfhd85bac45k98xgsfx0g0zhwi3mjkg5kvr1"; }; meta.homepage = "https://github.com/mrjones2014/smart-splits.nvim/"; }; @@ -11809,24 +11744,24 @@ final: prev: smear-cursor-nvim = buildVimPlugin { pname = "smear-cursor.nvim"; - version = "2025-01-17"; + version = "2025-01-27"; src = fetchFromGitHub { owner = "sphamba"; repo = "smear-cursor.nvim"; - rev = "d758c6ae26d8ee68679513b4a6853b212e533bfd"; - sha256 = "01s4xkpp4kg3lga2x2jwxs96vwcf0mix746aqwmfp79fanxwi7sm"; + rev = "58c25d6a3e1857e37bd18384972dc7e2b67de25a"; + sha256 = "1sfrpk8yjmxnddgfwxps0afbzbq2dihy2m4jr3byhds17sqg15mi"; }; meta.homepage = "https://github.com/sphamba/smear-cursor.nvim/"; }; snacks-nvim = buildVimPlugin { pname = "snacks.nvim"; - version = "2025-01-19"; + version = "2025-01-24"; src = fetchFromGitHub { owner = "folke"; repo = "snacks.nvim"; - rev = "d6284d51ff748f43c5431c35ffed7f7c02e51069"; - sha256 = "0z6a3idlmalbiwlz5c6n0ycc5dn4439ffm52ml1r04jajqn8rx56"; + rev = "b96bd540f785c725289f9f15f0147b1b2dac5a35"; + sha256 = "16y78k5y1lci5y8laj35bx15b191sqh2igibxwp1dl90cp2c89f1"; }; meta.homepage = "https://github.com/folke/snacks.nvim/"; }; @@ -11881,12 +11816,12 @@ final: prev: sonokai = buildVimPlugin { pname = "sonokai"; - version = "2025-01-16"; + version = "2025-01-24"; src = fetchFromGitHub { owner = "sainnhe"; repo = "sonokai"; - rev = "622aa3cfeacaa3b51565a089404df3afa0187ed7"; - sha256 = "10y7qk70qdm38cr6xjwkrabz730amps8y239mdqgh7z9fx0cizzb"; + rev = "e1c1491ec3714ec9ae3d49db3c126afbd4c49970"; + sha256 = "0zhfrlwy2gy25mvf2pn80wd1jlmglicvzfmk6rv00958bi1h8557"; }; meta.homepage = "https://github.com/sainnhe/sonokai/"; }; @@ -12472,12 +12407,12 @@ final: prev: tailwind-tools-nvim = buildVimPlugin { pname = "tailwind-tools.nvim"; - version = "2024-11-16"; + version = "2025-01-24"; src = fetchFromGitHub { owner = "luckasRanarison"; repo = "tailwind-tools.nvim"; - rev = "3703e162d819a04b128902c508276553dae0dfb8"; - sha256 = "1ia8mxb60gkhr984q9jcvn9hm3bmqxd19fpkbh41cxqr2z4pxnhb"; + rev = "0862805c3c0d8a8d61ec1baffc79b9fbf5578d82"; + sha256 = "0vybmjxlxb43vxwbg2xzfnih1rgr51cachb6rx6g76p2xbz6d8gf"; }; meta.homepage = "https://github.com/luckasRanarison/tailwind-tools.nvim/"; }; @@ -12605,12 +12540,12 @@ final: prev: telescope-frecency-nvim = buildVimPlugin { pname = "telescope-frecency.nvim"; - version = "2025-01-11"; + version = "2025-01-27"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-frecency.nvim"; - rev = "6e581bb7bea187fc03a4be3b252a8adecabc398a"; - sha256 = "1dxnlq50l1a7lh9lgx0rc9s1nf030fwrgxpgki6xcz0yhxx2s7j5"; + rev = "1ba7caa48f9ecf585cadce96078c353e031250e7"; + sha256 = "0zff8ar8g2n5l2ldvn90jg3lcias725x9lb1yphya8afjn4sbaqq"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-frecency.nvim/"; }; @@ -12702,12 +12637,12 @@ final: prev: telescope-manix = buildNeovimPlugin { pname = "telescope-manix"; - version = "2025-01-19"; + version = "2025-01-26"; src = fetchFromGitHub { owner = "MrcJkb"; repo = "telescope-manix"; - rev = "7fc130e920c702f0ff54ab25f45da821a3976a33"; - sha256 = "0204lvca077fvw4p0facmic2j5n4h1k88z7azglppx64z5cl40bk"; + rev = "fce4719aecfefdc7ddd15b1b82136d75f7994a4c"; + sha256 = "1v5a60smjyrfsmwmjnpbapzskzf705lknn3ii7lw90xav82dj9sp"; }; meta.homepage = "https://github.com/MrcJkb/telescope-manix/"; }; @@ -13075,12 +13010,12 @@ final: prev: tiny-inline-diagnostic-nvim = buildVimPlugin { pname = "tiny-inline-diagnostic.nvim"; - version = "2025-01-15"; + version = "2025-01-25"; src = fetchFromGitHub { owner = "rachartier"; repo = "tiny-inline-diagnostic.nvim"; - rev = "aaa6f0dd097f8ca2478cad259e61b7cb26ec0eb8"; - sha256 = "0fy6xyi1ybgrrvys2qb7g2sl7pknnzmlrpzb8ml2wwr1igkrjpyp"; + rev = "e6445d7b57da19238c9490b79d9758fc5220a79e"; + sha256 = "1k4b3ss4x9xhj6g4mnkmn4abswlvfjg9f5bk6nz68ksdaw302g07"; }; meta.homepage = "https://github.com/rachartier/tiny-inline-diagnostic.nvim/"; }; @@ -13196,12 +13131,12 @@ final: prev: traces-vim = buildVimPlugin { pname = "traces.vim"; - version = "2022-04-11"; + version = "2025-01-25"; src = fetchFromGitHub { owner = "markonm"; repo = "traces.vim"; - rev = "9663fcf84de5776bee71b6c816c25ccb6ea11d1a"; - sha256 = "0gwn1kclcqp1yvaja6wqf27ng8d4wrd2j7795syxdk3d8vmpn55d"; + rev = "261602a6ee8d40d13522242ec5671456a230c17e"; + sha256 = "118zicpmw7gca1fvzfm3sb101kzksgwf06hdk4790ry7xsrmnank"; }; meta.homepage = "https://github.com/markonm/traces.vim/"; }; @@ -13232,12 +13167,12 @@ final: prev: treesj = buildVimPlugin { pname = "treesj"; - version = "2025-01-06"; + version = "2025-01-21"; src = fetchFromGitHub { owner = "Wansmer"; repo = "treesj"; - rev = "ec234a9a13d61a7b95900abdb02fabaea1afd9f3"; - sha256 = "129wkjzsyl73fdxklpzq8hs6in01zl9b58kwhlscvhskb9pb8gdy"; + rev = "48c1a7539f376fd40ceb9cf12d697040fcf90649"; + sha256 = "0yha205ajwqz4y1a5l5qh35mivaz2ql1vqfky2cxy90zndq8g08r"; }; meta.homepage = "https://github.com/Wansmer/treesj/"; }; @@ -13509,24 +13444,24 @@ final: prev: unimpaired-nvim = buildVimPlugin { pname = "unimpaired.nvim"; - version = "2024-04-09"; + version = "2025-01-23"; src = fetchFromGitHub { owner = "tummetott"; repo = "unimpaired.nvim"; - rev = "8e504ba95dd10a687f4e4dacd5e19db221b88534"; - sha256 = "sha256-CNU4cigMjbvOdUzUXze9ZDmTZRuYtj4dCuuLVZkMTQg="; + rev = "a282ab8ce0d0d4b5b1200ea484993aecf65dd94c"; + sha256 = "08nbc8svk83c5mjgj6ljsa7dm91i0q3anrfgjjx6x6s7khvxzccd"; }; meta.homepage = "https://github.com/tummetott/unimpaired.nvim/"; }; unison = buildVimPlugin { pname = "unison"; - version = "2025-01-17"; + version = "2025-01-24"; src = fetchFromGitHub { owner = "unisonweb"; repo = "unison"; - rev = "14c73f1cf87f7e5155301b26dc648099e55aa0b7"; - sha256 = "1rz2kb41mdmimdwgb0p9nd8g3aq0xmzwhnbxwbxsylkfxzkbgfid"; + rev = "f605ceca04028bc0b020b25af82a40e233d2d9d4"; + sha256 = "1bmmngjalnaiwnyl58kawkn2cx2r28ac8kd4iyc22c21pimngp1b"; }; meta.homepage = "https://github.com/unisonweb/unison/"; }; @@ -14709,11 +14644,11 @@ final: prev: vim-dadbod = buildVimPlugin { pname = "vim-dadbod"; - version = "2024-12-12"; + version = "2025-01-25"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-dadbod"; - rev = "f740950d0703099e0f172016f10e0e39f50fd0ba"; + rev = "9f0ca8bcef704659820a95c3bbd2c262583a66a1"; sha256 = "13kwx67r5xl22znrd3i48qvr5dl5ny7qkpwkp455grkdx9y4q2gg"; }; meta.homepage = "https://github.com/tpope/vim-dadbod/"; @@ -15021,12 +14956,12 @@ final: prev: vim-endwise = buildVimPlugin { pname = "vim-endwise"; - version = "2024-12-12"; + version = "2025-01-24"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-endwise"; - rev = "5ec72eef1a07fb32af9be5402144678f68cb1a7a"; - sha256 = "09wbf132vd7jsyv6i59nlq99dk2723mqkisfgvfv1m0xr14rr8gw"; + rev = "f6a32fbe4d4e511d446ac189e926f8e24f69cc1e"; + sha256 = "1yysr1l197p8mkcg739688gi718886spbmmf232r824jw9cladq3"; }; meta.homepage = "https://github.com/tpope/vim-endwise/"; }; @@ -15141,12 +15076,12 @@ final: prev: vim-fern = buildVimPlugin { pname = "vim-fern"; - version = "2025-01-07"; + version = "2025-01-26"; src = fetchFromGitHub { owner = "lambdalisue"; repo = "vim-fern"; - rev = "0912da576f4beae177cda58b4cd5984e40548b84"; - sha256 = "12n5xnimxfk1862p98dk0jzq6in4jwcg8mf346mrmdsha76277m2"; + rev = "cb5be74e4a343c8187be91b6be4475b2d73755a2"; + sha256 = "176xb6zydgckvr7ahmxjqmds7wz3ndjb712brqyh0d3qw4ll9glp"; }; meta.homepage = "https://github.com/lambdalisue/vim-fern/"; }; @@ -15297,12 +15232,12 @@ final: prev: vim-fugitive = buildVimPlugin { pname = "vim-fugitive"; - version = "2024-12-29"; + version = "2025-01-20"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "174230d6a7f2df94705a7ffd8d5413e27ec10a80"; - sha256 = "0bs5l8f1qrg9fr97nb029yf7bs813fg0pk5f0cjqfnmglslfr773"; + rev = "d74a7cff4cfcf84f83cc7eccfa365488f3bbabc2"; + sha256 = "1pzsz49915rixx8wm0rf580sg23pfi7dvwxmpqw0xxb87r9jxhkn"; }; meta.homepage = "https://github.com/tpope/vim-fugitive/"; }; @@ -16103,12 +16038,12 @@ final: prev: vim-just = buildVimPlugin { pname = "vim-just"; - version = "2024-12-16"; + version = "2025-01-27"; src = fetchFromGitHub { owner = "NoahTheDuke"; repo = "vim-just"; - rev = "ed67f198e981f555c0f9e9ed5b69b4b06543a9e1"; - sha256 = "03zbh0my0l966y46l21612m5gr8c57jhhnhxxyzlrpy2wh59xjmk"; + rev = "0f7d26de0c48e2620b733e51f4159aae13dc3bee"; + sha256 = "0hhghy5r7sdvbb92yg418bbvmaknab3pg8ilxfc5jli33k4xd3sc"; }; meta.homepage = "https://github.com/NoahTheDuke/vim-just/"; }; @@ -16571,12 +16506,12 @@ final: prev: vim-monokai = buildVimPlugin { pname = "vim-monokai"; - version = "2024-12-10"; + version = "2025-01-26"; src = fetchFromGitHub { owner = "crusoexia"; repo = "vim-monokai"; - rev = "54a2a6c2f4c0d20401af98952945945f6b94101f"; - sha256 = "1fx0548mdq0rqmw71bpsvd6bs7gn18zhn1yv5kbh3h8h93a8sl8y"; + rev = "ccaaf4bf983e828e46d47288d0278316486d718b"; + sha256 = "195sq9gcjsyr0crwqawhjm1r044fpwkba383ia8jg7m2rhm4g71w"; }; meta.homepage = "https://github.com/crusoexia/vim-monokai/"; }; @@ -17913,17 +17848,6 @@ final: prev: meta.homepage = "https://github.com/dstein64/vim-startuptime/"; }; - vim-stationeers-ic10-syntax = buildVimPlugin { - pname = "vim-stationeers-ic10-syntax"; - version = "2025-01-08"; - src = fetchgit { - url = "https://gitlab.com/LittleMorph/vim-ic10"; - rev = "7c1f13b198cfe122fb52f6abfb8dc95d5ca51013"; - sha256 = "0pxk1qq6niy9msm369w5xn2jcwpa8a30hpqk6hb1ag1v6244j3g1"; - }; - meta.homepage = "https://gitlab.com/LittleMorph/vim-ic10"; - }; - vim-strip-trailing-whitespace = buildVimPlugin { pname = "vim-strip-trailing-whitespace"; version = "2022-02-01"; @@ -18106,12 +18030,12 @@ final: prev: vim-terraform = buildVimPlugin { pname = "vim-terraform"; - version = "2025-01-08"; + version = "2025-01-20"; src = fetchFromGitHub { owner = "hashivim"; repo = "vim-terraform"; - rev = "174789e2f0a1c8348ae129223581760807162e82"; - sha256 = "16pafwdlcbjbnli3afwcyi07ai53jqpxk7ci8z02s457r2s31z0n"; + rev = "8912ca1be3025a1c9fab193618f3b99517e01973"; + sha256 = "1n853x6z5cza54vw447k0sprsqf658fdyj5fp3cls14k9pngfqi3"; }; meta.homepage = "https://github.com/hashivim/vim-terraform/"; }; @@ -18131,12 +18055,12 @@ final: prev: vim-test = buildVimPlugin { pname = "vim-test"; - version = "2025-01-17"; + version = "2025-01-22"; src = fetchFromGitHub { owner = "vim-test"; repo = "vim-test"; - rev = "844b51ee092ee4bd5f9b140874c1568751b6f37c"; - sha256 = "07nvv0d8ypy0n4x44gl4a5x8jkps7h0wmmsr0zvg56zwl00iikaw"; + rev = "d317336c4022c272e74cfe11e277483183dd0b5f"; + sha256 = "1f124zfgrzbmlzv68wlzjp0k91prnjv2h63lj84s5mn599rahpb2"; }; meta.homepage = "https://github.com/vim-test/vim-test/"; }; @@ -18551,12 +18475,12 @@ final: prev: vim-wakatime = buildVimPlugin { pname = "vim-wakatime"; - version = "2024-11-15"; + version = "2025-01-25"; src = fetchFromGitHub { owner = "wakatime"; repo = "vim-wakatime"; - rev = "cf51327a9e08935569614d1cb24e779ee9f45519"; - sha256 = "10d59w48h1n744l9w406msghncdl7i2nxg98dsd8siy6mycb5d2b"; + rev = "e46d7c4f98ee0f40782008dd60cb2a79c377fb1d"; + sha256 = "1sr1gva01vw7adgpyhbaxsl5vl1nbdn04722m8mx18fsfa7jca7x"; }; meta.homepage = "https://github.com/wakatime/vim-wakatime/"; }; @@ -18767,12 +18691,12 @@ final: prev: vimade = buildVimPlugin { pname = "vimade"; - version = "2025-01-19"; + version = "2025-01-25"; src = fetchFromGitHub { owner = "TaDaa"; repo = "vimade"; - rev = "9fb08c8c24c06781c99808adead0b07de228240d"; - sha256 = "1pkafigvbcwfr5jjgc6mxml3srf01m3n6v2wpc77mdwgzkj9ijq2"; + rev = "b750dca2828de47a7a596792108b6160263da4c2"; + sha256 = "1n3ns004rzvl90z9wwj0mbzv2z1sspygvxxnnckl7h28aj7kv2gc"; }; meta.homepage = "https://github.com/TaDaa/vimade/"; }; @@ -18888,12 +18812,12 @@ final: prev: vimtex = buildVimPlugin { pname = "vimtex"; - version = "2025-01-18"; + version = "2025-01-26"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "814eaae6dbfe5a293b211ebb9c57de5183d6dfc2"; - sha256 = "1443dyld31bzksqy1hgrc5ir7r0kb27kkwagls50ilwy6kz3kblj"; + rev = "83e331dcad5ce28012e656eea3906b5b897db2ba"; + sha256 = "1y4l90xfsaax8nmz71jv0c1ym8xv4yhr0v8vc2gmcnm1a1li18d3"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; @@ -19044,12 +18968,12 @@ final: prev: which-key-nvim = buildVimPlugin { pname = "which-key.nvim"; - version = "2025-01-05"; + version = "2025-01-23"; src = fetchFromGitHub { owner = "folke"; repo = "which-key.nvim"; - rev = "1f8d414f61e0b05958c342df9b6a4c89ce268766"; - sha256 = "02nndwqr49461260shhqy3gm3y69lqqczscpqcssh2jx9mbzhppm"; + rev = "6cebd86917df559a88de0f806b2989799c6e6423"; + sha256 = "1w13ajdd18gqikyj04bgxjsxanfjyvvaxvsqxsyq2gchc4fjmsqq"; }; meta.homepage = "https://github.com/folke/which-key.nvim/"; }; @@ -19273,12 +19197,12 @@ final: prev: yazi-nvim = buildVimPlugin { pname = "yazi.nvim"; - version = "2025-01-18"; + version = "2025-01-26"; src = fetchFromGitHub { owner = "mikavilpas"; repo = "yazi.nvim"; - rev = "34847a489ed9a9980cb4daf6dfac9024403caa9f"; - sha256 = "0kcmr74s9rwvd7dd8db7qpi5gi0kysv7zgfk77q9wsk3q7k09j9j"; + rev = "9a39d68534cb5ae7250aa50fcc233335843dd786"; + sha256 = "134czard0y7ynq2gz6r968vhyg01p2akwfrsmwaaq8sff2jpc1p1"; }; meta.homepage = "https://github.com/mikavilpas/yazi.nvim/"; }; @@ -19333,12 +19257,12 @@ final: prev: zellij-nav-nvim = buildVimPlugin { pname = "zellij-nav.nvim"; - version = "2024-12-24"; + version = "2025-01-22"; src = fetchFromGitHub { owner = "swaits"; repo = "zellij-nav.nvim"; - rev = "366935eeb527889ab51771233b687589135d7891"; - sha256 = "0lj0g8nhmn5pikbzszyach6nsw55ddxq4yrdx9miw48qi6nz51sz"; + rev = "91cc2a642d8927ebde50ced5bf71ba470a0fc116"; + sha256 = "0acb5zfiljfiz1is98drj54mv211m8qqmxmi5acc1s2mcr56z31s"; }; meta.homepage = "https://github.com/swaits/zellij-nav.nvim/"; }; @@ -19441,12 +19365,12 @@ final: prev: zotcite = buildVimPlugin { pname = "zotcite"; - version = "2024-11-21"; + version = "2025-01-24"; src = fetchFromGitHub { owner = "jalvesaq"; repo = "zotcite"; - rev = "a6d1eb8a8a8555aef814979a385d03165e2f8922"; - sha256 = "11lnm75n4im2m3vg4av6sa2x2fw62ja1w4an9c6ccvrqy5fj2wgm"; + rev = "db6db942b1385f13fd4d66182fa253477ecc5a23"; + sha256 = "10lilkw6vcakfhxwj5fj29lx000iv87qk6xlmxnvafh9fi2wmivh"; }; meta.homepage = "https://github.com/jalvesaq/zotcite/"; }; diff --git a/pkgs/applications/editors/vim/plugins/non-generated/clangd_extensions-nvim/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/clangd_extensions-nvim/default.nix new file mode 100644 index 0000000000000..8a7712cd36c9f --- /dev/null +++ b/pkgs/applications/editors/vim/plugins/non-generated/clangd_extensions-nvim/default.nix @@ -0,0 +1,26 @@ +{ + lib, + fetchFromSourcehut, + nix-update-script, + vimUtils, +}: +vimUtils.buildVimPlugin { + pname = "clangd_extensions.nvim"; + version = "unstable-2024-10-05"; + + src = fetchFromSourcehut { + owner = "~p00f"; + repo = "clangd_extensions.nvim"; + rev = "8f7b72100883e0e34400d9518d40a03f21e4d0a6"; + hash = "sha256-N2YPu2Oa5KBkL8GSp9Al+rxhtNgu7YtxtMuy5BIcnOY="; + }; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Clangd's off-spec features for neovim's LSP client"; + homepage = "https://git.sr.ht/~p00f/clangd_extensions.nvim"; + license = lib.licenses.mit; + platforms = lib.platforms.all; + }; +} diff --git a/pkgs/applications/editors/vim/plugins/non-generated/cmp-async-path/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/cmp-async-path/default.nix new file mode 100644 index 0000000000000..059e9c1733f3c --- /dev/null +++ b/pkgs/applications/editors/vim/plugins/non-generated/cmp-async-path/default.nix @@ -0,0 +1,30 @@ +{ + lib, + vimUtils, + fetchFromGitea, + nix-update-script, + vimPlugins, +}: +vimUtils.buildVimPlugin { + pname = "cmp-async-path"; + version = "unstable-2024-10-21"; + + src = fetchFromGitea { + domain = "codeberg.org"; + owner = "FelipeLema"; + repo = "cmp-async-path"; + rev = "d6d1ffa2075039632a2d71e8fa139818e15ac757"; + hash = "sha256-MZFpNPtSDMZNkfoz+3ZcDxLb8PvDtm9nb1dE0CbYIPQ="; + }; + + checkInputs = [ vimPlugins.nvim-cmp ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Nvim-cmp source for filesystem paths with async processing"; + homepage = "https://codeberg.org/FelipeLema/cmp-async-path/"; + license = lib.licenses.mit; + platforms = lib.platforms.all; + }; +} diff --git a/pkgs/applications/editors/vim/plugins/non-generated/gitlab-vim/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/gitlab-vim/default.nix new file mode 100644 index 0000000000000..e8908af5bf8ef --- /dev/null +++ b/pkgs/applications/editors/vim/plugins/non-generated/gitlab-vim/default.nix @@ -0,0 +1,26 @@ +{ + lib, + vimUtils, + fetchFromGitLab, + nix-update-script, +}: +vimUtils.buildVimPlugin { + pname = "gitlab.vim"; + version = "unstable-2025-01-23"; + + src = fetchFromGitLab { + owner = "gitlab-org/editor-extensions"; + repo = "gitlab.vim"; + rev = "62a60341df24ccecb73bc9ae34a198674bb12faf"; + hash = "sha256-9G5H3MUdE++hR7p8nsoxK5kuA84k8oJBMvOa01PZrsA="; + }; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Integrate GitLab Duo with Neovim"; + homepage = "https://gitlab.com/gitlab-org/editor-extensions/gitlab.vim"; + license = lib.licenses.mit; + platforms = lib.platforms.all; + }; +} diff --git a/pkgs/applications/editors/vim/plugins/non-generated/hare-vim/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/hare-vim/default.nix new file mode 100644 index 0000000000000..bd624de3c059b --- /dev/null +++ b/pkgs/applications/editors/vim/plugins/non-generated/hare-vim/default.nix @@ -0,0 +1,26 @@ +{ + lib, + vimUtils, + fetchFromSourcehut, + nix-update-script, +}: +vimUtils.buildVimPlugin { + pname = "hare.vim"; + version = "unstable-2025-01-23"; + + src = fetchFromSourcehut { + owner = "~sircmpwn"; + repo = "hare.vim"; + rev = "1a732aca2931402f3186f52ae626540a770aefe2"; + hash = "sha256-wBeQvDm7ZTUcw21VIAryyH6tMuBiQCMOJRZX/8ic8B4="; + }; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Hare programming in Vim"; + homepage = "https://git.sr.ht/~sircmpwn/hare.vim"; + license = lib.licenses.vim; + platforms = lib.platforms.all; + }; +} diff --git a/pkgs/applications/editors/vim/plugins/non-generated/lsp_lines-nvim/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/lsp_lines-nvim/default.nix new file mode 100644 index 0000000000000..34fa410f2b46e --- /dev/null +++ b/pkgs/applications/editors/vim/plugins/non-generated/lsp_lines-nvim/default.nix @@ -0,0 +1,26 @@ +{ + lib, + vimUtils, + fetchFromSourcehut, + nix-update-script, +}: +vimUtils.buildVimPlugin { + pname = "lsp_lines.nvim"; + version = "unstable-2024-12-10"; + + src = fetchFromSourcehut { + owner = "~whynothugo"; + repo = "lsp_lines.nvim"; + rev = "a92c755f182b89ea91bd8a6a2227208026f27b4d"; + hash = "sha256-jHiIZemneQACTDYZXBJqX2/PRTBoxq403ILvt1Ej1ZM="; + }; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Neovim diagnostics using virtual lines"; + homepage = "https://git.sr.ht/~whynothugo/lsp_lines.nvim"; + license = lib.licenses.mit; + platforms = lib.platforms.all; + }; +} diff --git a/pkgs/applications/editors/vim/plugins/non-generated/nvim-julia-autotest/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/nvim-julia-autotest/default.nix new file mode 100644 index 0000000000000..2a0fc95ef84bc --- /dev/null +++ b/pkgs/applications/editors/vim/plugins/non-generated/nvim-julia-autotest/default.nix @@ -0,0 +1,26 @@ +{ + lib, + vimUtils, + fetchFromGitLab, + nix-update-script, +}: +vimUtils.buildVimPlugin { + pname = "nvim-julia-autotest"; + version = "unstable-2022-10-31"; + + src = fetchFromGitLab { + owner = "usmcamp0811"; + repo = "nvim-julia-autotest"; + rev = "b74e2f9c961e604cb56cc23f87188348bfa0f33f"; + hash = "sha256-IaNsbBe5q7PB9Q/N/Z9nEnP6jlkQ6+xlkC0TCFnJpkk="; + }; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Automatically run Julia tests when you save runtest.jl file"; + homepage = "https://gitlab.com/usmcamp0811/nvim-julia-autotest"; + license = lib.licenses.gpl3; + platforms = lib.platforms.all; + }; +} diff --git a/pkgs/applications/editors/vim/plugins/non-generated/rainbow-delimiters-nvim/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/rainbow-delimiters-nvim/default.nix new file mode 100644 index 0000000000000..1e921dde3288a --- /dev/null +++ b/pkgs/applications/editors/vim/plugins/non-generated/rainbow-delimiters-nvim/default.nix @@ -0,0 +1,33 @@ +{ + lib, + vimUtils, + fetchFromGitLab, + nix-update-script, +}: +vimUtils.buildVimPlugin { + pname = "rainbow-delimiters.nvim"; + version = "unstable-2025-01-12"; + + src = fetchFromGitLab { + owner = "HiPhish"; + repo = "rainbow-delimiters.nvim"; + rev = "85b80abaa09cbbc039e3095b2f515b3cf8cadd11"; + hash = "sha256-zWHXYs3XdnoszqOFY3hA2L5mNn1a44OAeKv3lL3EMEw="; + }; + + nvimSkipModule = [ + # rainbow-delimiters.types.lua + "rainbow-delimiters.types" + # Test that requires an unpackaged dependency + "rainbow-delimiters._test.highlight" + ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Rainbow delimiters for Neovim with Tree-sitter"; + homepage = "https://gitlab.com/HiPhish/rainbow-delimiters.nvim"; + license = lib.licenses.gpl3; + platforms = lib.platforms.all; + }; +} diff --git a/pkgs/applications/editors/vim/plugins/non-generated/vim-stationeers-ic10-syntax/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/vim-stationeers-ic10-syntax/default.nix new file mode 100644 index 0000000000000..d6818ed031739 --- /dev/null +++ b/pkgs/applications/editors/vim/plugins/non-generated/vim-stationeers-ic10-syntax/default.nix @@ -0,0 +1,26 @@ +{ + lib, + vimUtils, + fetchFromGitLab, + nix-update-script, +}: +vimUtils.buildVimPlugin { + pname = "vim-ic10"; + version = "unstable-2025-01-08"; + + src = fetchFromGitLab { + owner = "LittleMorph"; + repo = "vim-ic10"; + rev = "7c1f13b198cfe122fb52f6abfb8dc95d5ca51013"; + hash = "sha256-4Q1JiDA7PBUWNBNfCIZC6nImhe2FJzOqrslHazAOs18="; + }; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Stationeers IC10 syntax highlighting for Vim"; + homepage = "https://gitlab.com/LittleMorph/vim-ic10"; + license = lib.licenses.mit; + platforms = lib.platforms.all; + }; +} diff --git a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix index 4a0bdf9b27f5f..7e13782b93eb4 100644 --- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix +++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix @@ -105,12 +105,12 @@ }; bash = buildGrammar { language = "bash"; - version = "0.0.0+rev=49c3100"; + version = "0.0.0+rev=a985bd2"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-bash"; - rev = "49c31006d8307dcb12bc5770f35b6d5b9e2be68e"; - hash = "sha256-JW+30zIyq8Xc7NG9V+YoFqC+57BjZXIbAvWPD2lqvIE="; + rev = "a985bd2d14d249b8f583343ad21aeb13c50c85e8"; + hash = "sha256-5uI2DOLGLN0zD2VbCPB7sdLQFTL5kQtNZpGh7VC25wg="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-bash"; }; @@ -193,23 +193,23 @@ }; c = buildGrammar { language = "c"; - version = "0.0.0+rev=3aa2995"; + version = "0.0.0+rev=492f7aa"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-c"; - rev = "3aa2995549d5d8b26928e8d3fa2770fd4327414e"; - hash = "sha256-iT0sjwtrDtCduxCU3wVB1AP6gzxW3DpmqNQaP3LUBiA="; + rev = "492f7aaa37560204856a2b3f775398b66ba09f31"; + hash = "sha256-4Ha5coP621qncxS6IE+KvNuhJlj5qI4ZveBwe/1cq9k="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-c"; }; c_sharp = buildGrammar { language = "c_sharp"; - version = "0.0.0+rev=acff8cb"; + version = "0.0.0+rev=2c31cc8"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-c-sharp"; - rev = "acff8cbb53a1d7b9cd07b209c9933a0e2da9ef35"; - hash = "sha256-Mdcr4UuoKiNodrNV7/NRfQkmgynPa798Rv9f6Qm3cFw="; + rev = "2c31cc87640ab6ad74fb408c0cf1262ce54da5bb"; + hash = "sha256-pr9JxTc7o5q82CaYVtSSNlp3BQS4+CGblfmtXQoj9os="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-c-sharp"; }; @@ -336,23 +336,23 @@ }; cpp = buildGrammar { language = "cpp"; - version = "0.0.0+rev=f41b4f6"; + version = "0.0.0+rev=a352ed8"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-cpp"; - rev = "f41b4f66a42100be405f96bdc4ebc4a61095d3e8"; - hash = "sha256-NRcyXjijLdoa5fdA+MKZyt7mnM5B37zCsqZh4QvuOtA="; + rev = "a352ed85f733f9c6cc458fe5a82bcd4c00f70eab"; + hash = "sha256-s/JJD2gfs2Kepj89N7ZCstdfZ1baONZmTxFy2D0KQ2M="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-cpp"; }; css = buildGrammar { language = "css"; - version = "0.0.0+rev=5c89b88"; + version = "0.0.0+rev=6731f03"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-css"; - rev = "5c89b88a37a2e1e36c031469462d6ee85ff2c13c"; - hash = "sha256-R5820/4sIQIfCMg3D/LF1Kk5Mf46YLokS8tBAcGL4Eo="; + rev = "6731f030693d3698ad94865ed0228fe45df07e30"; + hash = "sha256-+TGRtlFDCfQYRC2dp+xyMZL/EpBnEjdq8vDeF1ib6Y0="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-css"; }; @@ -370,12 +370,12 @@ }; cuda = buildGrammar { language = "cuda"; - version = "0.0.0+rev=635e8aa"; + version = "0.0.0+rev=757e0a6"; src = fetchFromGitHub { owner = "theHamsta"; repo = "tree-sitter-cuda"; - rev = "635e8aa3747823a0c4e9660c07cef76fe8d3ef93"; - hash = "sha256-+KHenEgo9wMncjEIJZoqS0x089hjdR3J1t+x663qy1M="; + rev = "757e0a61f9d38b3d9eaa299e8d866e8283ffc284"; + hash = "sha256-66tJ1GVAWKqXBCzBXUGdzG/Rl2vw/eJ6mQnWnnnpBcU="; }; meta.homepage = "https://github.com/theHamsta/tree-sitter-cuda"; }; @@ -592,12 +592,12 @@ }; elixir = buildGrammar { language = "elixir"; - version = "0.0.0+rev=02a6f7f"; + version = "0.0.0+rev=0e8eb7f"; src = fetchFromGitHub { owner = "elixir-lang"; repo = "tree-sitter-elixir"; - rev = "02a6f7fd4be28dd94ee4dd2ca19cb777053ea74e"; - hash = "sha256-OM2RWQNdYMltYwmbU5f4ZK5a8Wx4JxBMYx9R5n2B4jg="; + rev = "0e8eb7fc1dfb3d855398870827a9866a1529a5e4"; + hash = "sha256-rgmwf4ndSFtrdAz+w0QtIcZNgYfaLoCkqytnioXT/Pk="; }; meta.homepage = "https://github.com/elixir-lang/tree-sitter-elixir"; }; @@ -636,23 +636,23 @@ }; embedded_template = buildGrammar { language = "embedded_template"; - version = "0.0.0+rev=3322625"; + version = "0.0.0+rev=8495d10"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-embedded-template"; - rev = "332262529bc51abf5746317b2255ccc2fff778f8"; - hash = "sha256-C2Lo3tT2363O++ycXiR6x0y+jy2zlmhcKp7t1LhvCe8="; + rev = "8495d106154741e6d35d37064f864758ece75de6"; + hash = "sha256-DCEno1QzPcM9853hldrm4IAqKsTNALe//laDn+Hcr8Q="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-embedded-template"; }; erlang = buildGrammar { language = "erlang"; - version = "0.0.0+rev=d2281ab"; + version = "0.0.0+rev=981fda0"; src = fetchFromGitHub { owner = "WhatsApp"; repo = "tree-sitter-erlang"; - rev = "d2281ab060093290045941a865a3834eec862a3f"; - hash = "sha256-tiZY1CXwKBwkXRrl1uJACOoXIlC9AmqDQ9bxWuq9ejw="; + rev = "981fda038d2eb182a88a9374ccb1c14b840cba0b"; + hash = "sha256-uvVnWbkiwsqNq0hPikEwLLq1MDVohJlgK/L6zAUC+rU="; }; meta.homepage = "https://github.com/WhatsApp/tree-sitter-erlang"; }; @@ -746,12 +746,12 @@ }; fortran = buildGrammar { language = "fortran"; - version = "0.0.0+rev=5fc069e"; + version = "0.0.0+rev=022b032"; src = fetchFromGitHub { owner = "stadelmanma"; repo = "tree-sitter-fortran"; - rev = "5fc069e4f05810ec6f8e399cd522e4eba864181c"; - hash = "sha256-dcpGhtUbaw4lBrwL01nzokWF2BQLsER5S7zEH6xOzso="; + rev = "022b032d31299c5d8336cdfd0ece97de20a609c0"; + hash = "sha256-STRbEv7kBtkrokXgaN9g1JNwWmSV+7gkyklhYKJszNY="; }; meta.homepage = "https://github.com/stadelmanma/tree-sitter-fortran"; }; @@ -978,12 +978,12 @@ }; go = buildGrammar { language = "go"; - version = "0.0.0+rev=12fe553"; + version = "0.0.0+rev=7cb21a6"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-go"; - rev = "12fe553fdaaa7449f764bc876fd777704d4fb752"; - hash = "sha256-E8ieOSkpmdsMrj1m0op0WA5ki4VkodHBMtJRCmYtmGY="; + rev = "7cb21a65af6cc8e5c6742b9dba42881ea1158475"; + hash = "sha256-BOq/HH6r+6dbdUa/0rlQioXG3Dgm60gBNSc1SLfE2fI="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-go"; }; @@ -1088,12 +1088,12 @@ }; groovy = buildGrammar { language = "groovy"; - version = "0.0.0+rev=d1556e7"; + version = "0.0.0+rev=8691159"; src = fetchFromGitHub { owner = "murtaza64"; repo = "tree-sitter-groovy"; - rev = "d1556e77d49df1a28cd564af5766fdaea8ab7063"; - hash = "sha256-oEdO9P1akGzOmZvAUrO608yptgkMsJL5YAhPwBvarPI="; + rev = "86911590a8e46d71301c66468e5620d9faa5b6af"; + hash = "sha256-652wluH2C3pYmhthaj4eWDVLtEvvVIuu70bJNnt5em0="; }; meta.homepage = "https://github.com/murtaza64/tree-sitter-groovy"; }; @@ -1110,12 +1110,12 @@ }; hack = buildGrammar { language = "hack"; - version = "0.0.0+rev=fca1e29"; + version = "0.0.0+rev=bc5b3a1"; src = fetchFromGitHub { owner = "slackhq"; repo = "tree-sitter-hack"; - rev = "fca1e294f6dce8ec5659233a6a21f5bd0ed5b4f2"; - hash = "sha256-XTcsqCvlwbAAi7/TXrYX8wT56Ie+0OW5+eNRMH7XNyk="; + rev = "bc5b3a10d6d27e8220a113a9a7fe9bec0a1574b0"; + hash = "sha256-dVDJRRn5pT7FPQN+RIUi/mFG6uS8rAzWJy2dBfuiNSM="; }; meta.homepage = "https://github.com/slackhq/tree-sitter-hack"; }; @@ -1243,12 +1243,12 @@ }; html = buildGrammar { language = "html"; - version = "0.0.0+rev=d9219ad"; + version = "0.0.0+rev=d18f83f"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-html"; - rev = "d9219ada6e1a2c8f0ab0304a8bd9ca4285ae0468"; - hash = "sha256-0aLNG4eB2I0Qn0r1oF4YwUDLek78S5fbklFI/bMmxOQ="; + rev = "d18f83f8bed0be99796c4eacafe9b295ab2ee144"; + hash = "sha256-FbyIgMEheIMAvllWtizuhj39G60IYX6YPY0BIz9O2/4="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-html"; }; @@ -1287,12 +1287,12 @@ }; hyprlang = buildGrammar { language = "hyprlang"; - version = "0.0.0+rev=6858695"; + version = "0.0.0+rev=d719158"; src = fetchFromGitHub { owner = "luckasRanarison"; repo = "tree-sitter-hyprlang"; - rev = "6858695eba0e63b9e0fceef081d291eb352abce8"; - hash = "sha256-5csAj7k03QEEfkZE/EBmGjqUHPlFss3EWvExT4kaiQg="; + rev = "d719158abe537b1916daaea6fa03287089f0b601"; + hash = "sha256-5iflQ4FDEvVRuaytPl08Q9CYXm2dfZ49qJyvcsOrzuI="; }; meta.homepage = "https://github.com/luckasRanarison/tree-sitter-hyprlang"; }; @@ -1364,34 +1364,34 @@ }; janet_simple = buildGrammar { language = "janet_simple"; - version = "0.0.0+rev=b4aa56f"; + version = "0.0.0+rev=ca4785b"; src = fetchFromGitHub { owner = "sogaiu"; repo = "tree-sitter-janet-simple"; - rev = "b4aa56fd0a2ea2708fc93062683ae5eaa4e973e6"; - hash = "sha256-2Yo1ZGNZbe6TtfaSIykkG10L58Z6lk5hMr30K5zGuYI="; + rev = "ca4785b47a4ff15653f0408a49c764dec533e0d3"; + hash = "sha256-pRB5G4lR0t2E9MQN/a2AC8OQppwD6gZ1AfCNPon6TIE="; }; meta.homepage = "https://github.com/sogaiu/tree-sitter-janet-simple"; }; java = buildGrammar { language = "java"; - version = "0.0.0+rev=94703d5"; + version = "0.0.0+rev=677da92"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-java"; - rev = "94703d5a6bed02b98e438d7cad1136c01a60ba2c"; - hash = "sha256-OvEO1BLZLjP3jt4gar18kiXderksFKO0WFXDQqGLRIY="; + rev = "677da92875756e31b3a42505d822cc8be7c5ab5e"; + hash = "sha256-6eJI+6bMdMb/9q9rXFF66JeuC8TaRKKzAnkfMZ8tojU="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-java"; }; javascript = buildGrammar { language = "javascript"; - version = "0.0.0+rev=108b2d4"; + version = "0.0.0+rev=3f1c835"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-javascript"; - rev = "108b2d4d17a04356a340aea809e4dd5b801eb40d"; - hash = "sha256-0x6DbmRTlxUP4vbWVsLoj+k1YOk2Dr+LAPClFsWi7r8="; + rev = "3f1c835d05165050834da0e3cbc23a75e94aaa64"; + hash = "sha256-+lC8zuuNlMIiEDqtuMdJwKXqG9udGOREq0ufasSbIJY="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-javascript"; }; @@ -1408,23 +1408,23 @@ }; jsdoc = buildGrammar { language = "jsdoc"; - version = "0.0.0+rev=b253abf"; + version = "0.0.0+rev=a417db5"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-jsdoc"; - rev = "b253abf68a73217b7a52c0ec254f4b6a7bb86665"; - hash = "sha256-Azzb2zBjAfwbEmAEO1YqhpaxtzbXmRjfIzRla2Hx+24="; + rev = "a417db5dbdd869fccb6a8b75ec04459e1d4ccd2c"; + hash = "sha256-MMLgza5H9NWYn9jtOumwg3cz3hqb8GQGFc/yRSvUIVI="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-jsdoc"; }; json = buildGrammar { language = "json"; - version = "0.0.0+rev=4d770d3"; + version = "0.0.0+rev=54ccd94"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-json"; - rev = "4d770d31f732d50d3ec373865822fbe659e47c75"; - hash = "sha256-hmcwRbTn0xPrV1OufXXq6VNhCopa1NQJhDsY3VSPovw="; + rev = "54ccd9485e0122a5e9faf5d8aaed7294c308e894"; + hash = "sha256-tltnBQNEFZeN0jIxG0eHofyMLR0CTrQos1fh02Xexas="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-json"; }; @@ -1507,12 +1507,12 @@ }; kotlin = buildGrammar { language = "kotlin"; - version = "0.0.0+rev=0662afb"; + version = "0.0.0+rev=c4ddea3"; src = fetchFromGitHub { owner = "fwcd"; repo = "tree-sitter-kotlin"; - rev = "0662afbd2ce19b17c603acf67ae707b4d69ab8f4"; - hash = "sha256-r3emNyglirgxb1ktR46EgsECv6ueHUpo6wI2ULyUBtU="; + rev = "c4ddea359a7ff4d92360b2efcd6cfce5dc25afe6"; + hash = "sha256-7REd272fpCP/ggzg7wLf5DS6QX9SIO9YGPdvj2c2w58="; }; meta.homepage = "https://github.com/fwcd/tree-sitter-kotlin"; }; @@ -1797,12 +1797,12 @@ }; nginx = buildGrammar { language = "nginx"; - version = "0.0.0+rev=281d184"; + version = "0.0.0+rev=989da76"; src = fetchFromGitHub { owner = "opa-oz"; repo = "tree-sitter-nginx"; - rev = "281d184b8240b2b22670b8907b57b6d6842db6f3"; - hash = "sha256-OsUCCtkaCwiKWKBduk9Ktc65LP1udKcKRmU4TAy8ayE="; + rev = "989da760be05a3334af3ec88705cbf57e6a9c41d"; + hash = "sha256-tIbwsh7cnpm1jkIKaXQ7NI/LXWzEOsZyNLfe/qTNkkM="; }; meta.homepage = "https://github.com/opa-oz/tree-sitter-nginx"; }; @@ -2009,35 +2009,35 @@ }; perl = buildGrammar { language = "perl"; - version = "0.0.0+rev=7120632"; + version = "0.0.0+rev=6f280c5"; src = fetchFromGitHub { owner = "tree-sitter-perl"; repo = "tree-sitter-perl"; - rev = "71206326a8bcbdc2032f852bab8698e315bf5910"; - hash = "sha256-EySvg8EcCrRS7QfiainRgsCYg8Kvn5DROLxrnyD3rkU="; + rev = "6f280c52662dc254eb7a5abc0889f7a9e1154ffd"; + hash = "sha256-wyIUdf0v/acVptAe3Z3tL9QvbdZYoxpeaS1a7oygyiU="; }; meta.homepage = "https://github.com/tree-sitter-perl/tree-sitter-perl"; }; php = buildGrammar { language = "php"; - version = "0.0.0+rev=43aad2b"; + version = "0.0.0+rev=5021edd"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-php"; - rev = "43aad2b9a98aa8e603ea0cf5bb630728a5591ad8"; - hash = "sha256-+CnUnrNRaD+CejyYjqelMYA1K3GN/WPeZBJoP2y5cmI="; + rev = "5021edde6d0ea75aedc313e75cca2ac5aa064d41"; + hash = "sha256-DeqHoBlx9UCq7e06W6MnAVtoG7h7qrT1PNGsWTRN2f0="; }; location = "php"; meta.homepage = "https://github.com/tree-sitter/tree-sitter-php"; }; php_only = buildGrammar { language = "php_only"; - version = "0.0.0+rev=43aad2b"; + version = "0.0.0+rev=5021edd"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-php"; - rev = "43aad2b9a98aa8e603ea0cf5bb630728a5591ad8"; - hash = "sha256-+CnUnrNRaD+CejyYjqelMYA1K3GN/WPeZBJoP2y5cmI="; + rev = "5021edde6d0ea75aedc313e75cca2ac5aa064d41"; + hash = "sha256-DeqHoBlx9UCq7e06W6MnAVtoG7h7qrT1PNGsWTRN2f0="; }; location = "php_only"; meta.homepage = "https://github.com/tree-sitter/tree-sitter-php"; @@ -2132,12 +2132,12 @@ }; prisma = buildGrammar { language = "prisma"; - version = "0.0.0+rev=eca2596"; + version = "0.0.0+rev=73f39a6"; src = fetchFromGitHub { owner = "victorhqc"; repo = "tree-sitter-prisma"; - rev = "eca2596a355b1a9952b4f80f8f9caed300a272b5"; - hash = "sha256-MOqkM7DCQl1L8Jn9nyw89EoAr0ez4+d39HeKy2cb66c="; + rev = "73f39a6d5401cfdcd143951e499336cf5ab2ffaa"; + hash = "sha256-0wHh+Gf2wer/35NdEWOCQFNdRH/wVWnRx9HnlX7vZho="; }; meta.homepage = "https://github.com/victorhqc/tree-sitter-prisma"; }; @@ -2267,12 +2267,12 @@ }; python = buildGrammar { language = "python"; - version = "0.0.0+rev=409b5d6"; + version = "0.0.0+rev=44c2f7a"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-python"; - rev = "409b5d671eb0ea4972eeacaaca24bbec1acf79b1"; - hash = "sha256-IIAL2qteFPBCPmDK1N2EdDgpI4CwfMuuVL8t5tYueLU="; + rev = "44c2f7aebce0efac5867cdc5f2ea03c1d43a0305"; + hash = "sha256-B/c4QW3LIMQPmiRyvQe7SrQNUoIqW8U9FEnP54+XT/4="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-python"; }; @@ -2311,12 +2311,12 @@ }; query = buildGrammar { language = "query"; - version = "0.0.0+rev=a6674e2"; + version = "0.0.0+rev=5c2d027"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "tree-sitter-query"; - rev = "a6674e279b14958625d7a530cabe06119c7a1532"; - hash = "sha256-xtr2IVI+3h/u9f84ye7szHR/U2E8Bm5NN7vhqaCkiyI="; + rev = "5c2d02747250bc326bc33687b3319b7db8554e24"; + hash = "sha256-bZ8bIrr3vclu7AklGyVIxkR3TF9JDrGJui6i71swqhM="; }; meta.homepage = "https://github.com/nvim-treesitter/tree-sitter-query"; }; @@ -2399,12 +2399,12 @@ }; regex = buildGrammar { language = "regex"; - version = "0.0.0+rev=d329907"; + version = "0.0.0+rev=b638d29"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-regex"; - rev = "d329907611abe46d26ab5908e5922e7400212cb9"; - hash = "sha256-XNoklzboR0NzFu2Ke7HT6TitROFhEM6S993INA1atfM="; + rev = "b638d29335ef41215b86732dd51be34c701ef683"; + hash = "sha256-KHPwvjqvgqLKGL/OeotF1djSSSrAsb2H3CNUmgiva18="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-regex"; }; @@ -2498,12 +2498,12 @@ }; rst = buildGrammar { language = "rst"; - version = "0.0.0+rev=5120f6e"; + version = "0.0.0+rev=dd5971e"; src = fetchFromGitHub { owner = "stsewd"; repo = "tree-sitter-rst"; - rev = "5120f6e59284cb8b85b450bd2db0bd352635ba9f"; - hash = "sha256-PI1C0W8fiuIQ2fgHXDelkCa0ng1a32x/9hrA33KoefM="; + rev = "dd5971ef7759583aadd5aa5e3a3a0905eb5734d5"; + hash = "sha256-gW/d49PsRm/FgTS4khJ681GDjf1aAgTSXvUv/8bP0ek="; }; meta.homepage = "https://github.com/stsewd/tree-sitter-rst"; }; @@ -2531,12 +2531,12 @@ }; rust = buildGrammar { language = "rust"; - version = "0.0.0+rev=1f63b33"; + version = "0.0.0+rev=2eaf126"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-rust"; - rev = "1f63b33efee17e833e0ea29266dd3d713e27e321"; - hash = "sha256-HV7zMwO3ZMaHqX5cV43iwuC+QM7ecApZ2U/hbXuM34c="; + rev = "2eaf126458a4d6a69401089b6ba78c5e5d6c1ced"; + hash = "sha256-u3mJghmVHYPjow1QWRoT/Ip7DZwli4EzmioZQOzqTjs="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-rust"; }; @@ -2553,12 +2553,12 @@ }; scfg = buildGrammar { language = "scfg"; - version = "0.0.0+rev=a551280"; + version = "0.0.0+rev=2f3709e"; src = fetchFromGitHub { owner = "rockorager"; repo = "tree-sitter-scfg"; - rev = "a5512800ea0220da4abbae61b8aea8423d1549aa"; - hash = "sha256-Je6taNzniyd1c+2NRCF7TOvnpeW4qhYYhdAEcgpDOAA="; + rev = "2f3709e7656fa2c443f92041c91a9f843f8cd625"; + hash = "sha256-2/n+pSR6Ojahm8iBnpNsQscrXQqzZflKBA42gX29u50="; }; generate = true; meta.homepage = "https://github.com/rockorager/tree-sitter-scfg"; @@ -2608,6 +2608,17 @@ }; meta.homepage = "https://github.com/theHamsta/tree-sitter-slang"; }; + slim = buildGrammar { + language = "slim"; + version = "0.0.0+rev=a0f08e8"; + src = fetchFromGitHub { + owner = "theoo"; + repo = "tree-sitter-slim"; + rev = "a0f08e85b787248219ea645423c5916c8d620ef6"; + hash = "sha256-b+V56Csa+byGvTieN+cAvoVy8UpFzS8/SSdYeW3cjts="; + }; + meta.homepage = "https://github.com/theoo/tree-sitter-slim"; + }; slint = buildGrammar { language = "slint"; version = "0.0.0+rev=f11da7e"; @@ -2654,12 +2665,12 @@ }; solidity = buildGrammar { language = "solidity"; - version = "0.0.0+rev=f7f5251"; + version = "0.0.0+rev=7270875"; src = fetchFromGitHub { owner = "JoranHonig"; repo = "tree-sitter-solidity"; - rev = "f7f5251a3f5b1d04f0799b3571b12918af177fc8"; - hash = "sha256-Tt8lXaHrRFbbATUoWK+Y9FZohY1IeDTCXaaom4yZYb4="; + rev = "727087514eff57d92e273a24303142308bce3381"; + hash = "sha256-k5YExvQmDXk+k9afiq6VizFdsvSH9u8Y1u3xB9i96mw="; }; meta.homepage = "https://github.com/JoranHonig/tree-sitter-solidity"; }; @@ -2689,12 +2700,12 @@ }; sourcepawn = buildGrammar { language = "sourcepawn"; - version = "0.0.0+rev=6b9bf9c"; + version = "0.0.0+rev=f2af8d0"; src = fetchFromGitHub { owner = "nilshelmig"; repo = "tree-sitter-sourcepawn"; - rev = "6b9bf9cbab91443380d2ca8a2f6c491cc7fac5bf"; - hash = "sha256-2DjGCZ701c2rMxQZM4YF61rZokZUov4ECb0gwAmyuVk="; + rev = "f2af8d0dc14c6790130cceb2a20027eb41a8297c"; + hash = "sha256-u8/wM2Dj+uO3g24MsGZfH9zkABCEaWWFI8EX3fxuljk="; }; meta.homepage = "https://github.com/nilshelmig/tree-sitter-sourcepawn"; }; @@ -2788,12 +2799,12 @@ }; superhtml = buildGrammar { language = "superhtml"; - version = "0.0.0+rev=1fda813"; + version = "0.0.0+rev=e6eba40"; src = fetchFromGitHub { owner = "kristoff-it"; repo = "superhtml"; - rev = "1fda813bd9dc108e962e018e6a327434767ad616"; - hash = "sha256-+32toY540h92Xk5xoYvZaMYNDxXWI4pRbkrBnU4xRjM="; + rev = "e6eba40bf54dd94d842154be0389c53a37be8dc8"; + hash = "sha256-v1K4yuAeFxu8K/Wt2gv2Onwfa4AB4Wt1p76d2koLAYw="; }; location = "tree-sitter-superhtml"; meta.homepage = "https://github.com/kristoff-it/superhtml"; @@ -2867,12 +2878,12 @@ }; t32 = buildGrammar { language = "t32"; - version = "0.0.0+rev=ad23ed0"; + version = "0.0.0+rev=e5a12f7"; src = fetchFromGitLab { owner = "xasc"; repo = "tree-sitter-t32"; - rev = "ad23ed0325658adbb1dfb397d4dfbea8872585c6"; - hash = "sha256-dcz2b0NiaJEQUN6kOk+FVfxqD3wSzolH+NXkPpzrQj4="; + rev = "e5a12f798f056049642aa03fbb83786e3a5b95d4"; + hash = "sha256-oOykmtAFPQiqK02nia8/m8pg2fi5yKt7dzZOGr9f3dQ="; }; meta.homepage = "https://gitlab.com/xasc/tree-sitter-t32.git"; }; @@ -2923,12 +2934,12 @@ }; templ = buildGrammar { language = "templ"; - version = "0.0.0+rev=60310af"; + version = "0.0.0+rev=a9178bf"; src = fetchFromGitHub { owner = "vrischmann"; repo = "tree-sitter-templ"; - rev = "60310af0d788a0160d719d4aff8f146b6e6c55bd"; - hash = "sha256-M0+Yw2Ld9qT9Ag9OaMpmls8LO4+IK0xtAZ8X5oZ2c78="; + rev = "a9178bfc9cc8040c08f39b47bae5400a2bf06e50"; + hash = "sha256-QMOPxbNzLcUfhEuD635M/n3WrADryjZVKXlNMF6QezQ="; }; meta.homepage = "https://github.com/vrischmann/tree-sitter-templ"; }; @@ -3035,12 +3046,12 @@ }; tsx = buildGrammar { language = "tsx"; - version = "0.0.0+rev=8e13e1d"; + version = "0.0.0+rev=410947e"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-typescript"; - rev = "8e13e1db35b941fc57f2bd2dd4628180448c17d5"; - hash = "sha256-Z68ERsfHxDubDJb7nQKSH0YoBmIReUGXNF0LJAQTXEs="; + rev = "410947e9d2ca8e032cd2419bf1241406c7e6f9bb"; + hash = "sha256-iRIRIighYwVB5Pze5nhdZ9gFiELiqVBYrSyKLzaXI/8="; }; location = "tsx"; meta.homepage = "https://github.com/tree-sitter/tree-sitter-typescript"; @@ -3069,12 +3080,12 @@ }; typescript = buildGrammar { language = "typescript"; - version = "0.0.0+rev=8e13e1d"; + version = "0.0.0+rev=410947e"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-typescript"; - rev = "8e13e1db35b941fc57f2bd2dd4628180448c17d5"; - hash = "sha256-Z68ERsfHxDubDJb7nQKSH0YoBmIReUGXNF0LJAQTXEs="; + rev = "410947e9d2ca8e032cd2419bf1241406c7e6f9bb"; + hash = "sha256-iRIRIighYwVB5Pze5nhdZ9gFiELiqVBYrSyKLzaXI/8="; }; location = "typescript"; meta.homepage = "https://github.com/tree-sitter/tree-sitter-typescript"; @@ -3170,12 +3181,12 @@ }; v = buildGrammar { language = "v"; - version = "0.0.0+rev=5351039"; + version = "0.0.0+rev=0461bf8"; src = fetchFromGitHub { owner = "vlang"; repo = "v-analyzer"; - rev = "535103910159887a41d019635c1cdbec910d1a31"; - hash = "sha256-4VxvK9KzJlN0AsXz0XL5FIs3H65vPgyj/YqTc138zC4="; + rev = "0461bf8addccb4df566827f1601f415d07b1ffbc"; + hash = "sha256-flnEty9x1wDDtSgQk9cRXYKfWFjvqxRXsLl5ev3rGXk="; }; location = "tree_sitter_v"; meta.homepage = "https://github.com/vlang/v-analyzer"; @@ -3215,12 +3226,12 @@ }; vhdl = buildGrammar { language = "vhdl"; - version = "0.0.0+rev=63d0360"; + version = "0.0.0+rev=da8ea8a"; src = fetchFromGitHub { owner = "jpt13653903"; repo = "tree-sitter-vhdl"; - rev = "63d0360d42c43b4902b8470c7ddcf323432e2dde"; - hash = "sha256-D85VFM82lU4GDpIWZmY+j6134DHp0pGbqg8Haj2mgiw="; + rev = "da8ea8afa7899a99e43a7d61afef9f77b7a675eb"; + hash = "sha256-yLoIKO1ObSe7rQOBjd1cF0U8/x622tYWwasiCHx+aYE="; }; meta.homepage = "https://github.com/jpt13653903/tree-sitter-vhdl"; }; @@ -3348,23 +3359,23 @@ }; xresources = buildGrammar { language = "xresources"; - version = "0.0.0+rev=983f13a"; + version = "0.0.0+rev=d0f9dc7"; src = fetchFromGitHub { owner = "ValdezFOmar"; repo = "tree-sitter-xresources"; - rev = "983f13acef542aef431a845fef084ddda8d9d666"; - hash = "sha256-s/wuzVzF8TzySZ0OFNCFpbvjminQzbb3icZc+DnChjc="; + rev = "d0f9dc7cec4dc15fc6f9d556bb4e9dd5050328a6"; + hash = "sha256-3TBpNdIsmOutazBlMKAsQaq7RPu4vUeZMFuZ2/2HDKo="; }; meta.homepage = "https://github.com/ValdezFOmar/tree-sitter-xresources"; }; yaml = buildGrammar { language = "yaml"; - version = "0.0.0+rev=b733d3f"; + version = "0.0.0+rev=1805917"; src = fetchFromGitHub { owner = "tree-sitter-grammars"; repo = "tree-sitter-yaml"; - rev = "b733d3f5f5005890f324333dd57e1f0badec5c87"; - hash = "sha256-23/zcjnQUQt32N2EdQMzWM9srkXfQxlBvOo7FWH6rnw="; + rev = "1805917414a9a8ba2473717fd69447277a175fae"; + hash = "sha256-lcdlvzDhl0mDCe4olMoEynxFFLfn3w4p24C1k/7DItA="; }; meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-yaml"; }; @@ -3414,24 +3425,24 @@ }; ziggy = buildGrammar { language = "ziggy"; - version = "0.0.0+rev=fe73bee"; + version = "0.0.0+rev=3518133"; src = fetchFromGitHub { owner = "kristoff-it"; repo = "ziggy"; - rev = "fe73beef9f52f04048d8b19016fc4fbc66b4596f"; - hash = "sha256-GSiVrl3GMp5Y8DF/gxdl1ToUoN5s3RQxNKxmab5tSHs="; + rev = "3518133e9ebea7c372eff4def368eda8488fad18"; + hash = "sha256-U3MUFYsWiM5RK3lFXyo3VaTlxqkh3b0HzQsRiegIHU8="; }; location = "tree-sitter-ziggy"; meta.homepage = "https://github.com/kristoff-it/ziggy"; }; ziggy_schema = buildGrammar { language = "ziggy_schema"; - version = "0.0.0+rev=fe73bee"; + version = "0.0.0+rev=3518133"; src = fetchFromGitHub { owner = "kristoff-it"; repo = "ziggy"; - rev = "fe73beef9f52f04048d8b19016fc4fbc66b4596f"; - hash = "sha256-GSiVrl3GMp5Y8DF/gxdl1ToUoN5s3RQxNKxmab5tSHs="; + rev = "3518133e9ebea7c372eff4def368eda8488fad18"; + hash = "sha256-U3MUFYsWiM5RK3lFXyo3VaTlxqkh3b0HzQsRiegIHU8="; }; location = "tree-sitter-ziggy-schema"; meta.homepage = "https://github.com/kristoff-it/ziggy"; diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index 1b682954f6c1e..0f223263cdd77 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -11,6 +11,7 @@ fetchurl, neovimUtils, replaceVars, + symlinkJoin, # Language dependencies fetchYarnDeps, mkYarnModules, @@ -125,6 +126,36 @@ let luaPackages = neovim-unwrapped.lua.pkgs; in { + corePlugins = symlinkJoin { + name = "core-vim-plugins"; + paths = with self; [ + # plugin managers + lazy-nvim + mini-deps + packer-nvim + vim-plug + + # core dependencies + plenary-nvim + + # popular plugins + mini-nvim + nvim-cmp + nvim-lspconfig + nvim-treesitter + vim-airline + vim-fugitive + vim-surround + ]; + + meta = { + description = "Collection of popular vim plugins (for internal testing purposes)"; + }; + }; + + ####################### + # Regular overrides + aerial-nvim = super.aerial-nvim.overrideAttrs { # optional dependencies nvimSkipModule = [ @@ -315,6 +346,8 @@ in ]; }; + clangd_extensions-nvim = callPackage ./non-generated/clangd_extensions-nvim { }; + clang_complete = super.clang_complete.overrideAttrs { # In addition to the arguments you pass to your compiler, you also need to # specify the path of the C++ std header (if you are using C++). @@ -366,9 +399,7 @@ in ]; }; - cmp-async-path = super.cmp-async-path.overrideAttrs { - checkInputs = [ self.nvim-cmp ]; - }; + cmp-async-path = callPackage ./non-generated/cmp-async-path { }; cmp-beancount = super.cmp-beancount.overrideAttrs { checkInputs = [ self.nvim-cmp ]; @@ -760,6 +791,7 @@ in # Optional integrations fzf-lua telescope-nvim + snacks-nvim ]; dependencies = with self; [ copilot-lua @@ -1198,6 +1230,8 @@ in configurePhase = "cd plugins/nvim"; }; + gitlab-vim = callPackage ./non-generated/gitlab-vim { }; + gitlinker-nvim = super.gitlinker-nvim.overrideAttrs { dependencies = [ self.plenary-nvim ]; }; @@ -1267,6 +1301,8 @@ in ]; }; + hare-vim = callPackage ./non-generated/hare-vim { }; + harpoon = super.harpoon.overrideAttrs { dependencies = [ self.plenary-nvim ]; }; @@ -1584,6 +1620,8 @@ in luaAttr = luaPackages.lsp-progress-nvim; }; + lsp_lines-nvim = callPackage ./non-generated/lsp_lines-nvim { }; + lspecho-nvim = super.lspecho-nvim.overrideAttrs { meta.license = lib.licenses.mit; }; @@ -1615,6 +1653,10 @@ in ]; }; + LuaSnip-snippets-nvim = super.LuaSnip-snippets-nvim.overrideAttrs { + checkInputs = [ self.luasnip ]; + }; + lz-n = neovimUtils.buildNeovimPlugin { luaAttr = luaPackages.lz-n; }; @@ -2255,7 +2297,7 @@ in nvim-java = super.nvim-java.overrideAttrs { dependencies = with self; [ - lua-async-await + lua-async mason-nvim nui-nvim nvim-dap @@ -2292,6 +2334,8 @@ in dependencies = [ self.nvim-java-core ]; }; + nvim-julia-autotest = callPackage ./non-generated/nvim-julia-autotest { }; + nvim-lsp-file-operations = super.nvim-lsp-file-operations.overrideAttrs { dependencies = [ self.plenary-nvim ]; }; @@ -2716,14 +2760,7 @@ in quicker-nvim = super.quicker-nvim.overrideAttrs { }; - rainbow-delimiters-nvim = super.rainbow-delimiters-nvim.overrideAttrs { - nvimSkipModule = [ - # rainbow-delimiters.types.lua - "rainbow-delimiters.types" - # Test that requires an unpackaged dependency - "rainbow-delimiters._test.highlight" - ]; - }; + rainbow-delimiters-nvim = callPackage ./non-generated/rainbow-delimiters-nvim { }; range-highlight-nvim = super.range-highlight-nvim.overrideAttrs { dependencies = [ self.cmd-parser-nvim ]; @@ -2763,6 +2800,10 @@ in dependencies = [ self.plenary-nvim ]; }; + repolink-nvim = super.repolink-nvim.overrideAttrs { + dependencies = [ self.plenary-nvim ]; + }; + # needs "http" and "json" treesitter grammars too rest-nvim = super.rest-nvim.overrideAttrs { dependencies = with self; [ @@ -3358,6 +3399,15 @@ in }; }; + vimade = super.vimade.overrideAttrs { + checkInputs = with self; [ + # Optional providers + hlchunk-nvim + mini-nvim + snacks-nvim + ]; + }; + vim-addon-actions = super.vim-addon-actions.overrideAttrs { dependencies = with self; [ vim-addon-mw-utils @@ -3624,6 +3674,8 @@ in dependencies = [ self.vim-repeat ]; }; + vim-stationeers-ic10-syntax = callPackage ./non-generated/vim-stationeers-ic10-syntax { }; + vim-stylish-haskell = super.vim-stylish-haskell.overrideAttrs (old: { postPatch = old.postPatch or "" diff --git a/pkgs/applications/editors/vim/plugins/update.py b/pkgs/applications/editors/vim/plugins/update.py index 37c0adb6bb290..1d8f332acba3f 100755 --- a/pkgs/applications/editors/vim/plugins/update.py +++ b/pkgs/applications/editors/vim/plugins/update.py @@ -82,7 +82,7 @@ def _isNeovimPlugin(plug: pluginupdate.Plugin) -> bool: f.write( textwrap.dedent( """ - { lib, buildVimPlugin, buildNeovimPlugin, fetchFromGitHub, fetchgit }: + { lib, buildVimPlugin, buildNeovimPlugin, fetchFromGitHub }: final: prev: { diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index d3e516ef24023..4f63eb7fae3ea 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -15,6 +15,7 @@ https://github.com/martinda/Jenkinsfile-vim-syntax/,, https://github.com/vigoux/LanguageTool.nvim/,, https://github.com/LazyVim/LazyVim/,, https://github.com/Yggdroot/LeaderF/,, +https://github.com/molleweide/LuaSnip-snippets.nvim/,HEAD, https://github.com/Valloric/MatchTagAlways/,, https://github.com/numToStr/Navigator.nvim/,, https://github.com/overcache/NeoSolarized/,, @@ -137,7 +138,6 @@ https://github.com/declancm/cinnamon.nvim/,HEAD, https://github.com/projekt0n/circles.nvim/,, https://github.com/zootedb0t/citruszest.nvim/,, https://github.com/xavierd/clang_complete/,, -https://git.sr.ht/~p00f/clangd_extensions.nvim,HEAD, https://github.com/rhysd/clever-f.vim/,, https://github.com/bbchung/clighter8/,, https://github.com/ekickx/clipboard-image.nvim/,, @@ -146,7 +146,6 @@ https://github.com/asheq/close-buffers.vim/,HEAD, https://github.com/Civitasv/cmake-tools.nvim/,, https://github.com/winston0410/cmd-parser.nvim/,, https://github.com/tzachar/cmp-ai/,HEAD, -https://codeberg.org/FelipeLema/cmp-async-path/,, https://github.com/crispgm/cmp-beancount/,HEAD, https://github.com/hrsh7th/cmp-buffer/,, https://github.com/hrsh7th/cmp-calc/,, @@ -385,7 +384,6 @@ https://github.com/mikesmithgh/git-prompt-string-lualine.nvim/,HEAD, https://github.com/ThePrimeagen/git-worktree.nvim/,, https://github.com/wintermute-cell/gitignore.nvim/,HEAD, https://github.com/vim-scripts/gitignore.vim/,, -https://gitlab.com/gitlab-org/editor-extensions/gitlab.vim,HEAD, https://github.com/ruifm/gitlinker.nvim/,, https://github.com/lewis6991/gitsigns.nvim/,, https://github.com/gregsexton/gitv/,, @@ -418,7 +416,6 @@ https://github.com/junegunn/gv.vim/,, https://github.com/chrishrb/gx.nvim/,HEAD, https://github.com/TheSnakeWitcher/hardhat.nvim/,HEAD, https://github.com/m4xshen/hardtime.nvim/,HEAD, -https://git.sr.ht/~sircmpwn/hare.vim,HEAD, https://github.com/ThePrimeagen/harpoon/,master, https://github.com/ThePrimeagen/harpoon/,harpoon2,harpoon2 https://github.com/kiyoon/haskell-scope-highlighting.nvim/,HEAD, @@ -533,7 +530,6 @@ https://github.com/ahmedkhalf/lsp-rooter.nvim/,, https://github.com/nvim-lua/lsp-status.nvim/,, https://github.com/VonHeikemen/lsp-zero.nvim/,v3.x, https://github.com/nvim-lua/lsp_extensions.nvim/,, -https://git.sr.ht/~whynothugo/lsp_lines.nvim,, https://github.com/ray-x/lsp_signature.nvim/,, https://github.com/lspcontainers/lspcontainers.nvim/,, https://github.com/deathbeam/lspecho.nvim/,HEAD, @@ -776,7 +772,6 @@ https://github.com/nvim-java/nvim-java-core/,HEAD, https://github.com/nvim-java/nvim-java-dap/,HEAD, https://github.com/mfussenegger/nvim-jdtls/,, https://github.com/gennaro-tedesco/nvim-jqx/,, -https://gitlab.com/usmcamp0811/nvim-julia-autotest,HEAD, https://github.com/ethanholz/nvim-lastplace/,HEAD, https://github.com/kosayoda/nvim-lightbulb/,, https://github.com/josa42/nvim-lightline-lsp/,, @@ -923,7 +918,6 @@ https://github.com/stefandtw/quickfix-reflector.vim/,, https://github.com/dannyob/quickfixstatus/,, https://github.com/jbyuki/quickmath.nvim/,HEAD, https://github.com/luochen1990/rainbow/,, -https://gitlab.com/HiPhish/rainbow-delimiters.nvim,HEAD, https://github.com/kien/rainbow_parentheses.vim/,, https://github.com/vim-scripts/random.vim/,, https://github.com/winston0410/range-highlight.nvim/,, @@ -938,6 +932,7 @@ https://github.com/amitds1997/remote-nvim.nvim/,HEAD, https://github.com/filipdutescu/renamer.nvim/,, https://github.com/MeanderingProgrammer/render-markdown.nvim/,, https://github.com/gabrielpoca/replacer.nvim/,HEAD, +https://github.com/9seconds/repolink.nvim/,HEAD, https://github.com/stevearc/resession.nvim/,HEAD, https://github.com/rest-nvim/rest.nvim/,, https://github.com/vim-scripts/restore_view.vim/,HEAD,restore-view-vim @@ -1485,7 +1480,6 @@ https://github.com/kbenzie/vim-spirv/,, https://github.com/yorokobi/vim-splunk/,HEAD, https://github.com/mhinz/vim-startify/,, https://github.com/dstein64/vim-startuptime/,, -https://gitlab.com/LittleMorph/vim-ic10,HEAD,vim-stationeers-ic10-syntax https://github.com/axelf4/vim-strip-trailing-whitespace/,, https://github.com/nbouscal/vim-stylish-haskell/,, https://github.com/alx741/vim-stylishask/,, diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 3a4a86852d42e..17681f58ce00a 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -2384,6 +2384,22 @@ let }; }; + hirse.vscode-ungit = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "vscode-ungit"; + publisher = "hirse"; + version = "2.5.2"; + hash = "sha256-0CFYL6rBecB8rNnk4IAtg03ZPdSJ9qxwnVdhdQedxsQ="; + }; + meta = { + description = "Ungit in Visual Studio Code."; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=Hirse.vscode-ungit"; + homepage = "https://github.com/hirse/vscode-ungit"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.therobot2105 ]; + }; + }; + hiukky.flate = buildVscodeMarketplaceExtension { mktplcRef = { name = "flate"; diff --git a/pkgs/applications/emulators/wine/sources.nix b/pkgs/applications/emulators/wine/sources.nix index c3606b9ef831e..4dca847881698 100644 --- a/pkgs/applications/emulators/wine/sources.nix +++ b/pkgs/applications/emulators/wine/sources.nix @@ -24,9 +24,9 @@ let fetchurl = args@{url, hash, ...}: in rec { stable = fetchurl rec { - version = "9.0"; - url = "https://dl.winehq.org/wine/source/9.0/wine-${version}.tar.xz"; - hash = "sha256-fP0JClOV9bdtlbtd76yKMSyN5MBwwRY7i1jaODMMpu4="; + version = "10.0"; + url = "https://dl.winehq.org/wine/source/10.0/wine-${version}.tar.xz"; + hash = "sha256-xeCz9ffvr7MOnNTZxiS4XFgxcdM1SdkzzTQC80GsNgE="; ## see http://wiki.winehq.org/Gecko gecko32 = fetchurl rec { @@ -69,9 +69,9 @@ in rec { unstable = fetchurl rec { # NOTE: Don't forget to change the hash for staging as well. - version = "10.0-rc5"; + version = "10.0"; url = "https://dl.winehq.org/wine/source/10.0/wine-${version}.tar.xz"; - hash = "sha256-7IlPe1wH0tTCHVNNf0OUZnuO8ngH4w4hKJhpp02XbtI="; + hash = "sha256-xeCz9ffvr7MOnNTZxiS4XFgxcdM1SdkzzTQC80GsNgE="; inherit (stable) patches; ## see http://wiki.winehq.org/Gecko @@ -117,7 +117,7 @@ in rec { staging = fetchFromGitLab rec { # https://gitlab.winehq.org/wine/wine-staging inherit (unstable) version; - hash = "sha256-no+yYF/xhy0kRfBqPer0UbpJNEh9LtKCmyVvhQB58K4="; + hash = "sha256-0mzKoaNaJ6ZDYQtJFU383W5nNe/FKtpBjeWDpiqkmp4="; domain = "gitlab.winehq.org"; owner = "wine"; repo = "wine-staging"; @@ -126,35 +126,7 @@ in rec { disabledPatchsets = [ ]; }; - wayland = fetchFromGitLab { - # https://gitlab.collabora.com/alf/wine/-/tree/wayland - version = "8.2"; - hash = "sha256-Eb2SFBIeQQ3cVZkUQcwNT5mcYe0ShFxBdMc3BlqkwTo="; - domain = "gitlab.collabora.com"; - owner = "alf"; - repo = "wine"; - rev = "b2547ddf9e08cafce98cf7734d5c4ec926ef3536"; - - inherit (unstable) gecko32 gecko64; - - inherit (unstable) mono; - - updateScript = writeShellScript "update-wine-wayland" '' - ${updateScriptPreamble} - wayland_rev=$(get_source_attr wayland.rev) - - latest_wayland_rev=$(curl -s 'https://gitlab.collabora.com/api/v4/projects/2847/repository/branches/wayland' | jq -r .commit.id) - - if [[ "$wayland_rev" != "$latest_wayland_rev" ]]; then - latest_wayland=$(curl -s 'https://gitlab.collabora.com/alf/wine/-/raw/wayland/VERSION' | cut -f3 -d' ') - wayland_url=$(get_source_attr wayland.url) - set_version_and_hash wayland "$latest_wayland" "$(nix-prefetch-url --unpack "''${wayland_url/$wayland_rev/$latest_wayland_rev}")" - set_source_attr wayland rev "\"$latest_wayland_rev\"" - fi - - do_update - ''; - }; + wayland = pkgs.lib.warnOnInstantiate "building wine with `wineRelease = \"wayland\"` is deprecated. Wine now builds with the wayland driver by default." stable; # added 2025-01-23 winetricks = fetchFromGitHub rec { # https://github.com/Winetricks/winetricks/releases diff --git a/pkgs/applications/graphics/epick/default.nix b/pkgs/applications/graphics/epick/default.nix index a74e1c0018130..91731416199b4 100644 --- a/pkgs/applications/graphics/epick/default.nix +++ b/pkgs/applications/graphics/epick/default.nix @@ -19,11 +19,13 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "vv9k"; repo = pname; - rev = version; - sha256 = "sha256-k0WQu1n1sAHVor58jr060vD5/2rDrt1k5zzJlrK9WrU="; + # Upstream has rewritten tags on multiple occasions. + rev = "14ee92e049780406fffdc1e4a83bf1433775663f"; + sha256 = "sha256-gjqAQrGJ9KFdzn2a3fOgu0VJ9zrX5stsbzriOGJaD/4="; }; - cargoHash = "sha256-OQZPOiMTpoWabxHa3TJG8L3zq8WxMeFttw8xggSXsMA="; + useFetchCargoVendor = true; + cargoHash = "sha256-r/0aNzU8jm2AqiZWq4plxXY/H7qKVC8nEI9BwOUKCdA="; nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ pkg-config diff --git a/pkgs/applications/graphics/tesseract/wrapper.nix b/pkgs/applications/graphics/tesseract/wrapper.nix index 47398b88c80a2..058b8a26db475 100644 --- a/pkgs/applications/graphics/tesseract/wrapper.nix +++ b/pkgs/applications/graphics/tesseract/wrapper.nix @@ -18,8 +18,6 @@ let nativeBuildInputs = [ makeWrapper ]; - phases = [ "buildPhase" "fixupPhase" ]; - buildPhase = '' makeWrapper {$tesseractBase,$out}/bin/tesseract --set-default TESSDATA_PREFIX $out/share/tessdata diff --git a/pkgs/applications/kde/kdevelop/kdev-python.nix b/pkgs/applications/kde/kdevelop/kdev-python.nix index 9c033837b0a81..284732de30372 100644 --- a/pkgs/applications/kde/kdevelop/kdev-python.nix +++ b/pkgs/applications/kde/kdevelop/kdev-python.nix @@ -6,18 +6,14 @@ threadweaver, ktexteditor, kdevelop-unwrapped, - python39, + python3, }: -let - # FIXME: stick with python 3.9 until MR supporting 3.10 is ready: - # https://invent.kde.org/kdevelop/kdev-python/-/merge_requests/16 - python = python39; -in -mkDerivation rec { + +mkDerivation { pname = "kdev-python"; cmakeFlags = [ - "-DPYTHON_EXECUTABLE=${python}/bin/python" + "-DPYTHON_EXECUTABLE=${lib.getExe python3}" ]; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/pagefind/default.nix b/pkgs/applications/misc/pagefind/default.nix index 84164c0b04f0c..f0096de5ae097 100644 --- a/pkgs/applications/misc/pagefind/default.nix +++ b/pkgs/applications/misc/pagefind/default.nix @@ -12,7 +12,7 @@ npmHooks, python3, rustc, - wasm-bindgen-cli, + wasm-bindgen-cli_0_2_92, wasm-pack, }: @@ -20,12 +20,6 @@ let - wasm-bindgen-92 = wasm-bindgen-cli.override { - version = "0.2.92"; - hash = "sha256-1VwY8vQy7soKEgbki4LD+v259751kKxSxmo/gqE6yV0="; - cargoHash = "sha256-aACJ+lYNEU8FFBs158G1/JG8sc6Rq080PeKCMnwdpH0="; - }; - # the lindera-unidic v0.32.2 crate uses [1] an outdated unidic-mecab fork [2] and builds it in pure rust # [1] https://github.com/lindera/lindera/blob/v0.32.2/lindera-unidic/build.rs#L5-L11 # [2] https://github.com/lindera/unidic-mecab @@ -121,7 +115,7 @@ rustPlatform.buildRustPackage rec { nodejs rustc rustc.llvmPackages.lld - wasm-bindgen-92 + wasm-bindgen-cli_0_2_92 wasm-pack httplz ] diff --git a/pkgs/applications/networking/browsers/chromium/info.json b/pkgs/applications/networking/browsers/chromium/info.json index 6948cd5897c77..0ef9d85722825 100644 --- a/pkgs/applications/networking/browsers/chromium/info.json +++ b/pkgs/applications/networking/browsers/chromium/info.json @@ -1,9 +1,9 @@ { "chromium": { - "version": "132.0.6834.110", + "version": "132.0.6834.159", "chromedriver": { - "hash_darwin": "sha256-TEy3go3cMHlv8+XRUWJhPVlLSgk+2DifW1LNStqh+nU=", - "hash_darwin_aarch64": "sha256-gpqA5zYbhrdVoaAH1m6xHmH0k7jiC7sGicqpKhVaytw=" + "hash_darwin": "sha256-t1WACSAqvu8Lp5xJpEpALXfSjF92gPdN0mUHQzz71YA=", + "hash_darwin_aarch64": "sha256-T0fDfWegn9kjhdDtAAK/IAFbKZ0r5VmvO2VQXzuNmSg=" }, "deps": { "depot_tools": { @@ -19,8 +19,8 @@ "DEPS": { "src": { "url": "https://chromium.googlesource.com/chromium/src.git", - "rev": "df453a35f099772fdb954e33551388add2ca3cde", - "hash": "sha256-deLCukHvNv6mUp33hHHFgeKD45SQs517xoRfCfReLAA=", + "rev": "2d77d3fc4452661469b78f115e0aed4d71269739", + "hash": "sha256-LbLIxN13fx6zzU5xzGvkTpw7tKRQBel2PYhflHLbWE8=", "recompress": true }, "src/third_party/clang-format/script": { @@ -760,13 +760,13 @@ }, "src/v8": { "url": "https://chromium.googlesource.com/v8/v8.git", - "rev": "625e932f21c984db3f9fba8b56b9afa4e977994c", - "hash": "sha256-19uEppABiuh+zHjgwAj/BPee/ClB/FKfzHxLKrdNhOE=" + "rev": "210ec27ca748c70580fe374f9811761667312b41", + "hash": "sha256-pfkztEU22T15H2amf+b5bpALQ6Er1YAxZoxbbfb2YU8=" } } }, "ungoogled-chromium": { - "version": "132.0.6834.110", + "version": "132.0.6834.159", "deps": { "depot_tools": { "rev": "41d43a2a2290450aeab946883542f8049b155c87", @@ -777,16 +777,16 @@ "hash": "sha256-zZoD5Bx7wIEP2KJkHef6wHrxU3px+8Vseq29QcK32bg=" }, "ungoogled-patches": { - "rev": "132.0.6834.110-1", - "hash": "sha256-pFuRsGnOXAECat5B0fUi9aw8Wdqbu1EBwyHNCBMoOpw=" + "rev": "132.0.6834.159-1", + "hash": "sha256-sot7YixPnt8ALPR2IIPgR1NtN/Oc14qlzyB3Vny+DAM=" }, "npmHash": "sha256-H1/h3x+Cgp1x94Ze3UPPHxRVpylZDvpMXMOuS+jk2dw=" }, "DEPS": { "src": { "url": "https://chromium.googlesource.com/chromium/src.git", - "rev": "df453a35f099772fdb954e33551388add2ca3cde", - "hash": "sha256-deLCukHvNv6mUp33hHHFgeKD45SQs517xoRfCfReLAA=", + "rev": "2d77d3fc4452661469b78f115e0aed4d71269739", + "hash": "sha256-LbLIxN13fx6zzU5xzGvkTpw7tKRQBel2PYhflHLbWE8=", "recompress": true }, "src/third_party/clang-format/script": { @@ -1526,8 +1526,8 @@ }, "src/v8": { "url": "https://chromium.googlesource.com/v8/v8.git", - "rev": "625e932f21c984db3f9fba8b56b9afa4e977994c", - "hash": "sha256-19uEppABiuh+zHjgwAj/BPee/ClB/FKfzHxLKrdNhOE=" + "rev": "210ec27ca748c70580fe374f9811761667312b41", + "hash": "sha256-pfkztEU22T15H2amf+b5bpALQ6Er1YAxZoxbbfb2YU8=" } } } diff --git a/pkgs/applications/networking/browsers/firefox/packages/firefox-devedition.nix b/pkgs/applications/networking/browsers/firefox/packages/firefox-devedition.nix index e9386bf99c6cb..ae63bc7d9d877 100644 --- a/pkgs/applications/networking/browsers/firefox/packages/firefox-devedition.nix +++ b/pkgs/applications/networking/browsers/firefox/packages/firefox-devedition.nix @@ -9,13 +9,13 @@ buildMozillaMach rec { pname = "firefox-devedition"; - version = "135.0b4"; + version = "135.0b9"; applicationName = "Mozilla Firefox Developer Edition"; requireSigning = false; branding = "browser/branding/aurora"; src = fetchurl { url = "mirror://mozilla/devedition/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "d3ee20d264c4c26308b814f4cc997349a6df32da17b9a29514b0504f7548606f4b6793ccd2e7464babf6588f13bfcc0e0641f9ac8d620f7da7d7e45684fdf775"; + sha512 = "bf09f999b347492b841a26fcbcfb4d37e5f74528a05ffab47572dcaae01cb43e70baf58e83cc5153498a6a6ad2cb69507b628fba840090c91f4dbca62717a435"; }; meta = { diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 364ac42cbf904..ee62b627df0fb 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -27,13 +27,13 @@ "vendorHash": "sha256-jK7JuARpoxq7hvq5+vTtUwcYot0YqlOZdtDwq4IqKvk=" }, "aiven": { - "hash": "sha256-rtqGkVtB69yt98bTb/g2iZtZNtCn7V5Q4uSBDx+/xGQ=", + "hash": "sha256-m2T8MNHBQfAyFDL28v4HE0UJzTKZFH1DY5OlfmCp+kE=", "homepage": "https://registry.terraform.io/providers/aiven/aiven", "owner": "aiven", "repo": "terraform-provider-aiven", - "rev": "v4.31.1", + "rev": "v4.33.0", "spdx": "MIT", - "vendorHash": "sha256-dIQ5WATs8HOjJpLyVPDgT+WZ8GkkSoNsmavxpCj4jmE=" + "vendorHash": "sha256-0WLhjCCOMi6uQJ+yEA+W6KHyZaf5L2P5hTFSdyb1ExU=" }, "akamai": { "hash": "sha256-acGLXJclAfg43AkJRoROReIOjBEnhgSpDRgvO6LumIY=", @@ -153,20 +153,20 @@ "vendorHash": null }, "baiducloud": { - "hash": "sha256-x8h/htGfphrvLNTKcxSnV0lomd/gdBuOn3U1ke6AqzI=", + "hash": "sha256-YcQq0FK76XjF80yOjOMhDp+aRoFOewXObVksDAzQSh8=", "homepage": "https://registry.terraform.io/providers/baidubce/baiducloud", "owner": "baidubce", "repo": "terraform-provider-baiducloud", - "rev": "v1.21.10", + "rev": "v1.21.12", "spdx": "MPL-2.0", "vendorHash": null }, "bigip": { - "hash": "sha256-hXQR6JcnZesO3rY/SkSxoff8JRuzK6oeEOorG8evNwg=", + "hash": "sha256-qTYHtkwgNlroct+HPfiexny9lBCDXwnlNRKRXmW0tXQ=", "homepage": "https://registry.terraform.io/providers/F5Networks/bigip", "owner": "F5Networks", "repo": "terraform-provider-bigip", - "rev": "v1.22.6", + "rev": "v1.22.7", "spdx": "MPL-2.0", "vendorHash": null }, @@ -207,13 +207,13 @@ "vendorHash": "sha256-A6/YN/iFxdfGjYO8Pum5nWysGmEeLaxgFPe8zaoPfjA=" }, "buildkite": { - "hash": "sha256-mhiPKnn5cOXMlz1cM0BrJnRVESWakgkiN/R5ZUUEv/M=", + "hash": "sha256-xz9gYf13tNU3J7nQscuIRU41CGjYc6qMXnLltAaPQac=", "homepage": "https://registry.terraform.io/providers/buildkite/buildkite", "owner": "buildkite", "repo": "terraform-provider-buildkite", - "rev": "v1.15.2", + "rev": "v1.15.5", "spdx": "MIT", - "vendorHash": "sha256-UdJxDq4VU7rWMoiSlXtb861yd+az2nrxGafvEj2K34Y=" + "vendorHash": "sha256-6Tmxmm/X3MZtFxlNa2H/oXGADlpoZ8oUSvTqKPAr5fA=" }, "ccloud": { "hash": "sha256-Dpx0eugcHCJV8GNPqjxx4P9ohgJgB10DTnHr+CeN/iQ=", @@ -317,13 +317,13 @@ "vendorHash": "sha256-ZCMSmOCPEMxCSpl3DjIUGPj1W/KNJgyjtHpmQ19JquA=" }, "datadog": { - "hash": "sha256-naPINUxSZP12wLanGw1BUYiGkyi1uqliDieR97oD+yI=", + "hash": "sha256-/RaKITbDBaTcF4xL+66gTBlEitbwj7z2NhJ60o+Cje0=", "homepage": "https://registry.terraform.io/providers/DataDog/datadog", "owner": "DataDog", "repo": "terraform-provider-datadog", - "rev": "v3.50.0", + "rev": "v3.52.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-LInse2bxYuGRGc28MOaMJJ6WAV0m2JF13mpvkSgyDCk=" + "vendorHash": "sha256-rbGBGmgOmv+PtkYlj89FXagDscrtVRl7J0ZP3n+lVdU=" }, "deno": { "hash": "sha256-7IvJrhXMeAmf8e21QBdYNSJyVMEzLpat4Tm4zHWglW8=", @@ -543,11 +543,11 @@ "vendorHash": "sha256-PEm/5AMATheF/yxEMVlEC/7hsRsMtMcp5wHpqrFBlFA=" }, "gridscale": { - "hash": "sha256-J4ZLexpjYXxOTaqih0+Nucyf2soYXxGiB38xAeXUJKs=", + "hash": "sha256-kgpEPbQLqiu8X0lOs6dCUqWpYTDxQX8fMgWoP0wWtBw=", "homepage": "https://registry.terraform.io/providers/gridscale/gridscale", "owner": "gridscale", "repo": "terraform-provider-gridscale", - "rev": "v1.27.0", + "rev": "v2.0.2", "spdx": "MPL-2.0", "vendorHash": null }, @@ -813,13 +813,13 @@ "vendorHash": "sha256-QxbZv6YMa5/I4bTeQBNdmG3EKtLEmstnH7HMiZzFJrI=" }, "migadu": { - "hash": "sha256-Pmc09MRNxrJHXlb74EnHkmML90pbKSLCyTrFlI+j3d8=", + "hash": "sha256-ZKlxt/qTccHlNSTwTFKroK/JmKLTcQ8MIeCKx+iRJm0=", "homepage": "https://registry.terraform.io/providers/metio/migadu", "owner": "metio", "repo": "terraform-provider-migadu", - "rev": "2024.12.26", + "rev": "2025.1.16", "spdx": "0BSD", - "vendorHash": "sha256-YFzYLUfyJglKaJSBksrI1DBHmK6+yoMIg9QlGIEZFkU=" + "vendorHash": "sha256-03pGB+biwTfJdGADhBSJn1BNhuowTrO8nwQm2eCCpaI=" }, "minio": { "hash": "sha256-GJU70N/8EocLNxTG/psIsRYVHkg5fALhA9/ewErNML0=", @@ -913,13 +913,13 @@ "vendorHash": null }, "okta": { - "hash": "sha256-ONhXeCCezhMgHQeT/HLFPUHW3No1Yv9vXho006dJoPQ=", + "hash": "sha256-LRlSqgcQPs3R/l4DKm5Ij3GjK7/WxRPV+/o4I2ukCFY=", "homepage": "https://registry.terraform.io/providers/okta/okta", "owner": "okta", "repo": "terraform-provider-okta", - "rev": "v4.12.0", + "rev": "v4.13.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-MA0w44ig8sS1+JgJ/TnBSiUlADDn/WP5zCYgcDXGaQk=" + "vendorHash": "sha256-EPBi417Ue8FFC23vOh9ENS50SHlrvJBAX1TX+oiFMMA=" }, "oktaasa": { "hash": "sha256-2LhxgowqKvDDDOwdznusL52p2DKP+UiXALHcs9ZQd0U=", @@ -958,13 +958,13 @@ "vendorHash": "sha256-0Atbzx1DjInPMa1lNxyNKfNMILjN4S814TlIAQeTfdI=" }, "opentelekomcloud": { - "hash": "sha256-gcELIKjDeXp0rqz+tDp2S9VEzPVoL+7RfvpfNF/qets=", + "hash": "sha256-KA0SMkf+Wt/YDa/lPndedD75yCMTcDO/EFX9wrLtIVY=", "homepage": "https://registry.terraform.io/providers/opentelekomcloud/opentelekomcloud", "owner": "opentelekomcloud", "repo": "terraform-provider-opentelekomcloud", - "rev": "v1.36.28", + "rev": "v1.36.29", "spdx": "MPL-2.0", - "vendorHash": "sha256-KvQNpXn11KdGbGQBWj7FwVypJOcFhLjgOKBfFZOyL7M=" + "vendorHash": "sha256-/vhalSK/kxbBc3Pq19BPl6H6L0FXhAqkK0/p1MPXckc=" }, "opsgenie": { "hash": "sha256-+msy9kPAryR0Ll5jKOd47DMjeMxEdSIfKZZKVHohQGY=", @@ -1093,13 +1093,13 @@ "vendorHash": null }, "scaleway": { - "hash": "sha256-8Jk++If2Uu51P/b29xSeUuIRduqm5lB9ob9YuAM0nPI=", + "hash": "sha256-8aESalFQaA6Qwod4rDeUzrKe80rbHfVJZIKtLliKUME=", "homepage": "https://registry.terraform.io/providers/scaleway/scaleway", "owner": "scaleway", "repo": "terraform-provider-scaleway", - "rev": "v2.48.0", + "rev": "v2.49.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-sd5Q/YcK28XgZGuNin6cn5xmwB2TenUuHMT9SRYIRTs=" + "vendorHash": "sha256-a1xH1NX+8/A4tcPYyxvg3lY9DZPrOAEl4OvngU9+tjE=" }, "secret": { "hash": "sha256-MmAnA/4SAPqLY/gYcJSTnEttQTsDd2kEdkQjQj6Bb+A=", @@ -1192,13 +1192,13 @@ "vendorHash": "sha256-c3R/7k7y7XS2Qli00nSj7gh/3Mj88PY4WybBTq/+pPs=" }, "spotinst": { - "hash": "sha256-ovrWtOJe5AVF1oneb+9It4MMkT8uL3bBdiXJNjahYRY=", + "hash": "sha256-zP71u5xaWcb+LBKGU3yFAQcZnK6MlO5WRQwc8Fz9ZJY=", "homepage": "https://registry.terraform.io/providers/spotinst/spotinst", "owner": "spotinst", "repo": "terraform-provider-spotinst", - "rev": "v1.207.0", + "rev": "v1.208.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-mVZbO2AH+mQeOj3I1FH2poQnQNGJUzxQNGmIv8nOqNw=" + "vendorHash": "sha256-HNKdEwG+7IJ2YpX97qkvXZbsoJWx+u+rZXRoZzvB1XA=" }, "ssh": { "hash": "sha256-1UN5QJyjCuxs2vQYlSuz2jsu/HgGTxOoWWRcv4qcwow=", @@ -1228,22 +1228,22 @@ "vendorHash": "sha256-9M1DsE/FPQK8TG7xCJWbU3HAJCK3p/7lxdzjO1oAfWs=" }, "sumologic": { - "hash": "sha256-THjaIm6QsHNEGuafwmnU3dUQqNJiDy4qTO+3bEIGR8Q=", + "hash": "sha256-T+DQ2uTkbwzTShKx1FOavOc/V/DxwBOxKPE639+mhXg=", "homepage": "https://registry.terraform.io/providers/SumoLogic/sumologic", "owner": "SumoLogic", "repo": "terraform-provider-sumologic", - "rev": "v3.0.0", + "rev": "v3.0.1", "spdx": "MPL-2.0", "vendorHash": "sha256-YdWs2orKhbwAZSQYC73t4e/vvVxk8LrBPG9ZC38VcZE=" }, "sysdig": { - "hash": "sha256-AedvLVOnAGQ33TJ2o5AI+LixvrLpK/C90vS8jsXadbk=", + "hash": "sha256-KoqAx3l03Q6FNu6/9QiDJZqVYumlq4JW1uQHCePuqqM=", "homepage": "https://registry.terraform.io/providers/sysdiglabs/sysdig", "owner": "sysdiglabs", "repo": "terraform-provider-sysdig", - "rev": "v1.44.0", + "rev": "v1.46.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-nfVS4EXpPoriXyPpBK8k5OU9MTWxxrvTIwsF2uyQE/0=" + "vendorHash": "sha256-eZl/UKvLG1Yi59oRl70CvrAIyLoyPW0ILWmFMzdUdDQ=" }, "tailscale": { "hash": "sha256-b2ZzXvlzlE+zv3Ufu4M5mcuLhyDkBbMznyM7NbiXAQs=", @@ -1273,22 +1273,22 @@ "vendorHash": "sha256-VMEL2dQ1+kMRWjJP6Obc3N1OytpAkRVW/9596WhwkE4=" }, "tencentcloud": { - "hash": "sha256-8WH87IFcZO5vK3kS9q94AJQ4Vv4jsFSPT0PZ1Cwt6jQ=", + "hash": "sha256-g4UQs7GdU5GFkrC9eeFLMYGLR2Wt2UbSSX5yP1CExT0=", "homepage": "https://registry.terraform.io/providers/tencentcloudstack/tencentcloud", "owner": "tencentcloudstack", "repo": "terraform-provider-tencentcloud", - "rev": "v1.81.152", + "rev": "v1.81.164", "spdx": "MPL-2.0", "vendorHash": null }, "tfe": { - "hash": "sha256-kF17NEk/faVBNXXq2ipoIqS97ENxmr1UnEJc6m9ScDw=", + "hash": "sha256-PnwwIeWktTiOSRHD7Vc9NttTpIBG0D2vWS0ngGRu3Yk=", "homepage": "https://registry.terraform.io/providers/hashicorp/tfe", "owner": "hashicorp", "repo": "terraform-provider-tfe", - "rev": "v0.62.0", + "rev": "v0.63.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-zDL3MOsOzMFh894xeqt+CIvKlQxDm3JLXsy2IK4ZMlE=" + "vendorHash": "sha256-6QIaJIlHr6c/pC6T/kQu0835Yf7l5idsTWl1sAcwXoQ=" }, "thunder": { "hash": "sha256-2i1DSOSt/vbFs0QCPogEBvADhLJFKbrQzwZ20ChCQMk=", diff --git a/pkgs/applications/networking/discordo/default.nix b/pkgs/applications/networking/discordo/default.nix index 06f42fbe1dad0..6a2eeac259580 100644 --- a/pkgs/applications/networking/discordo/default.nix +++ b/pkgs/applications/networking/discordo/default.nix @@ -3,13 +3,13 @@ buildGoModule rec { pname = "discordo"; - version = "0-unstable-2025-01-12"; + version = "0-unstable-2025-01-27"; src = fetchFromGitHub { owner = "ayn2op"; repo = pname; - rev = "2f071695146188c65b51f7030a89addfa845469a"; - hash = "sha256-k2wwFx0Wi60xpdiS7qGoHdS6TfXFlI6yDeXXfOp1ivc="; + rev = "1783361d5fb839e54f4562a9c42eb478d9cc8f57"; + hash = "sha256-AU7gT+q1vF4WWn5o2OCiAjHjub0ig1O7/CjFnuQaN6I="; }; vendorHash = "sha256-FsZRh4k9ucmAruJa1MZ4kVVryrEuHy9StgXHvgBiWSg="; diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix index 65927dd70f0fd..9a43363622275 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix @@ -1,797 +1,797 @@ { - version = "128.6.0esr"; + version = "128.6.1esr"; sources = [ { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/af/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/af/thunderbird-128.6.1esr.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "147169c7e5d3bb763fa87c4f7627f9ddec6493fa7833656021d102df897d2b2b"; + sha256 = "be2c44af9f0476c5ed21abed583cc6970b1a074b25ebe69b0000a3c38b892e91"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/ar/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/ar/thunderbird-128.6.1esr.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "eaf250a43059ab0d255ea7b1a96f55baa9287c88b2faf5269fc574df70e5731c"; + sha256 = "4f3208c2151de9a7503888bb467b2f3fc8006a1a79abb91f98306f8498e266d6"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/ast/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/ast/thunderbird-128.6.1esr.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "0a66cbf7d5defd48c433784eab0b0b457c11971eac0d4d2f45a735818a23ec02"; + sha256 = "e370b6799874607d5072bb09a98c2998ef8b6c3e8a967a7fe31eca3f15a94e6d"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/be/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/be/thunderbird-128.6.1esr.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "bb475d2f103966cf26e2837333124310cd9e943ee86ec01e524b884f438af6fa"; + sha256 = "0b0f0e4ae1843ca5c643a740a46737e39d844627212631a60b7c9b16c45c83e4"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/bg/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/bg/thunderbird-128.6.1esr.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "86f3ff01453cfe8156de06b23b4b7a08bc75bd6a7703b3851b145d0e334116c6"; + sha256 = "a4dee78c0bc74de69c1a61400ceb8fdced5b6da9deead89ce88a5cdc3234ff6a"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/br/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/br/thunderbird-128.6.1esr.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "cd2df9f9970e80e9cf97d658b0157d900dda0f2ecd8be225f40d132143874d88"; + sha256 = "ef798d533bab9530f30f03636900f61804b4b57c61a61585761f23c942eb18ca"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/ca/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/ca/thunderbird-128.6.1esr.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "0684f9615fd8324cea414b2b0d95a86bf361190ac41281805957cf70c1005457"; + sha256 = "3bd0fecc87a4aaf8934a35f0a4bcc86e271a78c1547d6c6fe5a924847f395e19"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/cak/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/cak/thunderbird-128.6.1esr.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "d2c40cd642b5e5b0a81c9d2cf0f1b034b17453dfdff100765874ff684e0bbf17"; + sha256 = "7af923642bd14adb3fccdbe6effc9afb25e911c3f8db8d42af1b122689f39bde"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/cs/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/cs/thunderbird-128.6.1esr.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "2d2324de917822676da6a13173e3fbd541abdeff2ae3cbbb9adab7c9321fe280"; + sha256 = "67c4a3efb4d00ac2840a732161f803b24b4f5ff1379b64a923b473fa8594e64b"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/cy/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/cy/thunderbird-128.6.1esr.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "8a57b789bfa683781d24cc3c74fe5ca5e28aa55d790bbfe2ec9113816cbad0ac"; + sha256 = "10a52a5ea2bd1957b350f07dbbff088529591bfb4634ab3ee1a76509489f47c1"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/da/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/da/thunderbird-128.6.1esr.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "1a58db475780f1aa0c2d487f826e83d2da592dd3f2bf296a19406ca5ee4ff864"; + sha256 = "fade618a5a8a8e80828796509a901883086ec528c1b92e8f5a5acc3afcd77226"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/de/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/de/thunderbird-128.6.1esr.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "7c5c2ef5e276cc9214d19235a913c1345cc1fcf967c0ca1abc0c935427188df4"; + sha256 = "3e54f9ad84530145aa48b2e0b861e7db0e2ea263422c60a7fd574221001a1908"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/dsb/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/dsb/thunderbird-128.6.1esr.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "b1fc585a9a57506d5852b5ced928ee26b27569bd11a6e31d1d362a2ce0e80e29"; + sha256 = "2267f1087ed7e796824aa732700c6c0892782dd8660dcba8d5540e617664d3c2"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/el/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/el/thunderbird-128.6.1esr.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "88ff0bf13a314a9228504b7af1c151935e56fb93fd5fec447c82df587439ec87"; + sha256 = "650490e9684ab556f552aa400ac11ad68883d4a51901f207dc077c7c1ce227d4"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/en-CA/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/en-CA/thunderbird-128.6.1esr.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "a27961dac518dbd07fbe65aee8dbd0a088f510b359644e67503a4c604a483cbf"; + sha256 = "bd70b88b9ad86c5a3a36f741f6a9cf08fd50d5ca82022327c038e6c9a3aef92e"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/en-GB/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/en-GB/thunderbird-128.6.1esr.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "315c95f6ae7aa96682d8db8f091a8fdb66f1d071e96ccb23394cc7b0e041b32d"; + sha256 = "699c053e9ae061842e51fab1ca87acf81b8a2ca243a2a1833eeb968af8865d2c"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/en-US/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/en-US/thunderbird-128.6.1esr.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "f8e7fdd9a29a196be4e3af54760ad6987d40180644bae4afb68bbf63f931f2b8"; + sha256 = "4dfa40703f0623569ef9f11e5909c35e61fd6d73d4858d85f1e911158b6e9f39"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/es-AR/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/es-AR/thunderbird-128.6.1esr.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "1a166113f8c3d38ff12dddd0193a45823ab623ed28bd8348025d45afd6c969a6"; + sha256 = "408148e33a08d9b092b2017c3fd97f3e7502bbb061b9e6381973f5f7e656b840"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/es-ES/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/es-ES/thunderbird-128.6.1esr.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "11fe857aa1ec54fb135840b3763dc5373eccd302b65028c9b8e3ff1d238a5c82"; + sha256 = "33f964d271a86f1bb02dbe793f89ba6b4a56e22f6a0fd72a9f1cbbbadc409c8f"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/es-MX/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/es-MX/thunderbird-128.6.1esr.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "10922d63aedd1e472d804a29572d084f9a49bd014072815b195ac04ee8959fa0"; + sha256 = "bf93e6bddb47944d9ccd5fe3443c2e7b9e4ff3ac0af1db05a07f45bbb57c8917"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/et/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/et/thunderbird-128.6.1esr.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "26f2876b278747de85c888c59abb639ce715ea2b849a3317c69192eb4690366d"; + sha256 = "8135645758ba64d0f0b4631d06142dcd621c49db5fc584cd01222a9ce543dabb"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/eu/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/eu/thunderbird-128.6.1esr.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "b9446b2f5bb87bb5ad9074e4295559d9aedfc790af7f5e1ae74077f93165eda4"; + sha256 = "4fc0f5a7e7342eb3387691cb3728a64e11f6983e233060f0dff41f351e328f37"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/fi/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/fi/thunderbird-128.6.1esr.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "e85e265b8b21839dbe09af3b860bc7c30c62678758f42542a3f2e73bec9b9300"; + sha256 = "67192f44c2edd542272806f6de1166e85e0cbe8d5ea59ea0459fc5dcf29c13cf"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/fr/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/fr/thunderbird-128.6.1esr.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "6c77bc7aec3e985c4ddc17e51bd659d8f4c68811e3e04dd5c27eaa37f48e4ebe"; + sha256 = "6323051cd2084f286ffeeee1e4e24cdc6c2b8853fd1aad8581eacea6e26478c6"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/fy-NL/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/fy-NL/thunderbird-128.6.1esr.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "a57e8c11a14e7418ef198c2acd566a4e3581cc9eda3ecb4fe8e1e219b27594f3"; + sha256 = "08718d1f1c809633b7854a96b56c841001408b8cc941455d4a2e500cc082c211"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/ga-IE/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/ga-IE/thunderbird-128.6.1esr.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "aed8de9226564d4ee4bb6869cc0421c435878d31103e87af21f393ba68c36ae3"; + sha256 = "a9c5d6534572f6356c439c88a990a97175b3e77a299bb34cbffb6f13d3e7c4ef"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/gd/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/gd/thunderbird-128.6.1esr.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "0cf99116e8534cb21696c0675d7bba710f27559d3d82d5e72a64daac16c1c7f4"; + sha256 = "4258c7ad2e824e20ea2fdc86507187c687cdb0178702442469a18ff77d206a49"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/gl/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/gl/thunderbird-128.6.1esr.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "3354f923b02c9c13d45c8a08c2f5e47fad5bac133563bcaf164a57c68d5bba92"; + sha256 = "235e1396dfaa266ebbeda750b6a10186593ddcfa95465201e7f7a3b87e8f15ff"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/he/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/he/thunderbird-128.6.1esr.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "461f8f59ea9699a1e74a1b27cbdcff05b52b8f126e8e97a0f037952a8b536cf0"; + sha256 = "5c38f24471bed56e25eab4820c556c0eba1d2798f2a566408ff8e9d973e87012"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/hr/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/hr/thunderbird-128.6.1esr.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "7fb6430e834532e43bd87b246058adeef11dd77adc850b8672fd04f3d6d6060a"; + sha256 = "c177125fb51b2b80cdaa6978ff2475ce9e052b8a2b1bf9b1ce536fe7ecc89309"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/hsb/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/hsb/thunderbird-128.6.1esr.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "e727fa3ff2617962157473b20e31bfdb99c59c35ec3e6cb10046211bfd47723d"; + sha256 = "8333ab8efc2f46a1a0a0db86c3d58dc6cd4e0144f2e69f3183ccddc0a7e882fd"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/hu/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/hu/thunderbird-128.6.1esr.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "c8d6f822508d7a68c65927b14105ddea413835a518d348bca4f41ef61bf11a94"; + sha256 = "f91995e57af2ca41e3166d3abe88915d3578a56f8fa646ad17a97d88d4362f03"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/hy-AM/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/hy-AM/thunderbird-128.6.1esr.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "da532b67da698cdc025a5320b4e11f630eb8982ed389c1c60fc3c942bdfb4034"; + sha256 = "12cdc3de116fc6b27ab2e9d55ea722363364477156b6da020c1df1346c3f2ae8"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/id/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/id/thunderbird-128.6.1esr.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "05ae0434947fbacd738b24941633db92a21ef8936703706cdaeb311f98cacab2"; + sha256 = "eb449aed2254840cd3b24056758130c14ed34dcd5dd7738d807a592bd71cdbb9"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/is/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/is/thunderbird-128.6.1esr.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "4f506da3c5677cb9fe600e31a9e37b398f00200a403365f8e68f89c8a0eb6bf0"; + sha256 = "67cebbbd999d7a42ec03a98dfcbaec637c291b5eb9eedd4bd4f65097526b0ecd"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/it/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/it/thunderbird-128.6.1esr.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "9142f001b55718443937fa7bc2ac92584371e9b4a1d0d87ff84c272fc87fa74e"; + sha256 = "e4ba4ff84f5a3ed8cfa86b5155bf3f1d487524566b03eacdd4052c4b5f431d96"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/ja/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/ja/thunderbird-128.6.1esr.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "965e2b5125ffbabce121c4efbd86cc796372ec969d8634d106a44fef2696c930"; + sha256 = "7b8d6c8a302d1877569246d4b5e23e4e6e7192a924030e89bd35cd04229d3b98"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/ka/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/ka/thunderbird-128.6.1esr.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "24b87f5590e83999c8a1b3970b5d0fa3bf98de9820573b0e1af49ced9ca7d29b"; + sha256 = "bf3e8af506a98db415491d56856261113b471ff9749a4b094a08d7b1850e86d4"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/kab/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/kab/thunderbird-128.6.1esr.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "2efdaf21264181251f39f165270e3e22103823750b9d4d35fb94784f95137d18"; + sha256 = "0efd72d632cc95e2546dd9c811b1e761c2d47e17bef49613aa38832af96acd8f"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/kk/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/kk/thunderbird-128.6.1esr.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "63820d662893a836a28159057e4ceb2042823d042e2c1f0ed833480817e3cedc"; + sha256 = "b3de6a7fa35e3ea01336dfe86c448d4b0f9a672d7452e77569541fce65810d02"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/ko/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/ko/thunderbird-128.6.1esr.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "a1006fb62ca22730213805e9a8bde134bd88405b0068204eba0400880bb10cdd"; + sha256 = "9410d40fd086f25fea1f5faeedd2f640ef0d436f49b5b8bbd4f41b4f4bed1525"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/lt/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/lt/thunderbird-128.6.1esr.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "60d9333c6633c828f4e491dc8a033a8940894875b9154433511573c31d4834a4"; + sha256 = "2af7d411d75ee76a8b3e4b1e63b07ab0634811ef8c18dfe5dd4cf3cb9676ea68"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/lv/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/lv/thunderbird-128.6.1esr.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "edf454a5d2ed00f486aebbf505aa5ce8cf9b6d14f06f4645535cc08a1db2a445"; + sha256 = "9d67e04d6039f69b0b256d103b494d7ad46471e4f337821bfc56811bb28f39a7"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/ms/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/ms/thunderbird-128.6.1esr.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "2e6374ae36a01a0362a3ac8e9a616e8b80d9c31fbe8f89e58930e00bbb8ede93"; + sha256 = "a7f269a701dabd3260a526f6a8588a6cb033c1d1e097497cf056642414974221"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/nb-NO/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/nb-NO/thunderbird-128.6.1esr.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "85e121b6878115a304720f9ff8ad85ce757ce1cb520284973be199f51357b707"; + sha256 = "940b364182ce1f208c99c58b0d5cad38fe0f5f09ab3995d4ea757136995295d5"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/nl/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/nl/thunderbird-128.6.1esr.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "306f6af60bee6174e0d7aab66b7cf21cfe383f9dce403c91fc867ce9a2c26944"; + sha256 = "9e18c1556863868f49a7c79a20da5e35d84f385dd4e0b11c6eaa0d8dc934944d"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/nn-NO/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/nn-NO/thunderbird-128.6.1esr.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "3aa2b9391365419cdf7a753206c962a932e7f5325505a3320ae57f3b781634d9"; + sha256 = "87f3c24434e81592cf9ba6d2715219ba632ba0014d2587d027e18441e9c306e1"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/pa-IN/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/pa-IN/thunderbird-128.6.1esr.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "797ae91d608e7be252439b1fcd4536df1b030fb1f7267408c17b75cefda4c20b"; + sha256 = "b8cdd1c2db2eede3e2aad1da30bf767d15bf302441c3cc4979a5280b36bcf539"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/pl/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/pl/thunderbird-128.6.1esr.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "4ac87004c02e69159ae6875658cb7ed95ddd965fa3871ba7a89a82b6abd4f9f6"; + sha256 = "6be2cd7239411ee03bf4f5fdb98ebb4235428e4aa3fb0c85fc9c9362571deecb"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/pt-BR/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/pt-BR/thunderbird-128.6.1esr.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "40a3721ec6cd57f58e27ddb239e5026648bf9d75eafc417e4d61b5128c8e6a45"; + sha256 = "baee1f8a9428f50c0115766e999a9f3c18c0e9bf6961a32b27716935f0d813d7"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/pt-PT/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/pt-PT/thunderbird-128.6.1esr.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "860fb6f9ed881a18921a498f30d5559316e1d7934d974636951339221a2b4b57"; + sha256 = "bddb747ee6e45014baf9a8d2261aadd4150c98d63dcd5ddafc08200972451038"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/rm/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/rm/thunderbird-128.6.1esr.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "b9c47fe2fdc79f0ab5cd6233aec9b8be4bda9537ea3fdba1290d28e6d2e38dcc"; + sha256 = "bc2835f7eeaebef7ec60c06cfd4641aed51facc81ae69e83d7e4d56ec9ea10a3"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/ro/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/ro/thunderbird-128.6.1esr.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "aecc5113a2e86c6202cab6ce6278a2b7ff8b7228efba5e3de5dc3811d845c043"; + sha256 = "8e9e4b0091ae91fb544d00e7e6748532a4f874e5d416cf317478858e06aed782"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/ru/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/ru/thunderbird-128.6.1esr.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "ab3903775cafe7907b28bf56d5f30e2d3d79055d84bd52469b26bf72ec8240c9"; + sha256 = "4420432e93242e90d048f7eeffc6d4b2a0208cc3a8b6b3547bf402c58f684094"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/sk/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/sk/thunderbird-128.6.1esr.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "8ef99d4dc206ae86ccf4460206ff56e314e1e35d282f05f86944e462db119b8c"; + sha256 = "2a3e5f5fc207a39954b53da37faae8b77c04beeeb77f01a712d34c3a97dcb8d1"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/sl/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/sl/thunderbird-128.6.1esr.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "c57ab55bd835e2d5bf8903a6a8db69ea456f93f1406167bffa9a9047b3747db3"; + sha256 = "67222234ed147536af027c7a9292a6e13f4fa0d6ba7a2af86d3e631754a8b9ce"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/sq/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/sq/thunderbird-128.6.1esr.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "8b8f216d54cf9e432e19ae07b2ac316684a8e1ba91e2dee7f8157f626c46b114"; + sha256 = "e6c0b7a5e1a7c91d74c192b6d07ca21aebf2a423f11d9384c268175e9a52c516"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/sr/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/sr/thunderbird-128.6.1esr.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "9212dbe44a7e39097b1d1a7860a06f4a7bdd45abe734b3c5bb7c04de0d766fec"; + sha256 = "fb4682aeb65695dfe82e7420f69e31000871cc89f28f85a968b8a9851d3c4374"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/sv-SE/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/sv-SE/thunderbird-128.6.1esr.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "1f1b6b76775b1643a6748b414c014c24c1fc84a09da4aad3ee7a3672ca5f0012"; + sha256 = "6a191f049d25899d5550e8b32fe36c9c9b87f1764271a38daeecc99d2d42258d"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/th/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/th/thunderbird-128.6.1esr.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "82f1ddd9b88b777162c947f09ef6add3e3050ab87ec5bb33d245b6fa14a603dd"; + sha256 = "4a7b662274fcb08462d28e9bacb0b388c24ba97ec2d2de4cd2a6ebeee51f19a5"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/tr/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/tr/thunderbird-128.6.1esr.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "380bcfa6ec40a2fba1eb444e473baa521cbf4ee654ad63898e5f3829be746dc8"; + sha256 = "e1c5e3f7b40d1e627b6f442bd2f015d28e1c07c70eadf686502ccc2d6c8f61de"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/uk/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/uk/thunderbird-128.6.1esr.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "2a7052d5c51e53c0ab3b0703f7b33a3e870a123b8604416ef8c92dfcbad736e9"; + sha256 = "57fd513305a33a959a09c80a1fbd3e06fd0cdd40f86cb41f814e9a31a9b24267"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/uz/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/uz/thunderbird-128.6.1esr.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "72148f0f1160f9fb93ea65e1dd6053a768e02b45f6ecfb3de68de4db4f635291"; + sha256 = "ca72d66aa59098fc0e2325718a0dec4911af4bab55245268876e6224ffc47169"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/vi/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/vi/thunderbird-128.6.1esr.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "475abbbb400aea36414d787e98ce9095632e11436759da552ccdb4272adaacea"; + sha256 = "57b4b669b8a8e1704a50040c8ee5dd84e5145a09ad40644709fbdceb46af1975"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/zh-CN/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/zh-CN/thunderbird-128.6.1esr.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "b2d5ac008c57e7e48168b9712d6e90891bd5c517a891e4d0d4fcb6d5ae2cfb3c"; + sha256 = "6e8323e5cc67720a7cf1afba7776116e70ad9ada3b4e01023eae1c5f4134c555"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/zh-TW/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/zh-TW/thunderbird-128.6.1esr.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "01122295d0e40f896312eee085b9db6e696a9eede5f94a69651d39253f7cec2c"; + sha256 = "746eb3f9a1296143c97817056cfdb4465fbd2071fa6dc9283d577c6a84c04c56"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/af/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/af/thunderbird-128.6.1esr.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "62d59997921ad6f8867fd28d249c86c4879c2634e5766b498feaa68d0da38336"; + sha256 = "f5f9713502309cf753ee9cb584226e1ec4b8983975eca29df846feb8617f3aee"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/ar/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/ar/thunderbird-128.6.1esr.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "dbc05ffb01763cfbec843331d47772d8b53f0e700db0fa4d3ce0afc4a48814e3"; + sha256 = "51ae27836ec8ad79a453a79dda6ebeac92f0a9a9928784a632cbde12952bec7c"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/ast/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/ast/thunderbird-128.6.1esr.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "bdcc2cb138d79367087ac72d7fec609128cb983416bee6e3f57f18ba3f78741b"; + sha256 = "710c0bf59054b3619c58707aee80469e950cfc7f571208aab0db44b115eb8dfa"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/be/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/be/thunderbird-128.6.1esr.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "ee1132188cca65f69cbef56287f930f685cc1c7f7e445b3eb819bd935ec7cb2e"; + sha256 = "f330fb05511f92648adfbcb21f7d40a5769d5bfb45a5aec74f0ea691e5871af7"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/bg/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/bg/thunderbird-128.6.1esr.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "ebbc2843eedaf5ef42e8d9b53e2e7c020e3eefaccbfa9d95554d259ea2332781"; + sha256 = "711940850a15971ae10bbd47650b4a0a2025fc6518c30b07b571892e85b9a75e"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/br/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/br/thunderbird-128.6.1esr.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "5c0679c6970f2e7d80fd4e1b78643e912d42641a287074ec8deb6f49016844fd"; + sha256 = "5294c69244262827b74d48e3d9080bbe55eeeb5c4dc58c2148923bc27176847f"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/ca/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/ca/thunderbird-128.6.1esr.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "d1d727eee4d58c7798414510918248b37d33ba5953243b6e23e7a03fe7c5dab3"; + sha256 = "7ff75c06c3e79aa66406ae9208f3ca3c496703e4828e1fdf77eaaecfc08f3e06"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/cak/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/cak/thunderbird-128.6.1esr.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "e9e6fa54db1a01d8a9fdaf3339dbbf84fb101220e57fe060df44e045a6051189"; + sha256 = "a3197fa772df576d549c26b8480c4ff4c550c7d922139d00582a8a5be4393ff2"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/cs/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/cs/thunderbird-128.6.1esr.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "f1e2399413bf3a744128cb9e2279b9f207f9361c5da3bdb4f7f625f73d2217a6"; + sha256 = "03a130d9449fa1f708be06e7a2724f087238727e321b41ffec07dcb6400026be"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/cy/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/cy/thunderbird-128.6.1esr.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "33a3372f67b1254dbb30989879a71b0078a2340901875abb9759780d81855712"; + sha256 = "490a874e8f1ada465cb600434464c25e25d44cb6452219b227510c59e91051b7"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/da/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/da/thunderbird-128.6.1esr.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "2a08ff6af580d47bf2e5759dba6d706bdd3fc74e7d7b6e56b4333c4b7aae9ace"; + sha256 = "f3a8e93f01bb5f0d13a2711aa55610672526989ba54596a6a72cf1f22198e470"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/de/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/de/thunderbird-128.6.1esr.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "66eaf15fd54ecd204510e3ee8e6042515932138464d12e31f287008c1abc8218"; + sha256 = "69849cb1ef0eb78c967e7529a85e5cda2f31ac25f6b48c88ee055230857c339e"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/dsb/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/dsb/thunderbird-128.6.1esr.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "2febaf2c4fb0e75b78bffd4c81b2818c63fe993451b0a7cc20a7e6353dd8fb07"; + sha256 = "357fbce54d89547a97055c08725c08619675830ac0dfe7967547e498ccc79381"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/el/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/el/thunderbird-128.6.1esr.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "165b23be9f875111a17807edcf6813fc8687773827b85e9c73475590ccab5412"; + sha256 = "638408fcff3c6e116e94bac9a10c9719cf81500d23f575f088b097c97b40de66"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/en-CA/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/en-CA/thunderbird-128.6.1esr.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "001af04eedd973468bfac7a2357bf145fc507bbf710d2ec236fb841d1b31309b"; + sha256 = "fb1d42d13985c308bd501d36f2b0977bf1d820d8f6e56ab3e4887b0f21bb2d57"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/en-GB/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/en-GB/thunderbird-128.6.1esr.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "f45125ce2e23318ae0d9943e15c6212a4238777fede7af7686f826ee3d9dbe28"; + sha256 = "89507abd00647841e576a318f4c18e2c728d818107e0e35a5c4f32f34e0b5879"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/en-US/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/en-US/thunderbird-128.6.1esr.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "d9c2e45e91c927832fa2b6affaccfed77a48f83cba647a895b49eaeeaa4461ec"; + sha256 = "eb8555ff145dfbcee89271de61d22f73ec90f2bc2e06ef54ec60aa2c3b4318df"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/es-AR/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/es-AR/thunderbird-128.6.1esr.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "39fccbc25a74ab3ced790c034bfa170d1b9f4eb312ad8a9c3f7e1ad77d427c51"; + sha256 = "2e5740eccfd005ba2ba20763246cd51923b2caf4a41ea6976ffe2670294d0ded"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/es-ES/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/es-ES/thunderbird-128.6.1esr.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "03741e6cdbb65a7f5915bf57b109cf6adf5213abc20da905fc861c88f9c9c406"; + sha256 = "835b83dddec9dd1ea6283f3294ae9b5e9b827c72e65bc4b50204b338fa7da2d4"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/es-MX/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/es-MX/thunderbird-128.6.1esr.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "15c7d464ff7769701d314f13330271ed2937ab0b0034a81161b2e36d283831be"; + sha256 = "47e23a7507b3c4af1da944c4865692808d961ab7073daec08887a1cd5505a77b"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/et/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/et/thunderbird-128.6.1esr.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "2f388016a416978bd4459f10c627d380fffbeff95dcc4f652ad459ea77a114af"; + sha256 = "60be867338dc57434be4521bc1ef9d26ac16da51bcc0681c3424ee65d0f04335"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/eu/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/eu/thunderbird-128.6.1esr.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "913e9a6f0c642488a6f265aeb82f47cad6d9da4c8a3c20a538be4dacfdd2f424"; + sha256 = "9e407cda465e65b8fa40f966eec6793f1d618a2cb4cdaf89026736f210582146"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/fi/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/fi/thunderbird-128.6.1esr.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "181c0036ea5c3cd1d2a51c1f554be95c780d825c2b698196f21ce4451242069a"; + sha256 = "559ead385a9d4545c31a3ae0219604658275700e56fd62f289bf89743d784bcf"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/fr/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/fr/thunderbird-128.6.1esr.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "4855ccbf98d16a50f5b879ca7488b850a2d4378610c1a45e292e1635b3e5836c"; + sha256 = "c64d0fbc18b86da7fdf599bb574cfea257a2ad2a4072d6d54f0f201284d32ba7"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/fy-NL/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/fy-NL/thunderbird-128.6.1esr.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "f1e518d037905d175b67ea69524f9347b1cf84bddfaac15c9755de319cc8cee6"; + sha256 = "48199cb503d9e4744368b199d4d06545265ddb0cbc9f3d443a0570d4f2a50658"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/ga-IE/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/ga-IE/thunderbird-128.6.1esr.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "a1b6fdd4a59fece7a9216c8684502634bdae34a23ad6b1d4a9b1877aa8c74b2f"; + sha256 = "4157290dd27ff6e738e8c7aa7522f0f1b8f3df09329c286c232cd21ffefca532"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/gd/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/gd/thunderbird-128.6.1esr.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "770e304815467dcd557a9377f7755ab6eeef1b754db35865102e148d181c24bd"; + sha256 = "053504f03781525eca26a11f0469c814480cd5c714eba97be41b321f8075e273"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/gl/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/gl/thunderbird-128.6.1esr.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "715aa396a68625b69ab3d19133023c2b8623074bcbf60198d278e48d655562f7"; + sha256 = "0e5d718033eadbb6f1d701df5995591fdcbed0b7cc3d5cc68ba42d8a481fe9bb"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/he/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/he/thunderbird-128.6.1esr.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "71851abff423cd15633b014ed49fc340a668f37912813180087bec647ef52695"; + sha256 = "631ea9ad6ba16b83e1edc0fd55c476f4a16259025a3863e9212e61e0d89bc7ea"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/hr/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/hr/thunderbird-128.6.1esr.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "ec3b050dd285b5ef797de74003f5661bb4157bc4db5dabd195f1973cf0c6f5bf"; + sha256 = "bad8f983ea5ae4f80ae38ada0c7c8d3fa336744b1e966c48af10217bf5ea2237"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/hsb/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/hsb/thunderbird-128.6.1esr.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "84d25c5f124a159ce9d6f0e2909c2813857c7efe38dd2f0df5b383f8f7e3d494"; + sha256 = "4d50574ac492b5bee3a7ab7f3e859ad076771cd9e47c4020018e1c10b9083518"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/hu/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/hu/thunderbird-128.6.1esr.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "ae2566441c6bdd4705dc24d3b917c8e03d7219650b38fbf94d94ff82a446fe62"; + sha256 = "e782b4eb870ffa199be3a1c571c67eade17cee24f3b4b8ee6f160067082a8c8c"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/hy-AM/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/hy-AM/thunderbird-128.6.1esr.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "684d92cba150239ba8f7c85cc00b8002a4f86c310c3a96cadc8afa4a8212337a"; + sha256 = "16c02f0811ded8a5fd0d17a3b4ce944fe2adc6ed53c8927a2bc0dd13ae6b5a17"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/id/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/id/thunderbird-128.6.1esr.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "f0be4128db7336c6d42880515d7006d6818e2650dc024e65aad6cd0e2be0e961"; + sha256 = "4226e163541af84d2df18d755673d6a5b2fafe9f650f6acdc9dc92d258b5ac1c"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/is/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/is/thunderbird-128.6.1esr.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "a141c3fb553a32f9874ed6f2a4004e84979d1b970c17fa7a74a6d23fce0263c9"; + sha256 = "3ee5840dcfbcfaa488ddf34267ee15346d6f4af3531a1581918ce0bef894e627"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/it/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/it/thunderbird-128.6.1esr.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "bbc2a5d84e0ed6bebd8585df3a852fbf92e5bb0f548ae37b970a6b2447c98ed1"; + sha256 = "8895b995cc0f80ce299b90b59609943eabbfbea79b9732c0020356223c47f792"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/ja/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/ja/thunderbird-128.6.1esr.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "d04fc2f0a0ce0be61012ae72dba8c48fe90bd6467ca20d8440787260f92dffcc"; + sha256 = "684e8e68b1369c3fba79192d6e5ec1a81da536d2c3bd41a3ae9ded8217cd1501"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/ka/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/ka/thunderbird-128.6.1esr.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "ed178358c17b02499d4b7691098c07c85cfbe4a43cb9bb8b5fd86ce7779298ae"; + sha256 = "aabc4ce18a4f12fb9bcbe5b185df7193850d98e75ebd3d71e277111edc1a76a3"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/kab/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/kab/thunderbird-128.6.1esr.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "3299c8a36adc7af99a3c73863645eb622e2b46de84f404233443d00b416e204c"; + sha256 = "11c2f379d051411a9339b0de268619d78d214cbd64ee75ed142c4b3b57114efd"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/kk/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/kk/thunderbird-128.6.1esr.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "1de2bac82f5be71751eef5bfeb59116927ea04b2b8c2b568fe1725745d160e85"; + sha256 = "636709b2a21c97264bf10464b72606bdaf95014dfa5dacb509989cdf8edec2b7"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/ko/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/ko/thunderbird-128.6.1esr.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "0326665b85426f1b14216e063118796e010969689d2341469bbf36d799f2f4a5"; + sha256 = "0f751cbdf911524e4436a3c7a1504de2c500e79d346acc539f3ecef4ec1acf2f"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/lt/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/lt/thunderbird-128.6.1esr.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "458467e5d24267011aa9b2c61cccb77b174bd17b791ab8ab260a7e07b0059ce2"; + sha256 = "2bdc68ba0514ad110427b85008c6e586c60cd3e5309d5b8fd0f55348c9df8375"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/lv/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/lv/thunderbird-128.6.1esr.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "935564c24ad59a8cba9388c0629c5074738d9671dfc95c3058adf5f0ffae465e"; + sha256 = "72bfa32ed3b847f3e4842a9a923dd64967da1430cf38182c1bf9772cb99a7ad9"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/ms/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/ms/thunderbird-128.6.1esr.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "d98f64f31ed2c2f2c5d6b044bfa64f342f326e9710da9e8884ece1010cd7482c"; + sha256 = "054c3a226465ed5d5d05d9465089a0b8369f89ff4b2e5db2f5e7d880eeede5da"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/nb-NO/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/nb-NO/thunderbird-128.6.1esr.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "14302cbe97ac0fcdfc3fa480f2b4437764be824dd0ab500c2c6c73701f4dedca"; + sha256 = "9137be450d76d838521f274a645995d61fb9723cd0f7b26ee6641306b645e031"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/nl/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/nl/thunderbird-128.6.1esr.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "8b5bb83eeab32207258366e9bd286c2b1b2cd729ef45abf41277f473baa7305f"; + sha256 = "71c19034ac6a06bffb84f64922360871e6fb1670d9c3fbc9a19798c8abee66c5"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/nn-NO/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/nn-NO/thunderbird-128.6.1esr.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "9417b5870546bd223de53ec36c17a4d0e2210fcbb4b853abb2f034b74a589051"; + sha256 = "d07aaf91cfc6f3b4da65cad518e62a5168eae9a8ee7bd940424a6682d7ad126b"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/pa-IN/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/pa-IN/thunderbird-128.6.1esr.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "0405871e0fbbda68cbdeb933c70c26d7c0cab0c4501b8762c7be3bd148e08ab8"; + sha256 = "3951b9ff05096165b17a9e5c49ac544cf77b1eb1b732e2a41ee9d94c47ebf6f5"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/pl/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/pl/thunderbird-128.6.1esr.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "1da36203c8420749724bd8b32e1c215257a225aa98f0e0643d0425b32aec5980"; + sha256 = "ae27f78332e8ad0855b0214f14cae0d7fa09d59f71b38a0f80dce359606073a6"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/pt-BR/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/pt-BR/thunderbird-128.6.1esr.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "cac9cd2269f7d69c25ca618864bfd115bcb2ec27331038b7c6e5831f941499ee"; + sha256 = "5383952811ca6f9bc52f3ddcfcc0b881fed818b6dca6b99d9cf90d178082ad9f"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/pt-PT/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/pt-PT/thunderbird-128.6.1esr.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "d66daca210cb2459850b554d492d4c0ba7d9fc7a34980ee72cfe983436861194"; + sha256 = "85c8c8ef1cf8dbd3c9c9874686590300e9cfc10c684b1bb4f64eb39cc8c5e4d2"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/rm/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/rm/thunderbird-128.6.1esr.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "dfdc1b27313897e4ae7437423d70a93b47c3277ff5199a7f134e90c787a6f5f4"; + sha256 = "2bd11169c571047b44025f0094a3bba2642f7d24480003a652fa30988997ac6f"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/ro/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/ro/thunderbird-128.6.1esr.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "477a37e982f00f32f7afd9e1263035f878034bc6ee79200cc3d156efc20dc124"; + sha256 = "88a1940d95c02f46aeb092af2758cb85840425b3924b662b2d1beacf18670628"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/ru/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/ru/thunderbird-128.6.1esr.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "d94e863b730f86b3c1ffd2004c74d339f72af66b67d098beb51a056e7bc4e58d"; + sha256 = "5efad22aa2d09b275367dac33deac99f4fe99e126f90883829ef71e2c577e161"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/sk/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/sk/thunderbird-128.6.1esr.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "7fb502e717b62433c10338a140ce724d2bcd6f947c3df140d88ccc7ba17f3f02"; + sha256 = "b4a4e1b3df1882a99394ce659018efaa01b940d08bb6f1d6bef0455c8c27c39e"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/sl/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/sl/thunderbird-128.6.1esr.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "8eea3f3ecd02765a286ddb763a1dd305a630d82720569069a239750ba83664d5"; + sha256 = "18dc29b47a46a74aa8e8a003593d0e92dc707a289a3f846355f6aca522b2d7ef"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/sq/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/sq/thunderbird-128.6.1esr.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "8aa055e87b14cca81d25499d196cceed9503e8922e03ee0ea92097dd9ed54d42"; + sha256 = "4f44f82bc32802c2bfb95fc9188ff1656b0b50b215e6475615395f19b4ba5e9c"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/sr/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/sr/thunderbird-128.6.1esr.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "879683d2bd155f0d764979c148c8024213337ff110e9b43bb45d6012f229a300"; + sha256 = "389b47ff4fe0ec44f6f04fed574a0be4fafcfe95713f5575972ee7be4fa2bc63"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/sv-SE/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/sv-SE/thunderbird-128.6.1esr.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "add729440a5acacbdb9303b975196ccd081fbaf609a5ca520c5c49da8a57fbfe"; + sha256 = "ce9ade81d2d2a66ccd50f043998364e4696eb5a5c3c272ec093d0266abf03417"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/th/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/th/thunderbird-128.6.1esr.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "b7dfb1c4471c6afe6ff84c15f868254d6871a32e9d989a085cfea3431e592b49"; + sha256 = "c51ac457124127d23339c9901446e3930c7b3f77870c71bb4be0baaf0ccf8fcf"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/tr/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/tr/thunderbird-128.6.1esr.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "55291db94cdbd0ba57ec3235a02dc06e3003240f0f9f95dba028a0fa6193e3d5"; + sha256 = "d657d7447a7a24ec5a033b72edf0410d1ccd07d0a40d9e296e6ecadaf57d654d"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/uk/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/uk/thunderbird-128.6.1esr.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "07ca8084dd890216f576f612f5540333f222496c061172e2bca55a97949ff199"; + sha256 = "0643a480d328aaf211fc65b0bb323dc4cc7943940c26784642fc8ddbf2f963a9"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/uz/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/uz/thunderbird-128.6.1esr.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "d0374a986585bd43e7e2ff88ce8c6fee727523ec98983fbcb665acf32327e2d0"; + sha256 = "a7dbb5595a507f4207e2181e138ba99ca08b87aa031ed4acdacf594f0ff523b9"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/vi/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/vi/thunderbird-128.6.1esr.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "147b9d64d517142fc20c91de1b5613a2c56976fa6c70382abee69dc98ad2a703"; + sha256 = "ebb655c6734c9b68bffe76a00f35156da93bd97c5879e4acf34df7b31ba92f0b"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/zh-CN/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/zh-CN/thunderbird-128.6.1esr.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "15cc8573c79e62f611499a0dcd09155e7d5b66c25bf8361132f8ce4a3530897c"; + sha256 = "004ff5ed854609c6554fdf235c81854038ab56f4e231fff00477d1de85a6d30b"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/zh-TW/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/zh-TW/thunderbird-128.6.1esr.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "9c5fae7d1ff16246beb284f26461a1cdec93c31bf8b9c0ca12adef2bf9fa7794"; + sha256 = "7894a24b448663f24e4466399fe006c4c0806f56a29a56ecfae5c2ad2f883106"; } ]; } diff --git a/pkgs/applications/networking/mullvad/mullvad.nix b/pkgs/applications/networking/mullvad/mullvad.nix index 3b29d73675f83..9e6fe6ff56d9f 100644 --- a/pkgs/applications/networking/mullvad/mullvad.nix +++ b/pkgs/applications/networking/mullvad/mullvad.nix @@ -16,6 +16,7 @@ , shadowsocks-rust , installShellFiles , writeShellScriptBin +, versionCheckHook, }: let # NOTE(cole-h): This is necessary because wireguard-go-rs executes go in its build.rs (whose goal @@ -33,7 +34,7 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "mullvad"; repo = "mullvadvpn-app"; - rev = version; + tag = version; fetchSubmodules = true; hash = "sha256-5GcYiyvulsOFepguBcBec98juw22YTbT7yvZJUOJUwc="; }; @@ -101,15 +102,25 @@ rustPlatform.buildRustPackage rec { --set-default MULLVAD_RESOURCE_DIR "$out/share/mullvad" ''; + __darwinAllowLocalNetworking = true; + + nativeInstallCheckInputs = [ + versionCheckHook + ]; + versionCheckProgramArg = [ "--version" ]; + doInstallCheck = true; + passthru = { inherit libwg; inherit openvpn-mullvad; }; - meta = with lib; { + meta = { description = "Mullvad VPN command-line client tools"; homepage = "https://github.com/mullvad/mullvadvpn-app"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ cole-h ]; + changelog = "https://github.com/mullvad/mullvadvpn-app/blob/2025.2/CHANGELOG.md"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ cole-h ]; + mainProgram = "mullvad"; }; } diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix index 8131243ef262a..ddca7c3bad511 100644 --- a/pkgs/applications/networking/mumble/default.nix +++ b/pkgs/applications/networking/mumble/default.nix @@ -108,24 +108,16 @@ let } source; source = rec { - version = "1.5.634"; + version = "1.5.735"; # Needs submodules src = fetchFromGitHub { owner = "mumble-voip"; repo = "mumble"; rev = "v${version}"; - hash = "sha256-d9XmXHq264rTT80zphYcKLxS+AyUhjb19D3DuBJvMI4="; + hash = "sha256-JRnGgxkf5ct6P71bYgLbCEUmotDLS2Evy6t8R7ac7D4="; fetchSubmodules = true; }; - - patches = [ - (fetchpatch { - name = "GCC14.patch"; - url = "https://github.com/mumble-voip/mumble/commit/56945a9dfb62d29dccfe561572ebf64500deaed1.patch"; - hash = "sha256-Frct9XJ/ZuHPglx+GB9h3vVycR8YY039dStIbfkPPDk="; - }) - ]; }; in { mumble = lib.recursiveUpdate (client source) {meta.mainProgram = "mumble";}; diff --git a/pkgs/applications/office/treesheets/default.nix b/pkgs/applications/office/treesheets/default.nix index 65996b7b2e4af..99c0ccfccabff 100644 --- a/pkgs/applications/office/treesheets/default.nix +++ b/pkgs/applications/office/treesheets/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "treesheets"; - version = "0-unstable-2025-01-13"; + version = "0-unstable-2025-01-16"; src = fetchFromGitHub { owner = "aardappel"; repo = "treesheets"; - rev = "89b40de858f598975098a0436637bca8357a4a86"; - hash = "sha256-kduZ+1EYxwuKAIVNBg9u32UD463gpBIjcxSj1FgvIIg="; + rev = "f8edf8abe4d7f18528cec6460831d34ee30881e3"; + hash = "sha256-6EwlpdbLEBu5oUQx6IawaFMkBbmfoRb+lZMZiVLAk8k="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/science/math/pari/default.nix b/pkgs/applications/science/math/pari/default.nix index d876875268b76..39f663cb50fd5 100644 --- a/pkgs/applications/science/math/pari/default.nix +++ b/pkgs/applications/science/math/pari/default.nix @@ -14,7 +14,7 @@ assert withThread -> libpthreadstubs != null; stdenv.mkDerivation rec { pname = "pari"; - version = "2.15.5"; + version = "2.17.1"; src = fetchurl { urls = [ @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { # old versions are at the url below "https://pari.math.u-bordeaux.fr/pub/pari/OLD/${lib.versions.majorMinor version}/${pname}-${version}.tar.gz" ]; - hash = "sha256-Dv3adRXZ2VT2MyTDSzTFYOYPc6gcOSSnEmCizJHV+YE="; + hash = "sha256-Z7pvMHEjNyUlhUHk8XS177xkxlrlEVut6e38RfH95dw="; }; buildInputs = [ diff --git a/pkgs/applications/science/math/wxmaxima/default.nix b/pkgs/applications/science/math/wxmaxima/default.nix index bb363c9f537af..d9db711638e63 100644 --- a/pkgs/applications/science/math/wxmaxima/default.nix +++ b/pkgs/applications/science/math/wxmaxima/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "wxmaxima"; - version = "24.11.0"; + version = "25.01.0"; src = fetchFromGitHub { owner = "wxMaxima-developers"; repo = "wxmaxima"; rev = "Version-${finalAttrs.version}"; - hash = "sha256-3tGMkxp7nadD+LNluIiyPf55Daf7N1MPTH62U8/GxuA="; + hash = "sha256-XFlEBmKxpi7NnUxVXV2F+zQKrvR4r93aLtHOoVZ7SPw="; }; buildInputs = [ diff --git a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix index 0c582199a6af6..5867656b2cbcf 100644 --- a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix +++ b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix @@ -45,8 +45,8 @@ let } else { - version = "2024.4"; - hash = "sha256-rGGOzi5Yr6hrU2xaLE/Lk38HYDGPEtGPEDRra969hqg="; + version = "2024.5"; + hash = "sha256-/s8GsYbN25Qs+0LujaXz6yuZk+aswKLxjRSsCwFEJPM="; }; in stdenv.mkDerivation rec { diff --git a/pkgs/applications/version-management/git-cliff/default.nix b/pkgs/applications/version-management/git-cliff/default.nix index 889a67312200b..a8c2adba6ee68 100644 --- a/pkgs/applications/version-management/git-cliff/default.nix +++ b/pkgs/applications/version-management/git-cliff/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "git-cliff"; - version = "2.7.0"; + version = "2.8.0"; src = fetchFromGitHub { owner = "orhun"; repo = "git-cliff"; rev = "v${version}"; - hash = "sha256-wGxxLfl+d8uTPLHPL2EKpaL36x0or7PHwdVaZTlKITE="; + hash = "sha256-B421xXt7TrBJVwi04vygnw9t5o7/KLVpuItQtwV4E24="; }; - cargoHash = "sha256-8G6iyvnKYxiRotQH7SwLSZStJg7iDNw4zPvT9sUTvmA="; + cargoHash = "sha256-geg6gdPKUBJBJI/TpW5m+/q/7M7kmIlrU2UAauctFOM="; # attempts to run the program on .git in src which is not deterministic doCheck = false; diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix index 0379d5cac956e..84f94437aa3e4 100644 --- a/pkgs/applications/version-management/gitlab/default.nix +++ b/pkgs/applications/version-management/gitlab/default.nix @@ -69,7 +69,7 @@ let buildFlags = [ "--enable-system-libraries" ]; }; gitlab-glfm-markdown = attrs: { - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { src = stdenv.mkDerivation { inherit (buildRubyGem { inherit (attrs) gemName version source; }) name @@ -83,7 +83,7 @@ let cp Cargo.lock $out ''; }; - hash = "sha256-vFApyObuqsMBXhT2yyMpH7rzW0GaPgJUn9/hE/GpS9I="; + hash = "sha256-fikyG1e45XP+oWOxuCdapW1zM2O02KozqB5qnbw2TY8="; }; dontBuild = false; diff --git a/pkgs/applications/video/obs-studio/plugins/obs-shaderfilter.nix b/pkgs/applications/video/obs-studio/plugins/obs-shaderfilter.nix index cce98123da026..6c2074bd7f7ee 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-shaderfilter.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-shaderfilter.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "obs-shaderfilter"; - version = "2.4.0"; + version = "2.4.1"; src = fetchFromGitHub { owner = "exeldro"; repo = "obs-shaderfilter"; rev = version; - sha256 = "sha256-k/9/8hMdD5ODNXFBBhaLxc6EjRImO+sGD274SkzenNg="; + sha256 = "sha256-J4g8PTPtVkKNkUTb0Ntz+HT4AaNCtqt58KfZOMS6llE="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index 8ec8874f51e4a..f4054613cdc60 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -74,8 +74,9 @@ let buildType = "release"; # Use maintainers/scripts/update.nix to update the version and all related hashes or # change the hashes in extpack.nix and guest-additions/default.nix as well manually. - virtualboxVersion = "7.1.4"; - virtualboxSha256 = "872e7a42b41f8558abbf887f1bdc7aac932bb88b2764d07cbce270cab57e3b5e"; + virtualboxVersion = "7.1.6"; + virtualboxSubVersion = "a"; + virtualboxSha256 = "5a7b13066ec71990af0cc00a5eea9c7ec3c71ca5ed99bb549c85494ce2ea395d"; kvmPatchVersion = "20241220"; kvmPatchHash = "sha256-SYyD79iN6Sp/Mxat+ml3fee9X1vFUFyrwHPnQNboc1c="; @@ -84,7 +85,9 @@ let # modsrc at all. withModsrc = !enableKvm; - virtualboxGuestAdditionsIso = callPackage guest-additions-iso/default.nix { }; + virtualboxGuestAdditionsIso = callPackage guest-additions-iso/default.nix { + inherit virtualboxVersion; + }; inherit (lib) optional @@ -104,11 +107,12 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "virtualbox"; - version = finalAttrs.virtualboxVersion; + version = "${finalAttrs.virtualboxVersion}${finalAttrs.virtualboxSubVersion}"; inherit buildType virtualboxVersion + virtualboxSubVersion virtualboxSha256 kvmPatchVersion kvmPatchHash @@ -116,7 +120,7 @@ stdenv.mkDerivation (finalAttrs: { ; src = fetchurl { - url = "https://download.virtualbox.org/virtualbox/${finalAttrs.virtualboxVersion}/VirtualBox-${finalAttrs.virtualboxVersion}.tar.bz2"; + url = "https://download.virtualbox.org/virtualbox/${finalAttrs.virtualboxVersion}/VirtualBox-${finalAttrs.virtualboxVersion}${finalAttrs.virtualboxSubVersion}.tar.bz2"; sha256 = finalAttrs.virtualboxSha256; }; diff --git a/pkgs/applications/virtualization/virtualbox/extpack.nix b/pkgs/applications/virtualization/virtualbox/extpack.nix index 134ce6424ce5e..7b9eb812064f0 100644 --- a/pkgs/applications/virtualization/virtualbox/extpack.nix +++ b/pkgs/applications/virtualization/virtualbox/extpack.nix @@ -4,17 +4,17 @@ virtualbox, }: let - inherit (virtualbox) version; + virtualboxExtPackVersion = "7.1.6"; in fetchurl rec { - name = "Oracle_VirtualBox_Extension_Pack-${version}.vbox-extpack"; - url = "https://download.virtualbox.org/virtualbox/${version}/${name}"; + name = "Oracle_VirtualBox_Extension_Pack-${virtualboxExtPackVersion}.vbox-extpack"; + url = "https://download.virtualbox.org/virtualbox/${virtualboxExtPackVersion}/${name}"; sha256 = # Manually sha256sum the extensionPack file, must be hex! # Thus do not use `nix-prefetch-url` but instead plain old `sha256sum`. # Checksums can also be found at https://www.virtualbox.org/download/hashes/${version}/SHA256SUMS let - value = "9dd60ef3c52c2a318fbbb6faace5862a299b61f678a579988869865dcf7390b6"; + value = "c13e47d3fb2c849019accb03353c7d04ffb9c264920075972ed2e2befe3cdd8b"; in assert (builtins.stringLength value) == 64; value; diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions-iso/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions-iso/default.nix index 70e68879264d3..61e577ebd95f6 100644 --- a/pkgs/applications/virtualization/virtualbox/guest-additions-iso/default.nix +++ b/pkgs/applications/virtualization/virtualbox/guest-additions-iso/default.nix @@ -1,15 +1,11 @@ { fetchurl, lib, - virtualbox, + virtualboxVersion, }: - -let - inherit (virtualbox) version; -in fetchurl { - url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso"; - sha256 = "80c91d35742f68217cf47b13e5b50d53f54c22c485bacce41ad7fdc321649e61"; + url = "http://download.virtualbox.org/virtualbox/${virtualboxVersion}/VBoxGuestAdditions_${virtualboxVersion}.iso"; + sha256 = "dbbda1645bc05c9260adfe9efc4949cb590ec5ec02680aff936375670cffcafc"; meta = { description = "Guest additions ISO for VirtualBox"; longDescription = '' diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/builder.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/builder.nix index 7219f0f8c58bb..9cb17616805dd 100644 --- a/pkgs/applications/virtualization/virtualbox/guest-additions/builder.nix +++ b/pkgs/applications/virtualization/virtualbox/guest-additions/builder.nix @@ -20,19 +20,23 @@ makeself, linuxHeaders, openssl, + virtualboxVersion, + virtualboxSubVersion, + virtualboxSha256, }: let buildType = "release"; - in stdenv.mkDerivation (finalAttrs: { pname = "VirtualBox-GuestAdditions-builder-${kernel.version}"; - version = "7.1.4"; + version = "${virtualboxVersion}${virtualboxSubVersion}"; + + inherit virtualboxVersion virtualboxSubVersion; src = fetchurl { - url = "https://download.virtualbox.org/virtualbox/${finalAttrs.version}/VirtualBox-${finalAttrs.version}.tar.bz2"; - sha256 = "872e7a42b41f8558abbf887f1bdc7aac932bb88b2764d07cbce270cab57e3b5e"; + url = "https://download.virtualbox.org/virtualbox/${finalAttrs.virtualboxVersion}/VirtualBox-${finalAttrs.virtualboxVersion}${finalAttrs.virtualboxSubVersion}.tar.bz2"; + sha256 = virtualboxSha256; }; env.NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types -Wno-error=implicit-function-declaration"; diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix index 547b6ac551720..2d8365fa3006d 100644 --- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix +++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix @@ -12,7 +12,13 @@ libX11, }: let - virtualBoxNixGuestAdditionsBuilder = callPackage ./builder.nix { }; + virtualboxVersion = "7.1.6"; + virtualboxSubVersion = "a"; + virtualboxSha256 = "5a7b13066ec71990af0cc00a5eea9c7ec3c71ca5ed99bb549c85494ce2ea395d"; + + virtualBoxNixGuestAdditionsBuilder = callPackage ./builder.nix { + inherit virtualboxVersion virtualboxSubVersion virtualboxSha256; + }; # Specifies how to patch binaries to make sure that libraries loaded using # dlopen are found. We grep binaries for specific library names and patch @@ -46,7 +52,7 @@ let in stdenv.mkDerivation { pname = "VirtualBox-GuestAdditions"; - version = "${virtualBoxNixGuestAdditionsBuilder.version}-${kernel.version}"; + version = "${virtualboxVersion}${virtualboxSubVersion}-${kernel.version}"; src = "${virtualBoxNixGuestAdditionsBuilder}/VBoxGuestAdditions-${ if stdenv.hostPlatform.is32bit then "x86" else "amd64" @@ -70,7 +76,7 @@ stdenv.mkDerivation { runHook preBuild # Build kernel modules. - cd src/vboxguest-${virtualBoxNixGuestAdditionsBuilder.version}_NixOS + cd src/vboxguest-${virtualboxVersion}_NixOS # Run just make first. If we only did make install, we get symbol warnings during build. make cd ../.. @@ -102,7 +108,7 @@ stdenv.mkDerivation { mkdir -p $out/bin # Install kernel modules. - cd src/vboxguest-${virtualBoxNixGuestAdditionsBuilder.version}_NixOS + cd src/vboxguest-${virtualboxVersion}_NixOS make install INSTALL_MOD_PATH=$out KBUILD_EXTRA_SYMBOLS=$PWD/vboxsf/Module.symvers cd ../.. diff --git a/pkgs/applications/virtualization/virtualbox/update.sh b/pkgs/applications/virtualization/virtualbox/update.sh index 5c811bea48826..51600df4ce5bf 100755 --- a/pkgs/applications/virtualization/virtualbox/update.sh +++ b/pkgs/applications/virtualization/virtualbox/update.sh @@ -29,19 +29,23 @@ if [ ! "$oldVersion" = "$latestVersion" ]; then virtualboxNixFile=$(nixFile ${attr}) extpackNixFile=$(nixFile ${attr}Extpack) guestAdditionsIsoNixFile="pkgs/applications/virtualization/virtualbox/guest-additions-iso/default.nix" - virtualboxGuestAdditionsNixFile="pkgs/applications/virtualization/virtualbox/guest-additions/builder.nix" + virtualboxGuestAdditionsNixFile="pkgs/applications/virtualization/virtualbox/guest-additions/default.nix" virtualBoxOldShaSum=$(oldHash ${attr}Extpack) extpackOldShaSum=$(oldHash ${attr}Extpack) - sed -e "s/virtualboxVersion =.*;/virtualboxVersion = \"$latestVersion\";/g" \ - -e "s/virtualboxSha256 =.*;/virtualboxSha256 = \"$virtualBoxShaSum\";/g" \ + sed -e "s/virtualboxVersion = \".*\";/virtualboxVersion = \"$latestVersion\";/g" \ + -e "s/virtualboxSubVersion = \".*\";/virtualboxSubVersion = \"\";/g" \ + -e "s/virtualboxSha256 = \".*\";/virtualboxSha256 = \"$virtualBoxShaSum\";/g" \ -i "$virtualboxNixFile" - sed -i -e 's|value = "'$extpackOldShaSum'"|value = "'$extpackShaSum'"|' $extpackNixFile - sed -e "s/sha256 =.*;/sha256 = \"$guestAdditionsIsoShaSum\";/g" \ + sed -e 's|value = "'$extpackOldShaSum'"|value = "'$extpackShaSum'"|' \ + -e "s/virtualboxExtPackVersion = \".*\";/virtualboxExtPackVersion = \"$latestVersion\";/g" \ + -i $extpackNixFile + sed -e "s/sha256 = \".*\";/sha256 = \"$guestAdditionsIsoShaSum\";/g" \ -i "$guestAdditionsIsoNixFile" - sed -e "s/version =.*;/version = \"$latestVersion\";/g" \ - -e "s/sha256 =.*;/sha256 = \"$virtualBoxShaSum\";/g" \ + sed -e "s/virtualboxVersion = \".*\";/virtualboxVersion = \"$latestVersion\";/g" \ + -e "s/virtualboxSubVersion = \".*\";/virtualboxSubVersion = \"\";/g" \ + -e "s/virtualboxSha256 = \".*\";/virtualboxSha256 = \"$virtualBoxShaSum\";/g" \ -i "$virtualboxGuestAdditionsNixFile" git add "$virtualboxNixFile" "$extpackNixFile" "$guestAdditionsIsoNixFile" "$virtualboxGuestAdditionsNixFile" diff --git a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprland-plugins.nix b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprland-plugins.nix index db8fdf62b3d13..fd00d81af44bc 100644 --- a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprland-plugins.nix +++ b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprland-plugins.nix @@ -33,10 +33,7 @@ let homepage = "https://github.com/hyprwm/hyprland-plugins"; description = "Hyprland ${description} plugin"; license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ - fufexan - johnrtitor - ]; + maintainers = lib.teams.hyprland.members; inherit (hyprland.meta) platforms; }; } diff --git a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprsplit.nix b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprsplit.nix index 513f5504ab8e0..ff9a24a9aefd9 100644 --- a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprsplit.nix +++ b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprsplit.nix @@ -9,13 +9,13 @@ }: mkHyprlandPlugin hyprland rec { pluginName = "hyprsplit"; - version = "0.46.2"; + version = "0.47.0"; src = fetchFromGitHub { owner = "shezdy"; repo = "hyprsplit"; rev = "refs/tags/v${version}"; - hash = "sha256-G+fgzjGNkYl5y6XL9K67ixCPEhb02J45cS9uicdC110="; + hash = "sha256-IKcUv2ayfiEoF9mOkt/+ACTSVI0RW/tCA9BS64/qePE="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/window-managers/hyprwm/xdg-desktop-portal-hyprland/default.nix b/pkgs/applications/window-managers/hyprwm/xdg-desktop-portal-hyprland/default.nix index 9da0df03294bb..23cb137956957 100644 --- a/pkgs/applications/window-managers/hyprwm/xdg-desktop-portal-hyprland/default.nix +++ b/pkgs/applications/window-managers/hyprwm/xdg-desktop-portal-hyprland/default.nix @@ -24,6 +24,7 @@ wayland, wayland-protocols, wayland-scanner, + debug ? false, }: gcc14Stdenv.mkDerivation (finalAttrs: { pname = "xdg-desktop-portal-hyprland"; @@ -65,6 +66,10 @@ gcc14Stdenv.mkDerivation (finalAttrs: { wayland-scanner ]; + cmakeBuildType = if debug then "Debug" else "RelWithDebInfo"; + + dontStrip = debug; + dontWrapQtApps = true; postInstall = '' @@ -91,10 +96,7 @@ gcc14Stdenv.mkDerivation (finalAttrs: { changelog = "https://github.com/hyprwm/xdg-desktop-portal-hyprland/releases/tag/v${finalAttrs.version}"; mainProgram = "hyprland-share-picker"; license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ - fufexan - khaneliman - ]; + maintainers = lib.teams.hyprland.members; platforms = lib.platforms.linux; }; }) diff --git a/pkgs/build-support/appimage/default.nix b/pkgs/build-support/appimage/default.nix index 24f1524bad110..ac01b2558c1df 100644 --- a/pkgs/build-support/appimage/default.nix +++ b/pkgs/build-support/appimage/default.nix @@ -156,7 +156,6 @@ rec { libuuid libogg libvorbis - SDL SDL2_image glew110 openssl @@ -179,9 +178,6 @@ rec { libtiff pixman speex - SDL_image - SDL_ttf - SDL_mixer SDL2_ttf SDL2_mixer libappindicator-gtk2 diff --git a/pkgs/build-support/rust/fetch-cargo-vendor.nix b/pkgs/build-support/rust/fetch-cargo-vendor.nix index 899c799c5fcc3..e346ab659af65 100644 --- a/pkgs/build-support/rust/fetch-cargo-vendor.nix +++ b/pkgs/build-support/rust/fetch-cargo-vendor.nix @@ -35,6 +35,9 @@ in name ? if args ? pname && args ? version then "${args.pname}-${args.version}" else "cargo-deps", hash ? (throw "fetchCargoVendor requires a `hash` value to be set for ${name}"), nativeBuildInputs ? [ ], + # This is mostly for breaking infinite recursion where dependencies + # of nix-prefetch-git use fetchCargoVendor. + allowGitDependencies ? true, ... }@args: @@ -53,11 +56,15 @@ let { name = "${name}-vendor-staging"; - nativeBuildInputs = [ - fetchCargoVendorUtil - nix-prefetch-git - cacert - ] ++ nativeBuildInputs; + nativeBuildInputs = + [ + fetchCargoVendorUtil + cacert + ] + ++ lib.optionals allowGitDependencies [ + nix-prefetch-git + ] + ++ nativeBuildInputs; buildPhase = '' runHook preBuild diff --git a/pkgs/build-support/rust/fetchcrate.nix b/pkgs/build-support/rust/fetchcrate.nix index 63a6295002534..b34f0336691b5 100644 --- a/pkgs/build-support/rust/fetchcrate.nix +++ b/pkgs/build-support/rust/fetchcrate.nix @@ -21,6 +21,8 @@ assert pname == null || pname == crateName; { name = "${crateName}-${version}.tar.gz"; url = "${registryDl}/${crateName}/${version}/download"; + + passthru = { inherit pname version; }; } // lib.optionalAttrs unpack { extension = "tar.gz"; diff --git a/pkgs/by-name/wa/wasm-bindgen-cli/package.nix b/pkgs/build-support/wasm-bindgen-cli/default.nix similarity index 78% rename from pkgs/by-name/wa/wasm-bindgen-cli/package.nix rename to pkgs/build-support/wasm-bindgen-cli/default.nix index 9fd1db1cdcde6..4597009c387b8 100644 --- a/pkgs/by-name/wa/wasm-bindgen-cli/package.nix +++ b/pkgs/build-support/wasm-bindgen-cli/default.nix @@ -9,16 +9,18 @@ stdenv, curl, darwin, - version ? "0.2.100", - hash ? "sha256-3RJzK7mkYFrs7C/WkhW9Rr4LdP5ofb2FdYGz1P7Uxog=", - cargoHash ? "sha256-tD0OY2PounRqsRiFh8Js5nyknQ809ZcHMvCOLrvYHRE=", +}: + +{ + version ? src.version, + src, + cargoDeps, }: rustPlatform.buildRustPackage rec { pname = "wasm-bindgen-cli"; - inherit version hash cargoHash; - src = fetchCrate { inherit pname version hash; }; + inherit version src cargoDeps; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/ae/aerc/package.nix b/pkgs/by-name/ae/aerc/package.nix index 469f2d6369c52..7fa713a762e6b 100644 --- a/pkgs/by-name/ae/aerc/package.nix +++ b/pkgs/by-name/ae/aerc/package.nix @@ -2,7 +2,6 @@ lib, buildGoModule, fetchFromSourcehut, - fetchpatch, ncurses, notmuch, scdoc, @@ -10,30 +9,30 @@ w3m, dante, gawk, + versionCheckHook, + nix-update-script, }: buildGoModule rec { pname = "aerc"; - version = "0.20.0"; + version = "0.20.1"; src = fetchFromSourcehut { owner = "~rjarry"; repo = "aerc"; rev = version; - hash = "sha256-0ZSmmmj5PpSORL0s0SSNoZGzct9Ps8j0ILAUCpJOOBw="; + hash = "sha256-IBTM3Ersm8yUCgiBLX8ozuvMEbfmY6eW5xvJD20UgRA="; }; proxyVendor = true; - vendorHash = "sha256-WowRlAzyrfZi27JzskIDberiYt9PQkuS6H3hKqUP9qo="; + vendorHash = "sha256-O1j0J6vCE6rap5/fOTxlUpXAG5mgZf8CfNOB4VOBxms="; nativeBuildInputs = [ scdoc python3Packages.wrapPython ]; - patches = [ - ./runtime-libexec.patch - ]; + patches = [ ./runtime-libexec.patch ]; postPatch = '' substituteAllInPlace config/aerc.conf @@ -47,9 +46,7 @@ buildGoModule rec { makeFlags = [ "PREFIX=${placeholder "out"}" ]; - pythonPath = [ - python3Packages.vobject - ]; + pythonPath = [ python3Packages.vobject ]; buildInputs = [ python3Packages.python @@ -85,12 +82,22 @@ buildGoModule rec { patchShebangs $out/libexec/aerc/filters ''; - meta = with lib; { + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = "--version"; + doInstallCheck = true; + + passthru.updateScript = nix-update-script { }; + + meta = { description = "Email client for your terminal"; homepage = "https://aerc-mail.org/"; - maintainers = [ ]; + changelog = "https://git.sr.ht/~rjarry/aerc/tree/${version}/item/CHANGELOG.md"; + maintainers = with lib.maintainers; [ + defelo + sikmir + ]; mainProgram = "aerc"; - license = licenses.mit; - platforms = platforms.unix; + license = lib.licenses.mit; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/by-name/al/alcom/package.nix b/pkgs/by-name/al/alcom/package.nix index 35336e2237299..55a8997e8f722 100644 --- a/pkgs/by-name/al/alcom/package.nix +++ b/pkgs/by-name/al/alcom/package.nix @@ -106,6 +106,9 @@ rustPlatform.buildRustPackage { -p:Deterministic=true ''; + # NuGet.targets(156,5): error : Unable to load the service index for source https://api.nuget.org/v3/index.json. + NuGetAudit = "false"; + passthru = { inherit (dotnetBuild) fetch-deps; }; diff --git a/pkgs/by-name/al/alist/package.nix b/pkgs/by-name/al/alist/package.nix index e2ba073fa6365..74fc2982563ff 100644 --- a/pkgs/by-name/al/alist/package.nix +++ b/pkgs/by-name/al/alist/package.nix @@ -7,17 +7,18 @@ stdenv, installShellFiles, versionCheckHook, + callPackage, }: buildGoModule rec { pname = "alist"; - version = "3.41.0"; - webVersion = "3.41.0"; + version = "3.42.0"; + webVersion = "3.42.0"; src = fetchFromGitHub { owner = "AlistGo"; repo = "alist"; tag = "v${version}"; - hash = "sha256-DzqSkcyDRyiHM0yh7A+dZj7TnjhDVQoHHgV5piVcu1g="; + hash = "sha256-qUW9bA2TeAVve77i43+ITxClLaO3aqm5959itf+iFqs="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -31,11 +32,11 @@ buildGoModule rec { }; web = fetchzip { url = "https://github.com/AlistGo/alist-web/releases/download/${webVersion}/dist.tar.gz"; - hash = "sha256-1IXvst9VfxuIjUrgmJxTYm8jJQStMK+RlQibQ3fTDGs="; + hash = "sha256-g2+qdLrxuyuqxlyVk32BKJCbMfXNs29KLEPxAkTQHjU="; }; proxyVendor = true; - vendorHash = "sha256-p6JqYmcQR6W7RE7F6NGxoiTxSOESuYjpke0rLRlxeSM="; + vendorHash = "sha256-uid+uT4eOtDsCNsKqGqPc4vMDnKUatG4V2n0Z7r6ccY="; buildInputs = [ fuse ]; @@ -67,6 +68,7 @@ buildGoModule rec { "TestHTTPAll" "TestWebsocketAll" "TestWebsocketCaller" + "TestDownloadOrder" ]; in [ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ]; @@ -88,6 +90,10 @@ buildGoModule rec { versionCheckHook ]; + passthru = { + updateScript = lib.getExe (callPackage ./update.nix { }); + }; + meta = { description = "File list/WebDAV program that supports multiple storages"; homepage = "https://github.com/alist-org/alist"; diff --git a/pkgs/by-name/al/alist/update.nix b/pkgs/by-name/al/alist/update.nix new file mode 100644 index 0000000000000..e32f0c3e6c8d6 --- /dev/null +++ b/pkgs/by-name/al/alist/update.nix @@ -0,0 +1,43 @@ +{ + writeShellApplication, + nix, + nix-update, + curl, + jq, + common-updater-scripts, +}: + +writeShellApplication { + name = "update-alist"; + runtimeInputs = [ + curl + jq + nix + common-updater-scripts + nix-update + ]; + + text = '' + # get old info + oldVersion=$(nix-instantiate --eval --strict -A "alist.version" | jq -e -r) + + get_latest_release() { + local repo=$1 + curl --fail ''${GITHUB_TOKEN:+ -H "Authorization: bearer $GITHUB_TOKEN"} \ + -s "https://api.github.com/repos/AlistGo/$repo/releases/latest" | jq -r ".tag_name" + } + + version=$(get_latest_release "alist") + version="''${version#v}" + webVersion=$(get_latest_release "alist-web") + + if [[ "$oldVersion" == "$version" ]]; then + echo "Already up to date!" + exit 0 + fi + + update-source-version alist "$webVersion" --source-key=web --version-key=webVersion + + nix-update alist --version="$version" + ''; +} diff --git a/pkgs/by-name/am/amazon-ssm-agent/package.nix b/pkgs/by-name/am/amazon-ssm-agent/package.nix index 0f9544044be8c..17c70f916af52 100644 --- a/pkgs/by-name/am/amazon-ssm-agent/package.nix +++ b/pkgs/by-name/am/amazon-ssm-agent/package.nix @@ -42,13 +42,13 @@ let in buildGoModule rec { pname = "amazon-ssm-agent"; - version = "3.3.1345.0"; + version = "3.3.1611.0"; src = fetchFromGitHub { owner = "aws"; repo = "amazon-ssm-agent"; tag = version; - hash = "sha256-6MGb6P3PYfnoztLdLhOm/smCjyWuV7ZGJtK40l4yFB0="; + hash = "sha256-mwru2BAnVSYLXoA+g7eizadSYLr9c3ikEJipo7N1n4Y="; }; vendorHash = null; diff --git a/pkgs/by-name/an/ansible-navigator/package.nix b/pkgs/by-name/an/ansible-navigator/package.nix index 6749994c3c896..92583af360432 100644 --- a/pkgs/by-name/an/ansible-navigator/package.nix +++ b/pkgs/by-name/an/ansible-navigator/package.nix @@ -7,7 +7,7 @@ }: python3Packages.buildPythonApplication rec { pname = "ansible-navigator"; - version = "24.12.0"; + version = "25.1.0"; pyproject = true; disabled = python3Packages.pythonOlder "3.10"; @@ -15,7 +15,7 @@ python3Packages.buildPythonApplication rec { src = fetchPypi { inherit version; pname = "ansible_navigator"; - hash = "sha256-+DJXSwwTIjF0b/i5NHCrnR9N+nMyl8of+zyEmmTzboQ="; + hash = "sha256-WcA14CiUUNXa+yR1IzoyQ7LWBXFI8yzV+xpRj2W8lzQ="; }; build-system = with python3Packages; [ diff --git a/pkgs/by-name/ap/apt/package.nix b/pkgs/by-name/ap/apt/package.nix index e28dde96197e4..6a932fd86f453 100644 --- a/pkgs/by-name/ap/apt/package.nix +++ b/pkgs/by-name/ap/apt/package.nix @@ -1,7 +1,7 @@ { lib, stdenv, - fetchurl, + fetchFromGitLab, bzip2, cmake, curl, @@ -34,11 +34,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "apt"; - version = "2.9.18"; + version = "2.9.25"; - src = fetchurl { - url = "mirror://debian/pool/main/a/apt/apt_${finalAttrs.version}.tar.xz"; - hash = "sha256-mQO7u8ibtqRoeggKG/kLuLo2gC7BlrNUmkwf0FAtGjo="; + src = fetchFromGitLab { + domain = "salsa.debian.org"; + owner = "apt-team"; + repo = "apt"; + rev = finalAttrs.version; + hash = "sha256-YVMqqWF4heSF11b0uKD/EUUBPPzkTtGP3QxnLVY6/l8="; }; # cycle detection; lib can't be split diff --git a/pkgs/by-name/aq/aquamarine/package.nix b/pkgs/by-name/aq/aquamarine/package.nix index e5f44520c15d0..66197c162d8d1 100644 --- a/pkgs/by-name/aq/aquamarine/package.nix +++ b/pkgs/by-name/aq/aquamarine/package.nix @@ -23,13 +23,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "aquamarine"; - version = "0.5.1"; + version = "0.7.2"; src = fetchFromGitHub { owner = "hyprwm"; repo = "aquamarine"; rev = "v${finalAttrs.version}"; - hash = "sha256-Gxv1kTz5jEvIzmkF6XgsdKglL2jmjJOQdZ+hO9uVnlQ="; + hash = "sha256-ldWD4ci3LcBIfUN41qlBO/oR5chcsRLejMbSW8eH628="; }; nativeBuildInputs = [ @@ -71,10 +71,7 @@ stdenv.mkDerivation (finalAttrs: { description = "A very light linux rendering backend library"; homepage = "https://github.com/hyprwm/aquamarine"; license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ - fufexan - johnrtitor - ]; + maintainers = lib.teams.hyprland.members; platforms = lib.platforms.linux ++ lib.platforms.freebsd; }; }) diff --git a/pkgs/by-name/as/asn/package.nix b/pkgs/by-name/as/asn/package.nix index 88f05bb5d41aa..e370f5f599f49 100644 --- a/pkgs/by-name/as/asn/package.nix +++ b/pkgs/by-name/as/asn/package.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "asn"; - version = "0.78.0"; + version = "0.78.3"; src = fetchFromGitHub { owner = "nitefood"; repo = "asn"; tag = "v${version}"; - hash = "sha256-pXPc6cAPqvbECvP3v3Z1Og8jhIhh5zvXomZrxNX6KVI="; + hash = "sha256-ydCpCmW6NK3LM05YLw6KtJWo7UtMcsxQt2RH/Xl+bFw="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/at/atuin/package.nix b/pkgs/by-name/at/atuin/package.nix index ba46f7d97944c..0de5a7b65d140 100644 --- a/pkgs/by-name/at/atuin/package.nix +++ b/pkgs/by-name/at/atuin/package.nix @@ -20,34 +20,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-P/q4XYhpXo9kwiltA0F+rQNSlqI+s8TSi5v5lFJWJ/4="; }; - # the interim crate contains both README.md and readme.md, - # which causes a hash mismatch on systems with a case-insensitive filesystem. - # This removes the readme files and updates cargo's checksum file accordingly - depsExtraArgs = { - nativeBuildInputs = [ - jq - moreutils - ]; - - postBuild = '' - pushd $name/interim - - if [ -e readme.md ]; then - rm --force --verbose README.md readme.md - jq 'del(.files."README.md") | del(.files."readme.md")' \ - .cargo-checksum.json -c \ - | sponge .cargo-checksum.json - - popd - else - echo "ERROR: the interim crate has been updated" - echo "When you see this message, please remove the workaround for the interim crate from the atuin nix expression" - exit 1 - fi - ''; - }; - - cargoHash = "sha256-l8DsQwEJZL9kr9UIpZzebDSRYET2WM8VFwk+O1Qk9oQ="; + useFetchCargoVendor = true; + cargoHash = "sha256-0KswWFy44ViPHlMCmwgVlDe7diDjLmVUk2517BEMTtk="; # atuin's default features include 'check-updates', which do not make sense # for distribution builds. List all other default features. diff --git a/pkgs/by-name/au/autoadb/package.nix b/pkgs/by-name/au/autoadb/package.nix deleted file mode 100644 index a0bb4f32a5658..0000000000000 --- a/pkgs/by-name/au/autoadb/package.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ - lib, - rustPlatform, - fetchFromGitHub, -}: - -rustPlatform.buildRustPackage rec { - pname = "autoadb"; - version = "unstable-2020-06-01"; - - src = fetchFromGitHub { - owner = "rom1v"; - repo = pname; - rev = "7f8402983603a9854bf618a384f679a17cd85e2d"; - sha256 = "sha256-9Sv38dCtvbqvxSnRpq+HsIwF/rfLUVZbi0J+mltLres="; - }; - - cargoHash = "sha256-xxmBgJqtWq1FLWTaC8SjaBoSXkPcIZYrSOc+hCEN778="; - - meta = with lib; { - description = "Execute a command whenever a device is adb-connected"; - homepage = "https://github.com/rom1v/autoadb"; - license = licenses.asl20; - maintainers = with maintainers; [ shawn8901 ]; - mainProgram = "autoadb"; - }; -} diff --git a/pkgs/by-name/au/automatic-timezoned/package.nix b/pkgs/by-name/au/automatic-timezoned/package.nix index 18a7ff55a86ca..386aabd5cc870 100644 --- a/pkgs/by-name/au/automatic-timezoned/package.nix +++ b/pkgs/by-name/au/automatic-timezoned/package.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "automatic-timezoned"; - version = "2.0.45"; + version = "2.0.50"; src = fetchFromGitHub { owner = "maxbrunet"; repo = pname; rev = "v${version}"; - sha256 = "sha256-8fgOhmjFXC0nMs7oTfJWbn1DOmOU9RtTgR+xmV/nZ9g="; + sha256 = "sha256-xXTm7/NS9XJRX/MQld7+GVOum9iW0wYfvaEve7K5cIk="; }; - cargoHash = "sha256-4WytstmBjd0FCSxY4omrZZhcSq1xSPQKFz7S4jZukVA="; + cargoHash = "sha256-WH2voVKUip5T9a4vVhe0N8YhuAiXD1JMyaIJ3lHWcrY="; meta = with lib; { description = "Automatically update system timezone based on location"; diff --git a/pkgs/by-name/av/avalonia/package.nix b/pkgs/by-name/av/avalonia/package.nix index 0484dd665c426..3bea156c1c91b 100644 --- a/pkgs/by-name/av/avalonia/package.nix +++ b/pkgs/by-name/av/avalonia/package.nix @@ -26,8 +26,8 @@ let dotnet-sdk = with dotnetCorePackages; combinePackages [ - sdk_7_0_1xx - runtime_6_0 + sdk_7_0_1xx-bin + runtime_6_0-bin ]; npmDepsFile = ./npm-deps.nix; diff --git a/pkgs/by-name/az/azure-storage-azcopy/package.nix b/pkgs/by-name/az/azure-storage-azcopy/package.nix index aa6b36ffabcd4..168c76410192a 100644 --- a/pkgs/by-name/az/azure-storage-azcopy/package.nix +++ b/pkgs/by-name/az/azure-storage-azcopy/package.nix @@ -6,18 +6,18 @@ buildGoModule rec { pname = "azure-storage-azcopy"; - version = "10.27.1"; + version = "10.28.0"; src = fetchFromGitHub { owner = "Azure"; repo = "azure-storage-azcopy"; tag = "v${version}"; - hash = "sha256-h/EiJZMX2vHn/t1FPM1ZkXf9I8LYiqK1GqkSDAlXBYY="; + hash = "sha256-dRS96M4KMEQaKYVA0fNgmmfH2JYVFbEjH8C3xA9knes="; }; subPackages = [ "." ]; - vendorHash = "sha256-7ZUQMJPYE62M47VqEwahVePC85x3TyOmADOVczUrj7w="; + vendorHash = "sha256-TwzcjhL8STH8tASTp2kQjn6bYyn/Ab+EJwvIGOBT+1A="; doCheck = false; diff --git a/pkgs/by-name/ba/bacon/package.nix b/pkgs/by-name/ba/bacon/package.nix index 0e4b02fb8e064..c1845323e58b5 100644 --- a/pkgs/by-name/ba/bacon/package.nix +++ b/pkgs/by-name/ba/bacon/package.nix @@ -6,40 +6,54 @@ pkg-config, alsa-lib, versionCheckHook, + bacon, nix-update-script, + + withSound ? false, }: +let + soundDependencies = + lib.optionals stdenv.hostPlatform.isLinux [ + alsa-lib + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + # bindgenHook is only included on darwin as it is needed to build `coreaudio-sys`, a darwin-specific crate + rustPlatform.bindgenHook + ]; +in + rustPlatform.buildRustPackage rec { pname = "bacon"; - version = "3.9.0"; + version = "3.9.1"; src = fetchFromGitHub { owner = "Canop"; repo = "bacon"; tag = "v${version}"; - hash = "sha256-LnJlE4ostOl+pr+d7ZsAfKvG4C45qt4pedWpeiTchPU="; + hash = "sha256-TniEPcY3mK5LO9CBXi5kgnUQkOeDwF9n1K0kSn4ucKk="; }; - cargoHash = "sha256-KS1SXrRqjvRom2zZOaaZZOMK2CRUwVmtXC2ilDfaEG0="; + cargoHash = "sha256-5pY43PH2I4L/QsNnJffBGiRtuZrnLVCxjo0YseLsEMc="; - nativeBuildInputs = [ + buildFeatures = lib.optionals withSound [ + "sound" + ]; + + nativeBuildInputs = lib.optionals withSound [ pkg-config ]; - buildInputs = - lib.optionals stdenv.hostPlatform.isLinux [ - alsa-lib - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - # bindgenHook is only included on darwin as it is needed to build `coreaudio-sys`, a darwin-specific crate - rustPlatform.bindgenHook - ]; + buildInputs = lib.optionals withSound soundDependencies; nativeInstallCheckInputs = [ versionCheckHook ]; versionCheckProgramArg = [ "--version" ]; doInstallCheck = true; passthru = { + tests = { + withSound = bacon.override { withSound = true; }; + }; updateScript = nix-update-script { }; }; diff --git a/pkgs/by-name/ba/baddns/package.nix b/pkgs/by-name/ba/baddns/package.nix index aea9b5bf287ee..c36e0b7eb0ec9 100644 --- a/pkgs/by-name/ba/baddns/package.nix +++ b/pkgs/by-name/ba/baddns/package.nix @@ -7,14 +7,14 @@ python3.pkgs.buildPythonApplication rec { pname = "baddns"; - version = "1.6.68"; + version = "1.7.86"; pyproject = true; src = fetchFromGitHub { owner = "blacklanternsecurity"; repo = "baddns"; tag = version; - hash = "sha256-TQPjSmLXgcHYxBQFO1QPozs1XRaJDTakGN24LLuFdfY="; + hash = "sha256-Jj36aNNYCwqK/Yux92YmCxywftoizXZE39qLhLpjAaw="; }; pythonRelaxDeps = true; diff --git a/pkgs/by-name/ba/basicswap/package.nix b/pkgs/by-name/ba/basicswap/package.nix new file mode 100644 index 0000000000000..e8ecd5a406db7 --- /dev/null +++ b/pkgs/by-name/ba/basicswap/package.nix @@ -0,0 +1,104 @@ +{ + lib, + python3Packages, + fetchFromGitHub, + linkFarm, + secp256k1, + particl-core, + bitcoind, + namecoind, + monero-cli, + wownero, +}: + +let + secp256k1_anonswap = secp256k1.overrideAttrs (old: { + src = fetchFromGitHub { + owner = "tecnovert"; + repo = "secp256k1"; + rev = "fd8b63ccf8bcb48358a42c456f34e2488a55a688"; + hash = "sha256-/bmKZRBBjirI4YqRKfzoxdAt6UVoWHmrNQQHX7l+eH8="; + }; + configureFlags = old.configureFlags ++ [ + "--enable-experimental" + "--enable-module-ed25519" + "--enable-module-generator" + "--enable-module-dleag" + "--enable-module-ecdsaotves" + ]; + }); + coincurve-anonswap = + (python3Packages.coincurve.override { + secp256k1 = secp256k1_anonswap; + }).overrideAttrs + (old: { + src = fetchFromGitHub { + owner = "tecnovert"; + repo = "coincurve"; + rev = "932366c9d4d8e487162b5c1b2a2d9693e24e0483"; + hash = "sha256-zOekPmP1zR/S+zxq/7OrEz24k8SInlsB+wJ8kPlmqe4="; + }; + }); + bindir = linkFarm "bindir" ( + lib.mapAttrs (_: p: "${lib.getBin p}/bin") { + particl = particl-core; + bitcoin = bitcoind; + namecoin = namecoind; + monero = monero-cli; + wownero = wownero; + #TODO: add pivx after it's not broken + } + ); +in +python3Packages.buildPythonApplication rec { + pname = "basicswap"; + version = "0.14.3"; + pyproject = true; + + src = fetchFromGitHub { + owner = "basicswap"; + repo = "basicswap"; + tag = "v${version}"; + hash = "sha256-Ay7MQJdbPDjbtfaIWsegu01KIjlKQqdqH3MomYW7KGc="; + }; + + postPatch = '' + substituteInPlace basicswap/config.py --replace-fail 'os.path.join("~", ".basicswap", "bin")' '"${bindir}"' + substituteInPlace basicswap/bin/prepare.py \ + --replace-fail "bin_dir = None" "bin_dir = '${bindir}'" \ + --replace-fail "no_cores = False" "no_cores = True" + ''; + + build-system = with python3Packages; [ + hatchling + ]; + + dependencies = with python3Packages; [ + coincurve-anonswap + wheel + pyzmq + protobuf + sqlalchemy_1_4 + python-gnupg + jinja2 + pycryptodome + pysocks + mnemonic + ]; + + postInstall = '' + install -Dm755 scripts/createoffers.py $out/bin/basicswap-createoffers + ''; + + doCheck = false; + + passthru.bindir = bindir; + + meta = with lib; { + description = "Basic Atomic Swap Proof of Concept"; + homepage = "https://basicswapdex.com"; + license = licenses.mit; + maintainers = with maintainers; [ linsui ]; + mainProgram = "basicswap-run"; + }; +} diff --git a/pkgs/by-name/ba/batmon/package.nix b/pkgs/by-name/ba/batmon/package.nix index 131fdd0af1622..c9272a6e5364c 100644 --- a/pkgs/by-name/ba/batmon/package.nix +++ b/pkgs/by-name/ba/batmon/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-+kjDNQKlaoI5fQ5FqYF6IPCKeE92WKxIhVCKafqfE0o="; }; - cargoHash = "sha256-DJpWBset6SW7Ahg60+Tu1VpH34LcVOyrEs9suKyTE9g="; + useFetchCargoVendor = true; + cargoHash = "sha256-0SXb8jBAYKnNFguamSMosPE6gH9aUzydF16w3SLhOU4="; meta = with lib; { description = "Interactive batteries viewer"; diff --git a/pkgs/by-name/be/beatsabermodmanager/package.nix b/pkgs/by-name/be/beatsabermodmanager/package.nix index 486dd4217b77a..51e6b983ec192 100644 --- a/pkgs/by-name/be/beatsabermodmanager/package.nix +++ b/pkgs/by-name/be/beatsabermodmanager/package.nix @@ -21,11 +21,11 @@ buildDotnetModule rec { }; dotnet-sdk = with dotnetCorePackages; combinePackages [ - sdk_7_0 - sdk_6_0 + sdk_7_0-bin + sdk_6_0-bin ]; - dotnet-runtime = dotnetCorePackages.runtime_7_0; + dotnet-runtime = dotnetCorePackages.runtime_7_0-bin; projectFile = [ "BeatSaberModManager/BeatSaberModManager.csproj" ]; diff --git a/pkgs/by-name/be/bento/package.nix b/pkgs/by-name/be/bento/package.nix new file mode 100644 index 0000000000000..9d2f51a3be7be --- /dev/null +++ b/pkgs/by-name/be/bento/package.nix @@ -0,0 +1,52 @@ +{ + lib, + fetchFromGitHub, + buildGoModule, + versionCheckHook, + nix-update-script, +}: + +buildGoModule rec { + pname = "bento"; + version = "1.4.1"; + + src = fetchFromGitHub { + owner = "warpstreamlabs"; + repo = "bento"; + tag = "v${version}"; + hash = "sha256-ukmmmvc5CWctDO+YaW/PiqWizfXtgbcMlIK6PjhxMm4="; + }; + + vendorHash = "sha256-G67i4tZoevlrj+LhjCoHReoWkIZUQVt4YBavmj+h2OI="; + + subPackages = [ + "cmd/bento" + "cmd/serverless/bento-lambda" + ]; + + ldflags = [ + "-s" + "-w" + "-X github.com/warpstreamlabs/bento/internal/cli.Version=${version}" + "-X main.Version=${version}" + ]; + + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = [ "--version" ]; + doInstallCheck = true; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "High performance and resilient stream processor"; + homepage = "https://warpstreamlabs.github.io/bento/"; + changelog = "https://github.com/warpstreamlabs/bento/releases/tag/v${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ genga898 ]; + mainProgram = "bento"; + badPlatforms = [ + # cannot find module providing package github.com/microsoft/gocosmos + lib.systems.inspect.patterns.isDarwin + ]; + }; +} diff --git a/pkgs/by-name/bi/bicep/package.nix b/pkgs/by-name/bi/bicep/package.nix index dc3c3cb908a87..4a824fea8da04 100644 --- a/pkgs/by-name/bi/bicep/package.nix +++ b/pkgs/by-name/bi/bicep/package.nix @@ -26,7 +26,7 @@ buildDotnetModule rec { nugetDeps = ./deps.json; - dotnet-sdk = dotnetCorePackages.sdk_8_0; + dotnet-sdk = dotnetCorePackages.sdk_8_0_4xx-bin; dotnet-runtime = dotnetCorePackages.runtime_8_0; diff --git a/pkgs/by-name/bi/bililiverecorder/package.nix b/pkgs/by-name/bi/bililiverecorder/package.nix index 3efa80e687eae..af7b1b432a362 100644 --- a/pkgs/by-name/bi/bililiverecorder/package.nix +++ b/pkgs/by-name/bi/bililiverecorder/package.nix @@ -9,8 +9,8 @@ let pname = "bililiverecorder"; dotnet = with dotnetCorePackages; combinePackages [ - runtime_6_0 - aspnetcore_6_0 + runtime_6_0-bin + aspnetcore_6_0-bin ]; version = "2.13.0"; diff --git a/pkgs/by-name/bi/bind/package.nix b/pkgs/by-name/bi/bind/package.nix index 73b0651c704d3..b2af814b2c1da 100644 --- a/pkgs/by-name/bi/bind/package.nix +++ b/pkgs/by-name/bi/bind/package.nix @@ -26,11 +26,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "bind"; - version = "9.18.28"; + version = "9.18.33"; src = fetchurl { url = "https://downloads.isc.org/isc/bind9/${finalAttrs.version}/${finalAttrs.pname}-${finalAttrs.version}.tar.xz"; - hash = "sha256-58zpoWX3thnu/Egy8KjcFrAF0p44kK7WAIxQbqKGpec="; + hash = "sha256-+zc/rF67xBxkUWCv1an7RRkY9sDmmrHZR0FU4rUV3kA="; }; outputs = [ @@ -150,7 +150,9 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://www.isc.org/bind/"; description = "Domain name server"; license = licenses.mpl20; - changelog = "https://downloads.isc.org/isc/bind9/cur/${lib.versions.majorMinor finalAttrs.version}/CHANGES"; + changelog = "https://downloads.isc.org/isc/bind9/cur/${lib.versions.majorMinor finalAttrs.version}/doc/arm/html/notes.html#notes-for-bind-${ + lib.replaceStrings [ "." ] [ "-" ] finalAttrs.version + }"; maintainers = with maintainers; [ globin ]; platforms = platforms.unix; diff --git a/pkgs/by-name/bl/blockbench/package.nix b/pkgs/by-name/bl/blockbench/package.nix index 8a5ccf20934aa..d5236efdea777 100644 --- a/pkgs/by-name/bl/blockbench/package.nix +++ b/pkgs/by-name/bl/blockbench/package.nix @@ -12,13 +12,13 @@ buildNpmPackage rec { pname = "blockbench"; - version = "4.12.0"; + version = "4.12.2"; src = fetchFromGitHub { owner = "JannisX11"; repo = "blockbench"; tag = "v${version}"; - hash = "sha256-1pIIy2ifbV05hnmBoUcMfs0KDiBQDS6opwFqj6ECTIA="; + hash = "sha256-/OdSV/wTrs6roiPiSQCqCLrlWtkB11gm3DM7r7B4HUU="; }; nativeBuildInputs = @@ -28,7 +28,7 @@ buildNpmPackage rec { copyDesktopItems ]; - npmDepsHash = "sha256-ytuAyEuf4zZm1hm/RXdltjisPNsmYrVnTfL1U3ULcCw="; + npmDepsHash = "sha256-ZM3hFMHuKl5BW1+10czESDknc9jIZ024mUSUdNHF3EM="; env.ELECTRON_SKIP_BINARY_DOWNLOAD = 1; diff --git a/pkgs/by-name/bl/blueberry/package.nix b/pkgs/by-name/bl/blueberry/package.nix index f32e619f56f55..1bcd602ccac57 100644 --- a/pkgs/by-name/bl/blueberry/package.nix +++ b/pkgs/by-name/bl/blueberry/package.nix @@ -13,9 +13,10 @@ xapp, }: -stdenv.mkDerivation rec { +python3Packages.buildPythonApplication rec { pname = "blueberry"; version = "1.4.8"; + format = "other"; src = fetchFromGitHub { owner = "linuxmint"; @@ -26,7 +27,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ gobject-introspection - python3Packages.wrapPython wrapGAppsHook3 ]; @@ -34,7 +34,6 @@ stdenv.mkDerivation rec { bluez-tools gnome-bluetooth_1_0 libnotify - python3Packages.python util-linux xapp ]; @@ -53,28 +52,28 @@ stdenv.mkDerivation rec { # Fix paths substituteInPlace $out/bin/blueberry \ - --replace /usr/lib/blueberry $out/lib/blueberry + --replace-fail /usr/lib/blueberry $out/lib/blueberry substituteInPlace $out/bin/blueberry-tray \ - --replace /usr/lib/blueberry $out/lib/blueberry + --replace-fail /usr/lib/blueberry $out/lib/blueberry substituteInPlace $out/etc/xdg/autostart/blueberry-obex-agent.desktop \ - --replace /usr/lib/blueberry $out/lib/blueberry + --replace-fail /usr/lib/blueberry $out/lib/blueberry substituteInPlace $out/etc/xdg/autostart/blueberry-tray.desktop \ - --replace Exec=blueberry-tray Exec=$out/bin/blueberry-tray + --replace-fail Exec=blueberry-tray Exec=$out/bin/blueberry-tray substituteInPlace $out/lib/blueberry/blueberry-obex-agent.py \ - --replace /usr/share $out/share + --replace-fail /usr/share $out/share substituteInPlace $out/lib/blueberry/blueberry-tray.py \ - --replace /usr/share $out/share + --replace-fail /usr/share $out/share substituteInPlace $out/lib/blueberry/blueberry.py \ - --replace '"bt-adapter"' '"${bluez-tools}/bin/bt-adapter"' \ - --replace /usr/bin/pavucontrol ${pavucontrol}/bin/pavucontrol \ - --replace /usr/lib/blueberry $out/lib/blueberry \ - --replace /usr/share $out/share + --replace-fail '"bt-adapter"' '"${bluez-tools}/bin/bt-adapter"' \ + --replace-fail /usr/bin/pavucontrol ${pavucontrol}/bin/pavucontrol \ + --replace-fail /usr/lib/blueberry $out/lib/blueberry \ + --replace-fail /usr/share $out/share substituteInPlace $out/lib/blueberry/rfkillMagic.py \ - --replace /usr/bin/rfkill ${util-linux}/bin/rfkill \ - --replace /usr/sbin/rfkill ${util-linux}/bin/rfkill \ - --replace /usr/lib/blueberry $out/lib/blueberry + --replace-fail /usr/bin/rfkill ${util-linux}/bin/rfkill \ + --replace-fail /usr/sbin/rfkill ${util-linux}/bin/rfkill \ + --replace-fail /usr/lib/blueberry $out/lib/blueberry substituteInPlace $out/share/applications/blueberry.desktop \ - --replace Exec=blueberry Exec=$out/bin/blueberry + --replace-fail Exec=blueberry Exec=$out/bin/blueberry glib-compile-schemas --strict $out/share/glib-2.0/schemas diff --git a/pkgs/by-name/bo/boogie/package.nix b/pkgs/by-name/bo/boogie/package.nix index 4aa6d5c45076a..71ef9beadd799 100644 --- a/pkgs/by-name/bo/boogie/package.nix +++ b/pkgs/by-name/bo/boogie/package.nix @@ -17,7 +17,7 @@ buildDotnetModule rec { hash = "sha256-IWtYbb1IFB6DLIYYTP+q7q+h/0aqonxr/mWwf+83aRo="; }; - dotnet-sdk = dotnetCorePackages.sdk_6_0; + dotnet-sdk = dotnetCorePackages.sdk_6_0-bin; projectFile = [ "Source/Boogie.sln" ]; nugetDeps = ./deps.json; diff --git a/pkgs/by-name/br/brlaser/package.nix b/pkgs/by-name/br/brlaser/package.nix index fff6673a9cf8a..deeda18924ec1 100644 --- a/pkgs/by-name/br/brlaser/package.nix +++ b/pkgs/by-name/br/brlaser/package.nix @@ -18,7 +18,11 @@ stdenv.mkDerivation rec { sha256 = "sha256-1fvO9F7ifbYQHAy54mOx052XutfKXSK6iT/zj4Mhbww="; }; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ + cmake + cups + ]; + buildInputs = [ zlib cups @@ -29,7 +33,7 @@ stdenv.mkDerivation rec { "-DCUPS_DATA_DIR=share/cups" ]; - meta = with lib; { + meta = { description = "CUPS driver for Brother laser printers"; longDescription = '' Although most Brother printers support a standard printer language such as PCL or PostScript, not all do. If you have a monochrome Brother laser printer (or multi-function device) and the other open source drivers don't work, this one might help. @@ -68,8 +72,8 @@ stdenv.mkDerivation rec { Lenovo M7605D ''; homepage = "https://github.com/pdewacht/brlaser"; - license = licenses.gpl2Plus; - platforms = platforms.linux; - maintainers = with maintainers; [ StijnDW ]; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ StijnDW ]; }; } diff --git a/pkgs/by-name/c3/c3-lsp/package.nix b/pkgs/by-name/c3/c3-lsp/package.nix index e5d879b64bee3..9bd26fde545e0 100644 --- a/pkgs/by-name/c3/c3-lsp/package.nix +++ b/pkgs/by-name/c3/c3-lsp/package.nix @@ -6,18 +6,18 @@ buildGoModule rec { pname = "c3-lsp"; - version = "0.3.3"; + version = "0.4.0"; src = fetchFromGitHub { owner = "pherrymason"; repo = "c3-lsp"; rev = "v${version}"; - hash = "sha256-1EuDXQGzqNM19SRokM9GGzA2ZcD0XaCbywErVSjINIM="; + hash = "sha256-MScpFh4J4jVJI5WtW4tfNB18YDpxs+ass1HmXyOO5VM="; }; sourceRoot = "${src.name}/server"; - vendorHash = "sha256-7g0Z392ksrvV+D9nMw325BykwLd9mvXRS1Zv6RNSs0w="; + vendorHash = "sha256-eT+Qirl0R1+di3JvXxggGK/nK9+nqw+8QEur+ldJXSc="; postInstall = '' mv $out/bin/lsp $out/bin/c3-lsp diff --git a/pkgs/by-name/ca/can-utils/package.nix b/pkgs/by-name/ca/can-utils/package.nix index 3dd97b7e8f64d..8d377fdb39974 100644 --- a/pkgs/by-name/ca/can-utils/package.nix +++ b/pkgs/by-name/ca/can-utils/package.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "can-utils"; - version = "2023.03"; + version = "2025.01"; src = fetchFromGitHub { owner = "linux-can"; repo = "can-utils"; rev = "v${version}"; - hash = "sha256-FaopviBJOmO0lXoJcdKNdtsoaJ8JrFEJGyO1aNBv+Pg="; + hash = "sha256-wum0hqPj3rCHHubNsOnj89tvrRQxoXrGQvZFcMKAGME="; }; makeFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/by-name/ca/canaille/package.nix b/pkgs/by-name/ca/canaille/package.nix index be6bc98756968..76a433cb7e952 100644 --- a/pkgs/by-name/ca/canaille/package.nix +++ b/pkgs/by-name/ca/canaille/package.nix @@ -11,7 +11,7 @@ let in python.pkgs.buildPythonApplication rec { pname = "canaille"; - version = "0.0.56"; + version = "0.0.57"; pyproject = true; disabled = python.pythonOlder "3.10"; @@ -20,7 +20,7 @@ python.pkgs.buildPythonApplication rec { owner = "yaal"; repo = "canaille"; rev = "refs/tags/${version}"; - hash = "sha256-cLsLwttUDxMKVqtVDCY5A22m1YY1UezeZQh1j74WzgU="; + hash = "sha256-pesN7k5kGHi3dqTMaXWdCsNsnaJxXv/Ku1wVC9N9a3k="; }; build-system = with python.pkgs; [ @@ -35,6 +35,7 @@ python.pkgs.buildPythonApplication rec { flask flask-wtf pydantic-settings + requests wtforms ] ++ sentry-sdk.optional-dependencies.flask; @@ -51,6 +52,7 @@ python.pkgs.buildPythonApplication rec { pytest-lazy-fixtures pytest-smtpd pytest-xdist + scim2-tester slapd toml faker @@ -58,8 +60,11 @@ python.pkgs.buildPythonApplication rec { ] ++ optional-dependencies.front ++ optional-dependencies.oidc + ++ optional-dependencies.scim ++ optional-dependencies.ldap - ++ optional-dependencies.postgresql; + ++ optional-dependencies.postgresql + ++ optional-dependencies.otp + ++ optional-dependencies.sms; postInstall = '' mkdir -p $out/etc/schema @@ -88,6 +93,10 @@ python.pkgs.buildPythonApplication rec { zxcvbn-rs-py ]; oidc = [ authlib ]; + scim = [ + scim2-models + authlib + ]; ldap = [ python-ldap ]; sentry = [ sentry-sdk ]; postgresql = [ @@ -95,7 +104,13 @@ python.pkgs.buildPythonApplication rec { sqlalchemy sqlalchemy-json sqlalchemy-utils - ] ++ sqlalchemy.optional-dependencies.postgresql; + ] ++ sqlalchemy.optional-dependencies.postgresql_psycopg2binary; + otp = [ + otpauth + pillow + qrcode + ]; + sms = [ smpplib ]; }; passthru = { diff --git a/pkgs/by-name/ca/capslock/package.nix b/pkgs/by-name/ca/capslock/package.nix index 4460368a1123e..5deac4688fef1 100644 --- a/pkgs/by-name/ca/capslock/package.nix +++ b/pkgs/by-name/ca/capslock/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "capslock"; - version = "0.2.6"; + version = "0.2.7"; src = fetchFromGitHub { owner = "google"; repo = "capslock"; rev = "v${version}"; - hash = "sha256-8B9L/lLRxDI6/qUCbL8VM37glDFBTaqb0fGI9BYfICU="; + hash = "sha256-kRuEcrx9LBzCpXFWlc9bSsgZt84T8R8VFdbAWAseSPQ="; }; - vendorHash = "sha256-gmvnpJurjhCGS3/FH6HBZ0Zwx57ArSaw5dLHtJXCFc8="; + vendorHash = "sha256-CUw4ukSAs12dprgcQRfdoKzY7gbzUCHk0t2SrUMtrxo="; subPackages = [ "cmd/capslock" ]; diff --git a/pkgs/by-name/ca/cargo-leptos/package.nix b/pkgs/by-name/ca/cargo-leptos/package.nix index 5979fbfc84e50..8cb3688c0ad70 100644 --- a/pkgs/by-name/ca/cargo-leptos/package.nix +++ b/pkgs/by-name/ca/cargo-leptos/package.nix @@ -16,16 +16,16 @@ let in rustPlatform.buildRustPackage rec { pname = "cargo-leptos"; - version = "0.2.25"; + version = "0.2.26"; src = fetchFromGitHub { owner = "leptos-rs"; repo = pname; rev = "v${version}"; - hash = "sha256-vgYr6mMS2O4/102R+6iCW9IBziM1tIav569d36iIbl8="; + hash = "sha256-v1gNH3pq5db/swsk79nEzgtR4jy3f/xHs4QaLnVcVYU="; }; - cargoHash = "sha256-Q3+tOpvzDqIn2M6Zrm1xK6TeTV4zrxK0PYgcIsEBIhE="; + cargoHash = "sha256-D9/ZXmXWrKhLLx2aJZgctidpxef53Z7H+X37m8Yz0Hs="; buildInputs = optionals isDarwin [ SystemConfiguration diff --git a/pkgs/by-name/ca/cargo-pgo/package.nix b/pkgs/by-name/ca/cargo-pgo/package.nix index 8ababffbe753d..7491968378320 100644 --- a/pkgs/by-name/ca/cargo-pgo/package.nix +++ b/pkgs/by-name/ca/cargo-pgo/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-pgo"; - version = "0.2.8"; + version = "0.2.9"; src = fetchFromGitHub { owner = "kobzol"; repo = pname; rev = "v${version}"; - hash = "sha256-yt9QAgpu667JkdNS7OiB/wB9BLXXpis0ZhWjYuETteU="; + hash = "sha256-FmZllibhesZY/8kIMnx4VfQrYF6+/cai7Gozda/3bMY="; }; - cargoHash = "sha256-T49RfBInMZeTPT7HhZIwhfK48ORKDD14fcShC6lFApI="; + cargoHash = "sha256-LxsUoujk6wwI67Y1XMVnZiJRKyLZupPX0JNFPUz9p30="; # Integration tests do not run in Nix build environment due to needing to # create and build Cargo workspaces. diff --git a/pkgs/by-name/ca/cargo-tauri/package.nix b/pkgs/by-name/ca/cargo-tauri/package.nix index 6bd040f99a0f7..ddd2f5bcb4f72 100644 --- a/pkgs/by-name/ca/cargo-tauri/package.nix +++ b/pkgs/by-name/ca/cargo-tauri/package.nix @@ -13,17 +13,17 @@ rustPlatform.buildRustPackage rec { pname = "tauri"; - version = "2.2.3"; + version = "2.2.7"; src = fetchFromGitHub { owner = "tauri-apps"; repo = "tauri"; - tag = "tauri-v${version}"; - hash = "sha256-VZPMy1UMvELcJxu5DHz4YSVe4wVrxrJjeiJK3ySczCA="; + tag = "tauri-cli-v${version}"; + hash = "sha256-BUZMIrPaeoYgmzzkPNEf83KjeiY9dlObivlC3jO5vIc="; }; useFetchCargoVendor = true; - cargoHash = "sha256-LcwOKUFiHoZ4WmTlwqsA2A9BZkBLPEINjZSyk6skvbA="; + cargoHash = "sha256-OhKp7fZjsVrB/ipvzFAei7kRqYgybrSm6uZRAnijKek="; nativeBuildInputs = [ pkg-config ]; @@ -48,7 +48,7 @@ rustPlatform.buildRustPackage rec { updateScript = nix-update-script { extraArgs = [ "--version-regex" - "tauri-v(.*)" + "tauri-cli-v(.*)" ]; }; }; diff --git a/pkgs/by-name/ca/cargo-tauri/test-app.nix b/pkgs/by-name/ca/cargo-tauri/test-app.nix index 8f039fffd9ea0..083817e6959bd 100644 --- a/pkgs/by-name/ca/cargo-tauri/test-app.nix +++ b/pkgs/by-name/ca/cargo-tauri/test-app.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: { src ; - hash = "sha256-deLcw84MsSqoVTUgqEJrcZhzFxACw56WIgsC8iYR4zk="; + hash = "sha256-zG4TmZlZ6oPvbDr3a8RlhM6ivtMG+vWox/OJETSUR2A="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/security/cewl/Gemfile b/pkgs/by-name/ce/cewl/Gemfile similarity index 100% rename from pkgs/tools/security/cewl/Gemfile rename to pkgs/by-name/ce/cewl/Gemfile diff --git a/pkgs/tools/security/cewl/Gemfile.lock b/pkgs/by-name/ce/cewl/Gemfile.lock similarity index 100% rename from pkgs/tools/security/cewl/Gemfile.lock rename to pkgs/by-name/ce/cewl/Gemfile.lock diff --git a/pkgs/tools/security/cewl/gemset.nix b/pkgs/by-name/ce/cewl/gemset.nix similarity index 100% rename from pkgs/tools/security/cewl/gemset.nix rename to pkgs/by-name/ce/cewl/gemset.nix diff --git a/pkgs/tools/security/cewl/default.nix b/pkgs/by-name/ce/cewl/package.nix similarity index 100% rename from pkgs/tools/security/cewl/default.nix rename to pkgs/by-name/ce/cewl/package.nix diff --git a/pkgs/by-name/ch/chirpstack-rest-api/package.nix b/pkgs/by-name/ch/chirpstack-rest-api/package.nix index cdc711873a36d..7abde58978fec 100644 --- a/pkgs/by-name/ch/chirpstack-rest-api/package.nix +++ b/pkgs/by-name/ch/chirpstack-rest-api/package.nix @@ -6,16 +6,16 @@ }: buildGoModule rec { pname = "chirpstack-rest-api"; - version = "4.10.2"; + version = "4.11.0"; src = fetchFromGitHub { owner = "chirpstack"; repo = "chirpstack-rest-api"; rev = "v${version}"; - hash = "sha256-t7JACy26BzmkC7f/KGATw8V+lqEqhkPjEg6LHQ6REWE="; + hash = "sha256-yYuSciMsQudGqBPNqj28TZgCGtZb9j7mtEkBR8tbEm4="; }; - vendorHash = "sha256-Y4KGcLms5TAWHcvm9OYKty3+Lciycy+31zokVAPx/pI="; + vendorHash = "sha256-UZ1todyWnxRTnqEGc/2rM+JCZPWYG/WA+OnivpB6JGI="; ldflags = [ "-s" diff --git a/pkgs/by-name/ci/cirrus-cli/package.nix b/pkgs/by-name/ci/cirrus-cli/package.nix index 0449246e01963..548a364c28b88 100644 --- a/pkgs/by-name/ci/cirrus-cli/package.nix +++ b/pkgs/by-name/ci/cirrus-cli/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "cirrus-cli"; - version = "0.134.0"; + version = "0.135.0"; src = fetchFromGitHub { owner = "cirruslabs"; repo = "cirrus-cli"; rev = "v${version}"; - hash = "sha256-f7EMIz2MR5LgW2chIkOyUx2BuC/EBJVR8AOl+ufHwu0="; + hash = "sha256-s7nJ6fhmVZf/+uuN7rW+lq0Xvlz9p425yQNzoTRxTLo="; }; vendorHash = "sha256-FMUBwrY5PJLsd507340PC+f0f9PzPblFYpnNi6hiNeM="; diff --git a/pkgs/by-name/cl/clash-verge-rev/package.nix b/pkgs/by-name/cl/clash-verge-rev/package.nix index 46c5006a21a86..3bbc157b7ffda 100644 --- a/pkgs/by-name/cl/clash-verge-rev/package.nix +++ b/pkgs/by-name/cl/clash-verge-rev/package.nix @@ -30,7 +30,7 @@ let hash = "sha256-kZf5O3n0xmNUN0G4hAWQDN9Oj9K7PtLpv6jnhh1C5Hg="; }; - service-cargo-hash = "sha256-uo/2QBsZzoTdwRiW0Kr7GGiQCpQH4lW4h5XHqWd5sTU="; + service-cargo-hash = "sha256-Sof0jnU5+IGWMmbqVqJmhUzDO6CRlFpwwzYx9Z5tZbk="; service = callPackage ./service.nix { inherit diff --git a/pkgs/by-name/cl/clash-verge-rev/service.nix b/pkgs/by-name/cl/clash-verge-rev/service.nix index 841ab702fbeeb..9641abcc922d7 100644 --- a/pkgs/by-name/cl/clash-verge-rev/service.nix +++ b/pkgs/by-name/cl/clash-verge-rev/service.nix @@ -27,5 +27,6 @@ rustPlatform.buildRustPackage { OPENSSL_NO_VENDOR = 1; }; + useFetchCargoVendor = true; cargoHash = service-cargo-hash; } diff --git a/pkgs/by-name/cl/clock-rs/package.nix b/pkgs/by-name/cl/clock-rs/package.nix new file mode 100644 index 0000000000000..089223d9093ba --- /dev/null +++ b/pkgs/by-name/cl/clock-rs/package.nix @@ -0,0 +1,37 @@ +{ + lib, + fetchFromGitHub, + rustPlatform, +}: + +rustPlatform.buildRustPackage rec { + pname = "clock-rs"; + version = "0.1.213"; + + src = fetchFromGitHub { + owner = "Oughie"; + repo = "clock-rs"; + tag = "v${version}"; + sha256 = "06spnadlgy7902bqhhi6019ay5y55qfrarsfidp938icali9q5pi"; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-3XIPrKt6oYugIo5erBE/od55AvBGEZe46l8DMXhhzF4="; + + meta = { + description = "Modern, digital clock that effortlessly runs in your terminal"; + longDescription = '' + clock-rs is a terminal-based clock written in Rust, designed to be a new alternative to tty-clock. + It supports all major platforms and offers several improvements, which include: + + The use of a single configuration file to manage its settings, with the ability to overwrite them through the command line, + Many additional features such as a timer and a stopwatch, + And greater flexibility as well as better user experience! + ''; + homepage = "https://github.com/Oughie/clock-rs"; + license = lib.licenses.asl20; + mainProgram = "clock-rs"; + maintainers = [ lib.maintainers.oughie ]; + platforms = lib.platforms.all; + }; +} diff --git a/pkgs/development/tools/cocogitto/default.nix b/pkgs/by-name/co/cocogitto/package.nix similarity index 100% rename from pkgs/development/tools/cocogitto/default.nix rename to pkgs/by-name/co/cocogitto/package.nix diff --git a/pkgs/tools/admin/coldsnap/default.nix b/pkgs/by-name/co/coldsnap/package.nix similarity index 100% rename from pkgs/tools/admin/coldsnap/default.nix rename to pkgs/by-name/co/coldsnap/package.nix diff --git a/pkgs/by-name/co/colorstorm/0001-fix-segfault.patch b/pkgs/by-name/co/colorstorm/0001-fix-segfault.patch new file mode 100644 index 0000000000000..af572eb75fb39 --- /dev/null +++ b/pkgs/by-name/co/colorstorm/0001-fix-segfault.patch @@ -0,0 +1,12 @@ +diff --git a/src/templator.zig b/src/templator.zig +index 5630a04..0dc8ca7 100644 +--- a/src/templator.zig ++++ b/src/templator.zig +@@ -77,7 +77,6 @@ pub fn parse_themes(f: std.fs.File) ![]Theme { + } + + const parsed = try std.json.parseFromSlice([]Theme, a, list.items, .{}); +- defer parsed.deinit(); + const themes = parsed.value; + + return themes; diff --git a/pkgs/by-name/co/colorstorm/package.nix b/pkgs/by-name/co/colorstorm/package.nix index 0f997fa2cc8a1..a665bd9ed5579 100644 --- a/pkgs/by-name/co/colorstorm/package.nix +++ b/pkgs/by-name/co/colorstorm/package.nix @@ -2,22 +2,31 @@ lib, stdenv, fetchFromGitHub, - zig_0_9, + zig_0_13, }: stdenv.mkDerivation (finalAttrs: { pname = "colorstorm"; - version = "2.0.0"; + # last tagged release is three years old and requires outdated Zig 0.9 + # new release requested in: https://github.com/benbusby/colorstorm/issues/16 + version = "2.0.0-unstable-2025-01-17"; src = fetchFromGitHub { owner = "benbusby"; repo = "colorstorm"; - rev = "v${finalAttrs.version}"; - hash = "sha256-6+P+QQpP1jxsydqhVrZkjl1gaqNcx4kS2994hOBhtu8="; + rev = "e645c4293fb5f72968038dac99e0b8dab3db194f"; + hash = "sha256-6D+aNcjJksv7E9RJB9fnzgzvGoUPXV4Shz5wLu5YHtg="; }; + patches = [ + # Fixes a use-after-free segfault. + # See https://github.com/benbusby/colorstorm/pull/15#discussion_r1930406581 + # and upstream PR https://github.com/NixOS/nixpkgs/pull/377279 + ./0001-fix-segfault.patch + ]; + nativeBuildInputs = [ - zig_0_9.hook + zig_0_13.hook ]; meta = { @@ -25,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/benbusby/colorstorm"; license = lib.licenses.mit; maintainers = [ ]; - inherit (zig_0_9.meta) platforms; + inherit (zig_0_13.meta) platforms; mainProgram = "colorstorm"; }; }) diff --git a/pkgs/by-name/co/commandergenius/package.nix b/pkgs/by-name/co/commandergenius/package.nix index 6008490dac178..a9b0afe5d19da 100644 --- a/pkgs/by-name/co/commandergenius/package.nix +++ b/pkgs/by-name/co/commandergenius/package.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "commandergenius"; - version = "3.5.1"; + version = "3.5.2"; src = fetchFromGitLab { owner = "Dringgstein"; repo = "Commander-Genius"; rev = "v${version}"; - hash = "sha256-sWnx2UdnuuLcTxhuXhfG2ssnFvuGi9kOBrpc4jiKgTs="; + hash = "sha256-4WfHdgn8frcDVa3Va6vo/jZihf09vIs+bNdAxScgovE="; }; buildInputs = [ diff --git a/pkgs/by-name/co/conjure-tor/package.nix b/pkgs/by-name/co/conjure-tor/package.nix new file mode 100644 index 0000000000000..98794f2791c84 --- /dev/null +++ b/pkgs/by-name/co/conjure-tor/package.nix @@ -0,0 +1,29 @@ +{ + lib, + buildGoModule, + fetchFromGitLab, + nix-update-script, +}: +buildGoModule { + pname = "conjure-tor"; + version = "0-unstable-2024-11-11"; + + src = fetchFromGitLab { + domain = "gitlab.torproject.org"; + owner = "tpo"; + repo = "anti-censorship/pluggable-transports/conjure"; + rev = "a773daab19928f37caf2ec4181f0da2e0d20d35a"; + hash = "sha256-WC9QEgwhu7ynf2p8SXzMf8JNp6ZzF4S9Lk2SjUWj2lU="; + }; + + vendorHash = "sha256-vdcpNYa2gjacK0DMQ6VP9kX6f10JOHn8+Wr1Ql+lI7o="; + + passthru.updateScript = nix-update-script { }; + + meta = { + homepage = "https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/conjure"; + description = "Refraction networking system that routes traffic to endpoints in an ISP's unused IP address space"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ mksafavi ]; + }; +} diff --git a/pkgs/by-name/co/containerlab/package.nix b/pkgs/by-name/co/containerlab/package.nix index 9f1912c3dce98..4811830f1fa4d 100644 --- a/pkgs/by-name/co/containerlab/package.nix +++ b/pkgs/by-name/co/containerlab/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "containerlab"; - version = "0.62.0"; + version = "0.62.2"; src = fetchFromGitHub { owner = "srl-labs"; repo = "containerlab"; rev = "v${version}"; - hash = "sha256-6WDmjVRLvh8FBydaN41Vj4B5BIkIF9VnvhRcJR3k9Ec="; + hash = "sha256-RUe/IHHhZKbxtNVxiS29/OPvpCCOzaz2d5Qh3vVll3U="; }; vendorHash = "sha256-G9W4iC04R5Rvl3hAJtMlUKJKo7AAIE33Y2c+0HedXU8="; diff --git a/pkgs/by-name/cp/cpuinfo/package.nix b/pkgs/by-name/cp/cpuinfo/package.nix index 17134da281049..357e71fa03791 100644 --- a/pkgs/by-name/cp/cpuinfo/package.nix +++ b/pkgs/by-name/cp/cpuinfo/package.nix @@ -10,13 +10,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "cpuinfo"; - version = "0-unstable-2024-12-09"; + version = "0-unstable-2025-01-10"; src = fetchFromGitHub { owner = "pytorch"; repo = "cpuinfo"; - rev = "ca156f7bc9109c552973414a63d310f76ef0cbf8"; - hash = "sha256-hIGizsl1NSGySXPI9Xx69xCfQLAMpYviYhBXX201N4o="; + rev = "8a1772a0c5c447df2d18edf33ec4603a8c9c04a6"; + hash = "sha256-dKmZ5YXLhvVdxaJ4PefR+SWlh+MTFHNxOMeM6Vj7Gvo="; }; passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; }; diff --git a/pkgs/by-name/cr/crowdin-cli/package.nix b/pkgs/by-name/cr/crowdin-cli/package.nix index d53f28993c5df..6cdea35be0bf6 100644 --- a/pkgs/by-name/cr/crowdin-cli/package.nix +++ b/pkgs/by-name/cr/crowdin-cli/package.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "crowdin-cli"; - version = "4.5.1"; + version = "4.5.2"; src = fetchurl { url = "https://github.com/crowdin/crowdin-cli/releases/download/${finalAttrs.version}/crowdin-cli.zip"; - hash = "sha256-wmW6RBVMdpcawCEgLaZwOLStdUIWumsgc39Y0Kv8uEE="; + hash = "sha256-gg9cBN0N4KGHW6i56uO5+UE1YJFMa2aQ8nJV8JPSvmU="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/da/darklua/package.nix b/pkgs/by-name/da/darklua/package.nix index cc634b7980ce8..fbc53beefe77b 100644 --- a/pkgs/by-name/da/darklua/package.nix +++ b/pkgs/by-name/da/darklua/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "darklua"; - version = "0.15.0"; + version = "0.16.0"; src = fetchFromGitHub { owner = "seaofvoices"; repo = "darklua"; rev = "v${version}"; - hash = "sha256-OLx3J8E9PYXgWbQncWoezyptrbFYcw3xmXzYAn7IUFw="; + hash = "sha256-D83cLJ6voLvgZ51qLoCUzBG83VFB3Y7HxuaZHpaiOn4="; }; - cargoHash = "sha256-bG5bjtA5a1gSabH9nqfYg/gdt2jfddlbPY3P6HEhQ2s="; + cargoHash = "sha256-0FQ6b6rT4NKKCWRsLw/olAiwLxSUj3VtxNiHZTGI78o="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreServices diff --git a/pkgs/by-name/dd/ddclient/package.nix b/pkgs/by-name/dd/ddclient/package.nix index 86847869864bd..ff13221d32029 100644 --- a/pkgs/by-name/dd/ddclient/package.nix +++ b/pkgs/by-name/dd/ddclient/package.nix @@ -12,7 +12,7 @@ let in perlPackages.buildPerlPackage rec { pname = "ddclient"; - version = "3.11.2"; + version = "4.0.0"; outputs = [ "out" ]; @@ -20,7 +20,7 @@ perlPackages.buildPerlPackage rec { owner = "ddclient"; repo = "ddclient"; rev = "v${version}"; - sha256 = "sha256-d1G+AM28nBpMWh1QBjm78KKeOL5b5arxERYRCXohwBg="; + sha256 = "sha256-RCE24RKcW4EhicOTwgz5UE/gzqLxw+UNNk960vFx5Gs="; }; postPatch = '' diff --git a/pkgs/by-name/dd/ddns-go/package.nix b/pkgs/by-name/dd/ddns-go/package.nix index 37b971c477de9..ed322327016a5 100644 --- a/pkgs/by-name/dd/ddns-go/package.nix +++ b/pkgs/by-name/dd/ddns-go/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "ddns-go"; - version = "6.8.0"; + version = "6.8.1"; src = fetchFromGitHub { owner = "jeessy2"; repo = pname; rev = "v${version}"; - hash = "sha256-zVNlsFPSLI8mXBUOo8z7nM4nShNd0ZwG5lZL2VyeGi8="; + hash = "sha256-a8torNtFdBq19a4eb0uMgivtF7FUF1DX6g8kyCc4Gxg="; }; vendorHash = "sha256-D66uremGVcTcyBlCA9vrQM5zGPFR96FqVak6tATEdI0="; diff --git a/pkgs/by-name/de/deltachat-desktop/package.nix b/pkgs/by-name/de/deltachat-desktop/package.nix index 7b118f2c0cc80..3cdbafdc33f03 100644 --- a/pkgs/by-name/de/deltachat-desktop/package.nix +++ b/pkgs/by-name/de/deltachat-desktop/package.nix @@ -19,17 +19,17 @@ let deltachat-rpc-server' = deltachat-rpc-server.overrideAttrs rec { - version = "1.154.3"; + version = "1.155.1"; src = fetchFromGitHub { owner = "deltachat"; repo = "deltachat-core-rust"; tag = "v${version}"; - hash = "sha256-SjNFgvg6sHW40v13OuR3BL3+JdDxntDCKtbe/C/04as="; + hash = "sha256-XZLKvOvdyvR5poRY/oo9MHi1f2XzBmSDR8VqjW3wq74="; }; cargoDeps = rustPlatform.fetchCargoVendor { pname = "deltachat-core-rust"; inherit version src; - hash = "sha256-kbSRGuyCJlTxzKr/C+MLczqT7WNTqZ2/Z42psbBFW+w="; + hash = "sha256-ZxKR1M9wqmzKVbSdBKzTsKF9tDVRGHnd+Ra9Jy5CQQY="; }; }; electron = electron_32; @@ -37,18 +37,18 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "deltachat-desktop"; - version = "1.52.0"; + version = "1.52.1"; src = fetchFromGitHub { owner = "deltachat"; repo = "deltachat-desktop"; tag = "v${finalAttrs.version}"; - hash = "sha256-yKIGgeUjfpw0MMCnrD2TYrACfb/V6681IukZZY8feZc="; + hash = "sha256-L/dgdg7Yrosy054Jdo2ST3x37kQ+CHOEN92/YNjnTYc="; }; pnpmDeps = pnpm.fetchDeps { inherit (finalAttrs) pname version src; - hash = "sha256-YgHJN0LNgXoDCLqOw891CD23kpQ0wCnKFp5WccTHHw8="; + hash = "sha256-ovwdFpVFqXaGqsYc1ldhimqgdi0CXjQYMMMcmUXtMFc="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/di/dinish/package.nix b/pkgs/by-name/di/dinish/package.nix new file mode 100644 index 0000000000000..7e316fc56e1ae --- /dev/null +++ b/pkgs/by-name/di/dinish/package.nix @@ -0,0 +1,37 @@ +{ + lib, + stdenvNoCC, + fetchzip, + nix-update-script, +}: + +stdenvNoCC.mkDerivation rec { + pname = "dinish"; + version = "4.005"; + + src = fetchzip { + url = "https://github.com/playbeing/dinish/releases/download/v${version}/dinish-ttf.zip"; + stripRoot = false; + hash = "sha256-K4JzqzlxOpy4rIF9kdrQlCIyrykDhnF1p1Q8CDMWBqg="; + }; + + installPhase = '' + runHook preInstall + + install -Dm644 *.ttf -t $out/share/fonts/truetype + + runHook postInstall + ''; + + passthru.updateScript = nix-update-script { }; + + meta = with lib; { + homepage = "https://github.com/playbeing/dinish"; + changelog = "https://github.com/playbeing/dinish/blob/v${version}/FONTLOG.txt"; + description = "Modern computer font inspired by DIN 1451"; + longDescription = "DINish is one of many modern computer fonts that were inspired by the lettering of the German Autobahn road signs. It is professionally designed, and usable for body text and captions, even spreadsheets. Its unadorned style is easy to read, and although it is close to a century old maintains a fresh look."; + license = licenses.ofl; + platforms = platforms.all; + maintainers = with maintainers; [ vji ]; + }; +} diff --git a/pkgs/by-name/do/dotenv-cli/package.nix b/pkgs/by-name/do/dotenv-cli/package.nix index 8ca6297020bc6..5db7d841e907a 100644 --- a/pkgs/by-name/do/dotenv-cli/package.nix +++ b/pkgs/by-name/do/dotenv-cli/package.nix @@ -10,18 +10,18 @@ }: stdenv.mkDerivation rec { pname = "dotenv-cli"; - version = "7.4.3"; + version = "8.0.0"; src = fetchFromGitHub { owner = "entropitor"; repo = "dotenv-cli"; rev = "v${version}"; - hash = "sha256-kR9LSHvbvKLuJBGrsmYMeqF3s8SF+/99OeNlKp9azI8="; + hash = "sha256-cqJGw6z0m1ImFEmG2jfcYjaKVhrGyM4hbOAHC7xNAFY="; }; yarnOfflineCache = fetchYarnDeps { yarnLock = "${src}/yarn.lock"; - hash = "sha256-Sx5DHUAXquqMqJgvhvHcRPqkfWN49+6icUQIos6OHCg="; + hash = "sha256-/w9MZ+hNEwB41VwPSYEY6V0uWmZ4Tsev3h2fa/REm2E="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/dr/drone-runner-docker/package.nix b/pkgs/by-name/dr/drone-runner-docker/package.nix index 290ca71e3bfd6..211a2449fbf9f 100644 --- a/pkgs/by-name/dr/drone-runner-docker/package.nix +++ b/pkgs/by-name/dr/drone-runner-docker/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "drone-runner-docker"; - version = "1.8.3"; + version = "1.8.4"; src = fetchFromGitHub { owner = "drone-runners"; repo = pname; tag = "v${version}"; - sha256 = "sha256-ZoQeCuT5FRhxp/ikB0gkp3QVOQ6OS7ukkz4QanWT9G0="; + sha256 = "sha256-xJbmxoyL4Sb6YkkwgysGte44ZBKYHjc5QdYa+b62C/M="; }; vendorHash = "sha256-KcNp3VdJ201oxzF0bLXY4xWHqHNz54ZrVSI96cfhU+k="; diff --git a/pkgs/by-name/dy/dyalog/package.nix b/pkgs/by-name/dy/dyalog/package.nix index 1ec73cd145281..3b39b5c86428f 100644 --- a/pkgs/by-name/dy/dyalog/package.nix +++ b/pkgs/by-name/dy/dyalog/package.nix @@ -11,7 +11,7 @@ makeWrapper, ncurses5, - dotnet-sdk_8, + dotnetCorePackages, dotnetSupport ? false, alsa-lib, @@ -33,7 +33,7 @@ let dyalogHome = "$out/lib/dyalog"; - makeWrapperArgs = lib.optional dotnetSupport "--set DOTNET_ROOT ${dotnet-sdk_8}/share/dotnet"; + makeWrapperArgs = lib.optional dotnetSupport "--set DOTNET_ROOT ${dotnetCorePackages.sdk_8_0-source}/share/dotnet"; licenseUrl = "https://www.dyalog.com/uploads/documents/Developer_Software_Licence.pdf"; diff --git a/pkgs/by-name/el/element-call/package.nix b/pkgs/by-name/el/element-call/package.nix index 1a3b90799c569..0123a954d8f1d 100644 --- a/pkgs/by-name/el/element-call/package.nix +++ b/pkgs/by-name/el/element-call/package.nix @@ -37,10 +37,18 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ yarnConfigHook yarnBuildHook - yarnInstallHook nodejs ]; + installPhase = '' + runHook preInstall + + mkdir $out + cp -r dist/* $out + + runHook postInstall + ''; + meta = with lib; { homepage = "https://github.com/element-hq/element-call"; description = "Group calls powered by Matrix"; diff --git a/pkgs/by-name/el/element-desktop/element-desktop-pin.nix b/pkgs/by-name/el/element-desktop/element-desktop-pin.nix index ed64279ccb16f..ecdec1f89c8c4 100644 --- a/pkgs/by-name/el/element-desktop/element-desktop-pin.nix +++ b/pkgs/by-name/el/element-desktop/element-desktop-pin.nix @@ -1,7 +1,7 @@ { - "version" = "1.11.89"; + "version" = "1.11.91"; "hashes" = { - "desktopSrcHash" = "sha256-vZLM1AIMxDltB+GeQEcYifnaBC1+4wWkotPFuelHxT0="; - "desktopYarnHash" = "1n057ic4dzcyg3wfr8jj7vab00jg2d1m38y5zk1kab1pka163f1q"; + "desktopSrcHash" = "sha256-nHA/j9V+vZUgY+eCCp/iO458GrXSkla+ruJbJjh9NJw="; + "desktopYarnHash" = "09k4kislf1zimbyn6m68bh2s3kpn2cs9h04wqli3j3qgkplcvxdv"; }; } diff --git a/pkgs/by-name/el/element-web-unwrapped/element-web-pin.nix b/pkgs/by-name/el/element-web-unwrapped/element-web-pin.nix index 6bd45a77319d8..75bc7666939a2 100644 --- a/pkgs/by-name/el/element-web-unwrapped/element-web-pin.nix +++ b/pkgs/by-name/el/element-web-unwrapped/element-web-pin.nix @@ -1,7 +1,7 @@ { - "version" = "1.11.89"; + "version" = "1.11.91"; "hashes" = { - "webSrcHash" = "sha256-K9i5MxTJaX359qsnpfXZBZiNHbhCEy25plUPVUtbGQs="; - "webYarnHash" = "164smvrq9937x0pql20zdqab5w35fcidbywkzlyc5g4w7iwkd9kx"; + "webSrcHash" = "sha256-kdjkmVkoJuV3SBFkVQr4IAi69mAs8V5i3qFOd66BP2s="; + "webYarnHash" = "sha256-in7qiGIXP+Ki820RB/uB2st2FIwrxjqYpdOmmLI6RSM="; }; } diff --git a/pkgs/by-name/el/elmerfem/package.nix b/pkgs/by-name/el/elmerfem/package.nix index 820781d98759a..6c467fc19761b 100644 --- a/pkgs/by-name/el/elmerfem/package.nix +++ b/pkgs/by-name/el/elmerfem/package.nix @@ -58,6 +58,8 @@ stdenv.mkDerivation rec { storepath = placeholder "out"; + NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration"; + cmakeFlags = [ "-DELMER_INSTALL_LIB_DIR=${storepath}/lib" "-DWITH_OpenMP:BOOLEAN=TRUE" diff --git a/pkgs/tools/misc/eludris/default.nix b/pkgs/by-name/el/eludris/package.nix similarity index 100% rename from pkgs/tools/misc/eludris/default.nix rename to pkgs/by-name/el/eludris/package.nix diff --git a/pkgs/by-name/ep/epson-escpr2/package.nix b/pkgs/by-name/ep/epson-escpr2/package.nix index 13bcd4818c8fd..55e7f9974a558 100644 --- a/pkgs/by-name/ep/epson-escpr2/package.nix +++ b/pkgs/by-name/ep/epson-escpr2/package.nix @@ -10,14 +10,14 @@ stdenv.mkDerivation rec { pname = "epson-inkjet-printer-escpr2"; - version = "1.2.25"; + version = "1.2.26"; src = fetchurl { # To find the most recent version go to # https://support.epson.net/linux/Printer/LSB_distribution_pages/en/escpr2.php # and retreive the download link for source package for x86 CPU - url = "https://download3.ebz.epson.net/dsc/f/03/00/16/60/34/8e2b40dc2a02ae67c82b2c55786159f07edf3f5a/epson-inkjet-printer-escpr2-1.2.25-1.src.rpm"; - sha256 = "sha256-rhNv6Ak83KG5SmdVUyu/2UXTB0BTj4yDyKRO++9q8WY="; + url = "https://download3.ebz.epson.net/dsc/f/03/00/16/65/06/8fdecc271f6473178d08ffd6b6f6ca2abc92e32f/epson-inkjet-printer-escpr2-1.2.26-1.src.rpm"; + sha256 = "sha256-Js2iZCS9ZzJVRF8PbDA/U1muOne+upq4sA0u+NVIk/0="; }; unpackPhase = '' diff --git a/pkgs/by-name/ez/eza/package.nix b/pkgs/by-name/ez/eza/package.nix index 23c2ab56f271b..ce97a5b963918 100644 --- a/pkgs/by-name/ez/eza/package.nix +++ b/pkgs/by-name/ez/eza/package.nix @@ -15,16 +15,16 @@ rustPlatform.buildRustPackage rec { pname = "eza"; - version = "0.20.18"; + version = "0.20.19"; src = fetchFromGitHub { owner = "eza-community"; repo = "eza"; rev = "v${version}"; - hash = "sha256-XJ8RYfBduTK5CkvFjVRF6yGkgBdojuewFUrEvRcTJsA="; + hash = "sha256-Fgb2+tKDTL7KxJhRavNc5K8AG98eZFOmDOc+sVY7rdk="; }; - cargoHash = "sha256-FUd2dtSwZEBJDCs5EbgrtHfO2oquZP/4wxhVreCaayg="; + cargoHash = "sha256-+scWqtriW9qh6nqiPV3LNLC333JRw5WZI04BHIZlqE4="; nativeBuildInputs = [ cmake diff --git a/pkgs/by-name/fa/faas-cli/package.nix b/pkgs/by-name/fa/faas-cli/package.nix index babe599b6558a..a9018bd05014d 100644 --- a/pkgs/by-name/fa/faas-cli/package.nix +++ b/pkgs/by-name/fa/faas-cli/package.nix @@ -18,13 +18,13 @@ let in buildGoModule rec { pname = "faas-cli"; - version = "0.17.0"; + version = "0.17.1"; src = fetchFromGitHub { owner = "openfaas"; repo = "faas-cli"; rev = version; - sha256 = "sha256-ZyRKcvHCZ7xpZ2KeQRMYn7W0YI+qp29C3H26Uk55Vuw="; + sha256 = "sha256-pCzYfsL4ZQOyxEpg//Edh+dengXkx6G+OWMNPfIPM+o="; }; vendorHash = null; diff --git a/pkgs/by-name/fe/feishin/package.nix b/pkgs/by-name/fe/feishin/package.nix index dd6cd95f18375..4b7f91f5b05f4 100644 --- a/pkgs/by-name/fe/feishin/package.nix +++ b/pkgs/by-name/fe/feishin/package.nix @@ -3,7 +3,7 @@ stdenv, buildNpmPackage, fetchFromGitHub, - electron_31, + electron_33, darwin, copyDesktopItems, makeDesktopItem, @@ -11,22 +11,22 @@ }: let pname = "feishin"; - version = "0.12.1"; + version = "0.12.2"; src = fetchFromGitHub { owner = "jeffvli"; repo = "feishin"; rev = "v${version}"; - hash = "sha256-UpNtRZhAqRq/sRVkgg/RbLUWNXvHkAyGhu29zWE6Lk0="; + hash = "sha256-2kWeUlOTAd1Usw/cLOARyLqxEzZRk27RuHjLwupnq80="; }; - electron = electron_31; + electron = electron_33; in buildNpmPackage { inherit pname version; inherit src; - npmDepsHash = "sha256-0YfydhQZgxjMvZYosuS+rGA+9qzSYTLilQqMqlnR1oQ="; + npmDepsHash = "sha256-KZsxKDAQ7UTnEemr6S9rqKtqPeTvqrhfxURSGTKkMMM="; npmFlags = [ "--legacy-peer-deps" ]; makeCacheWritable = true; @@ -60,7 +60,7 @@ buildNpmPackage { inherit version; src = "${src}/release/app"; - npmDepsHash = "sha256-KZ4TDf9Nz1/dPWAN/gI3tq0gvzI4BvSR3fawte2n9u0="; + npmDepsHash = "sha256-98P2dNmWcp8Hc8Xe43LM3dtxye7myhp1bHucKoKEcjI="; npmFlags = [ "--ignore-scripts" ]; dontNpmBuild = true; diff --git a/pkgs/by-name/fl/flarum/package.nix b/pkgs/by-name/fl/flarum/package.nix index 489d335f038b5..ab8daa790b82d 100644 --- a/pkgs/by-name/fl/flarum/package.nix +++ b/pkgs/by-name/fl/flarum/package.nix @@ -3,20 +3,20 @@ , fetchFromGitHub }: -php.buildComposerProject (finalAttrs: { +php.buildComposerProject2 (finalAttrs: { pname = "flarum"; version = "1.8.1"; src = fetchFromGitHub { owner = "flarum"; repo = "flarum"; - rev = "v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-kigUZpiHTM24XSz33VQYdeulG1YI5s/M02V7xue72VM="; }; composerLock = ./composer.lock; composerStrictValidation = false; - vendorHash = "sha256-m+x/4A/DcMv7mMfQjpH1vsVqXuMHhSHeX3sgI43uJLI="; + vendorHash = "sha256-pup+ZfPEnqoA3wEXQNn4pWTYXri6d4XzMfuc8k1SeQk="; meta = with lib; { changelog = "https://github.com/flarum/framework/blob/main/CHANGELOG.md"; diff --git a/pkgs/by-name/fl/flashrom/package.nix b/pkgs/by-name/fl/flashrom/package.nix index 0b1af9f9f89b9..87209a371b02d 100644 --- a/pkgs/by-name/fl/flashrom/package.nix +++ b/pkgs/by-name/fl/flashrom/package.nix @@ -53,6 +53,10 @@ stdenv.mkDerivation rec { install -Dm644 util/flashrom_udev.rules $out/lib/udev/rules.d/flashrom.rules ''; + NIX_CFLAGS_COMPILE = lib.optionalString ( + stdenv.cc.isClang && !stdenv.hostPlatform.isDarwin + ) "-Wno-gnu-folding-constant"; + meta = with lib; { homepage = "https://www.flashrom.org"; description = "Utility for reading, writing, erasing and verifying flash ROM chips"; diff --git a/pkgs/by-name/fl/flex-launcher/package.nix b/pkgs/by-name/fl/flex-launcher/package.nix new file mode 100644 index 0000000000000..de73d4b4480eb --- /dev/null +++ b/pkgs/by-name/fl/flex-launcher/package.nix @@ -0,0 +1,48 @@ +{ + stdenv, + fetchFromGitHub, + SDL2, + SDL2_ttf, + SDL2_image, + cmake, + validatePkgConfig, + inih, + lib, + gitUpdater, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "flex-launcher"; + version = "2.2"; + + src = fetchFromGitHub { + owner = "complexlogic"; + repo = "flex-launcher"; + tag = "v${finalAttrs.version}"; + hash = "sha256-touQMOKvp+D1vIYvyz/nU7aU9g6VXpDN3BPgoK/iYfw="; + }; + + nativeBuildInputs = [ + cmake + validatePkgConfig + ]; + + buildInputs = [ + SDL2 + SDL2_ttf + SDL2_image + inih + ]; + + passthru.updateScript = gitUpdater { rev-prefix = "v"; }; + + meta = { + description = "Customizable HTPC application launcher"; + license = lib.licenses.unlicense; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ MasterEvarior ]; + homepage = "https://complexlogic.github.io/flex-launcher/"; + changelog = "https://github.com/complexlogic/flex-launcher/releases/tag/v${finalAttrs.version}"; + mainProgram = "flex-launcher"; + }; +}) diff --git a/pkgs/by-name/fl/fluent-bit/package.nix b/pkgs/by-name/fl/fluent-bit/package.nix index 155acdbe28a49..54223b97e7f3f 100644 --- a/pkgs/by-name/fl/fluent-bit/package.nix +++ b/pkgs/by-name/fl/fluent-bit/package.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "fluent-bit"; - version = "3.2.4"; + version = "3.2.5"; src = fetchFromGitHub { owner = "fluent"; repo = "fluent-bit"; rev = "v${finalAttrs.version}"; - hash = "sha256-oTCGjDmGVovsfj+4fjIKy/xpiuYc0Q44LYwYPI4dSF8="; + hash = "sha256-H3wcKeHfAJNJAEtRcTU8rz93wug39TUqV3XN4wkTqMg="; }; # optional only to avoid linux rebuild diff --git a/pkgs/by-name/fl/flutter_rust_bridge_codegen/package.nix b/pkgs/by-name/fl/flutter_rust_bridge_codegen/package.nix index 8c6146706d35b..8ded3c1db399f 100644 --- a/pkgs/by-name/fl/flutter_rust_bridge_codegen/package.nix +++ b/pkgs/by-name/fl/flutter_rust_bridge_codegen/package.nix @@ -6,17 +6,17 @@ }: rustPlatform.buildRustPackage rec { pname = "flutter_rust_bridge_codegen"; - version = "2.7.0"; + version = "2.7.1"; src = fetchFromGitHub { owner = "fzyzcjy"; repo = "flutter_rust_bridge"; rev = "v${version}"; - hash = "sha256-XHHgKwwGI0v6PD+KQBA8AvUBqUPxefxoJXcZDwjOemQ="; + hash = "sha256-I9IaBOqX93g5i26aMa/ICWKurX/82R9PvINNVWNQuNk="; fetchSubmodules = true; }; - cargoHash = "sha256-MDQFHQQWEStBwrwlGti5bY5HwACcrLrSR9Zs9DxTz/A="; + cargoHash = "sha256-VZ4suSaWg2TfBjcxTuV9Ptkq/rBNmhBygtjsi5twJrk="; cargoBuildFlags = "--package flutter_rust_bridge_codegen"; cargoTestFlags = "--package flutter_rust_bridge_codegen"; diff --git a/pkgs/by-name/fr/frankenphp/package.nix b/pkgs/by-name/fr/frankenphp/package.nix index 506fdac0ebc54..d7395131df7f3 100644 --- a/pkgs/by-name/fr/frankenphp/package.nix +++ b/pkgs/by-name/fr/frankenphp/package.nix @@ -31,13 +31,13 @@ let in buildGoModule rec { pname = "frankenphp"; - version = "1.4.1"; + version = "1.4.2"; src = fetchFromGitHub { owner = "dunglas"; repo = "frankenphp"; tag = "v${version}"; - hash = "sha256-eXyO+Z/qD15smqb2/S1los/zsBVlxuYq+DAkvksMz/s="; + hash = "sha256-lY0nZCaevAlTOLHozOvH1xtLFTLOv093N4mrETt4Lhg="; }; sourceRoot = "${src.name}/caddy"; @@ -45,7 +45,7 @@ buildGoModule rec { # frankenphp requires C code that would be removed with `go mod tidy` # https://github.com/golang/go/issues/26366 proxyVendor = true; - vendorHash = "sha256-KlWRyQz//sR24IJj9RvRtPQG0N0FjVSL6Yrq0Nhgi/A="; + vendorHash = "sha256-LqsdX2oivCYhXBGZBKP+V7iNUoZuW6lRFO9kUpeEvL4="; buildInputs = [ phpUnwrapped diff --git a/pkgs/by-name/fr/frida-tools/package.nix b/pkgs/by-name/fr/frida-tools/package.nix index 4da97c248be64..9cd64d8464482 100644 --- a/pkgs/by-name/fr/frida-tools/package.nix +++ b/pkgs/by-name/fr/frida-tools/package.nix @@ -6,11 +6,11 @@ python3Packages.buildPythonApplication rec { pname = "frida-tools"; - version = "13.6.0"; + version = "13.6.1"; src = fetchPypi { inherit pname version; - hash = "sha256-M0S8tZagToIP6Qyr9RWNAGGfWOcOtO0bYKC02IhCpvg="; + hash = "sha256-imNW0vorY90lp2OkhYLYwgpyW+Vxd1kdq3Lvd4/iNVA="; }; propagatedBuildInputs = with python3Packages; [ diff --git a/pkgs/by-name/fu/fum/package.nix b/pkgs/by-name/fu/fum/package.nix index 88766c821601c..96d24f6623949 100644 --- a/pkgs/by-name/fu/fum/package.nix +++ b/pkgs/by-name/fu/fum/package.nix @@ -11,16 +11,17 @@ }: rustPlatform.buildRustPackage rec { pname = "fum"; - version = "0.4.3"; + version = "0.6.4"; src = fetchFromGitHub { owner = "qxb3"; repo = "fum"; tag = "v${version}"; - hash = "sha256-VRcQWwO80xFn5A21yjRsGqnnWkhWfsJxxEiw78NWJPM="; + hash = "sha256-vBn76s2ewLVVYhyXviQUmq+AzH6FSVdJaTEJQ2EPlM0="; }; - cargoHash = "sha256-GW3/SqQlEUTMtvOgnMGhcREOHz/V2qtjtCAzFFKMNb4="; + useFetchCargoVendor = true; + cargoHash = "sha256-7h/KIAIxldXPXUo0lzuBqs6Uf5S5p39yV+kTfLe/LBo="; nativeBuildInputs = [ autoPatchelfHook diff --git a/pkgs/by-name/gd/gdlauncher-carbon/package.nix b/pkgs/by-name/gd/gdlauncher-carbon/package.nix index b76ff180ac76d..2bf6074c25fbf 100644 --- a/pkgs/by-name/gd/gdlauncher-carbon/package.nix +++ b/pkgs/by-name/gd/gdlauncher-carbon/package.nix @@ -28,13 +28,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "gdlauncher-carbon"; - version = "2.0.20"; + version = "2.0.22"; src = appimageTools.extract { inherit (finalAttrs) pname version; src = fetchurl { url = "https://cdn-raw.gdl.gg/launcher/GDLauncher__${finalAttrs.version}__linux__x64.AppImage"; - hash = "sha256-tI9RU8qO3MHbImOGw2Wl1dksNbhqrYFyGemqms8aAio="; + hash = "sha256-b1d39cSuVJ17rx8vjlYlyIUvqkBbhCWXuq4Z96K1I3M="; }; }; diff --git a/pkgs/by-name/ge/geoserver/extensions.nix b/pkgs/by-name/ge/geoserver/extensions.nix index 9d3d4e63e31e1..96754b9aa427f 100644 --- a/pkgs/by-name/ge/geoserver/extensions.nix +++ b/pkgs/by-name/ge/geoserver/extensions.nix @@ -42,325 +42,325 @@ in { app-schema = mkGeoserverExtension { name = "app-schema"; - version = "2.26.1"; # app-schema - hash = "sha256-klT03jure+ILuQX5X3jdIfUa7AI/bdzTEig2QDs/P5o="; # app-schema + version = "2.26.2"; # app-schema + hash = "sha256-pFjKgEuAFiEN6FJkooKqMHzkbZnQWchzzLFPsA9TDH4="; # app-schema }; authkey = mkGeoserverExtension { name = "authkey"; - version = "2.26.1"; # authkey - hash = "sha256-jjZtUiSQ8ZzsLrinT8Uw628jIRKnGi6XnGT/5GvCwew="; # authkey + version = "2.26.2"; # authkey + hash = "sha256-u1/dbTHZPIImVq46YGWpdsO60wg6jWmc4ttAzasKpcU="; # authkey }; cas = mkGeoserverExtension { name = "cas"; - version = "2.26.1"; # cas - hash = "sha256-FcUlQ9gSb64wxnEZaU1oJViPDbA32GChcdiZ5uvft7w="; # cas + version = "2.26.2"; # cas + hash = "sha256-KagmWS+VNsC1wtasa9UwNZsaUzmbZKG/SPBq91pW4R8="; # cas }; charts = mkGeoserverExtension { name = "charts"; - version = "2.26.1"; # charts - hash = "sha256-IDGBTMa+VMqZIxOFylL29t0h9AoOXe7GJmj3dKrdGQ0="; # charts + version = "2.26.2"; # charts + hash = "sha256-TDv+7JFe5N8HtxjNOFYcfdJ9kdCLBKigdvqzb9p3dow="; # charts }; control-flow = mkGeoserverExtension { name = "control-flow"; - version = "2.26.1"; # control-flow - hash = "sha256-09EuvTTGeaNRLKshhsyHPvE4p9F5IJPV/ig8cNigQbA="; # control-flow + version = "2.26.2"; # control-flow + hash = "sha256-QQowtOOUKJCm1C7VkDHWbIscCal3PsxFMTfi5JUZqi8="; # control-flow }; css = mkGeoserverExtension { name = "css"; - version = "2.26.1"; # css - hash = "sha256-Qy5AYnXIcsoGxnGCjHRK4XiDflT1jVoVKr6Iq/GMYlg="; # css + version = "2.26.2"; # css + hash = "sha256-MgAwSWpSVrGJYRxGt1gCiLXj8uXQ8hvCkfI+yGtZU34="; # css }; csw = mkGeoserverExtension { name = "csw"; - version = "2.26.1"; # csw - hash = "sha256-mZ7BrWFmLrpzW/oM0YovTC+Zb6BMnj1idMSiemNX6Xc="; # csw + version = "2.26.2"; # csw + hash = "sha256-i3ObMkSOnCGihZm8CcMj90jG3B8pYRTX9Yd4uuholKY="; # csw }; csw-iso = mkGeoserverExtension { name = "csw-iso"; - version = "2.26.1"; # csw-iso - hash = "sha256-FV5GDv+fywFhdNJi5hT5qvvPQVBT3TJpjI0SQnmH5BY="; # csw-iso + version = "2.26.2"; # csw-iso + hash = "sha256-zEVkldjEsI+sBbMDvvL2b6DciwwUacsufXgvIDfLYX4="; # csw-iso }; db2 = mkGeoserverExtension { name = "db2"; - version = "2.26.1"; # db2 - hash = "sha256-XlCAFADr8hLFQAbCxrFtrNIBh4S4oEjbezlCwprW8uQ="; # db2 + version = "2.26.2"; # db2 + hash = "sha256-g9J/KZ3ET2HSs1fhVFW8cRe409vfZddBaXoXOgVZrcE="; # db2 }; # Needs wps extension. dxf = mkGeoserverExtension { name = "dxf"; - version = "2.26.1"; # dxf - hash = "sha256-WHuhp+nqO5NemYWGiRcuD5/vlBdmMNT+sdm2a+yk9do="; # dxf + version = "2.26.2"; # dxf + hash = "sha256-Ninuw1npfy3lND0O8Tu87hv/gXPQFC3vU8H1oE8aLdc="; # dxf }; excel = mkGeoserverExtension { name = "excel"; - version = "2.26.1"; # excel - hash = "sha256-JRNM+JilMODNb2r4XEBRj2wkIb/zc6e6Q+U+/X8egAY="; # excel + version = "2.26.2"; # excel + hash = "sha256-Lqkbr6KTtiKUmW5A3Uqem0C81oNnLd6eVzm/MwvnYjg="; # excel }; feature-pregeneralized = mkGeoserverExtension { name = "feature-pregeneralized"; - version = "2.26.1"; # feature-pregeneralized - hash = "sha256-I0UzMFkZF9SaIFI+GcfegxdC4IFIUi6+GsutotJ5i1Q="; # feature-pregeneralized + version = "2.26.2"; # feature-pregeneralized + hash = "sha256-T6NiDBOIpqQKEAm58558seSpHSA84w9K1C9l2Xy/sWQ="; # feature-pregeneralized }; # Note: The extension name ("gdal") clashes with pkgs.gdal. gdal = mkGeoserverExtension { name = "gdal"; - version = "2.26.1"; # gdal + version = "2.26.2"; # gdal buildInputs = [ pkgs.gdal ]; - hash = "sha256-EoaKKlEhch5/wg4SODx9JV9+M+4Ui9Wcb2HSM1bcgLE="; # gdal + hash = "sha256-OgkoB2VY4x+6kfDDbOMKUzyd6/Q1m9YMC6sZU17qRsE="; # gdal }; # Throws "java.io.FileNotFoundException: URL [jar:file:/nix/store/.../WEB-INF/lib/gs-geofence-server-2.24.1.jar!/geofence-default-override.properties] cannot be resolved to absolute file path because it does not reside in the file system: jar:file:/nix/store/.../WEB-INF/lib/gs-geofence-server-2.24.1.jar!/geofence-default-override.properties" but seems to work out of the box. #geofence = mkGeoserverExtension { # name = "geofence"; - # version = "2.26.1"; # geofence - # hash = "sha256-B2yPPEOsdBDxO/mG3W6MYBqhigjvS6YTZTsvHoUzBAg="; # geofence + # version = "2.26.2"; # geofence + # hash = "sha256-gXJYk64qO78hQhEmmJU98mrSYIKK/DlRPptdS6rFDD0="; # geofence #}; #geofence-server = mkGeoserverExtension { # name = "geofence-server"; - # version = "2.26.1"; # geofence-server - # hash = "sha256-pgWWomyBmru2tfQfuGdomQirN0Km3j5W/JG644vNHZQ="; # geofence-server + # version = "2.26.2"; # geofence-server + # hash = "sha256-tyxIjQNmATtLy1X9dmaLugsbMyg7+2+NMx8a5jvVvDU="; # geofence-server #}; #geofence-wps = mkGeoserverExtension { # name = "geofence-wps"; - # version = "2.26.1"; # geofence-wps - # hash = "sha256-hQBYJ+jXx3/GOVzqcSS1w/Zc0GKAD2fyIX5lm9kiPmg="; # geofence-wps + # version = "2.26.2"; # geofence-wps + # hash = "sha256-ZU5E5SsYBpOvguYhHXLrm5IJzYtSggcF+iqB76LB05g="; # geofence-wps #}; geopkg-output = mkGeoserverExtension { name = "geopkg-output"; - version = "2.26.1"; # geopkg-output - hash = "sha256-9EuI9Hvvxdf1FmJ6AMHmbc5RJr33MlBbGd9NqNwacFo="; # geopkg-output + version = "2.26.2"; # geopkg-output + hash = "sha256-XzzT6g5G26/NZzdCl4wqtQUbNfMGrc5/lI/HRN+x8BU="; # geopkg-output }; grib = mkGeoserverExtension { name = "grib"; - version = "2.26.1"; # grib - hash = "sha256-o87Fyy+remmP8c3m4TZ6TX+lUoPdH//P2yJ1DeV+iBs="; # grib + version = "2.26.2"; # grib + hash = "sha256-9onvPoSFOLODqedOLW3Bf0IJLE3UtuMSF8l4dGysMDs="; # grib buildInputs = [ netcdf ]; }; gwc-s3 = mkGeoserverExtension { name = "gwc-s3"; - version = "2.26.1"; # gwc-s3 - hash = "sha256-7XLrG4sJ1Bvw6d0qzT0ZGLVQ8wr9br9mUEwZGvd9U+s="; # gwc-s3 + version = "2.26.2"; # gwc-s3 + hash = "sha256-3z7DfkY/NP9ESfZWI+/ubHwHmBJM0SYyJGNVz7oAuVc="; # gwc-s3 }; h2 = mkGeoserverExtension { name = "h2"; - version = "2.26.1"; # h2 - hash = "sha256-ldqz1tPPJkyJPFBeltDUIDLwZtTu8mpSHRbWGsY3TfY="; # h2 + version = "2.26.2"; # h2 + hash = "sha256-7wsbxACFtmtL1ApQy1DT2yYzOF51nfi7CWYlUGfYoKY="; # h2 }; iau = mkGeoserverExtension { name = "iau"; - version = "2.26.1"; # iau - hash = "sha256-mzkYYPfixrSx7+r0lSrOw9agocpi7BogDnmcqtiJh1M="; # iau + version = "2.26.2"; # iau + hash = "sha256-j8Z5q0w6iqC++KScWoRTMOf4o7ADPN7IfPccc8A4A1M="; # iau }; importer = mkGeoserverExtension { name = "importer"; - version = "2.26.1"; # importer - hash = "sha256-Os7oRg+EM5p7rXyI5Qg0vWzZ2i1/tplw1zHaLJJ0feM="; # importer + version = "2.26.2"; # importer + hash = "sha256-4BObAg/3BuP8UH4yodClBJsSlTE4S2tyPtqDHqOGRYg="; # importer }; inspire = mkGeoserverExtension { name = "inspire"; - version = "2.26.1"; # inspire - hash = "sha256-cYxoBk/oOjKj7gk4mzHUSU1LbWLRxjSbH9B+JiZCxgU="; # inspire + version = "2.26.2"; # inspire + hash = "sha256-NZ5oMXpakPfdJZg8J9Y3D/8j09H0P9CQgnpeObrGkNE="; # inspire }; # Needs Kakadu plugin from # https://github.com/geosolutions-it/imageio-ext #jp2k = mkGeoserverExtension { # name = "jp2k"; - # version = "2.26.1"; # jp2k - # hash = "sha256-P4UUtfRSlH4GMpDcvy1TjyorolrPLK0P8zCwDJUbFhE="; # jp2k + # version = "2.26.2"; # jp2k + # hash = "sha256-W+nx7PeEksyjA2iuN75qvWqDSdSnF0eNHAPqwce3amA="; # jp2k #}; libjpeg-turbo = mkGeoserverExtension { name = "libjpeg-turbo"; - version = "2.26.1"; # libjpeg-turbo - hash = "sha256-pGorlT/BaS605wyIcgNAM5aJxV6I78Dr3m1uADxdebI="; # libjpeg-turbo + version = "2.26.2"; # libjpeg-turbo + hash = "sha256-EYZQOQ1rAqTbRHh7cewkvJT4l1cmyFxNUwEFW2/8ezQ="; # libjpeg-turbo buildInputs = [ libjpeg.out ]; }; mapml = mkGeoserverExtension { name = "mapml"; - version = "2.26.1"; # mapml - hash = "sha256-r1Z7Gc3c/kH2jm6wD46Oj2ZZTg136k2n9lqnRVkPXfs="; # mapml + version = "2.26.2"; # mapml + hash = "sha256-RHTPzy0f3DP6ye94Slw/Tz/GIleAgW1DMiMkkneT7kk="; # mapml }; mbstyle = mkGeoserverExtension { name = "mbstyle"; - version = "2.26.1"; # mbstyle - hash = "sha256-a5jQDyn/nOS/HbhAzKAKl40g1SDYQ51Xi+LzWtByntA="; # mbstyle + version = "2.26.2"; # mbstyle + hash = "sha256-vJB9wFiMJtu16JuJ+vESYG07U/Hs7NmMo3kqMkjV0k4="; # mbstyle }; metadata = mkGeoserverExtension { name = "metadata"; - version = "2.26.1"; # metadata - hash = "sha256-O9/gBrJBp8/fOYOx7fsqkgcQ0k6wxIoz9DLQDemjJK8="; # metadata + version = "2.26.2"; # metadata + hash = "sha256-CVp2KVHmqeIXPf031HBnvilcgfEKOpyv9Pc/yNpCFM8="; # metadata }; mongodb = mkGeoserverExtension { name = "mongodb"; - version = "2.26.1"; # mongodb - hash = "sha256-j9e2V6UkagW55WKKW2eaCnBBGwKmdDjGQBSvngpAqb8="; # mongodb + version = "2.26.2"; # mongodb + hash = "sha256-Ndo0/r0maxZ7GcGQFY8ZNgtmxXaDJ1Gtj4oDRN7qzWM="; # mongodb }; monitor = mkGeoserverExtension { name = "monitor"; - version = "2.26.1"; # monitor - hash = "sha256-CLTtJHO+/Hq8/JFErm3ieyLc6wIqCelx0CRDpzbPfZ0="; # monitor + version = "2.26.2"; # monitor + hash = "sha256-1/yqmzFaPbntgxB1zXqJIrKCdKJpPzHm30v+Ww/kgXE="; # monitor }; mysql = mkGeoserverExtension { name = "mysql"; - version = "2.26.1"; # mysql - hash = "sha256-TiSkHdp/U9P1acaD5mN0eOA/J/5fnnJH14nDlKNY3+k="; # mysql + version = "2.26.2"; # mysql + hash = "sha256-QOlAUhXyzpazYk/JJr9IcU1gIVS7iGB6Ly2HgbER8dA="; # mysql }; netcdf = mkGeoserverExtension { name = "netcdf"; - version = "2.26.1"; # netcdf - hash = "sha256-k/zDVoh19Pg/jZa4svAqU1c4EqPnPRSIQL9ZTlrohvY="; # netcdf + version = "2.26.2"; # netcdf + hash = "sha256-cwe518kyk5vMjjBvHhzmTdZ/G0nT0KEDoQK7GbiAnfQ="; # netcdf buildInputs = [ netcdf ]; }; netcdf-out = mkGeoserverExtension { name = "netcdf-out"; - version = "2.26.1"; # netcdf-out - hash = "sha256-maHIpPQshEcB7JZuhTIo1X209o29iv36alUx76LWV2I="; # netcdf-out + version = "2.26.2"; # netcdf-out + hash = "sha256-/u9cOOT0/FvEt39VXO3l4Vv01Qpiqg9qJnNH4nnUxa0="; # netcdf-out buildInputs = [ netcdf ]; }; ogr-wfs = mkGeoserverExtension { name = "ogr-wfs"; - version = "2.26.1"; # ogr-wfs + version = "2.26.2"; # ogr-wfs buildInputs = [ pkgs.gdal ]; - hash = "sha256-XFEO0JruZCgYj7LWNftIFeI0LoypMbtD2A148LbLg+4="; # ogr-wfs + hash = "sha256-4Lp9ffQVgug2zP6ikDyDSITqrq8K5wADjNm3ArpJz1s="; # ogr-wfs }; # Needs ogr-wfs extension. ogr-wps = mkGeoserverExtension { name = "ogr-wps"; - version = "2.26.1"; # ogr-wps + version = "2.26.2"; # ogr-wps # buildInputs = [ pkgs.gdal ]; - hash = "sha256-qfuU/HlVTHjPIA9DCdc8YURpLyPHSxXKEko0s3tDLpI="; # ogr-wps + hash = "sha256-57rQgsdwXI7eQFhbL+ieP8uOlfeOJqUVWibBNZiPb9E="; # ogr-wps }; oracle = mkGeoserverExtension { name = "oracle"; - version = "2.26.1"; # oracle - hash = "sha256-dZ6b+hYD1uJDHMJRDChsZc3W9TiQhKfvCBbDIr9xB9E="; # oracle + version = "2.26.2"; # oracle + hash = "sha256-23/lMh1L3zzwUk3cJCxQhdLdQoghhkK1JAoet9nmN1M="; # oracle }; params-extractor = mkGeoserverExtension { name = "params-extractor"; - version = "2.26.1"; # params-extractor - hash = "sha256-7qr+jxo4tzxW76k/t+Zd0h45U6mqzReRjnsJfWFZV8o="; # params-extractor + version = "2.26.2"; # params-extractor + hash = "sha256-mEKf4riqzSlwra71jY4MO1BM2/fCfikW1CKAB02ntF8="; # params-extractor }; printing = mkGeoserverExtension { name = "printing"; - version = "2.26.1"; # printing - hash = "sha256-jXdp0zX5sq4HBs1lF658FtSRjMOm1KXrbVm9dDPDmfk="; # printing + version = "2.26.2"; # printing + hash = "sha256-/R4MX73aiTGbqDNK+2rthcBUwJesc3j96UDqmpTZpxk="; # printing }; pyramid = mkGeoserverExtension { name = "pyramid"; - version = "2.26.1"; # pyramid - hash = "sha256-hRc24f5pY94TRsmttc0SLPjS6S23kzCeiyuE8XbM4pA="; # pyramid + version = "2.26.2"; # pyramid + hash = "sha256-6FIDk62d45ctmwhaW/XpdHziiPFyhsKm36l5BpZa4/w="; # pyramid }; querylayer = mkGeoserverExtension { name = "querylayer"; - version = "2.26.1"; # querylayer - hash = "sha256-7wNSoi6PUZJLHGUO0D48O88xKoU63FBSH4+lfxgbEjA="; # querylayer + version = "2.26.2"; # querylayer + hash = "sha256-sM9OmWKJwOjxqzuhOEF+6j01r3+lvvZmaOIxBnmsUbo="; # querylayer }; sldservice = mkGeoserverExtension { name = "sldservice"; - version = "2.26.1"; # sldservice - hash = "sha256-T2v42w8mhaFH/gcnJUEJdlQZH6gNyx8Y8wpKws0Xsns="; # sldservice + version = "2.26.2"; # sldservice + hash = "sha256-aKRy0wbx5XRdXPGZFsf+bdxmU0ILAPiMI2Zqg2nu52E="; # sldservice }; sqlserver = mkGeoserverExtension { name = "sqlserver"; - version = "2.26.1"; # sqlserver - hash = "sha256-gQrmBMxosWkvAb9+DG9UEgrmG8AKl3NPgYLZ2nG2iM0="; # sqlserver + version = "2.26.2"; # sqlserver + hash = "sha256-Sacng3WZ+bbljlnYQfP9RWk96kVeiJlGFFgudNheg9g="; # sqlserver }; vectortiles = mkGeoserverExtension { name = "vectortiles"; - version = "2.26.1"; # vectortiles - hash = "sha256-/cR7S5dzR8td7dFk05QkLnp0vhSpXuCLO0vmiB2JyRQ="; # vectortiles + version = "2.26.2"; # vectortiles + hash = "sha256-6hC8YfGbgUC6Mxx5/0qfbKOaO7UmHEhcrY9q1U/Q3Us="; # vectortiles }; wcs2_0-eo = mkGeoserverExtension { name = "wcs2_0-eo"; - version = "2.26.1"; # wcs2_0-eo - hash = "sha256-SYUo3G/BuILOHN6t8F9Q/gwGjAzCY9crmvU+f6mDm/U="; # wcs2_0-eo + version = "2.26.2"; # wcs2_0-eo + hash = "sha256-u433otfuIdCOPON8mGcyDgVoHstXV4tKClRopN+yJHE="; # wcs2_0-eo }; web-resource = mkGeoserverExtension { name = "web-resource"; - version = "2.26.1"; # web-resource - hash = "sha256-z2Zm4UvigN7TvIIHnn42xThIg8Xy3F2+1fPzdhDMZ+A="; # web-resource + version = "2.26.2"; # web-resource + hash = "sha256-C8+8Ri7RLz8UhsMuhINF2p7SriHV6+lU/DBMBo75fUw="; # web-resource }; wmts-multi-dimensional = mkGeoserverExtension { name = "wmts-multi-dimensional"; - version = "2.26.1"; # wmts-multi-dimensional - hash = "sha256-Wju8vN4KCN13aJshPqfUEQa8B0WHdeOvFEZ/ZzZOg7E="; # wmts-multi-dimensional + version = "2.26.2"; # wmts-multi-dimensional + hash = "sha256-6Wnf4im1fZULjoSOu2V3Phn4/6A3UGnCP8BvZDtaKUU="; # wmts-multi-dimensional }; wps = mkGeoserverExtension { name = "wps"; - version = "2.26.1"; # wps - hash = "sha256-Yi1MdBWeoNBMco/8JUouVXVpfebmpXkTo6COJPLl0bw="; # wps + version = "2.26.2"; # wps + hash = "sha256-ocFmcaWsEq7iothnc7/7DIPpbCo5z5WwI3F1tbDX8dA="; # wps }; # Needs hazelcast (https://github.com/hazelcast/hazelcast (?)) which is not # available in nixpgs as of 2024/01. #wps-cluster-hazelcast = mkGeoserverExtension { # name = "wps-cluster-hazelcast"; - # version = "2.26.1"; # wps-cluster-hazelcast - # hash = "sha256-Ed2jV6fmoOUQX7Cs3Qe1TjJ8mki/u1v/nng7MqF+Jqs="; # wps-cluster-hazelcast + # version = "2.26.2"; # wps-cluster-hazelcast + # hash = "sha256-GoSeXKd4wBhYdnGlHgoHiaVxnb4VNEg1TG5IXG0qJzA="; # wps-cluster-hazelcast #}; wps-download = mkGeoserverExtension { name = "wps-download"; - version = "2.26.1"; # wps-download - hash = "sha256-HX+RUZHsfyMb/u/I2S57zrW6HKhzSdE9CZT3GjQ0fbM="; # wps-download + version = "2.26.2"; # wps-download + hash = "sha256-FBVt/B2nuf0PY4o1yuJ997sjWdsWYYxDgC94yOKQH/8="; # wps-download }; # Needs Postrgres configuration or similar. # See https://docs.geoserver.org/main/en/user/extensions/wps-jdbc/index.html wps-jdbc = mkGeoserverExtension { name = "wps-jdbc"; - version = "2.26.1"; # wps-jdbc - hash = "sha256-W6EUZtt8It1u786eFvuw9k7eZ1SLBG+J4amW036PZko="; # wps-jdbc + version = "2.26.2"; # wps-jdbc + hash = "sha256-w3pzprk4UG4vE6K7tB/41U66OGSpB9uNUafKmKZ5uWY="; # wps-jdbc }; ysld = mkGeoserverExtension { name = "ysld"; - version = "2.26.1"; # ysld - hash = "sha256-kwAMkoSNxoraZ20fVg0xCOD3slxAITL+eLOIJCGewXk="; # ysld + version = "2.26.2"; # ysld + hash = "sha256-guaTT3S0lU6nSaw90gNCHm5Gsdc27jX+XE/92vVfVQI="; # ysld }; } diff --git a/pkgs/by-name/ge/geoserver/package.nix b/pkgs/by-name/ge/geoserver/package.nix index a228335d3e686..c3e7b826cc3fb 100644 --- a/pkgs/by-name/ge/geoserver/package.nix +++ b/pkgs/by-name/ge/geoserver/package.nix @@ -10,11 +10,11 @@ }: stdenv.mkDerivation (finalAttrs: rec { pname = "geoserver"; - version = "2.26.1"; + version = "2.26.2"; src = fetchurl { url = "mirror://sourceforge/geoserver/GeoServer/${version}/geoserver-${version}-bin.zip"; - hash = "sha256-qKlXVwzCNS+diuOo43q0nfwPlIMuUPOY1OaoKt9mL+g="; + hash = "sha256-K4OeMGnczKXVl+nxyd9unuCdoEpyF7j364Vxe49EOxo="; }; patches = [ diff --git a/pkgs/by-name/gf/gfn-electron/package.nix b/pkgs/by-name/gf/gfn-electron/package.nix index d00abe7861b31..37eb0397f94f0 100644 --- a/pkgs/by-name/gf/gfn-electron/package.nix +++ b/pkgs/by-name/gf/gfn-electron/package.nix @@ -7,7 +7,7 @@ makeBinaryWrapper, }: let - version = "2.1.2"; + version = "2.1.3"; in buildNpmPackage { pname = "gfn-electron"; @@ -17,10 +17,10 @@ buildNpmPackage { owner = "hmlendea"; repo = "gfn-electron"; tag = "v${version}"; - hash = "sha256-kTnM4wSDqP2V8hb4mDhbQYpVYouSnUkjuuCfITb/xgY="; + hash = "sha256-o5p7INuyrs4Fw0uoP9f3UpqpmJzHIFSBCBTTU2NfUMQ="; }; - npmDepsHash = "sha256-27N0hWOfkLQGaGspm4aCoVF6PWiUOAKs+JzbdQV94lo="; + npmDepsHash = "sha256-xp9uZAMrsPut91tQD3XfeENr7fXFg2bE89xShG1AcZk="; nativeBuildInputs = [ makeBinaryWrapper ]; diff --git a/pkgs/by-name/gg/gg-jj/native-tls.patch b/pkgs/by-name/gg/gg-jj/native-tls.patch new file mode 100644 index 0000000000000..bcbd79fc812bc --- /dev/null +++ b/pkgs/by-name/gg/gg-jj/native-tls.patch @@ -0,0 +1,351 @@ +diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock +index 37a1a2d..45640a1 100644 +--- a/src-tauri/Cargo.lock ++++ b/src-tauri/Cargo.lock +@@ -778,9 +778,9 @@ dependencies = [ + "bitflags 2.6.0", + "block", + "cocoa-foundation", +- "core-foundation", ++ "core-foundation 0.10.0", + "core-graphics", +- "foreign-types", ++ "foreign-types 0.5.0", + "libc", + "objc", + ] +@@ -793,7 +793,7 @@ checksum = "e14045fb83be07b5acf1c0884b2180461635b433455fa35d1cd6f17f1450679d" + dependencies = [ + "bitflags 2.6.0", + "block", +- "core-foundation", ++ "core-foundation 0.10.0", + "core-graphics-types", + "libc", + "objc", +@@ -873,6 +873,16 @@ dependencies = [ + "version_check", + ] + ++[[package]] ++name = "core-foundation" ++version = "0.9.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" ++dependencies = [ ++ "core-foundation-sys", ++ "libc", ++] ++ + [[package]] + name = "core-foundation" + version = "0.10.0" +@@ -896,9 +906,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "fa95a34622365fa5bbf40b20b75dba8dfa8c94c734aea8ac9a5ca38af14316f1" + dependencies = [ + "bitflags 2.6.0", +- "core-foundation", ++ "core-foundation 0.10.0", + "core-graphics-types", +- "foreign-types", ++ "foreign-types 0.5.0", + "libc", + ] + +@@ -909,7 +919,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "3d44a101f213f6c4cdc1853d4b78aef6db6bdfa3468798cc1d9912f4735013eb" + dependencies = [ + "bitflags 2.6.0", +- "core-foundation", ++ "core-foundation 0.10.0", + "libc", + ] + +@@ -1435,6 +1445,15 @@ version = "0.1.3" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "f81ec6369c545a7d40e4589b5597581fa1c441fe1cce96dd1de43159910a36a2" + ++[[package]] ++name = "foreign-types" ++version = "0.3.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" ++dependencies = [ ++ "foreign-types-shared 0.1.1", ++] ++ + [[package]] + name = "foreign-types" + version = "0.5.0" +@@ -1442,7 +1461,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "d737d9aa519fb7b749cbc3b962edcf310a8dd1f4b67c91c4f83975dbdd17d965" + dependencies = [ + "foreign-types-macros", +- "foreign-types-shared", ++ "foreign-types-shared 0.3.1", + ] + + [[package]] +@@ -1456,6 +1475,12 @@ dependencies = [ + "syn 2.0.87", + ] + ++[[package]] ++name = "foreign-types-shared" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" ++ + [[package]] + name = "foreign-types-shared" + version = "0.3.1" +@@ -2779,6 +2804,22 @@ dependencies = [ + "want", + ] + ++[[package]] ++name = "hyper-tls" ++version = "0.6.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0" ++dependencies = [ ++ "bytes", ++ "http-body-util", ++ "hyper", ++ "hyper-util", ++ "native-tls", ++ "tokio", ++ "tokio-native-tls", ++ "tower-service", ++] ++ + [[package]] + name = "hyper-util" + version = "0.1.10" +@@ -3418,9 +3459,9 @@ dependencies = [ + + [[package]] + name = "libc" +-version = "0.2.163" ++version = "0.2.164" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "1fdaeca4cf44ed4ac623e86ef41f056e848dbeab7ec043ecb7326ba300b36fd0" ++checksum = "433bfe06b8c75da9b2e3fbea6e5329ff87748f0b144ef75306e674c3f6f7c13f" + + [[package]] + name = "libgit2-sys" +@@ -3453,7 +3494,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4" + dependencies = [ + "cfg-if", +- "windows-targets 0.52.6", ++ "windows-targets 0.48.5", + ] + + [[package]] +@@ -3688,6 +3729,23 @@ dependencies = [ + "windows-sys 0.59.0", + ] + ++[[package]] ++name = "native-tls" ++version = "0.2.13" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0dab59f8e050d5df8e4dd87d9206fb6f65a483e20ac9fda365ade4fab353196c" ++dependencies = [ ++ "libc", ++ "log", ++ "openssl", ++ "openssl-probe", ++ "openssl-sys", ++ "schannel", ++ "security-framework", ++ "security-framework-sys", ++ "tempfile", ++] ++ + [[package]] + name = "ndk" + version = "0.9.0" +@@ -4065,6 +4123,32 @@ dependencies = [ + "pathdiff", + ] + ++[[package]] ++name = "openssl" ++version = "0.10.69" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f5e534d133a060a3c19daec1eb3e98ec6f4685978834f2dbadfe2ec215bab64e" ++dependencies = [ ++ "bitflags 2.6.0", ++ "cfg-if", ++ "foreign-types 0.3.2", ++ "libc", ++ "once_cell", ++ "openssl-macros", ++ "openssl-sys", ++] ++ ++[[package]] ++name = "openssl-macros" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn 2.0.87", ++] ++ + [[package]] + name = "openssl-probe" + version = "0.1.5" +@@ -4854,19 +4938,23 @@ dependencies = [ + "http-body", + "http-body-util", + "hyper", ++ "hyper-tls", + "hyper-util", + "ipnet", + "js-sys", + "log", + "mime", ++ "native-tls", + "once_cell", + "percent-encoding", + "pin-project-lite", ++ "rustls-pemfile", + "serde", + "serde_json", + "serde_urlencoded", + "sync_wrapper", + "tokio", ++ "tokio-native-tls", + "tokio-util 0.7.12", + "tower-service", + "url", +@@ -5000,6 +5088,21 @@ dependencies = [ + "windows-sys 0.52.0", + ] + ++[[package]] ++name = "rustls-pemfile" ++version = "2.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "dce314e5fee3f39953d46bb63bb8a46d40c2f8fb7cc5a3b6cab2bde9721d6e50" ++dependencies = [ ++ "rustls-pki-types", ++] ++ ++[[package]] ++name = "rustls-pki-types" ++version = "1.10.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "16f1201b3c9a7ee8039bcadc17b7e605e2945b27eee7631788c1bd2b0643674b" ++ + [[package]] + name = "rustversion" + version = "1.0.18" +@@ -5027,6 +5130,15 @@ version = "0.1.4" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "088c5d71572124929ea7549a8ce98e1a6fd33d0a38367b09027b382e67c033db" + ++[[package]] ++name = "schannel" ++version = "0.1.26" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "01227be5826fa0690321a2ba6c5cd57a19cf3f6a09e76973b58e61de6ab9d1c1" ++dependencies = [ ++ "windows-sys 0.59.0", ++] ++ + [[package]] + name = "schemars" + version = "0.8.21" +@@ -5089,6 +5201,29 @@ version = "4.1.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b" + ++[[package]] ++name = "security-framework" ++version = "2.11.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02" ++dependencies = [ ++ "bitflags 2.6.0", ++ "core-foundation 0.9.4", ++ "core-foundation-sys", ++ "libc", ++ "security-framework-sys", ++] ++ ++[[package]] ++name = "security-framework-sys" ++version = "2.12.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "fa39c7303dc58b5543c94d22c1766b0d31f2ee58306363ea622b10bbc075eaa2" ++dependencies = [ ++ "core-foundation-sys", ++ "libc", ++] ++ + [[package]] + name = "selectors" + version = "0.22.0" +@@ -5436,7 +5571,7 @@ dependencies = [ + "bytemuck", + "cfg_aliases", + "core-graphics", +- "foreign-types", ++ "foreign-types 0.5.0", + "js-sys", + "log", + "objc2", +@@ -5631,7 +5766,7 @@ checksum = "6682a07cf5bab0b8a2bd20d0a542917ab928b5edb75ebd4eda6b05cbaab872da" + dependencies = [ + "bitflags 2.6.0", + "cocoa", +- "core-foundation", ++ "core-foundation 0.10.0", + "core-graphics", + "crossbeam-channel", + "dispatch", +@@ -6208,6 +6343,16 @@ dependencies = [ + "syn 2.0.87", + ] + ++[[package]] ++name = "tokio-native-tls" ++version = "0.3.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2" ++dependencies = [ ++ "native-tls", ++ "tokio", ++] ++ + [[package]] + name = "tokio-util" + version = "0.6.10" +@@ -7006,7 +7151,7 @@ version = "0.1.9" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" + dependencies = [ +- "windows-sys 0.59.0", ++ "windows-sys 0.48.0", + ] + + [[package]] +diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml +index 550b0cf..9b711a4 100644 +--- a/src-tauri/Cargo.toml ++++ b/src-tauri/Cargo.toml +@@ -14,7 +14,7 @@ zip = "0.6" + assert_matches = "1.5" + + [dependencies] +-tauri = { version = "2.0.0", features = [] } ++tauri = { version = "2.0.0", features = ["native-tls"] } + tauri-codegen = "2.0.0" + tauri-macros = "2.0.0" + tauri-plugin = "2.0.0" diff --git a/pkgs/by-name/gg/gg-jj/package.nix b/pkgs/by-name/gg/gg-jj/package.nix index 7372c8236c3b4..ff2c5240a4bce 100644 --- a/pkgs/by-name/gg/gg-jj/package.nix +++ b/pkgs/by-name/gg/gg-jj/package.nix @@ -32,22 +32,23 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-iQxPJgMxBtyindkNdQkehwPf7ZgWCI09PToqs2y1Hfw="; }; + patches = [ ./native-tls.patch ]; cargoRoot = "src-tauri"; buildAndTestSubdir = "src-tauri"; # FIXME: Switch back to cargoHash when https://github.com/NixOS/nixpkgs/issues/356811 is fixed - cargoDeps = rustPlatform.fetchCargoTarball { - inherit (finalAttrs) pname version src; + cargoDeps = rustPlatform.fetchCargoVendor { + inherit (finalAttrs) + pname + version + src + patches + ; + # Tries to apply patches inside cargoRoot. + prePatch = "pushd .."; + postPatch = "popd"; sourceRoot = "${finalAttrs.src.name}/${finalAttrs.cargoRoot}"; - hash = "sha256-Lr/0GkWHvfDy/leRLxisuTzGPZYFo2beHq9UCl6XlDo="; - - nativeBuildInputs = [ yq ]; - - # Work around https://github.com/rust-lang/cargo/issues/10801 - # See https://discourse.nixos.org/t/rust-tauri-v2-error-no-matching-package-found/56751/4 - preBuild = '' - tomlq -it '.dependencies.tauri.features += ["native-tls"]' Cargo.toml - ''; + hash = "sha256-zEYU5l57VxVKKhoGfa77kT05vwoLyAu9eyt7C9dhAGM="; }; npmDeps = fetchNpmDeps { diff --git a/pkgs/by-name/gh/gh-gei/package.nix b/pkgs/by-name/gh/gh-gei/package.nix index a3b954862c1a2..e51e4270535c7 100644 --- a/pkgs/by-name/gh/gh-gei/package.nix +++ b/pkgs/by-name/gh/gh-gei/package.nix @@ -15,7 +15,7 @@ buildDotnetModule rec { hash = "sha256-hUURXPKhiI3n1BrW8IzVVmPuJyO4AxM8D5uluaJXk+4="; }; - dotnet-sdk = dotnetCorePackages.sdk_8_0; + dotnet-sdk = dotnetCorePackages.sdk_8_0_4xx; projectFile = "src/gei/gei.csproj"; nugetDeps = ./deps.json; # File generated with `nix-build -A gh-gei.passthru.fetch-deps`. diff --git a/pkgs/by-name/gi/gitkraken/package.nix b/pkgs/by-name/gi/gitkraken/package.nix index e81078a768a58..43c96bc14d47f 100644 --- a/pkgs/by-name/gi/gitkraken/package.nix +++ b/pkgs/by-name/gi/gitkraken/package.nix @@ -57,24 +57,24 @@ let pname = "gitkraken"; - version = "10.6.2"; + version = "10.6.3"; throwSystem = throw "Unsupported system: ${stdenv.hostPlatform.system}"; srcs = { x86_64-linux = fetchzip { url = "https://release.axocdn.com/linux/GitKraken-v${version}.tar.gz"; - hash = "sha256-E/9BR4PE5QF075+NgJZTtgDoShHEqeRcoICnMLt3RuY="; + hash = "sha256-VC1tNNC29+0aDCcR1WqV12ETG07sFd4de7Ool9VWuzc="; }; x86_64-darwin = fetchzip { url = "https://release.axocdn.com/darwin/GitKraken-v${version}.zip"; - hash = "sha256-gCiZN+ivXEF5KLas7eZn9iWfXcDGwf1gXK1ejY2C4xs="; + hash = "sha256-vIzbktz9cY4UCd99mI05Ju72+fPsskcS1aCKccnBS/o="; }; aarch64-darwin = fetchzip { url = "https://release.axocdn.com/darwin-arm64/GitKraken-v${version}.zip"; - hash = "sha256-1zd57Kqi5iKHw/dNqLQ7jVAkNFvkFeqQbZPN32kF9IU="; + hash = "sha256-T3U3VvaPNGMFzHKc/TaFgJQ/RGBzyacXBi53qhaG1C8="; }; }; @@ -87,9 +87,6 @@ let license = licenses.unfree; platforms = builtins.attrNames srcs; maintainers = with maintainers; [ - xnwdd - evanjs - arkivm nicolas-goudry Rishik-Y ]; diff --git a/pkgs/by-name/gi/gitxray/package.nix b/pkgs/by-name/gi/gitxray/package.nix index 19976da2d5f12..565edc247fed0 100644 --- a/pkgs/by-name/gi/gitxray/package.nix +++ b/pkgs/by-name/gi/gitxray/package.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "gitxray"; - version = "1.0.16.4"; + version = "1.0.17"; pyproject = true; src = fetchFromGitHub { owner = "kulkansecurity"; repo = "gitxray"; tag = version; - hash = "sha256-rxG/FXIvPPCmV8//Bq3Upu4kNjwVhPVTK4ADp9X3OL0="; + hash = "sha256-wPqjCIHYvU1QuQIXCrbzr8+JtwQmFNHzAjxr8AXkxrc="; }; build-system = with python3.pkgs; [ setuptools ]; diff --git a/pkgs/by-name/gl/glamoroustoolkit/package.nix b/pkgs/by-name/gl/glamoroustoolkit/package.nix index a9018cb1fda32..09262b7db87a0 100644 --- a/pkgs/by-name/gl/glamoroustoolkit/package.nix +++ b/pkgs/by-name/gl/glamoroustoolkit/package.nix @@ -29,12 +29,12 @@ stdenv.mkDerivation (finalAttrs: { pname = "glamoroustoolkit"; - version = "1.1.9"; + version = "1.1.11"; src = fetchzip { url = "https://github.com/feenkcom/gtoolkit-vm/releases/download/v${finalAttrs.version}/GlamorousToolkit-x86_64-unknown-linux-gnu.zip"; stripRoot = false; - hash = "sha256-dBUMn5KMSLTfmJnKTS6seEYDRy2JCiR+fi37UIUJ5aM="; + hash = "sha256-bb5tU4UtqdWcSqgl28V8IoATWx4TADxNFXkn9ljmw6Y="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/gl/glooctl/package.nix b/pkgs/by-name/gl/glooctl/package.nix index 8f4722c1b576e..4f6b10e09f542 100644 --- a/pkgs/by-name/gl/glooctl/package.nix +++ b/pkgs/by-name/gl/glooctl/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "glooctl"; - version = "1.18.5"; + version = "1.18.6"; src = fetchFromGitHub { owner = "solo-io"; repo = "gloo"; rev = "v${version}"; - hash = "sha256-0ITszVZnxbXSCie9lFotMwZYSVTAhqDgKiz19apPkog="; + hash = "sha256-kxNlTVU4VFqEhismth5qb0Ar335TYhO/2oE8tt9km3c="; }; vendorHash = "sha256-AEfDeUD7A4ZFgctNa8b1XeJMFnmcQCLvlQqNFM/gSCc="; diff --git a/pkgs/by-name/gn/gnmic/package.nix b/pkgs/by-name/gn/gnmic/package.nix index 527cb55f29bc2..73fe10e42abea 100644 --- a/pkgs/by-name/gn/gnmic/package.nix +++ b/pkgs/by-name/gn/gnmic/package.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "gnmic"; - version = "0.39.1"; + version = "0.40.0"; src = fetchFromGitHub { owner = "openconfig"; repo = pname; rev = "v${version}"; - hash = "sha256-bFMgGPGbBWfT7M5rE6k4Q5L9srgy0UyFtAq/xOdZhxw="; + hash = "sha256-rdT1gCALEsPiyN+4RKmJ36CUkYmbkIyi56JjVkzzkp8="; }; - vendorHash = "sha256-9A/ZcamCMUpNxG3taHrqI4JChjpSjSuwx0ZUyGAuGXo="; + vendorHash = "sha256-n4HBm9n3RkSmAkd29dhDN0tZ/bjVCBzQSihgY8VA1L4="; ldflags = [ "-s" diff --git a/pkgs/by-name/gn/gnome-bluetooth_1_0/package.nix b/pkgs/by-name/gn/gnome-bluetooth_1_0/package.nix index 815252650fc73..722453d3cd2c9 100644 --- a/pkgs/by-name/gn/gnome-bluetooth_1_0/package.nix +++ b/pkgs/by-name/gn/gnome-bluetooth_1_0/package.nix @@ -6,6 +6,7 @@ gnome, adwaita-icon-theme, meson, + mesonEmulatorHook, ninja, pkg-config, gtk3, @@ -51,20 +52,24 @@ stdenv.mkDerivation (finalAttrs: { }) ]; - nativeBuildInputs = [ - meson - ninja - gettext - itstool - pkg-config - libxml2 - wrapGAppsHook3 - gobject-introspection - gtk-doc - docbook-xsl-nons - docbook_xml_dtd_43 - python3 - ]; + nativeBuildInputs = + [ + meson + ninja + gettext + itstool + pkg-config + libxml2 + wrapGAppsHook3 + gobject-introspection + gtk-doc + docbook-xsl-nons + docbook_xml_dtd_43 + python3 + ] + ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ + mesonEmulatorHook + ]; buildInputs = [ glib @@ -86,6 +91,8 @@ stdenv.mkDerivation (finalAttrs: { patchShebangs meson_post_install.py ''; + strictDeps = true; + passthru = { updateScript = gnome.updateScript { packageName = "gnome-bluetooth"; diff --git a/pkgs/by-name/gn/gnome-terminal/package.nix b/pkgs/by-name/gn/gnome-terminal/package.nix index f52e6ad434755..0b876e7369719 100644 --- a/pkgs/by-name/gn/gnome-terminal/package.nix +++ b/pkgs/by-name/gn/gnome-terminal/package.nix @@ -1,13 +1,13 @@ { stdenv, lib, - fetchFromGitLab, + fetchurl, meson, ninja, pkg-config, python3, libxml2, - gitUpdater, + gnome, nautilus, glib, gtk4, @@ -30,14 +30,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "gnome-terminal"; - version = "3.54.2"; + version = "3.54.3"; - src = fetchFromGitLab { - domain = "gitlab.gnome.org"; - owner = "GNOME"; - repo = "gnome-terminal"; - rev = finalAttrs.version; - hash = "sha256-81dOdmIwa3OmuUTciTlearqic6bFMfiX1nvoIxJCt/M="; + src = fetchurl { + url = "mirror://gnome/sources/gnome-terminal/${lib.versions.majorMinor finalAttrs.version}/gnome-terminal-${finalAttrs.version}.tar.xz"; + hash = "sha256-Oa8AueYadNjN8oFSvq/uUTwyfhIjoHfRMcR5xQT0pHU="; }; nativeBuildInputs = [ @@ -78,8 +75,9 @@ stdenv.mkDerivation (finalAttrs: { ''; passthru = { - updateScript = gitUpdater { - odd-unstable = true; + updateScript = gnome.updateScript { + packageName = "gnome-terminal"; + versionPolicy = "odd-unstable"; }; tests = { diff --git a/pkgs/by-name/go/go-migrate/package.nix b/pkgs/by-name/go/go-migrate/package.nix index a78acdc7941da..f5857b03ad37e 100644 --- a/pkgs/by-name/go/go-migrate/package.nix +++ b/pkgs/by-name/go/go-migrate/package.nix @@ -6,17 +6,17 @@ buildGoModule rec { pname = "go-migrate"; - version = "4.18.1"; + version = "4.18.2"; src = fetchFromGitHub { owner = "golang-migrate"; repo = "migrate"; rev = "v${version}"; - sha256 = "sha256-ZZeurnoFcObrK75zkIZvz9ycdDP9AM3uX6h/4bMWpGc="; + sha256 = "sha256-DRWJ5USabSQtNkyDjz8P7eOS2QBE1KaD8K8XYORBVGo="; }; proxyVendor = true; # darwin/linux hash mismatch - vendorHash = "sha256-Zaq88oF5rSCSv736afyKDvTNCSIyrIGTN0kuJWqS7tg="; + vendorHash = "sha256-0SbhHA5gKzODW8rHCEuZXWs8vMsVDMqJsRDPs4V1gGc="; subPackages = [ "cmd/migrate" ]; diff --git a/pkgs/by-name/go/godot_4/package.nix b/pkgs/by-name/go/godot_4/package.nix index bd2c9439a7080..214a337d1716a 100644 --- a/pkgs/by-name/go/godot_4/package.nix +++ b/pkgs/by-name/go/godot_4/package.nix @@ -4,7 +4,6 @@ buildPackages, dbus, dotnet-sdk_6, - dotnet-sdk_8, dotnetCorePackages, fetchFromGitHub, fontconfig, @@ -60,6 +59,8 @@ let arch = stdenv.hostPlatform.linuxArch; + dotnet-sdk = dotnetCorePackages.sdk_8_0-source; + attrs = finalAttrs: rec { pname = "godot4${suffix}"; version = "4.3-stable"; @@ -154,7 +155,7 @@ let ] ++ lib.optionals withWayland [ wayland-scanner ] ++ lib.optionals withMono [ - dotnet-sdk_8 + dotnet-sdk makeWrapper ]; @@ -222,10 +223,10 @@ let + lib.optionalString withMono '' cp -r bin/GodotSharp/ $out/bin/ wrapProgram $out/bin/godot4${suffix} \ - --set DOTNET_ROOT ${dotnet-sdk_8} \ + --set DOTNET_ROOT ${dotnet-sdk} \ --prefix PATH : "${ lib.makeBinPath [ - dotnet-sdk_8 + dotnet-sdk ] }" '' diff --git a/pkgs/applications/misc/golden-cheetah/0001-Fix-building-with-bison-3.7.patch b/pkgs/by-name/go/golden-cheetah/0001-Fix-building-with-bison-3.7.patch similarity index 100% rename from pkgs/applications/misc/golden-cheetah/0001-Fix-building-with-bison-3.7.patch rename to pkgs/by-name/go/golden-cheetah/0001-Fix-building-with-bison-3.7.patch diff --git a/pkgs/applications/misc/golden-cheetah/default.nix b/pkgs/by-name/go/golden-cheetah/package.nix similarity index 59% rename from pkgs/applications/misc/golden-cheetah/default.nix rename to pkgs/by-name/go/golden-cheetah/package.nix index 7888db1a27d68..4d65093d27629 100644 --- a/pkgs/applications/misc/golden-cheetah/default.nix +++ b/pkgs/by-name/go/golden-cheetah/package.nix @@ -1,25 +1,16 @@ { lib, + stdenv, fetchFromGitHub, nix-update-script, - mkDerivation, - qtbase, - qtsvg, - qtserialport, - qtwebengine, - qtmultimedia, - qttools, - qtconnectivity, - qtcharts, + qt6, libusb-compat-0_1, gsl, blas, bison, flex, zlib, - qmake, makeDesktopItem, - wrapQtAppsHook, }: let @@ -33,37 +24,45 @@ let categories = [ "Utility" ]; }; in -mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "golden-cheetah"; version = "3.7-DEV2408"; src = fetchFromGitHub { owner = "GoldenCheetah"; repo = "GoldenCheetah"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-6JAdnYaKULJsc/zdcTMbCkbOCbiVtnJivEazDKL721c="; }; - buildInputs = [ - qtbase - qtsvg - qtserialport - qtwebengine - qtmultimedia - qttools - zlib - qtconnectivity - qtcharts - libusb-compat-0_1 - gsl - blas - ]; - nativeBuildInputs = [ - flex - wrapQtAppsHook - qmake - bison - ]; + buildInputs = + with qt6; + [ + qt5compat + qtbase + qtcharts + qtconnectivity + qtmultimedia + qtserialport + qtsvg + qttools + qtwebengine + ] + ++ [ + blas + gsl + libusb-compat-0_1 + zlib + ]; + nativeBuildInputs = + [ + bison + flex + ] + ++ (with qt6; [ + qmake + wrapQtAppsHook + ]); patches = [ # allow building with bison 3.7 @@ -84,30 +83,41 @@ mkDerivation rec { preConfigure = '' cp src/gcconfig.pri.in src/gcconfig.pri cp qwt/qwtconfig.pri.in qwt/qwtconfig.pri - sed -i 's,^#QMAKE_LRELEASE.*,QMAKE_LRELEASE = ${qttools.dev}/bin/lrelease,' src/gcconfig.pri + sed -i 's,^#QMAKE_LRELEASE.*,QMAKE_LRELEASE = ${qt6.qttools.dev}/bin/lrelease,' src/gcconfig.pri sed -i 's,^#LIBUSB_INSTALL.*,LIBUSB_INSTALL = ${libusb-compat-0_1},' src/gcconfig.pri sed -i 's,^#LIBUSB_INCLUDE.*,LIBUSB_INCLUDE = ${libusb-compat-0_1.dev}/include,' src/gcconfig.pri sed -i 's,^#LIBUSB_LIBS.*,LIBUSB_LIBS = -L${libusb-compat-0_1}/lib -lusb,' src/gcconfig.pri ''; - installPhase = '' - runHook preInstall + installPhase = + if stdenv.isLinux then + '' + runHook preInstall - mkdir -p $out/bin - cp src/GoldenCheetah $out/bin - install -Dm644 "${desktopItem}/share/applications/"* -t $out/share/applications/ - install -Dm644 src/Resources/images/gc.png $out/share/pixmaps/goldencheetah.png + mkdir -p $out/bin + cp src/GoldenCheetah $out/bin + install -Dm644 "${desktopItem}/share/applications/"* -t $out/share/applications/ + install -Dm644 src/Resources/images/gc.png $out/share/pixmaps/goldencheetah.png - runHook postInstall - ''; + runHook postInstall + '' + else if stdenv.isDarwin then + '' + runHook preInstall + mkdir -p $out/Applications + cp -r src/GoldenCheetah.app $out/Applications + runHook postInstall + '' + else + abort "unsupported platform"; passthru.updateScript = nix-update-script { }; meta = { description = "Performance software for cyclists, runners and triathletes. Built from source and without API tokens"; mainProgram = "GoldenCheetah"; - platforms = lib.platforms.linux; + platforms = with lib.platforms; darwin ++ linux; maintainers = with lib.maintainers; [ adamcstephens ]; license = lib.licenses.gpl2Plus; }; -} +}) diff --git a/pkgs/by-name/go/gollum/Gemfile.lock b/pkgs/by-name/go/gollum/Gemfile.lock index 90fe5379264a0..a0e51e6146584 100644 --- a/pkgs/by-name/go/gollum/Gemfile.lock +++ b/pkgs/by-name/go/gollum/Gemfile.lock @@ -5,14 +5,15 @@ GEM asciidoctor (2.0.23) base64 (0.2.0) builder (3.3.0) - concurrent-ruby (1.3.4) + concurrent-ruby (1.3.5) crass (1.0.6) creole (0.5.0) + date (3.4.1) expression_parser (0.9.0) gemojione (4.3.3) json github-markup (4.0.2) - gollum (6.0.1) + gollum (6.1.0) gemojione (~> 4.1) gollum-lib (~> 6.0) i18n (~> 1.8) @@ -45,82 +46,85 @@ GEM htmlentities (4.3.4) i18n (1.14.6) concurrent-ruby (~> 1.0) - json (2.7.4) - kramdown (2.4.0) - rexml + json (2.9.1) + kramdown (2.5.1) + rexml (>= 3.3.9) kramdown-parser-gfm (1.1.0) kramdown (~> 2.0) - logger (1.6.1) - loofah (2.23.1) + logger (1.6.5) + loofah (2.24.0) crass (~> 1.0.2) nokogiri (>= 1.12.0) mime-types (3.6.0) logger mime-types-data (~> 3.2015) - mime-types-data (3.2024.1001) - mini_portile2 (2.8.7) + mime-types-data (3.2025.0107) + mini_portile2 (2.8.8) multi_json (1.15.0) mustache (1.1.1) mustache-sinatra (2.0.0) mustache (~> 1.0) mustermann (3.0.3) ruby2_keywords (~> 0.0.1) - nokogiri (1.16.7) + nokogiri (1.18.1) mini_portile2 (~> 2.8.2) racc (~> 1.4) - octicons (19.12.0) + octicons (19.14.0) org-ruby (0.9.12) rubypants (~> 0.2) - psych (5.1.2) + psych (5.2.3) + date stringio racc (1.8.1) rack (3.1.8) - rack-protection (4.0.0) + rack-protection (4.1.1) base64 (>= 0.1.0) + logger (>= 1.6.0) rack (>= 3.0.0, < 4) - rack-session (2.0.0) + rack-session (2.1.0) + base64 (>= 0.1.0) rack (>= 3.0.0) - rackup (2.1.0) + rackup (2.2.1) rack (>= 3) - webrick (~> 1.8) - rdoc (6.7.0) + rdoc (6.11.0) psych (>= 4.0.0) - rexml (3.3.9) + rexml (3.4.0) rouge (3.30.0) rss (0.3.1) rexml ruby2_keywords (0.0.5) rubypants (0.7.1) - rugged (1.7.2) - sinatra (4.0.0) + rugged (1.9.0) + sinatra (4.1.1) + logger (>= 1.6.0) mustermann (~> 3.0) rack (>= 3.0.0, < 4) - rack-protection (= 4.0.0) + rack-protection (= 4.1.1) rack-session (>= 2.0.0, < 3) tilt (~> 2.0) - sinatra-contrib (4.0.0) + sinatra-contrib (4.1.1) multi_json (>= 0.0.2) mustermann (~> 3.0) - rack-protection (= 4.0.0) - sinatra (= 4.0.0) + rack-protection (= 4.1.1) + sinatra (= 4.1.1) tilt (~> 2.0) sprockets (4.2.1) concurrent-ruby (~> 1.0) rack (>= 2.2.4, < 4) sprockets-helpers (1.4.0) sprockets (>= 2.2) - stringio (3.1.1) + stringio (3.1.2) therubyrhino (2.1.2) therubyrhino_jar (>= 1.7.4, < 1.7.9) therubyrhino_jar (1.7.8) - tilt (2.4.0) + tilt (2.6.0) twitter-text (1.14.7) unf (~> 0.1.0) unf (0.1.4) unf_ext unf_ext (0.0.9.1) - useragent (0.16.10) - webrick (1.8.2) + useragent (0.16.11) + webrick (1.9.1) wikicloth (0.8.3) builder expression_parser @@ -140,4 +144,4 @@ DEPENDENCIES wikicloth BUNDLED WITH - 2.5.16 + 2.5.22 diff --git a/pkgs/by-name/go/gollum/gemset.nix b/pkgs/by-name/go/gollum/gemset.nix index 8ee71b2e826d0..c8dab484b3c25 100644 --- a/pkgs/by-name/go/gollum/gemset.nix +++ b/pkgs/by-name/go/gollum/gemset.nix @@ -34,10 +34,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0chwfdq2a6kbj6xz9l6zrdfnyghnh32si82la1dnpa5h75ir5anl"; + sha256 = "1ipbrgvf0pp6zxdk5ascp6i29aybz2bx9wdrlchjmpx6mhvkwfw1"; type = "gem"; }; - version = "1.3.4"; + version = "1.3.5"; }; crass = { groups = [ "default" ]; @@ -59,6 +59,16 @@ }; version = "0.5.0"; }; + date = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0kz6mc4b9m49iaans6cbx031j9y7ldghpi5fzsdh0n3ixwa8w9mz"; + type = "gem"; + }; + version = "3.4.1"; + }; expression_parser = { groups = [ "default" ]; platforms = [ ]; @@ -115,10 +125,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "01gk8zb1mfr7ypspbg765fn3m6rdh0b6jpyxfninabl9dzazyvpi"; + sha256 = "1djb0mr4csfpas1aq19yv3d04hw6vxxpgbffp2bsp0p0p1h51far"; type = "gem"; }; - version = "6.0.1"; + version = "6.1.0"; }; gollum-lib = { dependencies = [ @@ -179,10 +189,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1klf2mnfilzjqwcjdi5qb1zl3ghrifz1amcnvwjvsfnx9a5jb9ly"; + sha256 = "048danb0x10mpch6mf88mky35zjn6wk4hpbqq68ssbq58i3fzgfj"; type = "gem"; }; - version = "2.7.4"; + version = "2.9.1"; }; kramdown = { dependencies = [ "rexml" ]; @@ -190,10 +200,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1ic14hdcqxn821dvzki99zhmcy130yhv5fqfffkcf87asv5mnbmn"; + sha256 = "131nwypz8b4pq1hxs6gsz3k00i9b75y3cgpkq57vxknkv6mvdfw7"; type = "gem"; }; - version = "2.4.0"; + version = "2.5.1"; }; kramdown-parser-gfm = { dependencies = [ "kramdown" ]; @@ -211,10 +221,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0lwncq2rf8gm79g2rcnnyzs26ma1f4wnfjm6gs4zf2wlsdz5in9s"; + sha256 = "0sz584vw17pwrrc5zg6yd8lqcgfpjf4qplq3s7fr0r3505nybky3"; type = "gem"; }; - version = "1.6.1"; + version = "1.6.5"; }; loofah = { dependencies = [ @@ -225,10 +235,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0ppp2cgli5avzk0z3dwnah6y65ymyr793yja28p2fs9vrci7986h"; + sha256 = "07pfa5kgl7k2hxlzzn89qna6bmiyrxlchgbzi0885frsi08agrk1"; type = "gem"; }; - version = "2.23.1"; + version = "2.24.0"; }; mime-types = { dependencies = [ @@ -249,20 +259,20 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "06dbn0j13jwdrmlvrjd50mxqrjlkh3lvxp0afh4glyzbliqvqpsd"; + sha256 = "1jixfirdang1lx9iqkcw03mz43pi4vxlfpb8ha4sbz4cqry4jai3"; type = "gem"; }; - version = "3.2024.1001"; + version = "3.2025.0107"; }; mini_portile2 = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1q1f2sdw3y3y9mnym9dhjgsjr72sq975cfg5c4yx7gwv8nmzbvhk"; + sha256 = "0x8asxl83msn815lwmb2d7q5p29p7drhjv5va0byhk60v9n16iwf"; type = "gem"; }; - version = "2.8.7"; + version = "2.8.8"; }; multi_json = { groups = [ "default" ]; @@ -315,20 +325,20 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "15gysw8rassqgdq3kwgl4mhqmrgh7nk2qvrcqp4ijyqazgywn6gq"; + sha256 = "0xc4qs4izky1zgafabzykbxk8lc4dq6aivgxmfv3ciy3jrzbw66z"; type = "gem"; }; - version = "1.16.7"; + version = "1.18.1"; }; octicons = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "00ld13van1xiayr24gwpbxfb63zbw44fx25xs9cp29g6cdzi5hrp"; + sha256 = "0a1gvsr0fcxl7z8mnflr1lmmvknr11l05x9rg3c21dnnk6rnain7"; type = "gem"; }; - version = "19.12.0"; + version = "19.14.0"; }; org-ruby = { dependencies = [ "rubypants" ]; @@ -342,15 +352,18 @@ version = "0.9.12"; }; psych = { - dependencies = [ "stringio" ]; + dependencies = [ + "date" + "stringio" + ]; groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0s5383m6004q76xm3lb732bp4sjzb6mxb6rbgn129gy2izsj4wrk"; + sha256 = "1vjrx3yd596zzi42dcaq5xw7hil1921r769dlbz08iniaawlp9c4"; type = "gem"; }; - version = "5.1.2"; + version = "5.2.3"; }; racc = { groups = [ "default" ]; @@ -375,41 +388,42 @@ rack-protection = { dependencies = [ "base64" + "logger" "rack" ]; groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1xmvcxgm1jq92hqxm119gfk95wzl0d46nb2c2c6qqsm4ra2n3nyh"; + sha256 = "0sniswjyi0yn949l776h7f67rvx5w9f04wh69z5g19vlsnjm98ji"; type = "gem"; }; - version = "4.0.0"; + version = "4.1.1"; }; rack-session = { - dependencies = [ "rack" ]; + dependencies = [ + "base64" + "rack" + ]; groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "10afdpmy9kh0qva96slcyc59j4gkk9av8ilh58cnj0qq7q3b416v"; + sha256 = "1452c1bhh6fdnv17s1z65ajwh08axqnlmkhnr1qyyn2vacb3jz23"; type = "gem"; }; - version = "2.0.0"; + version = "2.1.0"; }; rackup = { - dependencies = [ - "rack" - "webrick" - ]; + dependencies = [ "rack" ]; groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0kbcka30g681cqasw47pq93fxjscq7yvs5zf8lp3740rb158ijvf"; + sha256 = "13brkq5xkj6lcdxj3f0k7v28hgrqhqxjlhd4y2vlicy5slgijdzp"; type = "gem"; }; - version = "2.1.0"; + version = "2.2.1"; }; rdoc = { dependencies = [ "psych" ]; @@ -417,10 +431,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0ygk2zk0ky3d88v3ll7qh6xqvbvw5jin0hqdi1xkv1dhaw7myzdi"; + sha256 = "0h00mb8wcj937srrafpjzq0klfi8rfpd4b3xpbvn9ghrn2wnzimy"; type = "gem"; }; - version = "6.7.0"; + version = "6.11.0"; }; RedCloth = { groups = [ "default" ]; @@ -437,10 +451,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1j9p66pmfgxnzp76ksssyfyqqrg7281dyi3xyknl3wwraaw7a66p"; + sha256 = "1ch4k2y80r4glr579kxliqnxld2qa91ydq8fiqam38bzpbps3gpg"; type = "gem"; }; - version = "3.3.9"; + version = "3.4.0"; }; rouge = { groups = [ "default" ]; @@ -488,13 +502,14 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1sccng15h8h3mcjxfgvxy85lfpswbj0nhmzwwsqdffbzqgsb2jch"; + sha256 = "1b7gcf6pxg4x607bica68dbz22b4kch33yi0ils6x3c8ql9akakz"; type = "gem"; }; - version = "1.7.2"; + version = "1.9.0"; }; sinatra = { dependencies = [ + "logger" "mustermann" "rack" "rack-protection" @@ -505,10 +520,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0za92lv4s7xhgkkm6xxf7ib0b3bsyj8drxgkrskgsb5g3mxnixjl"; + sha256 = "002dkzdc1xqhvz5sdnj4vb0apczhs07mnpgq4kkd5dd1ka2pp6af"; type = "gem"; }; - version = "4.0.0"; + version = "4.1.1"; }; sinatra-contrib = { dependencies = [ @@ -522,10 +537,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0r9khg85m60w0i77jpnm2irh9m4k0ia4mlicapj8dr7s6ykqd9dh"; + sha256 = "1giziwf8mgki581jf40zzw3dhjkkmdg3yxbrahj9krd5h24vb90y"; type = "gem"; }; - version = "4.0.0"; + version = "4.1.1"; }; sprockets = { dependencies = [ @@ -557,10 +572,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "07mfqb40b2wh53k33h91zva78f9zwcdnl85jiq74wnaw2wa6wiak"; + sha256 = "0cd1kdrf62p2ya3ia4rz49d5012bqinvqjmcgkakknswz0l1hkr0"; type = "gem"; }; - version = "3.1.1"; + version = "3.1.2"; }; therubyrhino = { dependencies = [ "therubyrhino_jar" ]; @@ -588,10 +603,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0kds7wkxmb038cwp6ravnwn8k65ixc68wpm8j5jx5bhx8ndg4x6z"; + sha256 = "0szpapi229v3scrvw1pgy0vpjm7z3qlf58m1198kxn70cs278g96"; type = "gem"; }; - version = "2.4.0"; + version = "2.6.0"; }; twitter-text = { dependencies = [ "unf" ]; @@ -630,20 +645,20 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1fv5kvq494swy0p17h9qya9r50w15xsi9zmvhzb8gh55kq6ki50p"; + sha256 = "0i1q2xdjam4d7gwwc35lfnz0wyyzvnca0zslcfxm9fabml9n83kh"; type = "gem"; }; - version = "0.16.10"; + version = "0.16.11"; }; webrick = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "089gy5494j560b242vi173wnbj2913hwlwnjkpzld58r96ilc5s3"; + sha256 = "12d9n8hll67j737ym2zw4v23cn4vxyfkb6vyv1rzpwv6y6a3qbdl"; type = "gem"; }; - version = "1.8.2"; + version = "1.9.1"; }; wikicloth = { dependencies = [ diff --git a/pkgs/by-name/gp/gpsprune/package.nix b/pkgs/by-name/gp/gpsprune/package.nix index 333092fdba0e7..802f9ad4aaf4d 100644 --- a/pkgs/by-name/gp/gpsprune/package.nix +++ b/pkgs/by-name/gp/gpsprune/package.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "gpsprune"; - version = "24.5"; + version = "25"; src = fetchurl { url = "https://activityworkshop.net/software/gpsprune/gpsprune_${version}.jar"; - hash = "sha256-qQtMSQbhIgYLJbCip6ioWeVphO1DEYudmXKUer04L4Y="; + hash = "sha256-8FGOigjHIvj+CZwq0Lht7UZjtmrE5l2Aqx92gZjau44="; }; dontUnpack = true; diff --git a/pkgs/by-name/gq/gqlgen/package.nix b/pkgs/by-name/gq/gqlgen/package.nix index 35606048bccdf..6679f6f11717c 100644 --- a/pkgs/by-name/gq/gqlgen/package.nix +++ b/pkgs/by-name/gq/gqlgen/package.nix @@ -6,7 +6,7 @@ }: let - version = "0.17.63"; + version = "0.17.64"; in buildGoModule { pname = "gqlgen"; @@ -16,10 +16,10 @@ buildGoModule { owner = "99designs"; repo = "gqlgen"; tag = "v${version}"; - hash = "sha256-J9+pleHdbQMHP/Aq9Pl6ise6PDvRqxQ72Iq7SNxgMws="; + hash = "sha256-JzXjUOhj49rp+aALfP48mRkySObd7z5qaHH6Na649+4="; }; - vendorHash = "sha256-hPUWYOfCx+kW2dJsjkCE/7bwofnGdQbDTvfZ877/pCk="; + vendorHash = "sha256-p285G/EfkrLrmbEc10J/QXIn6Hi3KIXH0f+BYeFpE4s="; subPackages = [ "." ]; diff --git a/pkgs/by-name/gq/gqlgenc/package.nix b/pkgs/by-name/gq/gqlgenc/package.nix index 4203714f6e6fd..c70a4ed7f3500 100644 --- a/pkgs/by-name/gq/gqlgenc/package.nix +++ b/pkgs/by-name/gq/gqlgenc/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "gqlgenc"; - version = "0.30.2"; + version = "0.30.3"; src = fetchFromGitHub { owner = "yamashou"; repo = "gqlgenc"; rev = "v${version}"; - sha256 = "sha256-F6EuOqB9ccat9pytJn8glBn5X9eEsEUN2+8+FqVvEbY="; + sha256 = "sha256-NYH05VppoIjxOzMP6aBBtZLxf8cj1kdzS+5NKtIDcik="; }; excludedPackages = [ "example" ]; diff --git a/pkgs/by-name/gr/grafana-kiosk/package.nix b/pkgs/by-name/gr/grafana-kiosk/package.nix index 57913244e940b..7ae16243d7f93 100644 --- a/pkgs/by-name/gr/grafana-kiosk/package.nix +++ b/pkgs/by-name/gr/grafana-kiosk/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "grafana-kiosk"; - version = "1.0.8"; + version = "1.0.9"; src = fetchFromGitHub { owner = "grafana"; repo = "grafana-kiosk"; rev = "v${version}"; - hash = "sha256-M0Gz0+MQNTIOYBxVRaxk5kYZwoJy1nPckGcYF29EzHA="; + hash = "sha256-kh62qGMVHNTssQMEBwLaEW0tRtP3iWMrxXeQU+fe+44="; }; - vendorHash = "sha256-dnA5Z6VX7+RLpV7+PPuckH+v407dK8nbe0OVJtfG1YE="; + vendorHash = "sha256-LZLmXGPYvNR4meqen0h0UHj62392hfPs9BLNK+X6sKA="; nativeBuildInputs = [ makeWrapper ]; postFixup = '' diff --git a/pkgs/by-name/gr/grimblast/package.nix b/pkgs/by-name/gr/grimblast/package.nix index fa7bab1cde8b8..7252d1a969516 100644 --- a/pkgs/by-name/gr/grimblast/package.nix +++ b/pkgs/by-name/gr/grimblast/package.nix @@ -18,13 +18,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "grimblast"; - version = "0.1-unstable-2024-12-01"; + version = "0.1-unstable-2025-01-29"; src = fetchFromGitHub { owner = "hyprwm"; repo = "contrib"; - rev = "d7c55140f1785b8d9fef351f1cd2a4c9e1eaa466"; - hash = "sha256-sp14z0mrqrtmouz1+bU4Jh8/0xi+xwQHF2l7mhGSSVU="; + rev = "d449f6e1fc31084437ebc0c45057ee656f593efd"; + hash = "sha256-8ytokHHcKusbspRaiGP38s7fHU105JRvO9GRTzcRklg="; }; strictDeps = true; @@ -64,10 +64,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { description = "Helper for screenshots within Hyprland, based on grimshot"; license = licenses.mit; platforms = platforms.unix; - maintainers = with maintainers; [ - donovanglover - khaneliman - ]; + maintainers = lib.teams.hyprland.members; mainProgram = "grimblast"; }; }) diff --git a/pkgs/by-name/gt/gtuber/package.nix b/pkgs/by-name/gt/gtuber/package.nix index 71e504cb8e5f8..750c7acdd7ff2 100644 --- a/pkgs/by-name/gt/gtuber/package.nix +++ b/pkgs/by-name/gt/gtuber/package.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation { pname = "gtuber"; - version = "0-unstable-2024-10-11"; + version = "0-unstable-2025-01-19"; src = fetchFromGitHub { owner = "Rafostar"; repo = "gtuber"; - rev = "468bf02a8adcf69b1bd6dd7b5dbcdcc0bfdb6922"; - hash = "sha256-pEiHqcxkrxZRD9xW/R9DNDdp5foxaHK2SAuzmPNegaY="; + rev = "446e26668a4e01fc2ca9c261a7f1c281577e566d"; + hash = "sha256-5Z6sID7Alm4FWl1qCQV1w5DmGsmor2vbnZUJi3Is650="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/gu/gum/package.nix b/pkgs/by-name/gu/gum/package.nix index 6fc7d68be6d50..31e1d6462a6d0 100644 --- a/pkgs/by-name/gu/gum/package.nix +++ b/pkgs/by-name/gu/gum/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "gum"; - version = "0.15.0"; + version = "0.15.1"; src = fetchFromGitHub { owner = "charmbracelet"; repo = pname; rev = "v${version}"; - hash = "sha256-DHIFU+dfZpeQo9kN9Krc1dhTf2HlnC7PEwTfN6RYmSU="; + hash = "sha256-5/ifKAKKl4adhTsrfIzViLuYpHyf1W6L0KQXk9EObow="; }; - vendorHash = "sha256-BcHwFj4nGmKcbVnLEVd9rK54DAyVNc2Dlt085N+HtFA="; + vendorHash = "sha256-H29cyhgC+ZI7CjFTfYb4ekvHfkMfUUzgCDtWXYW6iYM="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/ha/harper/package.nix b/pkgs/by-name/ha/harper/package.nix index fb1a1f105cb71..2064ddb337dbe 100644 --- a/pkgs/by-name/ha/harper/package.nix +++ b/pkgs/by-name/ha/harper/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "harper"; - version = "0.16.0"; + version = "0.18.0"; src = fetchFromGitHub { owner = "Automattic"; repo = "harper"; rev = "v${version}"; - hash = "sha256-lpaE1yb9Yt1AVpZWBnvDOjTpVeKdTlXDnqNDrF0fCZ8="; + hash = "sha256-phwFwrRuMPWPaPKi41G/YQfiRWFfNCir9478VrGckWI="; }; - cargoHash = "sha256-2SFgtEA9dUM1KDgNpZXNVRLHzDCd/AZ4GqzkI8ULRf4="; + cargoHash = "sha256-o2ydYm4ARA7NLcsNtN8oXiVaIv3D+RhW4tC5Btwd4nY="; meta = { description = "Grammar Checker for Developers"; diff --git a/pkgs/by-name/ha/hatch/package.nix b/pkgs/by-name/ha/hatch/package.nix index 5481f4f62aeff..5a5aff9e04739 100644 --- a/pkgs/by-name/ha/hatch/package.nix +++ b/pkgs/by-name/ha/hatch/package.nix @@ -74,18 +74,33 @@ python3Packages.buildPythonApplication rec { export HOME=$(mktemp -d); ''; - pytestFlagsArray = [ - # AssertionError on the version metadata - # https://github.com/pypa/hatch/issues/1877 - "--deselect=tests/backend/metadata/test_spec.py::TestCoreMetadataV21::test_all" - "--deselect=tests/backend/metadata/test_spec.py::TestCoreMetadataV21::test_license_expression" - "--deselect=tests/backend/metadata/test_spec.py::TestCoreMetadataV22::test_all" - "--deselect=tests/backend/metadata/test_spec.py::TestCoreMetadataV22::test_license_expression" - "--deselect=tests/backend/metadata/test_spec.py::TestCoreMetadataV23::test_all" - "--deselect=tests/backend/metadata/test_spec.py::TestCoreMetadataV23::test_license_expression" - "--deselect=tests/backend/metadata/test_spec.py::TestCoreMetadataV23::test_license_files" - "--deselect=tests/backend/metadata/test_spec.py::TestProjectMetadataFromCoreMetadata::test_license_files" - ]; + pytestFlagsArray = + [ + # AssertionError on the version metadata + # https://github.com/pypa/hatch/issues/1877 + "--deselect=tests/backend/metadata/test_spec.py::TestCoreMetadataV21::test_all" + "--deselect=tests/backend/metadata/test_spec.py::TestCoreMetadataV21::test_license_expression" + "--deselect=tests/backend/metadata/test_spec.py::TestCoreMetadataV22::test_all" + "--deselect=tests/backend/metadata/test_spec.py::TestCoreMetadataV22::test_license_expression" + "--deselect=tests/backend/metadata/test_spec.py::TestCoreMetadataV23::test_all" + "--deselect=tests/backend/metadata/test_spec.py::TestCoreMetadataV23::test_license_expression" + "--deselect=tests/backend/metadata/test_spec.py::TestCoreMetadataV23::test_license_files" + "--deselect=tests/backend/metadata/test_spec.py::TestProjectMetadataFromCoreMetadata::test_license_files" + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + # Dependency/versioning errors in the CLI tests, only seem to show up on Darwin + # https://github.com/pypa/hatch/issues/1893 + "--deselect=tests/cli/env/test_create.py::test_sync_dependencies_pip" + "--deselect=tests/cli/env/test_create.py::test_sync_dependencies_uv" + "--deselect=tests/cli/project/test_metadata.py::TestBuildDependenciesMissing::test_no_compatibility_check_if_exists" + "--deselect=tests/cli/run/test_run.py::TestScriptRunner::test_dependencies" + "--deselect=tests/cli/run/test_run.py::TestScriptRunner::test_dependencies_from_tool_config" + "--deselect=tests/cli/run/test_run.py::test_dependency_hash_checking" + "--deselect=tests/cli/run/test_run.py::test_sync_dependencies" + "--deselect=tests/cli/run/test_run.py::test_sync_project_dependencies" + "--deselect=tests/cli/run/test_run.py::test_sync_project_features" + "--deselect=tests/cli/version/test_version.py::test_no_compatibility_check_if_exists" + ]; disabledTests = [ diff --git a/pkgs/by-name/hd/hdrop/package.nix b/pkgs/by-name/hd/hdrop/package.nix index 4c1360184bb0e..fd5c43946f90b 100644 --- a/pkgs/by-name/hd/hdrop/package.nix +++ b/pkgs/by-name/hd/hdrop/package.nix @@ -15,13 +15,13 @@ stdenvNoCC.mkDerivation rec { pname = "hdrop"; - version = "0.7.3"; + version = "0.7.5"; src = fetchFromGitHub { owner = "Schweber"; repo = "hdrop"; rev = "v${version}"; - hash = "sha256-OX9kjGGdIvsaaGwNq7IbyD5B7AmlH1wHiR6P4uIOdi8="; + hash = "sha256-TKSiwpoc1RSct8JzLHeM5SZaIT8fQUmAmY45OKbvQ9E="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/he/heptabase/package.nix b/pkgs/by-name/he/heptabase/package.nix index f01cd563b9c19..d75879d80d9fb 100644 --- a/pkgs/by-name/he/heptabase/package.nix +++ b/pkgs/by-name/he/heptabase/package.nix @@ -5,10 +5,10 @@ }: let pname = "heptabase"; - version = "1.50.1"; + version = "1.51.1"; src = fetchurl { url = "https://github.com/heptameta/project-meta/releases/download/v${version}/Heptabase-${version}.AppImage"; - hash = "sha256-rxCpgetkm8Ma3d5PvTCM2SBcPffImw380UPuR+q0LaQ="; + hash = "sha256-ANVgH20I6pCy2WI3Umni8YCCWxgGrnyP154iHttlQTs="; }; appimageContents = appimageTools.extractType2 { inherit pname version src; }; diff --git a/pkgs/by-name/ho/home-manager/package.nix b/pkgs/by-name/ho/home-manager/package.nix index 4e6e920d98e7e..94160846668f0 100644 --- a/pkgs/by-name/ho/home-manager/package.nix +++ b/pkgs/by-name/ho/home-manager/package.nix @@ -19,14 +19,14 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "home-manager"; - version = "0-unstable-2025-01-13"; + version = "0-unstable-2025-01-27"; src = fetchFromGitHub { name = "home-manager-source"; owner = "nix-community"; repo = "home-manager"; - rev = "fc52a210b60f2f52c74eac41a8647c1573d2071d"; - hash = "sha256-TY0jUwR3EW0fnS0X5wXMAVy6h4Z7Y6a3m+Yq++C9AyE="; + rev = "e1ae908bcc30af792b0bb0a52e53b03d2577255e"; + hash = "sha256-xiPARGKwocaMtv+U/rgi+h2g56CZZEmrcl7ldRaslq8="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ht/httpx/package.nix b/pkgs/by-name/ht/httpx/package.nix index c1f038cf65155..108db308b234e 100644 --- a/pkgs/by-name/ht/httpx/package.nix +++ b/pkgs/by-name/ht/httpx/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "httpx"; - version = "1.6.9"; + version = "1.6.10"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "httpx"; tag = "v${version}"; - hash = "sha256-fkHMtFshRNtRhsxjbYOkeL2cln84NAa01jcGKips5Kk="; + hash = "sha256-lU5LtYFnWJu4yZTqdJFqLnaAUOQ3Nc2EaNPrvTxoW3Q="; }; - vendorHash = "sha256-zTPJtuKPtsVsgMwHFjVwAh1/3DudW7TPWOMJ20nNu1I="; + vendorHash = "sha256-+m0TPKIBCnRfswrMw9+w1r/pWaRmkI+s0RRbv5X5GBo="; subPackages = [ "cmd/httpx" ]; diff --git a/pkgs/by-name/hy/hyprcursor/package.nix b/pkgs/by-name/hy/hyprcursor/package.nix index a501314bcd912..05e8cc9c7911a 100644 --- a/pkgs/by-name/hy/hyprcursor/package.nix +++ b/pkgs/by-name/hy/hyprcursor/package.nix @@ -50,7 +50,11 @@ gcc14Stdenv.mkDerivation (finalAttrs: { description = "Hyprland cursor format, library and utilities"; changelog = "https://github.com/hyprwm/hyprcursor/releases/tag/v${finalAttrs.version}"; license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ iynaix ]; + maintainers = + lib.teams.hyprland.members + ++ (with lib.maintainers; [ + iynaix + ]); mainProgram = "hyprcursor-util"; platforms = lib.platforms.linux; }; diff --git a/pkgs/by-name/hy/hyprgraphics/package.nix b/pkgs/by-name/hy/hyprgraphics/package.nix index 43eb8f4b7e7dc..b6cf9820f4e8d 100644 --- a/pkgs/by-name/hy/hyprgraphics/package.nix +++ b/pkgs/by-name/hy/hyprgraphics/package.nix @@ -51,9 +51,6 @@ gcc14Stdenv.mkDerivation (finalAttrs: { description = "Official implementation library for the hypr config language"; license = lib.licenses.lgpl3Only; platforms = lib.platforms.all; - maintainers = with lib.maintainers; [ - fufexan - khaneliman - ]; + maintainers = lib.teams.hyprland.members; }; }) diff --git a/pkgs/by-name/hy/hypridle/package.nix b/pkgs/by-name/hy/hypridle/package.nix index aa9e74b0ce559..19697748d9680 100644 --- a/pkgs/by-name/hy/hypridle/package.nix +++ b/pkgs/by-name/hy/hypridle/package.nix @@ -48,11 +48,11 @@ gcc14Stdenv.mkDerivation (finalAttrs: { description = "Hyprland's idle daemon"; homepage = "https://github.com/hyprwm/hypridle"; license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ - iogamaster - johnrtitor - khaneliman - ]; + maintainers = + lib.teams.hyprland.members + ++ (with lib.maintainers; [ + iogamaster + ]); mainProgram = "hypridle"; platforms = [ "aarch64-linux" diff --git a/pkgs/by-name/hy/hyprland-protocols/package.nix b/pkgs/by-name/hy/hyprland-protocols/package.nix index 87c9c21036e09..814f3bd948572 100644 --- a/pkgs/by-name/hy/hyprland-protocols/package.nix +++ b/pkgs/by-name/hy/hyprland-protocols/package.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/hyprwm/hyprland-protocols"; description = "Wayland protocol extensions for Hyprland"; license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ fufexan ]; + maintainers = lib.teams.hyprland.members; platforms = lib.platforms.linux; }; }) diff --git a/pkgs/by-name/hy/hyprland-qt-support/package.nix b/pkgs/by-name/hy/hyprland-qt-support/package.nix new file mode 100644 index 0000000000000..3f97833d5a881 --- /dev/null +++ b/pkgs/by-name/hy/hyprland-qt-support/package.nix @@ -0,0 +1,48 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + ninja, + qt6, + pkg-config, + hyprlang, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "hyprland-qt-support"; + version = "0.1.0"; + + src = fetchFromGitHub { + owner = "hyprwm"; + repo = "hyprland-qt-support"; + tag = "v${finalAttrs.version}"; + hash = "sha256-+uZovj+X0a28172y0o0BvgGXyZLpKPbG03sVlCiSrWc="; + }; + + nativeBuildInputs = [ + cmake + ninja + pkg-config + qt6.wrapQtAppsHook + ]; + + buildInputs = [ + qt6.qtbase + qt6.qtdeclarative + qt6.qtsvg + qt6.qtwayland + hyprlang + ]; + + cmakeFlags = [ + (lib.cmakeFeature "INSTALL_QML_PREFIX" qt6.qtbase.qtQmlPrefix) + ]; + + meta = { + description = "A Qt6 QML provider for hypr* apps"; + homepage = "https://github.com/hyprwm/hyprland-qt-support"; + license = lib.licenses.bsd3; + platforms = lib.platforms.linux; + maintainers = lib.teams.hyprland.members; + }; +}) diff --git a/pkgs/by-name/hy/hyprland-qtutils/package.nix b/pkgs/by-name/hy/hyprland-qtutils/package.nix index 779a186bea730..96eab20a79bb8 100644 --- a/pkgs/by-name/hy/hyprland-qtutils/package.nix +++ b/pkgs/by-name/hy/hyprland-qtutils/package.nix @@ -5,6 +5,7 @@ cmake, pkg-config, hyprutils, + hyprland-qt-support, pciutils, qt6, }: @@ -13,13 +14,13 @@ let in gcc14Stdenv.mkDerivation (finalAttrs: { pname = "hyprland-qtutils"; - version = "0.1.2"; + version = "0.1.3"; src = fetchFromGitHub { owner = "hyprwm"; repo = "hyprland-qtutils"; tag = "v${finalAttrs.version}"; - hash = "sha256-FxbuGQExtN37ToWYnGmO6weOYN6WPHN/RAqbr7gNPek="; + hash = "sha256-9m/Ha7hrxtbBl4UylZTYzTT/8a6Sy5DvTmBJrcQ6FwQ="; }; nativeBuildInputs = [ @@ -30,6 +31,7 @@ gcc14Stdenv.mkDerivation (finalAttrs: { buildInputs = [ hyprutils + hyprland-qt-support qt6.qtbase qt6.qtsvg qt6.qtwayland @@ -43,7 +45,7 @@ gcc14Stdenv.mkDerivation (finalAttrs: { description = "Hyprland QT/qml utility apps"; homepage = "https://github.com/hyprwm/hyprland-qtutils"; license = lib.licenses.bsd3; - maintainers = [ lib.maintainers.fufexan ]; + maintainers = lib.teams.hyprland.members; platforms = lib.platforms.linux; }; }) diff --git a/pkgs/by-name/hy/hyprland/info.json b/pkgs/by-name/hy/hyprland/info.json index 18a8ceb32d979..942daa22e053c 100644 --- a/pkgs/by-name/hy/hyprland/info.json +++ b/pkgs/by-name/hy/hyprland/info.json @@ -1,7 +1,7 @@ { - "branch": "v0.46.2-b", - "commit_hash": "0bd541f2fd902dbfa04c3ea2ccf679395e316887", - "commit_message": "version: bump to 0.46.2", - "date": "2024-12-19", - "tag": "v0.46.2" + "branch": "v0.47.1-b", + "commit_hash": "75dff7205f6d2bd437abfb4196f700abee92581a", + "commit_message": "version: bump to 0.47.1", + "date": "2025-01-29", + "tag": "v0.47.1" } diff --git a/pkgs/by-name/hy/hyprland/package.nix b/pkgs/by-name/hy/hyprland/package.nix index ad06666d32374..96493d63a36f5 100644 --- a/pkgs/by-name/hy/hyprland/package.nix +++ b/pkgs/by-name/hy/hyprland/package.nix @@ -13,6 +13,7 @@ cairo, epoll-shim, git, + glaze, hyprcursor, hyprgraphics, hyprland-qtutils, @@ -85,14 +86,14 @@ assert assertMsg (!hidpiXWayland) customStdenv.mkDerivation (finalAttrs: { pname = "hyprland" + optionalString debug "-debug"; - version = "0.46.2"; + version = "0.47.1"; src = fetchFromGitHub { owner = "hyprwm"; repo = "hyprland"; fetchSubmodules = true; tag = "v${finalAttrs.version}"; - hash = "sha256-dj9dpVwpyTmUyVu4jtaIU39bHgVkoZjv6cgYfWyHc9E="; + hash = "sha256-374Ul6LCnuDdZ7o1xl2lDxTfmwt46K6csf6eniqFRYA="; }; postPatch = '' @@ -143,6 +144,7 @@ customStdenv.mkDerivation (finalAttrs: { [ aquamarine cairo + glaze git hyprcursor.dev hyprgraphics @@ -215,12 +217,7 @@ customStdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/hyprwm/Hyprland"; description = "Dynamic tiling Wayland compositor that doesn't sacrifice on its looks"; license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ - fufexan - johnrtitor - khaneliman - wozeparrot - ]; + maintainers = lib.teams.hyprland.members; mainProgram = "Hyprland"; platforms = lib.platforms.linux ++ lib.platforms.freebsd; }; diff --git a/pkgs/by-name/hy/hyprlang/package.nix b/pkgs/by-name/hy/hyprlang/package.nix index 0cbd1babd3407..d4dbe9584dd87 100644 --- a/pkgs/by-name/hy/hyprlang/package.nix +++ b/pkgs/by-name/hy/hyprlang/package.nix @@ -39,9 +39,10 @@ gcc14Stdenv.mkDerivation (finalAttrs: { description = "Official implementation library for the hypr config language"; license = lib.licenses.lgpl3Only; platforms = lib.platforms.all; - maintainers = with lib.maintainers; [ - iogamaster - fufexan - ]; + maintainers = + lib.teams.hyprland.members + ++ (with lib.maintainers; [ + iogamaster + ]); }; }) diff --git a/pkgs/by-name/hy/hyprlock/package.nix b/pkgs/by-name/hy/hyprlock/package.nix index e93cdcaceca01..6ee11eef131f5 100644 --- a/pkgs/by-name/hy/hyprlock/package.nix +++ b/pkgs/by-name/hy/hyprlock/package.nix @@ -70,10 +70,11 @@ gcc14Stdenv.mkDerivation (finalAttrs: { description = "Hyprland's GPU-accelerated screen locking utility"; homepage = "https://github.com/hyprwm/hyprlock"; license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ - iynaix - johnrtitor - ]; + maintainers = + lib.teams.hyprland.members + ++ (with lib.maintainers; [ + iynaix + ]); mainProgram = "hyprlock"; platforms = lib.platforms.linux; }; diff --git a/pkgs/by-name/hy/hyprpaper/package.nix b/pkgs/by-name/hy/hyprpaper/package.nix index bbf718c12f11b..3d04aa0caa41c 100644 --- a/pkgs/by-name/hy/hyprpaper/package.nix +++ b/pkgs/by-name/hy/hyprpaper/package.nix @@ -82,11 +82,7 @@ gcc14Stdenv.mkDerivation (finalAttrs: { inherit (finalAttrs.src.meta) homepage; description = "Blazing fast wayland wallpaper utility"; license = licenses.bsd3; - maintainers = with maintainers; [ - fufexan - khaneliman - wozeparrot - ]; + maintainers = lib.teams.hyprland.members; inherit (wayland.meta) platforms; broken = gcc14Stdenv.hostPlatform.isDarwin; mainProgram = "hyprpaper"; diff --git a/pkgs/by-name/hy/hyprpicker/package.nix b/pkgs/by-name/hy/hyprpicker/package.nix index f053be81f95aa..72ca3b69676b1 100644 --- a/pkgs/by-name/hy/hyprpicker/package.nix +++ b/pkgs/by-name/hy/hyprpicker/package.nix @@ -61,10 +61,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Wlroots-compatible Wayland color picker that does not suck"; homepage = "https://github.com/hyprwm/hyprpicker"; license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ - fufexan - khaneliman - ]; + maintainers = lib.teams.hyprland.members; platforms = wayland.meta.platforms; mainProgram = "hyprpicker"; }; diff --git a/pkgs/by-name/hy/hyprpolkitagent/package.nix b/pkgs/by-name/hy/hyprpolkitagent/package.nix index 056bd0d3aad44..b9b2ba249496d 100644 --- a/pkgs/by-name/hy/hyprpolkitagent/package.nix +++ b/pkgs/by-name/hy/hyprpolkitagent/package.nix @@ -4,6 +4,7 @@ cmake, pkg-config, fetchFromGitHub, + hyprland-qt-support, hyprutils, kdePackages, polkit, @@ -27,6 +28,7 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ + hyprland-qt-support hyprutils kdePackages.kirigami-addons kdePackages.polkit-qt-1 @@ -40,10 +42,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Polkit authentication agent written in QT/QML"; homepage = "https://github.com/hyprwm/hyprpolkitagent"; license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ - fufexan - johnrtitor - ]; + maintainers = lib.teams.hyprland.members; mainProgram = "hyprpolkitagent"; platforms = lib.platforms.linux; }; diff --git a/pkgs/by-name/hy/hyprprop/package.nix b/pkgs/by-name/hy/hyprprop/package.nix index f50e592506f69..e69670eb254ef 100644 --- a/pkgs/by-name/hy/hyprprop/package.nix +++ b/pkgs/by-name/hy/hyprprop/package.nix @@ -65,7 +65,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { description = "An xprop replacement for Hyprland"; license = lib.licenses.mit; platforms = lib.platforms.unix; - maintainers = with lib.maintainers; [ khaneliman ]; + maintainers = lib.teams.hyprland.members; mainProgram = "hyprprop"; }; }) diff --git a/pkgs/by-name/hy/hyprsunset/package.nix b/pkgs/by-name/hy/hyprsunset/package.nix index 56755a5139548..40ebdae92ef55 100644 --- a/pkgs/by-name/hy/hyprsunset/package.nix +++ b/pkgs/by-name/hy/hyprsunset/package.nix @@ -53,10 +53,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Application to enable a blue-light filter on Hyprland"; license = lib.licenses.bsd3; platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ - fufexan - johnrtitor - ]; + maintainers = lib.teams.hyprland.members; mainProgram = "hyprsunset"; }; }) diff --git a/pkgs/by-name/hy/hyprsysteminfo/package.nix b/pkgs/by-name/hy/hyprsysteminfo/package.nix new file mode 100644 index 0000000000000..54e1f7a6cfbc7 --- /dev/null +++ b/pkgs/by-name/hy/hyprsysteminfo/package.nix @@ -0,0 +1,53 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + qt6, + pkg-config, + hyprutils, + pciutils, + hyprland-qt-support, +}: +let + inherit (lib.strings) makeBinPath; +in +stdenv.mkDerivation (finalAttrs: { + pname = "hyprsysteminfo"; + version = "0.1.3"; + + src = fetchFromGitHub { + owner = "hyprwm"; + repo = "hyprsysteminfo"; + tag = "v${finalAttrs.version}"; + hash = "sha256-KDxT9B+1SATWiZdUBAQvZu17vk3xmyXcw2Zy56bdWbY="; + }; + + nativeBuildInputs = [ + cmake + pkg-config + qt6.wrapQtAppsHook + ]; + + buildInputs = [ + qt6.qtbase + qt6.qtdeclarative + qt6.qtsvg + qt6.qtwayland + hyprutils + hyprland-qt-support + ]; + + preFixup = '' + qtWrapperArgs+=(--prefix PATH : "${makeBinPath [ pciutils ]}") + ''; + + meta = { + description = "A tiny qt6/qml application to display information about the running system"; + homepage = "https://github.com/hyprwm/hyprsysteminfo"; + license = lib.licenses.bsd3; + maintainers = lib.teams.hyprland.members; + mainProgram = "hyprsysteminfo"; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/by-name/hy/hyprutils/package.nix b/pkgs/by-name/hy/hyprutils/package.nix index dec697da74fde..7f2760e902924 100644 --- a/pkgs/by-name/hy/hyprutils/package.nix +++ b/pkgs/by-name/hy/hyprutils/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "hyprutils"; - version = "0.3.3"; + version = "0.5.0"; src = fetchFromGitHub { owner = "hyprwm"; repo = "hyprutils"; tag = "v${finalAttrs.version}"; - hash = "sha256-1LimBKvDpBbeX+qW7T240WEyw+DBVpDotZB4JYm8Aps="; + hash = "sha256-TfFS0HCEJh63Kahrkp1h9hVDMdLU8a37Zz+IFucxyfA="; }; nativeBuildInputs = [ @@ -42,9 +42,6 @@ stdenv.mkDerivation (finalAttrs: { description = "Small C++ library for utilities used across the Hypr* ecosystem"; license = lib.licenses.bsd3; platforms = lib.platforms.linux ++ lib.platforms.freebsd; - maintainers = with lib.maintainers; [ - donovanglover - johnrtitor - ]; + maintainers = lib.teams.hyprland.members; }; }) diff --git a/pkgs/by-name/hy/hyprwayland-scanner/package.nix b/pkgs/by-name/hy/hyprwayland-scanner/package.nix index ff72717819f7a..1e32eaa1f7364 100644 --- a/pkgs/by-name/hy/hyprwayland-scanner/package.nix +++ b/pkgs/by-name/hy/hyprwayland-scanner/package.nix @@ -36,10 +36,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Hyprland version of wayland-scanner in and for C++"; changelog = "https://github.com/hyprwm/hyprwayland-scanner/releases/tag/${finalAttrs.version}"; license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ - fufexan - johnrtitor - ]; + maintainers = lib.teams.hyprland.members; mainProgram = "hyprwayland-scanner"; platforms = lib.platforms.linux; }; diff --git a/pkgs/by-name/i3/i3nator/package.nix b/pkgs/by-name/i3/i3nator/package.nix deleted file mode 100644 index 3736bff99dda3..0000000000000 --- a/pkgs/by-name/i3/i3nator/package.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ - lib, - fetchFromGitHub, - rustPlatform, -}: - -rustPlatform.buildRustPackage rec { - pname = "i3nator"; - version = "1.2.0"; - - src = fetchFromGitHub { - owner = "pitkley"; - repo = pname; - rev = version; - sha256 = "10rxvxq48dhzlw5p9fsj6x0ci4pap85s9b192zakgvk4h97ifp2p"; - }; - - cargoHash = "sha256-74woBoLXuxE4v3iMvc+QWz5n5F5/peaFBgZu+3ULXRM="; - - meta = with lib; { - description = "Tmuxinator for the i3 window manager"; - homepage = "https://github.com/pitkley/i3nator"; - license = with licenses; [ asl20 ]; - maintainers = with maintainers; [ mpoquet ]; - mainProgram = "i3nator"; - }; -} diff --git a/pkgs/by-name/ie/ieda/rustpkgs.nix b/pkgs/by-name/ie/ieda/rustpkgs.nix index ede208786947a..f02385b6136d1 100644 --- a/pkgs/by-name/ie/ieda/rustpkgs.nix +++ b/pkgs/by-name/ie/ieda/rustpkgs.nix @@ -8,7 +8,8 @@ in version = "0.1.3"; src = rootSrc; sourceRoot = "${src.name}/src/operation/iIR/source/iir-rust/iir"; - cargoHash = "sha256-ka91IsmBGBYts4U9X4uZDUMeS9adPn3MKl2BY4ZKDCY="; + useFetchCargoVendor = true; + cargoHash = "sha256-xyNaUTPvU21yOdkQq8vdnHCyLzcpDAFAje0R/gDqliU="; doCheck = false; @@ -19,7 +20,8 @@ in version = "0.1.0"; src = rootSrc; sourceRoot = "${src.name}/src/database/manager/parser/liberty/lib-rust/liberty-parser"; - cargoHash = "sha256-7yUD8M3efisuVoH3/R+Pk2CP4mizSinrqeuy3uqkq2c="; + useFetchCargoVendor = true; + cargoHash = "sha256-nRIOuSz5ImENvKeMAnthmBo+2/Jy5xbM66xkcfVCTMI="; doCheck = false; @@ -30,7 +32,8 @@ in version = "0.1.0"; src = rootSrc; sourceRoot = "${src.name}/src/database/manager/parser/sdf/sdf_parse"; - cargoHash = "sha256-6uzufy3S21vHJYgx9sItxQyccG0g/Zz1r2xHsYoQPRM="; + useFetchCargoVendor = true; + cargoHash = "sha256-PORA/9DDIax4lOn/pzmi7Y8mCCBUphMTzbBsb64sDl0="; nativeBuildInputs = [ rustPlatform.bindgenHook ]; }; @@ -39,7 +42,8 @@ in version = "0.2.4"; src = rootSrc; sourceRoot = "${src.name}/src/database/manager/parser/spef/spef-parser"; - cargoHash = "sha256-KTd3HVKV8hRCXf56FPksYGVJNDdlmMMIcSEk1MMGLsw="; + useFetchCargoVendor = true; + cargoHash = "sha256-Qr/oXTqn2gaxyAyLsRjaXNniNzIYVzPGefXTdkULmYk="; nativeBuildInputs = [ rustPlatform.bindgenHook ]; }; @@ -48,7 +52,8 @@ in version = "0.1.0"; src = rootSrc; sourceRoot = "${src.name}/src/database/manager/parser/vcd/vcd_parser"; - cargoHash = "sha256-1y1nPNfx23MyIJUV+E6mMuDOhdob0BDGuQwOl0Le/lE="; + useFetchCargoVendor = true; + cargoHash = "sha256-xcfVzDrnW4w3fU7qo6xzSQeIH8sEbEyzPF92F5tDcAk="; doCheck = false; @@ -59,7 +64,8 @@ in version = "0.1.0"; src = rootSrc; sourceRoot = "${src.name}/src/database/manager/parser/verilog/verilog-rust/verilog-parser"; - cargoHash = "sha256-Z/LXQzQ0m1lQdIPaWQ5rs2EAu/mbyi2JvrjGYVmKONs="; + useFetchCargoVendor = true; + cargoHash = "sha256-ooxY8Q8bfD+klBGfpTDD3YyWptEOGGHDoyamhjlSNTM="; doCheck = false; diff --git a/pkgs/by-name/im/imgproxy/package.nix b/pkgs/by-name/im/imgproxy/package.nix index 3ce46a4b6a685..c01f697f5c50d 100644 --- a/pkgs/by-name/im/imgproxy/package.nix +++ b/pkgs/by-name/im/imgproxy/package.nix @@ -11,12 +11,12 @@ buildGoModule rec { pname = "imgproxy"; - version = "3.27.1"; + version = "3.27.2"; src = fetchFromGitHub { owner = pname; repo = pname; - hash = "sha256-ewfBMHSrt7fBazgswOwOmeqk0uAc3uULPYppQZcLep4="; + hash = "sha256-rPdo+gj1nxbrE3qbABB7H+tN6WXAdwhtPUCYCsn6vEk="; rev = "v${version}"; }; diff --git a/pkgs/by-name/im/immich-public-proxy/package.nix b/pkgs/by-name/im/immich-public-proxy/package.nix index 3eab126726465..63157a6af6c5c 100644 --- a/pkgs/by-name/im/immich-public-proxy/package.nix +++ b/pkgs/by-name/im/immich-public-proxy/package.nix @@ -8,17 +8,17 @@ }: buildNpmPackage rec { pname = "immich-public-proxy"; - version = "1.6.2"; + version = "1.6.3"; src = fetchFromGitHub { owner = "alangrainger"; repo = "immich-public-proxy"; tag = "v${version}"; - hash = "sha256-R2w11AdOgcV1R1eIzDgt+yexWwystDNJiJ+14MH6WtU="; + hash = "sha256-nhVU3CVexXV+WCUP8E1tGvwwjy+PCTL9v3/3KI1tDus="; }; sourceRoot = "${src.name}/app"; - npmDepsHash = "sha256-VXCJ0VaAKOlz342saRAnb1MLZGgIZwPpy/2oS/Gvsj8="; + npmDepsHash = "sha256-NQgxAHNMPp2eDoiMqjqBOZ3364XjW3WtvrK/ciqg1DI="; # patch in absolute nix store paths so the process doesn't need to cwd in $out postPatch = '' diff --git a/pkgs/by-name/im/immich/sources.json b/pkgs/by-name/im/immich/sources.json index 199e2283252f7..7e2d317c56086 100644 --- a/pkgs/by-name/im/immich/sources.json +++ b/pkgs/by-name/im/immich/sources.json @@ -1,26 +1,26 @@ { - "version": "1.125.3", - "hash": "sha256-lDk2Pj+wspzeRVccWOJ1Xp4E72jlkJBU3G5djFNNHYw=", + "version": "1.125.7", + "hash": "sha256-xXxLSfJgdBprDloJwjqLssux/M9+sOyyrzoqGp/dfOM=", "components": { "cli": { - "npmDepsHash": "sha256-l4h6aTgGGZf84LpmaN9XLiw99pgo4JN8zfBXvyE438Y=", - "version": "2.2.44" + "npmDepsHash": "sha256-rAL+0GxC/GrgWwc5Z0hsJwInpQ/Afk+O2Pwz+I8vtk0=", + "version": "2.2.48" }, "server": { - "npmDepsHash": "sha256-v21BjA7+zOPQtZNH06q4+x/EvcNVi/4T1Zi4LMgYZUU=", - "version": "1.125.3" + "npmDepsHash": "sha256-s20zBaB/uBDZe60OKtZkHte5AaYtsaKQtkObEl7SXDU=", + "version": "1.125.7" }, "web": { - "npmDepsHash": "sha256-H32WmL7C+I03i3LSfs87Wyj/TMubqF1Nz7/VEj25aeI=", - "version": "1.125.3" + "npmDepsHash": "sha256-1zwtrFcs7mW2wMIQSwPU/CT3XxHZoIeh5KC/vZEPL4E=", + "version": "1.125.7" }, "open-api/typescript-sdk": { - "npmDepsHash": "sha256-HpLw4I7KEap45HnRcA4u1PA8qM2HvSeF5hLkar20bns=", - "version": "1.125.3" + "npmDepsHash": "sha256-vjgalQXHOllSCkVAG6bm0jVM68V20WIFgV9L/mCkklU=", + "version": "1.125.7" }, "geonames": { - "timestamp": "20250126191509", - "hash": "sha256-uzKJJTN9TZCAgEtePI2RGZWTNGKdhmup4RHNVMGfQ48=" + "timestamp": "20250129185843", + "hash": "sha256-poOvoBprzlEe4WDOdcO0TnIcwUp5xuKScumHMJ8YgO8=" } } } diff --git a/pkgs/by-name/in/influxdb-cxx/package.nix b/pkgs/by-name/in/influxdb-cxx/package.nix index de1ae626c49b3..6f4fff2d55fc8 100644 --- a/pkgs/by-name/in/influxdb-cxx/package.nix +++ b/pkgs/by-name/in/influxdb-cxx/package.nix @@ -17,12 +17,19 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "offa"; repo = "influxdb-cxx"; - rev = "v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-UlCmaw2mWAL5PuNXXGQa602Qxlf5BCr7ZIiShffG74o="; }; + patches = [ + (fetchpatch { + url = "https://github.com/offa/influxdb-cxx/commit/c4b0d5a4df153232be542fbb073e857ff69ec78c.patch"; + hash = "sha256-zPE7giDjWyQbGJxdZh2CEbAjouHUcAbQEzaOfCUSkfU="; + }) + ]; + postPatch = '' - substituteInPlace CMakeLists.txt --replace "-Werror" "" + substituteInPlace CMakeLists.txt --replace-warn "-Werror" "" ''; nativeBuildInputs = [ cmake ]; @@ -44,11 +51,11 @@ stdenv.mkDerivation (finalAttrs: { doCheck = true; - meta = with lib; { + meta = { description = "InfluxDB C++ client library"; homepage = "https://github.com/offa/influxdb-cxx"; - license = licenses.mit; - maintainers = with maintainers; [ sikmir ]; - platforms = platforms.unix; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ sikmir ]; + platforms = lib.platforms.unix; }; }) diff --git a/pkgs/by-name/io/iosevka-bin/package.nix b/pkgs/by-name/io/iosevka-bin/package.nix index 753b347b895a4..cadfedce6ebe4 100644 --- a/pkgs/by-name/io/iosevka-bin/package.nix +++ b/pkgs/by-name/io/iosevka-bin/package.nix @@ -17,7 +17,7 @@ let in stdenv.mkDerivation rec { pname = "${name}-bin"; - version = "32.3.1"; + version = "32.4.0"; src = fetchurl { url = "https://github.com/be5invis/Iosevka/releases/download/v${version}/PkgTTC-${name}-${version}.zip"; diff --git a/pkgs/by-name/io/iosevka-bin/variants.nix b/pkgs/by-name/io/iosevka-bin/variants.nix index dcc9a09f25681..470c00cd856e2 100644 --- a/pkgs/by-name/io/iosevka-bin/variants.nix +++ b/pkgs/by-name/io/iosevka-bin/variants.nix @@ -1,93 +1,93 @@ # This file was autogenerated. DO NOT EDIT! { - Iosevka = "1lpjvk31is2wm7705ilb826cpsgwfsx5182ic6lavpjigjnwi4qr"; - IosevkaAile = "0bagp60c44ksl1irh02hdjn4dw963l1z0k77nkmipqrgxl8g00vc"; - IosevkaCurly = "1sp72p2vxmjqjlxfkiyzg5gibymss8vxrvp7c32fybi5dfyixy28"; - IosevkaCurlySlab = "0wbrca2qjwd5g1jic10lfzgg3rpd70plx0q73fjlj7gpx4af7j25"; - IosevkaEtoile = "0jnbn5w04brx87ir708vi9nh0zx41znvk8anbxhi8smn7p8krd52"; - IosevkaSlab = "1l70z14xrh4aiib3yx32ypnxaj96gimiq72ar1w06mi445s3bka1"; - IosevkaSS01 = "0wfcjlkl2l6nyxy8gpsrmmvp5dsjz5qbz94ixviian2067lmy9n6"; - IosevkaSS02 = "0lj1vjvk3977kszc21p2pjmmfj68gj43dj69qn01wzfh6sy8qjwm"; - IosevkaSS03 = "0qd8nrd1j62khj865w52p9sanliyw19i8i3c49haw5pcwpylsgw5"; - IosevkaSS04 = "0dpm6jkszr75w6v023wd4yk1zrvfw1p3q7a9n4svr8vxmimn0b7m"; - IosevkaSS05 = "1naqv4nfl1bkl1gkmccls7104ixah9bkjyw6hn1434dgfgb7fhh3"; - IosevkaSS06 = "1cknkhcj8pqaz65s62rvpw1c6mr59hkn623lr8jzfz5wy018xy73"; - IosevkaSS07 = "0skn5i6wd40kzrlh6b483j0861imwa0zfalv6d022lxadznzld9f"; - IosevkaSS08 = "0lj48zk5il5jd7p3wyhcgqszkcyjzdmskbldjp31avjhjpmv0l78"; - IosevkaSS09 = "0w7w7jvs3jk6iimkb2g3c6w1a6rmmwnvh7gzh7zs5dirzyx2wcsd"; - IosevkaSS10 = "0f61cpjlw05r21i8pjx005yjy3wiw1rkrxmp12fd5v5hmj88m7wh"; - IosevkaSS11 = "138svbwr42hhhxbi330adhbyjqp1zfxvbv1nnc74pj94zijj6vzp"; - IosevkaSS12 = "1dil93hrghpg38wz3988zfd25hm7bx69zm6qw369x5216hcknz2v"; - IosevkaSS13 = "1ah6s1akc1m4hl21j64xnvd2jy2pmdafkkkvi1jhdvcq36k6nsm9"; - IosevkaSS14 = "1v2780dzyaazp0r2z1nclms2f26v4g2s7k1wqxw34fjzlzpkfcfa"; - IosevkaSS15 = "0m2fkvrnbz4h6ncsim9ixvp15g6rl1lsb62cvhfpq9bnydpzzxby"; - IosevkaSS16 = "0b3d6zkd5rn5dg6zq9airj96cjmbc30ds8qi3c610jvca865gh1m"; - IosevkaSS17 = "16x4n7cvhp017dg3a94chg5pg2svimlblmhbxnyic5nzy27hq26f"; - IosevkaSS18 = "18iab2dafsj1y18rvhvr53dyfawk6gxxsss4h4r9vajvp08y3qra"; - SGr-Iosevka = "0523fpvvypb0a1zj881n352vkbgybwz8859i8rqayxn1l766w8kx"; - SGr-IosevkaCurly = "0gfpw0ilk5j4r7kz53w99jsc309j8c4a9cxcahpssb6cnygpm6cp"; - SGr-IosevkaCurlySlab = "1gig9h22x9nw3zds3z9bqry9kvvgl197lkjf5x9pbbc8ah9m25iz"; - SGr-IosevkaFixed = "1bqn0v3z2vqi7lgxhwmbm7s62llyammpbs524na59m99g8rxa8dr"; - SGr-IosevkaFixedCurly = "1pwv91cpf672wdrvmv6adjkbnnrrdqqla2iyd9baxni44qmk9dji"; - SGr-IosevkaFixedCurlySlab = "0wsgx32d45a1iwz67hl40kwbz6j7g6c83f3nhq156pqa5v0afk2d"; - SGr-IosevkaFixedSlab = "04ms0gnz55fp6y01f6qskwmxfj8hy3kwxigpmqlghlzygbyfx7mf"; - SGr-IosevkaFixedSS01 = "0ffrhysjr5qggx5ccglsa44j5l25jz7a7kypcanpglpfzja011q2"; - SGr-IosevkaFixedSS02 = "1a0khkqs6fw9vzrd23a1nnjzz5vimgx1d5m1bzk761fsbrgv9jn0"; - SGr-IosevkaFixedSS03 = "0h25vb2d3qs778pv01l6slx3d4q5mz9vmqr5lb6ch1zczilz5i9q"; - SGr-IosevkaFixedSS04 = "0za23nay4909cyy3vjh2k28975cbabrqqxifw5wlyqwsi8ajr8hs"; - SGr-IosevkaFixedSS05 = "1kgfryzqddywdv8wyc38fwhx6nbh9fij2g4xfs25xiwfsprl36lm"; - SGr-IosevkaFixedSS06 = "0z9y16sipzqdgi36315zsa3hr4cy394g0f6j99lz8p027r14mbd1"; - SGr-IosevkaFixedSS07 = "1rfpri0fl7iihi6850zr96jlvcsarvv1jfsyhkmj8rclpd1zqgwk"; - SGr-IosevkaFixedSS08 = "046pwn81w7ijda9v7hwwgxja76n15l70c2zaa3wx5cqpkkadm4f3"; - SGr-IosevkaFixedSS09 = "1dqb4d8dr1mj34625pzvp8sngky98900vv9m1n8fid9lg1kix0jp"; - SGr-IosevkaFixedSS10 = "0d29vzvw1mhb6i1i8fmwgiycx30lpjgv38jmx8gnb837q5295r62"; - SGr-IosevkaFixedSS11 = "0khvm0bxm207va69a932v45dsafqlgzyx4fi146msx67h9nz9i57"; - SGr-IosevkaFixedSS12 = "1l1imghykch93n11y0a6hs1512xlcsxq3c4mk040zzy8dflbl9w4"; - SGr-IosevkaFixedSS13 = "1xb6janlz1cpns2pacsj2pbchghgzbz6mqgnq14z2x646ag90290"; - SGr-IosevkaFixedSS14 = "085q55s1rn52swlizcxw6wrdy73ilv6h0ypysh6zjqcrlgpda3x6"; - SGr-IosevkaFixedSS15 = "1m2adjy4rh7w2hjfb86kdagwasvai5fk83lincbh84avxlwz28sf"; - SGr-IosevkaFixedSS16 = "1w2f2glipy3h9sdw8l3ng7abl0421v176fi7phxjci90mxdj1i2l"; - SGr-IosevkaFixedSS17 = "1dvnxfyp89x7qrmjrkgzc14c0xxdfq1qb71bbks69zcnsmcm4zr1"; - SGr-IosevkaFixedSS18 = "1hms6c5g0p0j2dxyp1jdkc0kar1jwqzmjafafm6vjpnm8gaz5pz1"; - SGr-IosevkaSlab = "04539yj4yq854af0lm9p68njjigarigpk16h3qv8x8n1l2rkrq0z"; - SGr-IosevkaSS01 = "1gfcnj0wbm1x6zb1w9acp0q7775wdahdwd397fmpg662l0ss25mq"; - SGr-IosevkaSS02 = "0pm76nkpgjsnz44ngk93slsy5jv32821l4vrzn5d785bbdzzzf8d"; - SGr-IosevkaSS03 = "0cvmam87jzk83zfzjb2pcqvzh2zvr4ljjbg55ij1q7xhd64rqpaj"; - SGr-IosevkaSS04 = "1jq16mz0p8xy4ikyn7bjbvnrhlpvkz6y0ih84xbfkgig66hq43g1"; - SGr-IosevkaSS05 = "1phvc0ssssh7l5rdn1xby0bp4q3asr333xrf3dfiavx7ldysyipq"; - SGr-IosevkaSS06 = "0ybb7slxwsg87avhyyyvyrx469lf00bb8aw4371ypp34bbs10zr8"; - SGr-IosevkaSS07 = "0c2ym41kzxq3jnj131qc4q451blmaks5rd5ai1fb8xkzzwzfjin3"; - SGr-IosevkaSS08 = "0305v7pzxwp34kvwp6ysiirw0vl0z81hh629nsg3dm8a4da86b7h"; - SGr-IosevkaSS09 = "14zl7lab38xwp2k1fmqgnmm3bxf6ribk23bk531l6bgwdzxd84ds"; - SGr-IosevkaSS10 = "19a24pfcwiidpvfncf955q856kz2imqwmcvf93afwmpd7aya5gi2"; - SGr-IosevkaSS11 = "1b9ayk0ykxdcxlafqh49g5gyck1s9kpyd66nfg6jd1d3ql3ryajh"; - SGr-IosevkaSS12 = "01rby2jx0gc6n5ch79qjdfq8sp2bm4ji28dcixycv03sjq96agdz"; - SGr-IosevkaSS13 = "0rmkx6bzwvbcqaa950lng8aizkm9m3zrrwxzrfydgf6xx1s37ac5"; - SGr-IosevkaSS14 = "0xf41gjq55xk1fkys1j324zrh1ds545s8bdlliq1kzik0i6gbjli"; - SGr-IosevkaSS15 = "0izk1snd2rsh1gaa6rikr1grn3lwfkg3hnsikfqj16fixpxm752j"; - SGr-IosevkaSS16 = "1zr5706wq1jbfhngwnd6i9dy4izhv43p8pz0l0ly6f4zgcx3533a"; - SGr-IosevkaSS17 = "1lwj5mdhmnq9qkjkql2vawihbjf0dp50s8s8i2gq5cciy861i0qx"; - SGr-IosevkaSS18 = "155kwdny6fcaavd8mg8j1j6s9sfj35ig2cx75h7dkqsblbmcz2z2"; - SGr-IosevkaTerm = "0snj7i9ipa1ilancqcdwcw12s427nj9z3vgmmf71hbba9f82az1c"; - SGr-IosevkaTermCurly = "119ay1rxci8bg59687ckd2n61a6g09h4a6lk7319caw3s1w3mj6d"; - SGr-IosevkaTermCurlySlab = "0j1pis6aj1sblm4png0y1mihz3b1f4l8g768grnrfzl338nfg90v"; - SGr-IosevkaTermSlab = "05vqfdhrxrbsb81j2yrsfjqzmrhin9qf9jncx220dp7qvkjpjsza"; - SGr-IosevkaTermSS01 = "1j2sgpgnavll25ah6dr408bbq1i0mp0jvd5cgdfa4lq9nk9aa6c2"; - SGr-IosevkaTermSS02 = "0rx3kdin2rf8nr1jf7kw1ch6zgilgirflgkq9lyx83qq79dhakma"; - SGr-IosevkaTermSS03 = "1984r56grgrcm6lmm8mkik6n79pvwhzpfygd204rcqm267mw3hml"; - SGr-IosevkaTermSS04 = "168dxikfxqc66j3k8amf9bqcdzw053g4rl1cbxw3mxa72ay822j9"; - SGr-IosevkaTermSS05 = "0fy5mxw3yb82mr7jqm5fr2990xav794x3w419n7zs5bx8gj3l28c"; - SGr-IosevkaTermSS06 = "1fiw3qmkfhfzhns0b9gkb6bzfn17qkwyx3a8i3y2q2567hr6j1v4"; - SGr-IosevkaTermSS07 = "14fmhhrv1f39b6shp4y8aqmmvf245l12ga00af75mdan13mqsj1s"; - SGr-IosevkaTermSS08 = "1mcjlhvg1sci7y3whj4zc3lf8k880pvl8w2lf2fkyyz01x4x3ixw"; - SGr-IosevkaTermSS09 = "17wlci26hzjxawgars1dfdj0nn4a64r24fh1m8xvay8c6n0id50d"; - SGr-IosevkaTermSS10 = "113mjv8hxzjcimzwg1fy1z3ii44ncaxd1kcq1n2f5czdcsawx1lj"; - SGr-IosevkaTermSS11 = "0hp6b8c4ggzl6j4bjbw6dwphh4klwg6qrfmksqng0p8hvsf5lkp6"; - SGr-IosevkaTermSS12 = "1v7l7x8c7dmaim5rjdlvn66parfpzslc8y5c77r0c1rxafxgkycd"; - SGr-IosevkaTermSS13 = "1z855ikw3d8gnsz8xsdnfzl4pzxyp6p6yx6mjkw8rigjgk95kq8s"; - SGr-IosevkaTermSS14 = "1m7csblfpc0i6ly6jlizma5h6j73y9c2dhgqgqqw0r3cgrg249wi"; - SGr-IosevkaTermSS15 = "10l5b9p0b5m1884wmq0jk5i31hbizy6rn19i3qj6ifnf0mni3zxs"; - SGr-IosevkaTermSS16 = "07rb6vpa9rq7czdc68jw68n9k742hbd1hcwa9zgd0njnwf78fjjr"; - SGr-IosevkaTermSS17 = "0sm63f8r27lfvk7is9ldaa9shcfwbkydd16zd78g0n13nniiw0h7"; - SGr-IosevkaTermSS18 = "1rx38sqclkxiql402fc33d9v4y65y3cz9wyx1p97c5wa3j686ngh"; + Iosevka = "1wmp1xsvq6d7ybxdiscb04ry5fl3p7pbnqrm551pklgp30afcb0k"; + IosevkaAile = "19hrycbav3r134i1f3135j68lzk4r6iq996qv45nfy5vdiwka56n"; + IosevkaCurly = "1ibybiad4nx7n3q89ffw5d3q72c221v2vmb47hs4xiax8kjajijx"; + IosevkaCurlySlab = "09856251vpgch7d989kamyw7f46vwjlyhy22r82vvfvlfni9qvip"; + IosevkaEtoile = "11c3ky7f5k2qi5jq5jdai2s9nav5z5kqy8p8klhc9nqr7qbsgknc"; + IosevkaSlab = "0pd70bzgxwi0mgb9j5b3bz4zd8q5s85x6ipq0b3adxa3n0lni2xj"; + IosevkaSS01 = "01j36nxdh91rjkx3ccqdqj7czl5w35s4ml3y0fhjk13rfi3ikqk5"; + IosevkaSS02 = "193lwrz5bza0rrfab1mginq90ar0icxrysbiv8nm9d9cq6k67spk"; + IosevkaSS03 = "0x2g4q0ina97pv1rpm9mhw5as6il3nqpixpjy5nskb47vklnww0z"; + IosevkaSS04 = "1nr2nzp51swvxmkbsipppixjqdqqp28q7njh0zhwrw9ln2mv5ykf"; + IosevkaSS05 = "1sgbszbzgznkkjw3xiffbvfh9wx4rmw4a2332dwl3hqjsky2yb0c"; + IosevkaSS06 = "0bdxgm5v9xngwyygqxaihsaryj9nk7jr86a35sh83p8x92696dr3"; + IosevkaSS07 = "00cjyy477pllfcl84pms3hs7v59iz4xx24rh6mrp6gwm1dixk0lj"; + IosevkaSS08 = "0k4aifq8d6ry0q23yjfhmsz0hq55xg0ja8skjsnba67mmw3lmhls"; + IosevkaSS09 = "12z6bircf48p4i1pfglrdmm7dnrbg48d34d6x0andcshckh2z32m"; + IosevkaSS10 = "1jm8jdrlydwdi2ahgyw691j0akq7xv7xki6v4qdwdccjblzq38x4"; + IosevkaSS11 = "1p27lbp48rbr501al4hh1n10v2mi2l8jncyr2b16x6lx699dragh"; + IosevkaSS12 = "0mpjh3v072xvxl258b9700x4x0z17fwhq526z7v6pfvr1bpa7qd6"; + IosevkaSS13 = "029jhjymzq0x48mwds1yawp6v57zrsb1y9riy1rw3d5cq307p8np"; + IosevkaSS14 = "0bvi0nyn0rbrg0i8xq2zhr9sc8sl1xjbjslrd7x6h9xh8vpk67yn"; + IosevkaSS15 = "00dw3gy3ib151zlizbfac3zsxs0ap8qmfx4apghv5n9y815lsdfz"; + IosevkaSS16 = "16jrjv6rjh1xwj4yf91c17n1qpqv3vnnnbz7dj4g7rmpb9s5hqkz"; + IosevkaSS17 = "05nkynn2ri2lkm2ghd4vcb67qm00rl8f1fp17x4l84id36qbzy14"; + IosevkaSS18 = "1zb96ll1q514av1qqmlaf38py66jqyfy7f0ka8r8ln7jnnfbmsr1"; + SGr-Iosevka = "1knzbqr8yzbdwrbq9v00p87xp3gbnspcn9lwg5kx7y4s9k4xx4d3"; + SGr-IosevkaCurly = "1ggnp299h8n54v7l7526phwczcr30ssy58lp4as64jh3kdrpkm5s"; + SGr-IosevkaCurlySlab = "1wr15jsjnkyqf4vaxv0ckbsjnqcdzhp28xhma7h46invmicamz0b"; + SGr-IosevkaFixed = "0b89p0f6f2igyg930w7izs2y6027s0p6i9v7hd6y60h1c1g4h3zr"; + SGr-IosevkaFixedCurly = "09j0jpm2ym7m1gryphvdjy07bdadjfq2k33rkxdi3mm5c9ryr497"; + SGr-IosevkaFixedCurlySlab = "15ycyyi9y2671gdswvdg56wbiixfa3xdgh0rfbp5gxamaji52jba"; + SGr-IosevkaFixedSlab = "0rgkdji5figxa8fvl5f0xnw5sx1300g77h92bvn19p1479cpkqnd"; + SGr-IosevkaFixedSS01 = "074l13i6vfyvj4dr4373vhck6wx451xbinsy2nkmh1l0f4ybk722"; + SGr-IosevkaFixedSS02 = "0dmsncllnb09h9s4874v0ayadyx6ysacyd4px8gpzdgd5vwyddp5"; + SGr-IosevkaFixedSS03 = "001zgvyrls4ajklsinz003rvqx9aqhc4b65xksinm0n88p8c6l5v"; + SGr-IosevkaFixedSS04 = "146f0cmq28g1lkfapj78grqpsrl22208h6vj7k838rbkxx2vqazy"; + SGr-IosevkaFixedSS05 = "1ax08sgfnwki6qkfnzk3wc5i4i6r8nfzwdn4srz8mfwfm1mlcyps"; + SGr-IosevkaFixedSS06 = "0ypcnsqifmrh005hql6f6lql5ykgsfvanc2p24x521nrn1dy73va"; + SGr-IosevkaFixedSS07 = "15xijwfirrwph6n8pky350k5gfx5mhfhgbhhaahvd3wgl1wc3z1d"; + SGr-IosevkaFixedSS08 = "02l00b0zp8nxw7ma6rr8gvvkw2hxk8d3d3p0vrcf1fq1rarsrdhh"; + SGr-IosevkaFixedSS09 = "1hf9zdzgxgjdqd1msb2n8vmfqmz66vh7ksf436yddyzcmlflkg54"; + SGr-IosevkaFixedSS10 = "1k7z4bkf63a621p36ldgilj7d3x8cnkfjqma74l0a5m2cf8nhlhk"; + SGr-IosevkaFixedSS11 = "091cz89i7igh61ni7cnd8w7yx29x90v96ckjdaw2mvhg0bdkydxi"; + SGr-IosevkaFixedSS12 = "0mydmf6g8cybl00bzxr5l9ak8marp94wi73926xhks2saap9lzmj"; + SGr-IosevkaFixedSS13 = "1q3aa628k0wvyi20xgvwh6j2b9c6sfln1dvqwk89fa6cpqjd15qx"; + SGr-IosevkaFixedSS14 = "1hazszzhv7c3y242bk9v913v11l4f8difl7g3rk9w16x8bhcqykj"; + SGr-IosevkaFixedSS15 = "05i6sdspi33l5l4lc68xcnpq9jsfjd21xz2cblgg8mpxi5pcxwnx"; + SGr-IosevkaFixedSS16 = "0zcpgs611hicd9snhvwlbk2n94dnr76y8vg8ai41gy3d5ss5wgvc"; + SGr-IosevkaFixedSS17 = "1kgmiznjwlspq3sb4mz5p94cc9jakq00sg934sjj24kh4pxpc17p"; + SGr-IosevkaFixedSS18 = "1c6sbvbwlpyiq4vh1ydg2a963k001kcvgvw50r6ajv2dkq3b5hxf"; + SGr-IosevkaSlab = "1lprgw2ckvp1v9b0q6ygrij9mk6mnr7bjzhdp3v5r1mpyzhxznf8"; + SGr-IosevkaSS01 = "07ksz7bva2b47h6320rzg8wdpq2240rlym0988w8chslyi2g9cya"; + SGr-IosevkaSS02 = "0dj5f7v1m78rp0ahzp99dir8b87cdbmf2lzrp3m8g37hwjpjzi6h"; + SGr-IosevkaSS03 = "1v35nwwzkmbvrwil8kydw19v44gniyx7d77ri6kzxliwb86nd2rz"; + SGr-IosevkaSS04 = "1cmvm37jm7mzmv1llpi6091xvpvh6mvimgbiqwxr6vysaal7iwz2"; + SGr-IosevkaSS05 = "1v19ry9bpa5gdg8n1ni9kb4qrjw7jj8haqgaazkxqd5kqd0i0xbf"; + SGr-IosevkaSS06 = "0bn4c99ipf6ij52cia788wplhgpppb82pfwpd9h94775cy1qnwmp"; + SGr-IosevkaSS07 = "0cxw5in1v5pb0955c8pql7lla5cc70c7jvphx95kg17xdn0vf7zy"; + SGr-IosevkaSS08 = "1qy4ah3qrdcd8vm98njhycinp282b68picc1xzyrb1cs73wcmymx"; + SGr-IosevkaSS09 = "1hnzbjnfrg068gscia60cx5r1wvkylnnvnwxbbr49kx19j4nb9mw"; + SGr-IosevkaSS10 = "0x1h6j4731ain7s91sjkifm0zz2l18dv7qk4d4vg99am0mykr0kr"; + SGr-IosevkaSS11 = "0m8wd4shac32w4lhx3a1zcgg515bdgj29121342aasj8in65hzsw"; + SGr-IosevkaSS12 = "1h79lqih6xdvzzgb4xi3v3c1v9x08vby7l1rkiypkl66s7n2qmvz"; + SGr-IosevkaSS13 = "1kgksvsl35v4vjypw3qi5kcnnwcalwbh878p9q4wqrnx7x9q6f21"; + SGr-IosevkaSS14 = "1kv5zk7habxi85v7ihkgm857r81v52h6qwqcva55y8cycicbxc6f"; + SGr-IosevkaSS15 = "1a1wsi4vbfmnhvwh17k4z4zdcgsprqx15hkkpbv1ndshdmd0cnac"; + SGr-IosevkaSS16 = "1gy1a38x79yay6396qdn3a56hhyrslskriar58lxyjdzd8v052m4"; + SGr-IosevkaSS17 = "1flhbavmzdbi1pcnjdk0zfxh4lg284w7czw472y28xsawdpa6ylx"; + SGr-IosevkaSS18 = "1yva22hc60v22r1gsa06wxg6zdq7xg7kznq3zdicaa1z9jaj5is3"; + SGr-IosevkaTerm = "0nf100ymnmkcnj3pvrnsnsb8nanw4asvmmahbvbjwbscq9y5v1pp"; + SGr-IosevkaTermCurly = "1c6csjl5mhw7rvpkx36v57h5nd2mwy8xlpcisbv2x6mr6cmiypq0"; + SGr-IosevkaTermCurlySlab = "1mpfzk4pdpiwk7i93alw8whv6j6qq3by7mar33hqdfnwc8ry971s"; + SGr-IosevkaTermSlab = "19fjijgcfr368c946lkr7xac1gs74bxrax1rn1c0nr8b9qw8y241"; + SGr-IosevkaTermSS01 = "1q9j91mg19mgpx7a5bbkg5dfwza60zc5yakqb7ifcaybxphwzgzc"; + SGr-IosevkaTermSS02 = "1v4m60y7z4v6kjrsi16ibslf5bfxmh70qp4q6id5w83307acx4af"; + SGr-IosevkaTermSS03 = "062p5n78ny74ndhfywdv0ggm3hzscqq6z41yhz0x6pc6390ab3vn"; + SGr-IosevkaTermSS04 = "08s8140vf1bib5rg5slzp3w2zckf7czdij11jznj61qj5z6069qd"; + SGr-IosevkaTermSS05 = "01fa9hwznvls1shwglzvh6lvhwn2c2ys7pzvw131qd5fbj11nfxs"; + SGr-IosevkaTermSS06 = "0k22nm9y7zsbw9wyvkcnh8r7a9p78fdnqhr4k72winhnj0az4nhi"; + SGr-IosevkaTermSS07 = "0n4cds8bar6w420g6plvs8iwizskgs04m216bsnxa7mfmr368d8v"; + SGr-IosevkaTermSS08 = "1agzv2vsiry7x6681ic33cxyryv34fr66qpxcihx5xf2ky565vwv"; + SGr-IosevkaTermSS09 = "1x82wii0hpcnffvbkql6r8yj0s3m4vl6iyrd15dnhs38qrvahkj2"; + SGr-IosevkaTermSS10 = "0jpar4ggsr0gg2b6y3bjl5k6ffnwdi2l2vz4i24n10ldcdb6kygd"; + SGr-IosevkaTermSS11 = "0kpq91wdzkfkfldkcbxjddjvznaanz5nycvqh66zbvsfsy89i69c"; + SGr-IosevkaTermSS12 = "0q8vkmkzxszhi9mqmb0jyjqaiss2z588iqvy3xp0qzzqs6w4vvcp"; + SGr-IosevkaTermSS13 = "1n0isq8vfn5lfwxn2cjfaymkaiw131ykllzbv5b7kqlj32cj3q42"; + SGr-IosevkaTermSS14 = "1hjdbpc264b1glwvfzbfrrkjxpr238byk9pw55swklzrj6q0v7sw"; + SGr-IosevkaTermSS15 = "1sfxic3268bz7b6psnkkwbjmr4ipaf5alscr3kfwz5g03avhiz9x"; + SGr-IosevkaTermSS16 = "0l74n9mafv0zh1qcy4gxmfkf2mjhjcplfxkcxmm4ymgybgxcqrc8"; + SGr-IosevkaTermSS17 = "00q78cwj368rgk5lhlncs39h99w1dqbpg9nkqxqjqkgdqyd2ivwb"; + SGr-IosevkaTermSS18 = "128c6d1bblhfn9npgp56l5zyk4gyyq9p854mi3950r1zg89963x3"; } diff --git a/pkgs/by-name/ip/ipbus-uhal/package.nix b/pkgs/by-name/ip/ipbus-uhal/package.nix new file mode 100644 index 0000000000000..52292115695de --- /dev/null +++ b/pkgs/by-name/ip/ipbus-uhal/package.nix @@ -0,0 +1,74 @@ +{ + lib, + stdenv, + bash, + cacert, + boost186, + pugixml, + python3, + python3Packages, + fetchFromGitHub, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "ipbus-uhal"; + version = "2.8.16"; + src = fetchFromGitHub { + owner = "ipbus"; + repo = "ipbus-software"; + rev = "v${finalAttrs.version}"; + hash = "sha256-R+a9VmONyWh3BEYoMjRcXKv+3HaNcKbJDnYH1hXHdPg="; + }; + + nativeBuildInputs = [ + cacert + (python3.withPackages (ps: [ + ps.distutils + ps.pybind11 + ])) + ]; + buildInputs = [ + boost186 + pugixml + python3.pkgs.distutils + python3.pkgs.pybind11 + ]; + postPatch = '' + substituteInPlace config/Makefile.macros --replace-fail \ + 'SHELL := /bin/bash' "" + patchShebangs --build uhal/config/install.sh + patchShebangs --build uhal/tests/setup.sh + patchShebangs --build scripts/doxygen/api_uhal.sh + patchShebangs --build config/progress.sh + patchShebangs --build config/Makefile.macros + ''; + + enableParallelBuilding = true; + + makeFlags = [ + "Set=uhal" + "CXX=${stdenv.cc.targetPrefix}c++" + ]; + + installPhase = '' + runHook preInstall + mkdir -p $out/{bin,include} + make Set=uhal install prefix=$out/bin includedir=$out/include + runHook postInstall + ''; + + meta = { + description = "Software which pairs with ipbus-firmware"; + longDescription = '' + Software that provide a reliable high-performance + control link for particle-physics or other electronics, + by implementing a simple A32/D32 control protocol + for reading and modifying memory-mapped resources + within FPGA-based hardware devices. + ''; + platforms = lib.platforms.linux; + homepage = "https://ipbus.web.cern.ch/"; + maintainers = [ lib.maintainers.bashsu ]; + mainProgram = "ipbus-uhal"; + }; +}) diff --git a/pkgs/by-name/is/isd/package.nix b/pkgs/by-name/is/isd/package.nix new file mode 100644 index 0000000000000..5917238bdec1a --- /dev/null +++ b/pkgs/by-name/is/isd/package.nix @@ -0,0 +1,62 @@ +{ + lib, + python3Packages, + fetchFromGitHub, + nix-update-script, +}: + +python3Packages.buildPythonApplication rec { + pname = "isd"; + version = "0.2.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "isd-project"; + repo = "isd"; + tag = "v${version}"; + hash = "sha256-YOQoI9PB096C/wNF9y5nrXkpJGbO6cXQ2U6I2Ece2PM="; + }; + + build-system = with python3Packages; [ + hatchling + ]; + + dependencies = with python3Packages; [ + pfzy + pydantic + pydantic-settings + pyyaml + textual + types-pyyaml + xdg-base-dirs + ]; + + pythonRelaxDeps = [ + "pydantic" + "pydantic-settings" + "types-pyyaml" + ]; + + pythonImportsCheck = [ + "isd" + ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "TUI to interactively work with systemd units"; + longDescription = '' + isd (interactive systemd) is a TUI offering fuzzy search for systemd + units, auto-refreshing previews, smart `sudo` handling, and a fully + customizable interface for power-users and newcomers alike. + ''; + homepage = "https://github.com/isd-project/isd"; + changelog = "https://github.com/isd-project/isd/releases/tag/v${version}"; + license = lib.licenses.gpl3Only; + mainProgram = "isd"; + maintainers = with lib.maintainers; [ + gepbird + ]; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/by-name/je/jellyseerr/package.nix b/pkgs/by-name/je/jellyseerr/package.nix index eb6f823e52d25..1783f4f7aa5c5 100644 --- a/pkgs/by-name/je/jellyseerr/package.nix +++ b/pkgs/by-name/je/jellyseerr/package.nix @@ -4,30 +4,30 @@ fetchFromGitHub, stdenv, makeWrapper, - nodejs_20, + nodejs_22, python3, sqlite, nix-update-script, }: let - nodejs = nodejs_20; + nodejs = nodejs_22; pnpm = pnpm_9.override { inherit nodejs; }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "jellyseerr"; - version = "2.2.3"; + version = "2.3.0"; src = fetchFromGitHub { owner = "Fallenbagel"; repo = "jellyseerr"; - rev = "v${version}"; - hash = "sha256-JkbmCyunaMngAKUNLQHxfa1pktXxTjeL6ngvIgiAsGo="; + tag = "v${finalAttrs.version}"; + hash = "sha256-vAMuiHcf13CDyOB0k36DXUk+i6K6h/R7dmBLJsMkzNA="; }; pnpmDeps = pnpm.fetchDeps { - inherit pname version src; - hash = "sha256-1r2+aeRb6zdpqqimufibVRjeAdvwHL0GiQSu5pHBh+U="; + inherit (finalAttrs) pname version src; + hash = "sha256-iSzs+lMQzcFjUz4K3rYP0I6g/wVz6u49FSQuPHXbVRM="; }; buildInputs = [ sqlite ]; @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { passthru.updateScript = nix-update-script { }; - meta = with lib; { + meta = { description = "Fork of overseerr for jellyfin support"; homepage = "https://github.com/Fallenbagel/jellyseerr"; longDescription = '' @@ -79,9 +79,9 @@ stdenv.mkDerivation rec { requests for your media library. It is a a fork of Overseerr built to bring support for Jellyfin & Emby media servers! ''; - license = licenses.mit; - maintainers = with maintainers; [ camillemndn ]; - platforms = platforms.linux; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.camillemndn ]; + platforms = lib.platforms.linux; mainProgram = "jellyseerr"; }; -} +}) diff --git a/pkgs/by-name/je/jenkins/package.nix b/pkgs/by-name/je/jenkins/package.nix index 70d9cf242b53f..28df57aae22a6 100644 --- a/pkgs/by-name/je/jenkins/package.nix +++ b/pkgs/by-name/je/jenkins/package.nix @@ -18,11 +18,11 @@ stdenv.mkDerivation rec { pname = "jenkins"; - version = "2.479.2"; + version = "2.479.3"; src = fetchurl { url = "https://get.jenkins.io/war-stable/${version}/jenkins.war"; - hash = "sha256-F3wsAz8NOuQUjmAdD9raYBEtg/JQUh86Cg/ZfLsTjb0="; + hash = "sha256-MEyFkoYNWwPewnyWteiexY/HRPeBYcU/ejRKC/fOkgM="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/je/jetbrains-runner/package.nix b/pkgs/by-name/je/jetbrains-runner/package.nix index 364223be29260..fcb91662e252b 100644 --- a/pkgs/by-name/je/jetbrains-runner/package.nix +++ b/pkgs/by-name/je/jetbrains-runner/package.nix @@ -8,13 +8,13 @@ }: stdenv.mkDerivation rec { pname = "jetbrains-runner"; - version = "3.0.4"; + version = "3.0.5"; src = fetchFromGitHub { owner = "alex1701c"; repo = "JetBrainsRunner"; rev = version; - hash = "sha256-uLUtxKGXa8MjpdrT7X0EpRCWQTBYm8mt0NcyOLoGd5Y="; + hash = "sha256-fzGwwvBgvUVU6Ra66KrIAqRjWWR6pWYbWVkOk2tDwkc="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/jx/jx/package.nix b/pkgs/by-name/jx/jx/package.nix index befb1831504d1..e2a61f5850f2f 100644 --- a/pkgs/by-name/jx/jx/package.nix +++ b/pkgs/by-name/jx/jx/package.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "jx"; - version = "3.11.4"; + version = "3.11.27"; src = fetchFromGitHub { owner = "jenkins-x"; repo = "jx"; rev = "v${version}"; - sha256 = "sha256-6M5mY3VoKyoKRd3K6TstGdJ6sfYcIHkCESDUWhl3VCc="; + sha256 = "sha256-Qh7Mjo4fwB3FF83GARLgYbQfwLmzJcOvqTAWe9XN/0I="; }; - vendorHash = "sha256-GzkAIGy9CCBIbIWUkPOPM3GlKvlEVm6YXnQUUGjItXE="; + vendorHash = "sha256-MJ8gYB8MQADQbhfyWHdGoGzyKPTk7LrltI3Hd2xBN0k="; subPackages = [ "cmd" ]; diff --git a/pkgs/by-name/ka/kanata/package.nix b/pkgs/by-name/ka/kanata/package.nix index 08df492acd721..0fcefd35c5ce7 100644 --- a/pkgs/by-name/ka/kanata/package.nix +++ b/pkgs/by-name/ka/kanata/package.nix @@ -22,28 +22,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-cG9so0x0y8CbTxLOxSQwn5vG72KxHJzzTIH4lQA4MvE="; }; - cargoHash = "sha256-QQrFUJ24Qnrx8+7+h9riycXZSQUdH1sXMhpDzU9AXiI="; - - # the dependency native-windows-gui contains both README.md and readme.md, - # which causes a hash mismatch on systems with a case-insensitive filesystem - # this removes the readme files and updates cargo's checksum file accordingly - depsExtraArgs = { - nativeBuildInputs = [ - jq - moreutils - ]; - - postBuild = '' - pushd $name/native-windows-gui - - rm --force --verbose README.md readme.md - jq 'del(.files."README.md") | del(.files."readme.md")' \ - .cargo-checksum.json -c \ - | sponge .cargo-checksum.json - - popd - ''; - }; + useFetchCargoVendor = true; + cargoHash = "sha256-VKvle1hQae+0Vbvd7Epq3cDqG8OV5J2mowF5lue59oc="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.IOKit ]; diff --git a/pkgs/by-name/ka/kanidm/1_3.nix b/pkgs/by-name/ka/kanidm/1_3.nix index 8d4d310ac7138..f0f708eba3576 100644 --- a/pkgs/by-name/ka/kanidm/1_3.nix +++ b/pkgs/by-name/ka/kanidm/1_3.nix @@ -1,7 +1,7 @@ import ./generic.nix { version = "1.3.3"; hash = "sha256-W5G7osV4du6w/BfyY9YrDzorcLNizRsoz70RMfO2AbY="; - cargoHash = "sha256-iziTHr0gvv319Rzgkze9J1H4UzPR7WxMmCkiGVsb33k="; + cargoHash = "sha256-QgEoeXjGm7fhPnJBbquWJYDYPg+Uv1IjZnaI5yUEYlQ="; patchDir = ./patches/1_3; extraMeta = { knownVulnerabilities = [ diff --git a/pkgs/by-name/ka/kanidm/1_4.nix b/pkgs/by-name/ka/kanidm/1_4.nix index 1b1b941905bf9..a87b8eb4f11e4 100644 --- a/pkgs/by-name/ka/kanidm/1_4.nix +++ b/pkgs/by-name/ka/kanidm/1_4.nix @@ -1,6 +1,6 @@ import ./generic.nix { version = "1.4.6"; hash = "sha256-pjJyq52wO5p34LN2Jmt0npgWBDcWin8gIX4skZ7Ff8E="; - cargoHash = "sha256-XyyvXxZOvaxSzH8Jd23IxE4Wyd/6h5N3HRVEvdQ8RtY="; + cargoHash = "sha256-33HRoH/vWPe/wOZJtQLWV9eBocbj0iR/XUu4zMehu8M="; patchDir = ./patches/1_4; } diff --git a/pkgs/by-name/ka/kanidm/generic.nix b/pkgs/by-name/ka/kanidm/generic.nix index 5c0a04bcbc2bf..8512f1fc357c4 100644 --- a/pkgs/by-name/ka/kanidm/generic.nix +++ b/pkgs/by-name/ka/kanidm/generic.nix @@ -38,6 +38,7 @@ in rustPlatform.buildRustPackage rec { pname = "kanidm" + (lib.optionalString enableSecretProvisioning "-with-secret-provisioning"); inherit version cargoHash; + useFetchCargoVendor = true; cargoDepsName = "kanidm"; src = fetchFromGitHub { diff --git a/pkgs/by-name/ka/kapacitor/package.nix b/pkgs/by-name/ka/kapacitor/package.nix index 3f58b489bc81d..dacbcf2b4432f 100644 --- a/pkgs/by-name/ka/kapacitor/package.nix +++ b/pkgs/by-name/ka/kapacitor/package.nix @@ -43,7 +43,8 @@ let }) ]; sourceRoot = "${src.name}/libflux"; - cargoHash = "sha256-yIYeJvLe+L72ZyuQ2AK6l4HGSF/tgCyGQsXEOWUXDn0="; + useFetchCargoVendor = true; + cargoHash = "sha256-kbI1uUDE8JyFFtwV5k0EeeNGCZFQLXLobW/MilHX2Sg="; nativeBuildInputs = [ rustPlatform.bindgenHook ]; buildInputs = lib.optional stdenv.hostPlatform.isDarwin libiconv; pkgcfg = '' diff --git a/pkgs/by-name/ke/keylight-cli/package.nix b/pkgs/by-name/ke/keylight-cli/package.nix new file mode 100644 index 0000000000000..8814788e73dfd --- /dev/null +++ b/pkgs/by-name/ke/keylight-cli/package.nix @@ -0,0 +1,38 @@ +{ + lib, + stdenv, + fetchFromGitHub, + babashka, +}: + +stdenv.mkDerivation rec { + pname = "keylight-cli"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "versality"; + repo = "keylight-cli"; + tag = "v${version}"; + sha256 = "sha256-gzTvMBa7JVckxLnltlR5XOj6BBbfPXZei7Wj3f1n4Kw="; + }; + + buildInputs = [ babashka ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + install -Dm755 keylight.bb $out/bin/keylight + + runHook postInstall + ''; + + meta = with lib; { + description = "CLI tool to control Elgato Key Light devices"; + homepage = "https://github.com/versality/keylight-cli"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ versality ]; + mainProgram = "keylight"; + platforms = platforms.all; + }; +} diff --git a/pkgs/by-name/ki/kin-openapi/package.nix b/pkgs/by-name/ki/kin-openapi/package.nix index 4d16ab3a2b603..fa854b28c2f3e 100644 --- a/pkgs/by-name/ki/kin-openapi/package.nix +++ b/pkgs/by-name/ki/kin-openapi/package.nix @@ -5,14 +5,14 @@ }: buildGoModule rec { pname = "kin-openapi"; - version = "0.128.0"; - vendorHash = "sha256-yNS5Rtmxts4uOhMPTXCFRhe/dLPZZAtGKe/bNkOeIBw="; + version = "0.129.0"; + vendorHash = "sha256-/pXC1YHqbeM6skwTQZ9ZPjroIC6XYq5/A1riWWJFaYY="; src = fetchFromGitHub { owner = "getkin"; repo = "kin-openapi"; tag = "v${version}"; - hash = "sha256-4pYrg75dFFdFS2SC1BvFoHcLFNGgBumXd3Vd7jHvUJg="; + hash = "sha256-eYAsKklrIJanXbA5NZdX2utLWK66h1MQtKBuzMMaXSQ="; }; checkFlags = diff --git a/pkgs/by-name/ki/kittycad-kcl-lsp/package.nix b/pkgs/by-name/ki/kittycad-kcl-lsp/package.nix index e2e66c04d55fb..ac98b633206f3 100644 --- a/pkgs/by-name/ki/kittycad-kcl-lsp/package.nix +++ b/pkgs/by-name/ki/kittycad-kcl-lsp/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "kittycad-kcl-lsp"; - version = "0.1.65"; + version = "0.1.66"; src = fetchFromGitHub { owner = "KittyCAD"; repo = "kcl-lsp"; tag = "v${version}"; - hash = "sha256-3j7xiTrhDPBNTg53y2KyLpk8m4DrJbZWYkdIm5sxEfs="; + hash = "sha256-uKsxWNR5syd2+/4I9nxZ+fWBUdHP3rhpUzLVPn4v8Wk="; }; - cargoHash = "sha256-t7YnOnls0PZM2iTmmkBFt1WmFvqiY4eS8LBf0tvinJg="; + cargoHash = "sha256-Zn6WLG9v7I335bR2q/AXdwmy89T4nclQoJbJR6eVvYQ="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/ku/kubedb-cli/package.nix b/pkgs/by-name/ku/kubedb-cli/package.nix index b9a17df7cf663..5ee91afb40667 100644 --- a/pkgs/by-name/ku/kubedb-cli/package.nix +++ b/pkgs/by-name/ku/kubedb-cli/package.nix @@ -11,8 +11,8 @@ buildGoModule rec { src = fetchFromGitHub { owner = "kubedb"; repo = "cli"; - rev = "v${version}"; - sha256 = "sha256-6AhL3IBAQ9Mngquh7XbnXEb4jDX1k2d3bwKBFRhEzHA="; + tag = "v${version}"; + hash = "sha256-e3kP1N6uhLKrOWfvl29vVB9D/bpj1W+1dGlaAuc8es0="; }; vendorHash = null; diff --git a/pkgs/by-name/ku/kubedock/package.nix b/pkgs/by-name/ku/kubedock/package.nix index 317733741cdb5..2e832aef258de 100644 --- a/pkgs/by-name/ku/kubedock/package.nix +++ b/pkgs/by-name/ku/kubedock/package.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kubedock"; - version = "0.18.0"; + version = "0.18.1"; src = fetchFromGitHub { owner = "joyrex2001"; repo = "kubedock"; rev = version; - hash = "sha256-axJNlmQfcltmFHNiCkQiK7l2KydvP8HEiHqN6JwsrjQ="; + hash = "sha256-O8heDxfYmBV4sSdBZOQri+FMHJMrRW9+kai1S62ffQY="; }; vendorHash = "sha256-9mPcHMNAkjO8Ae9HcgvdR2+UUPMYmE2oTfYksZ/KL+Y="; diff --git a/pkgs/by-name/la/labwc-tweaks-gtk/package.nix b/pkgs/by-name/la/labwc-tweaks-gtk/package.nix index 9a794c513ab9c..545ffcd43ca2d 100644 --- a/pkgs/by-name/la/labwc-tweaks-gtk/package.nix +++ b/pkgs/by-name/la/labwc-tweaks-gtk/package.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "labwc-tweaks-gtk"; - version = "0-unstable-2025-01-11"; + version = "0-unstable-2025-01-26"; src = fetchFromGitHub { owner = "labwc"; repo = "labwc-tweaks-gtk"; - rev = "d954bc6bce2e86893c0470de36beae0542eceaad"; - hash = "sha256-c+6AolglEF/+voa5mDwm3JLIA4btFOBI8e2/ZxCApGg="; + rev = "5b811cc25dac6a024a50175ef56c4831883965d9"; + hash = "sha256-wBiHcSYczOjSm9X46oOUt1rRm0QioHOovbPMZMnLYmM="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/la/lazysql/package.nix b/pkgs/by-name/la/lazysql/package.nix index 171585a0b42af..50d88562e0072 100644 --- a/pkgs/by-name/la/lazysql/package.nix +++ b/pkgs/by-name/la/lazysql/package.nix @@ -10,13 +10,13 @@ buildGoModule rec { pname = "lazysql"; - version = "0.3.3"; + version = "0.3.4"; src = fetchFromGitHub { owner = "jorgerojas26"; repo = "lazysql"; rev = "v${version}"; - hash = "sha256-+7KchZbd/XJ+c5ndA4arbKabeMxX1ZTOVs7Nw+TSxGI="; + hash = "sha256-APbfaAHufpEaBdXO13afmdnpSA98LhXUhYZ6TK/gazk="; }; vendorHash = "sha256-ef3GngaaoNEJAOF5IlTQhTrO5P22w5p7G91TYJasfGk="; diff --git a/pkgs/by-name/li/libburn/package.nix b/pkgs/by-name/li/libburn/package.nix index 4f3e60bf90ce1..4d4901901ac54 100644 --- a/pkgs/by-name/li/libburn/package.nix +++ b/pkgs/by-name/li/libburn/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitea, + fetchpatch, autoreconfHook, pkg-config, }: @@ -18,6 +19,15 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-Xo45X4374FXvlrJ4Q0PahYvuWXO0k3N0ke0mbURYt54="; }; + patches = [ + # Fix the build against C23 compilers (like gcc-15): + (fetchpatch { + name = "c23.patch"; + url = "https://dev.lovelyhq.com/libburnia/libburn/commit/d537f9dd35282df834a311ead5f113af67d223b3.patch"; + hash = "sha256-aouU/6AchLhzMzvkVvUnFHWfebYTrkEJ6P3fF5pvE9M="; + }) + ]; + nativeBuildInputs = [ autoreconfHook pkg-config diff --git a/pkgs/by-name/li/libcifpp/package.nix b/pkgs/by-name/li/libcifpp/package.nix index 0e2b001eeaf7b..d4c419eba30c6 100644 --- a/pkgs/by-name/li/libcifpp/package.nix +++ b/pkgs/by-name/li/libcifpp/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "libcifpp"; - version = "7.0.8"; + version = "7.0.9"; src = fetchFromGitHub { owner = "PDB-REDO"; repo = "libcifpp"; tag = "v${finalAttrs.version}"; - hash = "sha256-PD811D/n++PM45H/BatlLiMaIeUEiisLU/bGhiUhPU0="; + hash = "sha256-wV4YvQmtpbj+mOiMeSr9gBpZzFPygkAOkj74vv4pA4U="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/li/libdaemon/package.nix b/pkgs/by-name/li/libdaemon/package.nix index 796cb02ea03fd..15b3790a3c94b 100644 --- a/pkgs/by-name/li/libdaemon/package.nix +++ b/pkgs/by-name/li/libdaemon/package.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { [ "--disable-lynx" ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ # Can't run this test while cross-compiling - "ac_cv_func_setpgrp_void=yes" + "ac_cv_func_setpgrp_void=${if stdenv.hostPlatform.isBSD then "no" else "yes"}" ]; meta = { diff --git a/pkgs/by-name/li/libloot/package.nix b/pkgs/by-name/li/libloot/package.nix index a7ab3ed42e53d..243d68d8dc697 100644 --- a/pkgs/by-name/li/libloot/package.nix +++ b/pkgs/by-name/li/libloot/package.nix @@ -150,7 +150,8 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-qJ7gC4BkrXJiVcyA1BqlJSRzgc/7VmNBHtDq0ouJoTU="; }; - cargoHash = "sha256-x4LFO6dD3bBKv6gTrNUAo7Rdw5cP67gn44QP6Iwbv0I="; + useFetchCargoVendor = true; + cargoHash = "sha256-m3lyABr7tU0AeC6EZomBw1X722ezQg/cjSZh/ZhkiBw="; lang = "c++"; header = "libloadorder.hpp"; @@ -167,7 +168,8 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-ygjSyixg+9HFFNV/G+w+TxGFTrjlWxlDt8phpCE8xyQ="; }; - cargoHash = "sha256-39iod83yVU5PyIjwv7pLLuMeNw9fHiM0tXDauyGrbx8="; + useFetchCargoVendor = true; + cargoHash = "sha256-6sY2M7kjSYB3+6+zoMxPwdl+g7ARLHm9RdSODHQR8bE="; lang = "c++"; header = "esplugin.hpp"; @@ -184,7 +186,8 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-yXbe7ByYHvFpokRpV2pz2SX0986dpk5IpehwDUhoZKg="; }; - cargoHash = "sha256-p+raWZkW16MrvfZhJigSPth8pZZ68twU1+0GL/Mo1Xw="; + useFetchCargoVendor = true; + cargoHash = "sha256-d3JBpYI4XMkDnufvdyZkgtp7H4amMzM0dBEO6t9efGE="; lang = "c"; header = "loot_condition_interpreter.h"; diff --git a/pkgs/by-name/li/libmcfp/package.nix b/pkgs/by-name/li/libmcfp/package.nix index 085798010bd89..81643693b47bc 100644 --- a/pkgs/by-name/li/libmcfp/package.nix +++ b/pkgs/by-name/li/libmcfp/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "libmcfp"; - version = "1.3.4"; + version = "1.3.5"; src = fetchFromGitHub { owner = "mhekkel"; repo = "libmcfp"; tag = "v${finalAttrs.version}"; - hash = "sha256-7Oy7qEXIAJ50NXL4+Mm67WrivpubDz7uLWZ3YVzTFxA="; + hash = "sha256-e4scwaCwKU2M5FJ/+UTNDigazopQwGhCIqDatQX7ERw="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/li/libspelling/package.nix b/pkgs/by-name/li/libspelling/package.nix index 15d226079e316..2c818931128aa 100644 --- a/pkgs/by-name/li/libspelling/package.nix +++ b/pkgs/by-name/li/libspelling/package.nix @@ -1,7 +1,7 @@ { lib, stdenv, - fetchFromGitLab, + fetchurl, meson, ninja, pkg-config, @@ -17,9 +17,9 @@ gnome, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libspelling"; - version = "0.4.5"; + version = "0.4.6"; outputs = [ "out" @@ -27,12 +27,9 @@ stdenv.mkDerivation rec { "devdoc" ]; - src = fetchFromGitLab { - domain = "gitlab.gnome.org"; - owner = "GNOME"; - repo = "libspelling"; - rev = version; - hash = "sha256-+WjhBg98s5RxQfd85FtMNuoVWjw9Hap9yDqnpYNAGgw="; + src = fetchurl { + url = "mirror://gnome/sources/libspelling/${lib.versions.majorMinor finalAttrs.version}/libspelling-${finalAttrs.version}.tar.xz"; + hash = "sha256-MkiptTNuovcn0tuRLS8Ag6zMBQXOcHZ5s9m4JmwBAfU="; }; nativeBuildInputs = [ @@ -69,4 +66,4 @@ stdenv.mkDerivation rec { changelog = "https://gitlab.gnome.org/GNOME/libspelling/-/raw/${version}/NEWS"; maintainers = with maintainers; [ chuangzhu ] ++ teams.gnome.members; }; -} +}) diff --git a/pkgs/by-name/li/licensor/package.nix b/pkgs/by-name/li/licensor/package.nix deleted file mode 100644 index 0e69041844e11..0000000000000 --- a/pkgs/by-name/li/licensor/package.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ - lib, - fetchFromGitHub, - rustPlatform, -}: - -rustPlatform.buildRustPackage rec { - pname = "licensor"; - version = "unstable-2021-02-03"; - - src = fetchFromGitHub { - owner = "raftario"; - repo = pname; - rev = "1897882a708ec6ed65a9569ae0e07d6ea576c652"; - sha256 = "0x0lkfrj7jka0p6nx6i9syz0bnzya5z9np9cw09zm1c9njv9mm32"; - }; - - cargoHash = "sha256-gEOMOb2VRx0cFnzmfKBh9W1FoI4Nr7/PW4GQnldoxsA="; - - # https://github.com/raftario/licensor/issues/67 - postPatch = '' - sed "/Copyright (c) 2021/s/2021/$(date +%Y)/" -i tests/integration.rs - ''; - - meta = with lib; { - description = "Write licenses to stdout"; - homepage = "https://github.com/raftario/licensor"; - license = licenses.mit; - maintainers = with maintainers; [ Br1ght0ne ]; - mainProgram = "licensor"; - }; -} diff --git a/pkgs/by-name/li/limbo/package.nix b/pkgs/by-name/li/limbo/package.nix index 1a11ba77ee688..6a813a1fcd2ba 100644 --- a/pkgs/by-name/li/limbo/package.nix +++ b/pkgs/by-name/li/limbo/package.nix @@ -7,16 +7,16 @@ }: rustPlatform.buildRustPackage rec { pname = "limbo"; - version = "0.0.12"; + version = "0.0.13"; src = fetchFromGitHub { owner = "tursodatabase"; repo = "limbo"; tag = "v${version}"; - hash = "sha256-Lmtvn7hWdrqumtTpiYK0sTsESeKo4Mfao32K0DfHmrc="; + hash = "sha256-zIjtuATXlqFh2IoM9cqWysZdRFaVgJTcZFWUsK+NtsQ="; }; - cargoHash = "sha256-hOKTN41yqMPh/Zo8jVRiOSL331py9QRzLhkTL2Jz0yI="; + cargoHash = "sha256-rU/e4JEEGj2okNGv5MTieEHQ0LlSsrouGJOHfBMv8rg="; cargoBuildFlags = [ "-p" diff --git a/pkgs/by-name/li/lime3ds/package.nix b/pkgs/by-name/li/lime3ds/package.nix index f927ff1c1283b..3b18a88f6e919 100644 --- a/pkgs/by-name/li/lime3ds/package.nix +++ b/pkgs/by-name/li/lime3ds/package.nix @@ -119,6 +119,12 @@ stdenv.mkDerivation (finalAttrs: { url = "https://raw.githubusercontent.com/Tatsh/tatsh-overlay/fa2f92b888f8c0aab70414ca560b823ffb33b122/games-emulation/lime3ds/files/lime3ds-0002-boost-fix.patch"; hash = "sha256-XJogqvQE7I5lVHtvQja0woVlO40blhFOqnoYftIQwJs="; }) + + # Fix boost 1.87 + (fetchpatch { + url = "https://raw.githubusercontent.com/Tatsh/tatsh-overlay/5c4497d9b67fa6f2fa327b2f2ce4cb5be8c9f2f7/games-emulation/lime3ds/files/lime3ds-0003-boost-1.87-fixes.patch"; + hash = "sha256-mwfI7fTx9aWF/EjMW3bxoz++A+6ONbNA70tT5nkhDUU="; + }) ]; postPatch = '' diff --git a/pkgs/by-name/li/lint-staged/package.nix b/pkgs/by-name/li/lint-staged/package.nix index 6130c19dbabcc..8758a657238eb 100644 --- a/pkgs/by-name/li/lint-staged/package.nix +++ b/pkgs/by-name/li/lint-staged/package.nix @@ -8,16 +8,16 @@ buildNpmPackage rec { pname = "lint-staged"; - version = "15.4.0"; + version = "15.4.3"; src = fetchFromGitHub { owner = "okonet"; repo = "lint-staged"; rev = "v${version}"; - hash = "sha256-upCbaGoP/O2j3PrZzxMneRBNvz/24sUpUOZK8C7R/Bc="; + hash = "sha256-TBh0qqe2sHSisBMU86TlGhSVrBFY9rgYs5uGSmSTT4g="; }; - npmDepsHash = "sha256-V/AUZV7Ru0TrD0PIm82ppWlqKwzbeiFm+CZO/PtSI+s="; + npmDepsHash = "sha256-p0+Feii4riQ4TtNAQtPZ1bH/yA8q1tjm15IKNi1Ksvk="; dontNpmBuild = true; diff --git a/pkgs/by-name/lk/lk-jwt-service/package.nix b/pkgs/by-name/lk/lk-jwt-service/package.nix index 78ea0a5d9af43..5964e0104a6f7 100644 --- a/pkgs/by-name/lk/lk-jwt-service/package.nix +++ b/pkgs/by-name/lk/lk-jwt-service/package.nix @@ -6,23 +6,19 @@ buildGoModule rec { pname = "lk-jwt-service"; - version = "0-unstable-2024-04-27"; + version = "0.1.1"; src = fetchFromGitHub { owner = "element-hq"; repo = "lk-jwt-service"; - rev = "4a295044a4d0bd2af4474bf6a8a14fd0596ecf9e"; - hash = "sha256-dN4iJ8P0u5dbZ93mp/FumcvByP7EpQhOvR+Oe4COWXQ="; + tag = "v${version}"; + hash = "sha256-RbfJdAhLz2wfTC17i533U25TIUtJEkHTgqJC2R+j1uM="; }; - vendorHash = "sha256-9qOApmmOW+N1L/9hj9tVy0hLIUI36WL2TGWUcM3ajeM="; - - postInstall = '' - mv $out/bin/ec-lms $out/bin/lk-jwt-service - ''; + vendorHash = "sha256-7wruthAqC9jVpAhPiIDdqAB51l38fLHEhl2QOaBJiL0="; meta = with lib; { - description = "Minimal service to provide LiveKit JWTs using Matrix OpenID Connect"; + description = "Minimal service to issue LiveKit JWTs for MatrixRTC"; homepage = "https://github.com/element-hq/lk-jwt-service"; license = licenses.agpl3Plus; maintainers = with maintainers; [ kilimnik ]; diff --git a/pkgs/by-name/ll/lldap-cli/package.nix b/pkgs/by-name/ll/lldap-cli/package.nix index 737ecded6f8c6..71872a9164078 100644 --- a/pkgs/by-name/ll/lldap-cli/package.nix +++ b/pkgs/by-name/ll/lldap-cli/package.nix @@ -7,18 +7,21 @@ gnugrep, gnused, jq, + lldap, + unixtools, curl, makeWrapper, + unstableGitUpdater, }: stdenv.mkDerivation { pname = "lldap-cli"; - version = "0-unstable-2024-02-24"; + version = "0-unstable-2024-11-11"; src = fetchFromGitHub { owner = "Zepmann"; repo = "lldap-cli"; - rev = "d1fe50006c4a3a1796d4fb2d73d8c8dcfc875fd5"; - hash = "sha256-ZKRTYdgtOfV7TgpaVKLhYrCttYvB/bUexMshmmF8NyY="; + rev = "2a80dc47c334c88faf3000b45c631bc2cea09906"; + hash = "sha256-uk7SOiQmUYtoJnihSnPsu/7Er4wXX4xvPboJaNSMjkM="; }; nativeBuildInputs = [ makeWrapper ]; @@ -42,15 +45,19 @@ stdenv.mkDerivation { --prefix PATH : ${ lib.makeBinPath [ bash + unixtools.column coreutils gnugrep gnused jq + lldap # Needed for lldap_set_password curl ] } ''; + passthru.updateScript = unstableGitUpdater { }; + meta = { description = "Command line tool for managing LLDAP"; longDescription = '' diff --git a/pkgs/by-name/ll/lldap/package.nix b/pkgs/by-name/ll/lldap/package.nix index 17d6aa009cf0d..e3092f19fbff3 100644 --- a/pkgs/by-name/ll/lldap/package.nix +++ b/pkgs/by-name/ll/lldap/package.nix @@ -5,19 +5,13 @@ , nixosTests , rustPlatform , rustc -, wasm-bindgen-cli +, wasm-bindgen-cli_0_2_95 , wasm-pack , which }: let - wasm-bindgen-95 = wasm-bindgen-cli.override { - version = "0.2.95"; - hash = "sha256-prMIreQeAcbJ8/g3+pMp1Wp9H5u+xLqxRxL+34hICss="; - cargoHash = "sha256-6iMebkD7FQvixlmghGGIvpdGwFNLfnUcFke/Rg8nPK4="; - }; - commonDerivationAttrs = rec { pname = "lldap"; version = "0.6.1"; @@ -44,7 +38,7 @@ let pname = commonDerivationAttrs.pname + "-frontend"; nativeBuildInputs = [ - wasm-pack wasm-bindgen-95 binaryen which rustc rustc.llvmPackages.lld + wasm-pack wasm-bindgen-cli_0_2_95 binaryen which rustc rustc.llvmPackages.lld ]; buildPhase = '' diff --git a/pkgs/by-name/lr/lrcget/package.nix b/pkgs/by-name/lr/lrcget/package.nix index a0a980af632ae..f55de468a80c1 100644 --- a/pkgs/by-name/lr/lrcget/package.nix +++ b/pkgs/by-name/lr/lrcget/package.nix @@ -18,18 +18,18 @@ }: rustPlatform.buildRustPackage rec { pname = "lrcget"; - version = "0.9.1"; + version = "0.9.3"; src = fetchFromGitHub { owner = "tranxuanthang"; repo = "lrcget"; rev = "${version}"; - hash = "sha256-ia+on2VZeOzxsZAELhXjq6wSo4Jtn8oZNXZ9hByHtYs="; + hash = "sha256-3dBjQ1fO1q8JCQFvvV8LWBCD8cKFkFmm8ufC/Xihmj4="; }; sourceRoot = "${src.name}/src-tauri"; - cargoHash = "sha256-xGOUR4DWVi5Sx9AEnvIeeRaF2kb5YAv1BBruAk712L8="; + cargoHash = "sha256-0gNbhB2u5SUY+UAumg2Mns4MY0bu3Hs1RsMSk8H2lIE="; frontend = buildNpmPackage { inherit version src; diff --git a/pkgs/by-name/ls/lsh/package.nix b/pkgs/by-name/ls/lsh/package.nix new file mode 100644 index 0000000000000..bfa38767ab47e --- /dev/null +++ b/pkgs/by-name/ls/lsh/package.nix @@ -0,0 +1,24 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, +}: +buildGoModule rec { + pname = "lsh"; + version = "1.3.3"; + src = fetchFromGitHub { + owner = "latitudesh"; + repo = "lsh"; + rev = "v${version}"; + sha256 = "0YpjG4u+wb4LRWzfTddKFwut0MBzEch+HZijmZiVXpE="; + }; + vendorHash = "sha256-ogdyzfayleka4Y8x74ZtttD7MaeCl1qP/rQi9x0tMto="; + subPackages = [ "." ]; + meta = with lib; { + changelog = "https://github.com/latitudesh/lsh/releases/tag/v${version}"; + description = "Command-Line Interface for Latitude.sh"; + homepage = "https://github.com/latitudesh/lsh"; + license = licenses.mit; + maintainers = [ lib.maintainers.dzmitry-lahoda ]; + }; +} diff --git a/pkgs/by-name/ma/mallard-ducktype/package.nix b/pkgs/by-name/ma/mallard-ducktype/package.nix new file mode 100644 index 0000000000000..7a9f1f890e8f0 --- /dev/null +++ b/pkgs/by-name/ma/mallard-ducktype/package.nix @@ -0,0 +1,4 @@ +{ python3 }: + +with python3.pkgs; +toPythonApplication mallard-ducktype diff --git a/pkgs/by-name/ma/maltego/package.nix b/pkgs/by-name/ma/maltego/package.nix index ff31321a90aa6..41de89224b5be 100644 --- a/pkgs/by-name/ma/maltego/package.nix +++ b/pkgs/by-name/ma/maltego/package.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "maltego"; - version = "4.9.0"; + version = "4.9.1"; src = fetchzip { url = "https://downloads.maltego.com/maltego-v4/linux/Maltego.v${finalAttrs.version}.linux.zip"; - hash = "sha256-K5Nh9tfNsKViNyMkkLFZ3c1ebGnlj+glEUZ/Iio2bxE="; + hash = "sha256-0bh1dsYBK6VO43mSxzVR1UOg8vCEJvf1pR/EREZ9Uxg="; }; postPatch = '' diff --git a/pkgs/by-name/ma/marmite/package.nix b/pkgs/by-name/ma/marmite/package.nix index 64d16f9e5224b..563c98fe91020 100644 --- a/pkgs/by-name/ma/marmite/package.nix +++ b/pkgs/by-name/ma/marmite/package.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "marmite"; - version = "0.2.3"; + version = "0.2.4"; src = fetchFromGitHub { owner = "rochacbruno"; repo = "marmite"; tag = version; - hash = "sha256-AblitYe7YDUc2Tg2P7j+wnOjMAhDtieDsbq6B6x+uMs="; + hash = "sha256-IfmwPN2PbBXJJXHgwseC5L3sDOjaVlRE//H8uHazSNA="; }; - cargoHash = "sha256-u8sJS9hvIao+af7IA4vE0eUSx0xmI1Kb5NXyZBrOCIw="; + cargoHash = "sha256-FpCoSX/V7AoRED3bFoGLqyNsS1mNK8i2z+YjWMvtUZo="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/mc/mcpelauncher-client/package.nix b/pkgs/by-name/mc/mcpelauncher-client/package.nix index b9181d3d18ec2..dba7dc1539e97 100644 --- a/pkgs/by-name/mc/mcpelauncher-client/package.nix +++ b/pkgs/by-name/mc/mcpelauncher-client/package.nix @@ -1,6 +1,7 @@ { lib, clangStdenv, + stdenv, fetchFromGitHub, fetchpatch, cmake, @@ -18,6 +19,8 @@ withQtWebview ? true, withQtErrorWindow ? true, fetchzip, + zenity, + xdg-utils, }: # gcc doesn't support __has_feature @@ -51,6 +54,16 @@ clangStdenv.mkDerivation (finalAttrs: { }) ]; + # Path hard-coded paths. + postPatch = lib.optionalString stdenv.isLinux '' + substituteInPlace mcpelauncher-client/src/jni/main_activity.cpp \ + --replace-fail /usr/bin/xdg-open ${xdg-utils}/bin/xdg-open \ + --replace-fail /usr/bin/zenity ${zenity}/bin/zenity + + substituteInPlace file-picker/src/file_picker_zenity.cpp \ + --replace-fail /usr/bin/zenity ${zenity}/bin/zenity + ''; + # FORTIFY_SOURCE breaks libc_shim and the project will fail to compile hardeningDisable = [ "fortify" ]; diff --git a/pkgs/by-name/md/mdbook/package.nix b/pkgs/by-name/md/mdbook/package.nix index 52fa8ca72ca13..fff84963849e5 100644 --- a/pkgs/by-name/md/mdbook/package.nix +++ b/pkgs/by-name/md/mdbook/package.nix @@ -11,7 +11,7 @@ let version = "0.4.43"; in -rustPlatform.buildRustPackage { +rustPlatform.buildRustPackage rec { inherit version; pname = "mdbook"; @@ -22,7 +22,11 @@ rustPlatform.buildRustPackage { hash = "sha256-aADNcuIeDef9+a3NOWQxo6IRnKJ6AbkvE4GqvFbubyI="; }; - cargoHash = "sha256-8K72sJywMKxX/31SJuCEoacWvHrpkuwGGLXJ9MsDkTE="; + cargoDeps = rustPlatform.fetchCargoVendor { + inherit pname version src; + allowGitDependencies = false; + hash = "sha256-W5hg6ECNQRIh07ogZkXTn51el2YltutY86aJBYFDTP4="; + }; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/me/mediamtx/package.nix b/pkgs/by-name/me/mediamtx/package.nix index 5a6fd3936a244..68f344c358410 100644 --- a/pkgs/by-name/me/mediamtx/package.nix +++ b/pkgs/by-name/me/mediamtx/package.nix @@ -8,23 +8,23 @@ let hlsJs = fetchurl { - url = "https://cdn.jsdelivr.net/npm/hls.js@v1.5.19/dist/hls.min.js"; - hash = "sha256-KTlFB7LXpglQPzIzKajKy3DJRGDURwP4hcmRm7Oy/a8="; + url = "https://cdn.jsdelivr.net/npm/hls.js@v1.5.20/dist/hls.min.js"; + hash = "sha256-0BbBIwSW7lnz9bAcFszkzAG1odPTV63sIAyQixMevkk="; }; in buildGoModule rec { pname = "mediamtx"; # check for hls.js version updates in internal/servers/hls/hlsjsdownloader/VERSION - version = "1.11.1"; + version = "1.11.2"; src = fetchFromGitHub { owner = "bluenviron"; repo = pname; rev = "v${version}"; - hash = "sha256-8/RTdcq8r5yMu586iDNyC/Cfi0PydX7QkU52noQR18Y="; + hash = "sha256-+NT3YheDdlTPnyGLUl9mpyYx2kvN1lw2jDRdAboTSdc="; }; - vendorHash = "sha256-Laos5sTQjtweC4GLuQuK2J/trObPlCmoHSUw4shVP4k="; + vendorHash = "sha256-aDBjxt3f7z/9LwYJ5KyteODGFO5u+7m/rovOd9363Fg="; postPatch = '' cp ${hlsJs} internal/servers/hls/hls.min.js diff --git a/pkgs/by-name/me/melonDS/package.nix b/pkgs/by-name/me/melonDS/package.nix index 925dd9ae63e8c..065e886a149eb 100644 --- a/pkgs/by-name/me/melonDS/package.nix +++ b/pkgs/by-name/me/melonDS/package.nix @@ -27,13 +27,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "melonDS"; - version = "1.0rc-unstable-2024-12-26"; + version = "1.0rc-unstable-2025-01-17"; src = fetchFromGitHub { owner = "melonDS-emu"; repo = "melonDS"; - rev = "0c5dd28b1c5c1d17a2ce87efbd858059a8f9376f"; - hash = "sha256-hIpIt+krUpSW1T05Vq02IU5Lfaj4Sgg18qMoMH45NaE="; + rev = "15c3faa26e879bdcff615558ded6dd886681ccae"; + hash = "sha256-X9UqAAsACc3vVaWKNvT+swZXygIvaWOgFRUFzSAMjGM="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/mi/microsoft-edge/package.nix b/pkgs/by-name/mi/microsoft-edge/package.nix index 3fcea059026f8..8d75419491604 100644 --- a/pkgs/by-name/mi/microsoft-edge/package.nix +++ b/pkgs/by-name/mi/microsoft-edge/package.nix @@ -168,11 +168,11 @@ in stdenv.mkDerivation (finalAttrs: { pname = "microsoft-edge"; - version = "131.0.2903.112"; + version = "132.0.2957.127"; src = fetchurl { url = "https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-stable/microsoft-edge-stable_${finalAttrs.version}-1_amd64.deb"; - hash = "sha256-4qQNcoBXOS4Uz+MR4jItOgcnMKqB6J541cvrb5md/oc="; + hash = "sha256-uoC8oxkrMWgmkUbgn7OP21lpEadKZmb4Heb32zEvdjE="; }; # With strictDeps on, some shebangs were not being patched correctly diff --git a/pkgs/by-name/mi/mieru/package.nix b/pkgs/by-name/mi/mieru/package.nix index 794d7e727c188..d1f001068a3a7 100644 --- a/pkgs/by-name/mi/mieru/package.nix +++ b/pkgs/by-name/mi/mieru/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "mieru"; - version = "3.11.0"; + version = "3.11.1"; src = fetchFromGitHub { owner = "enfein"; repo = "mieru"; rev = "v${version}"; - hash = "sha256-xwi9T7M4FEl79kyGj+F1HX8000PFLrBfTmnEaLwnEFg="; + hash = "sha256-FFV1zF/sKgIVSSTcDcuB3QWfcFKbI3RJFG9RveSVe+w="; }; vendorHash = "sha256-AOtq6bGijQqpNMNZA3XeMjzKAo7tWTpdrKB6KxQsdMM="; diff --git a/pkgs/by-name/mi/minijinja/package.nix b/pkgs/by-name/mi/minijinja/package.nix index b18dded161e73..848bf7915ea01 100644 --- a/pkgs/by-name/mi/minijinja/package.nix +++ b/pkgs/by-name/mi/minijinja/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "minijinja"; - version = "2.6.0"; + version = "2.7.0"; src = fetchFromGitHub { owner = "mitsuhiko"; repo = "minijinja"; rev = version; - hash = "sha256-6jPTbtB7n85oGHYgOqZgBF5QyQGJwyZ3zyY+XLfU9y0="; + hash = "sha256-8MKd1sT+zg03tkKppd8/Zu6ZZWoVTMTmQXSrcDKp0xw="; }; - cargoHash = "sha256-z5mGDJWiWoJ6F+Ln6UZiw+CthI7JHpVldX0j7Qf43Y0="; + cargoHash = "sha256-jAamGckxzWmqdwDFX1bFiU16eVS1u35KlR9vDcfIiNg="; # The tests relies on the presence of network connection doCheck = false; diff --git a/pkgs/by-name/mi/miracle-wm/package.nix b/pkgs/by-name/mi/miracle-wm/package.nix index ae8723448ac1d..2a44b0bf89624 100644 --- a/pkgs/by-name/mi/miracle-wm/package.nix +++ b/pkgs/by-name/mi/miracle-wm/package.nix @@ -6,6 +6,8 @@ nixosTests, boost, cmake, + coreutils, + dbus, glib, glm, gtest, @@ -16,29 +18,31 @@ libuuid, libxkbcommon, libgbm, + makeWrapper, mir, nlohmann_json, pcre2, pkg-config, + systemd, wayland, yaml-cpp, }: stdenv.mkDerivation (finalAttrs: { pname = "miracle-wm"; - version = "0.4.0"; + version = "0.4.1"; src = fetchFromGitHub { owner = "miracle-wm-org"; repo = "miracle-wm"; - rev = "v${finalAttrs.version}"; - hash = "sha256-IuYRgQm3DM6ZgsfRt37GCXC3hb1vGIrqw7WxYN+Bets="; + tag = "v${finalAttrs.version}"; + hash = "sha256-LPcVLpskpmHc8EzdNqMT6BnbY8Le/BVojpXPIqy6tGI="; }; postPatch = '' - substituteInPlace session/usr/local/share/wayland-sessions/miracle-wm.desktop.in \ - --replace-fail '@CMAKE_INSTALL_FULL_BINDIR@/miracle-wm' 'miracle-wm' + substituteInPlace CMakeLists.txt \ + --replace-fail 'DESTINATION /usr/lib' 'DESTINATION ''${CMAKE_INSTALL_LIBDIR}' '' + lib.optionalString (!finalAttrs.finalPackage.doCheck) '' substituteInPlace CMakeLists.txt \ @@ -52,6 +56,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake + makeWrapper pkg-config ]; @@ -75,6 +80,10 @@ stdenv.mkDerivation (finalAttrs: { checkInputs = [ gtest ]; + cmakeFlags = [ + (lib.cmakeBool "SYSTEMD_INTEGRATION" true) + ]; + doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; checkPhase = '' @@ -85,6 +94,18 @@ stdenv.mkDerivation (finalAttrs: { runHook postCheck ''; + postFixup = '' + patchShebangs $out/libexec/miracle-wm-session-setup + wrapProgram $out/libexec/miracle-wm-session-setup \ + --prefix PATH : "$out/bin:${ + lib.makeBinPath [ + coreutils # cat + dbus # dbus-update-activation-environment + systemd # systemctl + ] + }" + ''; + passthru = { updateScript = gitUpdater { rev-prefix = "v"; }; providedSessions = [ "miracle-wm" ]; diff --git a/pkgs/by-name/mi/misconfig-mapper/package.nix b/pkgs/by-name/mi/misconfig-mapper/package.nix index d87a6024284b1..53d8446cfbbfa 100644 --- a/pkgs/by-name/mi/misconfig-mapper/package.nix +++ b/pkgs/by-name/mi/misconfig-mapper/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "misconfig-mapper"; - version = "1.12.6"; + version = "1.13.0"; src = fetchFromGitHub { owner = "intigriti"; repo = "misconfig-mapper"; tag = "v${version}"; - hash = "sha256-OdwTY73w/N1NuEeK7GsQWFT9NyOwrKlK0q0llW9Ena0="; + hash = "sha256-WheKF6IG4quJpNBPXbOMKGEUkR6wr3cVi97Gtpaz+LA="; }; vendorHash = "sha256-omnWQfriaPqz51xrUKZM5112ZEHJZgAm68hnqUyzR6A="; diff --git a/pkgs/by-name/mm/mmdbctl/package.nix b/pkgs/by-name/mm/mmdbctl/package.nix index 35dc947ec5b44..c1c7fd949195b 100644 --- a/pkgs/by-name/mm/mmdbctl/package.nix +++ b/pkgs/by-name/mm/mmdbctl/package.nix @@ -11,16 +11,16 @@ buildGoModule rec { pname = "mmdbctl"; - version = "1.4.6"; + version = "1.4.7"; src = fetchFromGitHub { owner = "ipinfo"; repo = "mmdbctl"; tag = "mmdbctl-${version}"; - hash = "sha256-6hJ9V8fHs84Lq48l3mB9nZka4rLneyxD4HMhWQYZ0cI="; + hash = "sha256-drYtuL4TzutzitLVKyUotxgyDjL7AMNnt0vVtfQhu4A="; }; - vendorHash = "sha256-5vd39j/gpRRkUccctKGU8+QL0vANm2FMyw6jTtoqJmw="; + vendorHash = "sha256-4T3HEzRerC4KrGQnMNSW3OVzChUIf4yJ7qS9v8mWIX4="; ldflags = [ "-s" diff --git a/pkgs/by-name/mo/moralerspace-hw/package.nix b/pkgs/by-name/mo/moralerspace-hw/package.nix new file mode 100644 index 0000000000000..4438c390136a7 --- /dev/null +++ b/pkgs/by-name/mo/moralerspace-hw/package.nix @@ -0,0 +1,28 @@ +{ + lib, + stdenvNoCC, + fetchzip, + moralerspace, +}: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "moralerspace-hw"; + inherit (moralerspace) version meta; + + src = fetchzip { + url = "https://github.com/yuru7/moralerspace/releases/download/v${finalAttrs.version}/MoralerspaceHW_v${finalAttrs.version}.zip"; + hash = "sha256-V02Lp7bWKjUGhFJ5fOTVrk74ei0T5UtITQeHZ4OHytw="; + }; + + installPhase = '' + runHook preInstall + + install -Dm644 *.ttf -t $out/share/fonts/moralerspace-hw + + runHook postInstall + ''; + + passthru = { + inherit (moralerspace) updateScript; + }; +}) diff --git a/pkgs/by-name/mo/moralerspace-hwjpdoc/package.nix b/pkgs/by-name/mo/moralerspace-hwjpdoc/package.nix new file mode 100644 index 0000000000000..ad5938447a3f6 --- /dev/null +++ b/pkgs/by-name/mo/moralerspace-hwjpdoc/package.nix @@ -0,0 +1,28 @@ +{ + lib, + stdenvNoCC, + fetchzip, + moralerspace, +}: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "moralerspace-hwjpdoc"; + inherit (moralerspace) version meta; + + src = fetchzip { + url = "https://github.com/yuru7/moralerspace/releases/download/v${finalAttrs.version}/MoralerspaceHWJPDOC_v${finalAttrs.version}.zip"; + hash = "sha256-rYDx3MMjxnmp/o6nRc5/bIEkwvMP9gmwm6R//3KwoLk="; + }; + + installPhase = '' + runHook preInstall + + install -Dm644 *.ttf -t $out/share/fonts/moralerspace-hwjpdoc + + runHook postInstall + ''; + + passthru = { + inherit (moralerspace) updateScript; + }; +}) diff --git a/pkgs/by-name/mo/moralerspace-hwnf/package.nix b/pkgs/by-name/mo/moralerspace-hwnf/package.nix new file mode 100644 index 0000000000000..39615f9b8eb3e --- /dev/null +++ b/pkgs/by-name/mo/moralerspace-hwnf/package.nix @@ -0,0 +1,28 @@ +{ + lib, + stdenvNoCC, + fetchzip, + moralerspace, +}: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "moralerspace-hwnf"; + inherit (moralerspace) version meta; + + src = fetchzip { + url = "https://github.com/yuru7/moralerspace/releases/download/v${finalAttrs.version}/MoralerspaceHWNF_v${finalAttrs.version}.zip"; + hash = "sha256-XRdDcfgwbP5g26xh9rlHRp9i//k5PdRhMExMy3ibN/4="; + }; + + installPhase = '' + runHook preInstall + + install -Dm644 *.ttf -t $out/share/fonts/moralerspace-hwnf + + runHook postInstall + ''; + + passthru = { + inherit (moralerspace) updateScript; + }; +}) diff --git a/pkgs/by-name/mo/moralerspace-jpdoc/package.nix b/pkgs/by-name/mo/moralerspace-jpdoc/package.nix new file mode 100644 index 0000000000000..66897d80990eb --- /dev/null +++ b/pkgs/by-name/mo/moralerspace-jpdoc/package.nix @@ -0,0 +1,28 @@ +{ + lib, + stdenvNoCC, + fetchzip, + moralerspace, +}: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "moralerspace-jpdoc"; + inherit (moralerspace) version meta; + + src = fetchzip { + url = "https://github.com/yuru7/moralerspace/releases/download/v${finalAttrs.version}/MoralerspaceJPDOC_v${finalAttrs.version}.zip"; + hash = "sha256-oeTRnDSp9sbicMmaybX7xue1u7dSpAqUv8XTOUrzEjE="; + }; + + installPhase = '' + runHook preInstall + + install -Dm644 *.ttf -t $out/share/fonts/moralerspace-jpdoc + + runHook postInstall + ''; + + passthru = { + inherit (moralerspace) updateScript; + }; +}) diff --git a/pkgs/by-name/mo/moralerspace-nf/package.nix b/pkgs/by-name/mo/moralerspace-nf/package.nix new file mode 100644 index 0000000000000..b552eb036f5f6 --- /dev/null +++ b/pkgs/by-name/mo/moralerspace-nf/package.nix @@ -0,0 +1,28 @@ +{ + lib, + stdenvNoCC, + fetchzip, + moralerspace, +}: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "moralerspace-nf"; + inherit (moralerspace) version meta; + + src = fetchzip { + url = "https://github.com/yuru7/moralerspace/releases/download/v${finalAttrs.version}/MoralerspaceNF_v${finalAttrs.version}.zip"; + hash = "sha256-zpJ6I/4WMiVfDbowcvw1JAup0RdvylJCzQbwa5qWM44="; + }; + + installPhase = '' + runHook preInstall + + install -Dm644 *.ttf -t $out/share/fonts/moralerspace-nf + + runHook postInstall + ''; + + passthru = { + inherit (moralerspace) updateScript; + }; +}) diff --git a/pkgs/by-name/mo/moralerspace/package.nix b/pkgs/by-name/mo/moralerspace/package.nix new file mode 100644 index 0000000000000..baaf309226cbf --- /dev/null +++ b/pkgs/by-name/mo/moralerspace/package.nix @@ -0,0 +1,58 @@ +{ + lib, + stdenvNoCC, + fetchzip, + _experimental-update-script-combinators, + nix-update-script, +}: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "moralerspace"; + version = "1.1.0"; + + src = fetchzip { + url = "https://github.com/yuru7/moralerspace/releases/download/v${finalAttrs.version}/Moralerspace_v${finalAttrs.version}.zip"; + hash = "sha256-sItgkidfmOPKtMx8+eaVFn8hK9cRxYShIsNXTh5dJfk="; + }; + + installPhase = '' + runHook preInstall + + install -Dm644 *.ttf -t $out/share/fonts/moralerspace + + runHook postInstall + ''; + + passthru.updateScript = _experimental-update-script-combinators.sequence [ + (nix-update-script { }) + (nix-update-script { + attrPath = "moralerspace-hw"; + extraArgs = [ "--version=skip" ]; + }) + (nix-update-script { + attrPath = "moralerspace-hwjpdoc"; + extraArgs = [ "--version=skip" ]; + }) + (nix-update-script { + attrPath = "moralerspace-hwnf"; + extraArgs = [ "--version=skip" ]; + }) + (nix-update-script { + attrPath = "moralerspace-jpdoc"; + extraArgs = [ "--version=skip" ]; + }) + (nix-update-script { + attrPath = "moralerspace-nf"; + extraArgs = [ "--version=skip" ]; + }) + ]; + + meta = { + description = "Composite font of Monaspace and IBM Plex Sans JP"; + homepage = "https://github.com/yuru7/moralerspace"; + changelog = "https://github.com/yuru7/moralerspace/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.ofl; + maintainers = with lib.maintainers; [ natsukium ]; + platforms = lib.platforms.all; + }; +}) diff --git a/pkgs/by-name/mo/motif/package.nix b/pkgs/by-name/mo/motif/package.nix index 969cd4ad5a810..76ff287778620 100644 --- a/pkgs/by-name/mo/motif/package.nix +++ b/pkgs/by-name/mo/motif/package.nix @@ -3,6 +3,7 @@ stdenv, fetchurl, fetchpatch, + buildPackages, pkg-config, libtool, xbitmaps, @@ -32,6 +33,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ + flex libtool xbitmaps libXext @@ -55,9 +57,35 @@ stdenv.mkDerivation rec { libXau ]; - postPatch = lib.optionalString (!demoSupport) '' - sed 's/\//' -i Makefile.{am,in} - ''; + strictDeps = true; + + postPatch = + '' + # File existence fails when cross-compiling - useless for Nix anyhow + substituteInPlace ./configure --replace-fail \ + 'as_fn_error $? "cannot check for file existence' '#' \ + --replace-fail 'pkg-config' '${stdenv.cc.targetPrefix}pkg-config' + '' + + lib.optionalString (!demoSupport) '' + sed 's/\//' -i Makefile.{am,in} + '' + # for cross builds, we must copy several build tools from a native build + # (and we must ensure they are not removed and recreated by make) + + lib.optionalString (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + cp "${buildPackages.motif}/lib/internals/makestrs" config/util/makestrs + substituteInPlace config/util/Makefile.in \ + --replace-fail '@rm -f makestrs$(EXEEXT)' "" \ + --replace-fail '$(AM_V_CCLD)$(LINK) $(makestrs_OBJECTS) $(makestrs_LDADD) $(LIBS)' "" + + cp "${buildPackages.motif}"/lib/internals/{wml,wmluiltok,wmldbcreate} tools/wml/ + substituteInPlace tools/wml/Makefile.in \ + --replace-fail '@rm -f wmldbcreate$(EXEEXT)' "" \ + --replace-fail '$(AM_V_CCLD)$(LINK) $(wmldbcreate_OBJECTS) $(wmldbcreate_LDADD) $(LIBS)' "" \ + --replace-fail '@rm -f wmluiltok$(EXEEXT)' "" \ + --replace-fail '$(AM_V_CCLD)$(LINK) $(wmluiltok_OBJECTS) $(wmluiltok_LDADD) $(LIBS)' "" \ + --replace-fail '@rm -f wml$(EXEEXT)' "" \ + --replace-fail '$(AM_V_CCLD)$(LINK) $(wml_OBJECTS) $(wml_LDADD) $(LIBS)' "" + ''; patches = [ ./Remove-unsupported-weak-refs-on-darwin.patch @@ -90,6 +118,11 @@ stdenv.mkDerivation rec { }) ]; + # provide correct configure answers for cross builds + configureFlags = [ + "ac_cv_func_setpgrp_void=${if stdenv.hostPlatform.isBSD then "no" else "yes"}" + ]; + env = lib.optionalAttrs stdenv.cc.isClang { NIX_CFLAGS_COMPILE = toString [ "-Wno-error=implicit-function-declaration" @@ -99,6 +132,12 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + # copy tools for cross builds + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + mkdir -p "$out/lib/internals" + cp config/util/makestrs tools/wml/{wml,wmluiltok,.libs/wmldbcreate} "$out/lib/internals" + ''; + meta = with lib; { homepage = "https://motif.ics.com"; description = "Unix standard widget-toolkit and window-manager"; diff --git a/pkgs/by-name/mp/mp4fpsmod/package.nix b/pkgs/by-name/mp/mp4fpsmod/package.nix new file mode 100644 index 0000000000000..9f8710d381789 --- /dev/null +++ b/pkgs/by-name/mp/mp4fpsmod/package.nix @@ -0,0 +1,46 @@ +{ + lib, + stdenv, + fetchFromGitHub, + autoreconfHook, +}: + +stdenv.mkDerivation rec { + pname = "mp4fpsmod"; + version = "0.27-unstable-2023-12-30"; + + src = fetchFromGitHub { + owner = "nu774"; + repo = "mp4fpsmod"; + rev = "e2dd065012f4d2c7e42d4acdefee2ffdc50d3d86"; + hash = "sha256-54pkjlvLLi4pLlQA/l+v4Mx5HlloR6GiB2GP71A0x/g="; + }; + + nativeBuildInputs = [ autoreconfHook ]; + + enableParallelBuilding = true; + + preConfigure = '' + ./bootstrap.sh + ''; + + meta = with lib; { + description = "Tiny mp4 time code editor"; + longDescription = '' + Tiny mp4 time code editor. You can use this for changing fps, + delaying audio tracks, executing DTS compression, extracting + time codes of mp4. + ''; + inherit (src.meta) homepage; + license = with licenses; [ + # All files are distributed as Public Domain, except for the followings: + publicDomain + mpl11 # mp4v2 + boost # Boost + bsd2 # FreeBSD CVS + ]; + platforms = platforms.unix; + maintainers = with maintainers; [ huggy ]; + mainProgram = "mp4fpsmod"; + }; +} diff --git a/pkgs/by-name/ms/msbuild/package.nix b/pkgs/by-name/ms/msbuild/package.nix index 2df76c8722647..a694aa765bf7a 100644 --- a/pkgs/by-name/ms/msbuild/package.nix +++ b/pkgs/by-name/ms/msbuild/package.nix @@ -2,7 +2,7 @@ let - dotnet-sdk = dotnetCorePackages.sdk_6_0; + dotnet-sdk = dotnetCorePackages.sdk_6_0-bin; xplat = fetchurl { url = "https://github.com/mono/msbuild/releases/download/v16.9.0/mono_msbuild_6.12.0.137.zip"; diff --git a/pkgs/by-name/mu/multiqc/package.nix b/pkgs/by-name/mu/multiqc/package.nix new file mode 100644 index 0000000000000..be3f8ad6ea865 --- /dev/null +++ b/pkgs/by-name/mu/multiqc/package.nix @@ -0,0 +1,117 @@ +{ + lib, + python3Packages, + fetchFromGitHub, + procps, + stdenv, + versionCheckHook, +}: + +python3Packages.buildPythonApplication rec { + pname = "multiqc"; + version = "1.26"; + + # Two data sources. One for the code, another for the test data + srcs = [ + (fetchFromGitHub { + name = "multiqc"; + owner = "MultiQC"; + repo = "MultiQC"; + tag = "v${version}"; + hash = "sha256-MPAw6gG/3LzdskkDXOTDEM1NpG0sH9GvklYFQ1ZXWIs="; + }) + (fetchFromGitHub { + owner = "MultiQC"; + repo = "test-data"; + rev = "67435083a8bfa228dca3dda7d835facef15fc2c7"; + hash = "sha256-oYmPIJSy6dOKPcMr3B4foGoWcerA29x0XeGoU4dSYsA="; + name = "test-data"; + }) + ]; + + sourceRoot = "multiqc"; + + dependencies = with python3Packages; [ + click + humanize + importlib-metadata + jinja2 + kaleido + markdown + natsort + numpy + packaging + requests + pillow + plotly + pyyaml + rich + rich-click + coloredlogs + spectra + pydantic + typeguard + tqdm + ]; + + optional-dependencies = { + dev = with python3Packages; [ + pre-commit-hooks + pdoc3 + pytest + pytest-cov-stub + pytest-xdist + syrupy + pygithub + mypy + types-pyyaml + types-tqdm + types-requests + types-markdown + types-beautifulsoup4 + types-pillow + ]; + }; + + # Some tests run subprocess.run() with "multiqc" + preCheck = '' + chmod -R u+w ../test-data + ln -s ../test-data . + export PATH=$out/bin:$PATH + ''; + + # Some tests run subprocess.run() with "ps" + nativeCheckInputs = with python3Packages; [ + procps + pytest-cov + pytest-xdist + pytestCheckHook + syrupy + pygithub + versionCheckHook + ]; + + versionCheckProgramArg = [ "--version" ]; + + disabledTests = + # On darwin, kaleido fails to starts + lib.optionals (stdenv.hostPlatform.isDarwin) [ + "test_flat_plot" + ]; + + meta = { + description = "Aggregates bioinformatics results from multiple samples into a unified report"; + longDescription = '' + MultiQC is a tool to create a single report with interactive plots for multiple bioinformatics analyses across many samples. + + Reports are generated by scanning given directories for recognised log files. These are parsed and a single HTML report is generated summarising the statistics for all logs found. MultiQC reports can describe multiple analysis steps and large numbers of samples within a single plot, and multiple analysis tools making it ideal for routine fast quality control. + ''; + homepage = "https://multiqc.info"; + changelog = "https://github.com/MultiQC/MultiQC/releases/tag/v${version}/"; + license = [ lib.licenses.gpl3Plus ]; + maintainers = [ lib.maintainers.apraga ]; + mainProgram = "multiqc"; + platforms = lib.platforms.unix; + }; + +} diff --git a/pkgs/by-name/mu/mutter/package.nix b/pkgs/by-name/mu/mutter/package.nix index e0fc11bb82234..074b1cccb3879 100644 --- a/pkgs/by-name/mu/mutter/package.nix +++ b/pkgs/by-name/mu/mutter/package.nix @@ -17,6 +17,7 @@ xvfb-run, libadwaita, libxcvt, + libGL, libICE, libX11, libXcomposite, @@ -106,6 +107,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ desktop-file-utils gettext + glib libxcvt meson ninja @@ -133,6 +135,7 @@ stdenv.mkDerivation (finalAttrs: { libdrm libei libdisplay-info + libGL libgudev libinput libstartup_notification @@ -175,10 +178,6 @@ stdenv.mkDerivation (finalAttrs: { --replace-fail "libadwaita-1.so.0" "${libadwaita}/lib/libadwaita-1.so.0" ''; - postInstall = '' - ${glib.dev}/bin/glib-compile-schemas "$out/share/glib-2.0/schemas" - ''; - postFixup = '' # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back. # TODO: Move this into a directory devhelp can find. @@ -189,6 +188,7 @@ stdenv.mkDerivation (finalAttrs: { PKG_CONFIG_UDEV_UDEVDIR = "${placeholder "out"}/lib/udev"; separateDebugInfo = true; + strictDeps = true; passthru = { libdir = "${finalAttrs.finalPackage}/lib/mutter-15"; diff --git a/pkgs/by-name/my/mysql84/package.nix b/pkgs/by-name/my/mysql84/package.nix index 075c39763ae7e..bdddda7e31241 100644 --- a/pkgs/by-name/my/mysql84/package.nix +++ b/pkgs/by-name/my/mysql84/package.nix @@ -27,11 +27,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "mysql"; - version = "8.4.3"; + version = "8.4.4"; src = fetchurl { url = "https://dev.mysql.com/get/Downloads/MySQL-${lib.versions.majorMinor finalAttrs.version}/mysql-${finalAttrs.version}.tar.gz"; - hash = "sha256-eslWTEeAIvcwBf+Ju7QPZ7OB/AbVUYQWvf/sdeYluBg="; + hash = "sha256-+ykO90iJRDQIUknDG8pSrHGFMSREarIYuzvFAr8AgqU="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/n8/n8n/package.nix b/pkgs/by-name/n8/n8n/package.nix index 132e119bd41a0..2c1f0e246cc78 100644 --- a/pkgs/by-name/n8/n8n/package.nix +++ b/pkgs/by-name/n8/n8n/package.nix @@ -17,18 +17,18 @@ stdenv.mkDerivation (finalAttrs: { pname = "n8n"; - version = "1.73.1"; + version = "1.75.2"; src = fetchFromGitHub { owner = "n8n-io"; repo = "n8n"; tag = "n8n@${finalAttrs.version}"; - hash = "sha256-gPdJKVOZlizdS0o+2nBgCImnIhtHzRjE2xk0zJA52go="; + hash = "sha256-fIdwciI4QUNr2wNWiq7qT4c6aZeUnkaVhSkIgFO4Svw="; }; pnpmDeps = pnpm_9.fetchDeps { inherit (finalAttrs) pname version src; - hash = "sha256-Am9R2rfQiw1IPd22/UraqzEqvVeB5XuSrrLSYXWsWfU="; + hash = "sha256-rtXTAHZUeitQFTa1Tw6l4el+xWD2hLT+2wu2LXW80cE="; }; nativeBuildInputs = diff --git a/pkgs/by-name/na/naabu/package.nix b/pkgs/by-name/na/naabu/package.nix index 5120f7e1eebfa..c632a5dfc5c1d 100644 --- a/pkgs/by-name/na/naabu/package.nix +++ b/pkgs/by-name/na/naabu/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "naabu"; - version = "2.3.3"; + version = "2.3.4"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "naabu"; tag = "v${version}"; - hash = "sha256-ffE/PlLUH2qO4QJpSGHmEh7/ghputTCnTYplzP+Umw0="; + hash = "sha256-Xri3kdpK1oPb2doL/x7PkZQBtFugesbNX3GGc/w3GY8="; }; - vendorHash = "sha256-YSE6WQkq47A+D9ff3UHbc0Kdik9b4KjRpwYWkXDD5zA="; + vendorHash = "sha256-HpkFUHD3B09nxGK75zELTsjr4wXivY2o/DCjYSDepRI="; buildInputs = [ libpcap ]; diff --git a/pkgs/by-name/na/nanobench/package.nix b/pkgs/by-name/na/nanobench/package.nix new file mode 100644 index 0000000000000..af59b41ee20b3 --- /dev/null +++ b/pkgs/by-name/na/nanobench/package.nix @@ -0,0 +1,53 @@ +{ + lib, + stdenv, + fetchFromGitHub, + fetchpatch, + cmake, + nix-update-script, +}: + +stdenv.mkDerivation rec { + pname = "nanobench"; + version = "4.3.11"; + + src = fetchFromGitHub { + owner = "martinus"; + repo = "nanobench"; + tag = "v${version}"; + hash = "sha256-6OoVU31cNY0pIYpK/PdB9Qej+9IJo7+fHFQCTymBVrk="; + }; + + patches = [ + # Missing header from a test file. Required for compiling as of gcc13. Patched in commit from master branch. + # Remove on next release. + (fetchpatch { + url = "https://github.com/martinus/nanobench/commit/e4327893194f06928012eb81cabc606c4e4791ac.patch"; + hash = "sha256-vmpohg9TbIxT+p4JerWh/QBcZ3/+1gPSNf15sqW6leM="; + }) + + # Change cmake install directories to conventional locations. Patches from unmerged pull request. + # Remove when merged upstream. + (fetchpatch { + url = "https://github.com/martinus/nanobench/pull/98/commits/92c6995ccaebbda87fed13de8eaf3d135d1af0c0.patch"; + hash = "sha256-JwCpwSRzV1qnwwcJIGEJWxthT4Vj12TXhAGG0bc8KGM="; + }) + (fetchpatch { + url = "https://github.com/martinus/nanobench/pull/98/commits/17a1f0b598a09d399dd492c72bca5b48ad76c794.patch"; + hash = "sha256-2lOD63qN7gywUQxrdSRVyddpzcQjjeWOrA3hqu7x+CY="; + }) + ]; + + nativeBuildInputs = [ cmake ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Simple, fast, accurate single-header microbenchmarking functionality for C++11/14/17/20"; + homepage = "https://nanobench.ankerl.com/"; + changelog = "https://github.com/martinus/nanobench/releases/tag/v${version}"; + platforms = lib.platforms.all; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ mtpham99 ]; + }; +} diff --git a/pkgs/by-name/na/naps2/package.nix b/pkgs/by-name/na/naps2/package.nix index 216df3c3cf16c..ed72a25dbf76e 100644 --- a/pkgs/by-name/na/naps2/package.nix +++ b/pkgs/by-name/na/naps2/package.nix @@ -33,7 +33,7 @@ buildDotnetModule rec { inherit (combinePackages [ sdk_8_0 - sdk_6_0 + sdk_6_0-bin ]) packages targetPackages diff --git a/pkgs/by-name/ne/neovim-unwrapped/package.nix b/pkgs/by-name/ne/neovim-unwrapped/package.nix index b8d3e76cd16c2..05737a4a1726a 100644 --- a/pkgs/by-name/ne/neovim-unwrapped/package.nix +++ b/pkgs/by-name/ne/neovim-unwrapped/package.nix @@ -96,7 +96,7 @@ stdenv.mkDerivation ( in { pname = "neovim-unwrapped"; - version = "0.10.3"; + version = "0.10.4"; __structuredAttrs = true; @@ -104,7 +104,7 @@ stdenv.mkDerivation ( owner = "neovim"; repo = "neovim"; tag = "v${finalAttrs.version}"; - hash = "sha256-nmnEyHE/HcrwK+CyJHNoLG0BqjnWleiBy0UYcJL7Ecc="; + hash = "sha256-TAuoa5GD50XB4OCHkSwP1oXfedzVrCBRutNxBp/zGLY="; }; patches = [ diff --git a/pkgs/by-name/ne/netlify-cli/package.nix b/pkgs/by-name/ne/netlify-cli/package.nix index f766204b44770..a785718790e96 100644 --- a/pkgs/by-name/ne/netlify-cli/package.nix +++ b/pkgs/by-name/ne/netlify-cli/package.nix @@ -11,16 +11,16 @@ buildNpmPackage rec { pname = "netlify-cli"; - version = "18.0.0"; + version = "18.0.2"; src = fetchFromGitHub { owner = "netlify"; repo = "cli"; tag = "v${version}"; - hash = "sha256-LGnFVg7c+CMgjxkVdy/rdoo6uU5HaOwGKRDHRe5Hz3Y="; + hash = "sha256-GykzaVJyiAH7L9afK+PdwkqImo80ldcx420pM8V4WBg="; }; - npmDepsHash = "sha256-ONLkCbmmY45/sRwaGUWhA187YVtCcdPVnD7ZMFoQ2Y0="; + npmDepsHash = "sha256-n6JUInqI4ioMTebYcJXJ1ff8MjUW/+Y3b2lS7zhuSdI="; inherit nodejs; diff --git a/pkgs/by-name/ne/networkmanager-l2tp/package.nix b/pkgs/by-name/ne/networkmanager-l2tp/package.nix index c27d970885184..2f726ee47d651 100644 --- a/pkgs/by-name/ne/networkmanager-l2tp/package.nix +++ b/pkgs/by-name/ne/networkmanager-l2tp/package.nix @@ -38,16 +38,20 @@ stdenv.mkDerivation rec { }) ]; - nativeBuildInputs = [ - autoreconfHook - pkg-config - ]; + nativeBuildInputs = + [ + autoreconfHook + glib # for gdbus-codegen + pkg-config + ] + ++ lib.optionals withGnome [ + gtk4 # for gtk4-builder-tool + ]; buildInputs = [ networkmanager ppp - glib openssl nss ] @@ -67,6 +71,7 @@ stdenv.mkDerivation rec { ]; enableParallelBuilding = true; + strictDeps = true; passthru = { networkManagerPlugin = "VPN/nm-l2tp-service.name"; diff --git a/pkgs/by-name/ne/networkmanager-openconnect/package.nix b/pkgs/by-name/ne/networkmanager-openconnect/package.nix index c33ba6644f90f..e4ec7fa5739be 100644 --- a/pkgs/by-name/ne/networkmanager-openconnect/package.nix +++ b/pkgs/by-name/ne/networkmanager-openconnect/package.nix @@ -39,7 +39,6 @@ stdenv.mkDerivation rec { buildInputs = [ - glib libxml2 openconnect networkmanager @@ -55,6 +54,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ + glib intltool pkg-config file diff --git a/pkgs/by-name/ne/networkmanager-openvpn/package.nix b/pkgs/by-name/ne/networkmanager-openvpn/package.nix index 964a51ddab971..82e9c7b0149fc 100644 --- a/pkgs/by-name/ne/networkmanager-openvpn/package.nix +++ b/pkgs/by-name/ne/networkmanager-openvpn/package.nix @@ -37,6 +37,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ gettext + glib pkg-config file libxml2 @@ -46,7 +47,6 @@ stdenv.mkDerivation (finalAttrs: { [ openvpn networkmanager - glib ] ++ lib.optionals withGnome [ gtk3 @@ -63,6 +63,8 @@ stdenv.mkDerivation (finalAttrs: { "--enable-absolute-paths" ]; + strictDeps = true; + passthru = { updateScript = gnome.updateScript { packageName = "NetworkManager-openvpn"; diff --git a/pkgs/by-name/ne/networkmanager-sstp/package.nix b/pkgs/by-name/ne/networkmanager-sstp/package.nix index 4a8a13ac39368..494f27b80571f 100644 --- a/pkgs/by-name/ne/networkmanager-sstp/package.nix +++ b/pkgs/by-name/ne/networkmanager-sstp/package.nix @@ -29,18 +29,22 @@ stdenv.mkDerivation rec { sha256 = "sha256-zd+g86cZLyibLhYLal6XzUb9wFu7kHROp0KzRM95Qng="; }; - nativeBuildInputs = [ - autoreconfHook - file - gettext - pkg-config - ]; + nativeBuildInputs = + [ + autoreconfHook + file + gettext + glib # for gdbus-codegen + pkg-config + ] + ++ lib.optionals withGnome [ + gtk4 # for gtk4-builder-tool + ]; buildInputs = [ sstp networkmanager - glib ppp ] ++ lib.optionals withGnome [ @@ -63,6 +67,8 @@ stdenv.mkDerivation rec { "--enable-absolute-paths" ]; + strictDeps = true; + passthru = { updateScript = gnome.updateScript { packageName = pname; diff --git a/pkgs/by-name/ne/networkmanager-vpnc/package.nix b/pkgs/by-name/ne/networkmanager-vpnc/package.nix index 52f47d871199c..76af39b9da20e 100644 --- a/pkgs/by-name/ne/networkmanager-vpnc/package.nix +++ b/pkgs/by-name/ne/networkmanager-vpnc/package.nix @@ -35,12 +35,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config file + glib ]; buildInputs = [ vpnc networkmanager - glib ] ++ lib.optionals withGnome [ gtk3 gtk4 @@ -55,6 +55,8 @@ stdenv.mkDerivation rec { "--enable-absolute-paths" ]; + strictDeps = true; + passthru = { updateScript = gnome.updateScript { packageName = pname; diff --git a/pkgs/by-name/ne/networkminer/package.nix b/pkgs/by-name/ne/networkminer/package.nix index ff5d917ad7ace..88918a1b11158 100644 --- a/pkgs/by-name/ne/networkminer/package.nix +++ b/pkgs/by-name/ne/networkminer/package.nix @@ -21,7 +21,7 @@ buildDotnetModule rec { sha256 = "1n2312acq5rq0jizlcfk0crslx3wgcsd836p47nk3pnapzw0cqvv"; }; - dotnet-sdk = dotnetCorePackages.sdk_6_0; + dotnet-sdk = dotnetCorePackages.sdk_6_0-bin; nativeBuildInputs = [ unzip diff --git a/pkgs/by-name/ne/nezha-theme-admin/package-lock.json b/pkgs/by-name/ne/nezha-theme-admin/package-lock.json index f0d1f1869987b..5f585a605d1ad 100644 --- a/pkgs/by-name/ne/nezha-theme-admin/package-lock.json +++ b/pkgs/by-name/ne/nezha-theme-admin/package-lock.json @@ -124,22 +124,22 @@ } }, "node_modules/@babel/core": { - "version": "7.26.0", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.26.0.tgz", - "integrity": "sha512-i1SLeK+DzNnQ3LL/CswPCa/E5u4lh1k6IAEphON8F+cXt0t9euTshDru0q7/IqMa1PMPz5RnHuHscF8/ZJsStg==", + "version": "7.26.7", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.26.7.tgz", + "integrity": "sha512-SRijHmF0PSPgLIBYlWnG0hyeJLwXE2CgpsXaMOrtt2yp9/86ALw6oUlj9KYuZ0JN07T4eBMVIW4li/9S1j2BGA==", "dev": true, "license": "MIT", "dependencies": { "@ampproject/remapping": "^2.2.0", - "@babel/code-frame": "^7.26.0", - "@babel/generator": "^7.26.0", - "@babel/helper-compilation-targets": "^7.25.9", + "@babel/code-frame": "^7.26.2", + "@babel/generator": "^7.26.5", + "@babel/helper-compilation-targets": "^7.26.5", "@babel/helper-module-transforms": "^7.26.0", - "@babel/helpers": "^7.26.0", - "@babel/parser": "^7.26.0", + "@babel/helpers": "^7.26.7", + "@babel/parser": "^7.26.7", "@babel/template": "^7.25.9", - "@babel/traverse": "^7.25.9", - "@babel/types": "^7.26.0", + "@babel/traverse": "^7.26.7", + "@babel/types": "^7.26.7", "convert-source-map": "^2.0.0", "debug": "^4.1.0", "gensync": "^1.0.0-beta.2", @@ -258,26 +258,26 @@ } }, "node_modules/@babel/helpers": { - "version": "7.26.0", - "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.26.0.tgz", - "integrity": "sha512-tbhNuIxNcVb21pInl3ZSjksLCvgdZy9KwJ8brv993QtIVKJBBkYXz4q4ZbAv31GdnC+R90np23L5FbEBlthAEw==", + "version": "7.26.7", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.26.7.tgz", + "integrity": "sha512-8NHiL98vsi0mbPQmYAGWwfcFaOy4j2HY49fXJCfuDcdE7fMIsH9a7GdaeXpIBsbT7307WU8KCMp5pUVDNL4f9A==", "dev": true, "license": "MIT", "dependencies": { "@babel/template": "^7.25.9", - "@babel/types": "^7.26.0" + "@babel/types": "^7.26.7" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/parser": { - "version": "7.26.5", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.26.5.tgz", - "integrity": "sha512-SRJ4jYmXRqV1/Xc+TIVG84WjHBXKlxO9sHQnA2Pf12QQEAp1LOh6kDzNHXcUnbH1QI0FDoPPVOt+vyUDucxpaw==", + "version": "7.26.7", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.26.7.tgz", + "integrity": "sha512-kEvgGGgEjRUutvdVvZhbn/BxVt+5VSpwXz1j3WYXQbXDo8KzFOPNG2GQbdAiNq8g6wn1yKk7C/qrke03a84V+w==", "license": "MIT", "dependencies": { - "@babel/types": "^7.26.5" + "@babel/types": "^7.26.7" }, "bin": { "parser": "bin/babel-parser.js" @@ -319,9 +319,9 @@ } }, "node_modules/@babel/runtime": { - "version": "7.26.0", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.26.0.tgz", - "integrity": "sha512-FDSOghenHTiToteC/QRlv2q3DhPZ/oOXTBoirfWNx1Cx3TMVcGWQtMMmQcSvb/JjpNeGzx8Pq/b4fKEJuWm1sw==", + "version": "7.26.7", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.26.7.tgz", + "integrity": "sha512-AOPI3D+a8dXnja+iwsUqGRjr1BbZIe771sXdapOtYI531gSqpi92vXivKcq2asu/DFpdl1ceFAKZyRzK2PCVcQ==", "license": "MIT", "dependencies": { "regenerator-runtime": "^0.14.0" @@ -345,16 +345,16 @@ } }, "node_modules/@babel/traverse": { - "version": "7.26.5", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.26.5.tgz", - "integrity": "sha512-rkOSPOw+AXbgtwUga3U4u8RpoK9FEFWBNAlTpcnkLFjL5CT+oyHNuUUC/xx6XefEJ16r38r8Bc/lfp6rYuHeJQ==", + "version": "7.26.7", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.26.7.tgz", + "integrity": "sha512-1x1sgeyRLC3r5fQOM0/xtQKsYjyxmFjaOrLJNtZ81inNjyJHGIolTULPiSc/2qe1/qfpFLisLQYFnnZl7QoedA==", "license": "MIT", "dependencies": { "@babel/code-frame": "^7.26.2", "@babel/generator": "^7.26.5", - "@babel/parser": "^7.26.5", + "@babel/parser": "^7.26.7", "@babel/template": "^7.25.9", - "@babel/types": "^7.26.5", + "@babel/types": "^7.26.7", "debug": "^4.3.1", "globals": "^11.1.0" }, @@ -372,9 +372,9 @@ } }, "node_modules/@babel/types": { - "version": "7.26.5", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.26.5.tgz", - "integrity": "sha512-L6mZmwFDK6Cjh1nRCLXpa6no13ZIioJDz7mdkzHv399pThrTa/k0nUlNaenOeh2kWu/iaOQYElEpKPUswUa9Vg==", + "version": "7.26.7", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.26.7.tgz", + "integrity": "sha512-t8kDRGrKXyp6+tjUh7hw2RLyclsW4TRoRvRHtSyAX9Bb5ldlFh+90YAYY6awRXrlB4G5G2izNeGySpATlFzmOg==", "license": "MIT", "dependencies": { "@babel/helper-string-parser": "^7.25.9", @@ -883,9 +883,9 @@ } }, "node_modules/@eslint/js": { - "version": "9.18.0", - "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.18.0.tgz", - "integrity": "sha512-fK6L7rxcq6/z+AaQMtiFTkvbHkBLNlwyRxHpKawP0x3u9+NC6MQTnFW+AdpwC6gfHTW0051cokQgtTN2FqlxQA==", + "version": "9.19.0", + "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.19.0.tgz", + "integrity": "sha512-rbq9/g38qjfqFLOVPvwjIvFFdNziEC5S65jmjPw5r6A//QH+W91akh9irMwjDN8zKUTak6W9EsAv4m/7Wnw0UQ==", "dev": true, "license": "MIT", "engines": { @@ -1159,15 +1159,15 @@ "license": "MIT" }, "node_modules/@radix-ui/react-alert-dialog": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/@radix-ui/react-alert-dialog/-/react-alert-dialog-1.1.4.tgz", - "integrity": "sha512-A6Kh23qZDLy3PSU4bh2UJZznOrUdHImIXqF8YtUa6CN73f8EOO9XlXSCd9IHyPvIquTaa/kwaSWzZTtUvgXVGw==", + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/@radix-ui/react-alert-dialog/-/react-alert-dialog-1.1.5.tgz", + "integrity": "sha512-1Y2sI17QzSZP58RjGtrklfSGIf3AF7U/HkD3aAcAnhOUJrm7+7GG1wRDFaUlSe0nW5B/t4mYd/+7RNbP2Wexug==", "license": "MIT", "dependencies": { "@radix-ui/primitive": "1.1.1", "@radix-ui/react-compose-refs": "1.1.1", "@radix-ui/react-context": "1.1.1", - "@radix-ui/react-dialog": "1.1.4", + "@radix-ui/react-dialog": "1.1.5", "@radix-ui/react-primitive": "2.0.1", "@radix-ui/react-slot": "1.1.1" }, @@ -1322,15 +1322,15 @@ } }, "node_modules/@radix-ui/react-dialog": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/@radix-ui/react-dialog/-/react-dialog-1.1.4.tgz", - "integrity": "sha512-Ur7EV1IwQGCyaAuyDRiOLA5JIUZxELJljF+MbM/2NC0BYwfuRrbpS30BiQBJrVruscgUkieKkqXYDOoByaxIoA==", + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/@radix-ui/react-dialog/-/react-dialog-1.1.5.tgz", + "integrity": "sha512-LaO3e5h/NOEL4OfXjxD43k9Dx+vn+8n+PCFt6uhX/BADFflllyv3WJG6rgvvSVBxpTch938Qq/LGc2MMxipXPw==", "license": "MIT", "dependencies": { "@radix-ui/primitive": "1.1.1", "@radix-ui/react-compose-refs": "1.1.1", "@radix-ui/react-context": "1.1.1", - "@radix-ui/react-dismissable-layer": "1.1.3", + "@radix-ui/react-dismissable-layer": "1.1.4", "@radix-ui/react-focus-guards": "1.1.1", "@radix-ui/react-focus-scope": "1.1.1", "@radix-ui/react-id": "1.1.0", @@ -1339,8 +1339,8 @@ "@radix-ui/react-primitive": "2.0.1", "@radix-ui/react-slot": "1.1.1", "@radix-ui/react-use-controllable-state": "1.1.0", - "aria-hidden": "^1.1.1", - "react-remove-scroll": "^2.6.1" + "aria-hidden": "^1.2.4", + "react-remove-scroll": "^2.6.2" }, "peerDependencies": { "@types/react": "*", @@ -1373,9 +1373,9 @@ } }, "node_modules/@radix-ui/react-dismissable-layer": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/@radix-ui/react-dismissable-layer/-/react-dismissable-layer-1.1.3.tgz", - "integrity": "sha512-onrWn/72lQoEucDmJnr8uczSNTujT0vJnA/X5+3AkChVPowr8n1yvIKIabhWyMQeMvvmdpsvcyDqx3X1LEXCPg==", + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/@radix-ui/react-dismissable-layer/-/react-dismissable-layer-1.1.4.tgz", + "integrity": "sha512-XDUI0IVYVSwjMXxM6P4Dfti7AH+Y4oS/TB+sglZ/EXc7cqLwGAmp1NlMrcUjj7ks6R5WTZuWKv44FBbLpwU3sA==", "license": "MIT", "dependencies": { "@radix-ui/primitive": "1.1.1", @@ -1400,16 +1400,16 @@ } }, "node_modules/@radix-ui/react-dropdown-menu": { - "version": "2.1.4", - "resolved": "https://registry.npmjs.org/@radix-ui/react-dropdown-menu/-/react-dropdown-menu-2.1.4.tgz", - "integrity": "sha512-iXU1Ab5ecM+yEepGAWK8ZhMyKX4ubFdCNtol4sT9D0OVErG9PNElfx3TQhjw7n7BC5nFVz68/5//clWy+8TXzA==", + "version": "2.1.5", + "resolved": "https://registry.npmjs.org/@radix-ui/react-dropdown-menu/-/react-dropdown-menu-2.1.5.tgz", + "integrity": "sha512-50ZmEFL1kOuLalPKHrLWvPFMons2fGx9TqQCWlPwDVpbAnaUJ1g4XNcKqFNMQymYU0kKWR4MDDi+9vUQBGFgcQ==", "license": "MIT", "dependencies": { "@radix-ui/primitive": "1.1.1", "@radix-ui/react-compose-refs": "1.1.1", "@radix-ui/react-context": "1.1.1", "@radix-ui/react-id": "1.1.0", - "@radix-ui/react-menu": "2.1.4", + "@radix-ui/react-menu": "2.1.5", "@radix-ui/react-primitive": "2.0.1", "@radix-ui/react-use-controllable-state": "1.1.0" }, @@ -1510,9 +1510,9 @@ } }, "node_modules/@radix-ui/react-menu": { - "version": "2.1.4", - "resolved": "https://registry.npmjs.org/@radix-ui/react-menu/-/react-menu-2.1.4.tgz", - "integrity": "sha512-BnOgVoL6YYdHAG6DtXONaR29Eq4nvbi8rutrV/xlr3RQCMMb3yqP85Qiw/3NReozrSW+4dfLkK+rc1hb4wPU/A==", + "version": "2.1.5", + "resolved": "https://registry.npmjs.org/@radix-ui/react-menu/-/react-menu-2.1.5.tgz", + "integrity": "sha512-uH+3w5heoMJtqVCgYOtYVMECk1TOrkUn0OG0p5MqXC0W2ppcuVeESbou8PTHoqAjbdTEK19AGXBWcEtR5WpEQg==", "license": "MIT", "dependencies": { "@radix-ui/primitive": "1.1.1", @@ -1520,7 +1520,7 @@ "@radix-ui/react-compose-refs": "1.1.1", "@radix-ui/react-context": "1.1.1", "@radix-ui/react-direction": "1.1.0", - "@radix-ui/react-dismissable-layer": "1.1.3", + "@radix-ui/react-dismissable-layer": "1.1.4", "@radix-ui/react-focus-guards": "1.1.1", "@radix-ui/react-focus-scope": "1.1.1", "@radix-ui/react-id": "1.1.0", @@ -1531,8 +1531,8 @@ "@radix-ui/react-roving-focus": "1.1.1", "@radix-ui/react-slot": "1.1.1", "@radix-ui/react-use-callback-ref": "1.1.0", - "aria-hidden": "^1.1.1", - "react-remove-scroll": "^2.6.1" + "aria-hidden": "^1.2.4", + "react-remove-scroll": "^2.6.2" }, "peerDependencies": { "@types/react": "*", @@ -1550,9 +1550,9 @@ } }, "node_modules/@radix-ui/react-navigation-menu": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/@radix-ui/react-navigation-menu/-/react-navigation-menu-1.2.3.tgz", - "integrity": "sha512-IQWAsQ7dsLIYDrn0WqPU+cdM7MONTv9nqrLVYoie3BPiabSfUVDe6Fr+oEt0Cofsr9ONDcDe9xhmJbL1Uq1yKg==", + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/@radix-ui/react-navigation-menu/-/react-navigation-menu-1.2.4.tgz", + "integrity": "sha512-wUi01RrTDTOoGtjEPHsxlzPtVzVc3R/AZ5wfh0dyqMAqolhHAHvG5iQjBCTi2AjQqa77FWWbA3kE3RkD+bDMgQ==", "license": "MIT", "dependencies": { "@radix-ui/primitive": "1.1.1", @@ -1560,7 +1560,7 @@ "@radix-ui/react-compose-refs": "1.1.1", "@radix-ui/react-context": "1.1.1", "@radix-ui/react-direction": "1.1.0", - "@radix-ui/react-dismissable-layer": "1.1.3", + "@radix-ui/react-dismissable-layer": "1.1.4", "@radix-ui/react-id": "1.1.0", "@radix-ui/react-presence": "1.1.2", "@radix-ui/react-primitive": "2.0.1", @@ -1586,15 +1586,15 @@ } }, "node_modules/@radix-ui/react-popover": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/@radix-ui/react-popover/-/react-popover-1.1.4.tgz", - "integrity": "sha512-aUACAkXx8LaFymDma+HQVji7WhvEhpFJ7+qPz17Nf4lLZqtreGOFRiNQWQmhzp7kEWg9cOyyQJpdIMUMPc/CPw==", + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/@radix-ui/react-popover/-/react-popover-1.1.5.tgz", + "integrity": "sha512-YXkTAftOIW2Bt3qKH8vYr6n9gCkVrvyvfiTObVjoHVTHnNj26rmvO87IKa3VgtgCjb8FAQ6qOjNViwl+9iIzlg==", "license": "MIT", "dependencies": { "@radix-ui/primitive": "1.1.1", "@radix-ui/react-compose-refs": "1.1.1", "@radix-ui/react-context": "1.1.1", - "@radix-ui/react-dismissable-layer": "1.1.3", + "@radix-ui/react-dismissable-layer": "1.1.4", "@radix-ui/react-focus-guards": "1.1.1", "@radix-ui/react-focus-scope": "1.1.1", "@radix-ui/react-id": "1.1.0", @@ -1604,8 +1604,8 @@ "@radix-ui/react-primitive": "2.0.1", "@radix-ui/react-slot": "1.1.1", "@radix-ui/react-use-controllable-state": "1.1.0", - "aria-hidden": "^1.1.1", - "react-remove-scroll": "^2.6.1" + "aria-hidden": "^1.2.4", + "react-remove-scroll": "^2.6.2" }, "peerDependencies": { "@types/react": "*", @@ -1788,9 +1788,9 @@ } }, "node_modules/@radix-ui/react-select": { - "version": "2.1.4", - "resolved": "https://registry.npmjs.org/@radix-ui/react-select/-/react-select-2.1.4.tgz", - "integrity": "sha512-pOkb2u8KgO47j/h7AylCj7dJsm69BXcjkrvTqMptFqsE2i0p8lHkfgneXKjAgPzBMivnoMyt8o4KiV4wYzDdyQ==", + "version": "2.1.5", + "resolved": "https://registry.npmjs.org/@radix-ui/react-select/-/react-select-2.1.5.tgz", + "integrity": "sha512-eVV7N8jBXAXnyrc+PsOF89O9AfVgGnbLxUtBb0clJ8y8ENMWLARGMI/1/SBRLz7u4HqxLgN71BJ17eono3wcjA==", "license": "MIT", "dependencies": { "@radix-ui/number": "1.1.0", @@ -1799,7 +1799,7 @@ "@radix-ui/react-compose-refs": "1.1.1", "@radix-ui/react-context": "1.1.1", "@radix-ui/react-direction": "1.1.0", - "@radix-ui/react-dismissable-layer": "1.1.3", + "@radix-ui/react-dismissable-layer": "1.1.4", "@radix-ui/react-focus-guards": "1.1.1", "@radix-ui/react-focus-scope": "1.1.1", "@radix-ui/react-id": "1.1.0", @@ -1812,8 +1812,8 @@ "@radix-ui/react-use-layout-effect": "1.1.0", "@radix-ui/react-use-previous": "1.1.0", "@radix-ui/react-visually-hidden": "1.1.1", - "aria-hidden": "^1.1.1", - "react-remove-scroll": "^2.6.1" + "aria-hidden": "^1.2.4", + "react-remove-scroll": "^2.6.2" }, "peerDependencies": { "@types/react": "*", @@ -2057,9 +2057,9 @@ } }, "node_modules/@rollup/rollup-android-arm-eabi": { - "version": "4.31.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.31.0.tgz", - "integrity": "sha512-9NrR4033uCbUBRgvLcBrJofa2KY9DzxL2UKZ1/4xA/mnTNyhZCWBuD8X3tPm1n4KxcgaraOYgrFKSgwjASfmlA==", + "version": "4.32.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.32.1.tgz", + "integrity": "sha512-/pqA4DmqyCm8u5YIDzIdlLcEmuvxb0v8fZdFhVMszSpDTgbQKdw3/mB3eMUHIbubtJ6F9j+LtmyCnHTEqIHyzA==", "cpu": [ "arm" ], @@ -2071,9 +2071,9 @@ ] }, "node_modules/@rollup/rollup-android-arm64": { - "version": "4.31.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.31.0.tgz", - "integrity": "sha512-iBbODqT86YBFHajxxF8ebj2hwKm1k8PTBQSojSt3d1FFt1gN+xf4CowE47iN0vOSdnd+5ierMHBbu/rHc7nq5g==", + "version": "4.32.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.32.1.tgz", + "integrity": "sha512-If3PDskT77q7zgqVqYuj7WG3WC08G1kwXGVFi9Jr8nY6eHucREHkfpX79c0ACAjLj3QIWKPJR7w4i+f5EdLH5Q==", "cpu": [ "arm64" ], @@ -2085,9 +2085,9 @@ ] }, "node_modules/@rollup/rollup-darwin-arm64": { - "version": "4.31.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.31.0.tgz", - "integrity": "sha512-WHIZfXgVBX30SWuTMhlHPXTyN20AXrLH4TEeH/D0Bolvx9PjgZnn4H677PlSGvU6MKNsjCQJYczkpvBbrBnG6g==", + "version": "4.32.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.32.1.tgz", + "integrity": "sha512-zCpKHioQ9KgZToFp5Wvz6zaWbMzYQ2LJHQ+QixDKq52KKrF65ueu6Af4hLlLWHjX1Wf/0G5kSJM9PySW9IrvHA==", "cpu": [ "arm64" ], @@ -2099,9 +2099,9 @@ ] }, "node_modules/@rollup/rollup-darwin-x64": { - "version": "4.31.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.31.0.tgz", - "integrity": "sha512-hrWL7uQacTEF8gdrQAqcDy9xllQ0w0zuL1wk1HV8wKGSGbKPVjVUv/DEwT2+Asabf8Dh/As+IvfdU+H8hhzrQQ==", + "version": "4.32.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.32.1.tgz", + "integrity": "sha512-sFvF+t2+TyUo/ZQqUcifrJIgznx58oFZbdHS9TvHq3xhPVL9nOp+yZ6LKrO9GWTP+6DbFtoyLDbjTpR62Mbr3Q==", "cpu": [ "x64" ], @@ -2113,9 +2113,9 @@ ] }, "node_modules/@rollup/rollup-freebsd-arm64": { - "version": "4.31.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.31.0.tgz", - "integrity": "sha512-S2oCsZ4hJviG1QjPY1h6sVJLBI6ekBeAEssYKad1soRFv3SocsQCzX6cwnk6fID6UQQACTjeIMB+hyYrFacRew==", + "version": "4.32.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.32.1.tgz", + "integrity": "sha512-NbOa+7InvMWRcY9RG+B6kKIMD/FsnQPH0MWUvDlQB1iXnF/UcKSudCXZtv4lW+C276g3w5AxPbfry5rSYvyeYA==", "cpu": [ "arm64" ], @@ -2127,9 +2127,9 @@ ] }, "node_modules/@rollup/rollup-freebsd-x64": { - "version": "4.31.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.31.0.tgz", - "integrity": "sha512-pCANqpynRS4Jirn4IKZH4tnm2+2CqCNLKD7gAdEjzdLGbH1iO0zouHz4mxqg0uEMpO030ejJ0aA6e1PJo2xrPA==", + "version": "4.32.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.32.1.tgz", + "integrity": "sha512-JRBRmwvHPXR881j2xjry8HZ86wIPK2CcDw0EXchE1UgU0ubWp9nvlT7cZYKc6bkypBt745b4bglf3+xJ7hXWWw==", "cpu": [ "x64" ], @@ -2141,9 +2141,9 @@ ] }, "node_modules/@rollup/rollup-linux-arm-gnueabihf": { - "version": "4.31.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.31.0.tgz", - "integrity": "sha512-0O8ViX+QcBd3ZmGlcFTnYXZKGbFu09EhgD27tgTdGnkcYXLat4KIsBBQeKLR2xZDCXdIBAlWLkiXE1+rJpCxFw==", + "version": "4.32.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.32.1.tgz", + "integrity": "sha512-PKvszb+9o/vVdUzCCjL0sKHukEQV39tD3fepXxYrHE3sTKrRdCydI7uldRLbjLmDA3TFDmh418XH19NOsDRH8g==", "cpu": [ "arm" ], @@ -2155,9 +2155,9 @@ ] }, "node_modules/@rollup/rollup-linux-arm-musleabihf": { - "version": "4.31.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.31.0.tgz", - "integrity": "sha512-w5IzG0wTVv7B0/SwDnMYmbr2uERQp999q8FMkKG1I+j8hpPX2BYFjWe69xbhbP6J9h2gId/7ogesl9hwblFwwg==", + "version": "4.32.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.32.1.tgz", + "integrity": "sha512-9WHEMV6Y89eL606ReYowXuGF1Yb2vwfKWKdD1A5h+OYnPZSJvxbEjxTRKPgi7tkP2DSnW0YLab1ooy+i/FQp/Q==", "cpu": [ "arm" ], @@ -2169,9 +2169,9 @@ ] }, "node_modules/@rollup/rollup-linux-arm64-gnu": { - "version": "4.31.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.31.0.tgz", - "integrity": "sha512-JyFFshbN5xwy6fulZ8B/8qOqENRmDdEkcIMF0Zz+RsfamEW+Zabl5jAb0IozP/8UKnJ7g2FtZZPEUIAlUSX8cA==", + "version": "4.32.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.32.1.tgz", + "integrity": "sha512-tZWc9iEt5fGJ1CL2LRPw8OttkCBDs+D8D3oEM8mH8S1ICZCtFJhD7DZ3XMGM8kpqHvhGUTvNUYVDnmkj4BDXnw==", "cpu": [ "arm64" ], @@ -2183,9 +2183,9 @@ ] }, "node_modules/@rollup/rollup-linux-arm64-musl": { - "version": "4.31.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.31.0.tgz", - "integrity": "sha512-kpQXQ0UPFeMPmPYksiBL9WS/BDiQEjRGMfklVIsA0Sng347H8W2iexch+IEwaR7OVSKtr2ZFxggt11zVIlZ25g==", + "version": "4.32.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.32.1.tgz", + "integrity": "sha512-FTYc2YoTWUsBz5GTTgGkRYYJ5NGJIi/rCY4oK/I8aKowx1ToXeoVVbIE4LGAjsauvlhjfl0MYacxClLld1VrOw==", "cpu": [ "arm64" ], @@ -2197,9 +2197,9 @@ ] }, "node_modules/@rollup/rollup-linux-loongarch64-gnu": { - "version": "4.31.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loongarch64-gnu/-/rollup-linux-loongarch64-gnu-4.31.0.tgz", - "integrity": "sha512-pMlxLjt60iQTzt9iBb3jZphFIl55a70wexvo8p+vVFK+7ifTRookdoXX3bOsRdmfD+OKnMozKO6XM4zR0sHRrQ==", + "version": "4.32.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loongarch64-gnu/-/rollup-linux-loongarch64-gnu-4.32.1.tgz", + "integrity": "sha512-F51qLdOtpS6P1zJVRzYM0v6MrBNypyPEN1GfMiz0gPu9jN8ScGaEFIZQwteSsGKg799oR5EaP7+B2jHgL+d+Kw==", "cpu": [ "loong64" ], @@ -2211,9 +2211,9 @@ ] }, "node_modules/@rollup/rollup-linux-powerpc64le-gnu": { - "version": "4.31.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.31.0.tgz", - "integrity": "sha512-D7TXT7I/uKEuWiRkEFbed1UUYZwcJDU4vZQdPTcepK7ecPhzKOYk4Er2YR4uHKme4qDeIh6N3XrLfpuM7vzRWQ==", + "version": "4.32.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.32.1.tgz", + "integrity": "sha512-wO0WkfSppfX4YFm5KhdCCpnpGbtgQNj/tgvYzrVYFKDpven8w2N6Gg5nB6w+wAMO3AIfSTWeTjfVe+uZ23zAlg==", "cpu": [ "ppc64" ], @@ -2225,9 +2225,9 @@ ] }, "node_modules/@rollup/rollup-linux-riscv64-gnu": { - "version": "4.31.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.31.0.tgz", - "integrity": "sha512-wal2Tc8O5lMBtoePLBYRKj2CImUCJ4UNGJlLwspx7QApYny7K1cUYlzQ/4IGQBLmm+y0RS7dwc3TDO/pmcneTw==", + "version": "4.32.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.32.1.tgz", + "integrity": "sha512-iWswS9cIXfJO1MFYtI/4jjlrGb/V58oMu4dYJIKnR5UIwbkzR0PJ09O0PDZT0oJ3LYWXBSWahNf/Mjo6i1E5/g==", "cpu": [ "riscv64" ], @@ -2239,9 +2239,9 @@ ] }, "node_modules/@rollup/rollup-linux-s390x-gnu": { - "version": "4.31.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.31.0.tgz", - "integrity": "sha512-O1o5EUI0+RRMkK9wiTVpk2tyzXdXefHtRTIjBbmFREmNMy7pFeYXCFGbhKFwISA3UOExlo5GGUuuj3oMKdK6JQ==", + "version": "4.32.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.32.1.tgz", + "integrity": "sha512-RKt8NI9tebzmEthMnfVgG3i/XeECkMPS+ibVZjZ6mNekpbbUmkNWuIN2yHsb/mBPyZke4nlI4YqIdFPgKuoyQQ==", "cpu": [ "s390x" ], @@ -2253,9 +2253,9 @@ ] }, "node_modules/@rollup/rollup-linux-x64-gnu": { - "version": "4.31.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.31.0.tgz", - "integrity": "sha512-zSoHl356vKnNxwOWnLd60ixHNPRBglxpv2g7q0Cd3Pmr561gf0HiAcUBRL3S1vPqRC17Zo2CX/9cPkqTIiai1g==", + "version": "4.32.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.32.1.tgz", + "integrity": "sha512-WQFLZ9c42ECqEjwg/GHHsouij3pzLXkFdz0UxHa/0OM12LzvX7DzedlY0SIEly2v18YZLRhCRoHZDxbBSWoGYg==", "cpu": [ "x64" ], @@ -2267,9 +2267,9 @@ ] }, "node_modules/@rollup/rollup-linux-x64-musl": { - "version": "4.31.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.31.0.tgz", - "integrity": "sha512-ypB/HMtcSGhKUQNiFwqgdclWNRrAYDH8iMYH4etw/ZlGwiTVxBz2tDrGRrPlfZu6QjXwtd+C3Zib5pFqID97ZA==", + "version": "4.32.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.32.1.tgz", + "integrity": "sha512-BLoiyHDOWoS3uccNSADMza6V6vCNiphi94tQlVIL5de+r6r/CCQuNnerf+1g2mnk2b6edp5dk0nhdZ7aEjOBsA==", "cpu": [ "x64" ], @@ -2281,9 +2281,9 @@ ] }, "node_modules/@rollup/rollup-win32-arm64-msvc": { - "version": "4.31.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.31.0.tgz", - "integrity": "sha512-JuhN2xdI/m8Hr+aVO3vspO7OQfUFO6bKLIRTAy0U15vmWjnZDLrEgCZ2s6+scAYaQVpYSh9tZtRijApw9IXyMw==", + "version": "4.32.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.32.1.tgz", + "integrity": "sha512-w2l3UnlgYTNNU+Z6wOR8YdaioqfEnwPjIsJ66KxKAf0p+AuL2FHeTX6qvM+p/Ue3XPBVNyVSfCrfZiQh7vZHLQ==", "cpu": [ "arm64" ], @@ -2295,9 +2295,9 @@ ] }, "node_modules/@rollup/rollup-win32-ia32-msvc": { - "version": "4.31.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.31.0.tgz", - "integrity": "sha512-U1xZZXYkvdf5MIWmftU8wrM5PPXzyaY1nGCI4KI4BFfoZxHamsIe+BtnPLIvvPykvQWlVbqUXdLa4aJUuilwLQ==", + "version": "4.32.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.32.1.tgz", + "integrity": "sha512-Am9H+TGLomPGkBnaPWie4F3x+yQ2rr4Bk2jpwy+iV+Gel9jLAu/KqT8k3X4jxFPW6Zf8OMnehyutsd+eHoq1WQ==", "cpu": [ "ia32" ], @@ -2309,9 +2309,9 @@ ] }, "node_modules/@rollup/rollup-win32-x64-msvc": { - "version": "4.31.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.31.0.tgz", - "integrity": "sha512-ul8rnCsUumNln5YWwz0ted2ZHFhzhRRnkpBZ+YRuHoRAlUji9KChpOUOndY7uykrPEPXVbHLlsdo6v5yXo/TXw==", + "version": "4.32.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.32.1.tgz", + "integrity": "sha512-ar80GhdZb4DgmW3myIS9nRFYcpJRSME8iqWgzH2i44u+IdrzmiXVxeFnExQ5v4JYUSpg94bWjevMG8JHf1Da5Q==", "cpu": [ "x64" ], @@ -2356,15 +2356,15 @@ } }, "node_modules/@trivago/prettier-plugin-sort-imports": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/@trivago/prettier-plugin-sort-imports/-/prettier-plugin-sort-imports-5.2.1.tgz", - "integrity": "sha512-NDZndt0fmVThIx/8cExuJHLZagUVzfGCoVrwH9x6aZvwfBdkrDFTYujecek6X2WpG4uUFsVaPg5+aNQPSyjcmw==", + "version": "5.2.2", + "resolved": "https://registry.npmjs.org/@trivago/prettier-plugin-sort-imports/-/prettier-plugin-sort-imports-5.2.2.tgz", + "integrity": "sha512-fYDQA9e6yTNmA13TLVSA+WMQRc5Bn/c0EUBditUHNfMMxN7M82c38b1kEggVE3pLpZ0FwkwJkUEKMiOi52JXFA==", "license": "Apache-2.0", "dependencies": { - "@babel/generator": "^7.26.2", - "@babel/parser": "^7.26.2", - "@babel/traverse": "^7.25.9", - "@babel/types": "^7.26.0", + "@babel/generator": "^7.26.5", + "@babel/parser": "^7.26.7", + "@babel/traverse": "^7.26.7", + "@babel/types": "^7.26.7", "javascript-natural-sort": "^0.7.1", "lodash": "^4.17.21" }, @@ -2455,9 +2455,9 @@ "license": "MIT" }, "node_modules/@types/node": { - "version": "22.10.7", - "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.7.tgz", - "integrity": "sha512-V09KvXxFiutGp6B7XkpaDXlNadZxrzajcY50EuoLIpQ6WWYCSvf19lVIazzfIzQvhUN2HjX12spLojTnhuKlGg==", + "version": "22.12.0", + "resolved": "https://registry.npmjs.org/@types/node/-/node-22.12.0.tgz", + "integrity": "sha512-Fll2FZ1riMjNmlmJOdAyY5pUbkftXslB5DgEzlIuNaiWhXd00FhWxVC/r4yV/4wBb9JfImTu+jiSvXTkJ7F/gA==", "dev": true, "license": "MIT", "dependencies": { @@ -2500,17 +2500,17 @@ "license": "MIT" }, "node_modules/@typescript-eslint/eslint-plugin": { - "version": "8.21.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.21.0.tgz", - "integrity": "sha512-eTH+UOR4I7WbdQnG4Z48ebIA6Bgi7WO8HvFEneeYBxG8qCOYgTOFPSg6ek9ITIDvGjDQzWHcoWHCDO2biByNzA==", + "version": "8.22.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.22.0.tgz", + "integrity": "sha512-4Uta6REnz/xEJMvwf72wdUnC3rr4jAQf5jnTkeRQ9b6soxLxhDEbS/pfMPoJLDfFPNVRdryqWUIV/2GZzDJFZw==", "dev": true, "license": "MIT", "dependencies": { "@eslint-community/regexpp": "^4.10.0", - "@typescript-eslint/scope-manager": "8.21.0", - "@typescript-eslint/type-utils": "8.21.0", - "@typescript-eslint/utils": "8.21.0", - "@typescript-eslint/visitor-keys": "8.21.0", + "@typescript-eslint/scope-manager": "8.22.0", + "@typescript-eslint/type-utils": "8.22.0", + "@typescript-eslint/utils": "8.22.0", + "@typescript-eslint/visitor-keys": "8.22.0", "graphemer": "^1.4.0", "ignore": "^5.3.1", "natural-compare": "^1.4.0", @@ -2530,16 +2530,16 @@ } }, "node_modules/@typescript-eslint/parser": { - "version": "8.21.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.21.0.tgz", - "integrity": "sha512-Wy+/sdEH9kI3w9civgACwabHbKl+qIOu0uFZ9IMKzX3Jpv9og0ZBJrZExGrPpFAY7rWsXuxs5e7CPPP17A4eYA==", + "version": "8.22.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.22.0.tgz", + "integrity": "sha512-MqtmbdNEdoNxTPzpWiWnqNac54h8JDAmkWtJExBVVnSrSmi9z+sZUt0LfKqk9rjqmKOIeRhO4fHHJ1nQIjduIQ==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/scope-manager": "8.21.0", - "@typescript-eslint/types": "8.21.0", - "@typescript-eslint/typescript-estree": "8.21.0", - "@typescript-eslint/visitor-keys": "8.21.0", + "@typescript-eslint/scope-manager": "8.22.0", + "@typescript-eslint/types": "8.22.0", + "@typescript-eslint/typescript-estree": "8.22.0", + "@typescript-eslint/visitor-keys": "8.22.0", "debug": "^4.3.4" }, "engines": { @@ -2555,14 +2555,14 @@ } }, "node_modules/@typescript-eslint/scope-manager": { - "version": "8.21.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.21.0.tgz", - "integrity": "sha512-G3IBKz0/0IPfdeGRMbp+4rbjfSSdnGkXsM/pFZA8zM9t9klXDnB/YnKOBQ0GoPmoROa4bCq2NeHgJa5ydsQ4mA==", + "version": "8.22.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.22.0.tgz", + "integrity": "sha512-/lwVV0UYgkj7wPSw0o8URy6YI64QmcOdwHuGuxWIYznO6d45ER0wXUbksr9pYdViAofpUCNJx/tAzNukgvaaiQ==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/types": "8.21.0", - "@typescript-eslint/visitor-keys": "8.21.0" + "@typescript-eslint/types": "8.22.0", + "@typescript-eslint/visitor-keys": "8.22.0" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -2573,14 +2573,14 @@ } }, "node_modules/@typescript-eslint/type-utils": { - "version": "8.21.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.21.0.tgz", - "integrity": "sha512-95OsL6J2BtzoBxHicoXHxgk3z+9P3BEcQTpBKriqiYzLKnM2DeSqs+sndMKdamU8FosiadQFT3D+BSL9EKnAJQ==", + "version": "8.22.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.22.0.tgz", + "integrity": "sha512-NzE3aB62fDEaGjaAYZE4LH7I1MUwHooQ98Byq0G0y3kkibPJQIXVUspzlFOmOfHhiDLwKzMlWxaNv+/qcZurJA==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/typescript-estree": "8.21.0", - "@typescript-eslint/utils": "8.21.0", + "@typescript-eslint/typescript-estree": "8.22.0", + "@typescript-eslint/utils": "8.22.0", "debug": "^4.3.4", "ts-api-utils": "^2.0.0" }, @@ -2597,9 +2597,9 @@ } }, "node_modules/@typescript-eslint/types": { - "version": "8.21.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.21.0.tgz", - "integrity": "sha512-PAL6LUuQwotLW2a8VsySDBwYMm129vFm4tMVlylzdoTybTHaAi0oBp7Ac6LhSrHHOdLM3efH+nAR6hAWoMF89A==", + "version": "8.22.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.22.0.tgz", + "integrity": "sha512-0S4M4baNzp612zwpD4YOieP3VowOARgK2EkN/GBn95hpyF8E2fbMT55sRHWBq+Huaqk3b3XK+rxxlM8sPgGM6A==", "dev": true, "license": "MIT", "engines": { @@ -2611,14 +2611,14 @@ } }, "node_modules/@typescript-eslint/typescript-estree": { - "version": "8.21.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.21.0.tgz", - "integrity": "sha512-x+aeKh/AjAArSauz0GiQZsjT8ciadNMHdkUSwBB9Z6PrKc/4knM4g3UfHml6oDJmKC88a6//cdxnO/+P2LkMcg==", + "version": "8.22.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.22.0.tgz", + "integrity": "sha512-SJX99NAS2ugGOzpyhMza/tX+zDwjvwAtQFLsBo3GQxiGcvaKlqGBkmZ+Y1IdiSi9h4Q0Lr5ey+Cp9CGWNY/F/w==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/types": "8.21.0", - "@typescript-eslint/visitor-keys": "8.21.0", + "@typescript-eslint/types": "8.22.0", + "@typescript-eslint/visitor-keys": "8.22.0", "debug": "^4.3.4", "fast-glob": "^3.3.2", "is-glob": "^4.0.3", @@ -2664,9 +2664,9 @@ } }, "node_modules/@typescript-eslint/typescript-estree/node_modules/semver": { - "version": "7.6.3", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz", - "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==", + "version": "7.7.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.0.tgz", + "integrity": "sha512-DrfFnPzblFmNrIZzg5RzHegbiRWg7KMR7btwi2yjHwx06zsUbO5g613sVwEV7FTwmzJu+Io0lJe2GJ3LxqpvBQ==", "dev": true, "license": "ISC", "bin": { @@ -2677,16 +2677,16 @@ } }, "node_modules/@typescript-eslint/utils": { - "version": "8.21.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.21.0.tgz", - "integrity": "sha512-xcXBfcq0Kaxgj7dwejMbFyq7IOHgpNMtVuDveK7w3ZGwG9owKzhALVwKpTF2yrZmEwl9SWdetf3fxNzJQaVuxw==", + "version": "8.22.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.22.0.tgz", + "integrity": "sha512-T8oc1MbF8L+Bk2msAvCUzjxVB2Z2f+vXYfcucE2wOmYs7ZUwco5Ep0fYZw8quNwOiw9K8GYVL+Kgc2pETNTLOg==", "dev": true, "license": "MIT", "dependencies": { "@eslint-community/eslint-utils": "^4.4.0", - "@typescript-eslint/scope-manager": "8.21.0", - "@typescript-eslint/types": "8.21.0", - "@typescript-eslint/typescript-estree": "8.21.0" + "@typescript-eslint/scope-manager": "8.22.0", + "@typescript-eslint/types": "8.22.0", + "@typescript-eslint/typescript-estree": "8.22.0" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -2701,13 +2701,13 @@ } }, "node_modules/@typescript-eslint/visitor-keys": { - "version": "8.21.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.21.0.tgz", - "integrity": "sha512-BkLMNpdV6prozk8LlyK/SOoWLmUFi+ZD+pcqti9ILCbVvHGk1ui1g4jJOc2WDLaeExz2qWwojxlPce5PljcT3w==", + "version": "8.22.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.22.0.tgz", + "integrity": "sha512-AWpYAXnUgvLNabGTy3uBylkgZoosva/miNd1I8Bz3SjotmQPbVqhO4Cczo8AsZ44XVErEBPr/CRSgaj8sG7g0w==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/types": "8.21.0", + "@typescript-eslint/types": "8.22.0", "eslint-visitor-keys": "^4.2.0" }, "engines": { @@ -3012,9 +3012,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001695", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001695.tgz", - "integrity": "sha512-vHyLade6wTgI2u1ec3WQBxv+2BrTERV28UXQu9LO6lZ9pYeMk34vjXFLOxo1A4UBA8XTL4njRQZdno/yYaSmWw==", + "version": "1.0.30001696", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001696.tgz", + "integrity": "sha512-pDCPkvzfa39ehJtJ+OwGT/2yvT2SbjfHhiIW2LWOAcMQ7BzwxT/XuyUp4OTOd0XFWA6BKw0JalnBHgSi5DGJBQ==", "dev": true, "funding": [ { @@ -3378,9 +3378,9 @@ "license": "MIT" }, "node_modules/electron-to-chromium": { - "version": "1.5.84", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.84.tgz", - "integrity": "sha512-I+DQ8xgafao9Ha6y0qjHHvpZ9OfyA1qKlkHkjywxzniORU2awxyz7f/iVJcULmrF2yrM3nHQf+iDjJtbbexd/g==", + "version": "1.5.90", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.90.tgz", + "integrity": "sha512-C3PN4aydfW91Natdyd449Kw+BzhLmof6tzy5W1pFC5SpQxVXT+oyiyOG9AgYYSN9OdA/ik3YkCrpwqI8ug5Tug==", "dev": true, "license": "ISC" }, @@ -3480,9 +3480,9 @@ } }, "node_modules/eslint": { - "version": "9.18.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.18.0.tgz", - "integrity": "sha512-+waTfRWQlSbpt3KWE+CjrPPYnbq9kfZIYUqapc0uBXyjTp8aYXZDsUH16m39Ryq3NjAVP4tjuF7KaukeqoCoaA==", + "version": "9.19.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.19.0.tgz", + "integrity": "sha512-ug92j0LepKlbbEv6hD911THhoRHmbdXt2gX+VDABAW/Ir7D3nqKdv5Pf5vtlyY6HQMTEP2skXY43ueqTCWssEA==", "dev": true, "license": "MIT", "dependencies": { @@ -3491,7 +3491,7 @@ "@eslint/config-array": "^0.19.0", "@eslint/core": "^0.10.0", "@eslint/eslintrc": "^3.2.0", - "@eslint/js": "9.18.0", + "@eslint/js": "9.19.0", "@eslint/plugin-kit": "^0.2.5", "@humanfs/node": "^0.16.6", "@humanwhocodes/module-importer": "^1.0.1", @@ -4021,9 +4021,9 @@ "license": "MIT" }, "node_modules/i18next": { - "version": "24.2.1", - "resolved": "https://registry.npmjs.org/i18next/-/i18next-24.2.1.tgz", - "integrity": "sha512-Q2wC1TjWcSikn1VAJg13UGIjc+okpFxQTxjVAymOnSA3RpttBQNMPf2ovcgoFVsV4QNxTfNZMAxorXZXsk4fBA==", + "version": "24.2.2", + "resolved": "https://registry.npmjs.org/i18next/-/i18next-24.2.2.tgz", + "integrity": "sha512-NE6i86lBCKRYZa5TaUDkU5S4HFgLIEJRLr3Whf2psgaxBleQ2LC1YW1Vc+SCgkAW7VEzndT6al6+CzegSUHcTQ==", "funding": [ { "type": "individual", @@ -5047,9 +5047,9 @@ } }, "node_modules/prettier-plugin-tailwindcss": { - "version": "0.6.10", - "resolved": "https://registry.npmjs.org/prettier-plugin-tailwindcss/-/prettier-plugin-tailwindcss-0.6.10.tgz", - "integrity": "sha512-ndj2WLDaMzACnr1gAYZiZZLs5ZdOeBYgOsbBmHj3nvW/6q8h8PymsXiEnKvj/9qgCCAoHyvLOisoQdIcsDvIgw==", + "version": "0.6.11", + "resolved": "https://registry.npmjs.org/prettier-plugin-tailwindcss/-/prettier-plugin-tailwindcss-0.6.11.tgz", + "integrity": "sha512-YxaYSIvZPAqhrrEpRtonnrXdghZg1irNg4qrjboCXrpybLWVs55cW2N3juhspVJiO0JBvYJT8SYsJpc8OQSnsA==", "license": "MIT", "engines": { "node": ">=14.21.3" @@ -5228,16 +5228,16 @@ } }, "node_modules/react-remove-scroll": { - "version": "2.6.2", - "resolved": "https://registry.npmjs.org/react-remove-scroll/-/react-remove-scroll-2.6.2.tgz", - "integrity": "sha512-KmONPx5fnlXYJQqC62Q+lwIeAk64ws/cUw6omIumRzMRPqgnYqhSSti99nbj0Ry13bv7dF+BKn7NB+OqkdZGTw==", + "version": "2.6.3", + "resolved": "https://registry.npmjs.org/react-remove-scroll/-/react-remove-scroll-2.6.3.tgz", + "integrity": "sha512-pnAi91oOk8g8ABQKGF5/M9qxmmOPxaAnopyTHYfqYEwJhyFrbbBtHuSgtKEoH0jpcxx5o3hXqH1mNd9/Oi+8iQ==", "license": "MIT", "dependencies": { "react-remove-scroll-bar": "^2.3.7", - "react-style-singleton": "^2.2.1", + "react-style-singleton": "^2.2.3", "tslib": "^2.1.0", "use-callback-ref": "^1.3.3", - "use-sidecar": "^1.1.2" + "use-sidecar": "^1.1.3" }, "engines": { "node": ">=10" @@ -5429,9 +5429,9 @@ } }, "node_modules/rollup": { - "version": "4.31.0", - "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.31.0.tgz", - "integrity": "sha512-9cCE8P4rZLx9+PjoyqHLs31V9a9Vpvfo4qNcs6JCiGWYhw2gijSetFbH6SSy1whnkgcefnUwr8sad7tgqsGvnw==", + "version": "4.32.1", + "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.32.1.tgz", + "integrity": "sha512-z+aeEsOeEa3mEbS1Tjl6sAZ8NE3+AalQz1RJGj81M+fizusbdDMoEJwdJNHfaB40Scr4qNu+welOfes7maKonA==", "dev": true, "license": "MIT", "dependencies": { @@ -5445,25 +5445,25 @@ "npm": ">=8.0.0" }, "optionalDependencies": { - "@rollup/rollup-android-arm-eabi": "4.31.0", - "@rollup/rollup-android-arm64": "4.31.0", - "@rollup/rollup-darwin-arm64": "4.31.0", - "@rollup/rollup-darwin-x64": "4.31.0", - "@rollup/rollup-freebsd-arm64": "4.31.0", - "@rollup/rollup-freebsd-x64": "4.31.0", - "@rollup/rollup-linux-arm-gnueabihf": "4.31.0", - "@rollup/rollup-linux-arm-musleabihf": "4.31.0", - "@rollup/rollup-linux-arm64-gnu": "4.31.0", - "@rollup/rollup-linux-arm64-musl": "4.31.0", - "@rollup/rollup-linux-loongarch64-gnu": "4.31.0", - "@rollup/rollup-linux-powerpc64le-gnu": "4.31.0", - "@rollup/rollup-linux-riscv64-gnu": "4.31.0", - "@rollup/rollup-linux-s390x-gnu": "4.31.0", - "@rollup/rollup-linux-x64-gnu": "4.31.0", - "@rollup/rollup-linux-x64-musl": "4.31.0", - "@rollup/rollup-win32-arm64-msvc": "4.31.0", - "@rollup/rollup-win32-ia32-msvc": "4.31.0", - "@rollup/rollup-win32-x64-msvc": "4.31.0", + "@rollup/rollup-android-arm-eabi": "4.32.1", + "@rollup/rollup-android-arm64": "4.32.1", + "@rollup/rollup-darwin-arm64": "4.32.1", + "@rollup/rollup-darwin-x64": "4.32.1", + "@rollup/rollup-freebsd-arm64": "4.32.1", + "@rollup/rollup-freebsd-x64": "4.32.1", + "@rollup/rollup-linux-arm-gnueabihf": "4.32.1", + "@rollup/rollup-linux-arm-musleabihf": "4.32.1", + "@rollup/rollup-linux-arm64-gnu": "4.32.1", + "@rollup/rollup-linux-arm64-musl": "4.32.1", + "@rollup/rollup-linux-loongarch64-gnu": "4.32.1", + "@rollup/rollup-linux-powerpc64le-gnu": "4.32.1", + "@rollup/rollup-linux-riscv64-gnu": "4.32.1", + "@rollup/rollup-linux-s390x-gnu": "4.32.1", + "@rollup/rollup-linux-x64-gnu": "4.32.1", + "@rollup/rollup-linux-x64-musl": "4.32.1", + "@rollup/rollup-win32-arm64-msvc": "4.32.1", + "@rollup/rollup-win32-ia32-msvc": "4.32.1", + "@rollup/rollup-win32-x64-msvc": "4.32.1", "fsevents": "~2.3.2" } }, @@ -5603,9 +5603,9 @@ } }, "node_modules/sonner": { - "version": "1.7.2", - "resolved": "https://registry.npmjs.org/sonner/-/sonner-1.7.2.tgz", - "integrity": "sha512-zMbseqjrOzQD1a93lxahm+qMGxWovdMxBlkTbbnZdNqVLt4j+amF9PQxUCL32WfztOFt9t9ADYkejAL3jF9iNA==", + "version": "1.7.3", + "resolved": "https://registry.npmjs.org/sonner/-/sonner-1.7.3.tgz", + "integrity": "sha512-KXLWQfyR6AHpYZuQk8eO8fCbZSJY3JOpgsu/tbGc++jgPjj8JsR1ZpO8vFhqR/OxvWMQCSAmnSShY0gr4FPqHg==", "license": "MIT", "peerDependencies": { "react": "^18.0.0 || ^19.0.0 || ^19.0.0-rc", @@ -6038,15 +6038,15 @@ } }, "node_modules/typescript-eslint": { - "version": "8.21.0", - "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.21.0.tgz", - "integrity": "sha512-txEKYY4XMKwPXxNkN8+AxAdX6iIJAPiJbHE/FpQccs/sxw8Lf26kqwC3cn0xkHlW8kEbLhkhCsjWuMveaY9Rxw==", + "version": "8.22.0", + "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.22.0.tgz", + "integrity": "sha512-Y2rj210FW1Wb6TWXzQc5+P+EWI9/zdS57hLEc0gnyuvdzWo8+Y8brKlbj0muejonhMI/xAZCnZZwjbIfv1CkOw==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/eslint-plugin": "8.21.0", - "@typescript-eslint/parser": "8.21.0", - "@typescript-eslint/utils": "8.21.0" + "@typescript-eslint/eslint-plugin": "8.22.0", + "@typescript-eslint/parser": "8.22.0", + "@typescript-eslint/utils": "8.22.0" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" diff --git a/pkgs/by-name/ne/nezha-theme-admin/package.nix b/pkgs/by-name/ne/nezha-theme-admin/package.nix index 61277ddbdfb51..90084f122a177 100644 --- a/pkgs/by-name/ne/nezha-theme-admin/package.nix +++ b/pkgs/by-name/ne/nezha-theme-admin/package.nix @@ -7,13 +7,13 @@ buildNpmPackage rec { pname = "nezha-theme-admin"; - version = "1.6.2"; + version = "1.6.4"; src = fetchFromGitHub { owner = "nezhahq"; repo = "admin-frontend"; tag = "v${version}"; - hash = "sha256-AM3ZHI6oGsvkGg7YmlzLlNlOAAAZYztsRZ9qT/wR2KY="; + hash = "sha256-6dWf2vC7zCVx77OdCUd9iYAACZcvkhfQdVSKQp3DGnE="; }; # TODO: Switch to the bun build function once available in nixpkgs @@ -21,7 +21,7 @@ buildNpmPackage rec { cp ${./package-lock.json} package-lock.json ''; - npmDepsHash = "sha256-qegPPUDlcStdGWMggn9oHSTieWLoNoIJVK0sCx9zMNA="; + npmDepsHash = "sha256-8SvD6dycFWk4+PYNNnsbUb3e3H+CTRMwMeWLfx7xppc="; npmPackFlags = [ "--ignore-scripts" ]; diff --git a/pkgs/by-name/ne/nezha-theme-nazhua/package.nix b/pkgs/by-name/ne/nezha-theme-nazhua/package.nix index 93341c30479df..ed654b29d9546 100644 --- a/pkgs/by-name/ne/nezha-theme-nazhua/package.nix +++ b/pkgs/by-name/ne/nezha-theme-nazhua/package.nix @@ -12,18 +12,18 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "nezha-theme-nazhua"; - version = "0.5.1"; + version = "0.5.6"; src = fetchFromGitHub { owner = "hi2shark"; repo = "nazhua"; tag = "v${finalAttrs.version}"; - hash = "sha256-5XEdfUCwQSa+PWu4SHJCg3rCtblyD5x41lKe0SvFrU8="; + hash = "sha256-HqNiXkj3GLw5MlQu2fREwUYpT35txopli9SZcFCM90w="; }; yarnOfflineCache = fetchYarnDeps { yarnLock = finalAttrs.src + "/yarn.lock"; - hash = "sha256-Wy4xtLjDNkBLeESJCbfq9GhT0mSTAfGBN0A3oHX5BuE="; + hash = "sha256-/CQsG3iQdPyKHdApeMzq4w90NsMBdLXUP2lya8vtK5Q="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ni/nimlangserver/package.nix b/pkgs/by-name/ni/nimlangserver/package.nix index 6ccff3cce5059..870ad9692f928 100644 --- a/pkgs/by-name/ni/nimlangserver/package.nix +++ b/pkgs/by-name/ni/nimlangserver/package.nix @@ -6,7 +6,7 @@ buildNimPackage ( final: prev: rec { pname = "nimlangserver"; - version = "1.8.0"; + version = "1.8.1"; # nix build ".#nimlangserver.src" # nix run "github:daylinmorgan/nnl" -- result/nimble.lock -o:pkgs/by-name/ni/nimlangserver/lock.json --prefetch-git:bearssl,zlib @@ -16,7 +16,7 @@ buildNimPackage ( owner = "nim-lang"; repo = "langserver"; rev = "v${version}"; - hash = "sha256-JyBjHAP/sxQfQ1XvyeZyHsu0Er5D7ePDGyJK7Do5kyk="; + hash = "sha256-j5YnTGPtt0WhRvNfpgO9tjAqZJA5Kt1FE1Mjqn0/DNY="; }; doCheck = false; diff --git a/pkgs/by-name/ni/nixpkgs-hammering/package.nix b/pkgs/by-name/ni/nixpkgs-hammering/package.nix index 575d213de0c9e..4a689578ca224 100644 --- a/pkgs/by-name/ni/nixpkgs-hammering/package.nix +++ b/pkgs/by-name/ni/nixpkgs-hammering/package.nix @@ -10,13 +10,13 @@ }: let - version = "unstable-2024-03-25"; + version = "0-unstable-2024-12-22"; src = fetchFromGitHub { owner = "jtojnar"; repo = "nixpkgs-hammering"; - rev = "6851ecea8c6da45870b7c06d6495cba3fb2d7c7c"; - hash = "sha256-kr3zMr7aWt4W/+Jcol5Ctiq0KjXSxViPhGtyqvX9dqE="; + rev = "56e8d636b3e7188dae2832fc405db2e388be634b"; + hash = "sha256-hr+BHAmWT/FCLI5zNEHgtKdBbIYgmAydrErRu9RfuuM="; }; meta = with lib; { diff --git a/pkgs/by-name/no/nomino/package.nix b/pkgs/by-name/no/nomino/package.nix index 6ef8f5bb78695..9b6d523b84d02 100644 --- a/pkgs/by-name/no/nomino/package.nix +++ b/pkgs/by-name/no/nomino/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "nomino"; - version = "1.5.0"; + version = "1.6.0"; src = fetchFromGitHub { owner = "yaa110"; repo = pname; rev = version; - hash = "sha256-/5rKlPRo3+BsqPgHJ0M/JDGwA0c4rAiOd7gGClPfxMg="; + hash = "sha256-BWfgXg3DYdhSzO3qtkwDZ+BZGcIqm82G3ZryaetLYgM="; }; - cargoHash = "sha256-LaLMa66paTW9Wubus3phc7IgDW54sJFSf4VHnJHGq3o="; + cargoHash = "sha256-xmm9vOcHsRXw5zAptuiSF7xnA81HsHiG8v+nN/T77Yk="; meta = with lib; { description = "Batch rename utility for developers"; diff --git a/pkgs/by-name/no/noseyparker/package.nix b/pkgs/by-name/no/noseyparker/package.nix index adb032933e262..47acfa55be0b1 100644 --- a/pkgs/by-name/no/noseyparker/package.nix +++ b/pkgs/by-name/no/noseyparker/package.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "noseyparker"; - version = "0.22.0"; + version = "0.23.0"; src = fetchFromGitHub { owner = "praetorian-inc"; repo = "noseyparker"; rev = "v${version}"; - hash = "sha256-HRuqeKV0Y8kf/KBSHIK25Xrpr7tJODQQa4BoqxiulzU="; + hash = "sha256-n+lX49BwipIPQ2ZeQT+DFO2ILHHAU2VsOnhASOGX5RE="; }; - cargoHash = "sha256-/EeKoR4IHNwQj8Ohs46U2BYJWkutJ1XWhW6xsR+k7Yg="; + cargoHash = "sha256-/W3RBssypxampQv9EgH6krJ2vxOX8cbKeJOmRmxFL7c="; nativeCheckInputs = [ git diff --git a/pkgs/by-name/no/notion-app/info.json b/pkgs/by-name/no/notion-app/info.json index 20ea51f293f22..9b8664d7a88c0 100644 --- a/pkgs/by-name/no/notion-app/info.json +++ b/pkgs/by-name/no/notion-app/info.json @@ -1,12 +1,12 @@ { "x86_64-darwin": { - "version": "4.2.0", - "url": "https://desktop-release.notion-static.com/Notion-4.2.0.zip", - "hash": "sha512-FLptPNEtS9fTevSeGC00hDtpgSks+8JtEKRTtWlYPtI0vpA1KqixBdv2OaNSK1W7Krlsl25RpTOl8cJdQxcv4Q==" + "version": "4.3.0", + "url": "https://desktop-release.notion-static.com/Notion-4.3.0.zip", + "hash": "sha512-shh85dNtzDrUGXbjODdtxpDlgQlF76a/PWDiuLrbx/GUn5xTVZkCCfTGEkSBInfjzJ0Z4iNJ/WlAXPvTGFJLiw==" }, "aarch64-darwin": { - "version": "4.2.0", - "url": "https://desktop-release.notion-static.com/Notion-arm64-4.2.0.zip", - "hash": "sha512-cxfO3Bm7ZzAQMi0Pdwd3nvQlRPjn4w7j0ojYUCcn660YsBtoVkpNhiuqg9pbWzY0Umh+/8Zig9CGXKjjP94Iww==" + "version": "4.3.0", + "url": "https://desktop-release.notion-static.com/Notion-arm64-4.3.0.zip", + "hash": "sha512-LcHKB1nVc2VnfrtLKlkBfxlFvTTIlACIazNOMr4ZjHj8N7Trg1oai5wdH/sA+mKFhHiWH5fzHk8QIuCLwjMK4A==" } } diff --git a/pkgs/by-name/no/novelwriter/package.nix b/pkgs/by-name/no/novelwriter/package.nix index 1c798122be50e..dd07731612167 100644 --- a/pkgs/by-name/no/novelwriter/package.nix +++ b/pkgs/by-name/no/novelwriter/package.nix @@ -7,7 +7,7 @@ nix-update-script, }: let - version = "2.5.3"; + version = "2.6"; in python3.pkgs.buildPythonApplication { pname = "novelwriter"; @@ -18,7 +18,7 @@ python3.pkgs.buildPythonApplication { owner = "vkbo"; repo = "novelWriter"; rev = "v${version}"; - hash = "sha256-OrsDL5zpMDV2spxC0jtpuhaSWBIS6XBEWZuVxHAS/QM="; + hash = "sha256-eQ0az+4SEpf07rlCHGvK8Fp8ECimpTblWNlxwANNisE="; }; nativeBuildInputs = [ qt5.wrapQtAppsHook ]; diff --git a/pkgs/by-name/ns/nsxiv/package.nix b/pkgs/by-name/ns/nsxiv/package.nix index 692f9f625ef2d..f19b9e12a9fc3 100644 --- a/pkgs/by-name/ns/nsxiv/package.nix +++ b/pkgs/by-name/ns/nsxiv/package.nix @@ -13,14 +13,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "nsxiv"; - version = "32"; + version = "33"; src = fetchFromGitea { domain = "codeberg.org"; owner = "nsxiv"; repo = "nsxiv"; rev = "v${finalAttrs.version}"; - hash = "sha256-UWaet7hVtgfuWTiNY4VcsMWTfS6L9r5w1fb/0dWz8SI="; + hash = "sha256-H1s+pLpHTmoDssdudtAq6Ru0jwZZ55/qamEVgtHTGfk="; }; outputs = [ diff --git a/pkgs/by-name/oa/oauth2-proxy/package.nix b/pkgs/by-name/oa/oauth2-proxy/package.nix index 11422054cf03a..5b0aaaff4a183 100644 --- a/pkgs/by-name/oa/oauth2-proxy/package.nix +++ b/pkgs/by-name/oa/oauth2-proxy/package.nix @@ -6,12 +6,12 @@ buildGoModule rec { pname = "oauth2-proxy"; - version = "7.8.0"; + version = "7.8.1"; src = fetchFromGitHub { repo = pname; owner = "oauth2-proxy"; - sha256 = "sha256-fNnneMsqwxO0CMJAr1pUSCMDt0/fS7tS6KLs8ExKMTE="; + sha256 = "sha256-NU9/BLyTEWGqt9SJNbvF4kSG/op8TEpYV2A24/V29PM="; rev = "v${version}"; }; diff --git a/pkgs/by-name/oa/oauth2c/package.nix b/pkgs/by-name/oa/oauth2c/package.nix index ce05dd9faa97e..cb75d2fc90602 100644 --- a/pkgs/by-name/oa/oauth2c/package.nix +++ b/pkgs/by-name/oa/oauth2c/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "oauth2c"; - version = "1.17.1"; + version = "1.17.2"; src = fetchFromGitHub { owner = "cloudentity"; repo = pname; rev = "v${version}"; - hash = "sha256-rrQSQDrdaU3HBTZL0vwHYK07XzcYwUZQp9aG6lwuDsc="; + hash = "sha256-axCzPCYPn6T8AGqE92Yf/aVJ78Wl004Ts4YebSWYa6U="; }; vendorHash = "sha256-ZQFIETfiNKyeZuskwNfoTXBy3MSWmG0tDztz0Mm7xJY="; diff --git a/pkgs/by-name/ob/oboete/package.nix b/pkgs/by-name/ob/oboete/package.nix index c7de788d4c027..037d72024ce5a 100644 --- a/pkgs/by-name/ob/oboete/package.nix +++ b/pkgs/by-name/ob/oboete/package.nix @@ -13,17 +13,17 @@ rustPlatform.buildRustPackage rec { pname = "oboete"; - version = "0.1.7"; + version = "0.1.8"; src = fetchFromGitHub { owner = "mariinkys"; repo = "oboete"; tag = version; - hash = "sha256-W5dd8UNjG2w0N1EngDPK7Q83C2TF9UfW0GGvPaW6nls="; + hash = "sha256-tQn3ihGHkR91zNtBIiyyIEEo21Q0ZSKLEaV/3UI9pwU="; }; useFetchCargoVendor = true; - cargoHash = "sha256-UZUqPITtpHeNrsi6Nao+dfK3ACVJmZIc47aqSbwTemw="; + cargoHash = "sha256-91JMgdpMXL0a7oZXAG5xgiulOIyVXQ5x09wN3XDeSy0="; nativeBuildInputs = [ pkg-config @@ -54,7 +54,7 @@ rustPlatform.buildRustPackage rec { meta = { description = "Simple flashcards application for the COSMIC™ desktop written in Rust"; homepage = "https://github.com/mariinkys/oboete"; - changelog = "https://github.com/mariinkys/oboete/releases/tag/${src.tag}"; + changelog = "https://github.com/mariinkys/oboete/releases/tag/${version}"; license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ GaetanLepage ]; platforms = lib.platforms.linux; diff --git a/pkgs/by-name/oc/octoprint/plugins.nix b/pkgs/by-name/oc/octoprint/plugins.nix index 2dd462d4a4870..feae836d56bb9 100644 --- a/pkgs/by-name/oc/octoprint/plugins.nix +++ b/pkgs/by-name/oc/octoprint/plugins.nix @@ -11,7 +11,7 @@ let buildPlugin = args: self.buildPythonPackage (args // { pname = "octoprint-plugin-${args.pname}"; inherit (args) version; - propagatedBuildInputs = (args.propagatedBuildInputs or [ ]) ++ [ super.octoprint ]; + propagatedBuildInputs = (args.propagatedBuildInputs or [ ]) ++ [ self.octoprint ]; # none of the following have tests doCheck = false; }); diff --git a/pkgs/by-name/oh/oh-my-fish/package.nix b/pkgs/by-name/oh/oh-my-fish/package.nix index b91a89c0beb18..b93eb00d7862a 100644 --- a/pkgs/by-name/oh/oh-my-fish/package.nix +++ b/pkgs/by-name/oh/oh-my-fish/package.nix @@ -4,7 +4,7 @@ fetchFromGitHub, fish, runtimeShell, - substituteAll, + replaceVars, }: stdenv.mkDerivation (finalAttrs: { @@ -38,14 +38,16 @@ stdenv.mkDerivation (finalAttrs: { cp -vr * $out/share/oh-my-fish cp -v ${ - substituteAll { - name = "omf-install"; - src = ./omf-install; - omf = placeholder "out"; + replaceVars ./omf-install { inherit fish runtimeShell; + # replaced below + omf = null; } } $out/bin/omf-install + substituteInPlace $out/bin/omf-install \ + --replace-fail '@omf@' "$out" + chmod +x $out/bin/omf-install cat $out/bin/omf-install diff --git a/pkgs/by-name/om/omnictl/package.nix b/pkgs/by-name/om/omnictl/package.nix index 2f96914b07028..fd5e990e117e6 100644 --- a/pkgs/by-name/om/omnictl/package.nix +++ b/pkgs/by-name/om/omnictl/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "omnictl"; - version = "0.45.1"; + version = "0.46.0"; src = fetchFromGitHub { owner = "siderolabs"; repo = "omni"; rev = "v${version}"; - hash = "sha256-a9lp/XDet4CcMadMHj1ia4tdsK/Y8Sfd2f6/A2j1liQ="; + hash = "sha256-3ew/iyMR1BI5/4Rct+DqY0Tqy0lg1kv7rCTck7i+C70="; }; - vendorHash = "sha256-U/cserG37gM1XDN9HcPqnq4hPJSaOaLBoIs5OcsocYw="; + vendorHash = "sha256-VR2k1r1bP9QSkcjwGnFUER+E3WIKrdCID4zewJyDd9A="; ldflags = [ "-s" diff --git a/pkgs/by-name/on/onlyoffice-documentserver/package.nix b/pkgs/by-name/on/onlyoffice-documentserver/package.nix index 76fb0d7f50304..27e7468747995 100644 --- a/pkgs/by-name/on/onlyoffice-documentserver/package.nix +++ b/pkgs/by-name/on/onlyoffice-documentserver/package.nix @@ -80,6 +80,11 @@ let liberation_ttf_v1 ]; + extraBuildCommands = '' + mkdir -p $out/var/{lib/onlyoffice,www} + cp -ar ${onlyoffice-documentserver}/var/www/* $out/var/www/ + ''; + extraBwrapArgs = [ "--bind var/lib/onlyoffice/ var/lib/onlyoffice/" "--bind var/lib/onlyoffice/documentserver/sdkjs/common/ var/www/onlyoffice/documentserver/sdkjs/common/" diff --git a/pkgs/by-name/op/openlinkhub/package.nix b/pkgs/by-name/op/openlinkhub/package.nix index da1def67a90f3..97e87a53704dc 100644 --- a/pkgs/by-name/op/openlinkhub/package.nix +++ b/pkgs/by-name/op/openlinkhub/package.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "openlinkhub"; - version = "0.4.8"; + version = "0.5.0"; src = fetchFromGitHub { owner = "jurkovic-nikola"; repo = "OpenLinkHub"; tag = version; - hash = "sha256-gsMzquVK4QVXZPHIeAuZW/vHW8tRBWcVAX+/fORDp+U="; + hash = "sha256-2dsdswtpKXHEiPOdGS1gIyx8r3xx3Bjr2i4WyX4hmVY="; }; proxyVendor = true; diff --git a/pkgs/applications/misc/openrgb-plugins/effects/default.nix b/pkgs/by-name/op/openrgb-plugin-effects/package.nix similarity index 91% rename from pkgs/applications/misc/openrgb-plugins/effects/default.nix rename to pkgs/by-name/op/openrgb-plugin-effects/package.nix index 5723bab1d1c80..70f96877ad799 100644 --- a/pkgs/applications/misc/openrgb-plugins/effects/default.nix +++ b/pkgs/by-name/op/openrgb-plugin-effects/package.nix @@ -2,13 +2,11 @@ lib, stdenv, fetchFromGitLab, - qtbase, + libsForQt5, openrgb, glib, openal, - qmake, pkg-config, - wrapQtAppsHook, }: stdenv.mkDerivation (finalAttrs: { @@ -29,13 +27,13 @@ stdenv.mkDerivation (finalAttrs: { ln -s ${openrgb.src} OpenRGB ''; - nativeBuildInputs = [ + nativeBuildInputs = with libsForQt5; [ qmake pkg-config wrapQtAppsHook ]; - buildInputs = [ + buildInputs = with libsForQt5; [ qtbase glib openal diff --git a/pkgs/applications/misc/openrgb-plugins/hardwaresync/default.nix b/pkgs/by-name/op/openrgb-plugin-hardwaresync/package.nix similarity index 92% rename from pkgs/applications/misc/openrgb-plugins/hardwaresync/default.nix rename to pkgs/by-name/op/openrgb-plugin-hardwaresync/package.nix index 497da16c10a60..970c0d38a0593 100644 --- a/pkgs/applications/misc/openrgb-plugins/hardwaresync/default.nix +++ b/pkgs/by-name/op/openrgb-plugin-hardwaresync/package.nix @@ -2,14 +2,12 @@ lib, stdenv, fetchFromGitLab, - qtbase, + libsForQt5, openrgb, glib, libgtop, lm_sensors, - qmake, pkg-config, - wrapQtAppsHook, }: stdenv.mkDerivation (finalAttrs: { @@ -31,14 +29,14 @@ stdenv.mkDerivation (finalAttrs: { rm -r dependencies/lhwm-cpp-wrapper ''; - buildInputs = [ + buildInputs = with libsForQt5; [ qtbase glib libgtop lm_sensors ]; - nativeBuildInputs = [ + nativeBuildInputs = with libsForQt5; [ qmake pkg-config wrapQtAppsHook diff --git a/pkgs/applications/misc/openrgb/default.nix b/pkgs/by-name/op/openrgb/package.nix similarity index 95% rename from pkgs/applications/misc/openrgb/default.nix rename to pkgs/by-name/op/openrgb/package.nix index ac8651b36e379..fa544e48cd937 100644 --- a/pkgs/applications/misc/openrgb/default.nix +++ b/pkgs/by-name/op/openrgb/package.nix @@ -2,15 +2,12 @@ lib, stdenv, fetchFromGitLab, - qmake, - wrapQtAppsHook, + libsForQt5, libusb1, hidapi, pkg-config, coreutils, mbedtls_2, - qtbase, - qttools, symlinkJoin, openrgb, }: @@ -26,12 +23,13 @@ stdenv.mkDerivation rec { hash = "sha256-XBLj4EfupyeVHRc0pVI7hrXFoCNJ7ak2yO0QSfhBsGU="; }; - nativeBuildInputs = [ + nativeBuildInputs = with libsForQt5; [ qmake pkg-config wrapQtAppsHook ]; - buildInputs = [ + + buildInputs = with libsForQt5; [ libusb1 hidapi mbedtls_2 diff --git a/pkgs/by-name/op/openvas-scanner/package.nix b/pkgs/by-name/op/openvas-scanner/package.nix index 86e54ac70aaf8..0da01c5c0a99f 100644 --- a/pkgs/by-name/op/openvas-scanner/package.nix +++ b/pkgs/by-name/op/openvas-scanner/package.nix @@ -31,13 +31,13 @@ stdenv.mkDerivation rec { pname = "openvas-scanner"; - version = "23.15.0"; + version = "23.15.3"; src = fetchFromGitHub { owner = "greenbone"; repo = "openvas-scanner"; tag = "v${version}"; - hash = "sha256-LjZZYIA0Qkuheb8ZAPBuiy5GgjOgCfJ0D/YM03zTcW0="; + hash = "sha256-9TzS/w/FZSawrc505aeaGJlz4m6k4Q4loCVgChzKs30="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/or/orchard/package.nix b/pkgs/by-name/or/orchard/package.nix index 16139e4c6f4c8..8058366d61d20 100644 --- a/pkgs/by-name/or/orchard/package.nix +++ b/pkgs/by-name/or/orchard/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "orchard"; - version = "0.26.3"; + version = "0.26.4"; src = fetchFromGitHub { owner = "cirruslabs"; repo = pname; rev = version; - hash = "sha256-jBsNJLHgeUn3Mw257shNzaCzl3YahZ2gGpneGMMyxfA="; + hash = "sha256-XA4cu7Jou5kGYovGgIpRvpMFBSha0d8sk4WMbp7GpGc="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; diff --git a/pkgs/by-name/or/orz/package.nix b/pkgs/by-name/or/orz/package.nix index 6acd6736266dc..d29a891692ce9 100644 --- a/pkgs/by-name/or/orz/package.nix +++ b/pkgs/by-name/or/orz/package.nix @@ -7,16 +7,17 @@ rustPlatform.buildRustPackage rec { pname = "orz"; - version = "1.6.2"; + version = "1.6.2-unstable-2024-11-08"; src = fetchFromGitHub { owner = "richox"; repo = "orz"; - rev = "v${version}"; - hash = "sha256-Yro+iXlg18Pj/AkU4IjvgA88xctK65yStfTilz+IRs0="; + rev = "c828a50f18a309d4715741056db74941e6a98867"; + hash = "sha256-PVso4ufBwxhF1yhzIkIwSbRJdnH9h8gn3nreWQJDMn4="; }; - cargoHash = "sha256-aUsRbIajBP6esjW7Wj7mqIkbYUCbZ2GgxjRXMPTnHYg="; + useFetchCargoVendor = true; + cargoHash = "sha256-vbhK4jHNhCI1nFv2pVOtjlxQe+b7NMP14z2Tk+no8Vs="; outputs = [ "out" diff --git a/pkgs/by-name/ox/oxipng/package.nix b/pkgs/by-name/ox/oxipng/package.nix index 572977337e4c7..60e28c4285ed5 100644 --- a/pkgs/by-name/ox/oxipng/package.nix +++ b/pkgs/by-name/ox/oxipng/package.nix @@ -1,22 +1,27 @@ { lib, stdenv, - fetchCrate, + fetchFromGitHub, rustPlatform, + qemu, }: rustPlatform.buildRustPackage rec { version = "9.1.3"; pname = "oxipng"; - src = fetchCrate { - inherit version pname; - hash = "sha256-kzN4YNsFqv/KUxpHao++oqc90Us6VllyFYkpdVUigD0="; + # do not use fetchCrate (only repository includes tests) + src = fetchFromGitHub { + owner = "shssoichiro"; + repo = "oxipng"; + tag = "v${version}"; + hash = "sha256-8EOEcIw10hCyYi9SwDLDZ8J3ezLXa30RUY5I9ksfqTs="; }; cargoHash = "sha256-4PCLtBJliK3uteL8EVKLBVR2YZW1gwQOiSLQok+rqug="; - doCheck = !stdenv.hostPlatform.isAarch64 && !stdenv.hostPlatform.isDarwin; + # See https://github.com/shssoichiro/oxipng/blob/14b8b0e93a/.cargo/config.toml#L5 + nativeCheckInputs = [ qemu ]; meta = { homepage = "https://github.com/shssoichiro/oxipng"; diff --git a/pkgs/by-name/pa/pablodraw/package.nix b/pkgs/by-name/pa/pablodraw/package.nix index 1354061a838f8..7de1cf2e797f7 100644 --- a/pkgs/by-name/pa/pablodraw/package.nix +++ b/pkgs/by-name/pa/pablodraw/package.nix @@ -30,8 +30,8 @@ buildDotnetModule rec { executables = [ "PabloDraw" ]; - dotnet-sdk = dotnetCorePackages.sdk_7_0; - dotnet-runtime = dotnetCorePackages.runtime_7_0; + dotnet-sdk = dotnetCorePackages.sdk_7_0-bin; + dotnet-runtime = dotnetCorePackages.runtime_7_0-bin; nugetDeps = ./deps.json; diff --git a/pkgs/by-name/pa/packer/package.nix b/pkgs/by-name/pa/packer/package.nix index 324c428ef0b98..9bb7f19c98bfb 100644 --- a/pkgs/by-name/pa/packer/package.nix +++ b/pkgs/by-name/pa/packer/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "packer"; - version = "1.11.2"; + version = "1.12.0"; src = fetchFromGitHub { owner = "hashicorp"; repo = "packer"; rev = "v${version}"; - hash = "sha256-xi5CWL+KQd9nZSd0EscdH+lfw+WLtteSxtEos0lCNcA="; + hash = "sha256-19eaQs2f4zM3lXuQrWoS2S/tXWe3HdxXesjtVG67LFE="; }; - vendorHash = "sha256-Xmmc30W1ZfMc7YSQswyCjw1KyDA5qi8W+kZ1L7cM3cQ="; + vendorHash = "sha256-BsYL0PEpujsXLjhFP05yK8Pr0tc0lrdsQqxzmKso3rw="; subPackages = [ "." ]; diff --git a/pkgs/by-name/pa/paperless-ngx/package.nix b/pkgs/by-name/pa/paperless-ngx/package.nix index 1f91494028a58..a6b2ed8aec17b 100644 --- a/pkgs/by-name/pa/paperless-ngx/package.nix +++ b/pkgs/by-name/pa/paperless-ngx/package.nix @@ -26,13 +26,13 @@ xorg, }: let - version = "2.14.5"; + version = "2.14.6"; src = fetchFromGitHub { owner = "paperless-ngx"; repo = "paperless-ngx"; tag = "v${version}"; - hash = "sha256-ML38TErINQPjBGweCY673zFlGEjTjgJcYJTJUbTov+4="; + hash = "sha256-wBm4+ohM9v25n6zEUAeaVU6mAmB3GR8n1kDYyTBlnjM="; }; # subpath installation is broken with uvicorn >= 0.26 @@ -283,6 +283,7 @@ python.pkgs.buildPythonApplication rec { # FileNotFoundError(2, 'No such file or directory'): /build/tmp... "test_script_with_output" "test_script_exit_non_zero" + "testDocumentPageCountMigrated" # AssertionError: 10 != 4 (timezone/time issue) # Due to getting local time from modification date in test_consumer.py "testNormalOperation" diff --git a/pkgs/by-name/pa/parinfer-rust/package.nix b/pkgs/by-name/pa/parinfer-rust/package.nix index d300092b1907c..f5e6cfb5bea62 100644 --- a/pkgs/by-name/pa/parinfer-rust/package.nix +++ b/pkgs/by-name/pa/parinfer-rust/package.nix @@ -7,16 +7,17 @@ rustPlatform.buildRustPackage rec { pname = "parinfer-rust"; - version = "0.4.3"; + version = "0.4.3-unstable-2024-05-07"; src = fetchFromGitHub { owner = "eraserhd"; repo = "parinfer-rust"; - rev = "v${version}"; - sha256 = "0hj5in5h7pj72m4ag80ing513fh65q8xlsf341qzm3vmxm3y3jgd"; + rev = "d84828b453e158d06406f6b5e9056f6b54ff76c9"; + sha256 = "sha256-Q2fYogfn5QcNDEie4sUaVydAmDmcFXnsvz35cxPCf+M="; }; - cargoHash = "sha256-PW9LIQamQfusaijyJ2R9xe29LhM0GNf9BdxI9vkjVdE="; + useFetchCargoVendor = true; + cargoHash = "sha256-w/GMjNtKiMGYOfzSl5IZTeHBSp4C9Mu6+oogCqHxdb4="; nativeBuildInputs = [ llvmPackages.clang diff --git a/pkgs/by-name/pa/parseable/package.nix b/pkgs/by-name/pa/parseable/package.nix new file mode 100644 index 0000000000000..d501c1f4e6ddb --- /dev/null +++ b/pkgs/by-name/pa/parseable/package.nix @@ -0,0 +1,51 @@ +{ + lib, + rdkafka, + pkg-config, + fetchFromGitHub, + rustPlatform, + fetchzip, + versionCheckHook, + nix-update-script, +}: + +rustPlatform.buildRustPackage rec { + pname = "parseable"; + version = "1.7.1"; + + src = fetchFromGitHub { + owner = "parseablehq"; + repo = "parseable"; + tag = "v${version}"; + hash = "sha256-Uoejniv6hUpxTZ6gosP+LHTo4FD+o1AlUEWopdpz5M0="; + }; + + LOCAL_ASSETS_PATH = fetchzip { + url = "https://github.com/parseablehq/console/releases/download/v0.9.15/build.zip"; + hash = "sha256-T37pI7adfKPDkCETcGcZVzcYVcxROSZLDrFhV4XO4tc="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-rT/ORTOPsOgYlS8VCMBXo/cjfSJYcCtJofcPEIlc/cI="; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ rdkafka ]; + + buildFeatures = [ "rdkafka/dynamic-linking" ]; + + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = "--version"; + doInstallCheck = true; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Disk less, cloud native database for logs, observability, security, and compliance"; + homepage = "https://www.parseable.com"; + changelog = "https://github.com/parseablehq/parseable/releases/tag/v${version}"; + license = lib.licenses.agpl3Only; + maintainers = with lib.maintainers; [ ilyakooo0 ]; + mainProgram = "parseable"; + }; +} diff --git a/pkgs/by-name/pa/pax-rs/package.nix b/pkgs/by-name/pa/pax-rs/package.nix deleted file mode 100644 index 8278405f3f399..0000000000000 --- a/pkgs/by-name/pa/pax-rs/package.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ - lib, - fetchFromGitHub, - fetchurl, - rustPlatform, - runCommand, -}: - -rustPlatform.buildRustPackage rec { - pname = "pax-rs"; - version = "0.4.0"; - - meta = with lib; { - description = "Fastest JavaScript bundler in the galaxy"; - longDescription = '' - The fastest JavaScript bundler in the galaxy. Fully supports ECMAScript module syntax (import/export) in addition to CommonJS require(). - ''; - homepage = "https://github.com/nathan/pax"; - license = licenses.mit; - maintainers = [ maintainers.klntsky ]; - platforms = platforms.linux; - mainProgram = "px"; - }; - - src = - let - source = fetchFromGitHub { - owner = "nathan"; - repo = "pax"; - rev = "pax-v${version}"; - sha256 = "1l2xpgsms0bfc0i3l0hyw4dbp6d4qdxa9vxyp704p27vvn4ndhv2"; - }; - - cargo-lock = fetchurl { - url = "https://gist.github.com/klntsky/c7863424d7df0c379782015f6bb3b399/raw/1cf7481e33984fd1510dc77ed677606d08fa8eb6/Cargo.lock"; - sha256 = "0ff1b64b99cbca1cc2ceabcd2e4f7bc3411e3a2a9fbb9db2204d9240fe38ddeb"; - }; - in - runCommand "pax-rs-src" { } '' - cp -R ${source} $out - chmod +w $out - cp ${cargo-lock} $out/Cargo.lock - ''; - - cargoHash = "sha256-2gXd1rwj82Ywin4QW3g9cB9R0PkXhE73F9xSJ6EozzQ="; -} diff --git a/pkgs/by-name/pa/pay-respects/package.nix b/pkgs/by-name/pa/pay-respects/package.nix index 09ccbb3cb88ca..183f05670b190 100644 --- a/pkgs/by-name/pa/pay-respects/package.nix +++ b/pkgs/by-name/pa/pay-respects/package.nix @@ -8,17 +8,17 @@ }: rustPlatform.buildRustPackage rec { pname = "pay-respects"; - version = "0.6.11"; + version = "0.6.12"; src = fetchFromGitea { domain = "codeberg.org"; owner = "iff"; repo = "pay-respects"; rev = "v${version}"; - hash = "sha256-4m8/sp6r2Xb2SsNcatMv0+mWHBx+XKD0LEzrEwuWIEA="; + hash = "sha256-lDIhI9CnWwVVGyAJAS3gDUEkeXShTvPd8JKC1j9/9yU="; }; - cargoHash = "sha256-obuMixkXqWUuZFqs3mJyMpHx4RY70ZpE3H9GzqFmt6k="; + cargoHash = "sha256-3uSZtf2sbz74+V7LeHWWQWglrGRpiUSNAedVngjrH1Q="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/pd/pdm/package.nix b/pkgs/by-name/pd/pdm/package.nix index fe76cf7a3dead..b89368fc00682 100644 --- a/pkgs/by-name/pd/pdm/package.nix +++ b/pkgs/by-name/pd/pdm/package.nix @@ -24,7 +24,7 @@ let in python.pkgs.buildPythonApplication rec { pname = "pdm"; - version = "2.22.2"; + version = "2.22.3"; pyproject = true; disabled = python.pkgs.pythonOlder "3.8"; @@ -33,7 +33,7 @@ python.pkgs.buildPythonApplication rec { owner = "pdm-project"; repo = "pdm"; tag = version; - hash = "sha256-se0Xvziyg4CU6wENO0oYVAI4f2uBv3Ubadiptf/uPgQ="; + hash = "sha256-+qUvVQJO/xfBZJuMBezu/LdKhKag1BCQ3To2qFXiOzY="; }; pythonRelaxDeps = [ "hishel" ]; diff --git a/pkgs/by-name/pl/play/package.nix b/pkgs/by-name/pl/play/package.nix new file mode 100644 index 0000000000000..05fc04534c459 --- /dev/null +++ b/pkgs/by-name/pl/play/package.nix @@ -0,0 +1,42 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + versionCheckHook, + nix-update-script, +}: + +buildGoModule rec { + pname = "play"; + version = "0.3.5"; + + src = fetchFromGitHub { + owner = "paololazzari"; + repo = "play"; + tag = "v${version}"; + hash = "sha256-31naTjYwCytytKXg9tQo2qx0hVoBwBwL7nVeoAV+/go="; + }; + + vendorHash = "sha256-9eP0rhsgpTttYrBG/BNk/ICtaM+zKNBz2H2cHuTSt30="; + + modRoot = "."; + + nativeInstallCheckInputs = [ + versionCheckHook + ]; + versionCheckProgramArg = [ "version" ]; + doInstallCheck = true; + + passthru = { + updateScript = nix-update-script { }; + }; + + meta = { + description = "TUI playground for programs like grep, sed and awk"; + homepage = "https://github.com/paololazzari/play"; + changelog = "https://github.com/paololazzari/play/releases/tag/v${version}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ liberodark ]; + mainProgram = "play"; + }; +} diff --git a/pkgs/by-name/pl/plumed/package.nix b/pkgs/by-name/pl/plumed/package.nix index 3809e5fccc84c..c2d64c559678d 100644 --- a/pkgs/by-name/pl/plumed/package.nix +++ b/pkgs/by-name/pl/plumed/package.nix @@ -9,13 +9,13 @@ assert !blas.isILP64; stdenv.mkDerivation rec { pname = "plumed"; - version = "2.9.2"; + version = "2.9.3"; src = fetchFromGitHub { owner = "plumed"; repo = "plumed2"; rev = "v${version}"; - hash = "sha256-jNvdbfh1krNMrOFqkEHMy60mjsG/Wp6MQg0gHEjDA5U="; + hash = "sha256-KN412t64tp3QUQkhpLU3sAYDosQ3hw9HqpT1fzt5fwA="; }; postPatch = '' diff --git a/pkgs/by-name/po/poetry/plugins/poetry-plugin-up.nix b/pkgs/by-name/po/poetry/plugins/poetry-plugin-up.nix index dfc2de383b6a4..d017054aaeb13 100644 --- a/pkgs/by-name/po/poetry/plugins/poetry-plugin-up.nix +++ b/pkgs/by-name/po/poetry/plugins/poetry-plugin-up.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "poetry-plugin-up"; - version = "0.8.0"; + version = "0.9.0"; format = "pyproject"; src = fetchFromGitHub { owner = "MousaZeidBaker"; repo = pname; - rev = "refs/tags/v${version}"; - hash = "sha256-PWHbMDGL9CGLRmvFWLOztUW0f/TJioPjQtAgpyCbAqw="; + tag = "v${version}"; + hash = "sha256-gVhx8Vhk+yT/QjcEme8w0F+6BBpnEZOqzCkUJgM9eck="; }; build-system = [ @@ -43,7 +43,5 @@ buildPythonPackage rec { changelog = "https://github.com/MousaZeidBaker/poetry-plugin-up/releases/tag/${version}"; license = licenses.mit; maintainers = [ maintainers.k900 ]; - # https://github.com/MousaZeidBaker/poetry-plugin-up/pull/70 - broken = lib.versionAtLeast poetry.version "2"; }; } diff --git a/pkgs/by-name/po/poptracker/package.nix b/pkgs/by-name/po/poptracker/package.nix index b0b6f93f9d5e5..f29f75853f931 100644 --- a/pkgs/by-name/po/poptracker/package.nix +++ b/pkgs/by-name/po/poptracker/package.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "poptracker"; - version = "0.29.0"; + version = "0.30.1"; src = fetchFromGitHub { owner = "black-sliver"; repo = "PopTracker"; rev = "v${finalAttrs.version}"; - hash = "sha256-rkEaq8YLt0NhspXVgEqZ/9FF7GDlTU5fKgWGXeA6UX4="; + hash = "sha256-U1C0vwHcUfjBPGLcmmWFqaKmIMPlV/FumIbFJ6JDBFc="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/pr/protolint/package.nix b/pkgs/by-name/pr/protolint/package.nix index 0b9b38734c582..8dac80a2bb935 100644 --- a/pkgs/by-name/pr/protolint/package.nix +++ b/pkgs/by-name/pr/protolint/package.nix @@ -5,16 +5,16 @@ }: buildGoModule rec { pname = "protolint"; - version = "0.52.0"; + version = "0.53.0"; src = fetchFromGitHub { owner = "yoheimuta"; repo = pname; rev = "v${version}"; - hash = "sha256-nghe8arZwXzuZnGuVnhDnyEEgdLF1oImIy4E1jW37RQ="; + hash = "sha256-3/eoVrt/Ic2LLLbexXG3ng/uR60JbmKheSxa2PiMnvg="; }; - vendorHash = "sha256-3J72Pb4XqMptEXANYgNgvWGdD+z0mP7Nnx3C9Wp22s0="; + vendorHash = "sha256-TSbISfXBSxc9VQOGV7Chn1CPxhudRG5y2KxCgi01tKw="; # Something about the way we run tests causes issues. It doesn't happen # when using "go test" directly: diff --git a/pkgs/by-name/pr/proxsuite-nlp/package.nix b/pkgs/by-name/pr/proxsuite-nlp/package.nix index f522a4c9618aa..2abd4d6c8fd8a 100644 --- a/pkgs/by-name/pr/proxsuite-nlp/package.nix +++ b/pkgs/by-name/pr/proxsuite-nlp/package.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "proxsuite-nlp"; - version = "0.10.0"; + version = "0.10.1"; src = fetchFromGitHub { owner = "Simple-Robotics"; repo = "proxsuite-nlp"; rev = "v${finalAttrs.version}"; - hash = "sha256-JWMvPIxmZ5vSVS3nSlhFyNu8hLSVTc7Hdvd4YmE/pI8="; + hash = "sha256-+zg3QGPLqrvwT7rjnYXTUwIzHlHrIAISj/+Q9HU4cYs="; }; outputs = [ diff --git a/pkgs/by-name/py/pylyzer/package.nix b/pkgs/by-name/py/pylyzer/package.nix index 7e969644a6db5..f413e1c583b8d 100644 --- a/pkgs/by-name/py/pylyzer/package.nix +++ b/pkgs/by-name/py/pylyzer/package.nix @@ -13,17 +13,17 @@ rustPlatform.buildRustPackage rec { pname = "pylyzer"; - version = "0.0.77"; + version = "0.0.78"; src = fetchFromGitHub { owner = "mtshiba"; repo = "pylyzer"; tag = "v${version}"; - hash = "sha256-MlDW3dNe9fdOzWp38VkjgoiqOYgBF+ezwTQE0+6SXCc="; + hash = "sha256-g8/zhl0dCQOq4aTlivAh3ufgfEMzeMvTtJQxFuHHWB0="; }; useFetchCargoVendor = true; - cargoHash = "sha256-bkYRPwiB2BN4WNZ0HcOBiDbFyidftbHWyIDvJasnePc="; + cargoHash = "sha256-mi4pCYA0dQnv3MIpZxVVY0qLdIts/qvxS4og0Tyxk3w="; nativeBuildInputs = [ git diff --git a/pkgs/by-name/qb/qbittorrent-cli/deps.json b/pkgs/by-name/qb/qbittorrent-cli/deps.json new file mode 100644 index 0000000000000..665b616d4a60d --- /dev/null +++ b/pkgs/by-name/qb/qbittorrent-cli/deps.json @@ -0,0 +1,902 @@ +[ + { + "pname": "Alba.CsConsoleFormat", + "version": "1.0.0", + "hash": "sha256-JNCW7F/dqCQ0bS1Z+MBnd2xMfOifJXIcRIeJerQm9WM=" + }, + { + "pname": "BencodeNET", + "version": "2.3.0", + "hash": "sha256-U4HxqQhAQ02iRR0GGZQ7gSGFLAsFWwvJg8LqblRvlf4=" + }, + { + "pname": "CsvHelper", + "version": "12.1.2", + "hash": "sha256-1J43XjB2CAA2zQRyOry56ukKZaAmH68edyezmAVGXEk=" + }, + { + "pname": "IPNetwork2", + "version": "2.5.235", + "hash": "sha256-lY/bBqC4OSS3zKrc6ZN19DOu5JKi5s2ARcvAS3WyLa0=" + }, + { + "pname": "McMaster.Extensions.CommandLineUtils", + "version": "2.4.4", + "hash": "sha256-Pzo/Lf1ci+7HviQv1g4dM0Td/v99d2XpNKCwTT2nR6w=" + }, + { + "pname": "Microsoft.AspNetCore.App.Ref", + "version": "3.1.10", + "hash": "sha256-51D1XkqFMPHJzOmt1HQ0Bf1n9K0auwEyxTJuqA/8xHY=" + }, + { + "pname": "Microsoft.AspNetCore.App.Ref", + "version": "6.0.36", + "hash": "sha256-9jDkWbjw/nd8yqdzVTagCuqr6owJ/DUMi4BlUZT4hWU=" + }, + { + "pname": "Microsoft.AspNetCore.App.Runtime.linux-arm64", + "version": "3.1.32", + "hash": "sha256-vZkj1OFhojFyl//ZqrbZG3j8rGk/6rwqMhvvR6gWCgI=" + }, + { + "pname": "Microsoft.AspNetCore.App.Runtime.linux-arm64", + "version": "6.0.36", + "hash": "sha256-JQULJyF0ivLoUU1JaFfK/HHg+/qzpN7V2RR2Cc+WlQ4=" + }, + { + "pname": "Microsoft.AspNetCore.App.Runtime.linux-x64", + "version": "3.1.32", + "hash": "sha256-OV3Ie8JGTEwNI4Y6DJFh+ZUrBTwrSdFjEbfljfAwn3s=" + }, + { + "pname": "Microsoft.AspNetCore.App.Runtime.linux-x64", + "version": "6.0.36", + "hash": "sha256-zUsVIpV481vMLAXaLEEUpEMA9/f1HGOnvaQnaWdzlyY=" + }, + { + "pname": "Microsoft.AspNetCore.App.Runtime.osx-arm64", + "version": "6.0.36", + "hash": "sha256-2seqZcz0JeUjkzh3QcGa9TcJ4LUafpFjTRk+Nm8T6T0=" + }, + { + "pname": "Microsoft.AspNetCore.App.Runtime.osx-x64", + "version": "3.1.32", + "hash": "sha256-LD7skhj3ZqIJlgL2VG/1PqPJT7yGQPuSNkduHhQpM7M=" + }, + { + "pname": "Microsoft.AspNetCore.App.Runtime.osx-x64", + "version": "6.0.36", + "hash": "sha256-yxLafxiBKkvfkDggPk0P9YZIHBkDJOsFTO7/V9mEHuU=" + }, + { + "pname": "Microsoft.CSharp", + "version": "4.3.0", + "hash": "sha256-a3dAiPaVuky0wpcHmpTVtAQJNGZ2v91/oArA+dpJgj8=" + }, + { + "pname": "Microsoft.CSharp", + "version": "4.4.0", + "hash": "sha256-EMIApW3Zj0V85leF7DLgFFvfqPdsIdvvJ3BD7zD+Pto=" + }, + { + "pname": "Microsoft.NETCore.App", + "version": "2.1.30", + "hash": "sha256-DucpZ4+YQ0g7GMOcEjsNJj2Ol1jynqEyUZwpzY7keYE=" + }, + { + "pname": "Microsoft.NETCore.App.Host.linux-arm64", + "version": "3.1.32", + "hash": "sha256-V5yVTC2je2wsv/gqLaVmnzcnDfNGETz0e7/M3MG5z/8=" + }, + { + "pname": "Microsoft.NETCore.App.Host.linux-arm64", + "version": "6.0.36", + "hash": "sha256-9lC/LYnthYhjkWWz2kkFCvlA5LJOv11jdt59SDnpdy0=" + }, + { + "pname": "Microsoft.NETCore.App.Host.linux-x64", + "version": "3.1.32", + "hash": "sha256-ajR6pZv0zuzWDyxEnWtAuhasV5biV5lvweEbefTISiM=" + }, + { + "pname": "Microsoft.NETCore.App.Host.linux-x64", + "version": "6.0.36", + "hash": "sha256-VFRDzx7LJuvI5yzKdGmw/31NYVbwHWPKQvueQt5xc10=" + }, + { + "pname": "Microsoft.NETCore.App.Host.osx-arm64", + "version": "6.0.36", + "hash": "sha256-DaSWwYACJGolEBuMhzDVCj/rQTdDt061xCVi+gyQnuo=" + }, + { + "pname": "Microsoft.NETCore.App.Host.osx-x64", + "version": "3.1.32", + "hash": "sha256-AOr3qBlvr+WGF79tTq/yvKWJLXqEO4Sv+eTCpZGVz6A=" + }, + { + "pname": "Microsoft.NETCore.App.Host.osx-x64", + "version": "6.0.36", + "hash": "sha256-FrRny9EI6HKCKQbu6mcLj5w4ooSRrODD4Vj2ZMGnMd4=" + }, + { + "pname": "Microsoft.NETCore.App.Ref", + "version": "3.1.0", + "hash": "sha256-nuAvHwmJ2s3Ob1qNDH1+uV3awOZaWlaV3FenTmPUWyM=" + }, + { + "pname": "Microsoft.NETCore.App.Ref", + "version": "6.0.36", + "hash": "sha256-9LZgVoIFF8qNyUu8kdJrYGLutMF/cL2K82HN2ywwlx8=" + }, + { + "pname": "Microsoft.NETCore.App.Runtime.linux-arm64", + "version": "3.1.32", + "hash": "sha256-eL+GH7cDWSzXPPN9yxQvQ6IQ3AFUfnH0OJ/r8Mmx7I4=" + }, + { + "pname": "Microsoft.NETCore.App.Runtime.linux-arm64", + "version": "6.0.36", + "hash": "sha256-k3rxvUhCEU0pVH8KgEMtkPiSOibn+nBh+0zT2xIfId8=" + }, + { + "pname": "Microsoft.NETCore.App.Runtime.linux-x64", + "version": "3.1.32", + "hash": "sha256-h4HjfRnvH81dW84S3TCPcCfxeQLiLN7b1ZleRNsprFY=" + }, + { + "pname": "Microsoft.NETCore.App.Runtime.linux-x64", + "version": "6.0.36", + "hash": "sha256-U8wJ2snSDFqeAgDVLXjnniidC7Cr5aJ1/h/BMSlyu0c=" + }, + { + "pname": "Microsoft.NETCore.App.Runtime.osx-arm64", + "version": "6.0.36", + "hash": "sha256-UfLcrL2Gj/OLz0s92Oo+OCJeDpZFAcQLPLiSNND8D5Y=" + }, + { + "pname": "Microsoft.NETCore.App.Runtime.osx-x64", + "version": "3.1.32", + "hash": "sha256-IcJ45kU65HpYu1EjMB1sf87PTSvPdS2h5uyIzX4acxk=" + }, + { + "pname": "Microsoft.NETCore.App.Runtime.osx-x64", + "version": "6.0.36", + "hash": "sha256-0xIJYFzxdMcnCj3wzkFRQZSnQcPHzPHMzePRIOA3oJs=" + }, + { + "pname": "Microsoft.NETCore.DotNetAppHost", + "version": "2.1.30", + "hash": "sha256-S32dRd5Qw5P/Srjaz849B0P8hcG02ZzmJcDY0GLdS2U=" + }, + { + "pname": "Microsoft.NETCore.DotNetHostPolicy", + "version": "2.1.30", + "hash": "sha256-/G5C9pmkaM1ReoMTD7QNUsm+oHkjZrK9qHdrTZVUZv4=" + }, + { + "pname": "Microsoft.NETCore.DotNetHostResolver", + "version": "2.1.30", + "hash": "sha256-5gx6yqwbWsWWKOmldsLnN5o8fXQf2rbSUknSEhs1c0w=" + }, + { + "pname": "Microsoft.NETCore.Platforms", + "version": "1.1.0", + "hash": "sha256-FeM40ktcObQJk4nMYShB61H/E8B7tIKfl9ObJ0IOcCM=" + }, + { + "pname": "Microsoft.NETCore.Platforms", + "version": "2.1.14", + "hash": "sha256-eDbkdKujlhWqhcbembwpyM4DKrROdhJVB74YP/VjdVU=" + }, + { + "pname": "Microsoft.NETCore.Targets", + "version": "1.1.0", + "hash": "sha256-0AqQ2gMS8iNlYkrD+BxtIg7cXMnr9xZHtKAuN4bjfaQ=" + }, + { + "pname": "Microsoft.NETCore.Targets", + "version": "2.0.0", + "hash": "sha256-Qk2PbbhZpPzb88JiQQcXlNK6RDBfP1of6g337RTMWVs=" + }, + { + "pname": "Microsoft.NETFramework.ReferenceAssemblies", + "version": "1.0.3", + "hash": "sha256-FBoJP5DHZF0QHM0xLm9yd4HJZVQOuSpSKA+VQRpphEE=" + }, + { + "pname": "Microsoft.NETFramework.ReferenceAssemblies.net46", + "version": "1.0.3", + "hash": "sha256-3Lt5uzho2/u2TGQxFvqmPYiO6ezLoMTpZemZLtfE410=" + }, + { + "pname": "Microsoft.Win32.Primitives", + "version": "4.3.0", + "hash": "sha256-mBNDmPXNTW54XLnPAUwBRvkIORFM7/j0D0I2SyQPDEg=" + }, + { + "pname": "Mono.Posix", + "version": "5.4.0.201", + "hash": "sha256-5UyoA2LFenAuqzHwf7Kc4I/OXEeYsvVdMx1wFEfGLas=" + }, + { + "pname": "Mono.Posix.NETStandard", + "version": "1.0.0", + "hash": "sha256-/F61k7MY/fu2FcfW7CkyjuUroKwlYAXPQFVeDs1QknY=" + }, + { + "pname": "NETStandard.Library", + "version": "1.6.1", + "hash": "sha256-iNan1ix7RtncGWC9AjAZ2sk70DoxOsmEOgQ10fXm4Pw=" + }, + { + "pname": "NETStandard.Library", + "version": "2.0.3", + "hash": "sha256-Prh2RPebz/s8AzHb2sPHg3Jl8s31inv9k+Qxd293ybo=" + }, + { + "pname": "Newtonsoft.Json", + "version": "13.0.3", + "hash": "sha256-hy/BieY4qxBWVVsDqqOPaLy1QobiIapkbrESm6v2PHc=" + }, + { + "pname": "NJsonSchema", + "version": "9.14.1", + "hash": "sha256-dL+eEevnkY9zP3gDb+XGTISbXPkSn1QCz3TlZS+n2WQ=" + }, + { + "pname": "Portable.BouncyCastle", + "version": "1.8.8", + "hash": "sha256-Ikeur99EVv8T3UrPTmSX59ScPCoYYo5e/tjteEAB7qk=" + }, + { + "pname": "Portable.Xaml", + "version": "0.18.0", + "hash": "sha256-1Yl7X9RgmuO/roFvjhocCZxVxIdtvjzLuPKodNiSl3s=" + }, + { + "pname": "QBittorrent.Client", + "version": "1.9.24285.1", + "hash": "sha256-Jt8jHPU/0AoE7sugvNTHfQUVEtPwv1jQgckDmD2Tv7E=" + }, + { + "pname": "runtime.any.System.Collections", + "version": "4.3.0", + "hash": "sha256-4PGZqyWhZ6/HCTF2KddDsbmTTjxs2oW79YfkberDZS8=" + }, + { + "pname": "runtime.any.System.Diagnostics.Tools", + "version": "4.3.0", + "hash": "sha256-8yLKFt2wQxkEf7fNfzB+cPUCjYn2qbqNgQ1+EeY2h/I=" + }, + { + "pname": "runtime.any.System.Diagnostics.Tracing", + "version": "4.3.0", + "hash": "sha256-dsmTLGvt8HqRkDWP8iKVXJCS+akAzENGXKPV18W2RgI=" + }, + { + "pname": "runtime.any.System.Globalization", + "version": "4.3.0", + "hash": "sha256-PaiITTFI2FfPylTEk7DwzfKeiA/g/aooSU1pDcdwWLU=" + }, + { + "pname": "runtime.any.System.Globalization.Calendars", + "version": "4.3.0", + "hash": "sha256-AYh39tgXJVFu8aLi9Y/4rK8yWMaza4S4eaxjfcuEEL4=" + }, + { + "pname": "runtime.any.System.IO", + "version": "4.3.0", + "hash": "sha256-vej7ySRhyvM3pYh/ITMdC25ivSd0WLZAaIQbYj/6HVE=" + }, + { + "pname": "runtime.any.System.Reflection", + "version": "4.3.0", + "hash": "sha256-ns6f++lSA+bi1xXgmW1JkWFb2NaMD+w+YNTfMvyAiQk=" + }, + { + "pname": "runtime.any.System.Reflection.Extensions", + "version": "4.3.0", + "hash": "sha256-Y2AnhOcJwJVYv7Rp6Jz6ma0fpITFqJW+8rsw106K2X8=" + }, + { + "pname": "runtime.any.System.Reflection.Primitives", + "version": "4.3.0", + "hash": "sha256-LkPXtiDQM3BcdYkAm5uSNOiz3uF4J45qpxn5aBiqNXQ=" + }, + { + "pname": "runtime.any.System.Resources.ResourceManager", + "version": "4.3.0", + "hash": "sha256-9EvnmZslLgLLhJ00o5MWaPuJQlbUFcUF8itGQNVkcQ4=" + }, + { + "pname": "runtime.any.System.Runtime", + "version": "4.3.0", + "hash": "sha256-qwhNXBaJ1DtDkuRacgHwnZmOZ1u9q7N8j0cWOLYOELM=" + }, + { + "pname": "runtime.any.System.Runtime.Handles", + "version": "4.3.0", + "hash": "sha256-PQRACwnSUuxgVySO1840KvqCC9F8iI9iTzxNW0RcBS4=" + }, + { + "pname": "runtime.any.System.Runtime.InteropServices", + "version": "4.3.0", + "hash": "sha256-Kaw5PnLYIiqWbsoF3VKJhy7pkpoGsUwn4ZDCKscbbzA=" + }, + { + "pname": "runtime.any.System.Text.Encoding", + "version": "4.3.0", + "hash": "sha256-Q18B9q26MkWZx68exUfQT30+0PGmpFlDgaF0TnaIGCs=" + }, + { + "pname": "runtime.any.System.Text.Encoding.Extensions", + "version": "4.3.0", + "hash": "sha256-6MYj0RmLh4EVqMtO/MRqBi0HOn5iG4x9JimgCCJ+EFM=" + }, + { + "pname": "runtime.any.System.Threading.Tasks", + "version": "4.3.0", + "hash": "sha256-agdOM0NXupfHbKAQzQT8XgbI9B8hVEh+a/2vqeHctg4=" + }, + { + "pname": "runtime.any.System.Threading.Timer", + "version": "4.3.0", + "hash": "sha256-BgHxXCIbicVZtpgMimSXixhFC3V+p5ODqeljDjO8hCs=" + }, + { + "pname": "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl", + "version": "4.3.0", + "hash": "sha256-LXUPLX3DJxsU1Pd3UwjO1PO9NM2elNEDXeu2Mu/vNps=" + }, + { + "pname": "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl", + "version": "4.3.0", + "hash": "sha256-qeSqaUI80+lqw5MK4vMpmO0CZaqrmYktwp6L+vQAb0I=" + }, + { + "pname": "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl", + "version": "4.3.0", + "hash": "sha256-SrHqT9wrCBsxILWtaJgGKd6Odmxm8/Mh7Kh0CUkZVzA=" + }, + { + "pname": "runtime.linux-arm64.Microsoft.NETCore.App", + "version": "2.1.30", + "hash": "sha256-0kRKwOZr5ZAoYRlSSntAZkvbG9jjIosteg79KggjOQ0=" + }, + { + "pname": "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost", + "version": "2.1.30", + "hash": "sha256-gdd3w8hQ4gg+wHx0p5dc9LS+Vw1GhNa0JKfsLQ8a9QI=" + }, + { + "pname": "runtime.linux-arm64.Microsoft.NETCore.DotNetHostPolicy", + "version": "2.1.30", + "hash": "sha256-3FHYUUXakKScAxdfO9U4SQPAdslGewAeRaSntzvRUr4=" + }, + { + "pname": "runtime.linux-arm64.Microsoft.NETCore.DotNetHostResolver", + "version": "2.1.30", + "hash": "sha256-a8bVHitAuYoDFlBZQ5oaQR9xTTiubQTko/TplHni30s=" + }, + { + "pname": "runtime.linux-x64.Microsoft.NETCore.App", + "version": "2.1.30", + "hash": "sha256-C68Sv04pdUcOcZunGCv9BD6sC+80U3Iv3FsZyZ+ayfM=" + }, + { + "pname": "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost", + "version": "2.1.30", + "hash": "sha256-/VWZBxBvHI8n5so2GU6Eo3Jzj4lVk+ouIH0sbyrcNFc=" + }, + { + "pname": "runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy", + "version": "2.1.30", + "hash": "sha256-gaUvRbpiC8ApcwC4FA0F4G8fmvp4xDL6FrnpizmKaf8=" + }, + { + "pname": "runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver", + "version": "2.1.30", + "hash": "sha256-Je0Ov7Mhqe6zH7+WTkbRkIbXbp/NefQ30xeYd6Ho3+g=" + }, + { + "pname": "runtime.native.System", + "version": "4.3.0", + "hash": "sha256-ZBZaodnjvLXATWpXXakFgcy6P+gjhshFXmglrL5xD5Y=" + }, + { + "pname": "runtime.native.System.IO.Compression", + "version": "4.3.0", + "hash": "sha256-DWnXs4vlKoU6WxxvCArTJupV6sX3iBbZh8SbqfHace8=" + }, + { + "pname": "runtime.native.System.Net.Http", + "version": "4.3.0", + "hash": "sha256-c556PyheRwpYhweBjSfIwEyZHnAUB8jWioyKEcp/2dg=" + }, + { + "pname": "runtime.native.System.Security.Cryptography.Apple", + "version": "4.3.0", + "hash": "sha256-2IhBv0i6pTcOyr8FFIyfPEaaCHUmJZ8DYwLUwJ+5waw=" + }, + { + "pname": "runtime.native.System.Security.Cryptography.OpenSsl", + "version": "4.3.0", + "hash": "sha256-Jy01KhtcCl2wjMpZWH+X3fhHcVn+SyllWFY8zWlz/6I=" + }, + { + "pname": "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl", + "version": "4.3.0", + "hash": "sha256-wyv00gdlqf8ckxEdV7E+Ql9hJIoPcmYEuyeWb5Oz3mM=" + }, + { + "pname": "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl", + "version": "4.3.0", + "hash": "sha256-zi+b4sCFrA9QBiSGDD7xPV27r3iHGlV99gpyVUjRmc4=" + }, + { + "pname": "runtime.osx-x64.Microsoft.NETCore.App", + "version": "2.1.30", + "hash": "sha256-1LfaR0V2Jl7S150BVSimd4vOkDdfecyRET3Bazq3/eI=" + }, + { + "pname": "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost", + "version": "2.1.30", + "hash": "sha256-t6npxXEpJFBAwHjbSrkG9uEMg5O0nsjaMaMzVpHLYvc=" + }, + { + "pname": "runtime.osx-x64.Microsoft.NETCore.DotNetHostPolicy", + "version": "2.1.30", + "hash": "sha256-dJMmh92qa+ZlUCunxjlIT5uMYfE9PiegBvXHHQllVCM=" + }, + { + "pname": "runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver", + "version": "2.1.30", + "hash": "sha256-YZ0ZPZgLmqIN/UbIrDjyFwMiuTwg/4CeZaoiOwFUxJc=" + }, + { + "pname": "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple", + "version": "4.3.0", + "hash": "sha256-serkd4A7F6eciPiPJtUyJyxzdAtupEcWIZQ9nptEzIM=" + }, + { + "pname": "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl", + "version": "4.3.0", + "hash": "sha256-gybQU6mPgaWV3rBG2dbH6tT3tBq8mgze3PROdsuWnX0=" + }, + { + "pname": "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl", + "version": "4.3.0", + "hash": "sha256-VsP72GVveWnGUvS/vjOQLv1U80H2K8nZ4fDAmI61Hm4=" + }, + { + "pname": "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl", + "version": "4.3.0", + "hash": "sha256-4yKGa/IrNCKuQ3zaDzILdNPD32bNdy6xr5gdJigyF5g=" + }, + { + "pname": "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl", + "version": "4.3.0", + "hash": "sha256-HmdJhhRsiVoOOCcUvAwdjpMRiyuSwdcgEv2j9hxi+Zc=" + }, + { + "pname": "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl", + "version": "4.3.0", + "hash": "sha256-pVFUKuPPIx0edQKjzRon3zKq8zhzHEzko/lc01V/jdw=" + }, + { + "pname": "runtime.unix.Microsoft.Win32.Primitives", + "version": "4.3.0", + "hash": "sha256-LZb23lRXzr26tRS5aA0xyB08JxiblPDoA7HBvn6awXg=" + }, + { + "pname": "runtime.unix.System.Console", + "version": "4.3.0", + "hash": "sha256-AHkdKShTRHttqfMjmi+lPpTuCrM5vd/WRy6Kbtie190=" + }, + { + "pname": "runtime.unix.System.Diagnostics.Debug", + "version": "4.3.0", + "hash": "sha256-ReoazscfbGH+R6s6jkg5sIEHWNEvjEoHtIsMbpc7+tI=" + }, + { + "pname": "runtime.unix.System.IO.FileSystem", + "version": "4.3.0", + "hash": "sha256-Pf4mRl6YDK2x2KMh0WdyNgv0VUNdSKVDLlHqozecy5I=" + }, + { + "pname": "runtime.unix.System.Net.Primitives", + "version": "4.3.0", + "hash": "sha256-pHJ+I6i16MV6m77uhTC6GPY6jWGReE3SSP3fVB59ti0=" + }, + { + "pname": "runtime.unix.System.Net.Sockets", + "version": "4.3.0", + "hash": "sha256-IvgOeA2JuBjKl5yAVGjPYMPDzs9phb3KANs95H9v1w4=" + }, + { + "pname": "runtime.unix.System.Private.Uri", + "version": "4.3.0", + "hash": "sha256-c5tXWhE/fYbJVl9rXs0uHh3pTsg44YD1dJvyOA0WoMs=" + }, + { + "pname": "runtime.unix.System.Runtime.Extensions", + "version": "4.3.0", + "hash": "sha256-l8S9gt6dk3qYG6HYonHtdlYtBKyPb29uQ6NDjmrt3V4=" + }, + { + "pname": "System.AppContext", + "version": "4.3.0", + "hash": "sha256-yg95LNQOwFlA1tWxXdQkVyJqT4AnoDc+ACmrNvzGiZg=" + }, + { + "pname": "System.Buffers", + "version": "4.3.0", + "hash": "sha256-XqZWb4Kd04960h4U9seivjKseGA/YEIpdplfHYHQ9jk=" + }, + { + "pname": "System.Buffers", + "version": "4.5.1", + "hash": "sha256-wws90sfi9M7kuCPWkv1CEYMJtCqx9QB/kj0ymlsNaxI=" + }, + { + "pname": "System.Collections", + "version": "4.3.0", + "hash": "sha256-afY7VUtD6w/5mYqrce8kQrvDIfS2GXDINDh73IjxJKc=" + }, + { + "pname": "System.Collections.Concurrent", + "version": "4.3.0", + "hash": "sha256-KMY5DfJnDeIsa13DpqvyN8NkReZEMAFnlmNglVoFIXI=" + }, + { + "pname": "System.Collections.NonGeneric", + "version": "4.3.0", + "hash": "sha256-8/yZmD4jjvq7m68SPkJZLBQ79jOTOyT5lyzX4SCYAx8=" + }, + { + "pname": "System.Collections.Specialized", + "version": "4.3.0", + "hash": "sha256-QNg0JJNx+zXMQ26MJRPzH7THdtqjrNtGLUgaR1SdvOk=" + }, + { + "pname": "System.ComponentModel", + "version": "4.3.0", + "hash": "sha256-i00uujMO4JEDIEPKLmdLY3QJ6vdSpw6Gh9oOzkFYBiU=" + }, + { + "pname": "System.ComponentModel.Annotations", + "version": "4.4.1", + "hash": "sha256-8NZ0tWPqRYf3ovkn4OQapGsHeseEYKg91nqZAU33hrQ=" + }, + { + "pname": "System.ComponentModel.Primitives", + "version": "4.3.0", + "hash": "sha256-IOMJleuIBppmP4ECB3uftbdcgL7CCd56+oAD/Sqrbus=" + }, + { + "pname": "System.ComponentModel.TypeConverter", + "version": "4.3.0", + "hash": "sha256-PSDiPYt8PgTdTUBz+GH6lHCaM1YgfObneHnZsc8Fz54=" + }, + { + "pname": "System.Console", + "version": "4.3.0", + "hash": "sha256-Xh3PPBZr0pDbDaK8AEHbdGz7ePK6Yi1ZyRWI1JM6mbo=" + }, + { + "pname": "System.Diagnostics.Debug", + "version": "4.3.0", + "hash": "sha256-fkA79SjPbSeiEcrbbUsb70u9B7wqbsdM9s1LnoKj0gM=" + }, + { + "pname": "System.Diagnostics.DiagnosticSource", + "version": "4.3.0", + "hash": "sha256-OFJRb0ygep0Z3yDBLwAgM/Tkfs4JCDtsNhwDH9cd1Xw=" + }, + { + "pname": "System.Diagnostics.Tools", + "version": "4.3.0", + "hash": "sha256-gVOv1SK6Ape0FQhCVlNOd9cvQKBvMxRX9K0JPVi8w0Y=" + }, + { + "pname": "System.Diagnostics.Tracing", + "version": "4.3.0", + "hash": "sha256-hCETZpHHGVhPYvb4C0fh4zs+8zv4GPoixagkLZjpa9Q=" + }, + { + "pname": "System.Dynamic.Runtime", + "version": "4.3.0", + "hash": "sha256-k75gjOYimIQtLBD5NDzwwi3ZMUBPRW3jmc3evDMMJbU=" + }, + { + "pname": "System.Globalization", + "version": "4.3.0", + "hash": "sha256-caL0pRmFSEsaoeZeWN5BTQtGrAtaQPwFi8YOZPZG5rI=" + }, + { + "pname": "System.Globalization.Calendars", + "version": "4.3.0", + "hash": "sha256-uNOD0EOVFgnS2fMKvMiEtI9aOw00+Pfy/H+qucAQlPc=" + }, + { + "pname": "System.Globalization.Extensions", + "version": "4.3.0", + "hash": "sha256-mmJWA27T0GRVuFP9/sj+4TrR4GJWrzNIk2PDrbr7RQk=" + }, + { + "pname": "System.IO", + "version": "4.3.0", + "hash": "sha256-ruynQHekFP5wPrDiVyhNiRIXeZ/I9NpjK5pU+HPDiRY=" + }, + { + "pname": "System.IO.Compression", + "version": "4.3.0", + "hash": "sha256-f5PrQlQgj5Xj2ZnHxXW8XiOivaBvfqDao9Sb6AVinyA=" + }, + { + "pname": "System.IO.Compression.ZipFile", + "version": "4.3.0", + "hash": "sha256-WQl+JgWs+GaRMeiahTFUbrhlXIHapzcpTFXbRvAtvvs=" + }, + { + "pname": "System.IO.FileSystem", + "version": "4.3.0", + "hash": "sha256-vNIYnvlayuVj0WfRfYKpDrhDptlhp1pN8CYmlVd2TXw=" + }, + { + "pname": "System.IO.FileSystem.Primitives", + "version": "4.3.0", + "hash": "sha256-LMnfg8Vwavs9cMnq9nNH8IWtAtSfk0/Fy4s4Rt9r1kg=" + }, + { + "pname": "System.Linq", + "version": "4.3.0", + "hash": "sha256-R5uiSL3l6a3XrXSSL6jz+q/PcyVQzEAByiuXZNSqD/A=" + }, + { + "pname": "System.Linq.Expressions", + "version": "4.3.0", + "hash": "sha256-+3pvhZY7rip8HCbfdULzjlC9FPZFpYoQxhkcuFm2wk8=" + }, + { + "pname": "System.Memory", + "version": "4.5.5", + "hash": "sha256-EPQ9o1Kin7KzGI5O3U3PUQAZTItSbk9h/i4rViN3WiI=" + }, + { + "pname": "System.Net.Http", + "version": "4.3.0", + "hash": "sha256-UoBB7WPDp2Bne/fwxKF0nE8grJ6FzTMXdT/jfsphj8Q=" + }, + { + "pname": "System.Net.NameResolution", + "version": "4.3.0", + "hash": "sha256-eGZwCBExWsnirWBHyp2sSSSXp6g7I6v53qNmwPgtJ5c=" + }, + { + "pname": "System.Net.Primitives", + "version": "4.3.0", + "hash": "sha256-MY7Z6vOtFMbEKaLW9nOSZeAjcWpwCtdO7/W1mkGZBzE=" + }, + { + "pname": "System.Net.Sockets", + "version": "4.3.0", + "hash": "sha256-il7dr5VT/QWDg/0cuh+4Es2u8LY//+qqiY9BZmYxSus=" + }, + { + "pname": "System.ObjectModel", + "version": "4.3.0", + "hash": "sha256-gtmRkWP2Kwr3nHtDh0yYtce38z1wrGzb6fjm4v8wN6Q=" + }, + { + "pname": "System.Private.Uri", + "version": "4.3.0", + "hash": "sha256-fVfgcoP4AVN1E5wHZbKBIOPYZ/xBeSIdsNF+bdukIRM=" + }, + { + "pname": "System.Reflection", + "version": "4.3.0", + "hash": "sha256-NQSZRpZLvtPWDlvmMIdGxcVuyUnw92ZURo0hXsEshXY=" + }, + { + "pname": "System.Reflection.Emit", + "version": "4.3.0", + "hash": "sha256-5LhkDmhy2FkSxulXR+bsTtMzdU3VyyuZzsxp7/DwyIU=" + }, + { + "pname": "System.Reflection.Emit.ILGeneration", + "version": "4.3.0", + "hash": "sha256-mKRknEHNls4gkRwrEgi39B+vSaAz/Gt3IALtS98xNnA=" + }, + { + "pname": "System.Reflection.Emit.Lightweight", + "version": "4.3.0", + "hash": "sha256-rKx4a9yZKcajloSZHr4CKTVJ6Vjh95ni+zszPxWjh2I=" + }, + { + "pname": "System.Reflection.Extensions", + "version": "4.3.0", + "hash": "sha256-mMOCYzUenjd4rWIfq7zIX9PFYk/daUyF0A8l1hbydAk=" + }, + { + "pname": "System.Reflection.Primitives", + "version": "4.3.0", + "hash": "sha256-5ogwWB4vlQTl3jjk1xjniG2ozbFIjZTL9ug0usZQuBM=" + }, + { + "pname": "System.Reflection.TypeExtensions", + "version": "4.3.0", + "hash": "sha256-4U4/XNQAnddgQIHIJq3P2T80hN0oPdU2uCeghsDTWng=" + }, + { + "pname": "System.Reflection.TypeExtensions", + "version": "4.4.0", + "hash": "sha256-sGgfV4pG9Kr+PLAR/DyRGiTP09Tkvol9U/WLSwkPOVk=" + }, + { + "pname": "System.Resources.ResourceManager", + "version": "4.3.0", + "hash": "sha256-idiOD93xbbrbwwSnD4mORA9RYi/D/U48eRUsn/WnWGo=" + }, + { + "pname": "System.Runtime", + "version": "4.3.0", + "hash": "sha256-51813WXpBIsuA6fUtE5XaRQjcWdQ2/lmEokJt97u0Rg=" + }, + { + "pname": "System.Runtime.CompilerServices.Unsafe", + "version": "4.5.3", + "hash": "sha256-lnZMUqRO4RYRUeSO8HSJ9yBHqFHLVbmenwHWkIU20ak=" + }, + { + "pname": "System.Runtime.Extensions", + "version": "4.3.0", + "hash": "sha256-wLDHmozr84v1W2zYCWYxxj0FR0JDYHSVRaRuDm0bd/o=" + }, + { + "pname": "System.Runtime.Handles", + "version": "4.3.0", + "hash": "sha256-KJ5aXoGpB56Y6+iepBkdpx/AfaJDAitx4vrkLqR7gms=" + }, + { + "pname": "System.Runtime.InteropServices", + "version": "4.3.0", + "hash": "sha256-8sDH+WUJfCR+7e4nfpftj/+lstEiZixWUBueR2zmHgI=" + }, + { + "pname": "System.Runtime.InteropServices.RuntimeInformation", + "version": "4.3.0", + "hash": "sha256-MYpl6/ZyC6hjmzWRIe+iDoldOMW1mfbwXsduAnXIKGA=" + }, + { + "pname": "System.Runtime.Numerics", + "version": "4.3.0", + "hash": "sha256-P5jHCgMbgFMYiONvzmaKFeOqcAIDPu/U8bOVrNPYKqc=" + }, + { + "pname": "System.Runtime.Serialization.Primitives", + "version": "4.3.0", + "hash": "sha256-zu5m1M9usend+i9sbuD6Xbizdo8Z6N5PEF9DAtEVewc=" + }, + { + "pname": "System.Security.Claims", + "version": "4.3.0", + "hash": "sha256-Fua/rDwAqq4UByRVomAxMPmDBGd5eImRqHVQIeSxbks=" + }, + { + "pname": "System.Security.Cryptography.Algorithms", + "version": "4.3.0", + "hash": "sha256-tAJvNSlczYBJ3Ed24Ae27a55tq/n4D3fubNQdwcKWA8=" + }, + { + "pname": "System.Security.Cryptography.Cng", + "version": "4.3.0", + "hash": "sha256-u17vy6wNhqok91SrVLno2M1EzLHZm6VMca85xbVChsw=" + }, + { + "pname": "System.Security.Cryptography.Csp", + "version": "4.3.0", + "hash": "sha256-oefdTU/Z2PWU9nlat8uiRDGq/PGZoSPRgkML11pmvPQ=" + }, + { + "pname": "System.Security.Cryptography.Encoding", + "version": "4.3.0", + "hash": "sha256-Yuge89N6M+NcblcvXMeyHZ6kZDfwBv3LPMDiF8HhJss=" + }, + { + "pname": "System.Security.Cryptography.OpenSsl", + "version": "4.3.0", + "hash": "sha256-DL+D2sc2JrQiB4oAcUggTFyD8w3aLEjJfod5JPe+Oz4=" + }, + { + "pname": "System.Security.Cryptography.Primitives", + "version": "4.3.0", + "hash": "sha256-fnFi7B3SnVj5a+BbgXnbjnGNvWrCEU6Hp/wjsjWz318=" + }, + { + "pname": "System.Security.Cryptography.ProtectedData", + "version": "5.0.0", + "hash": "sha256-K3TEOJ93azzLMiitzYdhJHrBfRvqoUa5bl44VSTLAUs=" + }, + { + "pname": "System.Security.Cryptography.X509Certificates", + "version": "4.3.0", + "hash": "sha256-MG3V/owDh273GCUPsGGraNwaVpcydupl3EtPXj6TVG0=" + }, + { + "pname": "System.Security.Principal", + "version": "4.3.0", + "hash": "sha256-rjudVUHdo8pNJg2EVEn0XxxwNo5h2EaYo+QboPkXlYk=" + }, + { + "pname": "System.Security.Principal.Windows", + "version": "4.3.0", + "hash": "sha256-mbdLVUcEwe78p3ZnB6jYsizNEqxMaCAWI3tEQNhRQAE=" + }, + { + "pname": "System.Text.Encoding", + "version": "4.3.0", + "hash": "sha256-GctHVGLZAa/rqkBNhsBGnsiWdKyv6VDubYpGkuOkBLg=" + }, + { + "pname": "System.Text.Encoding.Extensions", + "version": "4.3.0", + "hash": "sha256-vufHXg8QAKxHlujPHHcrtGwAqFmsCD6HKjfDAiHyAYc=" + }, + { + "pname": "System.Text.RegularExpressions", + "version": "4.3.0", + "hash": "sha256-VLCk1D1kcN2wbAe3d0YQM/PqCsPHOuqlBY1yd2Yo+K0=" + }, + { + "pname": "System.Threading", + "version": "4.3.0", + "hash": "sha256-ZDQ3dR4pzVwmaqBg4hacZaVenQ/3yAF/uV7BXZXjiWc=" + }, + { + "pname": "System.Threading.Tasks", + "version": "4.3.0", + "hash": "sha256-Z5rXfJ1EXp3G32IKZGiZ6koMjRu0n8C1NGrwpdIen4w=" + }, + { + "pname": "System.Threading.Tasks.Extensions", + "version": "4.3.0", + "hash": "sha256-X2hQ5j+fxcmnm88Le/kSavjiGOmkcumBGTZKBLvorPc=" + }, + { + "pname": "System.Threading.ThreadPool", + "version": "4.3.0", + "hash": "sha256-wW0QdvssRoaOfQLazTGSnwYTurE4R8FxDx70pYkL+gg=" + }, + { + "pname": "System.Threading.Timer", + "version": "4.3.0", + "hash": "sha256-pmhslmhQhP32TWbBzoITLZ4BoORBqYk25OWbru04p9s=" + }, + { + "pname": "System.ValueTuple", + "version": "4.4.0", + "hash": "sha256-LqpI3bSaXqVPqfEdfsWE2qX9tzFV6VPU6x4A/fVzzfM=" + }, + { + "pname": "System.ValueTuple", + "version": "4.5.0", + "hash": "sha256-niH6l2fU52vAzuBlwdQMw0OEoRS/7E1w5smBFoqSaAI=" + }, + { + "pname": "System.Xml.ReaderWriter", + "version": "4.3.0", + "hash": "sha256-QQ8KgU0lu4F5Unh+TbechO//zaAGZ4MfgvW72Cn1hzA=" + }, + { + "pname": "System.Xml.XDocument", + "version": "4.3.0", + "hash": "sha256-rWtdcmcuElNOSzCehflyKwHkDRpiOhJJs8CeQ0l1CCI=" + }, + { + "pname": "System.Xml.XmlDocument", + "version": "4.3.0", + "hash": "sha256-kbuV4Y7rVJkfMp2Kgoi8Zvdatm9CZNmlKB3GZgANvy4=" + } +] diff --git a/pkgs/by-name/qb/qbittorrent-cli/package.nix b/pkgs/by-name/qb/qbittorrent-cli/package.nix new file mode 100644 index 0000000000000..40d3dac0e71f4 --- /dev/null +++ b/pkgs/by-name/qb/qbittorrent-cli/package.nix @@ -0,0 +1,63 @@ +{ + lib, + buildDotnetModule, + fetchFromGitHub, + versionCheckHook, + nix-update-script, +}: +let + version = "1.8.24285.1"; +in +buildDotnetModule { + pname = "qbittorrent-cli"; + inherit version; + + src = fetchFromGitHub { + owner = "fedarovich"; + repo = "qbittorrent-cli"; + tag = "v${version}"; + hash = "sha256-ZGK8nicaXlDIShACeF4QS0BOCZCN0T4JFtHuuFoXhBw="; + }; + + nugetDeps = ./deps.json; + dotnetBuildFlags = [ + "-f" + "net6" + ]; + dotnetInstallFlags = [ + "-f" + "net6" + ]; + selfContainedBuild = true; + + projectFile = "src/QBittorrent.CommandLineInterface/QBittorrent.CommandLineInterface.csproj"; + executables = [ "qbt" ]; + + nativeInstallCheckInputs = [ + versionCheckHook + ]; + + versionCheckProgram = "${placeholder "out"}/bin/qbt"; + versionCheckProgramArg = [ "--version" ]; + doInstallCheck = true; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Command line interface for qBittorrent"; + homepage = "https://github.com/fedarovich/qbittorrent-cli"; + changelog = "https://github.com/fedarovich/qbittorrent-cli/releases/tag/v${version}"; + license = with lib.licenses; [ + mit + ]; + platforms = lib.platforms.unix; + badPlatforms = [ + # error NETSDK1084: There is no application host available for the specified RuntimeIdentifier 'osx-arm64' + "aarch64-darwin" + ]; + maintainers = with lib.maintainers; [ + pta2002 + ]; + mainProgram = "qbt"; + }; +} diff --git a/pkgs/by-name/qo/qownnotes/package.nix b/pkgs/by-name/qo/qownnotes/package.nix index 08e95d1f341f5..d738a084f31d7 100644 --- a/pkgs/by-name/qo/qownnotes/package.nix +++ b/pkgs/by-name/qo/qownnotes/package.nix @@ -10,19 +10,18 @@ nixosTests, installShellFiles, xvfb-run, + versionCheckHook, + nix-update-script, }: -let +stdenv.mkDerivation (finalAttrs: { pname = "qownnotes"; appname = "QOwnNotes"; - version = "25.1.5"; -in -stdenv.mkDerivation { - inherit pname version; + version = "25.1.6"; src = fetchurl { - url = "https://github.com/pbek/QOwnNotes/releases/download/v${version}/qownnotes-${version}.tar.xz"; - hash = "sha256-Qr5pkKznosUGO7HvUkZhemWwtKpyYA79Vz1jU6YhODE="; + url = "https://github.com/pbek/QOwnNotes/releases/download/v${finalAttrs.version}/qownnotes-${finalAttrs.version}.tar.xz"; + hash = "sha256-EmkOuxXH7XSpWrw3rtLPQ4XCX93RDbhnUR1edsNVJLk="; }; nativeBuildInputs = @@ -52,44 +51,54 @@ stdenv.mkDerivation { # Install shell completion on Linux (with xvfb-run) postInstall = lib.optionalString stdenv.hostPlatform.isLinux '' - installShellCompletion --cmd ${appname} \ - --bash <(xvfb-run $out/bin/${appname} --completion bash) \ - --fish <(xvfb-run $out/bin/${appname} --completion fish) - installShellCompletion --cmd ${pname} \ - --bash <(xvfb-run $out/bin/${appname} --completion bash) \ - --fish <(xvfb-run $out/bin/${appname} --completion fish) + installShellCompletion --cmd ${finalAttrs.appname} \ + --bash <(xvfb-run $out/bin/${finalAttrs.appname} --completion bash) \ + --fish <(xvfb-run $out/bin/${finalAttrs.appname} --completion fish) + installShellCompletion --cmd ${finalAttrs.pname} \ + --bash <(xvfb-run $out/bin/${finalAttrs.appname} --completion bash) \ + --fish <(xvfb-run $out/bin/${finalAttrs.appname} --completion fish) '' # Install shell completion on macOS + lib.optionalString stdenv.isDarwin '' - installShellCompletion --cmd ${pname} \ - --bash <($out/bin/${appname} --completion bash) \ - --fish <($out/bin/${appname} --completion fish) + installShellCompletion --cmd ${finalAttrs.pname} \ + --bash <($out/bin/${finalAttrs.appname} --completion bash) \ + --fish <($out/bin/${finalAttrs.appname} --completion fish) '' # Create a lowercase symlink for Linux + lib.optionalString stdenv.hostPlatform.isLinux '' - ln -s $out/bin/${appname} $out/bin/${pname} + ln -s $out/bin/${finalAttrs.appname} $out/bin/${finalAttrs.pname} '' # Rename application for macOS as lowercase binary + lib.optionalString stdenv.hostPlatform.isDarwin '' # Prevent "same file" error - mv $out/bin/${appname} $out/bin/${pname}.bin - mv $out/bin/${pname}.bin $out/bin/${pname} + mv $out/bin/${finalAttrs.appname} $out/bin/${finalAttrs.pname}.bin + mv $out/bin/${finalAttrs.pname}.bin $out/bin/${finalAttrs.pname} ''; # Tests QOwnNotes using the NixOS module by launching xterm: passthru.tests.basic-nixos-module-functionality = nixosTests.qownnotes; - meta = with lib; { + nativeInstallCheckInputs = [ + versionCheckHook + ]; + versionCheckProgramArg = [ "--version" ]; + doInstallCheck = true; + + passthru = { + updateScript = nix-update-script { }; + }; + + meta = { description = "Plain-text file notepad and todo-list manager with markdown support and Nextcloud/ownCloud integration"; homepage = "https://www.qownnotes.org/"; changelog = "https://www.qownnotes.org/changelog.html"; - downloadPage = "https://github.com/pbek/QOwnNotes/releases/tag/v${version}"; - license = licenses.gpl2Only; - maintainers = with maintainers; [ + downloadPage = "https://github.com/pbek/QOwnNotes/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.gpl2Only; + maintainers = with lib.maintainers; [ pbek totoroot matthiasbeyer ]; - platforms = platforms.unix; + platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/qu/quill-log/package.nix b/pkgs/by-name/qu/quill-log/package.nix index d8d9d9c13d76d..65c7d5fa2c8f7 100644 --- a/pkgs/by-name/qu/quill-log/package.nix +++ b/pkgs/by-name/qu/quill-log/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "quill-log"; - version = "8.0.0"; + version = "8.1.0"; src = fetchFromGitHub { owner = "odygrd"; repo = "quill"; rev = "v${version}"; - hash = "sha256-vwi5TU9yIdMgVXwPrhGcmmZtpq57DoVok38NY+hKlkU="; + hash = "sha256-bzu+IKURT/+WPfmsUlzLrXqY2l62CLolqwWg2BwGnO0="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/re/redpanda-client/package.nix b/pkgs/by-name/re/redpanda-client/package.nix index 42e796dc95b43..2fa9953df4ee3 100644 --- a/pkgs/by-name/re/redpanda-client/package.nix +++ b/pkgs/by-name/re/redpanda-client/package.nix @@ -7,12 +7,12 @@ stdenv, }: let - version = "24.3.3"; + version = "24.3.4"; src = fetchFromGitHub { owner = "redpanda-data"; repo = "redpanda"; rev = "v${version}"; - sha256 = "sha256-jhk8hhnTkmkMeaoFZNfqZW31KFR/16pAEhq/wXnFfMg="; + sha256 = "sha256-2VBichdsUM5cBAyRjMP2bECeMIQ60EYp832QNQ9UClk="; }; in buildGoModule rec { diff --git a/pkgs/by-name/re/refine/package.nix b/pkgs/by-name/re/refine/package.nix index bfad38b7fcd8d..91f7bd1a0271c 100644 --- a/pkgs/by-name/re/refine/package.nix +++ b/pkgs/by-name/re/refine/package.nix @@ -34,7 +34,7 @@ in python3Packages.buildPythonApplication rec { pname = "refine"; - version = "0.4.0"; + version = "0.4.2"; pyproject = false; # uses meson src = fetchFromGitLab { @@ -42,7 +42,7 @@ python3Packages.buildPythonApplication rec { owner = "TheEvilSkeleton"; repo = "Refine"; tag = version; - hash = "sha256-dgp2a/+Du2mEPQ4EPmOPvKsklrWI2zD1rPJnhE7LetQ="; + hash = "sha256-5oXLcmj0ZWYaCP93S+tSTqFn+XnrUkE/VwiA3ufvSQ0="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/re/regal/package.nix b/pkgs/by-name/re/regal/package.nix index 8bf887a6f5d4d..b67923d4e0130 100644 --- a/pkgs/by-name/re/regal/package.nix +++ b/pkgs/by-name/re/regal/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { name = "regal"; - version = "0.30.0"; + version = "0.30.2"; src = fetchFromGitHub { owner = "StyraInc"; repo = "regal"; rev = "v${version}"; - hash = "sha256-sr+tGfKDSgJ5SiHihJ/aMAn6AnAC8bEb838+xYdFosc="; + hash = "sha256-HlopAz+AqpjZ/NpVVvkiR0p7+ezWlr5ddLMK/LobxpM="; }; - vendorHash = "sha256-6JheW6JHkAidZda7WWHSfEAuPYoBdli8wWHp2sX2r5Q="; + vendorHash = "sha256-0B8MOF+ovJ1memBuXtEeMViKKWaQXX6+HQzMY91bgyI="; ldflags = [ "-s" diff --git a/pkgs/by-name/re/remind/package.nix b/pkgs/by-name/re/remind/package.nix index 1682646ca5e1f..35ae4e26e1326 100644 --- a/pkgs/by-name/re/remind/package.nix +++ b/pkgs/by-name/re/remind/package.nix @@ -16,14 +16,14 @@ tcl.mkTclDerivation rec { pname = "remind"; - version = "05.02.02"; + version = "05.02.03"; src = fetchFromGitea { domain = "git.skoll.ca"; owner = "Skollsoft-Public"; repo = "Remind"; rev = version; - hash = "sha256-GLNFj09lZ6iNUp9fuxhpD8wU7tiDIyVVBTye1naZdlM="; + hash = "sha256-4OKLBY5OcaUaSsxbOUN1b9LeUqj0rYBWsZNJ70DvcrQ="; }; propagatedBuildInputs = lib.optionals withGui [ diff --git a/pkgs/by-name/re/renode-dts2repl/package.nix b/pkgs/by-name/re/renode-dts2repl/package.nix index 3caff4d410178..01ebb6c336c7e 100644 --- a/pkgs/by-name/re/renode-dts2repl/package.nix +++ b/pkgs/by-name/re/renode-dts2repl/package.nix @@ -7,14 +7,14 @@ python3.pkgs.buildPythonApplication { pname = "renode-dts2repl"; - version = "0-unstable-2025-01-13"; + version = "0-unstable-2025-01-14"; pyproject = true; src = fetchFromGitHub { owner = "antmicro"; repo = "dts2repl"; - rev = "d9b880c36988c0500f67d2206c4b2fdf42fd6e65"; - hash = "sha256-Apu5WEwlUhO8/j84jH/CzWae17H5U1cwV7h9J8Nx5J0="; + rev = "cba1604ee130e7fa831392b315b55a142c5adc46"; + hash = "sha256-8xFixNOPFL5af+6Lbp84Z6C/ZFWsCcKPf6G4KpBbj/A="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/re/renovate/package.nix b/pkgs/by-name/re/renovate/package.nix index b3d674f1f5849..5202728adaa82 100644 --- a/pkgs/by-name/re/renovate/package.nix +++ b/pkgs/by-name/re/renovate/package.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "renovate"; - version = "39.107.0"; + version = "39.137.1"; src = fetchFromGitHub { owner = "renovatebot"; repo = "renovate"; tag = finalAttrs.version; - hash = "sha256-I2ufRvx8NZavFMKpiwgx8q8yejRUE8r7TvpSw4q56Zo="; + hash = "sha256-E3J+jEd21j5r4iaa4D2mNbWcwfwyzcaHTHiD3jBVXlQ="; }; postPatch = '' @@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = pnpm_9.fetchDeps { inherit (finalAttrs) pname version src; - hash = "sha256-ginPQvnhB8dQStipi2kGL+cdDwqobvENnrLRbC5WIHc="; + hash = "sha256-ljhRpFMafpB0xbmGVoh8Icwm0c0dr7JPqAA/6sln03w="; }; env.COREPACK_ENABLE_STRICT = 0; diff --git a/pkgs/by-name/re/repomix/package.nix b/pkgs/by-name/re/repomix/package.nix index 2db363a63a26e..be56c6e68e75b 100644 --- a/pkgs/by-name/re/repomix/package.nix +++ b/pkgs/by-name/re/repomix/package.nix @@ -8,16 +8,16 @@ buildNpmPackage rec { pname = "repomix"; - version = "0.2.15"; + version = "0.2.24"; src = fetchFromGitHub { owner = "yamadashy"; repo = "repomix"; tag = "v${version}"; - hash = "sha256-mtZkp5GZSI/3N0xe3SLaYyHDM+ncnKDjShUqAoUa13s="; + hash = "sha256-AP9wwx836AoIMnOc8JB06Kl9vfk9CQArLTsoYYdv3Rs="; }; - npmDepsHash = "sha256-F6XbNIzuRyLMQzlOoaRW/x1N4y5WbXS57zzYfhdK/jU="; + npmDepsHash = "sha256-TYDqy2itdgCO0N3WyE56txLmiTE+ZhUeWRgxHf+mvec="; nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; diff --git a/pkgs/by-name/re/resumed/package.nix b/pkgs/by-name/re/resumed/package.nix index 78d8836a55923..bc1d5ade1ed94 100644 --- a/pkgs/by-name/re/resumed/package.nix +++ b/pkgs/by-name/re/resumed/package.nix @@ -6,16 +6,16 @@ buildNpmPackage rec { pname = "resumed"; - version = "4.0.0"; + version = "4.1.0"; src = fetchFromGitHub { owner = "rbardini"; repo = "resumed"; rev = "v${version}"; - hash = "sha256-XaEK41UBKUldjRlxTzc42K/RwZ9D8kueU/6dm8n1W1U="; + hash = "sha256-kDv6kOVY8IfztmLeby2NgB5q0DtP1ajMselvr1EDQJ8="; }; - npmDepsHash = "sha256-r0wq1KGZA5b4eIQsp+dz8Inw8AQA62BK7vgfYlViIrY="; + npmDepsHash = "sha256-7Wdf8NaizgIExeX+Kc8wn5f20al0bnxRpFoPy6p40jw="; meta = with lib; { description = "Lightweight JSON Resume builder, no-frills alternative to resume-cli"; diff --git a/pkgs/by-name/re/rewatch/package.nix b/pkgs/by-name/re/rewatch/package.nix index e0ee1ebfc76b8..b94e2d35073fe 100644 --- a/pkgs/by-name/re/rewatch/package.nix +++ b/pkgs/by-name/re/rewatch/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "rewatch"; - version = "1.0.9"; + version = "1.0.10"; src = fetchFromGitHub { owner = "rescript-lang"; repo = "rewatch"; tag = "v${version}"; - hash = "sha256-y+0tBwGa7Fjrnd3O7CwZjapgXJojfgXBZyqAW3cz1Zk="; + hash = "sha256-9MowIppTEU2+g5T76qoZg2dOFyEo6uUmtZtzvuaqCrg="; }; - cargoHash = "sha256-cZTA50gm7o+vBaRNjpZI0LQkXaHIukVTBXoYMUubZgw="; + cargoHash = "sha256-QLpzDzcQjHuMlnPLXdT5H6AsiK/xw7R8+zQuyCbnIEo="; doCheck = true; diff --git a/pkgs/by-name/ri/river-bsp-layout/package.nix b/pkgs/by-name/ri/river-bsp-layout/package.nix index a5c64c60fe6ab..9a860623bd618 100644 --- a/pkgs/by-name/ri/river-bsp-layout/package.nix +++ b/pkgs/by-name/ri/river-bsp-layout/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "river-bsp-layout"; - version = "2.1.0"; + version = "2.1.1"; src = fetchFromGitHub { owner = "areif-dev"; repo = "river-bsp-layout"; rev = "v${version}"; - hash = "sha256-LRVZPAS4V5PtrqyOkKUfrZuwLqPZbLoyjn2DPxCFE2o="; + hash = "sha256-/R9v3NGsSG4JJtdk0sJX7ahRolRmJMwMP48JRmLffXc="; }; - cargoHash = "sha256-CtVyRwfIS8R48LUecKXoak+HHB5yNZ5RgguIWOhyFA8="; + cargoHash = "sha256-RnAtph7ugzkUoF0ikQeHOY1TPAQjBmZ+rXdUjsBNdDs="; meta = { homepage = "https://github.com/areif-dev/river-bsp-layout"; diff --git a/pkgs/by-name/ro/roogle/package.nix b/pkgs/by-name/ro/roogle/package.nix index 26cb21501157a..070f99dfdcb52 100644 --- a/pkgs/by-name/ro/roogle/package.nix +++ b/pkgs/by-name/ro/roogle/package.nix @@ -6,21 +6,17 @@ rustPlatform.buildRustPackage rec { pname = "roogle"; - version = "0.1.4"; + version = "1.0.2"; src = fetchFromGitHub { owner = "hkmatsumoto"; repo = pname; rev = version; - sha256 = "1h0agialbvhhiijkdnr47y7babq432limdl6ag2rmjfs7yishn4r"; + sha256 = "sha256-oeQwRcDn4X/CL+O4APmGv9T19c9oD5tCBRz4K41K1Zg="; }; - cargoHash = "sha256-CzFfFKTmBUAafk8PkkWmUkRIyO+yEhmCfN1zsLRq4Iw="; - - postInstall = '' - mkdir -p $out/share/roogle - cp -r assets $out/share/roogle - ''; + useFetchCargoVendor = true; + cargoHash = "sha256-lmRo6Q67hJ3hv0jQt6epiNOckRv0rA0a0DNEKIdDoUE="; meta = with lib; { description = "Rust API search engine which allows you to search functions by names and type signatures"; diff --git a/pkgs/by-name/ro/roslyn-ls/package.nix b/pkgs/by-name/ro/roslyn-ls/package.nix index 6e01757f51499..689b7002afe02 100644 --- a/pkgs/by-name/ro/roslyn-ls/package.nix +++ b/pkgs/by-name/ro/roslyn-ls/package.nix @@ -32,18 +32,18 @@ in buildDotnetModule rec { inherit pname dotnet-sdk dotnet-runtime; - vsVersion = "2.61.27"; + vsVersion = "2.62.18"; src = fetchFromGitHub { owner = "dotnet"; repo = "roslyn"; rev = "VSCode-CSharp-${vsVersion}"; - hash = "sha256-mqlCfgymhH/pR/GW3qZd0rmLdNezgVGZS6Q6zaNor8E="; + hash = "sha256-oy1xYM6Kd/8uAQQdvsxLNkycs9OOs7SEe+dzYc4RMeM="; }; # versioned independently from vscode-csharp # "roslyn" in here: # https://github.com/dotnet/vscode-csharp/blob/main/package.json - version = "4.13.0-3.25051.1"; + version = "4.14.0-1.25060.2"; projectFile = "src/LanguageServer/${project}/${project}.csproj"; useDotnetFromEnv = true; nugetDeps = ./deps.json; diff --git a/pkgs/by-name/ro/roslyn/package.nix b/pkgs/by-name/ro/roslyn/package.nix index 8811b92fbdc65..a69fa5fb2ad8e 100644 --- a/pkgs/by-name/ro/roslyn/package.nix +++ b/pkgs/by-name/ro/roslyn/package.nix @@ -17,7 +17,7 @@ buildDotnetModule rec { hash = "sha256-4iXabFp0LqJ8TXOrqeD+oTAocg6ZTIfijfX3s3fMJuI="; }; - dotnet-sdk = dotnetCorePackages.sdk_6_0; + dotnet-sdk = dotnetCorePackages.sdk_6_0-bin; projectFile = [ "src/NuGet/Microsoft.Net.Compilers.Toolset/Microsoft.Net.Compilers.Toolset.Package.csproj" ]; diff --git a/pkgs/by-name/rq/rqbit/package.nix b/pkgs/by-name/rq/rqbit/package.nix index f57afe0a066fe..f5205818e20a5 100644 --- a/pkgs/by-name/rq/rqbit/package.nix +++ b/pkgs/by-name/rq/rqbit/package.nix @@ -5,20 +5,20 @@ fetchFromGitHub, pkg-config, openssl, - darwin, buildNpmPackage, nodejs_20, + nix-update-script, }: let pname = "rqbit"; - version = "7.0.1"; + version = "8.0.0"; src = fetchFromGitHub { owner = "ikatson"; repo = "rqbit"; rev = "v${version}"; - hash = "sha256-Lt3HxK8fB1Xn2422wGkJ90muJjZ7r9ZHngGD/2tkaMM="; + hash = "sha256-Meztr/UxLgnbd3YwkSW0vy+D2N4mFg2v+T4nBnYiQBI="; }; rqbit-webui = buildNpmPackage { @@ -30,7 +30,7 @@ let sourceRoot = "${src.name}/crates/librqbit/webui"; - npmDepsHash = "sha256-VYPZXZx9rKLKZm5+d2wSVkoPLCQCffaeZVSi7mKRH/M="; + npmDepsHash = "sha256-vib8jpf7Jn1qv0m/dWJ4TbisByczNbtEd8hIM5ll2Q8="; installPhase = '' runHook preInstall @@ -45,15 +45,12 @@ in rustPlatform.buildRustPackage { inherit pname version src; - cargoHash = "sha256-esDUzzVm5J8fKftBfk5StJzN1YzLa1p0t7BsoxzrowI="; + useFetchCargoVendor = true; + cargoHash = "sha256-FGcws80cX0I74bVaSV6OLntPFPNanGAFm6CVHDAGbOU="; - nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ - pkg-config - ]; + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ]; - buildInputs = - lib.optionals stdenv.hostPlatform.isLinux [ openssl ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ openssl ]; preConfigure = '' mkdir -p crates/librqbit/webui/dist @@ -70,6 +67,13 @@ rustPlatform.buildRustPackage { passthru.webui = rqbit-webui; + passthru.updateScript = nix-update-script { + extraArgs = [ + "--subpackage" + "webui" + ]; + }; + meta = with lib; { description = "Bittorrent client in Rust"; homepage = "https://github.com/ikatson/rqbit"; diff --git a/pkgs/by-name/ru/rustdesk-flutter/package.nix b/pkgs/by-name/ru/rustdesk-flutter/package.nix index 0c6ecb9a6bd32..2b0e553d16099 100644 --- a/pkgs/by-name/ru/rustdesk-flutter/package.nix +++ b/pkgs/by-name/ru/rustdesk-flutter/package.nix @@ -38,7 +38,8 @@ let hash = "sha256-SbwqWapJbt6+RoqRKi+wkSH1D+Wz7JmnVbfcfKkjt8Q="; }; - cargoHash = "sha256-dDyiptG9TKes+fXx2atwx697SWH7Rltx6xVubtTn7FM="; + useFetchCargoVendor = true; + cargoHash = "sha256-4khuq/DK4sP98AMHyr/lEo1OJdqLujOIi8IgbKBY60Y="; cargoBuildFlags = [ "--package" "flutter_rust_bridge_codegen" diff --git a/pkgs/by-name/ru/rustfilt/package.nix b/pkgs/by-name/ru/rustfilt/package.nix deleted file mode 100644 index 351cfa9af57d8..0000000000000 --- a/pkgs/by-name/ru/rustfilt/package.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ - lib, - fetchFromGitHub, - rustPlatform, -}: - -rustPlatform.buildRustPackage rec { - pname = "rustfilt"; - version = "0.2.1"; - - src = fetchFromGitHub { - owner = "luser"; - repo = pname; - rev = version; - hash = "sha256-zb1tkeWmeMq7aM8hWssS/UpvGzGbfsaVYCOKBnAKwiQ="; - }; - - cargoHash = "sha256-rs2EWcvTxLVeJ0t+jLM75s+K72t+hqKzwy3oAdCZ8BE="; - - meta = with lib; { - description = "Demangle Rust symbol names using rustc-demangle"; - homepage = "https://github.com/luser/rustfilt"; - license = with licenses; [ asl20 ]; - maintainers = with maintainers; [ wykurz ]; - mainProgram = "rustfilt"; - }; -} diff --git a/pkgs/by-name/ru/rustywind/package.nix b/pkgs/by-name/ru/rustywind/package.nix index b113c86fa2e83..ccf53bc4a4929 100644 --- a/pkgs/by-name/ru/rustywind/package.nix +++ b/pkgs/by-name/ru/rustywind/package.nix @@ -14,10 +14,11 @@ rustPlatform.buildRustPackage rec { owner = "avencera"; repo = "rustywind"; rev = "v${version}"; - hash = "sha256-NRIWjmKjteJibqnOjkkUY9eKIM65H7NaRX8rn1MdXmY="; + hash = "sha256-4VpSf6ukeDbz8pRxsDt38MxMDgavAOqgzIof/3AaJ04="; }; - cargoHash = "sha256-yUODUAhWtRGCj3U9nBlw3+5dNv6vGHXmJzUd8hGKnu0="; + useFetchCargoVendor = true; + cargoHash = "sha256-zpSsDxUhQinKtjWuDeINenKedYKhPyW5u4bglmSgVdk="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security diff --git a/pkgs/by-name/ry/ryujinx/package.nix b/pkgs/by-name/ry/ryujinx/package.nix index 5ef0aa8bdb12e..c5531501898ae 100644 --- a/pkgs/by-name/ry/ryujinx/package.nix +++ b/pkgs/by-name/ry/ryujinx/package.nix @@ -34,7 +34,7 @@ buildDotnetModule rec { enableParallelBuilding = false; - dotnet-sdk = dotnetCorePackages.sdk_8_0; + dotnet-sdk = dotnetCorePackages.sdk_8_0_4xx-bin; dotnet-runtime = dotnetCorePackages.runtime_8_0; nugetDeps = ./deps.json; diff --git a/pkgs/by-name/sa/saga/package.nix b/pkgs/by-name/sa/saga/package.nix index d73a00dcd7bb3..ce6b0a4e8221b 100644 --- a/pkgs/by-name/sa/saga/package.nix +++ b/pkgs/by-name/sa/saga/package.nix @@ -34,11 +34,11 @@ stdenv.mkDerivation rec { pname = "saga"; - version = "9.7.1"; + version = "9.7.2"; src = fetchurl { url = "mirror://sourceforge/saga-gis/saga-${version}.tar.gz"; - hash = "sha256-ZPJ8OlVEqG/jmRaA7BJRsw3b1X/3tKtRcYTXqfGdJ0I="; + hash = "sha256-1nWpFGRBS49uzKl7m/4YWFI+3lvm2zKByYpR9llxsgY="; }; sourceRoot = "saga-${version}/saga-gis"; diff --git a/pkgs/by-name/sa/sage/sage-src.nix b/pkgs/by-name/sa/sage/sage-src.nix index e34dc32019c59..16ff02bcafa56 100644 --- a/pkgs/by-name/sa/sage/sage-src.nix +++ b/pkgs/by-name/sa/sage/sage-src.nix @@ -82,6 +82,13 @@ stdenv.mkDerivation rec { url = "https://github.com/sagemath/sage/commit/f10a6d04599795732c1d99e2da0a4839ccdcb4f5.diff"; hash = "sha256-xB0xg8dGLnSMdFK3/B5hkI9yzI5N3lUMhPZ89lDsp3s="; }) + + # https://github.com/sagemath/sage/pull/38749, to land in 10.6.beta6 + (fetchpatch { + name = "pari-2.17.1-update.patch"; + url = "https://github.com/sagemath/sage/compare/10.6.beta2...26f411e5939718d4439325ff669635e5a72d50e5.diff"; + hash = "sha256-Z4JwCuUDpqktAzNtVKRUbrJEh7TmCtFI7PJnOrcEbr4="; + }) ]; patches = nixPatches ++ bugfixPatches ++ packageUpgradePatches; diff --git a/pkgs/by-name/sa/sane-airscan/package.nix b/pkgs/by-name/sa/sane-airscan/package.nix index f7c0ed3ea8ac2..ee4fb89cec9cb 100644 --- a/pkgs/by-name/sa/sane-airscan/package.nix +++ b/pkgs/by-name/sa/sane-airscan/package.nix @@ -15,7 +15,7 @@ }: stdenv.mkDerivation rec { pname = "sane-airscan"; - version = "0.99.31"; + version = "0.99.32"; nativeBuildInputs = [ meson @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { owner = "alexpevzner"; repo = pname; rev = version; - sha256 = "sha256-ZSmublTne8YZM8irowPedgEr2fzPzwt1QGWU+BBTAzA="; + sha256 = "sha256-lfWdeXURWLwae9G11oIS25CsOkzTjigRDGFzdV33bTU="; }; meta = with lib; { diff --git a/pkgs/by-name/sc/scaleway-cli/package.nix b/pkgs/by-name/sc/scaleway-cli/package.nix index acf6a9fd26d34..707229ad5b520 100644 --- a/pkgs/by-name/sc/scaleway-cli/package.nix +++ b/pkgs/by-name/sc/scaleway-cli/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "scaleway-cli"; - version = "2.35.0"; + version = "2.36.0"; src = fetchFromGitHub { owner = "scaleway"; repo = "scaleway-cli"; rev = "v${version}"; - sha256 = "sha256-k+WfloaNr9qJE+y6ANgUvZnMWZjSa5YpZvHcOxk/79Q="; + sha256 = "sha256-xHHLOYdJ32Uo2TXdKPtYrbsx8kqGY5oF5zXGdsFTkd4="; }; - vendorHash = "sha256-HMZfka92iT7350tE35Hlo6KMnA21sJZBvaFoclmMsYw="; + vendorHash = "sha256-QPRUba3JUUp0wtylL21+FCTWf/BWStbOcmPwoSOeRF8="; ldflags = [ "-w" diff --git a/pkgs/by-name/sd/SDL_ttf/package.nix b/pkgs/by-name/sd/SDL_ttf/package.nix index d243dc90ab122..3f4b0e1fba1b7 100644 --- a/pkgs/by-name/sd/SDL_ttf/package.nix +++ b/pkgs/by-name/sd/SDL_ttf/package.nix @@ -50,5 +50,8 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.zlib; maintainers = lib.teams.sdl.members ++ (with lib.maintainers; [ ]); inherit (SDL.meta) platforms; + knownVulnerabilities = [ + "CVE-2022-27470" + ]; }; }) diff --git a/pkgs/by-name/sd/sdcc/package.nix b/pkgs/by-name/sd/sdcc/package.nix index e90b3b00ff38e..0f707b27bad8f 100644 --- a/pkgs/by-name/sd/sdcc/package.nix +++ b/pkgs/by-name/sd/sdcc/package.nix @@ -32,11 +32,11 @@ assert ] excludePorts == [ ]; stdenv.mkDerivation (finalAttrs: { pname = "sdcc"; - version = "4.4.0"; + version = "4.5.0"; src = fetchurl { url = "mirror://sourceforge/sdcc/sdcc-src-${finalAttrs.version}.tar.bz2"; - hash = "sha256-rowSFl6xdoDf9EsyjYh5mWMGtyQe+jqDsuOy0veQanU="; + hash = "sha256-1QMEN/tDa7HZOo29v7RrqqYGEzGPT7P1hx1ygV0e7YA="; }; outputs = [ diff --git a/pkgs/by-name/se/sedutil/package.nix b/pkgs/by-name/se/sedutil/package.nix index 5b731b9620692..946b40c512b8f 100644 --- a/pkgs/by-name/se/sedutil/package.nix +++ b/pkgs/by-name/se/sedutil/package.nix @@ -42,5 +42,6 @@ stdenv.mkDerivation rec { homepage = "https://www.drivetrust.com"; license = licenses.gpl3Plus; platforms = platforms.linux; + mainProgram = "sedutil-cli"; }; } diff --git a/pkgs/by-name/se/sentry-native/package.nix b/pkgs/by-name/se/sentry-native/package.nix index a272b26b3cfb1..6f7af52806b59 100644 --- a/pkgs/by-name/se/sentry-native/package.nix +++ b/pkgs/by-name/se/sentry-native/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "sentry-native"; - version = "0.7.18"; + version = "0.7.19"; src = fetchFromGitHub { owner = "getsentry"; repo = "sentry-native"; rev = version; - hash = "sha256-V/2SsLxhu/EenF408RnowGCeKkGpkn1i19Ic1l7Z7f8="; + hash = "sha256-N9zrXr5KwcShRfh0bFlK904FN+KPdVNmxYnLxoRkWxA="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/se/sequin/package.nix b/pkgs/by-name/se/sequin/package.nix index ce6e27be4260e..1060fa1fba0f6 100644 --- a/pkgs/by-name/se/sequin/package.nix +++ b/pkgs/by-name/se/sequin/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "sequin"; - version = "0.3.0"; + version = "0.3.1"; src = fetchFromGitHub { owner = "charmbracelet"; repo = "sequin"; tag = "v${version}"; - hash = "sha256-pGZ7QmmPIpXrRcfkbEbTZzHXHtqPwU8Cju9Q2xtSqvw="; + hash = "sha256-rszK2UZ3Eq9g+Di1lncDQIT4TlUcWZEu1SU2aE2uFHY="; }; - vendorHash = "sha256-LehOqSahbF3Nqm0/bJ0Q3mR0ds8FEXaLEvGLwzPdvU4="; + vendorHash = "sha256-mpmGd6liBzz9XPcB00ZhHaQzTid6lURD5I3EvehXsA8="; ldflags = [ "-X main.Version=${version}" diff --git a/pkgs/by-name/se/sequoia-chameleon-gnupg/package.nix b/pkgs/by-name/se/sequoia-chameleon-gnupg/package.nix index 5a522c3dfd037..674a043c2f246 100644 --- a/pkgs/by-name/se/sequoia-chameleon-gnupg/package.nix +++ b/pkgs/by-name/se/sequoia-chameleon-gnupg/package.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "sequoia-chameleon-gnupg"; - version = "0.11.2"; + version = "0.12.0"; src = fetchFromGitLab { owner = "sequoia-pgp"; repo = pname; rev = "v${version}"; - hash = "sha256-XoZA8X6lwziKFECJDPCSpqcFtJe5TsDGWvM+EgpBU3U="; + hash = "sha256-2EJDpiNYrNh8Ojhs6jSsaLV5zKExShiIor3/Tjue+y8="; }; - cargoHash = "sha256-xDQCAte+olmoMbchspNW/02NRkhwWxcgPkIXWBJsbIg="; + cargoHash = "sha256-X1mMJEVM7B7BomYVLfMPbOMrqNffidG+yYU4/4jt/DM="; nativeBuildInputs = [ rustPlatform.bindgenHook diff --git a/pkgs/by-name/sh/shadow/package.nix b/pkgs/by-name/sh/shadow/package.nix index 654a4ca8fd10e..daa2ed37560b5 100644 --- a/pkgs/by-name/sh/shadow/package.nix +++ b/pkgs/by-name/sh/shadow/package.nix @@ -56,10 +56,9 @@ stdenv.mkDerivation rec { sed 's/^\(s[ug]idperms\) = [0-9]755/\1 = 0755/' -i src/Makefile.am ''; - # Assume System V `setpgrp (void)', which is the default on GNU variants - # (`AC_FUNC_SETPGRP' is not cross-compilation capable.) + # `AC_FUNC_SETPGRP' is not cross-compilation capable. preConfigure = '' - export ac_cv_func_setpgrp_void=yes + export ac_cv_func_setpgrp_void=${if stdenv.hostPlatform.isBSD then "no" else "yes"} export shadow_cv_logdir=/var/log ''; diff --git a/pkgs/by-name/sh/shairport-sync/package.nix b/pkgs/by-name/sh/shairport-sync/package.nix index 30a24ea398384..55e8b094f8bd4 100644 --- a/pkgs/by-name/sh/shairport-sync/package.nix +++ b/pkgs/by-name/sh/shairport-sync/package.nix @@ -53,13 +53,13 @@ in stdenv.mkDerivation rec { pname = "shairport-sync"; - version = "4.3.5"; + version = "4.3.6"; src = fetchFromGitHub { repo = "shairport-sync"; owner = "mikebrady"; tag = version; - hash = "sha256-GYu/n4JoghqUHnkCiSQJYm9WSLww585WKgXTEiWGq4g="; + hash = "sha256-Pbg2yFa524OFOfvwZPS1/K+Vvn+bwtmo7Fbr919Smwc="; }; nativeBuildInputs = diff --git a/pkgs/by-name/si/signalbackup-tools/package.nix b/pkgs/by-name/si/signalbackup-tools/package.nix index 69d13e8bfe2cc..004de05929a60 100644 --- a/pkgs/by-name/si/signalbackup-tools/package.nix +++ b/pkgs/by-name/si/signalbackup-tools/package.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "signalbackup-tools"; - version = "20250122"; + version = "20250127-1"; src = fetchFromGitHub { owner = "bepaald"; repo = "signalbackup-tools"; rev = version; - hash = "sha256-rsA0i87zC6hyQa8xIyveID/nNwAD2YMG3BHYtWKxg1I="; + hash = "sha256-6JHHiT1OwLPKxA0rbGiwhwF4PiuS5yguoNtB7dpTJPI="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/si/silx/package.nix b/pkgs/by-name/si/silx/package.nix index 6b80d173da79f..24ea2f0cd497e 100644 --- a/pkgs/by-name/si/silx/package.nix +++ b/pkgs/by-name/si/silx/package.nix @@ -6,13 +6,13 @@ python3Packages.buildPythonApplication rec { pname = "silx"; - version = "2.1.2"; + version = "2.2.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-Uep/BkH3ngGDbPMVptab64SKBbOGqa0qazUoT47idqU="; + hash = "sha256-ff2YUp0GjOKAm2k+eBF+WlYlo8Z7gmUjFgTFTvOxRzI="; }; build-system = with python3Packages; [ diff --git a/pkgs/by-name/si/simdutf/package.nix b/pkgs/by-name/si/simdutf/package.nix index d15bd3ffebd5e..2cbe99cf9db13 100644 --- a/pkgs/by-name/si/simdutf/package.nix +++ b/pkgs/by-name/si/simdutf/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "simdutf"; - version = "6.0.3"; + version = "6.1.1"; src = fetchFromGitHub { owner = "simdutf"; repo = "simdutf"; rev = "v${finalAttrs.version}"; - hash = "sha256-BTnj7SUKgbJ2LM2gzw+8bSJ4+Zd6Z/KZy9B46fxIvsg="; + hash = "sha256-VAIxoTXOcWA2V+vx+AsCArkjprFiZun5BJoP1l3FGk0="; }; # Fix build on darwin diff --git a/pkgs/by-name/sk/sketchybar/package.nix b/pkgs/by-name/sk/sketchybar/package.nix index 0fa7b1deeacb8..501e14e1d2631 100644 --- a/pkgs/by-name/sk/sketchybar/package.nix +++ b/pkgs/by-name/sk/sketchybar/package.nix @@ -19,13 +19,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "sketchybar"; - version = "2.22.0"; + version = "2.22.1"; src = fetchFromGitHub { owner = "FelixKratz"; repo = "SketchyBar"; rev = "v${finalAttrs.version}"; - hash = "sha256-0082rRSfIKJFTAzmJ65ItEdLSwjFks5ZkTlVZqaWKEw="; + hash = "sha256-272lrH0ee4z4hcY4Hqt/UxjGwH6RFPEP4n0jz6Ab/+c="; }; buildInputs = [ diff --git a/pkgs/by-name/sl/slurm/package.nix b/pkgs/by-name/sl/slurm/package.nix index 97b3a45c535c1..60ccaecca0cc7 100644 --- a/pkgs/by-name/sl/slurm/package.nix +++ b/pkgs/by-name/sl/slurm/package.nix @@ -2,6 +2,8 @@ lib, stdenv, fetchFromGitHub, + runCommand, + config, pkg-config, libtool, curl, @@ -33,6 +35,8 @@ enableX11 ? true, enableGtk2 ? false, gtk2, + enableNVML ? config.cudaSupport, + nvml, }: stdenv.mkDerivation rec { @@ -113,7 +117,14 @@ stdenv.mkDerivation rec { http-parser ] ++ lib.optionals enableX11 [ xorg.xauth ] - ++ lib.optionals enableGtk2 [ gtk2 ]; + ++ lib.optionals enableGtk2 [ gtk2 ] + ++ lib.optionals enableNVML [ + (runCommand "collect-nvml" { } '' + mkdir $out + ln -s ${nvml.dev}/include $out/include + ln -s ${nvml.lib}/lib/stubs $out/lib + '') + ]; configureFlags = [ @@ -132,7 +143,8 @@ stdenv.mkDerivation rec { "--without-rpath" # Required for configure to pick up the right dlopen path ] ++ (lib.optional enableGtk2 "--disable-gtktest") - ++ (lib.optional (!enableX11) "--disable-x11"); + ++ (lib.optional (!enableX11) "--disable-x11") + ++ (lib.optional (enableNVML) "--with-nvml"); preConfigure = '' patchShebangs ./doc/html/shtml2html.py diff --git a/pkgs/by-name/so/sonarr/package.nix b/pkgs/by-name/so/sonarr/package.nix index c4a7cf65d357c..77c4a82d1aae8 100644 --- a/pkgs/by-name/so/sonarr/package.nix +++ b/pkgs/by-name/so/sonarr/package.nix @@ -69,8 +69,8 @@ buildDotnetModule { runtimeDeps = [ sqlite ]; - dotnet-sdk = dotnetCorePackages.sdk_6_0; - dotnet-runtime = dotnetCorePackages.aspnetcore_6_0; + dotnet-sdk = dotnetCorePackages.sdk_6_0-bin; + dotnet-runtime = dotnetCorePackages.aspnetcore_6_0-bin; doCheck = true; diff --git a/pkgs/by-name/so/sourcegit/deps.json b/pkgs/by-name/so/sourcegit/deps.json new file mode 100644 index 0000000000000..f76816c868533 --- /dev/null +++ b/pkgs/by-name/so/sourcegit/deps.json @@ -0,0 +1,232 @@ +[ + { + "pname": "Avalonia", + "version": "11.0.0", + "hash": "sha256-7QE0MtD1QDiG3gRx5xW33E33BXyEtASQSw+Wi3Lmy3E=" + }, + { + "pname": "Avalonia", + "version": "11.2.3", + "hash": "sha256-NUoyXJkIsgbkcKFVb10VRafM4ViHs801c/7vhu3ssUY=" + }, + { + "pname": "Avalonia.Angle.Windows.Natives", + "version": "2.1.22045.20230930", + "hash": "sha256-RxPcWUT3b/+R3Tu5E5ftpr5ppCLZrhm+OTsi0SwW3pc=" + }, + { + "pname": "Avalonia.AvaloniaEdit", + "version": "11.1.0", + "hash": "sha256-K9+hK+4aK93dyuGytYvVU25daz605+KN54hmwQYXFF8=" + }, + { + "pname": "Avalonia.BuildServices", + "version": "0.0.29", + "hash": "sha256-WPHRMNowRnYSCh88DWNBCltWsLPyOfzXGzBqLYE7tRY=" + }, + { + "pname": "Avalonia.Controls.ColorPicker", + "version": "11.2.3", + "hash": "sha256-z3ZHxVSOoOjqq+5G71jnGN1Y0i3YpAkox7cj3lNr6kg=" + }, + { + "pname": "Avalonia.Controls.DataGrid", + "version": "11.2.3", + "hash": "sha256-jIJvuYN0iym/WeOC0C7z5xj5kCZSXGoeLQ/q5qQfewM=" + }, + { + "pname": "Avalonia.Desktop", + "version": "11.2.3", + "hash": "sha256-srtZi+kDbhRtMl33l91zssBWETU5oHodKbbWyfEsb/I=" + }, + { + "pname": "Avalonia.Diagnostics", + "version": "11.2.3", + "hash": "sha256-DIGkaBff+C3BLwedw5xteR5lfzb6ecxiLt12eJVgLQc=" + }, + { + "pname": "Avalonia.Fonts.Inter", + "version": "11.2.3", + "hash": "sha256-ySsCXVpjqjCX/uYkwluSfrAoBtuq9k7fC1bFjxKC9/Q=" + }, + { + "pname": "Avalonia.FreeDesktop", + "version": "11.2.3", + "hash": "sha256-3sNemBmZE06w2ul87T5HrEeHUxXMOa9MfQhpI4AoxDY=" + }, + { + "pname": "Avalonia.Native", + "version": "11.2.3", + "hash": "sha256-2Gp98NGWcrILqF+P5PDMPRdsMby/lZiT3eWAUskFim8=" + }, + { + "pname": "Avalonia.Remote.Protocol", + "version": "11.2.3", + "hash": "sha256-dSeu7rnTD9rIvlyro2iFS52oi0vvfeaGV3kDm90BkKw=" + }, + { + "pname": "Avalonia.Skia", + "version": "11.0.0", + "hash": "sha256-A01nrs3Ij1eTo6tPmu7++T1K+Wo/H/9LvpeuOUGbQeU=" + }, + { + "pname": "Avalonia.Skia", + "version": "11.2.3", + "hash": "sha256-QBp8wTA92hGwbmNSVL4gsjrqA9CfwDPgdTiOEqcogGA=" + }, + { + "pname": "Avalonia.Themes.Fluent", + "version": "11.2.3", + "hash": "sha256-DRl+267mUtJDUJpreUj6BxDLGGYGkEEo5vDGtGguoC8=" + }, + { + "pname": "Avalonia.Themes.Simple", + "version": "11.2.3", + "hash": "sha256-UF15yTDzHmqd33siH3TJxmxaonA51dzga+hmCUahn1k=" + }, + { + "pname": "Avalonia.Win32", + "version": "11.2.3", + "hash": "sha256-xKFKObvqdJaQjphEktRJvzmAoDEsKg3WqlEG31V3qLE=" + }, + { + "pname": "Avalonia.X11", + "version": "11.2.3", + "hash": "sha256-SD4dmpKx4l8YOyUnrA0fnf2Bb+tHSNyARh7GAtHyg60=" + }, + { + "pname": "AvaloniaEdit.TextMate", + "version": "11.1.0", + "hash": "sha256-Nv52bUxA02VcsKCbMqEAkNBl46gznSivRZ3llLHrhkM=" + }, + { + "pname": "CommunityToolkit.Mvvm", + "version": "8.3.2", + "hash": "sha256-zY+iB5Rj/8ru0xpRWwFLFO6JI3UFB/XHnx9pWmrZCAs=" + }, + { + "pname": "HarfBuzzSharp", + "version": "7.3.0.2", + "hash": "sha256-ibgoqzT1NV7Qo5e7X2W6Vt7989TKrkd2M2pu+lhSDg8=" + }, + { + "pname": "HarfBuzzSharp", + "version": "7.3.0.3", + "hash": "sha256-1vDIcG1aVwVABOfzV09eAAbZLFJqibip9LaIx5k+JxM=" + }, + { + "pname": "HarfBuzzSharp.NativeAssets.Linux", + "version": "7.3.0.3", + "hash": "sha256-HW5r16wdlgDMbE/IfE5AQGDVFJ6TS6oipldfMztx+LM=" + }, + { + "pname": "HarfBuzzSharp.NativeAssets.macOS", + "version": "7.3.0.3", + "hash": "sha256-UpAVfRIYY8Wh8xD4wFjrXHiJcvlBLuc2Xdm15RwQ76w=" + }, + { + "pname": "HarfBuzzSharp.NativeAssets.WebAssembly", + "version": "7.3.0.3", + "hash": "sha256-jHrU70rOADAcsVfVfozU33t/5B5Tk0CurRTf4fVQe3I=" + }, + { + "pname": "HarfBuzzSharp.NativeAssets.Win32", + "version": "7.3.0.3", + "hash": "sha256-v/PeEfleJcx9tsEQAo5+7Q0XPNgBqiSLNnB2nnAGp+I=" + }, + { + "pname": "LiveChartsCore", + "version": "2.0.0-rc4.5", + "hash": "sha256-2Fgn9Bo1aM6dZHCU+OVykOhggTzpcEfFNfYtWc4yvHc=" + }, + { + "pname": "LiveChartsCore.SkiaSharpView", + "version": "2.0.0-rc4.5", + "hash": "sha256-03RR14tA0DtYHiLdgmAI4Gp5/e2H6QPkNFOBeqiFaJU=" + }, + { + "pname": "LiveChartsCore.SkiaSharpView.Avalonia", + "version": "2.0.0-rc4.5", + "hash": "sha256-lzG/5e6WDpUiHZ8GvovOMvwXyYoVBeB1Ktuuw2Fx5No=" + }, + { + "pname": "MicroCom.Runtime", + "version": "0.11.0", + "hash": "sha256-VdwpP5fsclvNqJuppaOvwEwv2ofnAI5ZSz2V+UEdLF0=" + }, + { + "pname": "Onigwrap", + "version": "1.0.6", + "hash": "sha256-p+dhMfIH4C6xLKRUREnUpC0DZwFazjvI+30KRT8TWnU=" + }, + { + "pname": "SkiaSharp", + "version": "2.88.8", + "hash": "sha256-rD5gc4SnlRTXwz367uHm8XG5eAIQpZloGqLRGnvNu0A=" + }, + { + "pname": "SkiaSharp", + "version": "2.88.9", + "hash": "sha256-jZ/4nVXYJtrz9SBf6sYc/s0FxS7ReIYM4kMkrhZS+24=" + }, + { + "pname": "SkiaSharp.HarfBuzz", + "version": "2.88.8", + "hash": "sha256-W9jNuEo/8q+k2aHNC19FfKcBUIEWx2zDcGwM+jDZ1o8=" + }, + { + "pname": "SkiaSharp.NativeAssets.Linux", + "version": "2.88.9", + "hash": "sha256-mQ/oBaqRR71WfS66mJCvcc3uKW7CNEHoPN2JilDbw/A=" + }, + { + "pname": "SkiaSharp.NativeAssets.macOS", + "version": "2.88.9", + "hash": "sha256-qvGuAmjXGjGKMzOPBvP9VWRVOICSGb7aNVejU0lLe/g=" + }, + { + "pname": "SkiaSharp.NativeAssets.WebAssembly", + "version": "2.88.9", + "hash": "sha256-vgFL4Pdy3O1RKBp+T9N3W4nkH9yurZ0suo8u3gPmmhY=" + }, + { + "pname": "SkiaSharp.NativeAssets.Win32", + "version": "2.88.9", + "hash": "sha256-kP5XM5GgwHGfNJfe4T2yO5NIZtiF71Ddp0pd1vG5V/4=" + }, + { + "pname": "System.IO.Pipelines", + "version": "8.0.0", + "hash": "sha256-LdpB1s4vQzsOODaxiKstLks57X9DTD5D6cPx8DE1wwE=" + }, + { + "pname": "System.Text.Json", + "version": "8.0.5", + "hash": "sha256-yKxo54w5odWT6nPruUVsaX53oPRe+gKzGvLnnxtwP68=" + }, + { + "pname": "TextMateSharp", + "version": "1.0.59", + "hash": "sha256-qfAGSgVpTrWMZSk0TFDVP1IgWWi6O1jEEvWc0Pvw9i0=" + }, + { + "pname": "TextMateSharp", + "version": "1.0.65", + "hash": "sha256-kZx3CBDzu7qUSnihs9Q4Ck78ih1aJ+0g8cN8Hke+E5w=" + }, + { + "pname": "TextMateSharp.Grammars", + "version": "1.0.59", + "hash": "sha256-ru5VxQK4PFRJhHu+MvCzDt3EwbC/94n1whtDovUAUDA=" + }, + { + "pname": "TextMateSharp.Grammars", + "version": "1.0.65", + "hash": "sha256-tZx/GKYX3bomQFVFaEgneNYHpB74v+8D90IfkYImlhE=" + }, + { + "pname": "Tmds.DBus.Protocol", + "version": "0.20.0", + "hash": "sha256-CRW/tkgsuBiBJfRwou12ozRQsWhHDooeP88E5wWpWJw=" + } +] diff --git a/pkgs/by-name/so/sourcegit/fix-darwin-git-path.patch b/pkgs/by-name/so/sourcegit/fix-darwin-git-path.patch new file mode 100644 index 0000000000000..790fd218e789d --- /dev/null +++ b/pkgs/by-name/so/sourcegit/fix-darwin-git-path.patch @@ -0,0 +1,31 @@ +diff --git a/src/Native/Linux.cs b/src/Native/Linux.cs +index a24f1b6..4102274 100644 +--- a/src/Native/Linux.cs ++++ b/src/Native/Linux.cs +@@ -97,7 +97,7 @@ namespace SourceGit.Native + } + } + +- private string FindExecutable(string filename) ++ public static string FindExecutable(string filename) + { + var pathVariable = Environment.GetEnvironmentVariable("PATH") ?? string.Empty; + var pathes = pathVariable.Split(Path.PathSeparator, StringSplitOptions.RemoveEmptyEntries); +diff --git a/src/Native/MacOS.cs b/src/Native/MacOS.cs +index 5721fe8..bc2a57d 100644 +--- a/src/Native/MacOS.cs ++++ b/src/Native/MacOS.cs +@@ -25,12 +25,7 @@ namespace SourceGit.Native + + public string FindGitExecutable() + { +- var gitPathVariants = new List() { +- "/usr/bin/git", "/usr/local/bin/git", "/opt/homebrew/bin/git", "/opt/homebrew/opt/git/bin/git" +- }; +- foreach (var path in gitPathVariants) +- if (File.Exists(path)) return path; +- return string.Empty; ++ return Linux.FindExecutable("git"); + } + + public string FindTerminal(Models.ShellOrTerminal shell) diff --git a/pkgs/by-name/so/sourcegit/package.nix b/pkgs/by-name/so/sourcegit/package.nix new file mode 100644 index 0000000000000..72ac096171054 --- /dev/null +++ b/pkgs/by-name/so/sourcegit/package.nix @@ -0,0 +1,117 @@ +{ + lib, + stdenv, + buildDotnetModule, + fetchFromGitHub, + dotnetCorePackages, + copyDesktopItems, + makeDesktopItem, + libicns, + + libXcursor, + libXext, + libXi, + libXrandr, + + git, + xdg-utils, +}: + +buildDotnetModule (finalAttrs: { + pname = "sourcegit"; + version = "2025.01"; + + src = fetchFromGitHub { + owner = "sourcegit-scm"; + repo = "sourcegit"; + tag = "v${finalAttrs.version}"; + hash = "sha256-6FO0WRUcWm7xnuw6Br97+cWZhvzIOesg/eANZzeyxZo="; + }; + + patches = [ ./fix-darwin-git-path.patch ]; + + dotnet-sdk = dotnetCorePackages.sdk_9_0; + dotnet-runtime = dotnetCorePackages.runtime_9_0; + + nugetDeps = ./deps.json; + + projectFile = [ "src/SourceGit.csproj" ]; + + executables = [ "SourceGit" ]; + + dotnetFlags = [ + "-p:DisableUpdateDetection=true" + "-p:DisableAOT=true" + ]; + + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ + copyDesktopItems + libicns + ]; + + # these are dlopen-ed at runtime + # libXi is needed for right-click support + # not sure about what the other ones are needed for, but I'll include them anyways + runtimeDeps = [ + libXcursor + libXext + libXi + libXrandr + ]; + + # Note: users can use `.overrideAttrs` to append to this list + runtimePathDeps = [ + git + xdg-utils + ]; + + # add fallback binaries to use if the user doesn't already have them in their PATH + preInstall = '' + makeWrapperArgs+=( + --suffix PATH : ${lib.makeBinPath finalAttrs.runtimePathDeps} + ) + ''; + + desktopItems = [ + (makeDesktopItem { + name = "SourceGit"; + exec = "SourceGit"; + icon = "SourceGit"; + desktopName = "SourceGit"; + terminal = false; + comment = finalAttrs.meta.description; + }) + ]; + + postInstall = + lib.optionalString stdenv.hostPlatform.isLinux '' + # extract the .icns file into multiple .png files + # where the format of the .png file names is App_"$n"x"$n"x32.png + + icns2png -x build/resources/app/App.icns + + for f in App_*x32.png; do + res=''${f//App_} + res=''${res//x32.png} + install -Dm644 $f "$out/share/icons/hicolor/$res/apps/SourceGit.png" + done + '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' + install -Dm644 build/resources/app/App.icns $out/Applications/SourceGit.app/Contents/Resources/App.icns + + substitute build/resources/app/App.plist $out/Applications/SourceGit.app/Contents/Info.plist \ + --replace-fail "SOURCE_GIT_VERSION" "${finalAttrs.version}" + + mkdir -p $out/Applications/SourceGit.app/Contents/MacOS + ln -s $out/bin/SourceGit $out/Applications/SourceGit.app/Contents/MacOS/SourceGit + ''; + + meta = { + changelog = "https://github.com/sourcegit-scm/sourcegit/releases/tag/${finalAttrs.src.tag}"; + description = "Free & OpenSource GUI client for GIT users"; + homepage = "https://github.com/sourcegit-scm/sourcegit"; + license = lib.licenses.mit; + mainProgram = "SourceGit"; + maintainers = with lib.maintainers; [ tomasajt ]; + }; +}) diff --git a/pkgs/by-name/sp/spring-boot-cli/package.nix b/pkgs/by-name/sp/spring-boot-cli/package.nix index b741dab8889a4..60ba89ab63732 100644 --- a/pkgs/by-name/sp/spring-boot-cli/package.nix +++ b/pkgs/by-name/sp/spring-boot-cli/package.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "spring-boot-cli"; - version = "3.4.1"; + version = "3.4.2"; src = fetchzip { url = "mirror://maven/org/springframework/boot/spring-boot-cli/${finalAttrs.version}/spring-boot-cli-${finalAttrs.version}-bin.zip"; - hash = "sha256-XJGopVQclKVfVXNlHj9LXu8Kt3hcfsajH5p63k6nQ94="; + hash = "sha256-pxGibIyg4C902pmth1rsgMb95yNVyYQenFmbQLDZSEo="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/sq/sql-formatter/package.nix b/pkgs/by-name/sq/sql-formatter/package.nix index b0d04027dab25..4ff946655c774 100644 --- a/pkgs/by-name/sq/sql-formatter/package.nix +++ b/pkgs/by-name/sq/sql-formatter/package.nix @@ -11,13 +11,13 @@ }: stdenv.mkDerivation rec { pname = "sql-formatter"; - version = "15.4.9"; + version = "15.4.10"; src = fetchFromGitHub { owner = "sql-formatter-org"; repo = "sql-formatter"; rev = "v${version}"; - hash = "sha256-rCM/RDyWGBAobsiODIujkcjkqM4uSFPdRfvPqgIJQaY="; + hash = "sha256-KRF4AFBkXzy9wYBTTsc4LvlLNbSohzbdbue+SZjNTJo="; }; yarnOfflineCache = fetchYarnDeps { diff --git a/pkgs/by-name/sq/sqldef/package.nix b/pkgs/by-name/sq/sqldef/package.nix index f2fb511a71b70..c84ebe37adcc0 100644 --- a/pkgs/by-name/sq/sqldef/package.nix +++ b/pkgs/by-name/sq/sqldef/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "sqldef"; - version = "0.17.27"; + version = "0.17.28"; src = fetchFromGitHub { owner = "sqldef"; repo = "sqldef"; rev = "v${version}"; - hash = "sha256-h0WOd3w6G9jmdhKzfD0AtdTzeLZgEPQ9LPlbIsASm34="; + hash = "sha256-DfH+5QArv3aI3ECQ5XK/mjNsKbZ4yEEY3LFZPuPvxDo="; }; proxyVendor = true; diff --git a/pkgs/by-name/sq/sqlitestudio/package.nix b/pkgs/by-name/sq/sqlitestudio/package.nix index a5c6e9870a2f3..15f1a546e1e48 100644 --- a/pkgs/by-name/sq/sqlitestudio/package.nix +++ b/pkgs/by-name/sq/sqlitestudio/package.nix @@ -11,13 +11,13 @@ }: stdenv.mkDerivation rec { pname = "sqlitestudio"; - version = "3.4.14"; + version = "3.4.15"; src = fetchFromGitHub { owner = "pawelsalawa"; repo = "sqlitestudio"; rev = version; - hash = "sha256-eexXRgi/AuxM1mDSdgOsfrv7JDF8NWCXhyAerA9lcBo="; + hash = "sha256-wMkTvw0zGl01511udpk3zZQygVWkmYp1QB+HsghWzNg="; }; nativeBuildInputs = diff --git a/pkgs/by-name/sq/squid/package.nix b/pkgs/by-name/sq/squid/package.nix index 73322d9a5797d..3211758710e7e 100644 --- a/pkgs/by-name/sq/squid/package.nix +++ b/pkgs/by-name/sq/squid/package.nix @@ -16,6 +16,7 @@ cppunit, esi ? false, ipv6 ? true, + nixosTests, }: stdenv.mkDerivation (finalAttrs: { @@ -80,6 +81,8 @@ stdenv.mkDerivation (finalAttrs: { done ''; + passthru.tests.squid = nixosTests.squid; + meta = with lib; { description = "Caching proxy for the Web supporting HTTP, HTTPS, FTP, and more"; homepage = "http://www.squid-cache.org"; diff --git a/pkgs/by-name/sr/src-cli/package.nix b/pkgs/by-name/sr/src-cli/package.nix index 5f85bf697e1e0..0367c5a410713 100644 --- a/pkgs/by-name/sr/src-cli/package.nix +++ b/pkgs/by-name/sr/src-cli/package.nix @@ -11,13 +11,13 @@ buildGoModule rec { pname = "src-cli"; - version = "5.11.1"; + version = "6.0.0"; src = fetchFromGitHub { owner = "sourcegraph"; repo = "src-cli"; rev = version; - hash = "sha256-e0i9qhdDb2DShimcBj0zR5wv3iklWYAhfG62S9f02O0="; + hash = "sha256-dl+tSUjGkSTNirG40zW2DBjzOIDD9hV0GBMSbTM/66Q="; }; vendorHash = "sha256-nMIRu2MiSCbdkuDEhigX9TSS2OWCXSDI8YH+u2ifIBg="; diff --git a/pkgs/by-name/st/stalwart-cli/package.nix b/pkgs/by-name/st/stalwart-cli/package.nix index 1569f36a82aa1..46be3abb2f375 100644 --- a/pkgs/by-name/st/stalwart-cli/package.nix +++ b/pkgs/by-name/st/stalwart-cli/package.nix @@ -11,7 +11,8 @@ rustPlatform.buildRustPackage rec { src = stalwart-mail.src; buildAndTestSubdir = "crates/cli"; - cargoHash = "sha256-9gqk26qCic1N8LHXLX3fWyk/oQr3QifbmPzAEWL6ZHo="; + useFetchCargoVendor = true; + cargoHash = "sha256-k0pNNLwFRLI7eHjVwHGjgrnX4moWOwoWvMiyPfGMgCo="; doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; diff --git a/pkgs/by-name/st/stalwart-mail/webadmin.nix b/pkgs/by-name/st/stalwart-mail/webadmin.nix index 8776839677eb4..8cf8b5418d44f 100644 --- a/pkgs/by-name/st/stalwart-mail/webadmin.nix +++ b/pkgs/by-name/st/stalwart-mail/webadmin.nix @@ -9,7 +9,7 @@ nodejs, npmHooks, llvmPackages, - wasm-bindgen-cli, + wasm-bindgen-cli_0_2_93, binaryen, zip, }: @@ -46,11 +46,8 @@ rustPlatform.buildRustPackage rec { tailwindcss trunk # needs to match with wasm-bindgen version in upstreams Cargo.lock - (wasm-bindgen-cli.override { - version = "0.2.93"; - hash = "sha256-DDdu5mM3gneraM85pAepBXWn3TMofarVR4NbjMdz3r0="; - cargoHash = "sha256-birrg+XABBHHKJxfTKAMSlmTVYLmnmqMDfRnmG6g/YQ="; - }) + wasm-bindgen-cli_0_2_93 + zip ]; diff --git a/pkgs/by-name/st/steam-unwrapped/force-overwrite-bootstrap.patch b/pkgs/by-name/st/steam-unwrapped/force-overwrite-bootstrap.patch new file mode 100644 index 0000000000000..0516f5d685641 --- /dev/null +++ b/pkgs/by-name/st/steam-unwrapped/force-overwrite-bootstrap.patch @@ -0,0 +1,13 @@ +diff --git a/bin_steam.sh b/bin_steam.sh +index 49f9d8a..48f4379 100755 +--- a/bin_steam.sh ++++ b/bin_steam.sh +@@ -297,7 +297,7 @@ fi + # Leave a copy of the bootstrap tarball in ~/.steam so that Steam can + # re-bootstrap itself if required + if ! cmp -s "$LAUNCHSTEAMBOOTSTRAPFILE" "$LAUNCHSTEAMDIR/bootstrap.tar.xz"; then +- cp "$LAUNCHSTEAMBOOTSTRAPFILE" "$LAUNCHSTEAMDIR/bootstrap.tar.xz" ++ cp -f "$LAUNCHSTEAMBOOTSTRAPFILE" "$LAUNCHSTEAMDIR/bootstrap.tar.xz" + fi + + # go to the install directory and run the client diff --git a/pkgs/by-name/st/steam-unwrapped/package.nix b/pkgs/by-name/st/steam-unwrapped/package.nix index 98e1ee15ac45b..7828feba494e6 100644 --- a/pkgs/by-name/st/steam-unwrapped/package.nix +++ b/pkgs/by-name/st/steam-unwrapped/package.nix @@ -7,14 +7,21 @@ stdenv.mkDerivation (finalAttrs: { pname = "steam-unwrapped"; - version = "1.0.0.81"; + version = "1.0.0.82"; src = fetchurl { # use archive url so the tarball doesn't 404 on a new release url = "https://repo.steampowered.com/steam/archive/stable/steam_${finalAttrs.version}.tar.gz"; - hash = "sha256-Gia5182s4J4E3Ia1EeC5kjJX9mSltsr+b+1eRtEXtPk="; + hash = "sha256-r6Lx3WJx/StkW6MLjzq0Cv02VONUJBoxy9UQAPfm/Hc="; }; + patches = [ + # We copy the bootstrap file from the store, where it's read-only, + # so future attempts to update it with bare "cp" will fail. + # So, use "cp -f" to force an overwrite. + ./force-overwrite-bootstrap.patch + ]; + makeFlags = [ "DESTDIR=$(out)" "PREFIX=" diff --git a/pkgs/by-name/st/step-kms-plugin/package.nix b/pkgs/by-name/st/step-kms-plugin/package.nix index 8f6eb6af9fdb6..bbbf684e52f4b 100644 --- a/pkgs/by-name/st/step-kms-plugin/package.nix +++ b/pkgs/by-name/st/step-kms-plugin/package.nix @@ -12,13 +12,13 @@ buildGoModule rec { pname = "step-kms-plugin"; - version = "0.11.8"; + version = "0.12.0"; src = fetchFromGitHub { owner = "smallstep"; repo = pname; rev = "v${version}"; - hash = "sha256-73l+R0Xrvyckt2ifJs12c3k6zSb9AhHV0F9Zk6qIwAg="; + hash = "sha256-zYDKUSYnuYGexWet8F6DI/5nPcGJtvSvB7b6sij6JY8="; }; vendorHash = "sha256-sXwaxMfBb8zZDCP3g8iZgXL540uDyWtu57cUPia9FzA="; diff --git a/pkgs/by-name/st/stgit/package.nix b/pkgs/by-name/st/stgit/package.nix index 6ef1afe79ce0b..793bf45613f63 100644 --- a/pkgs/by-name/st/stgit/package.nix +++ b/pkgs/by-name/st/stgit/package.nix @@ -19,15 +19,15 @@ rustPlatform.buildRustPackage rec { pname = "stgit"; - version = "2.5.0"; + version = "2.5.1"; src = fetchFromGitHub { owner = "stacked-git"; repo = "stgit"; rev = "v${version}"; - hash = "sha256-XyBVboNrvhOSZBPd5ZqdMuF261TpFzduC6XQtKJGntE="; + hash = "sha256-p6qEzkiRAuzvaPrUXtE+Ixdcu7W0aQFY2NQUyO+kESo="; }; - cargoHash = "sha256-xh8TW8TgwaCqqKVyP9ImHkKAIwW5c6AC1pZD5tu0XBs="; + cargoHash = "sha256-whFBUqKervY/mfogA1VffA8vhM01wySkqRdIpwMXV8M="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/st/stretchly/package.nix b/pkgs/by-name/st/stretchly/package.nix index b921992f6817a..684cf57eadc2b 100644 --- a/pkgs/by-name/st/stretchly/package.nix +++ b/pkgs/by-name/st/stretchly/package.nix @@ -4,18 +4,17 @@ fetchurl, makeWrapper, electron, - common-updater-scripts, - writeShellScript, makeDesktopItem, + nix-update-script, }: stdenv.mkDerivation (finalAttrs: { pname = "stretchly"; - version = "1.16.0"; + version = "1.17.2"; src = fetchurl { url = "https://github.com/hovancik/stretchly/releases/download/v${finalAttrs.version}/stretchly-${finalAttrs.version}.tar.xz"; - hash = "sha256-gOMUXGldtZUfqLABJHfbToYe0pcAn8dRWEFxCi/gY9Y="; + hash = "sha256-IsVmdsmLfNkZ7B9i8TjTHMymsmYLJY5AJleAoEwnUKk="; }; icon = fetchurl { @@ -40,19 +39,6 @@ stdenv.mkDerivation (finalAttrs: { runHook postInstall ''; - passthru = { - updateScript = writeShellScript "update-stretchly" '' - set -eu -o pipefail - - # get the latest release version - latest_version=$(curl -s https://api.github.com/repos/hovancik/stretchly/releases/latest | jq --raw-output .tag_name | sed -e 's/^v//') - - echo "updating to $latest_version..." - - ${common-updater-scripts}/bin/update-source-version stretchly "$latest_version" - ''; - }; - desktopItem = makeDesktopItem { name = finalAttrs.pname; exec = finalAttrs.pname; @@ -62,7 +48,11 @@ stdenv.mkDerivation (finalAttrs: { categories = [ "Utility" ]; }; - meta = with lib; { + passthru = { + updateScript = nix-update-script { }; + }; + + meta = { description = "Break time reminder app"; longDescription = '' stretchly is a cross-platform electron app that reminds you to take @@ -73,9 +63,9 @@ stdenv.mkDerivation (finalAttrs: { ''; homepage = "https://hovancik.net/stretchly"; downloadPage = "https://hovancik.net/stretchly/downloads/"; - license = licenses.bsd2; - maintainers = with maintainers; [ _1000101 ]; - platforms = platforms.linux; + license = lib.licenses.bsd2; + maintainers = with lib.maintainers; [ _1000101 ]; + platforms = lib.platforms.linux; mainProgram = "stretchly"; }; }) diff --git a/pkgs/by-name/su/sudo-font/package.nix b/pkgs/by-name/su/sudo-font/package.nix index 940c11a76b2c7..d4dd350cba6e5 100644 --- a/pkgs/by-name/su/sudo-font/package.nix +++ b/pkgs/by-name/su/sudo-font/package.nix @@ -6,11 +6,11 @@ stdenvNoCC.mkDerivation rec { pname = "sudo-font"; - version = "2.1"; + version = "2.2"; src = fetchzip { url = "https://github.com/jenskutilek/sudo-font/releases/download/v${version}/sudo.zip"; - hash = "sha256-ER+TpODf+Inqo+XWJRNOHumzGRL4Dms5N1E+BU7Tr94="; + hash = "sha256-qI43FDDXcJby2EbEow0ZBzPVOQby3+WxvhJKyjrYUp8="; }; installPhase = '' diff --git a/pkgs/by-name/sv/svgbob/package.nix b/pkgs/by-name/sv/svgbob/package.nix index e2dd2e92ca2ce..8d5fe7ff92edb 100644 --- a/pkgs/by-name/sv/svgbob/package.nix +++ b/pkgs/by-name/sv/svgbob/package.nix @@ -6,15 +6,15 @@ rustPlatform.buildRustPackage rec { pname = "svgbob"; - version = "0.7.4"; + version = "0.7.6"; src = fetchCrate { inherit version; crateName = "svgbob_cli"; - hash = "sha256-qSY12WjSPMoWqJHkYnPvhCtZAuI3eq+sA+/Yr9Yssp8="; + hash = "sha256-mPF6GcsXl/Bcri9d8SS21+/sjssT4//ktwC620NrEUg="; }; - cargoHash = "sha256-dgOEztAlX823M+bc+vnrOvmeWtxxCsCR6+k1Yho82EM="; + cargoHash = "sha256-WXjHcfccoZa+7hqFfA4vbWLMlhbkfafG1Fgilbmi60E="; postInstall = '' mv $out/bin/svgbob_cli $out/bin/svgbob diff --git a/pkgs/by-name/sw/swapview/package.nix b/pkgs/by-name/sw/swapview/package.nix index b15b9d6d062dc..c4cc669c2b40b 100644 --- a/pkgs/by-name/sw/swapview/package.nix +++ b/pkgs/by-name/sw/swapview/package.nix @@ -6,16 +6,17 @@ rustPlatform.buildRustPackage rec { pname = "swapview"; - version = "0.1.0"; + version = "0.1.0-unstable-2023-12-03"; src = fetchFromGitHub { owner = "lilydjwg"; repo = "swapview"; - rev = "v${version}"; - sha256 = "0339biydk997j5r72vzp7djwkscsz89xr3936nshv23fmxjh2rzj"; + rev = "cc8e863acd2084413b91572357dab34551c27ed7"; + sha256 = "sha256-H5jMdmtZoN9nQfjXFQyYbuvPY58jmEP2j/XWGdBocFo="; }; - cargoHash = "sha256-v3Fd08s70YX7pEIWYcgpC2daerfZhtzth4haKfUy0Q8="; + useFetchCargoVendor = true; + cargoHash = "sha256-kLWd8dg63oA4sPMPPkRn+HsU+v+gQAiniBWI0i7JszM="; meta = with lib; { description = "Simple program to view processes' swap usage on Linux"; diff --git a/pkgs/by-name/sw/swayws/package.nix b/pkgs/by-name/sw/swayws/package.nix index 90752a14da04a..1bc606d030bfc 100644 --- a/pkgs/by-name/sw/swayws/package.nix +++ b/pkgs/by-name/sw/swayws/package.nix @@ -11,15 +11,14 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitLab { owner = "w0lff"; repo = pname; - rev = "v${version}"; - hash = "sha256-f0kXy7/31imgHHqKPmW9K+QrLqroaPaXwlJkzOoezRU="; + # Specifying commit hash rather than tag because upstream has + # rewritten a tag before: + # https://gitlab.com/w0lff/swayws/-/issues/1#note_1342349382 + rev = "98f0d5c1896b10e890e1727654f1cf3b34a2371e"; + hash = "sha256-zeM6/x2vjZ2IL+nZz1WBf5yY4C6ovmxyvgVLD54BKVc="; }; cargoHash = "sha256-VYT6wV59fraAoJgR/i6GlO8s7LUoehGtxPAggEL1eLo="; - # Required patch until upstream fixes https://gitlab.com/w0lff/swayws/-/issues/1 - cargoPatches = [ - ./ws-update-Cargo-lock.patch - ]; # swayws does not have any tests doCheck = false; diff --git a/pkgs/by-name/sw/swayws/ws-update-Cargo-lock.patch b/pkgs/by-name/sw/swayws/ws-update-Cargo-lock.patch deleted file mode 100644 index e1d7614e8bfaf..0000000000000 --- a/pkgs/by-name/sw/swayws/ws-update-Cargo-lock.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/Cargo.lock b/Cargo.lock -index f01f824..e00d079 100644 ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -328,7 +328,7 @@ dependencies = [ - - [[package]] - name = "swayws" --version = "1.1.1" -+version = "1.2.0" - dependencies = [ - "clap", - "env_logger", diff --git a/pkgs/by-name/sw/switch-to-configuration-ng/src/src/main.rs b/pkgs/by-name/sw/switch-to-configuration-ng/src/src/main.rs index 93da7aff7406d..a64d8566225b2 100644 --- a/pkgs/by-name/sw/switch-to-configuration-ng/src/src/main.rs +++ b/pkgs/by-name/sw/switch-to-configuration-ng/src/src/main.rs @@ -139,7 +139,7 @@ fn parse_os_release() -> Result> { })) } -fn do_pre_switch_check(command: &str, toplevel: &Path) -> Result<()> { +fn do_pre_switch_check(command: &str, toplevel: &Path, action: &Action) -> Result<()> { let mut cmd_split = command.split_whitespace(); let Some(argv0) = cmd_split.next() else { bail!("missing first argument in install bootloader commands"); @@ -148,6 +148,7 @@ fn do_pre_switch_check(command: &str, toplevel: &Path) -> Result<()> { match std::process::Command::new(argv0) .args(cmd_split.collect::>()) .arg(toplevel) + .arg::<&str>(action.into()) .spawn() .map(|mut child| child.wait()) { @@ -886,10 +887,7 @@ impl std::fmt::Display for Job { fn new_dbus_proxies( conn: &LocalConnection, -) -> ( - Proxy<'_, &LocalConnection>, - Proxy<'_, &LocalConnection>, -) { +) -> (Proxy<'_, &LocalConnection>, Proxy<'_, &LocalConnection>) { ( conn.with_proxy( "org.freedesktop.systemd1", @@ -1053,7 +1051,7 @@ fn do_system_switch(action: Action) -> anyhow::Result<()> { .unwrap_or_default() != "1" { - do_pre_switch_check(&pre_switch_check, &toplevel)?; + do_pre_switch_check(&pre_switch_check, &toplevel, action)?; } if *action == Action::Check { @@ -1220,16 +1218,16 @@ won't take effect until you reboot the system. unit.as_str(), "suspend.target" | "hibernate.target" | "hybrid-sleep.target" ) || parse_systemd_bool( - Some(&new_unit_info), - "Unit", - "RefuseManualStart", - false, - ) || parse_systemd_bool( - Some(&new_unit_info), - "Unit", - "X-OnlyManualStart", - false, - )) { + Some(&new_unit_info), + "Unit", + "RefuseManualStart", + false, + ) || parse_systemd_bool( + Some(&new_unit_info), + "Unit", + "X-OnlyManualStart", + false, + )) { units_to_start.insert(unit.to_string(), ()); record_unit(START_LIST_FILE, unit); // Don't spam the user with target units that always get started. diff --git a/pkgs/by-name/ta/tailwindcss-language-server/package.nix b/pkgs/by-name/ta/tailwindcss-language-server/package.nix index fd56c58586af5..63746aa22028b 100644 --- a/pkgs/by-name/ta/tailwindcss-language-server/package.nix +++ b/pkgs/by-name/ta/tailwindcss-language-server/package.nix @@ -2,12 +2,13 @@ lib, stdenv, fetchFromGitHub, - nodejs_22, + nodejs_23, pnpm_9, + cacert, }: let - version = "0.0.27"; + version = "0.14.1"; in stdenv.mkDerivation (finalAttrs: { pname = "tailwindcss-language-server"; @@ -16,8 +17,8 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "tailwindlabs"; repo = "tailwindcss-intellisense"; - rev = "@tailwindcss/language-server@v${finalAttrs.version}"; - hash = "sha256-FphKiGMTMQj/tBmrwkPVlb+dEGjf+N4EgZtOVg7iL2M="; + rev = "v${finalAttrs.version}"; + hash = "sha256-8hP61zBsNWolA60yzSBb+fPlRuHCTvRfnC1DduB4KkA="; }; pnpmDeps = pnpm_9.fetchDeps { @@ -28,21 +29,24 @@ stdenv.mkDerivation (finalAttrs: { pnpmWorkspaces prePnpmInstall ; - hash = "sha256-kLB84P2Zb3gXpNlXCnQFIxz8xibACB39URIhy6Na9p8="; + hash = "sha256-bxapagJcVPFxtKUuS4ATKr6rpAaDIFiccSANG0p3Ybc="; }; nativeBuildInputs = [ - nodejs_22 + nodejs_23 pnpm_9.configHook ]; - buildInputs = [ nodejs_22 ]; + buildInputs = [ + nodejs_23 + ]; pnpmWorkspaces = [ "@tailwindcss/language-server..." ]; prePnpmInstall = '' # Warning section for "pnpm@v8" # https://pnpm.io/cli/install#--filter-package_selector pnpm config set dedupe-peer-dependents false + export NODE_EXTRA_CA_CERTS="${cacert}/etc/ssl/certs/ca-bundle.crt" ''; buildPhase = '' diff --git a/pkgs/by-name/ta/talosctl/package.nix b/pkgs/by-name/ta/talosctl/package.nix index 560ad74ecfb19..3ece33feeb91a 100644 --- a/pkgs/by-name/ta/talosctl/package.nix +++ b/pkgs/by-name/ta/talosctl/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "talosctl"; - version = "1.9.2"; + version = "1.9.3"; src = fetchFromGitHub { owner = "siderolabs"; repo = "talos"; tag = "v${version}"; - hash = "sha256-Cff++tGfKcpTaiBVTRZnNzExAHlq4UfkeiIDe3gOF3w="; + hash = "sha256-nI+6EzbGQzfM/pG4d5O4I5BEJ2aNaZ/sE28/EcgQmCs="; }; - vendorHash = "sha256-L0lmTKj1gUFT1bVoCxMXnEpv2LUo/bl1eeOJmeeixhw="; + vendorHash = "sha256-o/PYWR7KOWCVXUhzdPY0bxRhCROXzp/UAXgFkWpggC8="; ldflags = [ "-s" diff --git a/pkgs/by-name/te/tensorman/package.nix b/pkgs/by-name/te/tensorman/package.nix index 03e372ac0b0d6..f972af1e43128 100644 --- a/pkgs/by-name/te/tensorman/package.nix +++ b/pkgs/by-name/te/tensorman/package.nix @@ -6,16 +6,17 @@ rustPlatform.buildRustPackage { pname = "tensorman"; - version = "unstable-2023-03-13"; + version = "0.1.0-unstable-2024-06-24"; src = fetchFromGitHub { owner = "pop-os"; repo = "tensorman"; - rev = "b1125f71b55a8d9a4d674a62fa1e8868d40d0f0d"; - hash = "sha256-WMX+nzNQTGeSUxOfMHo+U0ICYx8rttXpQrQClwU2zX8="; + rev = "24fa3b2bb06a29708162ee474a733e9a227b1778"; + hash = "sha256-kI/dOw9JnhXmLqIgaljhRMc/SX35m7WQ9b6bQa6diZ0="; }; - cargoHash = "sha256-y/AE2jTVetqBBExBlPEB0LwIVk+LjB2i0ZjijLPs9js="; + useFetchCargoVendor = true; + cargoHash = "sha256-/Ul8+5MmTntQ0OprfG4QhUNjc3PktCandzTTWn4FD0Y="; meta = with lib; { description = "Utility for easy management of Tensorflow containers"; diff --git a/pkgs/by-name/te/termplay/package.nix b/pkgs/by-name/te/termplay/package.nix deleted file mode 100644 index 79fcd6f03687b..0000000000000 --- a/pkgs/by-name/te/termplay/package.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ - rustPlatform, - fetchFromGitLab, - lib, - makeWrapper, - gst_all_1, - libsixel, -}: - -rustPlatform.buildRustPackage rec { - pname = "termplay"; - version = "2.0.6"; - - src = fetchFromGitLab { - owner = "jD91mZM2"; - repo = "termplay"; - rev = "v${version}"; - sha256 = "1w7hdqgqr1jgxid3k7f2j52wz31gv8bzr9rsm6xzp7nnihp6i45p"; - }; - - cargoHash = "sha256-i7toHEewkpQ85aj4PK4SLJQCfUllUqkqIWLaOEk3NyI="; - - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ - gst_all_1.gstreamer - gst_all_1.gst-plugins-base - gst_all_1.gst-plugins-good - gst_all_1.gst-plugins-ugly - gst_all_1.gst-plugins-bad - libsixel - ]; - - buildFeatures = [ "bin" ]; - - postInstall = '' - wrapProgram $out/bin/termplay --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" - ''; - - meta = with lib; { - description = "Play an image/video in your terminal"; - homepage = "https://jd91mzm2.github.io/termplay/"; - license = licenses.mit; - maintainers = [ ]; - platforms = platforms.unix; - mainProgram = "termplay"; - }; -} diff --git a/pkgs/applications/networking/cluster/terraspace/Gemfile b/pkgs/by-name/te/terraspace/Gemfile similarity index 100% rename from pkgs/applications/networking/cluster/terraspace/Gemfile rename to pkgs/by-name/te/terraspace/Gemfile diff --git a/pkgs/applications/networking/cluster/terraspace/Gemfile.lock b/pkgs/by-name/te/terraspace/Gemfile.lock similarity index 100% rename from pkgs/applications/networking/cluster/terraspace/Gemfile.lock rename to pkgs/by-name/te/terraspace/Gemfile.lock diff --git a/pkgs/applications/networking/cluster/terraspace/gemset.nix b/pkgs/by-name/te/terraspace/gemset.nix similarity index 100% rename from pkgs/applications/networking/cluster/terraspace/gemset.nix rename to pkgs/by-name/te/terraspace/gemset.nix diff --git a/pkgs/applications/networking/cluster/terraspace/default.nix b/pkgs/by-name/te/terraspace/package.nix similarity index 100% rename from pkgs/applications/networking/cluster/terraspace/default.nix rename to pkgs/by-name/te/terraspace/package.nix diff --git a/pkgs/by-name/tf/tfswitch/package.nix b/pkgs/by-name/tf/tfswitch/package.nix index 5622d2c5b0d74..c28d39cd7dc1a 100644 --- a/pkgs/by-name/tf/tfswitch/package.nix +++ b/pkgs/by-name/tf/tfswitch/package.nix @@ -5,16 +5,16 @@ }: buildGoModule rec { pname = "tfswitch"; - version = "1.2.4"; + version = "1.3.0"; src = fetchFromGitHub { owner = "warrensbox"; repo = "terraform-switcher"; rev = "v${version}"; - sha256 = "sha256-zmGJiwdESf+3yXM7W64iSy38lADZmA03dI1yhtv9H28="; + sha256 = "sha256-Rpr/S22UX6+fHc71jnMo6kR+8kjJAboLog9vMwYTpnQ="; }; - vendorHash = "sha256-paJC46AJRaB5RieKs6wZYzshxAp8e8MvCatGsN8E4Io="; + vendorHash = "sha256-9oM7VrPZrZlR1s+vvjwpWvKdmknfbgd3hpvYByKQtgs="; # Disable tests since it requires network access and relies on the # presence of release.hashicorp.com diff --git a/pkgs/by-name/ti/timelens/package.nix b/pkgs/by-name/ti/timelens/package.nix deleted file mode 100644 index 2d2f1947d6fba..0000000000000 --- a/pkgs/by-name/ti/timelens/package.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ - lib, - rustPlatform, - fetchFromGitHub, - pkg-config, - glib, - gst_all_1, - wrapGAppsHook3, -}: - -rustPlatform.buildRustPackage rec { - pname = "timelens"; - version = "0.1.1"; - - src = fetchFromGitHub { - owner = "timelens"; - repo = "timelens"; - rev = version; - hash = "sha256-cGFM1QOuavGwGBccUEttSTp+aD+d31Cqul+AQYvbyhY="; - }; - - cargoHash = "sha256-rVE2foebSEk3zJQTAkmhoIOFyMArGnt9tLlOS7RjQYM="; - - nativeBuildInputs = [ - pkg-config - wrapGAppsHook3 - ]; - - buildInputs = [ - glib - gst_all_1.gstreamer - gst_all_1.gst-libav - gst_all_1.gst-plugins-bad - gst_all_1.gst-plugins-base - gst_all_1.gst-plugins-good - gst_all_1.gst-plugins-ugly - ]; - - meta = { - description = "Open source project for creating visual timelines"; - homepage = "https://timelens.blinry.org"; - changelog = "https://github.com/timelens/timelens/blob/${src.rev}/CHANGELOG.md"; - license = lib.licenses.gpl2Plus; - maintainers = [ ]; - mainProgram = "timelens"; - }; -} diff --git a/pkgs/by-name/to/tootik/package.nix b/pkgs/by-name/to/tootik/package.nix index 5fd9b50eaff0a..2defbff044438 100644 --- a/pkgs/by-name/to/tootik/package.nix +++ b/pkgs/by-name/to/tootik/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "tootik"; - version = "0.15.0"; + version = "0.15.1"; src = fetchFromGitHub { owner = "dimkr"; repo = "tootik"; tag = version; - hash = "sha256-Onl64ps8rfLVnZYQ2KPzS+mslgeNz2wpJuabwsqhXlM="; + hash = "sha256-uq0mDlJ5NPXw1fsNcoyTbqqpZsYDkX8OSdZ5ToO0rYQ="; }; - vendorHash = "sha256-GSi+sQz7kgp1YHEzH/Y7rOOEEhhvzd75cVhSow3URaU="; + vendorHash = "sha256-p/pgoGzrukd4mzzoyLI9g6vL4k+lTnMZOha1KrYjHJ0="; nativeBuildInputs = [ openssl ]; diff --git a/pkgs/by-name/tp/tpm2-openssl/package.nix b/pkgs/by-name/tp/tpm2-openssl/package.nix index 48c04e25fb4fb..a3a36bf24a3e2 100644 --- a/pkgs/by-name/tp/tpm2-openssl/package.nix +++ b/pkgs/by-name/tp/tpm2-openssl/package.nix @@ -12,12 +12,12 @@ stdenv.mkDerivation (finalAttrs: { pname = "tpm2-openssl"; - version = "1.2.0"; + version = "1.3.0"; src = fetchFromGitHub { owner = "tpm2-software"; repo = "tpm2-openssl"; rev = finalAttrs.version; - hash = "sha256-mZ4Z/GxJFwwfyFd1SAiVlQqOjkFSzsZePeuEZtq8Mcg="; + hash = "sha256-CCTR7qBqI/y+jLBEEcgRanYOBNUYM/sH/hCqOLGA4QM="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/tp/tpsecore/package.nix b/pkgs/by-name/tp/tpsecore/package.nix index 6d87efd6ec369..e8e50ea26e6aa 100644 --- a/pkgs/by-name/tp/tpsecore/package.nix +++ b/pkgs/by-name/tp/tpsecore/package.nix @@ -4,18 +4,12 @@ rustPlatform, rustc, wasm-pack, - wasm-bindgen-cli, + wasm-bindgen-cli_0_2_95, binaryen, }: let version = "0.1.1"; - - wasm-bindgen-cli-95 = wasm-bindgen-cli.override { - version = "0.2.95"; - hash = "sha256-prMIreQeAcbJ8/g3+pMp1Wp9H5u+xLqxRxL+34hICss="; - cargoHash = "sha256-6iMebkD7FQvixlmghGGIvpdGwFNLfnUcFke/Rg8nPK4="; - }; in rustPlatform.buildRustPackage { pname = "tpsecore"; @@ -32,7 +26,7 @@ rustPlatform.buildRustPackage { nativeBuildInputs = [ wasm-pack - wasm-bindgen-cli-95 + wasm-bindgen-cli_0_2_95 binaryen rustc.llvmPackages.lld ]; diff --git a/pkgs/by-name/tr/tre/package.nix b/pkgs/by-name/tr/tre/package.nix index 969b17817d719..ccfb9d4937c9d 100644 --- a/pkgs/by-name/tr/tre/package.nix +++ b/pkgs/by-name/tr/tre/package.nix @@ -29,16 +29,13 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ autoconf automake + gettext # autopoint libtool ]; - buildInputs = - [ - gettext - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - libiconv - ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ + libiconv + ]; preConfigure = '' ./utils/autogen.sh diff --git a/pkgs/by-name/tr/trealla/package.nix b/pkgs/by-name/tr/trealla/package.nix index 62cb6e0abd74f..e8a4c1e51c4aa 100644 --- a/pkgs/by-name/tr/trealla/package.nix +++ b/pkgs/by-name/tr/trealla/package.nix @@ -23,13 +23,13 @@ assert lib.elem lineEditingLibrary [ ]; stdenv.mkDerivation (finalAttrs: { pname = "trealla"; - version = "2.63.15"; + version = "2.63.33"; src = fetchFromGitHub { owner = "trealla-prolog"; repo = "trealla"; rev = "v${finalAttrs.version}"; - hash = "sha256-4YQCfkAJTTS0n0hDUcc25ks0XtToqNL7eFVM1aPjE/w="; + hash = "sha256-ivbjnYKuZW3xvyPxOF3Ov/0obI71lri/itsVFJ4Cb4k="; }; postPatch = '' diff --git a/pkgs/by-name/tr/trickest-cli/package.nix b/pkgs/by-name/tr/trickest-cli/package.nix index 730b9a4df1e24..0d0d065d866a5 100644 --- a/pkgs/by-name/tr/trickest-cli/package.nix +++ b/pkgs/by-name/tr/trickest-cli/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "trickest-cli"; - version = "1.8.4"; + version = "1.9.1"; src = fetchFromGitHub { owner = "trickest"; repo = "trickest-cli"; tag = "v${version}"; - hash = "sha256-8UrSY/ewy+0vo6QUV/cDBfv04TA3Toampf0hDnsWnXs="; + hash = "sha256-oLLPtKKYTHKqyyVuQS/0Xjmce202Dk/Gm1Ajy+hf/YY="; }; vendorHash = "sha256-gk8YMMvTHBL7yoXU9n0jhtUS472fqLW5m+mSl4Lio6c="; diff --git a/pkgs/by-name/tr/trunk-ng/package.nix b/pkgs/by-name/tr/trunk-ng/package.nix index 8c914af48f3eb..47959e4eddbfa 100644 --- a/pkgs/by-name/tr/trunk-ng/package.nix +++ b/pkgs/by-name/tr/trunk-ng/package.nix @@ -37,13 +37,8 @@ rustPlatform.buildRustPackage rec { # requires network checkFlags = [ "--skip=tools::tests::download_and_install_binaries" ]; - cargoHash = - { - darwin = "sha256-TwpGw3LH3TmZSbC4DkoOYpQdOpksXXoAoiacyZAefTU="; - linux = "sha256-AivISmT/r8xa/vSXUN8sU7z67t1hcyMQM+t6oXmIOhU="; - } - .${stdenv.hostPlatform.parsed.kernel.name} - or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); + useFetchCargoVendor = true; + cargoHash = "sha256-jDewjDm7Nh09CkRdPG0/ELn4odz/aaRNg8GegDxK6f8="; meta = with lib; { homepage = "https://github.com/ctron/trunk"; diff --git a/pkgs/by-name/tu/tui-journal/package.nix b/pkgs/by-name/tu/tui-journal/package.nix index 167330b9e2b7f..4333e9e4f9df4 100644 --- a/pkgs/by-name/tu/tui-journal/package.nix +++ b/pkgs/by-name/tu/tui-journal/package.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "tui-journal"; - version = "0.13.1"; + version = "0.14.0"; src = fetchFromGitHub { owner = "AmmarAbouZor"; repo = "tui-journal"; rev = "v${version}"; - hash = "sha256-KPh+ree1XSOdURb+pM0sjJeq3NnNvPOQ+spK4g3RxGM="; + hash = "sha256-2I+rldbJlTkfUrEcryXj1i2OvaQDbikruJK6FEss0no="; }; - cargoHash = "sha256-YiD2MtRMGdzPeKR082n9Kx3OBMFvtcqZOd+HRg7zA5o="; + cargoHash = "sha256-MDyykXMvb8aVQb0vQcBPcH1yHxHm+0Hf9/ZTUYZGvko="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/tu/tuifimanager/package.nix b/pkgs/by-name/tu/tuifimanager/package.nix index 3f48912d6056b..b87133ca8d837 100644 --- a/pkgs/by-name/tu/tuifimanager/package.nix +++ b/pkgs/by-name/tu/tuifimanager/package.nix @@ -21,7 +21,7 @@ lib.throwIf (enableDragAndDrop && !hasDndSupport) python3.pkgs.buildPythonApplication rec { pname = "tuifimanager"; - version = "5.0.9"; + version = "5.1.5"; pyproject = true; @@ -29,7 +29,7 @@ lib.throwIf (enableDragAndDrop && !hasDndSupport) owner = "GiorgosXou"; repo = "TUIFIManager"; tag = "v.${version}"; - hash = "sha256-15PXua3kLf3Mpgft2msFBn+fS2bzfTAIC9bmOkNKqlU="; + hash = "sha256-5ShrmjEFKGdmaGBFjMnIfcM6p8AZd13uIEFwDVAkU/8="; }; build-system = with python3.pkgs; [ diff --git a/pkgs/by-name/tu/turn-rs/package.nix b/pkgs/by-name/tu/turn-rs/package.nix index f15d22117714a..62d57d898168e 100644 --- a/pkgs/by-name/tu/turn-rs/package.nix +++ b/pkgs/by-name/tu/turn-rs/package.nix @@ -8,16 +8,17 @@ rustPlatform.buildRustPackage rec { pname = "turn-rs"; - version = "3.3.2"; + version = "3.2.0"; src = fetchFromGitHub { owner = "mycrl"; repo = "turn-rs"; tag = "v${version}"; - hash = "sha256-ITs6kNI1g7k8bcSSG6GwPGY5U+mFGqCTU6JIEj9mH/Q="; + hash = "sha256-4I4mjG/euBL08v4xZdnrI8aTGVo5z2F2FDYtxKW1Qt8="; }; - cargoHash = "sha256-bmeTDMa/khX7fTDCGpf3U2LZPnkXL+bi69sv6NPnANI="; + useFetchCargoVendor = true; + cargoHash = "sha256-qSYGcZdMn7uelufs6z1UQtLxrRbBGNf3o1a1jR+qiqo="; passthru = { updateScript = nix-update-script { }; diff --git a/pkgs/misc/urbit/default.nix b/pkgs/by-name/ur/urbit/package.nix similarity index 100% rename from pkgs/misc/urbit/default.nix rename to pkgs/by-name/ur/urbit/package.nix diff --git a/pkgs/misc/urbit/update-bin.sh b/pkgs/by-name/ur/urbit/update-bin.sh similarity index 100% rename from pkgs/misc/urbit/update-bin.sh rename to pkgs/by-name/ur/urbit/update-bin.sh diff --git a/pkgs/by-name/ut/ut1999/package.nix b/pkgs/by-name/ut/ut1999/package.nix index 3ca112a8cf4f3..2d86e22b8cbee 100644 --- a/pkgs/by-name/ut/ut1999/package.nix +++ b/pkgs/by-name/ut/ut1999/package.nix @@ -21,7 +21,7 @@ let version = "469d"; - srcs = { + srcs = rec { x86_64-linux = fetchurl { url = "https://github.com/OldUnreal/UnrealTournamentPatches/releases/download/v${version}/OldUnreal-UTPatch${version}-Linux-amd64.tar.bz2"; hash = "sha256-aoGzWuakwN/OL4+xUq8WEpd2c1rrNN/DkffI2vDVGjs="; @@ -38,6 +38,8 @@ let url = "https://github.com/OldUnreal/UnrealTournamentPatches/releases/download/v${version}/OldUnreal-UTPatch${version}-macOS-Sonoma.dmg"; hash = "sha256-TbhJbOH4E5WOb6XR9dmqLkXziK3/CzhNjd1ypBkkmvw="; }; + # fat binary + aarch64-darwin = x86_64-darwin; }; unpackIso = runCommand "ut1999-iso" @@ -56,11 +58,12 @@ let cp -r Music Sounds Textures Maps $out ''; systemDir = - { + rec { x86_64-linux = "System64"; aarch64-linux = "SystemARM64"; - x86_64-darwin = "System"; i686-linux = "System"; + x86_64-darwin = "System"; + aarch64-darwin = x86_64-darwin; } .${stdenv.hostPlatform.system} or (throw "unsupported system: ${stdenv.hostPlatform.system}"); in @@ -98,43 +101,49 @@ stdenv.mkDerivation { in '' runHook preInstall - + mkdir -p $out + '' + + lib.optionalString (stdenv.hostPlatform.isLinux) '' mkdir -p $out/bin + '' + + '' cp -r ${if stdenv.hostPlatform.isDarwin then "UnrealTournament.app" else "./*"} $out chmod -R 755 $out cd ${outPrefix} - - # NOTE: OldUnreal patch doesn't include these folders but could in the future - rm -rf ./{Music,Sounds,Maps} - ln -s ${unpackIso}/{Music,Sounds,Maps} . - - # TODO: unpack compressed maps with ucc - + # NOTE: OldUnreal patch doesn't include these folders on linux but could in the future + # on darwin it does, but they are empty + rm -rf ./{Music,Sounds} + ln -s ${unpackIso}/{Music,Sounds} . + '' + + lib.optionalString (stdenv.hostPlatform.isLinux) '' + # maps need no post-processing on linux, therefore linking them is ok + rm -rf ./Maps + ln -s ${unpackIso}/Maps . + '' + + lib.optionalString (stdenv.hostPlatform.isDarwin) '' + # Maps need post-processing on darwin, therefore need to be copied + cp -n ${unpackIso}/Maps/* ./Maps || true + # unpack compressed maps with ucc (needs absolute paths) + for map in $PWD/Maps/*.uz; do ./UCC decompress $map; done + mv ${systemDir}/*.unr ./Maps || true + rm ./Maps/*.uz + '' + + '' cp -n ${unpackIso}/Textures/* ./Textures || true - cp -n ${unpackIso}/System/*.{u,int} ./System || true '' + lib.optionalString (stdenv.hostPlatform.isLinux) '' + cp -n ${unpackIso}/System/*.{u,int} ./System || true ln -s "$out/${systemDir}/ut-bin" "$out/bin/ut1999" ln -s "$out/${systemDir}/ucc-bin" "$out/bin/ut1999-ucc" install -D "${./ut1999.svg}" "$out/share/pixmaps/ut1999.svg" - ${imagemagick}/bin/magick -background none ${./ut1999.svg} -resize 16x16 ut1999_16x16.png - ${imagemagick}/bin/magick -background none ${./ut1999.svg} -resize 24x24 ut1999_24x24.png - ${imagemagick}/bin/magick -background none ${./ut1999.svg} -resize 32x32 ut1999_32x32.png - ${imagemagick}/bin/magick -background none ${./ut1999.svg} -resize 48x48 ut1999_48x48.png - ${imagemagick}/bin/magick -background none ${./ut1999.svg} -resize 64x64 ut1999_64x64.png - ${imagemagick}/bin/magick -background none ${./ut1999.svg} -resize 128x128 ut1999_128x128.png - ${imagemagick}/bin/magick -background none ${./ut1999.svg} -resize 192x192 ut1999_192x192.png - ${imagemagick}/bin/magick -background none ${./ut1999.svg} -resize 256x256 ut1999_256x256.png - install -D "ut1999_16x16.png" "$out/share/icons/hicolor/16x16/apps/ut1999.png" - install -D "ut1999_24x24.png" "$out/share/icons/hicolor/24x24/apps/ut1999.png" - install -D "ut1999_32x32.png" "$out/share/icons/hicolor/32x32/apps/ut1999.png" - install -D "ut1999_48x48.png" "$out/share/icons/hicolor/48x48/apps/ut1999.png" - install -D "ut1999_64x64.png" "$out/share/icons/hicolor/64x64/apps/ut1999.png" - install -D "ut1999_128x128.png" "$out/share/icons/hicolor/128x128/apps/ut1999.png" - install -D "ut1999_192x192.png" "$out/share/icons/hicolor/192x192/apps/ut1999.png" - install -D "ut1999_256x256.png" "$out/share/icons/hicolor/256x256/apps/ut1999.png" + for size in 16 24 32 48 64 128 192 256; do + square=$(printf "%sx%s" $size $size) + ${imagemagick}/bin/magick -background none ${./ut1999.svg} -resize $square ut1999_$square.png + install -D "ut1999_$square.png" "$out/share/icons/hicolor/$square/apps/ut1999.png" + done + # TODO consider to remove shared libraries that can be provided by nixpkgs for darwin too # Remove bundled libraries to use native versions instead rm $out/${systemDir}/libmpg123.so* \ $out/${systemDir}/libopenal.so* \ diff --git a/pkgs/by-name/uv/uv/package.nix b/pkgs/by-name/uv/uv/package.nix index 5d44a274a3d51..cceff8bbb193a 100644 --- a/pkgs/by-name/uv/uv/package.nix +++ b/pkgs/by-name/uv/uv/package.nix @@ -17,17 +17,17 @@ rustPlatform.buildRustPackage rec { pname = "uv"; - version = "0.5.24"; + version = "0.5.25"; src = fetchFromGitHub { owner = "astral-sh"; repo = "uv"; tag = version; - hash = "sha256-a4SemtzExhQing7CKjNvakoZSkI7wX01JPz4xWwEraQ="; + hash = "sha256-nDZaS3Yc7Z8gKyl2+HTpwoTTJKJDZCTQIiZazICvlvQ="; }; useFetchCargoVendor = true; - cargoHash = "sha256-UdS3SiviF3j3XUd1hUD9eIurKaC9ZX7DrvvE158zS5w="; + cargoHash = "sha256-GWlL5NZwHfkOfl16Eh38xo4OETmy/HFFeOZCGDruluI="; nativeBuildInputs = [ cmake diff --git a/pkgs/by-name/v2/v2ray/package.nix b/pkgs/by-name/v2/v2ray/package.nix index ffcc687ddbcfa..880c390e012b7 100644 --- a/pkgs/by-name/v2/v2ray/package.nix +++ b/pkgs/by-name/v2/v2ray/package.nix @@ -16,18 +16,18 @@ buildGoModule rec { pname = "v2ray-core"; - version = "5.24.0"; + version = "5.25.1"; src = fetchFromGitHub { owner = "v2fly"; repo = "v2ray-core"; rev = "v${version}"; - hash = "sha256-3xbXqfac1Kv77uBxykoX1nDB5NqTJDYmmzRloZUL/dA="; + hash = "sha256-XJVWja2LGBIXGdzYL8oHMcZn15Bg01t/ro/SRI6Xi/A="; }; # `nix-update` doesn't support `vendorHash` yet. # https://github.com/Mic92/nix-update/pull/95 - vendorHash = "sha256-z0ScEkXQu6YSXESdaTAs3vkPPlHEDmJ5xAwJQERwhWo="; + vendorHash = "sha256-8SFQUe52zZLii1XnFg2GBMseBlDxKAE0V56VVXGDlck="; ldflags = [ "-s" diff --git a/pkgs/by-name/va/vacuum-go/package.nix b/pkgs/by-name/va/vacuum-go/package.nix index 0a1a5b6a283ff..4c4cfc91562e4 100644 --- a/pkgs/by-name/va/vacuum-go/package.nix +++ b/pkgs/by-name/va/vacuum-go/package.nix @@ -8,17 +8,17 @@ buildGoModule rec { pname = "vacuum-go"; - version = "0.15.3"; + version = "0.16.1"; src = fetchFromGitHub { owner = "daveshanley"; repo = "vacuum"; # using refs/tags because simple version gives: 'the given path has multiple possibilities' error tag = "v${version}"; - hash = "sha256-SI32ODbd3X4zMhS3LI4vwVn9/gwgabWZ/8Nx+L3KPYE="; + hash = "sha256-TljvCGquQJl+uJXRBJCximR5OgsdAgK/+eobQW9+fZo="; }; - vendorHash = "sha256-xTqrKkCRO6lUbzXI4/UrBoZsKU9mQW8cMrnZ2X3wzog="; + vendorHash = "sha256-Yuibhb0N8QHHjdB4v3jFVxz1T6SkhgFfcouPAjjA0lU="; env.CGO_ENABLED = 0; ldflags = [ diff --git a/pkgs/by-name/va/vanguards/package.nix b/pkgs/by-name/va/vanguards/package.nix new file mode 100644 index 0000000000000..c821f1531723c --- /dev/null +++ b/pkgs/by-name/va/vanguards/package.nix @@ -0,0 +1,38 @@ +{ + python312Packages, + fetchFromGitHub, + lib, +}: +python312Packages.buildPythonApplication rec { + pname = "vanguards"; + version = "0.3.1-unstable-2023-10-31"; + + dependencies = [ python312Packages.stem ]; + #tries to access the network during the tests, which fails + doCheck = false; + + src = fetchFromGitHub { + owner = "mikeperry-tor"; + repo = "vanguards"; + rev = "8132fa0e556fbcbb3538ff9b48a2180c0c5e8fbd"; + sha256 = "sha256-XauSTgoH6zXv2DXyX2lQc6gy6Ysm41fKnyuWZ3hj7kI="; + }; + patches = [ ./python-3.12.patch ]; + postPatch = '' + # fix import cycle issue + substituteInPlace src/vanguards/main.py --replace-fail \ + 'import stem.response.events' 'import stem.socket; import stem.control; import stem.response.events' + ''; + + meta = { + maintainers = with lib.maintainers; [ ForgottenBeast ]; + mainProgram = "vanguards"; + license = lib.licenses.mit; + homepage = "https://github.com/mikeperry-tor/vanguards"; + description = "Protects TOR hidden services against guard node attacks"; + longDescription = '' + Runs alongside tor and interacts with its control port + in order to protect and alert against guard node attacks on hidden services + ''; + }; +} diff --git a/pkgs/by-name/va/vanguards/python-3.12.patch b/pkgs/by-name/va/vanguards/python-3.12.patch new file mode 100644 index 0000000000000..5241b3c09ce6a --- /dev/null +++ b/pkgs/by-name/va/vanguards/python-3.12.patch @@ -0,0 +1,51 @@ +Origin: https://github.com/mikeperry-tor/vanguards/pull/105/commits/183d24775521feb3ed61b681088347279c3fc84c +From: Dave Jones +Date: Wed, 28 Aug 2024 12:54:24 +0100 +Subject: [PATCH] Python 3.12 compatibility + +Python 3.12 removes the deprecated `SafeConfigParser` class. This patch +switches the code to using ConfigParser and read_file from Python 3.x, +and patches 2.7's SafeConfigParser to a compatible definition. +--- + src/vanguards/config.py | 11 +++++++---- + 1 file changed, 7 insertions(+), 4 deletions(-) + +diff --git a/src/vanguards/config.py b/src/vanguards/config.py +index 1c33391..b8e3f9c 100644 +--- a/src/vanguards/config.py ++++ b/src/vanguards/config.py +@@ -16,9 +16,12 @@ + from .logger import plog + + try: +- from configparser import SafeConfigParser, Error ++ from configparser import ConfigParser, Error + except ImportError: + from ConfigParser import SafeConfigParser, Error ++ class ConfigParser(SafeConfigParser): ++ def read_file(self, f, source=None): ++ return self.readfp(f, source) + + ################# Global options ################## + +@@ -209,7 +212,7 @@ def set_options_from_module(config, module, section): + config.set(section, param, str(val)) + + def generate_config(): +- config = SafeConfigParser(allow_no_value=True) ++ config = ConfigParser(allow_no_value=True) + set_options_from_module(config, sys.modules[__name__], "Global") + set_options_from_module(config, vanguards, "Vanguards") + set_options_from_module(config, bandguards, "Bandguards") +@@ -219,9 +222,9 @@ def generate_config(): + return config + + def apply_config(config_file): +- config = SafeConfigParser(allow_no_value=True) ++ config = ConfigParser(allow_no_value=True) + +- config.readfp(open(config_file, "r")) ++ config.read_file(open(config_file, "r")) + + get_options_for_module(config, sys.modules[__name__], "Global") + get_options_for_module(config, vanguards, "Vanguards") diff --git a/pkgs/by-name/vd/vdhcoapp/filepicker.nix b/pkgs/by-name/vd/vdhcoapp/filepicker.nix index 3a8b145a8c90e..cd2f34dc114af 100644 --- a/pkgs/by-name/vd/vdhcoapp/filepicker.nix +++ b/pkgs/by-name/vd/vdhcoapp/filepicker.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-7sRzf3SA9RSBf4O36olXgka8c6Bufdb0qsuTofVe55s="; }; - cargoHash = "sha256-aal7ppFkCpNc+QTS4Qklsb9WfJ65QqG6p1eOskiX+/Q="; + useFetchCargoVendor = true; + cargoHash = "sha256-HUNBGG1+LsjaDsJS4p5aAdCRyltylQUtdydGSoUdNgo="; buildInputs = [ atk diff --git a/pkgs/by-name/ve/vencord/package.nix b/pkgs/by-name/ve/vencord/package.nix index f83d9c3c93972..5a373196e554f 100644 --- a/pkgs/by-name/ve/vencord/package.nix +++ b/pkgs/by-name/ve/vencord/package.nix @@ -14,13 +14,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "vencord"; - version = "1.11.2"; + version = "1.11.3"; src = fetchFromGitHub { owner = "Vendicated"; repo = "Vencord"; rev = "v${finalAttrs.version}"; - hash = "sha256-18CzWAcBotIdzXFPIptBo20KZxXDVhM7AwwlCnPz+Wk="; + hash = "sha256-hx8YXkkpZoNq1aDsgdU5+Usmcp/mrlTo9sV2X4vqRuY="; }; pnpmDeps = pnpm_9.fetchDeps { diff --git a/pkgs/by-name/vi/vital/package.nix b/pkgs/by-name/vi/vital/package.nix index fb103ddaec7de..a5c964cde693c 100644 --- a/pkgs/by-name/vi/vital/package.nix +++ b/pkgs/by-name/vi/vital/package.nix @@ -11,6 +11,7 @@ xorg, libGL, freetype, + zenity, }: stdenv.mkDerivation (finalAttrs: { @@ -57,6 +58,11 @@ stdenv.mkDerivation (finalAttrs: { curl libjack2 ] + }" \ + --prefix PATH : "${ + lib.makeBinPath [ + zenity + ] }" runHook postInstall diff --git a/pkgs/by-name/vo/voicevox-engine/make-installable.patch b/pkgs/by-name/vo/voicevox-engine/make-installable.patch index 6cc3b04ad05b3..ba1c7a00cb56c 100644 --- a/pkgs/by-name/vo/voicevox-engine/make-installable.patch +++ b/pkgs/by-name/vo/voicevox-engine/make-installable.patch @@ -2,7 +2,7 @@ diff --git a/pyproject.toml b/pyproject.toml index fa23446..6a7705c 100644 --- a/pyproject.toml +++ b/pyproject.toml -@@ -40,7 +40,15 @@ use_parentheses = true +@@ -40,7 +40,20 @@ use_parentheses = true datas = "datas" # PyInstaller's argument [tool.poetry] @@ -12,7 +12,12 @@ index fa23446..6a7705c 100644 +authors = [] +description = "" +packages = [ { include = "voicevox_engine" } ] -+include = [ "resources/**/*", "run.py", "engine_manifest.json", "presets.yaml"] ++include = [ ++ { path = "resources/**/*", format = ["sdist", "wheel"] }, ++ { path = "run.py", format = ["sdist", "wheel"] }, ++ { path = "engine_manifest.json", format = ["sdist", "wheel"] }, ++ { path = "presets.yaml", format = ["sdist", "wheel"] } ++] + +[tool.poetry.scripts] +voicevox-engine = "run:main" diff --git a/pkgs/by-name/vo/voicevox/package.nix b/pkgs/by-name/vo/voicevox/package.nix index a12fcef8e1c03..6f64d266a39ae 100644 --- a/pkgs/by-name/vo/voicevox/package.nix +++ b/pkgs/by-name/vo/voicevox/package.nix @@ -15,13 +15,13 @@ buildNpmPackage rec { pname = "voicevox"; - version = "0.22.3"; + version = "0.22.4"; src = fetchFromGitHub { owner = "VOICEVOX"; repo = "voicevox"; tag = version; - hash = "sha256-6z+A4bJIDfN/K8IjEdt2TqEa/EDt4uQpGh+zSWfP74I="; + hash = "sha256-IOs3wBcFYpO4AHiWFOQWd5hp6EmwyA7Rcc8wjHKvYNQ="; }; patches = [ diff --git a/pkgs/by-name/vo/void/package.nix b/pkgs/by-name/vo/void/package.nix deleted file mode 100644 index 9f45138b2d29f..0000000000000 --- a/pkgs/by-name/vo/void/package.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ - lib, - fetchFromGitHub, - rustPlatform, -}: - -rustPlatform.buildRustPackage rec { - pname = "void"; - version = "1.1.5"; - - src = fetchFromGitHub { - owner = "spacejam"; - repo = "void"; - rev = version; - sha256 = "08vazw4rszqscjz988k89z28skyj3grm81bm5iwknxxagmrb20fz"; - }; - - # The tests are long-running and not that useful - doCheck = false; - - cargoHash = "sha256-4LLm8EIGR9YJyVlSLRsQmBJc0QZaxBQafE4VLsDyAfI="; - - meta = with lib; { - description = "Terminal-based personal organizer"; - homepage = "https://github.com/spacejam/void"; - license = licenses.gpl3; - maintainers = with maintainers; [ spacekookie ]; - mainProgram = "void"; - }; -} diff --git a/pkgs/by-name/vp/vpnc/package.nix b/pkgs/by-name/vp/vpnc/package.nix index 3ffd36234aeba..d6b8630984a58 100644 --- a/pkgs/by-name/vp/vpnc/package.nix +++ b/pkgs/by-name/vp/vpnc/package.nix @@ -1,6 +1,8 @@ { lib, stdenv, + bash, + buildPackages, fetchFromGitHub, makeWrapper, pkg-config, @@ -14,17 +16,21 @@ stdenv.mkDerivation { pname = "vpnc"; - version = "unstable-2021-11-04"; + version = "unstable-2024-12-20"; src = fetchFromGitHub { owner = "streambinder"; repo = "vpnc"; - rev = "c8bb5371b881f8853f191c495e762f834c9def5d"; - sha256 = "1j1p83nfc2fpwczjcggsby0b44hk97ky0s6vns6md3awlbpgdn57"; + rev = "d58afaaafb6a43cb21bb08282b54480d7b2cc6ab"; + sha256 = "sha256-79DaK1s+YmROKbcWIXte+GZh0qq9LAQlSmczooR86H8="; fetchSubmodules = true; }; - nativeBuildInputs = [ makeWrapper ] ++ lib.optional (!opensslSupport) pkg-config; + nativeBuildInputs = [ + makeWrapper + perl + ] ++ lib.optional (!opensslSupport) pkg-config; + buildInputs = [ libgcrypt perl @@ -40,15 +46,25 @@ stdenv.mkDerivation { NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration"; }; - postPatch = '' - patchShebangs src/makeman.pl - ''; + postPatch = + '' + substituteInPlace src/vpnc-disconnect \ + --replace-fail /bin/sh ${lib.getExe' bash "sh"} + patchShebangs src/makeman.pl + '' + + lib.optionalString (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + # manpage generation invokes the build vpnc, which must be emulating when cross compiling + substituteInPlace src/makeman.pl --replace-fail \ + '$vpnc --long-help' \ + '${stdenv.hostPlatform.emulator buildPackages} $vpnc --long-help' + ''; enableParallelBuilding = true; # Missing install depends: # install: target '...-vpnc-unstable-2021-11-04/share/doc/vpnc': No such file or directory # make: *** [Makefile:149: install-doc] Error 1 enableParallelInstalling = false; + strictDeps = true; meta = with lib; { homepage = "https://davidepucci.it/doc/vpnc/"; diff --git a/pkgs/by-name/vt/vte/package.nix b/pkgs/by-name/vt/vte/package.nix index 8d19671fc6c48..08aeea7a832a4 100644 --- a/pkgs/by-name/vt/vte/package.nix +++ b/pkgs/by-name/vt/vte/package.nix @@ -1,7 +1,7 @@ { stdenv, lib, - fetchFromGitLab, + fetchurl, fetchpatch, gettext, pkg-config, @@ -34,19 +34,16 @@ stdenv.mkDerivation (finalAttrs: { pname = "vte"; - version = "0.78.2"; + version = "0.78.3"; outputs = [ "out" "dev" ] ++ lib.optional (gtkVersion != null) "devdoc"; - src = fetchFromGitLab { - domain = "gitlab.gnome.org"; - owner = "GNOME"; - repo = "vte"; - rev = finalAttrs.version; - hash = "sha256-ZUECInBRNYkXJtGveLq8SR6YdWqJA0y9UJSxmc8mVNk="; + src = fetchurl { + url = "mirror://gnome/sources/vte/${lib.versions.majorMinor finalAttrs.version}/vte-${finalAttrs.version}.tar.xz"; + hash = "sha256-l+KsOie8V1U1iiI/VfWiUYZUqgNhv8YaGWwcLgh5jv8="; }; patches = [ diff --git a/pkgs/by-name/w3/w3m/package.nix b/pkgs/by-name/w3/w3m/package.nix index 7363dfe3ed3b2..3722c6a5ceba3 100644 --- a/pkgs/by-name/w3/w3m/package.nix +++ b/pkgs/by-name/w3/w3m/package.nix @@ -103,7 +103,7 @@ stdenv.mkDerivation rec { "--with-gc=${boehmgc.dev}" ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ - "ac_cv_func_setpgrp_void=yes" + "ac_cv_func_setpgrp_void=${if stdenv.hostPlatform.isBSD then "no" else "yes"}" ] ++ lib.optional graphicsSupport "--enable-image=${lib.optionalString x11Support "x11,"}fb" ++ lib.optional (graphicsSupport && !x11Support) "--without-x"; diff --git a/pkgs/by-name/wa/wasabibackend/package.nix b/pkgs/by-name/wa/wasabibackend/package.nix index 5b36e1d8ede5d..2ab8e58e55a4f 100644 --- a/pkgs/by-name/wa/wasabibackend/package.nix +++ b/pkgs/by-name/wa/wasabibackend/package.nix @@ -22,8 +22,8 @@ buildDotnetModule rec { projectFile = "WalletWasabi.Backend/WalletWasabi.Backend.csproj"; nugetDeps = ./deps.json; - dotnet-sdk = dotnetCorePackages.sdk_7_0; - dotnet-runtime = dotnetCorePackages.aspnetcore_7_0; + dotnet-sdk = dotnetCorePackages.sdk_7_0-bin; + dotnet-runtime = dotnetCorePackages.aspnetcore_7_0-bin; buildInputs = [(lib.getLib stdenv.cc.cc) zlib]; diff --git a/pkgs/by-name/wa/wasm-bindgen-cli_0_2_100/package.nix b/pkgs/by-name/wa/wasm-bindgen-cli_0_2_100/package.nix new file mode 100644 index 0000000000000..0def66ce256e2 --- /dev/null +++ b/pkgs/by-name/wa/wasm-bindgen-cli_0_2_100/package.nix @@ -0,0 +1,19 @@ +{ + buildWasmBindgenCli, + fetchCrate, + rustPlatform, +}: + +buildWasmBindgenCli rec { + src = fetchCrate { + pname = "wasm-bindgen-cli"; + version = "0.2.100"; + hash = "sha256-3RJzK7mkYFrs7C/WkhW9Rr4LdP5ofb2FdYGz1P7Uxog="; + }; + + cargoDeps = rustPlatform.fetchCargoVendor { + inherit src; + inherit (src) pname version; + hash = "sha256-qsO12332HSjWCVKtf1cUePWWb9IdYUmT+8OPj/XP2WE="; + }; +} diff --git a/pkgs/by-name/wa/wasm-bindgen-cli_0_2_92/package.nix b/pkgs/by-name/wa/wasm-bindgen-cli_0_2_92/package.nix new file mode 100644 index 0000000000000..3d908a9501ffd --- /dev/null +++ b/pkgs/by-name/wa/wasm-bindgen-cli_0_2_92/package.nix @@ -0,0 +1,19 @@ +{ + buildWasmBindgenCli, + fetchCrate, + rustPlatform, +}: + +buildWasmBindgenCli rec { + src = fetchCrate { + pname = "wasm-bindgen-cli"; + version = "0.2.92"; + hash = "sha256-1VwY8vQy7soKEgbki4LD+v259751kKxSxmo/gqE6yV0="; + }; + + cargoDeps = rustPlatform.fetchCargoVendor { + inherit src; + inherit (src) pname version; + hash = "sha256-81vQkKubMWaX0M3KAwpYgMA1zUQuImFGvh5yTW+rIAs="; + }; +} diff --git a/pkgs/by-name/wa/wasm-bindgen-cli_0_2_93/package.nix b/pkgs/by-name/wa/wasm-bindgen-cli_0_2_93/package.nix new file mode 100644 index 0000000000000..a76e94595f735 --- /dev/null +++ b/pkgs/by-name/wa/wasm-bindgen-cli_0_2_93/package.nix @@ -0,0 +1,19 @@ +{ + buildWasmBindgenCli, + fetchCrate, + rustPlatform, +}: + +buildWasmBindgenCli rec { + src = fetchCrate { + pname = "wasm-bindgen-cli"; + version = "0.2.93"; + hash = "sha256-DDdu5mM3gneraM85pAepBXWn3TMofarVR4NbjMdz3r0="; + }; + + cargoDeps = rustPlatform.fetchCargoVendor { + inherit src; + inherit (src) pname version; + hash = "sha256-s8srI+lu+DgQ+5BbaEXC4Ja/BL+K22LIl5Gd1PwNZZk="; + }; +} diff --git a/pkgs/by-name/wa/wasm-bindgen-cli_0_2_95/package.nix b/pkgs/by-name/wa/wasm-bindgen-cli_0_2_95/package.nix new file mode 100644 index 0000000000000..34c590a4a2501 --- /dev/null +++ b/pkgs/by-name/wa/wasm-bindgen-cli_0_2_95/package.nix @@ -0,0 +1,19 @@ +{ + buildWasmBindgenCli, + fetchCrate, + rustPlatform, +}: + +buildWasmBindgenCli rec { + src = fetchCrate { + pname = "wasm-bindgen-cli"; + version = "0.2.95"; + hash = "sha256-prMIreQeAcbJ8/g3+pMp1Wp9H5u+xLqxRxL+34hICss="; + }; + + cargoDeps = rustPlatform.fetchCargoVendor { + inherit src; + inherit (src) pname version; + hash = "sha256-+h87/onAdpG0Jmeuy0Wd2djLFOAyaE52cAfxDVVcgP8="; + }; +} diff --git a/pkgs/by-name/wa/waveterm/package.nix b/pkgs/by-name/wa/waveterm/package.nix index 9bda318b58fd8..a050d09c653ed 100644 --- a/pkgs/by-name/wa/waveterm/package.nix +++ b/pkgs/by-name/wa/waveterm/package.nix @@ -33,7 +33,7 @@ let selectSystem = attrs: attrs.${stdenv.hostPlatform.system}; pname = "waveterm"; - version = "0.10.4"; + version = "0.11.0"; passthru.updateScript = ./update.sh; @@ -64,8 +64,8 @@ let fetchurl { url = "https://github.com/wavetermdev/waveterm/releases/download/v${version}/waveterm-linux-${arch}-${version}.deb"; hash = selectSystem { - x86_64-linux = "sha256-dwBnRuskajMpfaBQ5zr19+CQ3A/qen2RtxmV7GnXx0E="; - aarch64-linux = "sha256-HfzvbAV8RkmuwvuBtgvHgzAslbejlPJJJO7juGSMm1o="; + x86_64-linux = "sha256-4GKsO7gIQaIC7e7IH1QgIpXQqIX6NHyw8wXO0OWXRUI="; + aarch64-linux = "sha256-xbNBNwQNBwvAcx/sp8bchNtqUpXXILZADOr2wwQOrPk="; }; }; @@ -142,8 +142,8 @@ let fetchurl { url = "https://github.com/wavetermdev/waveterm/releases/download/v${version}/Wave-darwin-${arch}-${version}.zip"; hash = selectSystem { - x86_64-darwin = "sha256-iQimmHhpojimZvJtPgOExLaEu/io6BrWWkTsx/1avjY="; - aarch64-darwin = "sha256-4txsd3aKIcsjSvx+XeDm7a6M9YRkZNLUuvv5adLOVx8="; + x86_64-darwin = "sha256-qmBNZ6ovvDd2Kv3l94kl/p05xnSN21mjPTwzDP21Knc="; + aarch64-darwin = "sha256-GyLXmoBVpVKdrZcJGtVNxBk8vqsssAhNF+YNgnL6oVY="; }; }; diff --git a/pkgs/by-name/wa/waypipe/package.nix b/pkgs/by-name/wa/waypipe/package.nix index 61eedc92e513d..a4745fe72f16a 100644 --- a/pkgs/by-name/wa/waypipe/package.nix +++ b/pkgs/by-name/wa/waypipe/package.nix @@ -22,18 +22,18 @@ }: llvmPackages.stdenv.mkDerivation rec { pname = "waypipe"; - version = "0.10.1"; + version = "0.10.2"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "mstoeckl"; repo = "waypipe"; tag = "v${version}"; - hash = "sha256-l9gZ7FtLxGKBRlMem3VGJGTvOkVAtLBa7eF9+gA5Vfo="; + hash = "sha256-MTh3it+sJxd+vOTi9fVOxvlqlkgJAK56wel3xX0IzJE="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit pname version src; - hash = "sha256-DjqyKXbCQ6kzb1138wNWPnRXIgUaaE1nnCExLeLX6pw="; + hash = "sha256-15JmdpWXSyM0Hg3Babi4mKcnMhzx0fsWeFRROTQ/RLQ="; }; strictDeps = true; diff --git a/pkgs/by-name/wa/waytrogen/package.nix b/pkgs/by-name/wa/waytrogen/package.nix index 561c5dbf55abf..036633da5da26 100644 --- a/pkgs/by-name/wa/waytrogen/package.nix +++ b/pkgs/by-name/wa/waytrogen/package.nix @@ -10,25 +10,28 @@ rustPlatform.buildRustPackage rec { pname = "waytrogen"; - version = "0.5.8"; + version = "0.6.3"; src = fetchFromGitHub { owner = "nikolaizombie1"; repo = "waytrogen"; tag = version; - hash = "sha256-tq5cC0Z0kmrYopOGbdoAERBHQXrAw799zWdQP06rTYw="; + hash = "sha256-jkrvtwkzlsQgbw8/N4uzeqQ3fVSur2oa21IOXRRgh9I="; }; - cargoHash = "sha256-05YfQBezDbQ8KfNvl/4Av5vf/rxJU3Ej6RDgSnSfjtM="; + useFetchCargoVendor = true; + cargoHash = "sha256-iCcYlBqXo76QLuzdd1/YbLL99eCOnniHDAOllX8XyXQ="; nativeBuildInputs = [ pkg-config wrapGAppsHook4 ]; - buildInputs = [ - glib - ]; + buildInputs = [ glib ]; + + env = { + OPENSSL_NO_VENDOR = 1; + }; postBuild = '' install -Dm644 org.Waytrogen.Waytrogen.gschema.xml -t $out/share/gsettings-schemas/$name/glib-2.0/schemas @@ -38,6 +41,10 @@ rustPlatform.buildRustPackage rec { postInstall = '' install -Dm644 waytrogen.desktop $out/share/applications/waytrogen.desktop install -Dm644 README-Assets/WaytrogenLogo.svg $out/share/icons/hicolor/scalable/apps/waytrogen.svg + while IFS= read -r lang; do + mkdir -p $out/share/locale/$lang/LC_MESSAGES + msgfmt locales/$lang/LC_MESSAGES/waytrogen.po -o $out/share/locale/$lang/LC_MESSAGES/waytrogen.mo + done < locales/LINGUAS ''; passthru.updateScript = nix-update-script { }; @@ -52,7 +59,10 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/nikolaizombie1/waytrogen"; changelog = "https://github.com/nikolaizombie1/waytrogen/releases/tag/${version}"; license = lib.licenses.unlicense; - maintainers = with lib.maintainers; [ genga898 ]; + maintainers = with lib.maintainers; [ + genga898 + nikolaizombie1 + ]; mainProgram = "waytrogen"; platforms = lib.platforms.linux; }; diff --git a/pkgs/by-name/we/webmetro/package.nix b/pkgs/by-name/we/webmetro/package.nix deleted file mode 100644 index 12c60fe280500..0000000000000 --- a/pkgs/by-name/we/webmetro/package.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ - lib, - fetchFromGitHub, - rustPlatform, -}: - -rustPlatform.buildRustPackage rec { - pname = "webmetro"; - version = "unstable-20180426"; - - src = fetchFromGitHub { - owner = "Tangent128"; - repo = pname; - rev = "4f6cc00fe647bd311d00a8a4cb53ab08f20a04f9"; - sha256 = "1n2c7ygs8qsd5zgii6fqqcwg427bsij082bg4ijnzkq5630dx651"; - }; - - cargoHash = "sha256-6LfJ5rI7Y+ziEIMxPpKxOS+VSrKuKohEcqIK7xdKhNg="; - - meta = with lib; { - description = "Simple relay server for broadcasting a WebM stream"; - longDescription = '' - Webmetro is a simple relay server for broadcasting a WebM stream - from one uploader to many downloaders, via HTTP. - The initialization segment is remembered, so that viewers can join - mid-stream. Cluster timestamps are rewritten to be monotonic, so multiple - (compatibly-encoded) webm files can be chained together without - clients needing to reconnect. - ''; - license = with licenses; [ mit ]; - maintainers = with maintainers; [ leenaars ]; - mainProgram = "webmetro"; - }; -} diff --git a/pkgs/by-name/we/websurfx/package.nix b/pkgs/by-name/we/websurfx/package.nix index 6bafceffe315e..ebe1ce4ac311a 100644 --- a/pkgs/by-name/we/websurfx/package.nix +++ b/pkgs/by-name/we/websurfx/package.nix @@ -6,7 +6,7 @@ pkg-config, }: let - version = "1.22.2"; + version = "1.23.0"; in rustPlatform.buildRustPackage { pname = "websurfx"; @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage { owner = "neon-mmd"; repo = "websurfx"; tag = "v${version}"; - hash = "sha256-Kwf4lIY99dnF8p59qOUefHIyhQHBb/ZasidswETLICM="; + hash = "sha256-+29Q963+CdYgy8JmhZwG22CElliYpFyEtOj8pHZj8XY="; }; nativeBuildInputs = [ @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage { useFetchCargoVendor = true; - cargoHash = "sha256-DK5eYgz/+FieauE7bCXXOs7RQUQWEphq3wP8QD0S9QQ="; + cargoHash = "sha256-16u9pb8+qjoQPK5xipJAFCMIpebJRTiGtv1gFn3xyj8="; postPatch = '' substituteInPlace src/handler/mod.rs \ diff --git a/pkgs/by-name/we/wezterm/package.nix b/pkgs/by-name/we/wezterm/package.nix index 569beaa62bef2..06e6d8e241d0a 100644 --- a/pkgs/by-name/we/wezterm/package.nix +++ b/pkgs/by-name/we/wezterm/package.nix @@ -29,14 +29,14 @@ rustPlatform.buildRustPackage rec { pname = "wezterm"; - version = "0-unstable-2025-01-03"; + version = "0-unstable-2025-01-24"; src = fetchFromGitHub { owner = "wez"; repo = "wezterm"; - rev = "8e9cf912e66f704f300fac6107206a75036de1e7"; + rev = "4bf0007cefff7f1ad139d89b54f074d5ad7d2184"; fetchSubmodules = true; - hash = "sha256-JkAovAeoVrH2QlHzzcciraebfsSQPBQPsA3fUKEjRm8="; + hash = "sha256-YN1C+cgF2T/dUljCZO5RMdbJsun+7lgqLN7BW+IMZsg="; }; postPatch = '' diff --git a/pkgs/by-name/xd/xdg-desktop-portal-gnome/package.nix b/pkgs/by-name/xd/xdg-desktop-portal-gnome/package.nix index 8c09c2cf0b210..331643e2e4337 100644 --- a/pkgs/by-name/xd/xdg-desktop-portal-gnome/package.nix +++ b/pkgs/by-name/xd/xdg-desktop-portal-gnome/package.nix @@ -22,11 +22,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "xdg-desktop-portal-gnome"; - version = "47.1"; + version = "47.2"; src = fetchurl { url = "mirror://gnome/sources/xdg-desktop-portal-gnome/${lib.versions.major finalAttrs.version}/xdg-desktop-portal-gnome-${finalAttrs.version}.tar.xz"; - hash = "sha256-1CD/chc7BNyUkdPX3YzJYgT38/J8TL6mAkNh6pg592k="; + hash = "sha256-S1NoqhncCqYsioTkgciiZJC013x5ALjlydQyzpHxJ0w="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/xe/xephem/add-cross-compilation-support.patch b/pkgs/by-name/xe/xephem/add-cross-compilation-support.patch new file mode 100644 index 0000000000000..bfa05a4661cea --- /dev/null +++ b/pkgs/by-name/xe/xephem/add-cross-compilation-support.patch @@ -0,0 +1,153 @@ +diff --git a/libastro/Makefile b/libastro/Makefile +index 0a8ecb6..b24e827 100644 +--- a/libastro/Makefile ++++ b/libastro/Makefile +@@ -3,6 +3,9 @@ + + # compiler and flags + ++AR = ar ++RANLIB = ranlib ++ + # gcc + CC = gcc + CFLAGS= -O2 -Wall +@@ -83,8 +86,8 @@ OBJS = \ + vsop87_data.o + + libastro.a: $(HS) $(OBJS) +- ar rv $@ $(OBJS) +- ranlib $@ ++ $(AR) rv $@ $(OBJS) ++ $(RANLIB) $@ + + libastro.so: $(HS) $(OBJS) + $(CC) -shared -o $@ $(OBJS) +diff --git a/libip/Makefile b/libip/Makefile +index 5c36ac8..e223dca 100644 +--- a/libip/Makefile ++++ b/libip/Makefile +@@ -1,6 +1,9 @@ + # Makefile for image processing routines, libip. + # (C) 2001 Elwood Charles Downey + ++AR = ar ++RANLIB = ranlib ++ + # gcc + CC = gcc + CFLAGS= -I../libastro -O2 -Wall +@@ -36,11 +39,11 @@ OBJS = \ + HS = ip.h fsmatch.h + + libip.a: $(HS) $(OBJS) +- ar rv $@ $(OBJS) +- ranlib $@ ++ $(AR) rv $@ $(OBJS) ++ $(RANLIB) $@ + + libip.so: $(OBJS) +- gcc -shared -o $@ $(OBJS) ++ $(CC) -shared -o $@ $(OBJS) + + clobber: + rm -f *.o libip.a +diff --git a/libjpegd/Makefile b/libjpegd/Makefile +index 46ea040..7562fc5 100644 +--- a/libjpegd/Makefile ++++ b/libjpegd/Makefile +@@ -2,6 +2,9 @@ + + # compiler and flags + ++AR = ar ++RANLIB = ranlib ++ + # gcc + CC = gcc + CFLAGS= -O2 -Wall +@@ -62,8 +65,8 @@ OBJS = \ + jutils.o + + libjpegd.a: $(HS) $(OBJS) +- ar r $@ $(OBJS) +- ranlib $@ ++ $(AR) r $@ $(OBJS) ++ $(RANLIB) $@ + + clobber: + touch x.o x.a +diff --git a/liblilxml/Makefile b/liblilxml/Makefile +index 2e73761..7f3f2c3 100644 +--- a/liblilxml/Makefile ++++ b/liblilxml/Makefile +@@ -3,6 +3,9 @@ + + # compiler and flags + ++AR = ar ++RANLIB = ranlib ++ + # gcc + CC = gcc + CFLAGS= -O2 -Wall +@@ -27,8 +30,8 @@ HS = lilxml.h + OBJS = lilxml.o base64.o + + liblilxml.a: $(HS) $(OBJS) +- ar r $@ $(OBJS) +- ranlib $@ ++ $(AR) r $@ $(OBJS) ++ $(RANLIB) $@ + + liltest: liltest.o liblilxml.a + $(CC) $(LDFLAGS) -o liltest liltest.o liblilxml.a +diff --git a/libpng/Makefile b/libpng/Makefile +index 5f332cc..6217f2f 100644 +--- a/libpng/Makefile ++++ b/libpng/Makefile +@@ -10,7 +10,7 @@ ZLIBLIB = ../libz + # Compiler, linker, lib and other tools + CC = gcc + LD = $(CC) +-AR = ar rcs ++AR = ar + RANLIB = ranlib + RM = rm -f + +@@ -38,7 +38,7 @@ OBJS = png$(O) pngerror$(O) pngget$(O) pngmem$(O) pngpread$(O) \ + all: libpng$(A) + + libpng$(A): $(OBJS) +- $(AR) $@ $(OBJS) ++ $(AR) rcs $@ $(OBJS) + $(RANLIB) $@ + + clean: +diff --git a/libz/Makefile b/libz/Makefile +index 773f3ed..0fc73c0 100644 +--- a/libz/Makefile ++++ b/libz/Makefile +@@ -1,3 +1,7 @@ ++AR = ar ++RANLIB = ranlib ++ ++CC = cc + CLDFLAGS = + CFLAGS = $(CLDFLAGS) -Wall -O2 + LDFLAGS = +@@ -17,11 +21,11 @@ OBJS = adler32.o \ + inffast.o + + libz.a: $(OBJS) +- ar rc libz.a $(OBJS) +- -ranlib libz.a ++ $(AR) rc libz.a $(OBJS) ++ $(RANLIB) libz.a + + testzlib: testzlib.o libz.a +- cc $(LDFLAGS) -o testzlib testzlib.o libz.a ++ $(CC) $(LDFLAGS) -o testzlib testzlib.o libz.a + + clean: + rm -f *.o *.a testzlib diff --git a/pkgs/by-name/xe/xephem/package.nix b/pkgs/by-name/xe/xephem/package.nix new file mode 100644 index 0000000000000..edaec00e86707 --- /dev/null +++ b/pkgs/by-name/xe/xephem/package.nix @@ -0,0 +1,112 @@ +{ + lib, + stdenv, + fetchFromGitHub, + fetchpatch, + makeDesktopItem, + copyDesktopItems, + installShellFiles, + motif, + openssl, + groff, + xorg, +}: + +stdenv.mkDerivation rec { + pname = "xephem"; + version = "4.2.0"; + + src = fetchFromGitHub { + owner = "XEphem"; + repo = "XEphem"; + rev = version; + hash = "sha256-TuzXrWoJOAHg31DrJObPcHBXgtqR/KWKFRsqddPzL4c="; + }; + + nativeBuildInputs = [ + copyDesktopItems + installShellFiles + groff # nroff + ]; + + buildInputs = [ + motif + openssl + xorg.libXmu + xorg.libXext + xorg.libXt + ]; + + patches = [ + # fix compile error with GCC 14 + (fetchpatch { + url = "https://github.com/XEphem/XEphem/commit/30e14f685ede015fcd8985cd83ee6510f93f0073.patch"; + hash = "sha256-wNoLjR6xEl56ZA6FLBS2xtySeDEYXTCA8j4Z5JIrF6k="; + }) + ./add-cross-compilation-support.patch + ]; + + postPatch = '' + cd GUI/xephem + substituteInPlace xephem.c splash.c --replace-fail '/etc/XEphem' '${placeholder "out"}/etc/XEphem' + ''; + + doCheck = true; + + checkFlags = "-C ../../tests"; + + checkTarget = "run-test"; + + makeFlags = [ + "CC=${stdenv.cc.targetPrefix}cc" + "AR=${stdenv.cc.targetPrefix}ar" + "RANLIB=${stdenv.cc.targetPrefix}ranlib" + ]; + + installPhase = '' + runHook preInstall + installBin xephem + mkdir -p $out/share/xephem + cp -R auxil $out/share/xephem/ + cp -R catalogs $out/share/xephem/ + cp -R fifos $out/share/xephem/ + cp -R fits $out/share/xephem/ + cp -R gallery $out/share/xephem/ + cp -R help $out/share/xephem/ + cp -R lo $out/share/xephem/ + mkdir $out/etc + echo "XEphem.ShareDir: $out/share/xephem" > $out/etc/XEphem + installManPage xephem.1 + install -Dm644 XEphem.png -t $out/share/pixmaps + runHook postInstall + ''; + + desktopItems = [ + (makeDesktopItem { + name = "xephem"; + exec = "xephem"; + icon = "XEphem"; + desktopName = "XEphem"; + categories = [ + "Science" + "Astronomy" + ]; + }) + ]; + + meta = { + description = "Interactive astronomy program for all UNIX platforms"; + longDescription = '' + Xephem is an interactive astronomical ephemeris program for X Windows systems. It computes + heliocentric, geocentric and topocentric information for fixed celestial objects and objects + in heliocentric and geocentric orbits; has built-in support for all planet positions; the + moons of Jupiter, Saturn and Earth; Mars' and Jupiter's central meridian longitude; Saturn's + rings; and Jupiter's Great Red Spot. + ''; + mainProgram = "xephem"; + homepage = "https://xephem.github.io/XEphem/Site/xephem.html"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ EstebanMacanek ]; + platforms = lib.platforms.unix; + }; +} diff --git a/pkgs/by-name/ya/yamlscript/package.nix b/pkgs/by-name/ya/yamlscript/package.nix index 2575060ee1314..189caee6282cb 100644 --- a/pkgs/by-name/ya/yamlscript/package.nix +++ b/pkgs/by-name/ya/yamlscript/package.nix @@ -2,11 +2,11 @@ buildGraalvmNativeImage rec { pname = "yamlscript"; - version = "0.1.88"; + version = "0.1.89"; src = fetchurl { url = "https://github.com/yaml/yamlscript/releases/download/${version}/yamlscript.cli-${version}-standalone.jar"; - hash = "sha256-yG6KcMyCq8HTJk+nY+zkHOrzsNbiUDW+9ms5ZA0pmz8="; + hash = "sha256-SSgiAjPRow4R1cLl7POUzC+TeQ4Oq+8QeFh410IsgdA="; }; executable = "ys"; diff --git a/pkgs/by-name/ze/zed-editor/package.nix b/pkgs/by-name/ze/zed-editor/package.nix index d768673af00db..775489002e020 100644 --- a/pkgs/by-name/ze/zed-editor/package.nix +++ b/pkgs/by-name/ze/zed-editor/package.nix @@ -95,7 +95,7 @@ let in rustPlatform.buildRustPackage rec { pname = "zed-editor"; - version = "0.170.2"; + version = "0.171.3"; outputs = [ "out" ] ++ lib.optional buildRemoteServer "remote_server"; @@ -103,7 +103,7 @@ rustPlatform.buildRustPackage rec { owner = "zed-industries"; repo = "zed"; tag = "v${version}"; - hash = "sha256-E9p/JHHIQ2nQ6LeFob1tDf6UopeEWL/Z7INstehvfEI="; + hash = "sha256-hUEZzN2rocWXxEFmtjB/7AZf+1kAGx8IZ3U57+Zi0EQ="; }; patches = [ @@ -123,7 +123,7 @@ rustPlatform.buildRustPackage rec { ''; useFetchCargoVendor = true; - cargoHash = "sha256-A9sTR5MCLXskhvJHVGRQ/rSLwOKqhfgJi5zaGsgglL0="; + cargoHash = "sha256-s+SH6anGnYAPMDTD71QEclp8XM+ceyur3Anto0JOPyc="; nativeBuildInputs = [ @@ -292,16 +292,6 @@ rustPlatform.buildRustPackage rec { versionCheckProgramArg = [ "--version" ]; doInstallCheck = true; - # The darwin Applications directory is not stripped by default, see - # https://github.com/NixOS/nixpkgs/issues/367169 - # This setting is not platform-guarded as it doesn't do any harm on Linux, - # where this directory simply does not exist. - stripDebugList = [ - "bin" - "libexec" - "Applications" - ]; - passthru = { updateScript = gitUpdater { rev-prefix = "v"; diff --git a/pkgs/by-name/zm/zmap/package.nix b/pkgs/by-name/zm/zmap/package.nix index fcff083f37ee6..5ef06600ff92b 100644 --- a/pkgs/by-name/zm/zmap/package.nix +++ b/pkgs/by-name/zm/zmap/package.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "zmap"; - version = "4.3.1"; + version = "4.3.2"; src = fetchFromGitHub { owner = "zmap"; repo = pname; rev = "v${version}"; - sha256 = "sha256-QNOLbIDILwCNYlYrr2mET4K6x1zn8PIoXiqs/Oaj3eY="; + sha256 = "sha256-dHJ3H3jc0/cVfJ7NVoJG+WF9+rowbgYF1Ph5/exxRkE="; }; cmakeFlags = [ "-DRESPECT_INSTALL_PREFIX_CONFIG=ON" ]; diff --git a/pkgs/tools/networking/zrok/default.nix b/pkgs/by-name/zr/zrok/package.nix similarity index 100% rename from pkgs/tools/networking/zrok/default.nix rename to pkgs/by-name/zr/zrok/package.nix diff --git a/pkgs/tools/networking/zrok/update.sh b/pkgs/by-name/zr/zrok/update.sh similarity index 100% rename from pkgs/tools/networking/zrok/update.sh rename to pkgs/by-name/zr/zrok/update.sh diff --git a/pkgs/desktops/lomiri/applications/morph-browser/1001-morph-browser-tst_AddressBar-Replace-wait-and-compare-with-tryCompare.patch b/pkgs/desktops/lomiri/applications/morph-browser/1001-morph-browser-tst_AddressBar-Replace-wait-and-compare-with-tryCompare.patch deleted file mode 100644 index 72c27c3e0e295..0000000000000 --- a/pkgs/desktops/lomiri/applications/morph-browser/1001-morph-browser-tst_AddressBar-Replace-wait-and-compare-with-tryCompare.patch +++ /dev/null @@ -1,196 +0,0 @@ -From 9c4cd4fa938244cc2e319555d372e4e32029964a Mon Sep 17 00:00:00 2001 -From: OPNA2608 -Date: Tue, 14 Jan 2025 23:06:20 +0100 -Subject: [PATCH] tests/unittests/qml/tst_AddressBar.qml: Replace wait + - compare with tryCompare - ---- - tests/unittests/qml/tst_AddressBar.qml | 75 +++++++++++--------------- - 1 file changed, 30 insertions(+), 45 deletions(-) - -diff --git a/tests/unittests/qml/tst_AddressBar.qml b/tests/unittests/qml/tst_AddressBar.qml -index 5c27acff..dc0ec4c6 100644 ---- a/tests/unittests/qml/tst_AddressBar.qml -+++ b/tests/unittests/qml/tst_AddressBar.qml -@@ -73,6 +73,15 @@ Item { - name: "AddressBar" - when: windowShown - -+ function verifyAddressBarText(text) { -+ tryCompare(addressBar, "text", text) -+ } -+ -+ function typeStringAndVerify(text) { -+ typeString(text) -+ verifyAddressBarText(text) -+ } -+ - function init() { - addressBar.actualUrl = "" - validatedSpy.clear() -@@ -101,9 +110,7 @@ Item { - } - - function test_validUrlShouldNotBeRewritten(data) { -- typeString(data.url) -- wait(500) -- compare(addressBar.text, data.url) -+ typeStringAndVerify(data.url) - keyClick(Qt.Key_Return) - validatedSpy.wait() - compare(addressBar.requestedUrl, data.url) -@@ -120,9 +127,7 @@ Item { - } - - function test_urlWithoutSchemeShouldBeRewritten(data) { -- typeString(data.text) -- wait(500) -- compare(addressBar.text, data.text) -+ typeStringAndVerify(data.text) - keyClick(Qt.Key_Return) - validatedSpy.wait() - compare(addressBar.requestedUrl, data.requestedUrl) -@@ -137,9 +142,7 @@ Item { - } - - function test_leadingAndTrailingWhitespacesShouldBeTrimmed(data) { -- typeString(data.text) -- wait(500) -- compare(addressBar.text, data.text) -+ typeStringAndVerify(data.text) - keyClick(Qt.Key_Return) - validatedSpy.wait() - compare(addressBar.requestedUrl, data.requestedUrl) -@@ -153,9 +156,7 @@ Item { - } - - function test_searchQueryShouldBeRewritten(data) { -- typeString(data.text) -- wait(500) -- compare(addressBar.text, data.text) -+ typeStringAndVerify(data.text) - keyClick(Qt.Key_Return) - validatedSpy.wait() - compare(addressBar.requestedUrl.toString().indexOf(data.start), 0) -@@ -174,9 +175,7 @@ Item { - } - - function test_htmlEntitiesShouldBeEscapedInSearchQueries(data) { -- typeString(data.text) -- wait(500) -- compare(addressBar.text, data.text) -+ typeStringAndVerify(data.text) - keyClick(Qt.Key_Return) - validatedSpy.wait() - verify(addressBar.requestedUrl.toString().indexOf("q=" + data.escaped) > 0) -@@ -191,9 +190,7 @@ Item { - } - - function test_uppercaseDomainsShouldBeRewritten(data) { -- typeString(data.text) -- wait(500) -- compare(addressBar.text, data.text) -+ typeStringAndVerify(data.text) - keyClick(Qt.Key_Return) - validatedSpy.wait() - compare(addressBar.requestedUrl, data.requestedUrl) -@@ -213,9 +210,7 @@ Item { - } - - function test_uppercaseSchemeShouldBeRewritten(data) { -- typeString(data.text) -- wait(500) -- compare(addressBar.text, data.text) -+ typeStringAndVerify(data.text) - keyClick(Qt.Key_Return) - validatedSpy.wait() - compare(addressBar.requestedUrl, data.requestedUrl) -@@ -266,9 +261,7 @@ Item { - } - - function test_urlShouldBeSimplifiedWhenUnfocused(data) { -- typeString(data.input) -- wait(500) -- compare(addressBar.text, data.input) -+ typeStringAndVerify(data.input) - keyClick(Qt.Key_Return) - validatedSpy.wait() - addressBar.actualUrl = addressBar.requestedUrl -@@ -289,9 +282,7 @@ Item { - - function test_clickingWhenUnfocusedShouldSelectAll() { - var url = "http://example.org/" -- typeString(url) -- wait(500) -- compare(addressBar.text, url) -+ typeStringAndVerify(url) - addressBar.actualUrl = url - clickItem(textInput) - verify(!addressBar.activeFocus) -@@ -301,9 +292,7 @@ Item { - - function test_clickingWhenFocusedShouldDeselectText() { - var url = "http://example.org/" -- typeString(url) -- wait(500) -- compare(addressBar.text, url) -+ typeStringAndVerify(url) - addressBar.actualUrl = url - clickItem(textInput) - verify(!addressBar.activeFocus) -@@ -316,9 +305,7 @@ Item { - - function test_clickingActionButtonWhenUnfocusedShouldNotSelectAll() { - var url = "http://example.org/" -- typeString(url) -- wait(500) -- compare(addressBar.text, url) -+ typeStringAndVerify(url) - clickItem(textInput) - verify(!addressBar.activeFocus) - clickItem(addressBar.__actionButton) -@@ -355,31 +342,29 @@ Item { - } - - function test_unfocusingWhileEditingShouldResetUrl() { -- var url = "http://example.org/" -- typeString(url) -- wait(500) -- compare(addressBar.text, url) -+ var host = "example.org" -+ var url = "http://" + host + "/" -+ typeStringAndVerify(url) - addressBar.actualUrl = url - var clearButton = findChild(addressBar, "clear_button") - verify(clearButton != null) - clickItem(clearButton) -- compare(addressBar.text, "") -+ verifyAddressBarText("") - clickItem(textInput) -- compare(addressBar.text, "example.org") -+ verifyAddressBarText(host) - clickItem(addressBar) -- compare(addressBar.text, url) -+ verifyAddressBarText(url) - } - - function test_exitingFindInPageRestoresUrl() { -- addressBar.actualUrl = "http://example.org/" -+ var host = "example.org" -+ addressBar.actualUrl = "http://" + host + "/" - addressBar.findInPageMode = true - verify(addressBar.activeFocus) - compare(addressBar.text, "") -- typeString("hello") -- wait(500) -+ typeStringAndVerify("hello") - addressBar.findInPageMode = false -- wait(500) -- compare(addressBar.text, "example.org") -+ verifyAddressBarText(host) - } - } - } --- -2.47.0 - diff --git a/pkgs/desktops/lomiri/applications/morph-browser/default.nix b/pkgs/desktops/lomiri/applications/morph-browser/default.nix index b1502dff2f84a..9e273d032ce1d 100644 --- a/pkgs/desktops/lomiri/applications/morph-browser/default.nix +++ b/pkgs/desktops/lomiri/applications/morph-browser/default.nix @@ -2,7 +2,6 @@ stdenv, lib, fetchFromGitLab, - fetchpatch, gitUpdater, nixosTests, cmake, @@ -30,13 +29,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "morph-browser"; - version = "1.1.1"; + version = "1.1.2"; src = fetchFromGitLab { owner = "ubports"; repo = "development/core/morph-browser"; - rev = finalAttrs.version; - hash = "sha256-VxSADFTlaxQUDc81TzGkx54mjAUgY2L+suQC9zYGKo0="; + tag = finalAttrs.version; + hash = "sha256-CW+8HEGxeDDfqbBtNHDKTvsZkbu0tCmD6OEDW07KG2k="; }; outputs = [ @@ -44,18 +43,6 @@ stdenv.mkDerivation (finalAttrs: { "doc" ]; - patches = [ - # Remove when version > 1.1.1 - (fetchpatch { - name = "0002-morph-browser-Call-i18n-bindtextdomain-with-buildtime-determined-locale-path.patch"; - url = "https://gitlab.com/ubports/development/core/morph-browser/-/commit/3d9777fdc7d5b302a9f17679e4ea125e94468772.patch"; - hash = "sha256-zx/pP72uNqAi8TZR4bKeONuqcJyK/vGtPglTA+5R5no="; - }) - - # Remove when https://gitlab.com/ubports/development/core/morph-browser/-/merge_requests/589 merged & in release - ./1001-morph-browser-tst_AddressBar-Replace-wait-and-compare-with-tryCompare.patch - ]; - postPatch = '' substituteInPlace src/{Morph,Ubuntu}/CMakeLists.txt \ diff --git a/pkgs/desktops/lomiri/services/lomiri-indicator-network/default.nix b/pkgs/desktops/lomiri/services/lomiri-indicator-network/default.nix index 4cd9ea9e7db31..f07cd148290a6 100644 --- a/pkgs/desktops/lomiri/services/lomiri-indicator-network/default.nix +++ b/pkgs/desktops/lomiri/services/lomiri-indicator-network/default.nix @@ -108,6 +108,9 @@ stdenv.mkDerivation (finalAttrs: { doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; + # Multiple tests spin up & speak to D-Bus, avoid cross-talk causing failures + enableParallelChecking = false; + postInstall = '' substituteInPlace $out/etc/dbus-1/services/com.lomiri.connectivity1.service \ --replace-fail '/bin/false' '${lib.getExe' coreutils "false"}' diff --git a/pkgs/desktops/xfce/core/xfdesktop/default.nix b/pkgs/desktops/xfce/core/xfdesktop/default.nix index ab6900c28e1fd..0f6e6ef70ee3d 100644 --- a/pkgs/desktops/xfce/core/xfdesktop/default.nix +++ b/pkgs/desktops/xfce/core/xfdesktop/default.nix @@ -1,6 +1,7 @@ { lib, mkXfceDerivation, + fetchpatch, exo, gtk3, libxfce4ui, @@ -21,6 +22,15 @@ mkXfceDerivation { sha256 = "sha256-80g3lk1TkQI0fbYf2nXs36TrPlaGTHgH6k/TGOzRd3w="; + patches = [ + # Fix monitor chooser UI resource path + # https://gitlab.xfce.org/xfce/xfdesktop/-/merge_requests/181 + (fetchpatch { + url = "https://gitlab.xfce.org/xfce/xfdesktop/-/commit/699e21b062f56bdc0db192bfe036420b2618612e.patch"; + hash = "sha256-YTtXF+OJMHn6KY2xui1qGZ04np9a60asne+8ZS/dujs="; + }) + ]; + buildInputs = [ exo gtk3 diff --git a/pkgs/development/compilers/dotnet/8/default.nix b/pkgs/development/compilers/dotnet/8/default.nix index 95b4c71bcf789..0c72d4b037660 100644 --- a/pkgs/development/compilers/dotnet/8/default.nix +++ b/pkgs/development/compilers/dotnet/8/default.nix @@ -5,5 +5,5 @@ releaseInfoFile = ./release-info.json; bootstrapSdkFile = ./bootstrap-sdk.nix; depsFile = ./deps.json; - fallbackTargetPackages = dotnetCorePackages.sdk_8_0.targetPackages; + fallbackTargetPackages = dotnetCorePackages.sdk_8_0-bin.targetPackages; } diff --git a/pkgs/development/compilers/dotnet/9/default.nix b/pkgs/development/compilers/dotnet/9/default.nix index 21d73761cc58b..c9ec2ae9a9300 100644 --- a/pkgs/development/compilers/dotnet/9/default.nix +++ b/pkgs/development/compilers/dotnet/9/default.nix @@ -6,5 +6,5 @@ bootstrapSdkFile = ./bootstrap-sdk.nix; allowPrerelease = true; depsFile = ./deps.json; - fallbackTargetPackages = dotnetCorePackages.sdk_9_0.targetPackages; + fallbackTargetPackages = dotnetCorePackages.sdk_9_0-bin.targetPackages; } diff --git a/pkgs/development/compilers/dotnet/combine-packages.nix b/pkgs/development/compilers/dotnet/combine-packages.nix index 6528fb3d56a1e..4c9e868dc4f5d 100644 --- a/pkgs/development/compilers/dotnet/combine-packages.nix +++ b/pkgs/development/compilers/dotnet/combine-packages.nix @@ -18,7 +18,7 @@ in assert lib.assertMsg ((builtins.length dotnetPackages) > 0) '' You must include at least one package, e.g `with dotnetCorePackages; combinePackages [ - sdk_6_0 aspnetcore_7_0 + sdk_9_0 aspnetcore_8_0 ];`''; mkWrapper "sdk" (buildEnv { name = "dotnet-combined"; diff --git a/pkgs/development/compilers/dotnet/default.nix b/pkgs/development/compilers/dotnet/default.nix index 90c474f6ae20d..2d246642b8f6c 100644 --- a/pkgs/development/compilers/dotnet/default.nix +++ b/pkgs/development/compilers/dotnet/default.nix @@ -1,6 +1,6 @@ /* How to combine packages for use in development: - dotnetCombined = with dotnetCorePackages; combinePackages [ sdk_6_0 aspnetcore_7_0 ]; + dotnetCombined = with dotnetCorePackages; combinePackages [ sdk_9_0 aspnetcore_8_0 ]; Hashes and urls are retrieved from: https://dotnet.microsoft.com/download/dotnet @@ -13,74 +13,115 @@ makeScopeWithSplicing', }: -makeScopeWithSplicing' { - otherSplices = generateSplicesForMkScope "dotnetCorePackages"; - f = ( - self: - let - callPackage = self.callPackage; +let + pkgs = makeScopeWithSplicing' { + otherSplices = generateSplicesForMkScope "dotnetCorePackages"; + f = ( + self: + let + callPackage = self.callPackage; - fetchNupkg = callPackage ../../../build-support/dotnet/fetch-nupkg { }; + fetchNupkg = callPackage ../../../build-support/dotnet/fetch-nupkg { }; - buildDotnet = attrs: callPackage (import ./build-dotnet.nix attrs) { }; - buildDotnetSdk = - version: - import version { - inherit fetchNupkg; - buildAspNetCore = attrs: buildDotnet (attrs // { type = "aspnetcore"; }); - buildNetRuntime = attrs: buildDotnet (attrs // { type = "runtime"; }); - buildNetSdk = attrs: buildDotnet (attrs // { type = "sdk"; }); - }; + buildDotnet = attrs: callPackage (import ./build-dotnet.nix attrs) { }; + buildDotnetSdk = + version: + import version { + inherit fetchNupkg; + buildAspNetCore = attrs: buildDotnet (attrs // { type = "aspnetcore"; }); + buildNetRuntime = attrs: buildDotnet (attrs // { type = "runtime"; }); + buildNetSdk = attrs: buildDotnet (attrs // { type = "sdk"; }); + }; - ## Files in versions/ are generated automatically by update.sh ## - dotnet_6_0 = buildDotnetSdk ./versions/6.0.nix; - dotnet_7_0 = buildDotnetSdk ./versions/7.0.nix; - dotnet_8_0 = buildDotnetSdk ./versions/8.0.nix; - dotnet_9_0 = buildDotnetSdk ./versions/9.0.nix; + ## Files in versions/ are generated automatically by update.sh ## + dotnet-bin = lib.mergeAttrsList ( + map buildDotnetSdk [ + ./versions/6.0.nix + ./versions/7.0.nix + ./versions/8.0.nix + ./versions/9.0.nix + ] + ); - runtimeIdentifierMap = { - "x86_64-linux" = "linux-x64"; - "aarch64-linux" = "linux-arm64"; - "x86_64-darwin" = "osx-x64"; - "aarch64-darwin" = "osx-arm64"; - "x86_64-windows" = "win-x64"; - "i686-windows" = "win-x86"; - }; + runtimeIdentifierMap = { + "x86_64-linux" = "linux-x64"; + "aarch64-linux" = "linux-arm64"; + "x86_64-darwin" = "osx-x64"; + "aarch64-darwin" = "osx-arm64"; + "x86_64-windows" = "win-x64"; + "i686-windows" = "win-x86"; + }; - in - { - inherit callPackage fetchNupkg buildDotnetSdk; + in + lib.optionalAttrs config.allowAliases ( + { + # EOL + sdk_2_1 = throw "Dotnet SDK 2.1 is EOL, please use 8.0 (LTS) or 9.0 (Current)"; + sdk_2_2 = throw "Dotnet SDK 2.2 is EOL, please use 8.0 (LTS) or 9.0 (Current)"; + sdk_3_0 = throw "Dotnet SDK 3.0 is EOL, please use 8.0 (LTS) or 9.0 (Current)"; + sdk_3_1 = throw "Dotnet SDK 3.1 is EOL, please use 8.0 (LTS) or 9.0 (Current)"; + sdk_5_0 = throw "Dotnet SDK 5.0 is EOL, please use 8.0 (LTS) or 9.0 (Current)"; + } + // dotnet-bin + ) + // lib.mapAttrs' (k: v: lib.nameValuePair "${k}-bin" v) dotnet-bin + // { + inherit callPackage fetchNupkg buildDotnetSdk; - # Convert a "stdenv.hostPlatform.system" to a dotnet RID - systemToDotnetRid = - system: runtimeIdentifierMap.${system} or (throw "unsupported platform ${system}"); + # Convert a "stdenv.hostPlatform.system" to a dotnet RID + systemToDotnetRid = + system: runtimeIdentifierMap.${system} or (throw "unsupported platform ${system}"); - combinePackages = attrs: callPackage (import ./combine-packages.nix attrs) { }; + combinePackages = attrs: callPackage (import ./combine-packages.nix attrs) { }; - patchNupkgs = callPackage ./patch-nupkgs.nix { }; - nugetPackageHook = callPackage ./nuget-package-hook.nix { }; + patchNupkgs = callPackage ./patch-nupkgs.nix { }; + nugetPackageHook = callPackage ./nuget-package-hook.nix { }; - buildDotnetModule = callPackage ../../../build-support/dotnet/build-dotnet-module { }; - buildDotnetGlobalTool = callPackage ../../../build-support/dotnet/build-dotnet-global-tool { }; + buildDotnetModule = callPackage ../../../build-support/dotnet/build-dotnet-module { }; + buildDotnetGlobalTool = callPackage ../../../build-support/dotnet/build-dotnet-global-tool { }; - mkNugetSource = callPackage ../../../build-support/dotnet/make-nuget-source { }; - mkNugetDeps = callPackage ../../../build-support/dotnet/make-nuget-deps { }; - addNuGetDeps = callPackage ../../../build-support/dotnet/add-nuget-deps { }; + mkNugetSource = callPackage ../../../build-support/dotnet/make-nuget-source { }; + mkNugetDeps = callPackage ../../../build-support/dotnet/make-nuget-deps { }; + addNuGetDeps = callPackage ../../../build-support/dotnet/add-nuget-deps { }; - dotnet_8 = recurseIntoAttrs (callPackage ./8 { }); - dotnet_9 = recurseIntoAttrs (callPackage ./9 { }); - } - // lib.optionalAttrs config.allowAliases { - # EOL - sdk_2_1 = throw "Dotnet SDK 2.1 is EOL, please use 8.0 (LTS) or 9.0 (Current)"; - sdk_2_2 = throw "Dotnet SDK 2.2 is EOL, please use 8.0 (LTS) or 9.0 (Current)"; - sdk_3_0 = throw "Dotnet SDK 3.0 is EOL, please use 8.0 (LTS) or 9.0 (Current)"; - sdk_3_1 = throw "Dotnet SDK 3.1 is EOL, please use 8.0 (LTS) or 9.0 (Current)"; - sdk_5_0 = throw "Dotnet SDK 5.0 is EOL, please use 8.0 (LTS) or 9.0 (Current)"; - } - // dotnet_6_0 - // dotnet_7_0 - // dotnet_8_0 - // dotnet_9_0 + dotnet_8 = recurseIntoAttrs (callPackage ./8 { }); + dotnet_9 = recurseIntoAttrs (callPackage ./9 { }); + } + ); + }; +in +pkgs +// rec { + # use binary SDK here to avoid downgrading feature band + sdk_8_0_1xx = if !pkgs.dotnet_8.vmr.meta.broken then pkgs.dotnet_8.sdk else pkgs.sdk_8_0_1xx-bin; + # source-built SDK only exists for _1xx feature band + sdk_8_0_4xx = pkgs.callPackage ./wrapper.nix { } "sdk" ( + pkgs.sdk_8_0_4xx-bin.unwrapped.overrideAttrs (old: { + passthru = + old.passthru + // { + inherit (sdk_8_0_1xx) + runtime + aspnetcore + ; + } + # We can't use the source-built packages until ilcompiler is fixed (see vmr.nix) + // lib.optionalAttrs sdk_8_0_1xx.hasILCompiler { + inherit (sdk_8_0_1xx) + packages + targetPackages + ; + }; + }) ); + sdk_8_0 = sdk_8_0_4xx; + sdk_8_0-source = sdk_8_0_1xx; + runtime_8_0 = sdk_8_0.runtime; + aspnetcore_8_0 = sdk_8_0.aspnetcore; +} +// rec { + sdk_9_0_1xx = if !pkgs.dotnet_9.vmr.meta.broken then pkgs.dotnet_9.sdk else pkgs.sdk_9_0_1xx-bin; + sdk_9_0 = sdk_9_0_1xx; + runtime_9_0 = sdk_9_0.runtime; + aspnetcore_9_0 = sdk_9_0.aspnetcore; } diff --git a/pkgs/development/compilers/dotnet/packages.nix b/pkgs/development/compilers/dotnet/packages.nix index e8819a14611cc..a82b5c3f62f01 100644 --- a/pkgs/development/compilers/dotnet/packages.nix +++ b/pkgs/development/compilers/dotnet/packages.nix @@ -25,6 +25,11 @@ let + '' ln -s ${vmr.man} $man ''; + propagatedSandboxProfile = lib.optionalString stdenvNoCC.hostPlatform.isDarwin '' + (allow file-read* (subpath "/private/var/db/mds/system")) + (allow mach-lookup (global-name "com.apple.SecurityServer") + (global-name "com.apple.system.opendirectoryd.membership")) + ''; } ) ); @@ -66,8 +71,12 @@ let version=''${version,,} mkdir -p "$out"/share/nuget/packages/"$id" cp -r . "$out"/share/nuget/packages/"$id"/"$version" - chmod +w "$out"/share/nuget/packages/"$id"/"$version" - echo {} > "$out"/share/nuget/packages/"$id"/"$version"/.nupkg.metadata + cd "$out"/share/nuget/packages/"$id"/"$version" + chmod +w . + for dir in tools runtimes/*/native; do + [[ ! -d "$dir" ]] || chmod -R +x "$dir" + done + echo {} > .nupkg.metadata ) popd diff --git a/pkgs/development/compilers/dotnet/vmr.nix b/pkgs/development/compilers/dotnet/vmr.nix index d6d86c0b18378..80c1ddfeaa718 100644 --- a/pkgs/development/compilers/dotnet/vmr.nix +++ b/pkgs/development/compilers/dotnet/vmr.nix @@ -481,5 +481,8 @@ stdenv.mkDerivation rec { "x86_64-darwin" "aarch64-darwin" ]; + # build deadlocks intermittently on rosetta + # https://github.com/dotnet/runtime/issues/111628 + broken = stdenv.hostPlatform.system == "x86_64-darwin"; }; } diff --git a/pkgs/development/compilers/dotnet/wrapper.nix b/pkgs/development/compilers/dotnet/wrapper.nix index d328dbf97b7e0..d268476c2c14f 100644 --- a/pkgs/development/compilers/dotnet/wrapper.nix +++ b/pkgs/development/compilers/dotnet/wrapper.nix @@ -204,6 +204,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { runtime = null; run = checkConsoleOutput "$src/bin/test"; }; + + ready-to-run = mkConsoleTest { + name = "ready-to-run"; + usePackageSource = true; + build = "dotnet publish --use-current-runtime -p:PublishReadyToRun=true -o $out/bin"; + run = checkConsoleOutput "$src/bin/test"; + }; } // lib.optionalAttrs finalAttrs.finalPackage.hasILCompiler { aot = mkConsoleTest { diff --git a/pkgs/development/compilers/halide/default.nix b/pkgs/development/compilers/halide/default.nix index a21fdd937d4d6..3ce25abaf53cf 100644 --- a/pkgs/development/compilers/halide/default.nix +++ b/pkgs/development/compilers/halide/default.nix @@ -4,6 +4,7 @@ lib, fetchFromGitHub, cmake, + fetchpatch2, flatbuffers, libffi, libpng, @@ -14,71 +15,116 @@ openblas, blas, lapack, + removeReferencesTo, + ninja, pythonSupport ? false, - python3Packages ? null, + python3Packages, + wasmSupport ? false, + wabt, + doCheck ? true, }: assert blas.implementation == "openblas" && lapack.implementation == "openblas"; -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "halide"; - version = "18.0.0"; + version = "19.0.0"; src = fetchFromGitHub { owner = "halide"; repo = "Halide"; - rev = "v${version}"; - hash = "sha256-BPalUh9EgdCqVaWC1HoreyyRcPQc4QMIYnLrRoNDDCI="; + tag = "v${finalAttrs.version}"; + hash = "sha256-0SFGX4G6UR8NS4UsdFOb99IBq2/hEkr/Cm2p6zkIh/8="; }; - postPatch = '' - # See https://github.com/halide/Halide/issues/7785 - substituteInPlace 'src/runtime/HalideRuntime.h' \ - --replace '#if defined(__x86_64__) || defined(__i386__) || defined(__arm__) || defined(__aarch64__) - #define HALIDE_CPP_COMPILER_HAS_FLOAT16' \ - '#if defined(__x86_64__) || defined(__i386__) - #define HALIDE_CPP_COMPILER_HAS_FLOAT16' - ''; + patches = [ + # The following two patches fix cmake/HalidePackageConfigHelpers.cmake to + # support specifying an absolute library install path (which is what Nix + # does when "lib" is included as a separate output) + (fetchpatch2 { + url = "https://github.com/halide/Halide/commit/ac2cd23951aff9ac3b765e51938f1e576f1f0ee9.diff?full_index=1"; + hash = "sha256-JTktOTSyReDUEHTaPPMoi+/K/Gzg39i6MI97cO3654k="; + }) + (fetchpatch2 { + url = "https://github.com/halide/Halide/commit/59f4fff30f4ab628da9aa7e5f77a7f1bb218a779.diff?full_index=1"; + hash = "sha256-yOzE+1jai1w1GQisLYfu8F9pbTE/bYg0MTLq8rPXdGk="; + }) + ]; + + postPatch = + '' + substituteInPlace src/runtime/CMakeLists.txt --replace-fail \ + '-isystem "''${VulkanHeaders_INCLUDE_DIR}"' \ + '-isystem "''${VulkanHeaders_INCLUDE_DIR}" + -isystem "${llvmPackages.clang}/resource-root/include"' + '' + # Upstream Halide include a check in their CMake files that forces Halide to + # link LLVM dynamically because of WebAssembly. It unnecessarily increases + # the closure size in cases when the WebAssembly target is not used. Hence, + # the following hack + + lib.optionalString (!wasmSupport) '' + substituteInPlace cmake/FindHalide_LLVM.cmake --replace-fail \ + 'if (comp STREQUAL "WebAssembly")' \ + 'if (FALSE)' + ''; cmakeFlags = [ - "-DWARNINGS_AS_ERRORS=OFF" "-DWITH_PYTHON_BINDINGS=${if pythonSupport then "ON" else "OFF"}" - "-DTARGET_WEBASSEMBLY=OFF" + (lib.cmakeBool "WITH_TESTS" doCheck) + (lib.cmakeBool "WITH_TUTORIALS" doCheck) # Disable performance tests since they may fail on busy machines "-DWITH_TEST_PERFORMANCE=OFF" # Disable fuzzing tests -- this has become the default upstream after the # v16 release (See https://github.com/halide/Halide/commit/09c5d1d19ec8e6280ccbc01a8a12decfb27226ba) # These tests also fail to compile on Darwin because of some missing command line options... "-DWITH_TEST_FUZZ=OFF" - # Disable FetchContent for flatbuffers and use the version from nixpkgs instead - "-DFLATBUFFERS_USE_FETCHCONTENT=OFF" - "-DPYBIND11_USE_FETCHCONTENT=OFF" + # Disable FetchContent and use versions from nixpkgs instead + "-DHalide_USE_FETCHCONTENT=OFF" + "-DHalide_WASM_BACKEND=${if wasmSupport then "wabt" else "OFF"}" + (lib.cmakeBool "Halide_LLVM_SHARED_LIBS" wasmSupport) ]; - doCheck = true; + outputs = [ + "out" + "lib" + ]; - preCheck = - let - disabledTests = lib.strings.concatStringsSep "|" [ - # Requires too much parallelism for remote builders. - "mullapudi2016_fibonacci" - # Take too long---we don't want to run these in CI. - "adams2019_test_apps_autoscheduler" - "anderson2021_test_apps_autoscheduler" - "correctness_cross_compilation" - "correctness_simd_op_check_hvx" - ]; - in - '' - checkFlagsArray+=("ARGS=-E '${disabledTests}'") - ''; + inherit doCheck; - postInstall = lib.optionalString pythonSupport '' - mkdir -p $out/${builtins.dirOf python3Packages.python.sitePackages} - mv -v $out/lib/python3/site-packages $out/${python3Packages.python.sitePackages} - rmdir $out/lib/python3/ + disabledTests = [ + # Requires too much parallelism for remote builders. + "mullapudi2016_fibonacci" + # Tests performance---flaky in CI + "mullapudi2016_reorder" + # Take too long---we don't want to run these in CI. + "adams2019_test_apps_autoscheduler" + "anderson2021_test_apps_autoscheduler" + "correctness_cross_compilation" + "correctness_simd_op_check_hvx" + ]; + # ninja's setup-hook doesn't let us specify custom flags for the checkPhase, see + # https://discourse.nixos.org/t/building-only-specific-targets-with-cmake/31545/4 + # so we resort to overriding the whole checkPhase + dontUseNinjaCheck = true; + checkPhase = '' + runHook preCheck + ctest --exclude-regex '^(${lib.strings.concatStringsSep "|" finalAttrs.disabledTests})$' + runHook postCheck ''; + postInstall = + lib.optionalString pythonSupport '' + mkdir -p $lib/lib/${python3Packages.python.libPrefix} + mv -v $lib/lib/python3/site-packages $lib/lib/${python3Packages.python.libPrefix} + rmdir $lib/lib/python3/ + '' + # Debug symbols in the runtime include references to clang, but they're not + # required for running the code. llvmPackages.clang increases the runtime + # closure by at least a GB which is a waste, so we remove references to clang. + + lib.optionalString (stdenv != llvmPackages.stdenv) '' + remove-references-to -t ${llvmPackages.clang} $lib/lib/libHalide* + ''; + # Note: only openblas and not atlas part of this Nix expression # see pkgs/development/libraries/science/math/liblapack/3.5.0.nix # to get a hint howto setup atlas instead of openblas @@ -97,12 +143,15 @@ stdenv.mkDerivation rec { ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ libgbm libGL - ]; + ] + ++ lib.optionals wasmSupport [ wabt ]; nativeBuildInputs = [ cmake flatbuffers + removeReferencesTo + ninja ] ++ lib.optionals pythonSupport [ python3Packages.python @@ -124,5 +173,6 @@ stdenv.mkDerivation rec { atila twesterhout ]; + broken = !stdenv.buildPlatform.canExecute stdenv.hostPlatform; }; -} +}) diff --git a/pkgs/development/compilers/julia/default.nix b/pkgs/development/compilers/julia/default.nix index 68bd8497aad6d..390745fe52906 100644 --- a/pkgs/development/compilers/julia/default.nix +++ b/pkgs/development/compilers/julia/default.nix @@ -1,4 +1,4 @@ -{ callPackage }: +{ callPackage, fetchpatch2 }: let juliaWithPackages = callPackage ../../julia-modules { }; @@ -29,12 +29,12 @@ in { }); julia_110-bin = wrapJulia (callPackage (import ./generic-bin.nix { - version = "1.10.4"; + version = "1.10.8"; sha256 = { - x86_64-linux = "079f61757c3b5b40d2ade052b3cc4816f50f7ef6df668825772562b3746adff1"; - aarch64-linux = "ae4ae6ade84a103cdf30ce91c8d4035a0ef51c3e2e66f90a0c13abeb4e100fc4"; - x86_64-darwin = "259c18a5294dd41cc60117ecb9fc5a8b2f659807284903a65439fb9d3818c763"; - aarch64-darwin = "97b88d7f9b5724118769f3a3bd259f8f7ada48cdecf3d584cf68162dd873dd10"; + x86_64-linux = "0410175aeec3df63173c15187f2083f179d40596d36fd3a57819cc5f522ae735"; + aarch64-linux = "8d63dd12595a08edc736be8d6c4fea1840f137b81c62079d970dbd1be448b8cd"; + x86_64-darwin = "8dae60def14db9e9b0f70891f15483d05785ae27a2c14f8f4b1ce27010e4015f"; + aarch64-darwin = "cdd5891a7b143bde835a79155471b82c5482d4dc5576f719351810548242e64b"; }; }) { }); @@ -60,10 +60,18 @@ in { }); julia_110 = wrapJulia (callPackage (import ./generic.nix { - version = "1.10.4"; - hash = "sha256-8y5Sd/XYKmOCSILN6/rBWBmbuEgUw8AZo/7MNgFYYZE="; + version = "1.10.8"; + hash = "sha256-NPojubjOgy32CWlD/TDzI764Ca7cMsFj9r7vUdUW9Oc="; patches = [ ./patches/1.10/0002-skip-failing-and-flaky-tests.patch + # Revert https://github.com/JuliaLang/julia/pull/55354 + # [build] Some improvements to the LLVM build system + # Related: https://github.com/JuliaLang/julia/issues/55617 + (fetchpatch2 { + url = "https://github.com/JuliaLang/julia/commit/0be37db8c5b5a440bd9a11960ae9c998027b7337.patch"; + revert = true; + hash = "sha256-gXC3LE3AuHMlSdA4dW+rbAhJpSB6ZMaz9X1qrHDPX7Y="; + }) ]; }) { }); diff --git a/pkgs/development/compilers/llvm/20/llvm/gnu-install-dirs-polly.patch b/pkgs/development/compilers/llvm/20/llvm/gnu-install-dirs-polly.patch new file mode 100644 index 0000000000000..dfe21f9dcae0d --- /dev/null +++ b/pkgs/development/compilers/llvm/20/llvm/gnu-install-dirs-polly.patch @@ -0,0 +1,13 @@ +--- a/tools/polly/cmake/polly_macros.cmake 2024-03-15 17:36:20.550893344 -0700 ++++ b/tools/polly/cmake/polly_macros.cmake 2024-03-15 17:37:06.277332960 -0700 +@@ -45,8 +45,8 @@ + install(TARGETS ${name} + COMPONENT ${name} + ${exports} +- LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX} +- ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX}) ++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX} ++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}) + add_llvm_install_targets(install-${name} + COMPONENT ${name}) + endif() diff --git a/pkgs/development/compilers/llvm/common/default.nix b/pkgs/development/compilers/llvm/common/default.nix index 7d2ef2e3f135d..0fee6ce58ede8 100644 --- a/pkgs/development/compilers/llvm/common/default.nix +++ b/pkgs/development/compilers/llvm/common/default.nix @@ -130,6 +130,11 @@ let ]; "llvm/gnu-install-dirs-polly.patch" = [ { + after = "20"; + path = ../20; + } + { + before = "20"; after = "18"; path = ../18; } @@ -519,7 +524,8 @@ let (metadata.getVersionFile "clang/purity.patch") # https://reviews.llvm.org/D51899 (metadata.getVersionFile "clang/gnu-install-dirs.patch") - + ] + ++ lib.optionals (lib.versionOlder metadata.release_version "20") [ # https://github.com/llvm/llvm-project/pull/116476 # prevent clang ignoring warnings / errors for unsuppored # options when building & linking a source file with trailing @@ -1063,7 +1069,7 @@ let ++ lib.optionals (lib.versionAtLeast metadata.release_version "13") [ (metadata.getVersionFile "compiler-rt/armv6-scudo-libatomic.patch") ] - ++ lib.optional (lib.versionAtLeast metadata.release_version "19") (fetchpatch { + ++ lib.optional (lib.versions.major metadata.release_version == "19") (fetchpatch { url = "https://github.com/llvm/llvm-project/pull/99837/commits/14ae0a660a38e1feb151928a14f35ff0f4487351.patch"; hash = "sha256-JykABCaNNhYhZQxCvKiBn54DZ5ZguksgCHnpdwWF2no="; relative = "compiler-rt"; diff --git a/pkgs/development/compilers/llvm/default.nix b/pkgs/development/compilers/llvm/default.nix index ee60db1e08a6c..6ff44ffecff2d 100644 --- a/pkgs/development/compilers/llvm/default.nix +++ b/pkgs/development/compilers/llvm/default.nix @@ -31,9 +31,9 @@ let "18.1.8".officialRelease.sha256 = "sha256-iiZKMRo/WxJaBXct9GdAcAT3cz9d9pnAcO1mmR6oPNE="; "19.1.6".officialRelease.sha256 = "sha256-LD4nIjZTSZJtbgW6tZopbTF5Mq0Tenj2gbuPXhtOeUI="; "20.0.0-git".gitRelease = { - rev = "1ef5b987a464611a60e873650726b5e02fda0feb"; - rev-version = "20.0.0-unstable-2024-12-17"; - sha256 = "sha256-QCY9z9h3z5gPvwq6bNzAB5xFFStwOCfKh4VnWInhxU4="; + rev = "6383a12e3b4339fa4743bb97da4d51dea6d2e2ea"; + rev-version = "20.0.0-unstable-2025-01-25"; + sha256 = "sha256-LMew+lFm+HrR5iwFDnoXA6B2LiU/pVqsy1YrP9xr5GU="; }; } // llvmVersions; diff --git a/pkgs/development/coq-modules/ElmExtraction/default.nix b/pkgs/development/coq-modules/ElmExtraction/default.nix index cfba9df2a6605..73b526cc0a67f 100644 --- a/pkgs/development/coq-modules/ElmExtraction/default.nix +++ b/pkgs/development/coq-modules/ElmExtraction/default.nix @@ -26,7 +26,7 @@ mkCoqDerivation { { cases = [ (range "8.17" "9.0") - (range "1.3.1" "1.3.2") + (range "1.3.1" "1.3.4") ]; out = "0.1.0"; } diff --git a/pkgs/development/coq-modules/RustExtraction/default.nix b/pkgs/development/coq-modules/RustExtraction/default.nix index 4aaa96e77f857..d9a51b0eefa98 100644 --- a/pkgs/development/coq-modules/RustExtraction/default.nix +++ b/pkgs/development/coq-modules/RustExtraction/default.nix @@ -26,7 +26,7 @@ mkCoqDerivation { { cases = [ (range "8.17" "8.19") - (range "1.3.1" "1.3.2") + (range "1.3.1" "1.3.3") ]; out = "0.1.0"; } diff --git a/pkgs/development/coq-modules/metacoq/default.nix b/pkgs/development/coq-modules/metacoq/default.nix index 15c83514cce24..ba94bf8c5d1fd 100644 --- a/pkgs/development/coq-modules/metacoq/default.nix +++ b/pkgs/development/coq-modules/metacoq/default.nix @@ -43,11 +43,11 @@ let } { case = "8.19"; - out = "1.3.2-8.19"; + out = "1.3.3-8.19"; } { case = "8.20"; - out = "1.3.2-8.20"; + out = "1.3.4-8.20"; } ] null; release = { @@ -67,6 +67,8 @@ let "1.3.1-8.19".sha256 = "sha256-fZED/Uel1jt5XF83dR6HfyhSkfBdLkET8C/ArDgsm64="; "1.3.2-8.19".sha256 = "sha256-e5Pm1AhaQrO6JoZylSXYWmeXY033QflQuCBZhxGH8MA="; "1.3.2-8.20".sha256 = "sha256-4J7Ly4Fc2E/I6YqvzTLntVVls5t94OUOjVMKJyyJdw8="; + "1.3.3-8.19".sha256 = "sha256-SBTv49zQXZ+oGvIqWM53hjBKru9prFgZRv8gVgls40k="; + "1.3.4-8.20".sha256 = "sha256-ofRP0Uo48G2LBuIy/5ZLyK+iVZXleKiwfMEBD0rX9fQ="; }; releaseRev = v: "v${v}"; diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 8b9e8e4fbe238..f2415d204dbea 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -1419,7 +1419,7 @@ self: super: builtins.intersectAttrs super { tailwind = addBuildDepend # Overrides for tailwindcss copied from: # https://github.com/EmaApps/emanote/blob/master/nix/tailwind.nix - (pkgs.nodePackages.tailwindcss.overrideAttrs (oa: { + (pkgs.tailwindcss.overrideAttrs (oa: { plugins = [ pkgs.nodePackages."@tailwindcss/aspect-ratio" pkgs.nodePackages."@tailwindcss/forms" diff --git a/pkgs/development/interpreters/clisp/default.nix b/pkgs/development/interpreters/clisp/default.nix index 555bfc45beff3..2bcb59fe66f57 100644 --- a/pkgs/development/interpreters/clisp/default.nix +++ b/pkgs/development/interpreters/clisp/default.nix @@ -7,7 +7,7 @@ lib, stdenv, fetchFromGitLab, - autoconf269, + autoconf, automake, bash, libtool, @@ -56,24 +56,22 @@ assert let ffcallAvailable = stdenv.hostPlatform.isLinux && (libffcall != null); - # Some modules need autoreconf called in their directory. - shouldReconfModule = name: name != "asdf"; in stdenv.mkDerivation { - version = "2.50pre20230112"; + version = "2.49.95-unstable-2024-12-28"; pname = "clisp"; src = fetchFromGitLab { owner = "gnu-clisp"; repo = "clisp"; - rev = "bf72805c4dace982a6d3399ff4e7f7d5e77ab99a"; - hash = "sha256-sQoN2FUg9BPaCgvCF91lFsU/zLja1NrgWsEIr2cPiqo="; + rev = "c3ec11bab87cfdbeba01523ed88ac2a16b22304d"; + hash = "sha256-xXGx2FlS0l9huVMHqNbcAViLjxK8szOFPT0J8MpGp9w="; }; strictDeps = true; nativeBuildInputs = [ - autoconf269 + autoconf automake libtool ]; @@ -98,10 +96,6 @@ stdenv.mkDerivation { libXext ]; - patches = [ - ./gnulib_aarch64.patch - ]; - # First, replace port 9090 (rather low, can be used) # with 64237 (much higher, IANA private area, not # anything rememberable). @@ -112,22 +106,6 @@ stdenv.mkDerivation { find . -type f | xargs sed -e 's/-lICE/-lXau &/' -i ''; - preConfigure = lib.optionalString stdenv.hostPlatform.isDarwin ( - '' - ( - cd src - autoreconf -f -i -I m4 -I glm4 - ) - '' - + lib.concatMapStrings (x: '' - ( - root="$PWD" - cd modules/${x} - autoreconf -f -i -I "$root/src" -I "$root/src/m4" -I "$root/src/glm4" - ) - '') (builtins.filter shouldReconfModule withModules) - ); - configureFlags = [ "builddir" ] ++ lib.optional (!dllSupport) "--without-dynamic-modules" diff --git a/pkgs/development/interpreters/clisp/gnulib_aarch64.patch b/pkgs/development/interpreters/clisp/gnulib_aarch64.patch deleted file mode 100644 index a0095835706a5..0000000000000 --- a/pkgs/development/interpreters/clisp/gnulib_aarch64.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/gllib/vma-iter.c b/src/gllib/vma-iter.c -index 6045f21d7..d50a3a398 100644 ---- a/src/gllib/vma-iter.c -+++ b/src/gllib/vma-iter.c -@@ -1327,7 +1327,7 @@ vma_iterate (vma_iterate_callback_fn callback, void *data) - In 64-bit processes, we could use vm_region_64 or mach_vm_region. - I choose vm_region_64 because it uses the same types as vm_region, - resulting in less conditional code. */ --# if defined __ppc64__ || defined __x86_64__ -+# if defined __aarch64__ || defined __ppc64__ || defined __x86_64__ - struct vm_region_basic_info_64 info; - mach_msg_type_number_t info_count = VM_REGION_BASIC_INFO_COUNT_64; - diff --git a/pkgs/development/interpreters/rakudo/default.nix b/pkgs/development/interpreters/rakudo/default.nix index 30bd2df22feee..145f515a3c1d2 100644 --- a/pkgs/development/interpreters/rakudo/default.nix +++ b/pkgs/development/interpreters/rakudo/default.nix @@ -12,14 +12,14 @@ stdenv.mkDerivation rec { pname = "rakudo"; - version = "2024.12"; + version = "2025.01"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "rakudo"; repo = "rakudo"; rev = version; - hash = "sha256-R4D+Hh3M1373MQBLX2TY8nq+so4S6DP5RM5XR+Zr95Y="; + hash = "sha256-NrbeB6/VnxlUt6glIvetK1o9huWaeVD6WLdpi4bb2FU="; fetchSubmodules = true; }; diff --git a/pkgs/development/interpreters/rakudo/moarvm.nix b/pkgs/development/interpreters/rakudo/moarvm.nix index 227bee72df3d6..9000fab8bb725 100644 --- a/pkgs/development/interpreters/rakudo/moarvm.nix +++ b/pkgs/development/interpreters/rakudo/moarvm.nix @@ -9,14 +9,14 @@ stdenv.mkDerivation rec { pname = "moarvm"; - version = "2024.12"; + version = "2025.01"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "moarvm"; repo = "moarvm"; rev = version; - hash = "sha256-CP8zYs4y2pT2keIxqE7yFy+N9aR3fidkwRXAe5blWAo="; + hash = "sha256-Xvkn1edzOeXBiBn2QSwk0eKfSG1JvfSkVrCAmyYtlmI="; fetchSubmodules = true; }; diff --git a/pkgs/development/interpreters/rakudo/nqp.nix b/pkgs/development/interpreters/rakudo/nqp.nix index acb611334a38c..b1d06179fc23a 100644 --- a/pkgs/development/interpreters/rakudo/nqp.nix +++ b/pkgs/development/interpreters/rakudo/nqp.nix @@ -8,14 +8,14 @@ stdenv.mkDerivation rec { pname = "nqp"; - version = "2024.12"; + version = "2025.01"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "raku"; repo = "nqp"; rev = version; - hash = "sha256-TjN7uH5cJzZ49KbxOYDCj2tYk6ORZWZn7ruTIn4Hgzc="; + hash = "sha256-45L3fEL8jIk9bkKpuhrsLM014zNW1P7Kf6qVXxJjWws="; fetchSubmodules = true; }; diff --git a/pkgs/development/libraries/apr/default.nix b/pkgs/development/libraries/apr/default.nix index 5df85f8b53676..8d55d78c72e64 100644 --- a/pkgs/development/libraries/apr/default.nix +++ b/pkgs/development/libraries/apr/default.nix @@ -38,8 +38,9 @@ stdenv.mkDerivation rec { lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ # For cross builds, provide answers to the configure time tests. # These answers are valid on x86_64-linux and aarch64-linux. + # TODO: provide all valid answers for BSD. "ac_cv_file__dev_zero=yes" - "ac_cv_func_setpgrp_void=yes" + "ac_cv_func_setpgrp_void=${if stdenv.hostPlatform.isBSD then "no" else "yes"}" "apr_cv_tcp_nodelay_with_cork=yes" "ac_cv_define_PTHREAD_PROCESS_SHARED=yes" "apr_cv_process_shared_works=yes" diff --git a/pkgs/development/libraries/astal/buildAstalModule.nix b/pkgs/development/libraries/astal/buildAstalModule.nix index dd6929161031e..b6d748b141eb5 100644 --- a/pkgs/development/libraries/astal/buildAstalModule.nix +++ b/pkgs/development/libraries/astal/buildAstalModule.nix @@ -39,7 +39,7 @@ let cleanArgs args // { pname = "astal-${name}"; - version = "0-unstable-2025-01-13"; + version = "0-unstable-2025-01-23"; __structuredAttrs = true; strictDeps = true; @@ -47,8 +47,8 @@ let src = fetchFromGitHub { owner = "Aylur"; repo = "astal"; - rev = "cac0fc63bfe098b26753db8262f5d95ac42b281b"; - hash = "sha256-kNtKWbQ+gMzmAF7KNSZ4Hb8/2cfSNoURCyRSB0nx2I4="; + rev = "127e9cdcbf173846a3c40ddc0abfbb038df48042"; + hash = "sha256-ZCxxshGN7XooabArcoGkYSNx5yVunqjKJi2aTv6cznI="; }; sourceRoot = "${finalAttrs.src.name}/${sourceRoot}"; diff --git a/pkgs/development/libraries/gupnp/1.6.nix b/pkgs/development/libraries/gupnp/1.6.nix index 65033624639f7..8cbe314e7d322 100644 --- a/pkgs/development/libraries/gupnp/1.6.nix +++ b/pkgs/development/libraries/gupnp/1.6.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { pname = "gupnp"; - version = "1.6.7"; + version = "1.6.8"; outputs = [ "out" @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/gupnp/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - hash = "sha256-SmHYpainJw5gzpz+lmHMT6Mm8EWmVxjS64/2iv2++AU="; + hash = "sha256-cKADzr1oV3KT+z5q9J/5AiA7+HaLL8XWUd3B8PoeEek="; }; depsBuildBuild = [ diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix index 56586eb0de907..ec2644026d209 100644 --- a/pkgs/development/lua-modules/overrides.nix +++ b/pkgs/development/lua-modules/overrides.nix @@ -505,9 +505,9 @@ in lua-rtoml = prev.lua-rtoml.overrideAttrs (oa: { - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { src = oa.src; - hash = "sha256-EcP4eYsuOVeEol+kMqzsVHd8F2KoBdLzf6K0KsYToUY="; + hash = "sha256-7mFn4dLgaxfAxtPFCc3VzcBx2HuywcZTYqCGTbaGS0k="; }; propagatedBuildInputs = oa.propagatedBuildInputs ++ [ cargo rustPlatform.cargoSetupHook ]; @@ -831,9 +831,9 @@ in }); tiktoken_core = prev.tiktoken_core.overrideAttrs (oa: { - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { src = oa.src; - hash = "sha256-pKqG8aiV8BvvDO6RE6J3HEA/S4E4QunbO4WBpV5jUYk="; + hash = "sha256-sO2q4cmkJc6T4iyJUWpBfr2ISycS1cXAIO0ibMfzyIE="; }; nativeBuildInputs = oa.nativeBuildInputs ++ [ cargo rustPlatform.cargoSetupHook ]; }); @@ -846,9 +846,9 @@ in toml-edit = prev.toml-edit.overrideAttrs (oa: { - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { src = oa.src; - hash = "sha256-lguGj8fDqztrvqvEYVcJLmiuxPDaCpXU8aztInKjF+E="; + hash = "sha256-ow0zefFFrU91Q2PJww2jtd6nqUjwXUtfQzjkzl/AXuo="; }; NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index d187b9ee4378e..5581c6e9d695c 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -39,6 +39,7 @@ mapAliases { "@antora/cli" = pkgs.antora; # Added 2023-05-06 "@astrojs/language-server" = pkgs.astro-language-server; # Added 2024-02-12 "@bitwarden/cli" = pkgs.bitwarden-cli; # added 2023-07-25 + "@commitlint/config-conventional" = throw "@commitlint/config-conventional has been dropped, as it is a library and your JS project should lock it instead."; # added 2024-12-16 "@emacs-eask/cli" = pkgs.eask; # added 2023-08-17 "@forge/cli" = throw "@forge/cli was removed because it was broken"; # added 2023-09-20 "@githubnext/github-copilot-cli" = pkgs.github-copilot-cli; # Added 2023-05-02 @@ -182,6 +183,7 @@ mapAliases { surge = pkgs.surge-cli; # Added 2023-09-08 inherit (pkgs) svelte-language-server; # Added 2024-05-12 swagger = throw "swagger was removed because it was broken and abandoned upstream"; # added 2023-09-09 + inherit (pkgs) tailwindcss; # added 2024-12-04 teck-programmer = throw "teck-programmer was removed because it was broken and unmaintained"; # added 2024-08-23 tedicross = throw "tedicross was removed because it was broken"; # added 2023-09-09 inherit (pkgs) terser; # Added 2023-08-31 diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index f990a692b0f1d..0e37a6f244cf2 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -3,7 +3,6 @@ , "@antfu/ni" , "@babel/cli" , "@commitlint/cli" -, "@commitlint/config-conventional" , "@microsoft/rush" , "@shopify/cli" , "@tailwindcss/aspect-ratio" @@ -167,7 +166,6 @@ , "speed-test" , "svelte-check" , "svgo" -, "tailwindcss" , "tern" , "thelounge-plugin-closepms" , "thelounge-plugin-giphy" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 2371cf2b48a05..3a0116e0dee07 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -17942,15 +17942,6 @@ let sha512 = "8gsBDI5Y3vrKUCxN6Ue8xr6occZ5nsDEc4C7jO/EovFGozx8uttCAyfhRrvoUAWi2WMm3OmYs+0mPJU7kQdYWQ=="; }; }; - "conventional-changelog-conventionalcommits-7.0.2" = { - name = "conventional-changelog-conventionalcommits"; - packageName = "conventional-changelog-conventionalcommits"; - version = "7.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/conventional-changelog-conventionalcommits/-/conventional-changelog-conventionalcommits-7.0.2.tgz"; - sha512 = "NKXYmMR/Hr1DevQegFB4MwfM5Vv0m4UIxKZTTYuD98lpTknaZlSRrDOG4X7wIXpGkfsYxZTghUN+Qq+T0YQI7w=="; - }; - }; "conventional-changelog-conventionalcommits-8.0.0" = { name = "conventional-changelog-conventionalcommits"; packageName = "conventional-changelog-conventionalcommits"; @@ -53769,36 +53760,6 @@ in bypassCache = true; reconstructLock = true; }; - "@commitlint/config-conventional" = nodeEnv.buildNodePackage { - name = "_at_commitlint_slash_config-conventional"; - packageName = "@commitlint/config-conventional"; - version = "19.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/config-conventional/-/config-conventional-19.5.0.tgz"; - sha512 = "OBhdtJyHNPryZKg0fFpZNOBM1ZDbntMvqMuSmpfyP86XSfwzGw4CaoYRG4RutUPg0BTK07VMRIkNJT6wi2zthg=="; - }; - dependencies = [ - sources."@commitlint/types-19.5.0" - sources."@types/conventional-commits-parser-5.0.0" - sources."@types/node-22.5.5" - sources."array-ify-1.0.0" - sources."chalk-5.3.0" - sources."compare-func-2.0.0" - sources."conventional-changelog-conventionalcommits-7.0.2" - sources."dot-prop-5.3.0" - sources."is-obj-2.0.0" - sources."undici-types-6.19.8" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "Shareable commitlint config enforcing conventional commits"; - homepage = "https://commitlint.js.org/"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; "@microsoft/rush" = nodeEnv.buildNodePackage { name = "_at_microsoft_slash_rush"; packageName = "@microsoft/rush"; @@ -75210,183 +75171,6 @@ in bypassCache = true; reconstructLock = true; }; - tailwindcss = nodeEnv.buildNodePackage { - name = "tailwindcss"; - packageName = "tailwindcss"; - version = "3.4.12"; - src = fetchurl { - url = "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.4.12.tgz"; - sha512 = "Htf/gHj2+soPb9UayUNci/Ja3d8pTmu9ONTfh4QY8r3MATTZOzmv6UYWF7ZwikEIC8okpfqmGqrmDehua8mF8w=="; - }; - dependencies = [ - sources."@alloc/quick-lru-5.2.0" - sources."@cspotcode/source-map-support-0.8.1" - sources."@isaacs/cliui-8.0.2" - (sources."@jridgewell/gen-mapping-0.3.5" // { - dependencies = [ - sources."@jridgewell/trace-mapping-0.3.25" - ]; - }) - sources."@jridgewell/resolve-uri-3.1.2" - sources."@jridgewell/set-array-1.2.1" - sources."@jridgewell/sourcemap-codec-1.5.0" - sources."@jridgewell/trace-mapping-0.3.9" - sources."@nodelib/fs.scandir-2.1.5" - sources."@nodelib/fs.stat-2.0.5" - sources."@nodelib/fs.walk-1.2.8" - sources."@swc/core-1.7.26" - sources."@swc/counter-0.1.3" - sources."@swc/helpers-0.5.13" - sources."@swc/types-0.1.12" - sources."@swc/wasm-1.7.26" - sources."@tsconfig/node10-1.0.11" - sources."@tsconfig/node12-1.0.11" - sources."@tsconfig/node14-1.0.3" - sources."@tsconfig/node16-1.0.4" - sources."@types/node-22.5.5" - sources."acorn-8.12.1" - sources."acorn-walk-8.3.4" - sources."ansi-regex-5.0.1" - sources."ansi-styles-6.2.1" - sources."any-promise-1.3.0" - sources."anymatch-3.1.3" - sources."arg-5.0.2" - sources."balanced-match-1.0.2" - sources."binary-extensions-2.3.0" - sources."brace-expansion-2.0.1" - sources."braces-3.0.3" - sources."camelcase-css-2.0.1" - (sources."chokidar-3.6.0" // { - dependencies = [ - sources."glob-parent-5.1.2" - ]; - }) - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."commander-4.1.1" - sources."create-require-1.1.1" - sources."cross-spawn-7.0.3" - sources."cssesc-3.0.0" - sources."didyoumean-1.2.2" - sources."diff-4.0.2" - sources."dlv-1.1.3" - sources."eastasianwidth-0.2.0" - sources."emoji-regex-9.2.2" - (sources."fast-glob-3.3.2" // { - dependencies = [ - sources."glob-parent-5.1.2" - ]; - }) - sources."fastq-1.17.1" - sources."fill-range-7.1.1" - sources."foreground-child-3.3.0" - sources."function-bind-1.1.2" - sources."glob-10.4.5" - sources."glob-parent-6.0.2" - sources."hasown-2.0.2" - sources."is-binary-path-2.1.0" - sources."is-core-module-2.15.1" - sources."is-extglob-2.1.1" - sources."is-fullwidth-code-point-3.0.0" - sources."is-glob-4.0.3" - sources."is-number-7.0.0" - sources."isexe-2.0.0" - sources."jackspeak-3.4.3" - sources."jiti-1.21.6" - sources."lilconfig-2.1.0" - sources."lines-and-columns-1.2.4" - sources."lru-cache-10.4.3" - sources."make-error-1.3.6" - sources."merge2-1.4.1" - sources."micromatch-4.0.8" - sources."minimatch-9.0.5" - sources."minipass-7.1.2" - sources."mz-2.7.0" - sources."nanoid-3.3.7" - sources."normalize-path-3.0.0" - sources."object-assign-4.1.1" - sources."object-hash-3.0.0" - sources."package-json-from-dist-1.0.0" - sources."path-key-3.1.1" - sources."path-parse-1.0.7" - sources."path-scurry-1.11.1" - sources."picocolors-1.1.0" - sources."picomatch-2.3.1" - sources."pify-2.3.0" - sources."pirates-4.0.6" - sources."postcss-8.4.47" - sources."postcss-import-15.1.0" - sources."postcss-js-4.0.1" - (sources."postcss-load-config-4.0.2" // { - dependencies = [ - sources."lilconfig-3.1.2" - ]; - }) - sources."postcss-nested-6.2.0" - sources."postcss-selector-parser-6.1.2" - sources."postcss-value-parser-4.2.0" - sources."queue-microtask-1.2.3" - sources."read-cache-1.0.0" - sources."readdirp-3.6.0" - sources."resolve-1.22.8" - sources."reusify-1.0.4" - sources."run-parallel-1.2.0" - sources."shebang-command-2.0.0" - sources."shebang-regex-3.0.0" - sources."signal-exit-4.1.0" - sources."source-map-js-1.2.1" - sources."string-width-5.1.2" - (sources."string-width-cjs-4.2.3" // { - dependencies = [ - sources."emoji-regex-8.0.0" - sources."strip-ansi-6.0.1" - ]; - }) - (sources."strip-ansi-7.1.0" // { - dependencies = [ - sources."ansi-regex-6.1.0" - ]; - }) - sources."strip-ansi-cjs-6.0.1" - sources."sucrase-3.35.0" - sources."supports-preserve-symlinks-flag-1.0.0" - sources."thenify-3.3.1" - sources."thenify-all-1.6.0" - sources."to-regex-range-5.0.1" - sources."ts-interface-checker-0.1.13" - (sources."ts-node-10.9.2" // { - dependencies = [ - sources."arg-4.1.3" - ]; - }) - sources."tslib-2.7.0" - sources."typescript-5.6.2" - sources."undici-types-6.19.8" - sources."util-deprecate-1.0.2" - sources."v8-compile-cache-lib-3.0.1" - sources."which-2.0.2" - sources."wrap-ansi-8.1.0" - (sources."wrap-ansi-cjs-7.0.0" // { - dependencies = [ - sources."ansi-styles-4.3.0" - sources."emoji-regex-8.0.0" - sources."string-width-4.2.3" - sources."strip-ansi-6.0.1" - ]; - }) - sources."yaml-2.5.1" - sources."yn-3.1.1" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "A utility-first CSS framework for rapidly building custom user interfaces."; - homepage = "https://tailwindcss.com"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; tern = nodeEnv.buildNodePackage { name = "tern"; packageName = "tern"; diff --git a/pkgs/development/node-packages/overrides.nix b/pkgs/development/node-packages/overrides.nix index c770df51c1d15..814ce34f85e9b 100644 --- a/pkgs/development/node-packages/overrides.nix +++ b/pkgs/development/node-packages/overrides.nix @@ -258,27 +258,6 @@ final: prev: { name = "rush"; }; - tailwindcss = prev.tailwindcss.override { - plugins = [ ]; - nativeBuildInputs = [ pkgs.buildPackages.makeWrapper ]; - postInstall = '' - nodePath="" - for p in "$out" "${final.postcss}" $plugins; do - nodePath="$nodePath''${nodePath:+:}$p/lib/node_modules" - done - wrapProgram "$out/bin/tailwind" \ - --prefix NODE_PATH : "$nodePath" - wrapProgram "$out/bin/tailwindcss" \ - --prefix NODE_PATH : "$nodePath" - unset nodePath - ''; - passthru.tests = { - simple-execution = callPackage ./package-tests/tailwindcss.nix { - inherit (final) tailwindcss; - }; - }; - }; - thelounge-plugin-closepms = prev.thelounge-plugin-closepms.override { nativeBuildInputs = [ pkgs.node-pre-gyp ]; }; diff --git a/pkgs/development/ocaml-modules/ffmpeg/base.nix b/pkgs/development/ocaml-modules/ffmpeg/base.nix index bf63c00378cc3..f44069429bd4b 100644 --- a/pkgs/development/ocaml-modules/ffmpeg/base.nix +++ b/pkgs/development/ocaml-modules/ffmpeg/base.nix @@ -1,13 +1,13 @@ { lib, fetchFromGitHub }: rec { - version = "1.1.11"; + version = "1.2.1"; src = fetchFromGitHub { owner = "savonet"; repo = "ocaml-ffmpeg"; rev = "refs/tags/v${version}"; - sha256 = "sha256-Tr0YhoaaUSOlA7vlhAjPyFJI/iL7Z54oO27RnG7d+nA="; + sha256 = "sha256-Df+dU7Cd1rgsC/TelPzQ7wYlwsX9MGd8qcYsVN6dyMg="; }; meta = with lib; { diff --git a/pkgs/development/ocaml-modules/gluon/default.nix b/pkgs/development/ocaml-modules/gluon/default.nix index 38feb97ba8961..9bc4408c28abf 100644 --- a/pkgs/development/ocaml-modules/gluon/default.nix +++ b/pkgs/development/ocaml-modules/gluon/default.nix @@ -2,6 +2,7 @@ lib, buildDunePackage, fetchurl, + fetchpatch, bytestring, config, libc, @@ -20,6 +21,11 @@ buildDunePackage rec { hash = "sha256-YWJCPokY1A7TGqCGoxJl14oKDVeMNybEEB7KiK92WSo="; }; + patches = fetchpatch { + url = "https://github.com/riot-ml/gluon/commit/b29c34d04ea05d7721a229c35132320e796ed4b2.patch"; + hash = "sha256-XuzyoteQAgEs93WrgHTWT1I+hIJAiGiJ4XAiLtnEYtw="; + }; + buildInputs = [ config ]; diff --git a/pkgs/development/ocaml-modules/janestreet/0.17.nix b/pkgs/development/ocaml-modules/janestreet/0.17.nix index 404dfd614fbdb..8e43fde337bf6 100644 --- a/pkgs/development/ocaml-modules/janestreet/0.17.nix +++ b/pkgs/development/ocaml-modules/janestreet/0.17.nix @@ -1,6 +1,7 @@ { self, bash, + fetchpatch, fzf, lib, openssl, @@ -211,6 +212,10 @@ with self; ctypes-foreign openssl ]; + patches = fetchpatch { + url = "https://raw.githubusercontent.com/ocaml/opam-source-archives/main/patches/async_ssl/no-incompatible-pointer-types-017.patch"; + hash = "sha256-bpfIi97/b1hIwsFzsmhFAZV1w8CdaMxXoi72ScSYMjY="; + }; }; async_unix = janePackage { @@ -498,6 +503,13 @@ with self; patchShebangs unix_pseudo_terminal/src/discover.sh ''; doCheck = false; # command_validate_parsing.exe is not specified in test build deps + + # Compatibility with OCaml 5.3 + patches = lib.optional (lib.versionAtLeast ocaml.version "5.3") (fetchpatch { + url = "https://github.com/janestreet/core_unix/commit/ebce389ac68e098f542e34400e114ac992f415af.patch"; + includes = [ "bigstring_unix/src/bigstring_unix_stubs.c" ]; + hash = "sha256-FGg2zlyp3aZFu1VeFdm7pgSPiW0HAkLYgMGTj+tqju8="; + }); }; csvfields = janePackage { @@ -1545,8 +1557,8 @@ with self; // ( if lib.versionAtLeast ocaml.version "5.3" then { - version = "0.17.1"; - hash = "sha256-kcGXqO1kFYds8KwLvpIQ7OKhqnp6JZs8WYYLi7o/nBw="; + version = "0.17.2"; + hash = "sha256-AQJSdKtF6p/aG5Lx8VHVEOsisH8ep+iiml6DtW+Hdik="; } else { diff --git a/pkgs/development/ocaml-modules/labltk/default.nix b/pkgs/development/ocaml-modules/labltk/default.nix index b7e00aec49082..2ec6bc0e9d5c5 100644 --- a/pkgs/development/ocaml-modules/labltk/default.nix +++ b/pkgs/development/ocaml-modules/labltk/default.nix @@ -78,6 +78,10 @@ let version = "8.06.14"; sha256 = "sha256-eVSQetk+i3KObjHfsvnD615cIsq3aZ7IxycX42cuPIU="; }; + "5.3" = mkNewParam { + version = "8.06.15"; + sha256 = "sha256-I/y5qr5sasCtlrwxL/Lex79rg0o4tzDMBmQY7MdpU2w="; + }; }; param = params.${lib.versions.majorMinor ocaml.version} diff --git a/pkgs/development/ocaml-modules/mem_usage/default.nix b/pkgs/development/ocaml-modules/mem_usage/default.nix new file mode 100644 index 0000000000000..613edfe0377f7 --- /dev/null +++ b/pkgs/development/ocaml-modules/mem_usage/default.nix @@ -0,0 +1,28 @@ +{ + lib, + fetchFromGitHub, + buildDunePackage, +}: + +buildDunePackage rec { + pname = "mem_usage"; + version = "0.1.2"; + + src = fetchFromGitHub { + owner = "savonet"; + repo = "ocaml-mem_usage"; + rev = "v${version}"; + hash = "sha256-5tQNsqbiU9oJvKHUjeTo/ST4A0Axc95gdJISLaa9VRM="; + }; + + minimalOCamlVersion = "4.07"; + + doCheck = true; + + meta = { + license = lib.licenses.mit; + homepage = "https://www.liquidsoap.info/ocaml-mem_usage/"; + description = "Cross-platform memory usage information"; + maintainers = [ lib.maintainers.vbgl ]; + }; +} diff --git a/pkgs/development/ocaml-modules/ocaml-lsp/jsonrpc.nix b/pkgs/development/ocaml-modules/ocaml-lsp/jsonrpc.nix index aa90b9ac91f33..451b9e7f0d88c 100644 --- a/pkgs/development/ocaml-modules/ocaml-lsp/jsonrpc.nix +++ b/pkgs/development/ocaml-modules/ocaml-lsp/jsonrpc.nix @@ -9,7 +9,9 @@ lib, ocaml, version ? - if lib.versionAtLeast ocaml.version "5.2" then + if lib.versionAtLeast ocaml.version "5.3" then + "1.22.0" + else if lib.versionAtLeast ocaml.version "5.2" then "1.21.0" else if lib.versionAtLeast ocaml.version "4.14" then "1.18.0" @@ -24,6 +26,11 @@ let params = { + "1.22.0" = { + name = "lsp"; + minimalOCamlVersion = "5.2"; + sha256 = "sha256-UZ3DV30V3CIQ3vpYBIGnQ1eRGNUGk7aRuxDLyCA/tYE="; + }; "1.21.0" = { name = "lsp"; minimalOCamlVersion = "5.2"; diff --git a/pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix b/pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix index e05c0494515fb..d9c5df1c63f5a 100644 --- a/pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix +++ b/pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix @@ -23,7 +23,9 @@ ocamlformat-rpc-lib, ocaml, version ? - if lib.versionAtLeast ocaml.version "5.2" then + if lib.versionAtLeast ocaml.version "5.3" then + "1.22.0" + else if lib.versionAtLeast ocaml.version "5.2" then "1.21.0" else if lib.versionAtLeast ocaml.version "4.14" then "1.18.0" diff --git a/pkgs/development/ocaml-modules/ocsigen-server/conduit.patch b/pkgs/development/ocaml-modules/ocsigen-server/conduit.patch new file mode 100644 index 0000000000000..5aaac2407e326 --- /dev/null +++ b/pkgs/development/ocaml-modules/ocsigen-server/conduit.patch @@ -0,0 +1,14 @@ +diff --git a/src/server/ocsigen_cohttp.ml b/src/server/ocsigen_cohttp.ml +index 66895339..edbfcbf2 100644 +--- a/src/server/ocsigen_cohttp.ml ++++ b/src/server/ocsigen_cohttp.ml +@@ -105,7 +105,8 @@ let handler ~ssl ~address ~port ~connector (flow, conn) request body = + let rec getsockname = function + | `TCP (ip, port) -> Unix.ADDR_INET (Ipaddr_unix.to_inet_addr ip, port) + | `Unix_domain_socket path -> Unix.ADDR_UNIX path +- | `TLS (_, edn) -> getsockname edn ++ | `TLS (_, edn) -> getsockname (edn :> Conduit_lwt_unix.endp) ++ | `TLS_tunnel _ -> raise (Failure "TLS tunnel not supported") + | `Unknown err -> raise (Failure ("resolution failed: " ^ err)) + | `Vchan_direct _ -> raise (Failure "VChan not supported") + | `Vchan_domain_socket _ -> raise (Failure "VChan not supported") diff --git a/pkgs/development/ocaml-modules/ocsigen-server/default.nix b/pkgs/development/ocaml-modules/ocsigen-server/default.nix index e55fd1c05088f..2e758c0545bf5 100644 --- a/pkgs/development/ocaml-modules/ocsigen-server/default.nix +++ b/pkgs/development/ocaml-modules/ocsigen-server/default.nix @@ -64,6 +64,8 @@ buildDunePackage rec { hash = "sha256-T3bgPZpDO6plgebLJDBtBuR2eR/bN3o24UAUv1VwgtI="; }; + patches = [ ./conduit.patch ]; + nativeBuildInputs = [ makeWrapper which diff --git a/pkgs/development/ocaml-modules/secp256k1/default.nix b/pkgs/development/ocaml-modules/secp256k1/default.nix index 5a97578db5dd3..d27d260a3723a 100644 --- a/pkgs/development/ocaml-modules/secp256k1/default.nix +++ b/pkgs/development/ocaml-modules/secp256k1/default.nix @@ -1,6 +1,7 @@ { lib, fetchFromGitHub, + fetchpatch, buildDunePackage, base, stdio, @@ -21,6 +22,11 @@ buildDunePackage rec { hash = "sha256-22+dZb3MC1W5Qvsz3+IHV1/XiGCRmJHTH+6IW2QX2hU="; }; + patches = fetchpatch { + url = "https://github.com/dakk/secp256k1-ml/commit/9bde90a401746dcecdab68a2fdb95659d16a3022.patch"; + hash = "sha256-QndtZJtPKPjuv84jDmXc9Q/xGLb/mNUGL4AvRecSFlQ="; + }; + buildInputs = [ base stdio diff --git a/pkgs/development/php-packages/phive/default.nix b/pkgs/development/php-packages/phive/default.nix index 51a9df9087e3a..e3d8801049f8f 100644 --- a/pkgs/development/php-packages/phive/default.nix +++ b/pkgs/development/php-packages/phive/default.nix @@ -4,18 +4,18 @@ php, }: -php.buildComposerProject (finalAttrs: { +php.buildComposerProject2 (finalAttrs: { pname = "phive"; version = "0.15.3"; src = fetchFromGitHub { owner = "phar-io"; repo = "phive"; - rev = finalAttrs.version; + tag = finalAttrs.version; hash = "sha256-6vNhmIDE3kwZGMrDnGNGVV6/lb32Yb3ooWDYOC7SUcs="; }; - vendorHash = "sha256-iBNH4n4AVE47CYmwO6s6WBAuRe7JzzvoNruYfVbxPck="; + vendorHash = "sha256-wNqQfVRm4kEWpYfdo8HBESh0L4cXPrTlHnBI79b1Al0="; meta = { changelog = "https://github.com/phar-io/phive/releases/tag/${finalAttrs.version}"; diff --git a/pkgs/development/php-packages/php-parallel-lint/default.nix b/pkgs/development/php-packages/php-parallel-lint/default.nix index 342e4158f07a3..4e79ec0a30e39 100644 --- a/pkgs/development/php-packages/php-parallel-lint/default.nix +++ b/pkgs/development/php-packages/php-parallel-lint/default.nix @@ -2,21 +2,26 @@ fetchFromGitHub, lib, php, + versionCheckHook, }: -php.buildComposerProject (finalAttrs: { +php.buildComposerProject2 (finalAttrs: { pname = "php-parallel-lint"; version = "1.4.0"; src = fetchFromGitHub { owner = "php-parallel-lint"; repo = "PHP-Parallel-Lint"; - rev = "v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-g5e/yfvfq55MQDux3JRDvhaYEay68Q4u1VfIwDRgv7I="; }; composerLock = ./composer.lock; - vendorHash = "sha256-NZLGeX1i+E621UGYeWn5tKufDbCLv4iD1VXJcnhfleY="; + vendorHash = "sha256-ySdLlqlGKZ6LgmAOBMkBNoCAqWrgMwE/Cj6ZEPEsCko="; + + nativeInstallCheckInputs = [ versionCheckHook ]; + doInstallCheck = true; + versionCheckProgram = "${placeholder "out"}/bin/${finalAttrs.meta.mainProgram}"; meta = { description = "Tool to check syntax of PHP files faster than serial check with fancier output"; diff --git a/pkgs/development/python-modules/aiohomeconnect/default.nix b/pkgs/development/python-modules/aiohomeconnect/default.nix index ffa755c21533a..e2ed0f5b81de7 100644 --- a/pkgs/development/python-modules/aiohomeconnect/default.nix +++ b/pkgs/development/python-modules/aiohomeconnect/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "aiohomeconnect"; - version = "0.11.2"; + version = "0.11.4"; pyproject = true; disabled = pythonOlder "3.11"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "MartinHjelmare"; repo = "aiohomeconnect"; tag = "v${version}"; - hash = "sha256-YnQypKeVYoHD445fv9n643qIqjTCInCfbTHPUrMePJI="; + hash = "sha256-feAjp1DjZeNTOf0lWN23pap7oDiqSx0v6tf6uIVf1fU="; }; pythonRelaxDeps = [ "httpx" ]; diff --git a/pkgs/development/python-modules/azure-mgmt-eventhub/default.nix b/pkgs/development/python-modules/azure-mgmt-eventhub/default.nix index efa62109277e1..312b26a27e1cb 100644 --- a/pkgs/development/python-modules/azure-mgmt-eventhub/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-eventhub/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "azure-mgmt-eventhub"; - version = "11.1.0"; + version = "11.2.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "azure_mgmt_eventhub"; inherit version; - hash = "sha256-47j+CauuZ8XaiE57bw3kTi+CfFuACaZSuVH7LSD8s5I="; + hash = "sha256-McR/GPc9LYM0XN5ZCVaOKIWMJUijWxDiMZS0dnqc5+M="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/bindep/default.nix b/pkgs/development/python-modules/bindep/default.nix index 7feb91d8d9713..99eca088b2ab6 100644 --- a/pkgs/development/python-modules/bindep/default.nix +++ b/pkgs/development/python-modules/bindep/default.nix @@ -11,18 +11,17 @@ buildPythonPackage rec { pname = "bindep"; - version = "2.11.0"; + version = "2.12.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-rLLyWbzh/RUIhzR5YJu95bmq5Qg3hHamjWtqGQAufi8="; + hash = "sha256-wGtR5tC6OWWq2PPCXwpXS+D4AboHyxp4SV2olUZ952A="; }; env.PBR_VERSION = version; build-system = [ - distro pbr setuptools ]; @@ -41,7 +40,7 @@ buildPythonPackage rec { meta = with lib; { description = "Bindep is a tool for checking the presence of binary packages needed to use an application / library"; - homepage = "https://docs.opendev.org/opendev/bindep/latest/"; + homepage = "https://opendev.org/opendev/bindep"; license = licenses.asl20; mainProgram = "bindep"; maintainers = teams.openstack.members; diff --git a/pkgs/development/python-modules/blackjax/default.nix b/pkgs/development/python-modules/blackjax/default.nix index 69865be6e5bde..5b02bf3450d6a 100644 --- a/pkgs/development/python-modules/blackjax/default.nix +++ b/pkgs/development/python-modules/blackjax/default.nix @@ -49,17 +49,28 @@ buildPythonPackage rec { pytest-xdist ]; - disabledTestPaths = - [ "tests/test_benchmarks.py" ] - ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [ - # Assertion errors on numerical values - "tests/mcmc/test_integrators.py" - ]; + disabledTestPaths = [ + "tests/test_benchmarks.py" + + # Assertion errors on numerical values + "tests/mcmc/test_integrators.py" + ]; disabledTests = [ # too slow "test_adaptive_tempered_smc" + + # AssertionError on numerical values + "test_barker" + "test_mclmc" + "test_mcse4" + "test_normal_univariate" + "test_nuts__with_device" + "test_nuts__with_jit" + "test_nuts__without_device" + "test_nuts__without_jit" + "test_smc_waste_free__with_jit" ] ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [ # Numerical test (AssertionError) diff --git a/pkgs/development/python-modules/boto3-stubs/default.nix b/pkgs/development/python-modules/boto3-stubs/default.nix index 92e73ce6b2423..502f538739ba5 100644 --- a/pkgs/development/python-modules/boto3-stubs/default.nix +++ b/pkgs/development/python-modules/boto3-stubs/default.nix @@ -359,7 +359,7 @@ buildPythonPackage rec { pname = "boto3-stubs"; - version = "1.36.6"; + version = "1.36.8"; pyproject = true; disabled = pythonOlder "3.7"; @@ -367,7 +367,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "boto3_stubs"; inherit version; - hash = "sha256-9ewaWm7LkpEpA2MRY0gvbOhPCS1bw27Aj3cHAL78zHs="; + hash = "sha256-8J+hyMYuDd3zvMQFORoSErHe5W1wQ3izg/9A8d3BSNs="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/botocore-stubs/default.nix b/pkgs/development/python-modules/botocore-stubs/default.nix index 4bb19c57001fd..81238266e916c 100644 --- a/pkgs/development/python-modules/botocore-stubs/default.nix +++ b/pkgs/development/python-modules/botocore-stubs/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "botocore-stubs"; - version = "1.36.6"; + version = "1.36.8"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "botocore_stubs"; inherit version; - hash = "sha256-9HwwA2pePIQu9zR66yBnqVKVmnucMsfcDtJwQKIxNQ0="; + hash = "sha256-qLZdf2rhSqkNA/vBwnt8PGs8o9fC6x2BREG6BKIt2YE="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/compliance-trestle/default.nix b/pkgs/development/python-modules/compliance-trestle/default.nix new file mode 100755 index 0000000000000..b67b80f02c011 --- /dev/null +++ b/pkgs/development/python-modules/compliance-trestle/default.nix @@ -0,0 +1,108 @@ +{ + attrs, + buildPythonPackage, + cmarkgfm, + cryptography, + defusedxml, + datamodel-code-generator, + email-validator, + fetchFromGitHub, + furl, + ilcli, + importlib-resources, + jinja2, + lib, + mypy, + openpyxl, + orjson, + paramiko, + pytestCheckHook, + pydantic, + python-dotenv, + python-frontmatter, + requests, + ruamel-yaml, + setuptools, + setuptools-scm, +}: + +buildPythonPackage rec { + pname = "compliance-trestle"; + version = "3.7.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "oscal-compass"; + repo = "compliance-trestle"; + tag = "v${version}"; + hash = "sha256-MEPleUM5gSCJjVaVbNtNzRl+Vvvk97h6Q/mOWIxFd2Q="; + fetchSubmodules = true; + }; + + pythonRelaxDeps = true; + + postPatch = '' + substituteInPlace tests/trestle/misc/mypy_test.py \ + --replace-fail "trestle'," "${placeholder "out"}/bin/trestle'," \ + ''; + + build-system = [ + setuptools + setuptools-scm + ]; + + dependencies = [ + attrs + cmarkgfm + cryptography + defusedxml + datamodel-code-generator + email-validator + furl + ilcli + importlib-resources + jinja2 + openpyxl + orjson + paramiko + pydantic + python-dotenv + python-frontmatter + requests + ruamel-yaml + ]; + + nativeCheckInputs = [ + pytestCheckHook + mypy + ]; + + disabledTests = [ + # Requires network access + "test_import_from_url" + "test_import_from_nist" + "test_remote_profile_relative_cat" + + # AssertionError + "test_profile_generate_assemble_rev_5" + "test_ssp_assemble_fedramp_profile" + "test_ssp_generate_aggregates_no_cds" + "test_ssp_generate_aggregates_no_param_value_orig" + ]; + + disabledTestPaths = [ + # Requires network access + "tests/trestle/core/remote" + ]; + + pythonImportsCheck = [ "trestle" ]; + + meta = { + description = "An opinionated tooling platform for managing compliance as code, using continuous integration and NIST's OSCAL standard"; + homepage = "https://github.com/oscal-compass/compliance-trestle"; + changelog = "https://github.com/oscal-compass/compliance-trestle/blob/${src.rev}/CHANGELOG.md"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ tochiaha ]; + mainProgram = "trestle"; + }; +} diff --git a/pkgs/development/python-modules/conda-libmamba-solver/default.nix b/pkgs/development/python-modules/conda-libmamba-solver/default.nix index fceb265592e5f..dcbe419854bcc 100644 --- a/pkgs/development/python-modules/conda-libmamba-solver/default.nix +++ b/pkgs/development/python-modules/conda-libmamba-solver/default.nix @@ -9,7 +9,7 @@ }: buildPythonPackage rec { pname = "conda-libmamba-solver"; - version = "24.11.1"; + version = "25.1.1"; pyproject = true; src = fetchFromGitHub { @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "conda"; repo = "conda-libmamba-solver"; tag = version; - hash = "sha256-lIpMzm3wjkugMDwqmVFXDKVJyX/SdzFG5jelZRys8PQ="; + hash = "sha256-d6KLUhc7+KZ5H9vkI84S9TyximSwatu6lg7XIdMqtk0="; }; diff --git a/pkgs/development/python-modules/cyclopts/default.nix b/pkgs/development/python-modules/cyclopts/default.nix index 7a859d9bab5a5..094193c51319a 100644 --- a/pkgs/development/python-modules/cyclopts/default.nix +++ b/pkgs/development/python-modules/cyclopts/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "cyclopts"; - version = "3.3.0"; + version = "3.3.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "BrianPugh"; repo = "cyclopts"; tag = "v${version}"; - hash = "sha256-sXTKBDfQSqMWBX+wrhP6fCugGSuXM8mOkEroFWPalVs="; + hash = "sha256-PrhaUUzFQJ7tqUdu7nwi9k+NxQUPQWYDUc9vsvnmfeY="; }; build-system = [ diff --git a/pkgs/development/python-modules/cysignals/default.nix b/pkgs/development/python-modules/cysignals/default.nix index 9e90eaf38f19d..df27cb4c17e97 100644 --- a/pkgs/development/python-modules/cysignals/default.nix +++ b/pkgs/development/python-modules/cysignals/default.nix @@ -1,8 +1,8 @@ { lib, - autoreconfHook, fetchPypi, buildPythonPackage, + meson-python, cython, pariSupport ? true, pari, # for interfacing with the PARI/GP signal handler @@ -15,14 +15,19 @@ assert pariSupport -> pari != null; buildPythonPackage rec { pname = "cysignals"; - version = "1.11.4"; - format = "setuptools"; + version = "1.12.3"; + pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-Dx4yHlWgf5AchqNqHkSX9v+d/nAGgdATCjjDbk6yOMM="; + hash = "sha256-ifdibb8p21qz1u/xWomXj061GTwyDpCZvMFX2s3v0es="; }; + build-system = [ + cython + meson-python + ]; + # explicit check: # build/src/cysignals/implementation.c:27:2: error: #error "cysignals must be compiled without _FORTIFY_SOURCE" hardeningDisable = [ "fortify" ]; @@ -45,8 +50,6 @@ buildPythonPackage rec { pari ]; - nativeBuildInputs = [ autoreconfHook ]; - enableParallelBuilding = true; passthru.tests = { diff --git a/pkgs/development/python-modules/datafusion/default.nix b/pkgs/development/python-modules/datafusion/default.nix index c80baeef6e536..46d27a50e93e3 100644 --- a/pkgs/development/python-modules/datafusion/default.nix +++ b/pkgs/development/python-modules/datafusion/default.nix @@ -47,10 +47,10 @@ buildPythonPackage rec { hash = "sha256-5WOSlx4XW9zO6oTY16lWQElShLv0ubflVPfSSEGrFgg="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { name = "datafusion-cargo-deps"; inherit src; - hash = "sha256-hN03tbnH77VsMDxSMddMHIH00t7lUs5h8rTHbiMIExw="; + hash = "sha256-xUpchV4UFEX1HkCpClOwxnEfGLVlOIX4UmzYKiUth9U="; }; nativeBuildInputs = with rustPlatform; [ diff --git a/pkgs/development/python-modules/diffusers/default.nix b/pkgs/development/python-modules/diffusers/default.nix index 1c042fef1c92b..5d71a3b96d373 100644 --- a/pkgs/development/python-modules/diffusers/default.nix +++ b/pkgs/development/python-modules/diffusers/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { pname = "diffusers"; - version = "0.30.3"; + version = "0.31.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -49,7 +49,7 @@ buildPythonPackage rec { owner = "huggingface"; repo = "diffusers"; tag = "v${version}"; - hash = "sha256-/3lHJdsNblKb6xX03OluSCApMK3EXJbRLboBk8CjobE="; + hash = "sha256-5Kav5ZcSYLYH2ojGRFAGyyK7NC8Ny99odVPSpVI4atU="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/elevenlabs/default.nix b/pkgs/development/python-modules/elevenlabs/default.nix index 14e72f843c0b3..9a359369cb128 100644 --- a/pkgs/development/python-modules/elevenlabs/default.nix +++ b/pkgs/development/python-modules/elevenlabs/default.nix @@ -12,7 +12,7 @@ }: let - version = "1.9.0"; + version = "1.50.5"; tag = version; in buildPythonPackage { @@ -24,7 +24,7 @@ buildPythonPackage { owner = "elevenlabs"; repo = "elevenlabs-python"; inherit tag; - hash = "sha256-0fkt2Z05l95b2S+xoyyy9VGAUZDI1SM8kdcP1PCrUg8="; + hash = "sha256-Cew8+L7NoQlvR2pILVmwNIa3WUfZzmEkf1+U2nglsnM="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/es-client/default.nix b/pkgs/development/python-modules/es-client/default.nix index 49a1f30051c41..dcef4e4f068d3 100644 --- a/pkgs/development/python-modules/es-client/default.nix +++ b/pkgs/development/python-modules/es-client/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "es-client"; - version = "8.15.2"; + version = "8.17.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "untergeek"; repo = "es_client"; tag = "v${version}"; - hash = "sha256-7vkpZNY333DYj9klzm1YG5ccxsu+LrP7WOWPH1KCfFA="; + hash = "sha256-j7yaN7FOrGlRjZSBugRCtecfUw/3dNuI252VO/eYnzk="; }; pythonRelaxDeps = true; diff --git a/pkgs/development/python-modules/ete3/default.nix b/pkgs/development/python-modules/ete3/default.nix index 282a0546431f3..b16679376a536 100644 --- a/pkgs/development/python-modules/ete3/default.nix +++ b/pkgs/development/python-modules/ete3/default.nix @@ -8,34 +8,42 @@ lxml, withXmlSupport ? false, pyqt5, + setuptools, + legacy-cgi, }: buildPythonPackage rec { pname = "ete3"; version = "3.1.3"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit pname version; hash = "sha256-BqO3+o7ZAYewdqjbvlsbYqzulCAdPG6CL1X0SWAe9vI="; }; + build-system = [ + setuptools + ]; + doCheck = false; # Tests are (i) not 3.x compatible, (ii) broken under 2.7 + pythonImportsCheck = [ "ete3" ]; - propagatedBuildInputs = + dependencies = [ six numpy + legacy-cgi ] ++ lib.optional withTreeVisualization pyqt5 ++ lib.optional withXmlSupport lxml; - meta = with lib; { + meta = { description = "Python framework for the analysis and visualization of trees"; mainProgram = "ete3"; homepage = "http://etetoolkit.org/"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ delehef ]; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ delehef ]; }; } diff --git a/pkgs/development/python-modules/fastecdsa/default.nix b/pkgs/development/python-modules/fastecdsa/default.nix index 71d0fb1f9f4e7..58f80c336ab35 100644 --- a/pkgs/development/python-modules/fastecdsa/default.nix +++ b/pkgs/development/python-modules/fastecdsa/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "fastecdsa"; - version = "3.0.0"; + version = "3.0.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-deOnwZYvjtOMps90fp7OUfzbMxDFsk0Oj72gFoMymAU="; + hash = "sha256-9LSlD9XjRsSUmro2XAYcP2sl7ueYPJc+HTHednK6SOo="; }; buildInputs = [ gmp ]; diff --git a/pkgs/development/python-modules/flask-limiter/default.nix b/pkgs/development/python-modules/flask-limiter/default.nix index 4365cd89bd398..f59ee0cf92638 100644 --- a/pkgs/development/python-modules/flask-limiter/default.nix +++ b/pkgs/development/python-modules/flask-limiter/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "flask-limiter"; - version = "3.10.0"; + version = "3.10.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "alisaifee"; repo = "flask-limiter"; tag = version; - hash = "sha256-spE0gVrPlbz0JDXGznJ6RN2uNAsQn7tbHxWGU98221M="; + hash = "sha256-AfreBLyJDogXnxB5cIoT766VFiHIIoVKAoBIra6Q+xs="; }; postPatch = '' diff --git a/pkgs/development/python-modules/flux-led/default.nix b/pkgs/development/python-modules/flux-led/default.nix index 244d0dfdf42e9..5982eaca2791b 100644 --- a/pkgs/development/python-modules/flux-led/default.nix +++ b/pkgs/development/python-modules/flux-led/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "flux-led"; - version = "1.1.0"; + version = "1.1.3"; pyproject = true; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "Danielhiversen"; repo = "flux_led"; tag = version; - hash = "sha256-7gWqlb2PNRI50Xe8lv2Kim7wUYVzuQMa4BAbg2a7NvM="; + hash = "sha256-lFOxf9+O1APreIL/wQTZ+zSMx/MxPTRQrFWgw324myY="; }; postPatch = '' diff --git a/pkgs/development/python-modules/geometric/default.nix b/pkgs/development/python-modules/geometric/default.nix index 891012810bf82..696e4d19feec4 100644 --- a/pkgs/development/python-modules/geometric/default.nix +++ b/pkgs/development/python-modules/geometric/default.nix @@ -2,7 +2,6 @@ buildPythonPackage, lib, fetchFromGitHub, - fetchpatch, networkx, numpy, scipy, @@ -12,24 +11,16 @@ buildPythonPackage rec { pname = "geometric"; - version = "1.0.2"; + version = "1.1"; format = "setuptools"; src = fetchFromGitHub { owner = "leeping"; repo = "geomeTRIC"; tag = version; - hash = "sha256-DmrKLVQrPQDzTMxqEImnvRr3Wb2R3+hxtDVCN9XUcFM="; + hash = "sha256-8kM6zaQPxtFiJGT8ZW0ivg7bJc/8sdfoTv7NGW2wwR8="; }; - patches = [ - (fetchpatch { - name = "ase-is-optional"; - url = "https://github.com/leeping/geomeTRIC/commit/aff6e4411980ac9cbe112a050c3a34ba7e305a43.patch"; - hash = "sha256-JGGPX+JwkQ8Imgmyx+ReRTV+k6mxHYgm+Nd8WUjbFEg="; - }) - ]; - propagatedBuildInputs = [ networkx numpy diff --git a/pkgs/development/python-modules/imap-tools/default.nix b/pkgs/development/python-modules/imap-tools/default.nix index bc4b2ae8e79a4..a7a0736d60dbc 100644 --- a/pkgs/development/python-modules/imap-tools/default.nix +++ b/pkgs/development/python-modules/imap-tools/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "imap-tools"; - version = "1.9.0"; + version = "1.9.1"; pyproject = true; src = fetchFromGitHub { owner = "ikvk"; repo = "imap_tools"; tag = "v${version}"; - hash = "sha256-2frJqHKIOuERC8G6fJwJOdxcWHRQRRy1BxfZDrVhXEU="; + hash = "sha256-tlShiI90PAbWztrL5PgmE1D+/h6bUoSxAHxwGlQHvus="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/inference-gym/default.nix b/pkgs/development/python-modules/inference-gym/default.nix index dd1a854b92c92..315d78dde39de 100644 --- a/pkgs/development/python-modules/inference-gym/default.nix +++ b/pkgs/development/python-modules/inference-gym/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { pname = "inference-gym"; - version = "0.0.4"; + version = "0.0.5"; format = "wheel"; src = fetchPypi { @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "inference_gym"; dist = "py3"; python = "py3"; - hash = "sha256-bpi/IB8PuLPIKoTjmBeVl/4XGvE/yyG8WYxNqNcruvE="; + hash = "sha256-E3lNgCZIObPBkl0PWACUG19XOiCOh1+N/sUFHQyA/wE="; }; pythonImportsCheck = [ "inference_gym" ]; diff --git a/pkgs/development/python-modules/jaxtyping/default.nix b/pkgs/development/python-modules/jaxtyping/default.nix index 01d06d31eb129..f29fa882b5787 100644 --- a/pkgs/development/python-modules/jaxtyping/default.nix +++ b/pkgs/development/python-modules/jaxtyping/default.nix @@ -6,6 +6,9 @@ # build-system hatchling, + # dependencies + wadler-lindig, + # tests cloudpickle, equinox, @@ -20,18 +23,22 @@ let self = buildPythonPackage rec { pname = "jaxtyping"; - version = "0.2.36"; + version = "0.2.37"; pyproject = true; src = fetchFromGitHub { owner = "google"; repo = "jaxtyping"; tag = "v${version}"; - hash = "sha256-TXhHh6Nka9TOnfFPaNyHmLdTkhzyFEY0mLSfoDf9KQc="; + hash = "sha256-0a/9TSQW/k5kuucHoSUhLtRk9k+5ycbI/g6V1id3v28="; }; build-system = [ hatchling ]; + dependencies = [ + wadler-lindig + ]; + pythonImportsCheck = [ "jaxtyping" ]; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/jupyter-server/default.nix b/pkgs/development/python-modules/jupyter-server/default.nix index 071b3707225ba..8eeffccb26a5b 100644 --- a/pkgs/development/python-modules/jupyter-server/default.nix +++ b/pkgs/development/python-modules/jupyter-server/default.nix @@ -3,7 +3,6 @@ stdenv, buildPythonPackage, fetchPypi, - pythonOlder, hatch-jupyter-builder, hatchling, pytestCheckHook, @@ -37,7 +36,6 @@ buildPythonPackage rec { pname = "jupyter-server"; version = "2.14.2"; pyproject = true; - disabled = pythonOlder "3.8"; src = fetchPypi { pname = "jupyter_server"; @@ -45,12 +43,12 @@ buildPythonPackage rec { hash = "sha256-ZglQIaqWOM7SdsJIsdgYYuTFDyktV1kgu+lg3hxWsSs="; }; - nativeBuildInputs = [ + build-system = [ hatch-jupyter-builder hatchling ]; - propagatedBuildInputs = [ + dependencies = [ argon2-cffi jinja2 tornado @@ -87,6 +85,11 @@ buildPythonPackage rec { pytestFlagsArray = [ "-W" "ignore::DeprecationWarning" + # 19 failures on python 3.13: + # ResourceWarning: unclosed database in + # TODO: Can probably be removed at the next update + "-W" + "ignore::pytest.PytestUnraisableExceptionWarning" ]; preCheck = '' @@ -111,6 +114,10 @@ buildPythonPackage rec { ++ lib.optionals stdenv.hostPlatform.isLinux [ # Failed: DID NOT RAISE "test_copy_big_dir" + ] + ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ + # TypeError: the JSON object must be str, bytes or bytearray, not NoneType + "test_terminal_create_with_cwd" ]; disabledTestPaths = [ @@ -123,12 +130,12 @@ buildPythonPackage rec { __darwinAllowLocalNetworking = true; - meta = with lib; { + meta = { changelog = "https://github.com/jupyter-server/jupyter_server/blob/v${version}/CHANGELOG.md"; description = "Backend—i.e. core services, APIs, and REST endpoints—to Jupyter web applications"; mainProgram = "jupyter-server"; homepage = "https://github.com/jupyter-server/jupyter_server"; - license = licenses.bsdOriginal; + license = lib.licenses.bsdOriginal; maintainers = lib.teams.jupyter.members; }; } diff --git a/pkgs/development/python-modules/lacuscore/default.nix b/pkgs/development/python-modules/lacuscore/default.nix index 3375c23bc9095..46bdab1780c39 100644 --- a/pkgs/development/python-modules/lacuscore/default.nix +++ b/pkgs/development/python-modules/lacuscore/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "lacuscore"; - version = "1.12.7"; + version = "1.12.8"; pyproject = true; disabled = pythonOlder "3.9"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "ail-project"; repo = "LacusCore"; tag = "v${version}"; - hash = "sha256-bB9BeDhFlwdIgIv9VfvBkqxcfzpPe3jl6D/ChdP2FsM="; + hash = "sha256-blQhnQoNMXQhNQJ7EXawoYHxbPEgPmLltoLQTzsKwtA="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/ldfparser/default.nix b/pkgs/development/python-modules/ldfparser/default.nix index 42abf5cfd9a9d..a73651db76fc1 100644 --- a/pkgs/development/python-modules/ldfparser/default.nix +++ b/pkgs/development/python-modules/ldfparser/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "ldfparser"; - version = "0.25.0"; + version = "0.26.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "c4deszes"; repo = "ldfparser"; tag = "v${version}"; - hash = "sha256-SZ9mWV5PjkQ2OiScPSMrunkKQWmuYW2lB2JvpTGNbY4="; + hash = "sha256-SVl/O0/2k1Y4lta+3BFkddyBZfYO2vqh4Xx1ZXNwXN4="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/letpot/default.nix b/pkgs/development/python-modules/letpot/default.nix new file mode 100644 index 0000000000000..24cab45a1968f --- /dev/null +++ b/pkgs/development/python-modules/letpot/default.nix @@ -0,0 +1,43 @@ +{ + aiohttp, + aiomqtt, + buildPythonPackage, + fetchFromGitHub, + lib, + poetry-core, + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "letpot"; + version = "0.3.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "jpelgrom"; + repo = "python-letpot"; + tag = "v${version}"; + hash = "sha256-OFLQ0DV7roqUlm6zJWAzMRpcmAi/oco8lEHbmfqNaVs="; + }; + + build-system = [ poetry-core ]; + + dependencies = [ + aiohttp + aiomqtt + ]; + + pythonImportsCheck = [ "letpot" ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + meta = { + changelog = "https://github.com/jpelgrom/python-letpot/releases/tag/${src.tag}"; + description = "Asynchronous Python client for LetPot hydroponic gardens"; + homepage = "https://github.com/jpelgrom/python-letpot"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/libknot/default.nix b/pkgs/development/python-modules/libknot/default.nix index 28c9d3cfda69d..a88ba86c570f0 100644 --- a/pkgs/development/python-modules/libknot/default.nix +++ b/pkgs/development/python-modules/libknot/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "libknot"; - version = "3.4.3"; + version = "3.4.4"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-Sm3WHZdCpz0F/tpGQc7tvpjcxfPc2cMAyc0rVjm6i04="; + hash = "sha256-pvWkjoLmwhVBzDf1Axc6iuOLrDfIfrY0yr1uvJGy0s4="; }; postPatch = '' diff --git a/pkgs/development/python-modules/llama-cpp-python/default.nix b/pkgs/development/python-modules/llama-cpp-python/default.nix index ec69378235e60..90e2d9f7d0cbf 100644 --- a/pkgs/development/python-modules/llama-cpp-python/default.nix +++ b/pkgs/development/python-modules/llama-cpp-python/default.nix @@ -1,8 +1,10 @@ { lib, stdenv, + gcc13Stdenv, buildPythonPackage, fetchFromGitHub, + fetchpatch2, # nativeBuildInputs cmake, @@ -33,6 +35,9 @@ cudaPackages ? { }, }: +let + stdenvTarget = if cudaSupport then gcc13Stdenv else stdenv; +in buildPythonPackage rec { pname = "llama-cpp-python"; version = "0.3.6"; @@ -47,15 +52,38 @@ buildPythonPackage rec { }; # src = /home/gaetan/llama-cpp-python; + patches = [ + # fix segfault when running tests due to missing default Metal devices + (fetchpatch2 { + url = "https://github.com/ggerganov/llama.cpp/commit/acd38efee316f3a5ed2e6afcbc5814807c347053.patch?full_index=1"; + stripLen = 1; + extraPrefix = "vendor/llama.cpp/"; + hash = "sha256-71+Lpg9z5KPlaQTX9D85KS2LXFWLQNJJ18TJyyq3/pU="; + }) + ]; + dontUseCmakeConfigure = true; SKBUILD_CMAKE_ARGS = lib.strings.concatStringsSep ";" ( - lib.optionals cudaSupport [ + # Set GGML_NATIVE=off. Otherwise, cmake attempts to build with + # -march=native* which is either a no-op (if cc-wrapper is able to ignore + # it), or an attempt to build a non-reproducible binary. + # + # This issue was spotted when cmake rules appended feature modifiers to + # -mcpu, breaking linux build as follows: + # + # cc1: error: unknown value ‘native+nodotprod+noi8mm+nosve’ for ‘-mcpu’ + [ "-DGGML_NATIVE=off" ] + ++ lib.optionals cudaSupport [ "-DGGML_CUDA=on" "-DCUDAToolkit_ROOT=${lib.getDev cudaPackages.cuda_nvcc}" "-DCMAKE_CUDA_COMPILER=${lib.getExe cudaPackages.cuda_nvcc}" ] ); + preBuild = '' + export CMAKE_BUILD_PARALLEL_LEVEL="$NIX_BUILD_CORES" + ''; + nativeBuildInputs = [ cmake ninja @@ -76,6 +104,8 @@ buildPythonPackage rec { ] ); + stdenv = stdenvTarget; + dependencies = [ diskcache jinja2 @@ -99,7 +129,11 @@ buildPythonPackage rec { passthru = { updateScript = gitUpdater { rev-prefix = "v"; }; - tests.llama-cpp-python = llama-cpp-python.override { cudaSupport = true; }; + tests = lib.optionalAttrs stdenvTarget.hostPlatform.isLinux { + withCuda = llama-cpp-python.override { + cudaSupport = true; + }; + }; }; meta = { @@ -107,16 +141,9 @@ buildPythonPackage rec { homepage = "https://github.com/abetlen/llama-cpp-python"; changelog = "https://github.com/abetlen/llama-cpp-python/blob/v${version}/CHANGELOG.md"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ kirillrdy ]; - badPlatforms = [ - # Segfaults during tests: - # tests/test_llama.py .Fatal Python error: Segmentation fault - # Current thread 0x00000001f3decf40 (most recent call first): - # File "/private/tmp/nix-build-python3.12-llama-cpp-python-0.3.2.drv-0/source/llama_cpp/_internals.py", line 51 in __init__ - lib.systems.inspect.patterns.isDarwin - - # cc1: error: unknown value ‘native+nodotprod+noi8mm+nosve’ for ‘-mcpu’ - "aarch64-linux" + maintainers = with lib.maintainers; [ + booxter + kirillrdy ]; }; } diff --git a/pkgs/development/python-modules/llm/default.nix b/pkgs/development/python-modules/llm/default.nix index ffde0ee1cc3f5..b74cd1c46014b 100644 --- a/pkgs/development/python-modules/llm/default.nix +++ b/pkgs/development/python-modules/llm/default.nix @@ -22,7 +22,7 @@ let llm = buildPythonPackage rec { pname = "llm"; - version = "0.19.1"; + version = "0.20"; pyproject = true; build-system = [ setuptools ]; @@ -33,7 +33,7 @@ let owner = "simonw"; repo = "llm"; tag = version; - hash = "sha256-MMqlcKSvBAdM6Xfz3MQTIbCfWEqzVeCPzuJJzFVpxb4="; + hash = "sha256-nNwhsdix65i19f7JHvSLydDufP7nAUjV1YYQspsHT8s="; }; patches = [ ./001-disable-install-uninstall-commands.patch ]; diff --git a/pkgs/development/python-modules/mallard-ducktype/default.nix b/pkgs/development/python-modules/mallard-ducktype/default.nix new file mode 100644 index 0000000000000..f13d66593ed53 --- /dev/null +++ b/pkgs/development/python-modules/mallard-ducktype/default.nix @@ -0,0 +1,38 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, +}: + +buildPythonPackage rec { + pname = "mallard-ducktype"; + version = "1.0.2"; + pyproject = true; + + src = fetchFromGitHub { + owner = "projectmallard"; + repo = "mallard-ducktype"; + tag = version; + hash = "sha256-jHjzTBBRBh//bOrdnyCRmZRmpupgDaDRuZGAd75baco="; + }; + + build-system = [ setuptools ]; + + checkPhase = '' + runHook preCheck + pushd tests + ./runtests + popd + runHook postCheck + ''; + + pythonImportsCheck = [ "mallard" ]; + + meta = { + description = "Parser for the lightweight Ducktype syntax for Mallard"; + homepage = "https://github.com/projectmallard/mallard-ducktype"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ ]; + }; +} diff --git a/pkgs/development/python-modules/manga-ocr/default.nix b/pkgs/development/python-modules/manga-ocr/default.nix index 5c6c54975353c..3b159b798f468 100644 --- a/pkgs/development/python-modules/manga-ocr/default.nix +++ b/pkgs/development/python-modules/manga-ocr/default.nix @@ -8,15 +8,14 @@ with python3Packages; buildPythonPackage rec { pname = "manga-ocr"; - version = "0.1.13"; - disabled = pythonOlder "3.7"; + version = "0.1.14"; format = "pyproject"; src = fetchFromGitHub { owner = "kha-white"; repo = "manga-ocr"; tag = "v${version}"; - hash = "sha256-0EwXDMnA9SCmSsMVXnMenSFSzs74lorFNNym9y/NNsI="; + hash = "sha256-fCLgFeo6GYPSpCX229TK2MXTKt3p1tQV06phZYD6UeE="; }; build-system = [ @@ -37,15 +36,11 @@ buildPythonPackage rec { unidic-lite ]; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace-fail "numpy<2" "numpy" - ''; - meta = with lib; { + mainProgram = "manga_ocr"; description = "Optical character recognition for Japanese text, with the main focus being Japanese manga"; homepage = "https://github.com/kha-white/manga-ocr"; - changelog = "https://github.com/kha-white/manga-ocr/releases/tag/${version}"; + changelog = "https://github.com/kha-white/manga-ocr/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ laurent-f1z1 ]; }; diff --git a/pkgs/development/python-modules/mat2/default.nix b/pkgs/development/python-modules/mat2/default.nix index f942fadb403f7..735c530dc01f4 100644 --- a/pkgs/development/python-modules/mat2/default.nix +++ b/pkgs/development/python-modules/mat2/default.nix @@ -5,7 +5,7 @@ pytestCheckHook, pythonOlder, fetchFromGitLab, - substituteAll, + replaceVars, bubblewrap, exiftool, ffmpeg, @@ -40,22 +40,21 @@ buildPythonPackage rec { patches = [ # hardcode paths to some binaries - (substituteAll ( - { - src = ./paths.patch; - exiftool = "${exiftool}/bin/exiftool"; - ffmpeg = "${ffmpeg}/bin/ffmpeg"; - } - // lib.optionalAttrs dolphinIntegration { kdialog = "${plasma5Packages.kdialog}/bin/kdialog"; } - )) + (replaceVars ./paths.patch { + exiftool = "${exiftool}/bin/exiftool"; + ffmpeg = "${ffmpeg}/bin/ffmpeg"; + kdialog = if dolphinIntegration then "${plasma5Packages.kdialog}/bin/kdialog" else null; + # replaced in postPatch + mat2 = null; + mat2svg = null; + }) # the executable shouldn't be called .mat2-wrapped ./executable-name.patch # hardcode path to mat2 executable ./tests.patch ] ++ lib.optionals (stdenv.hostPlatform.isLinux) [ - (substituteAll { - src = ./bubblewrap-path.patch; + (replaceVars ./bubblewrap-path.patch { bwrap = "${bubblewrap}/bin/bwrap"; }) ]; diff --git a/pkgs/development/python-modules/mdtraj/default.nix b/pkgs/development/python-modules/mdtraj/default.nix index f655aa08bf293..2c13426c1f921 100644 --- a/pkgs/development/python-modules/mdtraj/default.nix +++ b/pkgs/development/python-modules/mdtraj/default.nix @@ -6,12 +6,13 @@ fetchpatch, llvmPackages, zlib, - cython_0, - oldest-supported-numpy, + cython, + numpy, setuptools, + versioneer, wheel, astunparse, - numpy, + netcdf4, packaging, pyparsing, scipy, @@ -26,14 +27,14 @@ buildPythonPackage rec { pname = "mdtraj"; - version = "1.10.0"; + version = "1.10.2"; pyproject = true; src = fetchFromGitHub { owner = "mdtraj"; repo = "mdtraj"; tag = version; - hash = "sha256-hNv/humEZOX4W7cOlJSAodk9pIi18//YJNSWNiEFiVg="; + hash = "sha256-0hSMKrY3p29IUmMuLsNUK4s/AM5zCzAh6Udg/xbeky0="; }; patches = [ @@ -48,16 +49,17 @@ buildPythonPackage rec { ]; build-system = [ - cython_0 - oldest-supported-numpy + cython + numpy setuptools + versioneer wheel ]; buildInputs = [ zlib ] ++ lib.optionals stdenv.cc.isClang [ llvmPackages.openmp ]; dependencies = [ - astunparse + netcdf4 numpy packaging pyparsing @@ -84,6 +86,7 @@ buildPythonPackage rec { # require network access "test_pdb_from_url" "test_1vii_url_and_gz" + "test_3" # fail due to data race "test_read_atomindices_1" diff --git a/pkgs/development/python-modules/migen/default.nix b/pkgs/development/python-modules/migen/default.nix index 830348a68d2a8..8e02b3290a456 100644 --- a/pkgs/development/python-modules/migen/default.nix +++ b/pkgs/development/python-modules/migen/default.nix @@ -10,14 +10,14 @@ buildPythonPackage { pname = "migen"; - version = "0.9.2-unstable-2024-12-25"; + version = "0.9.2-unstable-2025-01-16"; pyproject = true; src = fetchFromGitHub { owner = "m-labs"; repo = "migen"; - rev = "4c2ae8dfeea37f235b52acb8166f12acaaae4f7c"; - hash = "sha256-P4vaF+9iVekRAC2/mc9G7IwI6baBpPAxiDQ8uye4sAs="; + rev = "28e913e7114dae485747ccd8f9fd436ada2195f0"; + hash = "sha256-5Rv7R8OO/CsjdDreo+vCUO7dIrTD+70meV5rIvHOGDk="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/otpauth/default.nix b/pkgs/development/python-modules/otpauth/default.nix new file mode 100644 index 0000000000000..167a69e34b1c8 --- /dev/null +++ b/pkgs/development/python-modules/otpauth/default.nix @@ -0,0 +1,36 @@ +{ + lib, + buildPythonPackage, + pythonOlder, + fetchPypi, + setuptools, + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "otpauth"; + version = "2.1.1"; + + pyproject = true; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-4J7WOgGzWs14t7sPmB/c29HZ2cAb4aPg1wJMZdDnTio="; + }; + + build-system = [ setuptools ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ pname ]; + + meta = with lib; { + description = "Implements one time password of HOTP/TOTP"; + homepage = "https://otp.authlib.org/"; + changelog = "https://github.com/authlib/otpauth/releases/tag/v${version}"; + license = licenses.bsd3; + maintainers = with maintainers; [ erictapen ]; + }; +} diff --git a/pkgs/development/python-modules/parallel-ssh/default.nix b/pkgs/development/python-modules/parallel-ssh/default.nix new file mode 100644 index 0000000000000..107d5548d9cf2 --- /dev/null +++ b/pkgs/development/python-modules/parallel-ssh/default.nix @@ -0,0 +1,46 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + gevent, + ssh-python, + ssh2-python, + unittestCheckHook, +}: + +buildPythonPackage rec { + pname = "parallel-ssh"; + version = "2.13.0"; + + src = fetchFromGitHub { + owner = "ParallelSSH"; + repo = "parallel-ssh"; + tag = version; + hash = "sha256-J/rwlJ9BOcENngIVz5cU+uA34hEEw7QsgsPnpNbbZbk="; + }; + + build-system = [ + setuptools + ]; + + dependencies = [ + gevent + ssh-python + ssh2-python + ]; + + pythonImportsCheck = [ "pssh" ]; + + nativeCheckInputs = [ + unittestCheckHook + ]; + + meta = { + description = "Asynchronous parallel SSH client library"; + homepage = "https://github.com/ParallelSSH/parallel-ssh"; + changelog = "https://github.com/ParallelSSH/parallel-ssh/blob/${version}/Changelog.rst"; + license = lib.licenses.lgpl21Only; + maintainers = with lib.maintainers; [ infinidoge ]; + }; +} diff --git a/pkgs/development/python-modules/pcbnewtransition/default.nix b/pkgs/development/python-modules/pcbnewtransition/default.nix index 79e2ef3d1624a..f5a674d3763d4 100644 --- a/pkgs/development/python-modules/pcbnewtransition/default.nix +++ b/pkgs/development/python-modules/pcbnewtransition/default.nix @@ -8,7 +8,7 @@ }: buildPythonPackage rec { pname = "pcbnewtransition"; - version = "0.4.2"; + version = "0.5.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "pcbnewTransition"; inherit version; - hash = "sha256-fFOzL80m92PcF9SC6NZ69OUuEJn1sl+mWVFjRorhS4M="; + hash = "sha256-4XNcnQzUWpY0NEfS2bdtkedvG4lY79jaPe0QqTWNW6s="; }; propagatedBuildInputs = [ kicad ]; diff --git a/pkgs/development/python-modules/pcffont/default.nix b/pkgs/development/python-modules/pcffont/default.nix index db83e7f9c5e2c..f663f812c826b 100644 --- a/pkgs/development/python-modules/pcffont/default.nix +++ b/pkgs/development/python-modules/pcffont/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pcffont"; - version = "0.0.15"; + version = "0.0.16"; pyproject = true; disabled = pythonOlder "3.10"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "pcffont"; inherit version; - hash = "sha256-sJWopdjZ0vM0BrdBgc6XZsDGFN7/NCCBqrCyYCRhT3M="; + hash = "sha256-erZ9zcXZqBg71subC8U7QA7nwwoh2lQeIzRAkmxBxzg="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/playwrightcapture/default.nix b/pkgs/development/python-modules/playwrightcapture/default.nix index 87466acbb22be..d86427837f0e6 100644 --- a/pkgs/development/python-modules/playwrightcapture/default.nix +++ b/pkgs/development/python-modules/playwrightcapture/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "playwrightcapture"; - version = "1.27.5"; + version = "1.27.6"; pyproject = true; disabled = pythonOlder "3.9"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "Lookyloo"; repo = "PlaywrightCapture"; tag = "v${version}"; - hash = "sha256-TnK7CeW4mJGS77tzYkBQJbLn+niZEMWScpLLaWLmQAA="; + hash = "sha256-Kh4F5dicbVvM9k8T4iMERMuze3Ztawi9LXH7+udtZFU="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/pycm/default.nix b/pkgs/development/python-modules/pycm/default.nix index b560b9705cca8..7d6a114c3451b 100644 --- a/pkgs/development/python-modules/pycm/default.nix +++ b/pkgs/development/python-modules/pycm/default.nix @@ -5,54 +5,55 @@ matplotlib, numpy, pytestCheckHook, - pythonOlder, + pytest-cov-stub, seaborn, + setuptools, }: buildPythonPackage rec { pname = "pycm"; - version = "4.0"; - format = "setuptools"; - - disabled = pythonOlder "3.5"; + version = "4.2"; + pyproject = true; src = fetchFromGitHub { owner = "sepandhaghighi"; repo = pname; tag = "v${version}"; - hash = "sha256-GyH06G7bArFBTzV/Sx/KmoJvcoed0sswW7qGqsSULHo="; + hash = "sha256-oceLARBP9D6NlMQiDvzIpJNNcod5D1O4xo3YzrUstso="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ matplotlib numpy seaborn ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytestCheckHook + pytest-cov-stub + matplotlib + ]; disabledTests = [ - # Minor tolerance issues with Python 3.12; should be fixed in next release - # (see https://github.com/sepandhaghighi/pycm/pull/528) - "verified_test" - "function_test" + "plot_error_test" # broken doctest (expects matplotlib import exception) ]; postPatch = '' # Remove a trivial dependency on the author's `art` Python ASCII art library rm pycm/__main__.py - # Also depends on python3Packages.notebook - rm Otherfiles/notebook_check.py substituteInPlace setup.py \ --replace-fail '=get_requires()' '=[]' ''; pythonImportsCheck = [ "pycm" ]; - meta = with lib; { + meta = { description = "Multiclass confusion matrix library"; homepage = "https://pycm.io"; - license = licenses.mit; - maintainers = with maintainers; [ bcdarwin ]; + changelog = "https://github.com/sepandhaghighi/pycm/releases/tag/${src.tag}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ bcdarwin ]; }; } diff --git a/pkgs/development/python-modules/pycycling/default.nix b/pkgs/development/python-modules/pycycling/default.nix index 6f277cffc8ff4..86f1ddb0b925c 100644 --- a/pkgs/development/python-modules/pycycling/default.nix +++ b/pkgs/development/python-modules/pycycling/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "pycycling"; - version = "0.4.0"; + version = "0.4.1"; src = fetchPypi { inherit pname version; - hash = "sha256-yi3ZcyhhOtHp46MK0R15/dic+b1oYjy4tFVRH3ssbE8="; + hash = "sha256-7vOjkXZ/IrsJ9JyqkbaeNcB59ZyfHQJLit5yPHoBUH4="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pyiskra/default.nix b/pkgs/development/python-modules/pyiskra/default.nix index 0c12f06127927..c52242f8ed5b1 100644 --- a/pkgs/development/python-modules/pyiskra/default.nix +++ b/pkgs/development/python-modules/pyiskra/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "pyiskra"; - version = "0.1.14"; + version = "0.1.15"; pyproject = true; src = fetchFromGitHub { owner = "Iskramis"; repo = "pyiskra"; tag = "v${version}"; - hash = "sha256-OLNUa11UULiW6E8nVy5rUyN7iAD7KdM+R76m2zaDOgc="; + hash = "sha256-LIrhd2gDqa1AehnG0WVQKUNbFTuFkLcHwqNAjFejYk0="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/python-codon-tables/default.nix b/pkgs/development/python-modules/python-codon-tables/default.nix index f5fc127aa471c..ded3d5103f2da 100644 --- a/pkgs/development/python-modules/python-codon-tables/default.nix +++ b/pkgs/development/python-modules/python-codon-tables/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "python-codon-tables"; - version = "0.1.12"; + version = "0.1.13"; format = "setuptools"; src = fetchPypi { pname = "python_codon_tables"; inherit version; - hash = "sha256-pzPoR55nU8ObPv1iIE52qpqD5xGdYLm1uG3nCD6I46Y="; + hash = "sha256-3PQLBgZJjefCOrh+PHbaViy4VwZGR68mkwC58usi51o="; }; # no tests in tarball diff --git a/pkgs/development/python-modules/python-gvm/default.nix b/pkgs/development/python-modules/python-gvm/default.nix index e091431b61f80..78dc4ea0b84a8 100644 --- a/pkgs/development/python-modules/python-gvm/default.nix +++ b/pkgs/development/python-modules/python-gvm/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "python-gvm"; - version = "24.12.0"; + version = "25.1.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "greenbone"; repo = "python-gvm"; tag = "v${version}"; - hash = "sha256-6K9Gv2ycQuCeH5GxtRfpwRqTQxpuqRZC82EvQCFSX4k="; + hash = "sha256-z78JnyAyWqNqFGuauIXitPO0D0WtHicBlD6Jno4G74Y="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/scim2-client/default.nix b/pkgs/development/python-modules/scim2-client/default.nix new file mode 100644 index 0000000000000..4ccad91014133 --- /dev/null +++ b/pkgs/development/python-modules/scim2-client/default.nix @@ -0,0 +1,64 @@ +{ + lib, + buildPythonPackage, + pythonOlder, + fetchPypi, + hatchling, + scim2-models, + pytestCheckHook, + portpicker, + pytest-httpserver, + pytest-asyncio, + scim2-server, + httpx, + werkzeug, +}: + +buildPythonPackage rec { + pname = "scim2-client"; + version = "0.5.1"; + + pyproject = true; + + disabled = pythonOlder "3.9"; + + src = fetchPypi { + inherit version; + pname = "scim2_client"; + hash = "sha256-g2RR+Ruvjw88cGHcwEPoktTmB8VcWAPnea3BErS8JyI="; + }; + + build-system = [ hatchling ]; + + dependencies = [ scim2-models ]; + + nativeCheckInputs = [ + pytestCheckHook + portpicker + pytest-httpserver + pytest-asyncio + scim2-server + werkzeug + ] ++ optional-dependencies.httpx; + + # Werkzeug returns 500, didn't deem it worth it to investigate + disabledTests = [ + "test_search_request" + "test_query_dont_check_request_payload" + ]; + + pythonImportsCheck = [ "scim2_client" ]; + + optional-dependencies = { + httpx = [ httpx ]; + werkzeug = [ werkzeug ]; + }; + + meta = with lib; { + description = "Pythonically build SCIM requests and parse SCIM responses"; + homepage = "https://scim2-client.readthedocs.io/"; + changelog = "https://github.com/python-scim/scim2-client/releases/tag/${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ erictapen ]; + }; +} diff --git a/pkgs/development/python-modules/scim2-models/default.nix b/pkgs/development/python-modules/scim2-models/default.nix new file mode 100644 index 0000000000000..ada6c553129d2 --- /dev/null +++ b/pkgs/development/python-modules/scim2-models/default.nix @@ -0,0 +1,40 @@ +{ + lib, + buildPythonPackage, + pythonOlder, + fetchPypi, + hatchling, + pydantic, + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "scim2-models"; + version = "0.3.0"; + + pyproject = true; + + disabled = pythonOlder "3.9"; + + src = fetchPypi { + inherit version; + pname = "scim2_models"; + hash = "sha256-odtiOF54IOZ8lP11gkaBU5frOzvRvKeXoqPvNG6B2Cc="; + }; + + build-system = [ hatchling ]; + + dependencies = [ pydantic ] ++ pydantic.optional-dependencies.email; + + nativeCheckInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "scim2_models" ]; + + meta = with lib; { + description = "SCIM2 models serialization and validation with pydantic"; + homepage = "https://github.com/python-scim/scim2-models"; + changelog = "https://github.com/python-scim/scim2-models/releases/tag/${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ erictapen ]; + }; +} diff --git a/pkgs/development/python-modules/scim2-server/default.nix b/pkgs/development/python-modules/scim2-server/default.nix new file mode 100644 index 0000000000000..bd0bac6a1ddd7 --- /dev/null +++ b/pkgs/development/python-modules/scim2-server/default.nix @@ -0,0 +1,49 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + hatchling, + scim2-filter-parser, + scim2-models, + werkzeug, + pytestCheckHook, + httpx, + time-machine, +}: + +buildPythonPackage rec { + pname = "scim2-server"; + version = "0.1.2"; + + pyproject = true; + + src = fetchPypi { + inherit version; + pname = "scim2_server"; + hash = "sha256-6MHQVo0vqJ/69iBz3GtH1f2YO/Vh/MORSkEETwy/9pE="; + }; + + build-system = [ hatchling ]; + + dependencies = [ + scim2-filter-parser + scim2-models + werkzeug + ]; + + nativeCheckInputs = [ + pytestCheckHook + httpx + time-machine + ]; + + pythonImportsCheck = [ "scim2_server" ]; + + meta = with lib; { + description = "Lightweight SCIM2 server prototype"; + homepage = "https://github.com/python-scim/scim2-server"; + changelog = "https://github.com/python-scim/scim2-server/releases/tag/${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ erictapen ]; + }; +} diff --git a/pkgs/development/python-modules/scim2-tester/default.nix b/pkgs/development/python-modules/scim2-tester/default.nix new file mode 100644 index 0000000000000..2125a7706e868 --- /dev/null +++ b/pkgs/development/python-modules/scim2-tester/default.nix @@ -0,0 +1,50 @@ +{ + lib, + buildPythonPackage, + pythonOlder, + fetchPypi, + hatchling, + scim2-client, + pytestCheckHook, + werkzeug, + scim2-server, + pytest-httpserver, +}: + +buildPythonPackage rec { + pname = "scim2-tester"; + version = "0.1.13"; + + pyproject = true; + + disabled = pythonOlder "3.10"; + + src = fetchPypi { + inherit version; + pname = "scim2_tester"; + hash = "sha256-Jpfxyok46fRCW3aAOFb0BTEI++Ou5lob/0RsoXgzkxk="; + }; + + build-system = [ hatchling ]; + + dependencies = [ scim2-client ]; + + nativeCheckInputs = [ + pytestCheckHook + werkzeug + scim2-server + pytest-httpserver + ] ++ optional-dependencies.httpx; + + pythonImportsCheck = [ "scim2_tester" ]; + + optional-dependencies.httpx = scim2-client.optional-dependencies.httpx; + + meta = with lib; { + description = "SCIM RFCs server compliance checker"; + homepage = "https://scim2-tester.readthedocs.io/"; + changelog = "https://github.com/python-scim/scim2-tester/releases/tag/${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ erictapen ]; + }; +} diff --git a/pkgs/development/python-modules/scrap-engine/default.nix b/pkgs/development/python-modules/scrap-engine/default.nix index 0a8c9fed90e89..2583c637f7a82 100644 --- a/pkgs/development/python-modules/scrap-engine/default.nix +++ b/pkgs/development/python-modules/scrap-engine/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "scrap-engine"; - version = "1.4.1"; + version = "1.4.2"; pyproject = true; src = fetchPypi { pname = "scrap_engine"; inherit version; - hash = "sha256-qxzbVYFcSKcL2HtMlH9epO/sCx9HckWAt/NyVD8QJBQ="; + hash = "sha256-9jiStwFD5vhPSxWsEVmHOvfRgNgVOUvlzAa1Rmf+faE="; }; build-system = [ diff --git a/pkgs/development/python-modules/skops/default.nix b/pkgs/development/python-modules/skops/default.nix index 8cee781bcc406..908596bee25eb 100644 --- a/pkgs/development/python-modules/skops/default.nix +++ b/pkgs/development/python-modules/skops/default.nix @@ -3,7 +3,7 @@ buildPythonPackage, fetchFromGitHub, pythonOlder, - setuptools, + hatchling, pytestCheckHook, pytest-cov-stub, huggingface-hub, @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "skops"; - version = "0.10"; + version = "0.11.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -26,10 +26,10 @@ buildPythonPackage rec { owner = "skops-dev"; repo = "skops"; tag = "v${version}"; - hash = "sha256-2uX5sGVdTnZEbl0VXI8E7h1pQYQVbpQeUKUchCZpgg4="; + hash = "sha256-23Wy/VSd/CvpqT/zDX4ApplfsUwbjOj9q+T8YCKs8X4="; }; - build-system = [ setuptools ]; + build-system = [ hatchling ]; dependencies = [ huggingface-hub diff --git a/pkgs/development/python-modules/spectra/default.nix b/pkgs/development/python-modules/spectra/default.nix new file mode 100644 index 0000000000000..f07c17a3bd165 --- /dev/null +++ b/pkgs/development/python-modules/spectra/default.nix @@ -0,0 +1,49 @@ +{ + buildPythonPackage, + colormath, + fetchFromGitHub, + fetchpatch2, + lib, + pytestCheckHook, + setuptools, +}: + +buildPythonPackage rec { + pname = "spectra"; + version = "0.0.11"; + pyproject = true; + + src = fetchFromGitHub { + owner = "jsvine"; + repo = "spectra"; + tag = "v${version}"; + hash = "sha256-4A2TWTxYqckJ3DX5cd2KN3KXcmO/lQdXmOEnGi76RsA="; + }; + + patches = [ + # https://github.com/jsvine/spectra/pull/21 + (fetchpatch2 { + name = "nose-to-pytest.patch"; + url = "https://github.com/jsvine/spectra/commit/50037aba16dac4bf0fb7ffbd787d0e6b906e8a4b.patch"; + hash = "sha256-cMoIbjRwcZjvhiIOcJR7NmIAOaqpr/e5eh9+sPGKqos="; + excludes = [ ".github/*" ]; + }) + ]; + + build-system = [ + setuptools + ]; + + propagatedBuildInputs = [ colormath ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + meta = { + description = "Python library that makes color math, color scales, and color-space conversion easy"; + homepage = "https://github.com/jsvine/spectra"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ apraga ]; + }; +} diff --git a/pkgs/development/python-modules/ssh-python/default.nix b/pkgs/development/python-modules/ssh-python/default.nix new file mode 100644 index 0000000000000..eac4194a0871b --- /dev/null +++ b/pkgs/development/python-modules/ssh-python/default.nix @@ -0,0 +1,46 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + cython, + openssl, + zlib, + libssh, +}: + +buildPythonPackage rec { + pname = "ssh-python"; + version = "1.1.1"; + + src = fetchFromGitHub { + owner = "ParallelSSH"; + repo = "ssh-python"; + tag = version; + hash = "sha256-kidz4uHT5C8TUROLGQUHihemYtwOoWZQNw7ElbwYKLM="; + }; + + build-system = [ setuptools ]; + nativeBuildInputs = [ + cython + ]; + buildInputs = [ + openssl + zlib + libssh + ]; + + env = { + SYSTEM_LIBSSH = true; + }; + + pythonImportsCheck = [ "ssh" ]; + + meta = { + description = "Python bindings for libssh C library"; + homepage = "https://github.com/ParallelSSH/ssh-python"; + changelog = "https://github.com/ParallelSSH/ssh-python/blob/${version}/Changelog.rst"; + license = lib.licenses.lgpl21Only; + maintainers = with lib.maintainers; [ infinidoge ]; + }; +} diff --git a/pkgs/development/python-modules/ssh2-python/default.nix b/pkgs/development/python-modules/ssh2-python/default.nix new file mode 100644 index 0000000000000..275e0250810e0 --- /dev/null +++ b/pkgs/development/python-modules/ssh2-python/default.nix @@ -0,0 +1,46 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + cython, + openssl, + zlib, + libssh2, +}: + +buildPythonPackage rec { + pname = "ssh2-python"; + version = "1.1.2"; + + src = fetchFromGitHub { + owner = "ParallelSSH"; + repo = "ssh2-python"; + tag = version; + hash = "sha256-nNMe7BTHI4O9Ueyq2YxtHat4BrrtiWGFkKHwUu/NtkM="; + }; + + build-system = [ setuptools ]; + nativeBuildInputs = [ + cython + ]; + buildInputs = [ + openssl + zlib + libssh2 + ]; + + env = { + SYSTEM_LIBSSH2 = true; + }; + + pythonImportsCheck = [ "ssh2" ]; + + meta = { + description = "Python bindings for libssh2 C library"; + homepage = "https://github.com/ParallelSSH/ssh2-python"; + changelog = "https://github.com/ParallelSSH/ssh2-python/blob/${version}/Changelog.rst"; + license = lib.licenses.lgpl21Only; + maintainers = with lib.maintainers; [ infinidoge ]; + }; +} diff --git a/pkgs/development/python-modules/stable-baselines3/default.nix b/pkgs/development/python-modules/stable-baselines3/default.nix index a9d784707886f..0cca87dd98572 100644 --- a/pkgs/development/python-modules/stable-baselines3/default.nix +++ b/pkgs/development/python-modules/stable-baselines3/default.nix @@ -22,16 +22,14 @@ }: buildPythonPackage rec { pname = "stable-baselines3"; - # TODO: To this date, the latest release (2.4.1) is not compatible with numpy 2 and does not build - # successfully on nixpkgs - version = "2.4.1-unstable-2025-01-07"; + version = "2.5.0"; pyproject = true; src = fetchFromGitHub { owner = "DLR-RM"; repo = "stable-baselines3"; - rev = "b7c64a1aa4dd2fd3efed96e7a9ddb4d1f5c96112"; - hash = "sha256-oyTOBRZsKkhhGKwwBN9HCV0t8+MkJYpWsTRdS+upMeI="; + tag = "v${version}"; + hash = "sha256-4KOF/3/PxHHSo95zaqtPy5+h53VcUsMhSx85tGvXV2o="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/torch/default.nix b/pkgs/development/python-modules/torch/default.nix index 26c1e15207a59..e43e28fe42a40 100644 --- a/pkgs/development/python-modules/torch/default.nix +++ b/pkgs/development/python-modules/torch/default.nix @@ -232,8 +232,8 @@ let domain = "codeberg.org"; owner = "gm6k"; repo = "git-unroll"; - rev = "96bf24f2af153310ec59979c123a8cefda8636db"; - hash = "sha256-BTlq2Pm4l/oypBzKKpxExVPyQ0CcAP8llUnl/fd3DUU="; + rev = "9243bb8a6a9f6875e21a5c64320b66f7fdaf9b3f"; + hash = "sha256-1MjbB1EVgmU0HlUibrKOkjmxQ8wseocSJENiAqyHcjU="; }; unroll-src = writeShellScript "unroll-src" '' diff --git a/pkgs/development/python-modules/triton/default.nix b/pkgs/development/python-modules/triton/default.nix index 69ddb4ad716cb..2f8dcecc023ab 100644 --- a/pkgs/development/python-modules/triton/default.nix +++ b/pkgs/development/python-modules/triton/default.nix @@ -17,7 +17,7 @@ python, pytestCheckHook, stdenv, - substituteAll, + replaceVars, setuptools, torchWithRocm, zlib, @@ -43,28 +43,20 @@ buildPythonPackage { patches = [ ./0001-setup.py-introduce-TRITON_OFFLINE_BUILD.patch - (substituteAll { - src = ./0001-_build-allow-extra-cc-flags.patch; + (replaceVars ./0001-_build-allow-extra-cc-flags.patch { ccCmdExtraFlags = "-Wl,-rpath,${addDriverRunpath.driverLink}/lib"; }) - (substituteAll ( - { - src = ./0002-nvidia-amd-driver-short-circuit-before-ldconfig.patch; - } - // lib.optionalAttrs rocmSupport { libhipDir = "${lib.getLib rocmPackages.clr}/lib"; } - // lib.optionalAttrs cudaSupport { - libcudaStubsDir = "${lib.getOutput "stubs" cudaPackages.cuda_cudart}/lib/stubs"; - ccCmdExtraFlags = "-Wl,-rpath,${addDriverRunpath.driverLink}/lib"; - } - )) + (replaceVars ./0002-nvidia-amd-driver-short-circuit-before-ldconfig.patch { + libhipDir = if rocmSupport then "${lib.getLib rocmPackages.clr}/lib" else null; + libcudaStubsDir = + if cudaSupport then "${lib.getOutput "stubs" cudaPackages.cuda_cudart}/lib/stubs" else null; + }) ] ++ lib.optionals cudaSupport [ - (substituteAll { - src = ./0003-nvidia-cudart-a-systempath.patch; + (replaceVars ./0003-nvidia-cudart-a-systempath.patch { cudaToolkitIncludeDirs = "${lib.getInclude cudaPackages.cuda_cudart}/include"; }) - (substituteAll { - src = ./0004-nvidia-allow-static-ptxas-path.patch; + (replaceVars ./0004-nvidia-allow-static-ptxas-path.patch { nixpkgsExtraBinaryPaths = lib.escapeShellArgs [ (lib.getExe' cudaPackages.cuda_nvcc "ptxas") ]; }) ]; diff --git a/pkgs/development/python-modules/typst/default.nix b/pkgs/development/python-modules/typst/default.nix index 3c0d3422883bc..39cf7728077cf 100644 --- a/pkgs/development/python-modules/typst/default.nix +++ b/pkgs/development/python-modules/typst/default.nix @@ -25,10 +25,10 @@ buildPythonPackage rec { hash = "sha256-VgQbMeyvXjzE8jSaGLygIy8EhR23MpqjlU68FsBZq6E="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "${pname}-${version}"; - hash = "sha256-H7lKoSDSx0cGH+VsIX90KaiWJw1h/BokNdKzxmvm6XQ="; + hash = "sha256-OHJQlGwgaQ2ELWvjaA8qsuXOQGSdgirK/yTff7POOmE="; }; build-system = [ diff --git a/pkgs/development/python-modules/unstructured/default.nix b/pkgs/development/python-modules/unstructured/default.nix index e9eed5709877e..eac7e5e042246 100644 --- a/pkgs/development/python-modules/unstructured/default.nix +++ b/pkgs/development/python-modules/unstructured/default.nix @@ -113,7 +113,7 @@ grpcio, }: let - version = "0.16.13"; + version = "0.16.15"; in buildPythonPackage { pname = "unstructured"; @@ -124,7 +124,7 @@ buildPythonPackage { owner = "Unstructured-IO"; repo = "unstructured"; tag = version; - hash = "sha256-VVgSrXqfWEOjZAU54rGBW3m4FxZKJDmbFsWdgjiqMSs="; + hash = "sha256-Wp51LOgM/zE81324Qzu83XGupUMAzz2wn+COmNq95H8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/wadler-lindig/default.nix b/pkgs/development/python-modules/wadler-lindig/default.nix new file mode 100644 index 0000000000000..7011c0a9ef16b --- /dev/null +++ b/pkgs/development/python-modules/wadler-lindig/default.nix @@ -0,0 +1,46 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + + # build-system + hatchling, + + # tests + numpy, + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "wadler-lindig"; + version = "0.1.3"; + pyproject = true; + + src = fetchFromGitHub { + owner = "patrick-kidger"; + repo = "wadler_lindig"; + rev = "v${version}"; + hash = "sha256-akb1x9UYbfEwnVS6ahpb42XnEl3y7kk3WkhwD8p7AA4="; + }; + + build-system = [ + hatchling + ]; + + pythonImportsCheck = [ + "wadler_lindig" + ]; + + nativeCheckInputs = [ + numpy + pytestCheckHook + ]; + + meta = { + description = "A Wadler--Lindig pretty printer for Python"; + homepage = "https://github.com/patrick-kidger/wadler_lindig"; + changelog = "https://github.com/patrick-kidger/wadler_lindig/releases/tag/v${version}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ GaetanLepage ]; + }; +} diff --git a/pkgs/development/python-modules/wasmer/default.nix b/pkgs/development/python-modules/wasmer/default.nix index c903ede48d27b..5ea52995d3315 100644 --- a/pkgs/development/python-modules/wasmer/default.nix +++ b/pkgs/development/python-modules/wasmer/default.nix @@ -37,10 +37,10 @@ let hash = "sha256-Iu28LMDNmtL2r7gJV5Vbb8HZj18dlkHe+mw/Y1L8YKE="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "${pname}-${version}"; - sha256 = cargoHash; + hash = cargoHash; }; nativeBuildInputs = @@ -87,19 +87,19 @@ in wasmer = common { pname = "wasmer"; buildAndTestSubdir = "packages/api"; - cargoHash = "sha256-HKbVss6jGFdnCgXV3UYf6RxtmQM3+tq3cHfOSKw5JnY="; + cargoHash = "sha256-oHyjzEqv88e2CHhWhKjUh6K0UflT9Y1JD//3oiE/UBQ="; }; wasmer-compiler-cranelift = common { pname = "wasmer-compiler-cranelift"; buildAndTestSubdir = "packages/compiler-cranelift"; - cargoHash = "sha256-BTBkoTluK7IVS+TpbQnMjn2Wvwhfxv1ev5PZWS/kW0w="; + cargoHash = "sha256-oHyjzEqv88e2CHhWhKjUh6K0UflT9Y1JD//3oiE/UBQ="; }; wasmer-compiler-llvm = common { pname = "wasmer-compiler-llvm"; buildAndTestSubdir = "packages/compiler-llvm"; - cargoHash = "sha256-AfLp4RLfnJ3R1Wg+RCJRmYr7748LQtl1W+ttTgIMls4="; + cargoHash = "sha256-oHyjzEqv88e2CHhWhKjUh6K0UflT9Y1JD//3oiE/UBQ="; extraNativeBuildInputs = [ llvm_14 ]; extraBuildInputs = [ libffi @@ -112,6 +112,6 @@ in wasmer-compiler-singlepass = common { pname = "wasmer-compiler-singlepass"; buildAndTestSubdir = "packages/compiler-singlepass"; - cargoHash = "sha256-4DoeKRjS/2ijpUva0p/AE3qoIyt8CvCjkPWFPyLH6gs="; + cargoHash = "sha256-oHyjzEqv88e2CHhWhKjUh6K0UflT9Y1JD//3oiE/UBQ="; }; } diff --git a/pkgs/development/python-modules/whey-pth/default.nix b/pkgs/development/python-modules/whey-pth/default.nix index c40292ede641f..a389860d1e2d6 100644 --- a/pkgs/development/python-modules/whey-pth/default.nix +++ b/pkgs/development/python-modules/whey-pth/default.nix @@ -1,21 +1,30 @@ { buildPythonPackage, - fetchPypi, + fetchFromGitHub, lib, setuptools, dom-toml, whey, + pytestCheckHook, }: + buildPythonPackage rec { pname = "whey-pth"; version = "0.0.6"; pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-CIpgqzNXW3VpS+k6BCpc2DNyqwgt/Af3ms59AH/V5KM="; + src = fetchFromGitHub { + owner = "repo-helper"; + repo = "whey-pth"; + tag = "v${version}"; + hash = "sha256-A+bXB9F8FD+A1iRuETIxP12bkH/5NKcx01ERXJZAj+Q="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail 'setuptools!=61.*,<=67.1.0,>=40.6.0' setuptools + ''; + build-system = [ setuptools ]; dependencies = [ @@ -23,14 +32,18 @@ buildPythonPackage rec { whey ]; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace-fail '"setuptools!=61.*,<=67.1.0,>=40.6.0"' '"setuptools"' - ''; + pythonImportsCheck = [ "whey_pth" ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + # missing dependency coincidence + doCheck = false; meta = { - description = "Extension to whey to support .pth files."; - homepage = "https://pypi.org/project/whey-pth"; + description = "Extension to whey to support .pth files"; + homepage = "https://github.com/repo-helper/whey-pth"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ tyberius-prime ]; }; diff --git a/pkgs/development/python-modules/whey/default.nix b/pkgs/development/python-modules/whey/default.nix index 7c1aaec13e6c6..61ef34e74ad66 100644 --- a/pkgs/development/python-modules/whey/default.nix +++ b/pkgs/development/python-modules/whey/default.nix @@ -1,30 +1,41 @@ { buildPythonPackage, - fetchPypi, + fetchFromGitHub, lib, setuptools, attrs, click, consolekit, dist-meta, + docutils, dom-toml, domdf-python-tools, + editables, handy-archives, natsort, packaging, pyproject-parser, + pytestCheckHook, shippinglabel, }: + buildPythonPackage rec { pname = "whey"; version = "0.1.1"; pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-l72fjczuuDXg/cDiqJ7roNVm4X+au+1u4AA8Szs1bNo="; + src = fetchFromGitHub { + owner = "repo-helper"; + repo = "whey"; + tag = "v${version}"; + hash = "sha256-s2jZmuFj0gTWVTcXWcBhcu5RBuaf/qMS/xzIpIoG1ZE="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail 'setuptools!=61.*,<=67.1.0,>=40.6.0' setuptools + ''; + build-system = [ setuptools ]; dependencies = [ @@ -41,14 +52,29 @@ buildPythonPackage rec { shippinglabel ]; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace-fail '"setuptools!=61.*,<=67.1.0,>=40.6.0"' '"setuptools"' - ''; + pythonImportsCheck = [ "whey" ]; + + optional-dependencies = { + all = lib.flatten (lib.attrValues (lib.filterAttrs (n: v: n != "all") optional-dependencies)); + editable = [ + editables + ]; + readme = [ + docutils + pyproject-parser + ] ++ pyproject-parser.optional-dependencies.readme; + }; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + # missing dependency pyproject-examples + doCheck = false; meta = { - description = "A simple Python wheel builder for simple projects."; - homepage = "https://pypi.org/project/whey"; + description = "Simple Python wheel builder for simple projects"; + homepage = "https://github.com/repo-helper/whey"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ tyberius-prime ]; }; diff --git a/pkgs/development/python-modules/zxcvbn-rs-py/default.nix b/pkgs/development/python-modules/zxcvbn-rs-py/default.nix index dcfc2f8d66408..fd636b09b9c84 100644 --- a/pkgs/development/python-modules/zxcvbn-rs-py/default.nix +++ b/pkgs/development/python-modules/zxcvbn-rs-py/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "zxcvbn-rs-py"; - version = "0.1.1"; + version = "0.2.0"; pyproject = true; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "zxcvbn_rs_py"; inherit version; - hash = "sha256-7EZJ/WGekfsnisqTs9dwwbQia6OlDEx3MR9mkqSI+gA="; + hash = "sha256-DQzdOngHGZma2NyfrNuMppG6GzpGoKfwVQGUVmN7erA="; }; build-system = [ @@ -29,7 +29,7 @@ buildPythonPackage rec { cargoDeps = rustPlatform.fetchCargoTarball { name = "${pname}-${version}"; inherit src; - hash = "sha256-OA6iyojBMAG9GtjHaIQ9cM0SEMwMa2bKFRIXmqp4OBE="; + hash = "sha256-tb0puFu4T3KW75U7GXjYzjH72diH/tboSwmpnkGwG0k="; }; pythonImportsCheck = [ "zxcvbn_rs_py" ]; diff --git a/pkgs/development/rocm-modules/5/llvm/stage-2/1000-libcxx-failing-tests.list b/pkgs/development/rocm-modules/5/llvm/stage-2/1000-libcxx-failing-tests.list index d5e1f675079fa..a70c98d4e4732 100644 --- a/pkgs/development/rocm-modules/5/llvm/stage-2/1000-libcxx-failing-tests.list +++ b/pkgs/development/rocm-modules/5/llvm/stage-2/1000-libcxx-failing-tests.list @@ -173,3 +173,4 @@ ../libcxx/test/std/language.support/support.dynamic/new.delete/new.delete.array/sized_delete_array14.pass.cpp ../libcxx/test/std/language.support/support.dynamic/new.delete/new.delete.single/sized_delete14.pass.cpp ../libcxx/test/libcxx/selftest/sh.cpp/empty.sh.cpp +../libcxx/test/libcxx/transitive_includes.sh.cpp diff --git a/pkgs/development/rocm-modules/5/tensile/default.nix b/pkgs/development/rocm-modules/5/tensile/default.nix index bb8db155c42a3..262939c0ae67f 100644 --- a/pkgs/development/rocm-modules/5/tensile/default.nix +++ b/pkgs/development/rocm-modules/5/tensile/default.nix @@ -12,6 +12,7 @@ joblib, filelock, rocminfo, + writeText, }: buildPythonPackage rec { @@ -47,6 +48,12 @@ buildPythonPackage rec { export ROCM_PATH=${rocminfo} ''; + # TODO: remove this workaround once https://github.com/NixOS/nixpkgs/pull/323869 + # does not cause issues anymore, or at least replace it with a better workaround + setupHook = writeText "setup-hook" '' + export TENSILE_ROCM_ASSEMBLER_PATH="${stdenv.cc.cc}/bin/clang++"; + ''; + pythonImportsCheck = [ "Tensile" ]; passthru.updateScript = rocmUpdateScript { diff --git a/pkgs/development/rocm-modules/6/tensile/default.nix b/pkgs/development/rocm-modules/6/tensile/default.nix index 0a1f4d60ea5ea..e2a892b343088 100644 --- a/pkgs/development/rocm-modules/6/tensile/default.nix +++ b/pkgs/development/rocm-modules/6/tensile/default.nix @@ -13,6 +13,7 @@ joblib, filelock, rocminfo, + writeText, }: buildPythonPackage rec { @@ -61,6 +62,12 @@ buildPythonPackage rec { ROCM_PATH = rocminfo; }; + # TODO: remove this workaround once https://github.com/NixOS/nixpkgs/pull/323869 + # does not cause issues anymore, or at least replace it with a better workaround + setupHook = writeText "setup-hook" '' + export TENSILE_ROCM_ASSEMBLER_PATH="${stdenv.cc.cc}/bin/clang++"; + ''; + pythonImportsCheck = [ "Tensile" ]; passthru.updateScript = rocmUpdateScript { diff --git a/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix b/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix index 9e631be1be0ec..9e5d4f009b327 100644 --- a/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix +++ b/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-7RSwRKLfNEZQczMriaeXH8uMMqR5Drdmtc68RCO2xTA="; }; - cargoHash = "sha256-O7AhHkL59/B6cbjfyeWbbevJHxOLcQfNQ3mbLAnQwQk="; + useFetchCargoVendor = true; + cargoHash = "sha256-z89LPoXsJKoKm+Aqi7PHtRn4iI77hAJQPVjKWNTgm8U="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix index a385558463626..1db3881940071 100644 --- a/pkgs/development/tools/build-managers/gradle/default.nix +++ b/pkgs/development/tools/build-managers/gradle/default.nix @@ -48,6 +48,7 @@ rec { runCommand, writeText, autoPatchelfHook, + buildPackages, # The JDK/JRE used for running Gradle. java ? defaultJava, @@ -78,7 +79,6 @@ rec { ]; buildInputs = [ - java stdenv.cc.cc ncurses5 ncurses6 @@ -123,6 +123,8 @@ rec { newFileEvents = toString (lib.versionAtLeast version "8.12"); in '' + # get the correct jar executable for cross + export PATH="${buildPackages.jdk}/bin:$PATH" . ${./patching.sh} nativeVersion="$(extractVersion native-platform $out/lib/gradle/lib/native-platform-*.jar)" @@ -244,7 +246,7 @@ rec { lib, callPackage, mitm-cache, - substituteAll, + replaceVars, symlinkJoin, concatTextFile, makeSetupHook, @@ -264,11 +266,10 @@ rec { name = "setup-hook.sh"; files = [ (mitm-cache.setupHook) - (substituteAll { - src = ./setup-hook.sh; + (replaceVars ./setup-hook.sh { # jdk used for keytool inherit (gradle) jdk; - init_script = ./init-build.gradle; + init_script = "${./init-build.gradle}"; }) ]; })) diff --git a/pkgs/development/tools/flatpak-builder/default.nix b/pkgs/development/tools/flatpak-builder/default.nix index 7bbeee4a15363..5c02e5e194e9c 100644 --- a/pkgs/development/tools/flatpak-builder/default.nix +++ b/pkgs/development/tools/flatpak-builder/default.nix @@ -2,7 +2,7 @@ lib, stdenv, fetchurl, - substituteAll, + replaceVars, nixosTests, docbook_xml_dtd_45, @@ -65,8 +65,7 @@ stdenv.mkDerivation (finalAttrs: { ./respect-xml-catalog-files-var.patch # Hardcode paths - (substituteAll { - src = ./fix-paths.patch; + (replaceVars ./fix-paths.patch { brz = "${breezy}/bin/brz"; cp = "${coreutils}/bin/cp"; patch = "${patch}/bin/patch"; @@ -81,8 +80,7 @@ stdenv.mkDerivation (finalAttrs: { euelfcompress = "${elfutils}/bin/eu-elfcompress"; }) - (substituteAll { - src = ./fix-test-paths.patch; + (replaceVars ./fix-test-paths.patch { inherit glibcLocales; }) ./fix-test-prefix.patch diff --git a/pkgs/development/tools/flatpak-builder/fix-test-paths.patch b/pkgs/development/tools/flatpak-builder/fix-test-paths.patch index 96212a30fcf8c..d107ef738d036 100644 --- a/pkgs/development/tools/flatpak-builder/fix-test-paths.patch +++ b/pkgs/development/tools/flatpak-builder/fix-test-paths.patch @@ -5,7 +5,7 @@ skip_without_python2 () { - if ! test -f /usr/bin/python2 || ! /usr/bin/python2 -c "import sys; sys.exit(0 if sys.version_info >= (2, 7) else 1)" ; then -+ if ! test -f @python2@/bin/python2 || ! @python2@/bin/python2 -c "import sys; sys.exit(0 if sys.version_info >= (2, 7) else 1)" ; then ++ if true ; then echo "1..0 # SKIP this test requires /usr/bin/python2 (2.7) support" exit 0 fi diff --git a/pkgs/development/tools/gauge/default.nix b/pkgs/development/tools/gauge/default.nix index 841cd521057b2..414edd86d0fce 100644 --- a/pkgs/development/tools/gauge/default.nix +++ b/pkgs/development/tools/gauge/default.nix @@ -6,7 +6,7 @@ buildGoModule rec { pname = "gauge"; - version = "1.6.11"; + version = "1.6.12"; patches = [ # adds a check which adds an error message when trying to @@ -18,10 +18,10 @@ buildGoModule rec { owner = "getgauge"; repo = "gauge"; rev = "v${version}"; - hash = "sha256-4Fjh2wVl5k01YH1bNW8tAn6J44cWvwUnBqu2dE63wKY="; + hash = "sha256-CstlH7KOSUK3Oe5d8LyUswcebwusVv5iuB7gaZOKpVg="; }; - vendorHash = "sha256-xxWcniT9aaLw3rX7uHTRmIVw4BVR1MDIpvF21pfMtDk="; + vendorHash = "sha256-nqyzNbD2j6b34QpFiv2yVxEVkrZkuzcwAt9uqAB2iA4="; excludedPackages = [ "build" diff --git a/pkgs/development/tools/language-servers/nixd/default.nix b/pkgs/development/tools/language-servers/nixd/default.nix index 59ff96a3f42f1..ab873f618f22f 100644 --- a/pkgs/development/tools/language-servers/nixd/default.nix +++ b/pkgs/development/tools/language-servers/nixd/default.nix @@ -21,13 +21,13 @@ let common = rec { - version = "2.5.1"; + version = "2.6.0"; src = fetchFromGitHub { owner = "nix-community"; repo = "nixd"; rev = version; - hash = "sha256-5+ul4PxMgPkmGLB8CYpJcIcRDY/pJgByvjIHDA1Gs5A="; + hash = "sha256-gYC7nbZsTDOA1cJIw9JRjwjgkvSzrlQonGTT21EZeWM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/marksman/default.nix b/pkgs/development/tools/marksman/default.nix index 73404de176247..444b35a6ee94a 100644 --- a/pkgs/development/tools/marksman/default.nix +++ b/pkgs/development/tools/marksman/default.nix @@ -28,7 +28,7 @@ buildDotnetModule rec { nugetDeps = ./deps.json; - dotnet-sdk = dotnetCorePackages.sdk_8_0; + dotnet-sdk = dotnetCorePackages.sdk_8_0_4xx-bin; dotnet-runtime = dotnetCorePackages.runtime_8_0; postInstall = '' diff --git a/pkgs/development/tools/misc/fswatch/default.nix b/pkgs/development/tools/misc/fswatch/default.nix index 814838532766c..bf6fcf41cef14 100644 --- a/pkgs/development/tools/misc/fswatch/default.nix +++ b/pkgs/development/tools/misc/fswatch/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "fswatch"; - version = "1.18.0"; + version = "1.18.2"; src = fetchFromGitHub { owner = "emcrisostomo"; repo = "fswatch"; rev = version; - sha256 = "sha256-n9EDEF5swC7UyvC0cd+U/u4Wd050Jf9h2AVtEVbUICA="; + sha256 = "sha256-u9+sayp0U6TudffGP2Bb2PbbSMjUHCb6gGBq3jKQ3EQ="; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/misc/texlab/default.nix b/pkgs/development/tools/misc/texlab/default.nix index 0e1b70d28b400..3e236dd0d018b 100644 --- a/pkgs/development/tools/misc/texlab/default.nix +++ b/pkgs/development/tools/misc/texlab/default.nix @@ -16,16 +16,16 @@ let in rustPlatform.buildRustPackage rec { pname = "texlab"; - version = "5.22.0"; + version = "5.22.1"; src = fetchFromGitHub { owner = "latex-lsp"; repo = "texlab"; tag = "v${version}"; - hash = "sha256-3yMfacncGTqm07OmbNdj2gmkHnagN3urQFb7lCSxegg="; + hash = "sha256-ldbWENQa7ZiBSx1b1JgChIgadqzHEPvUyOdHVgW6MSU="; }; - cargoHash = "sha256-LLRZ0UdExttpOMFwiTQ7IHrpmXYE2mvXvE0LfQ8/4KA="; + cargoHash = "sha256-HMTo0RSjiNpB9V/9LS2jm/JJGsO2hpJ4kSl70+fjWH0="; outputs = [ "out" ] ++ lib.optional (!isCross) "man"; diff --git a/pkgs/development/tools/rbspy/default.nix b/pkgs/development/tools/rbspy/default.nix index 4a61021a00ca1..b27c65b2fd175 100644 --- a/pkgs/development/tools/rbspy/default.nix +++ b/pkgs/development/tools/rbspy/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "rbspy"; - version = "0.28.0"; + version = "0.29.0"; src = fetchFromGitHub { owner = "rbspy"; repo = "rbspy"; tag = "v${version}"; - hash = "sha256-6tCTrplzoiimKvXEIXd2gUOXzcZ/eQ22npBqbVv0Nv0="; + hash = "sha256-KEF98h51F4sZ/eX08hggabnBji/8e/yJTP1VNzuLOlw="; }; - cargoHash = "sha256-J+3v7O38+MhCoq1UKf0Sqaomw/SSu+JK3sWWv9rB6FI="; + cargoHash = "sha256-qC/D3Nt+dEH6gDEHaOCc5Gt8Qe2nWG5fGq81y188bYY="; # error: linker `aarch64-linux-gnu-gcc` not found postPatch = '' diff --git a/pkgs/development/tools/rebazel/default.nix b/pkgs/development/tools/rebazel/default.nix deleted file mode 100644 index 33592b76e8536..0000000000000 --- a/pkgs/development/tools/rebazel/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ - lib, - stdenv, - rustPlatform, - fetchFromGitHub, - CoreServices, -}: - -rustPlatform.buildRustPackage rec { - pname = "rebazel"; - version = "0.1.4"; - - src = fetchFromGitHub { - owner = "meetup"; - repo = "rebazel"; - rev = "v${version}"; - hash = "sha256-v84ZXhtJpejQmP61NmP06+qrtMu/0yb7UyD7U12xlME="; - }; - - cargoHash = "sha256-cBAm8LyNKEVJkhZJ+QZU5XtQutb1oNvad8xH70Bi2LM="; - - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices ]; - - meta = with lib; { - description = "tool for expediting bazel build workflows"; - mainProgram = "rebazel"; - homepage = "https://github.com/meetup/rebazel"; - license = licenses.mit; - maintainers = with maintainers; [ zimbatm ]; - }; -} diff --git a/pkgs/development/tools/rust/cargo-asm/default.nix b/pkgs/development/tools/rust/cargo-asm/default.nix deleted file mode 100644 index f8cd24e153d3b..0000000000000 --- a/pkgs/development/tools/rust/cargo-asm/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - rustPlatform, - Security, -}: - -rustPlatform.buildRustPackage rec { - pname = "cargo-asm"; - version = "2019-12-24"; - - src = fetchFromGitHub { - owner = "gnzlbg"; - repo = "cargo-asm"; - rev = "577f890ebd4a09c8265710261e976fe7bfce8668"; - sha256 = "1f6kzsmxgdms9lq5z9ynnmxymk9k2lzlp3caa52wqjvdw1grw0rb"; - }; - - cargoHash = "sha256-QsaOFman+VBSIAbCalW63I3QXY0uECZy9+ufOKhSQrA="; - - buildInputs = lib.optional stdenv.hostPlatform.isDarwin Security; - - # Test checks against machine code output, which fails with some - # LLVM/compiler versions. - doCheck = false; - - meta = with lib; { - description = "Display the assembly or LLVM-IR generated for Rust source code"; - homepage = "https://github.com/gnzlbg/cargo-asm"; - license = licenses.mit; - maintainers = with maintainers; [ matthiasbeyer ]; - }; -} diff --git a/pkgs/development/tools/rust/cargo-web/default.nix b/pkgs/development/tools/rust/cargo-web/default.nix deleted file mode 100644 index ace033d6a1140..0000000000000 --- a/pkgs/development/tools/rust/cargo-web/default.nix +++ /dev/null @@ -1,55 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - openssl, - perl, - pkg-config, - rustPlatform, - CoreServices, - Security, - fetchpatch, -}: - -rustPlatform.buildRustPackage rec { - pname = "cargo-web"; - version = "0.6.26"; - - src = fetchFromGitHub { - owner = "koute"; - repo = pname; - rev = version; - sha256 = "1dl5brj5fnmxmwl130v36lvy4j64igdpdvjwmxw3jgg2c6r6b7cd"; - }; - - patches = [ - (fetchpatch { - name = "fix-qualified-path.patch"; - url = "https://github.com/koute/cargo-web/commit/c9584542163d60d0aae6d6890509794e838e257f.patch"; - hash = "sha256-w59fXmrszptKt0llqGt0AF+0b3r9N6xUY6zQkpZnemE="; - }) - ]; - - cargoHash = "sha256-apPXSG8RV9hZ+jttn4XHhgmuLQ7344SQJna7Z/fu/mA="; - - nativeBuildInputs = [ - openssl - perl - pkg-config - ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - CoreServices - Security - ]; - - meta = with lib; { - description = "Cargo subcommand for the client-side Web"; - mainProgram = "cargo-web"; - homepage = "https://github.com/koute/cargo-web"; - license = with licenses; [ - asl20 # or - mit - ]; - maintainers = with maintainers; [ clevor ]; - }; -} diff --git a/pkgs/games/openra/build-engine.nix b/pkgs/games/openra/build-engine.nix index 85644fadef065..956ed7750e816 100644 --- a/pkgs/games/openra/build-engine.nix +++ b/pkgs/games/openra/build-engine.nix @@ -17,8 +17,8 @@ buildDotnetModule rec { nugetDeps = engine.deps; - dotnet-sdk = dotnetCorePackages.sdk_6_0; - dotnet-runtime = dotnetCorePackages.runtime_6_0; + dotnet-sdk = dotnetCorePackages.sdk_6_0-bin; + dotnet-runtime = dotnetCorePackages.runtime_6_0-bin; useAppHost = false; diff --git a/pkgs/os-specific/linux/fwts/default.nix b/pkgs/os-specific/linux/fwts/default.nix index c4a4d3ece8c1d..6fd7dc8e99d1a 100644 --- a/pkgs/os-specific/linux/fwts/default.nix +++ b/pkgs/os-specific/linux/fwts/default.nix @@ -1,38 +1,67 @@ -{ lib, stdenv, fetchzip, autoreconfHook, pkg-config, gnumake42, glib, pcre -, json_c, flex, bison, dtc, pciutils, dmidecode, acpica-tools, libbsd }: +{ + lib, + stdenv, + fetchzip, + autoreconfHook, + pkg-config, + glib, + pcre, + json_c, + flex, + bison, + dtc, + pciutils, + dmidecode, + acpica-tools, + libbsd, +}: stdenv.mkDerivation rec { pname = "fwts"; version = "24.09.00"; src = fetchzip { - url = "https://fwts.ubuntu.com/release/${pname}-V${version}.tar.gz"; - sha256 = "sha256-ZJSlx8O38e7bJYTgZacayslr28TLHHJsISXq9Uzsnyc="; + url = "https://fwts.ubuntu.com/release/fwts-V${version}.tar.gz"; + hash = "sha256-ZJSlx8O38e7bJYTgZacayslr28TLHHJsISXq9Uzsnyc="; stripRoot = false; }; - # fails with make 4.4 - nativeBuildInputs = [ autoreconfHook pkg-config gnumake42 ]; - buildInputs = [ glib pcre json_c flex bison dtc pciutils dmidecode acpica-tools libbsd ]; + nativeBuildInputs = [ + autoreconfHook + pkg-config + ]; + + buildInputs = [ + glib + pcre + json_c + flex + bison + dtc + pciutils + dmidecode + acpica-tools + libbsd + ]; postPatch = '' substituteInPlace src/lib/include/fwts_binpaths.h \ - --replace "/usr/bin/lspci" "${pciutils}/bin/lspci" \ - --replace "/usr/sbin/dmidecode" "${dmidecode}/bin/dmidecode" \ - --replace "/usr/bin/iasl" "${acpica-tools}/bin/iasl" + --replace-fail "/usr/bin/lspci" "${pciutils}/bin/lspci" \ + --replace-fail "/usr/sbin/dmidecode" "${dmidecode}/bin/dmidecode" \ + --replace-fail "/usr/bin/iasl" "${acpica-tools}/bin/iasl" substituteInPlace src/lib/src/fwts_devicetree.c \ src/devicetree/dt_base/dt_base.c \ - --replace "dtc -I" "${dtc}/bin/dtc -I" + --replace-fail "dtc -I" "${dtc}/bin/dtc -I" ''; enableParallelBuilding = true; - meta = with lib; { + meta = { homepage = "https://wiki.ubuntu.com/FirmwareTestSuite"; description = "Firmware Test Suite"; - platforms = platforms.linux; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ tadfisher ]; + platforms = lib.platforms.linux; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ tadfisher ]; }; } diff --git a/pkgs/os-specific/linux/nvidia-x11/open.nix b/pkgs/os-specific/linux/nvidia-x11/open.nix index 6d27b4dd0b988..108466d4e8ec4 100644 --- a/pkgs/os-specific/linux/nvidia-x11/open.nix +++ b/pkgs/os-specific/linux/nvidia-x11/open.nix @@ -30,6 +30,7 @@ stdenv.mkDerivation ( "SYSSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/source" "SYSOUT=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" "MODLIB=$(out)/lib/modules/${kernel.modDirVersion}" + "DATE=" { aarch64-linux = "TARGET_ARCH=aarch64"; x86_64-linux = "TARGET_ARCH=x86_64"; diff --git a/pkgs/servers/adguardhome/bins.nix b/pkgs/servers/adguardhome/bins.nix index 1eed4d5a569ba..a1ed882b2b1f6 100644 --- a/pkgs/servers/adguardhome/bins.nix +++ b/pkgs/servers/adguardhome/bins.nix @@ -1,31 +1,31 @@ { fetchurl, fetchzip }: { - x86_64-darwin = fetchzip { - sha256 = "sha256-+xZmMc5VOJ2GKvZdR0qDdwj+qze4r7eJFtZuLUkqZwE="; - url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.55/AdGuardHome_darwin_amd64.zip"; - }; - aarch64-darwin = fetchzip { - sha256 = "sha256-gIqPWHOl0bcZYmfujV3KnTrsZ8hWjN5KQDWq+aHNIn4="; - url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.55/AdGuardHome_darwin_arm64.zip"; - }; - i686-linux = fetchurl { - sha256 = "sha256-HWUTRPkaqk26A2eeN13DUNKBNM+jDBa5UuqjrYzPK5k="; - url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.55/AdGuardHome_linux_386.tar.gz"; - }; - x86_64-linux = fetchurl { - sha256 = "sha256-El/IAemoIyOgQYpmI1F84qTFteHT0H3ncYp2WxzZcJY="; - url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.55/AdGuardHome_linux_amd64.tar.gz"; - }; - aarch64-linux = fetchurl { - sha256 = "sha256-AHsQbTWH1mNafhRtpGY31g89jP07TZnL5fJvS0EbLDU="; - url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.55/AdGuardHome_linux_arm64.tar.gz"; - }; - armv6l-linux = fetchurl { - sha256 = "sha256-cpCgPLJEkgR0h5pduIEGP+sb58qZTljEeQn/w3Csz2Q="; - url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.55/AdGuardHome_linux_armv6.tar.gz"; - }; - armv7l-linux = fetchurl { - sha256 = "sha256-Nm09ih54jZEDMJCBJst43Sl2d6vVXCdFnkWBV4lehns="; - url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.55/AdGuardHome_linux_armv7.tar.gz"; - }; +x86_64-darwin = fetchzip { + sha256 = "sha256-uviTmopXz7OYVr4H2M/dFOMw0vD5P+3t5CChSL2HyrE="; + url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.56/AdGuardHome_darwin_amd64.zip"; +}; +aarch64-darwin = fetchzip { + sha256 = "sha256-P9n6H8YmttcZE5E/7nw/Bc+Gzb4nHbs3L/2pgdqUyFw="; + url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.56/AdGuardHome_darwin_arm64.zip"; +}; +i686-linux = fetchurl { + sha256 = "sha256-JPhx1Hqu5o3K4bBulStedLZexCtZhgZNgzvGTqUn3XY="; + url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.56/AdGuardHome_linux_386.tar.gz"; +}; +x86_64-linux = fetchurl { + sha256 = "sha256-BEqPo3jeLukMnykO+6GNZ93bplDCOcV33BOHleQLWDI="; + url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.56/AdGuardHome_linux_amd64.tar.gz"; +}; +aarch64-linux = fetchurl { + sha256 = "sha256-JxitRduWdp4uJCcoR7FA26prDIc68CzsFOviehxDRxI="; + url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.56/AdGuardHome_linux_arm64.tar.gz"; +}; +armv6l-linux = fetchurl { + sha256 = "sha256-TdBDGSny3xWRrMG5MamrN26E/fOf7V9jHvxxbK+7BPU="; + url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.56/AdGuardHome_linux_armv6.tar.gz"; +}; +armv7l-linux = fetchurl { + sha256 = "sha256-mrBsebAKSelAMcuurAUiZdPKr2AGi9lnk1Dhz+PAm/0="; + url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.56/AdGuardHome_linux_armv7.tar.gz"; +}; } diff --git a/pkgs/servers/adguardhome/default.nix b/pkgs/servers/adguardhome/default.nix index 63315913b720c..d5fcb49a85ff5 100644 --- a/pkgs/servers/adguardhome/default.nix +++ b/pkgs/servers/adguardhome/default.nix @@ -13,7 +13,7 @@ in stdenv.mkDerivation rec { pname = "adguardhome"; - version = "0.107.55"; + version = "0.107.56"; src = sources.${system} or (throw "Source for ${pname} is not available for ${system}"); installPhase = '' diff --git a/pkgs/servers/clickhouse/default.nix b/pkgs/servers/clickhouse/default.nix index a7837947852eb..b65285ef71330 100644 --- a/pkgs/servers/clickhouse/default.nix +++ b/pkgs/servers/clickhouse/default.nix @@ -120,21 +120,21 @@ mkDerivation rec { null; corrosionDeps = if rustSupport then - rustPlatform.fetchCargoTarball { + rustPlatform.fetchCargoVendor { src = corrosionSrc; name = "corrosion-deps"; preBuild = "cd generator"; - hash = "sha256-dhUgpwSjE9NZ2mCkhGiydI51LIOClA5wwk1O3mnnbM8="; + hash = "sha256-ok1QLobiGBccmbEEWQxHz3ivvuT6FrOgG6wLK4gIbgU="; } else null; rustDeps = if rustSupport then - rustPlatform.fetchCargoTarball { + rustPlatform.fetchCargoVendor { inherit src; name = "rust-deps"; preBuild = "cd rust"; - hash = "sha256-rbEfCRB2QAZ2WBgSLYYUqeYtI4Y5d9oQ2G8/mPirIp4="; + hash = "sha256-nX5wBM8rVMbaf/IrPsqkdT2KQklQbBIGomeWSTjclR4="; } else null; diff --git a/pkgs/servers/home-assistant/custom-components/versatile_thermostat/package.nix b/pkgs/servers/home-assistant/custom-components/versatile_thermostat/package.nix new file mode 100644 index 0000000000000..8c124a29aee69 --- /dev/null +++ b/pkgs/servers/home-assistant/custom-components/versatile_thermostat/package.nix @@ -0,0 +1,29 @@ +{ + buildHomeAssistantComponent, + fetchFromGitHub, + lib, + gitUpdater, +}: + +buildHomeAssistantComponent rec { + owner = "jmcollin78"; + domain = "versatile_thermostat"; + version = "7.1.5"; + + src = fetchFromGitHub { + inherit owner; + repo = domain; + rev = "refs/tags/${version}"; + hash = "sha256-XCDWByw/2xUjub/fNGvpIGzDyn3rq+JMI7syI1oPus0="; + }; + + passthru.updateScript = gitUpdater { ignoredVersions = "(Alpha|Beta|alpha|beta).*"; }; + + meta = { + changelog = "https://github.com/jmcollin78/versatile_thermostat/releases/tag/${version}"; + description = "A full-featured thermostat"; + homepage = "https://github.com/jmcollin78/versatile_thermostat"; + maintainers = with lib.maintainers; [ pwoelfel ]; + license = lib.licenses.mit; + }; +} diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/bubble-card/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/bubble-card/package.nix index 899e212232c43..811709ef4d7f8 100644 --- a/pkgs/servers/home-assistant/custom-lovelace-modules/bubble-card/package.nix +++ b/pkgs/servers/home-assistant/custom-lovelace-modules/bubble-card/package.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { pname = "bubble-card"; - version = "2.3.4"; + version = "2.4.0"; dontBuild = true; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { owner = "Clooos"; repo = "Bubble-Card"; rev = "v${version}"; - hash = "sha256-90If8QKlxacJZoEG3+IFHPd9cuFJS5Ki9XMdTaq67IA="; + hash = "sha256-Hn6jH7lT+bjkOM/iRCmD1B8l6ZRqjNTmVMj4IN7ixE4="; }; installPhase = '' diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/clock-weather-card/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/clock-weather-card/package.nix new file mode 100644 index 0000000000000..e224e4ce98eed --- /dev/null +++ b/pkgs/servers/home-assistant/custom-lovelace-modules/clock-weather-card/package.nix @@ -0,0 +1,49 @@ +{ + lib, + fetchFromGitHub, + stdenvNoCC, + fetchYarnDeps, + nodejs, + yarnConfigHook, + yarnBuildHook, +}: +stdenvNoCC.mkDerivation rec { + pname = "clock-weather-card"; + version = "2.8.7"; + + src = fetchFromGitHub { + owner = "pkissling"; + repo = "clock-weather-card"; + tag = "v${version}"; + hash = "sha256-ylJNI0DE+3j8EZFpUmuuBnII8nBMrJ5bhlGVh3M25eo="; + }; + + offlineCache = fetchYarnDeps { + yarnLock = src + "/yarn.lock"; + hash = "sha256-EUuPF2kS6CaJ2MUYoBocLOQyOgkhRHd34ul+efJua7Q="; + }; + + nativeBuildInputs = [ + nodejs + yarnConfigHook + yarnBuildHook + ]; + + installPhase = '' + runHook preInstall + + mkdir $out + cp ./dist/clock-weather-card.js $out/ + + runHook postInstall + ''; + + meta = { + description = "A Home Assistant Card indicating today's date/time, along with an iOS inspired weather forecast for the next days with animated icons"; + homepage = "https://github.com/pkissling/clock-weather-card"; + changelog = "https://github.com/pkissling/clock-weather-card/blob/${src.tag}/CHANGELOG.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ oddlama ]; + platforms = lib.platforms.all; + }; +} diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/versatile-thermostat-ui-card/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/versatile-thermostat-ui-card/package.nix new file mode 100644 index 0000000000000..1d3d7c75aad8a --- /dev/null +++ b/pkgs/servers/home-assistant/custom-lovelace-modules/versatile-thermostat-ui-card/package.nix @@ -0,0 +1,37 @@ +{ + lib, + buildNpmPackage, + fetchFromGitHub, +}: + +buildNpmPackage rec { + pname = "versatile-thermostat-ui-card"; + version = "1.1.2"; + + src = fetchFromGitHub { + owner = "jmcollin78"; + repo = "versatile-thermostat-ui-card"; + rev = "${version}"; + hash = "sha256-JOm0jQysBtKHjAXtWnjbEn7UPSNLHd95TGfP13WH0Ww="; + }; + + npmFlags = [ "--legacy-peer-deps" ]; + npmDepsHash = "sha256-TlJGO0kw3+8ukT1DERp/xDwmeSu0ofP5mqrmXmGcF2M="; + + installPhase = '' + runHook preInstall + + mkdir $out + install -m0644 dist/versatile-thermostat-ui-card.js $out + + runHook postInstall + ''; + + meta = with lib; { + changelog = "https://github.com/jmcollin78/versatile-thermostat-ui-card/releases/tag/${version}"; + description = "Home Assistant card for the Versatile Thermostat integration."; + homepage = "https://github.com/jmcollin78/versatile-thermostat-ui-card"; + license = licenses.mit; + maintainers = with maintainers; [ pwoelfel ]; + }; +} diff --git a/pkgs/servers/http/nginx/generic.nix b/pkgs/servers/http/nginx/generic.nix index 3f4933500f7be..3c0e87ab6c76c 100644 --- a/pkgs/servers/http/nginx/generic.nix +++ b/pkgs/servers/http/nginx/generic.nix @@ -12,7 +12,7 @@ outer@{ nixosTests, installShellFiles, - substituteAll, + replaceVars, removeReferencesTo, gd, geoip, @@ -40,7 +40,7 @@ outer@{ buildInputs ? [ ], extraPatches ? [ ], fixPatch ? p: p, - postPatch ? "", + postPatch ? null, preConfigure ? "", preInstall ? "", postInstall ? "", @@ -214,12 +214,7 @@ stdenv.mkDerivation { patches = map fixPatch ( [ - (substituteAll { - src = ./nix-etag-1.15.4.patch; - preInstall = '' - export nixStoreDir="$NIX_STORE" nixStoreDirLen="''${#NIX_STORE}" - ''; - }) + ./nix-etag-1.15.4.patch ./nix-skip-check-logs-path.patch ] ++ @@ -255,7 +250,11 @@ stdenv.mkDerivation { ) ++ extraPatches; - inherit postPatch; + postPatch = lib.defaultTo '' + substituteInPlace src/http/ngx_http_core_module.c \ + --replace-fail '@nixStoreDir@' "$NIX_STORE" \ + --replace-fail '@nixStoreDirLen@' "''${#NIX_STORE}" + '' postPatch; hardeningEnable = lib.optional (!stdenv.hostPlatform.isDarwin) "pie"; diff --git a/pkgs/servers/http/openresty/default.nix b/pkgs/servers/http/openresty/default.nix index d40cb644cf4d2..842762a0c2c16 100644 --- a/pkgs/servers/http/openresty/default.nix +++ b/pkgs/servers/http/openresty/default.nix @@ -39,6 +39,10 @@ callPackage ../nginx/generic.nix args rec { buildInputs = [ postgresql ]; postPatch = '' + substituteInPlace bundle/nginx-${nginxVersion}/src/http/ngx_http_core_module.c \ + --replace-fail '@nixStoreDir@' "$NIX_STORE" \ + --replace-fail '@nixStoreDirLen@' "''${#NIX_STORE}" + patchShebangs configure bundle/ ''; diff --git a/pkgs/servers/http/tengine/default.nix b/pkgs/servers/http/tengine/default.nix index 812784ebd394d..d60b8ec7815b9 100644 --- a/pkgs/servers/http/tengine/default.nix +++ b/pkgs/servers/http/tengine/default.nix @@ -8,7 +8,7 @@ libxcrypt, libxml2, libxslt, - substituteAll, + replaceVars, gd, geoip, gperftools, @@ -48,17 +48,17 @@ stdenv.mkDerivation rec { jemalloc ] ++ lib.concatMap (mod: mod.inputs or [ ]) modules; - patches = - lib.singleton (substituteAll { - src = ../nginx/nix-etag-1.15.4.patch; - preInstall = '' - export nixStoreDir="$NIX_STORE" nixStoreDirLen="''${#NIX_STORE}" - ''; - }) - ++ [ - ./check-resolv-conf.patch - ../nginx/nix-skip-check-logs-path.patch - ]; + patches = [ + ../nginx/nix-etag-1.15.4.patch + ./check-resolv-conf.patch + ../nginx/nix-skip-check-logs-path.patch + ]; + + postPatch = '' + substituteInPlace src/http/ngx_http_core_module.c \ + --replace-fail '@nixStoreDir@' "$NIX_STORE" \ + --replace-fail '@nixStoreDirLen@' "''${#NIX_STORE}" + ''; configureFlags = [ diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix index 8d5b2885b867d..c63e91595c0dc 100644 --- a/pkgs/servers/jackett/default.nix +++ b/pkgs/servers/jackett/default.nix @@ -26,7 +26,15 @@ buildDotnetModule rec { dotnet-runtime = dotnetCorePackages.aspnetcore_8_0; dotnet-sdk = dotnetCorePackages.sdk_8_0; - dotnetInstallFlags = [ "-p:TargetFramework=net8.0" ]; + dotnetInstallFlags = [ + "--framework" + "net8.0" + ]; + + postPatch = '' + substituteInPlace ${projectFile} ${testProjectFile} \ + --replace-fail 'net8.0;net462net8.0