Unverified Commit b529daaa authored by nixpkgs-ci[bot]'s avatar nixpkgs-ci[bot] Committed by GitHub
Browse files

Merge master into staging-next

parents c39935db aa6ae0af

nixos/doc/manual/release-notes/rl-2411.section.md

+0 −2
Original line number Diff line number Diff line
@@ -928,8 +928,6 @@ 


- `buildNimSbom` was added as an alternative to `buildNimPackage`. `buildNimSbom` uses [SBOMs](https://cyclonedx.org/) to generate packages whereas `buildNimPackage` uses a custom JSON lockfile format.



- The default version of `z3` has been updated from 4.8 to 4.13. There are still a few packages that need specific 4.8 versions; those will continue to be maintained.



## Detailed Migration Information {#sec-release-24.11-migration}



### `sound` options removal {#sec-release-24.11-migration-sound}

nixos/doc/manual/release-notes/rl-2505.section.md

+2 −0
Original line number Diff line number Diff line
@@ -221,6 +221,8 @@ 


- `nodePackages.meshcommander` has been removed, as the package was deprecated by Intel.



- The default version of `z3` has been updated from 4.8 to 4.13. There are still a few packages that need specific older versions; those will continue to be maintained as long as other packages depend on them but may be removed in the future.



- `kanata` was updated to v1.7.0, which introduces several breaking changes.

  See the release notes of

  [v1.7.0](https://github.com/jtroo/kanata/releases/tag/v1.7.0)

pkgs/applications/editors/nano/default.nix

+0 −5
Original line number Diff line number Diff line
@@ -9,7 +9,6 @@ 
  common-updater-scripts,

  git,

  nix,

  nixfmt-classic,

  coreutils,

  gnused,

  callPackage,
@@ -75,7 +74,6 @@ stdenv.mkDerivation rec { 
        lib.makeBinPath [

          common-updater-scripts

          git

          nixfmt-classic

          nix

          coreutils

          gnused
@@ -87,9 +85,6 @@ stdenv.mkDerivation rec { 


      if [ ! "$oldVersion" = "$latestTag" ]; then

        update-source-version ${pname} "$latestTag" --version-key=version --print-changes

        nixpkgs="$(git rev-parse --show-toplevel)"

        default_nix="$nixpkgs/pkgs/applications/editors/nano/default.nix"

        nixfmt "$default_nix"

      else

        echo "${pname} is already up-to-date"

      fi

pkgs/applications/editors/vscode/extensions/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -4231,8 +4231,8 @@ let 
        mktplcRef = {

          name = "wikitext";

          publisher = "RoweWilsonFrederiskHolme";

          version = "3.8.2";

          hash = "sha256-rWifSoJSN37xPIaCQgPyXRz9tCX2Akahl/3CuqzXq94=";

          version = "4.0.1";

          hash = "sha256-DN7VRLr5IaqCdsbADriH0AuUODGL8OeZWbCSozQTboU=";

        };

        meta = {

          description = "Extension that helps users view and write MediaWiki's Wikitext files";

pkgs/by-name/an/anytype/package.nix

+23 −4
Original line number Diff line number Diff line 
{ lib, fetchurl, appimageTools, makeWrapper, commandLineArgs ? "" }:

{

  lib,

  fetchurl,

  appimageTools,

  makeWrapper,

  nix-update-script,

  commandLineArgs ? "",

}:



let

  pname = "anytype";

  version = "0.43.8";

  version = "0.44.0";

  name = "Anytype-${version}";

  src = fetchurl {

    url = "https://github.com/anyproto/anytype-ts/releases/download/v${version}/${name}.AppImage";

    hash = "sha256-inqJvx5K/k97X50E0FYlzJDKqrVjAU6ZKIVdCWHr8NI=";

    hash = "sha256-+Ae0xH6ipNZgIVrrAmgeG8bibm/I3NLiDMzS+fwf9RQ=";

  };

  appimageContents = appimageTools.extractType2 { inherit pname version src; };

in appimageTools.wrapType2 {

in

appimageTools.wrapType2 {

  inherit pname version src;



  nativeBuildInputs = [ makeWrapper ];
@@ -29,6 +37,17 @@ in appimageTools.wrapType2 { 
    done

  '';



  passthru.updateScript = nix-update-script {

    # Prevent updating to versions with '-' in them.

    # Necessary since Anytype uses Electron-based 'MAJOR.MINOR.PATCH(-{alpha,beta})?' versioning scheme where each

    #  {alpha,beta} version increases the PATCH version, releasing a new full release version in GitHub instead of a

    #  pre-release version.

    extraArgs = [

      "--version-regex"

      "[^-]*"

    ];

  };



  meta = with lib; {

    description = "P2P note-taking tool";

    homepage = "https://anytype.io/";