Unverified Commit b00b35b4 authored by github-actions[bot]'s avatar github-actions[bot] Committed by GitHub
Browse files

Merge master into staging-next

parents 74cdd9c9 0223e698
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -580,7 +580,7 @@ After unpacking all of `src` and `srcs`, if neither of `sourceRoot` and `setSour
If `unpackPhase` produces multiple source directories, you should set `sourceRoot` to the name of the intended directory.
You can also set `sourceRoot = ".";` if you want to control it yourself in a later phase.

For example, if your want your build to start in a sub-directory inside your sources, and you are using `fetchzip`-derived `src` (like `fetchFromGitHub` or similar), you need to set `sourceRoot = "${src.name}/my-sub-directory"`.
For example, if you want your build to start in a sub-directory inside your sources, and you are using `fetchzip`-derived `src` (like `fetchFromGitHub` or similar), you need to set `sourceRoot = "${src.name}/my-sub-directory"`.

##### `setSourceRoot` {#var-stdenv-setSourceRoot}

+17 −7
Original line number Diff line number Diff line
@@ -3190,6 +3190,15 @@
      { fingerprint = "208A 2A66 8A2F CDE7 B5D3  8F64 CDDC 792F 6552 51ED"; }
    ];
  };
  cageyv = {
    email = "pingme@cageyv.dev";
    github = "cageyv";
    githubId = 51059484;
    name = "Vladmir Samoylov";
    keys = [
      { fingerprint = "8916 F727 734E 77AB 437F  A33A 19AB 76F5 CEE1 1392"; }
    ];
  };
  CaitlinDavitt = {
    email = "CaitlinDavitt@gmail.com";
    github = "CaitlinDavitt";
@@ -5792,6 +5801,14 @@
    githubId = 119483;
    name = "Matthew Brown";
  };
  edgar-vincent = {
    name = "Edgar Vincent";
    email = "e-v@posteo.net";
    matrix = "@edgar.vincent:matrix.org";
    github = "edgar-vincent";
    githubId = 63352906;
    keys = [ { fingerprint = "922F CA48 5FDB 20B1 ED1B  A61F 284D 11D3 33C4 D21B"; } ];
  };
  edlimerkaj = {
    name = "Edli Merkaj";
    email = "edli.merkaj@identinet.io";
@@ -12015,13 +12032,6 @@
    githubId = 4969294;
    name = "Louis Tim Larsen";
  };
  loveisgrief = {
    name = "LoveIsGrief";
    email = "loveisgrief@tuta.io";
    github = "LoveIsGrief";
    githubId = 2829538;
    keys = [ { fingerprint = "9847 4F48 18C6 4E0A F0C5  3529 E96D 1EDF A053 45EB"; } ];
  };
  lovek323 = {
    email = "jason@oconal.id.au";
    github = "lovek323";
+2 −4
Original line number Diff line number Diff line
@@ -337,10 +337,6 @@
- `zx` was updated to v8, which introduces several breaking changes.
  See the [v8 changelog](https://github.com/google/zx/releases/tag/8.0.0) for more information.

- `system.stateVersion` is now validated. If you never changed this yourself, you don't need to do anything. If your `stateVersion` is not a valid NixOS release version (e.g. "24.11" is valid),
  your system was already at risk of experiencing silent incompatible state updates. If your previous value is a well-formed version but not a valid release (e.g. "23.12"),
  round down to the nearest actual release. If it wasn't a well-formed version (e.g. "nixos-unstable"), set it to the version of NixOS that you originally installed.

- The `portunus` package and service do not support weak password hashes anymore.
  If you installed Portunus on NixOS 23.11 or earlier, upgrade to NixOS 24.05 first to get support for strong password hashing.
  Then, follow the instructions on the [upstream release notes](https://github.com/majewsky/portunus/releases/tag/v2.0.0) to upgrade all existing user accounts to strong password hashes.
@@ -410,6 +406,8 @@
- The `services.syncplay` module now exposes all currently available command-line arguments for `syncplay-server` as options, as well as a `useACMEHost` option for easy TLS setup.
  The systemd service now uses `DynamicUser`/`StateDirectory` and the `user` and `group` options have been deprecated.

- The `openlens` package got removed, suggested replacment `lens-desktop`

## Other Notable Changes {#sec-release-24.11-notable-changes}

<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
+2 −45
Original line number Diff line number Diff line
@@ -44,49 +44,6 @@ let
  };
  initrdRelease = pkgs.writeText "initrd-release" (attrsToText initrdReleaseContents);

  checkRelease = version:
    let
      parts = lib.versions.splitVersion version;
      isVersion = lib.length parts == 2 && lib.all (p: lib.stringLength p == 2) parts;
      majorVersion = lib.toIntBase10 (lib.elemAt parts 0);
      minorVersion = lib.elemAt parts 1;

      versionPatterns = [
        # only 13.10
        { fromMajor = 13; minor = [ "10" ]; }
        # 14.04 and 14.12
        { fromMajor = 14; minor = [ "04" "12" ]; }
        # only 15.09
        { fromMajor = 15; minor = [ "09" ]; }
        # 16.03 to 20.09
        { fromMajor = 16; minor = [ "03" "09" ]; }
        # from 21.05
        { fromMajor = 21; minor = [ "05" "11" ]; }
      ];

      # find the versioning pattern that applies by looking for the first
      # major version newer than `majorVersion`, and picking the previous pattern
      patternIndex = lib.lists.findFirstIndex
        ({ fromMajor, ... }: fromMajor > majorVersion)
        (lib.length versionPatterns)
        versionPatterns;

      validMinorVersions =
        if patternIndex == 0
        then []
        else (lib.elemAt versionPatterns (patternIndex - 1)).minor;

      correctMinorVersion = lib.elem minorVersion validMinorVersions;
      notNewerThanNixpkgs = lib.versionAtLeast trivial.release version;
    in isVersion && correctMinorVersion && notNewerThanNixpkgs;

  releaseType = types.addCheck
    (types.strMatching "[[:digit:]]{2}\\.[[:digit:]]{2}")
    checkRelease // {
      name = "nixosRelease";
      description = "NixOS release version, e.g. \"${trivial.release}\"";
      descriptionClass = "nonRestrictiveClause";
    };
in
{
  imports = [
@@ -113,7 +70,7 @@ in

      release = mkOption {
        readOnly = true;
        type = releaseType;
        type = types.str;
        default = trivial.release;
        description = "The NixOS release (e.g. `16.03`).";
      };
@@ -194,7 +151,7 @@ in
    };

    stateVersion = mkOption {
      type = releaseType;
      type = types.str;
      # TODO Remove this and drop the default of the option so people are forced to set it.
      # Doing this also means fixing the comment in nixos/modules/testing/test-instrumentation.nix
      apply = v:
+4 −2
Original line number Diff line number Diff line
@@ -155,8 +155,6 @@ in
            deepin-desktop-base

            startdde
            # TODO: should remove dde-dock, but dde-shell still need it's dconfig
            dde-dock
            dde-shell
            dde-launchpad
            dde-session-ui
@@ -177,6 +175,8 @@ in
            dde-application-manager
            deepin-service-manager
            dde-grand-search
            dde-api-proxy
            dde-tray-loader
          ];
          optionalPackages = [
            onboard # dde-dock plugin
@@ -216,6 +216,7 @@ in
        dde-application-manager
        deepin-service-manager
        dde-grand-search
        dde-api-proxy
      ];

      systemd.packages = with pkgs.deepin; [
@@ -230,6 +231,7 @@ in
        dde-session
        dde-application-manager
        deepin-service-manager
        dde-api-proxy
      ];
    };
}
Loading